@things-factory/dataset 5.0.0-alpha.13 → 5.0.0-alpha.17

package/client/pages/data-entry-form.js

@@ -53,7 +53,9 @@ class DataEntryForm extends localize(i18next)(LitElement) {
   async _updateDataItems() {
     const data = this.entryForm.buildValue()
     const dataSample = {
-      dataSetId: this.dataSet.id,
+      dataSet: {
+        id: this.dataSet.id
+      },
       data
     }
 

package/client/pages/data-ooc.js

@@ -0,0 +1,450 @@
+import '@operato/data-grist'
+
+import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
+import { css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
+
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
+import { isMobileDevice } from '@operato/utils'
+import { notify } from '@operato/layout'
+
+export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
+  static get properties() {
+    return {
+      active: String,
+      gristConfig: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          overflow: hidden;
+        }
+
+        ox-grist {
+          overflow-y: auto;
+          flex: 1;
+        }
+
+        #filters {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+
+          background-color: white;
+        }
+
+        #filters > * {
+          padding: var(--padding-default) var(--padding-wide);
+        }
+      `
+    ]
+  }
+
+  get context() {
+    return {
+      title: i18next.t('title.data-ooc list'),
+      help: 'integration/ui/data-ooc',
+      actions: [
+        {
+          title: i18next.t('button.save'),
+          action: this._updateDataOoc.bind(this),
+          ...CommonButtonStyles.save
+        }
+      ],
+      exportable: {
+        name: i18next.t('title.data-ooc list'),
+        data: this._exportableData.bind(this)
+      }
+    }
+  }
+
+  render() {
+    return html`
+      <ox-grist
+        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+      >
+        <div slot="headroom" id="filters">
+          <ox-filters-form></ox-filters-form>
+        </div>
+      </ox-grist>
+    `
+  }
+
+  get grist() {
+    return this.renderRoot.querySelector('ox-grist')
+  }
+
+  // update with url params value
+  _updateSearchConfig(lifecycle) {
+    // this.searchConfig = this.searchConfig.map(conf => {
+    // if (conf.name in lifecycle.params) {
+    //   conf.value = lifecycle.params[conf.name]
+    // } else {
+    //   delete conf.value
+    // }
+    // return conf
+    // })
+  }
+
+  // set default field value to record with searchConfig
+  _setDefaultFieldsValue(fields) {
+    // this.searchConfig.forEach(conf => {
+    //   if (!fields[conf.name] && conf.value) {
+    //     fields[conf.name] = conf.value
+    //   }
+    // })
+  }
+
+  async pageInitialized(lifecycle) {
+    this._updateSearchConfig(lifecycle)
+
+    this.gristConfig = {
+      list: {
+        fields: ['dataSet', 'data', 'spec', 'correctiveAction', 'corrector', 'correctedAt', 'collectedAt', 'creator']
+      },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'string',
+          name: 'name',
+          label: true,
+          header: i18next.t('field.name'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          sortable: true,
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'string',
+          name: 'description',
+          label: true,
+          header: i18next.t('field.description'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          width: 150,
+          imex: true
+        },
+        {
+          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: 'string',
+          name: 'state',
+          label: true,
+          header: i18next.t('field.state'),
+          record: {
+            editable: false
+          },
+          width: 150,
+          imex: true
+        },
+        {
+          type: 'textarea',
+          name: 'correctiveAction',
+          label: true,
+          header: i18next.t('field.corrective-action'),
+          record: {
+            editable: true
+          },
+          width: 150,
+          imex: true
+        },
+        {
+          type: 'resource-object',
+          name: 'dataSet',
+          header: i18next.t('field.data-set'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'resource-object',
+          name: 'dataSample',
+          header: i18next.t('field.data-sample'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          width: 120,
+          imex: true
+        },
+        {
+          type: 'json5',
+          name: 'partitionKeys',
+          header: i18next.t('field.partition-keys'),
+          record: {
+            editable: false
+          },
+          width: 200,
+          imex: true
+        },
+        {
+          type: 'json5',
+          name: 'data',
+          header: i18next.t('field.data'),
+          record: {
+            editable: false
+          },
+          width: 200,
+          imex: true
+        },
+        {
+          type: 'json5',
+          name: 'spec',
+          header: i18next.t('field.spec'),
+          record: {
+            editable: false
+          },
+          width: 200
+        },
+        {
+          type: 'text',
+          name: 'rawData',
+          header: i18next.t('field.raw-data'),
+          record: {
+            editable: false
+          },
+          width: 200,
+          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,
+          imex: true
+        },
+        {
+          type: 'datetime',
+          name: 'collectedAt',
+          header: i18next.t('field.collected_at'),
+          sortable: true,
+          width: 180,
+          imex: true
+        }
+      ],
+      rows: {
+        appendable: false,
+        selectable: {
+          multiple: true
+        }
+      },
+      sorters: [
+        {
+          name: 'updatedAt',
+          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`
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          responses: dataOocs(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              name
+              description
+              dataSet {
+                id
+                name
+              }
+              dataSample {
+                id
+                name
+              }
+              partitionKeys
+              data
+              state
+              spec
+              ooc
+              oos
+              correctiveAction
+              correctedAt
+              corrector {
+                id
+                name
+              }
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters,
+        pagination: { page, limit },
+        sortings
+      }
+    })
+
+    return {
+      total: response.data.responses.total || 0,
+      records: response.data.responses.items || []
+    }
+  }
+
+  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) {
+      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
+            }
+          : column.imex
+      })
+
+    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
+          }, {})
+      }
+    })
+
+    return { header: headerSetting, data: data }
+  }
+}
+
+window.customElements.define('data-ooc-page', DataOoc)

