From cddcc834e29e121d7ae91b92b29da95460ab19c3 Mon Sep 17 00:00:00 2001 From: shamsmosowi Date: Fri, 12 Nov 2021 16:37:52 +1100 Subject: [PATCH 1/2] hide selectedColumn --- src/components/Table/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx index 8159d3d5..54023bc1 100644 --- a/src/components/Table/index.tsx +++ b/src/components/Table/index.tsx @@ -11,7 +11,7 @@ import { HTML5Backend } from "react-dnd-html5-backend"; // import "react-data-grid/dist/react-data-grid.css"; import DataGrid, { Column, - SelectColumn as _SelectColumn, + // SelectColumn as _SelectColumn, } from "react-data-grid"; import Loading from "@src/components/Loading"; @@ -38,7 +38,7 @@ export type TableColumn = Column & { }; const rowKeyGetter = (row: any) => row.id; -const SelectColumn = { ..._SelectColumn, width: 42, maxWidth: 42 }; +//const SelectColumn = { ..._SelectColumn, width: 42, maxWidth: 42 }; export default function Table() { const classes = useStyles(); @@ -93,7 +93,7 @@ export default function Table() { .filter((column) => !userDocHiddenFields.includes(column.key)); setColumns([ - SelectColumn, + // SelectColumn, ..._columns, { isNew: true, From a699e7d9569fff5bc179466026c1d1b407854263 Mon Sep 17 00:00:00 2001 From: shamsmosowi Date: Fri, 12 Nov 2021 16:57:53 +1100 Subject: [PATCH 2/2] show audit & webhook logs for new version or rowy run --- .../TableHeader/CloudLogs/CloudLogsModal.tsx | 46 +++++++++++++------ src/components/TableHeader/CloudLogs/utils.ts | 2 +- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/components/TableHeader/CloudLogs/CloudLogsModal.tsx b/src/components/TableHeader/CloudLogs/CloudLogsModal.tsx index 86def86c..7ea5a75f 100644 --- a/src/components/TableHeader/CloudLogs/CloudLogsModal.tsx +++ b/src/components/TableHeader/CloudLogs/CloudLogsModal.tsx @@ -25,7 +25,8 @@ import { useProjectContext } from "@src/contexts/ProjectContext"; import { cloudLogFiltersAtom, cloudLogFetcher } from "./utils"; export default function CloudLogsModal(props: IModalProps) { - const { rowyRun, tableState, table } = useProjectContext(); + const { rowyRun, tableState, table, compatibleRowyRunVersion } = + useProjectContext(); const [cloudLogFilters, setCloudLogFilters] = useAtom(cloudLogFiltersAtom); @@ -76,18 +77,37 @@ export default function CloudLogsModal(props: IModalProps) { "& > *": { flexShrink: 0 }, }} > - - setCloudLogFilters((c) => ({ type: v, timeRange: c.timeRange })) - } - aria-label="Filter by log type" - > - Webhooks - Audit - Build - + {compatibleRowyRunVersion!({ minVersion: "1.2.1" }) ? ( + + setCloudLogFilters((c) => ({ + type: v, + timeRange: c.timeRange, + })) + } + aria-label="Filter by log type" + > + Webhooks + Audit + Build + + ) : ( + + setCloudLogFilters((c) => ({ + type: v, + timeRange: c.timeRange, + })) + } + aria-label="Filter by log type" + > + Build + + )} {cloudLogFilters.type === "webhook" && ( ( "cloudLogFilters", { - type: "webhook", + type: "build", timeRange: { type: "days", value: 7 }, } );