From 59dc2e9e12d21daea0f182e96e8af0e949099236 Mon Sep 17 00:00:00 2001
From: "Jain, Ankur" <Ankur_Jain@comcast.com>
Date: Tue, 28 Jan 2025 11:46:05 -0500
Subject: [PATCH] Fix Tab Labels

and also the display for product ids
---
 src/views/Accounts/Accounts.vue     | 18 ++++----
 src/views/Compliance/Compliance.vue |  6 +--
 src/views/PKI/PKI.vue               | 10 ++---
 src/views/Upgrades/Upgrades.vue     |  6 +--
 src/views/Validators/Validators.vue |  6 +--
 vue.config.js                       | 64 -----------------------------
 6 files changed, 23 insertions(+), 87 deletions(-)
 delete mode 100644 vue.config.js

diff --git a/src/views/Accounts/Accounts.vue b/src/views/Accounts/Accounts.vue
index e858989..29c33d1 100644
--- a/src/views/Accounts/Accounts.vue
+++ b/src/views/Accounts/Accounts.vue
@@ -82,7 +82,7 @@ export default {
     computed: {
         allProposedAccounts() {
             const pendingAccountsArray = this.$store.getters['zigbeealliance.distributedcomplianceledger.dclauth/getPendingAccountAll']();
-            // Add the hex value to the vendor ID to all the accounts
+            // Add the hex value to the vendor ID to the accounts
             pendingAccountsArray?.pendingAccount?.forEach((pendingAccount) => {
                 pendingAccount.account.vendorIDHex = this.addHexValueToVendorID(pendingAccount.account.vendorID);
             });
@@ -96,7 +96,7 @@ export default {
 
         allActiveAccounts() {
             const allAccountsArray = this.$store.getters['zigbeealliance.distributedcomplianceledger.dclauth/getAccountAll']();
-            // Add the hex value to the vendor ID to all the accounts
+            // Add the hex value to the vendor ID to the accounts
             allAccountsArray?.account?.forEach((account) => {
                 account.vendorIDHex = this.addHexValueToVendorID(account.vendorID);
             });
@@ -125,21 +125,21 @@ export default {
     },
 
     created: function () {
-        // Get all the accounts
+        // Get the accounts
         this.$store.dispatch('zigbeealliance.distributedcomplianceledger.dclauth/QueryAccountAll', {
             options: {
                 subscribe: true,
                 all: true
             }
         });
-        // Get all the pending accounts
+        // Get the pending accounts
         this.$store.dispatch('zigbeealliance.distributedcomplianceledger.dclauth/QueryPendingAccountAll', {
             options: {
                 subscribe: true,
                 all: true
             }
         });
-        // Get all the revoked accounts
+        // Get the revoked accounts
         this.$store.dispatch('zigbeealliance.distributedcomplianceledger.dclauth/QueryPendingAccountRevocationAll', {
             options: {
                 subscribe: true,
@@ -153,7 +153,7 @@ export default {
 <template>
     <div class="prime-vue-container">
         <TabView>
-            <TabPanel header="All Active Accounts">
+            <TabPanel header="Active Accounts">
                 <Button @click="showProposeNewAccountDialog" icon="pi pi-check" v-bind:class="{ 'p-disabled': !isSignedIn }" label="Propose-Account">Propose Account</Button>
                 <div class="mb-4"></div>
                 <DataTable :value="allActiveAccounts" :auto-layout="true" :paginator="true" :rows="10" :rowsPerPageOptions="[5, 10, 20, 50]" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
@@ -220,7 +220,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Proposed Accounts">
+            <TabPanel header="Proposed Accounts">
                 <DataTable :value="allProposedAccounts" :auto-layout="true" :paginator="true" :rows="10" :rowsPerPageOptions="[5, 10, 20, 50]" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
@@ -247,7 +247,7 @@ export default {
                     <Column field="productIDs" header="Product IDs">
                         <template #body="{ data }">
                             <span style="white-space: pre-line">
-                                {{ data.productIDs?.map(range => `${range.min}-${range.max}`).join('\n') }}
+                                {{ data.account.productIDs?.map(range => `${range.min}-${range.max}`).join('\n') }}
                             </span>
                         </template>
                     </Column>                    
@@ -281,7 +281,7 @@ export default {
                     </Column>
                 </DataTable>
             </TabPanel>
-            <TabPanel header="All Active Accounts - Pending Revocation">
+            <TabPanel header="Active Accounts - Pending Revocation">
                 <DataTable :value="allActiveRevocations" :auto-layout="true" :paginator="true" :rows="10" :rowsPerPageOptions="[5, 10, 20, 50]" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
diff --git a/src/views/Compliance/Compliance.vue b/src/views/Compliance/Compliance.vue
index 4824908..01e02d5 100644
--- a/src/views/Compliance/Compliance.vue
+++ b/src/views/Compliance/Compliance.vue
@@ -164,7 +164,7 @@ export default {
 <template>
     <div class="prime-vue-container">
         <TabView>
-            <TabPanel header="All Certified Models">
+            <TabPanel header="Certified Models">
                 <DataTable :value="allCertifiedModels" :auto-layout="true" :paginator="true" :rows="10" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
@@ -215,7 +215,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Revoked Models">
+            <TabPanel header="Revoked Models">
                 <!-- Disabled per request from CSA
                 <Button @click="showRevokeModelDialog" class="p-button-primary mb-4" v-bind:class="{ 'p-disabled': !isSignedIn }" label="Revoke Model" /> 
                 -->
@@ -244,7 +244,7 @@ export default {
                     </Column>
                 </DataTable>
             </TabPanel>
-            <TabPanel header="All Provisional Models">
+            <TabPanel header="Provisional Models">
                 
                 <!-- Disabled per request from CSA
                 <Button @click="showProvisionalModelDialog" class="p-button-primary mb-4" v-bind:class="{ 'p-disabled': !isSignedIn }" label="Provision Model" />
diff --git a/src/views/PKI/PKI.vue b/src/views/PKI/PKI.vue
index 3b83ea0..403929a 100644
--- a/src/views/PKI/PKI.vue
+++ b/src/views/PKI/PKI.vue
@@ -532,7 +532,7 @@ export default {
         <ConfirmDialog></ConfirmDialog>
         <Message :closable="false" v-if="error" severity="error">{{ errorMessage() }}</Message>
         <TabView :scrollable="true">
-            <TabPanel header="All Attestation Certificates">
+            <TabPanel header="Attestation Certificates">
                 <DataTable responsiveLayout="stack" :value="allApprovedRootCertificates" :auto-layout="true" :paginator="true" :rows="10"
                     v-model:filters="filters" v-model:expandedRows="expandedRows" filterDisplay="row" showGridlines :tableStyle="{ minWidth: '50rem' }"
                     stripedRows>
@@ -610,7 +610,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All NOC Certificates">
+            <TabPanel header="NOC Certificates">
                 <DataTable responsiveLayout="stack" :value="allNocRootCertificates" :auto-layout="true" :paginator="true" :rows="10"
                     v-model:filters="filters" v-model:expandedRows="expandedRows" filterDisplay="row" showGridlines :tableStyle="{ minWidth: '50rem' }"
                     stripedRows>
@@ -727,7 +727,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Proposed Attestation Certificates">
+            <TabPanel header="Proposed Attestation Certificates">
                 <DataTable :value="allProposedCertificates" :auto-layout="true" :paginator="true" :rows="10"
                     v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
@@ -790,7 +790,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Proposed Revoked Attestation Certificates">
+            <TabPanel header="Proposed Revoked Attestation Certificates">
                 <DataTable :value="allProposedCertificateRevocation" :auto-layout="true" :paginator="true" :rows="10"
                     v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
@@ -831,7 +831,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Revoked Attestation Certificates">
+            <TabPanel header="Revoked Attestation Certificates">
                 <DataTable :value="allRevokedCertificates" :auto-layout="true" :paginator="true" :rows="10"
                     v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
diff --git a/src/views/Upgrades/Upgrades.vue b/src/views/Upgrades/Upgrades.vue
index ac22530..e8745e9 100644
--- a/src/views/Upgrades/Upgrades.vue
+++ b/src/views/Upgrades/Upgrades.vue
@@ -133,7 +133,7 @@ export default {
 <template>
     <div class="prime-vue-container">
         <TabView>
-            <TabPanel header="All Approved Upgrades">
+            <TabPanel header="Approved Upgrades">
                 <Button @click="showProposeUpgradeDialog" icon="pi pi-check" v-bind:class="{ 'p-disabled': !isSignedIn }" label="Propose-Upgrade">Propose Upgrade</Button>
 
                 <div class="mb-4"></div>
@@ -183,7 +183,7 @@ export default {
                 </DataTable>
             </TabPanel>
 
-            <TabPanel header="All Proposed Upgrades">
+            <TabPanel header="Proposed Upgrades">
                 <DataTable :value="allProposedUpgrades" :auto-layout="true" :paginator="true" :rows="10" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
@@ -235,7 +235,7 @@ export default {
                     </Column>
                 </DataTable>
             </TabPanel>
-            <TabPanel header="All Rejected Upgrades">
+            <TabPanel header="Rejected Upgrades">
                 <DataTable :value="allRejectedUpgrades" :auto-layout="true" :paginator="true" :rows="10" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
diff --git a/src/views/Validators/Validators.vue b/src/views/Validators/Validators.vue
index 0733525..cede076 100644
--- a/src/views/Validators/Validators.vue
+++ b/src/views/Validators/Validators.vue
@@ -159,7 +159,7 @@ export default {
 <template>
     <div class="prime-vue-container ml-5">
         <TabView>
-            <TabPanel header="All Current Validators">
+            <TabPanel header="Current Validators">
                 <!-- <div class="mb-5 ml-2">
 					<Button
 						@click="showValidatorInfoDialog"
@@ -202,7 +202,7 @@ export default {
                     </Column>
                 </DataTable>
             </TabPanel>
-            <TabPanel header="All Jailed Validators">
+            <TabPanel header="Jailed Validators">
                 <DataTable :value="jailedValidators(allValidators)" :auto-layout="true" :paginator="true" :rows="10" :rowsPerPageOptions="[5, 10, 20, 50]" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
@@ -228,7 +228,7 @@ export default {
                     </Column>
                 </DataTable>
             </TabPanel>
-            <TabPanel header="All Proposed Disable Validators">
+            <TabPanel header="Proposed Disable Validators">
                 <DataTable :value="allProposedDisableValidators" :auto-layout="true" :paginator="true" :rows="10" :rowsPerPageOptions="[5, 10, 20, 50]" v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
                     <template #header>
                         <div class="flex justify-content-end">
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index 4c4492f..0000000
--- a/vue.config.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const fs = require('fs');
-const packageJson = fs.readFileSync('./package.json');
-const version = JSON.parse(packageJson).version || 0;
-
-module.exports = {
-  productionSourceMap: false,
-  devServer: {
-    disableHostCheck: true,
-    proxy: {
-      "/api": {
-        target: "http://localhost:26640",
-        pathRewrite: {
-          '^/api': '/'
-        }
-      },
-      '/rpc' : {
-        target: 'http://localhost:26657',
-        pathRewrite: {
-          '^/rpc': '/'
-        },
-        changeOrigin: true,
-        ws: true,
-      },
-      '/websocket' : {
-        target: 'http://localhost:26657',
-        changeOrigin: true,
-        ws: true,
-        upgrade: true,
-      }
-    },
-  },
-  configureWebpack: {
-    plugins: [
-      new webpack.DefinePlugin({
-        'process.env': {
-          PACKAGE_VERSION: '"' + version + '"'
-        }
-      })
-    ],
-    resolve: {
-      symlinks: false,
-      alias: {
-        vue$: path.resolve('./node_modules/vue/dist/vue.esm-bundler.js')
-      }
-    },
-    module: {
-      rules: [
-        {
-          test: /\.js$/,
-          exclude: /node_modules\/(?!(@starport|@cosmjs|cosmjs-types)\/).*/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: ['@babel/preset-env'],
-              plugins: ['@babel/plugin-proposal-numeric-separator', '@babel/plugin-proposal-optional-chaining']
-            }
-          }
-        }
-      ]
-    }
-  }
-}