Merge branch 'material-ui-bump-devPortal-9' of https://github.com/thi…

…saltennakoon/apim-apps into material-ui-bump-devPortal-9

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt.ui</groupId>
     <artifactId>apim.ui.apps</artifactId>
     <packaging>pom</packaging>
-    <version>9.0.498-SNAPSHOT</version>
+    <version>9.0.502-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 
@@ -63,6 +63,16 @@
                 <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
                 <version>${carbon.apimgt.imp.pkg.version.range}</version>
                 <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.ops4j.pax.logging</groupId>
+                        <artifactId>pax-logging-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.ops4j.pax.logging</groupId>
+                        <artifactId>pax-logging-log4j2</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
             <dependency>

portals/admin/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.0.498-SNAPSHOT</version>
+        <version>9.0.502-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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

@@ -9,6 +9,7 @@
   "Admin.KeyManager.label.allow.exchange.token": "Token Exchange",
   "Admin.KeyManager.label.message.allow.direct.token": "Direct Token",
   "Admin.KeyManager.label.token.audience": "Allowed Token Audience ",
+  "Admin.KeyManager.permission.type": "Key Manager Permission",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.name": "Name",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.quota": "Quota",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.quota.policy": "Quota Policy",
@@ -64,6 +65,10 @@
   "AdminPages.ApiCategories.table.header.category.description": "Description",
   "AdminPages.ApiCategories.table.header.category.name": "Category Name",
   "AdminPages.ApiCategories.table.header.category.number.of.apis": "Number of APIs",
+  "AdminPages.ApiSettings.EditApi.form.edit.error": "API provider should not be empty.",
+  "AdminPages.ApiSettings.EditApi.form.edit.other.error": "Given Username is not valid.",
+  "AdminPages.ApiSettings.EditApi.form.edit.successful": "API provider changed successfully",
+  "AdminPages.ApiSettings.EditApi.form.edit.user.notvalid": "Error while updating the provider name.",
   "AdminPages.ApplicationSettings.Edit.form.edit.successful": "Application owner changed successfully",
   "AdminPages.ApplicationSettings.Edit.form.helperText": "Enter a new Owner. Make sure the new owner has logged into the Developer Portal at least once",
   "AdminPages.ApplicationSettings.Edit.form.name": "Application Name",
@@ -77,6 +82,7 @@
   "AdminPages.Gateways.List.title": "Gateway Environments",
   "AdminPages.Gateways.table.header.description": "Description",
   "AdminPages.Gateways.table.header.displayName": "Name",
+  "AdminPages.Gateways.table.header.gatewayType": "Gateway 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 ?",
   "AdminPages.KeyManagers.Delete.form.delete.successful": "KeyManager deleted successfully",
@@ -86,6 +92,15 @@
   "AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.empty": "VHost is empty",
   "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",
+  "Apis.Listing.Listing.apis.search.label": "Search by API",
+  "Apis.Listing.Listing.apis.searching": "Searching",
+  "Apis.Listing.Listing.clear.search": "Clear Search",
+  "Apis.Listing.Listing.empty.message": "No Data to Display",
+  "Apis.Listing.Listing.search.placeholder": "API Name",
+  "Apis.Listing.apiTableHead.name": "Name",
+  "Apis.Listing.apiTableHead.provider": "Provider",
+  "Apis.Listing.apiTableHead.version": "Version",
   "Apis.Shared.AdminRootErrorBoundary.refresh": "Refresh",
   "Apis.Shared.AdminRootErrorBoundary.refresh.or.try.again.message": "You may refresh the page now or try again later",
   "Apis.Shared.AdminRootErrorBoundary.something.went.wrong.while.rendering.button": "Something went wrong while rendering the",
@@ -117,10 +132,11 @@
   "Base.RouteMenuMapping.advanced.throttling.policies.Adding": "Add Advanced Policy",
   "Base.RouteMenuMapping.advanced.throttling.policies.Editing": "Edit Advanced Policy",
   "Base.RouteMenuMapping.api.categories": "API Categories",
+  "Base.RouteMenuMapping.apis": "Change API Provider",
   "Base.RouteMenuMapping.application.creation": "Application Creation",
   "Base.RouteMenuMapping.application.deletion": "Application Deletion",
   "Base.RouteMenuMapping.application.throttling.policies": "Application Policies",
-  "Base.RouteMenuMapping.applications": "Applications",
+  "Base.RouteMenuMapping.applications": "Change Application Owner",
   "Base.RouteMenuMapping.blacklisted.items": "Deny Policies",
   "Base.RouteMenuMapping.custom.throttling.policies": "Custom Policies",
   "Base.RouteMenuMapping.custom.throttling.policies.items.Adding": "Add Custom Policy",
@@ -190,6 +206,7 @@
   "GatewayEnvironments.AddEditVhost.httpsPort": "HTTPS Port",
   "GatewayEnvironments.AddEditVhost.wsPort": "WS Port",
   "GatewayEnvironments.AddEditVhost.wssPort": "WSS Port",
+  "KeyManager.AddEditKeyManager.permissions.add.description": "Permissions for the Key Manager",
   "KeyManager.Claim.Helper.text": "Add Claim Mappings",
   "KeyManager.Connector.Configuration.Helper.text": "Add Key Manager Connector Configurations",
   "KeyManager.KeyValidation.CUSTOM": "CUSTOM",
