Merge pull request #628 from dulithsenanayake/fix-prototype-endpoint-…

…issue [Master] Add additional lifeCycleStatus check for prototype APIs
wso2 · Mar 26, 2024 · 9553771 · 9553771
2 parents 70a2a7c + 10f917e
commit 9553771
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/...urce/src/app/components/Apis/Details/Configuration/components/APISecurity/APISecurity.jsx b/...urce/src/app/components/Apis/Details/Configuration/components/APISecurity/APISecurity.jsx
@@ -78,7 +78,8 @@ export default function APISecurity(props) {
  } else {
  isEndpointAvailable = apiContext.api.endpointConfig !== null;
  isPrototyped = apiContext.api.endpointConfig !== null
- && apiContext.api.endpointConfig.implementation_status === 'prototyped';
+ && apiContext.api.endpointConfig.implementation_status === 'prototyped'
+ && apiContext.api.lifeCycleStatus === 'PROTOTYPED';
  }
 
  const haveMultiLevelSecurity = securityScheme.includes(API_SECURITY_MUTUAL_SSL)

diff --git a/...main/webapp/source/src/app/components/Apis/Details/Configuration/components/Endpoints.jsx b/...main/webapp/source/src/app/components/Apis/Details/Configuration/components/Endpoints.jsx
@@ -100,7 +100,7 @@ function Endpoints(props) {
  const { api } = props;
 
  const isPrototypedAvailable = api.endpointConfig !== null
- && api.endpointConfig.implementation_status === 'prototyped';
+ && api.endpointConfig.implementation_status === 'prototyped' && api.lifeCycleStatus === 'PROTOTYPED';
 
  /**
  * Check whether the endpoint configuration is dynamic

diff --git a/...her/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/EndpointOverview.jsx b/...her/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/EndpointOverview.jsx
@@ -227,7 +227,8 @@ function EndpointOverview(props) {
  } else if (apiObject.endpointImplementationType === 'MOCKED_OAS') {
  return endpointTypes[7];
  } else if (apiObject.endpointImplementationType === 'ENDPOINT'
- && apiObject.endpointConfig.implementation_status === 'prototyped') {
+ && apiObject.endpointConfig.implementation_status === 'prototyped'
+ && api.lifeCycleStatus === 'PROTOTYPED') {
  return endpointTypes[3];
  } else if (type === 'http') {
  if (typeChangeConfirmation.serviceInfo) {

diff --git a/.../publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx b/.../publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx
@@ -458,7 +458,7 @@ function Endpoints(props) {
  }
  } else {
  let isValidEndpoint = false;
- if (endpointConfig.implementation_status === 'prototyped') {
+ if (endpointConfig.implementation_status === 'prototyped' && api.lifeCycleStatus === 'PROTOTYPED') {
  if (implementationType === 'ENDPOINT') {
  if (endpointConfig.production_endpoints && endpointConfig.production_endpoints.url === '') {
  return {

diff --git a/...isher/src/main/webapp/source/src/app/components/Apis/Details/LifeCycle/CheckboxLabels.jsx b/...isher/src/main/webapp/source/src/app/components/Apis/Details/LifeCycle/CheckboxLabels.jsx
@@ -106,7 +106,7 @@ export default function CheckboxLabels(props) {
  isMandatoryPropertiesAvailable, isMandatoryPropertiesConfigured
  } = props;
  const isEndpointAvailable = !isAPIProduct
- ? api.endpointConfig !== null && !api.endpointConfig.implementation_status
+ ? api.endpointConfig !== null
  : false;
  const lcState = isAPIProduct ? api.state : api.lifeCycleStatus;
 

diff --git a/...ublisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Endpoints.jsx b/...ublisher/src/main/webapp/source/src/app/components/Apis/Details/NewOverview/Endpoints.jsx
@@ -53,7 +53,8 @@ const showEndpoint = (api, type) => {
 function Endpoints(props) {
  const { parentClasses, api } = props;
  const isPrototypedAvailable = api.endpointConfig !== null
- && api.endpointConfig.implementation_status === 'prototyped';
+ && api.endpointConfig.implementation_status === 'prototyped'
+ && api.lifeCycleStatus === 'PROTOTYPED';
  const productionEndpointSecurity = api.endpointConfig && api.endpointConfig.endpoint_security
  && api.endpointConfig.endpoint_security.production.type;
  const sandboxEndpointSecurity = api.endpointConfig && api.endpointConfig.endpoint_security