Localization: Realm Overrides Fixes (keycloak#26169)

* resolved conflict Signed-off-by: Agnieszka Gancarczyk <[email protected]> * improvements Signed-off-by: Agnieszka Gancarczyk <[email protected]> * improved tests Signed-off-by: Agnieszka Gancarczyk <[email protected]> * feedback Signed-off-by: Agnieszka Gancarczyk <[email protected]> * test fix Signed-off-by: Agnieszka Gancarczyk <[email protected]> * test fix Signed-off-by: Agnieszka Gancarczyk <[email protected]> * resolved conflict Signed-off-by: Agnieszka Gancarczyk <[email protected]> * fixed test Signed-off-by: Agnieszka Gancarczyk <[email protected]> --------- Signed-off-by: Agnieszka Gancarczyk <[email protected]> Co-authored-by: Agnieszka Gancarczyk <[email protected]>
tnorimat · Jan 16, 2024 · 33651c3 · 33651c3
1 parent e83cc12
commit 33651c3
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 675 deletions.
diff --git a/js/apps/admin-ui/cypress/e2e/realm_settings_tabs_test.spec.ts b/js/apps/admin-ui/cypress/e2e/realm_settings_tabs_test.spec.ts
@@ -206,7 +206,8 @@ describe("Realm settings tabs tests", () => {
         .contains("td", "123")
         .should("be.visible");
 
-      cy.findByTestId("realmOverrides-deleteKebabToggle").click();
+      cy.get('td.pf-c-table__action button[aria-label="Actions"]').click();
+      cy.contains("button", "Delete").click();
       cy.findByTestId("confirm").click();
       masthead.checkNotificationMessage(
         "Successfully removed message(s) from the bundle.",
@@ -253,7 +254,8 @@ describe("Realm settings tabs tests", () => {
         .contains("td", "def")
         .should("be.visible");
 
-      cy.findByTestId("realmOverrides-deleteKebabToggle").click();
+      cy.get('td.pf-c-table__action button[aria-label="Actions"]').click();
+      cy.contains("button", "Delete").click();
       cy.findByTestId("confirm").click();
 
       masthead.checkNotificationMessage(
@@ -343,7 +345,7 @@ describe("Realm settings tabs tests", () => {
     it("Check a11y violations on localization realm overrides sub tab/ adding message bundle", () => {
       realmSettingsPage.goToLocalizationTab();
       realmSettingsPage.goToLocalizationRealmOverridesSubTab();
-      cy.findByTestId("add-bundle-button").click();
+      cy.findByTestId("add-translationBtn").click();
       cy.checkA11y();
       modalUtils.cancelModal();
     });

diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
@@ -95,7 +95,7 @@ export default class RealmSettingsPage extends CommonPage {
   testConnectionButton = "test-connection-button";
   modalTestConnectionButton = "modal-test-connection-button";
   emailAddressInput = "email-address-input";
-  addBundleButton = "add-bundle-button";
+  addBundleButton = "add-translationBtn";
   confirmAddBundle = "add-bundle-confirm-button";
   keyInput = "key-input";
   valueInput = "value-input";

diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
@@ -964,7 +964,7 @@ deleteMappingConfirm=Are you sure you want to delete this mapping?
 createClientProfileSuccess=New client profile created
 eventTypes.CLIENT_LOGIN_ERROR.description=Client login error
 explainBearerOnly=This is a special OIDC type. This client only allows bearer token requests and cannot participate in browser logins.
-noMessageBundlesInstructions=Add a message bundle to get started.
+noTranslationsInstructions=Add a translation to get started.
 clearFile=Clear this file
 allowCreate=Allow create
 providerUpdatedError=Could not update client policy due to {{error}}
@@ -2632,7 +2632,7 @@ minus=Minus
 groupsHelp=Groups where the user has membership. To leave a group, select it and click Leave.
 includeGroupsAndRoles=Include groups and roles
 groupsPermissionsHint=Determines if fine grained permissions are enabled for managing this role.  Disabling will delete all current permissions that have been set up.
-searchForMessageBundle=Search for message bundle
+searchForTranslation=Search for translation
 offlineSessionMaxHelp=Max time before an offline session is expired regardless of activity.
 resourceSaveError=Could not persist resource due to {{error}}
 clientsClientScopesHelp=The scopes associated with this resource.
@@ -2673,7 +2673,7 @@ policyType.totp=Time based
 addAttribute=Add {{label}}
 clientScopeSearch.protocol=Protocol
 initialAccessTokenDetails=Initial access token details
-noMessageBundles=No message bundles
+noTranslations=No translations
 deleteProvider=Delete provider?
 inputTypeSize=Input size
 createAttributeSubTitle=Create a new attribute
@@ -2984,3 +2984,5 @@ joinCommunity=Join community
 readBlog=Read blog
 customValue=Custom value
 termsAndConditionsUserAttribute=Terms and conditions accepted timestamp
+realmOverridesDescription= Realm overrides allow you to specify translations that will take effect for the entire realm. These translations will override any translation specified by a theme.
+addTranslation=Add translation
diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_pl.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_pl.properties
@@ -951,7 +951,7 @@ deleteMappingConfirm=Czy na pewno chcesz usunąć to odwzorowanie?
 createClientProfileSuccess=Utworzono nowy profil klienta
 eventTypes.CLIENT_LOGIN_ERROR.description=Błąd logowania klienta
 explainBearerOnly=To jest specjalny typ OIDC. Ten klient pozwala tylko na żądania tokenów dostępu i nie może uczestniczyć w logowaniach przeglądarki.
-noMessageBundlesInstructions=Dodaj pakiet wiadomości, aby rozpocząć.
+noTranslationsInstructions=Dodaj tłumaczenie, aby rozpocząć.
 clearFile=Wyczyść ten plik
 allowCreate=Zezwól na tworzenie
 providerUpdatedError=Nie można zaktualizować polityki klienta z powodu błędu: {{error}}
@@ -2644,7 +2644,7 @@ policyType.totp=Oparte na czasie
 addAttribute=Dodaj atrybut
 clientScopeSearch.protocol=Protokół
 initialAccessTokenDetails=Informacje o tokenie początkowym dostępu
-noMessageBundles=Brak pakietów wiadomości
+noTranslations=Brak tłuamczeń
 deleteProvider=Usunąć dostawcę?
 inputTypeSize=Rozmiar pola wejściowego
 createAttributeSubTitle=Utwórz nowy atrybut
@@ -2916,3 +2916,4 @@ invalidEmailMessage='{{0}}': Nieprawidłowy adres e-mail.
 missingLastNameMessage='{{0}}': Proszę podać nazwisko.
 missingEmailMessage='{{0}}': Proszę podać adres e-mail.
 missingPasswordMessage='{{0}}': Proszę podać hasło.
+addTranslation=Dodaj tłumaczenie