@steedos/service-package-registry 3.0.0-beta.30 → 3.0.0-beta.33

package/main/default/manager/packages.js

@@ -71,6 +71,7 @@ const getAllPackages = async ()=>{
             _package.instance_id = packageInfo.instanceID
             _package.version = packageInfo.version
             _package.homepage = packageInfo.homepage
+            _package.isUnmanaged = packageInfo.isUnmanaged
         }else{
             packages.push({
                 label: packageInfo.label || packageName,
@@ -84,7 +85,8 @@ const getAllPackages = async ()=>{
                 instance_id: packageInfo.instanceID,
                 status : 'enable',
                 version : packageInfo.version,
-                local: false
+                local: false,
+                isUnmanaged: packageInfo.isUnmanaged
             })
         }
     })

package/main/default/manager/registry.js

@@ -282,10 +282,17 @@ async function yarnAddPackage(yarnPackage){
             paths: [path.join(installDir, 'node_modules')]
         }))
         if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
+            // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+            const schema = require(path.join(packagePath, 'package.service.js'));
+            schema.settings.packageInfo = {
+                ...schema.settings.packageInfo,
+                ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+            }
             steedosPackages.push({
                 name: parsed.name,
                 version: parsed.rawSpec,
-                path: packagePath
+                path: packagePath,
+                isUnmanaged: schema.settings.packageInfo.isUnmanaged
             })
         }
     })

package/main/default/objects/steedos_packages/buttons/disable.button.js

@@ -40,6 +40,9 @@ module.exports = {
             return false;
         }
         const record = data?.record || {};
+        if(record.isUnmanaged){
+            return false
+        }
         if (record.status === 'enable') {
             return true;
         }

package/main/default/objects/steedos_packages/buttons/enable.button.js

@@ -41,6 +41,9 @@ module.exports = {
             return false;
         }
         const record = data?.record || {};
+        if(record.isUnmanaged){
+            return false
+        }
         if(record.status !== 'enable'){
             return true;
         }

package/main/default/objects/steedos_packages/buttons/reload.button.js

@@ -23,6 +23,9 @@ module.exports = {
             return false;
         }
         const record = data?.record;
+        if(record.isUnmanaged){
+            return false
+        }
         if(record.status === 'enable'){
             return true;
         }

package/main/default/objects/steedos_packages/buttons/uninstall.button.js

@@ -1,38 +1,41 @@
 module.exports = {
     uninstall: function (object_name, record_id) {
-
-
         Steedos.sobject(object_name).retrieve(record_id).then((record)=>{
             if(!record){
                 return SteedosUI.notification.error({message: '未找到软件包'})
             }
-            console.log('record.....',record)
 
             SteedosUI.Modal.confirm({
-                title: t('steedos_packages.uninstall.title'),
-                content: t('steedos_packages.uninstall.text') + ` ${record.name}`,
+                title: t('steedos_packages.uninstall.text') + ` ${record.name} 吗?` ,
+                content: `卸载后，该软件包中的所有组件将被永久删除且无法恢复`,
                 okText: t('steedos_packages.uninstall.title'),
                 cancelText: t('Cancel'),
+                width: 480,
                 onOk: function(){
-                    Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/uninstall'), {type: 'post', async: false, data: JSON.stringify({
-                            module: record.name,
-                            nodeID: window.$("#steedos_package_main_node").val()
-                        }),
-                        success: function(data){
-                            if(data.status == 1){
-                                SteedosUI.notification.error({message: data.msg});
-                                return;
+                    return new Promise((resolve, reject) => {
+                        Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/uninstall'), {type: 'post', async: false, data: JSON.stringify({
+                                module: record.name,
+                                nodeID: window.$("#steedos_package_main_node").val()
+                            }),
+                            success: function(data){
+                                if(data.status == 1){
+                                    SteedosUI.notification.error({message: data.msg});
+                                    resolve(data);
+                                    return;
+                                }
+                                setTimeout(function(){
+                                    SteedosUI.notification.success({
+                                        message: t('steedos_packages.uninstall.toastr_success')
+                                    });
+                                    resolve(data);
+                                    navigate("/app/admin/steedos_packages")
+                                }, 1000 * 2)
+                            },
+                            error: function(XMLHttpRequest){
+                                SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.msg});
+                                reject()
                             }
-                            setTimeout(function(){
-                                SteedosUI.notification.success({
-                                    message: t('steedos_packages.uninstall.toastr_success')
-                                });
-                                navigate("/app/admin/steedos_packages")
-                            }, 1000 * 2)
-                        },
-                        error: function(XMLHttpRequest){
-                            SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.msg});
-                        }
+                        })
                     })
                 }
             });

