@things-factory/lite-menu 5.0.0-alpha.5 → 5.0.0-alpha.52

package/client/actions/lite-menu.js

@@ -81,15 +81,18 @@ export function updateMenuTemplate(template) {
 }
 
 export async function fetchAddonMenus() {
+  var applicationName = document.querySelector('meta[name="application-name"]')?.content
+
   var liteMenus = (
     await client.query({
       query: gql`
-        {
-          liteMenus {
+        query ($filters: [Filter!]) {
+          liteMenus: liteMenus(filters: $filters) {
             items {
               id
               name
               description
+              appName
               parent
               rank
               active
@@ -100,12 +103,26 @@ export async function fetchAddonMenus() {
             total
           }
         }
-      `
+      `,
+      variables: {
+        filters: [
+          {
+            name: 'active',
+            operator: 'eq',
+            value: true
+          },
+          {
+            name: 'appName',
+            operator: 'in',
+            value: ['', applicationName]
+          }
+        ]
+      }
     })
   ).data.liteMenus.items
 
   store.dispatch({
     type: UPDATE_ADDON_MENUS,
-    addon: liteMenus
+    addon: liteMenus.filter(menu => !menu.appName || menu.appName === applicationName)
   })
 }

package/client/pages/addon-menu-setting.js

@@ -16,6 +16,10 @@ import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
+import { fetchAddonMenus } from '../actions/lite-menu'
+
+const applicationName = document.querySelector('meta[name="application-name"]')?.content
+
 class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
@@ -132,10 +136,11 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
 
     await Promise.all(
       modifiedList.map(async record => {
-        var originalName = record.__origin__.name
+        var id = record.__origin__.id
         var patch = {
           name: record.name,
           description: record.description,
+          appName: record.appName,
           parent: record.parent,
           rank: record.rank,
           active: record.active,
@@ -153,15 +158,15 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
 
         return await client.mutate({
           mutation: gql`
-            mutation ($name: String!, $patch: LiteMenuPatch!) {
-              updateLiteMenu(name: $name, patch: $patch) {
+            mutation ($id: String!, $patch: LiteMenuPatch!) {
+              updateLiteMenu(id: $id, patch: $patch) {
                 id
                 name
               }
             }
           `,
           variables: {
-            name: originalName,
+            id,
             patch: patch
           }
         })
@@ -173,6 +178,7 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
         var liteMenu = {
           name: record.name,
           description: record.description,
+          appName: record.appName,
           parent: record.parent,
           rank: record.rank,
           active: record.active,
@@ -198,6 +204,7 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
     )
 
     grist.fetch()
+    fetchAddonMenus() /* update menu-system */
   }
 
   onReload() {
@@ -211,22 +218,23 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
 
     await Promise.all(
       deletedList.map(async record => {
-        var name = record.name
+        var id = record.id
 
         return await client.mutate({
           mutation: gql`
-            mutation ($name: String!) {
-              deleteLiteMenu(name: $name)
+            mutation ($id: String!) {
+              deleteLiteMenu(id: $id)
             }
           `,
           variables: {
-            name
+            id
           }
         })
       })
     )
 
     grist.fetch()
+    fetchAddonMenus() /* update menu-system */
   }
 
   async pageInitialized() {
@@ -277,6 +285,23 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
           filter: 'search',
           width: 200
         },
+        {
+          type: 'select',
+          name: 'appName',
+          header: i18next.t('field.app-name'),
+          label: true,
+          record: {
+            align: 'left',
+            editable: true,
+            options: ['', applicationName]
+          },
+          filter: {
+            options: ['', applicationName],
+            multiple: false,
+            operator: 'eq'
+          },
+          width: 200
+        },
         {
           type: 'select',
           name: 'parent',
@@ -421,6 +446,7 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
                 id
                 name
                 description
+                appName
                 parent
                 rank
                 type
@@ -449,18 +475,20 @@ class AddonMenuSetting extends connect(store)(localize(i18next)(PageView)) {
           }
         `,
         variables: {
-          filters,
+          filters: [
+            ...filters,
+            {
+              name: 'appName',
+              operator: 'in',
+              value: ['', applicationName]
+            }
+          ],
           pagination: { page, limit },
           sortings
         }
       })
     ).data.responses
 
-    store.dispatch({
-      type: 'UPDATE_ADDON_MENUS',
-      addon: response.items
-    })
-
     return {
       records: response.items,
       total: response.total

package/dist-server/service/lite-menu/lite-menu-mutation.js

@@ -22,17 +22,17 @@ let LiteMenuMutation = class LiteMenuMutation {
         const { domain, user } = context.state;
         return await (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu).save(Object.assign({ domain, creator: user, updater: user }, liteMenu));
     }
-    async updateLiteMenu(name, patch, context) {
+    async updateLiteMenu(id, patch, context) {
         const { domain, user } = context.state;
         const repository = (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu);
         const liteMenu = await repository.findOne({
-            where: { domain, name }
+            where: { domain, id }
         });
         return await repository.save(Object.assign(Object.assign(Object.assign({ domain, creater: user }, liteMenu), patch), { updater: user }));
     }
-    async deleteLiteMenu(name, context) {
+    async deleteLiteMenu(id, context) {
         const { domain } = context.state;
-        await (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu).delete({ domain, name });
+        await (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu).delete({ domain, id });
         return true;
     }
 };
@@ -46,7 +46,7 @@ __decorate([
 ], LiteMenuMutation.prototype, "createLiteMenu", null);
 __decorate([
     (0, type_graphql_1.Mutation)(returns => lite_menu_1.LiteMenu, { description: 'To modify LiteMenu information' }),
-    __param(0, (0, type_graphql_1.Arg)('name')),
+    __param(0, (0, type_graphql_1.Arg)('id')),
     __param(1, (0, type_graphql_1.Arg)('patch')),
     __param(2, (0, type_graphql_1.Ctx)()),
     __metadata("design:type", Function),
@@ -55,7 +55,7 @@ __decorate([
 ], LiteMenuMutation.prototype, "updateLiteMenu", null);
 __decorate([
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete LiteMenu' }),
-    __param(0, (0, type_graphql_1.Arg)('name')),
+    __param(0, (0, type_graphql_1.Arg)('id')),
     __param(1, (0, type_graphql_1.Ctx)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),

package/dist-server/service/lite-menu/lite-menu-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"lite-menu-mutation.js","sourceRoot":"","sources":["../../../server/service/lite-menu/lite-menu-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA2C;AAC3C,2CAAsC;AACtC,qDAA6D;AAG7D,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAE3B,KAAK,CAAC,cAAc,CAAkB,QAAqB,EAAS,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,OAAO,MAAM,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAC,IAAI,iBACvC,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACV,QAAQ,EACX,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,cAAc,CACL,IAAY,EACX,KAAoB,EAC3B,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAA;QAC1C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,6CAC1B,MAAM,EACN,OAAO,EAAE,IAAI,IACV,QAAQ,GACR,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,cAAc,CAAc,IAAY,EAAS,OAAY;QACjE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACtD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;AAxCC;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAQ,EAAE,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;IACnD,WAAA,IAAA,kBAAG,EAAC,UAAU,CAAC,CAAA;IAAyB,WAAA,IAAA,kBAAG,GAAE,CAAA;;qCAAnB,4BAAW;;sDAS1D;AAGD;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAQ,EAAE,EAAE,WAAW,EAAE,gCAAgC,EAAE,CAAC;IAE9E,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IACX,WAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IACZ,WAAA,IAAA,kBAAG,GAAE,CAAA;;6CADe,8BAAa;;sDAiBnC;AAGD;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC9C,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;sDAKrD;AAzCU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,oBAAQ,CAAC;GACN,gBAAgB,CA0C5B;AA1CY,4CAAgB"}
+{"version":3,"file":"lite-menu-mutation.js","sourceRoot":"","sources":["../../../server/service/lite-menu/lite-menu-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2D;AAC3D,qCAAuC;AAEvC,2CAAsC;AACtC,qDAA6D;AAG7D,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAE3B,KAAK,CAAC,cAAc,CAAkB,QAAqB,EAAS,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,OAAO,MAAM,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAC,IAAI,iBACvC,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACV,QAAQ,EACX,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,cAAc,CACP,EAAU,EACP,KAAoB,EAC3B,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAA;QAC1C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,6CAC1B,MAAM,EACN,OAAO,EAAE,IAAI,IACV,QAAQ,GACR,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,cAAc,CAAY,EAAU,EAAS,OAAY;QAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,IAAA,uBAAa,EAAC,oBAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;AAxCC;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAQ,EAAE,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;IACnD,WAAA,IAAA,kBAAG,EAAC,UAAU,CAAC,CAAA;IAAyB,WAAA,IAAA,kBAAG,GAAE,CAAA;;qCAAnB,4BAAW;;sDAS1D;AAGD;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAQ,EAAE,EAAE,WAAW,EAAE,gCAAgC,EAAE,CAAC;IAE9E,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IACT,WAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IACZ,WAAA,IAAA,kBAAG,GAAE,CAAA;;6CADe,8BAAa;;sDAiBnC;AAGD;IADC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC9C,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;sDAKjD;AAzCU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,oBAAQ,CAAC;GACN,gBAAgB,CA0C5B;AA1CY,4CAAgB"}

package/dist-server/service/lite-menu/lite-menu-query.js

@@ -16,27 +16,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteMenuQuery = void 0;
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
-const shell_1 = require("@things-factory/shell");
 const auth_base_1 = require("@things-factory/auth-base");
 const board_service_1 = require("@things-factory/board-service");
+const shell_1 = require("@things-factory/shell");
 const lite_menu_1 = require("./lite-menu");
 const lite_menu_type_1 = require("./lite-menu-type");
 let LiteMenuQuery = class LiteMenuQuery {
-    async liteMenu(name, context) {
+    async liteMenu(id, context) {
+        const { domain } = context.state;
         const repository = (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu);
         var liteMenu = repository.findOne({
-            where: { domain: context.state.domain, name, relations: ['domain', 'creator', 'updater'] }
+            where: { domain, id, relations: ['domain', 'creator', 'updater'] }
         });
         return liteMenu;
     }
     async liteMenus(params, context) {
-        const queryBuilder = (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu).createQueryBuilder();
-        (0, shell_1.buildQuery)(queryBuilder, params, context);
-        var [items, total] = await queryBuilder.leftJoinAndSelect('LiteMenu.domain', 'Domain').getManyAndCount();
+        const { domain } = context.state;
+        const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
+            repository: (0, typeorm_1.getRepository)(lite_menu_1.LiteMenu),
+            params,
+            domain,
+            searchables: ['name', 'description']
+        });
+        var [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
     async board(liteMenu) {
-        if (liteMenu.type == 'board' && liteMenu.value) {
+        if ((liteMenu.type === 'board' || liteMenu.type === 'interactive-board') && liteMenu.value) {
             return await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({ id: liteMenu.value });
         }
     }
@@ -52,7 +58,7 @@ let LiteMenuQuery = class LiteMenuQuery {
 };
 __decorate([
     (0, type_graphql_1.Query)(returns => lite_menu_1.LiteMenu, { description: 'To fetch a LiteMenu' }),
-    __param(0, (0, type_graphql_1.Arg)('name')),
+    __param(0, (0, type_graphql_1.Arg)('id')),
     __param(1, (0, type_graphql_1.Ctx)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),

package/dist-server/service/lite-menu/lite-menu-query.js.map

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

package/dist-server/service/lite-menu/lite-menu-type.js

@@ -22,6 +22,10 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], NewLiteMenu.prototype, "description", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], NewLiteMenu.prototype, "appName", void 0);
 __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
@@ -60,6 +64,10 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], LiteMenuPatch.prototype, "description", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], LiteMenuPatch.prototype, "appName", void 0);
 __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)

package/dist-server/service/lite-menu/lite-menu-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"lite-menu-type.js","sourceRoot":"","sources":["../../../server/service/lite-menu/lite-menu-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAsF;AAEtF,2CAAsC;AAGtC,IAAa,WAAW,GAAxB,MAAa,WAAW;CAwBvB,CAAA;AAtBC;IADC,IAAA,oBAAK,GAAE;;yCACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACX;AAGf;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC1B;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACV;AAvBL,WAAW;IADvB,IAAA,wBAAS,GAAE;GACC,WAAW,CAwBvB;AAxBY,kCAAW;AA2BxB,IAAa,aAAa,GAA1B,MAAa,aAAa;CAwBzB,CAAA;AAtBC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACd;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAGf;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1B;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAvBL,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAwBzB;AAxBY,sCAAa;AA2B1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}
+{"version":3,"file":"lite-menu-type.js","sourceRoot":"","sources":["../../../server/service/lite-menu/lite-menu-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgE;AAEhE,2CAAsC;AAGtC,IAAa,WAAW,GAAxB,MAAa,WAAW;CA2BvB,CAAA;AAzBC;IADC,IAAA,oBAAK,GAAE;;yCACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACX;AAGf;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC1B;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACV;AA1BL,WAAW;IADvB,IAAA,wBAAS,GAAE;GACC,WAAW,CA2BvB;AA3BY,kCAAW;AA8BxB,IAAa,aAAa,GAA1B,MAAa,aAAa;CA2BzB,CAAA;AAzBC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACd;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAGf;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1B;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AA1BL,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CA2BzB;AA3BY,sCAAa;AA8B1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}

package/dist-server/service/lite-menu/lite-menu.js

@@ -11,11 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteMenu = void 0;
-const typeorm_1 = require("typeorm");
 const type_graphql_1 = require("type-graphql");
-const shell_1 = require("@things-factory/shell");
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const board_service_1 = require("@things-factory/board-service");
+const shell_1 = require("@things-factory/shell");
 let LiteMenu = class LiteMenu {
 };
 __decorate([
@@ -44,6 +44,14 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], LiteMenu.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true,
+        default: ''
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], LiteMenu.prototype, "appName", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         nullable: true,
@@ -125,8 +133,10 @@ __decorate([
 ], LiteMenu.prototype, "updaterId", void 0);
 LiteMenu = __decorate([
     (0, typeorm_1.Entity)(),
-    (0, typeorm_1.Index)('ix_lite_menus_0', (liteMenu) => [liteMenu.domain, liteMenu.name], { unique: true }),
-    (0, typeorm_1.Index)('ix_lite_menus_1', (liteMenu) => [liteMenu.domain, liteMenu.parent, liteMenu.rank], { unique: true }),
+    (0, typeorm_1.Index)('ix_lite_menus_0', (liteMenu) => [liteMenu.domain, liteMenu.name, liteMenu.appName], { unique: true }),
+    (0, typeorm_1.Index)('ix_lite_menus_1', (liteMenu) => [liteMenu.domain, liteMenu.appName, liteMenu.parent, liteMenu.rank], {
+        unique: true
+    }),
     (0, type_graphql_1.ObjectType)({ description: 'Entity for LiteMenu' })
 ], LiteMenu);
 exports.LiteMenu = LiteMenu;

package/dist-server/service/lite-menu/lite-menu.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/lite-menu",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.52",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,23 +24,23 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/data-grist": "1.0.0-alpha.4",
-    "@operato/graphql": "1.0.0-alpha.4",
-    "@operato/i18n": "1.0.0-alpha.4",
-    "@operato/input": "1.0.0-alpha.4",
-    "@operato/layout": "1.0.0-alpha.4",
-    "@operato/popup": "1.0.0-alpha.4",
-    "@operato/shell": "1.0.0-alpha.4",
-    "@operato/styles": "1.0.0-alpha.4",
-    "@operato/utils": "1.0.0-alpha.4",
-    "@things-factory/apptool-base": "^5.0.0-alpha.5",
-    "@things-factory/auth-base": "^5.0.0-alpha.5",
-    "@things-factory/board-service": "^5.0.0-alpha.5",
-    "@things-factory/board-ui": "^5.0.0-alpha.5",
-    "@things-factory/grist-ui": "^5.0.0-alpha.5",
-    "@things-factory/more-base": "^5.0.0-alpha.5",
-    "@things-factory/setting-base": "^5.0.0-alpha.5",
-    "@things-factory/utils": "^5.0.0-alpha.5"
+    "@operato/data-grist": "1.0.0-beta.26",
+    "@operato/graphql": "1.0.0-beta.26",
+    "@operato/i18n": "1.0.0-beta.26",
+    "@operato/input": "1.0.0-beta.26",
+    "@operato/layout": "1.0.0-beta.26",
+    "@operato/popup": "1.0.0-beta.26",
+    "@operato/shell": "1.0.0-beta.26",
+    "@operato/styles": "1.0.0-beta.26",
+    "@operato/utils": "1.0.0-beta.26",
+    "@things-factory/apptool-base": "^5.0.0-alpha.52",
+    "@things-factory/auth-base": "^5.0.0-alpha.52",
+    "@things-factory/board-service": "^5.0.0-alpha.52",
+    "@things-factory/board-ui": "^5.0.0-alpha.52",
+    "@things-factory/grist-ui": "^5.0.0-alpha.52",
+    "@things-factory/more-base": "^5.0.0-alpha.52",
+    "@things-factory/setting-base": "^5.0.0-alpha.52",
+    "@things-factory/utils": "^5.0.0-alpha.52"
   },
-  "gitHead": "379449b7be7b3d8220f1cac9ab684b812117edfd"
+  "gitHead": "dd9c8f2e256e256e42bd9bd26db5eaa955f85620"
 }

package/server/service/lite-menu/lite-menu-mutation.ts

@@ -1,7 +1,8 @@
-import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
+import { getRepository } from 'typeorm'
+
 import { LiteMenu } from './lite-menu'
-import { NewLiteMenu, LiteMenuPatch } from './lite-menu-type'
+import { LiteMenuPatch, NewLiteMenu } from './lite-menu-type'
 
 @Resolver(LiteMenu)
 export class LiteMenuMutation {
@@ -19,7 +20,7 @@ export class LiteMenuMutation {
 
   @Mutation(returns => LiteMenu, { description: 'To modify LiteMenu information' })
   async updateLiteMenu(
-    @Arg('name') name: string,
+    @Arg('id') id: string,
     @Arg('patch') patch: LiteMenuPatch,
     @Ctx() context: any
   ): Promise<LiteMenu> {
@@ -27,7 +28,7 @@ export class LiteMenuMutation {
 
     const repository = getRepository(LiteMenu)
     const liteMenu = await repository.findOne({
-      where: { domain, name }
+      where: { domain, id }
     })
 
     return await repository.save({
@@ -40,10 +41,10 @@ export class LiteMenuMutation {
   }
 
   @Mutation(returns => Boolean, { description: 'To delete LiteMenu' })
-  async deleteLiteMenu(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
+  async deleteLiteMenu(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
     const { domain } = context.state
 
-    await getRepository(LiteMenu).delete({ domain, name })
+    await getRepository(LiteMenu).delete({ domain, id })
     return true
   }
 }

package/server/service/lite-menu/lite-menu-query.ts

@@ -1,19 +1,22 @@
-import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { getRepository } from 'typeorm'
-import { Domain, ListParam, buildQuery } from '@things-factory/shell'
+
 import { User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+
 import { LiteMenu } from './lite-menu'
 import { LiteMenuList } from './lite-menu-type'
 
 @Resolver(LiteMenu)
 export class LiteMenuQuery {
   @Query(returns => LiteMenu, { description: 'To fetch a LiteMenu' })
-  async liteMenu(@Arg('name') name: string, @Ctx() context: any): Promise<LiteMenu> {
+  async liteMenu(@Arg('id') id: string, @Ctx() context: any): Promise<LiteMenu> {
+    const { domain } = context.state
     const repository = getRepository(LiteMenu)
 
     var liteMenu: any = repository.findOne({
-      where: { domain: context.state.domain, name, relations: ['domain', 'creator', 'updater'] }
+      where: { domain, id, relations: ['domain', 'creator', 'updater'] }
     })
 
     return liteMenu
@@ -21,16 +24,22 @@ export class LiteMenuQuery {
 
   @Query(returns => LiteMenuList, { description: 'To fetch multiple LiteMenus' })
   async liteMenus(@Args() params: ListParam, @Ctx() context: any): Promise<LiteMenuList> {
-    const queryBuilder = getRepository(LiteMenu).createQueryBuilder()
-    buildQuery(queryBuilder, params, context)
-    var [items, total] = await queryBuilder.leftJoinAndSelect('LiteMenu.domain', 'Domain').getManyAndCount()
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(LiteMenu),
+      params,
+      domain,
+      searchables: ['name', 'description']
+    })
+    var [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }
 
   @FieldResolver(type => Board)
   async board(@Root() liteMenu: LiteMenu) {
-    if (liteMenu.type == 'board' && liteMenu.value) {
+    if ((liteMenu.type === 'board' || liteMenu.type === 'interactive-board') && liteMenu.value) {
       return await getRepository(Board).findOne({ id: liteMenu.value })
     }
   }

package/server/service/lite-menu/lite-menu-type.ts

@@ -1,4 +1,4 @@
-import { ObjectType, Field, InputType, Int, ID, registerEnumType } from 'type-graphql'
+import { Field, InputType, Int, ObjectType } from 'type-graphql'
 
 import { LiteMenu } from './lite-menu'
 
@@ -10,6 +10,9 @@ export class NewLiteMenu {
   @Field({ nullable: true })
   description?: string
 
+  @Field({ nullable: true })
+  appName?: string
+
   @Field({ nullable: true })
   parent?: string
 
@@ -37,6 +40,9 @@ export class LiteMenuPatch {
   @Field({ nullable: true })
   description?: string
 
+  @Field({ nullable: true })
+  appName?: string
+
   @Field({ nullable: true })
   parent?: string
 

package/server/service/lite-menu/lite-menu.ts

@@ -1,22 +1,24 @@
+import { Field, ID, Int, ObjectType } from 'type-graphql'
 import {
+  Column,
   CreateDateColumn,
-  UpdateDateColumn,
   Entity,
   Index,
-  Column,
-  RelationId,
   ManyToOne,
-  PrimaryGeneratedColumn
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
 } from 'typeorm'
-import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
-import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
+import { Domain } from '@things-factory/shell'
 
 @Entity()
-@Index('ix_lite_menus_0', (liteMenu: LiteMenu) => [liteMenu.domain, liteMenu.name], { unique: true })
-@Index('ix_lite_menus_1', (liteMenu: LiteMenu) => [liteMenu.domain, liteMenu.parent, liteMenu.rank], { unique: true })
+@Index('ix_lite_menus_0', (liteMenu: LiteMenu) => [liteMenu.domain, liteMenu.name, liteMenu.appName], { unique: true })
+@Index('ix_lite_menus_1', (liteMenu: LiteMenu) => [liteMenu.domain, liteMenu.appName, liteMenu.parent, liteMenu.rank], {
+  unique: true
+})
 @ObjectType({ description: 'Entity for LiteMenu' })
 export class LiteMenu {
   @PrimaryGeneratedColumn('uuid')
@@ -40,6 +42,13 @@ export class LiteMenu {
   @Field({ nullable: true })
   description?: string
 
+  @Column({
+    nullable: true,
+    default: ''
+  })
+  @Field({ nullable: true })
+  appName?: string
+
   @Column({
     nullable: true,
     default: ''

package/translations/en.json

@@ -2,7 +2,8 @@
   "button.delete": "delete",
   "button.reload": "reload",
   "button.save": "save",
+  "field.app-name": "app name",
   "field.parent-menu": "parent menu",
   "field.icon": "icon",
   "text.addon-menu management": "addon menu management"
-}
+}

package/translations/ko.json

@@ -2,7 +2,8 @@
   "button.delete": "삭제",
   "button.reload": "재조회",
   "button.save": "저장",
+  "field.app-name": "어플리케이션",
   "field.parent-menu": "부모메뉴",
   "field.icon": "이미지",
   "text.addon-menu management": "부가메뉴관리"
-}
+}

package/translations/ms.json

@@ -2,7 +2,8 @@
   "button.delete": "padam",
   "button.reload": "memuat semula",
   "button.save": "simpan",
+  "field.app-name": "[ms] app name",
   "field.parent-menu": "[ms] parent menu",
   "field.icon": "ikon",
   "text.addon-menu management": "pengurusan addon menu"
-}
+}

package/translations/zh.json

@@ -1,7 +1,9 @@
 {
   "button.delete": "删除",
+  "button.reload": "[zh] reload",
   "button.save": "储存",
+  "field.app-name": "[zh] app name",
   "field.parent-menu": "上级菜单",
   "field.icon": "图标",
   "text.addon-menu management": "附加菜单管理"
-}
+}