Skip to content

Commit dbffdeb

Browse files
committed
prevent nav collapse on /taxlots
1 parent 3ab79bf commit dbffdeb

File tree

2 files changed

+75
-11
lines changed

2 files changed

+75
-11
lines changed

src/@seed/components/navigation/vertical/components/collapsible/collapsible.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export class VerticalNavigationCollapsibleItemComponent implements OnInit, OnDes
229229
}
230230

231231
// Check if the child has a link and is active
232-
if (child.link && this._router.isActive(child.link, child.exactMatch ? exactMatchOptions : subsetMatchOptions)) {
232+
if (child.link && this._router.isActive(child.id, child.exactMatch ? exactMatchOptions : subsetMatchOptions)) {
233233
return true
234234
}
235235
}

src/app/core/navigation/navigation.service.ts

+74-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,80 @@ export class NavigationService {
3333
icon: 'fa-solid:users',
3434
link: '/organizations',
3535
children: [
36-
{ id: 'organizations/settings', link: 'organizations/settings', title: 'Settings', icon: 'fa-solid:gears', type: 'basic' },
37-
{ id: 'organizations/access-level-tree', link: '/organizations/access-level-tree', title: 'Access Level Tree', icon: 'fa-solid:sitemap', type: 'basic' },
38-
{ id: 'organizations/column-mappings', link: '/organizations/column-mappings/properties', title: 'Column mappings', icon: 'fa-solid:sitemap', type: 'basic', regexMatch: /^\/organizations\/column-mappings\/(properties|taxlots)/ },
39-
{ id: 'organizations/column-settings', link: '/organizations/column-settings/properties', title: 'Column Settings', icon: 'fa-solid:sliders', type: 'basic', regexMatch: /^\/organizations\/column-settings\/(properties|taxlots)/ },
40-
{ id: 'organizations/cycles', link: '/organizations/cycles', title: 'Cycles', icon: 'fa-solid:calendar-days', type: 'basic' },
41-
{ id: 'organizations/data-quality', link: '/organizations/data-quality/properties', title: 'Data Quality', icon: 'fa-solid:flag', type: 'basic', regexMatch: /^\/organizations\/data-quality\/(properties|taxlots)/ },
42-
{ id: 'organizations/derived-columns', link: '/organizations/derived-columns/properties', title: 'Derived Columns', icon: 'fa-solid:calculator', type: 'basic', regexMatch: /^\/organizations\/derived-columns\/(properties|taxlots)/ },
43-
{ id: 'organizations/email-templates', link: '/organizations/email-templates', title: 'Email Templates', icon: 'fa-solid:envelope', type: 'basic' },
44-
{ id: 'organizations/labels', link: '/organizations/labels', title: 'Labels', icon: 'fa-solid:tags', type: 'basic' },
45-
{ id: 'organizations/members', link: '/organizations/members', title: 'Members', icon: 'fa-solid:user', type: 'basic' },
36+
{
37+
id: 'organizations/settings',
38+
link: 'organizations/settings',
39+
title: 'Settings',
40+
icon: 'fa-solid:gears',
41+
type: 'basic',
42+
},
43+
{
44+
id: 'organizations/access-level-tree',
45+
link: '/organizations/access-level-tree',
46+
title: 'Access Level Tree',
47+
icon: 'fa-solid:sitemap',
48+
type: 'basic',
49+
},
50+
{
51+
id: 'organizations/column-mappings',
52+
link: '/organizations/column-mappings/properties',
53+
title: 'Column mappings',
54+
icon: 'fa-solid:sitemap',
55+
type: 'basic',
56+
regexMatch: /^\/organizations\/column-mappings\/(properties|taxlots)/,
57+
},
58+
{
59+
id: 'organizations/column-settings',
60+
link: '/organizations/column-settings/properties',
61+
title: 'Column Settings',
62+
icon: 'fa-solid:sliders',
63+
type: 'basic',
64+
regexMatch: /^\/organizations\/column-settings\/(properties|taxlots)/,
65+
},
66+
{
67+
id: 'organizations/cycles',
68+
link: '/organizations/cycles',
69+
title: 'Cycles',
70+
icon: 'fa-solid:calendar-days',
71+
type: 'basic',
72+
},
73+
{
74+
id: 'organizations/data-quality',
75+
link: '/organizations/data-quality/properties',
76+
title: 'Data Quality',
77+
icon: 'fa-solid:flag',
78+
type: 'basic',
79+
regexMatch: /^\/organizations\/data-quality\/(properties|taxlots|goal)/,
80+
},
81+
{
82+
id: 'organizations/derived-columns',
83+
link: '/organizations/derived-columns/properties',
84+
title: 'Derived Columns',
85+
icon: 'fa-solid:calculator',
86+
type: 'basic',
87+
regexMatch: /^\/organizations\/derived-columns\/(properties|taxlots)/,
88+
},
89+
{
90+
id: 'organizations/email-templates',
91+
link: '/organizations/email-templates',
92+
title: 'Email Templates',
93+
icon: 'fa-solid:envelope',
94+
type: 'basic',
95+
},
96+
{
97+
id: 'organizations/labels',
98+
link: '/organizations/labels',
99+
title: 'Labels',
100+
icon: 'fa-solid:tags',
101+
type: 'basic',
102+
},
103+
{
104+
id: 'organizations/members',
105+
link: '/organizations/members',
106+
title: 'Members',
107+
icon: 'fa-solid:user',
108+
type: 'basic',
109+
},
46110
],
47111
},
48112
{

0 commit comments

Comments
 (0)