@things-factory/worklist 6.0.97 → 6.0.100
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/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/controllers/activity-instance/issue.js +2 -2
- package/dist-server/controllers/activity-instance/issue.js.map +1 -1
- package/dist-server/service/activity-instance/activity-instance-query.js +1 -4
- package/dist-server/service/activity-instance/activity-instance-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -9
- package/server/controllers/activity-instance/issue.ts +4 -2
- package/server/service/activity-instance/activity-instance-query.ts +1 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worklist",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.100",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,14 +29,14 @@
|
|
|
29
29
|
"@operato/event-view": "^1.0.0",
|
|
30
30
|
"@operato/graphql": "^1.0.0",
|
|
31
31
|
"@operato/grist-editor": "^1.0.0",
|
|
32
|
-
"@things-factory/attachment-base": "^6.0.
|
|
33
|
-
"@things-factory/auth-base": "^6.0.
|
|
34
|
-
"@things-factory/board-service": "^6.0.
|
|
35
|
-
"@things-factory/context-ui": "^6.0.
|
|
36
|
-
"@things-factory/organization": "^6.0.
|
|
37
|
-
"@things-factory/scheduler-client": "^6.0.
|
|
38
|
-
"@things-factory/shell": "^6.0.
|
|
32
|
+
"@things-factory/attachment-base": "^6.0.99",
|
|
33
|
+
"@things-factory/auth-base": "^6.0.99",
|
|
34
|
+
"@things-factory/board-service": "^6.0.99",
|
|
35
|
+
"@things-factory/context-ui": "^6.0.99",
|
|
36
|
+
"@things-factory/organization": "^6.0.99",
|
|
37
|
+
"@things-factory/scheduler-client": "^6.0.99",
|
|
38
|
+
"@things-factory/shell": "^6.0.99",
|
|
39
39
|
"moment-timezone": "^0.5.40"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "9cfa049647cfb5ef68a938af258ef02df0bc79d2"
|
|
42
42
|
}
|
|
@@ -92,12 +92,14 @@ export async function issue(
|
|
|
92
92
|
activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole
|
|
93
93
|
activityInstance.priority = priority ?? activity.priority
|
|
94
94
|
|
|
95
|
+
activityInstance.adhocType = 'standard'
|
|
96
|
+
activityInstance.refBy = activityId
|
|
97
|
+
|
|
95
98
|
if (!assignees || !approvalLine) {
|
|
96
|
-
activityInstance.adhocType = 'standard'
|
|
97
|
-
activityInstance.refBy = activityId
|
|
98
99
|
if (!assignees) {
|
|
99
100
|
assignees = activityInstance.assignees = activity.assignees
|
|
100
101
|
}
|
|
102
|
+
|
|
101
103
|
if (!approvalLine) {
|
|
102
104
|
approvalLine = activityInstance.approvalLine = activity.approvalLine
|
|
103
105
|
}
|
|
@@ -130,11 +130,7 @@ export class ActivityInstanceQuery {
|
|
|
130
130
|
|
|
131
131
|
@FieldResolver(type => Activity)
|
|
132
132
|
async activity(@Root() activityInstance: ActivityInstance): Promise<Activity> {
|
|
133
|
-
const {
|
|
134
|
-
|
|
135
|
-
if (adhocType !== 'standard') {
|
|
136
|
-
return null
|
|
137
|
-
}
|
|
133
|
+
const { activityId } = activityInstance
|
|
138
134
|
|
|
139
135
|
return await getRepository(Activity).findOneBy({ id: activityId })
|
|
140
136
|
}
|