@opencrvs/toolkit 2.0.0-rc.cbf3c53 → 2.0.0-rc.cc25fc9
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/dist/application-config/index.js +8 -1
- package/dist/cli.js +1 -1
- package/dist/commons/api/router.d.ts +13 -2
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventIndex.d.ts +14 -0
- package/dist/commons/events/FieldConfig.d.ts +1 -0
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/events/index.js +154 -62
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +1 -1
- package/dist/notification/index.js +97 -3
- package/opencrvs-toolkit-2.0.0-rc.cc25fc9.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.cbf3c53.tgz +0 -0
|
@@ -206,6 +206,11 @@ var FieldTypesToHideInReview = [
|
|
|
206
206
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
207
207
|
FieldType.ALPHA_HIDDEN
|
|
208
208
|
];
|
|
209
|
+
var HiddenFieldTypes = [
|
|
210
|
+
FieldType.HTTP,
|
|
211
|
+
FieldType.QUERY_PARAM_READER,
|
|
212
|
+
FieldType.ALPHA_HIDDEN
|
|
213
|
+
];
|
|
209
214
|
|
|
210
215
|
// ../commons/src/events/FieldValue.ts
|
|
211
216
|
var z7 = __toESM(require("zod/v4"));
|
|
@@ -1255,7 +1260,8 @@ var Range = import_v4.z.object({
|
|
|
1255
1260
|
});
|
|
1256
1261
|
var ContainsFlags = import_v4.z.object({
|
|
1257
1262
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
1258
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
1263
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
1264
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
1259
1265
|
}).meta({
|
|
1260
1266
|
id: "ContainsFlags"
|
|
1261
1267
|
});
|
|
@@ -1495,6 +1501,7 @@ var NumberField = BaseField.extend({
|
|
|
1495
1501
|
configuration: import_v43.default.object({
|
|
1496
1502
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
1497
1503
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
1504
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
1498
1505
|
prefix: TranslationConfig.optional(),
|
|
1499
1506
|
postfix: TranslationConfig.optional()
|
|
1500
1507
|
}).optional()
|
package/dist/cli.js
CHANGED
|
@@ -4300,7 +4300,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4300
4300
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4301
4301
|
var import_child_process = require("child_process");
|
|
4302
4302
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4303
|
-
var UPSTREAM_BRANCH = "release
|
|
4303
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4304
4304
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4305
4305
|
var FILES_TO_CHECKOUT = [
|
|
4306
4306
|
"src/analytics/analytics.ts",
|
|
@@ -7374,9 +7374,18 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
7374
7374
|
output: void;
|
|
7375
7375
|
meta: import("trpc-to-openapi").OpenApiMeta;
|
|
7376
7376
|
}>;
|
|
7377
|
-
|
|
7377
|
+
requestEmailChange: import("@trpc/server").TRPCMutationProcedure<{
|
|
7378
7378
|
input: {
|
|
7379
|
-
|
|
7379
|
+
email: string;
|
|
7380
|
+
};
|
|
7381
|
+
output: {
|
|
7382
|
+
nonce: string;
|
|
7383
|
+
};
|
|
7384
|
+
meta: import("trpc-to-openapi").OpenApiMeta;
|
|
7385
|
+
}>;
|
|
7386
|
+
requestPhoneChange: import("@trpc/server").TRPCMutationProcedure<{
|
|
7387
|
+
input: {
|
|
7388
|
+
phoneNumber: string;
|
|
7380
7389
|
};
|
|
7381
7390
|
output: {
|
|
7382
7391
|
nonce: string;
|
|
@@ -8004,6 +8013,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
8004
8013
|
flags?: {
|
|
8005
8014
|
anyOf?: string[] | undefined;
|
|
8006
8015
|
noneOf?: string[] | undefined;
|
|
8016
|
+
allOf?: string[] | undefined;
|
|
8007
8017
|
} | undefined;
|
|
8008
8018
|
data?: unknown;
|
|
8009
8019
|
}[];
|
|
@@ -8142,6 +8152,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
8142
8152
|
flags?: {
|
|
8143
8153
|
anyOf?: string[] | undefined;
|
|
8144
8154
|
noneOf?: string[] | undefined;
|
|
8155
|
+
allOf?: string[] | undefined;
|
|
8145
8156
|
} | undefined;
|
|
8146
8157
|
data?: unknown;
|
|
8147
8158
|
}[];
|
|
@@ -85,6 +85,32 @@ export declare const ActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
85
85
|
fields: z.ZodArray<z.ZodType<FieldConfig, import("./FieldConfig").FieldConfigInput, z.core.$ZodTypeInternals<FieldConfig, import("./FieldConfig").FieldConfigInput>>>;
|
|
86
86
|
}, z.core.$strip>;
|
|
87
87
|
conditionals: z.ZodOptional<z.ZodNever>;
|
|
88
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
89
|
+
label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
|
|
90
|
+
flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
91
|
+
id: z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
92
|
+
readonly INCOMPLETE: "incomplete";
|
|
93
|
+
readonly REJECTED: "rejected";
|
|
94
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
95
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
96
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
97
|
+
}>]>, z.ZodString]>;
|
|
98
|
+
operation: z.ZodEnum<{
|
|
99
|
+
add: "add";
|
|
100
|
+
remove: "remove";
|
|
101
|
+
}>;
|
|
102
|
+
conditional: z.ZodOptional<z.ZodAny>;
|
|
103
|
+
}, z.core.$strip>>>>;
|
|
104
|
+
supportingCopy: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
|
|
105
|
+
icon: z.ZodOptional<z.ZodString>;
|
|
106
|
+
conditionals: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
107
|
+
type: z.ZodLiteral<"SHOW">;
|
|
108
|
+
conditional: z.ZodAny;
|
|
109
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
110
|
+
type: z.ZodLiteral<"ENABLE">;
|
|
111
|
+
conditional: z.ZodAny;
|
|
112
|
+
}, z.core.$strip>], "type">>>;
|
|
113
|
+
type: z.ZodLiteral<"NOTIFY">;
|
|
88
114
|
}, z.core.$strip>, z.ZodObject<{
|
|
89
115
|
label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
|
|
90
116
|
flags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
@@ -388,8 +414,8 @@ export declare const actionConfigTypes: Set<ActionConfigTypes>;
|
|
|
388
414
|
*
|
|
389
415
|
* These are not the same as the broader workflow `action.type` values.
|
|
390
416
|
* `ActionConfigTypes` includes only the action kinds that can be defined
|
|
391
|
-
* in the country configuration (e.g. DECLARE, VALIDATE, CUSTOM), and
|
|
392
|
-
* excludes workflow-only types such as CREATE
|
|
417
|
+
* in the country configuration (e.g. NOTIFY, DECLARE, VALIDATE, CUSTOM), and
|
|
418
|
+
* excludes workflow-only types such as CREATE.
|
|
393
419
|
*/
|
|
394
420
|
export type ActionConfigTypes = ActionConfig['type'];
|
|
395
421
|
export declare const DeclarationActionConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
@@ -346,6 +346,13 @@ export declare const SerializedQueryExpression: z.ZodObject<{
|
|
|
346
346
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
347
347
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
348
348
|
}>]>, z.ZodString]>>>;
|
|
349
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
350
|
+
readonly INCOMPLETE: "incomplete";
|
|
351
|
+
readonly REJECTED: "rejected";
|
|
352
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
353
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
354
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
355
|
+
}>]>, z.ZodString]>>>;
|
|
349
356
|
}, z.core.$strip>>>;
|
|
350
357
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
351
358
|
}, z.core.$strip>;
|
|
@@ -657,6 +664,13 @@ export declare const CountryConfigQueryType: z.ZodDiscriminatedUnion<[z.ZodObjec
|
|
|
657
664
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
658
665
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
659
666
|
}>]>, z.ZodString]>>>;
|
|
667
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
668
|
+
readonly INCOMPLETE: "incomplete";
|
|
669
|
+
readonly REJECTED: "rejected";
|
|
670
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
671
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
672
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
673
|
+
}>]>, z.ZodString]>>>;
|
|
660
674
|
}, z.core.$strip>>>;
|
|
661
675
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
662
676
|
}, z.core.$strip>>;
|
|
@@ -967,6 +981,13 @@ export declare const CountryConfigQueryType: z.ZodDiscriminatedUnion<[z.ZodObjec
|
|
|
967
981
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
968
982
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
969
983
|
}>]>, z.ZodString]>>>;
|
|
984
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
985
|
+
readonly INCOMPLETE: "incomplete";
|
|
986
|
+
readonly REJECTED: "rejected";
|
|
987
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
988
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
989
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
990
|
+
}>]>, z.ZodString]>>>;
|
|
970
991
|
}, z.core.$strip>>>;
|
|
971
992
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
972
993
|
}, z.core.$strip>>;
|
|
@@ -1277,6 +1298,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
|
|
|
1277
1298
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1278
1299
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1279
1300
|
}>]>, z.ZodString]>>>;
|
|
1301
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
1302
|
+
readonly INCOMPLETE: "incomplete";
|
|
1303
|
+
readonly REJECTED: "rejected";
|
|
1304
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
1305
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1306
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1307
|
+
}>]>, z.ZodString]>>>;
|
|
1280
1308
|
}, z.core.$strip>>>;
|
|
1281
1309
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1282
1310
|
}, z.core.$strip>, z.ZodObject<{
|
|
@@ -1586,6 +1614,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
|
|
|
1586
1614
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1587
1615
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1588
1616
|
}>]>, z.ZodString]>>>;
|
|
1617
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
1618
|
+
readonly INCOMPLETE: "incomplete";
|
|
1619
|
+
readonly REJECTED: "rejected";
|
|
1620
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
1621
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1622
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1623
|
+
}>]>, z.ZodString]>>>;
|
|
1589
1624
|
}, z.core.$strip>>>;
|
|
1590
1625
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1591
1626
|
}, z.core.$strip>>;
|
|
@@ -1896,6 +1931,13 @@ export declare const CountryConfigQueryInputType: z.ZodUnion<readonly [z.ZodObje
|
|
|
1896
1931
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1897
1932
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1898
1933
|
}>]>, z.ZodString]>>>;
|
|
1934
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
1935
|
+
readonly INCOMPLETE: "incomplete";
|
|
1936
|
+
readonly REJECTED: "rejected";
|
|
1937
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
1938
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1939
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1940
|
+
}>]>, z.ZodString]>>>;
|
|
1899
1941
|
}, z.core.$strip>>>;
|
|
1900
1942
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1901
1943
|
}, z.core.$strip>>;
|
|
@@ -127,6 +127,13 @@ export declare const ContainsFlags: z.ZodObject<{
|
|
|
127
127
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
128
128
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
129
129
|
}>]>, z.ZodString]>>>;
|
|
130
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
131
|
+
readonly INCOMPLETE: "incomplete";
|
|
132
|
+
readonly REJECTED: "rejected";
|
|
133
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
134
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
135
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
136
|
+
}>]>, z.ZodString]>>>;
|
|
130
137
|
}, z.core.$strip>;
|
|
131
138
|
export declare const Within: z.ZodObject<{
|
|
132
139
|
type: z.ZodLiteral<"within">;
|
|
@@ -306,6 +313,13 @@ export declare const QueryExpression: z.ZodObject<{
|
|
|
306
313
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
307
314
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
308
315
|
}>]>, z.ZodString]>>>;
|
|
316
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
317
|
+
readonly INCOMPLETE: "incomplete";
|
|
318
|
+
readonly REJECTED: "rejected";
|
|
319
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
320
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
321
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
322
|
+
}>]>, z.ZodString]>>>;
|
|
309
323
|
}, z.core.$strip>>>;
|
|
310
324
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
311
325
|
}, z.core.$strip>;
|
|
@@ -267,6 +267,7 @@ declare const NumberField: z.ZodObject<{
|
|
|
267
267
|
configuration: z.ZodOptional<z.ZodObject<{
|
|
268
268
|
min: z.ZodOptional<z.ZodNumber>;
|
|
269
269
|
max: z.ZodOptional<z.ZodNumber>;
|
|
270
|
+
integer: z.ZodOptional<z.ZodBoolean>;
|
|
270
271
|
prefix: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
|
|
271
272
|
postfix: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
|
|
272
273
|
}, z.core.$strip>>;
|
|
@@ -75,4 +75,5 @@ export type FieldType = (typeof fieldTypes)[number];
|
|
|
75
75
|
*/
|
|
76
76
|
export declare const compositeFieldTypes: ("NAME" | "ADDRESS" | "DATE_RANGE" | "FILE" | "FILE_WITH_OPTIONS" | "DATA" | "ID_READER")[];
|
|
77
77
|
export declare const FieldTypesToHideInReview: ("IMAGE_VIEW" | "PARAGRAPH" | "PAGE_HEADER" | "BULLET_LIST" | "DIVIDER" | "DATA" | "ALPHA_PRINT_BUTTON" | "HTTP" | "QUERY_PARAM_READER" | "ID_READER" | "LOADER" | "ALPHA_HIDDEN")[];
|
|
78
|
+
export declare const HiddenFieldTypes: ("HTTP" | "QUERY_PARAM_READER" | "ALPHA_HIDDEN")[];
|
|
78
79
|
//# sourceMappingURL=FieldType.d.ts.map
|
|
@@ -690,7 +690,7 @@ export declare const isHiddenFieldType: (field: {
|
|
|
690
690
|
value: undefined;
|
|
691
691
|
config: HiddenField;
|
|
692
692
|
};
|
|
693
|
-
export type NonInteractiveFieldType = Divider | PageHeader | ImageViewField | Paragraph | Heading | BulletList | DataField | AlphaPrintButton |
|
|
693
|
+
export type NonInteractiveFieldType = Divider | PageHeader | ImageViewField | Paragraph | Heading | BulletList | DataField | AlphaPrintButton | LinkButtonField | LoaderField | AutocompleteField;
|
|
694
694
|
export type InteractiveFieldType = Exclude<FieldConfig, NonInteractiveFieldType>;
|
|
695
695
|
export declare const isNonInteractiveFieldType: (field: FieldConfig) => field is NonInteractiveFieldType;
|
|
696
696
|
export {};
|
|
@@ -322,6 +322,13 @@ export declare const WorkqueueConfig: z.ZodObject<{
|
|
|
322
322
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
323
323
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
324
324
|
}>]>, z.ZodString]>>>;
|
|
325
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
326
|
+
readonly INCOMPLETE: "incomplete";
|
|
327
|
+
readonly REJECTED: "rejected";
|
|
328
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
329
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
330
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
331
|
+
}>]>, z.ZodString]>>>;
|
|
325
332
|
}, z.core.$strip>>>;
|
|
326
333
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
327
334
|
}, z.core.$strip>>;
|
|
@@ -632,6 +639,13 @@ export declare const WorkqueueConfig: z.ZodObject<{
|
|
|
632
639
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
633
640
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
634
641
|
}>]>, z.ZodString]>>>;
|
|
642
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
643
|
+
readonly INCOMPLETE: "incomplete";
|
|
644
|
+
readonly REJECTED: "rejected";
|
|
645
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
646
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
647
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
648
|
+
}>]>, z.ZodString]>>>;
|
|
635
649
|
}, z.core.$strip>>>;
|
|
636
650
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
637
651
|
}, z.core.$strip>>;
|
|
@@ -1361,6 +1375,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
|
|
|
1361
1375
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1362
1376
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1363
1377
|
}>]>, z.ZodString]>>>;
|
|
1378
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
1379
|
+
readonly INCOMPLETE: "incomplete";
|
|
1380
|
+
readonly REJECTED: "rejected";
|
|
1381
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
1382
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1383
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1384
|
+
}>]>, z.ZodString]>>>;
|
|
1364
1385
|
}, z.core.$strip>>>;
|
|
1365
1386
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1366
1387
|
}, z.core.$strip>, z.ZodObject<{
|
|
@@ -1670,6 +1691,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
|
|
|
1670
1691
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1671
1692
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1672
1693
|
}>]>, z.ZodString]>>>;
|
|
1694
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
1695
|
+
readonly INCOMPLETE: "incomplete";
|
|
1696
|
+
readonly REJECTED: "rejected";
|
|
1697
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
1698
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1699
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1700
|
+
}>]>, z.ZodString]>>>;
|
|
1673
1701
|
}, z.core.$strip>>>;
|
|
1674
1702
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1675
1703
|
}, z.core.$strip>>;
|
|
@@ -1980,6 +2008,13 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
|
|
|
1980
2008
|
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
1981
2009
|
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
1982
2010
|
}>]>, z.ZodString]>>>;
|
|
2011
|
+
allOf: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
|
|
2012
|
+
readonly INCOMPLETE: "incomplete";
|
|
2013
|
+
readonly REJECTED: "rejected";
|
|
2014
|
+
readonly CORRECTION_REQUESTED: "correction-requested";
|
|
2015
|
+
readonly POTENTIAL_DUPLICATE: "potential-duplicate";
|
|
2016
|
+
readonly EDIT_IN_PROGRESS: "edit-in-progress";
|
|
2017
|
+
}>]>, z.ZodString]>>>;
|
|
1983
2018
|
}, z.core.$strip>>>;
|
|
1984
2019
|
data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
|
|
1985
2020
|
}, z.core.$strip>>;
|
|
@@ -2130,6 +2165,7 @@ export declare function defineWorkqueue(workqueueInput: WorkqueueConfigInput): {
|
|
|
2130
2165
|
flags?: {
|
|
2131
2166
|
anyOf?: string[] | undefined;
|
|
2132
2167
|
noneOf?: string[] | undefined;
|
|
2168
|
+
allOf?: string[] | undefined;
|
|
2133
2169
|
} | undefined;
|
|
2134
2170
|
data?: unknown;
|
|
2135
2171
|
}[];
|
|
@@ -2268,6 +2304,7 @@ export declare function defineWorkqueue(workqueueInput: WorkqueueConfigInput): {
|
|
|
2268
2304
|
flags?: {
|
|
2269
2305
|
anyOf?: string[] | undefined;
|
|
2270
2306
|
noneOf?: string[] | undefined;
|
|
2307
|
+
allOf?: string[] | undefined;
|
|
2271
2308
|
} | undefined;
|
|
2272
2309
|
data?: unknown;
|
|
2273
2310
|
}[];
|
|
@@ -2439,6 +2476,7 @@ export declare function defineWorkqueues(workqueues: WorkqueueConfigInputWithV19
|
|
|
2439
2476
|
flags?: {
|
|
2440
2477
|
anyOf?: string[] | undefined;
|
|
2441
2478
|
noneOf?: string[] | undefined;
|
|
2479
|
+
allOf?: string[] | undefined;
|
|
2442
2480
|
} | undefined;
|
|
2443
2481
|
data?: unknown;
|
|
2444
2482
|
}[];
|
|
@@ -2577,6 +2615,7 @@ export declare function defineWorkqueues(workqueues: WorkqueueConfigInputWithV19
|
|
|
2577
2615
|
flags?: {
|
|
2578
2616
|
anyOf?: string[] | undefined;
|
|
2579
2617
|
noneOf?: string[] | undefined;
|
|
2618
|
+
allOf?: string[] | undefined;
|
|
2580
2619
|
} | undefined;
|
|
2581
2620
|
data?: unknown;
|
|
2582
2621
|
}[];
|
package/dist/events/index.js
CHANGED
|
@@ -151,6 +151,7 @@ __export(events_exports, {
|
|
|
151
151
|
FormPageConfig: () => FormPageConfig,
|
|
152
152
|
Fuzzy: () => Fuzzy,
|
|
153
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
154
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
155
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
156
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -1219,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1219
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1220
1221
|
FieldType.ALPHA_HIDDEN
|
|
1221
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1222
1228
|
|
|
1223
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1224
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -2017,7 +2023,8 @@ var Range = import_v4.z.object({
|
|
|
2017
2023
|
});
|
|
2018
2024
|
var ContainsFlags = import_v4.z.object({
|
|
2019
2025
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2020
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2026
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2027
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2021
2028
|
}).meta({
|
|
2022
2029
|
id: "ContainsFlags"
|
|
2023
2030
|
});
|
|
@@ -2292,6 +2299,7 @@ var NumberField = BaseField.extend({
|
|
|
2292
2299
|
configuration: import_v43.default.object({
|
|
2293
2300
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2294
2301
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2302
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2295
2303
|
prefix: TranslationConfig.optional(),
|
|
2296
2304
|
postfix: TranslationConfig.optional()
|
|
2297
2305
|
}).optional()
|
|
@@ -3215,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3215
3223
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3216
3224
|
}).shape
|
|
3217
3225
|
);
|
|
3226
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3227
|
+
z24.object({
|
|
3228
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3229
|
+
}).shape
|
|
3230
|
+
);
|
|
3218
3231
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3219
3232
|
z24.object({
|
|
3220
3233
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3299,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3299
3312
|
id: "ReadActionConfig",
|
|
3300
3313
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3301
3314
|
}),
|
|
3315
|
+
NotifyConfig.meta({
|
|
3316
|
+
id: "NotifyActionConfig",
|
|
3317
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3318
|
+
}),
|
|
3302
3319
|
DeclareConfig.meta({
|
|
3303
3320
|
id: "DeclareActionConfig",
|
|
3304
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3321
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3305
3322
|
}),
|
|
3306
3323
|
RejectConfig.meta({
|
|
3307
3324
|
id: "RejectActionConfig",
|
|
@@ -3908,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3908
3925
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3909
3926
|
};
|
|
3910
3927
|
var isNonInteractiveFieldType = (field3) => {
|
|
3911
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3928
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3912
3929
|
};
|
|
3913
3930
|
|
|
3914
3931
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4470,13 +4487,13 @@ function getActionConfig({
|
|
|
4470
4487
|
actionType,
|
|
4471
4488
|
customActionType
|
|
4472
4489
|
}) {
|
|
4490
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4491
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4492
|
+
}
|
|
4473
4493
|
return eventConfiguration.actions.find((a) => {
|
|
4474
4494
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4475
4495
|
return a.customActionType === customActionType;
|
|
4476
4496
|
}
|
|
4477
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4478
|
-
return a.type === ActionType.DECLARE;
|
|
4479
|
-
}
|
|
4480
4497
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4481
4498
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4482
4499
|
}
|
|
@@ -4513,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4513
4530
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4514
4531
|
return actionConfig.form;
|
|
4515
4532
|
}
|
|
4516
|
-
if ("review" in actionConfig) {
|
|
4533
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4517
4534
|
return actionConfig.review.fields;
|
|
4518
4535
|
}
|
|
4519
4536
|
return [];
|
|
@@ -6485,6 +6502,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6485
6502
|
ActionType.ARCHIVE,
|
|
6486
6503
|
ActionType.PRINT_CERTIFICATE,
|
|
6487
6504
|
ActionType.REQUEST_CORRECTION,
|
|
6505
|
+
ActionType.APPROVE_CORRECTION,
|
|
6506
|
+
ActionType.REJECT_CORRECTION,
|
|
6488
6507
|
ActionType.CUSTOM
|
|
6489
6508
|
]);
|
|
6490
6509
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6526,9 +6545,6 @@ function getLegalStatuses(actions) {
|
|
|
6526
6545
|
// ../commons/src/events/state/flags.ts
|
|
6527
6546
|
var import_lodash3 = require("lodash");
|
|
6528
6547
|
var import_date_fns3 = require("date-fns");
|
|
6529
|
-
function isEditInProgress(actions) {
|
|
6530
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6531
|
-
}
|
|
6532
6548
|
function findPendingCorrectionAction(writeActions2) {
|
|
6533
6549
|
let correctionRequestAction;
|
|
6534
6550
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6543,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6543
6559
|
}
|
|
6544
6560
|
return correctionRequestAction;
|
|
6545
6561
|
}
|
|
6546
|
-
function isCorrectionRequested(actions) {
|
|
6547
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6548
|
-
}
|
|
6549
|
-
function isDeclarationIncomplete(actions) {
|
|
6550
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6551
|
-
}
|
|
6552
|
-
function isRejected(actions) {
|
|
6553
|
-
const resettingActionTypes = [
|
|
6554
|
-
ActionType.NOTIFY,
|
|
6555
|
-
ActionType.DECLARE,
|
|
6556
|
-
ActionType.EDIT,
|
|
6557
|
-
ActionType.REGISTER
|
|
6558
|
-
];
|
|
6559
|
-
return actions.reduce((prev, { type }) => {
|
|
6560
|
-
if (type === ActionType.REJECT) {
|
|
6561
|
-
return true;
|
|
6562
|
-
}
|
|
6563
|
-
if (resettingActionTypes.includes(type)) {
|
|
6564
|
-
return false;
|
|
6565
|
-
}
|
|
6566
|
-
return prev;
|
|
6567
|
-
}, false);
|
|
6568
|
-
}
|
|
6569
6562
|
function isPotentialDuplicate(actions) {
|
|
6570
6563
|
return actions.reduce((prev, { type }) => {
|
|
6571
6564
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6593,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6593
6586
|
}
|
|
6594
6587
|
});
|
|
6595
6588
|
}
|
|
6589
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6590
|
+
if (!isActionConfigType(action.type)) {
|
|
6591
|
+
return false;
|
|
6592
|
+
}
|
|
6593
|
+
const actionConfig = getActionConfig({
|
|
6594
|
+
eventConfiguration,
|
|
6595
|
+
actionType: action.type,
|
|
6596
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6597
|
+
});
|
|
6598
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6599
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6600
|
+
);
|
|
6601
|
+
if (removeOperations.length === 0) {
|
|
6602
|
+
return false;
|
|
6603
|
+
}
|
|
6604
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6605
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6606
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6607
|
+
const form = { ...declaration, ...annotation };
|
|
6608
|
+
return removeOperations.some(
|
|
6609
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6610
|
+
);
|
|
6611
|
+
}
|
|
6612
|
+
var INHERENT_FLAG_RULES = [
|
|
6613
|
+
{
|
|
6614
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6615
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6616
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6617
|
+
},
|
|
6618
|
+
{
|
|
6619
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6620
|
+
// other status-changing action (see getStatusFromActions).
|
|
6621
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6622
|
+
setOn: [ActionType.NOTIFY],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.CREATE,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.REGISTER,
|
|
6627
|
+
ActionType.ARCHIVE
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.REJECTED,
|
|
6632
|
+
setOn: [ActionType.REJECT],
|
|
6633
|
+
resetOn: [
|
|
6634
|
+
ActionType.NOTIFY,
|
|
6635
|
+
ActionType.DECLARE,
|
|
6636
|
+
ActionType.EDIT,
|
|
6637
|
+
ActionType.REGISTER
|
|
6638
|
+
]
|
|
6639
|
+
},
|
|
6640
|
+
{
|
|
6641
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6642
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6643
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6644
|
+
},
|
|
6645
|
+
{
|
|
6646
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6647
|
+
setOn: [ActionType.EDIT],
|
|
6648
|
+
resetOnAnyOtherAction: true
|
|
6649
|
+
}
|
|
6650
|
+
];
|
|
6651
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6652
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6653
|
+
if (rule.setOn.includes(action.type)) {
|
|
6654
|
+
return true;
|
|
6655
|
+
}
|
|
6656
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6657
|
+
return false;
|
|
6658
|
+
}
|
|
6659
|
+
if (actionConfigRemovesFlag(
|
|
6660
|
+
action,
|
|
6661
|
+
rule.flag,
|
|
6662
|
+
acceptedActions.slice(0, idx + 1),
|
|
6663
|
+
event2,
|
|
6664
|
+
eventConfiguration
|
|
6665
|
+
)) {
|
|
6666
|
+
return false;
|
|
6667
|
+
}
|
|
6668
|
+
return present;
|
|
6669
|
+
}, false);
|
|
6670
|
+
}
|
|
6596
6671
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6597
6672
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6598
6673
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6641,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6641
6716
|
return flag2;
|
|
6642
6717
|
});
|
|
6643
6718
|
}
|
|
6644
|
-
function getInherentFlags(sortedActions) {
|
|
6719
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6645
6720
|
const acceptedActions = sortedActions.filter(
|
|
6646
6721
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6647
6722
|
);
|
|
6648
|
-
|
|
6649
|
-
|
|
6650
|
-
|
|
6651
|
-
}
|
|
6652
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6654
|
-
}
|
|
6655
|
-
if (isRejected(acceptedActions)) {
|
|
6656
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6657
|
-
}
|
|
6658
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6663
|
-
}
|
|
6664
|
-
return inherentFlags;
|
|
6723
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6724
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6725
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6665
6726
|
}
|
|
6666
6727
|
function getEventFlags(event2, config) {
|
|
6667
6728
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6668
6729
|
return [
|
|
6669
6730
|
...getActionStatusFlags(sortedActions),
|
|
6670
|
-
...getInherentFlags(sortedActions),
|
|
6731
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6671
6732
|
...resolveEventCustomFlags(event2, config)
|
|
6672
6733
|
];
|
|
6673
6734
|
}
|
|
@@ -7672,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7672
7733
|
id: "signature.upload.modal.title",
|
|
7673
7734
|
defaultMessage: "Draw signature",
|
|
7674
7735
|
description: "Title for the modal to draw signature"
|
|
7736
|
+
},
|
|
7737
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7738
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7739
|
+
configuration: {
|
|
7740
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7675
7741
|
}
|
|
7676
7742
|
}
|
|
7677
7743
|
]
|
|
@@ -8228,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8228
8294
|
},
|
|
8229
8295
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8230
8296
|
},
|
|
8297
|
+
{
|
|
8298
|
+
type: ActionType.NOTIFY,
|
|
8299
|
+
label: {
|
|
8300
|
+
defaultMessage: "Notify health worker",
|
|
8301
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8302
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8303
|
+
},
|
|
8304
|
+
flags: [
|
|
8305
|
+
{
|
|
8306
|
+
id: "health-worker-notified",
|
|
8307
|
+
operation: "add"
|
|
8308
|
+
}
|
|
8309
|
+
]
|
|
8310
|
+
},
|
|
8231
8311
|
{
|
|
8232
8312
|
type: ActionType.REJECT,
|
|
8233
8313
|
label: {
|
|
@@ -8470,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8470
8550
|
}
|
|
8471
8551
|
}
|
|
8472
8552
|
],
|
|
8553
|
+
flags: [
|
|
8554
|
+
{
|
|
8555
|
+
id: "health-worker-notified",
|
|
8556
|
+
requiresAction: false,
|
|
8557
|
+
label: {
|
|
8558
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8559
|
+
defaultMessage: "Health worker notified",
|
|
8560
|
+
description: "Label for the health-worker-notified flag"
|
|
8561
|
+
}
|
|
8562
|
+
}
|
|
8563
|
+
],
|
|
8473
8564
|
advancedSearch: [
|
|
8474
8565
|
{
|
|
8475
8566
|
title: {
|
|
@@ -10228,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10228
10319
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10229
10320
|
}
|
|
10230
10321
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10231
|
-
return user2.administrativeAreaId
|
|
10322
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10232
10323
|
}
|
|
10233
10324
|
return true;
|
|
10234
10325
|
}
|
|
@@ -10317,7 +10408,7 @@ function canAccessUserWithScope({
|
|
|
10317
10408
|
}
|
|
10318
10409
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10319
10410
|
(id) => user2.administrativeAreaId === id
|
|
10320
|
-
) || user2.administrativeAreaId
|
|
10411
|
+
) || !user2.administrativeAreaId;
|
|
10321
10412
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10322
10413
|
return false;
|
|
10323
10414
|
}
|
|
@@ -10623,18 +10714,19 @@ var ACTION_FILTERS = {
|
|
|
10623
10714
|
function filterActionsByFlags(actions, flags) {
|
|
10624
10715
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10625
10716
|
}
|
|
10717
|
+
var REJECTED_ACTIONS = [
|
|
10718
|
+
ActionType.READ,
|
|
10719
|
+
ActionType.NOTIFY,
|
|
10720
|
+
ActionType.CUSTOM,
|
|
10721
|
+
ActionType.EDIT,
|
|
10722
|
+
ActionType.ARCHIVE
|
|
10723
|
+
];
|
|
10626
10724
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10627
10725
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10628
10726
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10629
10727
|
}
|
|
10630
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10631
|
-
return
|
|
10632
|
-
ActionType.READ,
|
|
10633
|
-
ActionType.NOTIFY,
|
|
10634
|
-
ActionType.CUSTOM,
|
|
10635
|
-
ActionType.EDIT,
|
|
10636
|
-
ActionType.ARCHIVE
|
|
10637
|
-
];
|
|
10728
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10729
|
+
return REJECTED_ACTIONS;
|
|
10638
10730
|
}
|
|
10639
10731
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10640
10732
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release/2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAc9C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,7 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
exports.UPSTREAM_BRANCH = 'release
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release/2.0.0';
|
|
63
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
64
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
65
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -4312,7 +4312,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4312
4312
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4313
4313
|
var import_child_process = require("child_process");
|
|
4314
4314
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4315
|
-
var UPSTREAM_BRANCH = "release
|
|
4315
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4316
4316
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4317
4317
|
var FILES_TO_CHECKOUT = [
|
|
4318
4318
|
"src/analytics/analytics.ts",
|
|
@@ -770,6 +770,11 @@ var FieldTypesToHideInReview = [
|
|
|
770
770
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
771
771
|
FieldType.ALPHA_HIDDEN
|
|
772
772
|
];
|
|
773
|
+
var HiddenFieldTypes = [
|
|
774
|
+
FieldType.HTTP,
|
|
775
|
+
FieldType.QUERY_PARAM_READER,
|
|
776
|
+
FieldType.ALPHA_HIDDEN
|
|
777
|
+
];
|
|
773
778
|
|
|
774
779
|
// ../commons/src/events/FieldValue.ts
|
|
775
780
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1478,7 +1483,8 @@ var Range = import_v4.z.object({
|
|
|
1478
1483
|
});
|
|
1479
1484
|
var ContainsFlags = import_v4.z.object({
|
|
1480
1485
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
1481
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
1486
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
1487
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
1482
1488
|
}).meta({
|
|
1483
1489
|
id: "ContainsFlags"
|
|
1484
1490
|
});
|
|
@@ -1750,6 +1756,7 @@ var NumberField = BaseField.extend({
|
|
|
1750
1756
|
configuration: import_v43.default.object({
|
|
1751
1757
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
1752
1758
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
1759
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
1753
1760
|
prefix: TranslationConfig.optional(),
|
|
1754
1761
|
postfix: TranslationConfig.optional()
|
|
1755
1762
|
}).optional()
|
|
@@ -2673,6 +2680,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
2673
2680
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
2674
2681
|
}).shape
|
|
2675
2682
|
);
|
|
2683
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
2684
|
+
z24.object({
|
|
2685
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
2686
|
+
}).shape
|
|
2687
|
+
);
|
|
2676
2688
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
2677
2689
|
z24.object({
|
|
2678
2690
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -2757,9 +2769,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
2757
2769
|
id: "ReadActionConfig",
|
|
2758
2770
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
2759
2771
|
}),
|
|
2772
|
+
NotifyConfig.meta({
|
|
2773
|
+
id: "NotifyActionConfig",
|
|
2774
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
2775
|
+
}),
|
|
2760
2776
|
DeclareConfig.meta({
|
|
2761
2777
|
id: "DeclareActionConfig",
|
|
2762
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
2778
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
2763
2779
|
}),
|
|
2764
2780
|
RejectConfig.meta({
|
|
2765
2781
|
id: "RejectActionConfig",
|
|
@@ -3193,7 +3209,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
3193
3209
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
3194
3210
|
return actionConfig.form;
|
|
3195
3211
|
}
|
|
3196
|
-
if ("review" in actionConfig) {
|
|
3212
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
3197
3213
|
return actionConfig.review.fields;
|
|
3198
3214
|
}
|
|
3199
3215
|
return [];
|
|
@@ -4697,12 +4713,53 @@ var updateActions = ActionTypes.extract([
|
|
|
4697
4713
|
ActionType.ARCHIVE,
|
|
4698
4714
|
ActionType.PRINT_CERTIFICATE,
|
|
4699
4715
|
ActionType.REQUEST_CORRECTION,
|
|
4716
|
+
ActionType.APPROVE_CORRECTION,
|
|
4717
|
+
ActionType.REJECT_CORRECTION,
|
|
4700
4718
|
ActionType.CUSTOM
|
|
4701
4719
|
]);
|
|
4702
4720
|
|
|
4703
4721
|
// ../commons/src/events/state/flags.ts
|
|
4704
4722
|
var import_lodash3 = require("lodash");
|
|
4705
4723
|
var import_date_fns3 = require("date-fns");
|
|
4724
|
+
var INHERENT_FLAG_RULES = [
|
|
4725
|
+
{
|
|
4726
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
4727
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
4728
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
4729
|
+
},
|
|
4730
|
+
{
|
|
4731
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
4732
|
+
// other status-changing action (see getStatusFromActions).
|
|
4733
|
+
flag: InherentFlags.INCOMPLETE,
|
|
4734
|
+
setOn: [ActionType.NOTIFY],
|
|
4735
|
+
resetOn: [
|
|
4736
|
+
ActionType.CREATE,
|
|
4737
|
+
ActionType.DECLARE,
|
|
4738
|
+
ActionType.REGISTER,
|
|
4739
|
+
ActionType.ARCHIVE
|
|
4740
|
+
]
|
|
4741
|
+
},
|
|
4742
|
+
{
|
|
4743
|
+
flag: InherentFlags.REJECTED,
|
|
4744
|
+
setOn: [ActionType.REJECT],
|
|
4745
|
+
resetOn: [
|
|
4746
|
+
ActionType.NOTIFY,
|
|
4747
|
+
ActionType.DECLARE,
|
|
4748
|
+
ActionType.EDIT,
|
|
4749
|
+
ActionType.REGISTER
|
|
4750
|
+
]
|
|
4751
|
+
},
|
|
4752
|
+
{
|
|
4753
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
4754
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
4755
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
4756
|
+
},
|
|
4757
|
+
{
|
|
4758
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
4759
|
+
setOn: [ActionType.EDIT],
|
|
4760
|
+
resetOnAnyOtherAction: true
|
|
4761
|
+
}
|
|
4762
|
+
];
|
|
4706
4763
|
|
|
4707
4764
|
// ../commons/src/events/defineConfig.ts
|
|
4708
4765
|
var IGNORED_EVENT_TYPES = [
|
|
@@ -5448,6 +5505,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
5448
5505
|
id: "signature.upload.modal.title",
|
|
5449
5506
|
defaultMessage: "Draw signature",
|
|
5450
5507
|
description: "Title for the modal to draw signature"
|
|
5508
|
+
},
|
|
5509
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
5510
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
5511
|
+
configuration: {
|
|
5512
|
+
maxFileSize: 5 * 1024 * 1024
|
|
5451
5513
|
}
|
|
5452
5514
|
}
|
|
5453
5515
|
]
|
|
@@ -6004,6 +6066,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6004
6066
|
},
|
|
6005
6067
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
6006
6068
|
},
|
|
6069
|
+
{
|
|
6070
|
+
type: ActionType.NOTIFY,
|
|
6071
|
+
label: {
|
|
6072
|
+
defaultMessage: "Notify health worker",
|
|
6073
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
6074
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
6075
|
+
},
|
|
6076
|
+
flags: [
|
|
6077
|
+
{
|
|
6078
|
+
id: "health-worker-notified",
|
|
6079
|
+
operation: "add"
|
|
6080
|
+
}
|
|
6081
|
+
]
|
|
6082
|
+
},
|
|
6007
6083
|
{
|
|
6008
6084
|
type: ActionType.REJECT,
|
|
6009
6085
|
label: {
|
|
@@ -6246,6 +6322,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
6246
6322
|
}
|
|
6247
6323
|
}
|
|
6248
6324
|
],
|
|
6325
|
+
flags: [
|
|
6326
|
+
{
|
|
6327
|
+
id: "health-worker-notified",
|
|
6328
|
+
requiresAction: false,
|
|
6329
|
+
label: {
|
|
6330
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
6331
|
+
defaultMessage: "Health worker notified",
|
|
6332
|
+
description: "Label for the health-worker-notified flag"
|
|
6333
|
+
}
|
|
6334
|
+
}
|
|
6335
|
+
],
|
|
6249
6336
|
advancedSearch: [
|
|
6250
6337
|
{
|
|
6251
6338
|
title: {
|
|
@@ -7241,6 +7328,13 @@ var ACTION_FILTERS = {
|
|
|
7241
7328
|
[ActionType.UNASSIGN]: (flags) => !flags.some((flag) => flag.endsWith(":requested")),
|
|
7242
7329
|
[ActionType.CUSTOM]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
|
|
7243
7330
|
};
|
|
7331
|
+
var REJECTED_ACTIONS = [
|
|
7332
|
+
ActionType.READ,
|
|
7333
|
+
ActionType.NOTIFY,
|
|
7334
|
+
ActionType.CUSTOM,
|
|
7335
|
+
ActionType.EDIT,
|
|
7336
|
+
ActionType.ARCHIVE
|
|
7337
|
+
];
|
|
7244
7338
|
|
|
7245
7339
|
// ../commons/src/events/FileUtils.ts
|
|
7246
7340
|
var import_lodash7 = require("lodash");
|
|
Binary file
|
package/package.json
CHANGED
|
Binary file
|