Skip to content

Commit db63da4

Browse files
FrancescoMolinaroFrancescoMolinaro
committed
[LM-46] fix label, fix query param handling in admin sidebar section
1 parent 03947a3 commit db63da4

31 files changed

Lines changed: 67 additions & 57 deletions

‎src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[attr.aria-labelledby]="'sidebarName-' + section.id"
66
[title]="('menu.section.icon.' + section.id) | translate"
77
[routerLink]="itemModel.link"
8+
[queryParams]="itemModel.queryParams"
89
(keyup.space)="navigate($event)"
910
(keyup.enter)="navigate($event)"
1011
href="javascript:void(0);"

‎src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
4949
navigate(event: any): void {
5050
event.preventDefault();
5151
if (!this.isDisabled) {
52-
this.router.navigate(this.itemModel.link);
52+
const extras = {
53+
queryParams: this.itemModel.queryParams
54+
}
55+
this.router.navigate(this.itemModel.link, extras);
5356
}
5457
}
5558
}

‎src/app/menu.resolver.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,9 @@ export class MenuResolver implements Resolve<boolean> {
622622
this.getDLExporterURL(),
623623
this.getDLExporterAccessToken()
624624
]).subscribe(([authorized, url, accesstoken]) => {
625+
console.log(accesstoken);
626+
const urlSegments = url.split('?');
627+
const queryParamSegments = urlSegments[1].split('=');
625628
this.menuService.addSection(MenuID.ADMIN,
626629
{
627630
id: 'loginmiur_dlexporter_url',
@@ -632,7 +635,10 @@ export class MenuResolver implements Resolve<boolean> {
632635
type: MenuItemType.LINK,
633636
text: 'menu.section.loginmiur_dlexporter_url',
634637
disabled: false,
635-
link: url
638+
link: urlSegments[0],
639+
queryParams: {
640+
[queryParamSegments[0]]: queryParamSegments[1]
641+
}
636642
} as LinkMenuItemModel,
637643
icon: 'fa-solid fa-arrows-spin',
638644
shouldPersistOnRouteChange: true

‎src/assets/i18n/ar.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7997,9 +7997,9 @@
79977997
// TODO New key - Add a translation
79987998
"menu.section.workflow": "Administer Workflow",
79997999

8000-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
8000+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
80018001
// TODO New key - Add a translation
8002-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
8002+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
80038003

80048004
// "menu.section.loginmiur_dlexporter": "DLExporter",
80058005
// TODO New key - Add a translation

‎src/assets/i18n/bn.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6884,9 +6884,9 @@
68846884
// "menu.section.workflow": "Administer Workflow",
68856885
"menu.section.workflow": "প্রশাসনিক কর্মধারা",
68866886

6887-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6887+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
68886888
// TODO New key - Add a translation
6889-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6889+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
68906890

68916891
// "menu.section.loginmiur_dlexporter": "DLExporter",
68926892
// TODO New key - Add a translation

‎src/assets/i18n/ca.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6755,9 +6755,9 @@
67556755
// "menu.section.workflow": "Administer Workflow",
67566756
"menu.section.workflow": "Administrar flux de treball",
67576757

6758-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6758+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
67596759
// TODO New key - Add a translation
6760-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6760+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
67616761

67626762
// "menu.section.loginmiur_dlexporter": "DLExporter",
67636763
// TODO New key - Add a translation

‎src/assets/i18n/cs.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7922,9 +7922,9 @@
79227922
// TODO New key - Add a translation
79237923
"menu.section.workflow": "Administer Workflow",
79247924

7925-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
7925+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
79267926
// TODO New key - Add a translation
7927-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
7927+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
79287928

79297929
// "menu.section.loginmiur_dlexporter": "DLExporter",
79307930
// TODO New key - Add a translation

‎src/assets/i18n/de.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7011,9 +7011,9 @@
70117011
// "menu.section.workflow": "Administer Workflow",
70127012
"menu.section.workflow": "Geschäftsgänge verwalten",
70137013

7014-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
7014+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
70157015
// TODO New key - Add a translation
7016-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
7016+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
70177017

70187018
// "menu.section.loginmiur_dlexporter": "DLExporter",
70197019
// TODO New key - Add a translation

‎src/assets/i18n/el.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6861,9 +6861,9 @@
68616861
// "menu.section.workflow": "Administer Workflow",
68626862
"menu.section.workflow": "Διαχείριση ροής εργασιών",
68636863

6864-
// "menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6864+
// "menu.section.loginmiur_dlexporter_url": "DLExporter",
68656865
// TODO New key - Add a translation
6866-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
6866+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
68676867

68686868
// "menu.section.loginmiur_dlexporter": "DLExporter",
68696869
// TODO New key - Add a translation

‎src/assets/i18n/en.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4015,7 +4015,7 @@
40154015

40164016
"menu.section.workflow": "Administer Workflow",
40174017

4018-
"menu.section.icon.loginmiur_dlexporter_url": "DLExporter",
4018+
"menu.section.loginmiur_dlexporter_url": "DLExporter",
40194019

40204020
"menu.section.loginmiur_dlexporter": "DLExporter",
40214021

0 commit comments

Comments
 (0)