Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions client/src/app/components/SearchInputField.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { SearchInput } from "@patternfly/react-core";

interface SearchInputFieldProps {
searchValue: string;
onSearchChange: (value: string) => void;
}

// Set up identifier search input
export const SearchInputField: React.FC<SearchInputFieldProps> = ({ searchValue, onSearchChange }) => (
<SearchInput
placeholder="Filter by text"
value={searchValue}
onChange={(_event, value) => onSearchChange(value)}
onClear={() => onSearchChange("")}
/>
);

// Set up date filter
export const PublishedOnInput = () => <>Date range input here</>;
19 changes: 3 additions & 16 deletions client/src/app/pages/Certificates/CertificatesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
Pagination,
PaginationVariant,
Popper,
SearchInput,
Toolbar,
ToolbarContent,
ToolbarFilter,
Expand All @@ -26,6 +25,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
import type { ICertificateProps } from "./Certificates.data";
import ShieldIcon from "@patternfly/react-icons/dist/esm/icons/shield-alt-icon";
import { capitalizeFirstLetter, formatDate, getCertificateStatusColor } from "@app/utils/utils";
import { PublishedOnInput, SearchInputField } from "@app/components/SearchInputField";

export interface ICertificatesPageProps {
certificates: ICertificateProps[];
Expand Down Expand Up @@ -232,19 +232,6 @@ const CertificatesPage = ({ certificates, columns }: ICertificatesPageProps) =>
</div>
);

// Set up identifier search input
const searchInput = (
<SearchInput
placeholder="Filter by text"
value={searchValue}
onChange={(_event, value) => onSearchChange(value)}
onClear={() => onSearchChange("")}
/>
);

// Set up date filter
const publishedOnInput = <>Date range input here</>;

const toggleGroupItems = (
<ToolbarGroup variant="filter-group">
<ToolbarItem>{attributeDropdown}</ToolbarItem>
Expand All @@ -255,10 +242,10 @@ const CertificatesPage = ({ certificates, columns }: ICertificatesPageProps) =>
categoryName="Subject"
showToolbarItem={activeAttributeMenu === "Filter text"}
>
{searchInput}
<SearchInputField searchValue={searchValue} onSearchChange={onSearchChange} />
</ToolbarFilter>
<ToolbarFilter categoryName={"Valid To"} showToolbarItem={activeAttributeMenu === "Valid To"}>
{publishedOnInput}
<PublishedOnInput />
</ToolbarFilter>
<ToolbarItem variant="pagination">{renderPagination("top", true)}</ToolbarItem>
</ToolbarGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
type MenuToggleElement,
} from "@patternfly/react-core";
import * as React from "react";
import StatusIcon from "./StatusIcon";
import StatusIcon from "@app/components/StatusIcon";
import CodeBranchIcon from "@patternfly/react-icons/dist/esm/icons/code-branch-icon";
import CubeIcon from "@patternfly/react-icons/dist/esm/icons/cube-icon";
import { CalendarAltIcon, FileAltIcon, EllipsisVIcon } from "@patternfly/react-icons";
Expand Down