@things-factory/dataset 5.0.0-y.0 → 5.0.0-zeta.10

package/client/bootstrap.js

@@ -1,14 +1,13 @@
 import '@operato/app/filter-renderer.js' /* register resource-object filter renderer */
 
+import { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'
 import {
   OxGristRendererJson5,
   registerEditor as registerGristEditor,
   registerRenderer as registerGristRenderer
 } from '@operato/data-grist'
-
-import { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'
 import { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor'
-import { OxGristEditorPartitionKeys } from '@operato/app/grist-editor/ox-grist-editor-partition-keys.js'
+import { OxGristEditorPartitionKeys } from '@operato/grist-editor/ox-grist-editor-partition-keys.js'
 
 export default function bootstrap() {
   registerGristEditor('data-item-spec', OxGristEditorDataItemSpec)

package/client/pages/data-entry/data-entry-list-page.js

@@ -3,7 +3,6 @@ import './data-entry-form'
 import '@operato/board/ox-board-viewer.js'
 
 import gql from 'graphql-tag'
-import JSON5 from 'json5'
 import { css, html } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin'
 
@@ -120,7 +119,7 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
         .orders=${this.orders}
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
-        <div slot="headroom" id="filters">
+        <div slot="headroom">
           <div id="filters">
             <ox-filters-form></ox-filters-form>
           </div>
@@ -315,38 +314,6 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
-  }
-
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-      await this.updateComplete
-
-      var filters = lifecycle.params?.['filters']
-      if (filters) {
-        try {
-          filters = JSON5.parse(filters)
-          this.filters = filters
-        } catch (e) {
-          console.error(`filters parameter parsing error: ${e}`)
-        }
-      }
-
-      var sorters = lifecycle.params?.['sorters']
-      if (sorters) {
-        try {
-          sorters = JSON5.parse(sorters)
-          this.sorters = sorters
-        } catch (e) {
-          console.error(`sorters parameter parsing error: ${e}`)
-        }
-      }
-
-      this.grist.fetch()
-    }
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
@@ -389,7 +356,6 @@ export class DataEntryListPage extends connect(store)(localize(i18next)(PageView
               dataItems {
                 name
                 description
-                sequence
                 active
                 tag
                 type

package/client/pages/data-ooc/data-ooc-list-page.js

@@ -108,7 +108,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
   async pageInitialized(lifecycle) {
     this.gristConfig = {
       list: {
-        fields: ['dataSet', 'data', 'spec', 'correctiveAction', 'corrector', 'correctedAt', 'collectedAt', 'creator']
+        fields: ['dataSet', 'data', 'correctiveAction', 'corrector', 'correctedAt', 'collectedAt', 'creator']
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -237,15 +237,6 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
           width: 200,
           imex: true
         },
-        {
-          type: 'json5',
-          name: 'spec',
-          header: i18next.t('field.spec'),
-          record: {
-            editable: false
-          },
-          width: 200
-        },
         {
           type: 'text',
           name: 'rawData',
@@ -305,7 +296,7 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
       },
       sorters: [
         {
-          name: 'updatedAt',
+          name: 'collectedAt',
           desc: true
         }
       ]
@@ -316,16 +307,6 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
     this.grist.fetch()
   }
 
-  // async pageUpdated(changes, lifecycle) {
-  //   if (this.active) {
-  //     // update with url params value
-  //     this._updateSearchConfig(lifecycle)
-  //     await this.updateComplete
-
-  //     this.grist.fetch()
-  //   }
-  // }
-
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
       query: gql`
@@ -335,21 +316,25 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
               id
               name
               description
+              useCase
               dataSet {
                 id
                 name
               }
-              dataSample {
-                id
+              partitionKeys
+              dataItems {
                 name
+                description
+                tag
+                unit
+                spec
               }
-              partitionKeys
               data
               rawData
-              state
-              spec
+              judgment
               ooc
               oos
+              state
               history
               workDate
               workShift
@@ -383,63 +368,6 @@ export class DataOocListPage extends connect(store)(localize(i18next)(PageView))
     }
   }
 
-  // async _updateDataOoc() {
-  //   let patches = this.grist.dirtyRecords
-  //   if (patches && patches.length) {
-  //     patches = patches.map(patch => {
-  //       let patchField = patch.id ? { id: patch.id } : {}
-  //       const dirtyFields = patch.__dirtyfields__
-  //       for (let key in dirtyFields) {
-  //         patchField[key] = dirtyFields[key].after
-  //       }
-  //       this._setDefaultFieldsValue(patchField)
-  //       patchField.cuFlag = patch.__dirty__
-
-  //       return patchField
-  //     })
-
-  //     const response = await client.mutate({
-  //       mutation: gql`
-  //         mutation ($patches: [DataOocPatch!]!) {
-  //           updateMultipleDataOoc(patches: $patches) {
-  //             name
-  //           }
-  //         }
-  //       `,
-  //       variables: {
-  //         patches
-  //       }
-  //     })
-
-  //     if (!response.errors) this.grist.fetch()
-  //   }
-  // }
-
-  // async _deleteDataOoc() {
-  //   if (confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
-  //     const ids = this.grist.selected.map(record => record.id)
-  //     if (ids && ids.length > 0) {
-  //       const response = await client.mutate({
-  //         mutation: gql`
-  //           mutation ($ids: [String!]!) {
-  //             deleteDataOocs(ids: $ids)
-  //           }
-  //         `,
-  //         variables: {
-  //           ids
-  //         }
-  //       })
-
-  //       if (!response.errors) {
-  //         this.grist.fetch()
-  //         notify({
-  //           message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
-  //         })
-  //       }
-  //     }
-  //   }
-  // }
-
   _exportableData() {
     let records = []
     if (this.grist.selected && this.grist.selected.length > 0) {

package/client/pages/data-ooc/data-ooc-view.js

@@ -82,25 +82,29 @@ class DataOocView extends localize(i18next)(LitElement) {
         <ox-data-ooc-view .dataSet=${this.dataSet} .dataOoc=${this.dataOoc}></ox-data-ooc-view>
       </div>
 
-      ${state === 'CREATED' || state === 'REVIEWED'
-        ? html`
+      ${
+        state === 'CREATED' || state === 'REVIEWED'
+          ? html`
             <label comment>
               <div><mwc-icon>build_circle</mwc-icon> <span>correction activity</span></div>
               <textarea placeholder="조치 내용을 입력해주세요."></textarea>
             </label>
           `
-        : html``}
+          : html``
+      }
 
       <div class="button-container">
-        ${state === 'CREATED'
-          ? html`<mwc-button raised @click=${() => this._processOoc('REVIEWED')}
-              >${i18next.t('button.reviewed')}</mwc-button
-            >`
-          : state === 'REVIEWED'
-          ? html`<mwc-button raised @click=${() => this._processOoc('CORRECTED')}
-              >${i18next.t('button.corrected')}</mwc-button
-            >`
-          : html``}
+        ${
+          state === 'CREATED'
+            ? html`<mwc-button raised @click=${() => this._processOoc('REVIEWED')}
+                >${i18next.t('button.reviewed')}</mwc-button
+              >`
+            : state === 'REVIEWED'
+            ? html`<mwc-button raised @click=${() => this._processOoc('CORRECTED')}
+                >${i18next.t('button.corrected')}</mwc-button
+              >`
+            : html``
+        }
       </div>
     `
   }
@@ -124,13 +128,14 @@ class DataOocView extends localize(i18next)(LitElement) {
               description
               useCase
               dataItems {
-                id
                 name
                 description
                 active
-                unit
                 tag
                 type
+                unit
+                options
+                quota
                 spec
               }
             }

package/client/pages/data-report/data-report-list-page.js

@@ -2,7 +2,6 @@ import '@operato/data-grist'
 import '@operato/board/ox-board-viewer.js'
 
 import gql from 'graphql-tag'
-import JSON5 from 'json5'
 import { css, html } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin'
 
@@ -155,7 +154,7 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
         .orders=${this.orders}
         .fetchHandler=${this.fetchHandler.bind(this)}
       >
-        <div slot="headroom" id="filters">
+        <div slot="headroom">
           <div id="filters">
             <ox-filters-form></ox-filters-form>
           </div>
@@ -358,38 +357,6 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
-  }
-
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-      await this.updateComplete
-
-      var filters = lifecycle.params?.['filters']
-      if (filters) {
-        try {
-          filters = JSON5.parse(filters)
-          this.filters = filters
-        } catch (e) {
-          console.error(`filters parameter parsing error: ${e}`)
-        }
-      }
-
-      var sorters = lifecycle.params?.['sorters']
-      if (sorters) {
-        try {
-          sorters = JSON5.parse(sorters)
-          this.sorters = sorters
-        } catch (e) {
-          console.error(`sorters parameter parsing error: ${e}`)
-        }
-      }
-
-      this.grist.fetch()
-    }
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
@@ -431,7 +398,6 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
               dataItems {
                 name
                 description
-                sequence
                 active
                 tag
                 type

package/client/pages/data-sample/data-sample-list-page.js

@@ -101,7 +101,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
 
   async pageInitialized(lifecycle) {
     this.gristConfig = {
-      list: { fields: ['dataSet', 'data', 'spec', 'updater', 'updatedAt'] },
+      list: { fields: ['dataSet', 'data', 'updater', 'updatedAt'] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
@@ -196,15 +196,6 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           width: 200,
           imex: true
         },
-        {
-          type: 'json5',
-          name: 'spec',
-          header: i18next.t('field.spec'),
-          record: {
-            editable: false
-          },
-          width: 200
-        },
         {
           type: 'text',
           name: 'rawData',
@@ -276,27 +267,13 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
       },
       sorters: [
         {
-          name: 'updatedAt',
+          name: 'collectedAt',
           desc: true
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
   }
 
-  // async pageUpdated(changes, lifecycle) {
-  //   if (this.active) {
-  //     // update with url params value
-  //     this._updateSearchConfig(lifecycle)
-  //     await this.updateComplete
-
-  //     this.grist.fetch()
-  //   }
-  // }
-
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
     const response = await client.query({
       query: gql`
@@ -306,17 +283,25 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
               id
               name
               description
+              useCase
               dataSet {
                 id
                 name
                 description
               }
               partitionKeys
+              dataItems {
+                name
+                description
+                tag
+                unit
+                spec
+              }
               data
               rawData
-              spec
               ooc
               oos
+              judgment
               workDate
               workShift
               updater {

package/client/pages/data-sample/data-sample-view.js

@@ -73,13 +73,14 @@ class DataSampleView extends localize(i18next)(LitElement) {
               description
               useCase
               dataItems {
-                id
                 name
                 description
                 active
-                unit
                 tag
                 type
+                unit
+                options
+                quota
                 spec
               }
             }

package/client/pages/data-sensor/data-sensor-list-page.js

@@ -288,10 +288,6 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {

package/client/pages/data-set/data-item-list.js

@@ -91,16 +91,6 @@ class DataItemList extends localize(i18next)(LitElement) {
             click: 'move-down'
           }
         },
-        {
-          type: 'number',
-          name: 'sequence',
-          hidden: true
-        },
-        {
-          type: 'string',
-          name: 'id',
-          hidden: true
-        },
         {
           type: 'string',
           name: 'name',
@@ -229,114 +219,58 @@ class DataItemList extends localize(i18next)(LitElement) {
       pagination: {
         infinite: true
       },
-      sorters: [
-        {
-          name: 'sequence'
-        }
-      ]
+      sorters: []
     }
   }
 
   async fetchHandler({ filters, page, limit, sortings = [] }) {
-    const response = await client.query({
-      query: gql`
-        query {
-          dataItems ( 
-            filters: { 
-              name: "dataSet",
-              value: "${this.dataSet.id}",
-              operator: "eq" 
-            },
-            sortings: { name: "sequence" }
-          ) {
-            items {
-              id
-              name
-              description
-              sequence
-              active
-              hidden
-              tag
-              type
-              options
-              unit
-              quota
-              spec
-            }
-            total
-          }
-        }
-      `
-    })
+    const dataItems = this.dataSet.dataItems || []
 
     return {
-      total: response.data.dataItems.total || 0,
-      records: response.data.dataItems.items || []
+      total: dataItems.length,
+      records: dataItems
     }
   }
 
   async _updateDataItems() {
-    let patches = this.grist._data.records
-    if (patches && patches.length) {
-      patches = patches.map(patch => {
-        var patchField = {}
-        const dirtyFields = patch.__dirtyfields__
-        for (let key in dirtyFields) {
-          patchField[key] = dirtyFields[key].after
-        }
-
-        return { ...patch.__origin__, ...patchField }
-      })
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation ($dataSetId: String!, $patches: [DataItemPatch!]!) {
-            updateMultipleDataItem(dataSetId: $dataSetId, patches: $patches) {
-              name
-            }
-          }
-        `,
-        variables: {
-          dataSetId: this.dataSet.id,
-          patches
-        }
-      })
-
-      if (!response.errors) {
-        this.grist.fetch()
-      }
-    }
-  }
-
-  async _deleteDataItems() {
-    if (!confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) return
-
-    const ids = this.grist.selected.map(record => record.id)
-    if (!(ids && ids.length > 0)) return
+    this.grist.commit()
 
     const response = await client.mutate({
       mutation: gql`
-        mutation ($ids: [String!]!) {
-          deleteDataItems(ids: $ids)
+        mutation ($id: String!, $patch: DataSetPatch!) {
+          updateDataSet(id: $id, patch: $patch) {
+            name
+          }
         }
       `,
       variables: {
-        ids
+        id: this.dataSet.id,
+        patch: {
+          dataItems: this.grist.data.records,
+          cuFlag: 'M'
+        }
       }
     })
 
-    if (response.errors) return
+    if (!response.errors) {
+      await document.dispatchEvent(
+        new CustomEvent('notify', {
+          detail: {
+            message: i18next.t('text.info_x_successfully', {
+              x: i18next.t('button.save')
+            })
+          }
+        })
+      )
+    }
+  }
+
+  async _deleteDataItems() {
+    if (!confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
+      return
+    }
 
-    this.grist.fetch()
-    await document.dispatchEvent(
-      new CustomEvent('notify', {
-        detail: {
-          message: i18next.t('text.info_x_successfully', {
-            x: i18next.t('text.delete')
-          })
-        }
-      })
-    )
+    this.grist.deleteSelectedRecords(false)
   }
 }
 

package/client/pages/data-set/data-set-list-page.js

@@ -537,10 +537,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
         }
       ]
     }
-
-    await this.updateComplete
-
-    this.grist.fetch()
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
@@ -581,7 +577,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               dataItems {
                 name
                 description
-                sequence
                 active
                 tag
                 type