Skip to content

Commit b6f7576

Browse files
ankur325ankur325
authored
Merge pull request #64 from Comcast/testnet
Merge Testnet into Main Branch
2 parents cf274b7 + 190f7f0 commit b6f7576

File tree

3 files changed

+46
-22
lines changed

3 files changed

+46
-22
lines changed

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/themes/application.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ justify-content-end {
1111
z-index: 9999; /* Adjust this value to be higher than the modal's z-index */
1212
max-width: 200px; /* Optional: Adjust max width of the tooltip */
1313
}
14+
15+
.p-dialog-mask {
16+
z-index: 1101 !important;
17+
}

‎src/views/PKI/PKI.vue

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -503,36 +503,36 @@ export default {
503503
<Button @click="showCertificateDialog('propose-root')"
504504
:disabled="!isSignedIn"
505505
icon="pi pi-plus-circle"
506-
label="Propose Root Cert"
506+
label="Propose Attestation Root CA"
507507
class="mr-3 p-button-primary"
508-
v-tooltip.top="'Propose a new root certificate'"
508+
v-tooltip.top="'Propose a new Attestation Root CA'"
509509
/>
510510
<Button @click="showCertificateDialog('add-leaf')"
511511
:disabled="!isSignedIn"
512512
icon="pi pi-file"
513-
label="Add Leaf Cert"
513+
label="Add Attestation Leaf Certificate"
514514
class="mr-3 p-button-primary"
515-
v-tooltip.top="'Add a new leaf certificate'"
515+
v-tooltip.top="'Add a New Attestation Leaf Certificate'"
516516
/>
517517
<Button @click="showCertificateDialog('add-noc-root')"
518518
:disabled="!isSignedIn"
519519
icon="pi pi-sitemap"
520-
label="Add NOC Root Cert"
520+
label="Add NOC Root CA (RCAC)"
521521
class="mr-3 p-button-primary"
522-
v-tooltip.top="'Add a new NOC root certificate'"
522+
v-tooltip.top="'Add a new NOC Root CA (RCAC)'"
523523
/>
524524
<Button @click="showCertificateDialog('add-noc-ica')"
525525
:disabled="!isSignedIn"
526526
icon="pi pi-server"
527-
label="Add NOC ICA Cert"
527+
label="Add NOC Intermediate CA (ICAC)"
528528
class="p-button-primary"
529-
v-tooltip.top="'Add a new NOC ICA certificate'"
529+
v-tooltip.top="'Add a new NOC Intermediate CA (ICAC)'"
530530
/>
531531
</div>
532532
<ConfirmDialog></ConfirmDialog>
533533
<Message :closable="false" v-if="error" severity="error">{{ errorMessage() }}</Message>
534-
<TabView>
535-
<TabPanel header="All Approved Certificates">
534+
<TabView :scrollable="true">
535+
<TabPanel header="All Attestation Certificates">
536536
<DataTable responsiveLayout="stack" :value="allApprovedRootCertificates" :auto-layout="true" :paginator="true" :rows="10"
537537
v-model:filters="filters" v-model:expandedRows="expandedRows" filterDisplay="row" showGridlines :tableStyle="{ minWidth: '50rem' }"
538538
stripedRows>
@@ -551,7 +551,11 @@ export default {
551551
<Column field="vid" header="Vendor ID" :sortable="true" />
552552
<Column field="certificateType" header="Certificate Type" :sortable="true" />
553553
<Column field="subjectAsText" header="Subject" :sortable="true" />
554-
<Column field="subjectKeyId" header="Subject Key ID"></Column>
554+
<Column field="subjectKeyId" header="Subject Key ID">
555+
<template #body="slotProps">
556+
<span style="word-break: break-all;">{{slotProps.data.subjectKeyId}}</span>
557+
</template>
558+
</Column>
555559
<Column field="approvals" header="Approvals">
556560
<template #body="row">
557561
<ol>
@@ -606,7 +610,7 @@ export default {
606610
</DataTable>
607611
</TabPanel>
608612
609-
<TabPanel header="All Noc Certificates">
613+
<TabPanel header="All NOC Certificates">
610614
<DataTable responsiveLayout="stack" :value="allNocRootCertificates" :auto-layout="true" :paginator="true" :rows="10"
611615
v-model:filters="filters" v-model:expandedRows="expandedRows" filterDisplay="row" showGridlines :tableStyle="{ minWidth: '50rem' }"
612616
stripedRows>
@@ -625,7 +629,11 @@ export default {
625629
<Column field="vid" header="Vendor ID" :sortable="true" />
626630
<Column field="certificateType" header="Certificate Type" :sortable="true" />
627631
<Column field="subjectAsText" header="Subject" :sortable="true" />
628-
<Column field="subjectKeyId" header="Subject Key ID"></Column>
632+
<Column field="subjectKeyId" header="Subject Key ID">
633+
<template #body="slotProps">
634+
<span style="word-break: break-all;">{{slotProps.data.subjectKeyId}}</span>
635+
</template>
636+
</Column>
629637
<Column field="approvals" header="Approvals">
630638
<template #body="row">
631639
<ol>
@@ -719,7 +727,7 @@ export default {
719727
</DataTable>
720728
</TabPanel>
721729
722-
<TabPanel header="All Proposed Certificates">
730+
<TabPanel header="All Proposed Attestation Certificates">
723731
<DataTable :value="allProposedCertificates" :auto-layout="true" :paginator="true" :rows="10"
724732
v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
725733
<template #header>
@@ -735,7 +743,11 @@ export default {
735743
736744
<Column field="subjectAsText" header="Subject" :sortable="true"></Column>
737745
738-
<Column field="subjectKeyId" header="Subject Key ID" :sortable="true"></Column>
746+
<Column field="subjectKeyId" header="Subject Key ID">
747+
<template #body="slotProps">
748+
<span style="word-break: break-all;">{{slotProps.data.subjectKeyId}}</span>
749+
</template>
750+
</Column>
739751
<Column field="approvals" header="Approvals">
740752
<template #body="row">
741753
<ol>
@@ -778,7 +790,7 @@ export default {
778790
</DataTable>
779791
</TabPanel>
780792
781-
<TabPanel header="All Proposed Revoked Certificates">
793+
<TabPanel header="All Proposed Revoked Attestation Certificates">
782794
<DataTable :value="allProposedCertificateRevocation" :auto-layout="true" :paginator="true" :rows="10"
783795
v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
784796
<template #header>
@@ -792,7 +804,11 @@ export default {
792804
</div>
793805
</template>
794806
<Column field="subjectAsText" header="Subject" :sortable="true" />
795-
<Column field="subjectKeyId" header="Subject Key ID" :sortable="true"></Column>
807+
<Column field="subjectKeyId" header="Subject Key ID">
808+
<template #body="slotProps">
809+
<span style="word-break: break-all;">{{slotProps.data.subjectKeyId}}</span>
810+
</template>
811+
</Column>
796812
<Column field="approvals" header="Revokes">
797813
<template #body="row">
798814
<ol>
@@ -815,7 +831,7 @@ export default {
815831
</DataTable>
816832
</TabPanel>
817833
818-
<TabPanel header="All Revoked Certificates">
834+
<TabPanel header="All Revoked Attestation Certificates">
819835
<DataTable :value="allRevokedCertificates" :auto-layout="true" :paginator="true" :rows="10"
820836
v-model:filters="filters" filterDisplay="row" showGridlines stripedRows>
821837
<template #header>
@@ -829,7 +845,11 @@ export default {
829845
</div>
830846
</template>
831847
<Column class="subject" field="subjectAsText" header="Subject" :sortable="true"></Column>
832-
<Column field="subjectKeyId" header="Subject Key ID" :sortable="true"></Column>
848+
<Column field="subjectKeyId" header="Subject Key ID">
849+
<template #body="slotProps">
850+
<span style="word-break: break-all;">{{slotProps.data.subjectKeyId}}</span>
851+
</template>
852+
</Column>
833853
<Column field="approvals" header="Revokes">
834854
<template #body="row">
835855
<ol>

0 commit comments

Comments
 (0)