Skip to content

Commit aa4f98d

Browse files
hisanhunaishisanhunais
authored
Merge pull request #900 from msm1992/main-federated-gateway-admin
[Gateway Federation][UI] Add admin UI changes to onboard external gateways
2 parents 52de5de + a1bcb36 commit aa4f98d

File tree

9 files changed

+950
-555
lines changed

9 files changed

+950
-555
lines changed

‎portals/admin/src/main/webapp/site/public/locales/en.json‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Admin.Addons.Help.Base.title": "Help",
33
"Admin.AiVendor.label.apiVersion": "API Version",
4+
"Admin.GatewayEnvironment.form.type": "Gateway Environment Type",
45
"Admin.KeyManager.form.type": "Key Manager Type",
56
"Admin.KeyManager.label.ConsumerKey.Claim": "Consumer Key Claim URI",
67
"Admin.KeyManager.label.DisplayName": "Display Name",
@@ -351,6 +352,8 @@
351352
"Base.RouteMenuMapping.custom.throttling.policies.items.Editing": "Edit Custom Policy",
352353
"Base.RouteMenuMapping.dashboard": "Dashboard",
353354
"Base.RouteMenuMapping.gateways": "Gateways",
355+
"Base.RouteMenuMapping.gateways.items.Adding": "Gateway Environment",
356+
"Base.RouteMenuMapping.gateways.items.Editing": "Edit Gateway Environment",
354357
"Base.RouteMenuMapping.governance": "Governance",
355358
"Base.RouteMenuMapping.governance.policies": "Policies",
356359
"Base.RouteMenuMapping.keymanagers": "Key Managers",
@@ -406,42 +409,50 @@
406409
"Dashboard.tasksWorkflow.compactTasks.userCreation.name": "User Creation",
407410
"Dashboard.tasksWorkflow.noTasks.card.description": "Manage workflow tasks, increase productivity and enhance competitiveness by enabling developers to easily deploy business processes and models.",
408411
"Dashboard.tasksWorkflow.noTasks.card.title": "All the pending tasks completed",
412+
"Environment.add.success": "- Gateway Environment added successfully.",
413+
"Environment.edit.success": "- Gateway Environment edited successfully.",
409414
"Form.Dialog.Base.cancel.btn": "Cancel",
415+
"Gateway.AddEditGWEnvironment.permission\n .denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
416+
"Gateway.AddEditGWEnvironment.permission.\n allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
410417
"Gateway.AddEditGWEnvironment.permission.Invalid": "Invalid Role(s) Found",
411-
"Gateway.AddEditGWEnvironment.permission.allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
412-
"Gateway.AddEditGWEnvironment.permission.denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
413418
"Gateway.AddEditGWEnvironment.permission.help": "Enter a valid role and press `Enter`",
414-
"GatewayEnvironments.AddEditGWEnvironment.form.Permission.helper.text": "Permissions for the Gateway Environment",
415-
"GatewayEnvironments.AddEditGWEnvironment.form.description.help": "Description of the Gateway Environment",
416-
"GatewayEnvironments.AddEditGWEnvironment.form.description.label": "Description",
419+
"Gateway.Configuration.Helper.text": "Add Gateway Agent Configurations",
420+
"GatewayEnvironment.type": "Key Type",
421+
"GatewayEnvironment.vhosts": "Vhosts",
422+
"GatewayEnvironment.visibility": "Visibility",
423+
"GatewayEnvironments.AddEditGWEnvironment.External.GatewayEnvironment.general.details.description": "Gateway vendor",
424+
"GatewayEnvironments.AddEditGWEnvironment.GatewayEnvironment.type": "Gateway Environment Type",
425+
"GatewayEnvironments.AddEditGWEnvironment.connector.configurations": "Gateway Agent Configurations",
426+
"GatewayEnvironments.AddEditGWEnvironment.connector.configurations\n .description": "Provide connection params for the selected Gateway Environment.",
427+
"GatewayEnvironments.AddEditGWEnvironment.form.add": "Add",
428+
"GatewayEnvironments.AddEditGWEnvironment.form.cancel": "Cancel",
429+
"GatewayEnvironments.AddEditGWEnvironment.form.description": "Description",
417430
"GatewayEnvironments.AddEditGWEnvironment.form.displayName": "Display Name",
418-
"GatewayEnvironments.AddEditGWEnvironment.form.displayName.help": "Display name of the Gateway Environment",
419431
"GatewayEnvironments.AddEditGWEnvironment.form.environment.name.empty": "Name is Empty",
420432
"GatewayEnvironments.AddEditGWEnvironment.form.environment.name.invalid": "Name must not contain special characters or spaces",
421-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk": "APK Gateway",
422-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk.description": "Fast API gateway running on kubernetes designed to manage and secure APIs.",
423-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk.new.label": "New",
424-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.label": "Select Gateway type",
425-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.regular": "Regular Gateway",
426-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.regular.description": "API gateway embedded in APIM runtime. Connect directly to an existing APIManager.",
427-
"GatewayEnvironments.AddEditGWEnvironment.form.info.add.successful": "Gateway Environment added successfully",
428-
"GatewayEnvironments.AddEditGWEnvironment.form.info.edit.successful": "Gateway Environment edited successfully",
429433
"GatewayEnvironments.AddEditGWEnvironment.form.name": "Name",
430-
"GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment",
431-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.allow.option": "Allow for role(s)",
432-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.deny.option": "Deny for role(s)",
433-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.public.option": "Public",
434-
"GatewayEnvironments.AddEditGWEnvironment.form.permissions": "Permission",
435-
"GatewayEnvironments.AddEditGWEnvironment.form.permissions.select": "Permission",
436-
"GatewayEnvironments.AddEditGWEnvironment.form.save.button.label": "Save",
434+
"GatewayEnvironments.AddEditGWEnvironment.form.name.form.description.help": "Description of the Gateway Environment.",
435+
"GatewayEnvironments.AddEditGWEnvironment.form.name.form.displayName.help": "Display name of the Gateway Environment.",
436+
"GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment.",
437+
"GatewayEnvironments.AddEditGWEnvironment.form.type.help": "Select Gateway Environment Type",
437438
"GatewayEnvironments.AddEditGWEnvironment.form.type.helper.text": "Supported Key Type of the Gateway Environment",
438439
"GatewayEnvironments.AddEditGWEnvironment.form.type.hybrid.option": "Hybrid",
439440
"GatewayEnvironments.AddEditGWEnvironment.form.type.label": "Type",
440441
"GatewayEnvironments.AddEditGWEnvironment.form.type.prod.option": "Production",
441442
"GatewayEnvironments.AddEditGWEnvironment.form.type.sandbox.option": "Sandbox",
443+
"GatewayEnvironments.AddEditGWEnvironment.form.update.btn": "Update",
442444
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.context.invalid": "Invalid Http context",
443445
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.host.empty": "Host of Vhost is empty",
444-
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.host.invalid": "Invalid Host",
446+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility": "Visibility",
447+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.allow.option": "Allow for role(s)",
448+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.deny.option": "Deny for role(s)",
449+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.helper.text": "Visibility of the Gateway Environment",
450+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.public.option": "Public",
451+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.select": "Visibility",
452+
"GatewayEnvironments.AddEditGWEnvironment.general.details": "General Details",
453+
"GatewayEnvironments.AddEditGWEnvironment.general.details.description": "Provide name and description of the Gateway Environment",
454+
"GatewayEnvironments.AddEditGWEnvironment.type.description": "Key type supported by the Gateway Environment",
455+
"GatewayEnvironments.AddEditGWEnvironment.visibility.add.description": "Configure vhosts",
445456
"GatewayEnvironments.AddEditVhost.add.vhost.btn": "New VHost",
446457
"GatewayEnvironments.AddEditVhost.host": "Host",
447458
"GatewayEnvironments.AddEditVhost.host.gateway.access.url": "Gateway Access URLs",
@@ -457,6 +468,9 @@
457468
"GatewayEnvironments.AddEditVhost.httpsPort": "HTTPS Port",
458469
"GatewayEnvironments.AddEditVhost.wsPort": "WS Port",
459470
"GatewayEnvironments.AddEditVhost.wssPort": "WSS Port",
471+
"Gateways.AddEditGateway.title.edit": "Gateway Environment - Edit",
472+
"Gateways.AddEditGateway.title.new": "Gateway Environment - Create new",
473+
"Gateways.ListGatewayEnvironments.addNewGatewayEnvironment": "Add Gateway Environment",
460474
"Governance.Overview.APICompliance.PolicyAdherence.column.policy": "Policy",
461475
"Governance.Overview.APICompliance.PolicyAdherence.column.rulesets": "Rulesets",
462476
"Governance.Overview.APICompliance.PolicyAdherence.column.status": "Status",

