-
Notifications
You must be signed in to change notification settings - Fork 22
feat(admin-ui): make page UI for cedarling configuration #2378
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 13 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
63ad577
feat: make cedarling config UI
kdhttps dd9909c
feat: add other language translation
kdhttps ae6e0c5
feat: add admin config api reducer
kdhttps 3a16b18
feat: add form validation
kdhttps 57c56f1
Merge branch 'main' of github.com:GluuFederation/flex into feat-2313-…
kdhttps 077dbd9
chore: fix format
kdhttps 4fe77b4
feat: add config saga
kdhttps b2e7f4a
feat: edit config
kdhttps ec2e56e
feat: use react query and remove saga
kdhttps c092ac0
feat: update translation
kdhttps 1b5e6d0
Merge branch 'main' of github.com:GluuFederation/flex into feat-2313-…
kdhttps 13106fc
feat: add toast and audit log
kdhttps 501dc0b
feat: set remote policy store as default
kdhttps 0e49977
fix: add code rabbit changes
kdhttps febcfc3
fix: add code rabbit changes
kdhttps 15fa453
feat: role to scope mapping and PRP config
kdhttps 6bbd7e8
refactor: remove add update operation on mapping
kdhttps 718ea05
chore: update notes
kdhttps 911dfa9
refactor: remove essential scope section
kdhttps f4a2c62
feat: update form and invalidate get query
kdhttps e6699a2
fix: addressed PR review changes
kdhttps 1cb798e
fix: addressed PR review changes
kdhttps 4ebd8df
refactor: update translations
kdhttps 8e1edd5
refactor: remove role and capabilities page
kdhttps 7f2d615
feat: add mapping notes in translation
kdhttps 47625c8
refactor: PR review fixes
kdhttps 7f3da04
docs: add cedarling config doc
kdhttps ff56cb8
docs: add policy store detaisl
kdhttps 0010707
docs: rephase sentence
kdhttps e80cce5
docs: code review fixes
kdhttps 799181d
docs: fix spelling mistake
kdhttps e84df41
fix: pushed arnab review changes
kdhttps 4b5cf15
feat: check remote url empty
kdhttps 59af644
fix: fix code review changes
kdhttps 98f84f0
fix: Remove redundant checked props
kdhttps 12c6407
refactor: remove docs content
kdhttps 0979d9b
Merge branch 'main' into feat-2313-cedarling-ui
kdhttps c3e75a1
refactor: update review doc
kdhttps e529e1b
fix: arnab review changes
kdhttps File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
213 changes: 213 additions & 0 deletions
213
admin-ui/plugins/admin/components/Cedarling/CedarlingConfigPage.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,213 @@ | ||
| import React, { useEffect, useState } from 'react' | ||
| import { | ||
| Button, | ||
| Card, | ||
| CardBody, | ||
| FormGroup, | ||
| CardTitle, | ||
| CardText, | ||
| Form, | ||
| Input, | ||
| Col, | ||
| } from 'Components' | ||
| import { useTranslation } from 'react-i18next' | ||
| import SetTitle from 'Utils/SetTitle' | ||
| import GluuLabel from '@/routes/Apps/Gluu/GluuLabel' | ||
| import { useDispatch, useSelector } from 'react-redux' | ||
| import { PROPERTIES_DELETE, PROPERTIES_READ, PROPERTIES_WRITE } from '@/utils/PermChecker' | ||
| import { useCedarling } from '@/cedarling' | ||
| import { | ||
| useGetAdminuiConf, | ||
| useEditAdminuiConf, | ||
| useSetRemotePolicyStoreAsDefault, | ||
| } from 'JansConfigApi' | ||
| import GluuLoader from '@/routes/Apps/Gluu/GluuLoader' | ||
| import type { AppConfigResponse } from 'JansConfigApi' | ||
| import { updateToast } from '@/redux/features/toastSlice' | ||
| import { getErrorMessage } from 'Plugins/schema/utils/errorHandler' | ||
| import { logAudit } from '@/utils/AuditLogger' | ||
| import type { RootState } from '@/redux/sagas/types/audit' | ||
| import { UPDATE } from '@/audit/UserActionType' | ||
| import { IconButton } from '@mui/material' | ||
| import { RefreshOutlined } from '@mui/icons-material' | ||
|
|
||
| const CedarlingConfigPage: React.FC = () => { | ||
| const { authorize } = useCedarling() | ||
| const { t } = useTranslation() | ||
| SetTitle(t('titles.cedarling_config')) | ||
| const [auiPolicyStoreUrl, setAuiPolicyStoreUrl] = useState('') | ||
| const [configApiPolicyStoreUrl, setConfigApiPolicyStoreUrl] = useState('') | ||
| const { data: auiConfig, isLoading, isSuccess } = useGetAdminuiConf() | ||
| const editAdminuiConfMutation = useEditAdminuiConf() | ||
| const setRemotePolicyStoreAsDefaultMutation = useSetRemotePolicyStoreAsDefault() | ||
| const token: string | undefined = useSelector( | ||
| (state: RootState) => state.authReducer?.token?.access_token, | ||
| ) | ||
| const userinfo: RootState['authReducer']['userinfo'] | undefined = useSelector( | ||
| (state: RootState) => state.authReducer?.userinfo, | ||
| ) | ||
| const client_id: string | undefined = useSelector( | ||
| (state: RootState) => state.authReducer?.config?.clientId, | ||
| ) | ||
|
|
||
| const dispatch = useDispatch() | ||
|
|
||
| const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => { | ||
| e.preventDefault() | ||
| const requestData = { | ||
| auiPolicyStoreUrl, | ||
| useRemotePolicyStore: true, | ||
| } | ||
|
|
||
| try { | ||
| const editAppConfigResponse: AppConfigResponse = await editAdminuiConfMutation.mutateAsync({ | ||
| data: { ...auiConfig, ...requestData }, | ||
| }) | ||
| console.log('Edit Response:', editAppConfigResponse) | ||
kdhttps marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| setAuiPolicyStoreUrl(editAppConfigResponse?.auiPolicyStoreUrl || '') | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| dispatch(updateToast(true, 'success')) | ||
|
|
||
| const userMessage: string = 'Policy Store URL configuration updated' | ||
| await logAudit({ | ||
| token: token ?? undefined, | ||
| userinfo: userinfo ?? undefined, | ||
| action: UPDATE, | ||
| resource: 'update_admin_ui_config', | ||
| message: userMessage, | ||
| client_id: client_id, | ||
| payload: requestData, | ||
| }) | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } catch (error) { | ||
| console.error('Error updating Cedarling configuration:', error) | ||
| const errorMessage = getErrorMessage(error, 'messages.error_in_saving', t) | ||
| dispatch(updateToast(true, 'error', errorMessage)) | ||
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| const handleSetRemotePolicyStoreAsDefault = async (e: React.MouseEvent<HTMLButtonElement>) => { | ||
| e.preventDefault() | ||
|
|
||
| try { | ||
| const setPolicyDefaultResponse = await setRemotePolicyStoreAsDefaultMutation.mutateAsync() | ||
|
|
||
| console.log('Edit Response:', setPolicyDefaultResponse) | ||
| dispatch(updateToast(true, 'success')) | ||
|
|
||
| const userMessage: string = 'Set policy store as default' | ||
| await logAudit({ | ||
| token: token ?? undefined, | ||
| userinfo: userinfo ?? undefined, | ||
| action: UPDATE, | ||
| resource: 'set_remote_policy_store_as_default', | ||
| message: userMessage, | ||
| client_id: client_id, | ||
| payload: {}, | ||
| }) | ||
| } catch (error) { | ||
| console.error('Error updating Cedarling configuration:', error) | ||
| const errorMessage = getErrorMessage(error, 'messages.error_in_saving', t) | ||
| dispatch(updateToast(true, 'error', errorMessage)) | ||
| } | ||
| } | ||
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| useEffect(() => { | ||
| const initPermissions = async () => { | ||
| const permissions = [PROPERTIES_READ, PROPERTIES_WRITE, PROPERTIES_DELETE] | ||
| for (const permission of permissions) { | ||
| await authorize([permission]) | ||
| } | ||
| } | ||
| initPermissions() | ||
| }, []) | ||
kdhttps marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| useEffect(() => { | ||
| if (isSuccess) { | ||
| setAuiPolicyStoreUrl(auiConfig?.auiPolicyStoreUrl || '') | ||
| } | ||
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, [isSuccess]) | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return ( | ||
| <GluuLoader blocking={isLoading}> | ||
| <Card className="shadow-sm align-items-center"> | ||
| <Col sm="9"> | ||
| <CardBody> | ||
| <CardTitle tag="h4" className="text-center fw-bold mb-4"> | ||
| {t('documentation.cedarlingConfig.title')} | ||
| </CardTitle> | ||
|
|
||
| <Card className="bg-light border-0 p-3 mb-4"> | ||
| <CardText className="text-center text-secondary"> | ||
| {t('documentation.cedarlingConfig.point1')}{' '} | ||
| <a | ||
| href="https://github.com/kdhttps/admin-ui-cedarling-config" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| AdminUICedarling | ||
| </a> | ||
| . | ||
| <br /> | ||
| {t('documentation.cedarlingConfig.point2')} | ||
| </CardText> | ||
| <CardText className="text-center text-muted small"> | ||
| {t('documentation.cedarlingConfig.note')}{' '} | ||
| <a | ||
| href="https://cloud.gluu.org/agama-lab" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| Agama-Lab | ||
| </a> | ||
| . | ||
| </CardText> | ||
| </Card> | ||
|
|
||
| <Form onSubmit={handleSubmit}> | ||
| <FormGroup row> | ||
| <GluuLabel label={'fields.auiPolicyStoreUrl'} /> | ||
| <Col sm={8}> | ||
| <Input | ||
| id="auiPolicyStoreUrl" | ||
| type="url" | ||
| name="auiPolicyStoreUrl" | ||
| value={auiPolicyStoreUrl} | ||
| onChange={(e) => setAuiPolicyStoreUrl(e.target.value)} | ||
| /> | ||
| </Col> | ||
kdhttps marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Col sm={1}> | ||
| <IconButton | ||
| type="button" | ||
| aria-label="search" | ||
| onClick={handleSetRemotePolicyStoreAsDefault} | ||
| > | ||
| <RefreshOutlined /> | ||
| </IconButton> | ||
| </Col> | ||
| </FormGroup> | ||
| <FormGroup row> | ||
| <GluuLabel label={'fields.configApiPolicyStoreUrl'} /> | ||
| <Col sm={8}> | ||
| <Input | ||
| id="configApiPolicyStoreUrl" | ||
| type="url" | ||
| name="configApiPolicyStoreUrl" | ||
| value={configApiPolicyStoreUrl} | ||
| onChange={(e) => setConfigApiPolicyStoreUrl(e.target.value)} | ||
| /> | ||
| </Col> | ||
| </FormGroup> | ||
|
|
||
| <div className="text-center mt-4"> | ||
| <Button color="dark" size="lg" type="submit"> | ||
| {t('actions.apply')} | ||
| </Button> | ||
| </div> | ||
| </Form> | ||
| </CardBody> | ||
| </Col> | ||
| </Card> | ||
| </GluuLoader> | ||
| ) | ||
| } | ||
|
|
||
| export default CedarlingConfigPage | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.