From 2961c1d21cc00961fb2f4904f74e39e0960f0cf5 Mon Sep 17 00:00:00 2001
From: nipun <nipunnadeendesilva@gmail.com>
Date: Fri, 11 Oct 2019 12:03:24 +0530
Subject: [PATCH] Modify the app details drawer of the APPM publisher

---
 .../AppDetailsDrawer/AppDetailsDrawer.css     |  4 ++++
 .../AppDetailsDrawer/AppDetailsDrawer.js      |  4 +++-
 .../components/new-release/AddReleaseForm.js  | 19 +++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css
index b85db7892f2..3aadbfe3d67 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css
@@ -30,4 +30,8 @@
         width: 210%;
     }
 
+    .app-release-cards{
+        display: grid;
+    }
+
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
index edfe0e73de1..7b453a4098a 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
@@ -446,7 +446,7 @@ class AppDetailsDrawer extends React.Component {
             <div>
                 <Drawer
                     placement="right"
-                    width={640}
+                    width={this.state.drawerWidth}
                     closable={false}
                     onClose={onClose}
                     visible={visible}
@@ -498,6 +498,7 @@ class AppDetailsDrawer extends React.Component {
                                 grid={{gutter: 16, column: 2}}
                                 dataSource={app.applicationReleases}
                                 renderItem={release => (
+                                    <div className="app-release-cards">
                                     <List.Item>
                                         <Link to={"apps/releases/" + release.uuid}>
                                             <Card className="release-card">
@@ -521,6 +522,7 @@ class AppDetailsDrawer extends React.Component {
                                             </Card>
                                         </Link>
                                     </List.Item>
+                                    </div>
                                 )}
                             />
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
index 8d26338f9d5..f10aa9e7241 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
@@ -17,7 +17,7 @@
  */
 
 import React from "react";
-import {Form, notification, Spin,} from "antd";
+import {Form, notification, Spin, Card} from "antd";
 import axios from "axios";
 import {withRouter} from 'react-router-dom'
 import {withConfigContext} from "../../context/ConfigContext";
@@ -73,9 +73,6 @@ class AddNewReleaseFormComponent extends React.Component {
         });
         const {data, release} = releaseData;
         const {formConfig} = this.props;
-        const {price} = release;
-
-        release.subMethod = (price === 0) ? "FREE" : "PAID";
 
         const json = JSON.stringify(release);
         const blob = new Blob([json], {
@@ -128,12 +125,14 @@ class AddNewReleaseFormComponent extends React.Component {
         return (
             <div>
                 <Spin tip="Uploading..." spinning={loading}>
-                <NewAppUploadForm
-                    formConfig={formConfig}
-                    supportedOsVersions={supportedOsVersions}
-                    onSuccessReleaseData={this.onSuccessReleaseData}
-                    onClickBackButton={this.onClickBackButton}
-                />
+                    <Card>
+                        <NewAppUploadForm
+                            formConfig={formConfig}
+                            supportedOsVersions={supportedOsVersions}
+                            onSuccessReleaseData={this.onSuccessReleaseData}
+                            onClickBackButton={this.onClickBackButton}
+                        />
+                    </Card>
                 </Spin>
             </div>
         );