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 rero#2275. * Closes rero#2388. * Closes rero#2766. * Closes rero#2659. * Closes rero#2649. * Closes rero#2625. * Closes rero#2340. ⚠️ Elasticsearch reindexing. Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
Garfield-fr · Jun 8, 2022 · aae2699 · aae2699
1 parent 7d4be08
commit aae2699
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 66 deletions.
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
@@ -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"
@@ -89,9 +97,6 @@
         ],
         "templateOptions": {
           "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
         }
       }
     },
@@ -125,9 +130,6 @@
         ],
         "templateOptions": {
           "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
         }
       }
     },
@@ -138,9 +140,6 @@
       "form": {
         "templateOptions": {
           "itemCssClass": "col-lg-4"
-        },
-        "expressionProperties": {
-          "templateOptions.required": "true"
         }
       }
     },
@@ -156,7 +155,7 @@
         "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",

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
@@ -56,7 +56,7 @@
               }
             ],
             "templateOptions": {
-              "itemcCssClass": "col-lg-4"
+              "itemcCssClass": "col"
             }
           }
         },
@@ -94,7 +94,18 @@
                 }
               },
               "country": {
-                "$ref": "https://bib.rero.ch/schemas/common/countries-v0.0.1.json#/country"
+                "allOf": [
+                  {
+                    "form": {
+                      "templateOptions": {
+                        "itemCssClass": "col-lg-4"
+                      }
+                    }
+                  },
+                  {
+                    "$ref": "https://bib.rero.ch/schemas/common/countries-v0.0.1.json#/country"
+                  }
+                ]
               },
               "canton": {
                 "$ref": "https://bib.rero.ch/schemas/common/cantons-v0.0.1.json#/canton"
@@ -114,7 +125,18 @@
                 }
               },
               "identifiedBy": {
-                "$ref": "https://bib.rero.ch/schemas/documents/document_identifier-v0.0.1.json#/identifier_contribution"
+                "allOf": [
+                  {
+                    "form": {
+                      "templateOptions": {
+                        "itemCssClass": "col-lg-8"
+                      }
+                    }
+                  },
+                  {
+                    "$ref": "https://bib.rero.ch/schemas/documents/document_identifier-v0.0.1.json#/identifier_contribution"
+                  }
+                ]
               }
             },
             "form": {
@@ -191,11 +213,6 @@
                     "itemCssClass": "col-lg-8"
                   }
                 }
-              },
-              "form": {
-                "templateOptions": {
-                  "itemCssClass": "col-lg-6"
-                }
               }
             },
             "form": {

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
@@ -23,7 +23,7 @@
             "Other"
           ],
           "form": {
-            "Type": "selectWithSort",
+            "type": "selectWithSort",
             "options": [
               {
                 "label": "Linear scale",

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json
@@ -980,7 +980,6 @@
       ]
     },
     "form": {
-      "hide": true,
       "templateOptions": {
         "cssClass": "w-md-50"
       }

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json
@@ -49,7 +49,8 @@
             "form_subdivision",
             "medium_of_performance_for_music",
             "arranged_statement_for_music",
-            "key_for_music"
+            "key_for_music",
+            "identifiedBy"
           ],
           "required": [
             "title"
@@ -142,6 +143,9 @@
               "title": "Key (music)",
               "type": "string",
               "minLength": 1
+            },
+            "identifiedBy": {
+              "$ref": "https://bib.rero.ch/schemas/documents/document_identifier-v0.0.1.json#/identifier_contribution"
             }
           }
         }