Merge pull request #581 from amansinghbais/#580

Improved: route for hard counts detail age, highlighting the tab for count details page, persisting detail when moving back from settings to count(#580)
hotwax · Jan 7, 2025 · fa24c85 · fa24c85
2 parents 91575f2 + 2295cb6
commit fa24c85
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
@@ -68,7 +68,7 @@ export default defineComponent({
         url: "/draft",
         iosIcon: createOutline,
         mdIcon: createOutline,
-        childRoutes: ["/draft/", "/bulkUpload", "/hard-count", "/hard-count-detail"],
+        childRoutes: ["/draft/", "/bulkUpload", "/hard-count"],
         meta: {
           permissionId: "APP_DRAFT_VIEW"
         }

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -84,7 +84,7 @@ const routes: Array<RouteRecordRaw> = [
         }
       },
       {
-        path: 'hard-count-detail/:id',
+        path: 'count-detail/hard/:id',
         name: 'HardCountDetail',
         component: HardCountDetail,
         props: true,

diff --git a/src/views/Count.vue b/src/views/Count.vue
@@ -244,7 +244,7 @@ async function segmentChanged(value) {
 }
 
 function navigateToStoreView(count) {
-  router.push((count.countTypeEnumId === "HARD_COUNT" && count.statusId === "INV_COUNT_ASSIGNED") ? `/tabs/hard-count-detail/${count.inventoryCountImportId}` : `/tabs/count-detail/${count.inventoryCountImportId}`);
+  router.push((count.countTypeEnumId === "HARD_COUNT" && count.statusId === "INV_COUNT_ASSIGNED") ? `/tabs/count-detail/hard/${count.inventoryCountImportId}` : `/tabs/count-detail/${count.inventoryCountImportId}`);
 }
 
 function getStatusIdForCountsToBeFetched() {

diff --git a/src/views/Tabs.vue b/src/views/Tabs.vue
@@ -3,7 +3,7 @@
     <ion-tabs>
       <ion-router-outlet></ion-router-outlet>
       <ion-tab-bar slot="bottom">
-        <ion-tab-button tab="orders" @click="$router.push('/tabs/count')" href="/tabs/count">
+        <ion-tab-button tab="orders" href="/tabs/count">
           <ion-icon :icon="infiniteOutline" />
           <ion-label>{{ translate("Counts") }}</ion-label>
         </ion-tab-button>