@things-factory/dataset 5.0.4 → 5.0.5

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

@@ -112,7 +112,9 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               openPopup(
-                html` <data-sample-view .dataSample=${record} style="background-color: white;"></data-sample-view> `,
+                html`
+                  <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
+                `,
                 {
                   backdrop: true,
                   size: 'large',
@@ -147,17 +149,6 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           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: 'string',
           name: 'key01',
@@ -344,19 +335,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
               key03
               key04
               key05
-              dataSet {
-                id
-                name
-                description
-              }
               partitionKeys
-              dataItems {
-                name
-                description
-                tag
-                unit
-                spec
-              }
               data
               rawData
               ooc

package/client/pages/data-sample/data-sample-search-page.js

@@ -133,6 +133,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
 
       this.dataKeySet = response.data.dataKeySet
       this.refreshGristConfig()
+
+      this.grist.fetch()
     }
   }
 
@@ -168,7 +170,9 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               openPopup(
-                html` <data-sample-view .dataSample=${record} style="background-color: white;"></data-sample-view> `,
+                html`
+                  <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
+                `,
                 {
                   backdrop: true,
                   size: 'large',
@@ -301,6 +305,10 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
   }
 
   async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+    if (!this.dataKeySetId) {
+      return { records: [], total: 0 }
+    }
+
     const response = await client.query({
       query: gql`
         query ($dataKeySetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
@@ -323,18 +331,6 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
               data
               ooc
               oos
-              dataSet {
-                id
-                name
-                description
-              }
-              dataItems {
-                name
-                description
-                tag
-                unit
-                spec
-              }
               judgment
               workDate
               workShift

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

@@ -1,13 +1,19 @@
 import '@operato/dataset/ox-data-sample-view.js'
 
+import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 
+import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
 
 class DataSampleView extends localize(i18next)(LitElement) {
   static get properties() {
     return {
+      dataSampleId: {
+        type: String,
+        attribute: 'data-sample-id'
+      },
       dataSample: Object
     }
   }
@@ -42,10 +48,67 @@ class DataSampleView extends localize(i18next)(LitElement) {
   render() {
     return html`
       <div content>
-        <ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>
+        ${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : html``}
       </div>
     `
   }
+
+  updated(changes) {
+    if (changes.has('dataSampleId')) {
+      this.fetchDataSample()
+    }
+  }
+
+  async fetchDataSample() {
+    const id = this.dataSampleId
+
+    const response = await client.query({
+      query: gql`
+        query ($id: String!) {
+          dataSample(id: $id) {
+            id
+            name
+            description
+            useCase
+            key01
+            key02
+            key03
+            key04
+            key05
+            data
+            ooc
+            oos
+            dataSet {
+              id
+              name
+              description
+            }
+            dataItems {
+              name
+              description
+              tag
+              unit
+              spec
+            }
+            judgment
+            workDate
+            workShift
+            updater {
+              id
+              name
+            }
+            updatedAt
+            collectedAt
+          }
+        }
+      `,
+      variables: {
+        id
+      }
+    })
+
+    this.dataSample = response.data.dataSample
+  }
 }
 
 window.customElements.define('data-sample-view', DataSampleView)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -43,5 +43,5 @@
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "53af7004376fb8221cebe0c4c2ff3ed82418c22a"
+  "gitHead": "6a82800ed0252cf65918e2fe934ad3f3ba72e153"
 }