@things-factory/dataset 6.0.28 → 6.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.28",
+  "version": "6.0.29",
   "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.29",
     "@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": "1ed1aec497f19c6b3f4bcf63be648c1c68aa8447"
 }

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