@hmcts/ccd-case-ui-toolkit 7.0.26 → 7.0.29-task-comp
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/esm2020/lib/shared/components/event-start/event-guard/event-start.guard.mjs +1 -6
- package/esm2020/lib/shared/components/event-start/services/event-start-state-machine.service.mjs +2 -2
- package/esm2020/lib/shared/components/palette/case-file-view/components/case-file-view-folder/case-file-view-folder.component.mjs +3 -2
- package/esm2020/lib/shared/domain/case-file-view/document-tree-node/document-tree-node.model.mjs +1 -1
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs +3 -7
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs +3 -7
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/lib/shared/components/event-start/event-guard/event-start.guard.d.ts.map +1 -1
- package/lib/shared/components/palette/case-file-view/components/case-file-view-folder/case-file-view-folder.component.d.ts.map +1 -1
- package/lib/shared/domain/case-file-view/document-tree-node/document-tree-node.model.d.ts +1 -0
- package/lib/shared/domain/case-file-view/document-tree-node/document-tree-node.model.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -21457,10 +21457,11 @@ class CaseFileViewFolderComponent {
|
|
|
21457
21457
|
newDocumentTreeNode.name = node.category_name;
|
|
21458
21458
|
newDocumentTreeNode.type = DocumentTreeNodeType.FOLDER;
|
|
21459
21459
|
newDocumentTreeNode.children = [...this.generateTreeData(node.sub_categories), ...this.getDocuments(node.documents)];
|
|
21460
|
+
newDocumentTreeNode.category_order = node.category_order;
|
|
21460
21461
|
return [
|
|
21461
21462
|
...tree,
|
|
21462
21463
|
newDocumentTreeNode,
|
|
21463
|
-
];
|
|
21464
|
+
].sort((a, b) => a.category_order - b.category_order);
|
|
21464
21465
|
}, []);
|
|
21465
21466
|
}
|
|
21466
21467
|
getDocuments(documents) {
|
|
@@ -32137,15 +32138,10 @@ class EventStartGuard {
|
|
|
32137
32138
|
const caseId = route.params['cid'];
|
|
32138
32139
|
const eventId = route.params['eid'];
|
|
32139
32140
|
const taskId = route.queryParams['tid'];
|
|
32140
|
-
// TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
|
|
32141
|
-
const isComplete = route.queryParams['isComplete'];
|
|
32142
32141
|
const caseInfoStr = this.sessionStorageService.getItem('caseInfo');
|
|
32143
32142
|
if (caseInfoStr) {
|
|
32144
32143
|
const caseInfo = JSON.parse(caseInfoStr);
|
|
32145
32144
|
if (caseInfo && caseInfo.cid === caseId) {
|
|
32146
|
-
if (isComplete) {
|
|
32147
|
-
return of(true);
|
|
32148
|
-
}
|
|
32149
32145
|
return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId, caseInfo.caseType, caseInfo.jurisdiction).pipe(switchMap((payload) => this.checkForTasks(payload, caseId, eventId, taskId)));
|
|
32150
32146
|
}
|
|
32151
32147
|
}
|
|
@@ -32344,7 +32340,7 @@ class EventStartStateMachineService {
|
|
|
32344
32340
|
// Store task to session
|
|
32345
32341
|
context.sessionStorageService.setItem('taskToComplete', JSON.stringify(task));
|
|
32346
32342
|
// Allow user to perform the event
|
|
32347
|
-
context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], {
|
|
32343
|
+
context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
|
|
32348
32344
|
}
|
|
32349
32345
|
entryActionForStateMultipleTasksAssignedToUser(state, context) {
|
|
32350
32346
|
// Trigger final state to complete processing of state machine
|