Fix review comments

Author: tharikaGitHub

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/components/Apis/Details/LifeCycle/LifeCycleUpdate.jsx

@@ -29,9 +29,7 @@ import { injectIntl, FormattedMessage } from 'react-intl';
 import Typography from '@material-ui/core/Typography';
 import API from 'AppData/api';
 import { CircularProgress } from '@material-ui/core';
-import {
-    ScopeValidation, resourceMethod, resourcePath, client,
-} from 'AppData/ScopeValidation';
+import { ScopeValidation, resourceMethod, resourcePath } from 'AppData/ScopeValidation';
 import Alert from 'AppComponents/Shared/Alert';
 import Banner from 'AppComponents/Shared/Banner';
 import LaunchIcon from '@material-ui/icons/Launch';
@@ -323,7 +321,6 @@ class LifeCycleUpdate extends Component {
                     <ScopeValidation
                         resourcePath={resourcePath.API_CHANGE_LC}
                         resourceMethod={resourceMethod.POST}
-                        client={client.API_CLIENT}
                     >
                         <div className={classes.buttonsWrapper}>
                             {!isWorkflowPending

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/components/Apis/Details/Subscriptions/SubscriptionsTable.jsx

@@ -44,9 +44,7 @@ import UserIcon from '@material-ui/icons/Person';
 
 import Alert from 'AppComponents/Shared/Alert';
 import API from 'AppData/api';
-import {
-    ScopeValidation, resourceMethod, resourcePath, client,
-} from 'AppData/ScopeValidation';
+import { ScopeValidation, resourceMethod, resourcePath } from 'AppData/ScopeValidation';
 import AuthManager from 'AppData/AuthManager';
 import Invoice from './Invoice';
 
@@ -855,7 +853,6 @@ class SubscriptionsTable extends Component {
                                 <ScopeValidation
                                     resourceMethod={resourceMethod.POST}
                                     resourcePath={resourcePath.BLOCK_SUBSCRIPTION}
-                                    client={client.API_CLIENT}
                                 >
                                     {
                                         this.getSubscriptionBlockingButtons(

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/components/Apis/Details/components/CreateNewVersionButton.jsx

@@ -25,9 +25,7 @@ import { withStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import { FormattedMessage } from 'react-intl';
 
-import {
-    client, resourceMethod, resourcePath, ScopeValidation,
-} from 'AppData/ScopeValidation';
+import { resourceMethod, resourcePath, ScopeValidation } from 'AppData/ScopeValidation';
 import VerticalDivider from 'AppComponents/Shared/VerticalDivider';
 
 const styles = (theme) => ({
@@ -86,7 +84,6 @@ function CreateNewVersionButton(props) {
             <ScopeValidation
                 resourceMethod={resourceMethod.POST}
                 resourcePath={resourcePath.API_COPY}
-                client={client.API_CLIENT}
             >
                 <div className={classes.createNewVersionWrapper}>
                     <VerticalDivider height={70} />

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/components/Apis/Details/components/DeleteApiButton.jsx

@@ -10,9 +10,7 @@ import { withRouter } from 'react-router-dom';
 import { withStyles } from '@material-ui/core/styles';
 import IconButton from '@material-ui/core/IconButton';
 import API from 'AppData/api';
-import {
-    client, resourceMethod, resourcePath, ScopeValidation,
-} from 'AppData/ScopeValidation';
+import { resourceMethod, resourcePath, ScopeValidation } from 'AppData/ScopeValidation';
 import Alert from 'AppComponents/Shared/Alert';
 import VerticalDivider from 'AppComponents/Shared/VerticalDivider';
 import { FormattedMessage } from 'react-intl';
@@ -192,7 +190,6 @@ class DeleteApiButton extends React.Component {
                 <ScopeValidation
                     resourceMethod={resourceMethod.DELETE}
                     resourcePath={path}
-                    client={client.API_CLIENT}
                 >
                     <Box
                         className={classNames({ [classes.inlineBlock]: updateData, [classes.flexBox]: !updateData })}

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/data/ScopeValidation.jsx

@@ -143,11 +143,15 @@ export default class ScopeValidation extends React.Component {
     }
 }
 
+ScopeValidation.defaultProps = {
+    client: client.API_CLIENT,
+};
+
 ScopeValidation.propTypes = {
     children: PropTypes.node.isRequired,
     resourcePath: PropTypes.string.isRequired,
     resourceMethod: PropTypes.string.isRequired,
-    client: PropTypes.shape({}).isRequired,
+    client: PropTypes.shape({}),
 };
 
 export {

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/data/ServiceCatalogClient.js

@@ -100,7 +100,7 @@ class ServiceCatalogClient {
             return (
                 resolved.spec.paths[resourcePath]
                 && resolved.spec.paths[resourcePath][resourceMethod]
-                && resolved.spec.paths[resourcePath][resourceMethod].security[0].OAuth2Security[0]
+                && resolved.spec.paths[resourcePath][resourceMethod].security[0].OAuth2Security
             );
         });
     }

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/source/src/app/data/Utils.js

@@ -209,7 +209,6 @@ class Utils {
      */
     static getServiceCatalogSwaggerURL() {
         return 'https://' + Utils.getCurrentEnvironment().host + Utils.CONST.SERVICE_CATALOG_SWAGGER_YAML;
-        // return Utils.CONST.SERVICE_CATALOG_SWAGGER_YAML;
     }
 
     /**