Merge pull request #3635 from appwrite/fix-console-sdk
fix: console sdk
This commit is contained in:
commit
6fd7a841bd
12 changed files with 7313 additions and 6484 deletions
|
@ -76,7 +76,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"appwrite/sdk-generator": "0.19.5",
|
"appwrite/sdk-generator": "0.20.0",
|
||||||
"phpunit/phpunit": "9.5.20",
|
"phpunit/phpunit": "9.5.20",
|
||||||
"squizlabs/php_codesniffer": "^3.6",
|
"squizlabs/php_codesniffer": "^3.6",
|
||||||
"swoole/ide-helper": "4.8.9",
|
"swoole/ide-helper": "4.8.9",
|
||||||
|
|
20
composer.lock
generated
20
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "677b1b47c8567f0b7b05645e2bbc7bc7",
|
"content-hash": "7f417dc4a1f0d5ed97b3d6a88aa72adf",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adhocore/jwt",
|
"name": "adhocore/jwt",
|
||||||
|
@ -2828,29 +2828,29 @@
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "appwrite/sdk-generator",
|
"name": "appwrite/sdk-generator",
|
||||||
"version": "0.19.5",
|
"version": "0.20.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/appwrite/sdk-generator.git",
|
"url": "https://github.com/appwrite/sdk-generator.git",
|
||||||
"reference": "04de540cf683e2b08b3192c137dde7f2c37003d9"
|
"reference": "af7dd08848a78a0d38befa3e63083eb0186806f7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/04de540cf683e2b08b3192c137dde7f2c37003d9",
|
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/af7dd08848a78a0d38befa3e63083eb0186806f7",
|
||||||
"reference": "04de540cf683e2b08b3192c137dde7f2c37003d9",
|
"reference": "af7dd08848a78a0d38befa3e63083eb0186806f7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
"matthiasmullie/minify": "^1.3",
|
"matthiasmullie/minify": "^1.3.68",
|
||||||
"php": ">=7.0.0",
|
"php": ">=7.0.0",
|
||||||
"twig/twig": "^3.3"
|
"twig/twig": "^3.4.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"brianium/paratest": "^6.4",
|
"brianium/paratest": "^6.4",
|
||||||
"phpunit/phpunit": "^9.5.13"
|
"phpunit/phpunit": "^9.5.21"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -2872,9 +2872,9 @@
|
||||||
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
|
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/appwrite/sdk-generator/issues",
|
"issues": "https://github.com/appwrite/sdk-generator/issues",
|
||||||
"source": "https://github.com/appwrite/sdk-generator/tree/0.19.5"
|
"source": "https://github.com/appwrite/sdk-generator/tree/0.20.0"
|
||||||
},
|
},
|
||||||
"time": "2022-07-06T11:05:57+00:00"
|
"time": "2022-08-02T10:09:48+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/instantiator",
|
"name": "doctrine/instantiator",
|
||||||
|
|
63
package-lock.json
generated
63
package-lock.json
generated
|
@ -9,8 +9,8 @@
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chart.js": "^3.8.0",
|
"chart.js": "^3.8.2",
|
||||||
"markdown-it": "^12.3.2",
|
"markdown-it": "^13.0.1",
|
||||||
"pell": "^1.0.6",
|
"pell": "^1.0.6",
|
||||||
"prismjs": "^1.28.0",
|
"prismjs": "^1.28.0",
|
||||||
"turndown": "^7.1.1"
|
"turndown": "^7.1.1"
|
||||||
|
@ -549,9 +549,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/chart.js": {
|
"node_modules/chart.js": {
|
||||||
"version": "3.8.0",
|
"version": "3.8.2",
|
||||||
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.2.tgz",
|
||||||
"integrity": "sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg=="
|
"integrity": "sha512-7rqSlHWMUKFyBDOJvmFGW2lxULtcwaPLegDjX/Nu5j6QybY+GCiQkEY+6cqHw62S5tcwXMD8Y+H5OBGoR7d+ZQ=="
|
||||||
},
|
},
|
||||||
"node_modules/chokidar": {
|
"node_modules/chokidar": {
|
||||||
"version": "2.1.8",
|
"version": "2.1.8",
|
||||||
|
@ -1067,9 +1067,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/entities": {
|
"node_modules/entities": {
|
||||||
"version": "2.1.0",
|
"version": "3.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
||||||
"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
|
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.12"
|
||||||
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/fb55/entities?sponsor=1"
|
"url": "https://github.com/fb55/entities?sponsor=1"
|
||||||
}
|
}
|
||||||
|
@ -2606,9 +2609,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/linkify-it": {
|
"node_modules/linkify-it": {
|
||||||
"version": "3.0.3",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
||||||
"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
|
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"uc.micro": "^1.0.1"
|
"uc.micro": "^1.0.1"
|
||||||
}
|
}
|
||||||
|
@ -2862,13 +2865,13 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/markdown-it": {
|
"node_modules/markdown-it": {
|
||||||
"version": "12.3.2",
|
"version": "13.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz",
|
||||||
"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
|
"integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"argparse": "^2.0.1",
|
"argparse": "^2.0.1",
|
||||||
"entities": "~2.1.0",
|
"entities": "~3.0.1",
|
||||||
"linkify-it": "^3.0.1",
|
"linkify-it": "^4.0.1",
|
||||||
"mdurl": "^1.0.1",
|
"mdurl": "^1.0.1",
|
||||||
"uc.micro": "^1.0.5"
|
"uc.micro": "^1.0.5"
|
||||||
},
|
},
|
||||||
|
@ -5484,9 +5487,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"chart.js": {
|
"chart.js": {
|
||||||
"version": "3.8.0",
|
"version": "3.8.2",
|
||||||
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.2.tgz",
|
||||||
"integrity": "sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg=="
|
"integrity": "sha512-7rqSlHWMUKFyBDOJvmFGW2lxULtcwaPLegDjX/Nu5j6QybY+GCiQkEY+6cqHw62S5tcwXMD8Y+H5OBGoR7d+ZQ=="
|
||||||
},
|
},
|
||||||
"chokidar": {
|
"chokidar": {
|
||||||
"version": "2.1.8",
|
"version": "2.1.8",
|
||||||
|
@ -5924,9 +5927,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"entities": {
|
"entities": {
|
||||||
"version": "2.1.0",
|
"version": "3.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
||||||
"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
|
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="
|
||||||
},
|
},
|
||||||
"errno": {
|
"errno": {
|
||||||
"version": "0.1.8",
|
"version": "0.1.8",
|
||||||
|
@ -7178,9 +7181,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"linkify-it": {
|
"linkify-it": {
|
||||||
"version": "3.0.3",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
||||||
"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
|
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"uc.micro": "^1.0.1"
|
"uc.micro": "^1.0.1"
|
||||||
}
|
}
|
||||||
|
@ -7413,13 +7416,13 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"markdown-it": {
|
"markdown-it": {
|
||||||
"version": "12.3.2",
|
"version": "13.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz",
|
||||||
"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
|
"integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"argparse": "^2.0.1",
|
"argparse": "^2.0.1",
|
||||||
"entities": "~2.1.0",
|
"entities": "~3.0.1",
|
||||||
"linkify-it": "^3.0.1",
|
"linkify-it": "^4.0.1",
|
||||||
"mdurl": "^1.0.1",
|
"mdurl": "^1.0.1",
|
||||||
"uc.micro": "^1.0.5"
|
"uc.micro": "^1.0.5"
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
"gulp-less": "^5.0.0"
|
"gulp-less": "^5.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chart.js": "^3.8.0",
|
"chart.js": "^3.8.2",
|
||||||
"markdown-it": "^12.3.2",
|
"markdown-it": "^13.0.1",
|
||||||
"pell": "^1.0.6",
|
"pell": "^1.0.6",
|
||||||
"prismjs": "^1.28.0",
|
"prismjs": "^1.28.0",
|
||||||
"turndown": "^7.1.1"
|
"turndown": "^7.1.1"
|
||||||
|
|
761
public/dist/scripts/app-all.js
vendored
761
public/dist/scripts/app-all.js
vendored
File diff suppressed because one or more lines are too long
750
public/dist/scripts/app-dep.js
vendored
750
public/dist/scripts/app-dep.js
vendored
File diff suppressed because it is too large
Load diff
11
public/dist/scripts/app.js
vendored
11
public/dist/scripts/app.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load diff
|
@ -57,7 +57,7 @@ window.addEventListener("load", async () => {
|
||||||
const realtime = window.ls.container.get('realtime');
|
const realtime = window.ls.container.get('realtime');
|
||||||
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
|
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||||
let current = {};
|
let current = {};
|
||||||
window.ls.container.get('console').subscribe(['project', 'console'], response => {
|
window.ls.container.get('console').client.subscribe(['project', 'console'], response => {
|
||||||
if (response.events.includes('stats.connections')) {
|
if (response.events.includes('stats.connections')) {
|
||||||
for (let project in response.payload) {
|
for (let project in response.payload) {
|
||||||
current[project] = response.payload[project] ?? 0;
|
current[project] = response.payload[project] ?? 0;
|
||||||
|
|
|
@ -2,16 +2,28 @@
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
window.ls.container.set('console', function (window) {
|
window.ls.container.set('console', function (window) {
|
||||||
var sdk = new window.Appwrite();
|
var client = new Appwrite.Client();
|
||||||
var endpoint = window.location.origin + '/v1';
|
var endpoint = window.location.origin + '/v1';
|
||||||
|
|
||||||
sdk
|
client
|
||||||
.setEndpoint(endpoint)
|
.setEndpoint(endpoint)
|
||||||
.setProject('console')
|
.setProject('console')
|
||||||
.setLocale(APP_ENV.LOCALE)
|
.setLocale(APP_ENV.LOCALE)
|
||||||
;
|
;
|
||||||
|
|
||||||
return sdk;
|
return {
|
||||||
|
client: client,
|
||||||
|
account: new Appwrite.Account(client),
|
||||||
|
avatars: new Appwrite.Avatars(client),
|
||||||
|
databases: new Appwrite.Databases(client),
|
||||||
|
functions: new Appwrite.Functions(client),
|
||||||
|
health: new Appwrite.Health(client),
|
||||||
|
locale: new Appwrite.Locale(client),
|
||||||
|
projects: new Appwrite.Projects(client),
|
||||||
|
storage: new Appwrite.Storage(client),
|
||||||
|
teams: new Appwrite.Teams(client),
|
||||||
|
users: new Appwrite.Users(client)
|
||||||
|
}
|
||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
})(window);
|
})(window);
|
|
@ -2,17 +2,28 @@
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
window.ls.container.set('sdk', function (window, router) {
|
window.ls.container.set('sdk', function (window, router) {
|
||||||
var sdk = new window.Appwrite();
|
var client = new Appwrite.Client();
|
||||||
var endpoint = window.location.origin + '/v1';
|
var endpoint = window.location.origin + '/v1';
|
||||||
|
|
||||||
sdk
|
client
|
||||||
.setEndpoint(endpoint)
|
.setEndpoint(endpoint)
|
||||||
.setProject(router.params.project || '')
|
.setProject(router.params.project || '')
|
||||||
.setLocale(APP_ENV.LOCALE)
|
.setLocale(APP_ENV.LOCALE)
|
||||||
.setMode('admin')
|
.setMode('admin')
|
||||||
;
|
;
|
||||||
|
|
||||||
return sdk;
|
return {
|
||||||
|
client: client,
|
||||||
|
account: new Appwrite.Account(client),
|
||||||
|
avatars: new Appwrite.Avatars(client),
|
||||||
|
databases: new Appwrite.Databases(client),
|
||||||
|
functions: new Appwrite.Functions(client),
|
||||||
|
health: new Appwrite.Health(client),
|
||||||
|
locale: new Appwrite.Locale(client),
|
||||||
|
storage: new Appwrite.Storage(client),
|
||||||
|
teams: new Appwrite.Teams(client),
|
||||||
|
users: new Appwrite.Users(client)
|
||||||
|
}
|
||||||
}, false);
|
}, false);
|
||||||
|
|
||||||
})(window);
|
})(window);
|
|
@ -203,6 +203,12 @@
|
||||||
let params = [];
|
let params = [];
|
||||||
let match;
|
let match;
|
||||||
|
|
||||||
|
let indexOfArguments = functionAsString.indexOf('(');
|
||||||
|
|
||||||
|
if (indexOfArguments !== -1) {
|
||||||
|
functionAsString = functionAsString.slice(indexOfArguments, -1);
|
||||||
|
}
|
||||||
|
|
||||||
functionAsString = functionAsString.replaceAll('={}', "");
|
functionAsString = functionAsString.replaceAll('={}', "");
|
||||||
functionAsString = functionAsString.replaceAll('=[]', "");
|
functionAsString = functionAsString.replaceAll('=[]', "");
|
||||||
functionAsString = functionAsString.replace(REGEX_COMMENTS, "");
|
functionAsString = functionAsString.replace(REGEX_COMMENTS, "");
|
||||||
|
@ -259,7 +265,7 @@
|
||||||
let args = getParams(target);
|
let args = getParams(target);
|
||||||
|
|
||||||
return target.apply(
|
return target.apply(
|
||||||
target,
|
container.get(scope),
|
||||||
args.map(function(value) {
|
args.map(function(value) {
|
||||||
let result = getValue(value, prefix, data);
|
let result = getValue(value, prefix, data);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue