diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js index 401b35b79da..2af6f069756 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js @@ -31,10 +31,16 @@ class ListApps extends React.Component { super(props); this.state = { filters: {} - } + }; + this.appName = ''; } setFilters = (filters) => { + if (this.appName === '' && filters.hasOwnProperty("appName")) { + delete filters["appName"]; + } else { + filters.appName = this.appName; + } this.setState({ filters }); @@ -42,6 +48,7 @@ class ListApps extends React.Component { setSearchText = (appName) => { const filters = {...this.state.filters}; + this.appName = appName; if (appName === '' && filters.hasOwnProperty("appName")) { delete filters["appName"]; } else { @@ -52,6 +59,17 @@ class ListApps extends React.Component { }); }; + onChangeSearchText = (e) => { + const filters = {...this.state.filters}; + const appName = e.target.value; + if (appName === '' && filters.hasOwnProperty("appName")) { + delete filters["appName"]; + this.setState({ + filters + }); + } + }; + render() { const {isDrawerVisible, filters} = this.state; return ( @@ -67,9 +85,10 @@ class ListApps extends React.Component { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js index 7fd5c6eee12..d024f5903c2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js @@ -46,15 +46,27 @@ class ReleaseView extends React.Component { const config = this.props.context; const release = this.props.app.applicationReleases[0]; const {uuid} = release; + const {isAndroidEnterpriseApp} = this.props.app; this.setState({ loading: true, }); + const parameters = {}; + let url = window.location.origin + config.serverConfig.invoker.uri + - config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + type + "/" + operation; + config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + type + "/"; + if (isAndroidEnterpriseApp) { + url += "ent-app-install/"; // add ent-app-install path param for android enterprise app + parameters.requiresUpdatingExternal = true; + } + url += operation; // add operation to url if (timestamp != null) { - url += `?timestamp=${timestamp}`; + parameters.timestamp = timestamp; // add timestamp for scheduled operations } + + const queryParams = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); + url += '?' + queryParams; + axios.post( url, payload, diff --git a/pom.xml b/pom.xml index 818a329e95d..807d740db7e 100644 --- a/pom.xml +++ b/pom.xml @@ -1767,6 +1767,11 @@ ${carbon.multitenancy.version} provided + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.vesion} + @@ -2246,6 +2251,8 @@ 1.7.6 v10.15.3 6.9.0 + + 3.1.0 7.0.85