Skip to content

Commit 30317a7

Browse files
committed
chore(ui): update data examples, rm roles
1 parent 7b85722 commit 30317a7

File tree

6 files changed

+22
-124
lines changed

6 files changed

+22
-124
lines changed

src/app/Trust/Certificates/CertificatesPage.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,6 @@ const CertificatesPage = ({ certificates, columns }: ICertificatesPageProps) =>
327327
<Td dataLabel={columns[6]} isActionCell>
328328
<ActionsColumn
329329
items={[
330-
{
331-
title: 'View Details',
332-
onClick: () => {
333-
console.log('View Details button clicked');
334-
},
335-
},
336330
{
337331
title: 'Copy Fingerprint',
338332
onClick: () => {

src/app/Trust/Overview/TrustOverview.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,6 @@ const TrustOverview = () => {
168168
A new <a href="#">signing certificate</a> was detected or added.
169169
</DescriptionListDescription>
170170
</DescriptionListGroup>
171-
<DescriptionListGroup>
172-
<DescriptionListTerm icon={<PencilAltIcon />}>Signature verification</DescriptionListTerm>
173-
<DescriptionListDescription>Metadata or targets with invalid signatures</DescriptionListDescription>
174-
</DescriptionListGroup>
175171
</DescriptionList>
176172
</Content>
177173
</CardBody>

src/app/Trust/TrustRoots/TrustRoots.data.tsx

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export const exampleTrustRoot = {
3636
name: 'Sigstore Default Trust Root',
3737
source: 'https://tuf-repo.sigstore.dev/',
3838
lastUpdated: '2025-06-09T08:43:00Z',
39-
policyUrl: 'https://tuf-repo.sigstore.dev/trust-policy.yaml',
4039
type: 'tuf', // could later support other types
4140

4241
certificates: [
@@ -54,38 +53,38 @@ export const exampleTrustRoot = {
5453
status: 'valid',
5554
fingerprint: '11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33:44',
5655
},
57-
{
58-
subject: 'CN=TUF Root Signer',
59-
issuer: 'Self-signed',
60-
type: 'TUF',
61-
role: 'root',
62-
status: 'valid',
63-
version: 5,
64-
fingerprint: 'AA:AA:AA:AA:BB:BB:BB:BB:CC:CC:CC:CC:DD:DD:DD:DD:EE:EE:EE:EE',
65-
},
56+
// {
57+
// subject: 'CN=TUF Root Signer',
58+
// issuer: 'Self-signed',
59+
// type: 'TUF',
60+
// role: 'root',
61+
// status: 'valid',
62+
// version: 5,
63+
// fingerprint: 'AA:AA:AA:AA:BB:BB:BB:BB:CC:CC:CC:CC:DD:DD:DD:DD:EE:EE:EE:EE',
64+
// },
6665
],
6766

6867
tufMetadata: [
6968
{
70-
role: 'root',
69+
// role: 'root',
7170
version: 5,
7271
expires: '2025-12-01T00:00:00Z',
7372
status: 'valid',
7473
},
7574
{
76-
role: 'targets',
75+
// role: 'targets',
7776
version: 3,
7877
expires: '2025-08-15T00:00:00Z',
7978
status: 'valid',
8079
},
8180
{
82-
role: 'snapshot',
81+
// role: 'snapshot',
8382
version: 3,
8483
expires: '2025-06-20T00:00:00Z',
8584
status: 'expiring',
8685
},
8786
{
88-
role: 'timestamp',
87+
// role: 'timestamp',
8988
version: 12,
9089
expires: '2025-06-10T08:00:00Z',
9190
status: 'expiring',

src/app/Trust/TrustRoots/components/TrustRootsDataList.tsx

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,16 @@ import {
2121
Flex,
2222
FlexItem,
2323
Icon,
24-
Label,
2524
MenuToggle,
2625
MenuToggleElement,
27-
Progress,
28-
ProgressSize,
2926
} from '@patternfly/react-core';
3027
// import { rows } from '../TrustRoots.data';
3128

3229
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
3330
import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
3431
import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
35-
import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
36-
import PendingIcon from '@patternfly/react-icons/dist/esm/icons/pending-icon';
3732
import TimesCircleIcon from '@patternfly/react-icons/dist/esm/icons/times-circle-icon';
38-
import {
39-
MinusIcon,
40-
CalendarAltIcon,
41-
ClockIcon,
42-
FileAltIcon,
43-
RunningIcon,
44-
EllipsisVIcon,
45-
} from '@patternfly/react-icons';
33+
import { MinusIcon, CalendarAltIcon, FileAltIcon, EllipsisVIcon } from '@patternfly/react-icons';
4634
import { TrustRootsDrawerContent } from './TrustRootsDrawerContent';
4735
import { exampleTrustRoot } from '../TrustRoots.data';
4836

@@ -51,10 +39,9 @@ const TrustRootsDataList = () => {
5139
const [isDrawerExpanded, setIsDrawerExpanded] = useState(false);
5240
const drawerRef = useRef<HTMLDivElement>(undefined);
5341

54-
const getRow = (id: string, lastStatus: 'success' | 'error' | null, isRunning: boolean, isDisabled: boolean) => {
42+
const getRow = (id: string, lastStatus: 'success' | 'error' | null, isRunning: boolean) => {
5543
let mainIcon;
5644
let lastStatusComponent;
57-
let currentStatus;
5845

5946
if (lastStatus === 'success') {
6047
mainIcon = (
@@ -86,13 +73,6 @@ const TrustRootsDataList = () => {
8673
</FlexItem>
8774
</Flex>
8875
</FlexItem>
89-
<FlexItem>
90-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
91-
<FlexItem>
92-
<ClockIcon /> 5 minutes
93-
</FlexItem>
94-
</Flex>
95-
</FlexItem>
9676
<FlexItem>
9777
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
9878
<FlexItem>
@@ -104,29 +84,6 @@ const TrustRootsDataList = () => {
10484
);
10585
}
10686

107-
if (isRunning) {
108-
mainIcon = (
109-
<Icon size="xl" status="info">
110-
<InProgressIcon />
111-
</Icon>
112-
);
113-
}
114-
if (isRunning) {
115-
currentStatus = <Progress title="Time remaining: 2 hours" value={33} size={ProgressSize.sm} />;
116-
} else {
117-
currentStatus = (
118-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
119-
<FlexItem>
120-
<PendingIcon /> Scheduled
121-
</FlexItem>
122-
</Flex>
123-
);
124-
}
125-
126-
if (isDisabled) {
127-
currentStatus = <Label color="orange">Disabled</Label>;
128-
}
129-
13087
return (
13188
<DataListItem id={id} aria-labelledby="Demo-item1">
13289
<DataListItemRow>
@@ -169,14 +126,6 @@ const TrustRootsDataList = () => {
169126
<DataListCell key="status" alignRight>
170127
{lastStatusComponent}
171128
</DataListCell>,
172-
<DataListCell key="progress" alignRight>
173-
<Flex direction={{ default: 'column' }}>
174-
<FlexItem>
175-
<RunningIcon /> Every 5 hours
176-
</FlexItem>
177-
<FlexItem>{currentStatus}</FlexItem>
178-
</Flex>
179-
</DataListCell>,
180129
]}
181130
/>
182131
{action}
@@ -204,8 +153,7 @@ const TrustRootsDataList = () => {
204153
onOpenChange={() => {}}
205154
>
206155
<DropdownList>
207-
<DropdownItem>Action1</DropdownItem>
208-
<DropdownItem>Action2</DropdownItem>
156+
<DropdownItem>Refresh</DropdownItem>
209157
</DropdownList>
210158
</Dropdown>
211159
</DataListAction>
@@ -255,11 +203,11 @@ const TrustRootsDataList = () => {
255203
setIsDrawerExpanded(true);
256204
}}
257205
>
258-
{getRow('row-1', null, false, false)}
259-
{getRow('row-2', null, true, false)}
260-
{getRow('row-3', 'success', false, false)}
261-
{getRow('row-4', 'error', false, false)}
262-
{getRow('row-5', null, false, true)}
206+
{getRow('row-1', null, false)}
207+
{getRow('row-2', null, true)}
208+
{getRow('row-3', 'success', false)}
209+
{getRow('row-4', 'error', false)}
210+
{getRow('row-5', null, false)}
263211
</DataList>
264212
</DrawerContentBody>
265213
</DrawerContent>

src/app/Trust/TrustRoots/components/TrustRootsDrawerContent.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const TrustRootsDrawerContent = () => {
3131
<Table variant="compact">
3232
<Thead>
3333
<Tr>
34-
<Th>Role</Th>
3534
<Th>Version</Th>
3635
<Th>Expires</Th>
3736
<Th>Status</Th>
@@ -40,7 +39,6 @@ const TrustRootsDrawerContent = () => {
4039
<Tbody>
4140
{exampleTrustRoot.tufMetadata.map((metadata, idx) => (
4241
<Tr key={idx}>
43-
<Td>{capitalizeFirstLetter(metadata.role)}</Td>
4442
<Td>{metadata.version}</Td>
4543
<Td>{formatDate(metadata.expires)}</Td>
4644
<Td>
@@ -73,7 +71,6 @@ const TrustRootsDrawerContent = () => {
7371
<Th>Subject</Th>
7472
<Th>Issuer</Th>
7573
<Th>Type</Th>
76-
<Th>Role</Th>
7774
<Th>Status</Th>
7875
</Tr>
7976
</Thead>
@@ -83,7 +80,6 @@ const TrustRootsDrawerContent = () => {
8380
<Td>{cert.subject}</Td>
8481
<Td>{cert.issuer}</Td>
8582
<Td>{cert.type}</Td>
86-
<Td>{cert.role ? capitalizeFirstLetter(cert.role) : null}</Td>
8783
<Td>
8884
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
8985
<FlexItem>
@@ -127,14 +123,6 @@ const TrustRootsDrawerContent = () => {
127123
<a href="#">{exampleTrustRoot.source}</a>
128124
</DescriptionListDescription>
129125
</DescriptionListGroup>
130-
<DescriptionListGroup>
131-
<DescriptionListTermHelpText>
132-
<Popover headerContent={<div>Policy URL</div>} bodyContent={<div>Additional info</div>}>
133-
<DescriptionListTermHelpTextButton> Policy URL </DescriptionListTermHelpTextButton>
134-
</Popover>
135-
</DescriptionListTermHelpText>
136-
<DescriptionListDescription>{exampleTrustRoot.policyUrl}</DescriptionListDescription>
137-
</DescriptionListGroup>
138126
<DescriptionListGroup>
139127
<DescriptionListTermHelpText>
140128
<Popover headerContent={<div>Last Updated</div>} bodyContent={<div>Additional info</div>}>

stories/Trust/Certificates.stories.tsx

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,6 @@ MIIBszCCAVugAwIBAgIUWY1QrUe7GpU4... (truncated)
3232
type: 'Fulcio',
3333
status: 'valid',
3434
},
35-
{
36-
subject: 'CN=TUF Root Signing Key,O=Trusted Foundations',
37-
pem: `-----BEGIN CERTIFICATE-----
38-
MIICkzCCAfugAwIBAgIUQw9X3lNwJzZL... (truncated)
39-
-----END CERTIFICATE-----`,
40-
issuer: 'Self-signed',
41-
validFrom: '2022-07-01T00:00:00Z',
42-
validTo: '2032-07-01T00:00:00Z',
43-
fingerprint: 'AB:CD:EF:12:34:56:78:90:00:00:11:22:33:44:55:66:77:88:99:AA',
44-
type: 'TUF',
45-
role: 'root',
46-
version: 4,
47-
status: 'valid',
48-
},
4935
{
5036
subject: 'CN=Test Cert Expiring Soon,O=Example Org',
5137
issuer: 'CN=Example CA',
@@ -76,19 +62,6 @@ MIIDeTCCAmGgAwIBAgIUEj0+4xFe7r... (truncated)
7662
type: 'Fulcio',
7763
status: 'valid',
7864
},
79-
{
80-
name: 'TUF Root v5',
81-
subject: 'CN=TUF Root Signing Key,O=RHTAS',
82-
issuer: 'Self-signed',
83-
validFrom: '2023-01-01T00:00:00Z',
84-
validTo: '2026-01-01T00:00:00Z',
85-
fingerprint: '12:34:56:78:9A:BC:DE:F0:12:34:56:78:9A:BC:DE:F0:12:34:56:78',
86-
pem: '-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----',
87-
type: 'TUF',
88-
role: 'root',
89-
version: 5,
90-
status: 'valid',
91-
},
9265
{
9366
name: 'Fulcio Production CA',
9467
subject: 'CN=Fulcio Root CA,O=Sigstore',
@@ -100,6 +73,6 @@ MIIDeTCCAmGgAwIBAgIUEj0+4xFe7r... (truncated)
10073
status: 'valid',
10174
},
10275
],
103-
columns: ['Subject', 'Issuer', 'Type', 'Role', 'Status', 'Version'],
76+
columns: ['Subject', 'Issuer', 'Type', 'Status', 'Version'],
10477
},
10578
};

0 commit comments

Comments
 (0)