Skip to content

Commit

Permalink
Merge branch 'main' into admin-ui-issue-1747
Browse files Browse the repository at this point in the history
  • Loading branch information
mjatin-dev committed Oct 25, 2024
2 parents 5985799 + 1aa590b commit 28c4ded
Show file tree
Hide file tree
Showing 11 changed files with 631 additions and 156 deletions.
23 changes: 21 additions & 2 deletions admin-ui/app/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@
"released_attributes": "Released Attributes",
"jans_assertion_consumer_service_get_url": "Jans Assertion Consumer Service GET URL",
"jans_assertion_consumer_service_post_url": "Jans Assertion Consumer Service POST URL",
"jans_id": "Jans ID",
"jans_state": "Jans State",
"jans_sess_state":"Jans Session State",
"jans_user_dn": "Jans User DN",
"permission_granted_map": "Permission Granted Map",
"jans_sess_attr": "Jans Session Attributes",
"metadata_file": "Metadata File",
"metadata_url": "Metadata URL",
"webhook_url": "URL",
Expand Down Expand Up @@ -218,7 +224,7 @@
"client_credentials_access_token": "Client Credentials Access Token",
"client_expiration_date": "Client Expiration Date",
"client_id": "Client Id",
"client_id_used": "Client Id Used",
"client_id_used": "Client Id",
"client_name": "Client name",
"client_secret": "Client secret",
"computation_pool_size": "Computation Pool Size",
Expand Down Expand Up @@ -877,7 +883,11 @@
"change_backend_bind_password": "Change Backend Bind Password",
"add_agama_project": "Add Agama project",
"add_alias": "Add New Mapping",
"edit_alias": "Edit Mapping"
"edit_alias": "Edit Mapping",
"export_csv": "Export CSV",
"filters": "Filters",
"expiration_date" : "Expiration Date",
"authentication_date": "Authentication Date"
},
"links": {
"support": "https://support.gluu.org/"
Expand Down Expand Up @@ -1546,6 +1556,15 @@
"type": "Type",
"domain": "Domain"
},
"sessions":{
"expirationDate" : "Expiration Date",
"jansId": "Jans Id",
"jansState": "Jans State",
"jansSessState": "Jans Session State",
"jansUsrDN": "Jans User DN",
"permissionGrantedMap": "Permission Granted Map",
"jansSessAttr": "Jans Session Attribute"
},
"saml": {
"name": "The alphanumeric ID string that is used to identify the Trust Relationship",
"displayName": "Trust Relationship display name",
Expand Down
20 changes: 18 additions & 2 deletions admin-ui/app/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@
"ssl_trust_store_password": "Mot de passe du magasin de confiance SSL",
"jans_assertion_consumer_service_get_url": "URL GET du service consommateur d'assertions Jans",
"jans_assertion_consumer_service_post_url": "URL POST du service consommateur d'assertions Jans",
"jans_id": "ID Jans",
"jans_state": "État Jans",
"jans_sess_state":"État de la session Jans",
"jans_user_dn": "DN de l'utilisateur Jans",
"permission_granted_map": "Carte des autorisations accordées",
"jans_sess_attr": "Attributs de la session Jans",
"ssl_key_store_password": "Mot de passe du magasin de clés SSL",
"customAttributes": "attributs personnalisés",
"enable_kc": "Activer le lien Jannssen Keycloak",
Expand Down Expand Up @@ -345,7 +351,7 @@
"client_credentials_access_token": "Jeton d'accès aux informations d'identification du client",
"client_expiration_date": "Date d'expiration du client",
"client_id": "Identité du client",
"client_id_used": "Identifiant client utilisé",
"client_id_used": "Identifiant client",
"client_name": "Nom du client",
"client_secret": "Secret du client",
"computation_pool_size": "Taille du pool de calcul",
Expand Down Expand Up @@ -776,7 +782,8 @@
"ssa_management": "SSA Gestion",
"jans_ink": "Jans Link",
"change_backend_bind_password": "Modifier le mot de passe de liaison du backend",
"add_agama_project": "Ajouter un projet Agama"
"add_agama_project": "Ajouter un projet Agama",
"export_csv":"Exporter CSV"
},
"links": {
"support": "https://support.gluu.org/"
Expand Down Expand Up @@ -1484,5 +1491,14 @@
"createdBy": "Créé par",
"type": "Type",
"domain": "Domaine"
},
"sessions":{
"expirationDate" : "Date d'expiration",
"jansId": "ID Jans",
"jansState": "État Jans",
"jansSessState": "État de la session Jans",
"jansUsrDN": "DN de l'utilisateur Jans",
"permissionGrantedMap": "Carte des autorisations accordées",
"jansSessAttr": "Attribut de la session Jans"
}
}
20 changes: 18 additions & 2 deletions admin-ui/app/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@
"policies_zip_uris": "URIs de políticas ZIP",
"jans_assertion_consumer_service_get_url": "URL GET do Serviço de Consumo de Asserção Jans",
"jans_assertion_consumer_service_post_url": "URL POST do Serviço de Consumo de Asserção Jans",
"jans_id": "ID Jans",
"jans_state": "Estado Jans",
"jans_sess_state":"Estado da sessão Jans",
"jans_user_dn": "DN do usuário Jans",
"permission_granted_map": "Mapa de permissões concedidas",
"jans_sess_attr": "Atributos da sessão Jans",
"download_summary": "Baixar Resumo",
"customAttributes": "atributos personalizados",
"sessionTimeoutInMins": "Tempo limite da sessão da interface de administração (em minutos)",
Expand Down Expand Up @@ -329,7 +335,7 @@
"client_credentials_access_token": "Token de acesso de credenciais de cliente",
"client_expiration_date": "Data de Vencimento do Cliente",
"client_id": "ID do Cliente",
"client_id_used": "ID do cliente usado",
"client_id_used": "ID do cliente",
"client_name": "Nome do cliente",
"client_secret": "Segredo do cliente",
"computation_pool_size": "Tamanho do pool de computação",
Expand Down Expand Up @@ -773,7 +779,8 @@
"jans_ink": "Jans Link",
"change_backend_bind_password": "Alterar senha de ligação de back-end",
"add_agama_project": "Adicionar projeto Agama",
"jans_kc_link": "Link KC Jans"
"jans_kc_link": "Link KC Jans",
"export_csv":"Exportar CSV"
},
"links": {
"support": "https://support.gluu.org/"
Expand Down Expand Up @@ -1481,5 +1488,14 @@
"createdBy": "Criado por",
"type": "Tipo",
"domain": "Domínio"
},
"sessions":{
"expirationDate" : "Data de expiração",
"jansId": "ID Jans",
"jansState": "Estado Jans",
"jansSessState": "Estado da sessão Jans",
"jansUsrDN": "DN do usuário Jans",
"permissionGrantedMap": "Mapa de permissões concedida",
"jansSessAttr": "Atributo da sessão Jans"
}
}
2 changes: 1 addition & 1 deletion admin-ui/app/routes/Apps/Gluu/GluuAdvancedSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function GluuAdvancedSearch({
)}
 
