@bjsdistribution/dms-client-return 0.0.57 → 0.0.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/OrderViewQueryHandler.d.ts +3 -0
  2. package/dist/dms-client-return.cjs.development.js +10024 -10016
  3. package/dist/dms-client-return.cjs.development.js.map +1 -1
  4. package/dist/dms-client-return.cjs.production.min.js +1 -1
  5. package/dist/dms-client-return.cjs.production.min.js.map +1 -1
  6. package/dist/dms-client-return.esm.js +10029 -10021
  7. package/dist/dms-client-return.esm.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/OrderViewQueryHandler.tsx +14 -0
  10. package/src/components/order-view/notes/index.tsx +1 -1
  11. package/src/components/order-view/order-actions/actions/confirm-order/tables/NotesTable.tsx +1 -1
  12. package/src/components/order-view/store.ts +1 -1
  13. package/src/index.tsx +4 -3
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "0.0.57",
2
+ "version": "0.0.58",
3
3
  "license": "MIT",
4
4
  "main": "dist/index.js",
5
5
  "typings": "dist/index.d.ts",
package/src/OrderViewQueryHandler.tsx ADDED
@@ -0,0 +1,14 @@
1
+ import React from 'react';
2
+ import { useSearchParams } from 'react-router-dom';
3
+ import OrderView from './components/order-view';
4
+ import ReturnMainTable from './components/order-daily-overview';
5
+
6
+ const OrderViewQueryHandler = () => {
7
+ const [searchParams] = useSearchParams(); // Access the query params
8
+ const orderId = searchParams.get('order'); // Get the 'order' param
9
+
10
+ // If 'order' query param is present, render OrderViewWrapper, otherwise redirect to home
11
+ return orderId ? <OrderView /> : <ReturnMainTable />;
12
+ };
13
+
14
+ export default OrderViewQueryHandler;
package/src/components/order-view/notes/index.tsx CHANGED
@@ -66,7 +66,7 @@ function Notes() {
66
66
  useEffect(() => {
67
67
  let combinedArray = [];
68
68
 
69
- if (moduleIds) {
69
+ if (moduleIds && orderId) {
70
70
  setShouldPerformAction(true);
71
71
  }
72
72
  if (!NotesLoading && NotesData?.data) {
package/src/components/order-view/order-actions/actions/confirm-order/tables/NotesTable.tsx CHANGED
@@ -56,7 +56,7 @@ function NotesTable() {
56
56
  });
57
57
  useEffect(() => {
58
58
  setNoteLoadingStore(true);
59
- if (moduleIds) {
59
+ if (moduleIds && orderId) {
60
60
  setShouldPerformAction(true);
61
61
  }
62
62
  if (!NotesLoading && NotesData?.data) {
package/src/components/order-view/store.ts CHANGED
@@ -162,7 +162,7 @@ function useIsOnHoldOrder() {
162
162
  return useAtom(isOnHold);
163
163
  }
164
164
  //value
165
- const orderId = atom<any>([]);
165
+ const orderId = atom<any>(undefined);
166
166
  export const useOrderId = () => {
167
167
  return useAtom(orderId);
168
168
  };
package/src/index.tsx CHANGED
@@ -1,13 +1,11 @@
1
1
  import React, { Suspense, useEffect } from 'react';
2
2
  import { Route, Routes, useSearchParams } from 'react-router-dom';
3
- import OrderView from './components/order-view';
4
3
  import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
5
4
  import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
6
5
  import {
7
6
  useSelectedAction,
8
7
  useSelectedClient,
9
8
  } from './components/order-daily-overview/store/store';
10
- import ReturnMainTable from './components/order-daily-overview';
11
9
  import { notification } from 'antd';
12
10
  import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
13
11
  import {
@@ -21,6 +19,8 @@ import {
21
19
  import { ApiResponse } from './components/types';
22
20
  import { useApiHook } from '@bjsdistribution/dms-component-library';
23
21
  import { useLocationOptions } from './components/order-view/store';
22
+ import OrderViewQueryHandler from './OrderViewQueryHandler';
23
+ import OrderView from './components/order-view';
24
24
  function ReturnClient() {
25
25
  notification.config({
26
26
  top: 80,
@@ -111,9 +111,10 @@ function ReturnClient() {
111
111
  <Routes>
112
112
  {/* for local */}
113
113
  {/* for dev */}
114
- <Route path="" element={<ReturnMainTable />} />
114
+ <Route path="" element={<OrderViewQueryHandler />} />
115
115
  <Route path="overview" element={<ReturnAfterTable />} />
116
116
  <Route path="/:id" element={<OrderView />} />
117
+
117
118
  <Route path="filter" element={<ReturnTable />} />
118
119
  {/* <Route
119
120
  path=""