documents: add identifiedBy on some fields

Fields involved: supplement, supplementTo, otherEdition, otherPhysicalFormat, issuedWith, precededBy, succeededBy, relatedTo, hasReproduction, reproductionOf, work_access_point * Removes templateOptions on the country jsonschema. * Fixes typo on the type entry (lower case t). * Adds the card wrapper on vendors jsonschema. * Closes #2275. * Closes #2388. * Closes #2766. * Closes #2659. * Closes #2649. * Closes #2625. * Closes #2340. * Closes #1924. ⚠️ Elasticsearch reindexing. Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
rero · Jun 13, 2022 · 4b3644a · 4b3644a
1 parent e683906
commit 4b3644a
Show file tree

Hide file tree

Showing 27 changed files with 158 additions and 123 deletions.
diff --git a/rero_ils/jsonschemas/common/cantons-v0.0.1.json b/rero_ils/jsonschemas/common/cantons-v0.0.1.json
@@ -140,7 +140,7 @@
       "templateOptions": {
         "itemCssClass": "col-lg-4"
       },
-      "hideExpression": "field.parent.model.country !== 'sz'"
+      "hideExpression": "field?.parent?.model && field.parent.model.country !== 'sz'"
     }
   }
 }
diff --git a/rero_ils/jsonschemas/common/languages-v0.0.1.json b/rero_ils/jsonschemas/common/languages-v0.0.1.json
@@ -2541,7 +2541,7 @@
     ],
     "form": {
       "templateOptions": {
-        "itemCssClass": "col-lg-6"
+        "itemCssClass": "col-lg-12"
       },
       "hide": true
     }
@@ -2568,7 +2568,7 @@
         "minLength": 1,
         "form": {
           "templateOptions": {
-            "itemCssClass": "col-lg-6"
+            "itemCssClass": "col-lg-12"
           }
         }
       },