‎portals/admin/src/main/webapp/site/public/locales/fr.json‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Admin.Addons.Help.Base.title": "Help",
33
"Admin.AiVendor.label.apiVersion": "API Version",
4+
"Admin.GatewayEnvironment.form.type": "Gateway Environment Type",
45
"Admin.KeyManager.form.type": "Key Manager Type",
56
"Admin.KeyManager.label.ConsumerKey.Claim": "Consumer Key Claim URI",
67
"Admin.KeyManager.label.DisplayName": "Display Name",
@@ -351,6 +352,8 @@
351352
"Base.RouteMenuMapping.custom.throttling.policies.items.Editing": "Edit Custom Policy",
352353
"Base.RouteMenuMapping.dashboard": "Dashboard",
353354
"Base.RouteMenuMapping.gateways": "Gateways",
355+
"Base.RouteMenuMapping.gateways.items.Adding": "Gateway Environment",
356+
"Base.RouteMenuMapping.gateways.items.Editing": "Edit Gateway Environment",
354357
"Base.RouteMenuMapping.governance": "Governance",
355358
"Base.RouteMenuMapping.governance.policies": "Policies",
356359
"Base.RouteMenuMapping.keymanagers": "Key Managers",
@@ -406,42 +409,50 @@
406409
"Dashboard.tasksWorkflow.compactTasks.userCreation.name": "User Creation",
407410
"Dashboard.tasksWorkflow.noTasks.card.description": "Manage workflow tasks, increase productivity and enhance competitiveness by enabling developers to easily deploy business processes and models.",
408411
"Dashboard.tasksWorkflow.noTasks.card.title": "All the pending tasks completed",
412+
"Environment.add.success": "- Gateway Environment added successfully.",
413+
"Environment.edit.success": "- Gateway Environment edited successfully.",
409414
"Form.Dialog.Base.cancel.btn": "Cancel",
415+
"Gateway.AddEditGWEnvironment.permission\n .denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
416+
"Gateway.AddEditGWEnvironment.permission.\n allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
410417
"Gateway.AddEditGWEnvironment.permission.Invalid": "Invalid Role(s) Found",
411-
"Gateway.AddEditGWEnvironment.permission.allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
412-
"Gateway.AddEditGWEnvironment.permission.denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
413418
"Gateway.AddEditGWEnvironment.permission.help": "Enter a valid role and press `Enter`",
414-
"GatewayEnvironments.AddEditGWEnvironment.form.Permission.helper.text": "Permissions for the Gateway Environment",
415-
"GatewayEnvironments.AddEditGWEnvironment.form.description.help": "Description of the Gateway Environment",
416-
"GatewayEnvironments.AddEditGWEnvironment.form.description.label": "Description",
419+
"Gateway.Configuration.Helper.text": "Add Gateway Agent Configurations",
420+
"GatewayEnvironment.type": "Key Type",
421+
"GatewayEnvironment.vhosts": "Vhosts",
422+
"GatewayEnvironment.visibility": "Visibility",
423+
"GatewayEnvironments.AddEditGWEnvironment.External.GatewayEnvironment.general.details.description": "Gateway vendor",
424+
"GatewayEnvironments.AddEditGWEnvironment.GatewayEnvironment.type": "Gateway Environment Type",
425+
"GatewayEnvironments.AddEditGWEnvironment.connector.configurations": "Gateway Agent Configurations",
426+
"GatewayEnvironments.AddEditGWEnvironment.connector.configurations\n .description": "Provide connection params for the selected Gateway Environment.",
427+
"GatewayEnvironments.AddEditGWEnvironment.form.add": "Add",
428+
"GatewayEnvironments.AddEditGWEnvironment.form.cancel": "Cancel",
429+
"GatewayEnvironments.AddEditGWEnvironment.form.description": "Description",
417430
"GatewayEnvironments.AddEditGWEnvironment.form.displayName": "Display Name",
418-
"GatewayEnvironments.AddEditGWEnvironment.form.displayName.help": "Display name of the Gateway Environment",
419431
"GatewayEnvironments.AddEditGWEnvironment.form.environment.name.empty": "Name is Empty",
420432
"GatewayEnvironments.AddEditGWEnvironment.form.environment.name.invalid": "Name must not contain special characters or spaces",
421-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk": "APK Gateway",
422-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk.description": "Fast API gateway running on kubernetes designed to manage and secure APIs.",
423-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.apk.new.label": "New",
424-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.label": "Select Gateway type",
425-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.regular": "Regular Gateway",
426-
"GatewayEnvironments.AddEditGWEnvironment.form.gateway.type.regular.description": "API gateway embedded in APIM runtime. Connect directly to an existing APIManager.",
427-
"GatewayEnvironments.AddEditGWEnvironment.form.info.add.successful": "Gateway Environment added successfully",
428-
"GatewayEnvironments.AddEditGWEnvironment.form.info.edit.successful": "Gateway Environment edited successfully",
429433
"GatewayEnvironments.AddEditGWEnvironment.form.name": "Name",
430-
"GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment",
431-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.allow.option": "Allow for role(s)",
432-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.deny.option": "Deny for role(s)",
433-
"GatewayEnvironments.AddEditGWEnvironment.form.permission.public.option": "Public",
434-
"GatewayEnvironments.AddEditGWEnvironment.form.permissions": "Permission",
435-
"GatewayEnvironments.AddEditGWEnvironment.form.permissions.select": "Permission",
436-
"GatewayEnvironments.AddEditGWEnvironment.form.save.button.label": "Save",
434+
"GatewayEnvironments.AddEditGWEnvironment.form.name.form.description.help": "Description of the Gateway Environment.",
435+
"GatewayEnvironments.AddEditGWEnvironment.form.name.form.displayName.help": "Display name of the Gateway Environment.",
436+
"GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment.",
437+
"GatewayEnvironments.AddEditGWEnvironment.form.type.help": "Select Gateway Environment Type",
437438
"GatewayEnvironments.AddEditGWEnvironment.form.type.helper.text": "Supported Key Type of the Gateway Environment",
438439
"GatewayEnvironments.AddEditGWEnvironment.form.type.hybrid.option": "Hybrid",
439440
"GatewayEnvironments.AddEditGWEnvironment.form.type.label": "Type",
440441
"GatewayEnvironments.AddEditGWEnvironment.form.type.prod.option": "Production",
441442
"GatewayEnvironments.AddEditGWEnvironment.form.type.sandbox.option": "Sandbox",
443+
"GatewayEnvironments.AddEditGWEnvironment.form.update.btn": "Update",
442444
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.context.invalid": "Invalid Http context",
443445
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.host.empty": "Host of Vhost is empty",
444-
"GatewayEnvironments.AddEditGWEnvironment.form.vhost.host.invalid": "Invalid Host",
446+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility": "Visibility",
447+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.allow.option": "Allow for role(s)",
448+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.deny.option": "Deny for role(s)",
449+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.helper.text": "Visibility of the Gateway Environment",
450+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.public.option": "Public",
451+
"GatewayEnvironments.AddEditGWEnvironment.form.visibility.select": "Visibility",
452+
"GatewayEnvironments.AddEditGWEnvironment.general.details": "General Details",
453+
"GatewayEnvironments.AddEditGWEnvironment.general.details.description": "Provide name and description of the Gateway Environment",
454+
"GatewayEnvironments.AddEditGWEnvironment.type.description": "Key type supported by the Gateway Environment",
455+
"GatewayEnvironments.AddEditGWEnvironment.visibility.add.description": "Configure vhosts",
445456
"GatewayEnvironments.AddEditVhost.add.vhost.btn": "New VHost",
446457
"GatewayEnvironments.AddEditVhost.host": "Host",
447458
"GatewayEnvironments.AddEditVhost.host.gateway.access.url": "Gateway Access URLs",
@@ -457,6 +468,9 @@
457468
"GatewayEnvironments.AddEditVhost.httpsPort": "HTTPS Port",
458469
"GatewayEnvironments.AddEditVhost.wsPort": "WS Port",
459470
"GatewayEnvironments.AddEditVhost.wssPort": "WSS Port",
471+
"Gateways.AddEditGateway.title.edit": "Gateway Environment - Edit",
472+
"Gateways.AddEditGateway.title.new": "Gateway Environment - Create new",
473+
"Gateways.ListGatewayEnvironments.addNewGatewayEnvironment": "Add Gateway Environment",
460474
"Governance.Overview.APICompliance.PolicyAdherence.column.policy": "Policy",
461475
"Governance.Overview.APICompliance.PolicyAdherence.column.rulesets": "Rulesets",
462476
"Governance.Overview.APICompliance.PolicyAdherence.column.status": "Status",

