remove org id from org rotues

perryr16 · perryr16 · commit 3ab79bfebd06 · 2025-02-03T21:28:13.000Z
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
@@ -81,10 +81,8 @@ export const appRoutes: Route[] = [
       { path: 'about', title: 'About', component: AboutComponent },
       { path: 'contact', title: 'Contact', component: ContactComponent },
       { path: 'documentation', title: 'Documentation', component: DocumentationComponent },
-      { path: 'organizations', component: OrganizationsListComponent },
       {
-        path: 'organizations/:organizationId',
-        component: OrganizationsNavComponent,
+        path: 'organizations',
         loadChildren: () => import('app/modules/organizations/organizations.routes'),
       },
       // 404, redirect to dashboard
diff --git a/src/app/core/navigation/navigation.service.ts b/src/app/core/navigation/navigation.service.ts
@@ -35,11 +35,11 @@ export class NavigationService {
       children: [
         { id: 'organizations/settings', link: 'organizations/settings', title: 'Settings', icon: 'fa-solid:gears', type: 'basic' },
         { id: 'organizations/access-level-tree', link: '/organizations/access-level-tree', title: 'Access Level Tree', icon: 'fa-solid:sitemap', type: 'basic' },
-        { id: 'organizations/column-mappings', link: '/organizations/column-mappings/properties', title: 'Column mappings', icon: 'fa-solid:sitemap', type: 'basic' },
-        { id: 'organizations/column-settings', link: '/organizations/column-settings/properties', title: 'Column Settings', icon: 'fa-solid:sliders', type: 'basic' },
+        { id: 'organizations/column-mappings', link: '/organizations/column-mappings/properties', title: 'Column mappings', icon: 'fa-solid:sitemap', type: 'basic', regexMatch: /^\/organizations\/column-mappings\/(properties|taxlots)/ },
+        { id: 'organizations/column-settings', link: '/organizations/column-settings/properties', title: 'Column Settings', icon: 'fa-solid:sliders', type: 'basic', regexMatch: /^\/organizations\/column-settings\/(properties|taxlots)/ },
         { id: 'organizations/cycles', link: '/organizations/cycles', title: 'Cycles', icon: 'fa-solid:calendar-days', type: 'basic' },
-        { id: 'organizations/data-quality', link: '/organizations/data-quality/properties', title: 'Data Quality', icon: 'fa-solid:flag', type: 'basic' },
-        { id: 'organizations/derived-columns', link: '/organizations/derived-columns/properties', title: 'Derived Columns', icon: 'fa-solid:calculator', type: 'basic' },
+        { id: 'organizations/data-quality', link: '/organizations/data-quality/properties', title: 'Data Quality', icon: 'fa-solid:flag', type: 'basic', regexMatch: /^\/organizations\/data-quality\/(properties|taxlots)/ },
+        { id: 'organizations/derived-columns', link: '/organizations/derived-columns/properties', title: 'Derived Columns', icon: 'fa-solid:calculator', type: 'basic', regexMatch: /^\/organizations\/derived-columns\/(properties|taxlots)/ },
         { id: 'organizations/email-templates', link: '/organizations/email-templates', title: 'Email Templates', icon: 'fa-solid:envelope', type: 'basic' },
         { id: 'organizations/labels', link: '/organizations/labels', title: 'Labels', icon: 'fa-solid:tags', type: 'basic' },
         { id: 'organizations/members', link: '/organizations/members', title: 'Members', icon: 'fa-solid:user', type: 'basic' },
diff --git a/src/app/layout/layouts/main/main.component.ts b/src/app/layout/layouts/main/main.component.ts
@@ -51,7 +51,7 @@ export class MainLayoutComponent implements OnInit, OnDestroy {
       this.isScreenSmall = !matchingAliases.includes('md')
 
       // Change the navigation appearance
-      this.navigationAppearance = this.isScreenSmall ? 'default' : 'dense'
+      this.navigationAppearance = this.isScreenSmall ? 'dense' : 'default'
     })
 
     this._versionService.version$.pipe(takeUntil(this._unsubscribeAll$)).subscribe(({ version, sha }) => {
diff --git a/src/app/modules/organizations/organizations-column-mappings/organizations-column-mappings.component.ts b/src/app/modules/organizations/organizations-column-mappings/organizations-column-mappings.component.ts
@@ -26,8 +26,7 @@ export class OrganizationsColumnMappingsComponent implements OnInit {
 
   async toggleInventoryType(type: OrganizationTab) {
     if (type !== this.type) {
-      const orgId = this._route.snapshot.parent.params.organizationId as string
-      const newRoute = `/organizations/${orgId}/column-mappings/${type}`
+      const newRoute = `/organizations/column-mappings/${type}`
       await this._router.navigateByUrl(newRoute, { skipLocationChange: false })
       this.type = type
     }
diff --git a/src/app/modules/organizations/organizations-column-settings/organizations-column-settings.component.ts b/src/app/modules/organizations/organizations-column-settings/organizations-column-settings.component.ts
@@ -24,8 +24,7 @@ export class OrganizationsColumnSettingsComponent implements OnInit {
 
   async toggleInventoryType(type: InventoryType) {
     if (type !== this.type) {
-      const orgId = this._route.snapshot.parent.params.organizationId as string
-      const newRoute = `/organizations/${orgId}/column-settings/${type}`
+      const newRoute = `/organizations/column-settings/${type}`
       await this._router.navigateByUrl(newRoute, { skipLocationChange: false })
       this.type = type
     }
diff --git a/src/app/modules/organizations/organizations-data-quality/organizations-data-quality.component.ts b/src/app/modules/organizations/organizations-data-quality/organizations-data-quality.component.ts
@@ -26,8 +26,7 @@ export class OrganizationsDataQualityComponent implements OnInit {
 
   async toggleInventoryType(type: OrganizationTab) {
     if (type !== this.type) {
-      const orgId = this._route.snapshot.parent.params.organizationId as string
-      const newRoute = `/organizations/${orgId}/data-quality/${type}`
+      const newRoute = `/organizations/data-quality/${type}`
       await this._router.navigateByUrl(newRoute, { skipLocationChange: false })
       this.type = type
     }
diff --git a/src/app/modules/organizations/organizations-derived-columns/organizations-derived-columns.component.ts b/src/app/modules/organizations/organizations-derived-columns/organizations-derived-columns.component.ts
@@ -24,8 +24,7 @@ export class OrganizationsDerivedColumnsComponent implements OnInit {
 
   async toggleInventoryType(type: InventoryType) {
     if (type !== this.type) {
-      const orgId = this._route.snapshot.parent.params.organizationId as string
-      const newRoute = `/organizations/${orgId}/column-mappings/${type}`
+      const newRoute = `/organizations/derived-columns/${type}`
       await this._router.navigateByUrl(newRoute, { skipLocationChange: false })
       this.type = type
     }
diff --git a/src/app/modules/organizations/organizations.routes.ts b/src/app/modules/organizations/organizations.routes.ts
@@ -40,7 +40,7 @@ const organizationsDerivedColumnsTypeMatcher = (segments: UrlSegment[]) => {
 }
 
 export default [
-  { path: '', component: OrganizationsSettingsComponent },
+  { path: 'settings', component: OrganizationsSettingsComponent },
   { path: 'access-level-tree', component: OrganizationsAccessLevelTreeComponent },
   { matcher: OrganizationsColumnMappingTypeMatcher, component: OrganizationsColumnMappingsComponent },
   { matcher: organizationsColumnSettingsTypeMatcher, component: OrganizationsColumnSettingsComponent },

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ export class OrganizationsColumnMappingsComponent implements OnInit {`
`26`	`26`
`27`	`27`	`async toggleInventoryType(type: OrganizationTab) {`
`28`	`28`	`if (type !== this.type) {`
`29`		`- const orgId = this._route.snapshot.parent.params.organizationId as string`
`30`		- const newRoute = `/organizations/${orgId}/column-mappings/${type}`
	`29`	+ const newRoute = `/organizations/column-mappings/${type}`
`31`	`30`	`await this._router.navigateByUrl(newRoute, { skipLocationChange: false })`
`32`	`31`	`this.type = type`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ export class OrganizationsColumnSettingsComponent implements OnInit {`
`24`	`24`
`25`	`25`	`async toggleInventoryType(type: InventoryType) {`
`26`	`26`	`if (type !== this.type) {`
`27`		`- const orgId = this._route.snapshot.parent.params.organizationId as string`
`28`		- const newRoute = `/organizations/${orgId}/column-settings/${type}`
	`27`	+ const newRoute = `/organizations/column-settings/${type}`
`29`	`28`	`await this._router.navigateByUrl(newRoute, { skipLocationChange: false })`
`30`	`29`	`this.type = type`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ const organizationsDerivedColumnsTypeMatcher = (segments: UrlSegment[]) => {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`export default [`
`43`		`- { path: '', component: OrganizationsSettingsComponent },`
	`43`	`+ { path: 'settings', component: OrganizationsSettingsComponent },`
`44`	`44`	`{ path: 'access-level-tree', component: OrganizationsAccessLevelTreeComponent },`
`45`	`45`	`{ matcher: OrganizationsColumnMappingTypeMatcher, component: OrganizationsColumnMappingsComponent },`
`46`	`46`	`{ matcher: organizationsColumnSettingsTypeMatcher, component: OrganizationsColumnSettingsComponent },`