datastake-daf 0.6.232 → 0.6.234

package/dist/components/index.js

@@ -9898,7 +9898,7 @@ const AjaxSelect$2 = ({
   const [initFetch, setInitFetch] = React.useState(false);
   const filterValues = React.useMemo(() => typeof config.filters === "function" ? config.filters(filters) : {}, [config, filters]);
   const [lastFilterValues, setLastFilterValues] = React.useState(filterValues);
-  const _app = config?.app || app;
+  const isFilter = config?.isOnFilter || false;
   const disabled = React.useMemo(() => typeof config.disabled === "function" ? config.disabled(filters) : true, [config, filters]);
   const value = React.useMemo(() => filters[k] || null, [k, filters]);
   const label = React.useMemo(() => {
@@ -9911,8 +9911,8 @@ const AjaxSelect$2 = ({
   React.useEffect(() => {
     if (Object.keys(lastFilterValues) && !disabled) {
       getAjaxData({
-        apiUrl,
-        app: _app,
+        apiUrl: isFilter ? config.filtersConfig?.apiUrl : apiUrl,
+        app: isFilter ? config.filtersConfig?.app : app,
         entity: config.entity,
         filterValues: lastFilterValues,
         mapper: config.mapper,
@@ -12021,9 +12021,9 @@ const SearchFilters = _ref => {
   };
   const openIfClosed = () => {
   };
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+  return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-search-filters', hasError && 'error', className]),
-    children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+    children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "input-container",
       ref: ref,
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -12069,20 +12069,7 @@ const SearchFilters = _ref => {
           children: t('Oops, looks like there are no search matches. Please try again!')
         })]
       })]
-    }), showFilter && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "flex flex-column",
-      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-        className: "ml-3 flex-1 squareIconButton no-min-width",
-        onClick: () => {
-          setShowFilters(p => !p);
-        },
-        icon: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-          name: "Filter",
-          width: 16,
-          height: 16
-        })
-      })
-    })]
+    })
   });
 };
 SearchFilters.propTypes = {

package/package.json

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

package/src/@daf/core/components/Filters/searchFilters/index.jsx

@@ -171,7 +171,7 @@ const SearchFilters = ({
           </div>
         )}
       </div>
-      {showFilter && (
+      {/* {showFilter && (
         <div className='flex flex-column'>
           <Button
             className="ml-3 flex-1 squareIconButton no-min-width"
@@ -180,12 +180,9 @@ const SearchFilters = ({
             }}
             icon={<CustomIcon name='Filter' width={16} height={16} />}
           >
-            {/* <div className='flex flex-column justify-content-center'>
-              <CustomIcon name='Filter' width={16} height={16} />
-            </div> */}
           </Button>
         </div>
-      )}
+      )} */}
     </div>
   );
 };

package/src/@daf/core/components/Filters/selectFilters/AjaxSelect.jsx

@@ -53,7 +53,7 @@ export const AjaxSelect = ({
     [config, filters]
   );
   const [lastFilterValues, setLastFilterValues] = useState(filterValues);
-  const _app = config?.app || app;
+  const isFilter = config?.isOnFilter || false;
 
   const disabled = useMemo(
     () =>
@@ -73,8 +73,8 @@ export const AjaxSelect = ({
   useEffect(() => {
     if (Object.keys(lastFilterValues) && !disabled) {
       getAjaxData({
-        apiUrl,
-        app: _app,
+        apiUrl: isFilter ? config.filtersConfig?.apiUrl : apiUrl,
+        app: isFilter ? config.filtersConfig?.app : app,
         entity: config.entity,
         filterValues: lastFilterValues,
         mapper: config.mapper,