@things-factory/dataset 6.0.25 → 6.0.28

package/client/pages/data-set/data-set-importer.ts

@@ -0,0 +1,96 @@
+import '@operato/data-grist'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+import { customElement, property, state } from 'lit/decorators.js'
+
+import { client } from '@operato/graphql'
+import { i18next } from '@operato/i18n'
+import { isMobileDevice } from '@operato/utils'
+import { DataSet } from '@operato/dataset'
+
+@customElement('data-set-importer')
+export class DataSetImporter extends LitElement {
+  static styles = [
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        background-color: #fff;
+      }
+
+      ox-grist {
+        flex: 1;
+      }
+
+      .button-container {
+        display: flex;
+        margin-left: auto;
+        padding: var(--padding-default);
+      }
+
+      mwc-button {
+        margin-left: var(--margin-default);
+      }
+    `
+  ]
+
+  @property({ type: Array }) dataSets: DataSet[] = []
+
+  @state() columns: any = {
+    list: { fields: ['name', 'description'] },
+    pagination: { infinite: true },
+    columns: [
+      {
+        type: 'string',
+        name: 'name',
+        header: i18next.t('field.name'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'description',
+        header: i18next.t('field.description'),
+        width: 200
+      },
+      {
+        type: 'checkbox',
+        name: 'active',
+        header: i18next.t('field.active'),
+        width: 60
+      }
+    ]
+  }
+
+  render() {
+    return html`
+      <ox-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.columns}
+        .data=${{ records: this.dataSets }}
+      ></ox-grist>
+
+      <div class="button-container">
+        <mwc-button raised @click=${this.save.bind(this)}>${i18next.t('button.save')}</mwc-button>
+      </div>
+    `
+  }
+
+  async save() {
+    const response = await client.mutate({
+      mutation: gql`
+        mutation importDataSets($dataSets: [DataSetPatch!]!) {
+          importDataSets(dataSets: $dataSets)
+        }
+      `,
+      variables: { dataSets: this.dataSets }
+    })
+
+    if (response.errors?.length) {
+      return
+    }
+
+    this.dispatchEvent(new CustomEvent('imported'))
+  }
+}

package/client/pages/data-set/{data-set-list-page.js → data-set-list-page.ts}

@@ -3,12 +3,21 @@ import './data-item-list.js'
 import './data-set-importer.js'
 import '../../components/data-entry-form.js'
 
+import moment from 'moment-timezone'
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
-import moment from 'moment-timezone'
+import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
 
-import { getEditor, getRenderer } from '@operato/data-grist'
+import {
+  getEditor,
+  getRenderer,
+  ColumnConfig,
+  DataGrist,
+  FetchOption,
+  SortersControl,
+  ImexConfig
+} from '@operato/data-grist'
 import { OxDataUseCase } from '@operato/dataset'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
@@ -16,6 +25,7 @@ import { notify, openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
+import { OxPopup } from '@operato/popup'
 
 const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone
 const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)]
@@ -33,6 +43,10 @@ const ENTRY_TYPES = [
     display: 'Board',
     value: 'board'
   },
+  {
+    display: 'CustomElement',
+    value: 'custom-element'
+  },
   {
     display: 'Page',
     value: 'page'
@@ -56,6 +70,10 @@ const MONITOR_TYPES = [
     display: 'Board',
     value: 'board'
   },
+  {
+    display: 'CustomElement',
+    value: 'custom-element'
+  },
   {
     display: 'Page',
     value: 'page'
@@ -79,6 +97,10 @@ const REPORT_TYPES = [
     display: 'Embed',
     value: 'embed'
   },
+  {
+    display: 'CustomElement',
+    value: 'custom-element'
+  },
   {
     display: 'Page',
     value: 'page'
@@ -105,34 +127,44 @@ const USECASE_OPTIONS = () => {
     }
   })
 }
+
+@customElement('data-set-list-page')
 export class DataSetListPage extends connect(store)(localize(i18next)(PageView)) {
-  static get properties() {
-    return {
-      gristConfig: Object,
-      mode: String
-    }
-  }
+  static styles = [
+    ScrollbarStyles,
+    CommonGristStyles,
+    css`
+      :host {
+        display: flex;
+
+        width: 100%;
 
-  static get styles() {
-    return [
-      ScrollbarStyles,
-      CommonGristStyles,
-      css`
-        :host {
-          display: flex;
+        --grid-record-emphasized-background-color: red;
+        --grid-record-emphasized-color: yellow;
+      }
+    `
+  ]
 
-          width: 100%;
+  @state() gristConfig: any
+  @state() mode: 'CARD' | 'GRID' | 'LIST' = isMobileDevice() ? 'CARD' : 'GRID'
 
-          --grid-record-emphasized-background-color: red;
-          --grid-record-emphasized-color: yellow;
-        }
-      `
-    ]
-  }
+  @query('ox-grist') private grist!: DataGrist
+  @query('#sorter-control') private sortersControl!: OxPopup
 
   get context() {
     return {
-      title: i18next.t('title.data-set list'),
+      search: {
+        handler: (search: string) => {
+          this.grist.searchText = search
+        },
+        placeholder: i18next.t('title.data-set list'),
+        value: this.grist.searchText
+      },
+      filter: {
+        handler: () => {
+          this.grist.toggleHeadroom()
+        }
+      },
       help: 'dataset/data-set',
       actions: [
         {
@@ -162,7 +194,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
   }
 
   render() {
-    const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
+    const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
       <ox-grist
@@ -173,7 +205,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       >
         <div slot="headroom">
           <div id="filters">
-            <ox-filters-form autofocus></ox-filters-form>
+            <ox-filters-form autofocus without-search></ox-filters-form>
           </div>
 
           <div id="sorters">
@@ -181,7 +213,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
             <mwc-icon
               @click=${e => {
                 const target = e.currentTarget
-                this.renderRoot.querySelector('#sorter-control').open({
+                this.sortersControl.open({
                   right: 0,
                   top: target.offsetTop + target.offsetHeight
                 })
@@ -203,10 +235,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     `
   }
 
