Merge pull request #1251 from ugent-library/fix_issue_1237

Fix issue 1237

.vscode/settings.json

@@ -2,5 +2,21 @@
   "protoc": {
     "options": ["-I ./api/v1"]
   },
-  "cSpell.words": ["biblio", "Biblio", "briefcase", "CYPRESSTEST", "liblogin", "Moreels"]
+  "cSpell.words": [
+    "arxiv",
+    "Arxiv",
+    "biblio",
+    "Biblio",
+    "briefcase",
+    "CYPRESSTEST",
+    "eisbn",
+    "eissn",
+    "esci",
+    "isbn",
+    "issn",
+    "liblogin",
+    "Moreels",
+    "pubmed",
+    "tagify"
+  ]
 }

views/form/cols/contributor_name.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <input name="{{.Name}}" type="text" value="{{.Value}}"
+    <input id="{{.Name}}" name="{{.Name}}" type="text" value="{{.Value}}"
         class="form-control{{if .Error}} is-invalid{{end}} form-control-auto-focus"
         {{if .Readonly}}readonly{{end}}
         hx-get="{{.Vars.SuggestURL}}"

views/form/cols/date.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <input class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" type="date"
+    <input class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" type="date"
         value="{{.Value}}"{{with .Min}} min="{{.}}"{{end}}{{with .Max}} max="{{.}}"{{end}}{{if .Disabled}} disabled{{end}}>
     {{if .Error}}<small class="invalid-feedback">{{.Error}}</small>{{end}}
 </div>

views/form/cols/select.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
         {{if .EmptyOption}}<option></option>{{end}}
         {{range .Options}}
         <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>

views/form/cols/select_repeat.gohtml

@@ -1,5 +1,5 @@
 <div class="mb-6 col{{if .Error}} is-invalid{{end}}">
-    <label class="col-form-label" for="{{.Name}}">
+    <label class="col-form-label" for="{{.Name}}-0">
         {{.Label}}
         {{with .Tooltip}}
         <a class="text-muted mx-2" href="#" data-bs-container="body" data-bs-toggle="popover" data-trigger="focus" data-bs-placement="right" data-bs-content="{{.}}">
@@ -13,7 +13,7 @@
     <div class="form-values">
         {{range $i, $v := .Values}}
         <div class="d-flex mb-3 form-value">
-            <select class="custom-select form-control" name="{{$.Name}}">
+            <select class="custom-select form-control" name="{{$.Name}}" id="{{$.Name}}-{{$i}}" data-tmpl-id="{{.Name}}-{i}">
                 {{if $.EmptyOption}}<option></option>{{end}}
                 {{range $.Options}}
                 <option value="{{.Value}}"{{if eq .Value $v}} selected{{end}}>{{.Label}}</option>
@@ -27,7 +27,7 @@
         {{end}}
 
         <div class="d-flex mb-3 form-value">
-            <select class="custom-select form-control" name="{{.Name}}">
+            <select class="custom-select form-control" name="{{.Name}}" id="{{.Name}}-{{len .Values}}" data-tmpl-id="{{.Name}}-{i}">
                 {{if .EmptyOption}}<option></option>{{end}}
                 {{range .Options}}
                 <option value="{{.Value}}">{{.Label}}</option>

views/form/cols/text.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <input class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" type="text" value="{{.Value}}"
+    <input class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" type="text" value="{{.Value}}"
         {{if .Readonly}}readonly{{end}}
     >
     {{with .Error}}<small class="invalid-feedback">{{.}}</small>{{end}}

views/form/cols/text_area.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <textarea class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" rows="{{.Rows}}">{{.Value}}</textarea>
+    <textarea class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" rows="{{.Rows}}">{{.Value}}</textarea>
     {{with .Error}}<small class="invalid-feedback">{{.}}</small>{{end}}
     {{with .Help}}<small class="form-text text-muted">{{.}}</small>{{end}}
 </div>

views/form/cols/text_repeat.gohtml

@@ -1,5 +1,5 @@
 <div class="mb-6 col form-text-multiple{{if .Error}} is-invalid{{end}}">
-   <label class="col-form-label" for="{{.Name}}">
+   <label class="col-form-label" for="{{.Name}}-0">
         {{.Label}}
         {{with .Tooltip}}
         <a class="text-muted mx-2" href="#" data-bs-container="body" data-bs-toggle="popover" data-trigger="focus" data-bs-placement="right" data-bs-content="{{.}}">

views/form/default/dataset/access_level.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
             hx-put="{{pathFor "dataset_edit_file_refresh_form" "id" .Vars.ID}}"
             hx-include=".modal-body"
             hx-swap="none scroll:.modal-body:bottom"

views/form/default/dataset/license.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
             hx-put="{{pathFor "dataset_edit_file_refresh_form" "id" .Vars.ID}}"
             hx-include=".modal-body"
             hx-swap="none scroll:.modal-body:bottom"

views/form/default/date.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <input class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" type="date"
+        <input class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" type="date"
             value="{{.Value}}"{{with .Min}} min="{{.}}"{{end}}{{with .Max}} max="{{.}}"{{end}}{{if .Disabled}} disabled{{end}}>
         {{if .Error}}<small class="invalid-feedback">{{.Error}}</small>{{end}}
     </div>

views/form/default/publication/file_document_type.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
             hx-get="{{pathFor "publication_edit_file_refresh_form" "id" $.Vars.ID "file_id" $.Vars.FileID}}"
             hx-swap="none"
             hx-include=".file-attributes"

views/form/default/publication/type.gohtml

@@ -13,6 +13,7 @@
         <select
             class="form-select form-control{{if .Error}} is-invalid{{end}}"
             name="{{.Name}}"
