Skip to content

Commit f4916f6

Browse files
Garfield-frGarfield-fr
committed
chore(schema): update schemas
Co-Authored-by: Bertrand Zuchuat <[email protected]>
1 parent 9b617ec commit f4916f6

File tree

12 files changed

+46
-35
lines changed

12 files changed

+46
-35
lines changed

Diff for: ‎rero_ils/modules/acquisition/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
166166
"widget": {
167167
"formlyConfig": {
168-
"type": "datepicker",
168+
"type": "datePicker",
169169
"props": {
170170
"validation": {
171171
"messages": {

Diff for: ‎rero_ils/modules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
193193
"widget": {
194194
"formlyConfig": {
195-
"type": "datepicker",
195+
"type": "datePicker",
196196
"expressions": {
197197
"props.required": "field?.parent?.model?.status === 'ordered' || field?.parent?.model?.status === 'received'",
198198
"hide": "field?.parent?.model?.status !== 'ordered' && field?.parent?.model?.status !== 'received'"
@@ -215,7 +215,7 @@
215215
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
216216
"widget": {
217217
"formlyConfig": {
218-
"type": "datepicker",
218+
"type": "datePicker",
219219
"expressions": {
220220
"props.required": "field?.parent?.model?.status === 'received'",
221221
"hide": "field?.parent?.model?.status !== 'received'"
@@ -279,13 +279,14 @@
279279
"pattern": "^https://bib.rero.ch/api/documents/.+?$",
280280
"widget": {
281281
"formlyConfig": {
282+
"type": "remoteAutoComplete",
282283
"props": {
283284
"validation": {
284285
"messages": {
285286
"patternMessage": "Should be in the following format: https://bib.rero.ch/api/documents/<PID>."
286287
}
287288
},
288-
"remoteTypeahead": {
289+
"queryOptions": {
289290
"type": "documents",
290291
"filter": "NOT harvested:true"
291292
}

Diff for: ‎rero_ils/modules/acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
120120
"widget": {
121121
"formlyConfig": {
122-
"type": "datepicker",
122+
"type": "datePicker",
123123
"props": {
124124
"validation": {
125125
"messages": {

Diff for: ‎rero_ils/modules/acquisition/budgets/jsonschemas/budgets/budget-v0.0.1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
6060
"widget": {
6161
"formlyConfig": {
62-
"type": "datepicker",
62+
"type": "datePicker",
6363
"props": {
6464
"validation": {
6565
"messages": {
@@ -77,7 +77,7 @@
7777
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
7878
"widget": {
7979
"formlyConfig": {
80-
"type": "datepicker",
80+
"type": "datePicker",
8181
"props": {
8282
"validation": {
8383
"messages": {

Diff for: ‎rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,17 @@
159159
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
160160
"widget": {
161161
"formlyConfig": {
162-
"type": "datepicker",
162+
"type": "datePicker",
163163
"props": {
164164
"validation": {
165165
"messages": {
166166
"patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
167-
"dateMustBeLessThan": "The start date must be less than the end date."
167+
"datesGreaterThan": "The start date must be less than the end date."
168168
},
169169
"validators": {
170-
"dateMustBeLessThan": {
171-
"startDate": "start_date",
172-
"endDate": "end_date",
170+
"datesGreaterThan": {
171+
"dateFirst": "start_date",
172+
"dateLast": "end_date",
173173
"strict": true
174174
}
175175
}
@@ -185,17 +185,17 @@
185185
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
186186
"widget": {
187187
"formlyConfig": {
188-
"type": "datepicker",
188+
"type": "datePicker",
189189
"props": {
190190
"validation": {
191191
"messages": {
192192
"patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
193-
"datesMustBeGreaterThan": "The end date must be greater than the start date."
193+
"datesGreaterThan": "The end date must be greater than the start date."
194194
},
195195
"validators": {
196-
"dateMustBeGreaterThan": {
197-
"startDate": "start_date",
198-
"endDate": "end_date",
196+
"datesGreaterThan": {
197+
"dateFirst": "start_date",
198+
"dateLast": "end_date",
199199
"strict": true
200200
}
201201
}
@@ -255,8 +255,9 @@
255255
"pattern": "^https://bib.rero.ch/api/items/.*?$",
256256
"widget": {
257257
"formlyConfig": {
258+
"type": "remoteAutoComplete",
258259
"props": {
259-
"remoteTypeahead": {
260+
"queryOptions": {
260261
"type": "items"
261262
}
262263
}

Diff for: ‎rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717
"pattern": "^(https://mef.rero.ch/api/agents/(gnd|idref|rero)/.*|https://bib.rero.ch/api/local_entities/.*?)$",
1818
"widget": {
1919
"formlyConfig": {
20-
"type": "entityTypeahead",
20+
"type": "entity-autocomplete",
2121
"props": {
22+
"scrollHeight": "600px",
23+
"group": true,
2224
"filters": {
25+
"selected": "bf:Person",
2326
"options": [
2427
{
2528
"label": "Person",
@@ -31,7 +34,9 @@
3134
}
3235
]
3336
},
34-
"itemCssClass": "col-12"
37+
"queryOptions": {
38+
"type": "mef"
39+
}
3540
}
3641
}
3742
}

Diff for: ‎rero_ils/modules/documents/jsonschemas/documents/document_document_relation-v0.0.1.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,15 @@
266266
"pattern": "^https://bib.rero.ch/api/documents/.*?$",
267267
"widget": {
268268
"formlyConfig": {
269+
"type": "remoteAutoComplete",
269270
"props": {
271+
"scrollHeight": "400px",
270272
"validation": {
271273
"messages": {
272274
"patternMessage": "Should be in the following format: https://bib.rero.ch/api/documents/<PID>."
273275
}
274276
},
275-
"remoteTypeahead": {
277+
"queryOptions": {
276278
"type": "documents",
277279
"filter": "NOT harvested:true"
278280
},
@@ -305,4 +307,4 @@
305307
}
306308
}
307309
}
308-
}
310+
}

Diff for: ‎rero_ils/modules/documents/jsonschemas/documents/document_part_of-v0.0.1.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@
3333
"pattern": "^https://bib.rero.ch/api/documents/.*?$",
3434
"widget": {
3535
"formlyConfig": {
36+
"type": "remoteAutoComplete",
3637
"props": {
3738
"validation": {
3839
"messages": {
3940
"patternMessage": "Should be in the following format: https://bib.rero.ch/api/documents/<PID>."
4041
}
4142
},
42-
"remoteTypeahead": {
43+
"queryOptions": {
4344
"type": "documents",
4445
"filter": "NOT harvested:true"
4546
}
@@ -147,4 +148,4 @@
147148
}
148149
}
149150
}
150-
}
151+
}

Diff for: ‎rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
347347
"widget": {
348348
"formlyConfig": {
349-
"type": "datepicker",
349+
"type": "datePicker",
350350
"props": {
351351
"validation": {
352352
"messages": {
@@ -944,7 +944,7 @@
944944
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
945945
"widget": {
946946
"formlyConfig": {
947-
"type": "datepicker",
947+
"type": "datePicker",
948948
"wrappers": [
949949
"form-field"
950950
],

Diff for: ‎rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,15 @@
9292
"pattern": "^https://bib.rero.ch/api/patrons/.*?$",
9393
"widget": {
9494
"formlyConfig": {
95+
"type": "remoteAutoComplete",
9596
"props": {
9697
"hideLabel": true,
9798
"validation": {
9899
"messages": {
99100
"patternMessage": "Should be in the following format: https://bib.rero.ch/api/patrons/<PID>."
100101
}
101102
},
102-
"remoteTypeahead": {
103+
"queryOptions": {
103104
"type": "patrons"
104105
}
105106
}

Diff for: ‎rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
234234
"widget": {
235235
"formlyConfig": {
236-
"type": "datepicker",
236+
"type": "datePicker",
237237
"expressions": {
238238
"hide": "false"
239239
},
@@ -292,7 +292,7 @@
292292
"pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
293293
"widget": {
294294
"formlyConfig": {
295-
"type": "datepicker",
295+
"type": "datePicker",
296296
"props": {
297297
"validation": {
298298
"messages": {
@@ -400,7 +400,7 @@
400400
"validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
401401
"widget": {
402402
"formlyConfig": {
403-
"type": "datepicker",
403+
"type": "datePicker",
404404
"expressions": {
405405
"props.required": "field?.parent?.model?.status === 'received'",
406406
"hide": "field?.parent?.model?.status !== 'received'"
@@ -426,7 +426,7 @@
426426
"validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
427427
"widget": {
428428
"formlyConfig": {
429-
"type": "datepicker",
429+
"type": "datePicker",
430430
"props": {
431431
"validation": {
432432
"messages": {
@@ -446,7 +446,7 @@
446446
"validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
447447
"widget": {
448448
"formlyConfig": {
449-
"type": "datepicker",
449+
"type": "datePicker",
450450
"props": {
451451
"validation": {
452452
"messages": {
@@ -693,7 +693,7 @@
693693
"validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
694694
"widget": {
695695
"formlyConfig": {
696-
"type": "datepicker",
696+
"type": "datePicker",
697697
"props": {
698698
"hideLabel": true,
699699
"defaultValueExpression": "new Date().toISOString().split('T')[0]",

Diff for: ‎rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
"pattern": "\\d{4}-((0[1-9])|(1[0-2]))-(((0[1-9])|[1-2][0-9])|(3[0-1]))$",
252252
"widget": {
253253
"formlyConfig": {
254-
"type": "datepicker",
254+
"type": "datePicker",
255255
"props": {
256256
"validation": {
257257
"messages": {
@@ -492,7 +492,7 @@
492492
},
493493
"widget": {
494494
"formlyConfig": {
495-
"type": "multicheckbox",
495+
"type": "multi-checkbox",
496496
"wrappers": [
497497
"card"
498498
],

0 commit comments

Comments
 (0)