@things-factory/meta-ui 7.0.1-alpha.4 → 7.0.1-alpha.41

package/client/actions/main.js

@@ -1,5 +1,6 @@
+import '@material/web/icon/icon.js'
+
 import '../viewparts/dynamic-menu-part'
-import '@material/mwc-icon'
 
 import gql from 'graphql-tag'
 import { html } from 'lit'
@@ -17,13 +18,7 @@ export const UPDATE_META_MENU_TEMPLATE = 'UPDATE_META_MENU_TEMPLATE'
 var HAMBURGER
 
 export async function setupMenuPart(options) {
-  var {
-    hovering = isMobileDevice() ? true : false,
-    slotTemplate,
-    portraitSlotTemplate,
-    landscapeSlotTemplate,
-    position = VIEWPART_POSITION.NAVBAR
-  } = options || {}
+  var { hovering = isMobileDevice() ? true : false, slotTemplate, portraitSlotTemplate, landscapeSlotTemplate, position = VIEWPART_POSITION.NAVBAR } = options || {}
 
   const { hovering: hoveringSetting } = (await clientSettingStore.get('dynamic-menu'))?.value || {}
   if (hoveringSetting !== undefined) {
@@ -31,8 +26,7 @@ export async function setupMenuPart(options) {
   }
 
   const orientation = position == VIEWPART_POSITION.HEADERBAR ? 'landscape' : 'portrait'
-  const orientatedSlotTemplate =
-    (orientation == 'landscape' ? landscapeSlotTemplate : portraitSlotTemplate) || slotTemplate || html``
+  const orientatedSlotTemplate = (orientation == 'landscape' ? landscapeSlotTemplate : portraitSlotTemplate) || slotTemplate || html``
 
   appendViewpart({
     name: 'dynamic-menu-part',
@@ -50,11 +44,13 @@ export async function setupMenuPart(options) {
       HAMBURGER = {
         name: 'hamburger',
         template: html`
-        <mwc-icon @click=${e=>
-          toggleOverlay('dynamic-menu-part', {
-            backdrop: true
-          })}
-        >view_headline</mwc-icon>
+          <md-icon
+            @click=${e =>
+              toggleOverlay('dynamic-menu-part', {
+                backdrop: true
+              })}
+            >view_headline</md-icon
+          >
         `,
         position: TOOL_POSITION.FRONT_END
       }
@@ -84,8 +80,7 @@ export async function updateMenuTemplate(template) {
     await client.query({
       query: gql`
         query ($filters: [Filter!], $sortings: [Sorting!]) {
-          liteMenus: liteMenus(filters: $filters
-              sortings: $sortings) {
+          liteMenus: myLiteMenus(filters: $filters, sortings: $sortings) {
             items {
               id
               name
@@ -115,10 +110,10 @@ export async function updateMenuTemplate(template) {
             value: ['', applicationName]
           }
         ],
-        sortings:[
+        sortings: [
           {
-              name: 'rank',
-              desc: false
+            name: 'rank',
+            desc: false
           }
         ]
       }

package/client/bootstrap.ts

@@ -1,15 +1,9 @@
+import '@material/web/icon/icon.js'
+
 import { html } from 'lit-html'
 
-import { auth } from '@things-factory/auth-base/dist-client/auth.js'
-import { ADD_MORENDA } from '@things-factory/more-base'
 import { navigate, store } from '@operato/shell'
-
-import { updateMenuTemplate } from './actions/main'
-import metaUI from './reducers/main'
-import { TermsUtil } from './utils/terms-util'
-import { GristDefaultValue } from './utils/grist-default-value'
-import { MENUS } from './dynamic-menus'
-
+import { i18next } from '@operato/i18n'
 import {
   registerEditor as gristColumnRegisterEditor,
   registerRenderer as gristColumnRegisterRenderer,
@@ -17,6 +11,14 @@ import {
 } from '@operato/data-grist'
 import { registerFilterRenderer as formRegisterFilterRenderer } from '@operato/form'
 
+import { auth } from '@things-factory/auth-base/dist-client'
+import { ADD_MORENDA } from '@things-factory/more-base/client'
+
+import { updateMenuTemplate } from './actions/main'
+import metaUI from './reducers/main'
+import { GristDefaultValue } from './utils/grist-default-value'
+import { MENUS } from './dynamic-menus'
+
 /** GRIST Renderer Compoment  */
 import { GristRendererMetaCodeSelector } from './component/grist/renderer/grist-renderer-meta-code-selector'
 import { GristRendererMetaObjectSelector } from './component/grist/renderer/grist-renderer-meta-object-selector'
@@ -41,7 +43,6 @@ import './pages/history/history-json-list-popup'
 
 import './pages/activity/meta-activity-writer-element'
 import './pages/activity/meta-activity-viewer-element'
-import { i18next } from '@operato/i18n'
 
 export default async function bootstrap(module) {
   // GRIST Renderer
@@ -69,23 +70,20 @@ export default async function bootstrap(module) {
     metaUI
   })
 
-  // 1. 용어 다운로드
-  var locale = i18next.language
-  if (locale == 'ko') {
-    locale = 'ko-KR'
-  }
-  await TermsUtil.downloadTerminologies(locale)
-
   auth.on('profile', async ({ credential, domains, domain }) => {
     // 2. 메뉴 정보를 서버로 부터 받아서 적용
     const menuRoutes = await MENUS
     updateMenuTemplate(menuRoutes.menus)
 
+    i18next.on('languageChanged', async () => {
+      updateMenuTemplate(menuRoutes.menus)
+    })
+
     // 3. 동적 메뉴 관리 화면 추가
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>auto_fix_high</mwc-icon>`,
+        icon: html`<md-icon>auto_fix_high</md-icon>`,
         name: html`<ox-i18n msgid="title.dynamic_menu"></ox-i18n>`,
         action: () => {
           navigate('dynamic-menu')
@@ -97,7 +95,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>filter_tilt_shift</mwc-icon>`,
+        icon: html`<md-icon>filter_tilt_shift</md-icon>`,
         name: html`<ox-i18n msgid="title.entity"></ox-i18n>`,
         action: () => {
           navigate('config-entity')
@@ -109,7 +107,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>speaker_notes</mwc-icon>`,
+        icon: html`<md-icon>speaker_notes</md-icon>`,
         name: html`<ox-i18n msgid="title.terminology"></ox-i18n>`,
         action: () => {
           navigate('config-terminology')
@@ -121,7 +119,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>code</mwc-icon>`,
+        icon: html`<md-icon>code</md-icon>`,
         name: html`<ox-i18n msgid="title.code_management"></ox-i18n>`,
         action: () => {
           navigate('codes')
@@ -133,7 +131,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>business_center</mwc-icon>`,
+        icon: html`<md-icon>business_center</md-icon>`,
         name: html`<ox-i18n msgid="title.meta_activity_list"></ox-i18n>`,
         action: () => {
           navigate('meta-activity-list')
@@ -144,7 +142,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>margin</mwc-icon>`,
+        icon: html`<md-icon>margin</md-icon>`,
         name: html`<ox-i18n msgid="title.meta_activity_define"></ox-i18n>`,
         action: () => {
           navigate('meta-activity-define')
@@ -155,7 +153,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html`<mwc-icon>work</mwc-icon>`,
+        icon: html`<md-icon>work</md-icon>`,
         name: html`<ox-i18n msgid="title.activity_list"></ox-i18n>`,
         action: () => {
           navigate('activity-list')
@@ -166,7 +164,7 @@ export default async function bootstrap(module) {
     store.dispatch({
       type: ADD_MORENDA,
       morenda: {
-        icon: html` <mwc-icon>dataset</mwc-icon> `,
+        icon: html` <md-icon>dataset</md-icon> `,
         name: html` <ox-i18n msgid="text.attribute management"></ox-i18n> `,
         action: () => {
           navigate('attributes')

package/client/component/filter/filter-form-meta-code-select.ts

@@ -0,0 +1,99 @@
+import '@material/web/icon/icon.js'
+import '../popup/meta-object-selector-popup'
+
+import { html } from 'lit-html'
+
+import { openPopup } from '@operato/layout'
+import { FilterSelectRenderer } from '@operato/form'
+import { TermsUtil } from './../../utils/terms-util'
+
+function openMetaCodeSelector(filter, value, confirmCallback) {
+  var template = html` <meta-object-selector-popup .value=${value} .options=${filter.options} .confirmCallback=${confirmCallback}> </meta-object-selector-popup> `
+
+  openPopup(template, {
+    backdrop: true,
+    size: 'large',
+    title: filter.options.selectorName ? TermsUtil.tMenu(filter.options.selectorName) : TermsUtil.tTitle('select_item')
+  })
+}
+
+export const FilterFormMetaCodeSelect: FilterSelectRenderer = (filter, value, owner) => {
+  const options = filter.options || {}
+  const codes = options.codes && options.codes.length > 0 ? options.codes : undefined
+  const { operator = 'eq' } = filter
+  const hiddenText = value ? value : ''
+
+  var text = value ? value : ''
+
+  if (options.dispField && value && codes) {
+    let dispCode = codes.filter(x => x.value == value)
+
+    if (dispCode && dispCode.length > 0) {
+      text = dispCode[0].display
+    }
+  }
+
+  return operator === 'eq'
+    ? html`
+        <input name='${filter.name}' .value=${hiddenText} type="text" hidden></input>
+        <input
+          type="text"
+          readonly
+          name='${filter.name}_disp'
+          .value=${text}
+          @click=${e => {
+            e.stopPropagation()
+
+            const input = e.target
+
+            const confirmCallback = selected => {
+              let code = selected ? selected[options.codeField] : ''
+              let disp = code
+
+              if (selected && options.dispField) {
+                let fields = options.dispField.split(',')
+                disp = selected[fields[0]]
+
+                if (fields.length > 1) {
+                  disp += `(${fields
+                    .splice(1)
+                    .map(field => {
+                      return selected[field]
+                    })
+                    .join(',')})`
+                }
+              }
+
+              input.value = disp
+
+              let codeInput =
+                owner.tagName.toLowerCase() == 'ox-grid-header'
+                  ? //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`[name="${filter.name}"]`)
+                  : //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`form [name="${filter.name}"]`)
+
+              codeInput.value = code
+
+              input.dispatchEvent(new Event('change', { bubbles: true }))
+
+              input.dispatchEvent(
+                new CustomEvent('filter-change', {
+                  bubbles: true,
+                  composed: true,
+                  detail: {
+                    name: filter.name,
+                    operator,
+                    value: code
+                  }
+                })
+              )
+            }
+
+            openMetaCodeSelector(filter, value, confirmCallback)
+          }}
+        />
+        <md-icon style="--md-icon-size: 18px;margin-left: -24px;">manage_search</md-icon>
+      `
+    : html``
+}

package/client/component/filter/filter-form-meta-object-select.ts

@@ -0,0 +1,104 @@
+import '@material/web/icon/icon.js'
+import '../popup/meta-object-selector-popup'
+
+import { html } from 'lit-html'
+
+import { openPopup } from '@operato/layout'
+import { FilterSelectRenderer } from '@operato/form'
+import { TermsUtil } from '../../utils/terms-util'
+
+function openMetaObjectSelector(filter, value, confirmCallback) {
+  var template = html` <meta-object-selector-popup .value=${value} .options=${filter.options} .confirmCallback=${confirmCallback}></meta-object-selector-popup> `
+
+  openPopup(template, {
+    backdrop: true,
+    size: 'large',
+    title: filter.options.selectorName ? TermsUtil.tMenu(filter.options.selectorName) : TermsUtil.tTitle('select_item')
+  })
+}
+
+export const FilterFormMetaObjectSelect: FilterSelectRenderer = (filter, value, owner) => {
+  const options = filter.options
+  const { operator = 'eq' } = filter
+  const hiddenText = value ? value.id : ''
+
+  var text = ''
+
+  if (value) {
+    let fields = options!.nameField.split(',')
+    text = value[fields[0]]
+
+    if (fields.length > 1) {
+      text += `(${fields
+        .splice(1)
+        .map(field => {
+          return value[field]
+        })
+        .join(',')})`
+    }
+  }
+
+  return operator === 'eq'
+    ? html`
+        <input name='${filter.name}' .value=${hiddenText} type="text" hidden></input>
+        <input
+          type="text"
+          readonly
+          name='${filter.name}_disp'
+          .value=${text}
+          @click=${e => {
+            e.stopPropagation()
+
+            const input = e.target
+
+            const confirmCallback = selected => {
+              let code = selected ? selected.id : ''
+              let disp = ''
+
+              if (selected) {
+                let fields = options!.nameField.split(',')
+                disp = selected[fields[0]]
+
+                if (fields.length > 1) {
+                  disp += `(${fields
+                    .splice(1)
+                    .map(field => {
+                      return selected[field]
+                    })
+                    .join(',')})`
+                }
+              }
+
+              input.value = disp
+
+              let codeInput =
+                owner.tagName.toLowerCase() == 'ox-grid-header'
+                  ? //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`[name="${filter.name}"]`)
+                  : //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`form [name="${filter.name}"]`)
+
+              codeInput.value = code
+
+              input.dispatchEvent(new Event('change', { bubbles: true }))
+
+              input.dispatchEvent(
+                new CustomEvent('filter-change', {
+                  bubbles: true,
+                  composed: true,
+                  detail: {
+                    name: filter.name,
+                    operator,
+                    value: code
+                  }
+                })
+              )
+            }
+
+            openMetaObjectSelector(filter, value, confirmCallback)
+          }}
+        />
+        <md-icon style="--md-icon-size: 18px;margin-left: -24px;">manage_search</md-icon>
+      `
+    : html``
+}

package/client/component/filter/filter-grist-meta-code-select.ts

@@ -0,0 +1,97 @@
+import '../popup/meta-object-selector-popup'
+
+import { html } from 'lit-html'
+
+import { openPopup } from '@operato/layout'
+import { FilterConfigObject, FilterSelectRenderer } from '@operato/data-grist'
+import { TermsUtil } from '../../utils/terms-util'
+
+function openMetaCodeSelector(column, value, confirmCallback) {
+  var template = html` <meta-object-selector-popup .value=${value} .options=${column.record.options} .confirmCallback=${confirmCallback}></meta-object-selector-popup> `
+
+  openPopup(template, {
+    backdrop: true,
+    size: 'large',
+    title: column.record.options.selectorName ? TermsUtil.tMenu(column.record.options.selectorName) : TermsUtil.tTitle('select_item')
+  })
+}
+
+export const FilterGristMetaCodeSelect: FilterSelectRenderer = (column, value, owner) => {
+  const filter = column.filter
+  const options = column.record.options
+  const codes = options.codes && options.codes.length > 0 ? options.codes : undefined
+  const { operator = 'eq' } = filter as FilterConfigObject
+  const hiddenText = value ? value : ''
+
+  var text = value ? value : ''
+
+  if (options.dispField && value && codes) {
+    let dispCode = codes.filter(x => x.value == value)
+
+    if (dispCode && dispCode.length > 0) {
+      text = dispCode[0].display
+    }
+  }
+
+  return operator === 'eq'
+    ? html`
+        <input name='${column.name}' .value=${hiddenText} type="text" hidden></input>
+        <input
+          type="text"
+          readonly
+          name='${column.name}_disp'
+          .value=${text}
+          @click=${e => {
+            e.stopPropagation()
+
+            const input = e.target
+
+            const confirmCallback = selected => {
+              let code = selected ? selected[options.codeField] : ''
+              let disp = code
+
+              if (selected && options.dispField) {
+                let fields = options.dispField.split(',')
+                disp = selected[fields[0]]
+
+                if (fields.length > 1) {
+                  disp += `(${fields
+                    .splice(1)
+                    .map(field => {
+                      return selected[field]
+                    })
+                    .join(',')})`
+                }
+              }
+
+              input.value = disp
+
+              let codeInput =
+                owner.tagName.toLowerCase() == 'ox-grid-header'
+                  ? //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`[name="${filter.name}"]`)
+                  : //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`form [name="${filter.name}"]`)
+              codeInput.value = code
+
+              input.dispatchEvent(new Event('change', { bubbles: true }))
+
+              input.dispatchEvent(
+                new CustomEvent('filter-change', {
+                  bubbles: true,
+                  composed: true,
+                  detail: {
+                    name: column.name,
+                    operator,
+                    value: code
+                  }
+                })
+              )
+            }
+
+            openMetaCodeSelector(column, value, confirmCallback)
+          }}
+        />
+      `
+    : html``
+}

package/client/component/filter/filter-grist-meta-object-select.ts

@@ -0,0 +1,102 @@
+import '../popup/meta-object-selector-popup'
+
+import { html } from 'lit-html'
+
+import { openPopup } from '@operato/layout'
+import { FilterConfigObject, FilterSelectRenderer } from '@operato/data-grist'
+import { TermsUtil } from '../../utils/terms-util'
+
+function openMetaObjectSelector(column, value, confirmCallback) {
+  var template = html` <meta-object-selector-popup .value=${value} .options=${column.record.options} .confirmCallback=${confirmCallback}></meta-object-selector-popup> `
+
+  openPopup(template, {
+    backdrop: true,
+    size: 'large',
+    title: column.record.options.selectorName ? TermsUtil.tMenu(column.record.options.selectorName) : TermsUtil.tTitle('select_item')
+  })
+}
+
+export const FilterGristMetaObjectSelect: FilterSelectRenderer = (column, value, owner) => {
+  const filter = column.filter
+  const { operator = 'eq' } = filter as FilterConfigObject
+  const options = column.record.options
+  const hiddenText = value ? value.id : ''
+
+  var text = ''
+
+  if (value) {
+    let fields = options.nameField.split(',')
+    text = value[fields[0]]
+
+    if (fields.length > 1) {
+      text += `(${fields
+        .splice(1)
+        .map(field => {
+          return value[field]
+        })
+        .join(',')})`
+    }
+  }
+
+  return operator === 'eq'
+    ? html`
+        <input name='${column.name}' .value=${hiddenText} type="text" hidden></input>
+        <input
+          type="text"
+          readonly
+          name='${column.name}_disp'
+          .value=${text}
+          @click=${e => {
+            e.stopPropagation()
+
+            const input = e.target
+
+            const confirmCallback = selected => {
+              let code = selected ? selected.id : ''
+              let disp = ''
+
+              if (selected) {
+                let fields = options.nameField.split(',')
+                disp = selected[fields[0]]
+
+                if (fields.length > 1) {
+                  disp += `(${fields
+                    .splice(1)
+                    .map(field => {
+                      return selected[field]
+                    })
+                    .join(',')})`
+                }
+              }
+
+              input.value = disp
+
+              let codeInput =
+                owner.tagName.toLowerCase() == 'ox-grid-header'
+                  ? //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`[name="${filter.name}"]`)
+                  : //@ts-ignore owner element를 전제하지 않는 방법이 필요할 것이다.
+                    owner.renderRoot.querySelector(`form [name="${filter.name}"]`)
+              codeInput.value = code
+
+              input.dispatchEvent(new Event('change', { bubbles: true }))
+
+              input.dispatchEvent(
+                new CustomEvent('filter-change', {
+                  bubbles: true,
+                  composed: true,
+                  detail: {
+                    name: column.name,
+                    operator,
+                    value: code
+                  }
+                })
+              )
+            }
+
+            openMetaObjectSelector(column, value, confirmCallback)
+          }}
+        />
+      `
+    : html``
+}

package/client/component/grist/renderer/grist-renderer-meta-object-selector.js

@@ -1,5 +1,5 @@
 /**
- * 그리드 Resource-column 타입 셀렉터 
+ * 그리드 Resource-column 타입 셀렉터
  * @auth yang
  */
 import { html } from 'lit'
@@ -7,28 +7,33 @@ import { html } from 'lit'
 import { detectOverflow } from '@operato/utils'
 
 function onmouseover(e) {
-  const element = e.target;
+  const element = e.target
   if (detectOverflow(element)) {
     element.setAttribute('data-tooltip', element.textContent)
   }
 }
 
 function onmouseout(e) {
-  const element = e.target;
-  element.removeAttribute('data-tooltip');
+  const element = e.target
+  element.removeAttribute('data-tooltip')
 }
 
 export const GristRendererMetaObjectSelector = (value, column, record, rowIndex, field) => {
+  let text = ''
 
-  let text = '';
-  if(value && column.record.options){
-    let fields = column.record.options.nameField.split(",");
-    text = value[fields[0]];
+  if (value && column.record.options?.nameField) {
+    let fields = column.record.options.nameField.split(',')
+    text = value[fields[0]]
 
-    if(fields.length > 1){
-      text+= `(${fields.splice(1).map(field => { return value[field]}).join(",")})` 
+    if (fields.length > 1) {
+      text += `(${fields
+        .splice(1)
+        .map(field => {
+          return value[field]
+        })
+        .join(',')})`
     }
-  } 
+  }
 
-  return html`<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${text}</span>`;
-}
+  return html`<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${text}</span>`
+}