diff --git a/console/src/app/modules/actions-two/actions-two-actions/actions-two-actions.component.html b/console/src/app/modules/actions-two/actions-two-actions/actions-two-actions.component.html index 3e6c31fc0e..f7a10f92c5 100644 --- a/console/src/app/modules/actions-two/actions-two-actions/actions-two-actions.component.html +++ b/console/src/app/modules/actions-two/actions-two-actions/actions-two-actions.component.html @@ -1,7 +1,5 @@

{{ 'ACTIONSTWO.EXECUTION.TITLE' | translate }}

- - {{ 'ACTIONSTWO.BETA_NOTE' | translate }} - +

{{ 'ACTIONSTWO.EXECUTION.DESCRIPTION' | translate }}

{{ 'ACTIONSTWO.TARGET.TITLE' | translate }} - - {{ 'ACTIONSTWO.BETA_NOTE' | translate }} - +

{{ 'ACTIONSTWO.TARGET.DESCRIPTION' | translate }}

-

{{ 'ORG.PAGES.LIST' | translate }}

-

{{ 'ORG.PAGES.LISTDESCRIPTION' | translate }}

+

{{ 'ACTIONSTWO.EXECUTION.TITLE' | translate }}

+ + {{ 'ACTIONSTWO.BETA_NOTE' | translate }} + - - - actions + + + + - targets - - + + + +
diff --git a/console/src/app/pages/actions/actions.component.ts b/console/src/app/pages/actions/actions.component.ts index 7a139379e1..346ead6b4a 100644 --- a/console/src/app/pages/actions/actions.component.ts +++ b/console/src/app/pages/actions/actions.component.ts @@ -1,10 +1,11 @@ -import { Component } from '@angular/core'; +import { Component, signal } from '@angular/core'; import { enterAnimations } from 'src/app/animations'; +import { InfoSectionType } from 'src/app/modules/info-section/info-section.component'; import { SidenavSetting } from 'src/app/modules/sidenav/sidenav.component'; import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service'; -const ACTIONS: SidenavSetting = { id: 'general', i18nKey: 'MENU.ACTIONS' }; -const TARGETS: SidenavSetting = { id: 'roles', i18nKey: 'MENU.TARGETS' }; +const ACTIONS: SidenavSetting = { id: 'actions', i18nKey: 'MENU.ACTIONS' }; +const TARGETS: SidenavSetting = { id: 'targets', i18nKey: 'MENU.TARGETS' }; @Component({ selector: 'cnsl-actions', @@ -14,7 +15,8 @@ const TARGETS: SidenavSetting = { id: 'roles', i18nKey: 'MENU.TARGETS' }; }) export class ActionsComponent { public settingsList: SidenavSetting[] = [ACTIONS, TARGETS]; - public currentSetting = this.settingsList[0]; + protected readonly currentSetting$ = signal(this.settingsList[0]); + protected readonly InfoSectionType = InfoSectionType; constructor(breadcrumbService: BreadcrumbService) { const iamBread = new Breadcrumb({ diff --git a/console/src/app/pages/actions/actions.module.ts b/console/src/app/pages/actions/actions.module.ts index 112ff8eede..e0f14cee5d 100644 --- a/console/src/app/pages/actions/actions.module.ts +++ b/console/src/app/pages/actions/actions.module.ts @@ -7,10 +7,23 @@ import { ActionsRoutingModule } from './actions-routing.module'; import { ActionsComponent } from './actions.component'; import { MetaLayoutModule } from 'src/app/modules/meta-layout/meta-layout.module'; import { SidenavModule } from 'src/app/modules/sidenav/sidenav.module'; +import { ActionsTwoActionsComponent } from 'src/app/modules/actions-two/actions-two-actions/actions-two-actions.component'; +import ActionsTwoModule from 'src/app/modules/actions-two/actions-two.module'; +import { FormsModule } from '@angular/forms'; +import { InfoSectionModule } from 'src/app/modules/info-section/info-section.module'; @NgModule({ declarations: [ActionsComponent], - imports: [CommonModule, ActionsRoutingModule, OrgTableModule, TranslateModule, MetaLayoutModule, SidenavModule], + imports: [ + CommonModule, + FormsModule, + ActionsRoutingModule, + OrgTableModule, + TranslateModule, + InfoSectionModule, + SidenavModule, + ActionsTwoModule, + ], exports: [ActionsComponent], }) export default class ActionsModule {} diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index 711a8f1d65..03f6f3d87f 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -431,6 +431,7 @@ "SHOWORGS": "Show All Organizations", "GRANTS": "Authorizations", "ACTIONS": "Actions", + "TARGETS": "Targets", "PRIVACY": "Privacy", "TOS": "Terms of Service", "OPENSHORTCUTSTOOLTIP": "Type ? to show keyboard shortcuts",