@things-factory/meta-ui 7.0.1-alpha.65 → 7.0.1-alpha.67

package/client/pages/menu/dynamic-menu.js

@@ -27,15 +27,15 @@ class DynamicMenu extends localize(i18next)(PageView) {
       /**
        * @description 마스터 페이지 개인화 서비스 제공자
        ***************************
-        * @type {Object}
-        */
+       * @type {Object}
+       */
       masterPersonalConfigProvider: Object,
 
       /**
        * @description 디테일 페이지 개인화 서비스 제공자
        ***************************
-        * @type {Object}
-        */
+       * @type {Object}
+       */
       detailPersonalConfigProvider: Object
     }
   }
@@ -165,6 +165,12 @@ class DynamicMenu extends localize(i18next)(PageView) {
           name
           routing
         }
+        privilege {
+          privilege
+          category
+          owner
+          super
+        }
       `
 
       limit = 999999
@@ -207,6 +213,12 @@ class DynamicMenu extends localize(i18next)(PageView) {
       routing
       hiddenFlag
       iconPath
+      privilege {
+        privilege
+        category
+        owner
+        super
+      }
     `
     limit = 999999
     return await MetaApi.searchByPagination('dynamicMenus', filters, sorters, page, limit, selectFields)
@@ -248,10 +260,13 @@ class DynamicMenu extends localize(i18next)(PageView) {
    * 메뉴 Create / Update
    */
   async saveMenu() {
-    let patches = MetaApi.patchesForUpdateMultiple(this.detailGrist)
+    var patches = this.detailGrist.dirtyRecords
 
     if (ValueUtil.isNotEmpty(patches)) {
-      patches.forEach(patch => {
+      patches = patches.map(patch => {
+        const { creator, updater, createdAt, updatedAt, __dirty__, __dirtyfields__, __origin__, __seq__, __selected__, ...others } = patch
+
+        patch = others
         patch.menuType = patch.menuType || 'SCREEN'
 
         if (!patch.parentId) {
@@ -265,6 +280,10 @@ class DynamicMenu extends localize(i18next)(PageView) {
         if (patch.hiddenFlag === undefined || patch.hiddenFlag == null) {
           patch.hiddenFlag = false
         }
+
+        patch.cuFlag = __dirty__
+
+        return patch
       })
 
       let result = await MetaApi.updateMultiple('updateMultipleMenu', patches)
@@ -435,7 +454,18 @@ class DynamicMenu extends localize(i18next)(PageView) {
         MetaApi.getGristColumnConfig2('boolean', 'hiddenFlag', 'hidden', 'center', true, false, 55),
         MetaApi.getGristColumnConfig2('string', 'routing', 'routing', 'left', true, false, 135),
         MetaApi.getGristColumnConfig2('string', 'category', 'tag', 'left', true, false, 135),
-        MetaApi.getGristColumnConfig2('string', 'resourceUrl', 'page_location', 'left', true, false, 350)
+        MetaApi.getGristColumnConfig2('string', 'resourceUrl', 'page_location', 'left', true, false, 350),
+        {
+          type: 'privilege',
+          name: 'privilege',
+          label: true,
+          header: i18next.t('field.required privilege'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 200
+        }
       ]
     }
 
@@ -618,6 +648,17 @@ class DynamicMenu extends localize(i18next)(PageView) {
             }
           },
           width: 200
+        },
+        {
+          type: 'privilege',
+          name: 'privilege',
+          label: true,
+          header: i18next.t('field.required privilege'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 200
         }
         /*{
           type: 'meta-code-selector',

package/client/utils/meta-ui-util.js

@@ -1,6 +1,5 @@
 import '@material/web/icon/icon.js'
 import '@operato/data-grist/ox-record-creator.js'
-// import '@things-factory/personalization/dist-client/grid-preference-editor.js'
 
 import { css, html, render, nothing } from 'lit'
 
@@ -59,38 +58,6 @@ export class MetaUiUtil {
    * @returns {Object} 메뉴 메타 정보 (암호)
    */
   static async getMenuMetaData(menuRouting) {
-    // var response = await client.query({
-    //   query: gql`
-    //     query ($id: String) {
-    //       metaUITemplateIsOverLimit(id: $id)
-    //     }
-    //   `,
-    //   variables: { id: null}
-    // })
-
-    // if (response.errors) {
-    //   return undefined;
-    // }
-
-    // const response = await client.query({
-    //   query: gql`
-    //     query ($routing: String) {
-    //       menus(routing: $routing) {
-    //         id
-    //         template
-    //       }
-
-    //       myGridPersonalize(menuId: $menuId) {
-    //         id
-    //         template
-    //       }
-    //     }
-    //   `,
-    //   variables: {
-    //     routing: menuRouting
-    //   }
-    // })
-
     let filters = [{ name: 'routing', operator: 'eq', value: menuRouting }]
     let data = await ServiceUtil.searchByPagination('menus', filters, null, 0, 0, 'id,template')
     return data
@@ -940,32 +907,6 @@ export class MetaUiUtil {
       return columns
     }
 
-    // 개인 그리드 컬럼 설정 가져오기
-    // let personal = await MetaApi.getMyMenuGridPersnal(this.menuId)
-    // let { template = {} } = personal
-    // if (!template.master) {
-    //   // 설정이 없으면 그대로 리턴
-    //   return columns
-    // }
-
-    // let personCols = template.master
-    // // 개인 컬럼만 보이기
-    // columns = columns.map(x => {
-    //   // id는 제외
-    //   if (x.name == 'id') return x
-    //   x.hidden = !personCols.includes(x.name)
-    //   x.rank = personCols.indexOf(x.name)
-    //   if (x.rank == -1) {
-    //     x.rank = 99999
-    //   }
-    //   return x
-    // })
-
-    // // 개인 컬럼 순서 정렬
-    // columns.sort((a, b) => {
-    //   return a.rank - b.rank
-    // })
-
     return columns
   }
 
@@ -2060,31 +2001,6 @@ export class MetaUiUtil {
     ]
   }
 
-  /**
-   * @description 그리스트 개인화 스타일 리턴
-   *************************************
-   * @returns {Array} 그리스트 개인화 스타일 css
-   */
-  // static getGristPersonalizedStyles() {
-  //   return [
-  //     css`
-  //       [slot='setting'] {
-  //         --md-icon-size: 14px;
-  //         width: 16px;
-  //         height: 16px;
-  //         background-color: rgba(var(--secondary-color-rgb), 0.6);
-  //         border-radius: 0px 0px 7px 7px;
-  //         color: var(--theme-white-color);
-  //         cursor: pointer;
-  //       }
-
-  //       [slot='setting']:hover {
-  //         color: var(--primary-color);
-  //       }
-  //     `
-  //   ]
-  // }
-
   /**
    * @description 기본 그리스트 스타일 리턴
    ************************************
@@ -2114,7 +2030,6 @@ export class MetaUiUtil {
       `,
       ...MetaUiUtil.getGristEmphasizedStyles(),
       ...MetaUiUtil.getCustomButtonContainerStyles()
-      // ...MetaUiUtil.getGristPersonalizedStyles()
     ]
   }
 
@@ -2186,7 +2101,6 @@ export class MetaUiUtil {
       `,
       ...MetaUiUtil.getGristEmphasizedStyles(),
       ...MetaUiUtil.getCustomButtonContainerStyles()
-      // ...MetaUiUtil.getGristPersonalizedStyles()
     ]
   }
 
@@ -2258,7 +2172,6 @@ export class MetaUiUtil {
       `,
       ...MetaUiUtil.getGristEmphasizedStyles(),
       ...MetaUiUtil.getCustomButtonContainerStyles()
-      // ...MetaUiUtil.getGristPersonalizedStyles()
     ]
   }
 
@@ -2330,7 +2243,6 @@ export class MetaUiUtil {
       `,
       ...MetaUiUtil.getGristEmphasizedStyles(),
       ...MetaUiUtil.getCustomButtonContainerStyles()
-      // ...MetaUiUtil.getGristPersonalizedStyles()
     ]
   }
 
@@ -2369,7 +2281,6 @@ export class MetaUiUtil {
       `,
       ...MetaUiUtil.getGristEmphasizedStyles(),
       ...MetaUiUtil.getCustomButtonContainerStyles()
-      // ...MetaUiUtil.getGristPersonalizedStyles()
     ]
   }
 
@@ -3339,42 +3250,6 @@ export class MetaUiUtil {
     `
   }
 
-  /**
-   * @description 그리드 컬럼 개인화 팝업 버튼을 그린다.
-   **********************************************
-   * @param {Object} pageView 페이지 뷰
-   * @return {HTMLElement} 그리드 컬럼 개인화 팝업 버튼 HTML
-   */
-  // static getGridColumnPersonalizeButton(pageView) {
-  //   if (pageView.gridMode != 'GRID') {
-  //     return html``
-  //   }
-
-  //   if (pageView.is_activity !== true) {
-  //     return html`
-  //       <md-icon
-  //         slot="setting"
-  //         @click=${e => {
-  //           const page = pageView.lifecycle?.page
-
-  //           if (page) {
-  //             let element = MetaApi.createCustomElement('grid-preference-editor', 'grid-preference-editor')
-  //             element.target = e.currentTarget.closest('ox-grist')
-  //             element.page = page
-
-  //             MetaApi.openPopupByElement(TermsUtil.tTitle('grid-column-personalize'), 'midium', element, false)
-  //           } else {
-  //             console.error('page is not found.')
-  //           }
-  //         }}
-  //         >settings</md-icon
-  //       >
-  //     `
-  //   } else {
-  //     return html``
-  //   }
-  // }
-
   /**
    * @description 그리드 보기 옵션 버튼을 그린다.
    ****************************************

package/client/utils/service-util.js

@@ -188,33 +188,6 @@ export class ServiceUtil {
     return menuItems != null ? ServiceUtil.arrangeMenuRoutes(menuItems) : null
   }
 
-  /**
-   * @description 현재 사용자, 메뉴에 해당 하는 그리드 개인화 정보 조회
-   **********************************************************
-   * @returns {Object} 그리드 개인화 오브젝트
-   */
-  // static async getMyMenuGridPersnal(menuId) {
-  //   try {
-  //     const response = await client.query({
-  //       query: gql`
-  //         query myGridPersonalize($menuId: String!) {
-  //           myGridPersonalize(menuId: $menuId) {
-  //             id
-  //             template
-  //           }
-  //         }
-  //       `,
-  //       variables: {
-  //         menuId
-  //       }
-  //     })
-
-  //     return response.data.myGridPersonalize
-  //   } catch (e) {
-  //     ServiceUtil.showGraphqlException(e)
-  //   }
-  // }
-
   /**
    * @description 메뉴 틀에 맞게 재 배치
    **************************************
@@ -363,51 +336,61 @@ export class ServiceUtil {
    * @returns {Array} 메뉴 바에 표시될 메뉴 리스트
    */
   static async searchMyDynamicMenus() {
-    let filters = [
-      {
-        name: 'hiddenFlag',
-        operator: 'noteq',
-        value: true
-      },
-      {
-        // name: 'menuType', operator: 'in', value: ['HOME', 'MENU', 'GROUP', 'SCREEN', 'HIDDEN-PAGE']
-        name: 'menuType',
-        operator: 'in',
-        value: ['HOME', 'MENU', 'GROUP']
-      }
-    ]
-    // let sortings = [{ name: 'menuType' }, { name: 'rank' }];
-    let sortings = [{ name: 'rank' }]
-    let selectFields = `
-      id
-      parent {
-        id
-        name
-      }
-      children{
-        id
-        name
-        description
-        menuType
-        category
-        routingType
-        routing
-        resourceUrl
-        iconPath
-        hiddenFlag
-        rank
+    const response = await client.query({
+      query: gql`
+        query MyMenus($sortings: [Sorting!], $filters: [Filter!]) {
+          myMenus(sortings: $sortings, filters: $filters) {
+            items {
+              id
+              parent {
+                id
+                name
+              }
+              children(permittedOnly: true) {
+                id
+                name
+                description
+                menuType
+                category
+                routingType
+                routing
+                resourceUrl
+                iconPath
+                hiddenFlag
+                rank
+              }
+              name
+              description
+              menuType
+              category
+              routingType
+              routing
+              resourceUrl
+              iconPath
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters: [
+          {
+            name: 'hiddenFlag',
+            operator: 'noteq',
+            value: true
+          },
+          {
+            // name: 'menuType', operator: 'in', value: ['HOME', 'MENU', 'GROUP', 'SCREEN', 'HIDDEN-PAGE']
+            name: 'menuType',
+            operator: 'in',
+            value: ['HOME', 'MENU', 'GROUP']
+          }
+        ],
+        sortings: [{ name: 'rank' }]
       }
-      name
-      description
-      menuType
-      category
-      routingType
-      routing
-      resourceUrl
-      iconPath
-    `
-    let data = await ServiceUtil.searchByPagination('menus', filters, sortings, 0, 0, selectFields)
-    return data ? data.records : []
+    })
+
+    return response.data?.myMenus.items || []
   }
 
   /**

package/dist-client/pages/menu/dynamic-menu.js

@@ -1,3 +1,4 @@
+import { __rest } from "tslib";
 import '@material/web/icon/icon.js';
 import '@things-factory/form-ui';
 import { html } from 'lit';
@@ -21,14 +22,14 @@ class DynamicMenu extends localize(i18next)(PageView) {
             /**
              * @description 마스터 페이지 개인화 서비스 제공자
              ***************************
-              * @type {Object}
-              */
+             * @type {Object}
+             */
             masterPersonalConfigProvider: Object,
             /**
              * @description 디테일 페이지 개인화 서비스 제공자
              ***************************
-              * @type {Object}
-              */
+             * @type {Object}
+             */
             detailPersonalConfigProvider: Object
         };
     }
@@ -150,6 +151,12 @@ class DynamicMenu extends localize(i18next)(PageView) {
           name
           routing
         }
+        privilege {
+          privilege
+          category
+          owner
+          super
+        }
       `;
             limit = 999999;
             let fetchResult = await MetaApi.searchByPagination('dynamicMenus', filters, sorters, page, limit, selectFields);
@@ -185,6 +192,12 @@ class DynamicMenu extends localize(i18next)(PageView) {
       routing
       hiddenFlag
       iconPath
+      privilege {
+        privilege
+        category
+        owner
+        super
+      }
     `;
         limit = 999999;
         return await MetaApi.searchByPagination('dynamicMenus', filters, sorters, page, limit, selectFields);
@@ -220,9 +233,11 @@ class DynamicMenu extends localize(i18next)(PageView) {
      * 메뉴 Create / Update
      */
     async saveMenu() {
-        let patches = MetaApi.patchesForUpdateMultiple(this.detailGrist);
+        var patches = this.detailGrist.dirtyRecords;
         if (ValueUtil.isNotEmpty(patches)) {
-            patches.forEach(patch => {
+            patches = patches.map(patch => {
+                const { creator, updater, createdAt, updatedAt, __dirty__, __dirtyfields__, __origin__, __seq__, __selected__ } = patch, others = __rest(patch, ["creator", "updater", "createdAt", "updatedAt", "__dirty__", "__dirtyfields__", "__origin__", "__seq__", "__selected__"]);
+                patch = others;
                 patch.menuType = patch.menuType || 'SCREEN';
                 if (!patch.parentId) {
                     patch.parent = { id: this.menuGroupId };
@@ -234,6 +249,8 @@ class DynamicMenu extends localize(i18next)(PageView) {
                 if (patch.hiddenFlag === undefined || patch.hiddenFlag == null) {
                     patch.hiddenFlag = false;
                 }
+                patch.cuFlag = __dirty__;
+                return patch;
             });
             let result = await MetaApi.updateMultiple('updateMultipleMenu', patches);
             if (result) {
@@ -380,7 +397,18 @@ class DynamicMenu extends localize(i18next)(PageView) {
                 MetaApi.getGristColumnConfig2('boolean', 'hiddenFlag', 'hidden', 'center', true, false, 55),
                 MetaApi.getGristColumnConfig2('string', 'routing', 'routing', 'left', true, false, 135),
                 MetaApi.getGristColumnConfig2('string', 'category', 'tag', 'left', true, false, 135),
-                MetaApi.getGristColumnConfig2('string', 'resourceUrl', 'page_location', 'left', true, false, 350)
+                MetaApi.getGristColumnConfig2('string', 'resourceUrl', 'page_location', 'left', true, false, 350),
+                {
+                    type: 'privilege',
+                    name: 'privilege',
+                    label: true,
+                    header: i18next.t('field.required privilege'),
+                    record: {
+                        editable: true
+                    },
+                    sortable: true,
+                    width: 200
+                }
             ]
         };
         // 메뉴 그리드 설정
@@ -546,6 +574,17 @@ class DynamicMenu extends localize(i18next)(PageView) {
                         }
                     },
                     width: 200
+                },
+                {
+                    type: 'privilege',
+                    name: 'privilege',
+                    label: true,
+                    header: i18next.t('field.required privilege'),
+                    record: {
+                        editable: true
+                    },
+                    sortable: true,
+                    width: 200
                 }
                 /*{
                   type: 'meta-code-selector',