Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion admin-ui/app/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@
"state": "State",
"status": "Status",
"scopes": "Scopes",
"sort_by": "Sort By",
"smtp_host": "SMTP Host",
"smtp_port": "SMTP Port",
"trust_host": "Trust Server",
Expand Down Expand Up @@ -798,6 +799,8 @@
"view_script_details": "View custom script details",
"add_new_user": "Add User",
"error_in_saving": "Error in saving.",
"loading_attribute": "Loading attribute...",
"loading_attributes": "Loading attributes",
"error_processiong_request": "Error in processing request.",
"no_scope_in_client": "No Scope data for this Client",
"no_scope_in_spontaneous_client": "No Spontaneous Scope data for this Client",
Expand All @@ -823,6 +826,13 @@
"password_changed_successfully": "Password changed successfully",
"device_deleted_successfully": "Device deleted successfully"
},
"errors": {
"attribute_create_failed": "Error creating attribute",
"attribute_update_failed": "Error updating attribute",
"attribute_delete_failed": "Error deleting attribute",
"attribute_load_failed": "Error loading attribute",
"attribute_not_found": "Attribute not found"
},
"tooltips": {
"add_attribute": "Add attribute",
"add_user": "Add User",
Expand All @@ -847,7 +857,10 @@
"product_version": "Version number of this database product",
"driver_name": "Name of this JDBC driver",
"driver_version": "Version number of this JDBC driver",
"followingPermissionRequiredToBeAdded": "We need to add the following essential permissions to the role to ensure users with this role can access the Admin UI."
"followingPermissionRequiredToBeAdded": "We need to add the following essential permissions to the role to ensure users with this role can access the Admin UI.",
"sort_ascending": "Sort ascending",
"sort_descending": "Sort descending",
"clear_filters": "Clear all filters"
},
"placeholders": {
"id": "Enter id",
Expand Down Expand Up @@ -1015,13 +1028,16 @@
"options": {
"admin": "ADMIN",
"active": "ACTIVE",
"all": "All",
"ascending": "Ascending",
"boolean": "BOOLEAN",
"binary": "BINARY",
"certificate": "CERTIFICATE",
"choose": "Choose",
"cluster": "CLUSTER",
"date": "DATE",
"default": "DEFAULT",
"descending": "Descending",
"disable": "disable",
"disabled": "Disabled",
"enabled": "Enabled",
Expand All @@ -1032,6 +1048,7 @@
"memcached": "MEMCACHED",
"native_persistence": "NATIVE_PERSISTENCE",
"no": "No",
"none": "None",
"numeric": "NUMERIC",
"openid": "OPENID",
"redis": "REDIS",
Expand Down
13 changes: 13 additions & 0 deletions admin-ui/app/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@
"state": "Estado",
"status": "Estado",
"scopes": "Ámbitos",
"sort_by": "Ordenar Por",
"smtp_host": "Host SMTP",
"smtp_port": "Puerto SMTP",
"trust_host": "Servidor de Confianza",
Expand Down Expand Up @@ -798,6 +799,7 @@
"view_script_details": "Ver detalles del script personalizado",
"add_new_user": "Agregar Usuario",
"error_in_saving": "Error al guardar.",
"loading_attributes": "Cargando atributos",
"error_processiong_request": "Error al procesar la solicitud.",
"no_scope_in_client": "Sin datos de Scope para este Cliente",
"no_scope_in_spontaneous_client": "Sin datos de Scope Espontáneo para este Cliente",
Expand All @@ -823,6 +825,13 @@
"password_changed_successfully": "Contraseña cambiada exitosamente",
"device_deleted_successfully": "Dispositivo eliminado exitosamente"
},
"errors": {
"attribute_create_failed": "Error al crear el atributo",
"attribute_update_failed": "Error al actualizar el atributo",
"attribute_delete_failed": "Error al eliminar el atributo",
"attribute_load_failed": "Error al cargar el atributo",
"attribute_not_found": "Atributo no encontrado"
},
"tooltips": {
"add_attribute": "Añadir atributo",
"add_ldap": "Añadir LDAP",
Expand Down Expand Up @@ -1012,13 +1021,16 @@
"options": {
"admin": "ADMIN",
"active": "ACTIVO",
"all": "Todos",
"ascending": "Ascendente",
"boolean": "BOOLEANO",
"binary": "BINARIO",
"certificate": "CERTIFICADO",
"choose": "Elegir",
"cluster": "CLÚSTER",
"date": "FECHA",
"default": "POR DEFECTO",
"descending": "Descendente",
"disable": "deshabilitar",
"disabled": "Deshabilitado",
"enabled": "Habilitado",
Expand All @@ -1029,6 +1041,7 @@
"memcached": "MEMCACHED",
"native_persistence": "PERSISTENCIA_NATIVA",
"no": "No",
"none": "Ninguno",
"numeric": "NUMÉRICO",
"openid": "OPENID",
"redis": "REDIS",
Expand Down
18 changes: 17 additions & 1 deletion admin-ui/app/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@
"parLifetime": "Durée requise",
"requirePar": "Requérir PAR",
"scopes": "Portées",
"sort_by": "Trier Par",
"activate": "Activer",
"active": "Active",
"application_type": "Type de demande",
Expand Down Expand Up @@ -737,6 +738,7 @@
"2FA_details": "les détails de la 2FA",
"view_script_details": "Afficher les détails du script personnalisé",
"add_new_user": "Ajouter un utilisateur",
"loading_attributes": "Chargement des attributs",
"no_scope_in_client": "Aucune donnée d'étendue pour ce client",
"error_in_script": "Erreur dans le script",
"see_configurations": "Voir configuration",
Expand All @@ -761,6 +763,13 @@
"password_changed_successfully": "Mot de passe modifié avec succès",
"device_deleted_successfully": "Appareil supprimé avec succès"
},
"errors": {
"attribute_create_failed": "Erreur lors de la création de l'attribut",
"attribute_update_failed": "Erreur lors de la mise à jour de l'attribut",
"attribute_delete_failed": "Erreur lors de la suppression de l'attribut",
"attribute_load_failed": "Erreur lors du chargement de l'attribut",
"attribute_not_found": "Attribut introuvable"
},
"tooltips": {
"add_attribute": "Ajouter un attribut",
"add_ldap": "Ajouter LDAP",
Expand All @@ -783,7 +792,10 @@
"product_version": "Numéro de version de ce produit de base de données",
"driver_name": "Nom de ce pilote JDBC",
"driver_version": "Numéro de version de ce pilote JDBC",
"followingPermissionRequiredToBeAdded": "Nous devons ajouter les autorisations essentielles suivantes au rôle pour garantir que les utilisateurs disposant de ce rôle peuvent accéder à l'interface utilisateur d'administration."
"followingPermissionRequiredToBeAdded": "Nous devons ajouter les autorisations essentielles suivantes au rôle pour garantir que les utilisateurs disposant de ce rôle peuvent accéder à l'interface utilisateur d'administration.",
"sort_ascending": "Trier par ordre croissant",
"sort_descending": "Trier par ordre décroissant",
"clear_filters": "Effacer tous les filtres"
},
"placeholders": {
"id": "Enter id",
Expand Down Expand Up @@ -910,13 +922,16 @@
"options": {
"admin": "ADMINISTRER",
"active": "ACTIF",
"all": "Tout",
"ascending": "Croissant",
"boolean": "BOOLEEN",
"binary": "BINAIRE",
"certificate": "CERTIFICAT",
"choose": "Choisir",
"cluster": "GROUPE",
"date": "DATE",
"default": "DÉFAUT",
"descending": "Décroissant",
"disable": "désactiver",
"disabled": "Désactivée",
"enabled": "Activée",
Expand All @@ -927,6 +942,7 @@
"memcached": "MEMCACHED",
"native_persistence": "NATIVE_PERSISTENCE",
"no": "Non",
"none": "Aucun",
"numeric": "NUMÉRIQUE",
"openid": "ID OUVERT",
"redis": "REDIS",
Expand Down
13 changes: 13 additions & 0 deletions admin-ui/app/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@
"spontaneousScopes": "Escopos espontâneos",
"redirectUrisRegex": "Expressão regular de redirecionamento",
"scopes": "Escopos",
"sort_by": "Ordenar Por",
"requestUris": "URIs de solicitação",
"defaultAcrValues": "ACR padrão",
"authorizedAcrValues": "ACRs autorizados",
Expand Down Expand Up @@ -732,6 +733,7 @@
"2FA_details": "detalhes 2FA",
"view_script_details": "Ver detalhes do guião personalizado",
"add_new_user": "Adicionar usuário",
"loading_attributes": "Carregando atributos",
"no_scope_in_client": "Sem dados de Escopo para este Cliente",
"error_in_script": "Erro no roteiro",
"see_configurations": "Voir configuration",
Expand All @@ -756,6 +758,13 @@
"password_changed_successfully": "Senha alterada com sucesso",
"device_deleted_successfully": "Dispositivo excluído com sucesso"
},
"errors": {
"attribute_create_failed": "Erro ao criar atributo",
"attribute_update_failed": "Erro ao atualizar atributo",
"attribute_delete_failed": "Erro ao excluir atributo",
"attribute_load_failed": "Erro ao carregar atributo",
"attribute_not_found": "Atributo não encontrado"
},
"tooltips": {
"add_attribute": "Adicionar atributo",
"add_user": "Adicionar usuário",
Expand Down Expand Up @@ -907,13 +916,16 @@
"options": {
"admin": "ADMIN",
"active": "ATIVO",
"all": "Todos",
"ascending": "Ascendente",
"boolean": "BOLEANO",
"binary": "BINÁRIO",
"certificate": "CERTIFICADO",
"choose": "Escolher",
"cluster": "AGRUPAR",
"date": "ENCONTRO: DATA",
"default": "PADRÃO",
"descending": "Descendente",
"disable": "desabilitar",
"disabled": "Desabilitado",
"enabled": "Habilitado",
Expand All @@ -924,6 +936,7 @@
"memcached": "MEMCACHED",
"native_persistence": "NATIVE_PERSISTENCE",
"no": "Não",
"none": "Nenhum",
"numeric": "NUMÉRICO",
"openid": "OPENID",
"redis": "REDIS",
Expand Down
74 changes: 74 additions & 0 deletions admin-ui/app/routes/Apps/Gluu/GluuStatusMessage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import React from 'react'
import { Row, Col } from 'Components'
import GluuLabel from 'Routes/Apps/Gluu/GluuLabel'
import { customColors } from '@/customColors'

interface GluuStatusMessageProps {
message: string
type: 'loading' | 'error' | 'success' | 'info'
labelSize?: number
colSize?: number
inline?: boolean
}

const getColorForType = (type: GluuStatusMessageProps['type']) => {
switch (type) {
case 'loading':
case 'info':
return customColors.lightBlue
case 'error':
return customColors.accentRed
case 'success':
return customColors.lightGreen
default:
return customColors.lightBlue
}
}

const getAriaAttributes = (type: GluuStatusMessageProps['type']) => {
switch (type) {
case 'error':
return { 'role': 'alert', 'aria-live': 'assertive' as const }
case 'success':
case 'info':
return { 'role': 'status', 'aria-live': 'polite' as const }
case 'loading':
return { 'role': 'status', 'aria-live': 'polite' as const, 'aria-busy': true }
default:
return { 'role': 'status', 'aria-live': 'polite' as const }
}
}

const GluuStatusMessage: React.FC<GluuStatusMessageProps> = ({
message,
type,
labelSize = 4,
colSize = 8,
inline = false,
}) => {
const messageContent = (
<div
style={{
color: getColorForType(type),
fontSize: '0.875rem',
marginTop: '0.25rem',
}}
{...getAriaAttributes(type)}
>
{message}
</div>
)

if (inline) {
return messageContent
}

return (
<Row>
<GluuLabel label="" size={labelSize} />
<Col sm={colSize}>{messageContent}</Col>
</Row>
)
}

export default GluuStatusMessage
7 changes: 4 additions & 3 deletions admin-ui/plugins/admin/redux/features/WebhookSlice.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const initialState = {
triggerWebhookInProgress: false,
triggerWebhookMessage: '',
webhookTriggerErrors: [],
tiggerPayload: {
triggerPayload: {
feature: null,
payload: null,
},
Expand Down Expand Up @@ -107,8 +107,9 @@ const webhookSlice = createSlice({
setWebhookModal: (state, action) => {
state.webhookModal = action.payload
},
triggerWebhook: (state) => {
triggerWebhook: (state, action) => {
state.triggerWebhookInProgress = true
state.triggerPayload = action.payload
},
setTriggerWebhookResponse: (state, action) => {
state.triggerWebhookInProgress = false
Expand All @@ -118,7 +119,7 @@ const webhookSlice = createSlice({
state.webhookTriggerErrors = action.payload
},
setTriggerPayload: (state, action) => {
state.tiggerPayload = action.payload
state.triggerPayload = action.payload
},
setFeatureToTrigger: (state, action) => {
state.featureToTrigger = action.payload
Expand Down
Loading
Loading