@steedos/standard-object-database 2.5.0-beta.19 → 2.5.0-beta.20

package/main/default/objects/3.permission_objects.observe.object.js

@@ -1,13 +1,46 @@
-var permissionCore = require('./permission_objects.core.js');
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-06 18:58:32
+ * @Description: 
+ */
 
+const cachers = require('@steedos/cachers');
+const objectql = require("@steedos/objectql");
+const _ = require('lodash');
+let permissionObjectsLoadSetTimeoutId = null;
 Meteor.startup(function () {
     var _change, _remove;
     _change = function (document) {
-        permissionCore.loadObjectPermission(document)
-    };
-    _remove = function (document) {
-        permissionCore.removeObjectPermission(document);
+        if(permissionObjectsLoadSetTimeoutId){
+            clearTimeout(permissionObjectsLoadSetTimeoutId);
+            permissionObjectsLoadSetTimeoutId = null;
+        }
+        permissionObjectsLoadSetTimeoutId = setTimeout(()=>{
+            objectql.getObject("permission_set").find({}).then((permissionSets)=>{
+                objectql.getObject("permission_objects").directFind({}).then((records)=>{
+                    records = _.map(records, (doc)=>{
+                        if(_.includes(['admin', 'user', 'customer', 'supplier'], doc.permission_set_id)){
+                            doc.name = doc.permission_set_id
+                        }else{
+                            const record = _.find(permissionSets, (item)=>{
+                                return doc.permission_set_id == item._id
+                            })
+                            if(record){
+                                doc.name = record.name;
+                            }else{
+                                doc.name = _.last(doc.name.split('.')) || doc.permission_set_id;
+                            }
+                        }
+                        return doc;
+                    })
+                    cachers.getCacher('permission_objects').set('permission_objects', _.groupBy(records, 'space'));
+                })
+            })
+        }, 1000 * 3)
     };
+   
     Creator.getCollection("permission_objects").find({}, {
         fields: {
             created: 0,
@@ -23,7 +56,7 @@ Meteor.startup(function () {
             return _change(newDocument);
         },
         removed: function (oldDocument) {
-            return _remove(oldDocument);
+            return _change(oldDocument);
         }
     });
 });

package/main/default/objects/datasources.object.js

@@ -1,4 +1,5 @@
 const _ = require("underscore");
+const lodash = require("lodash");
 var objectql = require('@steedos/objectql');
 var schema = objectql.getSteedosSchema();
 const datasourceCore = require('./datasources.core');
@@ -20,6 +21,9 @@ Creator.Objects['datasources'].methods = {
     testConnection: async function (req, res) {
         var userSession = req.user
             var recordId = req.params._id;
+            if(lodash.includes(defaultDatasourceName, recordId)){
+                return res.send({ok: 1});
+            }
             var spaceId = userSession.spaceId
             let doc = await objectql.getObject('datasources').findOne(recordId, {filters: `(space eq \'${spaceId}\')`});
             if(doc){

package/main/default/objects/datasources.object.yml

@@ -82,6 +82,15 @@ fields:
   is_enable:
     type: boolean
     label: Enable
+  record_permissions: 
+    type: object
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+  is_system:
+    type: boolean
+    label: System
+    readonly: true
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+    disabled: true
 list_views:
   all:
     columns:
@@ -89,6 +98,7 @@ list_views:
       - name
       - is_enable
       - driver
+      - is_system
     label: All
     filter_scope: space
 actions:

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

@@ -9,23 +9,30 @@ const auth = require('@steedos/auth');
 const _ = require('underscore');
 //由于新版lookup 组件限制。需编写trigger处理在只读页面不显示已选中项的问题
 //由于lookup组件强依赖_id 字段，所以必须返回_id
+
+const PERMISSIONS = {
+    allowEdit: false,
+    allowDelete: false,
+    allowRead: true,
+};
+
+const BASERECORD = {
+    is_system: true,
+    record_permissions: PERMISSIONS
+};
+
 module.exports = {
 
     beforeFind: async function () {
         delete this.query.fields;
     },
-
-    beforeAggregate: async function () {
-        delete this.query.fields;
-    },
-
     afterFind: async function(){
         const { spaceId } = this;
         let lng = Steedos.locale(this.userId, true);
-        let dataList = [{_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng)}];
+        let dataList = [{_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD}];
         let filters = InternalData.parserFilters(this.query.filters)
         if(filters._id === 'meteor'){
-            dataList.push({_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng)})
+            dataList.push({_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD})
         }
         if (!_.isEmpty(dataList)) {
             dataList.forEach((doc) => {
@@ -44,26 +51,6 @@ module.exports = {
         }
 
     },
-    afterAggregate: async function(){
-        const { spaceId } = this;
-        let lng = Steedos.locale(this.userId, true)
-        let dataList = [{_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng)}];
-        if (!_.isEmpty(dataList)) {
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    this.data.values.push(doc);
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
-            }
-        }
-    },
     afterCount: async function(){
         delete this.query.fields;
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
@@ -74,7 +61,7 @@ module.exports = {
             if(this.id === 'default'){
                 try {
                     let lng = Steedos.locale(this.userId, true)
-                    this.data.values = {_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng)};
+                    this.data.values = {_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD};
                 } catch (error) {
                     
                 }
@@ -82,7 +69,7 @@ module.exports = {
             if(this.id === 'meteor'){
                 try {
                     let lng = Steedos.locale(this.userId, true)
-                    this.data.values = {_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng)};
+                    this.data.values = {_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD};
                 } catch (error) {
                     
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.0-beta.19",
+    "version": "2.5.0-beta.20",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "99f85803376a6096f0262ff47689572818bf655b"
+    "gitHead": "830af95dcc46ba3ac1abf237943d23e627feabaf"
 }