@things-factory/dataset 6.2.105 → 6.2.110

package/client/pages/data-sample/data-sample-page.ts

@@ -16,6 +16,13 @@ export class DataSampleViewPage extends localize(i18next)(PageView) {
       data-sample-view {
         flex: 1;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
   ]
 

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

@@ -15,6 +15,7 @@ import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
+import { GhostPrint } from '@operato/ghost-print'
 
 @customElement('data-sample-search-page')
 export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageView)) {
@@ -60,7 +61,13 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
         }
       },
       help: 'dataset/data-sample-search',
-      actions: [],
+      actions: [
+        {
+          title: i18next.t('button.print'),
+          action: this.printSamples.bind(this),
+          icon: 'print'
+        }
+      ],
       exportable: {
         name: i18next.t('title.data-sample search'),
         data: this._exportableData.bind(this)
@@ -170,16 +177,11 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           title: i18next.t('title.open data sample view'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
-              openPopup(
-                html`
-                  <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
-                `,
-                {
-                  backdrop: true,
-                  size: 'large',
-                  title: i18next.t('title.data-sample view')
-                }
-              )
+              openPopup(html` <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view> `, {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-sample view')
+              })
             }
           }
         },
@@ -319,12 +321,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     const response = await client.query({
       query: gql`
         query ($dataSetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: dataSamplesByDataSet(
-            dataSetId: $dataSetId
-            filters: $filters
-            pagination: $pagination
-            sortings: $sortings
-          ) {
+          responses: dataSamplesByDataSet(dataSetId: $dataSetId, filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -394,9 +391,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           .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)
+            record[key] = key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }
@@ -404,4 +399,14 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
 
     return { header: headerSetting, data: data }
   }
+
+  printSamples() {
+    const selected = this.grist.selected
+    const ids = selected.map(record => record.id).join('|')
+
+    GhostPrint.print({
+      src: `./data-samples?ids=${ids}`
+      // pending: 200 * selected.length
+    })
+  }
 }

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

@@ -1,4 +1,6 @@
 import '@operato/dataset/ox-data-sample-view.js'
+import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
 
 import gql from 'graphql-tag'
 import { css, html, LitElement, nothing } from 'lit'
@@ -11,25 +13,28 @@ import { DataSample } from '@operato/dataset'
 import { GhostPrint } from '@operato/ghost-print'
 
 @customElement('data-sample-view')
-class DataSampleView extends localize(i18next)(LitElement) {
+export class DataSampleView extends localize(i18next)(LitElement) {
   static styles = [
     ScrollbarStyles,
     css`
       :host {
-        display: flex;
-        flex-direction: column;
-
+        position: relative;
+        display: block;
+        overflow: auto;
         background-color: #fff;
       }
 
-      ox-data-sample-view {
-        flex: 1;
+      ox-data-sample-view,
+      ox-data-ooc-brief-view {
         padding: var(--padding-wide);
-        overflow: auto;
+      }
+
+      activity-thread-timeline {
+        margin: var(--margin-default);
       }
 
       mwc-fab {
-        position: absolute;
+        position: fixed;
         bottom: 15px;
         right: 16px;
         text-decoration: auto;
@@ -37,15 +42,6 @@ class DataSampleView extends localize(i18next)(LitElement) {
       }
 
       @media print {
-        :host {
-          display: block;
-        }
-
-        ox-data-sample-view {
-          flex: unset;
-          overflow: visible;
-        }
-
         mwc-fab {
           display: none;
         }
@@ -64,8 +60,41 @@ class DataSampleView extends localize(i18next)(LitElement) {
   private printHandler = this.handlePrint.bind(this)
 
   render() {
+    const dataSample = this.dataSample
+
+    if (!dataSample) {
+      return nothing
+    }
+
+    if (dataSample.dataOoc) {
+      var reviewActivityThread = dataSample.dataOoc.reviewActivityInstance?.activityThreads?.[0]
+      var resolveActivityThread = dataSample.dataOoc.resolveActivityInstance?.activityThreads?.[0]
+    } else {
+      var reviewActivityThread = dataSample?.reviewActivityInstance?.activityThreads?.[0]
+    }
+
     return html`
-      ${this.dataSample ? html`<ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>` : nothing}
+      ${!dataSample?.dataOoc
+        ? html` <ox-data-sample-view .dataSample=${dataSample}></ox-data-sample-view> `
+        : html` <ox-data-ooc-brief-view .dataOoc=${dataSample!.dataOoc}></ox-data-ooc-brief-view>`}
+      ${reviewActivityThread
+        ? html`
+            <activity-thread-timeline
+              subtitle=${String(i18next.t(dataSample?.dataOoc ? 'label.ooc review timeline' : 'label.datasample review timeline'))}
+              .activityThread=${reviewActivityThread}
+              short-form
+            ></activity-thread-timeline>
+          `
+        : nothing}
+      ${resolveActivityThread
+        ? html`
+            <activity-thread-timeline
+              subtitle=${String(i18next.t('label.ooc resolve timeline'))}
+              .activityThread=${resolveActivityThread}
+              short-form
+            ></activity-thread-timeline>
+          `
+        : nothing}
 
       <mwc-fab
         icon="print"
@@ -104,6 +133,12 @@ class DataSampleView extends localize(i18next)(LitElement) {
             data
             ooc
             oos
+            updatedAt
+            collectedAt
+            updater {
+              id
+              name
+            }
             dataSet {
               id
               name
@@ -126,12 +161,99 @@ class DataSampleView extends localize(i18next)(LitElement) {
             judgment
             workDate
             workShift
-            updater {
-              id
+            reviewActivityInstance {
+              ...ActivityInstanceFragment
+            }
+            dataOoc {
               name
+              description
+              useCase
+              dataSet {
+                id
+                name
+              }
+              key01
+              key02
+              key03
+              key04
+              key05
+              partitionKeys
+              dataItems {
+                name
+                description
+                active
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+              }
+              data
+              rawData
+              judgment
+              ooc
+              oos
+              state
+              history
+              workDate
+              workShift
+              correctiveInstruction
+              correctiveAction
+              reviewedAt
+              reviewer {
+                id
+                name
+              }
+              correctedAt
+              corrector {
+                id
+                name
+              }
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+
+              reviewActivityInstance {
+                ...ActivityInstanceFragment
+              }
+              resolveActivityInstance {
+                ...ActivityInstanceFragment
+              }
+            }
+          }
+        }
+
+        fragment ActivityInstanceFragment on ActivityInstance {
+          activityThreads {
+            assignee {
+              name
+            }
+            output
+            activityApprovals {
+              judgment
+              approver {
+                name
+              }
+              comment
+              createdAt
+              updatedAt
+              terminatedAt
+            }
+            activityThreadHistories {
+              transaction
+              reason
+              updater {
+                name
+              }
+              updatedAt
+              state
+              output
             }
-            updatedAt
-            collectedAt
           }
         }
       `,

package/client/pages/data-sample/data-samples-page.ts

@@ -1,7 +1,9 @@
 import '@operato/dataset/ox-data-sample-view.js'
+import '@operato/dataset/ox-data-ooc-brief-view.js'
+import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
 
 import gql from 'graphql-tag'
-import { PropertyValues, html, css } from 'lit'
+import { PropertyValues, html, css, nothing } from 'lit'
 import { customElement, state } from 'lit/decorators.js'
 import { PageView } from '@operato/shell'
 import { i18next, localize } from '@operato/i18n'
@@ -19,7 +21,7 @@ export class DataSamplesPage extends localize(i18next)(PageView) {
         overflow: auto;
       }
 
-      ox-data-sample-view {
+      .end {
         page-break-after: always;
         break-after: always;
       }
@@ -35,7 +37,39 @@ export class DataSamplesPage extends localize(i18next)(PageView) {
   }
 
   render() {
-    return this.dataSamples?.map(dataSample => html` <ox-data-sample-view .dataSample=${dataSample}></ox-data-sample-view> `)
+    return this.dataSamples?.map(dataSample => {
+      if (dataSample?.dataOoc) {
+        var reviewActivityThread = dataSample.dataOoc.reviewActivityInstance?.activityThreads?.[0]
+        var resolveActivityThread = dataSample.dataOoc.resolveActivityInstance?.activityThreads?.[0]
+      } else {
+        var reviewActivityThread = dataSample?.reviewActivityInstance?.activityThreads?.[0]
+      }
+
+      return html`
+        ${!dataSample.dataOoc
+          ? html` <ox-data-sample-view .dataSample=${dataSample}></ox-data-sample-view> `
+          : html` <ox-data-ooc-brief-view .dataOoc=${dataSample.dataOoc}></ox-data-ooc-brief-view>`}
+        ${reviewActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t(dataSample?.dataOoc ? 'label.ooc review timeline' : 'label.datasample review timeline'))}
+                .activityThread=${reviewActivityThread}
+                short-form
+              ></activity-thread-timeline>
+            `
+          : nothing}
+        ${resolveActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t('label.ooc resolve timeline'))}
+                .activityThread=${resolveActivityThread}
+                short-form
+              ></activity-thread-timeline>
+            `
+          : nothing}
+        <div class="end"></div>
+      `
+    })
   }
 
   updated(changes: PropertyValues<this>) {}
@@ -79,6 +113,12 @@ export class DataSamplesPage extends localize(i18next)(PageView) {
               data
               ooc
               oos
+              updatedAt
+              collectedAt
+              updater {
+                id
+                name
+              }
               dataSet {
                 id
                 name
@@ -101,12 +141,98 @@ export class DataSamplesPage extends localize(i18next)(PageView) {
               judgment
               workDate
               workShift
+              reviewActivityInstance {
+                ...ActivityInstanceFragment
+              }
+              dataOoc {
+                name
+                description
+                useCase
+                dataSet {
+                  id
+                  name
+                }
+                key01
+                key02
+                key03
+                key04
+                key05
+                partitionKeys
+                dataItems {
+                  name
+                  description
+                  active
+                  tag
+                  group
+                  type
+                  unit
+                  options
+                  quota
+                  spec
+                }
+                data
+                rawData
+                judgment
+                ooc
+                oos
+                state
+                history
+                workDate
+                workShift
+                correctiveInstruction
+                correctiveAction
+                reviewedAt
+                reviewer {
+                  id
+                  name
+                }
+                correctedAt
+                corrector {
+                  id
+                  name
+                }
+                updater {
+                  id
+                  name
+                }
+                updatedAt
+                collectedAt
+                reviewActivityInstance {
+                  ...ActivityInstanceFragment
+                }
+                resolveActivityInstance {
+                  ...ActivityInstanceFragment
+                }
+              }
+            }
+          }
+        }
+
+        fragment ActivityInstanceFragment on ActivityInstance {
+          activityThreads {
+            assignee {
+              name
+            }
+            output
+            activityApprovals {
+              judgment
+              approver {
+                name
+              }
+              comment
+              createdAt
+              updatedAt
+              terminatedAt
+            }
+            activityThreadHistories {
+              transaction
+              reason
               updater {
-                id
                 name
               }
               updatedAt
-              collectedAt
+              state
+              output
             }
           }
         }

package/client/pages/data-set/data-item-list.ts

@@ -153,7 +153,7 @@ class DataItemList extends localize(i18next)(LitElement) {
           name: 'type',
           header: i18next.t('field.type'),
           record: {
-            options: ['', 'number', 'text', 'select', 'boolean', 'date', 'datetime', 'file'],
+            options: ['', 'number', 'text', 'select', 'radio', 'boolean', 'date', 'datetime', 'file'],
             editable: true
           },
           width: 120
@@ -170,7 +170,7 @@ class DataItemList extends localize(i18next)(LitElement) {
                 name: record.type,
                 help: '',
                 spec:
-                  record.type === 'select'
+                  record.type === 'select' || record.type === 'radio'
                     ? [
                         {
                           type: 'options' /* property-editor type */,

package/dist-client/activities/activity-data-collect-view.js

@@ -66,6 +66,13 @@ DataCollectActivityView.styles = [
         padding: 10px;
         overflow: auto;
       }
+
+      @media print {
+        :host {
+          display: block;
+          overflow: visible;
+        }
+      }
     `
 ];
 __decorate([

package/dist-client/activities/activity-data-collect-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-data-collect-view.js","sourceRoot":"","sources":["../../client/activities/activity-data-collect-view.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI1C,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAwBxE,MAAM;QACJ,OAAO,IAAI,CAAA,iCAAiC,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,MAAM,wBAAwB,CAAA;IACxG,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,YAAY,EAAE,CAAA;SACpB;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;QAE/B,IAAI,EAAE,EAAE;YACN,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;SAuBT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AArEM,8BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;KAaF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uDAAa;AAExC;IAAC,KAAK,EAAE;;wDAAmC;AAtBhC,uBAAuB;IADnC,aAAa,CAAC,4BAA4B,CAAC;GAC/B,uBAAuB,CAuEnC;SAvEY,uBAAuB","sourcesContent":["import '@operato/dataset/ox-data-entry-view.js'\n\nimport gql from 'graphql-tag'\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, query, state } from 'lit/decorators.js'\n\nimport { client } from '@operato/graphql'\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { DataSet } from '@operato/dataset'\n\n@customElement('activity-data-collect-view')\nexport class DataCollectActivityView extends localize(i18next)(LitElement) {\n  static styles = [\n    ScrollbarStyles,\n    css`\n      :host {\n        display: flex;\n        flex-direction: column;\n\n        background-color: #fff;\n      }\n\n      ox-data-entry-view {\n        flex: 1;\n        padding: 10px;\n        overflow: auto;\n      }\n    `\n  ]\n\n  @property({ type: Object }) input?: any\n  @property({ type: Object }) output?: any\n\n  @state() dataSet?: DataSet & { id: string }\n\n  render() {\n    return html` <ox-data-entry-view .dataSet=${this.dataSet} .value=${this.output}></ox-data-entry-view>`\n  }\n\n  updated(changes) {\n    if (changes.has('input')) {\n      this.fetchDataSet()\n    }\n  }\n\n  async fetchDataSet() {\n    const id = this.input.dataSetId\n\n    if (id) {\n      const response = await client.query({\n        query: gql`\n          query ($id: String!) {\n            dataSet(id: $id) {\n              id\n              name\n              description\n              useCase\n              dataItems {\n                name\n                description\n                active\n                hidden\n                tag\n                group\n                type\n                unit\n                options\n                quota\n                spec\n                stat\n              }\n            }\n          }\n        `,\n        variables: {\n          id\n        }\n      })\n\n      this.dataSet = response.data.dataSet\n    }\n  }\n}\n"]}
+{"version":3,"file":"activity-data-collect-view.js","sourceRoot":"","sources":["../../client/activities/activity-data-collect-view.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI1C,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA+BxE,MAAM;QACJ,OAAO,IAAI,CAAA,iCAAiC,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,MAAM,wBAAwB,CAAA;IACxG,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,YAAY,EAAE,CAAA;SACpB;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;QAE/B,IAAI,EAAE,EAAE;YACN,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;SAuBT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AA5EM,8BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;KAoBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uDAAa;AAExC;IAAC,KAAK,EAAE;;wDAAmC;AA7BhC,uBAAuB;IADnC,aAAa,CAAC,4BAA4B,CAAC;GAC/B,uBAAuB,CA8EnC;SA9EY,uBAAuB","sourcesContent":["import '@operato/dataset/ox-data-entry-view.js'\n\nimport gql from 'graphql-tag'\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, query, state } from 'lit/decorators.js'\n\nimport { client } from '@operato/graphql'\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { DataSet } from '@operato/dataset'\n\n@customElement('activity-data-collect-view')\nexport class DataCollectActivityView extends localize(i18next)(LitElement) {\n  static styles = [\n    ScrollbarStyles,\n    css`\n      :host {\n        display: flex;\n        flex-direction: column;\n\n        background-color: #fff;\n      }\n\n      ox-data-entry-view {\n        flex: 1;\n        padding: 10px;\n        overflow: auto;\n      }\n\n      @media print {\n        :host {\n          display: block;\n          overflow: visible;\n        }\n      }\n    `\n  ]\n\n  @property({ type: Object }) input?: any\n  @property({ type: Object }) output?: any\n\n  @state() dataSet?: DataSet & { id: string }\n\n  render() {\n    return html` <ox-data-entry-view .dataSet=${this.dataSet} .value=${this.output}></ox-data-entry-view>`\n  }\n\n  updated(changes) {\n    if (changes.has('input')) {\n      this.fetchDataSet()\n    }\n  }\n\n  async fetchDataSet() {\n    const id = this.input.dataSetId\n\n    if (id) {\n      const response = await client.query({\n        query: gql`\n          query ($id: String!) {\n            dataSet(id: $id) {\n              id\n              name\n              description\n              useCase\n              dataItems {\n                name\n                description\n                active\n                hidden\n                tag\n                group\n                type\n                unit\n                options\n                quota\n                spec\n                stat\n              }\n            }\n          }\n        `,\n        variables: {\n          id\n        }\n      })\n\n      this.dataSet = response.data.dataSet\n    }\n  }\n}\n"]}

package/dist-client/activities/activity-data-review-edit.d.ts

@@ -5,7 +5,7 @@ export declare class DataReviewActivityEdit extends DataReviewActivityEdit_base
     static styles: import("lit").CSSResult[];
     input?: any;
     output?: any;
-    dataReview?: any;
+    dataSample?: any;
     render(): import("lit-html").TemplateResult<1>;
     onChangeInstruction(e: Event): void;
     updated(changes: any): void;

package/dist-client/activities/activity-data-review-edit.js

@@ -1,14 +1,16 @@
 import { __decorate, __metadata } from "tslib";
 import '@operato/dataset/ox-data-entry-form.js';
+import gql from 'graphql-tag';
 import { css, html, LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { i18next, localize } from '@operato/i18n';
 import { ScrollbarStyles } from '@operato/styles';
+import { client } from '@operato/graphql';
 let DataReviewActivityEdit = class DataReviewActivityEdit extends localize(i18next)(LitElement) {
     render() {
         return html `
       <div content>
-        <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>
+        <ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>
       </div>
     `;
     }
@@ -25,9 +27,65 @@ let DataReviewActivityEdit = class DataReviewActivityEdit extends localize(i18ne
         }
     }
     async fetchDataAssign() {
-        var _a;
-        const dataSample = (_a = this.input) === null || _a === void 0 ? void 0 : _a.dataSample;
-        this.dataReview = dataSample;
+        const { dataSampleId, dataSample } = this.input || {};
+        if (dataSample) {
+            /* only for backwards compatibility - should be deleted later */
+            this.dataSample = dataSample;
+        }
+        else if (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
+                active
+                hidden
+                tag
+                group
+                type
+                unit
+                options
+                quota
+                spec
+                stat
+              }
+              judgment
+              workDate
+              workShift
+              updater {
+                id
+                name
+              }
+              updatedAt
+              collectedAt
+            }
+          }
+        `,
+                variables: {
+                    id: dataSampleId
+                }
+            });
+            this.dataSample = Object.assign({}, response.data.dataSample);
+        }
     }
 };
 DataReviewActivityEdit.styles = [
@@ -66,7 +124,7 @@ __decorate([
 __decorate([
     state(),
     __metadata("design:type", Object)
-], DataReviewActivityEdit.prototype, "dataReview", void 0);
+], DataReviewActivityEdit.prototype, "dataSample", void 0);
 DataReviewActivityEdit = __decorate([
     customElement('activity-data-review-edit')
 ], DataReviewActivityEdit);

package/dist-client/activities/activity-data-review-edit.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-data-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAgCvE,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,UAAU;;KAErD,CAAA;IACH,CAAC;IAED,mBAAmB,CAAC,CAAQ;QAC1B,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAA;QAClB,IAAI,CAAC,MAAM,CAAC,WAAW,GAAI,CAAC,CAAC,MAA8B,CAAC,KAAK,CAAA;QAEjE,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CACH,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,CAAA;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;;AA3DM,6BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;KAqBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAa;AAExC;IAAC,KAAK,EAAE;;0DAAiB;AA9Bd,sBAAsB;IADlC,aAAa,CAAC,2BAA2B,CAAC;GAC9B,sBAAsB,CA6DlC;SA7DY,sBAAsB","sourcesContent":["import '@operato/dataset/ox-data-entry-form.js'\n\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, state } from 'lit/decorators.js'\n\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\n\n@customElement('activity-data-review-edit')\nexport class DataReviewActivityEdit extends localize(i18next)(LitElement) {\n  static styles = [\n    ScrollbarStyles,\n    css`\n      :host {\n        display: flex;\n        flex-direction: column;\n\n        background-color: #fff;\n      }\n\n      div[content] {\n        flex: 1;\n        flex-direction: column;\n\n        display: flex;\n        overflow: auto;\n      }\n\n      ox-data-sample-view {\n        flex: 1;\n        padding: var(--padding-wide);\n        overflow: auto;\n      }\n    `\n  ]\n\n  @property({ type: Object }) input?: any\n  @property({ type: Object }) output?: any\n\n  @state() dataReview?: any\n\n  render() {\n    return html`\n      <div content>\n        <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>\n      </div>\n    `\n  }\n\n  onChangeInstruction(e: Event) {\n    this.output ||= {}\n    this.output.instruction = (e.target as HTMLTextAreaElement).value\n\n    this.dispatchEvent(\n      new CustomEvent('change', {\n        detail: this.output\n      })\n    )\n  }\n\n  updated(changes) {\n    if (changes.has('input')) {\n      this.fetchDataAssign()\n    }\n  }\n\n  async fetchDataAssign() {\n    const dataSample = this.input?.dataSample\n    this.dataReview = dataSample\n  }\n}\n"]}
+{"version":3,"file":"activity-data-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAGlC,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAgCvE,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,UAAU;;KAErD,CAAA;IACH,CAAC;IAED,mBAAmB,CAAC,CAAQ;QAC1B,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAA;QAClB,IAAI,CAAC,MAAM,CAAC,WAAW,GAAI,CAAC,CAAC,MAA8B,CAAC,KAAK,CAAA;QAEjE,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CACH,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAA;QAErD,IAAI,UAAU,EAAE;YACd,gEAAgE;YAChE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;SAC7B;aAAM,IAAI,YAAY,EAAE;YACvB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA6CT;gBACD,SAAS,EAAE;oBACT,EAAE,EAAE,YAAY;iBACjB;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,qBACV,QAAQ,CAAC,IAAI,CAAC,UAAU,CAC5B,CAAA;SACF;IACH,CAAC;;AAvHM,6BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;KAqBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAa;AAExC;IAAC,KAAK,EAAE;;0DAAiB;AA9Bd,sBAAsB;IADlC,aAAa,CAAC,2BAA2B,CAAC;GAC9B,sBAAsB,CAyHlC;SAzHY,sBAAsB","sourcesContent":["import '@operato/dataset/ox-data-entry-form.js'\n\nimport gql from 'graphql-tag'\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, state } from 'lit/decorators.js'\n\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { client } from '@operato/graphql'\n\n@customElement('activity-data-review-edit')\nexport class DataReviewActivityEdit extends localize(i18next)(LitElement) {\n  static styles = [\n    ScrollbarStyles,\n    css`\n      :host {\n        display: flex;\n        flex-direction: column;\n\n        background-color: #fff;\n      }\n\n      div[content] {\n        flex: 1;\n        flex-direction: column;\n\n        display: flex;\n        overflow: auto;\n      }\n\n      ox-data-sample-view {\n        flex: 1;\n        padding: var(--padding-wide);\n        overflow: auto;\n      }\n    `\n  ]\n\n  @property({ type: Object }) input?: any\n  @property({ type: Object }) output?: any\n\n  @state() dataSample?: any\n\n  render() {\n    return html`\n      <div content>\n        <ox-data-sample-view .dataSample=${this.dataSample}></ox-data-sample-view>\n      </div>\n    `\n  }\n\n  onChangeInstruction(e: Event) {\n    this.output ||= {}\n    this.output.instruction = (e.target as HTMLTextAreaElement).value\n\n    this.dispatchEvent(\n      new CustomEvent('change', {\n        detail: this.output\n      })\n    )\n  }\n\n  updated(changes) {\n    if (changes.has('input')) {\n      this.fetchDataAssign()\n    }\n  }\n\n  async fetchDataAssign() {\n    const { dataSampleId, dataSample } = this.input || {}\n\n    if (dataSample) {\n      /* only for backwards compatibility - should be deleted later */\n      this.dataSample = dataSample\n    } else if (dataSampleId) {\n      const response = await client.query({\n        query: gql`\n          query ($id: String!) {\n            dataSample(id: $id) {\n              id\n              name\n              description\n              useCase\n              key01\n              key02\n              key03\n              key04\n              key05\n              data\n              ooc\n              oos\n              dataSet {\n                id\n                name\n                description\n              }\n              dataItems {\n                name\n                description\n                active\n                hidden\n                tag\n                group\n                type\n                unit\n                options\n                quota\n                spec\n                stat\n              }\n              judgment\n              workDate\n              workShift\n              updater {\n                id\n                name\n              }\n              updatedAt\n              collectedAt\n            }\n          }\n        `,\n        variables: {\n          id: dataSampleId\n        }\n      })\n\n      this.dataSample = {\n        ...response.data.dataSample\n      }\n    }\n  }\n}\n"]}

package/dist-client/activities/activity-data-review-view.d.ts

@@ -5,7 +5,7 @@ export declare class DataReviewActivityView extends DataReviewActivityView_base
     static styles: import("lit").CSSResult[];
     input?: any;
     output?: any;
-    dataReview?: any;
+    dataSample?: any;
     render(): import("lit-html").TemplateResult<1>;
     onChangeInstruction(e: Event): void;
     updated(changes: any): void;