chore(schema): use select instead of selectWithSort

Co-Authored-by: Bertrand Zuchuat <[email protected]>
Garfield-fr · Sep 18, 2024 · 42d1024 · 42d1024
1 parent 0f8b215
commit 42d1024
Show file tree

Hide file tree

Showing 41 changed files with 168 additions and 119 deletions.
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/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
@@ -381,6 +381,8 @@
     "widget": {
       "formlyConfig": {
         "props": {
+          "sort": true,
+          "filter": true,
           "itemCssClass": "col-lg-4",
           "options": [
             {
@@ -1887,4 +1889,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",
@@ -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",

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
@@ -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/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
@@ -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 @@
       }
     }
   }
-}
+}
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
@@ -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/...ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json b/...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
@@ -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
@@ -162,8 +162,10 @@
   },
   "widget": {
     "formlyConfig": {
-      "type": "selectWithSort",
+      "type": "select",
       "props": {
+        "filter": true,
+        "sort": true,
         "itemCssClass": "col-lg-6",
         "options": [
           {
@@ -771,4 +773,4 @@
       }
     }
   }
-}
+}
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
@@ -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 @@
       }
     }
   }
-}
+}