diff --git a/rero_ils/modules/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json b/rero_ils/modules/acq_order_lines/jsonschemas/acq_order_lines/acq_order_line-v0.0.1.json
@@ -168,9 +168,9 @@
       "format": "date",
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "form": {
-        "hideExpression": "field.parent.model.status !== 'ordered' && field.parent.model.status !== 'received'",
+        "hideExpression": "field?.parent?.model && field.parent.model.status !== 'ordered' && field.parent.model.status !== 'received'",
         "expressionProperties": {
-          "templateOptions.required": "field.parent.model.status === 'ordered' || field.parent.model.status === 'received'"
+          "templateOptions.required": "field?.parent?.model && (field.parent.model.status === 'ordered' || field.parent.model.status === 'received')"
         },
         "type": "datepicker",
         "placeholder": "Select a date",
@@ -187,9 +187,9 @@
       "format": "date",
       "pattern": "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$",
       "form": {
-        "hideExpression": "field.parent.model.status !== 'received'",
+        "hideExpression": "field?.parent?.model && field.parent.model.status !== 'received'",
         "expressionProperties": {
-          "templateOptions.required": "field.parent.model.status === 'received'"
+          "templateOptions.required": "field?.parent?.model && field.parent.model.status === 'received'"
         },
         "type": "datepicker",
         "placeholder": "Select a date",

diff --git a/rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json b/rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json
@@ -43,7 +43,10 @@
     "name": {
       "title": "Name",
       "type": "string",
-      "minLength": 2
+      "minLength": 2,
+      "form": {
+        "focus": true
+      }
     },
     "description": {
       "title": "Description",
@@ -104,7 +107,7 @@
       "type": "integer",
       "minimum": 1,
       "form": {
-        "hideExpression": "!model.allow_requests",
+        "hideExpression": "model && !model.allow_requests",
         "templateOptions": {
           "addonRight": {
             "text": "day(s)"
@@ -223,6 +226,10 @@
       "required": [
         "intervals"
       ],
+      "propertiesOrder": [
+        "intervals",
+        "maximum_total_amount"
+      ],
       "properties": {
         "intervals": {
           "type": "array",
@@ -308,15 +315,15 @@
       "minimum": 0,
       "default": 0,
       "form": {
-        "hideExpression": "model.checkout_duration <= 0"
+        "hideExpression": "model && model.checkout_duration <= 0"
       }
     },
     "renewal_duration": {
       "title": "Renewal duration in days",
       "type": "integer",
       "minimum": 1,
       "form": {
-        "hideExpression": "!model.hasOwnProperty('number_renewals') || model.number_renewals <= 0",
+        "hideExpression": "model && (!model.hasOwnProperty('number_renewals') || model.number_renewals <= 0)",
         "templateOptions": {
           "addonRight": {
             "text": "day(s)"
@@ -364,7 +371,7 @@
         }
       },
       "form": {
-        "hideExpression": "field.parent.model.policy_library_level !== true"
+        "hideExpression": "field?.parent?.model && field.parent.model.policy_library_level !== true"
       }
     },
     "settings": {

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
@@ -107,7 +107,7 @@
             "card"
           ]
         },
-        "hideExpression": "field.parent.model.collection_type !== 'course'",
+        "hideExpression": "field?.parent?.model && field.parent.model.collection_type !== 'course'",
         "expressionProperties": {
           "templateOptions.required": "true"
         }

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
@@ -8,7 +8,7 @@
       "type": "object",
       "oneOf": [
         {
-          "title": "contentType",
+          "title": "unknown media",
           "additionalProperties": false,
           "propertiesOrder": [
             "contentType"
@@ -69,7 +69,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1002",
@@ -160,7 +160,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1021",
@@ -254,7 +254,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1011",
@@ -337,7 +337,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1030",
@@ -400,7 +400,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1032",
@@ -488,7 +488,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1042",
@@ -552,7 +552,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1045",
@@ -630,7 +630,7 @@
                 "other"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "rdact:1051",
@@ -696,7 +696,7 @@
                 "unspecified"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "unspecified",
@@ -752,7 +752,7 @@
           "other"
         ],
         "form": {
-          "Type": "selectWithSort",
+          "type": "selectWithSort",
           "options": [
             {
               "label": "rdaco:1002",

diff --git a/...ls/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json b/...ls/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json
@@ -106,7 +106,18 @@
       }
     },
     "identifiedBy": {
-      "$ref": "https://bib.rero.ch/schemas/documents/document_identifier-v0.0.1.json#/identifier_contribution"
+      "allOf": [
+        {
+          "form": {
+            "templateOptions": {
+              "itemCssClass": "col-12"
+            }
+          }
+        },
+        {
+          "$ref": "https://bib.rero.ch/schemas/documents/document_identifier-v0.0.1.json#/identifier_contribution"
+        }
+      ]
     }
   },
   "form": {

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_document_relation-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_document_relation-v0.0.1.json
@@ -243,7 +243,8 @@
       "type": "object",
       "additionalProperties": false,
       "propertiesOrder": [
-        "label"
+        "label",
+        "identifiedBy"
       ],
       "required": [
         "label"
@@ -252,6 +253,9 @@
         "label": {
           "type": "string",
           "minLength": 1
+        },
+        "identifiedBy": {
+          "$ref": "https://bib.rero.ch/schemas/documents/document_identified_by-v0.0.1.json#/identifiedBy"
         }
       }
     }

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
@@ -49,7 +49,7 @@
             "noInfo"
           ],
           "form": {
-            "Type": "selectWithSort",
+            "type": "selectWithSort",
             "options": [
               {
                 "label": "resource",

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json
@@ -63,7 +63,7 @@
                 "bf:Topic"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "bf:Topic",

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
@@ -190,7 +190,10 @@
           "minLength": 1,
           "form": {
             "placeholder": "Examples: LCCN, PMID, DNB",
-            "hide": true,
+            "hideExpression": "field?.parent?.model && field.parent.model.type !== 'bf:Local'",
+            "expressionProperties": {
+              "templateOptions.required": "field?.parent?.model && field.parent.model.type === 'bf:Local'"
+            },
             "templateOptions": {
               "itemCssClass": "col-lg-6"
             }

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_identifier-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_identifier-v0.0.1.json
@@ -8,6 +8,10 @@
       "value",
       "source"
     ],
+    "required": [
+      "type",
+      "value"
+    ],
     "properties": {
       "type": {
         "$ref": "#/definitions/type_main"
@@ -35,6 +39,10 @@
       "value",
       "source"
     ],
+    "required": [
+      "type",
+      "value"
+    ],
     "properties": {
       "type": {
         "$ref": "#/definitions/type_contribution"
@@ -88,10 +96,7 @@
           }
         ],
         "templateOptions": {
-          "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
+          "itemCssClass": "col-lg-12"
         }
       }
     },
@@ -124,10 +129,7 @@
           }
         ],
         "templateOptions": {
-          "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
+          "itemCssClass": "col-lg-12"
         }
       }
     },
@@ -137,10 +139,7 @@
       "minLength": 1,
       "form": {
         "templateOptions": {
-          "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
+          "itemCssClass": "col-lg-12"
         }
       }
     },
@@ -151,12 +150,12 @@
       "minLength": 1,
       "form": {
         "templateOptions": {
-          "itemCssClass": "col-lg-4"
+          "itemCssClass": "col-lg-12"
         },
         "expressionProperties": {
           "templateOptions.required": "true"
         },
-        "hideExpression": "field.parent.model && field.parent.model.type !== 'bf:Local'"
+        "hideExpression": "!field?.parent?.model || (field.parent.model && field.parent.model.type !== 'bf:Local')"
       }
     }
   }

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
@@ -68,7 +68,7 @@
                 "target_understanding_caregivers"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "target_understanding_children",
@@ -230,7 +230,7 @@
                 "target_school_master"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "target_school_harmos1",
@@ -335,7 +335,7 @@
                 "pegi_18"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "pegi_3",
@@ -403,7 +403,7 @@
                 "from the age of 2"
               ],
               "form": {
-                "Type": "selectWithSort",
+                "type": "selectWithSort",
                 "options": [
                   {
                     "label": "from the age of 18",