Merge pull request #544 from AudiovisualMetadataPlatform/dev

merge fixes on dev branch so far to vue3 as a record of the status before AMP-3426 merge
AudiovisualMetadataPlatform · Oct 29, 2024 · 6cdeea9 · 6cdeea9
2 parents 433e8b1 + 6a1683f
commit 6cdeea9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/src/components/batch/BatchIngest.vue b/src/components/batch/BatchIngest.vue
@@ -74,9 +74,7 @@
                         v-bind="filename"
                         type="file"
                         class="form-control-file btn btn-light btn-lg"
-                        id="exampleFormControlFile1"
                         ref="inputFile"
-                        value="Upload batch manifest"
                         :disabled="inProgress || unitName.length === 0"
                         accept=".csv"
                         @change="

diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
@@ -972,30 +972,30 @@ export default {
     configProperties: sync("configProperties"),
     baseUrl() {
       const self = this;
-      if (window.location.hash.toLowerCase().indexOf("unit") > -1) {
+      if (window.location.href.toLowerCase().indexOf("unit") > -1) {
         return "unit";
-      } else if (window.location.hash.toLowerCase().indexOf("file") > -1) {
+      } else if (window.location.href.toLowerCase().indexOf("file") > -1) {
         return "file";
       } else if (
-        window.location.hash.toLowerCase().indexOf("collection") > -1 &&
-        window.location.hash.toLowerCase().indexOf("item") === -1
+        window.location.href.toLowerCase().indexOf("collection") > -1 &&
+        window.location.href.toLowerCase().indexOf("item") === -1
       ) {
         this.getItemsConfig();
         return "collection";
-      } else if (window.location.hash.toLowerCase().indexOf("item") > -1) {
+      } else if (window.location.href.toLowerCase().indexOf("item") > -1) {
         return "item";
       }
       return "";
     },
     purpose() {
-      return window.location.hash.toLowerCase().indexOf("details") > -1
+      return window.location.href.toLowerCase().indexOf("details") > -1
         ? "details"
         : "";
     },
     isCreatePage() {
       return (
-        window.location.hash.toLowerCase().indexOf("create") > -1 ||
-        window.location.hash.toLowerCase().indexOf("add-item") > -1
+        window.location.href.toLowerCase().indexOf("create") > -1 ||
+        window.location.href.toLowerCase().indexOf("add-item") > -1
       );
     },
     listOfTaskManager() {

diff --git a/src/components/entity/ItemFiles.vue b/src/components/entity/ItemFiles.vue
@@ -104,12 +104,9 @@
         >
           <div class="d-flex w-100 mt-3">
             <div class="input-group image-preview col-11 p-0 mr-1">
-              <!-- <label for="exampleFormControlFile1" class="form-control-file btn btn-light btn-lg"><button>Browse</button></label> -->
               <input
                 type="file"
                 class="form-control-file btn btn-light btn-lg"
-                id="exampleFormControlFile1"
-                value="Upload"
                 ref="fileupload"
                 @change="getFile"
               />
@@ -180,7 +177,7 @@ export default {
     selectedFile: sync("selectedFile"),
     accessControl: sync("accessControl"),
     isCreatePage() {
-      return window.location.hash.toLowerCase().indexOf("add-item") > -1;
+      return window.location.href.toLowerCase().indexOf("add-item") > -1;
     },
   },
   methods: {

diff --git a/src/components/evaluation/GroundTruthModal.vue b/src/components/evaluation/GroundTruthModal.vue
@@ -141,8 +141,6 @@
                   type="file"
                   :accept="'.' + mstDetails.groundtruthFormat"
                   class="form-control-file btn btn-light btn"
-                  id="exampleFormControlFile1"
-                  value="Upload"
                   ref="fileupload"
                   @change="getFile"
                   :disabled="uploadGtFiles.length > 0"

diff --git a/src/components/supplement/SupplementFile.vue b/src/components/supplement/SupplementFile.vue
@@ -13,8 +13,6 @@
               <input
                 type="file"
                 class="form-control-file btn btn-light btn-lg"
-                id="exampleFormControlFile1"
-                value="upload"
                 @change="filesChange"
               />
             </label>

diff --git a/src/components/supplement/SupplementList.vue b/src/components/supplement/SupplementList.vue
@@ -145,11 +145,11 @@ export default {
     baseUrl() {
       const self = this;
       if (
-        window.location.hash.toLowerCase().indexOf("supplemental-files/") > -1
+        window.location.href.toLowerCase().indexOf("supplemental-files/") > -1
       ) {
         return "supplement";
       } else if (
-        window.location.hash.toLowerCase().indexOf("supplemental-files") > -1
+        window.location.href.toLowerCase().indexOf("supplemental-files") > -1
       ) {
         return "list-supplement";
       }

diff --git a/src/components/workflow/SelectWorkflow.vue b/src/components/workflow/SelectWorkflow.vue
@@ -288,17 +288,14 @@
           </h5>
         </template>
         <template #default>
-          <b-form-group v-slot="{ ariaDescribedby }">
+          <b-form-radio-group v-model="selectedSupplement">
             <b-form-radio
               v-for="(supplement, index) in supplementList"
               v-bind:key="index"
-              v-model="selectedSupplement"
-              :aria-describedby="ariaDescribedby"
-              name="some-radios"
               :value="supplement"
               >{{ supplement.name }}</b-form-radio
             >
-          </b-form-group>
+          </b-form-radio-group>
           <div class="row pad-all-2">
             <div class="float-left">
               <label class="switch">