@things-factory/organization 6.0.34 → 6.0.40
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/bootstrap.ts +5 -3
- package/client/component/approval-line-items-editor-popup.ts +5 -1
- package/client/component/approval-line-items-editor.ts +16 -3
- package/client/grist-editor/grist-editor-approval-line.ts +6 -7
- package/client/grist-editor/grist-editor-assignees.ts +6 -7
- package/client/grist-editor/grist-renderer-approval-line.ts +12 -0
- package/client/grist-editor/grist-renderer-assignees.ts +12 -0
- package/dist-client/bootstrap.js +5 -3
- package/dist-client/bootstrap.js.map +1 -1
- package/dist-client/component/approval-line-items-editor-popup.js +4 -1
- package/dist-client/component/approval-line-items-editor-popup.js.map +1 -1
- package/dist-client/component/approval-line-items-editor.js +16 -3
- package/dist-client/component/approval-line-items-editor.js.map +1 -1
- package/dist-client/grist-editor/grist-editor-approval-line.js +5 -5
- package/dist-client/grist-editor/grist-editor-approval-line.js.map +1 -1
- package/dist-client/grist-editor/grist-editor-assignees.js +5 -5
- package/dist-client/grist-editor/grist-editor-assignees.js.map +1 -1
- package/dist-client/grist-editor/grist-renderer-approval-line.d.ts +3 -0
- package/dist-client/grist-editor/grist-renderer-approval-line.js +10 -0
- package/dist-client/grist-editor/grist-renderer-approval-line.js.map +1 -0
- package/dist-client/grist-editor/grist-renderer-assignees.d.ts +3 -0
- package/dist-client/grist-editor/grist-renderer-assignees.js +10 -0
- package/dist-client/grist-editor/grist-renderer-assignees.js.map +1 -0
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/service/approval-line/approval-line-query.js +4 -4
- package/dist-server/service/approval-line/approval-line-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/server/service/approval-line/approval-line-query.ts +4 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/organization",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.40",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"@things-factory/contact": "^6.0.34",
|
|
35
35
|
"@things-factory/shell": "^6.0.34"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "12f9a90b362b53ed1a8df8bdac015f4a5676a75b"
|
|
38
38
|
}
|
|
@@ -31,7 +31,7 @@ async function getOwnerValue(approvalLine: ApprovalLine, context: ResolverContex
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
async function getModel(approvalLine: ApprovalLine, context: ResolverContext): Promise<ApprovalLineItem[]> {
|
|
34
|
-
const { domain
|
|
34
|
+
const { domain } = context.state
|
|
35
35
|
const { model } = approvalLine
|
|
36
36
|
|
|
37
37
|
if (!model || !(model instanceof Array)) {
|
|
@@ -46,13 +46,13 @@ async function getModel(approvalLine: ApprovalLine, context: ResolverContext): P
|
|
|
46
46
|
|
|
47
47
|
switch (type) {
|
|
48
48
|
case OrgMemberTargetType.Employee:
|
|
49
|
-
approver = await getRepository(Employee).findOneBy({ domain: { id: domain.id }, id })
|
|
49
|
+
approver = id && (await getRepository(Employee).findOneBy({ domain: { id: domain.id }, id }))
|
|
50
50
|
break
|
|
51
51
|
case OrgMemberTargetType.Department:
|
|
52
|
-
approver = await getRepository(Department).findOneBy({ domain: { id: domain.id }, id })
|
|
52
|
+
approver = id && (await getRepository(Department).findOneBy({ domain: { id: domain.id }, id }))
|
|
53
53
|
break
|
|
54
54
|
case OrgMemberTargetType.Role:
|
|
55
|
-
approver = await getRepository(Role).findOneBy({ domain: { id: domain.id }, id })
|
|
55
|
+
approver = id && (await getRepository(Role).findOneBy({ domain: { id: domain.id }, id }))
|
|
56
56
|
break
|
|
57
57
|
case OrgMemberTargetType.Myself:
|
|
58
58
|
case OrgMemberTargetType.MyDepartment:
|