fix: correct logic for history route to work

ref: #26 #28 nofusscomputing/centurion_erp#248
nofusscomputing · Nov 14, 2024 · f74a8ac · f74a8ac
1 parent 9200914
commit f74a8ac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/App.js b/src/App.js
@@ -51,13 +51,12 @@ function App() {
                 >
                     <Route path='/login' element={<Login/>}/>
 
-                    <Route path="/core/:model/:pk/:action"
+                    <Route path="/core/:model/:pk/history"
                         element={<History
                             setContentHeading={setContentHeading}
                             SetContentHeaderIcon={SetContentHeaderIcon}
                         />}
                         errorElement={<ErrorPage /> }
-                        loader = {detailsLoader}
                     />
 
                     <Route path="/settings"

diff --git a/src/components/Table.jsx b/src/components/Table.jsx
@@ -261,7 +261,7 @@ const Table = ({
                                     <td
                                         onClick={(e) => {
                                             let a = e
-                                            document.getElementById('expandable-' + e.currentTarget.parentElement.id).classList.toggle("hide-expandable-row")
+                                            document.getElementById('expandable-' + data.id).classList.toggle("hide-expandable-row")
                                         }}
                                     >
                                         <IconLoader

diff --git a/src/hooks/urlBuilder.js b/src/hooks/urlBuilder.js
@@ -63,9 +63,9 @@ export default function urlBuilder(
         pk = params.pk
     }
 
-    if( ! module && path_directories[0] == 'settings' ) {
+    if( ! module ) {
 
-        module = 'settings'
+        module = path_directories[0]
 
     }
 
@@ -75,12 +75,10 @@ export default function urlBuilder(
 
     }
 
-
     const allowed_actions = [ 'add', 'delete', 'edit' ]
 
     if( ! allowed_actions.includes( action ) ) {
 
-        action = null
 
         for( let dir of path_directories ) {
 
@@ -90,6 +88,12 @@ export default function urlBuilder(
         }
     }
 
+    if( ! action && path_directories[path_directories.length-1] == 'history' ) {
+
+        action = 'history'
+    }
+
+
     const ticket_models = [
         'change',
         'incident',
@@ -294,6 +298,9 @@ export default function urlBuilder(
 
         method = 'PATCH'
 
+    } else if( action === 'history' ) {
+
+        url += '/history'
     }
 
     if(

diff --git a/src/layout/history.jsx b/src/layout/history.jsx
@@ -22,7 +22,7 @@ const History = ({
             <div className="content">
                 <Table
                     callback={setContentHeading}
-                    data_url_path={'core/' + url_builder.model + '/' + url_builder.pk + '/history'}
+                    data_url_path={'core/' + url_builder.params.model + '/' + url_builder.params.pk + '/history'}
                 />
             </div>
         </section>