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 <alt13ri@gmail.com>

* ff

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>

---------

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>
This commit is contained in:
Victor Ilyushchenko 2025-04-28 22:30:55 +03:00 committed by GitHub
parent dd851ddf05
commit c721929021
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 83 additions and 19 deletions

View File

@ -45,6 +45,8 @@
import { getProjectDocumentLink } from '../navigation' import { getProjectDocumentLink } from '../navigation'
import documentRes from '../plugin' import documentRes from '../plugin'
import { import {
$approvalRequest as approvalRequest,
$reviewRequest as reviewRequest,
$activeRightPanelTab as activeRightPanelTab, $activeRightPanelTab as activeRightPanelTab,
$availableEditorModes as availableEditorModes, $availableEditorModes as availableEditorModes,
$availableRightPanelTabs as availableRightPanelTabs, $availableRightPanelTabs as availableRightPanelTabs,
@ -140,7 +142,12 @@
{ {
label: documentRes.string.TeamTab, label: documentRes.string.TeamTab,
component: EditDocTeam, component: EditDocTeam,
props: { controlledDoc: $controlledDocument, editable: $isDocumentOwner } props: {
controlledDoc: $controlledDocument,
editable: $isDocumentOwner,
reviewRequest: $reviewRequest,
approvalRequest: $approvalRequest
}
}, },
{ {
label: documentRes.string.ReleaseTab, label: documentRes.string.ReleaseTab,

View File

@ -25,14 +25,13 @@
export let canChangeReviewers: boolean = true export let canChangeReviewers: boolean = true
export let canChangeApprovers: boolean = true export let canChangeApprovers: boolean = true
export let canChangeCoAuthors: boolean = true export let canChangeCoAuthors: boolean = true
export let reviewers: Ref<Employee>[] = controlledDoc?.reviewers ?? []
export let approvers: Ref<Employee>[] = controlledDoc?.approvers ?? []
export let coAuthors: Ref<Employee>[] = controlledDoc?.coAuthors ?? []
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
const currentEmployee = getCurrentEmployee() const currentEmployee = getCurrentEmployee()
$: reviewers = controlledDoc.reviewers
$: approvers = controlledDoc.approvers
$: coAuthors = controlledDoc.coAuthors
$: permissionsSpace = space === documents.space.UnsortedTemplates ? documents.space.QualityDocuments : space $: permissionsSpace = space === documents.space.UnsortedTemplates ? documents.space.QualityDocuments : space
function getPermittedPersons ( function getPermittedPersons (

View File

@ -13,37 +13,92 @@
// limitations under the License. // limitations under the License.
--> -->
<script lang="ts"> <script lang="ts">
import { Scroller } from '@hcengineering/ui' import { Employee, Person } from '@hcengineering/contact'
import {
ControlledDocument,
ControlledDocumentState,
DocumentApprovalRequest,
DocumentReviewRequest,
DocumentState
} from '@hcengineering/controlled-documents'
import { Ref } from '@hcengineering/core' import { Ref } from '@hcengineering/core'
import { ControlledDocument, ControlledDocumentState, DocumentState } from '@hcengineering/controlled-documents'
import { Employee } from '@hcengineering/contact'
import { getClient } from '@hcengineering/presentation' import { getClient } from '@hcengineering/presentation'
import { Scroller } from '@hcengineering/ui'
import DocTeam from './DocTeam.svelte' import DocTeam from './DocTeam.svelte'
export let controlledDoc: ControlledDocument export let controlledDoc: ControlledDocument
export let editable: boolean = true export let editable: boolean = true
export let reviewRequest: DocumentReviewRequest | undefined
export let approvalRequest: DocumentApprovalRequest | undefined
$: canChangeCoAuthors = $: controlledState = controlledDoc.controlledState ?? null
editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
$: canChangeReviewers = $: isEditableDraft = editable && controlledDoc.state === DocumentState.Draft
editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
$: canChangeApprovers = $: inCleanState = controlledState === null
editable && $: inReview = controlledState === ControlledDocumentState.InReview && reviewRequest !== undefined
((controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null) || $: inApproval = controlledState === ControlledDocumentState.InApproval && approvalRequest !== undefined
controlledDoc.controlledState === ControlledDocumentState.InReview || $: isReviewed = controlledState === ControlledDocumentState.Reviewed
controlledDoc.controlledState === ControlledDocumentState.Reviewed)
$: canChangeCoAuthors = isEditableDraft && inCleanState
$: canChangeReviewers = isEditableDraft && (inCleanState || inReview)
$: canChangeApprovers = isEditableDraft && (inCleanState || inApproval || inReview || isReviewed)
$: reviewers = (reviewRequest?.requested as Ref<Employee>[]) ?? controlledDoc.reviewers
$: approvers = (approvalRequest?.requested as Ref<Employee>[]) ?? controlledDoc.approvers
$: coAuthors = controlledDoc.coAuthors
const client = getClient() const client = getClient()
async function handleUpdate ({ async function handleUpdate ({
detail detail
}: { }: {
detail: { type: 'reviewers' | 'approvers', users: Ref<Employee>[] } detail: { type: 'reviewers' | 'approvers', users: Ref<Person>[] }
}): Promise<void> { }): Promise<void> {
const { type, users } = detail const { type, users } = detail
await client.update(controlledDoc, { [type]: users }) const request = detail.type === 'reviewers' ? reviewRequest : approvalRequest
const ops = client.apply()
if (request?._id !== undefined) {
const requested = request.requested?.slice() ?? []
const requestedSet = new Set<Ref<Person>>(requested)
const addedPersons = new Set<Ref<Person>>()
const removedPersons = new Set<Ref<Person>>(requested)
for (const u of users) {
if (requestedSet.has(u)) {
removedPersons.delete(u)
} else {
addedPersons.add(u)
}
}
const approved = request.approved?.slice() ?? []
const approvedDates = request.approvedDates?.slice() ?? []
for (const u of removedPersons) {
const idx = approved.indexOf(u)
if (idx === -1) continue
approved.splice(idx, 1)
approvedDates.splice(idx, 1)
}
const requiredApprovesCount = users.length
await ops.update(request, {
requested: users,
approved,
approvedDates,
requiredApprovesCount
})
}
await ops.update(controlledDoc, { [type]: users })
await ops.commit()
} }
</script> </script>
@ -56,6 +111,9 @@
{canChangeCoAuthors} {canChangeCoAuthors}
{canChangeReviewers} {canChangeReviewers}
{canChangeApprovers} {canChangeApprovers}
{reviewers}
{approvers}
{coAuthors}
on:update={handleUpdate} on:update={handleUpdate}
/> />
</div> </div>