@omniumretail/component-library 1.1.73 → 1.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omniumretail/component-library",
-  "version": "1.1.73",
+  "version": "1.1.74",
   "private": false,
   "main": "dist/bundle.js",
   "typings": "./dist/types/index",

package/src/components/Category/CategoryContent/index.tsx

@@ -81,8 +81,6 @@ export const CategoryContent = (props: categoryContent) => {
         setSwitchYesOrNoAnswStatus(initialValues?.isYesOrNo || false);
     }, [form, initialValues]);
 
-    console.log();
-
     return (
         <div className={styles.categoryContent}>
             <div className={styles.title}>{t('components.categoryContent.editCategory')}</div>

package/src/components/Category/CategorySidebar/index.tsx

@@ -82,11 +82,11 @@ function remove_nested_element(data: DataNode[], index: string | number): DataNo
 export const CategorySidebar = (props: SidebarProps) => {
     const {
         categoryContentData,
-        categoryContentFinalData,
         data,
         hasHeader
     } = props;
 
+    const [sidebarInfo, setSidebarInfo] = useState<any>(hasHeader ? ["0"] : undefined);
     const [gData, setGData] = useState<DataNode[]>(() => {
         // Adiciona a categoria "Header" se hasHeader for true
         if (hasHeader && data?.length === 0) {
@@ -127,7 +127,6 @@ export const CategorySidebar = (props: SidebarProps) => {
     });
 
     const [expandedKeys] = useState([]);
-    const [sidebarInfo, setSidebarInfo] = useState<any>(undefined);
 
     const onDragEnter: TreeProps['onDragEnter'] = (info) => {
         // drag entered
@@ -242,6 +241,8 @@ export const CategorySidebar = (props: SidebarProps) => {
             ...prevCategories,
             { title: t('components.category.newCategory'), key: `${gData.length}` },
         ])
+
+        setSidebarInfo([`${gData.length}`]);
     }
 
     const removeCategory = () => {
@@ -257,28 +258,36 @@ export const CategorySidebar = (props: SidebarProps) => {
             selectKey: sidebarInfo,
             data: get_element_by_index(gData, sidebarInfo && sidebarInfo[0]),
         });
+
     }, [sidebarInfo]);
 
-    useEffect(() => {
+    function updateCategoryTitles(categories: any[]): any[] {
+        return categories.map((category: any, index: number) => {
+            if (category?.data) {
+                const titleWithoutCounts = category.title.replace(/\(Q: \d+\)/g, '').replace(/\(G: \d+\)/g, '').trim();
+                const updatedTitle = `${titleWithoutCounts} ${category.data.questions ? '(Q: ' + category.data.questions.length + ')' : ''} ${category.data.grade ? '(G: ' + category.data.grade + ')' : ''}`;
+                const updatedChildren = category.children ? updateCategoryTitles(category.children) : null;
 
-        const newGData = addPropertyByIndex(gData, sidebarInfo && sidebarInfo[0], "data", categoryContentData);
+                return { ...category, title: updatedTitle, children: updatedChildren };
+            }
+            return category;
+        });
+    }
 
-        function updateCategoryTitles(categories: any[]): any[] {
-            return categories.map((category: any, index: number) => {
-                if (category?.data) {
-                    const titleWithoutCounts = category.title.replace(/\(Q: \d+\)/g, '').replace(/\(G: \d+\)/g, '').trim();
-                    const updatedTitle = `${titleWithoutCounts} ${category.data.questions ? '(Q: ' + category.data.questions.length + ')' : ''} ${category.data.grade ? '(G: ' + category.data.grade + ')' : ''}`;
-                    const updatedChildren = category.children ? updateCategoryTitles(category.children) : null;
-                    
-                    return { ...category, title: updatedTitle, children: updatedChildren };
-                }
-                return category;
-            });
-        }
+    useEffect(() => {
+        if (hasHeader) {
+            if (categoryContentData?.categoryName) {
+                const newGData = addPropertyByIndex(gData, sidebarInfo && sidebarInfo[0], "data", categoryContentData);
+                const updatedGData: any[] = updateCategoryTitles(newGData);
 
-        const updatedGData: any[] = updateCategoryTitles(newGData);
+                setGData(updatedGData);
+            }
+        } else {
+            const newGData = addPropertyByIndex(gData, sidebarInfo && sidebarInfo[0], "data", categoryContentData);
+            const updatedGData: any[] = updateCategoryTitles(newGData);
 
-        setGData(updatedGData);
+            setGData(updatedGData);
+        }
     }, [categoryContentData]);
 
     useEffect(() => {
@@ -292,7 +301,7 @@ export const CategorySidebar = (props: SidebarProps) => {
 
     return (
         <div className={styles.categorySidebar}>
-            <div className={styles.title}>Categorias</div>
+            <div className={styles.title}>{t('components.categorySidBar.categories')}</div>
             <Button icon={<PlusOutlined />} onClick={addCategory}>
                 {t('components.categorySidBar.addCategory')}
             </Button>
@@ -307,6 +316,7 @@ export const CategorySidebar = (props: SidebarProps) => {
 
             <div className={styles.categoryViewer}>
                 <Tree
+                    defaultSelectedKeys={hasHeader ? ["0"] : undefined}
                     className="draggable-tree"
                     defaultExpandedKeys={expandedKeys}
                     draggable
@@ -315,6 +325,7 @@ export const CategorySidebar = (props: SidebarProps) => {
                     onDrop={onDrop}
                     treeData={gData}
                     onSelect={onSelect}
+                    selectedKeys={sidebarInfo}
                 />
             </div>
         </div>

package/src/components/Category/index.tsx

@@ -29,7 +29,7 @@ export const Category = (props: Category) => {
     }, [finalData]);
 
     useEffect(() => {
-        setShowContent(categorySidebarInfo?.selectKey?.length > 0);
+        setShowContent(categorySidebarInfo?.selectKey?.length);
     }, [categorySidebarInfo]);
 
     return (

package/src/locales/en.json

@@ -61,7 +61,8 @@
         },
         "categorySidBar": {
             "addCategory": "Add Category",
-            "removeCategory": "Remove Category"
+            "removeCategory": "Remove Category",
+            "categories": "Categories"
         },
         "categoryContent": {
             "message": "Please select a category in the sidebar",

package/src/locales/es.json

@@ -61,7 +61,8 @@
         },
         "categorySidBar": {
             "addCategory": "Agregar Categoría",
-            "removeCategory": "Eliminar Categoría"
+            "removeCategory": "Eliminar Categoría",
+            "categories": "Categorías"
         },
         "categoryContent": {
             "message": "Por favor, seleccione una categoría en la barra lateral",

package/src/locales/pt.json

@@ -61,7 +61,8 @@
         },
         "categorySidBar": {
             "addCategory": "Adicionar categoria",
-            "removeCategory": "Remover categoria"
+            "removeCategory": "Remover categoria",
+            "categories": "Categorias"
         },
         "categoryContent": {
             "message": "Por favor selecione uma categoria na barra lateral",