-  get grist() {
-    return this.renderRoot.querySelector('ox-grist')
-  }
-
   async pageInitialized(lifecycle) {
     this.gristConfig = {
       list: {
@@ -216,6 +244,24 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: record => (!record || !record.name ? '' : record.schedulerHandle ? 'pause' : 'play_arrow'),
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              if (!record || !record.name) {
+                /* TODO record가 새로 추가된 것이면 리턴하도록 한다. */
+                return
+              }
+              if (record.schedulerHandle) {
+                this.stopDataCollectionSchedule(record)
+              } else {
+                this.startDataCollectionSchedule(record)
+              }
+            }
+          }
+        },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -355,7 +401,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               queryName: 'dataKeySets'
             }
           },
-          sortable: true,
           filter: false,
           width: 120
         },
@@ -383,7 +428,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
             }
           },
           width: 80,
-          label: true,
           imex: {
             width: 13,
             header: i18next.t('field.schedule'),
@@ -419,7 +463,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               queryName: 'roles'
             }
           },
-          sortable: true,
           filter: false,
           width: 120
         },
@@ -434,7 +477,24 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               queryName: 'roles'
             }
           },
-          sortable: true,
+          width: 120
+        },
+        {
+          type: 'assignees',
+          name: 'assignees',
+          header: i18next.t('field.assignees'),
+          record: {
+            editable: true
+          },
+          width: 120
+        },
+        {
+          type: 'approval-line',
+          name: 'approvalLine',
+          header: i18next.t('field.approval-line'),
+          record: {
+            editable: true
+          },
           width: 120
         },
         {
@@ -537,7 +597,6 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
           record: {
             editable: false
           },
-          sortable: true,
           width: 120
         },
         {
@@ -564,7 +623,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     }
   }
 
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -579,6 +638,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               useCase
               schedule
               timezone
+              schedulerHandle
               dataKeySet {
                 id
                 name
@@ -591,6 +651,26 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
                 id
                 name
               }
+              assignees {
+                type
+                value
+                assignee {
+                  id
+                  name
+                  description
+                  controlNo
+                }
+              }
+              approvalLine {
+                type
+                value
+                approver {
+                  id
+                  name
+                  description
+                  controlNo
+                }
+              }
               entryType
               entryView
               monitorType