‎portals/admin/src/main/webapp/source/src/app/components/Base/RouteMenuMapping.jsx‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import SubscriptionThrottlingPolicies from 'AppComponents/Throttling/Subscriptio
3030
import APICategories from 'AppComponents/APICategories/ListApiCategories';
3131
import BlacklistThrottlingPolicies from 'AppComponents/Throttling/Blacklist/List';
3232
import ListApplications from 'AppComponents/ApplicationSettings/ListApplications';
33-
import GatewayEnvironments from 'AppComponents/GatewayEnvironments/ListGWEnviornments';
33+
import GatewayEnvironments from 'AppComponents/GatewayEnvironments';
3434
import AdvancedThrottlePolicies from 'AppComponents/Throttling/Advanced';
3535
import CustomThrottlingPolicies from 'AppComponents/Throttling/Custom';
3636
import TenantTheme from 'AppComponents/TenantTheme/UploadTheme';
@@ -205,6 +205,24 @@ const RouteMenuMapping = (intl) => [
205205
path: '/settings/environments',
206206
component: GatewayEnvironments,
207207
icon: <GamesIcon />,
208+
addEditPageDetails: [
209+
{
210+
id: 'Add Gateway Environment',
211+
displayText: intl.formatMessage({
212+
id: 'Base.RouteMenuMapping.gateways.items.Adding',
213+
defaultMessage: 'Gateway Environment',
214+
}),
215+
path: '/settings/gateways/create',
216+
},
217+
{
218+
id: 'Edit Gateway Environment',
219+
displayText: intl.formatMessage({
220+
id: 'Base.RouteMenuMapping.gateways.items.Editing',
221+
defaultMessage: 'Edit Gateway Environment',
222+
}),
223+
path: '/settings/gateways/(.*?)$',
224+
},
225+
],
208226
},
209227
{
210228
id: 'API Categories',

0 commit comments

Comments
 (0)