@knovator/pagecreator-admin 1.6.8 → 1.6.10

package/index.cjs

@@ -7200,6 +7200,8 @@ const WidgetForm = ({
   const [blogLimit, setBlogLimit] = React.useState(10);
   const [blogCategories, setBlogCategories] = React.useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = React.useState(false);
+  const pagesLoadedRef = React.useRef(false);
+  const blogCategoryInitialized = React.useRef(false);
   React.useEffect(() => {
     if (data && formState === 'UPDATE') {
       const widgetType = widgetTypes.find(type => type.value === (data === null || data === void 0 ? void 0 : data.widgetType));
@@ -7264,78 +7266,44 @@ const WidgetForm = ({
   }, [currentItemsType, baseUrl, token, widgetRoutesPrefix, blogCategories.length]);
   // Set blog category and limit when editing a widget
   React.useEffect(() => {
-    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0) {
+    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0 && !blogCategoryInitialized.current) {
       // Set blog category if it exists in the data
-      if (data.blogCategory && !blogCategory) {
+      if (data.blogCategory) {
         const savedCategory = blogCategories.find(cat => cat.value === data.blogCategory);
         if (savedCategory) {
           setBlogCategory(savedCategory);
+          blogCategoryInitialized.current = true;
         }
       }
       // Set blog limit if it exists in the data
-      if (data.blogLimit && blogLimit === 10) {
+      if (data.blogLimit) {
         setBlogLimit(data.blogLimit);
       }
     }
-  }, [formState, data, currentItemsType, blogCategories, blogCategory, blogLimit]);
-  // Auto-fetch blogs when category or limit changes
+  }, [formState, data, currentItemsType, blogCategories]);
+  // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   React.useEffect(() => {
     if (currentItemsType === 'blog') {
-      if (blogCategory && blogLimit > 0) {
-        // Fetch blogs when category is selected
-        const fetchBlogsByCategory = () => __awaiter(void 0, void 0, void 0, function* () {
-          var _a;
-          try {
-            setCollectionItemsUpdated(false);
-            const response = yield commonApi({
-              baseUrl,
-              token,
-              method: 'POST',
-              url: `${widgetRoutesPrefix}/collection-data`,
-              data: {
-                search: '',
-                collectionName: 'blog',
-                collectionItems: []
-              },
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              onError: error => console.error('Error fetching blogs:', error)
-            });
-            if ((response === null || response === void 0 ? void 0 : response.code) === 'SUCCESS' && Array.isArray((_a = response.data) === null || _a === void 0 ? void 0 : _a.docs)) {
-              // Filter blogs by selected category
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              const filteredBlogs = response.data.docs
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              .filter(blog => Array.isArray(blog.category) &&
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              blog.category.some(cat => cat.id === blogCategory.value)).slice(0, blogLimit)
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              .map(blog => Object.assign(Object.assign({}, blog), {
-                value: blog._id,
-                label: blog.name || blog.title
-              }));
-              setSelectedCollectionItems(filteredBlogs);
-              setCollectionItemsUpdated(true);
-            }
-          } catch (error) {
-            console.error('Error fetching blogs:', error);
-          }
-        });
-        fetchBlogsByCategory();
-      } else if (!blogCategory) {
-        // Clear selected blogs when category is cleared
+      if (blogCategory || blogLimit > 0) {
+        // Clear selected collection items since server will fetch latest blogs based on category/limit
         setSelectedCollectionItems([]);
         setCollectionItemsUpdated(true);
       }
     }
-  }, [blogCategory, blogLimit, currentItemsType, baseUrl, token, widgetRoutesPrefix]);
+  }, [blogCategory, blogLimit, currentItemsType]);
   // Reset blog category and limit when itemsType changes away from 'blogs'
   React.useEffect(() => {
     if (currentItemsType !== 'blog') {
       setBlogCategory(null);
       setBlogLimit(10);
       setBlogCategories([]);
+      blogCategoryInitialized.current = false;
     }
   }, [currentItemsType]);
+  // Reset initialization flag when opening a different widget or changing form state
+  React.useEffect(() => {
+    blogCategoryInitialized.current = false;
+  }, [data === null || data === void 0 ? void 0 : data._id, formState]);
   // Watch blogLimit form value and update state
   const watchedBlogLimit = watch('blogLimit');
   React.useEffect(() => {
@@ -7344,6 +7312,18 @@ const WidgetForm = ({
       setBlogLimit(limit);
     }
   }, [watchedBlogLimit, currentItemsType]);
+  // Load pages data when Links widget type is selected
+  React.useEffect(() => {
+    if ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue && (selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value) === constants.pagesItemsTypeValue && !pagesLoadedRef.current) {
+      // Trigger initial load of pages
+      pagesLoadedRef.current = true;
+      getCollectionData(constants.pagesItemsTypeValue, '');
+    }
+    // Reset ref when widget type changes away from Links
+    if ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) !== constants.linksWidgetTypeValue) {
+      pagesLoadedRef.current = false;
+    }
+  }, [selectedWidgetType, selectedCollectionType, getCollectionData]);
   const onChangeSearch = (str, callback, collectionName) => {
     let collectionItems = [];
     let valueToSet = '';
@@ -7533,8 +7513,12 @@ const WidgetForm = ({
       }
       return item;
     });
