@knovator/pagecreator-admin 1.3.0 → 1.3.2

package/index.cjs

@@ -4050,7 +4050,7 @@ const DNDItemsList = ({
   }, item.label)), shouldShowSettings(item) && (/*#__PURE__*/React__default["default"].createElement("button", {
     type: "button",
     className: "khb_DND-item-settings",
-    onClick: () => onFilterClick === null || onFilterClick === void 0 ? void 0 : onFilterClick(item),
+    onClick: onFilterClick,
     "aria-label": "Open filter settings"
   }, /*#__PURE__*/React__default["default"].createElement(Settings, {
     className: "khb_DND-item-settings-icon"
@@ -4058,7 +4058,9 @@ const DNDItemsList = ({
 };
 
 const PageForm = ({
-  formRef
+  formRef,
+  onFilterClick,
+  filterQuery
 }) => {
   const {
     commonTranslations
@@ -4143,6 +4145,12 @@ const PageForm = ({
     } = result;
     if (destination) onChangeWidgetSequence(source.index, destination.index);
   };
+  const handlePageSubmit = formData => {
+    const dataToSubmit = typeof filterQuery !== 'undefined' ? Object.assign(Object.assign({}, formData), {
+      filterQuery
+    }) : formData;
+    return onPageFormSubmit(dataToSubmit);
+  };
   // Schemas
   const pageFormSchema = [{
     label: commonTranslations.name,
@@ -4191,7 +4199,7 @@ const PageForm = ({
     className: "khb_form"
   }, /*#__PURE__*/React__default["default"].createElement(SimpleForm, {
     schema: pageFormSchema,
-    onSubmit: onPageFormSubmit,
+    onSubmit: handlePageSubmit,
     ref: formRef,
     isUpdating: formState === 'UPDATE',
     register: register,
@@ -4202,6 +4210,7 @@ const PageForm = ({
     setError: setError
   }), /*#__PURE__*/React__default["default"].createElement(DNDItemsList, {
     onDragEnd: onDragEnd,
+    onFilterClick: onFilterClick,
     items: selectedWidgets
   }));
 };

package/index.js

@@ -4038,7 +4038,7 @@ const DNDItemsList = ({
   }, item.label)), shouldShowSettings(item) && (/*#__PURE__*/React.createElement("button", {
     type: "button",
     className: "khb_DND-item-settings",
-    onClick: () => onFilterClick === null || onFilterClick === void 0 ? void 0 : onFilterClick(item),
+    onClick: onFilterClick,
     "aria-label": "Open filter settings"
   }, /*#__PURE__*/React.createElement(Settings, {
     className: "khb_DND-item-settings-icon"
@@ -4046,7 +4046,9 @@ const DNDItemsList = ({
 };
 
 const PageForm = ({
-  formRef
+  formRef,
+  onFilterClick,
+  filterQuery
 }) => {
   const {
     commonTranslations
@@ -4131,6 +4133,12 @@ const PageForm = ({
     } = result;
     if (destination) onChangeWidgetSequence(source.index, destination.index);
   };
+  const handlePageSubmit = formData => {
+    const dataToSubmit = typeof filterQuery !== 'undefined' ? Object.assign(Object.assign({}, formData), {
+      filterQuery
+    }) : formData;
+    return onPageFormSubmit(dataToSubmit);
+  };
   // Schemas
   const pageFormSchema = [{
     label: commonTranslations.name,
@@ -4179,7 +4187,7 @@ const PageForm = ({
     className: "khb_form"
   }, /*#__PURE__*/React.createElement(SimpleForm, {
     schema: pageFormSchema,
-    onSubmit: onPageFormSubmit,
+    onSubmit: handlePageSubmit,
     ref: formRef,
     isUpdating: formState === 'UPDATE',
     register: register,
@@ -4190,6 +4198,7 @@ const PageForm = ({
     setError: setError
   }), /*#__PURE__*/React.createElement(DNDItemsList, {
     onDragEnd: onDragEnd,
+    onFilterClick: onFilterClick,
     items: selectedWidgets
   }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knovator/pagecreator-admin",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "dependencies": {
     "classnames": "^2.3.1",
     "react-beautiful-dnd": "^13.1.0",

package/src/lib/components/Page/Form/PageForm.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { FormProps } from '../../../types';
-declare const PageForm: ({ formRef }: FormProps) => JSX.Element | null;
+declare const PageForm: ({ formRef, onFilterClick, filterQuery }: FormProps) => JSX.Element | null;
 export default PageForm;

package/src/lib/types/components.d.ts

@@ -8,7 +8,7 @@ export interface DNDItemsListProps {
     items: OptionType[];
     listCode?: string;
     formatItem?: (code: string, data: any) => JSX.Element;
-    onFilterClick?: (item: OptionType) => void;
+    onFilterClick?: () => void;
 }
 export interface DrawerProps {
     children?: React.ReactNode;
@@ -134,6 +134,8 @@ export interface CustomInputType {
     setError: (msg: string) => void;
 }
 export interface FormProps {
+    onFilterClick?: () => void;
+    filterQuery?: string;
     formRef: MutableRefObject<HTMLFormElement | null>;
     customInputs?: Record<string, (props: InputRendererProps) => JSX.Element>;
 }