package/client/pages/data-sample.js

@@ -1,10 +1,10 @@
 import '@operato/data-grist'
 
-import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
 import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
 
+import { ScrollbarStyles } from '@operato/styles'
 import { client } from '@operato/graphql'
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -54,13 +54,7 @@ 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)
@@ -121,7 +115,7 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           header: i18next.t('field.name'),
           record: {
-            editable: true
+            editable: false
           },
           filter: 'search',
           sortable: true,
@@ -134,7 +128,7 @@ 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,
@@ -143,7 +137,7 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'resource-object',
           name: 'dataSet',
-          header: i18next.t('field.dataSet'),
+          header: i18next.t('field.data-set'),
           record: {
             editable: false
           },
@@ -161,6 +155,24 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           width: 200,
           imex: true
         },
+        {
+          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',
@@ -219,11 +231,24 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
         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
         }
       ]
     }
@@ -260,6 +285,8 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
               partitionKeys
               data
               spec
+              ooc
+              oos
               updater {
                 id
                 name
@@ -284,31 +311,6 @@ 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)
-            }
-          `,
-          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-sensor.js

@@ -194,7 +194,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: {

package/client/pages/data-set.js

@@ -9,6 +9,7 @@ import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 
+import { OxDataItemSpec } from '@operato/dataset'
 import { client } from '@operato/graphql'
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -202,6 +203,47 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           sortable: true,
           width: 60
         },
+        {
+          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,
+          width: 60
+        },
+        {
+          type: 'select',
+          name: 'useCase',
+          label: true,
+          header: i18next.t('field.use-case'),
+          record: {
+            editable: true,
+            options: () => {
+              return ['', ...OxDataItemSpec.getProviderNames()].map(name => {
+                return {
+                  display: name,
+                  value: name
+                }
+              })
+            }
+          },
+          sortable: true,
+          width: 80
+        },
         {
           type: 'partition-keys',
           name: 'partitionKeys',
@@ -238,6 +280,19 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           },
           width: 120
         },
+        {
+          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',
@@ -298,8 +353,14 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
               partitionKeys
               slugger
               active
+              type
+              useCase
               schedule
               timezone
+              supervisoryRole {
+                id
+                name
+              }
               updater {
                 id
                 name

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
   }
 }