Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testnet #67

Closed
wants to merge 5 commits into from
Closed

Testnet #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fe2a26
Merge pull request #58 from Comcast/testnet
ankur325 Jan 16, 2025
cf274b7
Merge pull request #61 from Comcast/testnet
ankur325 Jan 17, 2025
b6f7576
Merge pull request #64 from Comcast/testnet
ankur325 Jan 23, 2025
3a93bfe
Merge branch 'main' into testnet
ankur325 Jan 24, 2025
59dc2e9
Fix Tab Labels
ankur325 Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dcl-ui",
"version": "1.14.2",
"version": "1.14.3",
"description": "A Vuejs based application for managing CSA Distributed Compliance Ledger",
"author": "Comcast Inc.",
"private": true,
Expand Down
30 changes: 22 additions & 8 deletions src/views/Accounts/Accounts.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand All @@ -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);
});
Expand Down Expand Up @@ -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,
Expand All @@ -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>
Expand Down Expand Up @@ -194,6 +194,13 @@ export default {
</template>
</Column> -->
<Column field="vendorIDHex" header="Vendor ID" :sortable="true"></Column>
<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') }}
</span>
</template>
</Column>
<Column field="approvals" header="Approvals">
<template #body="row">
<ol>
Expand All @@ -213,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">
Expand All @@ -237,6 +244,13 @@ export default {
</Column>
<Column field="account.base_account.address" header="Address"></Column>
<Column field="account.vendorIDHex" header="Vendor ID"></Column>
<Column field="productIDs" header="Product IDs">
<template #body="{ data }">
<span style="white-space: pre-line">
{{ data.account.productIDs?.map(range => `${range.min}-${range.max}`).join('\n') }}
</span>
</template>
</Column>
<Column field="account.approvals" header="Approvals">
<template #body="row">
<ol>
Expand Down Expand Up @@ -267,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">
Expand Down
5 changes: 4 additions & 1 deletion src/views/Accounts/ProposeNewAccount.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ export default {
value: {
signer: creatorAddress,
vendorID: this.vendorID,
productIDS: this.productIDs,
productIDs: this.productIDs ? this.productIDs.split(',').map(range => {
const [min, max] = range.trim().split('-').map(Number);
return { min, max };
}) : [],
address: this.address,
pubKey: encodedBasePubkey,
roles: this.selectedRoles,
Expand Down
6 changes: 3 additions & 3 deletions src/views/Compliance/Compliance.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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" />
-->
Expand Down Expand Up @@ -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" />
Expand Down
10 changes: 5 additions & 5 deletions src/views/PKI/PKI.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/views/Upgrades/Upgrades.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions src/views/Validators/Validators.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand Down
64 changes: 0 additions & 64 deletions vue.config.js
View file
Open in desktop

This file was deleted.