From cd374ab350a887f2645d32b0c4799e99a70432be Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Sat, 5 Oct 2019 18:42:15 +0530 Subject: [PATCH 1/4] Fix icon size & change paddings of the tile in APPM store --- .../src/components/apps/list-apps/ListApps.js | 65 ++++++++++++++++++- .../src/pages/dashboard/apps/Apps.js | 2 + .../react-app/src/components/apps/AppCard.css | 49 ++++++++++++++ .../react-app/src/components/apps/AppCard.js | 18 ++--- 4 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css 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 803d4bbeb01..d5639cea70a 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 @@ -17,10 +17,11 @@ */ import React from "react"; -import {Card, Col, Row, Typography, Input, Divider} from "antd"; +import {Card, Col, Row, Typography, Input, Divider, notification} from "antd"; import AppsTable from "./appsTable/AppsTable"; import Filters from "./Filters"; import AppDetailsDrawer from "./AppDetailsDrawer/AppDetailsDrawer"; +import axios from "axios"; const {Title} = Typography; const Search = Input.Search; @@ -51,6 +52,68 @@ class ListApps extends React.Component { }); }; + 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.getTags(); + this.setState({ + categories: categories, + loading: false + }); + } + + }).catch((error) => { + if (error.hasOwnProperty("response") && error.response.status === 401) { + window.location.href = window.location.origin+ '/publisher/login'; + } else { + notification["error"]({ + message: "There was a problem", + duration: 0, + description: + "Error occurred while trying to load categories.", + }); + } + 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.getDeviceTypes(); + this.setState({ + tags: tags, + loading: false, + }); + } + + }).catch((error) => { + if (error.hasOwnProperty("response") && error.response.status === 401) { + window.location.href = window.location.origin+ '/publisher/login'; + } else { + notification["error"]({ + message: "There was a problem", + duration: 0, + description: + "Error occurred while trying to load tags.", + }); + } + this.setState({ + loading: false + }); + }); + }; + render() { const {isDrawerVisible, filters} = this.state; return ( diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js index 248fca92aee..de480c0c5d6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js @@ -27,6 +27,8 @@ class Apps extends React.Component { } + + render() { return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css new file mode 100644 index 00000000000..c976ceb6d32 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * + * Entgra (pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +.app-icon { + min-width: 100%; + height: auto; +} + +.content { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; +} + +.box { + position: relative; + width: 100%; /* desired width */ +} + +.box:before { + content: ""; + display: block; + padding-top: 100%; /* initial ratio of 1:1*/ +} + +.release .release-icon { + margin-right: 15px; +} + +.release .release-icon img { + width: 100%; + border-radius: 28%; +} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js index d18aa40bbfa..bd8f43582da 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js @@ -19,7 +19,7 @@ import {Card, Typography, Col, Row} from 'antd'; import React from "react"; import {Link} from "react-router-dom"; -import "../../App.css"; +import "./AppCard.css"; import StarRatings from 'react-star-ratings'; const {Meta} = Card; @@ -29,11 +29,6 @@ class AppCard extends React.Component { constructor(props) { super(props); - this.handleReleasesClick = this.handleReleasesClick.bind(this); - } - - handleReleasesClick() { - this.props.openReleasesModal(this.props.app); } render() { @@ -45,12 +40,17 @@ class AppCard extends React.Component { - icon +
+
+ icon +
+
+ {/*icon*/} {/**/} - + {app.name}
- {app.deviceType}
+ {app.subMethod.toLowerCase()}
Date: Sat, 5 Oct 2019 22:05:19 +0530 Subject: [PATCH 2/4] Use common function to handle ajax call errors in APPM UI --- .../react-app/public/conf/config.json | 2 +- .../apps/detailed-rating/DetailedRating.js | 12 +- .../AppDetailsDrawer/AppDetailsDrawer.js | 23 +--- .../src/components/apps/list-apps/Filters.js | 34 +---- .../src/components/apps/list-apps/ListApps.js | 62 ---------- .../apps/list-apps/appsTable/AppsTable.js | 14 +-- .../apps/release/lifeCycle/LifeCycle.js | 11 +- .../apps/release/nodes/CustomNode.css | 39 ------ .../apps/release/nodes/CustomNode.jsx | 54 -------- .../components/apps/release/review/Reviews.js | 12 +- .../apps/release/temp/LifeCycleGraph.js | 116 ------------------ .../ManagedConfigurationsIframe.js | 26 +--- .../manage/categories/ManageCategories.js | 44 +------ .../manage/categories/ManageTags.js | 48 +------- .../src/components/new-app/AddNewAppForm.js | 12 +- .../src/components/new-app/IconImg.js | 84 ------------- .../components/new-app/UploadScreenshots.js | 67 ---------- .../new-app/subForms/NewAppDetailsForm.js | 39 +----- .../components/new-release/AddReleaseForm.js | 12 +- .../react-app/src/js/Utils.js | 3 +- .../react-app/src/pages/Login.js | 14 +-- .../add-new-app/components/AddTagModal.js | 67 ---------- .../src/pages/dashboard/apps/Apps.js | 2 - .../pages/dashboard/apps/release/Release.js | 25 +--- .../src/pages/dashboard/logout/Logout.js | 1 - .../manage/android-enterprise/page/Page.js | 14 +-- 26 files changed, 46 insertions(+), 791 deletions(-) delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/IconImg.js delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/UploadScreenshots.js delete mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json index 88d68e9e8d6..65013996e06 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json @@ -1,7 +1,7 @@ { "theme": { "logo": "https://entgra.io/assets/images/svg/logo.svg", - "primaryColor": "#badc58" + "primaryColor": "rgb(24, 144, 255)" }, "serverConfig": { "invoker": { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js index 876c3b32320..2ef88827be1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js @@ -22,6 +22,7 @@ import StarRatings from "react-star-ratings"; import "./DetailedRating.css"; import axios from "axios"; import {withConfigContext} from "../../../context/ConfigContext"; +import {handleApiError} from "../../../js/Utils"; const { Text } = Typography; @@ -60,16 +61,7 @@ class DetailedRating extends React.Component{ } }).catch(function (error) { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+'/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load rating for the release.", - }); - } + handleApiError(error, "Error occurred while trying to load rating for the release."); }); }; 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 12cf8cb591f..d42a2a8a097 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 @@ -42,6 +42,7 @@ import pSBC from "shade-blend-color"; import {withConfigContext} from "../../../../context/ConfigContext"; import ManagedConfigurationsIframe from "../../../manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe"; +import {handleApiError} from "../../../../js/Utils"; const {Meta} = Card; const {Text, Title} = Typography; @@ -135,16 +136,7 @@ class AppDetailsDrawer extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load app details.", - }); - } + handleApiError(error, "Error occurred while trying to load app details."); this.setState({ loading: false }); @@ -175,16 +167,7 @@ class AppDetailsDrawer extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load tags.", - }); - } + handleApiError(error, "Error occurred while trying to load tags."); this.setState({ loading: false }); 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 d5f8e770c21..de8bbf83578 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 @@ -34,6 +34,7 @@ import { } from "antd"; import axios from "axios"; import {withConfigContext} from "../../../context/ConfigContext"; +import {handleApiError} from "../../../js/Utils"; const {Option} = Select; const {Title} = Typography; @@ -92,16 +93,7 @@ class FiltersForm extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load categories.", - }); - } + handleApiError(error, "Error occurred while trying to load categories."); this.setState({ loading: false }); @@ -123,16 +115,7 @@ class FiltersForm extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load tags.", - }); - } + handleApiError(error, "Error occurred while trying to load tags."); this.setState({ loading: false }); @@ -154,16 +137,7 @@ class FiltersForm extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load device types.", - }); - } + handleApiError(error, "Error occurred while trying to load device types."); this.setState({ loading: false }); 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 d5639cea70a..ec5b7a25d9b 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 @@ -52,68 +52,6 @@ class ListApps extends React.Component { }); }; - 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.getTags(); - this.setState({ - categories: categories, - loading: false - }); - } - - }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load categories.", - }); - } - 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.getDeviceTypes(); - this.setState({ - tags: tags, - loading: false, - }); - } - - }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load tags.", - }); - } - this.setState({ - loading: false - }); - }); - }; - render() { const {isDrawerVisible, filters} = this.state; return ( 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 8fe5b00cce6..aae593fb2af 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 @@ -23,6 +23,7 @@ import pSBC from 'shade-blend-color'; import "./AppsTable.css"; import {withConfigContext} from "../../../../context/ConfigContext"; import AppDetailsDrawer from "../AppDetailsDrawer/AppDetailsDrawer"; +import {handleApiError} from "../../../../js/Utils"; let config = null; @@ -214,18 +215,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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load the apps.", - }); - } - + handleApiError(error, "Error occurred while trying to load apps."); this.setState({loading: false}); }); }; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js index eac2b0ff986..3230939c727 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js @@ -24,6 +24,7 @@ import 'react-quill/dist/quill.snow.css'; import './LifeCycle.css'; import LifeCycleDetailsModal from "./lifeCycleDetailsModal/lifeCycleDetailsModal"; import {withConfigContext} from "../../../../context/ConfigContext"; +import {handleApiError} from "../../../../js/Utils"; const {Text, Title, Paragraph} = Typography; const {Option} = Select; @@ -120,15 +121,7 @@ class LifeCycle extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "Error", - description: - "Error occurred while trying to add lifecycle", - }); - } + handleApiError(error, "Error occurred while trying to add lifecycle"); this.setState({ isConfirmButtonLoading: false }); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css deleted file mode 100644 index f248b812875..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -/* --- Shape for the nodes --- */ - -.node { - width: 75px; - height: 30px; - border-radius: 20% 20% 20% 20%; - overflow: hidden; - box-sizing: border-box; - display: flex; -} - - -.node .name { - padding: 5%; - font-size: 0.5rem; - font-weight: bold; - text-align: center; - text-transform: uppercase; - color: white; -} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx deleted file mode 100644 index 761d227a96c..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from "react"; - -import "./CustomNode.css"; - - -/** - * Component that renders a person's name and gender, along with icons - * representing if they have a driver license for bike and / or car. - * @param {Object} props component props to render. - */ -function CustomNode({ node }) { - - return ( -
-
{node.id}
- - {/*
*/} - {/*
*/} - {/**/} - {/*
*/} - - {/*
*/} - {/*{person.hasBike && (*/} - {/*
*/} - {/*)}*/} - {/*{person.hasCar &&
}*/} - {/*
*/} - {/*
*/} -
- ); -} - -export default CustomNode; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js index 51041c277a5..0e75a3d663b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js @@ -24,6 +24,7 @@ import InfiniteScroll from 'react-infinite-scroller'; import SingleReview from "./SingleReview"; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; +import {handleApiError} from "../../../../js/Utils"; const limit = 5; @@ -58,16 +59,7 @@ class Reviews extends React.Component { } }).catch(function (error) { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load reviews.", - }); - } + handleApiError(error, "Error occurred while trying to load reviews."); }); }; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js deleted file mode 100644 index a5b41fb58dc..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from "react"; -import * as SRD from "storm-react-diagrams"; -import "storm-react-diagrams/dist/style.min.css"; -import "./LifeCycle.css"; -import {distributeElements} from "../../../js/utils/dagre-utils.ts"; - -const inPortName = "IN"; -const outPortName = "OUT"; - -class LifeCycleGraph extends React.Component { - render() { - - const lifecycle = this.props.lifecycle; - const nodes = []; - const links = []; - - const engine = new SRD.DiagramEngine(); - engine.installDefaultFactories(); - - const model = new SRD.DiagramModel(); - const nextStates = lifecycle[this.props.currentStatus].proceedingStates; - - - Object.keys(lifecycle).forEach((stateName) => { - let color = "rgb(83, 92, 104)"; - if (stateName === this.props.currentStatus) { - color = "rgb(192,255,0)"; - } else if (nextStates.includes(stateName)) { - color = "rgb(0,192,255)"; - } - const node = createNode(stateName, color); - nodes.push(node); - lifecycle[stateName].node = node; - }); - - Object.keys(lifecycle).forEach((stateName) => { - const state = lifecycle[stateName]; - //todo: remove checking property - if (state.hasOwnProperty("proceedingStates")) { - - state.proceedingStates.forEach((proceedingState) => { - links.push(connectNodes(state.node, lifecycle[proceedingState].node)); - }); - } - }); - - nodes.forEach((node) => { - model.addNode(node); - // node.addListener({ - // selectionChanged: (node, isSelected) => { - // console.log(isSelected); - // } - // }); - }); - links.forEach((link) => { - model.addLink(link); - }); - - - let distributedModel = getDistributedModel(engine, model); - engine.setDiagramModel(distributedModel); - - return ( -
- -
- ); - } -} - -function getDistributedModel(engine, model) { - const serialized = model.serializeDiagram(); - const distributedSerializedDiagram = distributeElements(serialized); - - //deserialize the model - let deSerializedModel = new SRD.DiagramModel(); - deSerializedModel.deSerializeDiagram(distributedSerializedDiagram, engine); - return deSerializedModel; -} - -function createNode(name, color) { - const node = new SRD.DefaultNodeModel(name, color); - node.addPort(new SRD.DefaultPortModel(true, inPortName, " ")); - node.addPort(new SRD.DefaultPortModel(false, outPortName, " ")); - return node; -} - -let count = 0; - -function connectNodes(nodeFrom, nodeTo) { - return nodeFrom.getPort(outPortName).link(nodeTo.getPort(inPortName)); -} - -function f() { - // console.log(1); -} - -export default LifeCycleGraph; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js index dcc994dad66..67b38049587 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js @@ -75,18 +75,7 @@ class ManagedConfigurationsIframe 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load configurations.", - }); - } - + handleApiError(error, "Error occurred while trying to load configurations."); this.setState({loading: false, visible: false}); }); }; @@ -154,18 +143,7 @@ class ManagedConfigurationsIframe 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to update configurations.", - }); - } - + handleApiError(error, "Error occurred while trying to update configurations."); this.setState({loading: false}); }); }; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js index 526d2a7b7a3..984cd5d67d5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js @@ -38,6 +38,7 @@ import axios from "axios"; import {TweenOneGroup} from 'rc-tween-one'; import pSBC from "shade-blend-color"; import {withConfigContext} from "../../../context/ConfigContext"; +import {handleApiError} from "../../../js/Utils"; const {Title} = Typography; @@ -69,12 +70,7 @@ class ManageCategories extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - message.warning('Something went wrong'); - - } + handleApiError(error, "Error occured while trying to load categories"); this.setState({ loading: false }); @@ -116,17 +112,7 @@ class ManageCategories 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load categories.", - }); - } + handleApiError(error, "Error occurred while trying to load categories."); this.setState({ loading: false }); @@ -264,17 +250,7 @@ class ManageCategories 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to add categories.", - }); - } + handleApiError(error, "Error occurred while trying to add categories."); this.setState({ loading: false }); @@ -331,17 +307,7 @@ class ManageCategories 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to delete the category.", - }); - } + handleApiError(error, "Error occurred while trying to delete the category."); this.setState({ loading: false, editingValue: null diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js index e204e4d99bc..69c269bc173 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js @@ -36,6 +36,7 @@ import { import axios from "axios"; import {TweenOneGroup} from 'rc-tween-one'; import {withConfigContext} from "../../../context/ConfigContext"; +import {handleApiError} from "../../../js/Utils"; const {Title} = Typography; @@ -67,16 +68,7 @@ class ManageTags extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load tags.", - }); - } + handleApiError(error, "Error occurred while trying to load tags."); this.setState({ loading: false }); @@ -120,17 +112,7 @@ class ManageTags 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to delete the tag.", - }); - } + handleApiError(error, "Error occurred while trying to delete the tag."); this.setState({ loading: false }); @@ -265,17 +247,7 @@ class ManageTags 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to delete tag.", - }); - } + handleApiError(error, "Error occurred while trying to delete tag."); this.setState({ loading: false }); @@ -332,17 +304,7 @@ class ManageTags 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to edit tag.", - }); - } + handleApiError(error, "Error occurred while trying to edit tag."); this.setState({ loading: false, editingValue: null diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js index 7529778de59..4e1c89b6f24 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js @@ -33,6 +33,7 @@ import {withRouter} from 'react-router-dom'; import NewAppDetailsForm from "./subForms/NewAppDetailsForm"; import NewAppUploadForm from "./subForms/NewAppUploadForm"; import {withConfigContext} from "../../context/ConfigContext"; +import {handleApiError} from "../../js/Utils"; const {Step} = Steps; @@ -103,16 +104,7 @@ class AddNewAppFormComponent extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "Something went wrong!", - description: - "Sorry, we were unable to complete your request.", - }); - - } + handleApiError(error, "Sorry, we were unable to complete your request.") this.setState({ loading: false, isError: true, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/IconImg.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/IconImg.js deleted file mode 100644 index 077ca6a3f93..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/IconImg.js +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from "react"; -import { Upload, Icon, message } from 'antd'; - -function getBase64(img, callback) { - const reader = new FileReader(); - reader.addEventListener('load', () => callback(reader.result)); - reader.readAsDataURL(img); -} - -function beforeUpload(file) { - const isJPG = file.type === 'image/jpeg'; - if (!isJPG) { - message.error('You can only upload JPG file!'); - } - const isLt2M = file.size / 1024 / 1024 < 2; - if (!isLt2M) { - message.error('Image must smaller than 2MB!'); - } - return isJPG && isLt2M; -} - - -class IconImage extends React.Component { - state = { - loading: false, - }; - - handleChange = (info) => { - if (info.file.status === 'uploading') { - this.setState({ loading: true }); - return; - } - if (info.file.status === 'done') { - // Get this url from response in real world. - getBase64(info.file.originFileObj, imageUrl => this.setState({ - imageUrl, - loading: false, - })); - } - }; - - render() { - const uploadButton = ( -
- -
Upload
-
- ); - const imageUrl = this.state.imageUrl; - return ( - - {imageUrl ? avatar : uploadButton} - - ); - } -} - -export default IconImage; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/UploadScreenshots.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/UploadScreenshots.js deleted file mode 100644 index b5405e8748d..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/UploadScreenshots.js +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from "react"; -import { Upload, Icon, Modal} from 'antd'; - - -class UploadScreenshots extends React.Component { - state = { - previewVisible: false, - previewImage: '', - fileList: [], - }; - - handleCancel = () => this.setState({ previewVisible: false }); - - handlePreview = (file) => { - this.setState({ - previewImage: file.url || file.thumbUrl, - previewVisible: true, - }); - }; - - handleChange = ({ fileList }) => this.setState({ fileList }); - - render() { - const { previewVisible, previewImage, fileList } = this.state; - const uploadButton = ( -
- -
Upload
-
- ); - return ( -
- - {fileList.length >= 3 ? null : uploadButton} - - - example - -
- ); - } -} -export default UploadScreenshots; \ No newline at end of file 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 94c37634e6d..1acac2779eb 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 @@ -20,6 +20,7 @@ import React from "react"; import {Button, Col, Divider, Form, Icon, Input, notification, Row, Select, Switch, Upload} from "antd"; import axios from "axios"; import {withConfigContext} from "../../../context/ConfigContext"; +import {handleApiError} from "../../../js/Utils"; const formItemLayout = { labelCol: { @@ -80,8 +81,6 @@ class NewAppDetailsForm extends React.Component { componentDidMount() { this.getCategories(); - this.getTags(); - this.getDeviceTypes(); } getCategories = () => { @@ -96,18 +95,10 @@ class NewAppDetailsForm extends React.Component { loading: false }); } + this.getTags(); }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load categories.", - }); - } + handleApiError(error, "Error occurred while trying to load categories."); this.setState({ loading: false }); @@ -126,18 +117,10 @@ class NewAppDetailsForm extends React.Component { loading: false, }); } + this.getDeviceTypes(); }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load tags.", - }); - } + handleApiError(error, "Error occurred while trying to load tags."); this.setState({ loading: false }); @@ -180,17 +163,7 @@ class NewAppDetailsForm extends React.Component { }).catch((error) => { - console.log(error); - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load device types.", - }); - } + handleApiError(error, "Error occurred while trying to load device types."); this.setState({ loading: false }); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js index 6bab7496420..9d9b3541576 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js @@ -36,6 +36,7 @@ import { import axios from "axios"; import {withRouter} from 'react-router-dom' import {withConfigContext} from "../../context/ConfigContext"; +import {handleApiError} from "../../js/Utils"; const {Option} = Select; const {TextArea} = Input; @@ -127,16 +128,7 @@ class AddNewReleaseFormComponent extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin+ '/publisher/login'; - } else { - notification["error"]({ - message: "Something went wrong!", - description: - "Sorry, we were unable to complete your request.", - }); - - } + handleApiError(error, "Sorry, we were unable to complete your request."); this.setState({ loading: false }); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js index f8e4425e8d8..9cbc439bba7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js @@ -20,12 +20,11 @@ import {message, notification} from "antd"; export const handleApiError = (error, message) => { if (error.hasOwnProperty("response") && error.response.status === 401) { - message.error('You are not logged in'); window.location.href = window.location.origin + '/publisher/login'; } else { notification["error"]({ message: "There was a problem", - duration: 0, + duration: 10, description: message, }); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js index 82d4c3021ec..1973099955a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js @@ -22,6 +22,7 @@ import './Login.css'; import axios from 'axios'; import "./Login.css"; import {withConfigContext} from "../context/ConfigContext"; +import {handleApiError} from "../js/Utils"; const {Title} = Typography; const {Text} = Typography; @@ -101,18 +102,7 @@ class NormalLoginForm extends React.Component { window.location = window.location.origin+"/publisher"; } }).catch(function (error) { - if (error.hasOwnProperty("response") && error.response.status === 400) { - thisForm.setState({ - inValid: true - }); - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to login.", - }); - } + handleApiError(error, "Error occurred while trying to login."); thisForm.setState({ loading: false }); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js deleted file mode 100644 index 1088ce4d8ca..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/components/AddTagModal.js +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. - * - * Entgra (pvt) Ltd. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from "react"; -import { Upload, Icon, Modal} from 'antd'; - - -class AddTagModal extends React.Component { - state = { - previewVisible: false, - previewImage: '', - fileList: [], - }; - - handleCancel = () => this.setState({ previewVisible: false }); - - handlePreview = (file) => { - this.setState({ - previewImage: file.url || file.thumbUrl, - previewVisible: true, - }); - }; - - handleChange = ({ fileList }) => this.setState({ fileList }); - - render() { - const { previewVisible, previewImage, fileList } = this.state; - const uploadButton = ( -
- -
Upload
-
- ); - return ( -
- - {fileList.length >= 3 ? null : uploadButton} - - - example - -
- ); - } -} -export default AddTagModal; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js index de480c0c5d6..248fca92aee 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js @@ -27,8 +27,6 @@ class Apps extends React.Component { } - - render() { return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js index 27439bd6dab..06a6d89f6ca 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js @@ -23,6 +23,7 @@ import axios from 'axios'; import ReleaseView from "../../../../components/apps/release/ReleaseView"; import LifeCycle from "../../../../components/apps/release/lifeCycle/LifeCycle"; import {withConfigContext} from "../../../../context/ConfigContext"; +import {handleApiError} from "../../../../js/Utils"; const {Title} = Typography; @@ -87,18 +88,7 @@ class Release extends React.Component { } }).catch((error) => { - if (error.hasOwnProperty("response") && error.response.status === 401) { - //todo display a popop with error - message.error('You are not logged in'); - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load the release.", - }); - } + handleApiError(error, "Error occurred while trying to load the release."); this.setState({loading: false}); }); @@ -118,16 +108,7 @@ class Release extends React.Component { } }).catch(function (error) { - if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to load lifecycle configuration.", - }); - } + handleApiError(error, "Error occurred while trying to load lifecycle configuration."); }); }; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js index 1c3fbcf50a3..26e0e89bb6e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js @@ -52,7 +52,6 @@ class Logout extends React.Component { window.location = window.location.origin + "/publisher/login"; } }).catch(function (error) { - if (error.hasOwnProperty("response") && error.response.status === 400) { thisForm.setState({ inValid: true diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js index 087b58caffa..bd4ad771e8c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js @@ -37,6 +37,7 @@ import {withConfigContext} from "../../../../../context/ConfigContext"; import axios from "axios"; import Cluster from "../../../../../components/manage/android-enterprise/Pages/Cluster/Cluster"; import EditLinks from "../../../../../components/manage/android-enterprise/Pages/EditLinks/EditLinks"; +import {handleApiError} from "../../../../../js/Utils"; const {Option} = Select; const {Title, Text} = Typography; @@ -110,18 +111,7 @@ class Page 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'; - } else { - notification["error"]({ - message: "There was a problem", - duration: 0, - description: - "Error occurred while trying to save the page name.", - }); - } - + handleApiError(error, "Error occurred while trying to save the page name."); this.setState({loading: false}); }); } From 2e690892d5a7cec976dffe4918ab77a0718ba4b0 Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Sun, 6 Oct 2019 17:06:26 +0530 Subject: [PATCH 3/4] Fix app name length issue in APPM Store --- .../apps/release/edit-release/EditRelease.js | 42 +++++++++++-------- .../react-app/src/js/Utils.js | 5 ++- .../react-app/src/pages/Login.js | 9 +++- .../src/pages/dashboard/Dashboard.js | 9 +++- .../react-app/src/components/apps/AppCard.css | 7 ++++ .../react-app/src/components/apps/AppCard.js | 2 +- .../react-app/src/js/Utils.js | 2 +- 7 files changed, 51 insertions(+), 25 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js index 9ad5f239f05..ecc6000ffe9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js @@ -117,7 +117,7 @@ class EditReleaseModal extends React.Component { showModal = () => { - const {release} = this.props; + const {app, release} = this.props; const {formConfig} = this.state; const {specificElements} = formConfig; let metaData = []; @@ -143,6 +143,14 @@ class EditReleaseModal extends React.Component { } }); + // if (specificElements.hasOwnProperty("packageName")) { + // this.props.form.setFields({ + // packageName: { + // value: app.packageName + // } + // }); + // } + if (specificElements.hasOwnProperty("version")) { this.props.form.setFields({ version: { @@ -238,10 +246,10 @@ class EditReleaseModal extends React.Component { if (specificElements.hasOwnProperty("url")) { release.url = values.url; } - - if (specificElements.hasOwnProperty("packageName")) { - release.packageName = values.packageName; - } + // + // if (specificElements.hasOwnProperty("packageName")) { + // release.packageName = values.packageName; + // } if (icons.length === 1) { data.append('icon', icons[0].originFileObj); @@ -362,18 +370,18 @@ class EditReleaseModal extends React.Component { )} - {formConfig.specificElements.hasOwnProperty("packageName") && ( - - {getFieldDecorator('packageName', { - rules: [{ - required: true, - message: 'Please input the package name' - }], - })( - - )} - - )} + {/*{formConfig.specificElements.hasOwnProperty("packageName") && (*/} + {/* */} + {/* {getFieldDecorator('packageName', {*/} + {/* rules: [{*/} + {/* required: true,*/} + {/* message: 'Please input the package name'*/} + {/* }],*/} + {/* })(*/} + {/* */} + {/* )}*/} + {/* */} + {/*)}*/} {formConfig.specificElements.hasOwnProperty("url") && ( diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js index 9cbc439bba7..2ef4f8bf0f6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js @@ -16,11 +16,12 @@ * under the License. */ -import {message, notification} from "antd"; +import {notification} from "antd"; export const handleApiError = (error, message) => { if (error.hasOwnProperty("response") && error.response.status === 401) { - window.location.href = window.location.origin + '/publisher/login'; + const redirectUrl = encodeURI(window.location.href); + window.location.href = window.location.origin + `/publisher/login?redirect=${redirectUrl}`; } 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/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js index 1973099955a..63ea79f8ca1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js @@ -99,7 +99,12 @@ class NormalLoginForm extends React.Component { axios.post(window.location.origin+ config.serverConfig.loginUri, request ).then(res=>{ if (res.status === 200) { - window.location = window.location.origin+"/publisher"; + let redirectUrl = window.location.origin+"/publisher"; + const searchParams = new URLSearchParams(window.location.search); + if(searchParams.has("redirect")){ + redirectUrl = searchParams.get("redirect"); + } + window.location = redirectUrl; } }).catch(function (error) { handleApiError(error, "Error occurred while trying to login."); @@ -152,7 +157,7 @@ class NormalLoginForm extends React.Component { )}
Forgot password - diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js index 5cd6ce5de52..044851a503a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js @@ -81,12 +81,12 @@ class Dashboard extends React.Component { > - Public APP + Public App - Enterprise APP + Enterprise App @@ -94,6 +94,11 @@ class Dashboard extends React.Component { Web Clip + + + Custom App + + */} - {app.name}
+ {app.name}
{app.subMethod.toLowerCase()}
{ } else { notification["error"]({ message: "There was a problem", - duration: 0, + duration: 10, description: message, }); } From ff875c3330f477ac088a594fe4fe77aaafc75acd Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Sun, 6 Oct 2019 20:29:17 +0530 Subject: [PATCH 4/4] Add scheduled install/uninstall feature to APPM store ui --- .../components/apps/release/ReleaseView.js | 11 ++- .../apps/release/install/DeviceInstall.js | 25 +++-- .../apps/release/install/DeviceUninstall.js | 86 ++++++++--------- .../apps/release/install/GroupInstall.js | 5 +- .../apps/release/install/GroupUninstall.js | 20 ++-- .../apps/release/install/RoleInstall.js | 9 +- .../apps/release/install/RoleUninstall.js | 10 +- .../apps/release/install/UserInstall.js | 9 +- .../apps/release/install/UserUninstall.js | 63 ++++++------- .../installModalFooter/InstallModalFooter.js | 94 +++++++++++++++++++ .../react-app/src/js/Utils.js | 2 +- 11 files changed, 209 insertions(+), 125 deletions(-) create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js 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 33d6afaca8c..690a71f01df 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 @@ -42,7 +42,7 @@ class ReleaseView extends React.Component { } } - appOperation = (type, payload, operation) => { + appOperation = (type, payload, operation, timestamp=null) => { const config = this.props.context; const release = this.props.app.applicationReleases[0]; const {uuid} = release; @@ -50,7 +50,11 @@ class ReleaseView extends React.Component { this.setState({ loading: true, }); - const url = window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + type + "/" + operation; + let url = window.location.origin+ config.serverConfig.invoker.uri + + config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + type + "/" + operation; + if(timestamp!= null){ + url += `?timestamp=${timestamp}`; + } axios.post( url, payload, @@ -61,7 +65,8 @@ class ReleaseView extends React.Component { if (res.status === 200) { this.setState({ loading: false, - appInstallModalVisible: false + appInstallModalVisible: false, + appUnInstallModalVisible: false, }); notification["success"]({ message: 'Done!', diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js index 14fbb0ce670..3e67c54c033 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js @@ -18,13 +18,14 @@ import React from "react"; import axios from "axios"; -import {Button, message, notification, Table, Typography} from "antd"; +import {Button, message, DatePicker, Table, Typography} from "antd"; import TimeAgo from 'javascript-time-ago' // Load locale-specific relative date/time formatting rules. import en from 'javascript-time-ago/locale/en' import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const columns = [ @@ -109,7 +110,9 @@ class DeviceInstall extends React.Component { data: [], pagination: {}, loading: false, - selectedRows: [] + selectedRows: [], + scheduledTime: null, + isScheduledInstallVisible: false }; } @@ -147,7 +150,7 @@ class DeviceInstall extends React.Component { if (deviceType !== 'ANY') { extraParams.type = deviceType; } - + // note: encode with '%26' not '&' const encodedExtraParams = Object.keys(extraParams).map(key => key + '=' + extraParams[key]).join('&'); @@ -163,11 +166,10 @@ class DeviceInstall extends React.Component { data: res.data.data.devices, pagination, }); - } }).catch((error) => { - handleApiError(error,"Error occurred while trying to load devices."); + handleApiError(error, "Error occurred while trying to load devices."); this.setState({loading: false}); }); }; @@ -187,7 +189,7 @@ class DeviceInstall extends React.Component { }); }; - install = () => { + install = (timestamp=null) => { const {selectedRows} = this.state; const payload = []; selectedRows.map(device => { @@ -196,11 +198,11 @@ class DeviceInstall extends React.Component { type: device.type }); }); - this.props.onInstall("devices", payload, "install"); + this.props.onInstall("devices", payload, "install",timestamp); }; render() { - const {data, pagination, loading, selectedRows} = this.state; + const {data, pagination, loading, selectedRows, scheduledTime,isScheduledInstallVisible} = this.state; return (
@@ -224,12 +226,7 @@ class DeviceInstall extends React.Component { rowSelection={this.rowSelection} scroll={{x: 1000}} /> -
- -
+
); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js index f9d30db39fc..c590608fb87 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js @@ -18,13 +18,14 @@ import React from "react"; import axios from "axios"; -import {Button,Table, Typography} from "antd"; +import {Button, Select, Table, Typography} from "antd"; import TimeAgo from 'javascript-time-ago' // Load locale-specific relative date/time formatting rules. import en from 'javascript-time-ago/locale/en' import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const columns = [ @@ -115,8 +116,8 @@ class DeviceUninstall extends React.Component { rowSelection = { onChange: (selectedRowKeys, selectedRows) => { this.setState({ - selectedRows: selectedRows - }) + selectedRows: selectedRows + }) }, getCheckboxProps: record => ({ disabled: record.name === 'Disabled User', // Column configuration not to be checked @@ -151,7 +152,7 @@ class DeviceUninstall extends React.Component { const uuid = this.props.uuid; axios.get( - window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/subscription/" + uuid + "/"+ + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + "/devices?" + encodedExtraParams, ).then(res => { if (res.status === 200) { @@ -163,7 +164,7 @@ class DeviceUninstall extends React.Component { }); } }).catch((error) => { - handleApiError(error,"Error occurred while trying to load devices."); + handleApiError(error, "Error occurred while trying to load devices."); this.setState({loading: false}); }); }; @@ -172,59 +173,54 @@ class DeviceUninstall extends React.Component { const pager = {...this.state.pagination}; pager.current = pagination.current; this.setState({ - pagination: pager, - }); + pagination: pager, + }); this.fetch({ - results: pagination.pageSize, - page: pagination.current, - sortField: sorter.field, - sortOrder: sorter.order, - ...filters, - }); + results: pagination.pageSize, + page: pagination.current, + sortField: sorter.field, + sortOrder: sorter.order, + ...filters, + }); }; - uninstall = () => { + uninstall = (timestamp = null) => { const {selectedRows} = this.state; const payload = []; selectedRows.map(device => { payload.push({ - id: device.deviceIdentifier, - type: device.type - }); + id: device.deviceIdentifier, + type: device.type + }); }); - this.props.onUninstall("devices", payload, "uninstall"); + this.props.onUninstall("devices", payload, "uninstall", null); }; render() { const {data, pagination, loading, selectedRows} = this.state; return ( -
- - Start uninstalling the application for devices by selecting the corresponding devices. - Select uninstall to automatically start uninstalling the application for the respective devices. - - record.deviceIdentifier} - dataSource={data} - pagination={{ - ...pagination, - size: "small", - showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices` - }} - loading={loading} - onChange={this.handleTableChange} - rowSelection={this.rowSelection} - scroll={{x: 1000}} - /> -
- -
- +
+ + Start uninstalling the application for devices by selecting the corresponding devices. + Select uninstall to automatically start uninstalling the application for the respective devices. + +
record.deviceIdentifier} + dataSource={data} + pagination={{ + ...pagination, + size: "small", + showTotal: (total, range) => `showing ${range[0]}-${range[1]} of ${total} devices` + }} + loading={loading} + onChange={this.handleTableChange} + rowSelection={this.rowSelection} + scroll={{x: 1000}} + /> + + ); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js index 47d3b628c46..be8c598a234 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -112,9 +113,7 @@ class GroupInstall extends React.Component { ))} -
- -
+ ); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js index f3aeebc9748..014d37105dc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -75,19 +76,19 @@ class GroupUninstall extends React.Component { handleChange = value => { this.setState({ - value, - data: [], - fetching: false, - }); + value, + data: [], + fetching: false, + }); }; - install = () =>{ + uninstall = (timestamp=null) =>{ const {value} = this.state; const data = []; value.map(val=>{ data.push(val.key); }); - this.props.onInstall("group", data, "uninstall"); + this.props.onUninstall("group", data, "uninstall",null); }; render() { @@ -108,15 +109,12 @@ class GroupUninstall extends React.Component { filterOption={false} onSearch={this.fetchUser} onChange={this.handleChange} - style={{width: '100%'}} - > + style={{width: '100%'}}> {data.map(d => ( ))} -
- -
+ ); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js index b9edba286e0..276ba34ab37 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -79,13 +80,13 @@ class RoleInstall extends React.Component { }); }; - install = () =>{ + install = (timestamp=null) =>{ const {value} = this.state; const data = []; value.map(val=>{ data.push(val.key); }); - this.props.onInstall("role", data, "install"); + this.props.onInstall("role", data, "install", timestamp); }; render() { @@ -112,9 +113,7 @@ class RoleInstall extends React.Component { ))} -
- -
+ ); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js index 53c3a6c5574..83e27f920c1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -80,17 +81,16 @@ class RoleUninstall extends React.Component { }); }; - install = () =>{ + uninstall = (timestamp=null) =>{ const {value} = this.state; const data = []; value.map(val=>{ data.push(val.key); }); - this.props.onInstall("role", data, "uninstall"); + this.props.onUninstall("role", data, "uninstall",null); }; render() { - const {fetching, data, value} = this.state; return ( @@ -113,9 +113,7 @@ class RoleUninstall extends React.Component { ))} -
- -
+ ); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js index 7be794f9ae2..82f91bddff4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -81,13 +82,13 @@ class UserInstall extends React.Component { }); }; - install = () => { + install = (timestamp=null) => { const {value} = this.state; const data = []; value.map(val => { data.push(val.key); }); - this.props.onInstall("user", data, "install"); + this.props.onInstall("user", data, "install",timestamp); }; render() { @@ -112,9 +113,7 @@ class UserInstall extends React.Component { ))} -
- -
+ ); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js index 5c68455abdc..73786afca25 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js @@ -22,6 +22,7 @@ import debounce from 'lodash.debounce'; import axios from "axios"; import {withConfigContext} from "../../../../context/ConfigContext"; import {handleApiError} from "../../../../js/Utils"; +import InstallModalFooter from "./installModalFooter/InstallModalFooter"; const {Text} = Typography; const {Option} = Select; @@ -49,9 +50,8 @@ class UserUninstall extends React.Component { const uuid = this.props.uuid; axios.get( - window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.store+ "/subscription/" + uuid + "/"+ - "/USER?", - + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/subscription/" + uuid + "/" + + "/USER?", ).then(res => { if (res.status === 200) { if (fetchId !== this.lastFetchId) { @@ -67,54 +67,53 @@ class UserUninstall extends React.Component { } }).catch((error) => { - handleApiError(error,"Error occurred while trying to load users."); + handleApiError(error, "Error occurred while trying to load users."); this.setState({fetching: false}); }); }; handleChange = value => { this.setState({ - value, - data: [], - fetching: false, - }); + value, + data: [], + fetching: false, + }); }; - uninstall = () => { + uninstall = (timestamp=null) => { const {value} = this.state; const data = []; value.map(val => { data.push(val.key); }); - this.props.onUninstall("user", data, "uninstall"); + this.props.onUninstall("user", data, "uninstall",null); }; render() { const {fetching, data, value} = this.state; return ( -
- Start uninstalling the application for one or more users by entering the corresponding user name. Select uninstall to automatically start uninstalling the application for the respective user/users. -

Select users

- -
- -
-
+
+ Start uninstalling the application for one or more users by entering the corresponding user name. + Select uninstall to automatically start uninstalling the application for the respective + user/users. +

Select users

+ + +
); } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js new file mode 100644 index 00000000000..72552dfc7a5 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * + * Entgra (pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React from "react"; +import {Button, DatePicker} from "antd"; + +class InstallModalFooter extends React.Component{ + constructor(props) { + super(props); + this.state={ + scheduledTime: null, + isScheduledInstallVisible: false + } + } + + onDateTimeChange = (value, dateString) => { + this.setState({ + scheduledTime: dateString + }); + }; + + showScheduledInstall = ()=>{ + this.setState({ + isScheduledInstallVisible: true + }) + }; + + hideScheduledInstall = ()=>{ + this.setState({ + isScheduledInstallVisible: false + }) + }; + + render() { + const {scheduledTime,isScheduledInstallVisible} =this.state; + const {disabled, type} = this.props; + return ( +
+
+ + +
+
+ + + +
+
+ ); + } +} + +export default InstallModalFooter; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/js/Utils.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/js/Utils.js index 1850d221327..9bb8c4a521e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/js/Utils.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/js/Utils.js @@ -25,7 +25,7 @@ export const handleApiError = (error, message) => { } else { notification["error"]({ message: "There was a problem", - duration: 10, + duration: 2, description: message, }); }