@@ -199,6 +216,9 @@
   "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.permissions": "Permissions",
   "KeyManagers.AddEditKeyManager.\n                                                                form.scopeManagementEndpoint": "Scope Management Endpoint",
   "KeyManagers.AddEditKeyManager.\n                                                            form.displayRevokeEndpoint": "Display Revoke Endpoint",
   "KeyManagers.AddEditKeyManager.External.KeyManager\n                                        .general.details.description": "Identity Provider vendor and the  token usage mode",

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

@@ -9,10 +9,13 @@
   "Admin.KeyManager.label.allow.exchange.token": "",
   "Admin.KeyManager.label.message.allow.direct.token": "",
   "Admin.KeyManager.label.token.audience": "",
+  "Admin.KeyManager.permission.type": "",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.name": "",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.quota": "",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.quota.policy": "",
   "Admin.Throttling.Advanced.Throttling.policy.table.header.unit.time": "",
+  "Admin.Throttling.Application.AddEdit.burst.control.add.description": "",
+  "Admin.Throttling.Application.Throttling.Policy.add.burst.limits.details": "",
   "Admin.Throttling.Application.Throttling.Policy.add.data.amount.helper.text": "",
   "Admin.Throttling.Application.Throttling.Policy.add.description.helper.text": "",
   "Admin.Throttling.Application.Throttling.Policy.add.general.details": "",
@@ -62,6 +65,9 @@
   "AdminPages.ApiCategories.table.header.category.description": "",
   "AdminPages.ApiCategories.table.header.category.name": "",
   "AdminPages.ApiCategories.table.header.category.number.of.apis": "",
+  "AdminPages.ApiSettings.EditApi.form.edit.successful": "",
+  "AdminPages.ApiSettings.EditApi.form.helperText": "",
+  "AdminPages.ApiSettings.EditApi.form.name": "",
   "AdminPages.ApplicationSettings.Edit.form.edit.successful": "",
   "AdminPages.ApplicationSettings.Edit.form.helperText": "",
   "AdminPages.ApplicationSettings.Edit.form.name": "",
@@ -75,6 +81,7 @@
   "AdminPages.Gateways.List.title": "",
   "AdminPages.Gateways.table.header.description": "",
   "AdminPages.Gateways.table.header.displayName": "",
+  "AdminPages.Gateways.table.header.gatewayType": "",
   "AdminPages.Gateways.table.header.vhosts": "",
   "AdminPages.KeyManager.Delete.form.delete.confirmation.message": "",
   "AdminPages.KeyManagers.Delete.form.delete.successful": "",
@@ -84,6 +91,15 @@
   "AdminPagesGatewayEnvironments.AddEditGWEnvironment.form.environment.vhost.empty": "",
   "Apis.Details.Scopes.CreateScope.roles.help": "",
   "Apis.Details.Scopes.Roles.Invalid": "",
+  "Apis.Listing.Listing.apis.search": "",
+  "Apis.Listing.Listing.apis.search.label": "",
+  "Apis.Listing.Listing.apis.searching": "",
+  "Apis.Listing.Listing.clear.search": "",
+  "Apis.Listing.Listing.empty.message": "",
+  "Apis.Listing.Listing.search.placeholder": "",
+  "Apis.Listing.apiTableHead.actions": "",
+  "Apis.Listing.apiTableHead.name": "",
+  "Apis.Listing.apiTableHead.owner": "",
   "Apis.Shared.AdminRootErrorBoundary.refresh": "",
   "Apis.Shared.AdminRootErrorBoundary.refresh.or.try.again.message": "",
   "Apis.Shared.AdminRootErrorBoundary.something.went.wrong.while.rendering.button": "",
@@ -119,6 +135,7 @@
   "Base.RouteMenuMapping.application.deletion": "",
   "Base.RouteMenuMapping.application.throttling.policies": "",
   "Base.RouteMenuMapping.applications": "",
+  "Base.RouteMenuMapping.apps": "",
   "Base.RouteMenuMapping.blacklisted.items": "",
   "Base.RouteMenuMapping.custom.throttling.policies": "",
   "Base.RouteMenuMapping.custom.throttling.policies.items.Adding": "",
@@ -188,6 +205,7 @@
   "GatewayEnvironments.AddEditVhost.httpsPort": "",
   "GatewayEnvironments.AddEditVhost.wsPort": "",
   "GatewayEnvironments.AddEditVhost.wssPort": "",
+  "KeyManager.AddEditKeyManager.permissions.add.description": "",
   "KeyManager.Claim.Helper.text": "",
   "KeyManager.Connector.Configuration.Helper.text": "",
   "KeyManager.KeyValidation.CUSTOM": "",
@@ -197,6 +215,9 @@
   "KeyManager.add.success": "",
   "KeyManager.add.success.msg": "",
   "KeyManager.edit.success": "",
+  "KeyManager.enter.permission.allowed": "",
+  "KeyManager.enter.permission.denied": "",
+  "KeyManager.permissions": "",
   "KeyManagers.AddEditKeyManager.\n                                                                form.scopeManagementEndpoint": "",
   "KeyManagers.AddEditKeyManager.\n                                                            form.displayRevokeEndpoint": "",
   "KeyManagers.AddEditKeyManager.External.KeyManager\n                                        .general.details.description": "",
@@ -457,6 +478,8 @@
   "Throttling.Advanced.List.help.link.two": "",
   "Throttling.Advanced.List.search.default": "",
   "Throttling.Advanced.List.title.main": "",
+  "Throttling.Application.AddEdit.burst.control.limit": "",
+  "Throttling.Application.AddEdit.form.request.rate": "",
   "Throttling.Application.Policy..List.search.default": "",
   "Throttling.Application.Policy.List.addButtonProps.title": "",
   "Throttling.Application.Policy.List.addButtonProps.triggerButtonText": "",