+            id="{{.Name}}"
             {{if .Disabled}} disabled{{end}}
             hx-get="{{pathFor "publication_confirm_update_type" "id" .Vars.Publication.ID}}"
             hx-headers='{"If-Match": "{{.Vars.Publication.SnapshotID}}"}'

views/form/default/select.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
             {{if .EmptyOption}}<option></option>{{end}}
             {{range .Options}}
             <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>

views/form/default/select_repeat.gohtml

@@ -1,5 +1,5 @@
 <div class="mb-6 row">
-    <label class="col-lg-3 col-form-label mt-2" for="{{.Name}}">
+    <label class="col-lg-3 col-form-label mt-2" for="{{.Name}}-0">
         {{.Label}}
         {{if .Tooltip}}
         <a class="text-muted mx-2" href="#" data-bs-container="body" data-bs-toggle="popover" data-trigger="focus" data-bs-placement="right" data-bs-content="{{.Tooltip}}">
@@ -12,7 +12,7 @@
      <div class="col-lg-{{.Cols}} form-values">
          {{range $i, $v := .Values}}
          <div class="d-flex mb-3 form-value">
-             <select class="custom-select form-control" name="{{$.Name}}">
+             <select class="custom-select form-control" name="{{$.Name}}" id="{{$.Name}}-{{$i}}" data-tmpl-id="{{$.Name}}-{i}">
                  {{if $.EmptyOption}}<option></option>{{end}}
                  {{range $.Options}}
                  <option value="{{.Value}}"{{if eq .Value $v}} selected{{end}}>{{.Label}}</option>
@@ -26,7 +26,7 @@
          {{end}}
 
          <div class="d-flex mb-3 form-value">
-             <select class="custom-select form-control" name="{{.Name}}">
+             <select class="custom-select form-control" id="{{.Name}}-{{len .Values}}" name="{{.Name}}" data-tmpl-id="{{$.Name}}-{i}">
                  {{if .EmptyOption}}<option></option>{{end}}
                  {{range .Options}}
                  <option value="{{.Value}}">{{.Label}}</option>

views/form/default/text.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}} {{if .AutocompleteURL}} autocomplete{{end}}"{{if .AutocompleteURL}} data-bs-target="[name={{.Name}}]"{{end}}>
-        <input class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" type="text" value="{{.Value}}"
+        <input class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" type="text" value="{{.Value}}"
             {{if .AutocompleteURL}}
             autocomplete="off"
             hx-get="{{.AutocompleteURL}}"

views/form/default/text_area.gohtml

@@ -10,7 +10,7 @@
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
     <div class="col-lg-{{.Cols}}">
-        <textarea class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" rows="{{.Rows}}">{{.Value}}</textarea>
+        <textarea class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" rows="{{.Rows}}">{{.Value}}</textarea>
         {{with .Error}}<small class="invalid-feedback">{{.}}</small>{{end}}
         {{with .Help}}<small class="form-text text-muted">{{.}}</small>{{end}}
     </div>

views/form/default/text_repeat.gohtml

@@ -1,5 +1,5 @@
 <div class="mb-6 row form-text-multiple{{if .Error}} is-invalid{{end}}">
-    <label class="col-lg-3 col-form-label mt-2" for="{{.Name}}">
+    <label class="col-lg-3 col-form-label mt-2" for="{{.Name}}-0">
         {{.Label}}
         {{with .Tooltip}}
         <a class="text-muted mx-2" href="#" data-bs-container="body" data-bs-toggle="popover" data-trigger="focus" data-bs-placement="right" data-bs-content="{{.}}">

views/form/file/document_type.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
+    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}
         hx-get="{{pathFor "publication_edit_file_refresh_form" "id" $.Vars.ID "file_id" $.Vars.FileID}}"
         hx-swap="none"
         hx-include=".file-attributes"

views/form/file/embargo_after.gohtml

@@ -10,7 +10,7 @@
             {{end}}
             {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
         </label>
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
             {{if .EmptyOption}}<option></option>{{end}}
             {{range .Options}}
             <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>

views/form/file/embargo_during.gohtml

@@ -10,7 +10,7 @@
             {{end}}
             {{if .Required}}&nbsp;<abbr class="required" title="Required">*</abbr>{{end}}
         </label>
-        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+        <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
             {{if .EmptyOption}}<option></option>{{end}}
             {{range .Options}}
             <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>

views/form/file/embargo_end.gohtml

@@ -11,7 +11,7 @@
                 {{end}}
                 {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
             </label>
-            <input class="form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}" type="date"
+            <input class="form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}" type="date"
                 value="{{.Value}}"{{with .Min}} min="{{.}}"{{end}}{{with .Max}} max="{{.}}"{{end}}{{if .Disabled}} disabled{{end}}>
             <small>More information about <a href="https://onderzoektips.ugent.be/en/tips/00002097" target="_blank">embargo periods</a>.</small>
             {{if .Error}}<small class="invalid-feedback">{{.Error}}</small>{{end}}

views/form/file/license.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
         {{if .EmptyOption}}<option></option>{{end}}
         {{range .Options}}
         <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>

views/form/file/publication_version.gohtml

@@ -9,7 +9,7 @@
         {{end}}
         {{if .Required}}&nbsp;<span class="badge badge-outline-primary badge-sm">Required</span>{{end}}
     </label>
-    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
+    <select class="form-select form-control{{if .Error}} is-invalid{{end}}" id="{{.Name}}" name="{{.Name}}"{{if .Disabled}} disabled{{end}}>
         {{if .EmptyOption}}<option></option>{{end}}
         {{range .Options}}
         <option value="{{.Value}}"{{if eq .Value $.Value}} selected{{end}}>{{.Label}}</option>