Skip to content

Commit 7f44a47

Browse files
PascalRepondPascalRepond
committed
chore: enhance editors UX
* Adapts certain classes in the jsonschemas for tailwind-css and for better editors usability. * Fixes some errors in the descriptions/titles, etc. of the editors. Co-Authored-by: Pascal Repond <[email protected]>
1 parent 5740449 commit 7f44a47

File tree

37 files changed

+322
-372
lines changed

37 files changed

+322
-372
lines changed

‎rero_ils/jsonschemas/common/currency-v0.0.1.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"formlyConfig": {
1717
"type": "select",
1818
"props": {
19+
"itemCssClass": "w-full md:w-2/12",
1920
"sort": true
2021
}
2122
}

‎rero_ils/jsonschemas/common/identifier-v0.0.1.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"widget": {
2727
"formlyConfig": {
2828
"props": {
29-
"containerCssClass": "grid grid-cols-12 gap-x-2",
29+
"containerCssClass": "grid grid-cols-12 gap-2",
3030
"itemCssClass": "col-span-12",
3131
"hide": true
3232
}
@@ -46,7 +46,7 @@
4646
"widget": {
4747
"formlyConfig": {
4848
"props": {
49-
"itemCssClass": "col-span-12 md:col-span-6",
49+
"itemCssClass": "col-span-12 md:col-span-4",
5050
"options": [
5151
{
5252
"value": "bf:Local",
@@ -76,7 +76,7 @@
7676
"widget": {
7777
"formlyConfig": {
7878
"props": {
79-
"itemCssClass": "col-span-12 md:col-span-6"
79+
"itemCssClass": "col-span-12 md:col-span-8"
8080
}
8181
}
8282
}

‎rero_ils/jsonschemas/common/languages-v0.0.1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2587,7 +2587,7 @@
25872587
"widget": {
25882588
"formlyConfig": {
25892589
"props": {
2590-
"containerCssClass": "grid grid-cols-12 gap-x-2"
2590+
"containerCssClass": "grid grid-cols-12 gap-2"
25912591
}
25922592
}
25932593
}
@@ -2623,7 +2623,7 @@
26232623
"widget": {
26242624
"formlyConfig": {
26252625
"props": {
2626-
"containerCssClass": "grid grid-cols-12 gap-x-2"
2626+
"containerCssClass": "grid grid-cols-12 gap-2"
26272627
}
26282628
}
26292629
}

‎rero_ils/jsonschemas/common/ui-languages-v0.0.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "select",
1414
"props": {
1515
"sort": true,
16-
"itemCssClass": "col-span-12 md:col-span-2",
16+
"itemCssClass": "col-span-12 md:col-span-3",
1717
"options": [
1818
{
1919
"label": "lang_fre",

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

+16-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"propertiesOrder": [
88
"acq_account",
99
"document",
10-
"priority",
1110
"quantity",
1211
"amount",
12+
"priority",
1313
"notes",
1414
"is_cancelled"
1515
],
@@ -36,15 +36,15 @@
3636
"minLength": 1
3737
},
3838
"priority": {
39-
"title": "Priority",
39+
"title": "Priority (0-5)",
4040
"description": "The higher the number, the higher the priority.",
4141
"type": "integer",
4242
"minimum": 0,
4343
"maximum": 5,
4444
"widget": {
4545
"formlyConfig": {
4646
"props": {
47-
"itemCssClass": "col-span-12 md:col-span-3 md:col-offset-right-9"
47+
"itemCssClass": "col-span-4 md:col-span-2"
4848
}
4949
}
5050
}
@@ -57,21 +57,22 @@
5757
"widget": {
5858
"formlyConfig": {
5959
"props": {
60-
"itemCssClass": "col-span-12 md:col-span-6"
60+
"itemCssClass": "col-span-4 md:col-span-2"
6161
}
6262
}
6363
}
6464
},
6565
"amount": {
6666
"title": "Amount",
67+
"description": "Expected price per item.",
6768
"type": "number",
6869
"default": 0,
6970
"minimum": 0,
7071
"widget": {
7172
"formlyConfig": {
7273
"props": {
7374
"fieldMap": "amount",
74-
"itemCssClass": "col-span-12 md:col-span-6"
75+
"itemCssClass": "col-span-4 md:col-span-2"
7576
}
7677
}
7778
}
@@ -112,6 +113,7 @@
112113
"formlyConfig": {
113114
"type": "select",
114115
"props": {
116+
"itemCssClass": "col-span-12 md:col-span-4",
115117
"sort": true,
116118
"options": [
117119
{
@@ -136,11 +138,19 @@
136138
"formlyConfig": {
137139
"type": "textarea",
138140
"props": {
141+
"itemCssClass": "col-span-12 md:col-span-8",
139142
"rows": 3
140143
}
141144
}
142145
}
143146
}
147+
},
148+
"widget": {
149+
"formlyConfig": {
150+
"props": {
151+
"containerCssClass": "grid grid-cols-12 gap-2"
152+
}
153+
}
144154
}
145155
},
146156
"widget": {
@@ -294,7 +304,7 @@
294304
"widget": {
295305
"formlyConfig": {
296306
"props": {
297-
"containerCssClass": "grid grid-cols-12 gap-x-2"
307+
"containerCssClass": "grid grid-cols-12 gap-2"
298308
}
299309
}
300310
}

‎rero_ils/modules/acquisition/acq_orders/jsonschemas/acq_orders/acq_order-v0.0.1.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"formlyConfig": {
8181
"type": "select",
8282
"props": {
83+
"itemCssClass": "col-span-12 md:col-span-4",
8384
"sort": true,
8485
"options": [
8586
{
@@ -104,18 +105,23 @@
104105
"formlyConfig": {
105106
"type": "textarea",
106107
"props": {
108+
"itemCssClass": "col-span-12 md:col-span-8",
107109
"rows": 3
108110
}
109111
}
110112
}
111113
}
114+
},
115+
"widget": {
116+
"formlyConfig": {
117+
"props": {
118+
"containerCssClass": "grid grid-cols-12 gap-2"
119+
}
120+
}
112121
}
113122
},
114123
"widget": {
115124
"formlyConfig": {
116-
"wrappers": [
117-
"card"
118-
],
119125
"props": {
120126
"validation": {
121127
"validators": {

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

-3
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,6 @@
196196
},
197197
"widget": {
198198
"formlyConfig": {
199-
"wrappers": [
200-
"card"
201-
],
202199
"props": {
203200
"validation": {
204201
"validators": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
}
4646
},
4747
"messages": {
48-
"alreadyTakenMessage": "The budget name is already taken."
48+
"alreadyTakenMessage": "This name is already taken."
4949
}
5050
}
5151
}

‎rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
"widget": {
282282
"formlyConfig": {
283283
"props": {
284-
"itemCssClass": "col-span-12 md:col-span-3"
284+
"itemCssClass": "col-span-12 md:col-span-2"
285285
}
286286
}
287287
}
@@ -307,7 +307,6 @@
307307
"formlyConfig": {
308308
"props": {
309309
"itemCssClass": "col-span-12 md:col-span-4",
310-
"hideLabel": true,
311310
"fieldMap": "fee_amount"
312311
}
313312
}
@@ -317,7 +316,7 @@
317316
"widget": {
318317
"formlyConfig": {
319318
"props": {
320-
"containerCssClass": "grid grid-cols-12 gap-x-2"
319+
"containerCssClass": "grid grid-cols-12 gap-2"
321320
}
322321
}
323322
}
@@ -492,7 +491,6 @@
492491
"formlyConfig": {
493492
"type": "cipo-pt-it",
494493
"props": {
495-
"cssClass": "editor-title",
496494
"navigation": {
497495
"essential": true
498496
}

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

+49-17
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
],
1616
"propertiesOrder": [
1717
"collection_type",
18+
"title",
1819
"start_date",
1920
"end_date",
20-
"title",
2121
"collection_id",
2222
"teachers",
2323
"description",
@@ -27,6 +27,13 @@
2727
"items",
2828
"published"
2929
],
30+
"widget": {
31+
"formlyConfig": {
32+
"props": {
33+
"containerCssClass": "grid grid-cols-12 gap-2"
34+
}
35+
}
36+
},
3037
"properties": {
3138
"$schema": {
3239
"title": "Schema",
@@ -44,12 +51,26 @@
4451
"title": "Identifier",
4552
"description": "Identifier or code used locally for this collection",
4653
"type": "string",
47-
"minLength": 1
54+
"minLength": 1,
55+
"widget": {
56+
"formlyConfig": {
57+
"props": {
58+
"itemCssClass": "col-span-12"
59+
}
60+
}
61+
}
4862
},
4963
"title": {
5064
"title": "Title",
5165
"type": "string",
52-
"minLength": 1
66+
"minLength": 1,
67+
"widget": {
68+
"formlyConfig": {
69+
"props": {
70+
"itemCssClass": "col-span-12 md:col-span-9"
71+
}
72+
}
73+
}
5374
},
5475
"collection_type": {
5576
"title": "Type",
@@ -65,6 +86,7 @@
6586
"form-field"
6687
],
6788
"props": {
89+
"itemCssClass": "col-span-12 md:col-span-3",
6890
"sort": true,
6991
"options": [
7092
{
@@ -103,13 +125,13 @@
103125
},
104126
"widget": {
105127
"formlyConfig": {
128+
"props": {
129+
"itemCssClass": "col-span-12"
130+
},
106131
"expressions": {
107132
"props.required": true,
108133
"hide": "field?.parent?.model?.collection_type !== 'course'"
109-
},
110-
"wrappers": [
111-
"card"
112-
]
134+
}
113135
}
114136
}
115137
},
@@ -133,9 +155,9 @@
133155
},
134156
"widget": {
135157
"formlyConfig": {
136-
"wrappers": [
137-
"card"
138-
]
158+
"props": {
159+
"itemCssClass": "col-span-12"
160+
}
139161
}
140162
}
141163
},
@@ -147,6 +169,7 @@
147169
"formlyConfig": {
148170
"type": "textarea",
149171
"props": {
172+
"itemCssClass": "col-span-12",
150173
"rows": 5
151174
}
152175
}
@@ -161,6 +184,7 @@
161184
"formlyConfig": {
162185
"type": "datePicker",
163186
"props": {
187+
"itemCssClass": "col-span-12 md:col-span-3",
164188
"validation": {
165189
"messages": {
166190
"patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
@@ -187,6 +211,7 @@
187211
"formlyConfig": {
188212
"type": "datePicker",
189213
"props": {
214+
"itemCssClass": "col-span-12 md:col-span-3",
190215
"validation": {
191216
"messages": {
192217
"patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
@@ -232,9 +257,9 @@
232257
},
233258
"widget": {
234259
"formlyConfig": {
235-
"wrappers": [
236-
"card"
237-
]
260+
"props": {
261+
"itemCssClass": "col-span-12"
262+
}
238263
}
239264
}
240265
},
@@ -268,9 +293,9 @@
268293
},
269294
"widget": {
270295
"formlyConfig": {
271-
"wrappers": [
272-
"card"
273-
]
296+
"props": {
297+
"itemCssClass": "col-span-12"
298+
}
274299
}
275300
}
276301
},
@@ -293,7 +318,14 @@
293318
"type": "boolean",
294319
"title": "Published",
295320
"description": "'Published' indicates that the collection appears in the public interface.",
296-
"default": true
321+
"default": true,
322+
"widget": {
323+
"formlyConfig": {
324+
"props": {
325+
"itemCssClass": "col-span-12"
326+
}
327+
}
328+
}
297329
}
298330
}
299331
}

0 commit comments

Comments
 (0)