@things-factory/dataset 5.0.0-alpha.2 → 5.0.0-alpha.20

package/client/pages/data-sample.js

@@ -1,14 +1,15 @@
 import '@operato/data-grist'
+import './data-sample-view.js'
 
-import gql from 'graphql-tag'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@operato/i18n'
+import { notify, openPopup } from '@operato/layout'
 
+import { ScrollbarStyles } from '@operato/styles'
 import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { notify } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 
 export class DataSample extends connect(store)(localize(i18next)(PageView)) {
@@ -54,13 +55,11 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
     return {
       title: i18next.t('title.data-sample list'),
       help: 'integration/ui/data-sample',
-      actions: [
-        {
-          title: i18next.t('button.delete'),
-          action: this._deleteDataSample.bind(this),
-          ...CommonButtonStyles.delete
-        }
-      ]
+      actions: [],
+      exportable: {
+        name: i18next.t('title.data-sample list'),
+        data: this._exportableData.bind(this)
+      }
     }
   }
 
@@ -111,17 +110,35 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'assignment',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-sample-view .dataSample=${record} style="background-color: white;"></data-sample-view> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-sample view')
+                }
+              )
+            }
+          }
+        },
         {
           type: 'string',
           name: 'name',
           label: true,
           header: i18next.t('field.name'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 120,
+          imex: true
         },
         {
           type: 'string',
@@ -129,32 +146,63 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           header: i18next.t('field.description'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
-          width: 200
+          width: 150,
+          imex: true
         },
         {
-          type: 'object',
+          type: 'resource-object',
           name: 'dataSet',
           header: i18next.t('field.data-set'),
           record: {
             editable: false
           },
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'json5',
+          name: 'partitionKeys',
+          header: i18next.t('field.partition-keys'),
+          record: {
+            editable: false
+          },
+          width: 200,
+          imex: true
+        },
+        {
+          type: 'checkbox',
+          name: 'ooc',
+          header: i18next.t('field.ooc'),
+          record: {
+            editable: false
+          },
+          width: 30
         },
         {
-          type: 'json',
+          type: 'checkbox',
+          name: 'oos',
+          header: i18next.t('field.oos'),
+          record: {
+            editable: false
+          },
+          width: 30
+        },
+        {
+          type: 'json5',
           name: 'data',
           header: i18next.t('field.data'),
           record: {
             editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
-          type: 'json',
+          type: 'json5',
           name: 'spec',
           header: i18next.t('field.spec'),
           record: {
@@ -163,45 +211,62 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           width: 200
         },
         {
-          type: 'code',
+          type: 'text',
           name: 'rawData',
           header: i18next.t('field.raw-data'),
           record: {
             editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
-          type: 'object',
+          type: 'resource-object',
           name: 'updater',
           header: i18next.t('field.updater'),
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
         },
         {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
           sortable: true,
-          width: 180
+          width: 180,
+          imex: true
         },
         {
           type: 'datetime',
           name: 'collectedAt',
           header: i18next.t('field.collected_at'),
           sortable: true,
-          width: 180
+          width: 180,
+          imex: true
         }
       ],
       rows: {
         appendable: false,
         selectable: {
           multiple: true
+        },
+        classifier: function (record, rowIndex) {
+          var emphasized
+          if (record['oos']) {
+            emphasized = ['red']
+          } else if (record['ooc']) {
+            emphasized = 'orange'
+          }
+
+          return {
+            emphasized
+          }
         }
       },
       sorters: [
         {
-          name: 'name'
+          name: 'updatedAt',
+          desc: true
         }
       ]
     }
@@ -235,8 +300,11 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
               }
+              partitionKeys
               data
               spec
+              ooc
+              oos
               updater {
                 id
                 name
@@ -261,36 +329,43 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _deleteDataSample() {
-    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!]!) {
-              deleteDataSamples(ids: $ids)
+  _exportableData() {
+    let records = []
+    if (this.grist.selected && this.grist.selected.length > 0) {
+      records = this.grist.selected
+    } else {
+      records = this.grist.data.records
+    }
+
+    var headerSetting = this.grist.compiledConfig.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex === true
+          ? {
+              header: column.header.renderer(),
+              key: column.name,
+              width: column.width,
+              type: column.type
             }
-          `,
-          variables: {
-            ids
-          }
-        })
+          : column.imex
+      })
 
-        if (!response.errors) {
-          this.grist.fetch()
-          notify({
-            message: i18next.t('text.info_x_successfully', { x: i18next.t('text.delete') })
-          })
-        }
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this.gristConfig.columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            const key = column.imex === true ? column.name : column.imex.key
+            record[key] = key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            return record
+          }, {})
       }
-    }
-  }
+    })
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
+    return { header: headerSetting, data: data }
   }
 }
 

package/client/pages/data-sensor.js

@@ -1,15 +1,15 @@
 import '@operato/data-grist'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import { connect } from 'pwa-helpers/connect-mixin'
+import { i18next, localize } from '@operato/i18n'
 
 import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { notify } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import { notify } from '@operato/layout'
 
 export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -153,6 +153,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
             editable: true
           },
           sortable: true,
+          filter: true,
           width: 60
         },
         {
@@ -176,6 +177,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
             editable: true
           },
           sortable: true,
+          filter: 'search',
           width: 150
         },
         {
@@ -334,11 +336,6 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
               model
               serialNo
               netmask
-              collecter {
-                id
-                name
-              }
-              collectedAt
               updater {
                 id
                 name
@@ -387,13 +384,6 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _copyDataSensor() {
     var selected = this.grist.selected
     if (selected.length == 0) return

package/client/pages/data-set.js

@@ -1,18 +1,20 @@
 import '@operato/data-grist'
 import './data-item-list'
 import './data-set-importer'
+import './data-entry-form'
 
-import gql from 'graphql-tag'
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
-import moment from 'moment-timezone'
-import { connect } from 'pwa-helpers/connect-mixin'
-
-import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+
+import { OxDataUseCase } from '@operato/dataset'
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
+import moment from 'moment-timezone'
 
 export class DataSet extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -138,12 +140,32 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               if (!record.id) return
-              openPopup(html` <data-item-list .dataSet=${record}></data-item-list> `, {
+              const popup = openPopup(html` <data-item-list .dataSet=${record}></data-item-list> `, {
                 backdrop: true,
                 help: 'data-set/ui/data-item-list',
                 size: 'large',
                 title: i18next.t('title.data-item list')
               })
+              popup.onclosed = () => {
+                this.grist.fetch()
+              }
+            }
+          }
+        },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'fact_check',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-entry-form .dataSet=${record} style="background-color: white;"></data-entry-form> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-entry-form')
+                }
+              )
             }
           }
         },
@@ -178,15 +200,62 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: true
           },
+          filter: true,
           sortable: true,
           width: 60
         },
         {
-          type: 'json',
+          type: 'select',
+          name: 'type',
+          label: true,
+          header: i18next.t('field.type'),
+          record: {
+            editable: true,
+            options: [
+              {},
+              {
+                display: 'Manually Collected',
+                value: 'manual'
+              },
+              {
+                display: 'Automatically Collected',
+                value: 'automatic'
+              }
+            ]
+          },
+          sortable: true,
+          filter: true,
+          width: 60
+        },
+        {
+          type: 'select',
+          name: 'useCase',
+          label: true,
+          header: i18next.t('field.use-case'),
+          record: {
+            editable: true,
+            options: () => {
+              return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
+                return {
+                  display: name,
+                  value: name
+                }
+              })
+            }
+          },
+          sortable: true,
+          filter: true,
+          width: 80
+        },
+        {
+          type: 'partition-keys',
           name: 'partitionKeys',
           header: i18next.t('field.partition-keys'),
           record: {
-            editable: true
+            editable: true,
+            options: {
+              objectified: true /* transfered as a object type */
+            }
           },
           width: 200
         },
@@ -196,7 +265,10 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           header: i18next.t('field.schedule'),
           record: {
-            editable: true
+            editable: true,
+            options: {
+              objectified: true
+            }
           },
           width: 80,
           label: true
@@ -212,7 +284,20 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           width: 120
         },
         {
-          type: 'object',
+          type: 'resource-object',
+          name: 'supervisoryRole',
+          header: i18next.t('field.supervisory-role'),
+          record: {
+            editable: true,
+            options: {
+              queryName: 'roles'
+            }
+          },
+          sortable: true,
+          width: 120
+        },
+        {
+          type: 'resource-object',
           name: 'updater',
           header: i18next.t('field.updater'),
           record: {
@@ -271,8 +356,14 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
               partitionKeys
               slugger
               active
+              type
+              useCase
               schedule
               timezone
+              supervisoryRole {
+                id
+                name
+              }
               updater {
                 id
                 name
@@ -283,7 +374,10 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
                 description
                 sequence
                 active
+                tag
                 type
+                unit
+                options
                 quota
                 spec
               }
@@ -330,13 +424,6 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async stateChanged(state) {
-    if (this.active && this._currentPopupName && !state.layout.viewparts[this._currentPopupName]) {
-      this.grist.fetch()
-      this._currentPopupName = null
-    }
-  }
-
   async _copyDataSet() {
     var selected = this.grist.selected
     if (selected.length == 0) return
@@ -355,7 +442,9 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
       }
     })
 
-    if (!response.errors) this.grist.fetch()
+    if (!response.errors) {
+      this.grist.fetch()
+    }
   }
 
   async _updateDataSet() {
@@ -386,13 +475,25 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
         }
       })
 
-      if (!response.errors) this.grist.fetch()
+      if (!response.errors) {
+        this.grist.fetch()
+      }
     }
   }
 
   async exportHandler() {
     const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
-    const targetFieldSet = new Set(['id', 'name', 'type', 'description', 'schedule', 'timezone', 'active', 'dataItems'])
+    const targetFieldSet = new Set([
+      'id',
+      'name',
+      'type',
+      'description',
+      'tag',
+      'schedule',
+      'timezone',
+      'active',
+      'dataItems'
+    ])
 
     return exportTargets.map(dataSet => {
       let tempObj = {}
@@ -408,11 +509,11 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
     openPopup(
       html`
         <data-set-importer
-          .dataSets="${records}"
-          @imported="${() => {
+          .dataSets=${records}
+          @imported=${() => {
             history.back()
             this.grist.fetch()
-          }}"
+          }}
         ></data-set-importer>
       `,
       {

package/client/route.js

@@ -11,5 +11,9 @@ export default function route(page) {
     case 'data-sample':
       import('./pages/data-sample')
       return page
+
+    case 'data-ooc':
+      import('./pages/data-ooc')
+      return page
   }
 }