@@ -685,7 +765,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     let patches = this.grist.dirtyRecords
     if (patches && patches.length) {
       patches = patches.map(patch => {
-        let patchField = patch.id ? { id: patch.id } : {}
+        let patchField: any = patch.id ? { id: patch.id } : {}
         const dirtyFields = patch.__dirtyfields__
         for (let key in dirtyFields) {
           patchField[key] = dirtyFields[key].after
@@ -720,6 +800,60 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     }
   }
 
+  async startDataCollectionSchedule(record) {
+    var response = await client.mutate({
+      mutation: gql`
+        mutation ($dataSetId: String!) {
+          startDataCollectionSchedule(dataSetId: $dataSetId) {
+            schedulerHandle
+          }
+        }
+      `,
+      variables: {
+        dataSetId: record.id
+      }
+    })
+
+    const schedulerHandle = response.data.startDataCollectionSchedule.schedulerHandle
+    record.schedulerHandle = schedulerHandle
+
+    notify({
+      level: 'info',
+      message: `${record.schedulerHandle ? 'success' : 'fail'} to start data collection schedule : ${record.name}`
+    })
+
+    this.grist.fetch()
+  }
+
+  async stopDataCollectionSchedule(record) {
+    var response = await client.mutate({
+      mutation: gql`
+        mutation ($dataSetId: String!) {
+          stopDataCollectionSchedule(dataSetId: $dataSetId) {
+            schedulerHandle
+          }
+        }
+      `,
+      variables: {
+        dataSetId: record.id
+      }
+    })
+
+    if (!response.errors) {
+      notify({
+        level: 'info',
+        message: `success to stop data collection schedule : ${record.name}`
+      })
+    } else {
+      notify({
+        level: 'error',
+        message: `${response.errors.map(error => error.message).join('\n')}`
+      })
+    }
+
+    this.grist.fetch()
+  }
+
   async exportHandler() {
     var headerSetting = this.grist._config.columns
       .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
@@ -735,7 +869,8 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
         ...this.grist._config.columns
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
+            var imexKey = (column.imex as ImexConfig)!.key
+            record[imexKey] = imexKey
               .split('.')
               .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
@@ -764,5 +899,3 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     )
   }
 }
-
-window.customElements.define('data-set-list-page', DataSetListPage)

package/client/{route.js → route.ts}

@@ -20,6 +20,10 @@ export default function route(page) {
       import('./pages/data-report/data-report-samples-page.js')
       return page
 
+    case 'data-ooc':
+      import('./pages/data-ooc/data-ooc-view-page.js')
+      return page
+
     case 'data-ooc-list':
       import('./pages/data-ooc/data-ooc-list-page.js')
       return page
@@ -31,7 +35,7 @@ export default function route(page) {
     case 'data-report-list':
       import('./pages/data-report/data-report-list-page.js')
       return page
-  
+
     case 'data-archive-list':
       import('./pages/data-archive/data-archive-list-page.js')
       return page

package/client/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "strict": true,
+    "declaration": true,
+    "module": "esnext",
+    "outDir": "../dist-client",
+    "baseUrl": "./"
+  },
+  "include": ["./**/*"]
+}

package/config/config.development.js