package/main/default/objects/steedos_packages/buttons/upgradePackage.button.js

@@ -11,6 +11,9 @@ module.exports = {
             return false;
         }
         const record = data?.record;
+        if(record.isUnmanaged){
+            return false
+        }
         if (record.status === 'enable' && !record.local && !record.static) {
             return true;
         }

package/main/default/objects/steedos_packages/fields/isUnmanaged.field.yml

@@ -0,0 +1,4 @@
+name: isUnmanaged
+type: boolean
+label: 模板
+visible_on: "{{false}}"

package/main/default/objects/steedos_packages/listviews/all.listview.yml

@@ -9,6 +9,7 @@ columns:
   - field: status
   - field: static
   - field: icon
+  - field: isUnmanaged
 filter_scope: space
 label: 所有软件包
 scrolling_mode: standard

package/main/default/pages/steedos_package_detail.page.amis.json

@@ -75,35 +75,6 @@
                             ],
                             "className": "p-0",
                             "id": "u:5d4e7e3f6ecc"
-                        },
-                        {
-                            "title": "依赖服务",
-                            "body": [
-                                {
-                                    "type": "steedos-object-form",
-                                    "label": "对象表单",
-                                    "objectApiName": "${objectName}",
-                                    "recordId": "${recordId}",
-                                    "appId": "${appId}",
-                                    "id": "u:fec578db3278",
-                                    "mode": "read",
-                                    "className": "mb-4",
-                                    "fields": [
-                                        "dependencies"
-                                    ],
-                                    "fieldsExtend": {
-                                        "dependencies": {
-                                            "label": false,
-                                            "amis": {
-                                                "type": "tpl",
-                                                "tpl": "${dependencies | join: }"
-                                            }
-                                        }
-                                    }
-                                }
-                            ],
-                            "className": "p-0",
-                            "id": "u:5d4e7e3f6ecc"
                         }
                     ],
                     "id": "u:148cf8e840eb"

package/main/default/pages/steedos_packages_list.page.amis.json

