@things-factory/kpi 9.0.31 → 9.0.32

package/client/pages/kpi-dashboard/kpi-dashboard.ts

@@ -186,15 +186,15 @@ export class KpiDashboardPage extends PageView {
       minData[category] = Math.min(...values)
       maxData[category] = Math.max(...values)
       avgData[category] = values.reduce((a, b) => a + b, 0) / values.length
-      aData[category] = data.find(d => d.category === category && d.group === 'A')?.value ?? avgData[category]
+      aData[category] = data.find(d => d.category === category && d.org === 'A')?.value ?? avgData[category]
     })
-    // kpi-radar-chart가 기대하는 구조로 변환: [{group, category, value} ...]
+    // kpi-radar-chart가 기대하는 구조로 변환: [{org, category, value} ...]
     const result: any[] = []
     categories.forEach(category => {
-      result.push({ group: 'Min', category, value: minData[category] })
-      result.push({ group: 'Max', category, value: maxData[category] })
-      result.push({ group: 'Avg', category, value: avgData[category] })
-      result.push({ group: 'A', category, value: aData[category] })
+      result.push({ org: 'Min', category, value: minData[category] })
+      result.push({ org: 'Max', category, value: maxData[category] })
+      result.push({ org: 'Avg', category, value: avgData[category] })
+      result.push({ org: 'A', category, value: aData[category] })
     })
     return result
   }
