@knovator/pagecreator-admin 0.5.5 → 0.5.6

package/index.cjs

@@ -2819,7 +2819,7 @@ const usePage = ({
     }
     onError(code, 'error', data === null || data === void 0 ? void 0 : data.message);
   }, [onError, onLogout]);
-  const getWidgets = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+  const getWidgets = React.useCallback(callback => __awaiter(void 0, void 0, void 0, function* () {
     try {
       setWidgetsLoading(true);
       const api = getApiType({
@@ -2846,6 +2846,7 @@ const usePage = ({
             value: item['_id'] || item['id']
           };
         });
+        if (typeof callback === 'function') callback(widgetsData);
         return setWidgets(widgetsData);
       }
       setWidgetsLoading(false);
@@ -2970,10 +2971,7 @@ const usePage = ({
   const onChangeFormState = (state, data) => {
     setItemData(data || null);
     setFormState(state);
-    if (state === 'UPDATE' && (data === null || data === void 0 ? void 0 : data.widgets)) {
-      setSelectedWidgets(data.widgets.map(widgetId => widgets.find(widget => widget['value'] === widgetId)).filter(widget => widget));
-      // setSelectedWidgets(widgets.filter((widget) => data.widgets.includes(widget.value)));
-    } else {
+    if (state === 'UPDATE' && (data === null || data === void 0 ? void 0 : data.widgets)) ; else {
       setSelectedWidgets([]);
     }
   };
@@ -2987,7 +2985,6 @@ const usePage = ({
   };
   React.useEffect(() => {
     if (_canList) getPages();
-    getWidgets();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pageSize, currentPage, _canList]);
   return {
@@ -3006,6 +3003,7 @@ const usePage = ({
     widgets,
     itemData,
     formState,
+    getWidgets,
     onCloseForm,
     widgetsLoading,
     selectedWidgets,
@@ -3027,6 +3025,7 @@ const PageContextProvider = ({
   closeForm: _closeForm = () => {},
   getPages: _getPages = () => {},
   loading: _loading = false,
+  getWidgets: _getWidgets = () => {},
   onChangeFormState: _onChangeFormState = () => {},
   onPageFormSubmit: _onPageFormSubmit = () => {},
   canAdd: _canAdd = false,
@@ -3060,6 +3059,7 @@ const PageContextProvider = ({
       closeForm: _closeForm,
       formState: _formState,
       loading: _loading,
+      getWidgets: _getWidgets,
       onChangeFormState: _onChangeFormState,
       canAdd: _canAdd,
       canUpdate: _canUpdate,
@@ -4042,6 +4042,7 @@ const PageForm = ({
     selectedWidgets,
     setSelectedWidgets,
     widgets,
+    getWidgets,
     onChangeWidgetSequence,
     canAdd,
     canUpdate
@@ -4055,6 +4056,12 @@ const PageForm = ({
     event.target.value = changeToCode(event.target.value);
     return event;
   }
+  function loadOptions(value, callback) {
+    getWidgets(widgetsData => {
+      if (callback) callback(widgetsData);
+      if (formState === 'UPDATE' && data) setSelectedWidgets(data.widgets.map(widgetId => widgetsData.find(widget => widget['value'] === widgetId)).filter(widget => widget));
+    });
+  }
   // Widget Form Functions
   const onDragEnd = result => {
     const {
@@ -4092,6 +4099,7 @@ const PageForm = ({
     options: widgets,
     selectedOptions: selectedWidgets,
     isMulti: true,
+    loadOptions: loadOptions,
     onChange: widgets => setSelectedWidgets(widgets)
   }];
   if (!canAdd && !canUpdate) return null;
@@ -4512,6 +4520,7 @@ const Page = ({
     itemData,
     setCurrentPage,
     formState,
+    getWidgets,
     onChangeFormState,
     onPageFormSubmit,
     onCloseForm,
@@ -4537,6 +4546,7 @@ const Page = ({
     currentPage: currentPage,
     onChangeFormState: onChangeFormState,
     pageSize: pageSize,
+    getWidgets: getWidgets,
     setCurrentPage: setCurrentPage,
     onPageFormSubmit: onPageFormSubmit,
     selectedWidgets: selectedWidgets,

package/index.js

@@ -2807,7 +2807,7 @@ const usePage = ({
     }
     onError(code, 'error', data === null || data === void 0 ? void 0 : data.message);
   }, [onError, onLogout]);
-  const getWidgets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+  const getWidgets = useCallback(callback => __awaiter(void 0, void 0, void 0, function* () {
     try {
       setWidgetsLoading(true);
       const api = getApiType({
@@ -2834,6 +2834,7 @@ const usePage = ({
             value: item['_id'] || item['id']
           };
         });
+        if (typeof callback === 'function') callback(widgetsData);
         return setWidgets(widgetsData);
       }
       setWidgetsLoading(false);
@@ -2958,10 +2959,7 @@ const usePage = ({
   const onChangeFormState = (state, data) => {
     setItemData(data || null);
     setFormState(state);
-    if (state === 'UPDATE' && (data === null || data === void 0 ? void 0 : data.widgets)) {
-      setSelectedWidgets(data.widgets.map(widgetId => widgets.find(widget => widget['value'] === widgetId)).filter(widget => widget));
-      // setSelectedWidgets(widgets.filter((widget) => data.widgets.includes(widget.value)));
-    } else {
+    if (state === 'UPDATE' && (data === null || data === void 0 ? void 0 : data.widgets)) ; else {
       setSelectedWidgets([]);
     }
   };
@@ -2975,7 +2973,6 @@ const usePage = ({
   };
   useEffect(() => {
     if (_canList) getPages();
-    getWidgets();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pageSize, currentPage, _canList]);
   return {
@@ -2994,6 +2991,7 @@ const usePage = ({
     widgets,
     itemData,
     formState,
+    getWidgets,
     onCloseForm,
     widgetsLoading,
     selectedWidgets,
@@ -3015,6 +3013,7 @@ const PageContextProvider = ({
   closeForm: _closeForm = () => {},
   getPages: _getPages = () => {},
   loading: _loading = false,
+  getWidgets: _getWidgets = () => {},
   onChangeFormState: _onChangeFormState = () => {},
   onPageFormSubmit: _onPageFormSubmit = () => {},
   canAdd: _canAdd = false,
@@ -3048,6 +3047,7 @@ const PageContextProvider = ({
       closeForm: _closeForm,
       formState: _formState,
       loading: _loading,
+      getWidgets: _getWidgets,
       onChangeFormState: _onChangeFormState,
       canAdd: _canAdd,
       canUpdate: _canUpdate,
@@ -4030,6 +4030,7 @@ const PageForm = ({
     selectedWidgets,
     setSelectedWidgets,
     widgets,
+    getWidgets,
     onChangeWidgetSequence,
     canAdd,
     canUpdate
@@ -4043,6 +4044,12 @@ const PageForm = ({
     event.target.value = changeToCode(event.target.value);
     return event;
   }
+  function loadOptions(value, callback) {
+    getWidgets(widgetsData => {
+      if (callback) callback(widgetsData);
+      if (formState === 'UPDATE' && data) setSelectedWidgets(data.widgets.map(widgetId => widgetsData.find(widget => widget['value'] === widgetId)).filter(widget => widget));
+    });
+  }
   // Widget Form Functions
   const onDragEnd = result => {
     const {
@@ -4080,6 +4087,7 @@ const PageForm = ({
     options: widgets,
     selectedOptions: selectedWidgets,
     isMulti: true,
+    loadOptions: loadOptions,
     onChange: widgets => setSelectedWidgets(widgets)
   }];
   if (!canAdd && !canUpdate) return null;
@@ -4500,6 +4508,7 @@ const Page = ({
     itemData,
     setCurrentPage,
     formState,
+    getWidgets,
     onChangeFormState,
     onPageFormSubmit,
     onCloseForm,
@@ -4525,6 +4534,7 @@ const Page = ({
     currentPage: currentPage,
     onChangeFormState: onChangeFormState,
     pageSize: pageSize,
+    getWidgets: getWidgets,
     setCurrentPage: setCurrentPage,
     onPageFormSubmit: onPageFormSubmit,
     selectedWidgets: selectedWidgets,

package/package.json

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

package/src/lib/context/PageContext.d.ts

@@ -2,6 +2,6 @@ import React from 'react';
 import { PageContextType } from '../types';
 interface PageContextProviderProps extends React.PropsWithChildren, Partial<PageContextType> {
 }
-declare const PageContextProvider: ({ t, list, widgets, formState, closeForm, getPages, loading, onChangeFormState, onPageFormSubmit, canAdd, canUpdate, selectedWidgets, setSelectedWidgets, onChangeWidgetSequence, currentPage, limits, pageSize, setCurrentPage, setPageSize, totalPages, totalRecords, canList, columns, data, canDelete, loader, children, }: PageContextProviderProps) => JSX.Element;
+declare const PageContextProvider: ({ t, list, widgets, formState, closeForm, getPages, loading, getWidgets, onChangeFormState, onPageFormSubmit, canAdd, canUpdate, selectedWidgets, setSelectedWidgets, onChangeWidgetSequence, currentPage, limits, pageSize, setCurrentPage, setPageSize, totalPages, totalRecords, canList, columns, data, canDelete, loader, children, }: PageContextProviderProps) => JSX.Element;
 export declare function usePageState(): PageContextType;
 export default PageContextProvider;

package/src/lib/hooks/usePage.d.ts

@@ -22,6 +22,7 @@ declare const usePage: ({ routes, defaultLimit, canList, preConfirmDelete, }: Us
     widgets: ObjectType[];
     itemData: any;
     formState: FormActionTypes | undefined;
+    getWidgets: (callback?: ((data: any) => void) | undefined) => Promise<void>;
     onCloseForm: () => void;
     widgetsLoading: boolean;
     selectedWidgets: {

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

@@ -70,6 +70,7 @@ export interface WidgetContextType {
 export interface PageContextType {
     t: (key: string) => string;
     list: any[];
+    getWidgets: (callback?: (data: any) => void) => void;
     formState: FormActionTypes | undefined;
     closeForm: () => void;
     onPageFormSubmit: (data: any) => void;