Skip to content
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.

Sign up for GitHub

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

Added UI changes related to Key Manager usage implementations #622

Merged
merged 26 commits into from
Mar 25, 2024
+1,380 −367
Merged

Added UI changes related to Key Manager usage implementations #622

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
191f707
Added UI changes related to Key Manager Usage implementations inadmin…
prasa7 Jul 30, 2023
40d7712
Added key manager names.
prasa7 Jul 31, 2023
54d4421
Implemented Key manager is deletable function.
prasa7 Aug 1, 2023
f29d783
Added Remove token ui function.
prasa7 Aug 3, 2023
8b5a620
Added keys removal functionality.
prasa7 Aug 8, 2023
0b5853f
Moved remove keys button to top.
prasa7 Aug 10, 2023
fd08072
Implemeted zero usage ui texts.
prasa7 Aug 10, 2023
57796bb
Added clean up token login to front end
SavinduDimal Mar 7, 2024
fed7240
Moved remove keys and clean keys to different components.
prasa7 Aug 11, 2023
0f35441
Added delete confirmatiion.
prasa7 Aug 11, 2023
a606a9b
Added intl texts.
prasa7 Aug 11, 2023
3f742ce
Changes to removeKeys from cleanUpKeys.
prasa7 Aug 13, 2023
ce072df
Improved admin portal ui code.
prasa7 Aug 14, 2023
fab258e
Removed clean clean keys method.
prasa7 Aug 14, 2023
12949f3
MOdified the ui footer.
prasa7 Aug 14, 2023
bca7e9a
Fixed key manager delete ui issue.
prasa7 Aug 14, 2023
26ef607
Improved UI code.
prasa7 Aug 14, 2023
4c2310b
Added intel texts.
prasa7 Aug 14, 2023
cf08d3c
Improved delete ui function.
prasa7 Aug 14, 2023
8600a4b
Added REST api changes to UI components.
prasa7 Aug 15, 2023
b8ef9b5
Fix multiple issues
SavinduDimal Mar 18, 2024
ff36659
Add popup for key manager usages
SavinduDimal Mar 21, 2024
b6c825a
Add locales file changes
SavinduDimal Mar 22, 2024
5cca1d6
Remove /settings/key-managers/usages path
SavinduDimal Mar 22, 2024
f9b6e75
Fix global key manager token type view issue
SavinduDimal Mar 22, 2024
04b8ced
Add requested changes from review
SavinduDimal Mar 22, 2024
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
20 changes: 18 additions & 2 deletions portals/admin/src/main/webapp/site/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.displayName.empty": "Display Name is Empty",
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.duplicate": "VHosts are duplicated",
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.empty": "VHost is empty",
"Api.Name": "API Name",
"Api.Provider": "Provider",
"Api.Version": "Version",
"Apis.Details.Scopes.CreateScope.roles.help": "Enter a valid role and press `Enter`.",
"Apis.Details.Scopes.Roles.Invalid": "A Role is invalid",
"Apis.Listing.Listing.apis.search": "Search",
Expand All @@ -112,6 +115,9 @@
"Apis.Shared.ConfirmDialog.ok": "OK",
"Apis.Shared.ConfirmDialog.please.confirm": "Please Confirm",
"Apis.Shared.RedirectToLogin.you.will.be.redirected.to": "You will be redirected to {page}",
"Application.Name": "Application Name",
"Application.Owner": "Application Owner",
"Application.organization": "Application Organization",
"Applications.Listing.ApplicationTableHead.actions": "Actions",
"Applications.Listing.ApplicationTableHead.name": "Name",
"Applications.Listing.ApplicationTableHead.owner": "Owner",
Expand Down Expand Up @@ -217,8 +223,8 @@
"KeyManager.add.success": "Key Manager added successfully.",
"KeyManager.add.success.msg": " - Key Manager added successfully.",
"KeyManager.edit.success": " - Key Manager edited successfully.",
"KeyManager.enter.permission.allowed": "Use of this Key-Manager is\n \"Allowed\" for above roles.",
"KeyManager.enter.permission.denied": "Use of this Key-Manager is\n \"Denied\" for above roles.",
"KeyManager.enter.permission.allowed": "Use of this Key-Manager is\n \"Allowed\" for above roles.",
"KeyManager.enter.permission.denied": "Use of this Key-Manager is\n \"Denied\" for above roles.",
"KeyManager.permissions": "Permissions",
"KeyManagers.AddEditKeyManager.\n form.scopeManagementEndpoint": "Scope Management Endpoint",
"KeyManagers.AddEditKeyManager.\n form.displayRevokeEndpoint": "Display Revoke Endpoint",
Expand All @@ -227,6 +233,8 @@
"KeyManagers.AddEditKeyManager.advanced": "Advanced Configurations",
"KeyManagers.AddEditKeyManager.advanced.description": "Advanced options for the Key Manager",
"KeyManagers.AddEditKeyManager.api.invocation.method": "API Invocation Method",
"KeyManagers.AddEditKeyManager.api.no.usages": "No API usages for\n this key manager specifically.",
"KeyManagers.AddEditKeyManager.application.no.usages": "No Application usages\n for this key manager specifically.",
"KeyManagers.AddEditKeyManager.certificate": "Certificates",
"KeyManagers.AddEditKeyManager.certificate.description": "Upload or provide the certificate inline.",
"KeyManagers.AddEditKeyManager.claim.mappings.hidden.help": "Expand to add edit claim mappings",
Expand Down Expand Up @@ -289,6 +297,7 @@
"KeyManagers.AddEditKeyManager.title.newGlobal": "Global Key Manager - Create new",
"KeyManagers.AddEditKeyManager.token.handling.options": "Token Handling Options",
"KeyManagers.AddEditKeyManager.token.validation.method": "Token Validation Method",
"KeyManagers.AddEditKeyManager.usages": "Key Manager Usage",
"KeyManagers.AddEditKeyManager.useIntrospect": "Use introspect",
"KeyManagers.AddEditTokenExchangeIDP.form.Issuer": "Issuer",
"KeyManagers.AddEditTokenExchangeIDP.form.issuer.help": "E.g.,: https://localhost:9443/oauth2/token",
Expand All @@ -307,6 +316,12 @@
"KeyManagers.ImportConfig.dialog.trigger.import": "Import",
"KeyManagers.ImportConfig.form.url": "Url",
"KeyManagers.ImportConfig.form.url.help": "Provide Url",
"KeyManagers.ListKeyManagerAPIUsages.error": "Unable to get Key Manager API usage details",
"KeyManagers.ListKeyManagerApplicationUsages.error": "Unable to get Key Manager application usage details",
"KeyManagers.ListKeyManagerUsages.empty.content": "There are no Key Manger usages.",
"KeyManagers.ListKeyManagerUsages.empty.title": "Key Manager Usages",
"KeyManagers.ListKeyManagerUsages.permission.denied.content": "You dont have enough permission to view Key Manager Usages. Please contact the site administrator.",
"KeyManagers.ListKeyManagerUsages.permission.denied.title": "Permission Denied",
"KeyManagers.ListKeyManagers.List.title": "Key Managers",
"KeyManagers.ListKeyManagers.addButtonProps.triggerButtonText": "Add Key Manager",
"KeyManagers.ListKeyManagers.addGlobalKeyManager": "Add Global Key Manager",
Expand All @@ -316,6 +331,7 @@
"KeyManagers.ListKeyManagers.table.header.label.name": "Name",
"KeyManagers.ListKeyManagers.table.header.label.provider": "Provider",
"KeyManagers.ListKeyManagers.table.header.label.tokenType": "Type",
"KeyManagers.ListKeyManagers.table.header.label.usage": "Usage",
"Keymanager.Claim.Action": "Action",
"Keymanager.KeyValidation.Action": "Action",
"Keymanager.KeyValidation.ClaimKey": "Claim Key",
Expand Down
16 changes: 16 additions & 0 deletions portals/admin/src/main/webapp/site/public/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.displayName.empty": "",
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.duplicate": "",
"AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.empty": "",
"Api.Name": "",
"Api.Provider": "",
"Api.Version": "",
"Apis.Details.Scopes.CreateScope.roles.help": "",
"Apis.Details.Scopes.Roles.Invalid": "",
"Apis.Listing.Listing.apis.search": "",
Expand All @@ -112,6 +115,9 @@
"Apis.Shared.ConfirmDialog.ok": "",
"Apis.Shared.ConfirmDialog.please.confirm": "",
"Apis.Shared.RedirectToLogin.you.will.be.redirected.to": "",
"Application.Name": "",
"Application.Owner": "",
"Application.organization": "",
"Applications.Listing.ApplicationTableHead.actions": "",
"Applications.Listing.ApplicationTableHead.name": "",
"Applications.Listing.ApplicationTableHead.owner": "",
Expand Down Expand Up @@ -227,6 +233,8 @@
"KeyManagers.AddEditKeyManager.advanced": "",
"KeyManagers.AddEditKeyManager.advanced.description": "",
"KeyManagers.AddEditKeyManager.api.invocation.method": "",
"KeyManagers.AddEditKeyManager.api.no.usages": "",
"KeyManagers.AddEditKeyManager.application.no.usages": "",
"KeyManagers.AddEditKeyManager.certificate": "",
"KeyManagers.AddEditKeyManager.certificate.description": "",
"KeyManagers.AddEditKeyManager.claim.mappings.hidden.help": "",
Expand Down Expand Up @@ -289,6 +297,7 @@
"KeyManagers.AddEditKeyManager.title.newGlobal": "",
"KeyManagers.AddEditKeyManager.token.handling.options": "",
"KeyManagers.AddEditKeyManager.token.validation.method": "",
"KeyManagers.AddEditKeyManager.usages": "",
"KeyManagers.AddEditKeyManager.useIntrospect": "",
"KeyManagers.AddEditTokenExchangeIDP.form.Issuer": "",
"KeyManagers.AddEditTokenExchangeIDP.form.issuer.help": "",
Expand All @@ -307,6 +316,12 @@
"KeyManagers.ImportConfig.dialog.trigger.import": "",
"KeyManagers.ImportConfig.form.url": "",
"KeyManagers.ImportConfig.form.url.help": "",
"KeyManagers.ListKeyManagerAPIUsages.error": "",
"KeyManagers.ListKeyManagerApplicationUsages.error": "",
"KeyManagers.ListKeyManagerUsages.empty.content": "",
"KeyManagers.ListKeyManagerUsages.empty.title": "",
"KeyManagers.ListKeyManagerUsages.permission.denied.content": "",
"KeyManagers.ListKeyManagerUsages.permission.denied.title": "",
"KeyManagers.ListKeyManagers.List.title": "",
"KeyManagers.ListKeyManagers.addButtonProps.triggerButtonText": "",
"KeyManagers.ListKeyManagers.addGlobalKeyManager": "",
Expand All @@ -316,6 +331,7 @@
"KeyManagers.ListKeyManagers.table.header.label.name": "",
"KeyManagers.ListKeyManagers.table.header.label.provider": "",
"KeyManagers.ListKeyManagers.table.header.label.tokenType": "",
"KeyManagers.ListKeyManagers.table.header.label.usage": "",
"Keymanager.Claim.Action": "",
"Keymanager.KeyValidation.Action": "",
"Keymanager.KeyValidation.ClaimKey": "",
Expand Down
4 changes: 2 additions & 2 deletions portals/admin/src/main/webapp/source/src/app/components/KeyManagers/DeleteKeyManager.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { useAppContext } from 'AppComponents/Shared/AppContext';
* @param {JSON} props component props.
* @returns {JSX} Loading animation.
*/
function Delete({ updateList, dataRow }) {
function Delete({ updateList, dataRow, isDisabled }) {
const { id, type, isGlobal } = dataRow;
const { isSuperTenant, user: { _scopes } } = useAppContext();
const isSuperAdmin = isSuperTenant && _scopes.includes('apim:admin_settings');
Expand Down Expand Up @@ -68,7 +68,7 @@ function Delete({ updateList, dataRow }) {
triggerIconProps={{
color: 'primary',
component: 'span',
disabled: type === 'default' || (isGlobal && !isSuperAdmin),
disabled: type === 'default' || (isGlobal && !isSuperAdmin) || isDisabled,
}}
>
<DialogContentText>
Expand Down
Loading