primeng: fix patron editor

jma · Garfield-fr · jma · commit b116a0c1ff44 · 2025-02-12T13:12:58.000+01:00
* Removes css class for the professional view.
* Adapts the main search component to the new ui version.
* Fixes several details in the patron editor.

Co-Authored-by: Johnny Mariéthoz &lt;Johnny.Mariethoz@rero.ch&gt;
Co-Authored-by: Bertrand Zuchuat &lt;bertrand.zuchuat@rero.ch&gt;
diff --git a/rero_ils/jsonschemas/common/cantons-v0.0.1.json b/rero_ils/jsonschemas/common/cantons-v0.0.1.json
@@ -37,7 +37,9 @@
         },
         "props": {
           "sort": true,
-          "itemCssClass": "col-lg-4",
+          "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
@@ -385,7 +385,6 @@
           "placeholder": "Select an option…",
           "sortOrder": "asc",
           "filter": true,
-          "itemCssClass": "col-lg-4",
           "options": [
             {
               "label": "country_aa",
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
@@ -16,17 +16,22 @@
       "pattern": "^(https://mef.rero.ch/api/concepts/(gnd|idref|rero)/.*|https://bib.rero.ch/api/local_entities/.*?)$",
       "widget": {
         "formlyConfig": {
-          "type": "entityTypeahead",
+          "type": "entity-autocomplete",
           "props": {
+            "scrollHeight": "600px",
+            "group": true,
             "filters": {
+              "selected": "concepts_genreForm",
               "options": [
                 {
                   "label": "Genre, form",
                   "value": "concepts_genreForm"
                 }
               ]
             },
-            "itemCssClass": "col-12"
+            "queryOptions": {
+              "type": "mef"
+            }
           }
         }
       }
@@ -36,12 +41,5 @@
       "type": "string",
       "minLength": 1
     }
-  },
-  "widget": {
-    "formlyConfig": {
-      "props": {
-        "containerCssClass": "row"
-      }
-    }
   }
 }
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
@@ -17,10 +17,12 @@
       "pattern": "^(https://mef.rero.ch/api/(agents|concepts|places)/(gnd|idref|rero)/.*|https://bib.rero.ch/api/local_entities/.*?)$",
       "widget": {
         "formlyConfig": {
-          "type": "entityTypeahead",
+          "type": "entity-autocomplete",
           "props": {
+            "scrollHeight": "600px",
+            "group": true,
             "filters": {
-              "default": "bf:Topic",
+              "selected": "bf:Topic",
               "options": [
                 {
                   "label": "Topic",
@@ -48,7 +50,9 @@
                 }
               ]
             },
-            "itemCssClass": "col-12"
+            "queryOptions": {
+              "type": "mef"
+            }
           }
         }
       }
@@ -58,12 +62,5 @@
       "type": "string",
       "minLength": 1
     }
