CFE-16 Merge branch 'bugfix/CFE-16_pending_notification' into 'develop'

src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabPanel/CallActions/index.jsx

@@ -2,27 +2,26 @@ import CallActionsCategories from "./CallActionCategories";
 import CallActionsSubcategories from "./CallActionSubcategories";
 import ActionHeader from "./ActionHeader";
 import CallActionDescription from "./CallActionDescription";
-import {CALL_ACTION} from "@/core/data/apiRoutes";
 import useRequest from "@/lib/app/hooks/useRequest";
 import useAnswers from "@/lib/callWidget/hooks/useAnswers";
 import {useState} from "react";
 import {Stack} from "@mui/material";
+import {CALL_ACTION} from "@/core/data/apiRoutes";
 
 function CallActions({tab}) {
-    const [description, setDescription] = useState('')
+    const [description, setDescription] = useState("")
     const requestServer = useRequest({auth: true});
     const {closeAnswerTab} = useAnswers();
 
     const handleSubcategoryButton = (category_id, subcategory_id) => {
+        let data = {}
+        data['category_id'] = category_id
+        data['subcategory_id'] = subcategory_id
+        if (description !== "")
+            data["description"] = description
+
         requestServer(`${CALL_ACTION}/${tab.id}`, "post", {
-            data: {
-                category_id,
-                subcategory_id,
-                description
-            },
-            success: {
-                notification: {show: false},
-            },
+            data
         })
             .then(() => {
                 closeAnswerTab(tab.id);

src/lib/callWidget/contexts/answers.jsx

@@ -1,5 +1,5 @@
-import { createContext, useEffect, useReducer, useState } from "react";
-import { GET_CATEGORY } from "@/core/data/apiRoutes";
+import {createContext, useEffect, useReducer, useState} from "react";
+import {GET_CATEGORY} from "@/core/data/apiRoutes";
 import useRequest from "@/lib/app/hooks/useRequest";
 
 const reducer = (state, action) => {
@@ -7,11 +7,11 @@ const reducer = (state, action) => {
         case "CHANGE_ACTIVE_TAB":
             return state.map((answer, index) =>
                 action.newValue === index
-                    ? { ...answer, active: true }
+                    ? {...answer, active: true}
                     : {
-                          ...answer,
-                          active: false,
-                      }
+                        ...answer,
+                        active: false,
+                    }
             );
         case "CHANGE_LIST":
             return [...action.newList];
@@ -19,10 +19,10 @@ const reducer = (state, action) => {
             return state.map((answer, index) =>
                 action.tab_id === answer.id
                     ? {
-                          ...answer,
-                          active_category_id: action.category_id,
-                      }
-                    : { ...answer }
+                        ...answer,
+                        active_category_id: action.category_id,
+                    }
+                    : {...answer}
             );
         default:
             return state;
@@ -32,17 +32,17 @@ const reducer = (state, action) => {
 const submission = (handleCategories, operation) => {
     switch (operation.type) {
         case "SET_CATEGORIES":
-            return { ...handleCategories, categoryLists: operation.categoriesByAPI };
+            return {...handleCategories, categoryLists: operation.categoriesByAPI};
         case "SET_SUBCATEGORIES":
-            return { ...handleCategories, subCategoryLists: operation.subCategoriesByAPI };
+            return {...handleCategories, subCategoryLists: operation.subCategoriesByAPI};
         default:
             return handleCategories;
     }
 };
 
 export const AnswersContext = createContext();
-export const AnswersProvider = ({ children }) => {
-    const requestServer = useRequest({ auth: true, notification: false });
+export const AnswersProvider = ({children}) => {
+    const requestServer = useRequest({auth: true, notification: false});
     const [openCallDialog, setOpenCallDialog] = useState(false);
     const [activeTab, setActiveTab] = useState(0);
     const [handleCategories, operation] = useReducer(submission, {
@@ -53,7 +53,7 @@ export const AnswersProvider = ({ children }) => {
 
     useEffect(() => {
         requestServer(GET_CATEGORY, "get")
-            .then(({ data }) => {
+            .then(({data}) => {
                 const subCategoriesByAPI = data.data;
                 const categoriesByAPI = subCategoriesByAPI.reduce((accumulator, currentValue) => {
                     if (!accumulator.find((item) => item.category_id === currentValue.category_id)) {
@@ -61,10 +61,11 @@ export const AnswersProvider = ({ children }) => {
                     }
                     return accumulator;
                 }, []);
-                operation({ type: "SET_CATEGORIES", categoriesByAPI });
-                operation({ type: "SET_SUBCATEGORIES", subCategoriesByAPI });
+                operation({type: "SET_CATEGORIES", categoriesByAPI});
+                operation({type: "SET_SUBCATEGORIES", subCategoriesByAPI});
             })
-            .catch(() => {});
+            .catch(() => {
+            });
     }, []);
 
     return (