-
-
-
-
+
+
+
+
- {loading && loadingView}
- {!loading && !error && applicationView}
- {error && errorView}
-
- );
- }
+ return (
+
+ {loading && loadingView}
+ {!loading && !error && applicationView}
+ {error && errorView}
+
+ );
+ }
}
export default App;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
index 2dc80f8145..0b11230cc0 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js
@@ -17,21 +17,24 @@
*/
import React from 'react';
-import {Route} from 'react-router-dom';
-class RouteWithSubRoutes extends React.Component{
- props;
- constructor(props){
- super(props);
- this.props = props;
- }
- render() {
- return(
-
-
-
- {detailedRating.ratingValue.toFixed(1)}
- -
-
-
- 5
-
-
-
- 4
-
-
-
- 3
-
-
-
- 2
-
-
-
- 1
-
-
-
+
+
+
+
+ {detailedRating.ratingValue.toFixed(1)}
+ +
+
+
+ 5
+
+ {' '}
+
+
+
+ 4
+
+ {' '}
+
+
+
+ 3
+
+ {' '}
+
+
+
+ 2
+
+ {' '}
+
+
+
+ 1
+
+ {' '}
+
+
+
-
-
-
- );
- }
+
+ {/* display add new release only if app type is enterprise*/}
+ {app.type === 'ENTERPRISE' && (
+
- {avatar}
- {name}
-
-
+ return (
+
-
- Description
- {!isDescriptionEditEnabled && (
-
-
- )}
-
- {!isDescriptionEditEnabled && (
-
- Categories
- {!isCategoriesEditEnabled && (
-
- )}
-
-
- {isCategoriesEditEnabled && ( -
- {category}
-
- );
- })
- }
- )}
-
-
-
- Tags
- {!isTagsEditEnabled && (
-
- )}
-
-
- {isTagsEditEnabled && ( -
- {tag}
-
- );
- })
- }
- )}
-
-
-
-
+ )}
+ />
+
+
+ Releases
+ Releases
-
-
- {/*display add new release only if app type is enterprise*/}
- {(app.type === "ENTERPRISE") && (
-
+ {avatar}
+
+ {name}
+
+
+
+
+
+ )}
+
+ Set up managed configurations
+
+
+
+ If you are developing apps for the enterprise market, you
+ may need to satisfy particular requirements set by a
+ organization's policies. Managed configurations,
+ previously known as application restrictions, allow the
+ organization's IT admin to remotely specify settings
+ for apps. This capability is particularly useful for
+ organization-approved apps deployed to a work profile.
+
+
+ +
+
- )}
- - (
+
+
+
+
+
+
- Set up managed configurations
-
-
-
- If you are developing apps for the enterprise market, you may need to satisfy
- particular requirements set by a organization's policies. Managed
- configurations,
- previously known as application restrictions, allow the organization's IT admin
- to
- remotely specify settings for apps. This capability is particularly useful for
- organization-approved apps deployed to a work profile.
-
+ {release.currentStatus === 'PUBLISHED' ? (
+
+
+ ) : (
+
- -
-
- )}
- />
- - (
-
-
-
-
-
-
- {(release.currentStatus === "PUBLISHED") ? (
-
-
- }>
-
-
- ) : (
-
- )}
-
- }
- title={release.version}
- description={
-
-
-
-
-
- }
- />
-
-
-
-
-
-
-
)}
-
-
- Add new release for the application
-
-
-
-
-
- {ReactHtmlParser(description)}
- )}
-
- {isDescriptionEditEnabled && (
-
-
- )}
-
- -
- {isCategoriesEditEnabled && ( -
-
-
- )}
- {!isCategoriesEditEnabled && (
- {
- categories.map(category => {
- return (
-
-
-
-
- -
- {isTagsEditEnabled && ( -
-
-
- )}
- {!isTagsEditEnabled && (
- {
- tags.map(tag => {
- return (
-
-
-
+
-
- {app.applicationReleases.length > 0 && (
- )}
-
-
-
+ }
+ />
+
+
+
+
+
+
+ )}
+
+ Add new release for the application
+
+
+
+
+ {ReactHtmlParser(description)}
+ )}
+
+ {isDescriptionEditEnabled && (
+
+
+ )}
+
+ +
+ {isCategoriesEditEnabled && ( +
+
+
+ )}
+ {!isCategoriesEditEnabled && (
+
+ {categories.map(category => {
+ return (
+
+
+
+
+ +
+ {isTagsEditEnabled && ( +
+
+
+ )}
+ {!isTagsEditEnabled && (
+
+ {tags.map(tag => {
+ return (
+
+
+
+
+
+ {app.applicationReleases.length > 0 && (
+
+
+
+
+ );
+ }
}
export default withConfigContext(AppDetailsDrawer);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
index 14c76e24a7..a3f2d7c467 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
@@ -16,314 +16,327 @@
* under the License.
*/
-import React from "react";
+import React from 'react';
import {
- Card,
- Col,
- Row,
- Typography,
- Input,
- Divider,
- Icon,
- Select,
- Button,
- Form,
- message,
- Radio,
- notification, Alert
-} from "antd";
-import axios from "axios";
-import {withConfigContext} from "../../../context/ConfigContext";
-import {handleApiError} from "../../../js/Utils";
-
-const {Option} = Select;
-const {Title} = Typography;
+ Card,
+ Col,
+ Row,
+ Typography,
+ Divider,
+ Select,
+ Button,
+ Form,
+ Alert,
+} from 'antd';
+import axios from 'axios';
+import { withConfigContext } from '../../../context/ConfigContext';
+import { handleApiError } from '../../../js/Utils';
+const { Option } = Select;
+const { Title } = Typography;
class FiltersForm extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- categories: [],
- tags: [],
- deviceTypes: [],
- forbiddenErrors: {
- categories: false,
- tags: false,
- deviceTypes: false
- }
- };
- }
-
- handleSubmit = e => {
- e.preventDefault();
- this.props.form.validateFields((err, values) => {
- for (const [key, value] of Object.entries(values)) {
- if (value === undefined) {
- delete values[key];
- }
- }
-
- if (values.hasOwnProperty("deviceType") && values.deviceType === "ALL") {
- delete values["deviceType"];
- }
-
- if (values.hasOwnProperty("appType") && values.appType === "ALL") {
- delete values["appType"];
- }
-
- this.props.setFilters(values);
- });
+ constructor(props) {
+ super(props);
+ this.state = {
+ categories: [],
+ tags: [],
+ deviceTypes: [],
+ forbiddenErrors: {
+ categories: false,
+ tags: false,
+ deviceTypes: false,
+ },
};
+ }
- componentDidMount() {
- this.getCategories();
- this.getTags();
- this.getDeviceTypes();
- }
-
- getCategories = () => {
- const config = this.props.context;
- axios.get(
- window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/categories"
- ).then(res => {
- if (res.status === 200) {
- let categories = JSON.parse(res.data.data);
- this.setState({
- categories: categories,
- loading: false
- });
- }
+ handleSubmit = e => {
+ e.preventDefault();
+ this.props.form.validateFields((err, values) => {
+ for (const [key, value] of Object.entries(values)) {
+ if (value === undefined) {
+ delete values[key];
+ }
+ }
- }).catch((error) => {
- handleApiError(error, "Error occurred while trying to load categories.", true);
- if (error.hasOwnProperty("response") && error.response.status === 403) {
- const {forbiddenErrors} = this.state;
- forbiddenErrors.categories = true;
- this.setState({
- forbiddenErrors,
- loading: false
- })
- } else {
- this.setState({
- loading: false
- });
- }
- });
- };
+ if (values.hasOwnProperty('deviceType') && values.deviceType === 'ALL') {
+ delete values.deviceType;
+ }
- getTags = () => {
- const config = this.props.context;
- axios.get(
- window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags"
- ).then(res => {
- if (res.status === 200) {
- let tags = JSON.parse(res.data.data);
- this.setState({
- tags: tags,
- loading: false,
- });
- }
+ if (values.hasOwnProperty('appType') && values.appType === 'ALL') {
+ delete values.appType;
+ }
- }).catch((error) => {
- handleApiError(error, "Error occurred while trying to load tags.", true);
- if (error.hasOwnProperty("response") && error.response.status === 403) {
- const {forbiddenErrors} = this.state;
- forbiddenErrors.tags = true;
- this.setState({
- forbiddenErrors,
- loading: false
- })
- } else {
- this.setState({
- loading: false
- });
- }
- });
- };
+ this.props.setFilters(values);
+ });
+ };
+ componentDidMount() {
+ this.getCategories();
+ this.getTags();
+ this.getDeviceTypes();
+ }
- getDeviceTypes = () => {
- const config = this.props.context;
- axios.get(
- window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt + "/device-types"
- ).then(res => {
- if (res.status === 200) {
- const deviceTypes = JSON.parse(res.data.data);
- this.setState({
- deviceTypes,
- loading: false,
- });
- }
+ getCategories = () => {
+ const config = this.props.context;
+ axios
+ .get(
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.publisher +
+ '/applications/categories',
+ )
+ .then(res => {
+ if (res.status === 200) {
+ let categories = JSON.parse(res.data.data);
+ this.setState({
+ categories: categories,
+ loading: false,
+ });
+ }
+ })
+ .catch(error => {
+ handleApiError(
+ error,
+ 'Error occurred while trying to load categories.',
+ true,
+ );
+ if (error.hasOwnProperty('response') && error.response.status === 403) {
+ const { forbiddenErrors } = this.state;
+ forbiddenErrors.categories = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false,
+ });
+ } else {
+ this.setState({
+ loading: false,
+ });
+ }
+ });
+ };
- }).catch((error) => {
- handleApiError(error, "Error occurred while trying to load device types.", true);
- if (error.hasOwnProperty("response") && error.response.status === 403) {
- const {forbiddenErrors} = this.state;
- forbiddenErrors.deviceTypes = true;
- this.setState({
- forbiddenErrors,
- loading: false
- })
- } else {
- this.setState({
- loading: false
- });
- }
- });
- };
+ getTags = () => {
+ const config = this.props.context;
+ axios
+ .get(
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.publisher +
+ '/applications/tags',
+ )
+ .then(res => {
+ if (res.status === 200) {
+ let tags = JSON.parse(res.data.data);
+ this.setState({
+ tags: tags,
+ loading: false,
+ });
+ }
+ })
+ .catch(error => {
+ handleApiError(
+ error,
+ 'Error occurred while trying to load tags.',
+ true,
+ );
+ if (error.hasOwnProperty('response') && error.response.status === 403) {
+ const { forbiddenErrors } = this.state;
+ forbiddenErrors.tags = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false,
+ });
+ } else {
+ this.setState({
+ loading: false,
+ });
+ }
+ });
+ };
- render() {
- const {categories, tags, deviceTypes, forbiddenErrors} = this.state;
- const {getFieldDecorator} = this.props.form;
+ getDeviceTypes = () => {
+ const config = this.props.context;
+ axios
+ .get(
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.deviceMgt +
+ '/device-types',
+ )
+ .then(res => {
+ if (res.status === 200) {
+ const deviceTypes = JSON.parse(res.data.data);
+ this.setState({
+ deviceTypes,
+ loading: false,
+ });
+ }
+ })
+ .catch(error => {
+ handleApiError(
+ error,
+ 'Error occurred while trying to load device types.',
+ true,
+ );
+ if (error.hasOwnProperty('response') && error.response.status === 403) {
+ const { forbiddenErrors } = this.state;
+ forbiddenErrors.deviceTypes = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false,
+ });
+ } else {
+ this.setState({
+ loading: false,
+ });
+ }
+ });
+ };
- return (
+ render() {
+ const { categories, tags, deviceTypes, forbiddenErrors } = this.state;
+ const { getFieldDecorator } = this.props.form;
-
- {avatar}
- {name}
-
);
+ {
+ title: '',
+ dataIndex: 'name',
+ // eslint-disable-next-line react/display-name
+ render: (name, row) => {
+ let avatar = null;
+ if (row.applicationReleases.length === 0) {
+ const avatarLetter = name.charAt(0).toUpperCase();
+ avatar = (
+
+ {avatar}
+ {name}
+
+ );
},
- {
- title: 'Subscription',
- dataIndex: 'subMethod'
+ },
+ {
+ title: 'Categories',
+ dataIndex: 'categories',
+ // eslint-disable-next-line react/display-name
+ render: categories => (
+
+ {categories.map(category => {
+ return (
+
- {(this.state.isForbiddenErrorVisible) && (
-
- record.id}
- dataSource={this.state.apps}
- columns={columns}
- pagination={this.state.pagination}
- onChange={this.handleTableChange}
- rowClassName="app-row"
- loading={loading}
- onRow={(record, rowIndex) => {
- return {
- onClick: event => {
- this.showDrawer(record, rowIndex);
- },
- };
- }}/>
-