Skip to content

Commit d7a54c3

Browse files
authored
Merge pull request #622 from ChildMindInstitute/release/2025.05.2
Release/2025.05.2
2 parents 9eebee5 + 16d492d commit d7a54c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1913
-278
lines changed

public/apple-app-site-association.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
"appIDs": [
66
"8RHKE85KB6.lab.childmindinstitute.data.dev"
77
],
8-
"paths": ["/password-recovery"]
8+
"paths": [
9+
"/password-recovery",
10+
"/active-assessment"
11+
]
912
}
1013
]
1114
}
12-
}
15+
}

src/abstract/lib/GroupBuilder/ActivityGroupsBuilder.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const getProgress = (startAt: Date, endAt: Date | null) => {
2828
type: ActivityPipelineType.Regular,
2929
startAt: startAt.getTime(),
3030
endAt: endAt ? endAt.getTime() : null,
31+
submitId: 'group-key-1',
3132
context: {
3233
summaryData: {},
3334
},
@@ -1577,7 +1578,7 @@ describe('ActivityGroupsBuilder', () => {
15771578
endAt: null,
15781579
currentActivityId: 'test-id-1',
15791580
currentActivityStartAt: addMinutes(scheduledAt, 5).getTime(),
1580-
executionGroupKey: 'group-key-1',
1581+
submitId: 'group-key-1',
15811582
pipelineActivityOrder: 0,
15821583
context: {
15831584
summaryData: {},

src/abstract/lib/GroupBuilder/AvailableGroupBuilder.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const getProgress = (startAt: Date, endAt: Date | null) => {
2222
type: ActivityPipelineType.Regular,
2323
startAt: startAt.getTime(),
2424
endAt: endAt ? endAt.getTime() : null,
25+
submitId: 'test-key',
2526
context: {
2627
summaryData: {},
2728
},

src/abstract/lib/GroupBuilder/ScheduledGroupEvaluator.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const getProgress = (startAt: Date, endAt: Date | null) => {
2121
type: ActivityPipelineType.Regular,
2222
startAt: startAt.getTime(),
2323
endAt: endAt ? endAt.getTime() : null,
24+
submitId: 'test-key',
2425
context: {
2526
summaryData: {},
2627
},

src/abstract/lib/types/entityProgress.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ export type FlowProgress = {
3434
currentActivityId: string;
3535
pipelineActivityOrder: number;
3636
currentActivityStartAt: number | null;
37-
executionGroupKey: string;
37+
submitId: string;
3838
};
3939

4040
export type ActivityProgress = {
4141
type: ActivityPipelineType.Regular;
42+
submitId: string;
4243
};
4344

4445
export type ProgressContext = {
@@ -66,3 +67,9 @@ export type GroupProgress = ActivityOrFlowProgress & EventProgressTimestampState
6667
export type GroupProgressId = `${string}/${string}` | `${string}/${string}/${string}`;
6768

6869
export type GroupProgressState = Record<GroupProgressId, GroupProgress>;
70+
71+
export type ActiveAssessment = {
72+
appletId: string;
73+
publicAppletKey: string | null;
74+
groupProgressId: GroupProgressId;
75+
} | null;
Lines changed: 65 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)