diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/BulkActionBar.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/BulkActionBar.js new file mode 100644 index 0000000000..4964d4d9cb --- /dev/null +++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/BulkActionBar.js @@ -0,0 +1,85 @@ +/* + * 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, Icon, notification} from "antd"; + +class BulkActionBar extends React.Component { + + constructor(props){ + super(props); + this.state = { + selectedMultiple:false, + selectedSingle:false + } + } + + //This method is used to trigger delete request on selected devices + deleteDevice = () => { + const deviceStatusArray = this.props.selectedRows.map(obj => obj.enrolmentInfo.status); + if(deviceStatusArray.includes("ACTIVE") || deviceStatusArray.includes("INACTIVE")){ + notification["error"]({ + message: "There was a problem", + duration: 0, + description: + "Cannot delete ACTIVE/INACTIVE devices.", + }); + }else{ + this.props.deleteDevice(); + } + } + + componentDidUpdate(prevProps, prevState, snapshot) { + if(prevProps.selectedRows !== this.props.selectedRows){ + if(this.props.selectedRows.length > 1){ + this.setState({selectedMultiple:true,selectedSingle:false}) + }else if(this.props.selectedRows.length == 1){ + this.setState({selectedSingle:true,selectedMultiple:true}) + }else{ + this.setState({selectedSingle:false,selectedMultiple:false}) + } + } + } + + render() { + return( +
+ + + +
+ ) + } +} + +export default BulkActionBar; \ No newline at end of file diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/DevicesTable.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/DevicesTable.js index d9caa0a984..7a096a2147 100644 --- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/DevicesTable.js +++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Devices/DevicesTable.js @@ -24,6 +24,7 @@ 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 BulkActionBar from "./BulkActionBar"; const {Text} = Typography; @@ -158,17 +159,6 @@ class DeviceTable extends React.Component { this.fetch(); } - componentDidUpdate(prevProps, prevState, snapshot) { - if(prevProps.deleteRequest !== this.props.deleteRequest){ - this.deleteDevice(); - } - if(prevProps.deselectRequest !== this.props.deselectRequest){ - this.rowSelection.getCheckboxProps = record => ({ - disabled: record.enrolmentInfo.status !== 'REMOVED' // Column configuration not to be checked - }) - } - } - //fetch data from api fetch = (params = {}) => { const config = this.props.context; @@ -222,19 +212,19 @@ class DeviceTable extends React.Component { const config = this.props.context; this.setState({loading: true}); - const deviceData = JSON.stringify(this.state.deviceIds); + const deviceData = this.state.deviceIds; //send request to the invoker - axios.delete( + axios.put( window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt + "/admin/devices/permanent-delete", - { - headers:{'Content-Type': 'application/json; charset=utf-8'} , - data: deviceData - }, + deviceData, + { headers : {'Content-Type': 'application/json'}} + ).then(res => { if (res.status === 200) { + this.fetch(); const pagination = {...this.state.pagination}; this.setState({ loading: false, @@ -242,7 +232,6 @@ class DeviceTable extends React.Component { pagination, }); } - }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { //todo display a popop with error @@ -253,7 +242,7 @@ class DeviceTable extends React.Component { message: "There was a problem", duration: 0, description: - "Error occurred while trying to load devices.", + "Error occurred while trying to delete devices.", }); } @@ -280,6 +269,9 @@ class DeviceTable extends React.Component { const {data, pagination, loading, selectedRows} = this.state; return (
+ (record.deviceIdentifier + record.enrolmentInfo.owner + record.enrolmentInfo.ownership)} diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Dashboard/Devices/Devices.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Dashboard/Devices/Devices.js index b7728680b4..f78f1c89f9 100644 --- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Dashboard/Devices/Devices.js +++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Dashboard/Devices/Devices.js @@ -35,32 +35,6 @@ class Devices extends React.Component { constructor(props) { super(props); this.routes = props.routes; - this.state = { - deselectRequest:false, - deleteRequest:false, - deleteButtonDisabled:true, - displayDeleteButton:'none', - selected:"Actions" - } - this.deleteCall = this.deleteCall.bind(this); - this.cancelDelete = this.cancelDelete.bind(this); - } - - //This method is used to trigger delete request on selected devices - deleteCall = () => { - this.setState({deleteRequest:!this.state.deleteRequest}); - } - - //This method is used to cancel deletion - cancelDelete = () => { - this.setState({displayDeleteButton:'none' , deleteRequest:false}) - } - - //When delete action is selected, this method is called and devices which aren't in REMOVED state becomes unselectable - onChange = value => { - this.setState( - {displayDeleteButton:'inline' , deselectRequest:!this.state.deselectRequest - }); } render() { @@ -77,49 +51,9 @@ class Devices extends React.Component {

Devices

Lorem ipsum dolor sit amet, est similique constituto at, quot inermis id mel, an illud incorrupte nam. -
-
- - - - - - - -
- - - . - - -
-
- +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java index ca8bdcf5f6..1ac3169189 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java @@ -248,12 +248,12 @@ public interface DeviceManagementAdminService { required = true) List deviceIdentifiers); - @DELETE + @PUT @Path("/permanent-delete") @ApiOperation( produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, - httpMethod = "DELETE", + httpMethod = "PUT", value = "Permanently remove the Device Specified by the Device ID", notes = "Returns the status of the permanently deleted device operation and the details of the deleted device.", tags = "Device Management", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java index 301a5d0dfc..4b30cb4112 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java @@ -136,7 +136,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe } } - @DELETE + @PUT @Override @Path("/permanent-delete") public Response deleteDevicesPermanently(List deviceIdentifiers) {