rero · jma · Sep 18, 2024 · Oct 28, 2024 · Nov 20, 2024 · Dec 18, 2024
diff --git 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/config.py b/rero_ils/config.py
@@ -999,13 +999,15 @@ def _(x):
         record_serializers={
             "application/json": "rero_ils.modules.serializers:json_v1_response"
         },
-        record_serializers_aliases={
-            "json": "application/json",
-        },
+        record_serializers_aliases={"json": "application/json"},
         search_serializers={
             "application/json": "rero_ils.modules.serializers:json_v1_search",
             "application/rero+json": "rero_ils.modules.holdings.serializers:json_holdings_search",
         },
+        search_serializers_aliases={
+            "json": "application/json",
+            "rero+json": "application/json",
+        },
         list_route="/holdings/",
         record_loaders={
             "application/json": lambda: Holding(request.get_json()),

diff --git a/rero_ils/jsonschemas/common/cantons-v0.0.1.json b/rero_ils/jsonschemas/common/cantons-v0.0.1.json
@@ -36,7 +36,10 @@
           "hide": "field?.parent?.model?.country !== 'sz'"
         },
         "props": {
-          "itemCssClass": "col-lg-4",
+          "sort": true,
+          "placeholder": "Select an option…",
+          "sortOrder": "asc",
+          "filter": true,
           "options": [
             {
               "label": "canton_ag",

diff --git a/rero_ils/jsonschemas/common/countries-v0.0.1.json b/rero_ils/jsonschemas/common/countries-v0.0.1.json
@@ -381,7 +381,10 @@
     "widget": {
       "formlyConfig": {
         "props": {
-          "itemCssClass": "col-lg-4",
+          "sort": true,
+          "placeholder": "Select an option…",
+          "sortOrder": "asc",
+          "filter": true,
           "options": [
             {
               "label": "country_aa",
@@ -1887,4 +1890,4 @@
       }
     }
   }
-}
+}
diff --git 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
+        }
       }
     }
   }
-}
+}
diff --git 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
@@ -10,8 +10,9 @@
     ],
     "widget": {
       "formlyConfig": {
-        "type": "selectWithSort",
+        "type": "select",
         "props": {
+          "sort": true,
           "itemCssClass": "col-lg-2",
           "options": [
             {
@@ -35,4 +36,4 @@
       }
     }
   }
-}
+}
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
@@ -137,11 +137,9 @@
       "default": "in progress",
       "widget": {
         "formlyConfig": {
-          "type": "selectWithSort",
+          "type": "select",
           "props": {
-            "selectWithSortOptions": {
-              "order": "label"
-            },
+            "sort": true,
             "options": [
               {
                 "value": "in_progress",
@@ -167,7 +165,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {
@@ -206,11 +204,9 @@
             ],
             "widget": {
               "formlyConfig": {
-                "type": "selectWithSort",
+                "type": "select",
                 "props": {
-                  "selectWithSortOptions": {
-                    "order": "label"
-                  },
+                  "sort": true,
                   "options": [
                     {
                       "value": "shipping_and_handling",

diff --git a/...odules/acquisition/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json b/...odules/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",
@@ -191,7 +192,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "expressions": {
             "props.required": "field?.parent?.model?.status === 'ordered' || field?.parent?.model?.status === 'received'",
             "hide": "field?.parent?.model?.status !== 'ordered' && field?.parent?.model?.status !== 'received'"
@@ -214,7 +215,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "expressions": {
             "props.required": "field?.parent?.model?.status === 'received'",
             "hide": "field?.parent?.model?.status !== 'received'"
@@ -278,13 +279,14 @@
           "pattern": "^https://bib.rero.ch/api/documents/.+?$",
           "widget": {
             "formlyConfig": {
+              "type": "remoteAutoComplete",
               "props": {
                 "validation": {
                   "messages": {
                     "patternMessage": "Should be in the following format: https://bib.rero.ch/api/documents/<PID>."
                   }
                 },
-                "remoteTypeahead": {
+                "queryOptions": {
                   "type": "documents",
                   "filter": "NOT harvested:true"
                 }

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
@@ -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/.../acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json b/.../acquisition/acq_receipt_lines/jsonschemas/acq_receipt_lines/acq_receipt_line-v0.0.1.json
@@ -119,7 +119,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {
@@ -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
@@ -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/acquisition/budgets/jsonschemas/budgets/budget-v0.0.1.json b/rero_ils/modules/acquisition/budgets/jsonschemas/budgets/budget-v0.0.1.json
@@ -59,7 +59,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {
@@ -77,7 +77,7 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {

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
@@ -60,14 +60,12 @@
       ],
       "widget": {
         "formlyConfig": {
-          "type": "selectWithSort",
+          "type": "select",
           "wrappers": [
             "form-field"
           ],
           "props": {
-            "selectWithSortOptions": {
-              "order": "label"
-            },
+            "sort": true,
             "options": [
               {
                 "label": "course",
@@ -161,17 +159,17 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {
                 "patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
-                "dateMustBeLessThan": "The start date must be less than the end date."
+                "datesGreaterThan": "The start date must be less than the end date."
               },
               "validators": {
-                "dateMustBeLessThan": {
-                  "startDate": "start_date",
-                  "endDate": "end_date",
+                "datesGreaterThan": {
+                  "dateFirst": "start_date",
+                  "dateLast": "end_date",
                   "strict": true
                 }
               }
@@ -187,17 +185,17 @@
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "widget": {
         "formlyConfig": {
-          "type": "datepicker",
+          "type": "datePicker",
           "props": {
             "validation": {
               "messages": {
                 "patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
-                "datesMustBeGreaterThan": "The end date must be greater than the start date."
+                "datesGreaterThan": "The end date must be greater than the start date."
               },
               "validators": {
-                "dateMustBeGreaterThan": {
-                  "startDate": "start_date",
-                  "endDate": "end_date",
+                "datesGreaterThan": {
+                  "dateFirst": "start_date",
+                  "dateLast": "end_date",
                   "strict": true
                 }
               }
@@ -257,8 +255,9 @@
             "pattern": "^https://bib.rero.ch/api/items/.*?$",
             "widget": {
               "formlyConfig": {
+                "type": "remoteAutoComplete",
                 "props": {
-                  "remoteTypeahead": {
+                  "queryOptions": {
                     "type": "items"
                   }
                 }

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
@@ -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
@@ -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 @@
       }
     }
   }
-}
+}