Merge pull request #719 from shilmyhasan/main-subapprovalnew

Add Subscription approval capability to Publisher portal

portals/publisher/src/main/webapp/WEB-INF/web.xml

@@ -123,6 +123,7 @@
  <servlet-mapping>
  <servlet-name>index</servlet-name>
  <url-pattern>/apis/*</url-pattern>
+ <url-pattern>/subscription/*</url-pattern>
  <url-pattern>/scopes/*</url-pattern>
  <url-pattern>/settings/*</url-pattern>
  <url-pattern>/policies/*</url-pattern>

portals/publisher/src/main/webapp/site/public/conf/settings.json

@@ -36,6 +36,9 @@
  "decodeEntries": true,
  "tagsNotAllowed": []
  },
+ "workflows": {
+ "limit": 30
+ },
  "loadDefaultLocales": false,
  "supportedDocTypes": "application/vnd.openxmlformats-officedocument.wordprocessingml.document, application/msword, application/pdf, text/plain, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.oasis.opendocument.text, application/vnd.oasis.opendocument.spreadsheet, application/json, application/x-yaml, .yaml, .md"
  },

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

@@ -307,6 +307,9 @@
  "Apis.Details.Configuration.components.AdvertiseInfo.originalDevPortalUrl.error": "Invalid Original Developer Portal URL",
  "Apis.Details.Configuration.components.AdvertiseInfo.originalDevPortalUrl.help": "This is the original developer portal of the advertised API",
  "Apis.Details.Configuration.components.AdvertiseInfo.tooltip": "Indicates if an API is a third party API. You can use third party APIs to expose an externally published API through API Manager.",
+ "Apis.Details.Configuration.components.Audience.Validation.Title": "Audience Validation",
+ "Apis.Details.Configuration.components.Audience.Validation.helper": "Press `Enter` after typing the audience value, to add a new audience",
+ "Apis.Details.Configuration.components.Audience.Validation.values": "Allowed Audience",
  "Apis.Details.Configuration.components.CORSConfiguration.allow.\n headers": "Access Control Allow Headers",
  "Apis.Details.Configuration.components.CORSConfiguration.allow.\n methods": "Access Control Allow Methods",
  "Apis.Details.Configuration.components.CORSConfiguration.allow.\n origins": "Access Control Allow Origins",
@@ -1273,6 +1276,7 @@
  "Base.Header.headersearch.HeaderSearch.tooltip.option6": "Description [ Syntax - description:xxxx ]",
  "Base.Header.headersearch.HeaderSearch.tooltip.title": "Search Options for APIs and APIProducts",
  "Base.Header.navbar.GlobalNavBar.Service.Catalog": "Services",
+ "Base.Header.navbar.GlobalNavBar.Tasks": "Tasks",
  "Base.Header.navbar.GlobalNavBar.analytics": "Analytics",
  "Base.Header.navbar.GlobalNavBar.api.products": "API Products",
  "Base.Header.navbar.GlobalNavBar.apis": "APIs",
@@ -1302,6 +1306,11 @@
  "LoginDenied.logout": "Logout",
  "LoginDenied.message": "The server could not verify that you are authorized to access the requested resource.",
  "LoginDenied.title": "Error 403 : Forbidden",
+ "Publisher.Addons.InlineProgress.message": "Loading...",
+ "Publisher.Addons.InputListBase.textfield.remove.label": "Remove",
+ "Publisher.Addons.ListBase.noDataError": "Error while retrieving data.",
+ "Publisher.Addons.ListBase.nodata.message": "No items yet",
+ "Publisher.Addons.ListBase.reload": "Reload",
  "Scopes.Create.CreateScope.cancel": "Cancel",
  "Scopes.Create.CreateScope.create.new.scope": "Create New Scope",
  "Scopes.Create.CreateScope.heading.scope.heading": "Scopes",
@@ -1350,6 +1359,7 @@
  "Scopes.Usage.Usage.scope.usage": "Usage",
  "Scopes.Usage.Usage.usage": "Usages of",
  "Scopes.Usage.Usage.usage.cancel": "Cancel",
+ "Scopes.Usage.UsageView.resource.revision": "Revision",
  "Scopes.Usage.UsageView.resource.target": "Target",
  "Scopes.Usage.UsageView.resource.usage": "List of Resources",
  "Scopes.Usage.UsageView.resource.verb": "Verb",
@@ -1428,9 +1438,47 @@
  "ServiceCatalog.ServicesTableView.ServicesTableView.service.url": "Service URL",
  "ServiceCatalog.ServicesTableView.ServicesTableView.usage": "Number of Usages",
  "ServiceCatalog.ServicesTableView.ServicesTableView.version": "Version",
+ "SubscriptionApproval.Addons.ListBase.reload": "Reload",
+ "SubscriptionAproval.Addons.ListBase.nodata.message": "No items yet",
+ "Task.SubscriptionCreation.table.button.reject": "Reject",
+ "Task.SubscriptionUpdate.table.button.reject": "Reject",
  "UnexpectedError.logout": "Logout",
  "UnexpectedError.message": "Error occurred due to invalid request",
  "UnexpectedError.title": "Internal Server Error",
+ "Workflow.ApplicationCreation.updateStatus.has.errors": "Unable to complete subscription creation approve/reject process.",
+ "Workflow.SubscriptionCreation.List.empty.content.subscriptioncreations": "There are no pending workflow requests for subscription creation.",
+ "Workflow.SubscriptionCreation.List.empty.title.subscriptioncreations": "Subscription Creation",
+ "Workflow.SubscriptionCreation.ListBase.nodata.message": "No items yet",
+ "Workflow.SubscriptionCreation.Reject.Title": "Reject",
+ "Workflow.SubscriptionCreation.Reject.button.cancel": "Cancel",
+ "Workflow.SubscriptionCreation.Reject.button.delete": "Reject",
+ "Workflow.SubscriptionCreation.Reject.text.description": "Are you sure, you want to reject this subscription ?",
+ "Workflow.SubscriptionCreation.apicall.has.errors": "Unable to get workflow pending requests for Subscription Creation",
+ "Workflow.SubscriptionCreation.help.link.one": "Create a subscription creation request",
+ "Workflow.SubscriptionCreation.permission.denied.content": "You dont have enough permission to view Subscription Creation - Approval Tasks. Please contact the site administrator.",
+ "Workflow.SubscriptionCreation.permission.denied.title": "Permission Denied",
+ "Workflow.SubscriptionCreation.search.default": "Search by API, Application or Subscriber",
+ "Workflow.SubscriptionCreation.table.button.approve": "Approve",
+ "Workflow.SubscriptionCreation.table.header.API": "API",
+ "Workflow.SubscriptionCreation.table.header.Action": "Action",
+ "Workflow.SubscriptionCreation.table.header.Application": "Application",
+ "Workflow.SubscriptionCreation.table.header.Description": "Description",
+ "Workflow.SubscriptionCreation.table.header.Subscriber": "Subscriber",
+ "Workflow.SubscriptionCreation.table.header.Tier": "Tier",
+ "Workflow.SubscriptionCreation.title.subscriptioncreation": "Subscription Creation - Approval Tasks",
+ "Workflow.SubscriptionCreation.update.success": "Workflow status is updated successfully",
+ "Workflow.SubscriptionUpdate.List.empty.content.subscriptioncreations": "There are no pending workflow requests for subscription update",
+ "Workflow.SubscriptionUpdate.List.empty.title.subscriptionupdate": "Subscription update",
+ "Workflow.SubscriptionUpdate.Reject.Title": "Reject",
+ "Workflow.SubscriptionUpdate.Reject.button.cancel": "Cancel",
+ "Workflow.SubscriptionUpdate.Reject.button.delete": "Reject",
+ "Workflow.SubscriptionUpdate.Reject.text.description": "Are you sure, you want to reject this subscription update?",
+ "Workflow.SubscriptionUpdate.apicall.has.errors": "Unable to get workflow pending requests for Subscription Update",
+ "Workflow.SubscriptionUpdate.help.link.one": "Create a subscription update request",
+ "Workflow.SubscriptionUpdate.permission.denied.content": "You dont have enough permission to view Subscription Update - Approval Tasks. Please contact the site administrator.",
+ "Workflow.SubscriptionUpdate.permission.denied.title": "Permission Denied",
+ "Workflow.SubscriptionUpdate.title.subscriptionupdate": "Subscription Update - Approval Tasks",
+ "Workflow.SubscriptionUpdate.updateStatus.has.errors": "Unable to complete subscription update approve/reject process.",
  "api.console.security.heading": "Security",
  "app.components.Shared.Banner.back": "Back",
  "block.all": "Block All",
@@ -1453,4 +1501,4 @@
  "upload.image": "Click or drag the image to upload.",
  "upload.image.size.error": "Uploaded File is too large. Maximum file size limit to 1MB",
  "upload.image.size.info": "Maximum file size limit to 1MB"
-}
+}