@things-factory/dataset 6.2.177 → 6.2.178

package/dist-server/utils/config-resolver.d.ts

@@ -0,0 +1 @@
+export declare function getEndpointUrl(endpoint: any, subpath?: string): string;

package/dist-server/utils/config-resolver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEndpointUrl = void 0;
+exports.getEndpointUrl = getEndpointUrl;
 function getEndpointUrl(endpoint, subpath = '') {
     const { url = '', protocol = 'http', host = '', port = 80 } = endpoint;
     let _url = '';
@@ -29,5 +29,4 @@ function getEndpointUrl(endpoint, subpath = '') {
     }
     return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x => x).join('/');
 }
-exports.getEndpointUrl = getEndpointUrl;
 //# sourceMappingURL=config-resolver.js.map

package/dist-server/utils/config-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../server/utils/config-resolver.ts"],"names":[],"mappings":";;;AACA,SAAgB,cAAc,CAAC,QAAY,EAAE,UAAe,EAAE;IAC1D,MAAM,EAAE,GAAG,GAAC,EAAE,EAAE,QAAQ,GAAC,MAAM,EAAE,IAAI,GAAC,EAAE,EAAE,IAAI,GAAC,EAAE,EAAE,GAAG,QAAQ,CAAA;IAE9D,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,SAAS,GAAG,QAAQ,CAAA;IAExB,IAAI,GAAG,EAAE;QACL,IAAI,GAAG,GAAG,CAAA;KACb;SAAM;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YACnB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,qBAAqB;YACrB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;aACrC;iBAAM;gBACH,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,EAAE,CAAA;aAC5B;SACJ;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1B,IAAI,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;SAC3B;KACJ;IAED,OAAO,SAAS,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAChG,CAAC;AA3BD,wCA2BC","sourcesContent":["\nexport function getEndpointUrl(endpoint:any, subpath:string=''):string {\n    const { url='', protocol='http', host='', port=80 } = endpoint\n    \n    let _url = ''\n    let _protocol = protocol\n\n    if (url) {\n        _url = url\n    } else {\n        const hosts = host.split('://')\n        // host에 protocol을 포함한 경우\n        if (hosts.length == 2) {\n            const _host = hosts[1]\n            _protocol = hosts[0]\n            // host에 port를 포함한 경우\n            const _hosts = _host.split(':')\n            if (_hosts.length > 1) {\n                _url = `${_hosts[0]}:${_hosts[1]}`\n            } else {\n                _url = `${_host}:${port}`\n            }\n        } else if (hosts.length == 1) { \n            _url = `${host}:${port}`\n        }\n    }\n\n    return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x=>x).join('/')\n}\n"]}
+{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../server/utils/config-resolver.ts"],"names":[],"mappings":";;AACA,wCA2BC;AA3BD,SAAgB,cAAc,CAAC,QAAY,EAAE,UAAe,EAAE;IAC1D,MAAM,EAAE,GAAG,GAAC,EAAE,EAAE,QAAQ,GAAC,MAAM,EAAE,IAAI,GAAC,EAAE,EAAE,IAAI,GAAC,EAAE,EAAE,GAAG,QAAQ,CAAA;IAE9D,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,SAAS,GAAG,QAAQ,CAAA;IAExB,IAAI,GAAG,EAAE,CAAC;QACN,IAAI,GAAG,GAAG,CAAA;IACd,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,qBAAqB;YACrB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;YACtC,CAAC;iBAAM,CAAC;gBACJ,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,EAAE,CAAA;YAC7B,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;QAC5B,CAAC;IACL,CAAC;IAED,OAAO,SAAS,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAChG,CAAC","sourcesContent":["\nexport function getEndpointUrl(endpoint:any, subpath:string=''):string {\n    const { url='', protocol='http', host='', port=80 } = endpoint\n    \n    let _url = ''\n    let _protocol = protocol\n\n    if (url) {\n        _url = url\n    } else {\n        const hosts = host.split('://')\n        // host에 protocol을 포함한 경우\n        if (hosts.length == 2) {\n            const _host = hosts[1]\n            _protocol = hosts[0]\n            // host에 port를 포함한 경우\n            const _hosts = _host.split(':')\n            if (_hosts.length > 1) {\n                _url = `${_hosts[0]}:${_hosts[1]}`\n            } else {\n                _url = `${_host}:${port}`\n            }\n        } else if (hosts.length == 1) { \n            _url = `${host}:${port}`\n        }\n    }\n\n    return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x=>x).join('/')\n}\n"]}

package/dist-server/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './config-resolver';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.177",
+  "version": "6.2.178",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,20 +40,20 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.2.177",
-    "@things-factory/aws-base": "^6.2.177",
-    "@things-factory/board-service": "^6.2.177",
+    "@things-factory/auth-base": "^6.2.178",
+    "@things-factory/aws-base": "^6.2.178",
+    "@things-factory/board-service": "^6.2.178",
     "@things-factory/env": "^6.2.170",
-    "@things-factory/integration-base": "^6.2.177",
-    "@things-factory/organization": "^6.2.177",
-    "@things-factory/scheduler-client": "^6.2.177",
-    "@things-factory/shell": "^6.2.170",
-    "@things-factory/work-shift": "^6.2.177",
-    "@things-factory/worklist": "^6.2.177",
+    "@things-factory/integration-base": "^6.2.178",
+    "@things-factory/organization": "^6.2.178",
+    "@things-factory/scheduler-client": "^6.2.178",
+    "@things-factory/shell": "^6.2.178",
+    "@things-factory/work-shift": "^6.2.178",
+    "@things-factory/worklist": "^6.2.178",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "853eef803719c588c9808df30dd134263a78d645"
+  "gitHead": "b21612202e8acb60a6d29e3e5913a06346352bc5"
 }

package/server/activities/activity-data-collect.ts

@@ -1,7 +1,7 @@
 import { In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
+import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist/dist-server'
 import { NewDataSample } from 'service/data-sample/data-sample-type'
 import { createDataSample } from '../controllers/create-data-sample'
 

package/server/activities/index.ts

@@ -6,6 +6,6 @@ import { ActivityOocResolve } from './activity-ooc-resolve'
 import { ActivityOocReview } from './activity-ooc-review'
 
 /* activity templates installation */
-;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect, ActivityDataReview].forEach(template => {
+;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect, ActivityDataReview].forEach((template: any) => {
   ActivityInstallations.installActivityTemplate(template)
 })

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

@@ -286,7 +286,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           approvalLine: []
         }
 
-        dataOoc.reviewActivityInstance = await issue(activityInstance, context)
+        dataOoc.reviewActivityInstance = await issue(activityInstance as any, context)
         await tx.getRepository(DataOoc).save(dataOoc)
       } else {
         console.error(`Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
@@ -384,7 +384,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             approvalLine: dataSet.reviewApprovalLine
           }
 
-          dataSample.reviewActivityInstance = await issue(activityInstance, context)
+          dataSample.reviewActivityInstance = await issue(activityInstance as any, context)
           await tx.getRepository(DataSample).save(dataSample)
 
           try {

package/server/controllers/finalize-data-collection.ts

@@ -158,7 +158,7 @@ async function getTimesForPeriod(
 
     return { date, period, range }
   } else if (periodType == DataSetSummaryPeriodType.WorkDate) {
-    const range = await getDateRangeForWorkDate(domain, date)
+    const range = await getDateRangeForWorkDate(domain, date, {})
 
     return { date, range }
   } else if (periodType == DataSetSummaryPeriodType.Day) {

package/server/controllers/issue-collect-data.ts

@@ -5,7 +5,7 @@ import { Activity, ActivityInstance, issue } from '@things-factory/worklist'
 
 import { DataSet } from '../service/data-set/data-set'
 
-export async function issueCollectData(domainId: string, dataSetId: string, context: ResolverContext): Promise<ActivityInstance> {
+export async function issueCollectData(domainId: string, dataSetId: string, context: ResolverContext): Promise<ActivityInstance | void> {
   await getDataSource().transaction(async tx => {
     const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })
 

package/server/engine/task/create-data-sample.ts

@@ -90,4 +90,4 @@ CreateDataSample.parameterSpec = [
 CreateDataSample.connectorFree = true
 CreateDataSample.help = 'dataset/task/create-data-sample'
 
-TaskRegistry.registerTaskHandler('create-data-sample', CreateDataSample)
+TaskRegistry.registerTaskHandler('create-data-sample', CreateDataSample as any)

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

@@ -104,7 +104,7 @@ function getAssigneesValue(patch: NewDataSet | DataSetPatch): AssigneeItem[] {
         case OrgMemberTargetType.Employee:
         case OrgMemberTargetType.Department:
         case OrgMemberTargetType.Role:
-          return !!m.assignee?.id
+          return !!(m as any).assignee?.id
         default:
           return true
       }

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

@@ -174,7 +174,6 @@ export class DataSetQuery {
       // "value" deprecated. to be removed
       var { type, assignee, value } = item
       var id = assignee?.id || id
-      var assignee
 
       switch (type) {
         case 'Employee':