Merge pull request #1516 from Shelf-nu/1513-bug-advanced-index-=-cust…

…odian-filtering fix: default state of value field in filters
Shelf-nu · Dec 13, 2024 · aa15985 · aa15985
2 parents 01d18c9 + 5b44445
commit aa15985
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 14 deletions.
diff --git a/app/components/assets/assets-index/advanced-asset-index-filters-and-sorting.tsx b/app/components/assets/assets-index/advanced-asset-index-filters-and-sorting.tsx
@@ -213,7 +213,6 @@ function AdvancedFilter() {
                         />
                       </div>
 
-                      {/* Only show operator and value fields if a column is selected */}
                       {filter.name && (
                         <>
                           <div className="w-[50px] shrink-0">
@@ -226,6 +225,11 @@ function AdvancedFilter() {
                                   return newFilters;
                                 });
                               }}
+                              disabled={
+                                filter.isNew
+                                  ? { reason: "Please select a column" }
+                                  : false
+                              }
                             />
                           </div>
                           <div className="min-w-0 grow">
@@ -241,6 +245,7 @@ function AdvancedFilter() {
                               applyFilters={applyFilters}
                               fieldName={getFieldName(index)}
                               zormError={getError(index)}
+                              disabled={filter.isNew}
                             />
                           </div>
                         </>

diff --git a/app/components/assets/assets-index/advanced-filters/helpers.ts b/app/components/assets/assets-index/advanced-filters/helpers.ts
@@ -180,7 +180,13 @@ export function getAvailableColumns(
   // Get columns that are visible and not already used
   const availableColumns = columns.filter(
     (column) =>
-      column.visible && !usedColumns.find((f) => f.name === column.name)
+      column.visible &&
+      !usedColumns.find((f) => {
+        if (operation === "filter" && "isNew" in f) {
+          return f.name === column.name && !f.isNew;
+        }
+        return f.name === column.name;
+      })
   );
 
   // Apply operation-specific filtering

diff --git a/app/components/assets/assets-index/advanced-filters/operator-selector.tsx b/app/components/assets/assets-index/advanced-filters/operator-selector.tsx
@@ -5,6 +5,7 @@ import {
   PopoverPortal,
   PopoverTrigger,
 } from "@radix-ui/react-popover";
+import type { DisabledProp } from "~/components/shared/button";
 import { Button } from "~/components/shared/button";
 import { tw } from "~/utils/tw";
 import type { Filter, FilterDefinition, FilterOperator } from "./schema";
@@ -58,9 +59,11 @@ export const operatorsPerType: FilterDefinition = {
 export function OperatorSelector({
   filter,
   setFilter,
+  disabled,
 }: {
   filter: Filter;
   setFilter: (filter: Filter["operator"]) => void;
+  disabled?: DisabledProp;
 }) {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
@@ -79,6 +82,7 @@ export function OperatorSelector({
           variant="secondary"
           title={operatorsMap[operator][1]}
           className="w-[50px] font-normal"
+          disabled={disabled}
         >
           {operatorsMap[operator][0]}
         </Button>