npm - @steedos/service-metadata-apps - Versions diffs - 2.6.1-beta.7 → 2.6.2-beta.2 - Mend

@steedos/service-metadata-apps 2.6.1-beta.7 → 2.6.2-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/actionsHandler.js CHANGED Viewed

@@ -6,7 +6,6 @@ const _1 = require(".");
 const _ = require("lodash");
 const i18n_1 = require("@steedos/i18n");
 const objectql_1 = require("@steedos/objectql");
-const cachers = require('@steedos/cachers');
 function cacherKey(appApiName) {
     return `$steedos.#${_1.METADATA_TYPE}.${appApiName}`;
 }
@@ -85,8 +84,7 @@ function getAllApps(ctx) {
 }
 function getAllTabs(ctx) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const cache = cachers.getCacher('tabs');
-        return cache.values();
+        return yield ctx.broker.call('tabs.getAll');
     });
 }
 function getContext(ctx) {
@@ -101,8 +99,7 @@ function getContext(ctx) {
 }
 function getTab(ctx, tabApiName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const cache = cachers.getCacher('tabs');
-        const metadataConfig = cache.get(tabApiName);
+        const metadataConfig = yield ctx.broker.call('tabs.get', { tabApiName });
         return metadataConfig === null || metadataConfig === void 0 ? void 0 : metadataConfig.metadata;
     });
 }
