Merge branch 'develop-7.x' into XRDDEV-1711

nordic-institute · Sep 21, 2021 · 3903afa · 3903afa
2 parents e4e5d90 + 6d27dd3
commit 3903afa
Show file tree

Hide file tree

Showing 21 changed files with 372 additions and 584 deletions.
diff --git a/src/centralserver/admin-ui/package-lock.json b/src/centralserver/admin-ui/package-lock.json
diff --git a/src/centralserver/admin-ui/src/components/managementRequests/IconSvg.vue b/src/centralserver/admin-ui/src/components/managementRequests/IconSvg.vue
diff --git a/src/centralserver/admin-ui/src/components/managementRequests/TypeCell.vue b/src/centralserver/admin-ui/src/components/managementRequests/TypeCell.vue
@@ -28,7 +28,14 @@
     <v-tooltip top>
       <template #activator="{ on, attrs }">
         <div v-bind="attrs" v-on="on">
-          <icon-svg v-bind="attrs" :icon-name="status" v-on="on"></icon-svg>
+          <xrd-icon-base v-bind="attrs" v-on="on">
+            <!-- Decide what icon to show -->
+            <XrdIconChangeOwner v-if="status === 'change_owner'" />
+            <XrdIconAddUser v-if="status === 'register_client'" />
+            <XrdIconRemoveUser v-if="status === 'delete_client'" />
+            <XrdIconRemoveCertificate v-if="status === 'delete_certificate'" />
+            <XrdIconAddCertificate v-if="status === 'register_certificate'" />
+          </xrd-icon-base>
         </div>
       </template>
       <span>{{ getStatusText() }}</span>
@@ -38,41 +45,14 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import IconSvg from './IconSvg.vue';
 
 export default Vue.extend({
-  components: {
-    IconSvg,
-  },
   props: {
     status: {
       type: String,
       default: undefined,
     },
   },
-
-  computed: {
-    iconName(): string {
-      if (!this.status) {
-        return '';
-      }
-      switch (this.status) {
-        case 'change_owner':
-          return 'icon-ChangeOwner';
-        case 'delete_certificate':
-          return 'icon-RemoveCertificate';
-        case 'delete_client':
-          return 'icon-RemoveUser';
-        case 'register_certificate':
-          return 'icon-AddCertificate';
-        case 'register_client':
-          return 'icon-AddUser';
-        default:
-          return 'error';
-      }
-    },
-  },
-
   methods: {
     getStatusText() {
       if (!this.status) {
@@ -105,14 +85,4 @@ export default Vue.extend({
   flex-direction: row;
   align-items: center;
 }
-
-.status-text {
-  font-style: normal;
-  font-weight: bold;
-  font-size: 12px;
-  line-height: 16px;
-  color: $XRoad-WarmGrey100;
-  margin-left: 2px;
-  text-transform: uppercase;
-}
 </style>
diff --git a/src/centralserver/admin-ui/src/components/ui/ContextualAlerts.vue b/src/centralserver/admin-ui/src/components/ui/ContextualAlerts.vue
@@ -143,7 +143,7 @@
             <v-btn
               icon
               color="primary"
-              data-test="close-snackbar"
+              data-test="close-alert"
               @click="closeError(notification.timeAdded)"
             >
               <xrd-icon-base><XrdIconClose /></xrd-icon-base>

diff --git a/src/centralserver/admin-ui/src/components/ui/Snackbar.vue b/src/centralserver/admin-ui/src/components/ui/Snackbar.vue
@@ -58,7 +58,7 @@
             data-test="close-snackbar"
             @click="closeSuccess(notification.timeAdded)"
           >
-            <v-icon dark>icon-Close</v-icon>
+            <xrd-icon-base><XrdIconClose /> </xrd-icon-base>
           </v-btn>
         </div>
       </v-snackbar>

diff --git a/src/centralserver/admin-ui/src/views/Members/Member/Subsystems/MemberSubsystems.vue b/src/centralserver/admin-ui/src/views/Members/Member/Subsystems/MemberSubsystems.vue
@@ -41,7 +41,8 @@
           <tr>
             <th>
               {{ $t('members.member.subsystems.subsystemcode') }}
-              <v-icon class="mb-1">icon-Sorting-arrow</v-icon>
+
+              <xrd-icon-base><XrdIconSortingArrow /> </xrd-icon-base>
             </th>
             <th>{{ $t('members.member.subsystems.servercode') }}</th>
             <th>{{ $t('members.member.subsystems.serverOwner') }}</th>
@@ -55,9 +56,10 @@
             <td class="xrd-clickable">NIIS-SS1</td>
             <td></td>
             <td class="status">
-              <v-icon :small="true" :color="colors.Success100"
-                >icon-Checked</v-icon
-              >
+              <xrd-icon-base
+                ><XrdIconChecked :color="colors.Success100" />
+              </xrd-icon-base>
+
               Registered
             </td>
             <td class="subsystem-actions">
@@ -68,7 +70,9 @@
             <td>RR</td>
             <td></td>
             <td></td>
-            <td class="status"><v-icon>icon-Error</v-icon> Unregistered</td>
+            <td class="status">
+              <xrd-icon-base><XrdIconError /> </xrd-icon-base> Unregistered
+            </td>
             <td class="subsystem-actions">
               <span class="xrd-clickable">Register</span>
               <span class="xrd-clickable">Delete</span>
@@ -79,9 +83,9 @@
             <td class="xrd-clickable">NIIS-SS1</td>
             <td class="xrd-clickable">NIIS</td>
             <td class="status">
-              <v-icon :small="true" :color="colors.Success100"
-                >icon-Checked</v-icon
-              >
+              <xrd-icon-base
+                ><XrdIconChecked :color="colors.Success100" />
+              </xrd-icon-base>
               Registered
             </td>
             <td class="subsystem-actions">
@@ -92,9 +96,9 @@
             <td class="xrd-clickable">NIIS-FUTU</td>
             <td class="xrd-clickable">FUTU</td>
             <td class="status">
-              <v-icon :small="true" :color="colors.Success100"
-                >icon-In-progress</v-icon
-              >
+              <xrd-icon-base
+                ><XrdIconInProgress :color="colors.Success100" />
+              </xrd-icon-base>
               Pending approval
             </td>
             <td class="subsystem-actions">