Merge branch 'release' into CR/product_detail

1 files changed, 21 insertions, 10 deletions

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 14015e28..ca104ada 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState, useCallback } from 'react';
-import useCategoryManagement from '../hooks/useCategoryManagement';
-import {fetchPopulerProductSolr} from '../api/categoryManagementApi'
+import {fetchCategoryManagementSolr} from '../api/categoryManagementApi'
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
@@ -14,7 +13,20 @@ import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
 
-  const { categoryManagement } = useCategoryManagement();
+  const [categoryManagement, setCategoryManagement] = useState([])
+  const [isLoading, setIsLoading] = useState(false)
+  const loadBrand = useCallback(async () => {
+    setIsLoading(true)
+    const items = await fetchCategoryManagementSolr();
+    
+    setIsLoading(false)
+    setCategoryManagement(items)
+  }, [])
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
+  
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
   
@@ -55,18 +67,17 @@ const CategoryDynamic = () => {
  
   return (
     <div>
-        {categoryManagement && categoryManagement.data?.map((category) => {
+        {categoryManagement && categoryManagement?.map((category) => {
           // const countLevel1 = categoryData[category.categoryIdI] || 0;
-          
           return (
-            <Skeleton key={category.id} isLoaded={categoryManagement}>
+            <Skeleton key={category.id} isLoaded={!isLoading}>
               <div key={category.id}>
                 <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
                   <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
                   {/* <Skeleton isLoaded={countLevel1 != 0}>
                     <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
                   </Skeleton> */}
-                  <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                  <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                 </div>
                 
                 {/* Swiper for SubCategories */}
@@ -94,13 +105,13 @@ const CategoryDynamic = () => {
                                     {countLevel2} Produk tersedia
                                   </p>
                                 </Skeleton> */}
-                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                               </div>
                             </div>
                             <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px] min-h-[240px] content-start'>
-                              {subCategory.childFrontendIdI.map((childCategory) => (
+                              {subCategory.child_frontend_id_i.map((childCategory) => (
                                 <div key={childCategory.id} className=''>
-                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.id_level_3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
                                     <NextImage
                                       src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
                                       alt={childCategory.name}