@things-factory/dataset 5.0.0-alpha.4 → 5.0.0-alpha.40

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

@@ -1,4 +1,5 @@
 import '@operato/data-grist'
+import './data-sample-view.js'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -6,12 +7,12 @@ import { connect } from 'pwa-helpers/connect-mixin'
 
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
-import { notify } from '@operato/layout'
+import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
-export class DataSample extends connect(store)(localize(i18next)(PageView)) {
+export class DataSampleListPage extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
       active: String,
@@ -53,14 +54,12 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
   get context() {
     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
-        }
-      ]
+      help: 'dataset/data-sample',
+      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: 120
+          width: 120,
+          imex: true
         },
         {
           type: 'string',
@@ -129,97 +146,143 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           header: i18next.t('field.description'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
-          width: 150
+          width: 150,
+          imex: true
         },
         {
-          type: 'object',
+          type: 'resource-object',
           name: 'dataSet',
-          header: i18next.t('field.dataSet'),
+          header: i18next.t('field.data-set'),
           record: {
             editable: false
           },
           sortable: true,
-          width: 120
+          width: 120,
+          imex: true
         },
         {
-          type: 'json',
+          type: 'json5',
           name: 'partitionKeys',
-          header: i18next.t('field.partitionKeys'),
+          header: i18next.t('field.partition-keys'),
           record: {
-            editable: false,
-            renderer: (value, column, record, rowIndex, field) => {
-              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
-            }
+            editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
-          type: 'json',
+          type: 'checkbox',
+          name: 'ooc',
+          header: i18next.t('field.ooc'),
+          record: {
+            editable: false
+          },
+          width: 30
+        },
+        {
+          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,
-            renderer: (value, column, record, rowIndex, field) => {
-              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
-            }
+            editable: false
           },
-          width: 200
+          width: 200,
+          imex: true
         },
         {
-          type: 'json',
+          type: 'json5',
           name: 'spec',
           header: i18next.t('field.spec'),
           record: {
-            editable: false,
-            renderer: (value, column, record, rowIndex, field) => {
-              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
-            }
+            editable: false
           },
           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',
-          name: 'updater',
-          header: i18next.t('field.updater'),
+          type: 'string',
+          name: 'workDate',
+          header: i18next.t('field.work-date'),
           sortable: true,
-          width: 120
+          width: 80,
+          imex: true
         },
         {
-          type: 'datetime',
-          name: 'updatedAt',
-          header: i18next.t('field.updated_at'),
+          type: 'string',
+          name: 'workShift',
+          header: i18next.t('field.work-shift'),
           sortable: true,
-          width: 180
+          width: 40,
+          imex: true
         },
         {
           type: 'datetime',
           name: 'collectedAt',
-          header: i18next.t('field.collected_at'),
+          header: i18next.t('field.collected-at'),
+          sortable: true,
+          width: 180,
+          imex: true
+        },
+        {
+          type: 'resource-object',
+          name: 'updater',
+          header: i18next.t('field.updater'),
+          sortable: true,
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'datetime',
+          name: 'updatedAt',
+          header: i18next.t('field.updated_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
         }
       ]
     }
@@ -255,7 +318,12 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
               }
               partitionKeys
               data
+              rawData
               spec
+              ooc
+              oos
+              workDate
+              workShift
               updater {
                 id
                 name
@@ -280,37 +348,44 @@ 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 }
   }
 }
 
-window.customElements.define('data-sample-page', DataSample)
+window.customElements.define('data-sample-list-page', DataSampleListPage)

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

@@ -0,0 +1,97 @@
+import '@operato/dataset/ox-data-sample-view.js'
+
+import { LitElement, css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
+
+import { ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
+import gql from 'graphql-tag'
+
+class DataSampleView extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      dataSet: Object,
+      dataSample: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          background-color: #fff;
+        }
+
+        div[content] {
+          flex: 1;
+
+          display: flex;
+          overflow: auto;
+        }
+
+        ox-data-sample-view {
+          flex: 1;
+          padding: var(--padding-wide);
+        }
+      `
+    ]
+  }
+
+  get sampleView() {
+    return this.renderRoot.querySelector('ox-data-sample-view')
+  }
+
+  render() {
+    return html`
+      <div content>
+        <ox-data-sample-view .dataSet=${this.dataSet} .dataSample=${this.dataSample}></ox-data-sample-view>
+      </div>
+    `
+  }
+
+  updated(changes) {
+    if (changes.has('dataSample')) {
+      this.fetchDataSet()
+    }
+  }
+
+  async fetchDataSet() {
+    const id = this.dataSample?.dataSet?.id
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSet(id: $id) {
+              id
+              name
+              description
+              useCase
+              dataItems {
+                id
+                name
+                description
+                active
+                unit
+                tag
+                type
+                spec
+              }
+            }
+          }
+        `,
+        variables: {
+          id: this.dataSample.dataSet.id
+        }
+      })
+
+      this.dataSet = response.data.dataSet
+    }
+  }
+}
+
+window.customElements.define('data-sample-view', DataSampleView)

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

