Merge branch 'application-mgt-new' into 'application-mgt-new'

Modify edit release component to update the release without refreshing

See merge request entgra/carbon-device-mgt!193

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js

@@ -11,23 +11,22 @@ const {Title, Text, Paragraph} = Typography;
 
 class ReleaseView extends React.Component {
     render() {
+        const {app, release} = this.props;
         const config = this.props.context;
-        const app = this.props.app;
-        const release = (app !== null) ? app.applicationReleases[0] : null;
         const {lifecycle, currentLifecycleStatus} = this.props;
+
         if (release == null || lifecycle == null) {
             return null;
         }
 
         const {isAppUpdatable, isAppInstallable} = lifecycle[currentLifecycleStatus];
 
-        console.log(isAppInstallable, isAppUpdatable);
-
         const platform = app.deviceType;
         const defaultPlatformIcons = config.defaultPlatformIcons;
         let icon = defaultPlatformIcons.default.icon;
         let color = defaultPlatformIcons.default.color;
         let theme = defaultPlatformIcons.default.theme;
+
         if (defaultPlatformIcons.hasOwnProperty(platform)) {
             icon = defaultPlatformIcons[platform].icon;
             color = defaultPlatformIcons[platform].color;

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js

@@ -231,6 +231,9 @@ class EditReleaseModal extends React.Component {
                     data
                 ).then(res => {
                     if (res.status === 200) {
+
+                        const updatedRelease = res.data.data;
+
                         this.setState({
                             loading: false,
                             visible: false,
@@ -241,10 +244,9 @@ class EditReleaseModal extends React.Component {
                             description:
                                 "Saved!",
                         });
-
-                        window.location.reload();
+                        // console.log(updatedRelease);
+                        this.props.updateRelease(updatedRelease);
                     }
-
                 }).catch((error) => {
                     if (error.hasOwnProperty("response") && error.response.status === 401) {
                         window.location.href = window.location.origin + '/publisher/login';

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js

@@ -8,8 +8,6 @@ import {withConfigContext} from "../../../../context/ConfigContext";
 
 const {Title} = Typography;
 
-
-
 class Release extends React.Component {
     routes;
 
@@ -135,6 +133,7 @@ class Release extends React.Component {
                             <Card>
                                 <ReleaseView
                                     app={app}
+                                    release={release}
                                     currentLifecycleStatus={currentLifecycleStatus}
                                     lifecycle={lifecycle}
                                     updateRelease={this.updateRelease}