Skip to content

Commit 3f27988

Browse files
abhinandan13janabhinandan13jan
committed
rebase and clear merge conflicts
1 parent 3c24bf4 commit 3f27988

File tree

12 files changed

+551
-559
lines changed

12 files changed

+551
-559
lines changed

‎src/app/Trust/TrustRoots/components/DrawerContents/TrustRootCertificateTab.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/DrawerContents/TrustRootCertificateTab.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import * as React from 'react';
2-
import { Flex, FlexItem, Icon, Pagination } from '@patternfly/react-core';
3-
import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
4-
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
5-
import { capitalizeFirstLetter } from '@app/utils/utils';
6-
import { ExclamationTriangleIcon } from '@patternfly/react-icons';
7-
import { TrustRootKind } from '../../data/TrustRoots.data';
8-
import TrustRootNotFound from '../TrustRootNotFound';
1+
import * as React from "react";
2+
import { Flex, FlexItem, Icon, Pagination } from "@patternfly/react-core";
3+
import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
4+
import CheckCircleIcon from "@patternfly/react-icons/dist/esm/icons/check-circle-icon";
5+
import { capitalizeFirstLetter } from "@app/utils/utils";
6+
import { ExclamationTriangleIcon } from "@patternfly/react-icons";
7+
import { type TrustRootKind } from "../../data/TrustRoots.data";
8+
import TrustRootNotFound from "../TrustRootNotFound";
99

10-
export type TrustRootCertificateTabProps = {
10+
export interface TrustRootCertificateTabProps {
1111
trustRoot?: TrustRootKind;
12-
};
12+
}
1313