<Input
style={{ width: '180px' }}
style={{ width: '180px', height: '54px' }}
id={patternId}
data-testid={patternId}
type="text"
Expand Down
3 changes: 2 additions & 1 deletion admin-ui/app/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
background-repeat: no-repeat;
background-position: right calc(0.375em + 0.1875rem) center;
background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
}
}

4 changes: 4 additions & 0 deletions admin-ui/app/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,7 @@ div.text-info {
p {
color: #8493a5 !important
}

label {
font-size: 14px !important;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import React from "react";
import { Container, Row, Col } from "Components";
import GluuFormDetailRow from "Routes/Apps/Gluu/GluuFormDetailRow";
import PropTypes from "prop-types";

function SessionDetailPage({ row}) {
const DOC_CATEGORY = 'sessions'

return (
<Container style={{ backgroundColor: "#F5F5F5", minWidth: "100%" }}>
<Row>
<Col sm={4}>
<GluuFormDetailRow
label="fields.expiration"
value={row.expirationDate?.toDateString() ?? '-'}
doc_category= {DOC_CATEGORY}
doc_entry="expirationDate"
/>
</Col>
<Col sm={4}>
<GluuFormDetailRow
label="fields.jans_id"
value={row.userDn ? row.userDn.split(",")[0].split("=")[1] : '-'}
doc_category= {DOC_CATEGORY}
doc_entry="jansId"
/>
</Col>
<Col sm={4}>
<GluuFormDetailRow
label="fields.jans_state"
value={row.state ?? '-'}
doc_category= {DOC_CATEGORY}
doc_entry="jansState"
/>
</Col>
</Row>

<Row>
<Col sm={4}>
<GluuFormDetailRow
label="fields.jans_sess_state"
value={row.sessionState ?? '-'}
doc_category= {DOC_CATEGORY}
doc_entry="jansSessState"
/>
</Col>
<Col sm={4}>
<GluuFormDetailRow
label="fields.jans_user_dn"
value={row.userDn ?? '-'}
doc_category= {DOC_CATEGORY}
doc_entry="jansUsrDN"
/>
</Col>
<Col sm={4}>
<GluuFormDetailRow
label="fields.permission_granted_map"
value={row.permissionGrantedMap ? JSON.stringify(row.permissionGrantedMap) : '-'}
doc_category= {DOC_CATEGORY}
doc_entry="permissionGrantedMap"
/>
</Col>
</Row>

<Row>
<Col sm={4}>
<GluuFormDetailRow
label="fields.jans_sess_attr"
value={row.sessionAttributes ? JSON.stringify(row.sessionAttributes) : '-'}
doc_category= {DOC_CATEGORY}
doc_entry="jansSessAttr"
/>
</Col>
</Row>
</Container>
);
}

SessionDetailPage.propTypes = {
row: PropTypes.any,
};
export default SessionDetailPage;
Loading

0 comments on commit 28c4ded

Please sign in to comment.