Rename all references to 'Admin Console' to 'Admin UI' (#3930)

apps/admin-ui/CODING_GUIDELINES.md

@@ -118,7 +118,7 @@ We will use one global CSS file to surface customization variables. Styles parti
 
 PatternFly reference https://pf4.patternfly.org/guidelines#variables
 
-For the Keycloak admin console, we modify the PatternFly convention to namespace the classes and variables to the Keycloak packages.
+For the Admin UI, we modify the PatternFly convention to namespace the classes and variables to the Keycloak packages.
 
 **Class name**
 ```css
@@ -145,7 +145,7 @@ For the Keycloak admin console, we modify the PatternFly convention to namespace
 ...
 }
 
-// Compact data table just in the management console at the lg or higher breakpoint
+// Compact data table just in the management UI at the lg or higher breakpoint
 .keycloak-admin--data-table--compact--lg {
 ...
 }
@@ -158,7 +158,7 @@ However, there are other times when modifications must be made to the styling pr
 
 These values can be seen in the [PatternFly design guidelines](https://www.patternfly.org/v4/design-guidelines/styles/colors) and a [full listing of variables](https://www.patternfly.org/v4/documentation/overview/global-css-variables) can be found in the documentation section.
 
-For the Keycloak admin console, we modify the PatternFly convention to namespace the classes and variables to the Keycloak packages.
+For the Admin UI, we modify the PatternFly convention to namespace the classes and variables to the Keycloak packages.
 
 **Custom property**
 ```css
@@ -189,7 +189,7 @@ For the Keycloak admin console, we modify the PatternFly convention to namespace
 
 Utility classes can be used to add specific styling to a component, such as margin-bottom or padding. However, their use should be limited to one-off styling needs.  
 
-For example, instead of using the utility class for margin-right multiple times, we should define a new Keycloak admin console class that adds this *margin-right: var(--pf-global--spacer--sm);* and in this example, the new class can set the color appropriately as well.
+For example, instead of using the utility class for margin-right multiple times, we should define a new Admin UI class that adds this *margin-right: var(--pf-global--spacer--sm);* and in this example, the new class can set the color appropriately as well.
 
 **Using a utility class **
 ```css

apps/admin-ui/cypress/e2e/authentication_policies.spec.ts

@@ -1,9 +1,9 @@
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import OTPPolicies from "../support/pages/admin_console/manage/authentication/OTPPolicies";
-import WebAuthnPolicies from "../support/pages/admin_console/manage/authentication/WebAuthnPolicies";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import OTPPolicies from "../support/pages/admin-ui/manage/authentication/OTPPolicies";
+import WebAuthnPolicies from "../support/pages/admin-ui/manage/authentication/WebAuthnPolicies";
 
 describe("Policies", () => {
   const masthead = new Masthead();

apps/admin-ui/cypress/e2e/authentication_test.spec.ts

@@ -1,16 +1,16 @@
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import Masthead from "../support/pages/admin_console/Masthead";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import DuplicateFlowModal from "../support/pages/admin_console/manage/authentication/DuplicateFlowModal";
-import FlowDetails from "../support/pages/admin_console/manage/authentication/FlowDetail";
-import RequiredActions from "../support/pages/admin_console/manage/authentication/RequiredActions";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import DuplicateFlowModal from "../support/pages/admin-ui/manage/authentication/DuplicateFlowModal";
+import FlowDetails from "../support/pages/admin-ui/manage/authentication/FlowDetail";
+import RequiredActions from "../support/pages/admin-ui/manage/authentication/RequiredActions";
 import adminClient from "../support/util/AdminClient";
-import PasswordPolicies from "../support/pages/admin_console/manage/authentication/PasswordPolicies";
+import PasswordPolicies from "../support/pages/admin-ui/manage/authentication/PasswordPolicies";
 import ModalUtils from "../support/util/ModalUtils";
 import CommonPage from "../support/pages/CommonPage";
-import BindFlowModal from "../support/pages/admin_console/manage/authentication/BindFlowModal";
+import BindFlowModal from "../support/pages/admin-ui/manage/authentication/BindFlowModal";
 
 const loginPage = new LoginPage();
 const masthead = new Masthead();

apps/admin-ui/cypress/e2e/client_authorization_test.spec.ts

@@ -1,14 +1,14 @@
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 import LoginPage from "../support/pages/LoginPage";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import AuthorizationTab from "../support/pages/admin_console/manage/clients/client_details/tabs/AuthorizationTab";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import AuthorizationTab from "../support/pages/admin-ui/manage/clients/client_details/tabs/AuthorizationTab";
 import ModalUtils from "../support/util/ModalUtils";
-import ClientDetailsPage from "../support/pages/admin_console/manage/clients/client_details/ClientDetailsPage";
-import PoliciesTab from "../support/pages/admin_console/manage/clients/client_details/tabs/authorization_subtabs/PoliciesTab";
-import PermissionsTab from "../support/pages/admin_console/manage/clients/client_details/tabs/authorization_subtabs/PermissionsTab";
+import ClientDetailsPage from "../support/pages/admin-ui/manage/clients/client_details/ClientDetailsPage";
+import PoliciesTab from "../support/pages/admin-ui/manage/clients/client_details/tabs/authorization_subtabs/PoliciesTab";
+import PermissionsTab from "../support/pages/admin-ui/manage/clients/client_details/tabs/authorization_subtabs/PermissionsTab";
 
 describe("Client authentication subtab", () => {
   const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/client_scopes_test.spec.ts

@@ -1,14 +1,14 @@
 import LoginPage from "../support/pages/LoginPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ListingPage, {
   Filter,
   FilterAssignedType,
   FilterProtocol,
-} from "../support/pages/admin_console/ListingPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import CreateClientScopePage from "../support/pages/admin_console/manage/client_scopes/CreateClientScopePage";
+} from "../support/pages/admin-ui/ListingPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import CreateClientScopePage from "../support/pages/admin-ui/manage/client_scopes/CreateClientScopePage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import RoleMappingTab from "../support/pages/admin_console/manage/RoleMappingTab";
+import RoleMappingTab from "../support/pages/admin-ui/manage/RoleMappingTab";
 import ModalUtils from "../support/util/ModalUtils";
 import adminClient from "../support/util/AdminClient";
 

apps/admin-ui/cypress/e2e/clients_saml_test.spec.ts

@@ -1,11 +1,11 @@
 import LoginPage from "../support/pages/LoginPage";
-import Masthead from "../support/pages/admin_console/Masthead";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import ModalUtils from "../support/util/ModalUtils";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import SettingsTab from "../support/pages/admin_console/manage/clients/client_details/tabs/SettingsTab";
+import SettingsTab from "../support/pages/admin-ui/manage/clients/client_details/tabs/SettingsTab";
 
 const loginPage = new LoginPage();
 const masthead = new Masthead();

apps/admin-ui/cypress/e2e/clients_test.spec.ts

@@ -2,22 +2,22 @@ import LoginPage from "../support/pages/LoginPage";
 import ListingPage, {
   Filter,
   FilterAssignedType,
-} from "../support/pages/admin_console/ListingPage";
-import CreateClientPage from "../support/pages/admin_console/manage/clients/CreateClientPage";
+} from "../support/pages/admin-ui/ListingPage";
+import CreateClientPage from "../support/pages/admin-ui/manage/clients/CreateClientPage";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import RoleMappingTab from "../support/pages/admin_console/manage/RoleMappingTab";
-import createRealmRolePage from "../support/pages/admin_console/manage/realm_roles/CreateRealmRolePage";
-import AssociatedRolesPage from "../support/pages/admin_console/manage/realm_roles/AssociatedRolesPage";
-import ClientRolesTab from "../support/pages/admin_console/manage/clients/ClientRolesTab";
-import InitialAccessTokenTab from "../support/pages/admin_console/manage/clients/tabs/InitialAccessTokenTab";
-import AdvancedTab from "../support/pages/admin_console/manage/clients/client_details/tabs/AdvancedTab";
+import RoleMappingTab from "../support/pages/admin-ui/manage/RoleMappingTab";
+import createRealmRolePage from "../support/pages/admin-ui/manage/realm_roles/CreateRealmRolePage";
+import AssociatedRolesPage from "../support/pages/admin-ui/manage/realm_roles/AssociatedRolesPage";
+import ClientRolesTab from "../support/pages/admin-ui/manage/clients/ClientRolesTab";
+import InitialAccessTokenTab from "../support/pages/admin-ui/manage/clients/tabs/InitialAccessTokenTab";
+import AdvancedTab from "../support/pages/admin-ui/manage/clients/client_details/tabs/AdvancedTab";
 import ClientDetailsPage, {
   ClientsDetailsTab,
-} from "../support/pages/admin_console/manage/clients/client_details/ClientDetailsPage";
+} from "../support/pages/admin-ui/manage/clients/client_details/ClientDetailsPage";
 import CommonPage from "../support/pages/CommonPage";
-import AttributesTab from "../support/pages/admin_console/manage/AttributesTab";
-import DedicatedScopesMappersTab from "../support/pages/admin_console/manage/clients/client_details/DedicatedScopesMappersTab";
+import AttributesTab from "../support/pages/admin-ui/manage/AttributesTab";
+import DedicatedScopesMappersTab from "../support/pages/admin-ui/manage/clients/client_details/DedicatedScopesMappersTab";
 
 let itemId = "client_crud";
 const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/events_test.spec.ts

@@ -1,16 +1,16 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import UserEventsTab, {
   UserEventSearchData,
-} from "../support/pages/admin_console/manage/events/tabs/UserEventsTab";
-import AdminEventsTab from "../support/pages/admin_console/manage/events/tabs/AdminEventsTab";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+} from "../support/pages/admin-ui/manage/events/tabs/UserEventsTab";
+import AdminEventsTab from "../support/pages/admin-ui/manage/events/tabs/AdminEventsTab";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import EventsPage, {
   EventsTab,
-} from "../support/pages/admin_console/manage/events/EventsPage";
-import ListingPage from "../support/pages/admin_console/ListingPage";
+} from "../support/pages/admin-ui/manage/events/EventsPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
 import adminClient from "../support/util/AdminClient";
 
 const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/group_test.spec.ts

@@ -1,16 +1,16 @@
-import GroupModal from "../support/pages/admin_console/manage/groups/GroupModal";
-import GroupDetailPage from "../support/pages/admin_console/manage/groups/group_details/GroupDetailPage";
-import AttributesTab from "../support/pages/admin_console/manage//AttributesTab";
-import { SearchGroupPage } from "../support/pages/admin_console/manage/groups/SearchGroupPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import GroupModal from "../support/pages/admin-ui/manage/groups/GroupModal";
+import GroupDetailPage from "../support/pages/admin-ui/manage/groups/group_details/GroupDetailPage";
+import AttributesTab from "../support/pages/admin-ui/manage/AttributesTab";
+import { SearchGroupPage } from "../support/pages/admin-ui/manage/groups/SearchGroupPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import GroupPage from "../support/pages/admin_console/manage/groups/GroupPage";
-import ChildGroupsTab from "../support/pages/admin_console/manage/groups/group_details/tabs/ChildGroupsTab";
-import MembersTab from "../support/pages/admin_console/manage/groups/group_details/tabs/MembersTab";
+import GroupPage from "../support/pages/admin-ui/manage/groups/GroupPage";
+import ChildGroupsTab from "../support/pages/admin-ui/manage/groups/group_details/tabs/ChildGroupsTab";
+import MembersTab from "../support/pages/admin-ui/manage/groups/group_details/tabs/MembersTab";
 import adminClient from "../support/util/AdminClient";
 import { range } from "lodash-es";
-import RoleMappingTab from "../support/pages/admin_console/manage/RoleMappingTab";
+import RoleMappingTab from "../support/pages/admin-ui/manage/RoleMappingTab";
 import CommonPage from "../support/pages/CommonPage";
 
 describe("Group test", () => {

apps/admin-ui/cypress/e2e/identity_providers_oidc_test.spec.ts

@@ -1,16 +1,16 @@
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import CreateProviderPage from "../support/pages/admin_console/manage/identity_providers/CreateProviderPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import CreateProviderPage from "../support/pages/admin-ui/manage/identity_providers/CreateProviderPage";
 import ModalUtils from "../support/util/ModalUtils";
-import AddMapperPage from "../support/pages/admin_console/manage/identity_providers/AddMapperPage";
-import ProviderBaseGeneralSettingsPage from "../support/pages/admin_console/manage/identity_providers/ProviderBaseGeneralSettingsPage";
+import AddMapperPage from "../support/pages/admin-ui/manage/identity_providers/AddMapperPage";
+import ProviderBaseGeneralSettingsPage from "../support/pages/admin-ui/manage/identity_providers/ProviderBaseGeneralSettingsPage";
 import ProviderBaseAdvancedSettingsPage, {
   ClientAuthentication,
   PromptSelect,
-} from "../support/pages/admin_console/manage/identity_providers/ProviderBaseAdvancedSettingsPage";
+} from "../support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage";
 
 describe("OIDC identity provider test", () => {
   const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/identity_providers_saml_test.spec.ts

@@ -1,12 +1,12 @@
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import CreateProviderPage from "../support/pages/admin_console/manage/identity_providers/CreateProviderPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import CreateProviderPage from "../support/pages/admin-ui/manage/identity_providers/CreateProviderPage";
 import ModalUtils from "../support/util/ModalUtils";
-import AddMapperPage from "../support/pages/admin_console/manage/identity_providers/AddMapperPage";
-import ProviderSAMLSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderSAMLSettings";
+import AddMapperPage from "../support/pages/admin-ui/manage/identity_providers/AddMapperPage";
+import ProviderSAMLSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderSAMLSettings";
 
 describe("SAML identity provider test", () => {
   const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/identity_providers_test.spec.ts

@@ -1,23 +1,23 @@
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import ListingPage from "../support/pages/admin_console/ListingPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
 
-import CreateProviderPage from "../support/pages/admin_console/manage/identity_providers/CreateProviderPage";
+import CreateProviderPage from "../support/pages/admin-ui/manage/identity_providers/CreateProviderPage";
 import ModalUtils from "../support/util/ModalUtils";
-import OrderDialog from "../support/pages/admin_console/manage/identity_providers/OrderDialog";
-import AddMapperPage from "../support/pages/admin_console/manage/identity_providers/AddMapperPage";
-import ProviderFacebookGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderFacebookGeneralSettings";
-import ProviderBaseGeneralSettingsPage from "../support/pages/admin_console/manage/identity_providers/ProviderBaseGeneralSettingsPage";
-import ProviderBaseAdvancedSettingsPage from "../support/pages/admin_console/manage/identity_providers/ProviderBaseAdvancedSettingsPage";
-import ProviderGithubGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderGithubGeneralSettings";
-import ProviderGoogleGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderGoogleGeneralSettings";
-import ProviderOpenshiftGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderOpenshiftGeneralSettings";
-import ProviderPaypalGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderPaypalGeneralSettings";
-import ProviderStackoverflowGeneralSettings from "../support/pages/admin_console/manage/identity_providers/social/ProviderStackoverflowGeneralSettings";
+import OrderDialog from "../support/pages/admin-ui/manage/identity_providers/OrderDialog";
+import AddMapperPage from "../support/pages/admin-ui/manage/identity_providers/AddMapperPage";
+import ProviderFacebookGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderFacebookGeneralSettings";
+import ProviderBaseGeneralSettingsPage from "../support/pages/admin-ui/manage/identity_providers/ProviderBaseGeneralSettingsPage";
+import ProviderBaseAdvancedSettingsPage from "../support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage";
+import ProviderGithubGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderGithubGeneralSettings";
+import ProviderGoogleGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderGoogleGeneralSettings";
+import ProviderOpenshiftGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderOpenshiftGeneralSettings";
+import ProviderPaypalGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderPaypalGeneralSettings";
+import ProviderStackoverflowGeneralSettings from "../support/pages/admin-ui/manage/identity_providers/social/ProviderStackoverflowGeneralSettings";
 import adminClient from "../support/util/AdminClient";
-import GroupPage from "../support/pages/admin_console/manage/groups/GroupPage";
+import GroupPage from "../support/pages/admin-ui/manage/groups/GroupPage";
 import CommonPage from "../support/pages/CommonPage";
 
 describe("Identity provider test", () => {

apps/admin-ui/cypress/e2e/login_test.spec.ts

@@ -1,5 +1,5 @@
 import LoginPage from "../support/pages/LoginPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 
 const username = "admin";
@@ -22,7 +22,7 @@ describe("Logging In", () => {
   it("logs in", () => {
     loginPage.logIn(username, password);
 
-    masthead.checkIsAdminConsole();
+    masthead.checkIsAdminUI();
 
     cy.getCookie("KEYCLOAK_SESSION_LEGACY").should("exist");
   });

apps/admin-ui/cypress/e2e/masthead_test.spec.ts

@@ -1,7 +1,7 @@
-import ListingPage from "../support/pages/admin_console/ListingPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 
 const loginPage = new LoginPage();
@@ -21,7 +21,7 @@ const goToAcctMgtTest = () => {
   masthead.accountManagement();
   cy.get("h1").contains("Welcome to Keycloak account management");
   cy.get("#landingReferrerLink").click({ force: true });
-  masthead.checkIsAdminConsole();
+  masthead.checkIsAdminUI();
 };
 
 describe("Masthead tests in desktop mode", () => {

apps/admin-ui/cypress/e2e/partial_export_test.spec.ts

@@ -1,6 +1,6 @@
-import PartialExportModal from "../support/pages/admin_console/configure/realm_settings/PartialExportModal";
-import RealmSettings from "../support/pages/admin_console/configure/realm_settings/RealmSettings";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import PartialExportModal from "../support/pages/admin-ui/configure/realm_settings/PartialExportModal";
+import RealmSettings from "../support/pages/admin-ui/configure/realm_settings/RealmSettings";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";

apps/admin-ui/cypress/e2e/partial_import_test.spec.ts

@@ -1,7 +1,7 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import PartialImportModal from "../support/pages/admin_console/configure/realm_settings/PartialImportModal";
-import RealmSettings from "../support/pages/admin_console/configure/realm_settings/RealmSettings";
+import PartialImportModal from "../support/pages/admin-ui/configure/realm_settings/PartialImportModal";
+import RealmSettings from "../support/pages/admin-ui/configure/realm_settings/RealmSettings";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 

apps/admin-ui/cypress/e2e/realm_roles_test.spec.ts

@@ -1,14 +1,14 @@
 import LoginPage from "../support/pages/LoginPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import createRealmRolePage from "../support/pages/admin_console/manage/realm_roles/CreateRealmRolePage";
-import AssociatedRolesPage from "../support/pages/admin_console/manage/realm_roles/AssociatedRolesPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import createRealmRolePage from "../support/pages/admin-ui/manage/realm_roles/CreateRealmRolePage";
+import AssociatedRolesPage from "../support/pages/admin-ui/manage/realm_roles/AssociatedRolesPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
-import ClientRolesTab from "../support/pages/admin_console/manage/clients/ClientRolesTab";
-import KeyValueInput from "../support/pages/admin_console/manage/KeyValueInput";
+import ClientRolesTab from "../support/pages/admin-ui/manage/clients/ClientRolesTab";
+import KeyValueInput from "../support/pages/admin-ui/manage/KeyValueInput";
 
 let itemId = "realm_role_crud";
 const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/realm_settings_client_policies_test.spec.ts

@@ -1,10 +1,10 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 import ModalUtils from "../support/util/ModalUtils";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 
 const loginPage = new LoginPage();
 const sidebarPage = new SidebarPage();

apps/admin-ui/cypress/e2e/realm_settings_client_profiles_test.spec.ts

@@ -1,10 +1,10 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 import ModalUtils from "../support/util/ModalUtils";
-import Masthead from "../support/pages/admin_console/Masthead";
+import Masthead from "../support/pages/admin-ui/Masthead";
 
 const loginPage = new LoginPage();
 const sidebarPage = new SidebarPage();

apps/admin-ui/cypress/e2e/realm_settings_events_test.spec.ts

@@ -1,10 +1,10 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import ListingPage from "../support/pages/admin_console/ListingPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
 import adminClient from "../support/util/AdminClient";
 
 const loginPage = new LoginPage();
@@ -142,7 +142,7 @@ describe("Realm settings events tab tests", () => {
     realmSettingsPage.toggleAddProviderDropdown();
 
     cy.findByTestId("option-aes-generated").click();
-    realmSettingsPage.enterConsoleDisplayName("test_aes-generated");
+    realmSettingsPage.enterUIDisplayName("test_aes-generated");
     realmSettingsPage.toggleSwitch("active", false);
     realmSettingsPage.toggleSwitch("enabled", false);
     realmSettingsPage.addProvider();
@@ -150,21 +150,21 @@ describe("Realm settings events tab tests", () => {
     realmSettingsPage.toggleAddProviderDropdown();
 
     cy.findByTestId("option-ecdsa-generated").click();
-    realmSettingsPage.enterConsoleDisplayName("test_ecdsa-generated");
+    realmSettingsPage.enterUIDisplayName("test_ecdsa-generated");
     realmSettingsPage.toggleSwitch("enabled", false);
     realmSettingsPage.addProvider();
 
     realmSettingsPage.toggleAddProviderDropdown();
 
     cy.findByTestId("option-hmac-generated").click();
-    realmSettingsPage.enterConsoleDisplayName("test_hmac-generated");
+    realmSettingsPage.enterUIDisplayName("test_hmac-generated");
     realmSettingsPage.toggleSwitch("active", false);
     realmSettingsPage.addProvider();
 
     realmSettingsPage.toggleAddProviderDropdown();
 
     cy.findByTestId("option-rsa-generated").click();
-    realmSettingsPage.enterConsoleDisplayName("test_rsa-generated");
+    realmSettingsPage.enterUIDisplayName("test_rsa-generated");
     realmSettingsPage.toggleSwitch("active", false);
     realmSettingsPage.toggleSwitch("enabled", false);
     realmSettingsPage.addProvider();
@@ -172,7 +172,7 @@ describe("Realm settings events tab tests", () => {
     realmSettingsPage.toggleAddProviderDropdown();
 
     cy.findByTestId("option-rsa-enc-generated").click();
-    realmSettingsPage.enterConsoleDisplayName("test_rsa-enc-generated");
+    realmSettingsPage.enterUIDisplayName("test_rsa-enc-generated");
     realmSettingsPage.toggleSwitch("active", false);
     realmSettingsPage.toggleSwitch("enabled", false);
     realmSettingsPage.addProvider();

apps/admin-ui/cypress/e2e/realm_settings_general_tab_test.spec.ts

@@ -1,7 +1,7 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 

apps/admin-ui/cypress/e2e/realm_settings_tabs_test.spec.ts

@@ -1,7 +1,7 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import RealmSettingsPage from "../support/pages/admin_console/manage/realm_settings/RealmSettingsPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 import adminClient from "../support/util/AdminClient";
 

apps/admin-ui/cypress/e2e/realm_settings_user_profile_tab.spec.ts

@@ -1,7 +1,7 @@
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import UserProfile from "../support/pages/admin_console/manage/realm_settings/UserProfile";
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import UserProfile from "../support/pages/admin-ui/manage/realm_settings/UserProfile";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";

apps/admin-ui/cypress/e2e/realm_test.spec.ts

@@ -1,10 +1,10 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import CreateRealmPage from "../support/pages/admin_console/CreateRealmPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import CreateRealmPage from "../support/pages/admin-ui/CreateRealmPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import RealmSettings from "../support/pages/admin_console/configure/realm_settings/RealmSettings";
+import RealmSettings from "../support/pages/admin-ui/configure/realm_settings/RealmSettings";
 import ModalUtils from "../support/util/ModalUtils";
 
 const masthead = new Masthead();

apps/admin-ui/cypress/e2e/realm_user_registration.spec.ts

@@ -1,9 +1,9 @@
-import ListingPage from "../support/pages/admin_console/ListingPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
 import UserRegistration, {
   GroupPickerDialog,
-} from "../support/pages/admin_console/manage/realm_settings/UserRegistration";
-import Masthead from "../support/pages/admin_console/Masthead";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+} from "../support/pages/admin-ui/manage/realm_settings/UserRegistration";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
 import adminClient from "../support/util/AdminClient";
 import { keycloakBefore } from "../support/util/keycloak_hooks";

apps/admin-ui/cypress/e2e/sessions_test.spec.ts

@@ -1,9 +1,9 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import SessionsPage from "../support/pages/admin_console/manage/sessions/SessionsPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import SessionsPage from "../support/pages/admin-ui/manage/sessions/SessionsPage";
 import CommonPage from "../support/pages/CommonPage";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import GroupPage from "../support/pages/admin_console/manage/groups/GroupPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import GroupPage from "../support/pages/admin-ui/manage/groups/GroupPage";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 
 const loginPage = new LoginPage();

apps/admin-ui/cypress/e2e/user_fed_kerberos_test.spec.ts

@@ -1,10 +1,10 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import ProviderPage from "../support/pages/admin_console/manage/providers/ProviderPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import ProviderPage from "../support/pages/admin-ui/manage/providers/ProviderPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import PriorityDialog from "../support/pages/admin_console/manage/providers/PriorityDialog";
+import PriorityDialog from "../support/pages/admin-ui/manage/providers/PriorityDialog";
 
 const loginPage = new LoginPage();
 const masthead = new Masthead();

apps/admin-ui/cypress/e2e/user_fed_ldap_hardcoded_mapper_test.spec.ts

@@ -1,13 +1,13 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import GroupModal from "../support/pages/admin_console/manage/groups/GroupModal";
-import ProviderPage from "../support/pages/admin_console/manage/providers/ProviderPage";
-import CreateClientPage from "../support/pages/admin_console/manage/clients/CreateClientPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import GroupModal from "../support/pages/admin-ui/manage/groups/GroupModal";
+import ProviderPage from "../support/pages/admin-ui/manage/providers/ProviderPage";
+import CreateClientPage from "../support/pages/admin-ui/manage/clients/CreateClientPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import GroupPage from "../support/pages/admin_console/manage/groups/GroupPage";
+import GroupPage from "../support/pages/admin-ui/manage/groups/GroupPage";
 
 const loginPage = new LoginPage();
 const masthead = new Masthead();

apps/admin-ui/cypress/e2e/user_fed_ldap_mapper_test.spec.ts

@@ -1,8 +1,8 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import ProviderPage from "../support/pages/admin_console/manage/providers/ProviderPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import ProviderPage from "../support/pages/admin-ui/manage/providers/ProviderPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 

apps/admin-ui/cypress/e2e/user_fed_ldap_test.spec.ts

@@ -1,7 +1,7 @@
 import LoginPage from "../support/pages/LoginPage";
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
-import ProviderPage from "../support/pages/admin_console/manage/providers/ProviderPage";
-import Masthead from "../support/pages/admin_console/Masthead";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
+import ProviderPage from "../support/pages/admin-ui/manage/providers/ProviderPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
 

apps/admin-ui/cypress/e2e/users_test.spec.ts

@@ -1,17 +1,17 @@
-import SidebarPage from "../support/pages/admin_console/SidebarPage";
+import SidebarPage from "../support/pages/admin-ui/SidebarPage";
 import LoginPage from "../support/pages/LoginPage";
-import CreateUserPage from "../support/pages/admin_console/manage/users/CreateUserPage";
-import Masthead from "../support/pages/admin_console/Masthead";
-import ListingPage from "../support/pages/admin_console/ListingPage";
-import UserDetailsPage from "../support/pages/admin_console/manage/users/user_details/UserDetailsPage";
-import AttributesTab from "../support/pages/admin_console/manage/AttributesTab";
+import CreateUserPage from "../support/pages/admin-ui/manage/users/CreateUserPage";
+import Masthead from "../support/pages/admin-ui/Masthead";
+import ListingPage from "../support/pages/admin-ui/ListingPage";
+import UserDetailsPage from "../support/pages/admin-ui/manage/users/user_details/UserDetailsPage";
+import AttributesTab from "../support/pages/admin-ui/manage/AttributesTab";
 import ModalUtils from "../support/util/ModalUtils";
 import { keycloakBefore } from "../support/util/keycloak_hooks";
-import UserGroupsPage from "../support/pages/admin_console/manage/users/UserGroupsPage";
+import UserGroupsPage from "../support/pages/admin-ui/manage/users/UserGroupsPage";
 import adminClient from "../support/util/AdminClient";
-import CredentialsPage from "../support/pages/admin_console/manage/users/CredentialsPage";
-import UsersPage from "../support/pages/admin_console/manage/users/UsersPage";
-import IdentityProviderLinksTab from "../support/pages/admin_console/manage/users/user_details/tabs/IdentityProviderLinksTab";
+import CredentialsPage from "../support/pages/admin-ui/manage/users/CredentialsPage";
+import UsersPage from "../support/pages/admin-ui/manage/users/UsersPage";
+import IdentityProviderLinksTab from "../support/pages/admin-ui/manage/users/user_details/tabs/IdentityProviderLinksTab";
 
 let groupName = "group";
 let groupsList: string[] = [];

apps/admin-ui/cypress/support/pages/CommonPage.ts

@@ -1,12 +1,12 @@
-import Masthead from "./admin_console/Masthead";
-import SidebarPage from "./admin_console/SidebarPage";
-import TabUtils from "./admin_console/components/TabPage";
-import FormUtils from "./admin_console/components/FormPage";
+import Masthead from "./admin-ui/Masthead";
+import SidebarPage from "./admin-ui/SidebarPage";
+import TabUtils from "./admin-ui/components/TabPage";
+import FormUtils from "./admin-ui/components/FormPage";
 import ModalUtils from "../util/ModalUtils";
-import ActionToolbarUtils from "./admin_console/components/ActionToolbarPage";
-import TableToolbarUtils from "./admin_console/components/TableToolbarPage";
-import TableUtils from "./admin_console/components/TablePage";
-import EmptyStatePage from "./admin_console/components/EmptyStatePage";
+import ActionToolbarUtils from "./admin-ui/components/ActionToolbarPage";
+import TableToolbarUtils from "./admin-ui/components/TableToolbarPage";
+import TableUtils from "./admin-ui/components/TablePage";
+import EmptyStatePage from "./admin-ui/components/EmptyStatePage";
 
 export default class CommonPage {
   private mastheadPage = new Masthead();

apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts

@@ -15,7 +15,7 @@ export default class Masthead extends CommonElements {
     return cy.findByTestId(this.globalAlerts);
   }
 
-  checkIsAdminConsole() {
+  checkIsAdminUI() {
     cy.get(this.logoBtn).should("exist");
     cy.get(this.userDrpDwn).should("exist");
 

apps/admin-ui/cypress/support/pages/admin-ui/manage/clients/CreateClientPage.ts

@@ -7,8 +7,8 @@ export default class CreateClientPage extends CommonPage {
   private clientIdError = "#kc-client-id + div";
   private clientNameInput = "#kc-name";
   private clientDescriptionInput = "#kc-description";
-  private alwaysDisplayInConsoleSwitch =
-    '[for="kc-always-display-in-console-switch"] .pf-c-switch__toggle';
+  private alwaysDisplayInUISwitch =
+    '[for="kc-always-display-in-ui-switch"] .pf-c-switch__toggle';
   private frontchannelLogoutSwitch =
     '[for="kc-frontchannelLogout-switch"] .pf-c-switch__toggle';
 
@@ -90,7 +90,7 @@ export default class CreateClientPage extends CommonPage {
     }
 
     if (alwaysDisplay) {
-      cy.get(this.alwaysDisplayInConsoleSwitch).click();
+      cy.get(this.alwaysDisplayInUISwitch).click();
     }
 
     if (frontchannelLogout) {