Fix review comments and fix the build issue

npamudika · Jan 23, 2025 · ee38a5e · ee38a5e
1 parent 5b181f3
commit ee38a5e
Show file tree

Hide file tree

Showing 11 changed files with 998 additions and 392 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "@material-ui/icons": "^4.11.3",
+    "@types/react": "^17.0.83"
+  }
+}
diff --git a/portals/admin/src/main/webapp/package-lock.json b/portals/admin/src/main/webapp/package-lock.json
diff --git a/portals/admin/src/main/webapp/package.json b/portals/admin/src/main/webapp/package.json
@@ -32,8 +32,6 @@
         "@emotion/react": "^11.11.3",
         "@emotion/styled": "^11.11.0",
         "@hapi/joi": "^15.1.1",
-        "@material-ui/core": "^4.12.4",
-        "@material-ui/icons": "^4.11.3",
         "@monaco-editor/react": "^4.6.0",
         "@mui/icons-material": "^5.15.4",
         "@mui/lab": "^5.0.0-alpha.160",
@@ -51,8 +49,6 @@
         "lodash.clonedeep": "^4.5.0",
         "lodash.isempty": "^4.4.0",
         "lodash.sortby": "^4.7.0",
-        "material-ui-chip-input": "^1.1.0",
-        "material-ui-color": "^1.2.0",
         "moment": "^2.29.4",
         "mui-chips-input": "^2.1.3",
         "mui-datatables": "^4.3.0",

diff --git a/portals/admin/src/main/webapp/site/public/locales/en.json b/portals/admin/src/main/webapp/site/public/locales/en.json
@@ -149,6 +149,7 @@
   "AdminPages.Gateways.table.header.description": "Description",
   "AdminPages.Gateways.table.header.displayName": "Name",
   "AdminPages.Gateways.table.header.gatewayType": "Gateway Type",
+  "AdminPages.Gateways.table.header.permission": "Visibility Permission",
   "AdminPages.Gateways.table.header.type": "Type",
   "AdminPages.Gateways.table.header.vhosts": "Virtual Host(s)",
   "AdminPages.KeyManager.Delete.form.delete.confirmation.message": "Are you sure you want to delete this KeyManager ?",
@@ -206,7 +207,6 @@
   "Api.Provider": "Provider",
   "Api.Version": "Version",
   "Apis.Details.Scopes.CreateScope.roles.help": "Enter a valid role and press `Enter`.",
-  "Apis.Details.Scopes.Roles.Invalid": "Invalid Role(s) Found",
   "Apis.Details.Scopes.permission.status.allow": "Allow",
   "Apis.Details.Scopes.permission.status.deny": "Deny",
   "Apis.Details.Scopes.permission.status.none": "None",
@@ -335,8 +335,11 @@
   "Dashboard.tasksWorkflow.noTasks.card.description": "Manage workflow tasks, increase productivity and enhance competitiveness by enabling developers to easily deploy business processes and models.",
   "Dashboard.tasksWorkflow.noTasks.card.title": "All the pending tasks completed",
   "Form.Dialog.Base.cancel.btn": "Cancel",
+  "Gateway.AddEditGWEnvironment.permission.Invalid": "Invalid Role(s) Found",
   "Gateway.AddEditGWEnvironment.permission.allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
   "Gateway.AddEditGWEnvironment.permission.denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
+  "Gateway.AddEditGWEnvironment.permission.help": "Enter a valid role and press `Enter`",
+  "GatewayEnvironments.AddEditGWEnvironment.form.Permission.helper.text": "Permissions for the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.description.help": "Description of the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.description.label": "Description",
   "GatewayEnvironments.AddEditGWEnvironment.form.displayName": "Display Name",
@@ -353,9 +356,11 @@
   "GatewayEnvironments.AddEditGWEnvironment.form.info.edit.successful": "Gateway Environment edited successfully",
   "GatewayEnvironments.AddEditGWEnvironment.form.name": "Name",
   "GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment",
-  "GatewayEnvironments.AddEditGWEnvironment.form.permission.type": "Gateway Environment Permission",
-  "GatewayEnvironments.AddEditGWEnvironment.form.permissions": "Permissions",
-  "GatewayEnvironments.AddEditGWEnvironment.form.permissions.add.description": "Permissions for the Gateway Environment",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.allow.option": "Allow for role(s)",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.deny.option": "Deny for role(s)",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.public.option": "Public",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permissions": "Permission",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permissions.select": "Permission",
   "GatewayEnvironments.AddEditGWEnvironment.form.save.button.label": "Save",
   "GatewayEnvironments.AddEditGWEnvironment.form.type.helper.text": "Supported Key Type of the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.type.hybrid.option": "Hybrid",

diff --git a/portals/admin/src/main/webapp/site/public/locales/fr.json b/portals/admin/src/main/webapp/site/public/locales/fr.json
@@ -149,6 +149,7 @@
   "AdminPages.Gateways.table.header.description": "Description",
   "AdminPages.Gateways.table.header.displayName": "Name",
   "AdminPages.Gateways.table.header.gatewayType": "Gateway Type",
+  "AdminPages.Gateways.table.header.permission": "Visibility Permission",
   "AdminPages.Gateways.table.header.type": "Type",
   "AdminPages.Gateways.table.header.vhosts": "Virtual Host(s)",
   "AdminPages.KeyManager.Delete.form.delete.confirmation.message": "Are you sure you want to delete this KeyManager ?",
