@things-factory/dataset 6.0.25 → 6.0.27

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.25",
+  "version": "6.0.27",
   "main": "dist-server/index.js",
-  "browser": "client/index.js",
+  "browser": "dist-client/index.js",
   "things-factory": true,
   "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "module for handling data collection",
@@ -16,10 +16,12 @@
     "directory": "packages/dataset"
   },
   "scripts": {
-    "build": "tsc --p tsconfig.json",
-    "build:server": "npm run clean:server && tsc",
-    "clean:server": "rm -rf dist-server",
-    "clean": "npm run clean:server",
+    "build": "npm run build:server && npm run build:client",
+    "build:client": "npx tsc --p ./client/tsconfig.json",
+    "build:server": "npx tsc --p ./server/tsconfig.json",
+    "clean:client": "npx rimraf dist-client",
+    "clean:server": "npx rimraf dist-server",
+    "clean": "npm run clean:server && npm run clean:client",
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
@@ -33,14 +35,15 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.0.25",
-    "@things-factory/aws-base": "^6.0.25",
-    "@things-factory/board-service": "^6.0.25",
+    "@things-factory/auth-base": "^6.0.27",
+    "@things-factory/aws-base": "^6.0.27",
+    "@things-factory/board-service": "^6.0.27",
     "@things-factory/env": "^6.0.7",
-    "@things-factory/shell": "^6.0.25",
-    "@things-factory/work-shift": "^6.0.25",
+    "@things-factory/shell": "^6.0.27",
+    "@things-factory/work-shift": "^6.0.27",
+    "@things-factory/worklist": "^6.0.27",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "8a987a42de944dc915b8cfddb047eb7bc0d4ba41"
+  "gitHead": "684784a4f3e450e9ce07dcd51db70b8a2d2c2a0f"
 }

package/server/controllers/activity-template/activity-ooc.ts

@@ -0,0 +1,55 @@
+export const ActivityOoc = {
+  name: 'OOC Review',
+  description: 'Task to take remedial action based on Out Of Control data',
+  release: '1.0.0',
+  provider: 'hatiolab.com',
+  category: 'quality',
+  activityType: 'user',
+  startable: true,
+  model: [
+    {
+      name: 'dataOocId',
+      description: 'OOC id',
+      tag: 'dataOocId',
+      hidden: true,
+      mandatory: true,
+      inout: 'in',
+      type: 'string',
+      options: {},
+      unit: null,
+      quantifier: [1],
+      spec: {}
+    },
+    {
+      name: 'Instruction',
+      description: 'Instructions for preventing OOC',
+      tag: 'instruction',
+      hidden: false,
+      mandatory: true,
+      inout: 'in',
+      type: 'textarea',
+      options: {},
+      unit: null,
+      quantifier: [1],
+      spec: {}
+    },
+    {
+      name: 'action',
+      description: 'Action Description',
+      tag: 'action',
+      hidden: false,
+      mandatory: true,
+      inout: 'out',
+      type: 'textarea',
+      options: {},
+      unit: null,
+      quantifier: [1],
+      spec: {}
+    }
+  ],
+  uiType: 'custom-element',
+  uiSource: 'data-ooc-activity-view',
+  reportType: 'page',
+  reportSource: 'data-ooc-report-page',
+  thumbnail: '/assets/images/ooc.png'
+}

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

@@ -1,8 +1,8 @@
 import moment from 'moment-timezone'
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
-import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
+import { User, Role } from '@things-factory/auth-base'
+import { Domain, getRedirectSubdomainPath, getRepository, pubsub } from '@things-factory/shell'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
 
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
@@ -10,6 +10,9 @@ import { DataSample } from '../service/data-sample/data-sample'
 import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
+import { Activity } from '@things-factory/worklist'
+
+import { draft } from '@things-factory/worklist/dist-server/controllers/activity-instance/draft'
 
 // See README.md at ## Data Samples
 process.env.TZ = 'UTC'
@@ -128,6 +131,48 @@ export async function createDataSample(
       state: DataOocStatus.CREATED
     })
 
