@things-factory/menu-base 8.0.15 → 8.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/menu-base",
-  "version": "8.0.15",
+  "version": "8.0.20",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,7 +24,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^8.0.15"
+    "@things-factory/auth-base": "^8.0.20"
   },
-  "gitHead": "214b341ededb4ecb5ef4401149d53899fe67af44"
+  "gitHead": "3f31152761b26593e0fc3223eeb86fc78e721824"
 }

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

@@ -92,20 +92,27 @@ export class MenuQuery {
       .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
       .map(role => role.id)
 
-    const [items, total] = await getQueryBuilderFromListParams({
+    const queryBuilder = getQueryBuilderFromListParams({
       repository: getRepository(Menu),
       params,
       domain,
       alias: 'menu',
       searchables: ['name', 'description']
     })
-      .andWhere(
-        new Brackets(qb => {
-          qb.where('menu.role IN (:...roles)').orWhere('menu.role is null')
-        })
-      )
-      .setParameter('roles', roles)
-      .getManyAndCount()
+
+    if (roles.length > 0) {
+      queryBuilder
+        .andWhere(
+          new Brackets(qb => {
+            qb.where('menu.role IN (:...roles)').orWhere('menu.role is null')
+          })
+        )
+        .setParameter('roles', roles)
+    } else {
+      queryBuilder.andWhere('menu.role is null')
+    }
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }