Skip to content

Commit c721929

Browse files
authored
EQMS-1441: editable QMS doc reviewers and approvers during requests. (#8699)
* EQMS-1441: editable QMS doc reviewers and approvers during requests. Signed-off-by: Victor Ilyushchenko <[email protected]> * ff Signed-off-by: Victor Ilyushchenko <[email protected]> --------- Signed-off-by: Victor Ilyushchenko <[email protected]>
1 parent dd851dd commit c721929

File tree

3 files changed

+83
-19
lines changed

3 files changed

+83
-19
lines changed

plugins/controlled-documents-resources/src/components/EditDocPanel.svelte

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
import { getProjectDocumentLink } from '../navigation'
4646
import documentRes from '../plugin'
4747
import {
48+
$approvalRequest as approvalRequest,
49+
$reviewRequest as reviewRequest,
4850
$activeRightPanelTab as activeRightPanelTab,
4951
$availableEditorModes as availableEditorModes,
5052
$availableRightPanelTabs as availableRightPanelTabs,
@@ -140,7 +142,12 @@
140142
{
141143
label: documentRes.string.TeamTab,
142144
component: EditDocTeam,
143-
props: { controlledDoc: $controlledDocument, editable: $isDocumentOwner }
145+
props: {
146+
controlledDoc: $controlledDocument,
147+
editable: $isDocumentOwner,
148+
reviewRequest: $reviewRequest,
149+
approvalRequest: $approvalRequest
150+
}
144151
},
145152
{
146153
label: documentRes.string.ReleaseTab,

plugins/controlled-documents-resources/src/components/document/DocTeam.svelte

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
export let canChangeReviewers: boolean = true
2626
export let canChangeApprovers: boolean = true
2727
export let canChangeCoAuthors: boolean = true
28+
export let reviewers: Ref<Employee>[] = controlledDoc?.reviewers ?? []
29+
export let approvers: Ref<Employee>[] = controlledDoc?.approvers ?? []
30+
export let coAuthors: Ref<Employee>[] = controlledDoc?.coAuthors ?? []
2831
2932
const dispatch = createEventDispatcher()
3033
const currentEmployee = getCurrentEmployee()
3134
32-
$: reviewers = controlledDoc.reviewers
33-
$: approvers = controlledDoc.approvers
34-
$: coAuthors = controlledDoc.coAuthors
35-
3635
$: permissionsSpace = space === documents.space.UnsortedTemplates ? documents.space.QualityDocuments : space
3736
3837
function getPermittedPersons (

plugins/controlled-documents-resources/src/components/document/EditDocTeam.svelte

Lines changed: 72 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,92 @@
1313
// limitations under the License.
1414
-->
1515
<script lang="ts">
16-
import { Scroller } from '@hcengineering/ui'
16+
import { Employee, Person } from '@hcengineering/contact'
17+
import {
18+
ControlledDocument,
19+
ControlledDocumentState,
20+
DocumentApprovalRequest,
21+
DocumentReviewRequest,
22+
DocumentState
23+
} from '@hcengineering/controlled-documents'
1724
import { Ref } from '@hcengineering/core'
18-
import { ControlledDocument, ControlledDocumentState, DocumentState } from '@hcengineering/controlled-documents'
19-
import { Employee } from '@hcengineering/contact'
2025
import { getClient } from '@hcengineering/presentation'
26+
import { Scroller } from '@hcengineering/ui'
2127
2228
import DocTeam from './DocTeam.svelte'
2329
2430
export let controlledDoc: ControlledDocument
2531
export let editable: boolean = true
32+
export let reviewRequest: DocumentReviewRequest | undefined
33+
export let approvalRequest: DocumentApprovalRequest | undefined
34+
35+
$: controlledState = controlledDoc.controlledState ?? null
36+
37+
$: isEditableDraft = editable && controlledDoc.state === DocumentState.Draft
2638
27-
$: canChangeCoAuthors =
28-
editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
29-
$: canChangeReviewers =
30-
editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
31-
$: canChangeApprovers =
32-
editable &&
33-
((controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null) ||
34-
controlledDoc.controlledState === ControlledDocumentState.InReview ||
35-
controlledDoc.controlledState === ControlledDocumentState.Reviewed)
39+
$: inCleanState = controlledState === null
40+
$: inReview = controlledState === ControlledDocumentState.InReview && reviewRequest !== undefined
41+
$: inApproval = controlledState === ControlledDocumentState.InApproval && approvalRequest !== undefined
42+
$: isReviewed = controlledState === ControlledDocumentState.Reviewed
43+
44+
$: canChangeCoAuthors = isEditableDraft && inCleanState
45+
$: canChangeReviewers = isEditableDraft && (inCleanState || inReview)
46+
$: canChangeApprovers = isEditableDraft && (inCleanState || inApproval || inReview || isReviewed)
47+
48+
$: reviewers = (reviewRequest?.requested as Ref<Employee>[]) ?? controlledDoc.reviewers
49+
$: approvers = (approvalRequest?.requested as Ref<Employee>[]) ?? controlledDoc.approvers
50+
$: coAuthors = controlledDoc.coAuthors
3651
3752
const client = getClient()
3853
3954
async function handleUpdate ({
4055
detail
4156
}: {
42-
detail: { type: 'reviewers' | 'approvers', users: Ref<Employee>[] }
57+
detail: { type: 'reviewers' | 'approvers', users: Ref<Person>[] }
4358
}): Promise<void> {
4459
const { type, users } = detail
4560
46-
await client.update(controlledDoc, { [type]: users })
61+
const request = detail.type === 'reviewers' ? reviewRequest : approvalRequest
62+
63+
const ops = client.apply()
64+
65+
if (request?._id !== undefined) {
66+
const requested = request.requested?.slice() ?? []
67+
const requestedSet = new Set<Ref<Person>>(requested)
68+
69+
const addedPersons = new Set<Ref<Person>>()
70+
const removedPersons = new Set<Ref<Person>>(requested)
71+
72+
for (const u of users) {
73+
if (requestedSet.has(u)) {
74+
removedPersons.delete(u)
75+
} else {
76+
addedPersons.add(u)
77+
}
78+
}
79+
80+
const approved = request.approved?.slice() ?? []
81+
const approvedDates = request.approvedDates?.slice() ?? []
82+
83+
for (const u of removedPersons) {
84+
const idx = approved.indexOf(u)
85+
if (idx === -1) continue
86+
approved.splice(idx, 1)
87+
approvedDates.splice(idx, 1)
88+
}
89+
90+
const requiredApprovesCount = users.length
91+
92+
await ops.update(request, {
93+
requested: users,
94+
approved,
95+
approvedDates,
96+
requiredApprovesCount
97+
})
98+
}
99+
100+
await ops.update(controlledDoc, { [type]: users })
101+
await ops.commit()
47102
}
48103
</script>
49104

@@ -56,6 +111,9 @@
56111
{canChangeCoAuthors}
57112
{canChangeReviewers}
58113
{canChangeApprovers}
114+
{reviewers}
115+
{approvers}
116+
{coAuthors}
59117
on:update={handleUpdate}
60118
/>
61119
</div>

0 commit comments

Comments
 (0)