Revert "feat: add test path filtering"

This reverts commit 1da1e33.

backend/kernelCI_app/utils.py

@@ -106,11 +106,8 @@ class FilterParams:
         "gte": ["gte", ">="],
         "lt": ["lt", "<"],
         "lte": ["lte", "<="],
-        "like": ["like", "LIKE"],
     }
 
-    string_like_filters = ["test.path"]
-
     def __init__(self, request):
         self.filters = []
         self.create_filters_from_req(request)
@@ -132,10 +129,6 @@ def create_filters_from_req(self, request):
                     self.add_filter(field, value, "in")
                 continue
 
-            if filter_term in self.string_like_filters:
-                self.add_filter(filter_term, request.GET.get(k), "like")
-                continue
-
             match = self.filter_reg.match(filter_term)
             if match:
                 field = match.group(1)

backend/kernelCI_app/views/treeCommitsHistory.py

@@ -70,9 +70,6 @@ def __treat_unknown_filter(self, table_field, op, value_name, filter):
             self.field_values[value_name] = filter['value']
             if op == "IN":
                 clause += f" = ANY(%({value_name})s)"
-            elif op == "LIKE":
-                self.field_values[value_name] = f"%{filter['value']}%"
-                clause += f" {op} %({value_name})s"
             else:
                 clause += f" {op} %({value_name})s"
 

backend/kernelCI_app/views/treeDetailsSlowView.py

@@ -27,7 +27,6 @@ def __init__(self):
         self.filterTreeDetailsCompiler = set()
         self.filterArchitecture = set()
         self.filterHardware = set()
-        self.filterPath = ""
         self.filter_handlers = {
             "boot.status": self.__handle_boot_status,
             "boot.duration": self.__handle_boot_duration,
@@ -37,7 +36,6 @@ def __init__(self):
             "compiler": self.__handle_compiler,
             "architecture": self.__handle_architecture,
             "test.hardware": self.__handle_hardware,
-            "test.path": self.__handle_path,
         }
 
         self.testHistory = []
@@ -97,9 +95,6 @@ def __handle_architecture(self, current_filter):
     def __handle_hardware(self, current_filter):
         self.filterHardware.add(current_filter["value"])
 
-    def __handle_path(self, current_filter):
-        self.filterPath = current_filter["value"]
-
     def __processFilters(self, request):
         try:
             filter_params = FilterParams(request)
@@ -475,13 +470,8 @@ def get(self, request, commit_hash: str | None):
             ) = currentRowData
 
             self.hardwareUsed.add(testEnvironmentCompatible)
