fix(sidebar): drop the query string from the sub-page label
Build / Build-and-ng-test (pull_request) Successful in 5m25s
Lighthouse Checks / lighthouse (pull_request) Successful in 21m16s
Build / Build-and-test-development (pull_request) Successful in 26m18s

Router.url carries the query string, so getSubPage() returned e.g.
'tables?embed=va' for a route with any parameter, and the sidebar label
rendered 'TABLES?EMBED=VA'. A VA report embed always adds a parameter, so
that is the case it shows up in.

Take the path part of the segment before splitting. Covered by a spec that
fails without the change.
This commit is contained in:
dc committed 2026-09-25 09:42:57 +00:00
1 parent f1734a2de0
commit d2dd46bfdf
2 files changed
+38 -1

No files matched your search

@@ -0,0 +1,34 @@
import { SidebarComponent } from './sidebar.component'
describe('SidebarComponent', () => {
// getSubPage is a pure read of the router's current URL, and the only other
// dependencies are the two SasService calls in the constructor - so the
// class can be constructed directly, without a TestBed.
const buildComponent = (routerUrl: string) =>
new SidebarComponent(
{ url: routerUrl } as any,
{} as any,
{
getSasjsConfig: () => ({}),
getServerType: () => 'SASVIYA'
} as any
)
describe('getSubPage', () => {
it('returns the sub-page segment of a plain route', () => {
expect(buildComponent('/home/tables').getSubPage()).toEqual('tables')
})
it('excludes the query string - a VA report embed always adds one', () => {
expect(buildComponent('/home/tables?embed=va').getSubPage()).toEqual(
'tables'
)
})
it('excludes the query string on the viewer route', () => {
expect(buildComponent('/view/data?labels=true').getSubPage()).toEqual(
'data'
)
})
})
})
@@ -67,7 +67,10 @@ export class SidebarComponent implements OnInit {
}
public getSubPage() {
let url = this._router.url.split('/')
// `Router.url` carries the query string, so take the path segment only -
// otherwise any route with a parameter renders it as part of the label
// (a VA report embed always adds one, e.g. `?embed=va`).
let url = this._router.url.split('?')[0].split('/')
return url[2]
}