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 4a8cefada9..5b106f6761 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 @@ -55,7 +55,7 @@ class AppDetailsDrawer extends React.Component { super(props); this.state = { loading: false, - name: null, + name: "", description: null, globalCategories: [], globalTags: [], @@ -93,7 +93,7 @@ class AppDetailsDrawer extends React.Component { getCategories = () => { const config = this.props.context; axios.get( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/categories" + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/categories" ).then(res => { if (res.status === 200) { const categories = JSON.parse(res.data.data); @@ -115,7 +115,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", @@ -133,7 +133,7 @@ class AppDetailsDrawer extends React.Component { getTags = () => { const config = this.props.context; axios.get( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags" + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags" ).then(res => { if (res.status === 200) { const tags = JSON.parse(res.data.data); @@ -155,7 +155,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", @@ -178,7 +178,7 @@ class AppDetailsDrawer extends React.Component { if (name !== this.state.name && name !== "") { const data = {name: name}; axios.put( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, data ).then(res => { if (res.status === 200) { @@ -195,7 +195,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { message.error('You are not logged in'); - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", @@ -259,7 +259,7 @@ class AppDetailsDrawer extends React.Component { if (difference.length !== 0 && temporaryCategories.length !== 0) { const data = {categories: temporaryCategories}; axios.put( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, data ).then(res => { if (res.status === 200) { @@ -277,7 +277,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { message.error('You are not logged in'); - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", @@ -324,7 +324,7 @@ class AppDetailsDrawer extends React.Component { if (difference.length !== 0 && temporaryTags.length !== 0) { const data = {tags: temporaryTags}; axios.put( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, data ).then(res => { if (res.status === 200) { @@ -341,7 +341,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { message.error('You are not logged in'); - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", @@ -365,7 +365,7 @@ class AppDetailsDrawer extends React.Component { if (temporaryDescription !== description && temporaryDescription !== "


") { const data = {description: temporaryDescription}; axios.put( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id, data ).then(res => { if (res.status === 200) { @@ -382,7 +382,7 @@ class AppDetailsDrawer extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { message.error('You are not logged in'); - window.location.href = window.location.origin+ '/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { message.error('Something went wrong... :('); } @@ -406,6 +406,36 @@ class AppDetailsDrawer extends React.Component { if (app == null) { return null; } + + let avatar = null; + + if (app.applicationReleases.length === 0) { + const avatarLetter = name.charAt(0).toUpperCase(); + avatar = ( + + {avatarLetter} + + ); + } else { + avatar = ( + + ) + } + return (
- + {avatar} {name}
@@ -436,8 +458,8 @@ class AppDetailsDrawer extends React.Component { {(app.type === "ENTERPRISE") && ( )} -
( @@ -596,8 +618,8 @@ class AppDetailsDrawer extends React.Component { )} - - + {app.applicationReleases.length > 0 && ( + )}
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 de407a4da6..1beeca3f3b 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 @@ -12,8 +12,22 @@ const columns = [ title: '', dataIndex: 'name', render: (name, row) => { - return ( -
+ let avatar = null; + if (row.applicationReleases.length === 0) { + const avatarLetter = name.charAt(0).toUpperCase(); + avatar = ( + + {avatarLetter} + + ); + } else { + avatar = ( + ) + } + + return ( +
+ {avatar} {name}
); } @@ -33,7 +53,7 @@ const columns = [ {categories.map(category => { return ( - + {category} ); @@ -80,7 +100,7 @@ class AppsTable extends React.Component { } componentDidMount() { - const {filters} =this.props; + const {filters} = this.props; this.setState({ filters }); @@ -89,9 +109,9 @@ class AppsTable extends React.Component { } componentDidUpdate(prevProps, prevState, snapshot) { - const {filters} =this.props; + const {filters} = this.props; if (prevProps.filters !== this.props.filters) { - console.log("d",this.props.filters); + console.log("d", this.props.filters); this.setState({ filters }); @@ -106,7 +126,7 @@ class AppsTable extends React.Component { this.setState({ pagination: pager, }); - this.fetch(this.state.filters,{ + this.fetch(this.state.filters, { results: pagination.pageSize, page: pagination.current, sortField: sorter.field, @@ -115,12 +135,12 @@ class AppsTable extends React.Component { }); }; - fetch = (filters,params = {}) => { + fetch = (filters, params = {}) => { this.setState({loading: true}); const config = this.props.context; - if(!params.hasOwnProperty("page")){ - params.page = 1; + if (!params.hasOwnProperty("page")) { + params.page = 1; } const data = { @@ -129,10 +149,9 @@ class AppsTable extends React.Component { ...filters }; - axios.post( - window.location.origin+ config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications", + axios.post( + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications", data, - ).then(res => { if (res.status === 200) { const data = res.data.data; @@ -156,7 +175,7 @@ class AppsTable extends React.Component { }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { message.error('You are not logged in'); - window.location.href = window.location.origin+'/publisher/login'; + window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js index 62795984f0..51d9ed9d56 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js @@ -68,7 +68,7 @@ class ReleaseView extends React.Component { icon="shop" disabled={this.props.currentLifecycleStatus !== "PUBLISHED"} onClick={() => { - window.open("https://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + "/store/" + app.deviceType + "/apps/" + release.uuid) + window.open(window.location.origin+ "/store/" + app.deviceType + "/apps/" + release.uuid) }}> Open in store diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js index 634683273d..84e69a9515 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js @@ -235,7 +235,7 @@ class NewAppDetailsForm extends React.Component { )} - //todo implement add meta data + {/* //todo implement add meta data */} {/**/} {/**/} {/**/}