Skip to content

2312-Catalog-page-changes #2321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mainawycliffe wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

2312-Catalog-page-changes #2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21eccc8
fix: default changes to 7 days
mainawycliffe Oct 2, 2024
4f3ddd9
feat: show duration filter values on the tab
mainawycliffe Oct 2, 2024
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
4 changes: 2 additions & 2 deletions src/components/Configs/Changes/ConfigChangesFilters/ConfigChangesDateRangeFIlter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ type Props = {

export const configChangesDefaultDateFilter: URLSearchParamsInit = {
rangeType: "relative",
display: "2 days",
range: "now-2d"
display: "7 days",
range: "now-7d"
};

export default function ConfigChangesDateRangeFilter({
Expand Down
8 changes: 5 additions & 3 deletions src/components/Configs/ConfigPageTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import TabbedLinks from "../../ui/Tabs/TabbedLinks";

type ConfigPageTabsProps = {
activeTab: string;
daysLabel?: string;
children: React.ReactNode;
};

export default function ConfigPageTabs({
activeTab,
children
children,
daysLabel = "7 days"
}: ConfigPageTabsProps) {
const [searchParams] = useSearchParams();

Expand All @@ -25,7 +27,7 @@ export default function ConfigPageTabs({
search: `${query}`
},
{
label: "Changes",
label: `Changes (${daysLabel})`,
key: "Changes",
path: `/catalog/changes`,
search: `${query}`
Expand All @@ -42,7 +44,7 @@ export default function ConfigPageTabs({
path: `/catalog/scrapers`
}
];
}, [type]);
}, [daysLabel, type]);

return (
<div className={`flex h-full flex-row`}>
Expand Down
10 changes: 9 additions & 1 deletion src/pages/config/ConfigChangesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useGetAllConfigsChangesQuery } from "@flanksource-ui/api/query-hooks/useConfigChangesHooks";
import { ConfigChangeTable } from "@flanksource-ui/components/Configs/Changes/ConfigChangeTable";
import { configChangesDefaultDateFilter } from "@flanksource-ui/components/Configs/Changes/ConfigChangesFilters/ConfigChangesDateRangeFIlter";
import { ConfigChangeFilters } from "@flanksource-ui/components/Configs/Changes/ConfigChangesFilters/ConfigChangesFilters";
import ConfigPageTabs from "@flanksource-ui/components/Configs/ConfigPageTabs";
import { InfoMessage } from "@flanksource-ui/components/InfoMessage";
Expand All @@ -9,6 +10,7 @@ import {
BreadcrumbRoot
} from "@flanksource-ui/ui/BreadcrumbNav";
import { PaginationOptions } from "@flanksource-ui/ui/DataTable";
import useTimeRangeParams from "@flanksource-ui/ui/Dates/TimeRangePicker/useTimeRangeParams";
import { Head } from "@flanksource-ui/ui/Head";
import { SearchLayout } from "@flanksource-ui/ui/Layout/SearchLayout";
import { refreshButtonClickedTrigger } from "@flanksource-ui/ui/SlidingSideBar/SlidingSideBar";
Expand All @@ -25,6 +27,12 @@ export function ConfigChangesPage() {
sortDirection: "desc"
});

const { getTimeRangeFromUrl } = useTimeRangeParams(
configChangesDefaultDateFilter
);

const timeRangeValue = getTimeRangeFromUrl();

const page = params.get("page") ?? "1";
const pageSize = params.get("pageSize") ?? "200";

Expand Down Expand Up @@ -100,7 +108,7 @@ export function ConfigChangesPage() {
loading={isLoading || isRefetching}
contentClass="p-0 h-full"
>
<ConfigPageTabs activeTab="Changes">
<ConfigPageTabs activeTab="Changes" daysLabel={timeRangeValue?.display}>
{error ? (
<InfoMessage message={errorMessage} />
) : (
Expand Down