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 c6ce74dc6ce..d9c8f9505d2 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 @@ -30,7 +30,7 @@ import { Spin, message, Icon, - Card, Badge + Card, Badge, Tooltip, Popover } from 'antd'; import DetailedRating from "../../detailed-rating/DetailedRating"; import {Link} from "react-router-dom"; @@ -486,7 +486,6 @@ class AppDetailsDrawer extends React.Component { )} - Releases
(
- - - - {(release.currentStatus === "PUBLISHED") ? ( - - }> + + + + + {(release.currentStatus === "PUBLISHED") ? ( + + + + }> + + + ) : ( - - ) : ( - - )} -
- } - title={release.version} - description={ -
- - - - - -
- } - /> - - + )} +
+ } + title={release.version} + description={ +
+ + + + + +
+ } + /> + + + )} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js index 01d6c8c1592..6158df2f2a1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js @@ -17,7 +17,7 @@ */ import React from "react"; -import {Avatar, Table, Tag, Icon, message, notification, Col, Badge, Alert} from "antd"; +import {Avatar, Table, Tag, Icon, message, notification, Col, Badge, Alert, Tooltip} from "antd"; import axios from "axios"; import pSBC from 'shade-blend-color'; import "./AppsTable.css"; @@ -60,8 +60,16 @@ const columns = [ title="Published" style={{backgroundColor: '#52c41a', borderRadius: "50%", color: "white"}} count={ - + + + }> { - this.setState({ - isFree: (value === 'free') - }); - }; - handlePreviewCancel = () => this.setState({previewVisible: false}); handlePreview = async file => { if (!file.url && !file.preview) { @@ -231,7 +225,7 @@ class NewAppUploadForm extends React.Component { handleUpperOsVersionChange = (upperOsVersion) => { if (upperOsVersion === "all") { this.upperOsVersion = this.props.supportedOsVersions[this.props.supportedOsVersions.length - 1]["versionName"]; - }else{ + } else { this.upperOsVersion = upperOsVersion; } this.setState({ @@ -247,7 +241,6 @@ class NewAppUploadForm extends React.Component { icons, screenshots, binaryFiles, - isFree, previewImage, previewVisible, binaryFileHelperText, @@ -310,17 +303,19 @@ class NewAppUploadForm extends React.Component { required: true, message: 'Please select a icon' })( - false} - onPreview={this.handlePreview}> - {icons.length === 1 ? null : uploadButton} - , +
+ false} + onPreview={this.handlePreview}> + {icons.length === 1 ? null : uploadButton} + + Recommended : 240px x 240px +
)} - false} - onPreview={this.handlePreview}> - {screenshots.length >= 3 ? null : uploadButton} - , +
+ false} + onPreview={this.handlePreview}> + {screenshots.length >= 3 ? null : uploadButton} + + Required 3 screenshots, Recommended min. 320px max. 3840px +
)}