@@ -334,6 +335,11 @@
   "Dashboard.tasksWorkflow.noTasks.card.description": "Manage workflow tasks, increase productivity and enhance competitiveness by enabling developers to easily deploy business processes and models.",
   "Dashboard.tasksWorkflow.noTasks.card.title": "All the pending tasks completed",
   "Form.Dialog.Base.cancel.btn": "Cancel",
+  "Gateway.AddEditGWEnvironment.permission.Invalid": "Invalid Role(s) Found",
+  "Gateway.AddEditGWEnvironment.permission.allowed": "Use of this Gateway Environment is \"Allowed\" for above roles.",
+  "Gateway.AddEditGWEnvironment.permission.denied": "Use of this Gateway Environment is \"Denied\" for above roles.",
+  "Gateway.AddEditGWEnvironment.permission.help": "Enter a valid role and press `Enter`",
+  "GatewayEnvironments.AddEditGWEnvironment.form.Permission.helper.text": "Permissions for the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.description.help": "Description of the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.description.label": "Description",
   "GatewayEnvironments.AddEditGWEnvironment.form.displayName": "Display Name",
@@ -350,6 +356,11 @@
   "GatewayEnvironments.AddEditGWEnvironment.form.info.edit.successful": "Gateway Environment edited successfully",
   "GatewayEnvironments.AddEditGWEnvironment.form.name": "Name",
   "GatewayEnvironments.AddEditGWEnvironment.form.name.help": "Name of the Gateway Environment",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.allow.option": "Allow for role(s)",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.deny.option": "Deny for role(s)",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permission.public.option": "Public",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permissions": "Permission",
+  "GatewayEnvironments.AddEditGWEnvironment.form.permissions.select": "Permission",
   "GatewayEnvironments.AddEditGWEnvironment.form.save.button.label": "Save",
   "GatewayEnvironments.AddEditGWEnvironment.form.type.helper.text": "Supported Key Type of the Gateway Environment",
   "GatewayEnvironments.AddEditGWEnvironment.form.type.hybrid.option": "Hybrid",

diff --git a/...in/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditGWEnvironment.jsx b/...in/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditGWEnvironment.jsx
@@ -38,9 +38,9 @@ import FormControlLabel from '@mui/material/FormControlLabel';
 import FormHelperText from '@mui/material/FormHelperText';
 import FormLabel from '@mui/material/FormLabel';
 import { MuiChipsInput } from 'mui-chips-input';
-import Error from '@material-ui/icons/Error';
-import InputAdornment from '@material-ui/core/InputAdornment';
-import { red } from '@material-ui/core/colors/';
+import Error from '@mui/icons-material/Error';
+import InputAdornment from '@mui/material/InputAdornment';
+import { red } from '@mui/material/colors/';
 import AddEditVhost from 'AppComponents/GatewayEnvironments/AddEditVhost';
 
 const styles = {

diff --git a/...dmin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx b/...dmin/src/main/webapp/source/src/app/components/GatewayEnvironments/ListGWEnviornments.jsx
@@ -122,7 +122,7 @@ export default function ListGWEnviornments() {
                 name: 'permissions',
                 label: intl.formatMessage({
                     id: 'AdminPages.Gateways.table.header.permission',
-                    defaultMessage: 'Permission',
+                    defaultMessage: 'Visibility Permission',
                 }),
                 options: {
                     sort: false,
@@ -199,7 +199,7 @@ export default function ListGWEnviornments() {
                 name: 'permissions',
                 label: intl.formatMessage({
                     id: 'AdminPages.Gateways.table.header.permission',
-                    defaultMessage: 'Permission',
+                    defaultMessage: 'Visibility Permission',
                 }),
                 options: {
                     sort: false,

diff --git a/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/Permission.jsx b/portals/admin/src/main/webapp/source/src/app/components/GatewayEnvironments/Permission.jsx
@@ -51,7 +51,7 @@ export default function SimplePopper(props) {
                 {type}
             </Button>
             <Popper id={id} open={open} anchorEl={anchorEl}>
-                <Box sx={{ 
+                <Box sx={{
                     fontFamily: 'sans-serif',
                     border: 'lightgray 1px solid',
                     p: 1,

diff --git a/portals/publisher/src/main/webapp/site/public/locales/en.json b/portals/publisher/src/main/webapp/site/public/locales/en.json
@@ -947,7 +947,7 @@
   "Apis.Details.Environments.Environments.status.not.deployed": "No Revision Deployed",
   "Apis.Details.Environments.Environments.undeploy.btn": "Undeploy",
   "Apis.Details.Environments.Environments.visibility.in.devportal": "Gateway URL Visibility",
-  "Apis.Details.Environments.Environments.visibility.permission": "Gateway Visibility Permission",
+  "Apis.Details.Environments.Environments.visibility.permission": "Visibility Permission",
   "Apis.Details.Environments.deploy.api.gateways.text": "API Gateways",
   "Apis.Details.Environments.deploy.env.text": "Deploy API to the Gateway Environment",
   "Apis.Details.Environments.deploy.text": "Deploy the API",

diff --git a/...sher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx b/...sher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
@@ -2803,7 +2803,7 @@ export default function Environments() {
                                     <TableCell>
                                         <FormattedMessage
                                             id='Apis.Details.Environments.Environments.visibility.permission'
-                                            defaultMessage='Gateway Visibility Permission'
+                                            defaultMessage='Visibility Permission'
                                         />
                                     </TableCell>
                                 </TableRow>