Merge pull request #66 from Comcast/testnet

fix: correct product ID range format and display in datatable
Comcast · Jan 24, 2025 · 4eddce4 · 4eddce4
2 parents b6f7576 + 168d496
commit 4eddce4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -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,

diff --git a/src/views/Accounts/Accounts.vue b/src/views/Accounts/Accounts.vue
@@ -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>
@@ -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.productIDs?.map(range => `${range.min}-${range.max}`).join('\n') }}
+                            </span>
+                        </template>
+                    </Column>                    
                     <Column field="account.approvals" header="Approvals">
                         <template #body="row">
                             <ol>

diff --git a/src/views/Accounts/ProposeNewAccount.vue b/src/views/Accounts/ProposeNewAccount.vue
@@ -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,