Skip to content

Commit 1c8627d

Browse files
Merge pull request #5 from abhinandan13jan/refactor-pages
feat(trustroots): refactor-common-components
2 parents 84aa096 + 5aee643 commit 1c8627d

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { SearchInput } from "@patternfly/react-core";
2+
3+
interface SearchInputFieldProps {
4+
searchValue: string;
5+
onSearchChange: (value: string) => void;
6+
}
7+
8+
// Set up identifier search input
9+
export const SearchInputField: React.FC<SearchInputFieldProps> = ({ searchValue, onSearchChange }) => (
10+
<SearchInput
11+
placeholder="Filter by text"
12+
value={searchValue}
13+
onChange={(_event, value) => onSearchChange(value)}
14+
onClear={() => onSearchChange("")}
15+
/>
16+
);
17+
18+
// Set up date filter
19+
export const PublishedOnInput = () => <>Date range input here</>;

client/src/app/pages/Certificates/CertificatesPage.tsx

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
Pagination,
1212
PaginationVariant,
1313
Popper,
14-
SearchInput,
1514
Toolbar,
1615
ToolbarContent,
1716
ToolbarFilter,
@@ -26,6 +25,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
2625
import type { ICertificateProps } from "./Certificates.data";
2726
import ShieldIcon from "@patternfly/react-icons/dist/esm/icons/shield-alt-icon";
2827
import { capitalizeFirstLetter, formatDate, getCertificateStatusColor } from "@app/utils/utils";
28+
import { PublishedOnInput, SearchInputField } from "@app/components/SearchInputField";
2929

3030
export interface ICertificatesPageProps {
3131
certificates: ICertificateProps[];
@@ -232,19 +232,6 @@ const CertificatesPage = ({ certificates, columns }: ICertificatesPageProps) =>
232232
</div>
233233
);
234234

235-
// Set up identifier search input
236-
const searchInput = (
237-
<SearchInput
238-
placeholder="Filter by text"
239-
value={searchValue}
240-
onChange={(_event, value) => onSearchChange(value)}
241-
onClear={() => onSearchChange("")}
242-
/>
243-
);
244-
245-
// Set up date filter
246-
const publishedOnInput = <>Date range input here</>;
247-
248235
const toggleGroupItems = (
249236
<ToolbarGroup variant="filter-group">
250237
<ToolbarItem>{attributeDropdown}</ToolbarItem>
@@ -255,10 +242,10 @@ const CertificatesPage = ({ certificates, columns }: ICertificatesPageProps) =>
255242
categoryName="Subject"
256243
showToolbarItem={activeAttributeMenu === "Filter text"}
257244
>
258-
{searchInput}
245+
<SearchInputField searchValue={searchValue} onSearchChange={onSearchChange} />
259246
</ToolbarFilter>
260247
<ToolbarFilter categoryName={"Valid To"} showToolbarItem={activeAttributeMenu === "Valid To"}>
261-
{publishedOnInput}
248+
<PublishedOnInput />
262249
</ToolbarFilter>
263250
<ToolbarItem variant="pagination">{renderPagination("top", true)}</ToolbarItem>
264251
</ToolbarGroup>

client/src/app/pages/TrustRoots/components/TrustRootRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
type MenuToggleElement,
1515
} from "@patternfly/react-core";
1616
import * as React from "react";
17-
import StatusIcon from "./StatusIcon";
17+
import StatusIcon from "@app/components/StatusIcon";
1818
import CodeBranchIcon from "@patternfly/react-icons/dist/esm/icons/code-branch-icon";
1919
import CubeIcon from "@patternfly/react-icons/dist/esm/icons/cube-icon";
2020
import { CalendarAltIcon, FileAltIcon, EllipsisVIcon } from "@patternfly/react-icons";

0 commit comments

Comments
 (0)