Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues reported in 4.5.0 beta testing #952

Merged
merged 4 commits into from
Mar 3, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 95 additions & 78 deletions portals/admin/src/main/webapp/site/public/locales/en.json

Large diffs are not rendered by default.

173 changes: 95 additions & 78 deletions portals/admin/src/main/webapp/site/public/locales/fr.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ function AddEditKeyManager(props) {
onChange={onChange}
helperText={intl.formatMessage({
id: 'KeyManagers.AddEditKeyManager.form.authorizeEndpoint.help',
defaultMessage: 'E.g., https://localhost:9443/oauth2/userinfo',
defaultMessage: 'E.g., https://localhost:9443/oauth2/authorize',
})}
/>
<TextField
Expand Down
90 changes: 62 additions & 28 deletions portals/publisher/src/main/webapp/site/public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
"Apis.Create.Default.APICreateDefault.create.publish.btn.creating.revision.status": "Creating Revision . . .",
"Apis.Create.Default.APICreateDefault.create.publish.btn.creating.status": "Creating API . . .",
"Apis.Create.Default.APICreateDefault.error.errorMessage.create.revision": "Something went wrong while creating the API Revision",
"Apis.Create.Default.APICreateDefault.error.errorMessage.create.revision.governance": "Action failed due to governance violations",
"Apis.Create.Default.APICreateDefault.error.errorMessage.deploy.revision": "Something went wrong while deploying the API Revision",
"Apis.Create.Default.APICreateDefault.error.errorMessage.publish": "Something went wrong while publishing the API",
"Apis.Create.Default.APICreateDefault.error.governance.violation": "Deployment failed due to governance violations",
"Apis.Create.Default.APICreateDefault.error.governance.violation": "Failed to publish the API due to governance violations",
"Apis.Create.Default.APICreateDefault.error.governance.violation.download": "Download Violations",
"Apis.Create.Default.APICreateDefault.error.otherStatus": "Error while publishing the API",
"Apis.Create.Default.APICreateDefault.error.policies.not.available": "Throttling policies not available. Contact your administrator",
"Apis.Create.Default.APICreateDefault.error.url.not.valid": "URL is not valid",
Expand Down Expand Up @@ -175,6 +175,8 @@
"Apis.Create.OpenAPI.create.api.url.placeholder": "Enter OpenAPI URL",
"Apis.Create.StreamingAPI.APICreateStreamingAPI.api.heading": "Create a Streaming API",
"Apis.Create.StreamingAPI.APICreateStreamingAPI.api.sub.heading": "Create an API by providing a Name, a Version, a Context and the Endpoint",
"Apis.Create.StreamingAPI.APICreateStreamingAPI.error.governance.violation": "Failed to create the API Revision due to governance violations",
"Apis.Create.StreamingAPI.APICreateStreamingAPI.error.governance.violation.download": "Download Violations",
"Apis.Create.StreamingAPI.APICreateStreamingAPI.websub.api.sub.heading": "Create an API by providing a Name, a Version and a Context",
"Apis.Create.WSDL.ApiCreateWSDL.create.error": "Something went wrong while adding the API",
"Apis.Create.WSDL.ApiCreateWSDL.create.success": "API created successfully",
Expand Down Expand Up @@ -403,13 +405,23 @@
"Apis.Details.Compliance.check.progress": "Compliance Check in Progress",
"Apis.Details.Compliance.check.progress.message": "The compliance check is currently in progress. This may take a few moments.",
"Apis.Details.Compliance.failed": "Failed",
"Apis.Details.Compliance.followed": "Followed ({count})",
"Apis.Details.Compliance.not.applied": "Not Applied ({count})",
"Apis.Details.Compliance.passed": "Passed",
"Apis.Details.Compliance.pending": "Pending ({count})",
"Apis.Details.Compliance.policy.adherence": "Policy Adherence",
"Apis.Details.Compliance.policy.adherence.summary": "Policy Adherence Summary",
"Apis.Details.Compliance.revision.message": "Compliance summary is not available for API revisions. Please navigate to the current API version to view the compliance summary.",
"Apis.Details.Compliance.rule.adherence": "Rule Adherence",
"Apis.Details.Compliance.rules.errors": "Errors ({count})",
"Apis.Details.Compliance.rules.info": "Info ({count})",
"Apis.Details.Compliance.rules.passed": "Passed ({count})",
"Apis.Details.Compliance.rules.warnings": "Warnings ({count})",
"Apis.Details.Compliance.ruleset.adherence": "Ruleset Adherence",
"Apis.Details.Compliance.ruleset.adherence.summary": "Ruleset Adherence Summary",
"Apis.Details.Compliance.topic.header": "Compliance Summary",
"Apis.Details.Compliance.unapplied": "Unapplied",
"Apis.Details.Compliance.violated": "Violated ({count})",
"Apis.Details.Components.SOAP.To.REST.edit.btn": "Edit",
"Apis.Details.Components.SOAP.To.REST.tabs.In.text": "In",
"Apis.Details.Components.SOAP.To.REST.tabs.Out.text": "Out",
Expand Down Expand Up @@ -730,16 +742,31 @@
"Apis.Details.Endpoints.\n GenericEndpoint.config.endpoint": "Endpoint configurations",
"Apis.Details.Endpoints.\n GenericEndpoint.security.endpoint": "Endpoint security",
"Apis.Details.Endpoints..EndpointOverview.change.type.proceed": "Proceed",
"Apis.Details.Endpoints.AIEndpoints.add.new.endpoint": "Add New Endpoint",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.add.success": "Endpoint Added Successfully",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.cancel": "Cancel",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.create.btn": "Create",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.create.new.endpoint": "Add New Endpoint",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.edit.endpoint": "Edit Endpoint",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.edit.success": "Endpoint Updated Successfully",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.duplicate.name": "This endpoint name already exists",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.empty.apiKey": "API Key cannot be empty",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.empty.name": "Endpoint name cannot be empty",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.empty.url": "Endpoint URL cannot be empty",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.invalid.url": "Please enter a valid endpoint URL",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.loading": "Error loading endpoint",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.error.saving": "Error occurred while saving the endpoint. Please try again.",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.form.has.errors": "One or more fields contain errors",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.heading": "Endpoints",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.production": "Production",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.sandbox": "Sandbox",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.saving": "Saving",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.select.endpoint.type": "Select Endpoint Type",
"Apis.Details.Endpoints.AIEndpoints.AddEditAIEndpoint.update.btn": "Update",
"Apis.Details.Endpoints.AIEndpoints.general.config.header": "General Endpoint Configurations",
"Apis.Details.Endpoints.AIEndpoints.primary.endpoints.label": "Primary Endpoints",
"Apis.Details.Endpoints.AIEndpoints.primary.production.endpoint.label": "Primary Production Endpoint",
"Apis.Details.Endpoints.AIEndpoints.primary.sandbox.endpoint.label": "Primary Sandbox Endpoint",
"Apis.Details.Endpoints.AIEndpoints.no.production.endpoints": "No production endpoints configured",
"Apis.Details.Endpoints.AIEndpoints.no.sandbox.endpoints": "No sandbox endpoints configured",
"Apis.Details.Endpoints.AIEndpoints.production.endpoints.label": "Production Endpoints",
"Apis.Details.Endpoints.AIEndpoints.reset.primary.endpoints": "Reset",
"Apis.Details.Endpoints.AIEndpoints.sandbox.endpoints.label": "Sandbox Endpoints",
"Apis.Details.Endpoints.AIEndpoints.save.primary.endpoints": "Save",
"Apis.Details.Endpoints.AIEndpoints.saving.primary.endpoints": "Saving",
"Apis.Details.Endpoints.API.Definition.fetch.error": "Error occurred while fetching API definition",
"Apis.Details.Endpoints.AdvancedConfig.AdvanceEndpointConfig.action": "Action",
"Apis.Details.Endpoints.AdvancedConfig.AdvanceEndpointConfig.cancel.button": "Close",
Expand Down Expand Up @@ -951,7 +978,6 @@
"Apis.Details.Endpoints.Security.api.key.query.param": "Authorization Query Param",
"Apis.Details.Endpoints.Security.api.key.value.placeholder": "Enter API Key",
"Apis.Details.Endpoints.Security.api.key.value.value": "API Key",
"Apis.Details.Endpoints.Security.no.api.key.value.error": "API Key should not be empty",
"Apis.Details.Endpoints.SequenceBackend.AddCertificat": "Add Sequence Backend",
"Apis.Details.Endpoints.SequenceBackend.AddSequence": "Add Sequence Backend",
"Apis.Details.Endpoints.SequenceBackend.delete.cancel.button": "Cancel",
Expand All @@ -961,25 +987,19 @@
"Apis.Details.Endpoints.UploadCustomBackend.click.or.drop.to.upload.file": "Click or drag the sequence backend file to upload.",
"Apis.Details.Endpoints.UploadCustomBackend.config.save.button": "Save",
"Apis.Details.Endpoints.UploadCustomBackend.invalid.file": "Invalid file type",
"Apis.Details.Endpoints.endpoint.add": "Add",
"Apis.Details.Endpoints.add.new.endpoint": "Add New Endpoint",
"Apis.Details.Endpoints.endpoint.advanced.configuration": "Advanced Configurations",
"Apis.Details.Endpoints.endpoint.cancel": "Cancel",
"Apis.Details.Endpoints.endpoint.check.status": "Check endpoint status",
"Apis.Details.Endpoints.endpoint.configurations.tooltip": "Endpoint configurations",
"Apis.Details.Endpoints.endpoint.delete": "Delete",
"Apis.Details.Endpoints.endpoint.deleting": "Deleting",
"Apis.Details.Endpoints.endpoint.name.helper.text": "Endpoint name should not be empty",
"Apis.Details.Endpoints.endpoint.update": "Update",
"Apis.Details.Endpoints.endpoint.updating": "Updating",
"Apis.Details.Endpoints.endpoint.url.helper.text": "Endpoint URL should not be empty",
"Apis.Details.Endpoints.endpoints.add.error": "Something went wrong while adding the endpoint",
"Apis.Details.Endpoints.endpoints.add.success": "Endpoint added successfully!",
"Apis.Details.Endpoints.endpoints.delete.error": "Something went wrong while deleting the endpoint",
"Apis.Details.Endpoints.endpoints.delete.success": "Endpoint deleted successfully!",
"Apis.Details.Endpoints.endpoint.check": "Check endpoint status",
"Apis.Details.Endpoints.endpoint.configuration": "Endpoint configurations",
"Apis.Details.Endpoints.endpoint.delete.error": "Error deleting endpoint",
"Apis.Details.Endpoints.endpoint.delete.primary.error": "Cannot delete primary endpoint. Please remove primary status first.",
"Apis.Details.Endpoints.endpoint.delete.success": "Endpoint deleted successfully",
"Apis.Details.Endpoints.endpoint.primary.remove.error": "At least one endpoint has to be a primary endpoint.",
"Apis.Details.Endpoints.endpoint.primary.set.error": "Error setting primary endpoint",
"Apis.Details.Endpoints.endpoint.primary.set.success": "Primary endpoint updated successfully",
"Apis.Details.Endpoints.endpoint.primary.update.error": "Error updating primary endpoint",
"Apis.Details.Endpoints.endpoint.primary.update.success": "Primary endpoint updated successfully",
"Apis.Details.Endpoints.endpoints.fetch.error": "Something went wrong while fetching endpoints",
"Apis.Details.Endpoints.endpoints.update.error": "Something went wrong while updating the endpoint",
"Apis.Details.Endpoints.endpoints.update.success": "Endpoint updated successfully!",
"Apis.Details.Endpoints.primary.endpoints.save.error": "Error occurred while saving primary endpoints",
"Apis.Details.Environments.Environments\n .select.vhost": "Select Access URL",
"Apis.Details.Environments.Environments.APIGateways": "API Gateways",
"Apis.Details.Environments.Environments.Create.Revision.Deploy": "Create new revision and deploy",
Expand Down Expand Up @@ -1293,12 +1313,26 @@
"Apis.Details.Policies.Components.TabPanel.Components.Common.Policy.List": "Common Policies",
"Apis.Details.Policies.CreatePolicy.create.new.policy": "Create New Policy",
"Apis.Details.Policies.CreatePolicy.create.new.policy.link": "Want to create a common policy that will be visible to all APIs instead?",
"Apis.Details.Policies.Custom.Policies.Modelcard.delete": "Delete",
"Apis.Details.Policies.Custom.Policies.model.add": "Add Model",
"Apis.Details.Policies.CustomPolicies.ModelFailover.accordion.production": "Production",
"Apis.Details.Policies.CustomPolicies.ModelFailover.accordion.sandbox": "Sandbox",
"Apis.Details.Policies.CustomPolicies.ModelFailover.fallback.models": "Fallback Models",
"Apis.Details.Policies.CustomPolicies.ModelFailover.no.models": "No models available. Please configure models for the LLM provider.",
"Apis.Details.Policies.CustomPolicies.ModelFailover.no.production.endpoints": "No production endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.CustomPolicies.ModelFailover.no.sandbox.endpoints": "No sandbox endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.CustomPolicies.ModelFailover.target.model": "Target Model",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.accordion.production": "Production",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.accordion.sandbox": "Sandbox",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.no.models": "No models available. Please configure models for the LLM provider.",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.no.production.endpoints": "No production endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.no.sandbox.endpoints": "No sandbox endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.select.endpoint": "Endpoint",
"Apis.Details.Policies.CustomPolicies.ModelRoundRobin.select.model": "Model",
"Apis.Details.Policies.CustomPolicies.ModelWeightedRoundRobin.accordion.production": "Production",
"Apis.Details.Policies.CustomPolicies.ModelWeightedRoundRobin.accordion.sandbox": "Sandbox",
"Apis.Details.Policies.CustomPolicies.ModelWeightedRoundRobin.no.models": "No models available. Please configure models for the LLM provider.",
"Apis.Details.Policies.CustomPolicies.ModelWeightedRoundRobin.no.production.endpoints": "No production endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.CustomPolicies.ModelWeightedRoundRobin.no.sandbox.endpoints": "No sandbox endpoints available. Please {configureLink} first.",
"Apis.Details.Policies.DeletePolicy.cancel": "Cancel",
"Apis.Details.Policies.DeletePolicy.confirm": "Delete",
"Apis.Details.Policies.DeletePolicy.delete.confirm": "Confirm Delete",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export default function ProvideGraphQL(props) {
inputsDispatcher({ action: 'inputValue', value: null });
inputsDispatcher({ action: 'isFormValid', value: false });
inputsDispatcher({ action: 'endpoint', value: '' });
inputsDispatcher({ action: 'isValid', value: null });
}

const isInvalidURL = Boolean(isValid.url);
Expand Down Expand Up @@ -237,10 +238,10 @@ export default function ProvideGraphQL(props) {
<RadioGroup
aria-label='Input Source'
value={apiInputs.inputType === '' ? 'url' : apiInputs.inputType}
onChange={(event) => inputsDispatcher({
action: 'inputType',
value: event.target.value
})}
onChange={(event) => {
inputsDispatcher({ action: 'inputType', value: event.target.value });
setValidity({ file: null });
}}
>
<FormControlLabel
disabled={isValidating}
Expand Down Expand Up @@ -279,7 +280,7 @@ export default function ProvideGraphQL(props) {
</Grid>
{isValid.file
&& (
<Grid item md={12}>
<Grid item md={12} sx={{ mb: 2}}>
<Banner
onClose={() => setValidity({ file: null })}
disableActions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ class AuthManager {
return false;
} else {
const arrayLength = AuthManager.getUser().scopes.length;
if (arrayLength === 5) {
if (arrayLength === 8) {
return intersectionBy(AuthManager.getUser().scopes,
['apim:api_view', 'apim:publisher_settings', 'openid', 'apim:gateway_policy_view',
'apim:common_operation_policy_view']);
'apim:common_operation_policy_view', 'apim:gov_policy_read', 'apim:gov_result_read',
'apim:gov_rule_read']);
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ const getSampleOpenAPI = (defaultSubscriptionPolicy) => ({
type: 'http',
},
'x-wso2-basePath': '/pizzashack/1.0.0',
'x-wso2-transports': ['http', 'https'],
'x-wso2-transports': ['https'],
'x-wso2-application-security': {
'security-types': ['oauth2'],
optional: false,
Expand Down
Loading