Merge branch 'master' into t#2474/add-name-columns

NationalSecurityAgency · Nov 27, 2023 · a5be9c6 · a5be9c6
2 parents e8864fd + 397c571
commit a5be9c6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/client-display/package.json b/client-display/package.json
@@ -27,7 +27,7 @@
     "@vue-a11y/announcer": "2.1.0",
     "animate.css": "4.1.1",
     "apexcharts": "3.29.0",
-    "axios": "0.23.0",
+    "axios": "1.6.0",
     "axios-auth-refresh": "3.2.1",
     "bootstrap": "4.5.3",
     "bootstrap-vue": "2.21.2",

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -28,7 +28,7 @@
     "@vue-a11y/announcer": "2.1.0",
     "animate.css": "4.1.1",
     "apexcharts": "3.27.2",
-    "axios": "0.27.2",
+    "axios": "1.6.0",
     "babel-polyfill": "6.26.0",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",

diff --git a/dashboard/src/components/expiration/ExpirationHistory.vue b/dashboard/src/components/expiration/ExpirationHistory.vue
@@ -53,6 +53,18 @@ limitations under the License.
           <template #head(expiredOn)="data">
             <span class="text-primary"><i class="fas fa-clock text-warning" aria-hidden="true"></i> {{ data.label }}</span>
           </template>
+          <template v-slot:cell(userIdForDisplay)="data">
+            {{ data.value }}
+
+            <b-button-group class="float-right">
+              <b-button :to="calculateClientDisplayRoute(data)"
+                        variant="outline-info" size="sm" class="text-secondary"
+                        v-b-tooltip.hover="'View User Details'"
+                        :aria-label="`View details for user ${data.label}`"
+                        data-cy="usersTable_viewDetailsBtn"><i class="fa fa-user-alt" aria-hidden="true"/><span class="sr-only">view user details</span>
+              </b-button>
+            </b-button-group>
+          </template>
           <template v-slot:cell(skillName)="data">
             <a :href="getUrl(data.item)">{{ data.value }}</a>
           </template>
@@ -180,6 +192,17 @@ limitations under the License.
       getUrl(item) {
         return `/administrator/projects/${encodeURIComponent(this.projectId)}/subjects/${encodeURIComponent(item.subjectId)}/skills/${encodeURIComponent(item.skillId)}/`;
       },
+      calculateClientDisplayRoute(props) {
+        const routeObj = {
+          name: 'ClientDisplayPreview',
+          params: {
+            projectId: this.$route.params.projectId,
+            userId: props.item.userId,
+          },
+        };
+
+        return routeObj;
+      },
     },
   };
 </script>