From 0a390b39c2f7798b8ca28b143e801e357b123642 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 4 Aug 2019 12:48:01 +0200 Subject: [PATCH] drone admin to PluginManager --- .drone.yml | 4 ++-- package.json | 2 +- src/backend/FrontblockAdmin.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index cd3df6d..8595667 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,13 +60,13 @@ steps: settings: registry: registry.frontblock.me insecure: true - repo: registry.frontblock.me/vendor/admin + repo: registry.frontblock.me/vendor/PluginManager tags: ${DRONE_BUILD_CREATED} - name: release container image: plugins/docker settings: - repo: frontblockme/admin + repo: frontblockme/PluginManager tags: ${DRONE_TAG} username: frontblockme password: diff --git a/package.json b/package.json index 8cd5a53..262a25b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build-backend": "tsc; webpack --display-error-details --config src/backend/webpack.prod.js --progress --colors; pwd; cp -r lib/PluginManager/* .", "build-frontend": "npm run build-dashboard; npm run build-widget", "build-dashboard": "cd src/frontend/dashboard; npm i; npm run build; cp -r dist/* ../../../static", - "build-widget": "rollup -c src/frontend/widget/rollup.config.js; mkdir -p plugins/admin; cp FrontendPlugin.js plugins/admin", + "build-widget": "rollup -c src/frontend/widget/rollup.config.js; mkdir -p plugins/PluginManager; cp FrontendPlugin.js plugins/PluginManager", "clean": "rm -rf lib static plugins kfs dist widget .rpt2_cache *.js *.ts; rm -rf src/frontend/dashboard/dist", "update-frontblock": "rm -rf node_modules/frontblock*; npm install" }, diff --git a/src/backend/FrontblockAdmin.ts b/src/backend/FrontblockAdmin.ts index b548b1e..974a5a4 100644 --- a/src/backend/FrontblockAdmin.ts +++ b/src/backend/FrontblockAdmin.ts @@ -113,7 +113,7 @@ export class FrontblockAdmin extends ConfigLoader{ const loadedPlugins = this.pm.getLoadedPlugins() for(const name in loadedPlugins){ loadedPlugins[name].backend.exportRPCs().forEach(rpc => { - const info = this.rpcToRpcInfo(name=="admin"?"PluginManager":name, rpc) + const info = this.rpcToRpcInfo(name, rpc) rpcInfos.push(info) }) }