From c567fdca93e3c007094a39ede400bb2c66695528 Mon Sep 17 00:00:00 2001 From: Sarah Rambacher Date: Wed, 13 Jan 2021 15:48:16 -0500 Subject: [PATCH] deduplicates some common text strings --- src/client-scopes/ClientScopesSection.tsx | 6 +++--- src/client-scopes/add/MapperDialog.tsx | 2 +- src/client-scopes/add/RoleMappingForm.tsx | 8 ++++---- src/client-scopes/details/MapperList.tsx | 7 ++++++- src/client-scopes/details/MappingDetails.tsx | 4 ++-- src/client-scopes/form/ClientScopeForm.tsx | 8 ++++---- src/client-scopes/messages.json | 6 ------ src/clients/ClientDescription.tsx | 4 ++-- src/clients/ClientsSection.tsx | 4 ++-- src/clients/import/ImportForm.tsx | 2 +- src/clients/messages.json | 10 ++-------- src/clients/scopes/AddScopeDialog.tsx | 2 +- src/clients/scopes/ClientScopes.tsx | 4 ++-- src/clients/scopes/EvaluateScopes.tsx | 4 ++-- src/clients/service-account/ServiceAccount.tsx | 5 ++++- src/common-messages.json | 6 ++++++ src/groups/GroupsCreateModal.tsx | 2 +- src/groups/messages.json | 1 - src/realm-roles/RealmRoleForm.tsx | 2 +- src/realm-roles/RealmRolesSection.tsx | 2 +- src/realm-roles/messages.json | 2 -- src/stories/KeycloakDataTable.stories.tsx | 4 ++-- src/user-federation/help.json | 16 ++++++++-------- src/user-federation/messages.json | 4 ---- 24 files changed, 55 insertions(+), 60 deletions(-) diff --git a/src/client-scopes/ClientScopesSection.tsx b/src/client-scopes/ClientScopesSection.tsx index 0dc07a6cb5..f782124c78 100644 --- a/src/client-scopes/ClientScopesSection.tsx +++ b/src/client-scopes/ClientScopesSection.tsx @@ -68,12 +68,12 @@ export const ClientScopesSection = () => { ]} columns={[ { - name: "name", + name: t("common:name"), cellRenderer: ClientScopeDetailLink, }, - { name: "description" }, + { name: t("common:description") }, { - name: "protocol", + name: t("protocol"), }, ]} /> diff --git a/src/client-scopes/add/MapperDialog.tsx b/src/client-scopes/add/MapperDialog.tsx index 680f5a3d2e..1ff5ffba87 100644 --- a/src/client-scopes/add/MapperDialog.tsx +++ b/src/client-scopes/add/MapperDialog.tsx @@ -142,7 +142,7 @@ export const AddMapperDialog = (props: AddMapperDialogProps) => { {isBuiltIn && rows.length > 0 && ( { rows[rowIndex].selected = isSelected; setRows([...rows]); diff --git a/src/client-scopes/add/RoleMappingForm.tsx b/src/client-scopes/add/RoleMappingForm.tsx index e74b5ebbf5..d528ec5221 100644 --- a/src/client-scopes/add/RoleMappingForm.tsx +++ b/src/client-scopes/add/RoleMappingForm.tsx @@ -170,11 +170,11 @@ export const RoleMappingForm = () => { /> } @@ -196,11 +196,11 @@ export const RoleMappingForm = () => { /> } diff --git a/src/client-scopes/details/MapperList.tsx b/src/client-scopes/details/MapperList.tsx index aa72b61336..7894258f1e 100644 --- a/src/client-scopes/details/MapperList.tsx +++ b/src/client-scopes/details/MapperList.tsx @@ -189,7 +189,12 @@ export const MapperList = ({ clientScope, refresh }: MapperListProps) => { />
{ return { cells: Object.values(cell.cells), mapper: cell.mapper }; })} diff --git a/src/client-scopes/details/MappingDetails.tsx b/src/client-scopes/details/MappingDetails.tsx index 1c24ff4333..1c9de5366e 100644 --- a/src/client-scopes/details/MappingDetails.tsx +++ b/src/client-scopes/details/MappingDetails.tsx @@ -157,11 +157,11 @@ export const MappingDetails = () => { {!id.match(isGuid) && ( } diff --git a/src/client-scopes/form/ClientScopeForm.tsx b/src/client-scopes/form/ClientScopeForm.tsx index d2233b1fe8..a44efdf703 100644 --- a/src/client-scopes/form/ClientScopeForm.tsx +++ b/src/client-scopes/form/ClientScopeForm.tsx @@ -118,11 +118,11 @@ export const ClientScopeForm = () => { className="pf-u-mt-md" > } @@ -148,11 +148,11 @@ export const ClientScopeForm = () => { /> } diff --git a/src/client-scopes/messages.json b/src/client-scopes/messages.json index ea712c290b..c8f66c1582 100644 --- a/src/client-scopes/messages.json +++ b/src/client-scopes/messages.json @@ -5,11 +5,6 @@ "clientScopeDetails": "Client scope details", "clientScopeExplain": "Client scopes allow you to define a common set of protocol mappers and roles, which are shared between multiple clients", "searchFor": "Search for client scope", - "name": "Name", - "description": "Description", - "category": "Category", - "type": "Type", - "priority": "Priority", "protocol": "Protocol", "deletedSuccess": "The client scope has been deleted", "deleteError": "Could not delete client scope: {{error}}", @@ -38,7 +33,6 @@ "addMapper": "Add mapper", "addMapperExplain": "If you want more fine-grain control, you can create protocol mapper on this client", "protocolMapper": "Mapper type", - "role": "Role", "realmRoles": "Realm roles", "selectARole": "Select a role", "clientRoles": "Client roles", diff --git a/src/clients/ClientDescription.tsx b/src/clients/ClientDescription.tsx index e238017ce9..12ef3b58b6 100644 --- a/src/clients/ClientDescription.tsx +++ b/src/clients/ClientDescription.tsx @@ -32,10 +32,10 @@ export const ClientDescription = ({ form }: ClientDescriptionProps) => { } /> - + - + { displayKey: "clients:clientID", cellRenderer: ClientDetailLink, }, - { name: "protocol", displayKey: "clients:type" }, + { name: "protocol", displayKey: "common:type" }, { name: "description", - displayKey: "clients:description", + displayKey: "common:description", cellFormatters: [emptyFormatter()], }, { diff --git a/src/clients/import/ImportForm.tsx b/src/clients/import/ImportForm.tsx index 7c262e0460..b3f909445d 100644 --- a/src/clients/import/ImportForm.tsx +++ b/src/clients/import/ImportForm.tsx @@ -58,7 +58,7 @@ export const ImportForm = () => { - +
{ if (rowIndex === -1) { setRows( diff --git a/src/clients/scopes/ClientScopes.tsx b/src/clients/scopes/ClientScopes.tsx index 3c011d65d2..480ec399e1 100644 --- a/src/clients/scopes/ClientScopes.tsx +++ b/src/clients/scopes/ClientScopes.tsx @@ -404,9 +404,9 @@ export const ClientScopes = ({ clientId, protocol }: ClientScopesProps) => { }} variant={TableVariant.compact} cells={[ - t("name"), + t("common:name"), { title: t("assignedType"), cellFormatters: [dropdown()] }, - t("description"), + t("common:description"), ]} rows={rows} actions={[ diff --git a/src/clients/scopes/EvaluateScopes.tsx b/src/clients/scopes/EvaluateScopes.tsx index 5977e6d408..a19c5e9fa8 100644 --- a/src/clients/scopes/EvaluateScopes.tsx +++ b/src/clients/scopes/EvaluateScopes.tsx @@ -71,11 +71,11 @@ const ProtocolMappers = ({ }, { name: "type.category", - displayKey: "clients:category", + displayKey: "common:category", }, { name: "type.priority", - displayKey: "clients:priority", + displayKey: "commmon:priority", }, ]} /> diff --git a/src/clients/service-account/ServiceAccount.tsx b/src/clients/service-account/ServiceAccount.tsx index f870f58922..b5a4f435e8 100644 --- a/src/clients/service-account/ServiceAccount.tsx +++ b/src/clients/service-account/ServiceAccount.tsx @@ -150,7 +150,10 @@ export const ServiceAccount = ({ clientId }: ServiceAccountProps) => { title: t("inherentFrom"), cellFormatters: [emptyFormatter()], }, - { title: t("description"), cellFormatters: [emptyFormatter()] }, + { + title: t("common:description"), + cellFormatters: [emptyFormatter()], + }, ]} rows={clientRoles} aria-label="roleList" diff --git a/src/common-messages.json b/src/common-messages.json index 14bada44a8..6324e8a483 100644 --- a/src/common-messages.json +++ b/src/common-messages.json @@ -39,6 +39,12 @@ "enableHelpMode": "Enable help mode", "learnMore": "Learn more", "test": "Test", + "name": "Name", + "role": "Role", + "description": "Description", + "type": "Type", + "category": "Category", + "priority": "Priority", "home": "Home", "manage": "Manage", diff --git a/src/groups/GroupsCreateModal.tsx b/src/groups/GroupsCreateModal.tsx index 53677f551f..7639954c66 100644 --- a/src/groups/GroupsCreateModal.tsx +++ b/src/groups/GroupsCreateModal.tsx @@ -75,7 +75,7 @@ export const GroupsCreateModal = ({ { /> { }, { name: "description", - displayKey: "roles:description", + displayKey: "common:description", cellFormatters: [emptyFormatter()], }, ]} diff --git a/src/realm-roles/messages.json b/src/realm-roles/messages.json index d182b5c422..e962946d2c 100644 --- a/src/realm-roles/messages.json +++ b/src/realm-roles/messages.json @@ -7,7 +7,6 @@ "createRole": "Create role", "importRole": "Import role", "roleID": "Role ID", - "type": "Type", "homeURL": "Home URL", "roleExplain": "Realm-level roles are a global namespace to define your roles.", "roleCreateExplain": "This is some description", @@ -15,7 +14,6 @@ "roleDetails": "Role details", "composite": "Composite", "deleteRole": "Delete this role", - "description": "Description", "details": "Details", "roleList": "Role list", "searchFor": "Search for role", diff --git a/src/stories/KeycloakDataTable.stories.tsx b/src/stories/KeycloakDataTable.stories.tsx index dfe157b246..58fdfbe23e 100644 --- a/src/stories/KeycloakDataTable.stories.tsx +++ b/src/stories/KeycloakDataTable.stories.tsx @@ -27,10 +27,10 @@ SimpleList.args = { searchPlaceholderKey: "common:search", columns: [ { name: "clientId", displayKey: "clients:clientID" }, - { name: "protocol", displayKey: "clients:type" }, + { name: "protocol", displayKey: "common:type" }, { name: "description", - displayKey: "clients:description", + displayKey: "common:description", cellFormatters: [ (data?: IFormatterValueType) => { return data ? data : "—"; diff --git a/src/user-federation/help.json b/src/user-federation/help.json index a56edfb7c1..3228d0b019 100644 --- a/src/user-federation/help.json +++ b/src/user-federation/help.json @@ -97,35 +97,35 @@ "memberofLdapAttributeHelp": "Used just when 'User Roles Retrieve Strategy' is GET_GROUPS_FROM_USER_MEMBEROF_ATTRIBUTE. It specifies the name of the LDAP attribute on the LDAP user, which contains the groups, which the user is member of. Usually it will be 'memberOf' and that's also the default value.", "mappedGroupAttributesHelp": "List of names of attributes divided by comma. This points to the list of attributes on LDAP group, which will be mapped as attributes of Group in Keycloak. Leave this empty if no additional group attributes are required to be mapped in Keycloak.", "dropNonexistingGroupsDuringSync": "If this flag is true, then during sync of groups from LDAP to Keycloak, we will keep just those Keycloak groups, which still exists in LDAP. Rest will be deleted", - "groupsPath": "Keycloak group path the LDAP groups are added to. For example if value '/Applications/App1' is used, then LDAP groups will be available in Keycloak under group 'App1', which is child of top level group 'Applications'. The default value is '/' so LDAP groups will be mapped to the Keycloak groups at the top level. The configured group path must already exists in the Keycloak when creating this mapper.", + "groupsPath": "Keycloak group path the LDAP groups are added to. For example if value '/Applications/App1' is used, then LDAP groups will be available in Keycloak under group 'App1', which is child of top level group 'Applications'. The default value is '/' so LDAP groups will be mapped to the Keycloak groups at the top level. The configured group path must already exist in the Keycloak when creating this mapper.", "userModelAttributeHelp": "Name of the UserModel property or attribute you want to map the LDAP attribute into. For example 'firstName', 'lastName, 'email', 'street' etc.", - "ldapAttribute": "Name of mapped attribute on LDAP object. For example 'cn', 'sn, 'mail', 'street' etc.", + "ldapAttribute": "Name of mapped attribute on LDAP object. For example 'cn', 'sn', 'mail', 'street' etc.", "readOnlyHelp": "Read-only attribute is imported from LDAP to UserModel, but it's not saved back to LDAP when user is updated in Keycloak.", "alwaysReadValueFromLdapHelp": "If on, then during reading of the LDAP attribute value will always used instead of the value from Keycloak DB", "isMandatoryInLdapHelp": "If true, attribute is mandatory in LDAP. Hence if there is no value in Keycloak DB, the empty value will be set to be propagated to LDAP", "isBinaryAttributeHelp": "Should be true for binary LDAP attributes", - "ldapRolesDNHelp": "LDAP DN where are roles of this tree saved. For example 'ou=finance,dc=example,dc=org'", + "ldapRolesDNHelp": "LDAP DN where roles of this tree are saved. For example 'ou=finance,dc=example,dc=org'", "roleNameLdapAttributeHelp": "Name of LDAP attribute, which is used in role objects for name and RDN of role. Usually it will be 'cn'. In this case typical group/role object may have DN like 'cn=role1,ou=finance,dc=example,dc=org'", "roleObjectClassesHelp": "Object class (or classes) of the role object. It's divided by comma if more classes needed. In typical LDAP deployment it could be 'groupOfNames'. In Active Directory it's usually 'group'", "useRealmRolesMappingHelp": "If true, then LDAP role mappings will be mapped to realm role mappings in Keycloak. Otherwise it will be mapped to client role mappings", "clientIdHelp": "Client ID of client to which LDAP role mappings will be mapped. Applicable just if 'Use Realm Roles Mapping' is false", - "userModelAttributeNameHelp": "Name of the model attribute, which will be added when importing user from ldap", - "attributeValueHelp": "Value of the model attribute, which will be added when importing user from ldap.", + "userModelAttributeNameHelp": "Name of the model attribute, which will be added when importing user from LDAP", + "attributeValueHelp": "Value of the model attribute, which will be added when importing user from LDAP.", "roleHelp": "Role to grant to user. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference an application role the syntax is appname.approle, i.e. myapp.myrole", "derFormattedHelp": "Activate this if the certificate is DER formatted in LDAP and not PEM formatted.", "ldapFullNameAttributeHelp": "Name of LDAP attribute, which contains fullName of user. Usually it will be 'cn'", - "fullNameLdapMapperReadOnlyHelp": "For Read-only is data imported from LDAP to Keycloak DB, but it's not saved back to LDAP when user is updated in Keycloak.", + "fullNameLdapMapperReadOnlyHelp": "For Read-only data is imported from LDAP to Keycloak DB, but it's not saved back to LDAP when user is updated in Keycloak.", "fullNameLdapMapperWriteOnlyHelp": "For Write-only is data propagated to LDAP when user is created or updated in Keycloak. But this mapper is not used to propagate data from LDAP back into Keycloak. This setting is useful if you configured separate firstName and lastName attribute mappers and you want to use those to read attribute from LDAP into Keycloak", - "groupHelp": "When user is imported from LDAP, he will be automatically added into this configured group.", + "groupHelp": "When user is imported from LDAP, they will be automatically added into this configured group.", "ldapAttributeNameHelp": "Name of the LDAP attribute, which will be added to the new user during registration", - "ldapAttributeValueHelp": "Value of the LDAP attribute, which will be added to the new user during registration. You can either hardcode any value like 'foo' but you can also use some special tokens. Only supported token right now is '${RANDOM}' , which will be replaced with some randomly generated String." + "ldapAttributeValueHelp": "Value of the LDAP attribute, which will be added to the new user during registration. You can either hardcode any value like 'foo' but you can also use some special tokens. Only supported token right now is '${RANDOM}', which will be replaced with some randomly generated String." } } diff --git a/src/user-federation/messages.json b/src/user-federation/messages.json index 2f1b26f26b..971f094232 100644 --- a/src/user-federation/messages.json +++ b/src/user-federation/messages.json @@ -85,9 +85,7 @@ "userFedDeleteConfirmTitle": "Delete user federation provider?", "userFedDeleteConfirm": "If you delete this user federation provider, all associated data will be removed.", - "*** mappers ***": "", "id": "ID", - "name": "Name", "mapperType": "Mapper type", "mapperTypeMsadUserAccountControlManager": "msad-user-account-control-mapper", @@ -133,8 +131,6 @@ "useRealmRolesMapping": "Use realm roles mapping", "clientId": "Client ID", - "role": "Role", - "derFormatted": "DER formatted", "ldapFullNameAttribute": "LDAP full name attribute",