+    // 여기쯤에서, worklist로 TODO로 보낸다.
+    // 입력담당역할에게 assign한다.
+    // 결재라인은 시설관리자을 포함한다. 결재라인을 dataset에 추가한다.
+    // Dataset용 Installable Activity 를 만든다.
+
+    const activity = (await tx.getRepository(Activity).findOneBy({
+      domain: { id: domain.id },
+      name: 'OOC Review'
+    })) as Activity
+
+    if (activity) {
+      const assignee =
+        dataSet.entryRoleId &&
+        (await tx.getRepository(Role)).findOneBy({ domain: { id: domain.id }, id: dataSet.entryRoleId })
+
+      const approver =
+        dataSet.supervisoryRoleId &&
+        (await tx.getRepository(Role)).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId })
+
+      const assignees = dataSet.entryRoleId ? [{ type: 'Role', value: dataSet.entryRoleId, assignee }] : []
+      const approvalLine = dataSet.supervisoryRoleId
+        ? [{ type: 'Role', value: dataSet.supervisoryRoleId, approver }]
+        : []
+
+      const activityInstance = {
+        name: `[OOC] ${dataSet.name}`,
+        activityId: activity.id,
+        description: `Data OOC occurred on '${dataSet.name}'`,
+        dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
+        input: {
+          dataOocId: dataOoc.id
+        },
+        assignees,
+        approvalLine
+      }
+
+      draft(activityInstance, context)
+    } else {
+      console.warn('OOC Review Activity not installed.')
+    }
+    //
+
     pubsub.publish('data-ooc', {
       dataOoc,
       supervisoryRoleId: dataSet.supervisoryRoleId
@@ -137,7 +182,7 @@ export async function createDataSample(
       notification: {
         domain,
         type: 'error',
-        title: `Data OOC occurred on '${dataSet.name}'`,
+        title: `[OOC] ${dataSet.name}`,
         body: `Data OOC occurred on '${dataSet.name}'`,
         url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),
         timestamp: collectedAt

package/server/controllers/index.ts

@@ -1,2 +1,11 @@
+import { ActivityInstallations } from '@things-factory/worklist'
+
+import { ActivityOoc } from './activity-template/activity-ooc'
+
+/* activity templates installation */
+;[ActivityOoc].forEach(template => {
+  ActivityInstallations.installActivityTemplate(template)
+})
+
 export * from './create-data-sample'
 export * from './data-use-case'

package/server/index.ts

@@ -1,8 +1,7 @@
 import './routes'
+// import './controllers'
 
 export * from './controllers'
-export * from './migrations'
-export * from './middlewares'
 export * from './service'
 
 export * from './service/data-spec/data-spec-manager'

package/server/routes.ts

@@ -1,5 +1,4 @@
-import { getConnection } from 'typeorm'
-
+import { getDataSource } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 
 import { createDataSample } from './controllers/create-data-sample'
@@ -23,7 +22,7 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
     }
 
     // make new data-sample
-    await getConnection().transaction(async tx => {
+    await getDataSource().transaction(async tx => {
       // find sensor through deviceId
       const sensor = await tx.getRepository(DataSensor).findOne({
         where: { deviceId },
@@ -99,5 +98,4 @@ process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRo
     let { reportType } = context.params
     context.body = `${reportType} Not Implemented.`
   })
-  
 })

package/server/service/data-set/data-set-query.ts

@@ -150,9 +150,10 @@ export class DataSetQuery {
   async dataKeySet(@Root() dataSet: DataSet) {
     return (
       dataSet.dataKeySet ||
-      (await getRepository(DataKeySet).findOneBy({
-        id: dataSet.dataKeySetId
-      }))
+      (dataSet.dataKeySetId &&
+        (await getRepository(DataKeySet).findOneBy({
+          id: dataSet.dataKeySetId
+        })))
     )
   }
 
@@ -174,7 +175,7 @@ export class DataSetQuery {
   @FieldResolver(type => Date, { nullable: true })
   async latestCollectedAt(@Root() dataSet: DataSet): Promise<Date> {
     const sample = await getRepository(DataSample).findOne({
-      select: ['collectedAt'],
+      select: ['id', 'collectedAt'],
       where: { dataSet: { id: dataSet.id } },
       order: { collectedAt: 'DESC' }
     })

package/server/service/data-set/data-set.ts

@@ -20,6 +20,7 @@ import { DataItem } from './data-item-type'
 export enum DataSetEntryType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external',
   Jasper = 'jasper',
@@ -34,6 +35,7 @@ registerEnumType(DataSetEntryType, {
 export enum DataSetMonitorType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external'
 }
@@ -46,6 +48,7 @@ registerEnumType(DataSetMonitorType, {
 export enum DataSetReportType {
   Generated = 'generated',
   Board = 'board',
+  CustomElement = 'custom-element',
   Page = 'page',
   ExternalURL = 'external'
 }

package/server/service/data-set-history/data-set-history-query.ts

@@ -83,9 +83,10 @@ export class DataSetHistoryQuery {
   async dataKeySet(@Root() dataSet: DataSet) {
     return (
       dataSet.dataKeySet ||
-      (await getRepository(DataKeySet).findOneBy({
-        id: dataSet.dataKeySetId
-      }))
+      (dataSet.dataKeySetId &&
+        (await getRepository(DataKeySet).findOneBy({
+          id: dataSet.dataKeySetId
+        })))
     )
   }
 

package/server/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "strict": false,
+    "module": "commonjs",
+    "outDir": "../dist-server",
+    "baseUrl": "./"
+  },
+  "include": ["./**/*"]
+}

package/things-factory.config.js

@@ -1,5 +1,5 @@
-import bootstrap from './client/bootstrap'
-import route from './client/route'
+import bootstrap from './dist-client/bootstrap'
+import route from './dist-client/route'
 
 export default {
   route,

package/translations/en.json

@@ -1,6 +1,6 @@
 {
   "button.corrected": "corrected",
-  "button.request": "request",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",

package/translations/ko.json

@@ -1,7 +1,7 @@
 {
   "button.corrected": "조치완료",
   "button.reviewed": "검토완료",
-  "button.request": "요청",
+  "button.request-archive": "자료보관 신규 요청",
   "field.appliance": "어플라이언스",
   "field.collected_at": "수집일시",
   "field.corrected-at": "조치 시간",

package/translations/ms.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "corrected",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",

package/translations/zh.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "corrected",
+  "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",

package/client/pages/data-key-set/data-key-set-importer.js

@@ -1,105 +0,0 @@
-import '@operato/data-grist'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-
-import { client } from '@operato/graphql'
-import { i18next } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-
-export class DataKeySetImporter extends LitElement {
-  static get properties() {
-    return {
-      columns: Object,
-      dataKeySets: Array
-    }
-  }
-
-  constructor() {
-    super()
-    this.columns = {
-      list: { fields: ['name', 'description'] },
-      pagination: { infinite: true },
-      columns: [
-        {
-          type: 'string',
-          name: 'name',
-          header: i18next.t('field.name'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'description',
-          header: i18next.t('field.description'),
-          width: 200
-        },
-        {
-          type: 'checkbox',
-          name: 'active',
-          header: i18next.t('field.active'),
-          width: 60
-        }
-      ]
-    }
-  }
-
-  static get styles() {
-    return [
-      css`
-        :host {
-          display: flex;
-          flex-direction: column;
-
-          background-color: #fff;
-        }
-
-        ox-grist {
-          flex: 1;
-        }
-
-        .button-container {
-          display: flex;
-          margin-left: auto;
-          padding: var(--padding-default);
-        }
-
-        mwc-button {
-          margin-left: var(--margin-default);
-        }
-      `
-    ]
-  }
-
-  render() {
-    return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data=${{
-          records: this.dataKeySets
-        }}
-      ></ox-grist>
-
-      <div class="button-container">
-        <mwc-button raised @click="${this.save.bind(this)}">${i18next.t('button.save')}</mwc-button>
-      </div>
-    `
-  }
-
-  async save() {
-    const response = await client.mutate({
-      mutation: gql`
-        mutation importDataKeySets($dataKeySets: [DataKeySetPatch!]!) {
-          importDataKeySets(dataKeySets: $dataKeySets)
-        }
-      `,
-      variables: { dataKeySets: this.dataKeySets }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-
-window.customElements.define('data-key-set-importer', DataKeySetImporter)

package/client/pages/data-set/data-set-importer.js

@@ -1,103 +0,0 @@
-import '@operato/data-grist'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-
-import { client } from '@operato/graphql'
-import { i18next } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-
-export class DataSetImporter extends LitElement {
-  static get properties() {
-    return {
-      columns: Object,
-      scenarios: Array
-    }
-  }
-
-  constructor() {
-    super()
-    this.columns = {
-      list: { fields: ['name', 'description'] },
-      pagination: { infinite: true },
-      columns: [
-        {
-          type: 'string',
-          name: 'name',
-          header: i18next.t('field.name'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'description',
-          header: i18next.t('field.description'),
-          width: 200
-        },
-        {
-          type: 'checkbox',
-          name: 'active',
-          header: i18next.t('field.active'),
-          width: 60
-        }
-      ]
-    }
-  }
-
-  static get styles() {
-    return [
-      css`
-        :host {
-          display: flex;
-          flex-direction: column;
-
-          background-color: #fff;
-        }
-
-        ox-grist {
-          flex: 1;
-        }
-
-        .button-container {
-          display: flex;
-          margin-left: auto;
-          padding: var(--padding-default);
-        }
-
-        mwc-button {
-          margin-left: var(--margin-default);
-        }
-      `
-    ]
-  }
-
-  render() {
-    return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data="${{ records: this.scenarios }}"
-      ></ox-grist>
-
-      <div class="button-container">
-        <mwc-button raised @click="${this.save.bind(this)}">${i18next.t('button.save')}</mwc-button>
-      </div>
-    `
-  }
-
-  async save() {
-    const response = await client.mutate({
-      mutation: gql`
-        mutation importDataSets($dataSets: [DataSetPatch!]!) {
-          importDataSets(dataSets: $dataSets)
-        }
-      `,
-      variables: { dataSets: this.dataSets }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-
-customElements.define('data-set-importer', DataSetImporter)

package/dist-server/middlewares/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initMiddlewares = void 0;
-function initMiddlewares(app) {
-    /* can add middlewares into app */
-}
-exports.initMiddlewares = initMiddlewares;
-//# sourceMappingURL=index.js.map

package/dist-server/middlewares/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,GAAG;IACjC,kCAAkC;AACpC,CAAC;AAFD,0CAEC","sourcesContent":["export function initMiddlewares(app) {\n  /* can add middlewares into app */\n}\n"]}

package/dist-server/migrations/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrations = void 0;
-const glob = require('glob');
-const path = require('path');
-exports.migrations = [];
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function (file) {
-    if (file.indexOf('index.js') !== -1)
-        return;
-    exports.migrations = exports.migrations.concat(Object.values(require(path.resolve(file))) || []);
-});
-//# sourceMappingURL=index.js.map

package/dist-server/migrations/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/migrations/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,QAAA,UAAU,GAAG,EAAE,CAAA;AAE1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,IAAI;IACzE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAAE,OAAM;IAC3C,kBAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA","sourcesContent":["const glob = require('glob')\nconst path = require('path')\n\nexport var migrations = []\n\nglob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {\n  if (file.indexOf('index.js') !== -1) return\n  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])\n})\n"]}

package/server/middlewares/index.ts

@@ -1,3 +0,0 @@
-export function initMiddlewares(app) {
-  /* can add middlewares into app */
-}

package/server/migrations/index.ts

@@ -1,9 +0,0 @@
-const glob = require('glob')
-const path = require('path')
-
-export var migrations = []
-
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {
-  if (file.indexOf('index.js') !== -1) return
-  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])
-})

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../tsconfig-base.json",
-  "compilerOptions": {
-    "outDir": "./dist-server",
-    "baseUrl": "./"
-  },
-  "include": ["./server/**/*"],
-  "exclude": ["**/*.spec.ts"]
-}