@@ -11,7 +11,7 @@ import { PageView, store } from '@operato/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
-export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
+export class DataSensorListPage extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
       active: String,
@@ -53,7 +53,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
   get context() {
     return {
       title: i18next.t('title.data-sensor list'),
-      help: 'integration/ui/data-sensor',
+      help: 'dataset/data-sensor',
       actions: [
         {
           title: i18next.t('button.copy'),
@@ -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
         },
         {
@@ -194,7 +196,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'object',
           name: 'dataSet',
-          header: i18next.t('field.dataSet'),
+          header: i18next.t('field.data-set'),
           record: {
             editable: true,
             options: {
@@ -272,7 +274,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'datetime',
           name: 'collectedAt',
-          header: i18next.t('field.collected_at'),
+          header: i18next.t('field.collected-at'),
           record: {
             editable: false
           },
@@ -382,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
@@ -443,4 +438,4 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
   }
 }
 
-window.customElements.define('data-sensor-page', DataSensor)
+window.customElements.define('data-sensor-list-page', DataSensorListPage)

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

@@ -1,8 +1,8 @@
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
+import { LitElement, css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
 
 import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
+import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 
 class DataItemList extends localize(i18next)(LitElement) {
@@ -61,8 +61,6 @@ class DataItemList extends localize(i18next)(LitElement) {
     `
   }
 
-  async updated(changedProps) {}
-
   async firstUpdated() {
     this.gristConfig = {
       list: { fields: ['name', 'description', 'active'] },
@@ -132,6 +130,17 @@ class DataItemList extends localize(i18next)(LitElement) {
           sortable: true,
           width: 60
         },
+        {
+          type: 'checkbox',
+          name: 'hidden',
+          label: true,
+          header: i18next.t('field.hidden'),
+          record: {
+            editable: true
+          },
+          sortable: true,
+          width: 60
+        },
         {
           type: 'string',
           name: 'tag',
@@ -157,9 +166,7 @@ class DataItemList extends localize(i18next)(LitElement) {
           header: i18next.t('field.options'),
           record: {
             editable: true,
-            renderer: (value, column, record, rowIndex, field) => {
-              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
-            },
+            renderer: 'json5',
             options: async (value, column, record, row, field) => {
               return {
                 name: record.type,
@@ -168,7 +175,7 @@ class DataItemList extends localize(i18next)(LitElement) {
                   record.type === 'select'
                     ? [
                         {
-                          type: 'options',
+                          type: 'options' /* property-editor type */,
                           name: 'options',
                           label: 'options'
                         }
@@ -181,6 +188,15 @@ class DataItemList extends localize(i18next)(LitElement) {
           },
           width: 120
         },
+        {
+          type: 'string',
+          name: 'unit',
+          header: i18next.t('field.unit'),
+          record: {
+            editable: true
+          },
+          width: 120
+        },
         {
           type: 'number',
           name: 'quota',
@@ -191,11 +207,16 @@ class DataItemList extends localize(i18next)(LitElement) {
           width: 60
         },
         {
-          type: 'json',
+          type: 'data-item-spec',
           name: 'spec',
           header: i18next.t('field.spec'),
           record: {
-            editable: true
+            editable: true,
+            options: {
+              name: '',
+              help: '',
+              objectified: true /* prevent from stringifying */
+            }
           },
           width: 200
         }
@@ -234,9 +255,11 @@ class DataItemList extends localize(i18next)(LitElement) {
               description
               sequence
               active
+              hidden
               tag
               type
               options
+              unit
               quota
               spec
             }
@@ -279,7 +302,9 @@ class DataItemList extends localize(i18next)(LitElement) {
         }
       })
 
-      if (!response.errors) this.grist.fetch()
+      if (!response.errors) {
+        this.grist.fetch()
+      }
     }
   }