@bjsdistribution/dms-client-return 0.0.90 → 0.0.91

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.90",
+  "version": "0.0.91",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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

@@ -1,33 +1,35 @@
 import {
   Button,
   Label,
+  useAxios,
   // SelectDropdown,
 } from '@bjsdistribution/dms-component-library';
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
-// import NoteType from './NoteType';
-import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
-import { getCookie } from '../utils';
 import { useLocation } from 'react-router-dom';
 import { useGlobalStateHitAuditLog, usemoduleIds, useOrderId } from '../store';
 import { notification } from 'antd';
 import NoteType from './NoteType';
 import { useSelectedData } from '../../store';
+import { ApiResponse } from '../types';
 
 function AddNote() {
   const [noteText, setNoteText] = useState('');
   const [orderId] = useOrderId();
-
   const location = useLocation();
   const pathname = location.pathname;
   const orderIdLocaation = pathname.split('/')[1];
-
-  const ssoToken = getCookie('id_token');
   const [moduleIds] = usemoduleIds();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
   const [selected] = useSelectedData();
 
   // Save New Note
+  const { fetchData: callAuditLogs } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/audit_logs/orders/`,
+    method: 'POST',
+  });
 
   const [notificationData, setNotificationData] = useState<{
     type: 'success' | 'error';
@@ -38,7 +40,6 @@ function AddNote() {
   const saveNote = async () => {
     setRecallAuditLog(false);
     if (!noteText) return;
-    const endpoint = `${getBaseEndpoint()}/audit_logs/orders/`;
     const payload = {
       audit_logs: [
         {
@@ -54,30 +55,25 @@ function AddNote() {
         },
       ],
     };
-    //to change
     try {
-      const response = await fetch(endpoint, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${ssoToken}`,
-        },
-        body: JSON.stringify(payload),
-      });
-
-      // setNoteLoadingStore(false);
-
-      if (response.ok) {
+      let response = (await callAuditLogs({
+        payload: payload,
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
+      if (response.code == 200 && response?.data) {
         notification.success({
           message: 'Success',
-          description: 'Note saved successfully.',
+          description: `${response?.message}`,
         });
         setNoteText('');
         setRecallAuditLog(true);
       } else {
         notification.error({
           message: 'Error',
-          description: 'Failed to save note.',
+          description: `${response?.error}`,
         });
       }
     } catch (error) {

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

@@ -13,7 +13,7 @@ import {
   useOrderNotify,
   useReminderNotiData,
   useRouteDetails,
-  useTaskLoading,
+  // useTaskLoading,
 } from '../order-actions/store';
 
 interface ApiResponse {
@@ -30,7 +30,7 @@ function Notification() {
   const [, setShowMoreInfo] = useInfoType();
   const [OrderData] = useOrderDetails();
   const [notificationData, setNotififcationData] = useNotificationData();
-  const [flagLoading] = useTaskLoading();
+  // const [flagLoading] = useTaskLoading();
   const [reminderData, setReminderData] = useReminderNotiData();
   const routeId = OrderData?.order_routes?.route_id;
   const [, setRouteData] = useRouteDetails();
@@ -181,14 +181,7 @@ function Notification() {
             </StyledTab>
           </TabsData>
         </Container>
-        {flagLoading ? (
-          <Loader>
-            <Spinner />
-            <Text>Fetching Notifications...</Text>
-          </Loader>
-        ) : notificationData.length > 0 ||
-          reminderData.length > 0 ||
-          OrderData ? (
+        {notificationData.length > 0 || reminderData.length > 0 || OrderData ? (
           <TabsWrapper>
             <Tabs
               activeNotifications={activeNotifications}
@@ -215,31 +208,31 @@ const Container = styled.div`
   border-bottom: 1px solid #ccc;
 `;
 
-const Loader = styled.div`
-  align-items: center;
-  justify-content: center;
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-`;
-
-const Spinner = styled.div`
-  border: 4px solid rgba(0, 0, 0, 0.1);
-  border-left-color: #3a3630;
-  border-radius: 50%;
-  width: 40px;
-  height: 40px;
-  animation: spin 1s linear infinite;
-
-  @keyframes spin {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
-  }
-`;
+// const Loader = styled.div`
+//   align-items: center;
+//   justify-content: center;
+//   display: flex;
+//   flex-direction: column;
+//   gap: 10px;
+// `;
+
+// const Spinner = styled.div`
+//   border: 4px solid rgba(0, 0, 0, 0.1);
+//   border-left-color: #3a3630;
+//   border-radius: 50%;
+//   width: 40px;
+//   height: 40px;
+//   animation: spin 1s linear infinite;
+
+//   @keyframes spin {
+//     0% {
+//       transform: rotate(0deg);
+//     }
+//     100% {
+//       transform: rotate(360deg);
+//     }
+//   }
+// `;
 
 const FlagContainer = styled.div`
   padding: 8px;
@@ -326,11 +319,11 @@ const TabsWrapper = styled.div`
   }
 `;
 
-const Text = styled.div`
-  color: var(--tonal-brown-651, #6a7378);
-  font-family: Lato;
-  font-size: 13px;
-  font-style: normal;
-  font-weight: 600;
-`;
+// const Text = styled.div`
+//   color: var(--tonal-brown-651, #6a7378);
+//   font-family: Lato;
+//   font-size: 13px;
+//   font-style: normal;
+//   font-weight: 600;
+// `;
 export default Notification;