From 7c8bf29e1ec2393407754e77bec4c45066fc42d4 Mon Sep 17 00:00:00 2001 From: ThibaudAv Date: Wed, 20 Mar 2024 17:32:52 +0100 Subject: [PATCH] fix(console): rename envId to envHrid to avoid any confusion this property does not always contain the environment Id but the hrid and if not defines the environment id. --- gravitee-apim-console-webui/src/app-routing.module.ts | 2 +- .../api/api-navigation/api-navigation.component.ts | 2 +- .../application-navigation.component.ts | 2 +- .../src/management/environment.guard.ts | 6 +++--- .../identityProviders/identity-providers.component.ajs.ts | 2 +- .../src/user/tasks/tasks.component.ts | 6 ++++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gravitee-apim-console-webui/src/app-routing.module.ts b/gravitee-apim-console-webui/src/app-routing.module.ts index d599abf0d65..a754226cd26 100644 --- a/gravitee-apim-console-webui/src/app-routing.module.ts +++ b/gravitee-apim-console-webui/src/app-routing.module.ts @@ -56,7 +56,7 @@ const appRoutes: Routes = [ import('./organization/configuration/organization-settings-routing.module').then((m) => m.OrganizationSettingsRoutingModule), }, { - path: ':envId', + path: ':envHrid', component: AppComponent, loadChildren: () => import('./management/management.module').then((m) => m.ManagementModule), }, diff --git a/gravitee-apim-console-webui/src/management/api/api-navigation/api-navigation.component.ts b/gravitee-apim-console-webui/src/management/api/api-navigation/api-navigation.component.ts index 9fd5b389244..3739a624ea2 100644 --- a/gravitee-apim-console-webui/src/management/api/api-navigation/api-navigation.component.ts +++ b/gravitee-apim-console-webui/src/management/api/api-navigation/api-navigation.component.ts @@ -370,7 +370,7 @@ export class ApiNavigationComponent implements OnInit, OnDestroy { } private getApiNavigationSearchItems() { - const environmentId = this.activatedRoute.snapshot.params.envId; + const environmentId = this.activatedRoute.snapshot.params.envHrid; const apiId = this.currentApi.id; const parentRouterLink = getPathFromRoot(this.activatedRoute); diff --git a/gravitee-apim-console-webui/src/management/application/application-navigation/application-navigation.component.ts b/gravitee-apim-console-webui/src/management/application/application-navigation/application-navigation.component.ts index d845584d224..6af638eafc7 100644 --- a/gravitee-apim-console-webui/src/management/application/application-navigation/application-navigation.component.ts +++ b/gravitee-apim-console-webui/src/management/application/application-navigation/application-navigation.component.ts @@ -177,7 +177,7 @@ export class ApplicationNavigationComponent implements OnInit, OnDestroy { } private getApplicationNavigationSearchItems(): MenuSearchItem[] { - const environmentId = this.activatedRoute.snapshot.params.envId; + const environmentId = this.activatedRoute.snapshot.params.envHrid; const applicationId = this.activatedRoute.snapshot.params.applicationId; const parentRouterLink = getPathFromRoot(this.activatedRoute); diff --git a/gravitee-apim-console-webui/src/management/environment.guard.ts b/gravitee-apim-console-webui/src/management/environment.guard.ts index ce4f818e7ba..8a0c1edc969 100644 --- a/gravitee-apim-console-webui/src/management/environment.guard.ts +++ b/gravitee-apim-console-webui/src/management/environment.guard.ts @@ -39,7 +39,7 @@ export const EnvironmentGuard: { const gioMenuSearchService = inject(GioMenuSearchService); const settingsNavigationService = inject(SettingsNavigationService); - const paramEnv = route.params.envId; + const paramEnv = route.params.envHrid; return environmentService.list().pipe( map((environments) => { @@ -62,7 +62,7 @@ export const EnvironmentGuard: { switchMap(() => environmentSettingsService.load()), // Load search items in menu map(() => { - gioMenuSearchService.addMenuSearchItems(settingsNavigationService.getSettingsNavigationSearchItems(route.params.envId)); + gioMenuSearchService.addMenuSearchItems(settingsNavigationService.getSettingsNavigationSearchItems(route.params.envHrid)); return true; }), ); @@ -73,7 +73,7 @@ export const EnvironmentGuard: { const gioMenuSearchService = inject(GioMenuSearchService); gioPermissionService.clearEnvironmentPermissions(); - gioMenuSearchService.removeMenuSearchItems([currentRoute.params.envId]); + gioMenuSearchService.removeMenuSearchItems([currentRoute.params.envHrid]); return true; }, }; diff --git a/gravitee-apim-console-webui/src/management/settings/identityProviders/identity-providers.component.ajs.ts b/gravitee-apim-console-webui/src/management/settings/identityProviders/identity-providers.component.ajs.ts index 18531421c17..957aac3494e 100644 --- a/gravitee-apim-console-webui/src/management/settings/identityProviders/identity-providers.component.ajs.ts +++ b/gravitee-apim-console-webui/src/management/settings/identityProviders/identity-providers.component.ajs.ts @@ -58,7 +58,7 @@ const IdentityProvidersComponentAjs: ng.IComponentOptions = { this.providedConfigurationMessage = 'Configuration provided by the system'; this.$onInit = () => { - this.envId = this.activatedRoute.snapshot.params.envId; + this.envId = Constants.org.currentEnv.id; this.canUpdatePortalSettings = UserService.isUserHasPermissions([ 'environment-settings-c', 'environment-settings-u', diff --git a/gravitee-apim-console-webui/src/user/tasks/tasks.component.ts b/gravitee-apim-console-webui/src/user/tasks/tasks.component.ts index d33a5c1104d..2ab4fc78b6d 100644 --- a/gravitee-apim-console-webui/src/user/tasks/tasks.component.ts +++ b/gravitee-apim-console-webui/src/user/tasks/tasks.component.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { filter, map, switchMap, takeUntil, tap } from 'rxjs/operators'; import { Subject } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; @@ -32,6 +32,7 @@ import { PromotionApprovalTaskData, Task } from '../../entities/task/task'; import { PromotionService } from '../../services-ngx/promotion.service'; import { SnackBarService } from '../../services-ngx/snack-bar.service'; import { Workflow } from '../../entities/workflow/workflow'; +import { Constants } from '../../entities/Constants'; class TaskData { icon: string; @@ -61,6 +62,7 @@ export class TasksComponent implements OnInit, OnDestroy { private readonly promotionService: PromotionService, private readonly matDialog: MatDialog, private readonly snackBarService: SnackBarService, + @Inject(Constants) private readonly constants: Constants, ) {} ngOnInit(): void { @@ -97,7 +99,7 @@ export class TasksComponent implements OnInit, OnDestroy { } go(task: TaskData): void { - const currentEnvironmentId = this.activatedRoute.snapshot.params.environmentId; + const currentEnvironmentId = this.constants.org.currentEnv.id; switch (task.type) { case 'SUBSCRIPTION_APPROVAL': {