@bjsdistribution/dms-client-return 0.0.89 → 0.0.90

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.89",
+  "version": "0.0.90",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "testEnvironment": "jest-environment-jsdom-sixteen"
   },
   "devDependencies": {
-    "@bjsdistribution/dms-component-library": "0.1.82",
+    "@bjsdistribution/dms-component-library": "0.1.87",
     "@size-limit/preset-small-lib": "^11.0.1",
     "@tippyjs/react": "^4.2.6",
     "@types/react": "^18.2.47",

package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx

@@ -24,7 +24,6 @@ import {
 import styled from 'styled-components';
 import { useApiHook } from '@bjsdistribution/dms-component-library';
 import { ApiResponse } from '../../common/interface';
-import Loader from '../../header/loader/Loader';
 import CaretDownFilledIcon from '../../../../common/CaretDownFilledIcon';
 import SortIcon from '../../../../common/SortIcon';
 
@@ -163,7 +162,6 @@ const OrderTable = () => {
   const {
     data: actionResponse,
     setShouldPerformAction: setAssignAction,
-    loading: AssignLoading,
     error: apiError,
   } = useApiHook<{
     data: ApiResponse[];
@@ -212,7 +210,6 @@ const OrderTable = () => {
 
   return (
     <>
-      {AssignLoading && <Loader />}
       <StyledTableWrapper className="fortables">
         <StyledTable>
           <thead>

package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -7,7 +7,6 @@ import {
   useGroupedPayload,
   useLocationData,
   useNewReturnPayload,
-  usePostLoading,
   useReturnPayload,
   useSelectAll,
   useSelectedOrders,
@@ -27,7 +26,6 @@ import { filtersReducerAtom } from '../../header-filters/filterStore';
 import { displayValueOrNA } from '../../shared/utlis';
 import PrintDropDownReturn from '../../../order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn';
 import { format } from 'date-fns';
-import Loader from '../../header/loader/Loader';
 import CaretDownFilledIcon from '../../../../common/CaretDownFilledIcon';
 import SortIcon from '../../../../common/SortIcon';
 const ReturnOrderTable = () => {
@@ -38,7 +36,7 @@ const ReturnOrderTable = () => {
   const { 'x-filters': filters, 'x-pagination': pagination } = state;
   const [returnData, setReturnData] = useReturnData();
   const [load, setLoading] = useLoading();
-  const [postLoading] = usePostLoading();
+  // const [postLoading] = usePostLoading();
   const dropdownRefParent = useRef<HTMLDivElement>(null);
   const dropdownRef = useRef<HTMLDivElement>(null);
   const [printToogle, setPrintToggle] = usePrintOptionTOggle();
@@ -318,7 +316,6 @@ const ReturnOrderTable = () => {
 
   return (
     <>
-      {postLoading && <Loader />}
       <StyledTableWrapper className="fortables">
         <StyledTable>
           <thead>

package/src/components/order-daily-overview/table/ReturnTable.tsx

@@ -19,7 +19,6 @@ import { filtersReducerAtom } from '../header-filters/filterStore';
 import { useCustomerData } from '../../store';
 import SortIcon from '../../../common/SortIcon';
 import CaretDownFilledIcon from '../../../common/CaretDownFilledIcon';
-import Loader from '../header/loader/Loader';
 
 interface ApiResponse {
   message: string;
@@ -177,7 +176,6 @@ const ReturnTable: React.FC = () => {
 
   return (
     <>
-      {statsLoading && <Loader />}
       <StyledTableWrapper>
         <StyledTable>
           <thead>

package/src/components/order-view/flags-action-modal/Actions.tsx

@@ -3,33 +3,49 @@ import styled from 'styled-components';
 import {
   Button,
   RadioButtonGroup,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
-
-import {
-  useFlagsLoading,
-  useSingleFlagData,
-  useSinglePayload,
-} from '../order-actions/store';
+import { useSingleFlagData, useSinglePayload } from '../order-actions/store';
 import { useCurrentAction } from '../store';
 import Tippy from '@tippyjs/react';
-import useUpdateFlag from '../order-actions/hooks/useUpdateFlag';
-import useFetchUnresolvedTasks from '../order-actions/hooks/useAllTaskData';
+import { notification } from 'antd';
+import { ApiResponse } from '../types';
 
-function ActionSection() {
+function ActionSection({ callUnresolvedTaskApi }: any) {
   const [, setCurrentAction] = useCurrentAction();
   const [payload] = useSinglePayload();
   const [dataArray] = useSingleFlagData();
-  const fetchData = useFetchUnresolvedTasks();
-  const [, setLoading] = useFlagsLoading();
 
-  const updateFlag = useUpdateFlag();
+  //flag PUT API
+  const { fetchData: callFlagUpdateAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/update/`,
+    method: 'PUT',
+  });
 
   const onSubmit = async () => {
-    setLoading(true);
-    await updateFlag([payload]);
-    setCurrentAction(undefined);
-    setLoading(false);
-    await fetchData();
+    let response = (await callFlagUpdateAPI({
+      payload: [payload],
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (response.code == 200 && response.data) {
+      notification.success({
+        message: 'Success',
+        description: `${response.message}`,
+      });
+      setCurrentAction(undefined);
+      await callUnresolvedTaskApi();
+    }
+    if (response?.code == null && response.error) {
+      return notification.error({
+        message: 'Failure',
+        description: `${response.error}`,
+      });
+    }
   };
 
   const onCancel = () => {

package/src/components/order-view/flags-action-modal/Header.tsx

@@ -4,20 +4,27 @@ import {
   CancelAndCompleteAction,
   CancelationModal,
   CrossIcon,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
 import { useResolvedPayload, useSingleFlagData } from '../order-actions/store';
-import useUpdateFlag from '../order-actions/hooks/useUpdateFlag';
 import { useCurrentAction } from '../store';
-import useFetchUnresolvedTasks from '../order-actions/hooks/useAllTaskData';
+import { notification } from 'antd';
+import { ApiResponse } from '../types';
 
-function HeaderSection() {
+function HeaderSection({ callUnresolvedTaskApi }: any) {
   const [dataArray] = useSingleFlagData();
   const [forResolvedPayload, setPayload] = useResolvedPayload();
   const [, setCurrentAction] = useCurrentAction();
-  const updateFlag = useUpdateFlag();
-  const fetchData = useFetchUnresolvedTasks();
   const [isModalOpen, setIsModalOpen] = useState(false);
 
+  //flag PUT API
+  const { fetchData: callFlagUpdateAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/update/`,
+    method: 'PUT',
+  });
+
   useEffect(() => {
     if (dataArray) {
       setPayload({
@@ -37,10 +44,28 @@ function HeaderSection() {
   };
 
   const saveButton = async () => {
-    await updateFlag([forResolvedPayload]);
-    await fetchData();
-    setIsModalOpen(false); // Close modal after API call
-    onCancel()
+    let response = (await callFlagUpdateAPI({
+      payload: [forResolvedPayload],
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (response.code == 200 && response.data) {
+      notification.success({
+        message: 'Success',
+        description: `${response?.message}`,
+      });
+      setIsModalOpen(false); // Close modal after API call
+      setCurrentAction(undefined);
+      await callUnresolvedTaskApi();
+    }
+    if (response?.code == null && response.error) {
+      return notification.error({
+        message: 'Failure',
+        description: `${response?.error}`,
+      });
+    }
   };
 
   const onCancel = () => {

package/src/components/order-view/flags-action-modal/index.tsx

@@ -3,6 +3,7 @@ import styled from 'styled-components';
 import {
   BackgroundModal,
   useApiHook,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
 import HeaderSection from './Header';
 import TextSection from './TextSection';
@@ -13,7 +14,6 @@ import {
   useCategoryData,
   useDepartmentData,
   useFlagRefId,
-  useFlagsLoading,
   useSingleFlagData,
   useSinglePayload,
   useTaskPriority,
@@ -21,8 +21,6 @@ import {
   useTaskTypeExtended,
 } from '../order-actions/store';
 import DetailSection from './DetailSection';
-import Loader from '../../order-daily-overview/header/loader/Loader';
-import useFetchSingleFlagsData from '../order-actions/hooks/useFetchSingleFlagData';
 import { allTypes } from '../order-actions/types';
 
 interface ApiResponse {
@@ -36,10 +34,8 @@ interface ApiResponse {
 function ViewFlag() {
   const [dataArray, setSingleFlag] = useSingleFlagData();
   const [flagRefId] = useFlagRefId();
-  //const [ssoToken] = useSsoToken();
-  const [loading, setLoading] = useFlagsLoading();
   const [payload, setPayload] = useSinglePayload();
-  const fetchData = useFetchSingleFlagsData();
+  // const fetchData = useFetchSingleFlagsData();
   const [staticData, setStaticData] = useAllStaticData();
   const [, setPriority] = useTaskPriority();
   const [, setTaskCategory] = useCategoryData();
@@ -47,6 +43,25 @@ function ViewFlag() {
   const [, setTaskTypeExtended] = useTaskTypeExtended();
   const [, setDepartmentData] = useDepartmentData();
 
+  //single flag data
+  const {
+    data: singleFlagData,
+    fetchData: fetchedSingleFlagData,
+    loading,
+  } = useAxios<ApiResponse>({
+    endpoint: `/tasks/${flagRefId}`,
+    method: 'GET',
+  });
+
+  //Unresolved API
+  const { fetchData: callUnresolvedTaskApi } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+  });
+
   // API Call
   const { data: fetchedStaticData } = useApiHook<ApiResponse>({
     endpoint: `/tasks/getStaticData/all/`,
@@ -72,17 +87,18 @@ function ViewFlag() {
     }
   }, [staticData]);
 
-  const fetchAndSetSingleFlagData = async () => {
-    setLoading(true);
-    const result = await fetchData();
-    setSingleFlag(result);
-    setLoading(false);
-  };
-
   useEffect(() => {
-    fetchAndSetSingleFlagData();
+    if (flagRefId) {
+      fetchedSingleFlagData();
+    }
   }, [flagRefId]);
 
+  useEffect(() => {
+    if (singleFlagData && singleFlagData?.data) {
+      setSingleFlag(singleFlagData?.data[0]);
+    }
+  }, [loading]);
+
   useEffect(() => {
     setPayload({
       ...payload,
@@ -97,19 +113,20 @@ function ViewFlag() {
 
   return (
     <>
-      <BackgroundModals>
-        {dataArray && loading && <Loader />}
-        <MainContainer>
-          <HeaderSection />
-          <DetailSection />
-          <TextSection />
-          <ButtonsSection />
-          <SectionsContainer>
-            <ActionSection />
-            <RadioButtonsSection />
-          </SectionsContainer>
-        </MainContainer>
-      </BackgroundModals>
+      {dataArray && (
+        <BackgroundModals>
+          <MainContainer>
+            <HeaderSection callUnresolvedTaskApi={callUnresolvedTaskApi} />
+            <DetailSection />
+            <TextSection />
+            <ButtonsSection />
+            <SectionsContainer>
+              <ActionSection callUnresolvedTaskApi={callUnresolvedTaskApi} />
+              <RadioButtonsSection />
+            </SectionsContainer>
+          </MainContainer>
+        </BackgroundModals>
+      )}
     </>
   );
 }

package/src/components/order-view/index.tsx

@@ -6,8 +6,7 @@ import SystemLogs from './system-event-logs/expanded-content';
 import GeneralHeader from './general-information';
 import ProductsInfo from './products-info';
 import OrderActions from './order-actions';
-import { useApiHook } from '@bjsdistribution/dms-component-library';
-
+import { useApiHook, useAxios } from '@bjsdistribution/dms-component-library';
 import {
   useOrderDetails,
   useOrderStaticData,
@@ -16,7 +15,6 @@ import {
   useDepotOptions,
   usePrevOrderDetails,
   useOrderProductsResources,
-  // useOrderProductsToolbox,
   useCustomerInfo,
   useLocationOptions,
   useOrderProductSystemLogs,
@@ -31,9 +29,7 @@ import {
 } from './store';
 import { OrdersType } from './types';
 import { useLocation } from 'react-router-dom';
-import useSystemLogs from './hooks/useGetSystemLogs';
 import { notification } from 'antd';
-// import { useAssignData } from '../store';
 import DetailsFilters from './details-filters/DetailsFilters';
 import { useSubContracterData, useVisibilityData } from '../store';
 import Notification from './notification';
@@ -65,22 +61,41 @@ function OrderView() {
   const [, setCustomerInfo] = useCustomerInfo();
   const [, setLocationOptions] = useLocationOptions();
   const [orderResources, setOrderResources] = useOrderProductsResources();
-  // const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();
   const [, setOrderProductId] = useOrderProductId();
   const [, setCUstomerId] = useCUstomerId();
   const [, setRouteId] = useRouteId();
   const [liveRecalling] = useLiveRecalling();
-  const systemLogsData = useSystemLogs();
   const [, setVisibilityData] = useVisibilityData();
   const [, setSubContracterData] = useSubContracterData();
   const [recallOrders] = useGlobalStateHitOrder();
   const [, setStatusVal] = useAllOrderStatus();
+  const gsitId = orderDetails?.gsit_order_id;
 
   useEffect(() => {
     setStatusVal(orderDetails?.status_value);
   }, [orderDetails?.status_value]);
 
+  //get system event logs
+  const {
+    data: fetchedSystemLogsData,
+    fetchData: callSystemLogsAPI,
+    loading: logsLoading,
+  } = useAxios<{
+    data: any[];
+  }>({
+    endpoint: `/events/get/event/`,
+    method: 'GET',
+    pagination: { page: 1, per_page: 100 },
+    filters: [
+      {
+        field: 'object_id',
+        op: '=',
+        value: `${gsitId}`,
+      },
+    ],
+  });
+
   // query param
   const location = useLocation();
   const [filters, setFilters] = useState<
@@ -131,7 +146,6 @@ function OrderView() {
       }
     } else {
       const paths = location.pathname.split('/');
-      console.log(paths[paths.length - 1], 'paths');
       setOrderId(paths[paths.length - 1]);
     }
   }, [location.search, loadingExternal]);
@@ -359,25 +373,23 @@ function OrderView() {
       setLocationOptions(locationOptions);
     }
   }, [dataLoading]);
-  let gsitId = orderDetails?.gsit_order_id;
   const [, setSystemLogsEvents] = useOrderProductSystemLogs();
 
-  const fetchReminderData = async () => {
-    const result = await systemLogsData();
-    setSystemLogsEvents(result);
-  };
+  useEffect(() => {
+    if (fetchedSystemLogsData && fetchedSystemLogsData?.data) {
+      setSystemLogsEvents(fetchedSystemLogsData?.data);
+    }
+  }, [logsLoading]);
 
   useEffect(() => {
     if (gsitOrderId) {
-      fetchReminderData();
+      callSystemLogsAPI();
     }
     return () => {
       setGsitOrderId(undefined);
     };
   }, [gsitId]);
 
-  console.log(orderId, 'orderId');
-
   const { data: fetchedSubcontractotData, loading: apiLoading } = useApiHook<{
     data: ApiResponse[];
   }>({

package/src/components/order-view/notes/AddNote.tsx

@@ -54,7 +54,7 @@ function AddNote() {
         },
       ],
     };
-
+    //to change
     try {
       const response = await fetch(endpoint, {
         method: 'POST',

package/src/components/order-view/notification/index.tsx

@@ -1,13 +1,13 @@
 import {
   SectionHeader,
   useApiHook,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
 import React, { useEffect, useState } from 'react';
 import Tabs from './Tabs';
 import styled from 'styled-components';
 import { useInfoType, useOrderDetails, useTabType } from '../store';
 import NotifyFlag from '../../../assets/icons/NotifyFlag';
-import useFetchUnresolvedTasks from '../order-actions/hooks/useAllTaskData';
 import {
   useNotificationData,
   useOrderNotify,
@@ -15,7 +15,6 @@ import {
   useRouteDetails,
   useTaskLoading,
 } from '../order-actions/store';
-import useFetchReminders from '../order-actions/hooks/useAllReminderData';
 
 interface ApiResponse {
   message: string;
@@ -29,8 +28,6 @@ interface ApiResponse {
 function Notification() {
   const [activeTab, setActiveTab] = useTabType();
   const [, setShowMoreInfo] = useInfoType();
-  const TaskData = useFetchUnresolvedTasks();
-  const ReminderData = useFetchReminders();
   const [OrderData] = useOrderDetails();
   const [notificationData, setNotififcationData] = useNotificationData();
   const [flagLoading] = useTaskLoading();
@@ -43,22 +40,52 @@ function Notification() {
   const [activeReminders, setActiveReminders] = useState([]);
   const [closedReminders, setCloseReminders] = useState([]);
 
+  //Unresolved API
+  const {
+    data: fetchedUnresolvedData,
+    loading: unresolvedLoading,
+    fetchData: callUnresolvedTaskApi,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: [{ field: 'order_id', op: '=', value: OrderData.id }],
+  });
+
+  //reminder get
+  const {
+    data: fetchedReminderData,
+    loading: reminderLoading,
+    fetchData: callReminderApi,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/reminder/get/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: [{ field: 'order_id', op: '=', value: OrderData.id }],
+  });
+
   const handleTabChange = (tab: string) => {
     setActiveTab(tab);
     setShowMoreInfo(false);
   };
 
   //flags notification data
-  const fetchTaskData = async () => {
-    const result = await TaskData();
-    setNotififcationData(result);
-  };
+  useEffect(() => {
+    if (fetchedUnresolvedData && fetchedUnresolvedData?.data) {
+      setNotififcationData(fetchedUnresolvedData?.data);
+    }
+  }, [unresolvedLoading]);
 
-  //reminder noitification
-  const fetchReminderData = async () => {
-    const result = await ReminderData();
-    setReminderData(result);
-  };
+  //reminder data set
+  useEffect(() => {
+    if (fetchedReminderData && fetchedReminderData?.data) {
+      setReminderData(fetchedReminderData?.data);
+    }
+  }, [reminderLoading]);
 
   //route API calling...
   const { data: fetchedData, setShouldPerformAction } = useApiHook<{
@@ -71,8 +98,8 @@ function Notification() {
 
   useEffect(() => {
     if (OrderData.id) {
-      fetchTaskData();
-      fetchReminderData();
+      callReminderApi();
+      callUnresolvedTaskApi();
     }
   }, [OrderData.id]);
 

package/src/components/order-view/order-actions/actions/add-resources/index.tsx

@@ -9,29 +9,33 @@ import {
   useAtom,
   useCurrentAction,
   useCustomerInfo,
+  useOrderId,
   useOrderStaticData,
 } from '../../../store';
 import {
   selectedCategoryIdAtom,
   selectedDocumentTypeAtom,
   selectedTypeAtom,
+  selectedVisibilityAtom,
   setResourcesCall,
 } from '../../store';
 import OrderActionsDropdown from '../../Dropdown';
 import { notification } from 'antd';
-import useUploadFiles from '../../../hooks/AddResources';
+import { ApiResponse } from '../../../types';
+import { useAxios } from '@bjsdistribution/dms-component-library';
 
 function AddResources() {
   const [, setCurrentAction] = useCurrentAction();
   const [staticOrderData] = useOrderStaticData();
   const [, setSelectedType] = useAtom(selectedTypeAtom);
   const [uploadedFiles, setUploadedFiles] = useAtom(uploadedFilesAtom);
-  const uploadFiles = useUploadFiles();
   const [isFormValid, setIsFormValid] = useState(false);
   const [selectedCategoryId] = useAtom(selectedCategoryIdAtom);
   const [selectedDocumentType] = useAtom(selectedDocumentTypeAtom);
   const [selectedType] = useAtom(selectedTypeAtom);
   const [, setResources] = useAtom(setResourcesCall);
+  const [orderId] = useOrderId();
+  const [selectedVisibility] = useAtom(selectedVisibilityAtom);
 
   const onClose = () => {
     setCurrentAction(undefined);
@@ -54,6 +58,17 @@ function AddResources() {
       setSelectedType(selectedOption.value);
     }
   };
+
+  // upload files
+  const { fetchData: callUploadFile } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/${orderId}/order_resources/?document_type=${selectedDocumentType}&type=${selectedType}&category=${selectedCategoryId}&visibility=${selectedVisibility}`,
+    method: 'POST',
+  });
+
+  //upload files
+
   const handleSubmit = async () => {
     if (!uploadedFiles) {
       notification.error({ message: 'No files selected' });
@@ -68,15 +83,29 @@ function AddResources() {
     }
 
     try {
-      const response = await uploadFiles(formData);
-      console.log('Upload successful:', response);
-      notification.success({ message: 'Files uploaded successfully' });
-      onClose(); // Close modal after successful upload
-      setResources(false);
-
-      setTimeout(() => {
-        setResources(true);
-      }, 1000);
+      let response = (await callUploadFile({
+        payload: formData,
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
+      if (response?.code == 200 && response?.data?.length > 0) {
+        notification.success({
+          message: 'Success',
+          description: `${response?.message}`,
+        });
+        onClose(); // Close modal after successful upload
+        setResources(false);
+        setTimeout(() => {
+          setResources(true);
+        }, 1000);
+      } else {
+        notification.error({
+          message: 'Error',
+          description: `${response?.error}`,
+        });
+      }
     } catch (error) {
       console.error('Upload failed:', error);
     }