@bjsdistribution/dms-client-return 0.0.75 → 0.0.77

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.75",
+  "version": "0.0.77",
   "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.42",
+    "@bjsdistribution/dms-component-library": "0.1.47",
     "@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-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -493,10 +493,11 @@ const ReturnOrderTable = () => {
                         >
                           <PrinterIcon />
                           <DownIcon />
-                          {printToogle == index && (
+                          {printToogle === index && (
                             <div ref={dropdownRef}>
                               <PrintDropDownReturn
-                                legacyProductId={item?.legacy_product_id}
+                                legacyURL={item?.return_order_product_label}
+                                legacyProductID={item?.legacy_product_id}
                               />
                             </div>
                           )}

package/src/components/order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn.tsx

@@ -6,24 +6,32 @@ import { optionsForReturnPrint } from '../../../../order-daily-overview/common/f
 
 const options: PrintData[] = optionsForReturnPrint;
 
-const PrintDropDownReturn = ({}: //url has tobe added here
-
-// legacyProductId,
-{
-  legacyProductId: number;
+const PrintDropDownReturn = ({
+  legacyURL,
+  legacyProductID,
+}: {
+  legacyProductID: any;
+  legacyURL: string;
 }) => {
   const downloadFiles = () => {
-    const url = ``;
-    window.open(url, '_blank'); // Opens the URL in a new tab
+    if (!legacyURL) return;
+
+    const url = `${legacyURL}${legacyProductID}`;
+    window.open(url, '_blank');
   };
 
   return (
     <OptionsList>
       {options?.map((item, index) => {
         const IconComponent = PrintIconMap[item.icon];
+        const isDisabled = !legacyURL || !legacyProductID;
 
         return (
-          <OptionsListLi key={index} onClick={downloadFiles}>
+          <OptionsListLi
+            key={index}
+            onClick={!isDisabled ? downloadFiles : undefined}
+            disabled={isDisabled}
+          >
             {IconComponent && <IconComponent />} {item.label}
           </OptionsListLi>
         );
@@ -52,14 +60,18 @@ export const OptionsList = styled.ul`
   min-width: 194px;
 `;
 
-export const OptionsListLi = styled.li`
+export const OptionsListLi = styled.li<{ disabled?: boolean }>`
   border-bottom: 1px solid #f0f2f2;
   padding: 8px 10px;
   display: flex;
   gap: 12px;
   align-items: center;
   font-size: 13px;
-  cursor: pointer;
+  cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
+  color: ${({ disabled }) => (disabled ? '#ccc' : 'inherit')};
+  pointer-events: ${({ disabled }) => (disabled ? 'none' : 'auto')};
+  background-color: ${({ disabled }) => (disabled ? '#f5f5f5' : 'transparent')};
+
   &:last-child {
     border: none;
   }

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

@@ -33,6 +33,7 @@ import useSystemLogs from './hooks/useGetSystemLogs';
 import { notification } from 'antd';
 // import { useAssignData } from '../store';
 import DetailsFilters from './details-filters/DetailsFilters';
+import { useVisibilityData } from '../store';
 
 interface ApiResponse {
   message: string;
@@ -66,7 +67,7 @@ function OrderView() {
   const [, setRouteId] = useRouteId();
   const [liveRecalling] = useLiveRecalling();
   const systemLogsData = useSystemLogs();
-  // const [, setAssignData] = useAssignData();
+  const [, setVisibilityData] = useVisibilityData();
 
   // query param
   const location = useLocation();
@@ -174,11 +175,11 @@ function OrderView() {
     if (fetchedStaticData && fetchedStaticData.data) {
       const result = fetchedStaticData?.data;
       setOrderStaticData(result[0]);
-      // setAssignData(
-      //   fetchedStaticData?.data?.flatMap(
-      //     (i: any) => i?.resource_visibility_type
-      //   )
-      // );
+      setVisibilityData(
+        fetchedStaticData?.data?.flatMap(
+          (i: any) => i?.resource_visibility_type
+        )
+      );
     }
   }, [staticDataLoading]);
 

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

@@ -11,6 +11,8 @@ 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';
 
 function AddNote() {
   const [noteText, setNoteText] = useState('');
@@ -23,7 +25,7 @@ function AddNote() {
   const ssoToken = getCookie('id_token');
   const [moduleIds] = usemoduleIds();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
-
+  const [selected] = useSelectedData();
 
   // Save New Note
 
@@ -48,6 +50,7 @@ function AddNote() {
           description: noteText,
           data_dump: '{}',
           manual: 1,
+          is_private: selected,
         },
       ],
     };
@@ -115,6 +118,7 @@ function AddNote() {
         <Button disabled={!noteText} onClick={saveNote}>
           SAVE NOTE
         </Button>
+        <NoteType />
       </SaveNoteContainer>
     </Container>
   );

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

@@ -1,27 +1,45 @@
-// import React from 'react';
-// import { RadioButtonGroup } from '@bjsdistribution/dms-component-library';
-// import { notesTypeOptions } from '../helper';
-// import styled from 'styled-components';
+import React from 'react';
+import { RadioButtonGroup } from '@bjsdistribution/dms-component-library';
+import styled from 'styled-components';
+import { useSelectedData, useVisibilityData } from '../../store';
 
-// function NoteType() {
-//   const radioGroupHandler = () => {};
-//   return (
-//     <Container>
-//       <RadioButtonGroup
-//         selectedValue={''}
-//         heading=""
-//         options={notesTypeOptions || []}
-//         onChange={radioGroupHandler}
-//         required={false}
-//       />
-//     </Container>
-//   );
-// }
+function NoteType() {
+  const [visibilityData] = useVisibilityData();
+  const [selected, setSelected] = useSelectedData();
 
-// const Container = styled.div`
-//   display: flex;
-//   flex-direction: column;
-//   gap: 6px;
-//   flex: 1;
-// `;
-// export default NoteType;
+  const handleRadioButtonChange = (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    const selectedValue = event.target.value;
+    const selectedOption = visibilityData?.find(
+      (option: any) => option.value === selectedValue
+    );
+    if (selectedOption) {
+      setSelected(selectedOption.value);
+    }
+  };
+
+  return (
+    <Container>
+      <RadioButtonGroup
+        selectedValue={selected}
+        heading=""
+        options={visibilityData?.map((client: any) => ({
+          label: client.type,
+          value: client.value,
+        }))}
+        onChange={handleRadioButtonChange}
+        required={false}
+      />
+    </Container>
+  );
+}
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  flex: 1;
+`;
+
+export default NoteType;

package/src/components/order-view/order-actions/actions/hold-order/HoldOrderModal.tsx

@@ -45,13 +45,18 @@ function HoldOrderModal() {
     }
   );
 
+  const dynamicUrl = selectedDate
+    ? `orders/${orderId}/hold/?hold_reason=${holdReason}&hold_until=${selectedDate}`
+    : `orders/${orderId}/hold/?hold_reason=${holdReason}
+`;
+
   const {
     data: response,
     setShouldPerformAction: setPerformAction,
   } = useApiHook<{
     data: ApiResponse[];
   }>({
-    endpoint: `orders/${orderId}/hold/?hold_reason=${holdReason}&hold_until=${selectedDate}`,
+    endpoint: dynamicUrl,
     method: 'POST',
     performAction: false,
   });
@@ -121,7 +126,7 @@ function HoldOrderModal() {
     }
   };
 
-  const showSubmitBtn = holdReason !== undefined && selectedDate !== null;
+  const showSubmitBtn = holdReason !== undefined;
 
   return (
     <OrderActionModal
@@ -136,7 +141,7 @@ function HoldOrderModal() {
       <HoldContentContainer>
         <SplitText>
           <HoldRow>
-            <Label label="Delivery Date" required />
+            <Label label="Hold Until (leave blank for indefinite)" />
             <HoldDatePickerWrap>
               <DatePicker
                 needConfirm

package/src/components/store.ts

@@ -64,6 +64,8 @@ const clearState = atom<boolean>(false);
 
 const assignData = atom<any[]>([]);
 
+const visibilityData = atom<any[]>([]);
+
 const assignPayload = atom<AssignUpdatePayload>(AssignUpdateInitial);
 
 const callAPIAgain = atom<boolean>(true);
@@ -166,6 +168,10 @@ function useAssignData() {
   return useAtom(assignData);
 }
 
+function useVisibilityData() {
+  return useAtom(visibilityData);
+}
+
 function useAssignPayload() {
   return useAtom(assignPayload);
 }
@@ -185,6 +191,12 @@ function useSelectedProducts() {
   return useAtom(selectedProductsMove);
 }
 
+const selectedAssignee = atom<any>('');
+
+export function useSelectedData() {
+  return useAtom(selectedAssignee);
+}
+
 export {
   useAtom,
   useFilter,
@@ -214,4 +226,5 @@ export {
   useActionTypeOptions,
   useLocationOptions,
   useSelectedProducts,
+  useVisibilityData
 };