diff --git a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/en.json b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/en.json index 74990b581175..afd847657206 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/en.json +++ b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/en.json @@ -382,7 +382,6 @@ "Throttling.Advanced.List.help.link.two": "Adding a new advanced throttling policy", "Throttling.Advanced.List.search.default": "Search by policy name", "Throttling.Advanced.List.title.main": "Advanced Throttling Policies", - "Throttling.Advanced.AddEdit.form.name": "Name", "Throttling.Application.Policy..List.search.default": "Search by Application Policy name", "Throttling.Application.Policy.List.addButtonProps.title": "Add Policy", "Throttling.Application.Policy.List.addButtonProps.triggerButtonText": "Add Policy", @@ -435,19 +434,29 @@ "Throttling.Custom.Policy.policy.name.invalid.character": "Name contains one or more illegal characters", "Throttling.Custom.Policy.policy.name.space": "Name contains spaces", "Throttling.Custom.Policy.search.default": "Custom Rate Limiting Policies", + "Throttling.Subscription.AddEdit.burst.control.add.description": "Define Burst Control Limits for the subscription policy. This is optional.", "Throttling.Subscription.AddEdit.burst.control.limit": "Number of requests for burst control", "Throttling.Subscription.AddEdit.burst.control.limits": "Burst Control (Rate Limiting)", + "Throttling.Subscription.AddEdit.custom.attributes.add.description": "Define custom attributes for the subscription policy.", "Throttling.Subscription.AddEdit.form.add": "Save", "Throttling.Subscription.AddEdit.form.cancel": "Cancel", "Throttling.Subscription.AddEdit.form.dataAmount.name": "Data Bandwidth", "Throttling.Subscription.AddEdit.form.description": "Description", "Throttling.Subscription.AddEdit.form.description.help": "Description of the rate limiting policy", + "Throttling.Subscription.AddEdit.form.max.complexity": "Max Complexity", + "Throttling.Subscription.AddEdit.form.max.depth": "Max Depth", "Throttling.Subscription.AddEdit.form.name.help": "Name of the rate limiting policy", "Throttling.Subscription.AddEdit.form.policyName": "Name", "Throttling.Subscription.AddEdit.form.request.rate": "Request Rate", "Throttling.Subscription.AddEdit.form.requestCount.count": "Request Count", + "Throttling.Subscription.AddEdit.form.roles": "Roles", "Throttling.Subscription.AddEdit.general.details": "General Details", + "Throttling.Subscription.AddEdit.general.details.description": "Provide the name and description of the subscription policy.", + "Throttling.Subscription.AddEdit.graphql.add.description": "Provide the Maximum Complexity and Maximum depth values for GraphQL APIs using this policy.", + "Throttling.Subscription.AddEdit.permissions.add.description": "Define the permissions for the subscription policy.", + "Throttling.Subscription.AddEdit.policy.flags.add.description": "Define the billing plan for the subscription policy. Enable stop on quota reach to block invoking an API when the defined quota is reached.", "Throttling.Subscription.AddEdit.quota.limits": "Quota Limits", + "Throttling.Subscription.AddEdit.quota.policies.add.description": "Request Count and Request Bandwidth are the two options for Quota Limit. You can use the option according to your requirement.", "Throttling.Subscription.AddEdit.title.main": "Subscription Rate Limiting Policy", "Throttling.Subscription.AddEdit.unitTime": "Unit Time", "Throttling.Subscription.Billing.Plan": "Billing Plan", @@ -472,7 +481,7 @@ "Throttling.Subscription.Policy.policy.request.count.empty.error.msg": "Request Count is Empty", "Throttling.Subscription.Policy.policy.unit.time.empty.error.msg": "Unit Time is Empty", "Throttling.Subscription.Policy.search.default": "Subscription Rate Limiting Policies", - "Throttling.Subscription.Properties.Properties.show.add.property.property.name": "Name", + "Throttling.Subscription.Properties.Properties.\n show.add.property.property.name": "Name", "Throttling.Subscription.Properties.property.value": "Value", "Throttling.Subscription.attribute.delete.tooltip": "Delete", "Throttling.Subscription.billing.cycle": "Billing Cycle", @@ -484,12 +493,9 @@ "Throttling.Subscription.enter.permission.allowed": "This policy is \"Allowed\" for above roles.", "Throttling.Subscription.enter.permission.denied": "This policy is \"Denied\" for above roles.", "Throttling.Subscription.fixed.rate.tooltip": "Fixed rate for the given billing cycle", - "Throttling.Subscription.max.complexity": "Max Complexity", - "Throttling.Subscription.max.depth": "Max Depth", "Throttling.Subscription.monetization.plan": "Monetization Plan", "Throttling.Subscription.monetization.plan.tooltip": "Monetization category type", "Throttling.Subscription.permissions": "Permissions", - "Throttling.Subscription.roles": "Roles", "Throttling.Subscription.stop.quota.reach": "Stop On Quota Reach", "Throttling.Subsription.Policy.List.empty.content.subscription.policies": "Subscription-level throttling policies are applicable per access token generated for an application.", "UnexpectedError.logout": "Logout", diff --git a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/fr.json b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/fr.json index 3282ecdd7014..f8a7531577af 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/fr.json +++ b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/site/public/locales/fr.json @@ -382,7 +382,6 @@ "Throttling.Advanced.List.help.link.two": "", "Throttling.Advanced.List.search.default": "", "Throttling.Advanced.List.title.main": "", - "Throttling.Advanced.AddEdit.form.name": "", "Throttling.Application.Policy..List.search.default": "", "Throttling.Application.Policy.List.addButtonProps.title": "", "Throttling.Application.Policy.List.addButtonProps.triggerButtonText": "", @@ -435,19 +434,29 @@ "Throttling.Custom.Policy.policy.name.invalid.character": "", "Throttling.Custom.Policy.policy.name.space": "", "Throttling.Custom.Policy.search.default": "", + "Throttling.Subscription.AddEdit.burst.control.add.description": "", "Throttling.Subscription.AddEdit.burst.control.limit": "", "Throttling.Subscription.AddEdit.burst.control.limits": "", + "Throttling.Subscription.AddEdit.custom.attributes.add.description": "", "Throttling.Subscription.AddEdit.form.add": "", "Throttling.Subscription.AddEdit.form.cancel": "", "Throttling.Subscription.AddEdit.form.dataAmount.name": "", "Throttling.Subscription.AddEdit.form.description": "", "Throttling.Subscription.AddEdit.form.description.help": "", + "Throttling.Subscription.AddEdit.form.max.complexity": "", + "Throttling.Subscription.AddEdit.form.max.depth": "", "Throttling.Subscription.AddEdit.form.name.help": "", "Throttling.Subscription.AddEdit.form.policyName": "", "Throttling.Subscription.AddEdit.form.request.rate": "", "Throttling.Subscription.AddEdit.form.requestCount.count": "", + "Throttling.Subscription.AddEdit.form.roles": "", "Throttling.Subscription.AddEdit.general.details": "", + "Throttling.Subscription.AddEdit.general.details.description": "", + "Throttling.Subscription.AddEdit.graphql.add.description": "", + "Throttling.Subscription.AddEdit.permissions.add.description": "", + "Throttling.Subscription.AddEdit.policy.flags.add.description": "", "Throttling.Subscription.AddEdit.quota.limits": "", + "Throttling.Subscription.AddEdit.quota.policies.add.description": "", "Throttling.Subscription.AddEdit.title.main": "", "Throttling.Subscription.AddEdit.unitTime": "", "Throttling.Subscription.Billing.Plan": "", @@ -472,7 +481,7 @@ "Throttling.Subscription.Policy.policy.request.count.empty.error.msg": "", "Throttling.Subscription.Policy.policy.unit.time.empty.error.msg": "", "Throttling.Subscription.Policy.search.default": "", - "Throttling.Subscription.Properties.Properties.show.add.property.property.name": "", + "Throttling.Subscription.Properties.Properties.\n show.add.property.property.name": "", "Throttling.Subscription.Properties.property.value": "", "Throttling.Subscription.attribute.delete.tooltip": "", "Throttling.Subscription.billing.cycle": "", @@ -484,12 +493,9 @@ "Throttling.Subscription.enter.permission.allowed": "", "Throttling.Subscription.enter.permission.denied": "", "Throttling.Subscription.fixed.rate.tooltip": "", - "Throttling.Subscription.max.complexity": "", - "Throttling.Subscription.max.depth": "", "Throttling.Subscription.monetization.plan": "", "Throttling.Subscription.monetization.plan.tooltip": "", "Throttling.Subscription.permissions": "", - "Throttling.Subscription.roles": "", "Throttling.Subscription.stop.quota.reach": "", "Throttling.Subsription.Policy.List.empty.content.subscription.policies": "", "UnexpectedError.logout": "", diff --git a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/AddEdit.jsx b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/AddEdit.jsx index 4f713de8cc22..89da2843246f 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/AddEdit.jsx +++ b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/AddEdit.jsx @@ -35,7 +35,7 @@ import FormControl from '@material-ui/core/FormControl'; import MenuItem from '@material-ui/core/MenuItem'; import Select from '@material-ui/core/Select'; import Switch from '@material-ui/core/Switch'; -import HelpOutline from '@material-ui/icons/HelpOutline'; +import HelpOutlinedIcon from '@material-ui/icons/HelpOutlined'; import CircularProgress from '@material-ui/core/CircularProgress'; import DeleteForeverIcon from '@material-ui/icons/DeleteForever'; import Table from '@material-ui/core/Table'; @@ -81,6 +81,9 @@ const useStyles = makeStyles((theme) => ({ buttonIcon: { marginRight: theme.spacing(1), }, + paddingTooltip: { + paddingLeft: 5, + }, })); /** @@ -233,8 +236,8 @@ function AddEdit(props) { permissionStatus: 'allow', }, graphQL: { - maxComplexity: result.body.graphQLMaxComplexity, - maxDepth: result.body.graphQLMaxDepth, + maxComplexity: (result.body.graphQLMaxComplexity === 0) ? '' : result.body.graphQLMaxComplexity, + maxDepth: (result.body.graphQLMaxDepth === 0) ? '' : result.body.graphQLMaxDepth, }, }; dispatch({ field: 'editDetails', value: editState }); @@ -409,8 +412,8 @@ function AddEdit(props) { billingPlan: state.billingPlan, stopOnQuotaReach: state.stopOnQuotaReach, customAttributes, - graphQLMaxComplexity: state.graphQL.maxComplexity, - graphQLMaxDepth: state.graphQL.maxDepth, + graphQLMaxComplexity: (state.graphQL.maxComplexity === '') ? 0 : state.graphQL.maxComplexity, + graphQLMaxDepth: (state.graphQL.maxDepth === '') ? 0 : state.graphQL.maxDepth, monetization: { monetizationPlan: state.monetization.monetizationPlan, properties: { @@ -439,8 +442,8 @@ function AddEdit(props) { billingPlan: state.billingPlan, stopOnQuotaReach: state.stopOnQuotaReach, customAttributes, - graphQLMaxComplexity: state.graphQL.maxComplexity, - graphQLMaxDepth: state.graphQL.maxDepth, + graphQLMaxComplexity: (state.graphQL.maxComplexity === '') ? 0 : state.graphQL.maxComplexity, + graphQLMaxDepth: (state.graphQL.maxDepth === '') ? 0 : state.graphQL.maxDepth, monetization: { monetizationPlan: state.monetization.monetizationPlan, properties: { @@ -518,8 +521,9 @@ function AddEdit(props) { }; const handleAttributeChange = (event) => { + const { id, name, value } = event.target; const tmpCustomAttributes = [...customAttributes]; - tmpCustomAttributes[event.target.id][event.target.name] = event.target.value; + tmpCustomAttributes[id][name] = value; setCustomAttributes(tmpCustomAttributes); }; @@ -535,7 +539,7 @@ function AddEdit(props) { > - + @@ -544,9 +548,17 @@ function AddEdit(props) { defaultMessage='General Details' /> + + + - {/* General Details */} + + {/* General Details */} + - {/* Quota limits */} + + + +
+ + + {/* Quota limits */} + @@ -605,7 +624,19 @@ function AddEdit(props) { defaultMessage='Quota Limits' /> + + + + + + + - {/* Burst Control (Rate Limiting) */} + + + +
+ + + {/* Burst Control (Rate Limiting) */} + @@ -743,8 +781,17 @@ function AddEdit(props) { defaultMessage='Burst Control (Rate Limiting)' /> + + + + + @@ -782,7 +829,14 @@ function AddEdit(props) { - {/* Policy flags */} + + + +
+ + + {/* Policy flags */} + @@ -791,46 +845,58 @@ function AddEdit(props) { defaultMessage='Policy Flags' /> + + + + + + + + - - + } + label='Free' /> - + } + label='Commercial' + /> + - - } - label='Free' - /> - } - label='Commercial' - /> - {billingPlan === 'COMMERCIAL' && (
- - + + + + )} placement='right-end' + className={classes.paddingTooltip} interactive > - + - + @@ -865,11 +932,13 @@ function AddEdit(props) { {monetizationPlan === 'FIXEDRATE' && ( - - + + + + )} placement='right-end' + className={classes.paddingTooltip} interactive > - + - + - - + + + + )} placement='right-end' + className={classes.paddingTooltip} interactive > - + - + - + + + - {/* Custom Attributes */} + + + +
+ + + {/* Custom Attributes */} + @@ -1017,23 +1099,29 @@ function AddEdit(props) { defaultMessage='Custom Attributes' /> + + + - + + + - - - - + + @@ -1047,7 +1135,7 @@ function AddEdit(props) { name='name' label={intl.formatMessage({ id: `Throttling.Subscription.Properties.Properties. - show.add.property.property.name`, + show.add.property.property.name`, defaultMessage: 'Name', })} margin='dense' @@ -1097,7 +1185,14 @@ function AddEdit(props) {
- {/* Permissions */} + + + +
+ + + {/* Permissions */} + @@ -1106,18 +1201,18 @@ function AddEdit(props) { defaultMessage='Permissions' /> + + + + + - - - - - {permissionStatus === 'allow' ? ( + + + )} fullWidth multiline helperText={intl.formatMessage({ @@ -1156,22 +1258,26 @@ function AddEdit(props) { )} - - - - - } label='Allow' /> - } label='Deny' /> - - + + + } label='Allow' /> + } label='Deny' /> + - {/* GraphQL */} + + + +
+ + + {/* GraphQL */} + @@ -1180,18 +1286,19 @@ function AddEdit(props) { defaultMessage='GraphQL' /> + + + + + - - - - - + + + )} fullWidth variant='outlined' /> - - - - - + + + )} fullWidth variant='outlined' /> diff --git a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/List.jsx b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/List.jsx index 8df4d012e0c8..6d6c0784de59 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/List.jsx +++ b/features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/source/src/app/components/Throttling/Subscription/List.jsx @@ -263,10 +263,7 @@ export default function ListSubscriptionThrottlingPolicies() { }); subscriptionThrottlingvalues = subscriptionPolicies - .filter((policy) => policy.policyName !== 'Unlimited') - .map((obj) => { - return Object.values(obj); - }); + .map(Object.values); return (subscriptionThrottlingvalues); }).catch((error) => { const { response } = error;