-    const submitPayload = Object.assign(Object.assign({}, formData), {
+    const submitPayload = Object.assign(Object.assign(Object.assign(Object.assign({}, formData), {
       items
+    }), blogCategory && {
+      blogCategory: blogCategory.value
+    }), blogLimit && {
+      blogLimit
     });
     onPrimaryButtonClick === null || onPrimaryButtonClick === void 0 ? void 0 : onPrimaryButtonClick(undefined, submitPayload);
     onWidgetFormSubmit(submitPayload);
@@ -7780,7 +7764,7 @@ const WidgetForm = ({
     loadOptions: onChangeSearch,
     isLoading: collectionDataLoading,
     disabled: currentItemsType === 'blog' && !!blogCategory,
-    show: !itemsEnabled && ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.carouselWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.fixedCardWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue || !selectedWidgetType) && !!(selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value),
+    show: !itemsEnabled && currentItemsType !== 'blog' && ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.carouselWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.fixedCardWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue || !selectedWidgetType) && !!(selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value),
     formatOptionLabel: formatOptionLabel,
     listCode: selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value,
     customStyles: reactSelectStyles || {},

package/index.js

@@ -7188,6 +7188,8 @@ const WidgetForm = ({
   const [blogLimit, setBlogLimit] = useState(10);
   const [blogCategories, setBlogCategories] = useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = useState(false);
+  const pagesLoadedRef = useRef(false);
+  const blogCategoryInitialized = useRef(false);
   useEffect(() => {
     if (data && formState === 'UPDATE') {
       const widgetType = widgetTypes.find(type => type.value === (data === null || data === void 0 ? void 0 : data.widgetType));
@@ -7252,78 +7254,44 @@ const WidgetForm = ({
   }, [currentItemsType, baseUrl, token, widgetRoutesPrefix, blogCategories.length]);
   // Set blog category and limit when editing a widget
   useEffect(() => {
-    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0) {
+    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0 && !blogCategoryInitialized.current) {
       // Set blog category if it exists in the data
-      if (data.blogCategory && !blogCategory) {
+      if (data.blogCategory) {
         const savedCategory = blogCategories.find(cat => cat.value === data.blogCategory);
         if (savedCategory) {
           setBlogCategory(savedCategory);
+          blogCategoryInitialized.current = true;
         }
       }
       // Set blog limit if it exists in the data
-      if (data.blogLimit && blogLimit === 10) {
+      if (data.blogLimit) {
         setBlogLimit(data.blogLimit);
       }
     }
-  }, [formState, data, currentItemsType, blogCategories, blogCategory, blogLimit]);
-  // Auto-fetch blogs when category or limit changes
+  }, [formState, data, currentItemsType, blogCategories]);
+  // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   useEffect(() => {
     if (currentItemsType === 'blog') {
-      if (blogCategory && blogLimit > 0) {
-        // Fetch blogs when category is selected
-        const fetchBlogsByCategory = () => __awaiter(void 0, void 0, void 0, function* () {
-          var _a;
-          try {
-            setCollectionItemsUpdated(false);
-            const response = yield commonApi({
-              baseUrl,
-              token,
-              method: 'POST',
-              url: `${widgetRoutesPrefix}/collection-data`,
-              data: {
-                search: '',
-                collectionName: 'blog',
-                collectionItems: []
-              },
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              onError: error => console.error('Error fetching blogs:', error)
-            });
-            if ((response === null || response === void 0 ? void 0 : response.code) === 'SUCCESS' && Array.isArray((_a = response.data) === null || _a === void 0 ? void 0 : _a.docs)) {
-              // Filter blogs by selected category
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              const filteredBlogs = response.data.docs
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              .filter(blog => Array.isArray(blog.category) &&
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              blog.category.some(cat => cat.id === blogCategory.value)).slice(0, blogLimit)
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              .map(blog => Object.assign(Object.assign({}, blog), {
-                value: blog._id,
-                label: blog.name || blog.title
-              }));
-              setSelectedCollectionItems(filteredBlogs);
-              setCollectionItemsUpdated(true);
-            }
-          } catch (error) {
-            console.error('Error fetching blogs:', error);
-          }
-        });
-        fetchBlogsByCategory();
-      } else if (!blogCategory) {
-        // Clear selected blogs when category is cleared
+      if (blogCategory || blogLimit > 0) {
+        // Clear selected collection items since server will fetch latest blogs based on category/limit
         setSelectedCollectionItems([]);
         setCollectionItemsUpdated(true);
       }
     }
-  }, [blogCategory, blogLimit, currentItemsType, baseUrl, token, widgetRoutesPrefix]);
+  }, [blogCategory, blogLimit, currentItemsType]);
   // Reset blog category and limit when itemsType changes away from 'blogs'
   useEffect(() => {
     if (currentItemsType !== 'blog') {
       setBlogCategory(null);
       setBlogLimit(10);
       setBlogCategories([]);
+      blogCategoryInitialized.current = false;
     }
   }, [currentItemsType]);
+  // Reset initialization flag when opening a different widget or changing form state
+  useEffect(() => {
+    blogCategoryInitialized.current = false;
+  }, [data === null || data === void 0 ? void 0 : data._id, formState]);
   // Watch blogLimit form value and update state
   const watchedBlogLimit = watch('blogLimit');
   useEffect(() => {
@@ -7332,6 +7300,18 @@ const WidgetForm = ({
       setBlogLimit(limit);
     }
   }, [watchedBlogLimit, currentItemsType]);
+  // Load pages data when Links widget type is selected
+  useEffect(() => {
+    if ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue && (selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value) === constants.pagesItemsTypeValue && !pagesLoadedRef.current) {
+      // Trigger initial load of pages
+      pagesLoadedRef.current = true;
+      getCollectionData(constants.pagesItemsTypeValue, '');
+    }
+    // Reset ref when widget type changes away from Links
+    if ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) !== constants.linksWidgetTypeValue) {
+      pagesLoadedRef.current = false;
+    }
+  }, [selectedWidgetType, selectedCollectionType, getCollectionData]);
   const onChangeSearch = (str, callback, collectionName) => {
     let collectionItems = [];
     let valueToSet = '';
@@ -7521,8 +7501,12 @@ const WidgetForm = ({
       }
       return item;
     });
-    const submitPayload = Object.assign(Object.assign({}, formData), {
+    const submitPayload = Object.assign(Object.assign(Object.assign(Object.assign({}, formData), {
       items
+    }), blogCategory && {
+      blogCategory: blogCategory.value
+    }), blogLimit && {
+      blogLimit
     });
     onPrimaryButtonClick === null || onPrimaryButtonClick === void 0 ? void 0 : onPrimaryButtonClick(undefined, submitPayload);
     onWidgetFormSubmit(submitPayload);
@@ -7768,7 +7752,7 @@ const WidgetForm = ({
     loadOptions: onChangeSearch,
     isLoading: collectionDataLoading,
     disabled: currentItemsType === 'blog' && !!blogCategory,
-    show: !itemsEnabled && ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.carouselWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.fixedCardWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue || !selectedWidgetType) && !!(selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value),
+    show: !itemsEnabled && currentItemsType !== 'blog' && ((selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.carouselWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.fixedCardWidgetTypeValue || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.linksWidgetTypeValue || !selectedWidgetType) && !!(selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value),
     formatOptionLabel: formatOptionLabel,
     listCode: selectedCollectionType === null || selectedCollectionType === void 0 ? void 0 : selectedCollectionType.value,
     customStyles: reactSelectStyles || {},

package/package.json

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