AMP-3122/3371/3377

: update packages - fix for app/store/router API changes - fix vue3 warnings - debug log for pathify
AudiovisualMetadataPlatform · Sep 2, 2024 · 8fa2518 · 8fa2518
1 parent c13b378
commit 8fa2518
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 144 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/account/Login.vue b/src/components/account/Login.vue
@@ -146,37 +146,38 @@ export default {
     async checkForm() {
       event.preventDefault();
       let self = this;
-      this.errors.other_errors = [];
-      if (!this.email) {
-        this.errors.email_error = "(Email required)";
+      self.errors.other_errors = [];
+      if (!self.email) {
+        self.errors.email_error = "(Email required)";
       }
-      if (!this.pswd) {
-        this.errors.pswd_error = "(Password required)";
+      if (!self.pswd) {
+        self.errors.pswd_error = "(Password required)";
       }
-      if (this.errors.email_error == "" && this.errors.pswd_error == "") {
-        var currentUser = await accountService.login(this.email, this.pswd);
-        console.log("current user:" + currentUser);
-        console.log("AUTH:");
+      if (self.errors.email_error == "" && self.errors.pswd_error == "") {
+        var currentUser = await accountService.login(self.email, self.pswd);
+        console.log("current user: " + currentUser);
         if (currentUser && currentUser.token) {
           self.isAuthenticated = true;
-          await self.accessControlService.initPermissions(this);
+          console.log("self.accessControl = ", self.accessControl)
+          console.log("store.accessControl: ", self.$store.state.accessControl);
+          await self.accessControlService.initPermissions(self);
           // Force setting localStorage vuex object for state in vuex-persistedstate
           let vuex = JSON.parse(localStorage.getItem("vuex"));
           localStorage.setItem("vuex", JSON.stringify({
             ...vuex,
-            acUnitsActions: this.acUnitsActions,
-            acUnitsMedia: this.acUnitsMedia,
-            acUnitsOutput: this.acUnitsOutput,
-            acActions: this.acActions,
+            acUnitsActions: self.acUnitsActions,
+            acUnitsMedia: self.acUnitsMedia,
+            acUnitsOutput: self.acUnitsOutput,
+            acActions: self.acActions,
           }));
-          if (this.$route.query.returnUrl) {
-            console.log("going to " + this.$route.query.returnUrl);
-            this.$router.push(this.$route.query.returnUrl);
+          if (self.$route.query.returnUrl) {
+            console.log("going to " + self.$route.query.returnUrl);
+            self.$router.push(self.$route.query.returnUrl);
           } else {
-            this.$router.push("/");
+            self.$router.push("/");
           }
         } else {
-          this.errors.other_errors.push("Email and password do not match");
+          self.errors.other_errors.push("Email and password do not match");
         }
       }
     },

diff --git a/src/components/batch/BatchIngest.vue b/src/components/batch/BatchIngest.vue
@@ -71,13 +71,13 @@
                   <div class="form-row">
                     <div class="col-lg-6">
                       <input
+                        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"
-                        v-bind="filename"
                         accept=".csv"
                         @change="
                           filesChange($event.target.name, $event.target.files);

diff --git a/src/components/dashboard/DashboardTable.vue b/src/components/dashboard/DashboardTable.vue
@@ -84,10 +84,10 @@
             }"
           >
             <td v-if="checkAvailability('testDate')">
-              {{ new Date(rec.testDate) | LOCAL_DATE_VALUE }}
+              {{ $filters.localDate(new Date(rec.testDate)) }}
             </td>
             <td v-if="checkAvailability('dateCreated')">
-              {{ new Date(rec.dateCreated) | LOCAL_DATE_VALUE }}
+              {{ $filters.localDate(new Date(rec.dateCreated)) }}
             </td>
             <td v-if="checkAvailability('submitter')">{{ rec.submitter }}</td>
             <td v-if="checkAvailability('unit')">{{ rec.unitName }}</td>

diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
@@ -141,7 +141,7 @@
                       <input
                         type="text"
                         class="form-control w-100"
-                        :value="entity.createdDate | LOCAL_DATE_VALUE"
+                        :value="$filters.localDate(entity.createdDate)"
                         :disabled="true"
                       />
                     </div>
@@ -161,7 +161,7 @@
                       <input
                         type="text"
                         class="form-control w-100"
-                        :value="entity.modifiedDate | LOCAL_DATE_VALUE"
+                        :value="$filters.localDate(entity.modifiedDate )"
                         :disabled="true"
                       />
                     </div>
@@ -325,7 +325,7 @@
                       <input
                         type="text"
                         class="form-control w-100"
-                        :value="entity.createdDate | LOCAL_DATE_VALUE"
+                        :value="$filters.localDate(entity.createdDate)"
                         :disabled="true"
                       />
                     </div>
@@ -346,7 +346,7 @@
                       <input
                         type="text"
                         class="form-control w-100"
-                        :value="entity.modifiedDate | LOCAL_DATE_VALUE"
+                        :value="$filters.localDate(entity.modifiedDate )"
                         :disabled="true"
                       />
                     </div>
@@ -371,7 +371,7 @@
                         <input
                           type="text"
                           class="form-control w-100"
-                          :value="entity.createdDate | LOCAL_DATE_VALUE"
+                          :value="$filters.localDate(entity.createdDate)"
                           :disabled="true"
                         />
                       </div>
@@ -390,7 +390,7 @@
                         <input
                           type="text"
                           class="form-control w-100"
-                          :value="entity.modifiedDate | LOCAL_DATE_VALUE"
+                          :value="$filters.localDate(entity.modifiedDate )"
                           :disabled="true"
                         />
                       </div>
@@ -851,7 +851,7 @@
                       <div class="col-2">
                         <label>Date Created:</label>
                         <p class="mb-0">
-                          {{ elem.createdDate | LOCAL_DATE_VALUE }}
+                          {{ $filters.localDate(elem.createdDate ) }}
                         </p>
                       </div>
                       <div class="col-2">
@@ -865,7 +865,7 @@
                       <div class="col-2">
                         <label>Modified Date</label>
                         <p class="mb-0">
-                          {{ elem.modifiedDate | LOCAL_DATE_VALUE }}
+                          {{ $filters.localDate(elem.modifiedDate ) }}
                         </p>
                       </div>
                     </div>

diff --git a/src/components/entity/OutputFile.vue b/src/components/entity/OutputFile.vue
@@ -34,7 +34,7 @@
             <!-- -->
             <tr v-for="output in listOfOutputList" :key="output.id">
               <td>
-                <p>{{ new Date(output.dateCreated) | LOCAL_DATE_VALUE }}</p>
+                <p>{{ $filters.localDate(new Date(output.dateCreated)) }}</p>
               </td>
               <td>
                 {{ output.submitter }}

diff --git a/src/components/evaluation/GroundTruthModal.vue b/src/components/evaluation/GroundTruthModal.vue
@@ -46,7 +46,7 @@
                     <td>
                       {{ supplement.description }}
                     </td>
-                    <td>{{ supplement.createdDate | LOCAL_DATE_VALUE }}</td>
+                    <td>{{ $filters.localDate(supplement.createdDate) }}</td>
                     <td class="text-center slim-col-12">
                       <input
                         type="radio"

diff --git a/src/components/supplement/SupplementFile.vue b/src/components/supplement/SupplementFile.vue
@@ -239,7 +239,7 @@
               type="text"
               class="form-control"
               id="create_date"
-              :value="supplement.fileDetails.createdDate | LOCAL_DATE_VALUE"
+              :value="$filters.localDate(supplement.fileDetails.createdDate)"
               disabled
             />
           </div>
@@ -259,7 +259,7 @@
               type="text"
               class="form-control"
               id="modified_date"
-              :value="supplement.fileDetails.modifiedDate | LOCAL_DATE_VALUE"
+              :value="$filters.localDate(supplement.fileDetails.modifiedDate)"
               disabled
             />
           </div>

diff --git a/src/components/supplement/SupplementList.vue b/src/components/supplement/SupplementList.vue
@@ -84,7 +84,7 @@
                         </div>
                         <div class="col">
                           Modified Date: <br />{{
-                            elem.modifiedDate | LOCAL_DATE_VALUE
+                            $filters.localDate(elem.modifiedDate)
                           }}
                         </div>
                         <div class="col">

diff --git a/src/components/workflow/SelectFiles.vue b/src/components/workflow/SelectFiles.vue
@@ -375,7 +375,7 @@
                         >
                           <td>{{ res.outputLabel }}</td>
                           <td>
-                            {{ new Date(res.dateCreated) | LOCAL_DATE_VALUE }}
+                            {{ $filters.localDate(new Date(res.dateCreated)) }}
                           </td>
                           <td>{{ res.submitter }}</td>
                           <td>{{ res.workflowName }}</td>

diff --git a/src/components/workflow/WorkflowList.vue b/src/components/workflow/WorkflowList.vue
@@ -66,11 +66,11 @@
             <!-- <div class="col"> Creator: </div> -->
             <div class="col">
               Date Created:
-              <br />{{ workflow.createTime | LOCAL_DATE_VALUE }}
+              <br />{{ $filters.localDate(workflow.createTime) }}
             </div>
             <div class="col">
               Last Updated:
-              <br />{{ workflow.updateTime | LOCAL_DATE_VALUE }}
+              <br />{{ $filters.localDate(workflow.updateTime) }}
             </div>
             <!-- <div class="col"> Version: </div> -->
             <div class="col" v-if="workflow.tags && workflow.tags.length">