Merge branch 'pub-issues' into 'master'

Improve lifecycle changing UX in application publisher

Closes product-iots#539

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

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json

@@ -40,28 +40,52 @@
   },
   "lifecycle": {
     "CREATED": {
-      "text": "The initial most state of an application."
+      "title": "Created",
+      "text": "The initial most state of an application.\n You can only proceed to one of the following states:",
+      "icon": "file-text",
+      "step": 0
     },
     "IN-REVIEW": {
-      "text": "This state can be applied when the application is being reviewed by approvers."
+      "title": "In-Review",
+      "text": "In this state the application is being reviewed by approvers. You can move from this state to APPROVED state if it is approved by reviewers. Otherwise, you can move the application into either REJECTED state or CREATED state based on the feedback getting by reviewers.",
+      "icon": "audit",
+      "step": 1
     },
     "APPROVED": {
-      "text": "The approved state is a compulsory state prior to publishing the application."
-    },
-    "REJECTED": {
-      "text": "The Approvers can reject an application due to a faulty of the app or not being in compliance with company policies."
+      "title": "Approved",
+      "text": "The approved state is a compulsory state prior to publishing the application.\n You can only proceed to one of the following states:",
+      "icon": "file-done",
+      "step": 2
     },
     "PUBLISHED": {
-      "text": "The state which is applied for applications which are qualified for your Corporate App Store. Only the applications of Published state can be installed to your corporate devices."
+      "title": "Published",
+      "text": "The state which is applied for applications which are qualified for your Corporate App Store. Only the applications of Published state can be installed to your corporate devices.\n You can only proceed to one of the following states:",
+      "icon": "global",
+      "step": 3
     },
     "BLOCKED": {
-      "text": "This state allows you to block your application either to publish or deprecate at a future date."
+      "title": "Blocked",
+      "text": "This state allows you to block your application either to publish or deprecate at a future date.\n You can only proceed to one of the following states:",
+      "icon": "exception",
+      "step": 4
     },
     "DEPRECATED": {
-      "text": "The applications which are outdated and no longer suit your app store."
+      "title": "Deprecated",
+      "text": "The applications which are outdated and no longer suit your app store.\n You can only proceed to one of the following states:",
+      "icon": "file-excel",
+      "step": 5
+    },
+    "REJECTED": {
+      "title": "Rejected",
+      "text": "The Approvers can reject an application due to a faulty of the app or not being in compliance with company policies.\n You can only proceed to one of the following states:",
+      "icon": "frown",
+      "step": 6
     },
     "RETIRED": {
-      "text": "The final state of an application, where no transition of states will be allowed after this."
+      "title": "Retired",
+      "text": "The final state of an application, where no transition of states will be allowed after this.",
+      "icon": "rest",
+      "step": 7
     }
   },
   "deviceTypes": {

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js

@@ -21,21 +21,21 @@ import {
   Typography,
   Tag,
   Divider,
-  Select,
   Button,
   Modal,
   notification,
+  Steps,
+  Icon,
+  Alert,
 } from 'antd';
 import axios from 'axios';
 import ReactQuill from 'react-quill';
 import 'react-quill/dist/quill.snow.css';
 import './styles.css';
-import LifeCycleDetailsModal from './components/lifeCycleDetailsModal';
 import { withConfigContext } from '../../../../../../../../components/ConfigContext';
 import { handleApiError } from '../../../../../../../../services/utils/errorHandler';
 
 const { Text, Title, Paragraph } = Typography;
-const { Option } = Select;
 
 const modules = {
   toolbar: [
@@ -60,6 +60,8 @@ const formats = [
   'image',
 ];
 
+const { Step } = Steps;
+
 class LifeCycle extends React.Component {
   constructor(props) {
     super(props);
@@ -69,9 +71,23 @@ class LifeCycle extends React.Component {
       reasonText: '',
       isReasonModalVisible: false,
       isConfirmButtonLoading: false,
+      current: 0,
+      lifecycleSteps: [],
     };
   }
 
+  componentDidMount() {
+    const config = this.props.context;
+    const lifeCycleConfig = config.lifecycle;
+    const lifecycleSteps = Object.keys(lifeCycleConfig).map(config => {
+      return lifeCycleConfig[config];
+    });
+    this.setState({
+      current: lifeCycleConfig[this.props.currentStatus].step,
+      lifecycleSteps,
+    });
+  }
+
   componentDidUpdate(prevProps, prevState, snapshot) {
     if (
       prevProps.currentStatus !== this.props.currentStatus ||
@@ -87,12 +103,9 @@ class LifeCycle extends React.Component {
     this.setState({ reasonText: value });
   };
 
-  handleSelectChange = value => {
-    this.setState({ selectedStatus: value });
-  };
-
-  showReasonModal = () => {
+  showReasonModal = lifecycleState => {
     this.setState({
+      selectedStatus: lifecycleState,
       isReasonModalVisible: true,
     });
   };
@@ -105,6 +118,7 @@ class LifeCycle extends React.Component {
 
   addLifeCycle = () => {
     const config = this.props.context;
+    const lifeCycleConfig = config.lifecycle;
     const { selectedStatus, reasonText } = this.state;
     const { uuid } = this.props;
     const data = {
@@ -128,6 +142,7 @@ class LifeCycle extends React.Component {
       .then(res => {
         if (res.status === 201) {
           this.setState({
+            current: lifeCycleConfig[selectedStatus].step,
             isReasonModalVisible: false,
             isConfirmButtonLoading: false,
             currentStatus: selectedStatus,
@@ -149,16 +164,19 @@ class LifeCycle extends React.Component {
       });
   };
 
+  onChange = current => {
+    this.setState({ current });
+  };
+
   render() {
     const {
       currentStatus,
       selectedStatus,
-      isConfirmButtonLoading,
+      current,
+      lifecycleSteps,
     } = this.state;
     const { lifecycle } = this.props;
-    const selectedValue = selectedStatus == null ? [] : selectedStatus;
     let proceedingStates = [];
-
     if (
       lifecycle !== null &&
       lifecycle.hasOwnProperty(currentStatus) &&
@@ -176,43 +194,45 @@ class LifeCycle extends React.Component {
           application. Have a thorough review and approval process before
           directly publishing it to your app store. You can easily transition
           from one state to another. <br />
-          Note: ‘Change State To’ displays only the next states allowed from the
-          current state
         </Paragraph>
-        {lifecycle !== null && <LifeCycleDetailsModal lifecycle={lifecycle} />}
-        <Divider dashed={true} />
-        <Text strong={true}>Current State: </Text>{' '}
-        <Tag color="blue">{currentStatus}</Tag>
-        <br />
-        <br />
-        <Text>Change State to: </Text>
-        <Select
-          placeholder="Select state"
-          style={{ width: 120 }}
+        <Divider />
+        <div>
+          <Steps
+            direction={'vertical'}
+            current={current}
+            onChange={this.onChange}
             size="small"
-          onChange={this.handleSelectChange}
-          value={selectedValue}
-          showSearch={true}
           >
+            {lifecycleSteps.map((step, index) => (
+              <Step
+                key={index}
+                icon={<Icon type={step.icon} />}
+                title={step.title}
+                disabled={current !== step.step}
+                description={
+                  current === step.step && (
+                    <div style={{ width: 400 }}>
+                      <p>{step.text}</p>
                       {proceedingStates.map(lifecycleState => {
                         return (
-              <Option key={lifecycleState} value={lifecycleState}>
-                {lifecycleState}
-              </Option>
-            );
-          })}
-        </Select>
                           <Button
-          style={{ marginLeft: 10 }}
-          size="small"
-          type="primary"
-          htmlType="button"
-          onClick={this.showReasonModal}
-          loading={isConfirmButtonLoading}
-          disabled={selectedStatus == null}
+                            size={'small'}
+                            style={{ marginRight: 3 }}
+                            onClick={() => this.showReasonModal(lifecycleState)}
+                            key={lifecycleState}
+                            type={'primary'}
                           >
-          Change
+                            {lifecycleState}
                           </Button>
+                        );
+                      })}
+                    </div>
+                  )
+                }
+              />
+            ))}
+          </Steps>
+        </div>
         <Divider />
         <Modal
           title="Confirm changing lifecycle state"
@@ -228,7 +248,15 @@ class LifeCycle extends React.Component {
             <Tag color="blue">{selectedStatus}</Tag>
           </Text>
           <br />
-          <br />
+          {lifecycle && selectedStatus && lifecycle[selectedStatus].isEndState && (
+            <Alert
+              message="In this state application becomes completely obsolete. Be careful,
+              this process cannot be undone."
+              banner
+              style={{ marginTop: 5 }}
+            />
+          )}
+          <Divider orientation="left">Reason</Divider>
           <ReactQuill
             theme="snow"
             value={this.state.reasonText}