@things-factory/worklist 5.0.0 → 5.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/components/activity-instance-preview.js +1 -0
- package/client/pages/activity-thread/activity-thread-list-page.js +10 -19
- package/client/pages/todo/pickable-list-page.js +1 -1
- package/dist-server/service/activity/activity-mutation.js +13 -9
- package/dist-server/service/activity/activity-mutation.js.map +1 -1
- package/dist-server/service/activity/activity-query.js +1 -0
- package/dist-server/service/activity/activity-query.js.map +1 -1
- package/dist-server/service/activity-instance/activity-instance-query.js +5 -7
- package/dist-server/service/activity-instance/activity-instance-query.js.map +1 -1
- package/dist-server/service/activity-instance/activity-instance.js +5 -0
- package/dist-server/service/activity-instance/activity-instance.js.map +1 -1
- package/dist-server/service/activity-template/activity-template-mutation.js +6 -2
- package/dist-server/service/activity-template/activity-template-mutation.js.map +1 -1
- package/dist-server/service/activity-template/activity-template-query.js +1 -0
- package/dist-server/service/activity-template/activity-template-query.js.map +1 -1
- package/package.json +6 -6
- package/server/service/activity/activity-mutation.ts +13 -9
- package/server/service/activity/activity-query.ts +1 -0
- package/server/service/activity-instance/activity-instance-query.ts +5 -7
- package/server/service/activity-instance/activity-instance.ts +4 -0
- package/server/service/activity-template/activity-template-mutation.ts +6 -2
- package/server/service/activity-template/activity-template-query.ts +1 -0
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
- package/dist-server/controllers/activity-instance/common.js +0 -30
- package/dist-server/controllers/activity-instance/common.js.map +0 -1
- package/dist-server/controllers/activity-instance/create.js +0 -103
- package/dist-server/controllers/activity-instance/create.js.map +0 -1
- package/dist-server/controllers/activity-instance/save.js +0 -14
- package/dist-server/controllers/activity-instance/save.js.map +0 -1
- package/dist-server/controllers/activity-instance/take.js +0 -46
- package/dist-server/controllers/activity-instance/take.js.map +0 -1
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import '@operato/data-grist'
|
|
2
2
|
import './activity-thread-importer.js'
|
|
3
3
|
|
|
4
|
-
import
|
|
5
|
-
import { PageView, store } from '@operato/shell'
|
|
4
|
+
import gql from 'graphql-tag'
|
|
6
5
|
import { css, html } from 'lit'
|
|
7
|
-
import {
|
|
8
|
-
import { notify, openPopup } from '@operato/layout'
|
|
6
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
|
9
7
|
|
|
10
8
|
import { client } from '@operato/graphql'
|
|
11
|
-
import {
|
|
12
|
-
import
|
|
9
|
+
import { i18next, localize } from '@operato/i18n'
|
|
10
|
+
import { notify, openPopup } from '@operato/layout'
|
|
11
|
+
import { PageView, store } from '@operato/shell'
|
|
12
|
+
import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
|
|
13
13
|
import { isMobileDevice } from '@operato/utils'
|
|
14
14
|
|
|
15
15
|
export class ActivityThreadListPage extends connect(store)(localize(i18next)(PageView)) {
|
|
@@ -67,14 +67,10 @@ export class ActivityThreadListPage extends connect(store)(localize(i18next)(Pag
|
|
|
67
67
|
const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
|
|
68
68
|
|
|
69
69
|
return html`
|
|
70
|
-
<ox-grist
|
|
71
|
-
.mode=${mode}
|
|
72
|
-
.config=${this.gristConfig}
|
|
73
|
-
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
74
|
-
>
|
|
70
|
+
<ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
|
|
75
71
|
<div slot="headroom">
|
|
76
72
|
<div id="filters">
|
|
77
|
-
<ox-filters-form></ox-filters-form>
|
|
73
|
+
<ox-filters-form autofocus></ox-filters-form>
|
|
78
74
|
</div>
|
|
79
75
|
|
|
80
76
|
<div id="sorters">
|
|
@@ -283,12 +279,7 @@ export class ActivityThreadListPage extends connect(store)(localize(i18next)(Pag
|
|
|
283
279
|
|
|
284
280
|
async exportHandler() {
|
|
285
281
|
const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
|
|
286
|
-
const targetFieldSet = new Set([
|
|
287
|
-
'id',
|
|
288
|
-
'name',
|
|
289
|
-
'description',
|
|
290
|
-
'active'
|
|
291
|
-
])
|
|
282
|
+
const targetFieldSet = new Set(['id', 'name', 'description', 'active'])
|
|
292
283
|
|
|
293
284
|
return exportTargets.map(activityThread => {
|
|
294
285
|
let tempObj = {}
|
|
@@ -317,7 +308,7 @@ export class ActivityThreadListPage extends connect(store)(localize(i18next)(Pag
|
|
|
317
308
|
title: i18next.t('title.import activity-thread')
|
|
318
309
|
}
|
|
319
310
|
)
|
|
320
|
-
|
|
311
|
+
|
|
321
312
|
popup.onclosed = () => {
|
|
322
313
|
this.grist.fetch()
|
|
323
314
|
}
|
|
@@ -26,6 +26,7 @@ let ActivityMutation = class ActivityMutation {
|
|
|
26
26
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
27
27
|
attachment: {
|
|
28
28
|
file: activity.thumbnail,
|
|
29
|
+
refType: activity_1.Activity.name,
|
|
29
30
|
refBy: result.id
|
|
30
31
|
}
|
|
31
32
|
}, context);
|
|
@@ -40,11 +41,12 @@ let ActivityMutation = class ActivityMutation {
|
|
|
40
41
|
});
|
|
41
42
|
const result = await repository.save(Object.assign(Object.assign(Object.assign({}, activity), patch), { updater: user }));
|
|
42
43
|
if (patch.thumbnail) {
|
|
43
|
-
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [
|
|
44
|
+
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [result.id] }, context);
|
|
44
45
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
45
46
|
attachment: {
|
|
46
47
|
file: patch.thumbnail,
|
|
47
|
-
|
|
48
|
+
refType: activity_1.Activity.name,
|
|
49
|
+
refBy: result.id
|
|
48
50
|
}
|
|
49
51
|
}, context);
|
|
50
52
|
}
|
|
@@ -64,6 +66,7 @@ let ActivityMutation = class ActivityMutation {
|
|
|
64
66
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
65
67
|
attachment: {
|
|
66
68
|
file: newRecord.thumbnail,
|
|
69
|
+
refType: activity_1.Activity.name,
|
|
67
70
|
refBy: result.id
|
|
68
71
|
}
|
|
69
72
|
}, context);
|
|
@@ -73,15 +76,16 @@ let ActivityMutation = class ActivityMutation {
|
|
|
73
76
|
}
|
|
74
77
|
if (_updateRecords.length > 0) {
|
|
75
78
|
for (let i = 0; i < _updateRecords.length; i++) {
|
|
76
|
-
const
|
|
77
|
-
const activity = await activityRepo.findOne(
|
|
78
|
-
const result = await activityRepo.save(Object.assign(Object.assign(Object.assign({}, activity),
|
|
79
|
-
if (
|
|
80
|
-
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [
|
|
79
|
+
const updateRecord = _updateRecords[i];
|
|
80
|
+
const activity = await activityRepo.findOne(updateRecord.id);
|
|
81
|
+
const result = await activityRepo.save(Object.assign(Object.assign(Object.assign({}, activity), updateRecord), { updater: user }));
|
|
82
|
+
if (updateRecord.thumbnail) {
|
|
83
|
+
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [result.id] }, context);
|
|
81
84
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
82
85
|
attachment: {
|
|
83
|
-
file:
|
|
84
|
-
|
|
86
|
+
file: updateRecord.thumbnail,
|
|
87
|
+
refType: activity_1.Activity.name,
|
|
88
|
+
refBy: result.id
|
|
85
89
|
}
|
|
86
90
|
}, context);
|
|
87
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-mutation.js","sourceRoot":"","sources":["../../../server/service/activity/activity-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA4B;AAE5B,qEAA0F;AAE1F,yCAAqC;AACrC,mDAA4D;AAG5D,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,KAAK,CAAC,cAAc,CAAkB,QAAqB,EAAS,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,iCAC/C,QAAQ,KACX,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI,QAAQ,CAAC,SAAS,EAAE;YACtB,MAAM,IAAA,kCAAgB,EACpB,IAAI,EACJ;gBACE,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ,CAAC,SAAS;oBACxB,KAAK,EAAE,MAAM,CAAC,EAAE;iBACjB;aACF,EACD,OAAO,CACR,CAAA;SACF;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAID,KAAK,CAAC,cAAc,CACP,EAAU,EACP,KAAoB,EAC3B,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAA;QAC7C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,+CAC/B,QAAQ,GACR,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI,KAAK,CAAC,SAAS,EAAE;YACnB,MAAM,IAAA,wCAAsB,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"activity-mutation.js","sourceRoot":"","sources":["../../../server/service/activity/activity-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -109,6 +109,7 @@ let ActivityQuery = class ActivityQuery {
|
|
|
109
109
|
const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
110
110
|
where: {
|
|
111
111
|
domain: activity.domainId,
|
|
112
|
+
refType: activity_1.Activity.name,
|
|
112
113
|
refBy: activity.id
|
|
113
114
|
}
|
|
114
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-query.js","sourceRoot":"","sources":["../../../server/service/activity/activity-query.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"activity-query.js","sourceRoot":"","sources":["../../../server/service/activity/activity-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,13 +88,11 @@ let ActivityInstanceQuery = class ActivityInstanceQuery {
|
|
|
88
88
|
return { items, total };
|
|
89
89
|
}
|
|
90
90
|
async activity(activityInstance) {
|
|
91
|
-
const { adhocType,
|
|
91
|
+
const { adhocType, activityId } = activityInstance;
|
|
92
92
|
if (adhocType !== 'standard') {
|
|
93
93
|
return null;
|
|
94
94
|
}
|
|
95
|
-
return await (0, typeorm_1.getRepository)(activity_1.Activity).findOne(
|
|
96
|
-
id: activityId
|
|
97
|
-
});
|
|
95
|
+
return await (0, typeorm_1.getRepository)(activity_1.Activity).findOne(activityId);
|
|
98
96
|
}
|
|
99
97
|
async activityThreads(activityInstance, context) {
|
|
100
98
|
const { user } = context.state;
|
|
@@ -128,12 +126,12 @@ let ActivityInstanceQuery = class ActivityInstanceQuery {
|
|
|
128
126
|
})));
|
|
129
127
|
}
|
|
130
128
|
async thumbnail(activityInstance) {
|
|
131
|
-
const {
|
|
132
|
-
const attachment =
|
|
129
|
+
const { activityId } = activityInstance;
|
|
130
|
+
const attachment = activityId &&
|
|
133
131
|
(await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
134
132
|
where: {
|
|
135
133
|
domain: activityInstance.domainId,
|
|
136
|
-
refBy:
|
|
134
|
+
refBy: activityId
|
|
137
135
|
}
|
|
138
136
|
}));
|
|
139
137
|
return attachment === null || attachment === void 0 ? void 0 : attachment.fullpath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-instance-query.js","sourceRoot":"","sources":["../../../server/service/activity-instance/activity-instance-query.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"activity-instance-query.js","sourceRoot":"","sources":["../../../server/service/activity-instance/activity-instance-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,9 +135,14 @@ __decorate([
|
|
|
135
135
|
__metadata("design:type", String)
|
|
136
136
|
], ActivityInstance.prototype, "refBy", void 0);
|
|
137
137
|
__decorate([
|
|
138
|
+
(0, typeorm_1.ManyToOne)(type => activity_1.Activity, { nullable: true }),
|
|
138
139
|
(0, type_graphql_1.Field)(type => activity_1.Activity, { nullable: true }),
|
|
139
140
|
__metadata("design:type", activity_1.Activity)
|
|
140
141
|
], ActivityInstance.prototype, "activity", void 0);
|
|
142
|
+
__decorate([
|
|
143
|
+
(0, typeorm_1.RelationId)((activityInstance) => activityInstance.activity),
|
|
144
|
+
__metadata("design:type", String)
|
|
145
|
+
], ActivityInstance.prototype, "activityId", void 0);
|
|
141
146
|
__decorate([
|
|
142
147
|
(0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
|
|
143
148
|
(0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-instance.js","sourceRoot":"","sources":["../../../server/service/activity-instance/activity-instance.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,qCAWgB;AAEhB,yDAAsD;AACtD,iDAA4D;AAE5D,wEAAmE;AACnE,mDAA6E;AAE7E,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,kEAAwC,CAAA;IACxC,+CAAqB,CAAA;IACrB,6CAAmB,CAAA;IACnB,6CAAmB,CAAA;IACnB,yCAAe,CAAA;IACf,6CAAmB,CAAA;AACrB,CAAC,EATW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QASjC;AAED,IAAA,+BAAgB,EAAC,sBAAsB,EAAE;IACvC,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,yCAAyC;CACvD,CAAC,CAAA;AAcF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QAOE,YAAO,GAAY,CAAC,CAAA;QAuCpB,aAAQ,GAAY,CAAC,CAAA;QAYrB,eAAU,GAAY,CAAC,CAAA;QAIvB,eAAU,GAAY,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"activity-instance.js","sourceRoot":"","sources":["../../../server/service/activity-instance/activity-instance.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ let ActivityTemplateMutation = class ActivityTemplateMutation {
|
|
|
26
26
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
27
27
|
attachment: {
|
|
28
28
|
file: activityTemplate.thumbnail,
|
|
29
|
+
refType: activity_template_1.ActivityTemplate.name,
|
|
29
30
|
refBy: result.id
|
|
30
31
|
}
|
|
31
32
|
}, context);
|
|
@@ -40,11 +41,12 @@ let ActivityTemplateMutation = class ActivityTemplateMutation {
|
|
|
40
41
|
});
|
|
41
42
|
const result = await repository.save(Object.assign(Object.assign(Object.assign({}, activityTemplate), patch), { updater: user }));
|
|
42
43
|
if (patch.thumbnail) {
|
|
43
|
-
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [
|
|
44
|
+
await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [result.id] }, context);
|
|
44
45
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
45
46
|
attachment: {
|
|
46
47
|
file: patch.thumbnail,
|
|
47
|
-
|
|
48
|
+
refType: activity_template_1.ActivityTemplate.name,
|
|
49
|
+
refBy: result.id
|
|
48
50
|
}
|
|
49
51
|
}, context);
|
|
50
52
|
}
|
|
@@ -64,6 +66,7 @@ let ActivityTemplateMutation = class ActivityTemplateMutation {
|
|
|
64
66
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
65
67
|
attachment: {
|
|
66
68
|
file: newRecord.thumbnail,
|
|
69
|
+
refType: activity_template_1.ActivityTemplate.name,
|
|
67
70
|
refBy: result.id
|
|
68
71
|
}
|
|
69
72
|
}, context);
|
|
@@ -81,6 +84,7 @@ let ActivityTemplateMutation = class ActivityTemplateMutation {
|
|
|
81
84
|
await (0, attachment_base_1.createAttachment)(null, {
|
|
82
85
|
attachment: {
|
|
83
86
|
file: newRecord.thumbnail,
|
|
87
|
+
refType: 'activity-template',
|
|
84
88
|
refBy: activityTemplate.id
|
|
85
89
|
}
|
|
86
90
|
}, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-template-mutation.js","sourceRoot":"","sources":["../../../server/service/activity-template/activity-template-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA4B;AAE5B,qEAA0F;AAE1F,2DAAsD;AACtD,qEAAqF;AAGrF,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAGnC,KAAK,CAAC,sBAAsB,CACD,gBAAqC,EACvD,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,IAAI,iCACvD,gBAAgB,KACnB,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI,gBAAgB,CAAC,SAAS,EAAE;YAC9B,MAAM,IAAA,kCAAgB,EACpB,IAAI,EACJ;gBACE,UAAU,EAAE;oBACV,IAAI,EAAE,gBAAgB,CAAC,SAAS;oBAChC,KAAK,EAAE,MAAM,CAAC,EAAE;iBACjB;aACF,EACD,OAAO,CACR,CAAA;SACF;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAID,KAAK,CAAC,sBAAsB,CACf,EAAU,EACP,KAA4B,EACnC,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAChD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,+CAC/B,gBAAgB,GAChB,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI,KAAK,CAAC,SAAS,EAAE;YACnB,MAAM,IAAA,wCAAsB,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"activity-template-mutation.js","sourceRoot":"","sources":["../../../server/service/activity-template/activity-template-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ let ActivityTemplateQuery = class ActivityTemplateQuery {
|
|
|
43
43
|
const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
44
44
|
where: {
|
|
45
45
|
domain: activityTemplate.domainId,
|
|
46
|
+
refType: activity_template_1.ActivityTemplate.name,
|
|
46
47
|
refBy: activityTemplate.id
|
|
47
48
|
}
|
|
48
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-template-query.js","sourceRoot":"","sources":["../../../server/service/activity-template/activity-template-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAAuC;AAEvC,qEAA4D;AAC5D,yDAAgD;AAChD,iDAAwF;AAExF,2DAAsD;AACtD,qEAA+D;AAG/D,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAEhC,KAAK,CAAC,gBAAgB,CAAY,EAAU,EAAS,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,oCAAgB,CAAC,CAAC,OAAO,CAAC;YACnD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,iBAAiB,CAAS,MAAiB,EAAS,OAAY;QACpE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,MAAM;YACN,MAAM;YACN,UAAU,EAAE,MAAM,IAAA,uBAAa,EAAC,oCAAgB,CAAC;YACjD,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;SACrC,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGD,KAAK,CAAC,SAAS,CAAS,gBAAkC;QACxD,MAAM,UAAU,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE;gBACL,MAAM,EAAE,gBAAgB,CAAC,QAAQ;gBACjC,KAAK,EAAE,gBAAgB,CAAC,EAAE;aAC3B;SACF,CAAC,CAAA;QAEF,OAAO,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA;IAC7B,CAAC;IAGD,KAAK,CAAC,MAAM,CAAS,gBAAkC;QACrD,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACvE,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,gBAAkC;QACtD,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;IAGD,KAAK,CAAC,OAAO,CAAS,gBAAkC;QACtD,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"activity-template-query.js","sourceRoot":"","sources":["../../../server/service/activity-template/activity-template-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worklist",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.7",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@operato/graphql": "^1.0.0",
|
|
28
28
|
"@operato/grist-editor": "^1.0.0",
|
|
29
|
-
"@things-factory/attachment-base": "^5.0.
|
|
30
|
-
"@things-factory/auth-base": "^5.0.
|
|
31
|
-
"@things-factory/board-service": "^5.0.
|
|
32
|
-
"@things-factory/shell": "^5.0.
|
|
29
|
+
"@things-factory/attachment-base": "^5.0.7",
|
|
30
|
+
"@things-factory/auth-base": "^5.0.7",
|
|
31
|
+
"@things-factory/board-service": "^5.0.7",
|
|
32
|
+
"@things-factory/shell": "^5.0.7"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "1c7c7618e2e3c9ef8b07d730c3df84c8bc01b35f"
|
|
35
35
|
}
|
|
@@ -26,6 +26,7 @@ export class ActivityMutation {
|
|
|
26
26
|
{
|
|
27
27
|
attachment: {
|
|
28
28
|
file: activity.thumbnail,
|
|
29
|
+
refType: Activity.name,
|
|
29
30
|
refBy: result.id
|
|
30
31
|
}
|
|
31
32
|
},
|
|
@@ -57,13 +58,14 @@ export class ActivityMutation {
|
|
|
57
58
|
})
|
|
58
59
|
|
|
59
60
|
if (patch.thumbnail) {
|
|
60
|
-
await deleteAttachmentsByRef(null, { refBys: [
|
|
61
|
+
await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)
|
|
61
62
|
await createAttachment(
|
|
62
63
|
null,
|
|
63
64
|
{
|
|
64
65
|
attachment: {
|
|
65
66
|
file: patch.thumbnail,
|
|
66
|
-
|
|
67
|
+
refType: Activity.name,
|
|
68
|
+
refBy: result.id
|
|
67
69
|
}
|
|
68
70
|
},
|
|
69
71
|
context
|
|
@@ -103,6 +105,7 @@ export class ActivityMutation {
|
|
|
103
105
|
{
|
|
104
106
|
attachment: {
|
|
105
107
|
file: newRecord.thumbnail,
|
|
108
|
+
refType: Activity.name,
|
|
106
109
|
refBy: result.id
|
|
107
110
|
}
|
|
108
111
|
},
|
|
@@ -116,23 +119,24 @@ export class ActivityMutation {
|
|
|
116
119
|
|
|
117
120
|
if (_updateRecords.length > 0) {
|
|
118
121
|
for (let i = 0; i < _updateRecords.length; i++) {
|
|
119
|
-
const
|
|
120
|
-
const activity = await activityRepo.findOne(
|
|
122
|
+
const updateRecord = _updateRecords[i]
|
|
123
|
+
const activity = await activityRepo.findOne(updateRecord.id)
|
|
121
124
|
|
|
122
125
|
const result = await activityRepo.save({
|
|
123
126
|
...activity,
|
|
124
|
-
...
|
|
127
|
+
...updateRecord,
|
|
125
128
|
updater: user
|
|
126
129
|
})
|
|
127
130
|
|
|
128
|
-
if (
|
|
129
|
-
await deleteAttachmentsByRef(null, { refBys: [
|
|
131
|
+
if (updateRecord.thumbnail) {
|
|
132
|
+
await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)
|
|
130
133
|
await createAttachment(
|
|
131
134
|
null,
|
|
132
135
|
{
|
|
133
136
|
attachment: {
|
|
134
|
-
file:
|
|
135
|
-
|
|
137
|
+
file: updateRecord.thumbnail,
|
|
138
|
+
refType: Activity.name,
|
|
139
|
+
refBy: result.id
|
|
136
140
|
}
|
|
137
141
|
},
|
|
138
142
|
context
|
|
@@ -96,15 +96,13 @@ export class ActivityInstanceQuery {
|
|
|
96
96
|
|
|
97
97
|
@FieldResolver(type => Activity)
|
|
98
98
|
async activity(@Root() activityInstance: ActivityInstance): Promise<Activity> {
|
|
99
|
-
const { adhocType,
|
|
99
|
+
const { adhocType, activityId } = activityInstance
|
|
100
100
|
|
|
101
101
|
if (adhocType !== 'standard') {
|
|
102
102
|
return null
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
return await getRepository(Activity).findOne(
|
|
106
|
-
id: activityId
|
|
107
|
-
})
|
|
105
|
+
return await getRepository(Activity).findOne(activityId)
|
|
108
106
|
}
|
|
109
107
|
|
|
110
108
|
@FieldResolver(type => [ActivityThread])
|
|
@@ -155,13 +153,13 @@ export class ActivityInstanceQuery {
|
|
|
155
153
|
|
|
156
154
|
@FieldResolver(type => String)
|
|
157
155
|
async thumbnail(@Root() activityInstance: ActivityInstance): Promise<string | undefined> {
|
|
158
|
-
const {
|
|
156
|
+
const { activityId } = activityInstance
|
|
159
157
|
const attachment: Attachment =
|
|
160
|
-
|
|
158
|
+
activityId &&
|
|
161
159
|
(await getRepository(Attachment).findOne({
|
|
162
160
|
where: {
|
|
163
161
|
domain: activityInstance.domainId,
|
|
164
|
-
refBy:
|
|
162
|
+
refBy: activityId
|
|
165
163
|
}
|
|
166
164
|
}))
|
|
167
165
|
|
|
@@ -122,9 +122,13 @@ export class ActivityInstance {
|
|
|
122
122
|
@Field({ nullable: true })
|
|
123
123
|
refBy?: string
|
|
124
124
|
|
|
125
|
+
@ManyToOne(type => Activity, { nullable: true })
|
|
125
126
|
@Field(type => Activity, { nullable: true })
|
|
126
127
|
activity?: Activity
|
|
127
128
|
|
|
129
|
+
@RelationId((activityInstance: ActivityInstance) => activityInstance.activity)
|
|
130
|
+
activityId?: string
|
|
131
|
+
|
|
128
132
|
@ManyToOne(type => Role, { nullable: true })
|
|
129
133
|
@Field(type => Role, { nullable: true })
|
|
130
134
|
assigneeRole?: Role
|
|
@@ -29,6 +29,7 @@ export class ActivityTemplateMutation {
|
|
|
29
29
|
{
|
|
30
30
|
attachment: {
|
|
31
31
|
file: activityTemplate.thumbnail,
|
|
32
|
+
refType: ActivityTemplate.name,
|
|
32
33
|
refBy: result.id
|
|
33
34
|
}
|
|
34
35
|
},
|
|
@@ -60,13 +61,14 @@ export class ActivityTemplateMutation {
|
|
|
60
61
|
})
|
|
61
62
|
|
|
62
63
|
if (patch.thumbnail) {
|
|
63
|
-
await deleteAttachmentsByRef(null, { refBys: [
|
|
64
|
+
await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)
|
|
64
65
|
await createAttachment(
|
|
65
66
|
null,
|
|
66
67
|
{
|
|
67
68
|
attachment: {
|
|
68
69
|
file: patch.thumbnail,
|
|
69
|
-
|
|
70
|
+
refType: ActivityTemplate.name,
|
|
71
|
+
refBy: result.id
|
|
70
72
|
}
|
|
71
73
|
},
|
|
72
74
|
context
|
|
@@ -106,6 +108,7 @@ export class ActivityTemplateMutation {
|
|
|
106
108
|
{
|
|
107
109
|
attachment: {
|
|
108
110
|
file: newRecord.thumbnail,
|
|
111
|
+
refType: ActivityTemplate.name,
|
|
109
112
|
refBy: result.id
|
|
110
113
|
}
|
|
111
114
|
},
|
|
@@ -135,6 +138,7 @@ export class ActivityTemplateMutation {
|
|
|
135
138
|
{
|
|
136
139
|
attachment: {
|
|
137
140
|
file: newRecord.thumbnail,
|
|
141
|
+
refType: 'activity-template',
|
|
138
142
|
refBy: activityTemplate.id
|
|
139
143
|
}
|
|
140
144
|
},
|
package/translations/en.json
CHANGED
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
"label.hours": "hours",
|
|
29
29
|
"label.minutes": "minutes",
|
|
30
30
|
"label.seconds": "seconds",
|
|
31
|
+
"title.activity bank": "activity bank",
|
|
31
32
|
"title.activity list": "activity list",
|
|
32
33
|
"title.activity model item list": "activity model item list",
|
|
33
34
|
"title.activity instance list": "activity instance list",
|
package/translations/ko.json
CHANGED
package/translations/ms.json
CHANGED
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
"label.hours": "[ms] hours",
|
|
29
29
|
"label.minutes": "[ms] minutes",
|
|
30
30
|
"label.seconds": "[ms] seconds",
|
|
31
|
+
"title.activity bank": "activity bank",
|
|
31
32
|
"title.activity list": "activity list",
|
|
32
33
|
"title.activity model item list": "activity model item list",
|
|
33
34
|
"title.activity instance list": "activity instance list",
|
package/translations/zh.json
CHANGED
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
"label.hours": "小时",
|
|
29
29
|
"label.minutes": "分钟",
|
|
30
30
|
"label.seconds": "秒钟",
|
|
31
|
+
"title.activity bank": "activity bank",
|
|
31
32
|
"title.activity list": "activity list",
|
|
32
33
|
"title.activity model item list": "activity model item list",
|
|
33
34
|
"title.activity instance list": "activity instance list",
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.evalActivityInstanceState = void 0;
|
|
4
|
-
const activity_instance_1 = require("../../service/activity-instance/activity-instance");
|
|
5
|
-
async function evalActivityInstanceState(activityInstance, { domain, user, tx, t }) {
|
|
6
|
-
activityInstance = await tx
|
|
7
|
-
.getRepository(activity_instance_1.ActivityInstance)
|
|
8
|
-
.findOne({ id: activityInstance.id }, { relations: ['activityThreads'] });
|
|
9
|
-
const { threadsMin, threadsMax, activityThreads, state, dueAt } = activityInstance;
|
|
10
|
-
const validThreads = activityThreads.filter(thread => thread.isValid());
|
|
11
|
-
const pendingStartedThreads = activityThreads.filter(thread => thread.isPendingStarted());
|
|
12
|
-
const pendingEndedThreads = activityThreads.filter(thread => thread.isPendingEnded());
|
|
13
|
-
switch (true) {
|
|
14
|
-
case state === activity_instance_1.ActivityInstanceStatus.Ended:
|
|
15
|
-
case state === activity_instance_1.ActivityInstanceStatus.Aborted:
|
|
16
|
-
return state;
|
|
17
|
-
case validThreads.length === 0:
|
|
18
|
-
return activity_instance_1.ActivityInstanceStatus.Posted;
|
|
19
|
-
case threadsMin > validThreads.length:
|
|
20
|
-
return activity_instance_1.ActivityInstanceStatus.WaitingAssignment;
|
|
21
|
-
case pendingStartedThreads.length > 0:
|
|
22
|
-
return activity_instance_1.ActivityInstanceStatus.Assigned;
|
|
23
|
-
case pendingEndedThreads.length > 0:
|
|
24
|
-
return dueAt.getTime() > Date.now() ? activity_instance_1.ActivityInstanceStatus.Started : activity_instance_1.ActivityInstanceStatus.Pending;
|
|
25
|
-
default:
|
|
26
|
-
return activity_instance_1.ActivityInstanceStatus.Ended;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
exports.evalActivityInstanceState = evalActivityInstanceState;
|
|
30
|
-
//# sourceMappingURL=common.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/common.ts"],"names":[],"mappings":";;;AAKA,yFAA4G;AAIrG,KAAK,UAAU,yBAAyB,CAC7C,gBAAkC,EAClC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAiB;IAEtC,gBAAgB,GAAG,MAAM,EAAE;SACxB,aAAa,CAAC,oCAAgB,CAAC;SAC/B,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IAC3E,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAA;IAElF,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;IACvE,MAAM,qBAAqB,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAA;IACzF,MAAM,mBAAmB,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;IAErF,QAAQ,IAAI,EAAE;QACZ,KAAK,KAAK,KAAK,0CAAsB,CAAC,UAAU,CAAC;QACjD,KAAK,KAAK,KAAK,0CAAsB,CAAC,OAAO;YAC3C,OAAO,KAAK,CAAA;QACd,KAAK,YAAY,CAAC,MAAM,KAAK,CAAC;YAC5B,OAAO,0CAAsB,CAAC,OAAO,CAAA;QACvC,KAAK,UAAU,GAAG,YAAY,CAAC,MAAM;YACnC,OAAO,0CAAsB,CAAC,iBAAiB,CAAA;QACjD,KAAK,qBAAqB,CAAC,MAAM,GAAG,CAAC;YACnC,OAAO,0CAAsB,CAAC,QAAQ,CAAA;QACxC,KAAK,mBAAmB,CAAC,MAAM,GAAG,CAAC;YACjC,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,0CAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAsB,CAAC,OAAO,CAAA;QACvG;YACE,OAAO,0CAAsB,CAAC,KAAK,CAAA;KACtC;AACH,CAAC;AA5BD,8DA4BC"}
|
|
@@ -1,103 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createAdhoc = exports.create = void 0;
|
|
4
|
-
const typeorm_1 = require("typeorm");
|
|
5
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
|
-
const activity_instance_1 = require("../../service/activity-instance/activity-instance");
|
|
7
|
-
const activity_thread_1 = require("../../service/activity-thread/activity-thread");
|
|
8
|
-
const activity_1 = require("../../service/activity/activity");
|
|
9
|
-
const debug = require('debug')('things-factory:worklist:create');
|
|
10
|
-
async function createActivityThreadsForUsers(activityInstance, assignees, { domain, user, tx, t }) {
|
|
11
|
-
const threadRepo = tx.getRepository(activity_thread_1.ActivityThread);
|
|
12
|
-
const now = new Date();
|
|
13
|
-
// create activity-thread for all of users taking given role
|
|
14
|
-
// for (let assignee of assignees) {
|
|
15
|
-
// const activityThread = {
|
|
16
|
-
// assignee,
|
|
17
|
-
// state: ActivityThreadStatus.Assigned,
|
|
18
|
-
// activityInstance,
|
|
19
|
-
// domain,
|
|
20
|
-
// creator: user,
|
|
21
|
-
// updater: user,
|
|
22
|
-
// assignedAt: now
|
|
23
|
-
// }
|
|
24
|
-
// await threadRepo.save(activityThread)
|
|
25
|
-
// }
|
|
26
|
-
return await threadRepo.save(assignees.map(assignee => {
|
|
27
|
-
return {
|
|
28
|
-
assignee,
|
|
29
|
-
state: activity_thread_1.ActivityThreadStatus.Assigned,
|
|
30
|
-
activityInstance,
|
|
31
|
-
domain,
|
|
32
|
-
creator: user,
|
|
33
|
-
updater: user,
|
|
34
|
-
dueAt: activityInstance.dueAt,
|
|
35
|
-
assignedAt: now
|
|
36
|
-
};
|
|
37
|
-
}));
|
|
38
|
-
}
|
|
39
|
-
async function createActivityThreadsForAllRoleUsers(activityInstance, { domain, user, tx, t }) {
|
|
40
|
-
// find how many users are having given role
|
|
41
|
-
const assigneeRole = (await tx
|
|
42
|
-
.getRepository(auth_base_1.Role)
|
|
43
|
-
.findOne({ id: activityInstance.assigneeRoleId }, { relations: ['users'] }));
|
|
44
|
-
const assignees = (assigneeRole === null || assigneeRole === void 0 ? void 0 : assigneeRole.users) || [];
|
|
45
|
-
if (assignees.length === 0) {
|
|
46
|
-
throw new Error("there's no users having given role");
|
|
47
|
-
}
|
|
48
|
-
// create activity-thread for all of users having given role
|
|
49
|
-
return await createActivityThreadsForUsers(activityInstance, assignees, { domain, user, tx, t });
|
|
50
|
-
}
|
|
51
|
-
async function create(activityInstance, { domain, user, tx, t }) {
|
|
52
|
-
const { activityId, input, dueAt } = activityInstance;
|
|
53
|
-
debug('createActivityInstance', activityId, input);
|
|
54
|
-
var repository = (0, typeorm_1.getRepository)(activity_1.Activity);
|
|
55
|
-
var activity = await repository.findOne({
|
|
56
|
-
where: { domain, id: activityId },
|
|
57
|
-
relations: ['assigneeRole', 'supervisoryRole']
|
|
58
|
-
});
|
|
59
|
-
if (!activity) {
|
|
60
|
-
throw new Error(t('error.activity-instance not found', {
|
|
61
|
-
activity: activityId
|
|
62
|
-
}));
|
|
63
|
-
}
|
|
64
|
-
if (!dueAt && activity.standardTime) {
|
|
65
|
-
activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000);
|
|
66
|
-
}
|
|
67
|
-
const created = await tx.getRepository(activity_instance_1.ActivityInstance).save(Object.assign(Object.assign({}, activityInstance), { activityType: activity.activityType, uiType: activity.uiType, uiSource: activity.uiSource, assigneeRole: activity.assigneeRole, supervisoryRole: activity.supervisoryRole, adhocType: 'standard', refBy: activityId, transaction: 'create', state: activity_instance_1.ActivityInstanceStatus.Posted, domain, creator: user, updater: user }));
|
|
68
|
-
if (created.threadsMin === 0) {
|
|
69
|
-
await createActivityThreadsForAllRoleUsers(created, { domain, user, tx, t });
|
|
70
|
-
}
|
|
71
|
-
return await tx.getRepository(activity_instance_1.ActivityInstance).findOne(created);
|
|
72
|
-
}
|
|
73
|
-
exports.create = create;
|
|
74
|
-
async function createAdhoc(activityInstance, { domain, user, tx, t }) {
|
|
75
|
-
const { adhocType, refBy, input, uiType, uiSource, supervisoryRole, assigneeRole, assignees } = activityInstance;
|
|
76
|
-
debug('createAdhocActivityInstance', adhocType, refBy, input);
|
|
77
|
-
var mergedAssignees = [];
|
|
78
|
-
// find how many users are taking given role
|
|
79
|
-
if (assigneeRole) {
|
|
80
|
-
mergedAssignees.concat((await tx.getRepository(auth_base_1.Role).findOne({
|
|
81
|
-
id: activityInstance.assigneeRole
|
|
82
|
-
}, {
|
|
83
|
-
relations: ['users']
|
|
84
|
-
})).users);
|
|
85
|
-
}
|
|
86
|
-
if (assignees instanceof Array) {
|
|
87
|
-
mergedAssignees.concat(await tx.getRepository(auth_base_1.User).find(assignees));
|
|
88
|
-
}
|
|
89
|
-
const created = await tx.getRepository(activity_instance_1.ActivityInstance).save(Object.assign(Object.assign({}, activityInstance), { transaction: 'create', state: activity_instance_1.ActivityInstanceStatus.Posted, uiType,
|
|
90
|
-
uiSource,
|
|
91
|
-
adhocType,
|
|
92
|
-
domain,
|
|
93
|
-
refBy,
|
|
94
|
-
input,
|
|
95
|
-
assigneeRole,
|
|
96
|
-
supervisoryRole, creator: user, updater: user }));
|
|
97
|
-
if (created.threadsMin === 0) {
|
|
98
|
-
await createActivityThreadsForUsers(activityInstance, assignees, { domain, user, tx, t });
|
|
99
|
-
}
|
|
100
|
-
return await tx.getRepository(activity_instance_1.ActivityInstance).findOne(created);
|
|
101
|
-
}
|
|
102
|
-
exports.createAdhoc = createAdhoc;
|
|
103
|
-
//# sourceMappingURL=create.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.save = void 0;
|
|
4
|
-
const activity_instance_1 = require("../../service/activity-instance/activity-instance");
|
|
5
|
-
const common_1 = require("../common");
|
|
6
|
-
async function save(id, save, { domain, user, tx, t }) {
|
|
7
|
-
const repository = tx.getRepository(activity_instance_1.ActivityInstance);
|
|
8
|
-
const activityInstance = await repository.findOne({
|
|
9
|
-
where: { domain, id }
|
|
10
|
-
});
|
|
11
|
-
return await repository.save(Object.assign(Object.assign(Object.assign({}, activityInstance), save), { transaction: 'save', state: await (0, common_1.evalActivityInstanceState)(activityInstance, { domain, user, tx, t }), updater: user }));
|
|
12
|
-
}
|
|
13
|
-
exports.save = save;
|
|
14
|
-
//# sourceMappingURL=save.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/save.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AAEpF,sCAAyE;AAElE,KAAK,UAAU,IAAI,CACxB,EAAU,EACV,IAA0B,EAC1B,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAiB;IAEtC,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IACrD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAChD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;KACtB,CAAC,CAAA;IAEF,OAAO,MAAM,UAAU,CAAC,IAAI,+CACvB,gBAAgB,GAChB,IAAI,KACP,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EACjF,OAAO,EAAE,IAAI,IACb,CAAA;AACJ,CAAC;AAjBD,oBAiBC"}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.take = void 0;
|
|
4
|
-
const typeorm_1 = require("typeorm");
|
|
5
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
6
|
-
const activity_instance_1 = require("../../service/activity-instance/activity-instance");
|
|
7
|
-
const common_1 = require("../common");
|
|
8
|
-
const debug = require('debug')('things-factory:worklist:take');
|
|
9
|
-
async function take({ id, assigneeRole, supervisoryRole, reason, dueAt }, { domain, user, tx, t }) {
|
|
10
|
-
debug('takeActivityInstance', id);
|
|
11
|
-
var repository = (0, typeorm_1.getRepository)(activity_instance_1.ActivityInstance);
|
|
12
|
-
var activityInstance = await repository.findOne({
|
|
13
|
-
where: { domain, id },
|
|
14
|
-
relations: ['assigneeRole', 'supervisoryRole']
|
|
15
|
-
});
|
|
16
|
-
if (!activityInstance) {
|
|
17
|
-
throw new Error(t('error.activity-instance not found', {
|
|
18
|
-
activityInstance: id
|
|
19
|
-
}));
|
|
20
|
-
}
|
|
21
|
-
if (dueAt) {
|
|
22
|
-
activityInstance.dueAt = dueAt;
|
|
23
|
-
}
|
|
24
|
-
if (assigneeRole) {
|
|
25
|
-
activityInstance.assigneeRole = (0, typeorm_1.getRepository)(auth_base_1.Role).findOne({
|
|
26
|
-
domain,
|
|
27
|
-
name: assigneeRole
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
if (supervisoryRole) {
|
|
31
|
-
activityInstance.supervisoryRole = (0, typeorm_1.getRepository)(auth_base_1.Role).findOne({
|
|
32
|
-
domain,
|
|
33
|
-
name: supervisoryRole
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
if (!activityInstance.assigneeRole) {
|
|
37
|
-
throw new Error(t('error.activity-instance assignee role not found', {
|
|
38
|
-
activityInstance: id,
|
|
39
|
-
role: assigneeRole
|
|
40
|
-
}));
|
|
41
|
-
}
|
|
42
|
-
if (activityInstance.assigneeRole)
|
|
43
|
-
return await tx.getRepository(activity_instance_1.ActivityInstance).save(Object.assign(Object.assign({}, activityInstance), { reason, transaction: 'take', state: await (0, common_1.evalActivityInstanceState)(id, { domain, user, tx, t }), updater: user }));
|
|
44
|
-
}
|
|
45
|
-
exports.take = take;
|
|
46
|
-
//# sourceMappingURL=take.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"take.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/take.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,yDAAgD;AAEhD,yFAAoF;AACpF,sCAAyE;AAEzE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAAA;AAEvD,KAAK,UAAU,IAAI,CACxB,EACE,EAAE,EACF,YAAY,EACZ,eAAe,EACf,MAAM,EACN,KAAK,EAC0F,EACjG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAiB;IAEtC,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;IAEjC,IAAI,UAAU,GAAG,IAAA,uBAAa,EAAC,oCAAgB,CAAC,CAAA;IAEhD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrB,SAAS,EAAE,CAAC,cAAc,EAAE,iBAAiB,CAAC;KAC/C,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,CAAC,CAAC,mCAAmC,EAAE;YACrC,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED,IAAI,KAAK,EAAE;QACT,gBAAgB,CAAC,KAAK,GAAG,KAAK,CAAA;KAC/B;IAED,IAAI,YAAY,EAAE;QAChB,gBAAgB,CAAC,YAAY,GAAG,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YAC1D,MAAM;YACN,IAAI,EAAE,YAAY;SACnB,CAAC,CAAA;KACH;IAED,IAAI,eAAe,EAAE;QACnB,gBAAgB,CAAC,eAAe,GAAG,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;YAC7D,MAAM;YACN,IAAI,EAAE,eAAe;SACtB,CAAC,CAAA;KACH;IAED,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,CAAC,CAAC,iDAAiD,EAAE;YACnD,gBAAgB,EAAE,EAAE;YACpB,IAAI,EAAE,YAAY;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,gBAAgB,CAAC,YAAY;QAC/B,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,IAAI,iCAC/C,gBAAgB,KACnB,MAAM,EACN,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EACnE,OAAO,EAAE,IAAI,IACb,CAAA;AACN,CAAC;AA9DD,oBA8DC"}
|