@@ -32,7 +32,7 @@
           "actions": [
             {
               "label": "${uiSchema.actions.enable.label}",
-              "disabledOn": "${status === 'enable' || window:Steedos.settings.public.enable_saas}",
+              "disabledOn": "${status === 'enable' || window:Steedos.settings.public.enable_saas || isUnmanaged === true}",
               "className": "mr-4",
               "onEvent": {
                 "click": {
@@ -48,7 +48,7 @@
             },
             {
               "label": "${uiSchema.actions.disable.label}",
-              "disabledOn": "${status !== 'enable' || window:Steedos.settings.public.enable_saas}",
+              "disabledOn": "${status !== 'enable' || window:Steedos.settings.public.enable_saas || isUnmanaged === true}",
               "onEvent": {
                 "click": {
                   "actions": [

package/main/default/routes/nodes.router.js

@@ -50,7 +50,10 @@ router.post('/api/nodes/uninstall', disabledChangePackageWithSaas, auth.requireA
         const result = await broker.call(`@steedos/service-project.uninstallPackage`, {
             module
         },{
-            nodeID: nodeID
+            nodeID: nodeID,
+            meta: {
+                user: userSession
+            }
         })
         res.status(200).send(result); //TODO 完善返回信息
     } catch (error) {

package/main/default/triggers/steedos_packages.trigger.js

@@ -18,13 +18,9 @@ module.exports = {
         const { spaceId } = this;
         let dataList = await packages.getAllPackages();
         if (!_.isEmpty(dataList)) {
-            const cloneValues = clone(this.data.values, false);
+            const cloneValues = [];
             dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    cloneValues.push(doc);
-                }
+                cloneValues.push(doc)
             })
             const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
             if (records.length > 0) {
@@ -42,12 +38,10 @@ module.exports = {
         this.data.values = result.length;
     },
     afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            const all = await packages.getAllPackages();
-            const id = this.id;
-            this.data.values = _.find(all, function(item){
-                return item._id === id
-            });
-        }
+        const all = await packages.getAllPackages();
+        const id = this.id;
+        this.data.values = _.find(all, function(item){
+            return item._id === id
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "3.0.0-beta.30",
+  "version": "3.0.0-beta.33",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "3.0.0-beta.30",
-    "@steedos/metadata-core": "3.0.0-beta.30",
-    "@steedos/objectql": "3.0.0-beta.30",
-    "@steedos/service-package-loader": "3.0.0-beta.30",
+    "@steedos/auth": "3.0.0-beta.33",
+    "@steedos/metadata-core": "3.0.0-beta.33",
+    "@steedos/objectql": "3.0.0-beta.33",
+    "@steedos/service-package-loader": "3.0.0-beta.33",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "179adc36b9bc560bad5673f0a068600f5af4848f"
+  "gitHead": "240a409b40d5e5e25cf2451b63e611ba7b8e4533"
 }

package/project.package.service.js

@@ -76,6 +76,11 @@ module.exports = {
 		uninstallPackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
+				const packages = loader.loadPackagesConfig();
+				let packageConfig = _.find(packages, (_p, pname) => {
+					_p.name = pname;
+					return pname === module;
+				})
                 await loader.removePackage(module);
         		await registry.uninstallModule(module)
 				await ctx.broker.call(`@steedos/service-packages.uninstall`, {
@@ -85,6 +90,17 @@ module.exports = {
 						instanceID: ctx.broker.instanceID, 
 					}
 				})
+				if(packageConfig.isUnmanaged){
+					await ctx.broker.call(`~packages-@steedos/metadata-api.remove`, {
+						name: module
+					}, {
+                        timeout: 0,
+                        meta: {
+                            user: ctx.meta.user
+                        }
+                    })
+				}
+
 				return {};
             }
 		},
@@ -557,7 +573,8 @@ module.exports = {
 								description: _packageInfo.description,
 								metadata: metadata,
 								static: _packageInfo.static,
-								homepage: _packageInfo.homepage
+								homepage: _packageInfo.homepage,
+								isUnmanaged: _packageInfo.isUnmanaged
 							}
 						})
 					}
@@ -569,24 +586,34 @@ module.exports = {
                 const packages = await registry.yarnAddPackage(yarnPackage);
 				for (const packageInfo of packages) {
 					const packagePath = packageInfo.path;
+					let enable = false;
+					if(packageInfo.isUnmanaged){
+						enable = true;
+					}
 					loader.appendToPackagesConfig(packageInfo.name, {
 						version: packageInfo.version,
 						path: util.getPackageRelativePath(process.cwd(), packagePath),
-						enable: false
+						enable: enable,
+						isUnmanaged: packageInfo.isUnmanaged || false
 					});
+					if(enable){
+						await this.broker.call('@steedos/service-project.enablePackage', {module: packageInfo.name})
+					}
+
 					const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
 					const packageYmlData = loader.getPackageYmlData(packagePath);
 					await this.broker.call(`@steedos/service-packages.install`, {
 						serviceInfo: Object.assign({}, {
 							version: packageInfo.version,
-							path: packageInfo.path
+							path: packageInfo.path,
+							isUnmanaged: packageInfo.isUnmanaged || false
 						}, {
 							packageYmlData: packageYmlData,
 							name: packageInfo.name,
 							enable: false, 
 							nodeID: broker.nodeID, 
 							instanceID: broker.instanceID,
-							metadata: metadata
+							metadata: metadata,
 						})
 					})
 				}