-  },
-  "widget": {
-    "formlyConfig": {
-      "props": {
-        "containerCssClass": "row"
-      }
-    }
   }
 }
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
@@ -47,7 +47,14 @@
       "items": {
         "title": "Local code",
         "type": "string",
-        "minLength": 1
+        "minLength": 1,
+        "widget": {
+          "formlyConfig": {
+            "props": {
+              "hideLabel": true
+            }
+          }
+        }
       }
     },
     "user_id": {
@@ -57,7 +64,6 @@
       "widget": {
         "formlyConfig": {
           "wrappers": [
-            "form-field",
             "user-id"
           ]
         }
@@ -200,6 +206,7 @@
             "widget": {
               "formlyConfig": {
                 "props": {
+                  "hideLabel": true,
                   "doNotSubmitOnEnter": true,
                   "validation": {
                     "validators": {
diff --git a/rero_ils/theme/templates/rero_ils/frontpage.html b/rero_ils/theme/templates/rero_ils/frontpage.html
@@ -43,7 +43,6 @@
           language="{{ current_i18n.locale.language[:2] }}"
           inputstyleclass="md:text-xl w-full"
           class="rero-ils-ui"
-          admin="false"
         />
       </div>
     </div>
diff --git a/rero_ils/theme/templates/rero_ils/header.html b/rero_ils/theme/templates/rero_ils/header.html
@@ -35,7 +35,6 @@
         {%- block navbar_search %}
           <main-search-bar
             class="flex-grow-1 rero-ils-ui"
-            admin="false"
             inputstyleclass="text-sm py-1 w-full"
             placeholder="{{ _('Search') }}"
             viewcode="{{ viewcode or config.RERO_ILS_SEARCH_GLOBAL_VIEW_CODE }}"
diff --git a/rero_ils/theme/templates/rero_ils/professional.html b/rero_ils/theme/templates/rero_ils/professional.html
@@ -31,7 +31,7 @@
 </head>
 
 <body>
-    <admin-root class="rero-ils-ui" />
+    <admin-root />
     {{ node_assets('@rero/rero-ils-ui/dist/admin', tags='type="module"') }}
 </body>
 

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,6 @@`
`385`	`385`	`"placeholder": "Select an option…",`
`386`	`386`	`"sortOrder": "asc",`
`387`	`387`	`"filter": true,`
`388`		`- "itemCssClass": "col-lg-4",`
`389`	`388`	`"options": [`
`390`	`389`	`{`
`391`	`390`	`"label": "country_aa",`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,22 @@`
`16`	`16`	`"pattern": "^(https://mef.rero.ch/api/concepts/(gnd\|idref\|rero)/.\|https://bib.rero.ch/api/local_entities/.?)$",`
`17`	`17`	`"widget": {`
`18`	`18`	`"formlyConfig": {`
`19`		`- "type": "entityTypeahead",`
	`19`	`+ "type": "entity-autocomplete",`
`20`	`20`	`"props": {`
	`21`	`+ "scrollHeight": "600px",`
	`22`	`+ "group": true,`
`21`	`23`	`"filters": {`
	`24`	`+ "selected": "concepts_genreForm",`
`22`	`25`	`"options": [`
`23`	`26`	`{`
`24`	`27`	`"label": "Genre, form",`
`25`	`28`	`"value": "concepts_genreForm"`
`26`	`29`	`}`
`27`	`30`	`]`
`28`	`31`	`},`
`29`		`- "itemCssClass": "col-12"`
	`32`	`+ "queryOptions": {`
	`33`	`+ "type": "mef"`
	`34`	`+ }`
`30`	`35`	`}`
`31`	`36`	`}`
`32`	`37`	`}`
`@@ -36,12 +41,5 @@`
`36`	`41`	`"type": "string",`
`37`	`42`	`"minLength": 1`
`38`	`43`	`}`
`39`		`- },`
`40`		`- "widget": {`
`41`		`- "formlyConfig": {`
`42`		`- "props": {`
`43`		`- "containerCssClass": "row"`
`44`		`- }`
`45`		`- }`
`46`	`44`	`}`
`47`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,12 @@`
`17`	`17`	`"pattern": "^(https://mef.rero.ch/api/(agents\|concepts\|places)/(gnd\|idref\|rero)/.\|https://bib.rero.ch/api/local_entities/.?)$",`
`18`	`18`	`"widget": {`
`19`	`19`	`"formlyConfig": {`
`20`		`- "type": "entityTypeahead",`
	`20`	`+ "type": "entity-autocomplete",`
`21`	`21`	`"props": {`
	`22`	`+ "scrollHeight": "600px",`
	`23`	`+ "group": true,`
`22`	`24`	`"filters": {`
`23`		`- "default": "bf:Topic",`
	`25`	`+ "selected": "bf:Topic",`
`24`	`26`	`"options": [`
`25`	`27`	`{`
`26`	`28`	`"label": "Topic",`
`@@ -48,7 +50,9 @@`
`48`	`50`	`}`
`49`	`51`	`]`
`50`	`52`	`},`
`51`		`- "itemCssClass": "col-12"`
	`53`	`+ "queryOptions": {`
	`54`	`+ "type": "mef"`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`	`}`
`54`	`58`	`}`
`@@ -58,12 +62,5 @@`
`58`	`62`	`"type": "string",`
`59`	`63`	`"minLength": 1`
`60`	`64`	`}`
`61`		`- },`
`62`		`- "widget": {`
`63`		`- "formlyConfig": {`
`64`		`- "props": {`
`65`		`- "containerCssClass": "row"`
`66`		`- }`
`67`		`- }`
`68`	`65`	`}`
`69`	`66`	`}`