@visns-studio/visns-components 5.15.19 → 5.15.21

package/package.json

@@ -94,7 +94,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.15.19",
+    "version": "5.15.21",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/DataGrid.jsx

@@ -2670,21 +2670,20 @@ const DataGrid = forwardRef(
                                 break;
                             default:
                                 // Convert column.id to string if it's an array with single element
-                                const columnId =
-                                    Array.isArray(column.id) &&
-                                    column.id.length === 1
-                                        ? column.id[0]
-                                        : column.id;
+                                // Use the same naming logic as createFilterName for consistency
+                                const filterName = createFilterName(column);
+                                const columnId = filterName;
 
                                 selectedDataSource = filterDataSource.reduce(
                                     (acc, fds) => {
-                                        if (fds.id === columnId) {
+                                        if (fds.id === filterName) {
                                             return fds.dataset;
                                         }
                                         return acc;
                                     },
                                     null
                                 );
+                                
                                 break;
                         }
 
@@ -2707,36 +2706,31 @@ const DataGrid = forwardRef(
                                     break;
                                 case 'select':
                                     filterEditor = SelectFilter;
-                                    filterEditorProps = {
-                                        multiple:
-                                            column.filter.operator === 'inlist',
-                                        wrapMultiple:
-                                            column.filter.operator !== 'inlist',
-                                        placeholder: column.filter.placeholder
-                                            ? column.filter.placeholder
-                                            : 'All Options',
-                                        dataSource: selectedDataSource,
-                                        searchable:
-                                            column.filter.searchable !== false,
-                                        // Enable clear functionality even when searchable is false
-                                        allowClearWhenNotSearchable:
-                                            column.filter.searchable === false,
-                                        // Explicitly enable clear icon
-                                        clearIcon: true,
-                                    };
-
-                                    // Debug: Check if fix is applied
-                                    if (column.filter.searchable === false) {
-                                        console.log(
-                                            'Filter Debug - searchable=false:',
-                                            {
-                                                columnName:
-                                                    column.name || 'unknown',
-                                                props: filterEditorProps,
-                                                visnsDataGridVersion: 'v1.0.18',
-                                            }
-                                        );
+                                    // Only set filter editor if we have data or it's not a URL-based filter
+                                    if (selectedDataSource || !column.filter.url) {
+                                        filterEditorProps = {
+                                            multiple:
+                                                column.filter.operator === 'inlist',
+                                            wrapMultiple:
+                                                column.filter.operator !== 'inlist',
+                                            placeholder: column.filter.placeholder
+                                                ? column.filter.placeholder
+                                                : selectedDataSource ? 'All Options' : 'Loading...',
+                                            dataSource: selectedDataSource,
+                                            searchable:
+                                                column.filter.searchable !== false,
+                                            // Enable clear functionality even when searchable is false
+                                            allowClearWhenNotSearchable:
+                                                column.filter.searchable === false,
+                                            // Explicitly enable clear icon
+                                            clearIcon: true,
+                                        };
+                                    } else {
+                                        // Show loading state for URL-based filters without data
+                                        filterEditor = null;
+                                        filterEditorProps = null;
                                     }
+
                                     break;
                                 default:
                                     filterEditor = null;
@@ -3205,6 +3199,12 @@ const DataGrid = forwardRef(
                 });
         }, [columns, filterDataSource, memoizedSettings]);
 
+        // Force re-render when filterDataSource updates to ensure dropdown filters get their data
+        const [renderKey, setRenderKey] = useState(0);
+        useEffect(() => {
+            setRenderKey(prev => prev + 1);
+        }, [filterDataSource]);
+
         useEffect(() => {
             if (setFilterData) {
                 setFilterData(filterValue);
@@ -3237,16 +3237,13 @@ const DataGrid = forwardRef(
                     ...filterDataSource[filterIndex],
                     dataset: data,
                 };
-                setFilterDataSource([
-                    ...filterDataSource.slice(0, filterIndex),
+                setFilterDataSource(prevState => [
+                    ...prevState.slice(0, filterIndex),
                     updatedFilter,
-                    ...filterDataSource.slice(filterIndex + 1),
+                    ...prevState.slice(filterIndex + 1),
                 ]);
             } else {
-                if (filterName.endsWith('.')) {
-                    filterName = filterName.slice(0, -1);
-                }
-
+                // Don't modify the filterName - keep it consistent with what createFilterName generates
                 const newFilter = {
                     id: filterName,
                     dataset: data,

package/src/components/Fetch.jsx

@@ -55,8 +55,8 @@ const generateCacheKey = (url, method, formData) => {
 const shouldCache = (method, url) => {
     const normalizedMethod = method.toUpperCase();
     
-    // Always cache GET requests
-    if (normalizedMethod === 'GET') return true;
+    // Don't cache GET requests
+    if (normalizedMethod === 'GET') return false;
     
     // Cache specific safe POST endpoints that return reference data
     const cacheableEndpoints = [

package/src/components/generic/GenericGrid.jsx

@@ -1218,7 +1218,7 @@ const GenericGrid = ({
     // Fetch filter options from URL
     const fetchFilterOptions = useCallback(async (filter) => {
         if (!filter.url) return;
-
+        
         try {
             const response = await CustomFetch(filter.url, 'POST', {});
             if (response.data && response.data.data) {
@@ -1233,6 +1233,11 @@ const GenericGrid = ({
         }
     }, []);
 
+    // Clear filter options when settings change to prevent stale data
+    useEffect(() => {
+        setFilterOptions({});
+    }, [settings]);
+
     // Initialize settings filters and fetch options
     useEffect(() => {
         if (settings?.filters && settings.filters.length > 0) {