datastake-daf 0.6.237 → 0.6.239

package/dist/components/index.js

@@ -12642,6 +12642,15 @@ function Loading(_ref) {
 const {
   Paragraph: Paragraph$1
 } = antd.Typography;
+const checkHasActiveFilterValues = filtersConfig => {
+  if (!(filtersConfig !== null && filtersConfig !== void 0 && filtersConfig.filtersConfig) || !(filtersConfig !== null && filtersConfig !== void 0 && filtersConfig.selectedFilters)) return false;
+  const filterConfigKeys = Object.keys(filtersConfig.filtersConfig);
+  const selectedFilters = filtersConfig.selectedFilters;
+  return filterConfigKeys.some(key => {
+    const value = selectedFilters[key];
+    return value !== undefined && value !== null && value !== '';
+  });
+};
 const useHeader = _ref => {
   let {
     title = '',
@@ -12663,7 +12672,14 @@ const useHeader = _ref => {
     isViewMode = false,
     filtersConfig = {}
   } = _ref;
+  const hasActiveFilterValues = React.useMemo(() => checkHasActiveFilterValues(filtersConfig), [filtersConfig === null || filtersConfig === void 0 ? void 0 : filtersConfig.filtersConfig, filtersConfig === null || filtersConfig === void 0 ? void 0 : filtersConfig.selectedFilters]);
+  const [showFilters, setShowFilters] = React.useState(() => checkHasActiveFilterValues(filtersConfig));
   const hasFilters = filtersConfig && Object.keys(filtersConfig).length > 0;
+  React.useEffect(() => {
+    if (hasActiveFilterValues) {
+      setShowFilters(true);
+    }
+  }, [hasActiveFilterValues]);
   const downloadButtonAction = app && app === 'sbg' && isViewMode ? null : {
     onClick: onDownload,
     disabled: downloadDisabled,
@@ -12689,7 +12705,7 @@ const useHeader = _ref => {
     noMinWidth: true,
     squareIconButton: true,
     onClick: () => {
-      filtersConfig.setShowFilters(p => !p);
+      setShowFilters(p => !p);
     }
   }];
   const actionButtons = onDownload && _actionButtons.length < 3 ? [..._actionButtons, ...(hasFilters ? filterButton : []), downloadButton] : [..._actionButtons, ...(hasFilters ? filterButton : [])];
@@ -12835,10 +12851,10 @@ const useHeader = _ref => {
       children: hasFilters && /*#__PURE__*/jsxRuntime.jsx(SelectFilters, {
         t: filtersConfig.t,
         apiUrl: filtersConfig.apiUrl,
-        showFilters: filtersConfig.showFilters,
+        showFilters: showFilters,
         onApply: filtersConfig.onApply,
         options: filtersConfig.options,
-        setShowFilters: filtersConfig.setShowFilters,
+        setShowFilters: setShowFilters,
         language: filtersConfig.language,
         type: filtersConfig.type,
         filtersConfig: filtersConfig.filtersConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.237",
+	"version": "0.6.239",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Header/hook.js

@@ -11,6 +11,18 @@ import SelectFilters from '../Filters/selectFilters/index.jsx'
 
 const { Paragraph } = Typography
 
+const checkHasActiveFilterValues = (filtersConfig) => {
+  if (!filtersConfig?.filtersConfig || !filtersConfig?.selectedFilters) return false;
+  
+  const filterConfigKeys = Object.keys(filtersConfig.filtersConfig);
+  const selectedFilters = filtersConfig.selectedFilters;
+  
+  return filterConfigKeys.some(key => {
+    const value = selectedFilters[key];
+    return value !== undefined && value !== null && value !== '';
+  });
+};
+
 export const useHeader = ({
   title = '',
   tooltip = '',
@@ -31,7 +43,16 @@ export const useHeader = ({
   isViewMode = false,
   filtersConfig = {},
 }) => {
+  const hasActiveFilterValues = useMemo(() => checkHasActiveFilterValues(filtersConfig), [filtersConfig?.filtersConfig, filtersConfig?.selectedFilters]);
+
+  const [showFilters, setShowFilters] = useState(() => checkHasActiveFilterValues(filtersConfig))
   const hasFilters = filtersConfig && Object.keys(filtersConfig).length > 0
+
+  useEffect(() => {
+    if (hasActiveFilterValues) {
+      setShowFilters(true);
+    }
+  }, [hasActiveFilterValues]);
   const downloadButtonAction = app && app === 'sbg' && isViewMode ? null : {
     onClick: onDownload,
     disabled: downloadDisabled,
@@ -54,7 +75,7 @@ export const useHeader = ({
     noMinWidth: true,
     squareIconButton: true,
     onClick: () => {
-      filtersConfig.setShowFilters((p) => !p)
+      setShowFilters((p) => !p)
     }
   }]
   
@@ -212,10 +233,10 @@ export const useHeader = ({
               <SelectFilters
                 t={filtersConfig.t}
                 apiUrl={filtersConfig.apiUrl}
-                showFilters={filtersConfig.showFilters}
+                showFilters={showFilters}
                 onApply={filtersConfig.onApply}
                 options={filtersConfig.options}
-                setShowFilters={filtersConfig.setShowFilters}
+                setShowFilters={setShowFilters}
                 language={filtersConfig.language}
                 type={filtersConfig.type}
                 filtersConfig={filtersConfig.filtersConfig}