{this.controllerBar()}
- {locationData.length > 0 ? (
-
+ {locationHistorySnapshots.length > 0 ? (
+
) : (
)}
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Geo/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Geo/index.js
index e82b13133b..c313b91252 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Geo/index.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Geo/index.js
@@ -32,6 +32,7 @@ class Geo extends React.Component {
}
render() {
+ const { deviceIdentifier, deviceType } = this.props.match.params;
return (
@@ -41,11 +42,14 @@ class Geo extends React.Component {
Home
- Geo
+
+ Devices
+
+ {`Location History - ${deviceType} / ${deviceIdentifier}`}
-
Geo
-
Geo Location Service
+
Location History
+
{`${deviceType} / ${deviceIdentifier}`}
-
+
);
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/Components/NotificationsTable/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/Components/NotificationsTable/index.js
new file mode 100644
index 0000000000..2b5b2bfc66
--- /dev/null
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/Components/NotificationsTable/index.js
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2020, 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 axios from 'axios';
+import { Icon, Table } 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 '../../../../../../components/ConfigContext';
+import { handleApiError } from '../../../../../../services/utils/errorHandler';
+
+let config = null;
+
+const columns = [
+ {
+ title: 'Device',
+ dataIndex: 'deviceName',
+ width: 100,
+ sorter: (a, b) => a.deviceName.localeCompare(b.deviceName),
+ },
+ {
+ title: 'Type',
+ dataIndex: 'deviceType',
+ key: 'type',
+ // eslint-disable-next-line react/display-name
+ render: type => {
+ const defaultPlatformIcons = config.defaultPlatformIcons;
+ let icon = defaultPlatformIcons.default.icon;
+ let color = defaultPlatformIcons.default.color;
+ let theme = defaultPlatformIcons.default.theme;
+
+ if (defaultPlatformIcons.hasOwnProperty(type)) {
+ icon = defaultPlatformIcons[type].icon;
+ color = defaultPlatformIcons[type].color;
+ theme = defaultPlatformIcons[type].theme;
+ }
+
+ return (
+
+
+
+ );
+ },
+ },
+ {
+ title: 'Description',
+ dataIndex: 'description',
+ key: 'description',
+ },
+];
+
+class NotificationsTable extends React.Component {
+ constructor(props) {
+ super(props);
+ config = this.props.context;
+ TimeAgo.addLocale(en);
+ this.state = {
+ data: [],
+ pagination: {},
+ loading: false,
+ selectedRows: [],
+ paramsObj: {},
+ };
+ }
+
+ rowSelection = {
+ onChange: (selectedRowKeys, selectedRows) => {
+ this.setState({
+ selectedRows: selectedRows,
+ });
+ },
+ };
+
+ componentDidMount() {
+ this.fetchData();
+ }
+
+ // Rerender component when parameters change
+ componentDidUpdate(prevProps, prevState, snapshot) {
+ if (prevProps.notificationType !== this.props.notificationType) {
+ this.fetchData();
+ }
+ }
+
+ // fetch data from api
+ fetchData = (params = {}) => {
+ // const policyReportData = this.props;
+ this.setState({ loading: true });
+ // get current page
+ const currentPage = params.hasOwnProperty('page') ? params.page : 1;
+
+ let extraParams;
+
+ extraParams = {
+ offset: 10 * (currentPage - 1), // calculate the offset
+ limit: 10,
+ };
+
+ const encodedExtraParams = Object.keys(extraParams)
+ .map(key => key + '=' + extraParams[key])
+ .join('&');
+
+ let apiUrl;
+
+ if (this.props.notificationType === 'unread') {
+ apiUrl =
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.deviceMgt +
+ '/notifications?status=NEW&' +
+ encodedExtraParams;
+ } else {
+ apiUrl =
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.deviceMgt +
+ '/notifications?' +
+ encodedExtraParams;
+ }
+
+ // send request to the invoker
+ axios
+ .get(apiUrl)
+ .then(res => {
+ if (res.status === 200) {
+ const pagination = { ...this.state.pagination };
+ this.setState({
+ loading: false,
+ data: res.data.data,
+ pagination,
+ });
+ }
+ })
+ .catch(error => {
+ handleApiError(error, 'Error occurred while trying to load devices.');
+ this.setState({ loading: false });
+ });
+ };
+
+ handleTableChange = (pagination, filters, sorter) => {
+ const pager = { ...this.state.pagination };
+ pager.current = pagination.current;
+ this.setState({
+ pagination: pager,
+ });
+ this.fetchData({
+ results: pagination.pageSize,
+ page: pagination.current,
+ sortField: sorter.field,
+ sortOrder: sorter.order,
+ ...filters,
+ });
+ };
+
+ render() {
+ let { data, pagination, loading } = this.state;
+
+ return (
+
+
record.id}
+ dataSource={data.notifications}
+ pagination={{
+ ...pagination,
+ size: 'small',
+ // position: "top",
+ total: data.count,
+ showTotal: (total, range) =>
+ `showing ${range[0]}-${range[1]} of ${total} notifications`,
+ }}
+ loading={loading}
+ onChange={this.handleTableChange}
+ rowSelection={this.rowSelection}
+ />
+
+ );
+ }
+}
+
+export default withConfigContext(NotificationsTable);
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/index.js
new file mode 100644
index 0000000000..456c3a9dab
--- /dev/null
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Notifications/index.js
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2020, 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 {
+ message,
+ notification,
+ Button,
+ PageHeader,
+ Breadcrumb,
+ Icon,
+ Radio,
+} from 'antd';
+import { withConfigContext } from '../../../../components/ConfigContext';
+import axios from 'axios';
+import { Link } from 'react-router-dom';
+
+import NotificationsTable from './Components/NotificationsTable';
+
+class Notifications extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ visible: false,
+ data: [],
+ notificationType: 'all',
+ };
+ }
+
+ handleModeChange = e => {
+ const notificationType = e.target.value;
+ this.setState({ notificationType });
+ };
+
+ clearNotifications = () => {
+ const config = this.props.context;
+ axios
+ .put(
+ window.location.origin +
+ config.serverConfig.invoker.uri +
+ config.serverConfig.invoker.deviceMgt +
+ '/notifications/clear-all',
+ { 'Content-Type': 'application/json; charset=utf-8' },
+ )
+ .then(res => {
+ if (res.status === 200) {
+ notification.success({
+ message: 'Done',
+ duration: 0,
+ description: 'All notifications are cleared.',
+ });
+ }
+ })
+ .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 + '/entgra/login';
+ } else {
+ notification.error({
+ message: 'There was a problem',
+ duration: 0,
+ description: 'Error occurred while trying to clear notifications.',
+ });
+ }
+ });
+ };
+
+ render() {
+ const { notificationType } = this.state;
+ return (
+
+
+
+
+
+ Home
+
+
+ Notifications
+
+
+
DEVICE NOTIFICATIONS
+
+ All Notifications
+ Unread Notifications
+
+
+
+
+
+
+
+
+
+
+ Set User role(s)
+ Set User(s)
+
+
+
+ {getFieldDecorator('roles', {
+ initialValue: 'ANY',
+ })(
+ ,
+ )}
+
+
+
+
+ {getFieldDecorator('users', {})(
+ ,
+ )}
+
+
+
+
+ {getFieldDecorator('deviceGroups', {
+ initialValue: 'NONE',
+ })(
+ ,
+ )}
+
+
+
+
+
+
+
+