@things-factory/dataset 6.0.28 → 6.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.28",
+  "version": "6.0.30",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,12 +40,12 @@
     "@things-factory/board-service": "^6.0.28",
     "@things-factory/env": "^6.0.7",
     "@things-factory/organization": "^6.0.28",
-    "@things-factory/scheduler-client": "^6.0.28",
+    "@things-factory/scheduler-client": "^6.0.30",
     "@things-factory/shell": "^6.0.28",
     "@things-factory/work-shift": "^6.0.28",
     "@things-factory/worklist": "^6.0.28",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "8b4e03229444e38fc3f3487227a96837eef85099"
+  "gitHead": "5c7c95e8edd7b72bcb6240d07b4ffe0b1fccce88"
 }

package/server/{controllers/activity-template → activities}/activity-data-collect.ts

@@ -1,6 +1,6 @@
 import { Activity, ActivityInstance, ActivityInstanceStatus } from '@things-factory/worklist'
 import { NewDataSample } from 'service/data-sample/data-sample-type'
-import { createDataSample } from '../../controllers/create-data-sample'
+import { createDataSample } from '../controllers/create-data-sample'
 
 async function callback(activityInstance: ActivityInstance, context: ResolverContext) {
   const { domain, tx } = context.state
@@ -76,9 +76,9 @@ export const ActivityDataCollect = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'data-collect-activity-view',
+  uiSource: 'activity-data-collect-view',
   reportType: 'page',
-  reportSource: 'data-collect-activity-view',
+  reportSource: 'activity-data-collect-view',
   thumbnail: '/assets/images/data-collect.png',
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

package/server/{controllers/activity-template → activities}/activity-ooc-resolve.ts

@@ -4,7 +4,7 @@ import {
   ActivityThread,
   ActivityThreadStatus
 } from '@things-factory/worklist'
-import { DataOoc, DataOocStatus } from '../../service/data-ooc/data-ooc'
+import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 
 async function callback(activityInstance: ActivityInstance, context: ResolverContext) {
   const { tx, user, domain } = context.state
@@ -106,7 +106,7 @@ export const ActivityOocResolve = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'ooc-resolve-activity-view',
+  uiSource: 'activity-ooc-resolve-view',
   reportType: 'page',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',

package/server/{controllers/activity-template → activities}/activity-ooc-review.ts

@@ -1,6 +1,6 @@
 import { Activity, ActivityInstance, ActivityInstanceStatus } from '@things-factory/worklist'
 import { post } from '@things-factory/worklist/dist-server/controllers/activity-instance/post'
-import { DataOoc, DataOocStatus } from '../../service/data-ooc/data-ooc'
+import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 
 async function callback(activityInstance: ActivityInstance, context: ResolverContext) {
   const { domain, user, tx } = context.state
@@ -110,7 +110,7 @@ export const ActivityOocReview = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'ooc-review-activity-view',
+  uiSource: 'activity-ooc-review-view',
   reportType: 'page',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',

package/server/activities/index.ts

@@ -0,0 +1,10 @@
+import { ActivityInstallations } from '@things-factory/worklist'
+
+import { ActivityOocReview } from './activity-ooc-review'
+import { ActivityOocResolve } from './activity-ooc-resolve'
+import { ActivityDataCollect } from './activity-data-collect'
+
+/* activity templates installation */
+;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect].forEach(template => {
+  ActivityInstallations.installActivityTemplate(template)
+})

package/server/controllers/index.ts

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

package/server/index.ts

@@ -1,5 +1,5 @@
 import './routes'
-// import './controllers'
+import './activities'
 
 export * from './controllers'
 export * from './service'

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

@@ -234,9 +234,7 @@ export class DataSetMutation {
     }
 
     try {
-      const handle = await unregisterSchedule({
-        resp_id: dataSet.schedulerHandle
-      })
+      await unregisterSchedule(dataSet.schedulerHandle)
 
       return await repository.save({
         ...dataSet,

package/dist-client/components/data-ooc-activity-view.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-ooc-activity-view.js","sourceRoot":"","sources":["../../client/components/data-ooc-activity-view.ts"],"names":[],"mappings":";AAAA,OAAO,yCAAyC,CAAA;AAEhD,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,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;AAGjD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA8D7D,MAAM;;QACJ,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA;QAEpC,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,OAAO;;;;;;;mBAOpC,OAAO,IAAI,EAAE;oBACZ,IAAI,CAAC,eAAe;;;KAGnC,CAAA;IACH,CAAC;IAED,eAAe,CAAC,CAAQ;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAA;QAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,GAAI,CAAC,CAAC,MAA8B,CAAC,KAAK,CAAA;QAE7D,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,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA6BT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AA3IM,0BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiDF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;kDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;mDAAa;AAExC;IAAC,KAAK,EAAE;;oDAAc;AAEtB;IAAC,KAAK,CAAC,UAAU,CAAC;8BAAmB,mBAAmB;4DAAA;AA5DpD,mBAAmB;IADxB,aAAa,CAAC,wBAAwB,CAAC;GAClC,mBAAmB,CA6IxB","sourcesContent":["import '@operato/dataset/ox-data-sample-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'\n\n@customElement('data-ooc-activity-view')\nclass DataOocActivityView 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-ooc-view {\n        flex: 1;\n        padding: var(--padding-wide);\n        overflow: auto;\n      }\n\n      label[comment] {\n        display: flex;\n        flex-direction: column;\n\n        padding: var(--padding-wide);\n      }\n\n      label[comment] div {\n        display: flex;\n      }\n\n      mwc-icon {\n        color: var(--status-danger-color);\n      }\n\n      textarea {\n        border: var(--input-field-border);\n        border-radius: var(--input-border-radius);\n        padding: var(--input-field-padding);\n        font: var(--input-field-font);\n      }\n\n      .button-container {\n        display: flex;\n        margin-left: auto;\n        padding: var(--padding-default);\n      }\n    `\n  ]\n\n  @property({ type: Object }) input?: any\n  @property({ type: Object }) output?: any\n\n  @state() dataOoc?: any\n\n  @query('textarea') commentTextArea!: HTMLTextAreaElement\n\n  render() {\n    const comment = this.output?.comment\n\n    return html`\n      <div content>\n        <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>\n      </div>\n\n      <label comment>\n        <div><mwc-icon>build_circle</mwc-icon> <span>correction activity</span></div>\n        <textarea\n          placeholder=\"조치 내용을 입력해주세요.\"\n          .value=${comment || ''}\n          @change=${this.onChangeComment}\n        ></textarea>\n      </label>\n    `\n  }\n\n  onChangeComment(e: Event) {\n    this.output = this.output || {}\n    this.output.comment = (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.fetchDataOoc()\n    }\n  }\n\n  async fetchDataOoc() {\n    const id = this.input.dataOocId\n\n    if (id) {\n      const response = await client.query({\n        query: gql`\n          query ($id: String!) {\n            dataOoc(id: $id) {\n              id\n              name\n              description\n              ooc\n              oos\n              state\n              type\n              useCase\n              data\n              judgment\n              dataItems {\n                name\n                description\n                active\n                tag\n                type\n                unit\n                options\n                quota\n                spec\n              }\n              workDate\n              workShift\n              collectedAt\n            }\n          }\n        `,\n        variables: {\n          id\n        }\n      })\n\n      this.dataOoc = response.data.dataOoc\n    }\n  }\n}\n"]}

package/dist-server/controllers/activity-template/activity-ooc.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActivityOoc = void 0;
-exports.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'
-};
-//# sourceMappingURL=activity-ooc.js.map

package/dist-server/controllers/activity-template/activity-ooc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"activity-ooc.js","sourceRoot":"","sources":["../../../server/controllers/activity-template/activity-ooc.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,2DAA2D;IACxE,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,SAAS;IACnB,YAAY,EAAE,MAAM;IACpB,SAAS,EAAE,IAAI;IACf,KAAK,EAAE;QACL;YACE,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,QAAQ;YACrB,GAAG,EAAE,WAAW;YAChB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,CAAC,CAAC,CAAC;YACf,IAAI,EAAE,EAAE;SACT;QACD;YACE,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,iCAAiC;YAC9C,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,CAAC,CAAC,CAAC;YACf,IAAI,EAAE,EAAE;SACT;QACD;YACE,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,oBAAoB;YACjC,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,CAAC,CAAC,CAAC;YACf,IAAI,EAAE,EAAE;SACT;KACF;IACD,MAAM,EAAE,gBAAgB;IACxB,QAAQ,EAAE,wBAAwB;IAClC,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,sBAAsB;IACpC,SAAS,EAAE,wBAAwB;CACpC,CAAA","sourcesContent":["export const ActivityOoc = {\n  name: 'OOC Review',\n  description: 'Task to take remedial action based on Out Of Control data',\n  release: '1.0.0',\n  provider: 'hatiolab.com',\n  category: 'quality',\n  activityType: 'user',\n  startable: true,\n  model: [\n    {\n      name: 'dataOocId',\n      description: 'OOC id',\n      tag: 'dataOocId',\n      hidden: true,\n      mandatory: true,\n      inout: 'in',\n      type: 'string',\n      options: {},\n      unit: null,\n      quantifier: [1],\n      spec: {}\n    },\n    {\n      name: 'Instruction',\n      description: 'Instructions for preventing OOC',\n      tag: 'instruction',\n      hidden: false,\n      mandatory: true,\n      inout: 'in',\n      type: 'textarea',\n      options: {},\n      unit: null,\n      quantifier: [1],\n      spec: {}\n    },\n    {\n      name: 'action',\n      description: 'Action Description',\n      tag: 'action',\n      hidden: false,\n      mandatory: true,\n      inout: 'out',\n      type: 'textarea',\n      options: {},\n      unit: null,\n      quantifier: [1],\n      spec: {}\n    }\n  ],\n  uiType: 'custom-element',\n  uiSource: 'data-ooc-activity-view',\n  reportType: 'page',\n  reportSource: 'data-ooc-report-page',\n  thumbnail: '/assets/images/ooc.png'\n}\n"]}

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"]}