@things-factory/dataset 7.0.0-alpha.6 → 7.0.0-alpha.8

package/client/pages/data-ooc/data-oocs-page.ts

@@ -1,7 +1,8 @@
 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 +20,11 @@ export class DataOocsPage extends localize(i18next)(PageView) {
         overflow: auto;
       }
 
-      ox-data-ooc-brief-view {
+      activity-thread-timeline {
+        margin: var(--margin-default);
+      }
+
+      .end {
         page-break-after: always;
         break-after: always;
       }
@@ -35,7 +40,33 @@ export class DataOocsPage extends localize(i18next)(PageView) {
   }
 
   render() {
-    return this.dataOocs?.map(dataOoc => html` <ox-data-ooc-brief-view .dataOoc=${dataOoc}></ox-data-ooc-brief-view> `)
+    return this.dataOocs?.map(dataOoc => {
+      const reviewActivityThread = dataOoc?.reviewActivityInstance?.activityThreads?.[0]
+      const resolveActivityThread = dataOoc?.resolveActivityInstance?.activityThreads?.[0]
+
+      return html`
+        <ox-data-ooc-brief-view .dataOoc=${dataOoc}></ox-data-ooc-brief-view>
+        ${reviewActivityThread
+          ? html`
+              <activity-thread-timeline
+                subtitle=${String(i18next.t('label.ooc 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>
+      `
+    })
   }
 
   pageUpdated(changes: any, lifecycle: any, before: any) {
@@ -83,6 +114,7 @@ export class DataOocsPage extends localize(i18next)(PageView) {
                 name
                 description
                 active
+                hidden
                 tag
                 group
                 type
@@ -90,6 +122,7 @@ export class DataOocsPage extends localize(i18next)(PageView) {
                 options
                 quota
                 spec
+                stat
               }
               data
               rawData
@@ -118,6 +151,41 @@ export class DataOocsPage extends localize(i18next)(PageView) {
               }
               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
             }
           }
         }

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

@@ -28,6 +28,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         flex-direction: column;
 
         overflow: hidden;
+
+        --grid-header-padding: 2px 0 2px 9px;
       }
 
       ox-grist {
@@ -107,16 +109,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           gutterName: 'button',
           fixed: true,
           icon: 'assignment',
-          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')
-              })
-            }
-          }
+          title: i18next.t('title.open data sample view')
         },
         {
           type: 'string',
@@ -147,7 +140,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key01',
-          header: i18next.t('field.key-01'),
+          header: {
+            renderer: i18next.t('field.key-01'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -158,7 +154,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key02',
-          header: i18next.t('field.key-02'),
+          header: {
+            renderer: i18next.t('field.key-02'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -169,7 +168,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key03',
-          header: i18next.t('field.key-03'),
+          header: {
+            renderer: i18next.t('field.key-03'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -180,7 +182,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key04',
-          header: i18next.t('field.key-04'),
+          header: {
+            renderer: i18next.t('field.key-04'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -191,7 +196,10 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         {
           type: 'string',
           name: 'key05',
-          header: i18next.t('field.key-05'),
+          header: {
+            renderer: i18next.t('field.key-05'),
+            group: i18next.t('field.key')
+          },
           record: {
             editable: false
           },
@@ -228,7 +236,7 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           imex: true
         },
         {
-          type: 'text',
+          type: 'json5',
           name: 'rawData',
           header: i18next.t('field.raw-data'),
           record: {
@@ -299,6 +307,15 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           return {
             emphasized
           }
+        },
+        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')
+            })
+          }
         }
       },
       sorters: [

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

@@ -174,16 +174,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           gutterName: 'button',
           fixed: true,
           icon: 'assignment',
-          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')
-              })
-            }
-          }
+          title: i18next.t('title.open data sample view')
         },
         {
           type: 'string',
@@ -302,6 +293,15 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           return {
             emphasized
           }
+        },
+        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')
+            })
+          }
         }
       },
       sorters: [
@@ -405,8 +405,8 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     const ids = selected.map(record => record.id).join('|')
 
     GhostPrint.print({
-      src: `./data-samples?ids=${ids}`,
-      pending: 300 * selected.length
+      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,100 @@ 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
+                hidden
+                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,100 @@ 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
+                  hidden
+                  tag
+                  group
+                  type
+                  unit
+                  options
+                  quota
+                  spec
+                  stat
+                }
+                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
             }
           }
         }