@@ -221,9 +221,9 @@ export class KpiDashboardPage extends PageView {
       const q1 = sorted[Math.floor(sorted.length / 4)]
       const q3 = sorted[Math.floor((sorted.length * 3) / 4)]
       // value: A그룹의 실제값(강조)
-      const value = data.find(d => d.category === category && d.group === 'A')?.value ?? mean
+      const value = data.find(d => d.category === category && d.org === 'A')?.value ?? mean
       return {
-        group: category, // x축: 카테고리
+        org: category, // x축: 카테고리
         min,
         q1,
         median,
@@ -470,28 +470,26 @@ export class KpiDashboardPage extends PageView {
       const response = await client.query({
         query: gql`
           query {
-            kpiCategories {
-              items {
+            kpiCategories: kpisLevel1 {
+              id
+              name
+              kpis: children {
                 id
                 name
-                kpis {
-                  id
-                  name
-                  value {
-                    value
-                    valueDate
-                  }
-                  targetValue
-                  unit
-                  grades
-                  vizType
-                  vizMeta
-                  histories(limit: 1) {
-                    version
-                    updatedAt
-                    updater {
-                      name
-                    }
+                value {
+                  value
+                  valueDate
+                }
+                targetValue
+                unit
+                grades
+                vizType
+                vizMeta
+                histories(limit: 1) {
+                  version
+                  updatedAt
+                  updater {
+                    name
                   }
                 }
               }
@@ -508,7 +506,7 @@ export class KpiDashboardPage extends PageView {
           }
         `
       })
-      this.categories = response.data.kpiCategories.items || []
+      this.categories = response.data.kpiCategories || []
       this.alerts = response.data.kpiAlerts || []
     } catch (e) {
       this.error = 'KPI 카테고리 데이터를 불러오지 못했습니다.'
@@ -548,7 +546,7 @@ export class KpiDashboardPage extends PageView {
                   id
                   name
                   unit
-                  category {
+                  category: parent {
                     id
                     name
                   }

package/client/pages/kpi-history/kpi-history-list-page.ts

@@ -7,6 +7,7 @@ import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { PageView } from '@operato/shell'
 import { gql } from '@apollo/client'
+import { p13n } from '@operato/p13n'
 
 const KPI_HISTORY_LIST_QUERY = gql`
   query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -35,7 +36,7 @@ const KPI_HISTORY_LIST_QUERY = gql`
 `
 
 @customElement('kpi-history-list-page')
-export class KpiHistoryListPage extends localize(i18next)(PageView) {
+export class KpiHistoryListPage extends p13n(localize(i18next)(PageView)) {
   static styles = css`
     :host {
       display: flex;
@@ -61,7 +62,6 @@ export class KpiHistoryListPage extends localize(i18next)(PageView) {
         'version',
         'name',
         'description',
-        'category',
         'formula',
         'active',
         'state',
@@ -75,7 +75,6 @@ export class KpiHistoryListPage extends localize(i18next)(PageView) {
         'version',
         'name',
         'description',
-        'category',
         'formula',
         'active',
         'state',
@@ -98,13 +97,6 @@ export class KpiHistoryListPage extends localize(i18next)(PageView) {
       { type: 'number', name: 'version', header: '버전', record: { editable: false }, width: 80 },
       { type: 'string', name: 'name', header: '이름', record: { editable: false }, width: 150 },
       { type: 'string', name: 'description', header: '설명', record: { editable: false }, width: 200 },
-      {
-        type: 'string',
-        name: 'category',
-        header: '카테고리',
-        record: { editable: false, renderer: (v, c, r) => r.category?.name },
-        width: 120
-      },
       { type: 'formula', name: 'formula', header: '산식', record: { editable: false }, width: 200 },
       { type: 'checkbox', name: 'active', label: true, header: '활성', record: { editable: false }, width: 60 },
       { type: 'string', name: 'state', header: '상태', record: { editable: false }, width: 100 },
@@ -130,7 +122,15 @@ export class KpiHistoryListPage extends localize(i18next)(PageView) {
   @query('ox-grist') private grist!: DataGrist
 
   render() {
-    return html` <ox-grist .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}></ox-grist> `
+    return html`
+      <ox-grist
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')!}
+      >
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
+      </ox-grist>
+    `
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {

package/client/pages/kpi-metric/kpi-metric-list-page.ts

@@ -15,6 +15,7 @@ import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { OxPopup, OxPrompt } from '@operato/popup'
 import { isMobileDevice } from '@operato/utils'
+import { p13n } from '@operato/p13n'
 
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -22,7 +23,7 @@ import gql from 'graphql-tag'
 import { KpiMetricImporter } from './kpi-metric-importer'
 
 @customElement('kpi-metric-list-page')
-export class KpiMetricListPage extends connect(store)(localize(i18next)(ScopedElementsMixin(PageView))) {
+export class KpiMetricListPage extends connect(store)(p13n(localize(i18next)(ScopedElementsMixin(PageView)))) {
   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
@@ -100,7 +101,12 @@ export class KpiMetricListPage extends connect(store)(localize(i18next)(ScopedEl
     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')!}
+      >
         <div slot="headroom" class="header">
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -118,6 +124,8 @@ export class KpiMetricListPage extends connect(store)(localize(i18next)(ScopedEl
             </ox-record-creator>
           </div>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }

package/client/pages/kpi-metric-value/kpi-metric-value-editor-page.ts

@@ -209,7 +209,7 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
     `
   ]
 
-  @property({ type: String }) group: string = ''
+  @property({ type: String }) org: string = ''
   @property({ type: String }) startDate: string = ''
   @property({ type: String }) endDate: string = ''
 
@@ -262,8 +262,8 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
         <div class="controls">
           <md-outlined-text-field
             label="그룹"
-            .value=${this.group}
-            @input=${(e: any) => (this.group = e.target.value)}
+            .value=${this.org}
+            @input=${(e: any) => (this.org = e.target.value)}
             style="width: 150px;"
           ></md-outlined-text-field>
 
@@ -492,7 +492,7 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
                 metricId
                 valueDate
                 value
-                group
+                org
               }
               total
             }
@@ -500,7 +500,7 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
         `,
         variables: {
           filters: [
-            ...(this.group ? [{ name: 'group', operator: 'eq', value: this.group }] : []),
+            ...(this.org ? [{ name: 'org', operator: 'eq', value: this.org }] : []),
             { name: 'valueDate', operator: 'between', value: [this.startDate, this.endDate] }
           ]
         }
@@ -576,7 +576,7 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
               patches.push({
                 id: existingValue.id,
                 value: data.value,
-                group: this.group,
+                org: this.org,
                 cuFlag: 'M'
               })
             } else {
@@ -594,7 +594,7 @@ export class KpiMetricValueEditorPage extends connect(store)(localize(i18next)(S
                 metricId: metric.metricId,
                 valueDate: normalizedDate,
                 value: data.value,
-                group: this.group,
+                org: this.org,
                 cuFlag: '+'
               })
             }

package/client/pages/kpi-metric-value/kpi-metric-value-importer.ts

@@ -25,13 +25,13 @@ export class KpiMetricValueImporter extends LitElement {
 
   @property({ type: Array }) metricValues: any[] = []
   @property({ type: Object }) columns = {
-    list: { fields: ['metric', 'value', 'valueDate', 'group', 'meta'] },
+    list: { fields: ['metric', 'value', 'valueDate', 'org', 'meta'] },
     pagination: { infinite: true },
     columns: [
       { type: 'string', name: 'metric', header: 'Metric', width: 150 },
       { type: 'number', name: 'value', header: '값', width: 120 },
       { type: 'date', name: 'valueDate', header: '날짜', width: 120 },
-      { type: 'string', name: 'group', header: '그룹', width: 120 },
+      { type: 'string', name: 'org', header: '조직', width: 120 },
       { type: 'object', name: 'meta', header: '메타', width: 120 }
     ]
   }

package/client/pages/kpi-metric-value/kpi-metric-value-list-page.ts

@@ -16,12 +16,13 @@ import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { OxPopup, OxPrompt } from '@operato/popup'
 import { isMobileDevice } from '@operato/utils'
+import { p13n } from '@operato/p13n'
 
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
 
 @customElement('kpi-metric-value-list-page')
-export class KpiMetricValueListPage extends connect(store)(localize(i18next)(ScopedElementsMixin(PageView))) {
+export class KpiMetricValueListPage extends connect(store)(p13n(localize(i18next)(ScopedElementsMixin(PageView)))) {
   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
@@ -90,7 +91,12 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
   render() {
     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')!}
+      >
         <div slot="headroom" class="header">
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -106,6 +112,8 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
             </ox-record-creator>
           </div>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }
@@ -113,8 +121,8 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
   async pageInitialized() {
     this.gristConfig = {
       list: {
-        fields: ['metric', 'valueDate', 'value', 'group', 'meta', 'createdAt', 'updatedAt', 'creator', 'updater'],
-        details: ['metric', 'valueDate', 'value', 'group', 'meta', 'createdAt', 'updatedAt', 'creator', 'updater']
+        fields: ['metric', 'valueDate', 'value', 'org', 'meta', 'createdAt', 'updatedAt', 'creator', 'updater'],
+        details: ['metric', 'valueDate', 'value', 'org', 'meta', 'createdAt', 'updatedAt', 'creator', 'updater']
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -140,7 +148,7 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
         },
         { type: 'string', name: 'valueDate', header: '날짜', record: { editable: true }, width: 120 },
         { type: 'number', name: 'value', header: '값', record: { editable: true }, width: 120 },
-        { type: 'string', name: 'group', header: '그룹', record: { editable: false }, width: 120 },
+        { type: 'string', name: 'org', header: '조직', record: { editable: false }, width: 120 },
         { type: 'object', name: 'meta', header: '메타', record: { editable: false }, width: 120 },
         { type: 'datetime', name: 'createdAt', header: '생성일', record: { editable: false }, width: 180 },
         { type: 'datetime', name: 'updatedAt', header: '수정일', record: { editable: false }, width: 180 },
@@ -189,7 +197,7 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
               valueDate
               value
               meta
-              group
+              org
               updater {
                 id
                 name
@@ -307,7 +315,7 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
 
   async exportHandler() {
     const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
-    const targetFieldSet = new Set(['id', 'metric', 'valueDate', 'value', 'group', 'meta'])
+    const targetFieldSet = new Set(['id', 'metric', 'valueDate', 'value', 'org', 'meta'])
     return exportTargets.map(metricValue => {
       let tempObj = {}
       for (const field of targetFieldSet) {
@@ -328,7 +336,7 @@ export class KpiMetricValueListPage extends connect(store)(localize(i18next)(Sco
           .metric=${metricValue.metric}
           .valueDate=${metricValue.valueDate}
           .value=${metricValue.value}
-          .group=${metricValue.group}
+          .org=${metricValue.org}
           .meta=${metricValue.meta ? JSON.stringify(metricValue.meta) : ''}
           @saved=${() => {
             this.grist.fetch()

package/client/pages/kpi-metric-value/kpi-metric-value-manual-entry-form.ts

@@ -61,7 +61,7 @@ export class KpiMetricValueManualEntryForm extends LitElement {
   @property({ type: Object }) metric: any
   @state() valueDate = new Date().toISOString().slice(0, 10)
   @state() value = ''
-  @state() group = ''
+  @state() org = ''
   @state() meta = ''
   @state() loading = false
 
@@ -80,7 +80,7 @@ export class KpiMetricValueManualEntryForm extends LitElement {
           </label>
           <label>
             그룹 (선택)
-            <input type="text" .value=${this.group} @input=${e => (this.group = e.target.value)} />
+            <input type="text" .value=${this.org} @input=${e => (this.org = e.target.value)} />
           </label>
           <label>
             메타정보 (선택, JSON)
@@ -111,8 +111,8 @@ export class KpiMetricValueManualEntryForm extends LitElement {
     try {
       await client.mutate({
         mutation: gql`
-          mutation ($metricName: String!, $value: Float!, $group: String, $meta: Object) {
-            recordKpiMetricValue(metricName: $metricName, value: $value, meta: $meta, group: $group) {
+          mutation ($metricName: String!, $value: Float!, $org: String, $meta: Object) {
+            recordKpiMetricValue(metricName: $metricName, value: $value, meta: $meta, org: $org) {
               id
             }
           }
@@ -120,7 +120,7 @@ export class KpiMetricValueManualEntryForm extends LitElement {
         variables: {
           metricName: this.metric.name,
           value: parseFloat(this.value),
-          group: this.group || undefined,
+          org: this.org || undefined,
           meta: parsedMeta
         }
       })

package/client/pages/kpi-statistic/kpi-statistic-editor-page.ts

@@ -485,8 +485,7 @@ export class KpiStatisticEditorPage extends connect(store)(localize(i18next)(Sco
                 name
                 periodType
                 active
-                categoryId
-                category {
+                category: parent {
                   id
                   name
                 }

package/client/pages/kpi-statistic/kpi-statistic-list-page.ts

@@ -15,6 +15,7 @@ import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { OxPopup, OxPrompt } from '@operato/popup'
 import { isMobileDevice } from '@operato/utils'
+import { p13n } from '@operato/p13n'
 
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -22,7 +23,7 @@ import gql from 'graphql-tag'
 import { KpiStatisticImporter } from './kpi-statistic-importer.js'
 
 @customElement('kpi-statistic-list-page')
-export class KpiStatisticListPage extends connect(store)(localize(i18next)(ScopedElementsMixin(PageView))) {
+export class KpiStatisticListPage extends connect(store)(p13n(localize(i18next)(ScopedElementsMixin(PageView)))) {
   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
@@ -100,7 +101,12 @@ export class KpiStatisticListPage extends connect(store)(localize(i18next)(Scope
     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')!}
+      >
         <div slot="headroom" class="header">
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -118,6 +124,8 @@ export class KpiStatisticListPage extends connect(store)(localize(i18next)(Scope
             </ox-record-creator>
           </div>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }

package/client/pages/kpi-value/kpi-value-editor-page.ts

@@ -210,7 +210,8 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
     `
   ]
 
-  @property({ type: String }) group: string = ''
+  @property({ type: String }) kpiOrgScopeId: string = ''
+  @property({ type: String }) org: string = '' // legacy support
   @property({ type: String }) startDate: string = ''
   @property({ type: String }) endDate: string = ''
 
@@ -263,8 +264,8 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
         <div class="controls">
           <md-outlined-text-field
             label="그룹"
-            .value=${this.group}
-            @input=${(e: any) => (this.group = e.target.value)}
+            .value=${this.org}
+            @input=${(e: any) => (this.org = e.target.value)}
             style="width: 150px;"
           ></md-outlined-text-field>
 
@@ -591,7 +592,10 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
                 valueDate
                 value
                 score
-                group
+                kpiOrgScope {
+                  id
+                  org
+                }
               }
               total
             }
@@ -599,7 +603,7 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
         `,
         variables: {
           filters: [
-            ...(this.group ? [{ name: 'group', operator: 'eq', value: this.group }] : []),
+            ...(this.org ? [{ name: 'org', operator: 'eq', value: this.org }] : []),
             { name: 'valueDate', operator: 'between', value: [this.startDate, this.endDate] }
           ]
         }
@@ -688,7 +692,7 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
               patches.push({
                 id: existingValue.id,
                 value: data.value,
-                group: this.group,
+                org: this.org,
                 cuFlag: 'M'
               })
             } else {
@@ -697,7 +701,7 @@ export class KpiValueEditorPage extends connect(store)(localize(i18next)(ScopedE
                 kpiId: kpi.kpiId,
                 valueDate: date,
                 value: data.value,
-                group: this.group,
+                org: this.org,
                 cuFlag: '+'
               })
             }

package/client/pages/kpi-value/kpi-value-list-page.ts

@@ -15,6 +15,7 @@ import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { OxPopup, OxPrompt } from '@operato/popup'
 import { isMobileDevice } from '@operato/utils'
+import { p13n } from '@operato/p13n'
 
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -22,7 +23,7 @@ import gql from 'graphql-tag'
 import { KpiValueImporter } from './kpi-value-importer'
 
 @customElement('kpi-value-list-page')
-export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedElementsMixin(PageView))) {
+export class KpiValueListPage extends connect(store)(p13n(localize(i18next)(ScopedElementsMixin(PageView)))) {
   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
@@ -106,7 +107,12 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')!}
+      >
         <div slot="headroom" class="header">
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -124,6 +130,8 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
             </ox-record-creator>
           </div>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }
@@ -137,7 +145,7 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
           'valueDate',
           'value',
           'score',
-          'group',
+          'kpiOrgScope',
           'inputType',
           'source',
           'meta',
@@ -152,7 +160,7 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
           'valueDate',
           'value',
           'score',
-          'group',
+          'kpiOrgScope',
           'inputType',
           'source',
           'meta',
@@ -188,7 +196,16 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
         { type: 'string', name: 'valueDate', header: '실적일', record: { editable: true }, width: 120 },
         { type: 'number', name: 'value', header: '실적값', record: { editable: true }, width: 120 },
         { type: 'number', name: 'score', header: '성과점수', record: { editable: false }, width: 120 },
-        { type: 'string', name: 'group', header: '그룹', record: { editable: false }, width: 120 },
+        {
+          type: 'string',
+          name: 'kpiOrgScope',
+          header: '조직',
+          record: { editable: false },
+          width: 120,
+          renderer: (value, column, record, rowIndex, field) => {
+            return value?.entityName || value?.org || ''
+          }
+        },
         { type: 'string', name: 'inputType', header: '입력방식', record: { editable: false }, width: 100 },
         { type: 'string', name: 'source', header: '수집출처', record: { editable: false }, width: 120 },
         { type: 'object', name: 'meta', header: '메타', record: { editable: false }, width: 120 },
@@ -243,7 +260,10 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
               inputType
               source
               meta
-              group
+              kpiOrgScope {
+                id
+                org
+              }
               updater {
                 id
                 name
@@ -362,7 +382,11 @@ export class KpiValueListPage extends connect(store)(localize(i18next)(ScopedEle
               value
               score
               valueDate
-              group
+              kpiOrgScope {
+                id
+                entityName
+                org
+              }
             }
           }
         `,

package/client/route.ts

@@ -12,17 +12,10 @@ export default function route(page: string) {
       import('./pages/kpi/kpi-list-page')
       return page
 
-    case 'kpi-category-list':
-      import('./pages/kpi-category/kpi-category-list-page')
+    case 'kpi-tree':
+      import('./pages/kpi/kpi-tree-page')
       return page
 
-    case 'kpi-category-list':
-      import('./pages/kpi-category/kpi-category-list-page')
-      return page
-
-    case 'kpi-category-value-list':
-      import('./pages/kpi-category-value/kpi-category-value-list-page')
-      return page
 
     case 'kpi-metric-list':
       import('./pages/kpi-metric/kpi-metric-list-page')