diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst index d6bbb9b519..5a863f98f0 100644 --- a/RELEASE-NOTES.rst +++ b/RELEASE-NOTES.rst @@ -2411,7 +2411,7 @@ Metadata others). - Renames person module into contribution module. - Sorts the contribution roles in the document editor (with - ``selectWithSort`` form option). + ``select`` form option). - Updates the conversion of documents with contribution references from IdRef. - Corrects MARC to JSON conversion for subjects. diff --git a/rero_ils/jsonschemas/common/cantons-v0.0.1.json b/rero_ils/jsonschemas/common/cantons-v0.0.1.json index b856bf82aa..28230454ac 100644 --- a/rero_ils/jsonschemas/common/cantons-v0.0.1.json +++ b/rero_ils/jsonschemas/common/cantons-v0.0.1.json @@ -36,6 +36,7 @@ "hide": "field?.parent?.model?.country !== 'sz'" }, "props": { + "sort": true, "itemCssClass": "col-lg-4", "options": [ { diff --git a/rero_ils/jsonschemas/common/countries-v0.0.1.json b/rero_ils/jsonschemas/common/countries-v0.0.1.json index 241eaed228..27252dbd96 100644 --- a/rero_ils/jsonschemas/common/countries-v0.0.1.json +++ b/rero_ils/jsonschemas/common/countries-v0.0.1.json @@ -381,6 +381,8 @@ "widget": { "formlyConfig": { "props": { + "sort": true, + "filter": true, "itemCssClass": "col-lg-4", "options": [ { @@ -1887,4 +1889,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/jsonschemas/common/currency-v0.0.1.json b/rero_ils/jsonschemas/common/currency-v0.0.1.json index 9a74b7e58c..d2abbe2651 100644 --- a/rero_ils/jsonschemas/common/currency-v0.0.1.json +++ b/rero_ils/jsonschemas/common/currency-v0.0.1.json @@ -14,8 +14,11 @@ "pattern": "^[A-Z]{3}$", "widget": { "formlyConfig": { - "type": "selectWithSort" + "type": "select", + "props": { + "sort": true + } } } } -} \ No newline at end of file +} diff --git a/rero_ils/jsonschemas/common/languages-v0.0.1.json b/rero_ils/jsonschemas/common/languages-v0.0.1.json index 0f7373fa60..ee35b81d5e 100644 --- a/rero_ils/jsonschemas/common/languages-v0.0.1.json +++ b/rero_ils/jsonschemas/common/languages-v0.0.1.json @@ -491,8 +491,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-6", "options": [ { diff --git a/rero_ils/jsonschemas/common/ui-languages-v0.0.1.json b/rero_ils/jsonschemas/common/ui-languages-v0.0.1.json index 6199a43645..8f76183c47 100644 --- a/rero_ils/jsonschemas/common/ui-languages-v0.0.1.json +++ b/rero_ils/jsonschemas/common/ui-languages-v0.0.1.json @@ -10,8 +10,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-2", "options": [ { @@ -35,4 +36,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/acquisition/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json b/rero_ils/modules/acquisition/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json index 8c428e61ed..9e766f5c6e 100644 --- a/rero_ils/modules/acquisition/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json +++ b/rero_ils/modules/acquisition/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json @@ -137,11 +137,9 @@ "default": "in progress", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "options": [ { "value": "in_progress", @@ -206,11 +204,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "options": [ { "value": "shipping_and_handling", diff --git a/rero_ils/modules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json b/rero_ils/modules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json index 7c11125ddf..f1f44c4216 100644 --- a/rero_ils/modules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json +++ b/rero_ils/modules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json @@ -126,8 +126,9 @@ "default": "staff_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "vendor_note", diff --git a/rero_ils/modules/acquisition/acq_orders/jsonschemas/acq_orders/acq_order-v0.0.1.json b/rero_ils/modules/acquisition/acq_orders/jsonschemas/acq_orders/acq_order-v0.0.1.json index 1aad6a4864..96b21fd5d3 100644 --- a/rero_ils/modules/acquisition/acq_orders/jsonschemas/acq_orders/acq_order-v0.0.1.json +++ b/rero_ils/modules/acquisition/acq_orders/jsonschemas/acq_orders/acq_order-v0.0.1.json @@ -49,8 +49,9 @@ "default": "monograph", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "value": "monograph", @@ -112,8 +113,9 @@ "default": "staff_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "vendor_note", diff --git a/rero_ils/modules/acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json b/rero_ils/modules/acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json index 45358b8d00..4714b99462 100644 --- a/rero_ils/modules/acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json +++ b/rero_ils/modules/acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json @@ -162,8 +162,9 @@ "default": "staff_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "staff_note", diff --git a/rero_ils/modules/acquisition/acq_receipts/jsonschemas/acq_receipts/acq_receipt-v0.0.1.json b/rero_ils/modules/acquisition/acq_receipts/jsonschemas/acq_receipts/acq_receipt-v0.0.1.json index fdc4511e5d..2731a3ab60 100644 --- a/rero_ils/modules/acquisition/acq_receipts/jsonschemas/acq_receipts/acq_receipt-v0.0.1.json +++ b/rero_ils/modules/acquisition/acq_receipts/jsonschemas/acq_receipts/acq_receipt-v0.0.1.json @@ -166,8 +166,9 @@ "default": "staff_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "staff_note", diff --git a/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json b/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json index ae60b7bd49..e16b6cf89f 100644 --- a/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json +++ b/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json @@ -60,14 +60,12 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "wrappers": [ "form-field" ], "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "options": [ { "label": "course", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_admin_metadata-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_admin_metadata-v0.0.1.json index e1152a0acb..dded8f6b27 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_admin_metadata-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_admin_metadata-v0.0.1.json @@ -51,9 +51,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "itemCssClass": "col-lg-6", + "sort": true, "options": [ { "label": "Full level", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json index 55156ccdbd..9a45f4850c 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json @@ -13,11 +13,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "cssClass": "w-md-50", "options": [ { @@ -41,4 +39,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json index 137771e272..4f08698787 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json @@ -72,8 +72,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1002", @@ -168,8 +169,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1021", @@ -267,8 +269,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1011", @@ -355,8 +358,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1030", @@ -423,8 +427,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1032", @@ -516,8 +521,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1042", @@ -585,8 +591,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1045", @@ -668,8 +675,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdact:1051", @@ -739,8 +747,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "unspecified", @@ -803,8 +812,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdaco:1002", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json index 577fcc18a4..446fad8aed 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json @@ -18,9 +18,6 @@ "widget": { "formlyConfig": { "type": "entityTypeahead", - "wrappers": [ - "form-field-horizontal" - ], "props": { "filters": { "options": [ diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json index c2a970b2a3..1604fc5fa4 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json @@ -24,8 +24,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "bf:Person", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json index b87f1e7186..6d0251fbe7 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json @@ -162,8 +162,10 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "filter": true, + "sort": true, "itemCssClass": "col-lg-6", "options": [ { @@ -771,4 +773,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json index bae81becce..5d8b16bba9 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json @@ -52,8 +52,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-6", "options": [ { @@ -117,8 +118,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, + "filter": true, "itemCssClass": "col-lg-6", "options": [ { @@ -280,4 +283,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json index 208bb2304a..a9d1bc89e5 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json @@ -30,8 +30,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-6", "options": [ { @@ -177,8 +178,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-6", "options": [ { diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json index e4b0fd9207..5f01a5ac83 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_genre_form_link-v0.0.1.json @@ -17,9 +17,6 @@ "widget": { "formlyConfig": { "type": "entityTypeahead", - "wrappers": [ - "form-field-horizontal" - ], "props": { "filters": { "options": [ @@ -47,4 +44,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json index 5f078f8767..9095997766 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json @@ -50,8 +50,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, + "filter": true, "itemCssClass": "col-lg-6", "options": [ { diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_intended_audience-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_intended_audience-v0.0.1.json index e5ab70d30a..6b7e834aba 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_intended_audience-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_intended_audience-v0.0.1.json @@ -69,8 +69,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, + "filter": true, "itemCssClass": "col-lg-6", "options": [ { @@ -233,8 +235,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, + "filter": true, "options": [ { "label": "target_school_harmos1", @@ -342,8 +346,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "pegi_3", @@ -414,8 +419,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "from the age of 18", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json index 32371ae772..51d0df1e7f 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json @@ -28,8 +28,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-12", "options": [ { @@ -85,4 +86,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json index 80017d7164..d1560156f4 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json @@ -31,8 +31,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, + "filter": true, "cssClass": "w-md-50", "options": [ { @@ -128,4 +130,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json index f7c85c80e4..f700fd44fe 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json @@ -37,8 +37,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemcCssClass": "col", "options": [ { @@ -154,8 +155,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-4", "options": [ { @@ -278,4 +280,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_scale_cartographic-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_scale_cartographic-v0.0.1.json index f68b2979c9..4de8c84a5a 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_scale_cartographic-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_scale_cartographic-v0.0.1.json @@ -24,8 +24,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "Linear scale", @@ -211,4 +212,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json index 0e92a9f41d..f00ad2c554 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json @@ -18,9 +18,6 @@ "widget": { "formlyConfig": { "type": "entityTypeahead", - "wrappers": [ - "form-field-horizontal" - ], "props": { "filters": { "default": "bf:Topic", diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json index aea15a3182..528bcc80e9 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json @@ -31,8 +31,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "cssClass": "w-md-50", "options": [ { @@ -143,4 +144,4 @@ } } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/entities/remote_entities/jsonschemas/remote_entities/remote_entity-v0.0.1.json b/rero_ils/modules/entities/remote_entities/jsonschemas/remote_entities/remote_entity-v0.0.1.json index ed9e745647..62b23f9647 100644 --- a/rero_ils/modules/entities/remote_entities/jsonschemas/remote_entities/remote_entity-v0.0.1.json +++ b/rero_ils/modules/entities/remote_entities/jsonschemas/remote_entities/remote_entity-v0.0.1.json @@ -55,8 +55,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rero", @@ -94,4 +95,4 @@ "format": "date-time" } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json b/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json index 1f8defe191..7b693d7c89 100644 --- a/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json +++ b/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json @@ -265,8 +265,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rdafr:1013", @@ -717,11 +718,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "options": [ { "label": "general_note", @@ -817,11 +816,12 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "expressions": { "props.required": "model && model.holdings_type === 'serial'" }, "props": { + "sort": true, "options": [ { "label": "not_currently_received", @@ -875,8 +875,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "deposit", @@ -977,8 +978,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "unknown", @@ -1038,8 +1040,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "other", @@ -1080,8 +1083,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "separate", diff --git a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json index cfd4ba3062..b211307ac8 100644 --- a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json +++ b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json @@ -344,8 +344,9 @@ "default": "public_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "public_note", diff --git a/rero_ils/modules/item_types/jsonschemas/item_types/item_type-v0.0.1.json b/rero_ils/modules/item_types/jsonschemas/item_types/item_type-v0.0.1.json index 942e79abd4..f3e03020c5 100644 --- a/rero_ils/modules/item_types/jsonschemas/item_types/item_type-v0.0.1.json +++ b/rero_ils/modules/item_types/jsonschemas/item_types/item_type-v0.0.1.json @@ -73,8 +73,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "value": "standard", diff --git a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json index 8e0d96c536..56242bafc0 100644 --- a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json +++ b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json @@ -362,8 +362,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "received", @@ -493,11 +494,12 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "wrappers": [ "hide" ], "props": { + "sort": true, "options": [ { "label": "on_shelf", @@ -598,8 +600,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "acquisition_note", @@ -737,8 +740,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "cssClass": "editor-title", "options": [ { diff --git a/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json b/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json index 4d3b1faaf3..10969c75d0 100644 --- a/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json +++ b/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json @@ -463,8 +463,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "lang_fre", @@ -541,8 +542,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "rollover_no_transfer", diff --git a/rero_ils/modules/loans/jsonschemas/loans/loan-ils-v0.0.1.json b/rero_ils/modules/loans/jsonschemas/loans/loan-ils-v0.0.1.json index 860878b342..debb962179 100644 --- a/rero_ils/modules/loans/jsonschemas/loans/loan-ils-v0.0.1.json +++ b/rero_ils/modules/loans/jsonschemas/loans/loan-ils-v0.0.1.json @@ -171,8 +171,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "CREATED", diff --git a/rero_ils/modules/patron_transactions/jsonschemas/patron_transactions/patron_transaction-v0.0.1.json b/rero_ils/modules/patron_transactions/jsonschemas/patron_transactions/patron_transaction-v0.0.1.json index fa1ac17270..bbc49731be 100644 --- a/rero_ils/modules/patron_transactions/jsonschemas/patron_transactions/patron_transaction-v0.0.1.json +++ b/rero_ils/modules/patron_transactions/jsonschemas/patron_transactions/patron_transaction-v0.0.1.json @@ -45,7 +45,10 @@ "default": "open", "widget": { "formlyConfig": { - "type": "selectWithSort" + "type": "select", + "props": { + "sort": true + } } } }, @@ -64,8 +67,9 @@ "default": "overdue", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "overdue", @@ -181,4 +185,4 @@ "title": "Total calculated amount of the patron transaction" } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json index b2679afba0..6f0167bd51 100644 --- a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json +++ b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json @@ -273,8 +273,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "email", @@ -312,8 +313,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "lang_fre", @@ -569,8 +571,9 @@ "default": "public_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "public_note", diff --git a/rero_ils/modules/stats_cfg/jsonschemas/stats_cfg/stat_cfg-v0.0.1.json b/rero_ils/modules/stats_cfg/jsonschemas/stats_cfg/stat_cfg-v0.0.1.json index 06aa9219ae..5405588a5e 100644 --- a/rero_ils/modules/stats_cfg/jsonschemas/stats_cfg/stat_cfg-v0.0.1.json +++ b/rero_ils/modules/stats_cfg/jsonschemas/stats_cfg/stat_cfg-v0.0.1.json @@ -217,7 +217,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -288,7 +288,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -359,7 +359,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -444,7 +444,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -551,7 +551,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -907,7 +907,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -982,7 +982,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ @@ -1054,7 +1054,7 @@ }, "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { "sort": false, "options": [ diff --git a/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json b/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json index c7b4c3f7dc..2fb5c584f2 100644 --- a/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json +++ b/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json @@ -88,11 +88,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { - "selectWithSortOptions": { - "order": "label" - }, + "sort": true, "options": [ { "label": "public", diff --git a/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json b/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json index 00621448b5..df10eb3a9d 100644 --- a/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json +++ b/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json @@ -108,8 +108,9 @@ "default": "general_note", "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "label": "order_note", @@ -202,8 +203,9 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "options": [ { "value": "fre", @@ -263,12 +265,10 @@ ], "widget": { "formlyConfig": { - "type": "selectWithSort", + "type": "select", "props": { + "sort": true, "itemCssClass": "col-lg-12", - "selectWithSortOptions": { - "order": "label" - }, "options": [ { "value": "default",