wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-05 15:24:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

EQMS-1411: Fixed the approval-to-effective status transition in QMS documents (#8598)
Some checks are pending
CI / build (push) Waiting to run
Details
CI / svelte-check (push) Blocked by required conditions
Details
CI / formatting (push) Blocked by required conditions
Details
CI / test (push) Blocked by required conditions
Details
CI / uitest (push) Waiting to run
Details
CI / uitest-pg (push) Waiting to run
Details
CI / uitest-qms (push) Waiting to run
Details
CI / uitest-workspaces (push) Waiting to run
Details
CI / docker-build (push) Blocked by required conditions
Details
CI / dist-build (push) Blocked by required conditions
Details

Browse Source 
Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>
This commit is contained in:
Victor Ilyushchenko 2025-04-17 05:15:07 +03:00 committed by GitHub
parent fe23a72d6e
commit 9e916670e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/controlled-documents/src/utils.ts
View File

@ -870,12 +870,16 @@ export async function getFirstRank (
/** /**
* @public * @public
*/ */
export function getEffectiveDocUpdate (): DocumentUpdate<ControlledDocument> { export function getEffectiveDocUpdates (): DocumentUpdate<ControlledDocument>[] {
return { return [
state: DocumentState.Effective, {
effectiveDate: Date.now(), state: DocumentState.Effective,
controlledState: undefined effectiveDate: Date.now()
} },
{
$unset: { controlledState: true }
}
]
} }
/** /**

11
server-plugins/controlled-documents-resources/src/index.ts
View File

@ -31,7 +31,7 @@ import documents, {
DocumentApprovalRequest, DocumentApprovalRequest,
DocumentState, DocumentState,
DocumentTemplate, DocumentTemplate,
getEffectiveDocUpdate, getEffectiveDocUpdates,
type DocumentRequest, type DocumentRequest,
type DocumentTraining type DocumentTraining
} from '@hcengineering/controlled-documents' } from '@hcengineering/controlled-documents'
@ -58,8 +58,9 @@ async function getDocs (
return allDocs.filter(predicate) return allDocs.filter(predicate)
} }
function makeDocEffective (doc: ControlledDocument, txFactory: TxFactory): Tx { function makeDocEffective (doc: ControlledDocument, txFactory: TxFactory): Tx[] {
return txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, getEffectiveDocUpdate()) const updates = getEffectiveDocUpdates()
return updates.map((u) => txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, u))
} }
function archiveDocs (docs: ControlledDocument[], txFactory: TxFactory): Tx[] { function archiveDocs (docs: ControlledDocument[], txFactory: TxFactory): Tx[] {
@ -358,7 +359,7 @@ export async function OnDocPlannedEffectiveDateChanged (
if (tx.operations.plannedEffectiveDate === 0 && doc.controlledState === ControlledDocumentState.Approved) { if (tx.operations.plannedEffectiveDate === 0 && doc.controlledState === ControlledDocumentState.Approved) {
// Create with not derived tx factory in order for notifications to work // Create with not derived tx factory in order for notifications to work
const factory = new TxFactory(control.txFactory.account) const factory = new TxFactory(control.txFactory.account)
await control.apply(control.ctx, [makeDocEffective(doc, factory)]) await control.apply(control.ctx, makeDocEffective(doc, factory))
} }
} }
@ -383,7 +384,7 @@ export async function OnDocApprovalRequestApproved (
// Create with not derived tx factory in order for notifications to work // Create with not derived tx factory in order for notifications to work
const factory = new TxFactory(control.txFactory.account) const factory = new TxFactory(control.txFactory.account)
await control.apply(control.ctx, [makeDocEffective(doc, factory)]) await control.apply(control.ctx, makeDocEffective(doc, factory))
// make doc effective immediately // make doc effective immediately
} }
return result return result