-
             if (
                 (
-                    self.filterPath != ""
-                    and (self.filterPath not in path)
-                )
-                or (
                     len(self.filterHardware) > 0
                     and (testEnvironmentCompatible not in self.filterHardware)
                 )

dashboard/src/components/BootsTable/BootsTable.tsx

@@ -118,7 +118,6 @@ interface IBootsTable {
   filter: TestsTableFilter;
   getRowLink: (testId: TestHistory['id']) => LinkProps;
   onClickFilter: (newFilter: TestsTableFilter) => void;
-  updatePathFilter: (pathFilter: string) => void;
 }
 
 const TableCellComponent = ({
@@ -197,7 +196,6 @@ export function BootsTable({
   filter,
   getRowLink,
   onClickFilter,
-  updatePathFilter,
 }: IBootsTable): JSX.Element {
   const [sorting, setSorting] = useState<SortingState>([]);
   const [pagination, setPagination] = useState<PaginationState>({
@@ -313,40 +311,20 @@ export function BootsTable({
       ?.setFilterValue(filter !== 'all' ? filter : undefined);
   }, [filter, table]);
 
-  // TODO: there should be a filtering for the frontend before the backend AND that filtering should consider the individual tests inside each test "batch" (the data from individualTestsTables), not only the rows of the external table
   const onSearchChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      if (e.target.value !== undefined) {
-        updatePathFilter(e.target.value);
-      }
-      // TODO: only use the frontend filtering when the backend filter function is undefined (like in BuildDetails page)
-      table.setGlobalFilter(String(e.target.value));
-    },
-    [table, updatePathFilter],
+    (e: React.ChangeEvent<HTMLInputElement>) =>
+      table.setGlobalFilter(String(e.target.value)),
+    [table],
   );
 
   const groupHeaders = table.getHeaderGroups()[0]?.headers;
   const tableHeaders = useMemo((): JSX.Element[] => {
     return groupHeaders.map(header => {
-      const headerComponent = header.isPlaceholder
-        ? null
-        : flexRender(header.column.columnDef.header, header.getContext());
       return (
-        <TableHead key={header.id} className="border-b px-2 font-bold">
-          {header.id === 'path' ? (
-            <div className="flex items-center">
-              {headerComponent}
-              {/* TODO: add startingValue with the currentPathFilter from the diffFilter param, same for TestsTable */}
-              <DebounceInput
-                debouncedSideEffect={onSearchChange}
-                className="w-50 font-normal"
-                type="text"
-                placeholder={intl.formatMessage({ id: 'global.search' })}
-              />
-            </div>
-          ) : (
-            headerComponent
-          )}
+        <TableHead key={header.id}>
+          {header.isPlaceholder
+            ? null
+            : flexRender(header.column.columnDef.header, header.getContext())}
         </TableHead>
       );
     });
@@ -438,7 +416,15 @@ export function BootsTable({
       navigationLogsActions={navigationLogsActions}
       onOpenChange={onOpenChange}
     >
-      <TableStatusFilter filters={filters} onClickTest={onClickFilter} />
+      <div className="flex justify-between">
+        <TableStatusFilter filters={filters} onClickTest={onClickFilter} />
+        <DebounceInput
+          debouncedSideEffect={onSearchChange}
+          className="w-50"
+          type="text"
+          placeholder={intl.formatMessage({ id: 'global.search' })}
+        />
+      </div>
       <BaseTable headerComponents={tableHeaders}>
         <TableBody>{tableRows}</TableBody>
       </BaseTable>

dashboard/src/components/TestsTable/TestsTable.tsx

@@ -47,17 +47,15 @@ export interface ITestsTable {
   columns?: ColumnDef<TPathTests>[];
   innerColumns?: ColumnDef<TIndividualTest>[];
   getRowLink: (testId: TestHistory['id']) => LinkProps;
-  updatePathFilter?: (pathFilter: string) => void;
 }
 
 export function TestsTable({
   testHistory,
   onClickFilter,
   filter,
+  getRowLink,
   columns = defaultColumns,
   innerColumns = defaultInnerColumns,
-  getRowLink,
-  updatePathFilter,
 }: ITestsTable): JSX.Element {
   const [sorting, setSorting] = useState<SortingState>([]);
   const [expanded, setExpanded] = useState<ExpandedState>({});
@@ -255,39 +253,20 @@ export function TestsTable({
     [filterCount, intl, filter],
   );
 
-  // TODO: there should be a filtering for the frontend before the backend AND that filtering should consider the individual tests inside each test "batch" (the data from individualTestsTables), not only the rows of the external table
   const onSearchChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      if (e.target.value !== undefined && updatePathFilter) {
-        updatePathFilter(e.target.value);
-      }
-      // TODO: remove this frontend filter when the hardwareDetails backend filtering gets in place
-      table.setGlobalFilter(String(e.target.value));
-    },
-    [table, updatePathFilter],
+    (e: React.ChangeEvent<HTMLInputElement>) =>
+      table.setGlobalFilter(String(e.target.value)),
+    [table],
   );
 
   const groupHeaders = table.getHeaderGroups()[0]?.headers;
   const tableHeaders = useMemo((): JSX.Element[] => {
     return groupHeaders.map(header => {
-      const headerComponent = header.isPlaceholder
-        ? null
-        : flexRender(header.column.columnDef.header, header.getContext());
       return (
         <TableHead key={header.id} className="border-b px-2 font-bold">
-          {header.id === 'path_group' ? (
-            <div className="flex items-center">
-              {headerComponent}
-              <DebounceInput
-                debouncedSideEffect={onSearchChange}
-                className="w-50 font-normal"
-                type="text"
-                placeholder={intl.formatMessage({ id: 'global.search' })}
-              />
-            </div>
-          ) : (
-            headerComponent
-          )}
+          {header.isPlaceholder
+            ? null
+            : flexRender(header.column.columnDef.header, header.getContext())}
         </TableHead>
       );
     });
@@ -337,7 +316,15 @@ export function TestsTable({
 
   return (
     <div className="flex flex-col gap-6 pb-4">
-      <TableStatusFilter filters={filters} onClickTest={onClickFilter} />
+      <div className="flex justify-between">
+        <TableStatusFilter filters={filters} onClickTest={onClickFilter} />
+        <DebounceInput
+          debouncedSideEffect={onSearchChange}
+          className="w-50"
+          type="text"
+          placeholder={intl.formatMessage({ id: 'global.search' })}
+        />
+      </div>
       <BaseTable headerComponents={tableHeaders}>
         <TableBody>{tableRows}</TableBody>
       </BaseTable>

dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx

@@ -38,21 +38,6 @@ const BootsTab = ({ reqFilter }: BootsTabProps): JSX.Element => {
 
   const navigate = useNavigate({ from: '/tree/$treeId/' });
 
-  const updatePathFilter = useCallback(
-    (pathFilter: string) => {
-      navigate({
-        search: previousSearch => ({
-          ...previousSearch,
-          diffFilter: {
-            ...previousSearch.diffFilter,
-            path: pathFilter === '' ? undefined : { [pathFilter]: true },
-          },
-        }),
-      });
-    },
-    [navigate],
-  );
-
   const onClickFilter = useCallback(
     (newFilter: TestsTableFilter): void => {
       navigate({
@@ -180,7 +165,6 @@ const BootsTab = ({ reqFilter }: BootsTabProps): JSX.Element => {
         onClickFilter={onClickFilter}
         testHistory={data.bootHistory}
         getRowLink={getRowLink}
-        updatePathFilter={updatePathFilter}
       />
     </div>
   );

dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx

@@ -44,21 +44,6 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
 
   const navigate = useNavigate({ from: '/tree/$treeId' });
 
-  const updatePathFilter = useCallback(
-    (pathFilter: string) => {
-      navigate({
-        search: previousSearch => ({
-          ...previousSearch,
-          diffFilter: {
-            ...previousSearch.diffFilter,
-            path: pathFilter === '' ? undefined : { [pathFilter]: true },
-          },
-        }),
-      });
-    },
-    [navigate],
-  );
-
   const getRowLink = useCallback(
     (bootId: string): LinkProps => {
       return {
@@ -185,7 +170,6 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
         onClickFilter={onClickFilter}
         filter={tableFilter.testsTable}
         getRowLink={getRowLink}
-        updatePathFilter={updatePathFilter}
       />
     </div>
   );

dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx

@@ -47,7 +47,6 @@ const filterFieldMap = {
   'test.duration_[gte]': 'testDurationMin',
   'test.duration_[lte]': 'testDurationMax',
   'test.hardware': 'hardware',
-  'test.path': 'path',
 } as const satisfies Record<TRequestFiltersValues, TFilterKeys>;
 
 export const mapFilterToReq = (

dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx

@@ -145,9 +145,7 @@ const ErrorsSummary = ({
 export const MemoizedErrorsSummary = memo(ErrorsSummary);
 
 const BootsTab = ({ boots, hardwareId }: TBootsTab): JSX.Element => {
-  const { tableFilter } = useSearch({
-    from: '/hardware/$hardwareId',
-  });
+  const { tableFilter } = useSearch({ from: '/hardware/$hardwareId' });
 
   const getRowLink = useCallback(
     (bootId: string): LinkProps => ({
@@ -163,21 +161,6 @@ const BootsTab = ({ boots, hardwareId }: TBootsTab): JSX.Element => {
 
   const navigate = useNavigate({ from: '/hardware/$hardwareId' });
 
-  const updatePathFilter = useCallback(
-    (pathFilter: string) => {
-      navigate({
-        search: previousSearch => ({
-          ...previousSearch,
-          diffFilter: {
-            ...previousSearch.diffFilter,
-            path: pathFilter === '' ? undefined : { [pathFilter]: true },
-          },
-        }),
-      });
-    },
-    [navigate],
-  );
-
   const onClickFilter = useCallback(
     (newFilter: TestsTableFilter): void => {
       navigate({
@@ -244,7 +227,6 @@ const BootsTab = ({ boots, hardwareId }: TBootsTab): JSX.Element => {
         filter={tableFilter.bootsTable}
         testHistory={boots.history}
         onClickFilter={onClickFilter}
-        updatePathFilter={updatePathFilter}
       />
     </div>
   );

dashboard/src/pages/hardwareDetails/Tabs/Tests/HardwareDetailsTestsTable.tsx

@@ -94,7 +94,6 @@ const HardwareDetailsTestTable = ({
   onClickFilter,
   testHistory,
   hardwareId,
-  updatePathFilter,
 }: IHardwareDetailsTestTable): JSX.Element => {
   const getRowLink = useCallback(
     (bootId: string): LinkProps => ({
@@ -115,7 +114,6 @@ const HardwareDetailsTestTable = ({
       testHistory={testHistory}
       innerColumns={innerColumns}
       getRowLink={getRowLink}
-      updatePathFilter={updatePathFilter}
     />
   );
 };

dashboard/src/pages/hardwareDetails/Tabs/Tests/TestsTab.tsx

@@ -27,28 +27,10 @@ interface TTestsTab {
 }
 
 const TestsTab = ({ tests, hardwareId }: TTestsTab): JSX.Element => {
-  const { tableFilter } = useSearch({
-    from: '/hardware/$hardwareId',
-  });
+  const { tableFilter } = useSearch({ from: '/hardware/$hardwareId' });
 
   const navigate = useNavigate({ from: '/hardware/$hardwareId' });
 
-  // TODO: move inside the same hook for the tables, passing navigate, in order to not repeat the same code in each tab of each monitor
-  const updatePathFilter = useCallback(
-    (pathFilter: string) => {
-      navigate({
-        search: previousSearch => ({
-          ...previousSearch,
-          diffFilter: {
-            ...previousSearch.diffFilter,
-            path: pathFilter === '' ? undefined : { [pathFilter]: true },
-          },
-        }),
-      });
-    },
-    [navigate],
-  );
-
   const onClickFilter = useCallback(
     (newFilter: TestsTableFilter): void => {
       navigate({
@@ -115,7 +97,6 @@ const TestsTab = ({ tests, hardwareId }: TTestsTab): JSX.Element => {
         filter={tableFilter.testsTable}
         hardwareId={hardwareId}
         onClickFilter={onClickFilter}
-        updatePathFilter={updatePathFilter}
       />
     </div>
   );