From b344e9d93b81f3ce5b948b4f473be4b07da4d91c Mon Sep 17 00:00:00 2001
From: "tcdlpds@gmail.com" <tcdlpds@gmail.com>
Date: Fri, 30 Oct 2020 15:49:06 +0530
Subject: [PATCH] Fix app subscription detail showing issue

---
 .../admin/SubscriptionManagementAdminAPI.java         |  6 ++----
 .../ReleasePage/components/ReleaseView/index.js       | 11 +++--------
 .../react-app/src/scenes/Login/index.js               |  6 +++---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
index 7fb357e4fe8..7c47b1f7cf1 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
@@ -27,14 +27,12 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
-import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
-import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -64,7 +62,7 @@ import java.util.List;
 )
 @Scopes(
         scopes = {
-                @org.wso2.carbon.apimgt.annotations.api.Scope(
+                @Scope(
                         name = "View Application Subscriptions",
                         description = "View Application Subscriptions.",
                         key = "perm:admin:app:subscription:view",
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleasePage/components/ReleaseView/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleasePage/components/ReleaseView/index.js
index fa6307d6b0b..3b0a02f92ec 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleasePage/components/ReleaseView/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleasePage/components/ReleaseView/index.js
@@ -294,14 +294,9 @@ class ReleaseView extends React.Component {
               <Divider />
               <ReviewContainer uuid={release.uuid} />
             </TabPane>
-            <Authorized
-              permission="/permission/admin/app-mgt/store/admin/subscription/view"
-              yes={
-                <TabPane tab="Subscription Details" key="2">
-                  <SubscriptionDetails uuid={release.uuid} />
-                </TabPane>
-              }
-            />
+            <TabPane tab="Subscription Details" key="2">
+              <SubscriptionDetails uuid={release.uuid} />
+            </TabPane>
           </Tabs>
         </div>
       </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Login/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Login/index.js
index 3d0f11d4a88..e7d4ccf6791 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Login/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Login/index.js
@@ -96,10 +96,10 @@ class Login extends React.Component {
     const config = this.props.context;
     return (
       <div className="login">
-        <div className="background"></div>
+        <div className="background" />
         <div className="content">
           <Row>
-            <Col xs={3} sm={3} md={10}></Col>
+            <Col xs={3} sm={3} md={10} />
             <Col xs={18} sm={18} md={4}>
               <Row style={{ marginBottom: 20 }}>
                 <Col
@@ -174,7 +174,7 @@ class Login extends React.Component {
             </Col>
           </Row>
           <Row>
-            <Col span={4} offset={10}></Col>
+            <Col span={4} offset={10} />
           </Row>
         </div>
       </div>