@things-factory/dataset 5.0.0-alpha.24 → 5.0.0-alpha.27

package/client/pages/{data-entry-form.js → data-entry/data-entry-form.js}

@@ -21,6 +21,7 @@ class DataEntryForm extends localize(i18next)(LitElement) {
           flex-direction: column;
 
           background-color: #fff;
+          overflow: auto;
         }
 
         ox-data-entry-form {

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

@@ -0,0 +1,324 @@
+import '@operato/data-grist'
+import './data-entry-form'
+
+import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
+import { PageView, store } from '@operato/shell'
+import { css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
+import { notify, openPopup } from '@operato/layout'
+
+import JSON5 from 'json5'
+import { OxDataUseCase } from '@operato/dataset'
+import { client } from '@operato/graphql'
+import { connect } from 'pwa-helpers/connect-mixin'
+import gql from 'graphql-tag'
+
+export class DataEntryListPage extends connect(store)(localize(i18next)(PageView)) {
+  static get properties() {
+    return {
+      active: String,
+      gristConfig: Object,
+      filters: Object,
+      sorters: Object,
+      mode: String
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      CommonGristStyles,
+      css`
+        :host {
+          display: flex;
+
+          width: 100%;
+
+          --grid-record-emphasized-background-color: red;
+          --grid-record-emphasized-color: yellow;
+        }
+      `
+    ]
+  }
+
+  get context() {
+    return {
+      title: i18next.t('title.data-entry list'),
+      help: 'dataset/data-entry-list'
+    }
+  }
+
+  render() {
+    const mode = 'CARD'
+
+    return html`
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .filters=${this.filters}
+        .orders=${this.orders}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+      >
+        <div slot="headroom" id="filters">
+          <div id="filters">
+            <ox-filters-form></ox-filters-form>
+          </div>
+
+          <div id="sorters">
+            Sort
+            <mwc-icon
+              @click=${e => {
+                const target = e.currentTarget
+                this.renderRoot.querySelector('#sorter-control').open({
+                  right: 0,
+                  top: target.offsetTop + target.offsetHeight
+                })
+              }}
+              >expand_more</mwc-icon
+            >
+            <ox-popup id="sorter-control">
+              <ox-sorters-control> </ox-sorters-control>
+            </ox-popup>
+          </div>
+        </div>
+      </ox-grist>
+    `
+  }
+
+  get grist() {
+    return this.renderRoot.querySelector('ox-grist')
+  }
+
+  async pageInitialized(lifecycle) {
+    this.gristConfig = {
+      list: {
+        fields: ['name', 'description'],
+        details: ['schedule', 'active']
+      },
+      columns: [
+        {
+          type: 'string',
+          name: 'name',
+          header: i18next.t('field.name'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'description',
+          header: i18next.t('field.description'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          width: 200
+        },
+        {
+          type: 'checkbox',
+          name: 'active',
+          label: true,
+          header: i18next.t('field.active'),
+          record: {
+            editable: false
+          },
+          filter: true,
+          sortable: true,
+          width: 60
+        },
+        {
+          type: 'select',
+          name: 'type',
+          label: true,
+          header: i18next.t('field.type'),
+          record: {
+            editable: false,
+            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: false,
+            options: () => {
+              return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
+                return {
+                  display: name,
+                  value: name
+                }
+              })
+            }
+          },
+          sortable: true,
+          filter: {
+            operator: 'eq',
+            options: () => {
+              return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
+                return {
+                  display: name,
+                  value: name
+                }
+              })
+            }
+          },
+          width: 80
+        },
+        {
+          type: 'crontab',
+          name: 'schedule',
+          label: true,
+          header: i18next.t('field.schedule'),
+          record: {
+            editable: true,
+            options: {
+              objectified: true
+            }
+          },
+          width: 80,
+          label: true
+        },
+        {
+          type: 'resource-object',
+          name: 'supervisoryRole',
+          header: i18next.t('field.supervisory-role'),
+          record: {
+            editable: true,
+            options: {
+              queryName: 'roles'
+            }
+          },
+          sortable: true,
+          width: 120
+        }
+      ],
+      rows: {
+        selectable: {
+          multiple: false
+        },
+        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')
+            })
+          }
+        },
+        classifier: function (record, rowIndex) {}
+      },
+      sorters: [
+        {
+          name: 'name'
+        }
+      ]
+    }
+
+    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 = [] }) {
+    const response = await client.query({
+      query: gql`
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          responses: dataSets(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              name
+              description
+              partitionKeys
+              slugger
+              active
+              type
+              useCase
+              schedule
+              timezone
+              supervisoryRole {
+                id
+                name
+              }
+              updater {
+                id
+                name
+              }
+              updatedAt
+              dataItems {
+                name
+                description
+                sequence
+                active
+                tag
+                type
+                unit
+                options
+                quota
+                spec
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters,
+        pagination: { page, limit },
+        sortings
+      }
+    })
+
+    return {
+      total: response.data.responses.total || 0,
+      records: response.data.responses.items || []
+    }
+  }
+}
+
+window.customElements.define('data-entry-list-page', DataEntryListPage)

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

@@ -12,7 +12,7 @@ import { PageView, store } from '@operato/shell'
 import { ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
-export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
+export class DataOocListPage extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
       active: String,
@@ -54,7 +54,7 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
   get context() {
     return {
       title: i18next.t('title.data-ooc list'),
-      help: 'integration/ui/data-ooc',
+      help: 'dataset/data-ooc',
       actions: [
         // {
         //   title: i18next.t('button.save'),
@@ -485,4 +485,4 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
   }
 }
 
-window.customElements.define('data-ooc-page', DataOoc)
+window.customElements.define('data-ooc-list-page', DataOocListPage)

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

@@ -12,7 +12,7 @@ import { PageView, store } from '@operato/shell'
 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,
@@ -54,7 +54,7 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
   get context() {
     return {
       title: i18next.t('title.data-sample list'),
-      help: 'integration/ui/data-sample',
+      help: 'dataset/data-sample',
       actions: [],
       exportable: {
         name: i18next.t('title.data-sample list'),
@@ -388,4 +388,4 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
   }
 }
 
-window.customElements.define('data-sample-page', DataSample)
+window.customElements.define('data-sample-list-page', DataSampleListPage)

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

@@ -11,7 +11,7 @@ import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 import { notify } from '@operato/layout'
 
-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'),
@@ -438,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-set.js → data-set/data-set-list-page.js}

@@ -1,7 +1,7 @@
 import '@operato/data-grist'
-import './data-item-list'
-import './data-set-importer'
-import './data-entry-form'
+import './data-item-list.js'
+import './data-set-importer.js'
+import '../data-entry/data-entry-form.js'
 
 import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { PageView, store } from '@operato/shell'
@@ -17,7 +17,7 @@ import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
 import moment from 'moment-timezone'
 
-export class DataSet extends connect(store)(localize(i18next)(PageView)) {
+export class DataSetListPage extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
       active: String,
@@ -48,7 +48,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
   get context() {
     return {
       title: i18next.t('title.data-set list'),
-      help: 'integration/ui/data-set',
+      help: 'dataset/data-set',
       actions: [
         {
           title: i18next.t('button.copy'),
@@ -549,4 +549,4 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
   }
 }
 
-window.customElements.define('data-set-page', DataSet)
+window.customElements.define('data-set-list-page', DataSetListPage)

package/client/route.js

@@ -1,19 +1,23 @@
 export default function route(page) {
   switch (page) {
-    case 'data-set':
-      import('./pages/data-set')
+    case 'data-set-list':
+      import('./pages/data-set/data-set-list-page.js')
       return page
 
-    case 'data-sensor':
-      import('./pages/data-sensor')
+    case 'data-sensor-list':
+      import('./pages/data-sensor/data-sensor-list-page.js')
       return page
 
-    case 'data-sample':
-      import('./pages/data-sample')
+    case 'data-sample-list':
+      import('./pages/data-sample/data-sample-list-page.js')
       return page
 
-    case 'data-ooc':
-      import('./pages/data-ooc')
+    case 'data-ooc-list':
+      import('./pages/data-ooc/data-ooc-list-page.js')
+      return page
+
+    case 'data-entry-list':
+      import('./pages/data-entry/data-entry-list-page.js')
       return page
   }
 }

package/dist-server/controllers/create-data-sample.js

@@ -67,7 +67,7 @@ async function createDataSample(dataSample, context) {
     partitionKeys = formatDate(partitionKeys, momentUtc);
     partitionKeys = replaceVariables(partitionKeys, Object.assign({}, dataSample.data));
     const { ooc, oos } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
-    const { workDate, workShift } = (0, work_shift_1.getWorkDateAndShift)(domain, collectedAt);
+    const { workDate, workShift } = await (0, work_shift_1.getWorkDateAndShift)(domain, collectedAt);
     const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), { domain,
         partitionKeys,
         spec,

package/dist-server/controllers/create-data-sample.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.24",
+  "version": "5.0.0-alpha.27",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,20 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "1.0.0-alpha.46",
-    "@operato/data-grist": "1.0.0-alpha.46",
-    "@operato/dataset": "1.0.0-alpha.46",
-    "@operato/graphql": "1.0.0-alpha.46",
-    "@operato/i18n": "1.0.0-alpha.46",
-    "@operato/layout": "1.0.0-alpha.46",
-    "@operato/shell": "1.0.0-alpha.46",
-    "@operato/styles": "1.0.0-alpha.46",
-    "@operato/utils": "1.0.0-alpha.46",
-    "@things-factory/auth-base": "^5.0.0-alpha.24",
-    "@things-factory/env": "^5.0.0-alpha.24",
-    "@things-factory/shell": "^5.0.0-alpha.24",
-    "@things-factory/work-shift": "^5.0.0-alpha.24",
+    "@operato/app": "1.0.0-alpha.48",
+    "@operato/data-grist": "1.0.0-alpha.48",
+    "@operato/dataset": "1.0.0-alpha.48",
+    "@operato/graphql": "1.0.0-alpha.48",
+    "@operato/i18n": "1.0.0-alpha.48",
+    "@operato/layout": "1.0.0-alpha.48",
+    "@operato/shell": "1.0.0-alpha.48",
+    "@operato/styles": "1.0.0-alpha.48",
+    "@operato/utils": "1.0.0-alpha.48",
+    "@things-factory/auth-base": "^5.0.0-alpha.27",
+    "@things-factory/env": "^5.0.0-alpha.27",
+    "@things-factory/shell": "^5.0.0-alpha.27",
+    "@things-factory/work-shift": "^5.0.0-alpha.27",
     "moment": "^2.29.1"
   },
-  "gitHead": "077d90d32fa548afd4925ce07f8f7f27c6b3399a"
+  "gitHead": "57962482d2b5a5aaba07d7477f3f35938d6e66b8"
 }

package/server/controllers/create-data-sample.ts

@@ -94,7 +94,7 @@ export async function createDataSample(
   })
 
   const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
-  const { workDate, workShift } = getWorkDateAndShift(domain, collectedAt)
+  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
 
   const result = await tx.getRepository(DataSample).save({
     name: dataSet.name,

package/things-factory.config.js

@@ -5,20 +5,24 @@ export default {
   route,
   routes: [
     {
-      tagname: 'data-set-page',
-      page: 'data-set'
+      tagname: 'data-set-list-page',
+      page: 'data-set-list'
     },
     {
-      tagname: 'data-sensor-page',
-      page: 'data-sensor'
+      tagname: 'data-sensor-list-page',
+      page: 'data-sensor-list'
     },
     {
-      tagname: 'data-sample-page',
-      page: 'data-sample'
+      tagname: 'data-sample-list-page',
+      page: 'data-sample-list'
     },
     {
-      tagname: 'data-ooc-page',
-      page: 'data-ooc'
+      tagname: 'data-ooc-list-page',
+      page: 'data-ooc-list'
+    },
+    {
+      tagname: 'data-entry-list-page',
+      page: 'data-entry-list'
     }
   ],
   bootstrap

package/translations/en.json

@@ -30,6 +30,7 @@
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "title.data-entry-form": "data entry form",
+  "title.data-entry list": "data entry list",
   "title.data-item list": "data item list",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
@@ -37,4 +38,4 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}