@@ -496,9 +501,10 @@ function AddEditGWEnvironment(props) {
/>
}
+ disabled={editMode}
label={(
APK Gateway
@@ -514,10 +520,32 @@ function AddEditGWEnvironment(props) {
)}
+
+ Type
+
+ Supported Key Type of the Gateway Environment
+
diff --git a/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditVhost.jsx b/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditVhost.jsx
index 6d351f8035e..165875797be 100644
--- a/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditVhost.jsx
+++ b/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditVhost.jsx
@@ -53,7 +53,7 @@ const useStyles = makeStyles((theme) => ({
function AddEditVhost(props) {
const intl = useIntl();
- const { onVhostChange, initialVhosts, selectedGatewayType } = props;
+ const { onVhostChange, initialVhosts, gatewayType } = props;
const classes = useStyles();
const [userVhosts, setUserVhosts] = useState(initialVhosts);
@@ -225,7 +225,7 @@ function AddEditVhost(props) {
https://${vhost.host || '
'}:${vhost.httpsPort}/${vhost.httpContext}`
}
- {selectedGatewayType === 'Regular' && (
+ {gatewayType === 'Regular' && (
`ws://${vhost.host || ''}:${vhost.wsPort}/ |
wss://${vhost.host || ''}:${vhost.wssPort}/`
)}
@@ -292,7 +292,7 @@ function AddEditVhost(props) {
{/* WS Ports */}
- {selectedGatewayType === 'Regular' && (
+ {gatewayType === 'Regular' && (
@@ -362,7 +362,7 @@ AddEditVhost.defaultProps = {
AddEditVhost.propTypes = {
onVhostChange: PropTypes.func.isRequired,
- selectedGatewayType: PropTypes.string.isRequired,
+ gatewayType: PropTypes.string.isRequired,
initialVhosts: PropTypes.arrayOf(PropTypes.shape({
host: PropTypes.string.isRequired,
httpContext: PropTypes.string,
diff --git a/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx b/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx
index cf87e2c466e..3ccc2754339 100644
--- a/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx
+++ b/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx
@@ -24,6 +24,7 @@ import ListBase from 'AppComponents/AdminPages/Addons/ListBase';
import Delete from 'AppComponents/GatewayEnvironments/DeleteGWEnvironment';
import AddEdit from 'AppComponents/GatewayEnvironments/AddEditGWEnvironment';
import EditIcon from '@material-ui/icons/Edit';
+import { useAppContext } from 'AppComponents/Shared/AppContext';
/**
* API call to get Gateway labels
@@ -47,62 +48,134 @@ function apiCall() {
*/
export default function ListGWEnviornments() {
const intl = useIntl();
- const columProps = [
- { name: 'id', options: { display: false } },
- { name: 'name', options: { display: false } },
- {
- name: 'displayName',
- label: intl.formatMessage({
- id: 'AdminPages.Gateways.table.header.displayName',
- defaultMessage: 'Name',
- }),
- options: {
- sort: true,
+ let columProps;
+ const { settings } = useAppContext();
+ const isGatewayTypeAvailable = settings.gatewayTypes.length === 2;
+ if (isGatewayTypeAvailable) {
+ columProps = [
+ { name: 'id', options: { display: false } },
+ { name: 'name', options: { display: false } },
+ {
+ name: 'displayName',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.displayName',
+ defaultMessage: 'Name',
+ }),
+ options: {
+ sort: true,
+ },
+ },
+ {
+ name: 'gatewayType',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.gatewayType',
+ defaultMessage: 'Gateway Type',
+ }),
+ options: {
+ sort: false,
+ },
},
- },
- {
- name: 'gatewayType',
- label: intl.formatMessage({
- id: 'AdminPages.Gateways.table.header.gatewayType',
- defaultMessage: 'Gateway Type',
- }),
- options: {
- sort: false,
+ {
+ name: 'type',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.type',
+ defaultMessage: 'Type',
+ }),
+ options: {
+ sort: false,
+ },
},
- },
- {
- name: 'description',
- label: intl.formatMessage({
- id: 'AdminPages.Gateways.table.header.description',
- defaultMessage: 'Description',
- }),
- options: {
- sort: false,
+ {
+ name: 'description',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.description',
+ defaultMessage: 'Description',
+ }),
+ options: {
+ sort: false,
+ },
+ },
+ {
+ name: 'vhosts',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.vhosts',
+ defaultMessage: 'Virtual Host(s)',
+ }),
+ options: {
+ sort: false,
+ customBodyRender: (vhosts) => {
+ return (
+ vhosts.map((vhost) => (
+
+ {
+ 'https://' + vhost.host + (vhost.httpsPort === 443 ? '' : ':' + vhost.httpsPort)
+ + (vhost.httpContext ? '/' + vhost.httpContext.replace(/^\//g, '') : '')
+ }
+
+ ))
+ );
+ },
+ },
+ },
+ ];
+ } else {
+ columProps = [
+ { name: 'id', options: { display: false } },
+ { name: 'name', options: { display: false } },
+ {
+ name: 'displayName',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.displayName',
+ defaultMessage: 'Name',
+ }),
+ options: {
+ sort: true,
+ },
+ },
+ {
+ name: 'type',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.type',
+ defaultMessage: 'Type',
+ }),
+ options: {
+ sort: false,
+ },
+ },
+ {
+ name: 'description',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.description',
+ defaultMessage: 'Description',
+ }),
+ options: {
+ sort: false,
+ },
},
- },
- {
- name: 'vhosts',
- label: intl.formatMessage({
- id: 'AdminPages.Gateways.table.header.vhosts',
- defaultMessage: 'Virtual Host(s)',
- }),
- options: {
- sort: false,
- customBodyRender: (vhosts) => {
- return (
- vhosts.map((vhost) => (
-
- {
- 'https://' + vhost.host + (vhost.httpsPort === 443 ? '' : ':' + vhost.httpsPort)
- + (vhost.httpContext ? '/' + vhost.httpContext.replace(/^\//g, '') : '')
- }
-
- ))
- );
+ {
+ name: 'vhosts',
+ label: intl.formatMessage({
+ id: 'AdminPages.Gateways.table.header.vhosts',
+ defaultMessage: 'Virtual Host(s)',
+ }),
+ options: {
+ sort: false,
+ customBodyRender: (vhosts) => {
+ return (
+ vhosts.map((vhost) => (
+
+ {
+ 'https://' + vhost.host + (vhost.httpsPort === 443 ? '' : ':' + vhost.httpsPort)
+ + (vhost.httpContext ? '/' + vhost.httpContext.replace(/^\//g, '') : '')
+ }
+
+ ))
+ );
+ },
},
},
- },
- ];
+ ];
+ }
const addButtonProps = {
triggerButtonText: intl.formatMessage({
id: 'AdminPages.Gateways.List.addButtonProps.triggerButtonText',
diff --git a/portals/admin/src/main/webapp/source/src/app/data/api.js b/portals/admin/src/main/webapp/source/src/app/data/api.js
index 5b49829dc39..9d6a50022d4 100644
--- a/portals/admin/src/main/webapp/source/src/app/data/api.js
+++ b/portals/admin/src/main/webapp/source/src/app/data/api.js
@@ -471,9 +471,9 @@ class API extends Resource {
/**
* Add a Gateway Environment
*/
- addGatewayEnvironment(name, displayName, description, gatewayType, vhosts, provider="wso2", callback = null) {
+ addGatewayEnvironment(name, displayName, type, description, gatewayType, vhosts, provider="wso2", callback = null) {
return this.client.then((client) => {
- const data = { name, displayName, description, gatewayType, vhosts, provider };
+ const data = { name, displayName, type, description, gatewayType, vhosts, provider };
const payload = {
'Content-Type': 'application/json',
};
@@ -488,9 +488,9 @@ class API extends Resource {
/**
* Update a Gateway Environment
*/
- updateGatewayEnvironment(id, name, displayName, description, gatewayType, vhosts, callback = null) {
+ updateGatewayEnvironment(id, name, displayName, type, description, gatewayType, vhosts, callback = null) {
return this.client.then((client) => {
- const data = { name, displayName, description, gatewayType, vhosts };
+ const data = { name, displayName, type, description, gatewayType, vhosts };
return client.apis['Environments'].put_environments__environmentId_(
{ environmentId: id },
{ requestBody: data },