Skip to content

Commit 02a6a09

Browse files
committed
feat(admin-ui): show agama config if present #1676
Signed-off-by: Jeet Viramgama <[email protected]>
1 parent 01fc3d1 commit 02a6a09

File tree

7 files changed

+175
-123
lines changed

7 files changed

+175
-123
lines changed

admin-ui/app/locales/en/translation.json

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"change_bind_password": "Change Bind Password",
1616
"set_password": "Set Password",
1717
"add_classes": "Add Classes",
18+
"configuration_copied": "Configuration copied",
19+
"copy_configuration": "Copy configuration",
1820
"apply": "Apply",
1921
"back_home": "Back Home",
2022
"cancel": "Cancel",
@@ -808,6 +810,7 @@
808810
"fido_management": "FIDO Configuration",
809811
"saml_management": "SAML",
810812
"scim_management": "SCIM Configuration",
813+
"project_configuration": "Project Configuration",
811814
"jans_ink": "Jans Link",
812815
"error": "error",
813816
"token": "Tokens",

admin-ui/app/locales/fr/translation.json

+3
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
"add_ldap_configuration": "Ajouter une configuration LDAP",
101101
"add_mapping": "Ajouter un Mapping",
102102
"add_property": "Ajouter une propriété",
103+
"configuration_copied": "Configuration copiée",
104+
"copy_configuration": "Copier la configuration",
103105
"reject": "Rejeter",
104106
"add_header": "Ajouter un en-tête",
105107
"apply": "Appliquer",
@@ -720,6 +722,7 @@
720722
"public_keys": "Clés publiques",
721723
"profile_detail": "Détails du profil",
722724
"roles": "Rôles AdminUI",
725+
"project_configuration": "Configuration du projet",
723726
"scopes": "Portées",
724727
"scripts": "Scénarios",
725728
"schemaName": "Nom du schéma",

admin-ui/app/locales/pt/translation.json

+3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
"add_attribute_mapping": "Adicionar mapeamento de atributos",
9797
"add": "Adicionar",
9898
"reject": "Rejeitar",
99+
"configuration_copied": "Configuração copiada",
100+
"copy_configuration": "Copiar configuração",
99101
"add_header": "Adicionar cabeçalho",
100102
"add_ldap_configuration": "Adicionar configuração LDAP",
101103
"add_mapping": "Add Mapping",
@@ -720,6 +722,7 @@
720722
"scripts": "Scripts",
721723
"schemaName": "Nome do esquema",
722724
"user_management": "Gerenciamento de usuários",
725+
"project_configuration": "Configuração do projeto",
723726
"ssa_management": "SSA Gerenciamento",
724727
"jans_ink": "Jans Link",
725728
"change_backend_bind_password": "Alterar senha de ligação de back-end",

admin-ui/app/routes/Apps/Gluu/GluuInputEditor.js

-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ function GluuInputEditor({
4040
size={lsize}
4141
required={required}
4242
/>
43-
{formik.errors.script && formik.touched.script ? (
44-
<div style={{ color: 'red' }}>{formik.errors.script}</div>
45-
) : null}
4643
<Col sm={rsize} style={{ position: 'relative' }}>
4744
{shortcode}
4845
<AceEditor

admin-ui/plugins/admin/components/CustomScripts/CustomScriptForm.js

+5
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,11 @@ function CustomScriptForm({ item, handleSubmit, viewOnly }) {
596596
formik={formik}
597597
value={formik.values.script}
598598
readOnly={viewOnly}
599+
errorMessage={formik.errors.script}
600+
showError={
601+
formik.errors.script &&
602+
formik.touched.script
603+
}
599604
required
600605
/>
601606
</Suspense>

admin-ui/plugins/auth-server/components/Agama/AgamaListPage.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import { ThemeContext } from 'Context/theme/themeContext'
88
import getThemeColor from 'Context/theme/config'
99
import TablePagination from '@mui/material/TablePagination';
1010
import Paper from '@mui/material/Paper';
11-
import { getAgama, deleteAgama, addAgama } from '../../redux/features/agamaSlice'
11+
import { getAgama, deleteAgama, addAgama } from 'Plugins/auth-server/redux/features/agamaSlice'
1212
import { hasPermission, AGAMA_READ, AGAMA_WRITE } from 'Utils/PermChecker'
13-
import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
13+
import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
1414
import MaterialTable from '@material-table/core'
1515
import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'
1616
import { useDropzone } from 'react-dropzone'
1717
import JSZip from 'jszip'
18-
import { AGAMA_DELETE } from '../../../../app/utils/PermChecker'
18+
import { AGAMA_DELETE } from 'Utils/PermChecker'
1919
import CircularProgress from '@mui/material/CircularProgress'
2020
import InfoIcon from '@mui/icons-material/Info';
2121
import AgamaProjectConfigModal from './AgamaProjectConfigModal'
@@ -179,14 +179,14 @@ function AgamaListPage() {
179179
let startCount = page * limit
180180
options['startIndex'] = parseInt(startCount)
181181
options['limit'] = limit
182-
options['pattern'] = pattern
182+
options['pattern'] = null
183183
setPageNumber(page)
184184
dispatch(getAgama(options))
185185
}
186186

187187
const onRowCountChangeClick = (count) => {
188188
options['limit'] = count
189-
options['pattern'] = pattern
189+
options['pattern'] = null
190190
setPageNumber(0)
191191
setLimit(count)
192192
dispatch(getAgama(options))

0 commit comments

Comments
 (0)