@@ -1,34 +1,34 @@
 module.exports = {
-    dataArchive: {
-        dataset: {
-            endpoint: {
-                host: 'localhost',
-                port: 80
-            },
-            datasource: {
-                database: ''
-            }
-        }
+  dataArchive: {
+    dataset: {
+      endpoint: {
+        host: 'localhost',
+        port: 80
+      },
+      datasource: {
+        database: ''
+      }
+    }
+  },
+  dataReport: {
+    jasper: {
+      endpoint: {
+        host: 'localhost',
+        port: 8090
+      },
+      datasource: {
+        database: ''
+      },
+      method: 'POST'
     },
-    dataReport: {
-        jasper: {
-            endpoint: {
-                host: 'localhost',
-                port: 8090
-            },
-            datasource: {
-                database: ''
-            },
-            method: 'POST'
-        },
-        shiny: {
-            endpoint: {
-                host: 'localhost',
-                port: 3838
-            },
-            datasource: {
-                database: ''
-            }
-        }
+    shiny: {
+      endpoint: {
+        host: 'localhost',
+        port: 3838
+      },
+      datasource: {
+        database: ''
+      }
     }
+  }
 }

package/config/config.production.js

@@ -1,34 +1,34 @@
 module.exports = {
-    dataArchive: {
-        dataset: {
-            endpoint: {
-                host: 'localhost',
-                port: 80
-            },
-            datasource: {
-                database: ''
-            }
-        }
+  dataArchive: {
+    dataset: {
+      endpoint: {
+        host: 'localhost',
+        port: 80
+      },
+      datasource: {
+        database: ''
+      }
+    }
+  },
+  dataReport: {
+    jasper: {
+      endpoint: {
+        host: 'localhost',
+        port: 8090
+      },
+      datasource: {
+        database: ''
+      },
+      method: 'POST'
     },
-    dataReport: {
-        jasper: {
-            endpoint: {
-                host: 'localhost',
-                port: 8090
-            },
-            datasource: {
-                database: ''
-            },
-            method: 'POST'
-        },
-        shiny: {
-            endpoint: {
-                host: 'localhost',
-                port: 3838
-            },
-            datasource: {
-                database: ''
-            }
-        }
+    shiny: {
+      endpoint: {
+        host: 'localhost',
+        port: 3838
+      },
+      datasource: {
+        database: ''
+      }
     }
-}
+  }
+}

package/dist-client/bootstrap.d.ts

@@ -0,0 +1,5 @@
+import './components/data-collect-activity-view';
+import './components/ooc-review-activity-view';
+import './components/ooc-resolve-activity-view';
+import '@operato/app/filter-renderer.js';
+export default function bootstrap(): void;

package/dist-client/bootstrap.js

@@ -0,0 +1,16 @@
+import './components/data-collect-activity-view'; /* refered by the activity template (activity-data-collect) on server */
+import './components/ooc-review-activity-view'; /* refered by the activity template (activity-ooc-review) on server */
+import './components/ooc-resolve-activity-view'; /* refered by the activity template (activity-ooc-resolve) on server */
+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 { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor/ox-grist-editor-data-item-spec.js';
+import { OxGristEditorPartitionKeys } from '@operato/grist-editor/ox-grist-editor-partition-keys.js';
+export default function bootstrap() {
+    registerGristEditor('data-item-spec', OxGristEditorDataItemSpec);
+    registerGristRenderer('data-item-spec', OxGristRendererJson5);
+    registerGristEditor('script', OxGristEditorCode);
+    registerGristEditor('partition-keys', OxGristEditorPartitionKeys);
+    registerGristRenderer('partition-keys', OxGristRendererJson5);
+}
+//# sourceMappingURL=bootstrap.js.map

package/dist-client/bootstrap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../client/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,yCAAyC,CAAA,CAAC,wEAAwE;AACzH,OAAO,uCAAuC,CAAA,CAAC,sEAAsE;AACrH,OAAO,wCAAwC,CAAA,CAAC,uEAAuE;AAEvH,OAAO,iCAAiC,CAAA,CAAC,8CAA8C;AAEvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAA;AACrF,OAAO,EACL,oBAAoB,EACpB,cAAc,IAAI,mBAAmB,EACrC,gBAAgB,IAAI,qBAAqB,EAC1C,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,iEAAiE,CAAA;AAC3G,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAA;AAEpG,MAAM,CAAC,OAAO,UAAU,SAAS;IAC/B,mBAAmB,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAA;IAChE,qBAAqB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;IAE7D,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;IAEhD,mBAAmB,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAA;IACjE,qBAAqB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;AAC/D,CAAC","sourcesContent":["import './components/data-collect-activity-view' /* refered by the activity template (activity-data-collect) on server */\nimport './components/ooc-review-activity-view' /* refered by the activity template (activity-ooc-review) on server */\nimport './components/ooc-resolve-activity-view' /* refered by the activity template (activity-ooc-resolve) on server */\n\nimport '@operato/app/filter-renderer.js' /* register resource-object filter renderer */\n\nimport { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'\nimport {\n  OxGristRendererJson5,\n  registerEditor as registerGristEditor,\n  registerRenderer as registerGristRenderer\n} from '@operato/data-grist'\nimport { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor/ox-grist-editor-data-item-spec.js'\nimport { OxGristEditorPartitionKeys } from '@operato/grist-editor/ox-grist-editor-partition-keys.js'\n\nexport default function bootstrap() {\n  registerGristEditor('data-item-spec', OxGristEditorDataItemSpec)\n  registerGristRenderer('data-item-spec', OxGristRendererJson5)\n\n  registerGristEditor('script', OxGristEditorCode)\n\n  registerGristEditor('partition-keys', OxGristEditorPartitionKeys)\n  registerGristRenderer('partition-keys', OxGristRendererJson5)\n}\n"]}

package/dist-client/components/data-collect-activity-view.d.ts

@@ -0,0 +1,19 @@
+import '@operato/dataset/ox-data-entry-form.js';
+import { LitElement } from 'lit';
+import { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js';
+import { DataSet } from '@operato/dataset';
+declare const DataCollectActivityView_base: (new (...args: any[]) => LitElement) & typeof LitElement;
+export declare class DataCollectActivityView extends DataCollectActivityView_base {
+    static styles: import("lit").CSSResult[];
+    input?: any;
+    output?: any;
+    dataSet?: DataSet & {
+        id: string;
+    };
+    entryForm: OxDataEntryForm;
+    render(): import("lit-html").TemplateResult<1>;
+    _updateDataItems(): Promise<void>;
+    updated(changes: any): void;
+    fetchDataSet(): Promise<void>;
+}
+export {};