Merge branch 'develop' of https://github.com/rowyio/rowy into develop

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<any> & {
 };
 
 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,

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 },
             }}
           >
-            <ToggleButtonGroup
-              value={cloudLogFilters.type}
-              exclusive
-              onChange={(_, v) =>
-                setCloudLogFilters((c) => ({ type: v, timeRange: c.timeRange }))
-              }
-              aria-label="Filter by log type"
-            >
-              <ToggleButton value="webhook">Webhooks</ToggleButton>
-              <ToggleButton value="audit">Audit</ToggleButton>
-              <ToggleButton value="build">Build</ToggleButton>
-            </ToggleButtonGroup>
+            {compatibleRowyRunVersion!({ minVersion: "1.2.1" }) ? (
+              <ToggleButtonGroup
+                value={cloudLogFilters.type}
+                exclusive
+                onChange={(_, v) =>
+                  setCloudLogFilters((c) => ({
+                    type: v,
+                    timeRange: c.timeRange,
+                  }))
+                }
+                aria-label="Filter by log type"
+              >
+                <ToggleButton value="webhook">Webhooks</ToggleButton>
+                <ToggleButton value="audit">Audit</ToggleButton>
+                <ToggleButton value="build">Build</ToggleButton>
+              </ToggleButtonGroup>
+            ) : (
+              <ToggleButtonGroup
+                value={cloudLogFilters.type}
+                exclusive
+                onChange={(_, v) =>
+                  setCloudLogFilters((c) => ({
+                    type: v,
+                    timeRange: c.timeRange,
+                  }))
+                }
+                aria-label="Filter by log type"
+              >
+                <ToggleButton value="build">Build</ToggleButton>
+              </ToggleButtonGroup>
+            )}
 
             {cloudLogFilters.type === "webhook" && (
               <MultiSelect

src/components/TableHeader/CloudLogs/utils.ts

@@ -18,7 +18,7 @@ export type CloudLogFilters = {
 export const cloudLogFiltersAtom = atomWithHash<CloudLogFilters>(
   "cloudLogFilters",
   {
-    type: "webhook",
+    type: "build",
     timeRange: { type: "days", value: 7 },
   }
 );