From 2978f6f0326fa7286df5f6f7ce601e27912c4b0a Mon Sep 17 00:00:00 2001
From: nipun <nipunnadeendesilva@gmail.com>
Date: Fri, 11 Oct 2019 13:45:32 +0530
Subject: [PATCH] Improve the form config object of the add release component

---
 .../components/new-release/AddReleaseForm.js  | 27 ++++++++++---------
 .../add-new-release/AddNewRelease.js          | 14 +---------
 2 files changed, 15 insertions(+), 26 deletions(-)

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 f10aa9e7241..962a2a0c40d 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
@@ -24,17 +24,23 @@ import {withConfigContext} from "../../context/ConfigContext";
 import {handleApiError} from "../../js/Utils";
 import NewAppUploadForm from "../new-app/subForms/NewAppUploadForm";
 
+const formConfig = {
+    specificElements: {
+        binaryFile: {
+            required: true
+        }
+    }
+};
+
 class AddNewReleaseFormComponent extends React.Component {
 
     constructor(props) {
         super(props);
         this.state = {
             loading: false,
-            isFree: true,
             supportedOsVersions: [],
             application: null,
             release: null,
-            isError: false,
             deviceType: null
         };
     }
@@ -68,20 +74,18 @@ class AddNewReleaseFormComponent extends React.Component {
         const config = this.props.context;
         const {appId, deviceType} = this.props;
         this.setState({
-            loading: true,
-            isError: false
+            loading: true
         });
         const {data, release} = releaseData;
-        const {formConfig} = this.props;
 
         const json = JSON.stringify(release);
         const blob = new Blob([json], {
             type: 'application/json'
         });
-        data.append(formConfig.jsonPayloadName, blob);
+        data.append("applicationRelease", blob);
 
         const url = window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher +
-                    "/applications/" + deviceType + formConfig.endpoint + "/" + appId;
+                    "/applications/" + deviceType + "/ent-app/" + appId;
         axios.post(
             url,
             data
@@ -101,15 +105,13 @@ class AddNewReleaseFormComponent extends React.Component {
 
             } else {
                 this.setState({
-                    loading: false,
-                    isError: true,
+                    loading: false
                 });
             }
         }).catch((error) => {
             handleApiError(error, "Sorry, we were unable to complete your request.");
             this.setState({
-                loading: false,
-                isError: true,
+                loading: false
             });
         });
 
@@ -121,11 +123,10 @@ class AddNewReleaseFormComponent extends React.Component {
 
     render() {
         const {loading, supportedOsVersions} = this.state;
-        const {formConfig} = this.props;
         return (
             <div>
                 <Spin tip="Uploading..." spinning={loading}>
-                    <Card>
+                    <Card style={{ width: "65%", marginLeft: "18%" }}>
                         <NewAppUploadForm
                             formConfig={formConfig}
                             supportedOsVersions={supportedOsVersions}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js
index cf6b7d1cbac..d5d7d70bb01 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js
@@ -28,18 +28,6 @@ import {Link} from "react-router-dom";
 
 const Paragraph = Typography;
 
-const formConfig = {
-    installationType: "ENTERPRISE",
-    endpoint: "/ent-app",
-    jsonPayloadName: "applicationRelease",
-    releaseWrapperName: "entAppReleaseWrappers",
-    specificElements: {
-        binaryFile: {
-            required: true
-        }
-    }
-};
-
 class AddNewRelease extends React.Component {
 
     constructor(props) {
@@ -67,7 +55,7 @@ class AddNewRelease extends React.Component {
                     </div>
                 </PageHeader>
                 <div style={{background: '#f0f2f5', padding: 24, minHeight: 720}}>
-                    <AddNewReleaseForm deviceType={deviceType} appId={appId} formConfig={formConfig}/>
+                    <AddNewReleaseForm deviceType={deviceType} appId={appId} />
                 </div>
 
             </div>