@bjsdistribution/dms-client-return 0.0.7 → 0.0.9

package/package.json

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

package/src/index.tsx

@@ -1,5 +1,5 @@
 import React, { Suspense, useEffect } from 'react';
-import { Navigate, Route, Routes, useNavigate } from 'react-router-dom';
+import { Route, Routes, useNavigate } from 'react-router-dom';
 // import AddOrder from './components/add-order';
 import OrderView from './components/order-view';
 // import AllReminder from './components/order-view/all-reminder/AllReminder';
@@ -13,6 +13,11 @@ function ReturnClient() {
   const LoadingMessage = () => <div>Loading...</div>;
   const [selectedClient] = useTableName();
   const navigate = useNavigate();
+  let selectedClientString = selectedClient?.replace(/\s+/g, '-');
+  selectedClientString = selectedClientString?.toLowerCase();
+
+  console.log(selectedClientString, 'selectedClient');
+  console.log(`../return/:${selectedClientString}`);
 
   useEffect(() => {
     if (!location.pathname.includes('/return')) {
@@ -24,10 +29,9 @@ function ReturnClient() {
   useEffect(() => {
     if (selectedClient) {
       const selectedClientString = selectedClient.replace(/\s+/g, '-');
-      selectedClient;
-      navigate(`returnclient/return/${selectedClientString}`);
+      navigate(`return/${selectedClientString}`);
     }
-  }, [selectedClient, navigate]);
+  }, [selectedClient]);
 
   return (
     <Suspense fallback={<LoadingMessage />}>
@@ -35,20 +39,18 @@ function ReturnClient() {
         <Route path="" element={<ReturnMainTable />} />
         <Route path="order-return" element={<ReturnAfterTable />} />
         <Route path="order-return/:id" element={<OrderView />} />
-        <Route
-          path="returnclient/return/:selectedClient"
-          element={<ReturnTable />}
-        />
-        <Route
+        <Route path="return/:name" element={<ReturnTable />} />
+
+        {/* <Route
           path=""
           element={
-            selectedClient ? (
-              <Navigate to={`returnclient/return/${selectedClient}`} />
+            selectedClientString ? (
+              <Navigate to={`return/${selectedClientString}`} />
             ) : (
               <ReturnMainTable />
             )
           }
-        />
+        /> */}
       </Routes>
     </Suspense>
   );