@@ -159,27 +156,30 @@ function getHiddenTabNames(ctx) {
 function getPermissionTabs(ctx, userSession) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { roles, spaceId } = userSession;
-        const pattern = `[${roles.join('/')}]*`;
-        const filterResult = yield ctx.broker.call('permission_tabs.filter', {
-            pattern: pattern,
-        }, {
-            user: { spaceId: spaceId }
-        });
         const permissionTabs = [];
-        for (const ptConfig of filterResult) {
-            if (!_.has(ptConfig.metadata, 'space') || ptConfig.metadata.space === spaceId) {
-                permissionTabs.push(ptConfig.metadata);
+        for (const role of roles) {
+            const pattern = `${role}_*`;
+            const filterResult = yield ctx.broker.call('permission_tabs.filter', {
+                pattern: pattern,
+            }, {
+                user: { spaceId: spaceId }
+            });
+            for (const ptConfig of filterResult) {
+                if (ptConfig.metadata.permission_set === role && (!_.has(ptConfig.metadata, 'space') || ptConfig.metadata.space === spaceId)) {
+                    permissionTabs.push(ptConfig.metadata);
+                }
             }
         }
         return permissionTabs;
     });
 }
 function tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context, props = {}) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             const tab = yield getTab(ctx, tabApiName);
             if (props.group) {
-                props.group = _.find(menu.tab_groups, { id: props.group }).group_name;
+                props.group = ((_a = _.find(menu.tab_groups, { id: props.group })) === null || _a === void 0 ? void 0 : _a.group_name) || props.group;
             }
             if (tab) {
                 const isMobileChecked = checkTabMobile(tab, mobile);
@@ -214,6 +214,10 @@ function tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context,
                         if (tab.is_new_window) {
                             urlMenu.target = '_blank';
                         }
+                        else if (tab.is_use_iframe) {
+                            urlMenu.is_use_iframe = true;
+                            urlMenu.path = `${appPath}/tab_iframe/${tab.name}/?url=${tab.url}`;
+                        }
                         menu.children.push(urlMenu);
                     }
                     if (tab.type === 'page') {
@@ -273,63 +277,61 @@ function transformAppToMenus(ctx, app, mobile, userSession, context) {
             isExternalUrl: !!app.url,
             tab_groups: app.tab_groups
         };
-        if (app.enable_nav_schema && app.nav_schema) {
+        if (app.enable_nav_schema && app.nav_schema && !mobile) {
             menu.nav_schema = _.isString(app.nav_schema) ? JSON.parse(app.nav_schema) : app.nav_schema;
         }
-        else {
-            const hiddenTabNames = context.hiddenTabNames || [];
-            if (app.tab_items) {
-                if (_.isArray(app.tab_items)) {
-                    for (const item of app.tab_items) {
-                        try {
-                            if (hiddenTabNames.includes(item.tab_name))
-                                continue;
-                            yield tabMenus(ctx, appPath, item.tab_name, menu, mobile, userSession, context, item);
-                        }
-                        catch (error) {
-                            ctx.broker.logger.info(error.message);
-                        }
+        const hiddenTabNames = context.hiddenTabNames || [];
+        if (app.tab_items) {
+            if (_.isArray(app.tab_items)) {
+                for (const item of app.tab_items) {
+                    try {
+                        if (hiddenTabNames.includes(item.tab_name))
+                            continue;
+                        yield tabMenus(ctx, appPath, item.tab_name, menu, mobile, userSession, context, item);
                     }
-                }
-                else {
-                    for (const tabApiName in app.tab_items) {
-                        try {
-                            if (hiddenTabNames.includes(tabApiName))
-                                continue;
-                            const props = app.tab_items[tabApiName];
-                            yield tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context, props);
-                        }
-                        catch (error) {
-                            ctx.broker.logger.info(error.message);
-                        }
+                    catch (error) {
+                        ctx.broker.logger.info(error.message);
                     }
                 }
             }
-            else if (_.isArray(app.tabs)) {
-                for (const tabApiName of app.tabs) {
+            else {
+                for (const tabApiName in app.tab_items) {
                     try {
                         if (hiddenTabNames.includes(tabApiName))
                             continue;
-                        yield tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context);
+                        const props = app.tab_items[tabApiName];
+                        yield tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context, props);
                     }
                     catch (error) {
                         ctx.broker.logger.info(error.message);
                     }
                 }
             }
-            const objects = mobile ? app.mobile_objects : app.objects;
-            if (_.isArray(objects)) {
-                const getChildrenPromises = [];
-                for (const objectApiName of objects) {
-                    getChildrenPromises.push(getMenuChildren({
-                        objectApiName, userSession, ctx, appPath, app
-                    }));
+        }
+        else if (_.isArray(app.tabs)) {
+            for (const tabApiName of app.tabs) {
+                try {
+                    if (hiddenTabNames.includes(tabApiName))
+                        continue;
+                    yield tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context);
                 }
-                const children = yield Promise.all(getChildrenPromises);
-                for (const child of children) {
-                    if (child) {
-                        menu.children.push(child);
-                    }
+                catch (error) {
+                    ctx.broker.logger.info(error.message);
+                }
+            }
+        }
+        const objects = mobile ? app.mobile_objects : app.objects;
+        if (_.isArray(objects)) {
+            const getChildrenPromises = [];
+            for (const objectApiName of objects) {
+                getChildrenPromises.push(getMenuChildren({
+                    objectApiName, userSession, ctx, appPath, app
+                }));
+            }
+            const children = yield Promise.all(getChildrenPromises);
+            for (const child of children) {
+                if (child) {
+                    menu.children.push(child);
                 }
             }
         }
@@ -424,17 +426,6 @@ function getAppsMenus(ctx) {
                 menus.push(menu);
             }
         }
-        const setupApp = {
-            code: 'admin',
-            name: '设置',
-            icon_slds: 'settings',
-            description: '管理员设置公司、人员、权限等。',
-            children: [],
-            mobile: true,
-            is_creator: true,
-        };
-        const menu = yield transformAppToMenus(ctx, setupApp, mobile, userSession, context);
-        menus.push(menu);
         return menus;
     });
 }

package/lib/actionsHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"actionsHandler.js","sourceRoot":"","sources":["../src/actionsHandler.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"actionsHandler.js","sourceRoot":"","sources":["../src/actionsHandler.ts"],"names":[],"mappings":"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"}

package/lib/index.js CHANGED Viewed

@@ -25,7 +25,7 @@ function getServicesAppConfigs(ctx, appApiName) {
             metadataType,
             metadataApiName: appApiName
         }, { meta: ctx.meta });
-        return _.map(configs, 'metadata');
+        return _.map(_.orderBy(configs, 'timestamp'), 'metadata');
     });
 }
 function refreshApp(ctx, appApiName) {

package/lib/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,4BAA4B;AACf,QAAA,aAAa,GAAG,MAAM,CAAC;AAEpC,SAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU;;QAClE,MAAM,YAAY,GAAG,qBAAa,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE;YACxE,WAAW;YACX,YAAY;YACZ,eAAe,EAAE,UAAU;SAC9B,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAC,CAAC,CAAA;QACpB,OAAO,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAC;IACpC,CAAC;CAAA;AARD,kDAQC;AAED,SAAe,qBAAqB,CAAC,GAAG,EAAE,UAAU;;QAChD,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,YAAY,GAAG,qBAAa,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAClE,WAAW;YACX,YAAY;YACZ,eAAe,EAAE,UAAU;SAC9B,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAC,CAAC,CAAA;QACpB,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;~~IACtC~~,CAAC;CAAA;AAED,SAAsB,UAAU,CAAC,GAAG,EAAE,UAAU;;QAC5C,IAAI,SAAS,GAAQ,EAAE,CAAC;QAExB,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAG,UAAU,CAAC,MAAM,IAAI,CAAC,EAAC;YACtB,OAAO,IAAI,CAAA;SACd;QAED,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAA;QAEnE,OAAO,SAAS,CAAC;IACrB,CAAC;CAAA;AAZD,gCAYC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,4BAA4B;AACf,QAAA,aAAa,GAAG,MAAM,CAAC;AAEpC,SAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU;;QAClE,MAAM,YAAY,GAAG,qBAAa,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE;YACxE,WAAW;YACX,YAAY;YACZ,eAAe,EAAE,UAAU;SAC9B,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAC,CAAC,CAAA;QACpB,OAAO,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAC;IACpC,CAAC;CAAA;AARD,kDAQC;AAED,SAAe,qBAAqB,CAAC,GAAG,EAAE,UAAU;;QAChD,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,YAAY,GAAG,qBAAa,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAClE,WAAW;YACX,YAAY;YACZ,eAAe,EAAE,UAAU;SAC9B,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAC,CAAC,CAAA;QACpB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;CAAA;AAED,SAAsB,UAAU,CAAC,GAAG,EAAE,UAAU;;QAC5C,IAAI,SAAS,GAAQ,EAAE,CAAC;QAExB,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAG,UAAU,CAAC,MAAM,IAAI,CAAC,EAAC;YACtB,OAAO,IAAI,CAAA;SACd;QAED,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAA;QAEnE,OAAO,SAAS,CAAC;IACrB,CAAC;CAAA;AAZD,gCAYC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-metadata-apps",
-  "version": "2.6.1-beta.7",
+  "version": "2.6.2-beta.2",
   "description": "",
   "main": "lib/apps.service.js",
   "scripts": {
@@ -19,8 +19,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/i18n": "2.6.1-beta.7",
-    "@steedos/objectql": "2.6.1-beta.7",
+    "@steedos/i18n": "2.6.2-beta.2",
+    "@steedos/objectql": "2.6.2-beta.2",
     "dotenv-flow": "^3.1.0",
     "ioredis": "^4.22.0",
     "lodash": "^4.17.21",
@@ -34,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/src/actionsHandler.ts CHANGED Viewed

@@ -3,9 +3,6 @@ import _ = require("lodash");
 import { translationApp, translationObjectLabel, translationTabLabel } from '@steedos/i18n';
 import { getAssignedApps, getObject as _getObject, absoluteUrl } from "@steedos/objectql";
-const cachers = require('@steedos/cachers');
 function cacherKey(appApiName: string): string {
     return `$steedos.#${METADATA_TYPE}.${appApiName}`
 }
@@ -85,9 +82,7 @@ async function getAllApps(ctx: any) {
 // }
 async function getAllTabs(ctx: any) {
-    const cache = cachers.getCacher('tabs');
-    return cache.values();
-    // return await ctx.broker.call('tabs.getAll');
+    return await ctx.broker.call('tabs.getAll');
 }
 async function getContext(ctx: any) {
@@ -102,11 +97,7 @@ async function getContext(ctx: any) {
 }
 async function getTab(ctx: any, tabApiName: string) {
-    // const metadataConfig = await ctx.broker.call('tabs.get', { tabApiName });
-    // return metadataConfig?.metadata;
-    const cache = cachers.getCacher('tabs');
-    const metadataConfig = cache.get(tabApiName)
+    const metadataConfig = await ctx.broker.call('tabs.get', { tabApiName });
     return metadataConfig?.metadata;
 }
@@ -180,16 +171,18 @@ async function getHiddenTabNames(ctx) {
 async function getPermissionTabs(ctx, userSession): Promise<any[]>{
     const { roles, spaceId } = userSession
-    const pattern = `[${roles.join('/')}]*`
-    const filterResult = await ctx.broker.call('permission_tabs.filter', {
-        pattern: pattern,
-    }, {
-        user: { spaceId: spaceId }
-    });
     const permissionTabs = []
-    for (const ptConfig of filterResult) {
-        if (!_.has(ptConfig.metadata, 'space') || ptConfig.metadata.space === spaceId) {
-            permissionTabs.push(ptConfig.metadata)
+    for (const role of roles) {
+        const pattern = `${role}_*`
+        const filterResult = await ctx.broker.call('permission_tabs.filter', {
+            pattern: pattern,
+        }, {
+            user: { spaceId: spaceId }
+        });
+        for (const ptConfig of filterResult) {
+            if (ptConfig.metadata.permission_set === role && (!_.has(ptConfig.metadata, 'space') || ptConfig.metadata.space === spaceId)) {
+                permissionTabs.push(ptConfig.metadata)
+            }
         }
     }
     return permissionTabs
@@ -201,7 +194,7 @@ async function tabMenus(ctx: any, appPath, tabApiName, menu, mobile, userSession
         // const objectsConfigs = context.objects;
         const tab = await getTab(ctx, tabApiName);
         if(props.group){
-            props.group = _.find(menu.tab_groups, { id: props.group }).group_name;
+            props.group = _.find(menu.tab_groups, { id: props.group })?.group_name || props.group;
         }
         if (tab) {
             const isMobileChecked = checkTabMobile(tab, mobile)
@@ -262,6 +255,9 @@ async function tabMenus(ctx: any, appPath, tabApiName, menu, mobile, userSession
                     };
                     if (tab.is_new_window) {
                         urlMenu.target = '_blank'
+                    }else if(tab.is_use_iframe){
+                        urlMenu.is_use_iframe = true;
+                        urlMenu.path = `${appPath}/tab_iframe/${tab.name}/?url=${tab.url}`
                     }
                     menu.children.push(
                         urlMenu
@@ -330,56 +326,56 @@ async function transformAppToMenus(ctx, app, mobile, userSession, context) {
         isExternalUrl: !!app.url,
         tab_groups: app.tab_groups
     }
-    if(app.enable_nav_schema && app.nav_schema){
+    if(app.enable_nav_schema && app.nav_schema && !mobile){
         menu.nav_schema = _.isString(app.nav_schema) ? JSON.parse(app.nav_schema) : app.nav_schema
-    }else{
-        const hiddenTabNames = context.hiddenTabNames || []
-        if (app.tab_items) {
-            // app.tab_items is array
-            if (_.isArray(app.tab_items)) {
-                for (const item of app.tab_items) {
-                    try {
-                        if (hiddenTabNames.includes(item.tab_name)) continue;
-                        await tabMenus(ctx, appPath, item.tab_name, menu, mobile, userSession, context, item)
-                    } catch (error) {
-                        ctx.broker.logger.info(error.message);
-                    }
-                }
-            } else {
-                for (const tabApiName in app.tab_items) {
-                    try {
-                        if (hiddenTabNames.includes(tabApiName)) continue;
-                        const props = app.tab_items[tabApiName]
-                        await tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context, props)
-                    } catch (error) {
-                        ctx.broker.logger.info(error.message);
-                    }
+    }
+    const hiddenTabNames = context.hiddenTabNames || []
+    if (app.tab_items) {
+        // app.tab_items is array
+        if (_.isArray(app.tab_items)) {
+            for (const item of app.tab_items) {
+                try {
+                    if (hiddenTabNames.includes(item.tab_name)) continue;
+                    await tabMenus(ctx, appPath, item.tab_name, menu, mobile, userSession, context, item)
+                } catch (error) {
+                    ctx.broker.logger.info(error.message);
                 }
             }
-        } else if (_.isArray(app.tabs)) {
-            for (const tabApiName of app.tabs) {
+        } else {
+            for (const tabApiName in app.tab_items) {
                 try {
                     if (hiddenTabNames.includes(tabApiName)) continue;
-                    await tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context)
+                    const props = app.tab_items[tabApiName]
+                    await tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context, props)
                 } catch (error) {
                     ctx.broker.logger.info(error.message);
                 }
             }
         }
-        const objects = mobile ? app.mobile_objects : app.objects
-        // const objectsConfigs = context.objects;
-        if (_.isArray(objects)) {
-            const getChildrenPromises = []
-            for (const objectApiName of objects) {
-                getChildrenPromises.push(getMenuChildren({
-                    objectApiName, userSession, ctx, appPath, app
-                }))
+    } else if (_.isArray(app.tabs)) {
+        for (const tabApiName of app.tabs) {
+            try {
+                if (hiddenTabNames.includes(tabApiName)) continue;
+                await tabMenus(ctx, appPath, tabApiName, menu, mobile, userSession, context)
+            } catch (error) {
+                ctx.broker.logger.info(error.message);
             }
-            const children = await Promise.all(getChildrenPromises)
-            for (const child of children) {
-                if (child) {
-                    menu.children.push(child)
-                }
+        }
+    }
+    const objects = mobile ? app.mobile_objects : app.objects
+    // const objectsConfigs = context.objects;
+    if (_.isArray(objects)) {
+        const getChildrenPromises = []
+        for (const objectApiName of objects) {
+            getChildrenPromises.push(getMenuChildren({
+                objectApiName, userSession, ctx, appPath, app
+            }))
+        }
+        const children = await Promise.all(getChildrenPromises)
+        for (const child of children) {
+            if (child) {
+                menu.children.push(child)
             }
         }
     }
@@ -475,17 +471,17 @@ async function getAppsMenus(ctx) {
         }
     }
     // if (!mobile) {
-        const setupApp = {
-            code: 'admin',
-            name: '设置',
-            icon_slds: 'settings',
-            description: '管理员设置公司、人员、权限等。',
-            children: [],
-            mobile: true,
-            is_creator: true,
-        }
-        const menu = await transformAppToMenus(ctx, setupApp, mobile, userSession, context);
-        menus.push(menu);
+        // const setupApp = {
+        //     code: 'admin',
+        //     name: '设置',
+        //     icon_slds: 'settings',
+        //     description: '管理员设置公司、人员、权限等。',
+        //     children: [],
+        //     mobile: true,
+        //     is_creator: true,
+        // }
+        // const menu = await transformAppToMenus(ctx, setupApp, mobile, userSession, context);
+        // menus.push(menu);
     // }
     return menus;
 }

package/src/index.ts CHANGED Viewed

@@ -19,7 +19,7 @@ async function getServicesAppConfigs(ctx, appApiName) {
         metadataType,
         metadataApiName: appApiName
     }, {meta: ctx.meta})
-    return _.map(configs, 'metadata');
+    return _.map(_.orderBy(configs, 'timestamp'), 'metadata');
 }
 export async function refreshApp(ctx, appApiName) {