1414
const TrustRootCertificateTab: React.FC<TrustRootCertificateTabProps> = ({ trustRoot }) => {
1515
return trustRoot ? (
@@ -31,17 +31,17 @@ const TrustRootCertificateTab: React.FC<TrustRootCertificateTabProps> = ({ trust
3131
<Td>{cert.issuer}</Td>
3232
<Td>{cert.type}</Td>
3333
<Td>
34-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
34+
<Flex spaceItems={{ default: "spaceItemsSm" }}>
3535
<FlexItem>
36-
{cert.status === 'valid' ? (
36+
{cert.status === "valid" ? (
3737
<Icon status="success">
3838
<CheckCircleIcon />
3939
</Icon>
4040
) : (
4141
<Icon status="warning">
4242
<ExclamationTriangleIcon />
4343
</Icon>
44-
)}{' '}
44+
)}{" "}
4545
{capitalizeFirstLetter(cert.status)}
4646
</FlexItem>
4747
</Flex>

‎src/app/Trust/TrustRoots/components/DrawerContents/TrustRootInfoTab.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/DrawerContents/TrustRootInfoTab.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import {
77
DescriptionListTermHelpTextButton,
88
PageSection,
99
Popover,
10-
} from '@patternfly/react-core';
10+
} from "@patternfly/react-core";
1111

12-
import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
13-
import { TrustRootKind } from '../../data/TrustRoots.data';
14-
import { formatDate } from '@app/utils/utils';
15-
import TrustRootNotFound from '../TrustRootNotFound';
12+
import PlusCircleIcon from "@patternfly/react-icons/dist/esm/icons/plus-circle-icon";
13+
import { formatDate } from "@app/utils/utils";
14+
import TrustRootNotFound from "../TrustRootNotFound";
15+
import type { TrustRootKind } from "../../data/TrustRoots.data";
1616

17-
type TrustRootInfoTabProps = {
17+
interface TrustRootInfoTabProps {
1818
trustRoot?: TrustRootKind;
19-
};
19+
}
2020

2121
const TrustRootInfoTab: React.FC<TrustRootInfoTabProps> = ({ trustRoot }) => {
2222
return trustRoot ? (

‎src/app/Trust/TrustRoots/components/DrawerContents/TrustRootMetadataTab.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/DrawerContents/TrustRootMetadataTab.tsx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import * as React from 'react';
2-
import { Button, Card, CardBody, CardFooter, CardTitle, Content, Flex, FlexItem, Icon } from '@patternfly/react-core';
3-
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
4-
import { capitalizeFirstLetter, formatDate } from '@app/utils/utils';
5-
import { ExclamationTriangleIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
6-
import { TrustRootKind } from '../../data/TrustRoots.data';
7-
import TrustRootNotFound from '../TrustRootNotFound';
1+
import * as React from "react";
2+
import { Button, Card, CardBody, CardFooter, CardTitle, Content, Flex, FlexItem, Icon } from "@patternfly/react-core";
3+
import CheckCircleIcon from "@patternfly/react-icons/dist/esm/icons/check-circle-icon";
4+
import { capitalizeFirstLetter, formatDate } from "@app/utils/utils";
5+
import { ExclamationTriangleIcon, ExternalLinkAltIcon } from "@patternfly/react-icons";
6+
import { type TrustRootKind } from "../../data/TrustRoots.data";
7+
import TrustRootNotFound from "../TrustRootNotFound";
88

9-
export type TrustRootMetadataTabProps = {
9+
export interface TrustRootMetadataTabProps {
1010
trustRoot?: TrustRootKind;
11-
};
11+
}
1212

1313
const TrustRootMetadataTab: React.FC<TrustRootMetadataTabProps> = ({ trustRoot }) => {
1414
if (!trustRoot) {
@@ -22,31 +22,31 @@ const TrustRootMetadataTab: React.FC<TrustRootMetadataTabProps> = ({ trustRoot }
2222
<Content component="h3">TUF metadata</Content>
2323
</CardTitle>
2424
<CardBody>
25-
<Flex grow={{ default: 'grow' }} spaceItems={{ default: 'spaceItemsXl' }}>
26-
<Flex flex={{ default: 'flex_1' }}>
27-
<Flex direction={{ default: 'column' }} spaceItems={{ default: 'spaceItemsLg' }}>
25+
<Flex grow={{ default: "grow" }} spaceItems={{ default: "spaceItemsXl" }}>
26+
<Flex flex={{ default: "flex_1" }}>
27+
<Flex direction={{ default: "column" }} spaceItems={{ default: "spaceItemsLg" }}>
2828
<FlexItem>
29-
<Flex direction={{ default: 'column' }}>
29+
<Flex direction={{ default: "column" }}>
3030
<FlexItem>
3131
<Content component="h4">Status</Content>
3232
</FlexItem>
3333
<FlexItem>
34-
{latestTUF.status === 'valid' ? (
34+
{latestTUF.status === "valid" ? (
3535
<Icon status="success">
3636
<CheckCircleIcon />
3737
</Icon>
3838
) : (
3939
<Icon status="warning">
4040
<ExclamationTriangleIcon />
4141
</Icon>
42-
)}{' '}
42+
)}{" "}
4343
{capitalizeFirstLetter(latestTUF.status)}
4444
</FlexItem>
4545
</Flex>
4646
</FlexItem>
4747

4848
<FlexItem>
49-
<Flex direction={{ default: 'column' }}>
49+
<Flex direction={{ default: "column" }}>
5050
<FlexItem>
5151
<Content component="h4">Version</Content>
5252
</FlexItem>
@@ -55,11 +55,11 @@ const TrustRootMetadataTab: React.FC<TrustRootMetadataTabProps> = ({ trustRoot }
5555
</FlexItem>
5656
</Flex>
5757
</Flex>
58-
<Flex flex={{ default: 'flex_1' }} align={{ default: 'alignRight' }}>
59-
<Flex direction={{ default: 'column' }} spaceItems={{ default: 'spaceItemsLg' }}>
58+
<Flex flex={{ default: "flex_1" }} align={{ default: "alignRight" }}>
59+
<Flex direction={{ default: "column" }} spaceItems={{ default: "spaceItemsLg" }}>
6060
<FlexItem>
6161
<FlexItem>
62-
<Flex direction={{ default: 'column' }}>
62+
<Flex direction={{ default: "column" }}>
6363
<FlexItem>
6464
<Content component="h4">Role</Content>
6565
</FlexItem>
@@ -68,9 +68,9 @@ const TrustRootMetadataTab: React.FC<TrustRootMetadataTabProps> = ({ trustRoot }
6868
</FlexItem>
6969
</FlexItem>
7070
<Flex>
71-
<FlexItem align={{ default: 'alignRight' }}>
71+
<FlexItem align={{ default: "alignRight" }}>
7272
<FlexItem>
73-
<Flex direction={{ default: 'column' }}>
73+
<Flex direction={{ default: "column" }}>
7474
<FlexItem>
7575
<Content component="h4">Expires</Content>
7676
</FlexItem>

‎src/app/Trust/TrustRoots/components/StatusIcon.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/StatusIcon.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { Icon } from '@patternfly/react-core';
2-
import * as React from 'react';
3-
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
4-
import TimesCircleIcon from '@patternfly/react-icons/dist/esm/icons/times-circle-icon';
5-
import { MinusIcon } from '@patternfly/react-icons';
1+
import { Icon } from "@patternfly/react-core";
2+
import * as React from "react";
3+
import CheckCircleIcon from "@patternfly/react-icons/dist/esm/icons/check-circle-icon";
4+
import TimesCircleIcon from "@patternfly/react-icons/dist/esm/icons/times-circle-icon";
5+
import { MinusIcon } from "@patternfly/react-icons";
66

7-
type StatusIconProps = {
7+
interface StatusIconProps {
88
status: string;
9-
};
9+
}
1010

1111
const StatusIcon: React.FC<StatusIconProps> = ({ status }) => {
12-
if (status === 'success') {
12+
if (status === "success") {
1313
return (
1414
<Icon size="xl" status="success">
1515
<CheckCircleIcon />
1616
</Icon>
1717
);
18-
} else if (status === 'error') {
18+
} else if (status === "error") {
1919
return (
2020
<Icon size="xl" status="danger">
2121
<TimesCircleIcon />

‎src/app/Trust/TrustRoots/components/TrustRootAction.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/TrustRootAction.tsx‎

File renamed without changes.

‎src/app/Trust/TrustRoots/components/TrustRootNotFound.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/TrustRootNotFound.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ErrorState } from '@patternfly/react-component-groups';
1+
import { ErrorState } from "@patternfly/react-component-groups";
22

33
const TrustRootNotFound = () => {
44
return <ErrorState title="Trust root not found" />;

‎src/app/Trust/TrustRoots/components/TrustRootRow.tsx‎ renamed to ‎client/src/app/pages/TrustRoots/components/TrustRootRow.tsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ import {
1111
Flex,
1212
FlexItem,
1313
MenuToggle,
14-
MenuToggleElement,
15-
} from '@patternfly/react-core';
16-
import * as React from 'react';
17-
import StatusIcon from './StatusIcon';
18-
import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
19-
import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
20-
import { CalendarAltIcon, FileAltIcon, EllipsisVIcon } from '@patternfly/react-icons';
21-
import { TrustRootKind } from '../data/TrustRoots.data';
14+
type MenuToggleElement,
15+
} from "@patternfly/react-core";
16+
import * as React from "react";
17+
import StatusIcon from "./StatusIcon";
18+
import CodeBranchIcon from "@patternfly/react-icons/dist/esm/icons/code-branch-icon";
19+
import CubeIcon from "@patternfly/react-icons/dist/esm/icons/cube-icon";
20+
import { CalendarAltIcon, FileAltIcon, EllipsisVIcon } from "@patternfly/react-icons";
21+
import { type TrustRootKind } from "../data/TrustRoots.data";
2222

23-
export type LastStatus = 'success' | 'error' | null;
23+
export type LastStatus = "success" | "error" | null;
2424

25-
export type TrustRootRowProps = {
25+
export interface TrustRootRowProps {
2626
id: string;
2727
lastStatus: LastStatus;
2828
isRunning: boolean;
2929
trustRoot: TrustRootKind;
30-
};
30+
}
3131

3232
const TrustRootRow: React.FC<TrustRootRowProps> = ({ id, lastStatus, isRunning, trustRoot }) => {
3333
let lastStatusComponent;
3434

35-
if (lastStatus === 'success' || lastStatus === 'error' || isRunning) {
35+
if (lastStatus === "success" || lastStatus === "error" || isRunning) {
3636
lastStatusComponent = (
37-
<Flex direction={{ default: 'column' }}>
37+
<Flex direction={{ default: "column" }}>
3838
<FlexItem>
39-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
39+
<Flex spaceItems={{ default: "spaceItemsSm" }}>
4040
<FlexItem>
4141
<CalendarAltIcon /> 7 hours ago
4242
</FlexItem>
4343
</Flex>
4444
</FlexItem>
4545
<FlexItem>
46-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
46+
<Flex spaceItems={{ default: "spaceItemsSm" }}>
4747
<FlexItem>
4848
<FileAltIcon /> {trustRoot.certificates.length} certificates
4949
</FlexItem>
@@ -62,13 +62,13 @@ const TrustRootRow: React.FC<TrustRootRowProps> = ({ id, lastStatus, isRunning,
6262
<StatusIcon status={lastStatus as string} />
6363
</DataListCell>,
6464
<DataListCell key="info" isFilled={false}>
65-
<Flex direction={{ default: 'column' }}>
65+
<Flex direction={{ default: "column" }}>
6666
<FlexItem>
6767
<Content component="p">{trustRoot.name}</Content>
6868
</FlexItem>
6969
<FlexItem>
7070
<Content component="dd">
71-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
71+
<Flex spaceItems={{ default: "spaceItemsSm" }}>
7272
<FlexItem>
7373
{/* <CodeBranchIcon /> https://github.com/organization/repository.git */}
7474
<CodeBranchIcon /> {trustRoot.source}
@@ -77,7 +77,7 @@ const TrustRootRow: React.FC<TrustRootRowProps> = ({ id, lastStatus, isRunning,
7777
</Content>
7878
</FlexItem>
7979
<FlexItem>
80-
<Flex spaceItems={{ default: 'spaceItemsSm' }}>
80+
<Flex spaceItems={{ default: "spaceItemsSm" }}>
8181
<FlexItem>
8282
<CubeIcon /> Type: {trustRoot.type}
8383
</FlexItem>
@@ -86,7 +86,7 @@ const TrustRootRow: React.FC<TrustRootRowProps> = ({ id, lastStatus, isRunning,
8686
</Flex>
8787
</DataListCell>,
8888
<DataListCell key="description">
89-
<Flex direction={{ default: 'column' }}>
89+
<Flex direction={{ default: "column" }}>
9090
<FlexItem>
9191
<Content component="p">This is the description of the Root</Content>
9292
</FlexItem>
@@ -106,7 +106,7 @@ const TrustRootRow: React.FC<TrustRootRowProps> = ({ id, lastStatus, isRunning,
106106
const action = (
107107
<DataListAction id="actions" aria-label="Actions" aria-labelledby="actions">
108108
<Dropdown
109-
popperProps={{ position: 'right' }}
109+
popperProps={{ position: "right" }}
110110
onSelect={() => {}}
111111
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
112112
<MenuToggle

‎client/src/app/pages/TrustRoots/components/TrustRootsDataList.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Fragment, useRef, useState } from "react";
1+
import { Fragment, useRef, useState, type LegacyRef } from "react";
22

33
import {
44
Content,
@@ -10,14 +10,14 @@ import {
1010
DrawerContentBody,
1111
DrawerHead,
1212
DrawerPanelContent,
13-
} from '@patternfly/react-core';
13+
} from "@patternfly/react-core";
1414
// import { rows } from '../TrustRoots.data';
1515

1616
// import { useQuery } from '@tanstack/react-query';
1717

18-
import { TrustRootsDrawerContent } from './TrustRootsDrawerContent';
19-
import { exampleTrustRoots } from '../data/TrustRoots.data';
20-
import TrustRootRow, { LastStatus, TrustRootRowProps } from './TrustRootRow';
18+
import { TrustRootsDrawerContent } from "./TrustRootsDrawerContent";
19+
import { exampleTrustRoots } from "../data/TrustRoots.data";
20+
import TrustRootRow, { type LastStatus, type TrustRootRowProps } from "./TrustRootRow";
2121

2222
const TrustRootsDataList = () => {
2323
const [selectedRow, setSelectedRow] = useState("");
@@ -41,8 +41,8 @@ const TrustRootsDataList = () => {
4141
const dummyStatuses: { id: string; lastStatus: LastStatus }[] = [
4242
{ id: exampleTrustRoots[0].id, lastStatus: null },
4343
{ id: exampleTrustRoots[1].id, lastStatus: null },
44-
{ id: exampleTrustRoots[2].id, lastStatus: 'success' },
45-
{ id: exampleTrustRoots[3].id, lastStatus: 'error' },
44+
{ id: exampleTrustRoots[2].id, lastStatus: "success" },
45+
{ id: exampleTrustRoots[3].id, lastStatus: "error" },
4646
{ id: exampleTrustRoots[4].id, lastStatus: null },
4747
];
4848
// to be updated
@@ -90,8 +90,7 @@ const TrustRootsDataList = () => {
9090
minSize={"150px"}
9191
>
9292
<DrawerHead>
93-
{/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment */}
94-
<div tabIndex={isDrawerExpanded ? 0 : -1} ref={drawerRef as any}>
93+
<div tabIndex={isDrawerExpanded ? 0 : -1} ref={drawerRef as LegacyRef<HTMLDivElement>}>
9594
<Content component="h3">
9695
{exampleTrustRoots.find((tr) => tr.id === selectedRow)?.name ?? selectedRow}
9796
</Content>

‎client/src/app/pages/TrustRoots/components/TrustRootsDrawerContent.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Fragment } from 'react';
2-
import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
3-
import { exampleTrustRoots } from '../data/TrustRoots.data';
4-
import TrustRootMetadataTab from './DrawerContents/TrustRootMetadataTab';
5-
import TrustRootCertificateTab from './DrawerContents/TrustRootCertificateTab';
6-
import TrustRootInfoTab from './DrawerContents/TrustRootInfoTab';
1+
import { Fragment } from "react";
2+
import { Tab, Tabs, TabTitleText } from "@patternfly/react-core";
3+
import { exampleTrustRoots } from "../data/TrustRoots.data";
4+
import TrustRootMetadataTab from "./DrawerContents/TrustRootMetadataTab";
5+
import TrustRootCertificateTab from "./DrawerContents/TrustRootCertificateTab";
6+
import TrustRootInfoTab from "./DrawerContents/TrustRootInfoTab";
77

8-
type TrustRootDrawerContentProps = {
8+
interface TrustRootDrawerContentProps {
99
trustRootId: string;
10-
};
10+
}
1111

1212
const TrustRootsDrawerContent: React.FC<TrustRootDrawerContentProps> = ({ trustRootId }) => {
1313
const trustRoot = exampleTrustRoots.find((tr) => tr.id === trustRootId);

0 commit comments

Comments
 (0)