fixed spelling

.github/workflows/dockerpublish.yml

@@ -5,7 +5,6 @@ on:
     # Publish `master` as Docker `latest` image.
     branches:
       - master
-      - 'release/**'
 
     # Publish `v1.2.3` tags as releases.
     tags:
@@ -15,8 +14,8 @@ on:
   pull_request:
 
   schedule:
-    # runs nightly build at 5AM
+      # runs nightly build at 5AM
-    - cron: '00 09 * * *'
+      - cron:  '00 09 * * *'
 
 env:
   IMAGE_NAME: wlan-cloud-ui
@@ -49,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Adding property file with component version and commit hash
+      - name: Adding property file with component version and commit hash 
         run: |
           # Strip git ref prefix from version
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
@@ -57,11 +56,8 @@ jobs:
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
-          # Create a release snapshot if we are on release branch
-          [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
-
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=1.3.0-SNAPSHOT
+          [ "$VERSION" == "master" ] && VERSION=latest
 
           TIMESTAMP=$(date +'%Y-%m-%d')
 
@@ -92,11 +88,8 @@ jobs:
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
-          # Create a release snapshot if we are on release branch
-          [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
-
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=1.3.0-SNAPSHOT
+          [ "$VERSION" == "master" ] && VERSION=latest
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
@@ -104,6 +97,6 @@ jobs:
 
           docker tag image $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
-
+          
           docker tag image $IMAGE_ID:$VERSION-$TIMESTAMP
-          docker push $IMAGE_ID:$VERSION-$TIMESTAMP
+          docker push $IMAGE_ID:$VERSION-$TIMESTAMP          

app/components/UsersDropdown/index.js

@@ -0,0 +1,58 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import { Popover, Row } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+
+import styles from './index.module.scss';
+
+const UsersDropdown = ({ onLogout }) => {
+  const [popoverVisible, setPopoverVisible] = useState(false);
+
+  const hidePopover = () => {
+    setPopoverVisible(false);
+  };
+
+  const handleVisibleChange = visible => {
+    setPopoverVisible(visible);
+  };
+
+  const userOptions = (
+    <>
+      <Row>
+        <Link onClick={hidePopover} to="/account">
+          Account
+        </Link>
+      </Row>
+      <Row>
+        <Link onClick={onLogout} to="/">
+          Log Out
+        </Link>
+      </Row>
+    </>
+  );
+
+  return (
+    <Popover
+      content={userOptions}
+      trigger="click"
+      getPopupContainer={e => e.parentElement}
+      visible={popoverVisible}
+      onVisibleChange={handleVisibleChange}
+      placement="bottomRight"
+      arrowPointAtCenter
+    >
+      <UserOutlined className={styles.MenuIcon} />
+    </Popover>
+  );
+};
+
+UsersDropdown.propTypes = {
+  onLogout: PropTypes.func,
+};
+
+UsersDropdown.defaultProps = {
+  onLogout: () => {},
+};
+
+export default UsersDropdown;

app/components/UsersDropdown/index.module.scss

@@ -0,0 +1,7 @@
+.MenuIcon {
+    cursor: pointer;
+    font-size: 18px;
+    line-height: 64px;
+    padding: 0 24px;
+  }
+  

app/constants/index.js

@@ -3,9 +3,9 @@ export const COMPANY = 'Telecom Infra Project';
 
 export const USER_FRIENDLY_RADIOS = {
   is2dot4GHz: '2.4GHz',
-  is5GHz: '5GHz',
   is5GHzL: '5GHz (L)',
   is5GHzU: '5GHz (U)',
+  is5GHz: '5GHz',
 };
 
 export const ROUTES = {

app/containers/Accounts/index.js

@@ -95,7 +95,7 @@ const Accounts = () => {
     }
   };
 
-  const handleCreateUser = ({ email, password, roles }) => {
+  const handleCreateUser = (email, password, roles) => {
     createUser({
       variables: {
         username: email,
@@ -119,7 +119,7 @@ const Accounts = () => {
       );
   };
 
-  const handleEditUser = ({ id, email, password, roles, lastModifiedTimestamp }) => {
+  const handleEditUser = (id, email, password, roles, lastModifiedTimestamp) => {
     updateUser({
       variables: {
         id,

app/containers/AddProfile/index.js

@@ -4,11 +4,10 @@ import { useMutation, useQuery, gql } from '@apollo/client';
 import { notification } from 'antd';
 import { useHistory } from 'react-router-dom';
 
-import { ROUTES, AUTH_TOKEN } from 'constants/index';
+import { ROUTES } from 'constants/index';
 import UserContext from 'contexts/UserContext';
-import { GET_ALL_PROFILES, GET_API_URL } from 'graphql/queries';
+import { GET_ALL_PROFILES } from 'graphql/queries';
-import { fetchMoreProfiles } from 'graphql/functions';
+import { updateQueryGetAllProfiles } from 'graphql/functions';
-import { getItem } from 'utils/localStorage';
 
 const CREATE_PROFILE = gql`
   mutation CreateProfile(
@@ -36,58 +35,27 @@ const CREATE_PROFILE = gql`
 
 const AddProfile = () => {
   const { customerId } = useContext(UserContext);
-
-  const { data: apiUrl } = useQuery(GET_API_URL);
-
   const { data: ssidProfiles, fetchMore } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'ssid' },
-    fetchPolicy: 'network-only',
   });
-  const { data: radiusProfiles, fetchMore: fetchMoreRadiusProfiles } = useQuery(
-    GET_ALL_PROFILES(),
-    {
-      variables: { customerId, type: 'radius' },
-      fetchPolicy: 'network-only',
-    }
-  );
-  const { data: captiveProfiles, fetchMore: fetchMoreCaptiveProfiles } = useQuery(
-    GET_ALL_PROFILES(),
-    {
-      variables: { customerId, type: 'captive_portal' },
-      fetchPolicy: 'network-only',
-    }
-  );
   const { data: venueProfiles, fetchMore: fetchMoreVenueProfiles } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'passpoint_venue' },
-    fetchPolicy: 'network-only',
   });
   const { data: operatorProfiles, fetchMore: fetchMoreOperatorProfiles } = useQuery(
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'passpoint_operator' },
-      fetchPolicy: 'network-only',
     }
   );
   const { data: idProviderProfiles, fetchMore: fetchMoreIdProviderProfiles } = useQuery(
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'passpoint_osu_id_provider' },
-      fetchPolicy: 'network-only',
     }
   );
   const { data: rfProfiles, fetchMore: fetchMoreRfProfiles } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'rf' },
-    fetchPolicy: 'network-only',
   });
-
-  const { data: passpointProfiles, fetchMore: fetchMorePasspointProfiles } = useQuery(
-    GET_ALL_PROFILES(),
-    {
-      variables: { customerId, type: 'passpoint' },
-      fetchPolicy: 'network-only',
-    }
-  );
-
   const [createProfile] = useMutation(CREATE_PROFILE);
   const history = useHistory();
 
@@ -116,74 +84,111 @@ const AddProfile = () => {
       );
   };
 
-  const handleFetchMoreProfiles = (e, key) => {
+  const handleFetchProfiles = e => {
-    if (key === 'radius') fetchMoreProfiles(e, radiusProfiles, fetchMoreRadiusProfiles);
+    if (ssidProfiles.getAllProfiles.context.lastPage) {
-    else if (key === 'captive_portal')
+      return false;
-      fetchMoreProfiles(e, captiveProfiles, fetchMoreCaptiveProfiles);
+    }
-    else if (key === 'rf') fetchMoreProfiles(e, rfProfiles, fetchMoreRfProfiles);
-    else if (key === 'passpoint_venue') fetchMoreProfiles(e, venueProfiles, fetchMoreVenueProfiles);
-    else if (key === 'passpoint_operator')
-      fetchMoreProfiles(e, operatorProfiles, fetchMoreOperatorProfiles);
-    else if (key === 'passpoint_osu_id_provider')
-      fetchMoreProfiles(e, idProviderProfiles, fetchMoreIdProviderProfiles);
-    else if (key === 'passpoint')
-      fetchMoreProfiles(e, passpointProfiles, fetchMorePasspointProfiles);
-    else fetchMoreProfiles(e, ssidProfiles, fetchMore);
-  };
 
-  const handleFileUpload = async (fileName, file) => {
+    e.persist();
-    const token = getItem(AUTH_TOKEN);
+    const { target } = e;
 
-    if (apiUrl?.getApiUrl) {
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
-      fetch(`${apiUrl?.getApiUrl}filestore/${fileName}`, {
+      fetchMore({
-        method: 'POST',
+        variables: { context: { ...ssidProfiles.getAllProfiles.context } },
-        headers: {
+        updateQuery: updateQueryGetAllProfiles,
-          Authorization: token ? `Bearer ${token.access_token}` : '',
-          'Content-Type': 'application/octet-stream',
-        },
-        body: file,
-      })
-        .then(response => response.json())
-        .then(resp => {
-          if (resp?.success) {
-            notification.success({
-              message: 'Success',
-              description: 'File successfully uploaded.',
-            });
-          } else {
-            notification.error({
-              message: 'Error',
-              description: 'File could not be uploaded.',
-            });
-          }
-        })
-        .catch(() => {
-          notification.error({
-            message: 'Error',
-            description: 'File could not be uploaded.',
-          });
-        });
-    } else {
-      notification.error({
-        message: 'Error',
-        description: 'File could not be uploaded.',
       });
     }
+
+    return true;
+  };
+
+  const handleFetchVenueProfiles = e => {
+    if (venueProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreVenueProfiles({
+        variables: { context: { ...venueProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchRfProfiles = e => {
+    if (rfProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreRfProfiles({
+        variables: { context: { ...rfProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchOperatorProfiles = e => {
+    if (operatorProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreOperatorProfiles({
+        variables: { context: { ...operatorProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchIdProviderProfiles = e => {
+    if (idProviderProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreIdProviderProfiles({
+        variables: { context: { ...idProviderProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
   };
 
   return (
     <AddProfilePage
       onCreateProfile={handleAddProfile}
-      ssidProfiles={ssidProfiles?.getAllProfiles?.items}
+      ssidProfiles={
-      radiusProfiles={radiusProfiles?.getAllProfiles?.items}
+        (ssidProfiles && ssidProfiles.getAllProfiles && ssidProfiles.getAllProfiles.items) || []
-      captiveProfiles={captiveProfiles?.getAllProfiles?.items}
+      }
       venueProfiles={venueProfiles?.getAllProfiles?.items}
       operatorProfiles={operatorProfiles?.getAllProfiles?.items}
       idProviderProfiles={idProviderProfiles?.getAllProfiles?.items}
       rfProfiles={rfProfiles?.getAllProfiles?.items}
-      passpointProfiles={passpointProfiles?.getAllProfiles?.items}
+      onFetchMoreProfiles={handleFetchProfiles}
-      onFetchMoreProfiles={handleFetchMoreProfiles}
+      onFetchMoreVenueProfiles={handleFetchVenueProfiles}
-      fileUpload={handleFileUpload}
+      onFetchMoreOperatorProfiles={handleFetchOperatorProfiles}
+      onFetchMoreIdProviderProfiles={handleFetchIdProviderProfiles}
+      onFetchMoreRfProfiles={handleFetchRfProfiles}
     />
   );
 };

app/containers/App/index.js

@@ -75,6 +75,7 @@ const App = () => {
         <Helmet titleTemplate={`%s - ${COMPANY}`} defaultTitle={COMPANY}>
           <meta name="description" content={COMPANY} />
         </Helmet>
+
         <Switch>
           <UnauthenticatedRoute exact path={ROUTES.login} component={Login} />
           <ProtectedRouteWithLayout exact path={ROUTES.root} component={RedirectToDashboard} />
@@ -91,9 +92,7 @@ const App = () => {
           <ProtectedRouteWithLayout exact path={ROUTES.addprofile} component={AddProfile} />
 
           <ProtectedRouteWithLayout exact path={ROUTES.alarms} component={Alarms} />
-          {user?.id !== 0 && (
+          <ProtectedRouteWithLayout exact path={ROUTES.account} component={EditAccount} />
-            <ProtectedRouteWithLayout exact path={ROUTES.account} component={EditAccount} />
-          )}
           {user?.roles?.[0] === 'SuperUser' && (
             <ProtectedRouteWithLayout exact path={ROUTES.users} component={Accounts} />
           )}

app/containers/Dashboard/index.js

@@ -20,11 +20,8 @@ function formatBytes(bytes, decimals = 2) {
   return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i] || ''}`;
 }
 
-function trafficLabelFormatter(bytes) {
+function trafficLabelFormatter() {
-  if (this?.value) {
+  return formatBytes(this.value);
-    return formatBytes(this.value);
-  }
-  return formatBytes(bytes);
 }
 
 function trafficTooltipFormatter() {
@@ -34,27 +31,12 @@ function trafficTooltipFormatter() {
 }
 
 const lineChartConfig = [
-  {
+  { key: 'inservicesAPs', title: 'Inservice APs (24 hours)' },
-    key: 'service',
+  { key: 'clientDevices', title: 'Client Devices (24 hours)' },
-    title: 'Inservice APs (24 hours)',
-    lines: [{ key: 'inServiceAps', name: 'Inservice APs' }],
-  },
-  {
-    key: 'clientDevices',
-    title: 'Client Devices (24 hours)',
-    lines: [
-      { key: 'clientDevices2dot4GHz', name: '2.4GHz' },
-      { key: 'clientDevices5GHz', name: '5GHz' },
-    ],
-  },
   {
     key: 'traffic',
-    title: 'Traffic - 5 min intervals (24 hours)',
+    title: 'Traffic (24 hours)',
-    lines: [
+    options: { formatter: trafficLabelFormatter, tooltipFormatter: trafficTooltipFormatter },
-      { key: 'trafficBytesDownstreamData', name: 'Downstream' },
-      { key: 'trafficBytesUpstreamData', name: 'Upstream' },
-    ],
-    options: { formatter: trafficLabelFormatter, trafficTooltipFormatter },
   },
 ];
 
@@ -73,8 +55,32 @@ const Dashboard = () => {
     variables: { customerId, statusDataTypes: ['CUSTOMER_DASHBOARD'] },
   });
 
-  const [lineChartData, setLineChartData] = useState([]);
+  const [lineChartData, setLineChartData] = useState({
-  const [trafficBytesData, setTrafficBytesData] = useState();
+    inservicesAPs: {
+      key: 'Inservice APs',
+      value: [],
+    },
+    clientDevices: {
+      is2dot4GHz: {
+        key: USER_FRIENDLY_RADIOS.is2dot4GHz,
+        value: [],
+      },
+      is5GHz: {
+        key: USER_FRIENDLY_RADIOS.is5GHz,
+        value: [],
+      },
+    },
+    traffic: {
+      trafficBytesDownstream: {
+        key: 'Down Stream',
+        value: [],
+      },
+      trafficBytesUpstream: {
+        key: 'Up Stream',
+        value: [],
+      },
+    },
+  });
 
   const { loading: metricsLoading, error: metricsError, data: metricsData, fetchMore } = useQuery(
     FILTER_SYSTEM_EVENTS,
@@ -92,65 +98,74 @@ const Dashboard = () => {
 
   const formatLineChartData = (list = []) => {
     if (list.length) {
-      const chartData = [];
+      setLineChartData(prev => {
+        const inservicesAPs = [];
+        const clientDevices2dot4GHz = [];
+        const clientDevices5GHz = [];
+        const trafficBytesDownstreamData = [];
+        const trafficBytesUpstreamData = [];
+        let totalDown = 0;
+        let totalUp = 0;
 
-      let inServiceAps = 0;
+        list.forEach(
-      let clientDevices2dot4GHz = 0;
+          ({
-      let clientDevices5GHz = 0;
+            eventTimestamp,
-      let trafficBytesDownstreamData = 0;
+            details: {
-      let trafficBytesUpstreamData = 0;
+              payload: {
-      let totalDown = 0;
+                details: {
-      let totalUp = 0;
+                  equipmentInServiceCount,
-
+                  associatedClientsCountPerRadio: radios,
-      list.forEach(
+                  trafficBytesDownstream,
-        ({
+                  trafficBytesUpstream,
-          eventTimestamp,
+                },
-          details: {
-            payload: {
-              details: {
-                equipmentInServiceCount,
-                associatedClientsCountPerRadio: radios,
-                trafficBytesDownstream,
-                trafficBytesUpstream,
               },
             },
-          },
+          }) => {
-        }) => {
+            inservicesAPs.push([eventTimestamp, equipmentInServiceCount]);
-          const timestamp = parseInt(eventTimestamp, 10);
-          inServiceAps = equipmentInServiceCount;
 
-          let total5GHz = 0;
+            let total5GHz = 0;
-          total5GHz += (radios?.is5GHz || 0) + (radios?.is5GHzL || 0) + (radios?.is5GHzU || 0); // combine all 5GHz radios
+            total5GHz += (radios?.is5GHz || 0) + (radios?.is5GHzL || 0) + (radios?.is5GHzU || 0); // combine all 5GHz radios
 
-          clientDevices2dot4GHz = radios.is2dot4GHz || 0;
+            clientDevices2dot4GHz.push([eventTimestamp, radios.is2dot4GHz || 0]);
-          clientDevices5GHz = total5GHz || 0;
+            clientDevices5GHz.push([eventTimestamp, total5GHz || 0]);
 
-          trafficBytesDownstreamData = (trafficBytesDownstream > 0 && trafficBytesDownstream) || 0;
+            trafficBytesDownstreamData.push([eventTimestamp, trafficBytesDownstream || 0]);
-          trafficBytesUpstreamData = (trafficBytesUpstream > 0 && trafficBytesUpstream) || 0;
+            trafficBytesUpstreamData.push([eventTimestamp, trafficBytesUpstream || 0]);
 
-          totalDown += (trafficBytesDownstream > 0 && trafficBytesDownstream) || 0;
+            totalDown += trafficBytesDownstream || 0;
-          totalUp += (trafficBytesUpstream > 0 && trafficBytesUpstream) || 0;
+            totalUp += trafficBytesUpstream || 0;
-          chartData.push({
+          }
-            timestamp,
+        );
-            inServiceAps,
-            clientDevices2dot4GHz,
-            clientDevices5GHz,
-            trafficBytesDownstreamData,
-            trafficBytesUpstreamData,
-          });
-        }
-      );
 
-      setTrafficBytesData(prev => {
         return {
-          totalUpstreamTraffic: (prev?.totalUpstreamTraffic || 0) + totalUp,
+          inservicesAPs: {
-          totalDownstreamTraffic: (prev?.totalDownstreamTraffic || 0) + totalDown,
+            ...prev.inservicesAPs,
+            value: [...prev.inservicesAPs.value, ...inservicesAPs],
+          },
+          clientDevices: {
+            is2dot4GHz: {
+              ...prev.clientDevices.is2dot4GHz,
+              value: [...prev.clientDevices.is2dot4GHz.value, ...clientDevices2dot4GHz],
+            },
+            is5GHz: {
+              ...prev.clientDevices.is5GHz,
+              value: [...prev.clientDevices.is5GHz.value, ...clientDevices5GHz],
+            },
+          },
+          traffic: {
+            trafficBytesDownstream: {
+              ...prev.traffic.trafficBytesDownstream,
+              value: [...prev.traffic.trafficBytesDownstream.value, ...trafficBytesDownstreamData],
+            },
+            trafficBytesUpstream: {
+              ...prev.traffic.trafficBytesUpstream,
+              value: [...prev.traffic.trafficBytesUpstream.value, ...trafficBytesUpstreamData],
+            },
+          },
+          totalDownstreamTraffic: totalDown,
+          totalUpstreamTraffic: totalUp,
         };
       });
-
-      setLineChartData(prev => {
-        return [...prev, ...chartData];
-      });
     }
   };
 
@@ -250,8 +265,8 @@ const Dashboard = () => {
         },
         {
           title: 'Usage Information (24 hours)',
-          'Total Traffic (Downstream)': formatBytes(trafficBytesData?.totalDownstreamTraffic),
+          'Total Traffic (US)': formatBytes(lineChartData?.totalUpstreamTraffic),
-          'Total Traffic (Upstream)': formatBytes(trafficBytesData?.totalUpstreamTraffic),
+          'Total Traffic (DS)': formatBytes(lineChartData?.totalDownstreamTraffic),
         },
       ]}
       pieChartDetails={pieChartsData}

app/containers/MasterLayout/index.js

@@ -12,8 +12,10 @@ import { removeItem } from 'utils/localStorage';
 
 import UserContext from 'contexts/UserContext';
 
+import UsersDropdown from 'components/UsersDropdown';
+
 const MasterLayout = ({ children }) => {
-  const { roles, customerId, id: currentUserId } = useContext(UserContext);
+  const { roles, customerId, email } = useContext(UserContext);
 
   const client = useApolloClient();
   const location = useLocation();
@@ -56,15 +58,11 @@ const MasterLayout = ({ children }) => {
       key: 'settings',
       text: 'Settings',
       children: [
-        ...(currentUserId !== 0
+        {
-          ? [
+          key: 'editAccount',
-              {
+          path: ROUTES.account,
-                key: 'editAccount',
+          text: 'Account',
-                path: ROUTES.account,
+        },
-                text: 'Edit Account',
-              },
-            ]
-          : []),
         {
           key: 'logout',
           path: ROUTES.root,
@@ -94,7 +92,8 @@ const MasterLayout = ({ children }) => {
       menuItems={menuItems}
       mobileMenuItems={mobileMenuItems}
       totalAlarms={data && data.getAlarmCount}
-      currentUserId={currentUserId}
+      currentUserEmail={email}
+      usersDropdown={<UsersDropdown onLogout={handleLogout} />}
     >
       {children}
     </Layout>

app/containers/Network/containers/AccessPointDetails/index.js

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useParams, useHistory } from 'react-router-dom';
-import { useQuery, useMutation } from '@apollo/client';
+import { useQuery, useMutation, gql } from '@apollo/client';
 import { Alert, notification } from 'antd';
 import moment from 'moment';
 import {
@@ -9,22 +9,126 @@ import {
   Loading,
 } from '@tip-wlan/wlan-cloud-ui-library';
 
+import { FILTER_SERVICE_METRICS, GET_ALL_FIRMWARE, GET_ALL_PROFILES } from 'graphql/queries';
 import {
-  GET_EQUIPMENT,
-  FILTER_SERVICE_METRICS,
-  GET_ALL_FIRMWARE,
-  GET_ALL_PROFILES,
-} from 'graphql/queries';
-import {
-  UPDATE_EQUIPMENT,
-  DELETE_EQUIPMENT,
   UPDATE_EQUIPMENT_FIRMWARE,
   REQUEST_EQUIPMENT_SWITCH_BANK,
   REQUEST_EQUIPMENT_REBOOT,
 } from 'graphql/mutations';
-import { fetchMoreProfiles } from 'graphql/functions';
+import { updateQueryGetAllProfiles } from 'graphql/functions';
 import UserContext from 'contexts/UserContext';
 
+const GET_EQUIPMENT = gql`
+  query GetEquipment($id: ID!) {
+    getEquipment(id: $id) {
+      id
+      equipmentType
+      inventoryId
+      customerId
+      profileId
+      locationId
+      name
+      latitude
+      longitude
+      serial
+      lastModifiedTimestamp
+      details
+      profile {
+        id
+        name
+        childProfiles {
+          id
+          name
+          details
+        }
+      }
+      baseMacAddress
+      manufacturer
+      status {
+        firmware {
+          detailsJSON
+        }
+        protocol {
+          detailsJSON
+        }
+        radioUtilization {
+          detailsJSON
+        }
+        clientDetails {
+          detailsJSON
+          details {
+            numClientsPerRadio
+          }
+        }
+        osPerformance {
+          detailsJSON
+        }
+      }
+      model
+      alarmsCount
+      alarms {
+        severity
+        alarmCode
+        details
+        createdTimestamp
+      }
+    }
+  }
+`;
+
+const UPDATE_EQUIPMENT = gql`
+  mutation UpdateEquipment(
+    $id: ID!
+    $equipmentType: String!
+    $inventoryId: String!
+    $customerId: ID!
+    $profileId: ID!
+    $locationId: ID!
+    $name: String!
+    $latitude: String
+    $longitude: String
+    $serial: String
+    $lastModifiedTimestamp: String
+    $details: JSONObject
+  ) {
+    updateEquipment(
+      id: $id
+      equipmentType: $equipmentType
+      inventoryId: $inventoryId
+      customerId: $customerId
+      profileId: $profileId
+      locationId: $locationId
+      name: $name
+      latitude: $latitude
+      longitude: $longitude
+      serial: $serial
+      lastModifiedTimestamp: $lastModifiedTimestamp
+      details: $details
+    ) {
+      id
+      equipmentType
+      inventoryId
+      customerId
+      profileId
+      locationId
+      name
+      latitude
+      longitude
+      serial
+      lastModifiedTimestamp
+      details
+    }
+  }
+`;
+
+const DELETE_EQUIPMENT = gql`
+  mutation DeleteEquipment($id: ID!) {
+    deleteEquipment(id: $id) {
+      id
+    }
+  }
+`;
+
 const toTime = moment();
 const fromTime = moment().subtract(1, 'hour');
 
@@ -38,7 +142,6 @@ const AccessPointDetails = ({ locations }) => {
       id,
     },
     fetchPolicy: 'network-only',
-    errorPolicy: 'all',
   });
 
   const { data: dataFirmware, error: errorFirmware, loading: loadingFirmware } = useQuery(
@@ -46,9 +149,9 @@ const AccessPointDetails = ({ locations }) => {
     {
       skip: !data?.getEquipment?.model,
       variables: { modelId: data?.getEquipment?.model },
-      errorPolicy: 'all',
     }
   );
+
   const {
     data: dataProfiles,
     error: errorProfiles,
@@ -63,7 +166,6 @@ const AccessPointDetails = ({ locations }) => {
     }`),
     {
       variables: { customerId, type: 'equipment_ap' },
-      fetchPolicy: 'network-only',
     }
   );
 
@@ -71,7 +173,7 @@ const AccessPointDetails = ({ locations }) => {
     loading: metricsLoading,
     error: metricsError,
     data: metricsData,
-    fetchMore: fetchMoreServiceMetrics,
+    refetch: metricsRefetch,
   } = useQuery(FILTER_SERVICE_METRICS, {
     variables: {
       customerId,
@@ -91,46 +193,23 @@ const AccessPointDetails = ({ locations }) => {
 
   const refetchData = () => {
     refetch();
-    fetchMoreServiceMetrics({
+    metricsRefetch();
-      variables: {
-        fromTime: moment()
-          .subtract(2, 'minutes')
-          .valueOf()
-          .toString(),
-        toTime: moment()
-          .valueOf()
-          .toString(),
-      },
-      updateQuery: (previousResult, { fetchMoreResult }) => {
-        const previousEntry = previousResult.filterServiceMetrics;
-        const newItems = fetchMoreResult.filterServiceMetrics.items;
-
-        return {
-          filterServiceMetrics: {
-            context: fetchMoreResult.filterServiceMetrics.context,
-            items: [...previousEntry.items, ...newItems],
-            __typename: previousEntry.__typename,
-          },
-        };
-      },
-    });
   };
 
-  const handleUpdateEquipment = ({
+  const handleUpdateEquipment = (
-    id: equipmentId,
+    equipmentId,
     equipmentType,
     inventoryId,
-    customerId: custId,
+    custId,
     profileId,
     locationId,
     name,
-    baseMacAddress,
     latitude,
     longitude,
     serial,
     lastModifiedTimestamp,
-    formattedData,
+    details
-  }) => {
+  ) => {
     updateEquipment({
       variables: {
         id: equipmentId,
@@ -140,12 +219,11 @@ const AccessPointDetails = ({ locations }) => {
         profileId,
         locationId,
         name,
-        baseMacAddress,
         latitude,
         longitude,
         serial,
         lastModifiedTimestamp,
-        details: formattedData,
+        details,
       },
     })
       .then(() => {
@@ -249,14 +327,28 @@ const AccessPointDetails = ({ locations }) => {
       );
 
   const handleFetchProfiles = e => {
-    fetchMoreProfiles(e, dataProfiles, fetchMore);
+    if (dataProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMore({
+        variables: { context: { ...dataProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
   };
 
   if (loading) {
     return <Loading />;
   }
 
-  if (error && !data?.getEquipment) {
+  if (error) {
     return (
       <Alert
         message="Error"

app/containers/Network/containers/AccessPoints/index.js

@@ -89,8 +89,8 @@ const accessPointsTableColumns = [
   },
   {
     title: 'CHANNEL',
-    dataIndex: ['status', 'channel', 'detailsJSON', 'channelNumberStatusDataMap'],
+    dataIndex: 'channel',
-    render: text => renderTableCell(Object.values(text ?? [])),
+    render: renderTableCell,
   },
   {
     title: 'OCCUPANCY',

app/containers/Network/containers/BulkEditAccessPoints/index.js

@@ -1,12 +1,9 @@
-import React, { useContext, useMemo, useEffect } from 'react';
+import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Alert, notification } from 'antd';
 import { useParams } from 'react-router-dom';
-import { useLazyQuery, useMutation } from '@apollo/client';
+import { useQuery, useMutation } from '@apollo/client';
-import { BulkEditAccessPoints, sortRadioTypes } from '@tip-wlan/wlan-cloud-ui-library';
+import { BulkEditAccessPoints, Loading } from '@tip-wlan/wlan-cloud-ui-library';
-import { USER_FRIENDLY_RADIOS } from 'constants/index';
-
-import { getBreadcrumbPath, getLocationPath } from 'utils/locations';
 
 import { FILTER_EQUIPMENT_BULK_EDIT_APS } from 'graphql/queries';
 import { UPDATE_EQUIPMENT_BULK } from 'graphql/mutations';
@@ -28,200 +25,243 @@ const renderTableCell = tabCell => {
   return <span>{tabCell}</span>;
 };
 const accessPointsChannelTableColumns = [
-  { title: 'Name', dataIndex: 'name', key: 'name', width: 250, render: renderTableCell },
+  { title: 'NAME', dataIndex: 'name', key: 'name', render: renderTableCell },
-
   {
-    title: 'Radios',
+    title: 'CHANNEL',
-    dataIndex: 'radioMap',
+    dataIndex: 'channel',
-    width: 150,
+    key: 'channel',
-    render: text => renderTableCell(text.map(i => USER_FRIENDLY_RADIOS[i])),
-  },
-  {
-    title: 'Manual Active Channel',
-    dataIndex: 'manualChannelNumber',
-    key: 'manualChannelNumber',
     editable: true,
-    width: 200,
-    render: renderTableCell,
-  },
-
-  {
-    title: 'Manual Backup Channel',
-    dataIndex: 'manualBackupChannelNumber',
-    key: 'manualBackupChannelNumber',
-    editable: true,
-    width: 210,
     render: renderTableCell,
   },
   {
-    title: 'Cell Size',
+    title: 'CELL SIZE',
     dataIndex: 'cellSize',
     key: 'cellSize',
     editable: true,
-    width: 150,
     render: renderTableCell,
   },
   {
-    title: 'Probe Response Threshold',
+    title: 'PROB RESPONSE THRESHOLD',
     dataIndex: 'probeResponseThreshold',
     key: 'probeResponseThreshold',
     editable: true,
-    width: 210,
     render: renderTableCell,
   },
   {
-    title: 'Client Disconnect Threshold',
+    title: 'CLIENT DISCONNECT THRESHOLD',
     dataIndex: 'clientDisconnectThreshold',
     key: 'clientDisconnectThreshold',
     editable: true,
-    width: 210,
-
     render: renderTableCell,
   },
   {
-    title: 'SNR (% Drop)',
+    title: 'SNR (% DROP)',
     dataIndex: 'snrDrop',
     key: 'snrDrop',
     editable: true,
-    width: 150,
     render: renderTableCell,
   },
   {
-    title: 'Min Load',
+    title: 'MIN LOAD',
     dataIndex: 'minLoad',
     key: 'minLoad',
     editable: true,
-    width: 150,
     render: renderTableCell,
   },
 ];
 
-const getRadioDetails = (radioDetails, type) => {
+const getBreadcrumbPath = (id, locations) => {
-  const sortedRadios = sortRadioTypes(Object.keys(radioDetails?.radioMap || {}));
+  const locationsPath = [];
+  const treeRecurse = (parentNodeId, node) => {
+    if (node.id === parentNodeId) {
+      locationsPath.unshift(node);
+      return node;
+    }
+    if (node.children) {
+      let parent;
+      node.children.some(i => {
+        parent = treeRecurse(parentNodeId, i);
+        return parent;
+      });
+      if (parent) {
+        locationsPath.unshift(node);
+      }
+      return parent;
+    }
+    return null;
+  };
 
-  if (type === 'manualChannelNumber') {
+  treeRecurse(id, {
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.manualChannelNumber);
+    id: 0,
-  }
+    children: locations,
+  });
 
-  if (type === 'manualBackupChannelNumber') {
+  return locationsPath;
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.manualBackupChannelNumber);
-  }
-  if (type === 'snrDrop') {
-    return sortedRadios.map(
-      i => radioDetails.advancedRadioMap[i]?.bestApSettings?.value?.dropInSnrPercentage
-    );
-  }
-  if (type === 'allowedChannels') {
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.allowedChannelsPowerLevels);
-  }
-
-  if (type === 'minLoad') {
-    return sortedRadios.map(
-      i => radioDetails.advancedRadioMap[i]?.bestApSettings?.value?.minLoadFactor
-    );
-  }
-
-  if (type === 'cellSize') {
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.rxCellSizeDb?.value);
-  }
-
-  if (type === 'probeResponseThreshold') {
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.probeResponseThresholdDb?.value);
-  }
-
-  if (type === 'clientDisconnectThreshold') {
-    return sortedRadios.map(i => radioDetails.radioMap[i]?.clientDisconnectThresholdDb?.value);
-  }
-
-  return sortedRadios;
 };
 
-const formatRadioFrequencies = ({
+const getLocationPath = (selectedId, locations) => {
-  manualChannelNumber,
+  const locationsPath = [];
-  manualBackupChannelNumber,
+
-  snrDrop,
+  const treeRecurse = (parentNodeId, node) => {
-  minLoad,
+    if (node.id === parentNodeId) {
-  cellSize,
+      locationsPath.unshift(node.id);
-  probeResponseThreshold,
+
-  clientDisconnectThreshold,
+      if (node.children) {
-  radioMap = [],
+        const flatten = children => {
-}) => {
+          children.forEach(i => {
-  const frequencies = {};
+            locationsPath.unshift(i.id);
-  radioMap.forEach((i, index) => {
+            if (i.children) {
-    frequencies[i] = {
+              flatten(i.children);
-      channelNumber: manualChannelNumber[index],
+            }
-      backupChannelNumber: manualBackupChannelNumber[index],
+          });
-      dropInSnrPercentage: snrDrop[index],
+        };
-      minLoadFactor: minLoad[index],
+
-      rxCellSizeDb: {
+        flatten(node.children);
-        auto: true,
+      }
-        value: cellSize[index],
+      return node;
-      },
+    }
-      probeResponseThresholdDb: {
+    if (node.children) {
-        auto: true,
+      let parent;
-        value: probeResponseThreshold[index],
+      node.children.some(i => {
-      },
+        parent = treeRecurse(parentNodeId, i);
-      clientDisconnectThresholdDb: {
+        return parent;
-        auto: true,
+      });
-        value: clientDisconnectThreshold[index],
+      return parent;
-      },
+    }
-    };
+
-  });
+    return null;
-  return frequencies;
+  };
+
+  if (selectedId) {
+    treeRecurse(selectedId, { id: 0, children: locations });
+  }
+
+  return locationsPath;
 };
 
 const BulkEditAPs = ({ locations, checkedLocations }) => {
   const { id } = useParams();
   const { customerId } = useContext(UserContext);
-
   const locationIds = useMemo(() => {
     const locationPath = getLocationPath(id, locations);
     return locationPath.filter(f => checkedLocations.includes(f));
   }, [id, locations, checkedLocations]);
 
-  const [
+  const {
-    filterEquipment,
+    loading: filterEquipmentLoading,
-    {
+    error: filterEquipmentError,
-      loading: filterEquipmentLoading,
+    refetch,
-      error: filterEquipmentError,
+    data: equipData,
-      refetch,
+    fetchMore,
-      data: equipData,
+  } = useQuery(FILTER_EQUIPMENT_BULK_EDIT_APS, {
-      fetchMore,
+    variables: { customerId, locationIds, equipmentType: 'AP' },
-    },
-  ] = useLazyQuery(FILTER_EQUIPMENT_BULK_EDIT_APS, {
-    errorPolicy: 'all',
-    fetchPolicy: 'cache-first',
   });
 
-  const fetchFilterEquipment = async () => {
-    filterEquipment({
-      variables: {
-        customerId,
-        locationIds,
-        equipmentType: 'AP',
-      },
-    });
-  };
   const [updateEquipmentBulk] = useMutation(UPDATE_EQUIPMENT_BULK);
 
-  const formattedTableData = useMemo(
+  const getRadioDetails = (radioDetails, type) => {
-    () =>
+    if (type === 'cellSize') {
-      equipData?.filterEquipment?.items?.map(({ id: key, name, details = {} }) => ({
+      const cellSizeValues = [];
+      Object.keys(radioDetails.radioMap).map(i => {
+        return cellSizeValues.push(radioDetails.radioMap[i].rxCellSizeDb.value);
+      });
+      return cellSizeValues;
+    }
+    if (type === 'probeResponseThreshold') {
+      const probeResponseThresholdValues = [];
+      Object.keys(radioDetails.radioMap).map(i => {
+        return probeResponseThresholdValues.push(
+          radioDetails.radioMap[i].probeResponseThresholdDb.value
+        );
+      });
+      return probeResponseThresholdValues;
+    }
+    if (type === 'clientDisconnectThreshold') {
+      const clientDisconnectThresholdValues = [];
+      Object.keys(radioDetails.radioMap).map(i => {
+        return clientDisconnectThresholdValues.push(
+          radioDetails.radioMap[i].clientDisconnectThresholdDb.value
+        );
+      });
+      return clientDisconnectThresholdValues;
+    }
+    if (type === 'snrDrop') {
+      const snrDropValues = [];
+      Object.keys(radioDetails.advancedRadioMap).map(i => {
+        return snrDropValues.push(
+          radioDetails.advancedRadioMap[i].bestApSettings.dropInSnrPercentage
+        );
+      });
+      return snrDropValues;
+    }
+
+    const minLoadValue = [];
+    Object.keys(radioDetails.advancedRadioMap).map(i => {
+      return minLoadValue.push(radioDetails.advancedRadioMap[i].bestApSettings.minLoadFactor);
+    });
+    return minLoadValue;
+  };
+
+  const setAccessPointsBulkEditTableData = (dataSource = []) => {
+    const tableData = dataSource.items.map(({ id: key, name, channel, details }) => {
+      return {
         key,
         id: key,
         name,
-        manualChannelNumber: getRadioDetails(details, 'manualChannelNumber'),
+        channel,
-        manualBackupChannelNumber: getRadioDetails(details, 'manualBackupChannelNumber'),
         cellSize: getRadioDetails(details, 'cellSize'),
         probeResponseThreshold: getRadioDetails(details, 'probeResponseThreshold'),
         clientDisconnectThreshold: getRadioDetails(details, 'clientDisconnectThreshold'),
         snrDrop: getRadioDetails(details, 'snrDrop'),
         minLoad: getRadioDetails(details, 'minLoad'),
-        radioMap: getRadioDetails(details, 'radioMap'),
+      };
-        allowedChannels: getRadioDetails(details, 'allowedChannels'),
+    });
-      })),
+    return tableData;
-    [equipData?.filterEquipment?.items]
+  };
-  );
+
+  const setUpdatedBulkEditTableData = (
+    equipmentId,
+    channel,
+    cellSize,
+    probeResponseThreshold,
+    clientDisconnectThreshold,
+    snrDrop,
+    minLoad,
+    dataSource = []
+  ) => {
+    const updatedItems = [];
+    let dropInSnrPercentage;
+    let minLoadFactor;
+    dataSource.items.forEach(({ id: itemId, details }) => {
+      if (equipmentId === itemId) {
+        Object.keys(details.radioMap).forEach((i, dataIndex) => {
+          const frequencies = {};
+          dropInSnrPercentage = snrDrop[dataIndex];
+          minLoadFactor = minLoad[dataIndex];
+
+          frequencies[`${i}`] = {
+            channelNumber: channel[dataIndex],
+            rxCellSizeDb: {
+              auto: true,
+              value: cellSize[dataIndex],
+            },
+            probeResponseThresholdDb: {
+              auto: true,
+              value: probeResponseThreshold[dataIndex],
+            },
+            clientDisconnectThresholdDb: {
+              auto: true,
+              value: clientDisconnectThreshold[dataIndex],
+            },
+            dropInSnrPercentage,
+            minLoadFactor,
+          };
+          updatedItems.push(frequencies);
+        });
+      }
+    });
+    return updatedItems;
+  };
 
   const updateEquipments = editedRowsArr => {
     updateEquipmentBulk({
@@ -246,13 +286,42 @@ const BulkEditAPs = ({ locations, checkedLocations }) => {
 
   const handleSaveChanges = updatedRows => {
     const editedRowsArr = [];
-    Object.keys(updatedRows).forEach(key => {
+    if (updatedRows.length > 0) {
-      return editedRowsArr.push({
+      updatedRows.map(
-        equipmentId: updatedRows[key].id,
+        ({
-        perRadioDetails: formatRadioFrequencies(updatedRows[key]),
+          id: equipmentId,
-      });
+          channel,
-    });
+          cellSize,
-    updateEquipments(editedRowsArr);
+          probeResponseThreshold,
+          clientDisconnectThreshold,
+          snrDrop,
+          minLoad,
+        }) => {
+          const updatedEuips = setUpdatedBulkEditTableData(
+            equipmentId,
+            channel,
+            cellSize,
+            probeResponseThreshold,
+            clientDisconnectThreshold,
+            snrDrop,
+            minLoad,
+            equipData && equipData.filterEquipment
+          );
+          const tempObj = {
+            equipmentId,
+            perRadioDetails: {},
+          };
+          updatedEuips.map(item => {
+            Object.keys(item).forEach(i => {
+              tempObj.perRadioDetails[i] = item[i];
+            });
+            return tempObj;
+          });
+          return editedRowsArr.push(tempObj);
+        }
+      );
+      updateEquipments(editedRowsArr);
+    }
   };
 
   const handleLoadMore = () => {
@@ -274,30 +343,33 @@ const BulkEditAPs = ({ locations, checkedLocations }) => {
     }
   };
 
-  useEffect(() => {
+  if (filterEquipmentLoading) {
-    fetchFilterEquipment();
+    return <Loading />;
-  }, [locationIds]);
+  }
 
   if (filterEquipmentError) {
     return (
-      <Alert
+      <Alert message="Error" description="Failed to load equipments data." type="error" showIcon />
-        message="Error"
-        description="Failed to load equipment(s) data."
-        type="error"
-        showIcon
-      />
     );
   }
 
   return (
     <BulkEditAccessPoints
       tableColumns={accessPointsChannelTableColumns}
-      tableData={formattedTableData}
+      tableData={
+        equipData &&
+        equipData.filterEquipment &&
+        setAccessPointsBulkEditTableData(equipData && equipData.filterEquipment)
+      }
       onLoadMore={handleLoadMore}
-      isLastPage={equipData?.filterEquipment?.context?.lastPage}
+      isLastPage={
+        equipData &&
+        equipData.filterEquipment &&
+        equipData.filterEquipment.context &&
+        equipData.filterEquipment.context.lastPage
+      }
       onSaveChanges={handleSaveChanges}
       breadcrumbPath={getBreadcrumbPath(id, locations)}
-      loading={filterEquipmentLoading}
     />
   );
 };

app/containers/Network/containers/BulkEditAccessPoints/index.module.scss

@@ -1,4 +1,5 @@
 .tabColumn {
   display: flex;
   flex-direction: column;
+  padding: 0 30px;
 }

app/containers/ProfileDetails/index.js

@@ -1,14 +1,14 @@
 import React, { useState, useContext } from 'react';
 import { useParams, Redirect } from 'react-router-dom';
 import { useQuery, useMutation, gql } from '@apollo/client';
-import { notification } from 'antd';
+import { Alert, notification } from 'antd';
 import { ProfileDetails as ProfileDetailsPage, Loading } from '@tip-wlan/wlan-cloud-ui-library';
 
-import { ROUTES, AUTH_TOKEN } from 'constants/index';
+import { ROUTES } from 'constants/index';
 import UserContext from 'contexts/UserContext';
-import { GET_ALL_PROFILES, GET_API_URL } from 'graphql/queries';
+import { GET_ALL_PROFILES } from 'graphql/queries';
-import { fetchMoreProfiles } from 'graphql/functions';
+import { FILE_UPLOAD } from 'graphql/mutations';
-import { getItem } from 'utils/localStorage';
+import { updateQueryGetAllProfiles } from 'graphql/functions';
 
 const GET_PROFILE = gql`
   query GetProfile($id: ID!) {
@@ -23,18 +23,6 @@ const GET_PROFILE = gql`
         profileType
         details
       }
-      associatedSsidProfiles {
-        id
-        name
-        profileType
-        details
-      }
-      osuSsidProfile {
-        id
-        name
-        profileType
-        details
-      }
       childProfileIds
       createdTimestamp
       lastModifiedTimestamp
@@ -87,24 +75,19 @@ const ProfileDetails = () => {
 
   const [redirect, setRedirect] = useState(false);
 
-  const { data: apiUrl } = useQuery(GET_API_URL);
+  const { loading, error, data } = useQuery(GET_PROFILE, {
-
-  const { loading, data } = useQuery(GET_PROFILE, {
     variables: { id },
     fetchPolicy: 'network-only',
-    errorPolicy: 'all',
   });
 
   const { data: ssidProfiles, fetchMore } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'ssid' },
-    fetchPolicy: 'network-only',
   });
 
   const { data: radiusProfiles, fetchMore: fetchMoreRadiusProfiles } = useQuery(
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'radius' },
-      fetchPolicy: 'network-only',
     }
   );
 
@@ -112,20 +95,17 @@ const ProfileDetails = () => {
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'captive_portal' },
-      fetchPolicy: 'network-only',
     }
   );
 
   const { data: venueProfiles, fetchMore: fetchMoreVenueProfiles } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'passpoint_venue' },
-    fetchPolicy: 'network-only',
   });
 
   const { data: operatorProfiles, fetchMore: fetchMoreOperatorProfiles } = useQuery(
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'passpoint_operator' },
-      fetchPolicy: 'network-only',
     }
   );
 
@@ -133,26 +113,18 @@ const ProfileDetails = () => {
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'passpoint_osu_id_provider' },
-      fetchPolicy: 'network-only',
     }
   );
 
   const { data: rfProfiles, fetchMore: fetchMoreRfProfiles } = useQuery(GET_ALL_PROFILES(), {
     variables: { customerId, type: 'rf' },
-    fetchPolicy: 'network-only',
   });
 
-  const { data: passpointProfiles, fetchMore: fetchMorePasspointProfiles } = useQuery(
-    GET_ALL_PROFILES(),
-    {
-      variables: { customerId, type: 'passpoint' },
-      fetchPolicy: 'network-only',
-    }
-  );
-
   const [updateProfile] = useMutation(UPDATE_PROFILE);
   const [deleteProfile] = useMutation(DELETE_PROFILE);
 
+  const [fileUpload] = useMutation(FILE_UPLOAD);
+
   const handleDeleteProfile = () => {
     deleteProfile({ variables: { id } })
       .then(() => {
@@ -198,97 +170,157 @@ const ProfileDetails = () => {
       );
   };
 
-  const handleFileUpload = async (fileName, file) => {
+  const handleFileUpload = (fileName, file) =>
-    const token = getItem(AUTH_TOKEN);
+    fileUpload({ variables: { fileName, file } })
-
+      .then(() => {
-    if (apiUrl?.getApiUrl) {
+        notification.success({
-      fetch(`${apiUrl?.getApiUrl}filestore/${fileName}`, {
+          message: 'Success',
-        method: 'POST',
+          description: 'File successfully uploaded.',
-        headers: {
-          Authorization: token ? `Bearer ${token.access_token}` : '',
-          'Content-Type': 'application/octet-stream',
-        },
-        body: file,
-      })
-        .then(response => response.json())
-        .then(resp => {
-          if (resp?.success) {
-            notification.success({
-              message: 'Success',
-              description: 'File successfully uploaded.',
-            });
-          } else {
-            notification.error({
-              message: 'Error',
-              description: 'File could not be uploaded.',
-            });
-          }
-        })
-        .catch(() => {
-          notification.error({
-            message: 'Error',
-            description: 'File could not be uploaded.',
-          });
         });
-    } else {
+      })
-      notification.error({
+      .catch(() =>
-        message: 'Error',
+        notification.error({
-        description: 'File could not be uploaded.',
+          message: 'Error',
+          description: 'File could not be uploaded.',
+        })
+      );
+
+  const handleFetchProfiles = e => {
+    if (ssidProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMore({
+        variables: { context: { ...ssidProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
       });
     }
+
+    return true;
   };
 
-  const handleDownloadFile = async name => {
+  const handleFetchRadiusProfiles = e => {
-    const token = getItem(AUTH_TOKEN);
+    if (radiusProfiles.getAllProfiles.context.lastPage) {
-    if (apiUrl?.getApiUrl) {
+      return false;
-      return fetch(`${apiUrl?.getApiUrl}filestore/${encodeURIComponent(name)}`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/octet-stream',
-          Authorization: token ? `Bearer ${token.access_token}` : '',
-        },
-      })
-        .then(response => response.blob())
-        .then(blob => {
-          return new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.onloadend = () => resolve(reader.result);
-            reader.onerror = reject;
-            reader.readAsDataURL(blob);
-          });
-        })
-        .catch(() => {
-          notification.error({
-            message: 'Error',
-            description: 'File could not be retrieved.',
-          });
-        });
     }
-    return notification.error({
+
-      message: 'Error',
+    e.persist();
-      description: 'File could not be retrieved.',
+    const { target } = e;
-    });
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreRadiusProfiles({
+        variables: { context: { ...radiusProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
   };
 
-  const handleFetchMoreProfiles = (e, key) => {
+  const handleFetchCaptiveProfiles = e => {
-    if (key === 'radius') fetchMoreProfiles(e, radiusProfiles, fetchMoreRadiusProfiles);
+    if (captiveProfiles.getAllProfiles.context.lastPage) {
-    else if (key === 'captive_portal')
+      return false;
-      fetchMoreProfiles(e, captiveProfiles, fetchMoreCaptiveProfiles);
+    }
-    else if (key === 'rf') fetchMoreProfiles(e, rfProfiles, fetchMoreRfProfiles);
+
-    else if (key === 'passpoint_venue') fetchMoreProfiles(e, venueProfiles, fetchMoreVenueProfiles);
+    e.persist();
-    else if (key === 'passpoint_operator')
+    const { target } = e;
-      fetchMoreProfiles(e, operatorProfiles, fetchMoreOperatorProfiles);
+
-    else if (key === 'passpoint_osu_id_provider')
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
-      fetchMoreProfiles(e, idProviderProfiles, fetchMoreIdProviderProfiles);
+      fetchMoreCaptiveProfiles({
-    else if (key === 'passpoint')
+        variables: { context: { ...captiveProfiles.getAllProfiles.context } },
-      fetchMoreProfiles(e, passpointProfiles, fetchMorePasspointProfiles);
+        updateQuery: updateQueryGetAllProfiles,
-    else fetchMoreProfiles(e, ssidProfiles, fetchMore);
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchVenueProfiles = e => {
+    if (venueProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreVenueProfiles({
+        variables: { context: { ...venueProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchRfProfiles = e => {
+    if (rfProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreRfProfiles({
+        variables: { context: { ...rfProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchOperatorProfiles = e => {
+    if (operatorProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreOperatorProfiles({
+        variables: { context: { ...operatorProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
+  };
+
+  const handleFetchIdProviderProfiles = e => {
+    if (idProviderProfiles.getAllProfiles.context.lastPage) {
+      return false;
+    }
+
+    e.persist();
+    const { target } = e;
+
+    if (target.scrollTop + target.offsetHeight === target.scrollHeight) {
+      fetchMoreIdProviderProfiles({
+        variables: { context: { ...idProviderProfiles.getAllProfiles.context } },
+        updateQuery: updateQueryGetAllProfiles,
+      });
+    }
+
+    return true;
   };
 
   if (loading) {
     return <Loading />;
   }
 
+  if (error) {
+    return (
+      <Alert message="Error" description="Failed to load profile data." type="error" showIcon />
+    );
+  }
+
   if (redirect) {
     return <Redirect to={ROUTES.profiles} />;
   }
@@ -296,7 +328,6 @@ const ProfileDetails = () => {
   return (
     <ProfileDetailsPage
       name={data.getProfile.name}
-      profileId={data?.getProfile?.id}
       profileType={data.getProfile.profileType}
       details={data.getProfile.details}
       childProfiles={data.getProfile.childProfiles}
@@ -310,12 +341,14 @@ const ProfileDetails = () => {
       venueProfiles={venueProfiles?.getAllProfiles?.items}
       operatorProfiles={operatorProfiles?.getAllProfiles?.items}
       idProviderProfiles={idProviderProfiles?.getAllProfiles?.items}
-      associatedSsidProfiles={data.getProfile?.associatedSsidProfiles}
-      osuSsidProfile={data.getProfile?.osuSsidProfile}
-      passpointProfiles={passpointProfiles?.getAllProfiles?.items}
       fileUpload={handleFileUpload}
-      onFetchMoreProfiles={handleFetchMoreProfiles}
+      onFetchMoreProfiles={handleFetchProfiles}
-      onDownloadFile={handleDownloadFile}
+      onFetchMoreRfProfiles={handleFetchRfProfiles}
+      onFetchMoreRadiusProfiles={handleFetchRadiusProfiles}
+      onFetchMoreCaptiveProfiles={handleFetchCaptiveProfiles}
+      onFetchMoreVenueProfiles={handleFetchVenueProfiles}
+      onFetchMoreOperatorProfiles={handleFetchOperatorProfiles}
+      onFetchMoreIdProviderProfiles={handleFetchIdProviderProfiles}
     />
   );
 };

app/containers/System/containers/AutoProvision/index.js

@@ -1,4 +1,4 @@
-import React, { useContext, useMemo } from 'react';
+import React, { useContext } from 'react';
 import { useQuery, useMutation } from '@apollo/client';
 import { Alert, notification } from 'antd';
 import { AutoProvision as AutoProvisionPage, Loading } from '@tip-wlan/wlan-cloud-ui-library';
@@ -6,8 +6,6 @@ import { AutoProvision as AutoProvisionPage, Loading } from '@tip-wlan/wlan-clou
 import UserContext from 'contexts/UserContext';
 import { GET_CUSTOMER, GET_ALL_LOCATIONS, GET_ALL_PROFILES } from 'graphql/queries';
 import { UPDATE_CUSTOMER } from 'graphql/mutations';
-import { fetchMoreProfiles } from 'graphql/functions';
-import { formatLocations } from 'utils/locations';
 
 const AutoProvision = () => {
   const { customerId } = useContext(UserContext);
@@ -16,13 +14,13 @@ const AutoProvision = () => {
   });
   const [updateCustomer] = useMutation(UPDATE_CUSTOMER);
 
-  const { data: dataLocation, loading: loadingLocation, error: errorLocation } = useQuery(
+  const { data: dataLocation, loading: loadingLoaction, error: errorLocation } = useQuery(
     GET_ALL_LOCATIONS,
     {
       variables: { customerId },
     }
   );
-  const { data: dataProfile, loading: loadingProfile, error: errorProfile, fetchMore } = useQuery(
+  const { data: dataProfile, loading: loadingProfile, error: errorProfile } = useQuery(
     GET_ALL_PROFILES(),
     {
       variables: { customerId, type: 'equipment_ap', limit: 100 },
@@ -62,14 +60,6 @@ const AutoProvision = () => {
       );
   };
 
-  const handleFetchMoreProfiles = e => {
-    fetchMoreProfiles(e, dataProfile, fetchMore);
-  };
-
-  const locationsTree = useMemo(() => {
-    return formatLocations(dataLocation?.getAllLocations, true);
-  }, [dataLocation?.getAllLocations]);
-
   if (loading) {
     return <Loading />;
   }
@@ -82,15 +72,14 @@ const AutoProvision = () => {
 
   return (
     <AutoProvisionPage
-      data={data?.getCustomer}
+      data={data && data.getCustomer}
-      locationsTree={locationsTree}
+      dataLocation={dataLocation && dataLocation.getAllLocations}
-      dataProfile={dataProfile?.getAllProfiles?.items}
+      dataProfile={dataProfile && dataProfile.getAllProfiles.items}
-      loadingLocation={loadingLocation}
+      loadingLoaction={loadingLoaction}
       loadingProfile={loadingProfile}
       errorLocation={errorLocation}
       errorProfile={errorProfile}
       onUpdateCustomer={handleUpdateCustomer}
-      onFetchMoreProfiles={handleFetchMoreProfiles}
     />
   );
 };

app/contexts/UserProvider/index.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RolesProvider } from '@tip-wlan/wlan-cloud-ui-library';
 
 import UserContext from 'contexts/UserContext';
 
 const UserProvider = ({ children, id, email, roles, customerId, updateUser, updateToken }) => (
   <UserContext.Provider value={{ id, email, roles, customerId, updateUser, updateToken }}>
-    <RolesProvider role={roles}>{children}</RolesProvider>
+    {children}
   </UserContext.Provider>
 );
 

app/graphql/functions.js

@@ -10,21 +10,3 @@ export const updateQueryGetAllProfiles = (previousResult, { fetchMoreResult }) =
     },
   };
 };
-
-export const fetchMoreProfiles = (e, profile, fetchMore) => {
-  if (profile.getAllProfiles.context.lastPage) {
-    return false;
-  }
-
-  e.persist();
-  const { target } = e;
-
-  if (target.scrollTop + target.offsetHeight + 10 >= target.scrollHeight) {
-    fetchMore({
-      variables: { context: { ...profile.getAllProfiles.context } },
-      updateQuery: updateQueryGetAllProfiles,
-    });
-  }
-
-  return true;
-};

app/graphql/mutations.js

@@ -255,62 +255,6 @@ export const CREATE_EQUIPMENT = gql`
   }
 `;
 
-export const UPDATE_EQUIPMENT = gql`
-  mutation UpdateEquipment(
-    $id: ID!
-    $equipmentType: String!
-    $inventoryId: String!
-    $customerId: ID!
-    $profileId: ID!
-    $locationId: ID!
-    $name: String!
-    $baseMacAddress: String
-    $latitude: String
-    $longitude: String
-    $serial: String
-    $lastModifiedTimestamp: String
-    $details: JSONObject
-  ) {
-    updateEquipment(
-      id: $id
-      equipmentType: $equipmentType
-      inventoryId: $inventoryId
-      customerId: $customerId
-      profileId: $profileId
-      locationId: $locationId
-      name: $name
-      baseMacAddress: $baseMacAddress
-      latitude: $latitude
-      longitude: $longitude
-      serial: $serial
-      lastModifiedTimestamp: $lastModifiedTimestamp
-      details: $details
-    ) {
-      id
-      equipmentType
-      inventoryId
-      customerId
-      profileId
-      locationId
-      name
-      baseMacAddress
-      latitude
-      longitude
-      serial
-      lastModifiedTimestamp
-      details
-    }
-  }
-`;
-
-export const DELETE_EQUIPMENT = gql`
-  mutation DeleteEquipment($id: ID!) {
-    deleteEquipment(id: $id) {
-      id
-    }
-  }
-`;
-
 export const UPDATE_CUSTOMER = gql`
   mutation UpdateCustomer(
     $id: ID!

app/graphql/queries.js

@@ -70,9 +70,6 @@ export const FILTER_EQUIPMENT = gql`
           firmware {
             detailsJSON
           }
-          channel {
-            detailsJSON
-          }
         }
       }
       context
@@ -80,67 +77,6 @@ export const FILTER_EQUIPMENT = gql`
   }
 `;
 
-export const GET_EQUIPMENT = gql`
-  query GetEquipment($id: ID!) {
-    getEquipment(id: $id) {
-      id
-      equipmentType
-      inventoryId
-      customerId
-      profileId
-      locationId
-      name
-      latitude
-      longitude
-      serial
-      lastModifiedTimestamp
-      details
-      profile {
-        id
-        name
-        childProfiles {
-          id
-          name
-          details
-        }
-      }
-      baseMacAddress
-      manufacturer
-      status {
-        firmware {
-          detailsJSON
-        }
-        protocol {
-          detailsJSON
-        }
-        radioUtilization {
-          detailsJSON
-        }
-        clientDetails {
-          detailsJSON
-          details {
-            numClientsPerRadio
-          }
-        }
-        osPerformance {
-          detailsJSON
-        }
-        channel {
-          detailsJSON
-        }
-      }
-      model
-      alarmsCount
-      alarms {
-        severity
-        alarmCode
-        details
-        createdTimestamp
-      }
-    }
-  }
-`;
-
 export const FILTER_EQUIPMENT_BULK_EDIT_APS = gql`
   query FilterEquipment(
     $locationIds: [ID]

app/index.js

@@ -14,7 +14,6 @@ import { AUTH_TOKEN } from 'constants/index';
 import { REFRESH_TOKEN } from 'graphql/mutations';
 import { getItem, setItem, removeItem } from 'utils/localStorage';
 import history from 'utils/history';
-import { ScrollToTop } from '@tip-wlan/wlan-cloud-ui-library';
 
 const API_URI = process.env.NODE_ENV === 'production' ? window.REACT_APP_API : process.env.API;
 const MOUNT_NODE = document.getElementById('root');
@@ -103,7 +102,6 @@ const render = () => {
   ReactDOM.render(
     <Router history={history}>
       <ApolloProvider client={client}>
-        <ScrollToTop />
         <App />
       </ApolloProvider>
     </Router>,

app/styles/index.scss

@@ -1,14 +1,3 @@
 body {
   font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
-
-input:-webkit-autofill,
-input:-webkit-autofill:hover,
-input:-webkit-autofill:focus,
-input:-webkit-autofill:active,
-input:-webkit-autofill::first-line {
-  -webkit-transition: color 9999s ease-out, background-color 9999s ease-out;
-  transition: color 9999s ease-out, background-color 9999s ease-out;
-  font-size: 14px !important;
-  font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif !important;
-}

app/utils/locations.js

@@ -1,110 +0,0 @@
-import { filter, isEmpty, each } from 'lodash';
-
-export const NETWORK_NODE = {
-  title: 'Network',
-  id: '0',
-  key: '0',
-  value: '0',
-  name: 'Network',
-};
-
-export const formatLocations = (list = [], disableRoot = false) => {
-  function unflatten(array, p) {
-    let tree = [];
-    const parent = typeof p !== 'undefined' ? p : { id: '0' };
-    let children = filter(array, child => child.parentId === parent.id);
-    children = children.map(c => ({
-      title: c.name,
-      value: `${c.id}`,
-      key: c.id,
-      isLeaf: false,
-      ...c,
-    }));
-    if (!isEmpty(children)) {
-      if (parent.id === '0') {
-        tree = children;
-      } else {
-        parent.children = children;
-      }
-      each(children, child => unflatten(array, child));
-    }
-    return tree;
-  }
-
-  return [
-    {
-      ...NETWORK_NODE,
-      ...(disableRoot && { disabled: true }),
-      children: unflatten(list),
-    },
-  ];
-};
-
-export const getBreadcrumbPath = (id, locations) => {
-  const locationsPath = [];
-  const treeRecurse = (parentNodeId, node) => {
-    if (node.id === parentNodeId) {
-      locationsPath.unshift(node);
-      return node;
-    }
-    if (node.children) {
-      let parent;
-      node.children.some(i => {
-        parent = treeRecurse(parentNodeId, i);
-        return parent;
-      });
-      if (parent) {
-        locationsPath.unshift(node);
-      }
-      return parent;
-    }
-    return null;
-  };
-
-  treeRecurse(id, {
-    id: 0,
-    children: locations,
-  });
-
-  return locationsPath;
-};
-
-export const getLocationPath = (selectedId, locations) => {
-  const locationsPath = [];
-
-  const treeRecurse = (parentNodeId, node) => {
-    if (node.id === parentNodeId) {
-      locationsPath.unshift(node.id);
-
-      if (node.children) {
-        const flatten = children => {
-          children.forEach(i => {
-            locationsPath.unshift(i.id);
-            if (i.children) {
-              flatten(i.children);
-            }
-          });
-        };
-
-        flatten(node.children);
-      }
-      return node;
-    }
-    if (node.children) {
-      let parent;
-      node.children.some(i => {
-        parent = treeRecurse(parentNodeId, i);
-        return parent;
-      });
-      return parent;
-    }
-
-    return null;
-  };
-
-  if (selectedId) {
-    treeRecurse(selectedId, { id: 0, children: locations });
-  }
-
-  return locationsPath;
-};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wlan-cloud-ui",
-  "version": "1.2.0",
+  "version": "0.7.5",
   "author": "ConnectUs",
   "description": "React Portal",
   "engines": {
@@ -9,9 +9,9 @@
   },
   "scripts": {
     "test": "jest --passWithNoTests --coverage",
-    "start": "cross-env NODE_ENV=development webpack serve --mode development",
+    "start": "cross-env NODE_ENV=development webpack-dev-server",
-    "start:bare": "cross-env API=https://wlan-ui.tip-sdk.lab.netexperience.com NODE_ENV=bare webpack serve --mode development",
+    "start:bare": "cross-env API=https://wlan-graphql.qa.lab.wlan.tip.build NODE_ENV=bare webpack-dev-server",
-    "start:dev": "cross-env API=https://wlan-ui.tip-sdk.lab.netexperience.com NODE_ENV=development webpack serve --mode development",
+    "start:dev": "cross-env API=https://wlan-graphql.qa.lab.wlan.tip.build NODE_ENV=development webpack-dev-server",
     "build": "webpack --mode=production",
     "format": "prettier --write 'app/**/*{.js,.scss}'",
     "eslint-fix": "eslint --fix 'app/**/*.js'",
@@ -21,26 +21,33 @@
   "dependencies": {
     "@ant-design/icons": "^4.2.1",
     "@apollo/client": "^3.1.3",
-    "@tip-wlan/wlan-cloud-ui-library": "^1.2.6",
+    "@tip-wlan/wlan-cloud-ui-library": "^0.7.6",
     "antd": "^4.5.2",
     "apollo-upload-client": "^13.0.0",
-    "graphql": "^15.5.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "graphql": "^14.6.0",
+    "highcharts": "^8.1.0",
+    "highcharts-react-official": "^3.0.0",
     "history": "^4.10.1",
+    "html-webpack-plugin": "^3.2.0",
     "lodash": "^4.17.15",
+    "mini-css-extract-plugin": "^0.9.0",
     "moment": "^2.26.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
     "prop-types": "^15.7.2",
     "react": "^16.13.0",
     "react-dom": "^16.13.0",
     "react-helmet": "^5.2.1",
+    "react-jsx-highcharts": "^4.1.0",
+    "react-jsx-highstock": "^4.1.0",
     "react-router-dom": "^5.1.2",
-    "recharts": "^2.0.9"
+    "terser-webpack-plugin": "^2.3.5"
   },
   "devDependencies": {
     "@babel/core": "^7.8.7",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/preset-env": "^7.8.7",
     "@babel/preset-react": "^7.8.3",
-    "@babel/runtime": "^7.13.10",
     "@testing-library/react": "^10.0.3",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.1.0",
@@ -48,10 +55,8 @@
     "babel-loader": "^8.0.6",
     "babel-plugin-root-import": "^6.4.1",
     "babel-polyfill": "^6.26.0",
-    "clean-webpack-plugin": "^3.0.0",
     "cross-env": "^7.0.2",
     "css-loader": "^3.4.2",
-    "css-minimizer-webpack-plugin": "^1.3.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-config-prettier": "^6.10.0",
@@ -63,23 +68,20 @@
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^2.5.0",
     "file-loader": "^5.1.0",
-    "html-webpack-plugin": "^5.3.1",
     "husky": "^4.2.3",
     "jest": "^25.4.0",
     "less": "^3.11.1",
-    "less-loader": "^6.2.0",
+    "less-loader": "^5.0.0",
     "lint-staged": "^10.0.8",
-    "mini-css-extract-plugin": "^1.3.9",
     "node-sass": "^4.13.1",
     "prettier": "^1.19.1",
     "react-test-renderer": "^16.13.1",
     "sass-loader": "^8.0.2",
     "style-loader": "^1.1.3",
-    "terser-webpack-plugin": "^5.1.1",
+    "webpack": "^4.42.0",
-    "webpack": "^5.28.0",
+    "webpack-cli": "^3.3.11",
-    "webpack-cli": "^4.5.0",
+    "webpack-dev-server": "^3.11.0",
-    "webpack-dev-server": "^3.11.2",
+    "webpack-merge": "^4.2.2"
-    "webpack-merge": "^5.7.3"
   },
   "browserslist": [
     "last 2 versions",

webpack.config.js

@@ -1,5 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies */
+const webpackMerge = require('webpack-merge');
-const { merge } = require('webpack-merge');
 const common = require('./webpack/webpack.common');
 
 const envs = {
@@ -10,4 +9,4 @@ const envs = {
 /* eslint-disable global-require,import/no-dynamic-require */
 const env = envs[process.env.NODE_ENV || 'production'];
 const envConfig = require(`./webpack/webpack.${env}.js`);
-module.exports = merge(common, envConfig);
+module.exports = webpackMerge(common, envConfig);

webpack/webpack.common.js

@@ -1,3 +1,4 @@
+const HtmlWebPackPlugin = require('html-webpack-plugin');
 /* eslint-disable import/no-extraneous-dependencies */
 const webpack = require('webpack');
 
@@ -24,6 +25,10 @@ module.exports = {
     ],
   },
   plugins: [
+    new HtmlWebPackPlugin({
+      template: commonPaths.templatePath,
+      favicon: './app/images/favicon.ico',
+    }),
     new webpack.DefinePlugin({
       'process.env.API': JSON.stringify(process.env.API || 'http://localhost:4000'),
     }),

webpack/webpack.dev.js

@@ -1,6 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies */
 const path = require('path');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const commonPaths = require('./paths');
 
@@ -54,9 +52,7 @@ module.exports = {
           {
             loader: 'less-loader', // compiles Less to CSS
             options: {
-              lessOptions: {
+              javascriptEnabled: true,
-                javascriptEnabled: true,
-              },
             },
           },
         ],
@@ -83,11 +79,4 @@ module.exports = {
       ),
     },
   },
-
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: commonPaths.templatePath,
-      favicon: './app/images/favicon.ico',
-    }),
-  ],
 };

webpack/webpack.prod.js

@@ -1,8 +1,6 @@
-/* eslint-disable import/no-extraneous-dependencies */
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const path = require('path');
 
@@ -10,50 +8,45 @@ const commonPaths = require('./paths');
 
 module.exports = {
   output: {
+    filename: `${commonPaths.jsFolder}/[name].[hash].js`,
     path: commonPaths.outputPath,
     publicPath: '/',
-    filename: `${commonPaths.jsFolder}/[name].[chunkhash].js`,
+    chunkFilename: `${commonPaths.jsFolder}/[name].[chunkhash].js`,
-    chunkFilename: `${commonPaths.jsFolder}/[id].[chunkhash].js`,
   },
-
   optimization: {
     minimize: true,
     minimizer: [
       new TerserPlugin({
-        terserOptions: {
+        // Use multi-process parallel running to improve the build speed
-          warnings: false,
+        // Default number of concurrent runs: os.cpus().length - 1
-          compress: {
-            comparisons: false,
-          },
-          parse: {},
-          mangle: true,
-          output: {
-            comments: false,
-            ascii_only: true,
-          },
-        },
         parallel: true,
+        // Enable file caching
+        cache: true,
+        sourceMap: true,
       }),
-      new CssMinimizerPlugin(),
+      new OptimizeCSSAssetsPlugin(),
     ],
-    nodeEnv: 'production',
+    // Automatically split vendor and commons
-    sideEffects: true,
+    // https://twitter.com/wSokra/status/969633336732905474
-    concatenateModules: true,
+    // https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
-    runtimeChunk: 'single',
     splitChunks: {
-      chunks: 'all',
-      maxInitialRequests: 10,
-      minSize: 0,
       cacheGroups: {
-        vendor: {
+        vendors: {
           test: /[\\/]node_modules[\\/]/,
-          name(module) {
+          name: 'vendors',
-            const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
+          chunks: 'initial',
-            return `npm.${packageName.replace('@', '')}`;
+        },
-          },
+        async: {
+          test: /[\\/]node_modules[\\/]/,
+          name: 'async',
+          chunks: 'async',
+          minChunks: 4,
         },
       },
     },
+    // Keep the runtime chunk seperated to enable long term caching
+    // https://twitter.com/wSokra/status/969679223278505985
+    runtimeChunk: true,
   },
 
   module: {
@@ -85,48 +78,25 @@ module.exports = {
           {
             loader: 'less-loader', // compiles Less to CSS
             options: {
-              lessOptions: {
+              javascriptEnabled: true,
-                javascriptEnabled: true,
-              },
             },
           },
         ],
       },
     ],
   },
-
   resolve: {
     modules: ['node_modules', 'app'],
     alias: {
       app: path.resolve(__dirname, '../', 'app'),
     },
   },
-
   plugins: [
     new CleanWebpackPlugin(),
-
-    // Minify and optimize the index.html
-    new HtmlWebpackPlugin({
-      template: commonPaths.templatePath,
-      favicon: './app/images/favicon.ico',
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-      inject: true,
-    }),
-
     new MiniCssExtractPlugin({
       filename: `${commonPaths.cssFolder}/[name].css`,
-      chunkFilename: `${commonPaths.cssFolder}/[id].css`,
+      chunkFilename: `${commonPaths.cssFolder}/[name].css`,
     }),
   ],
+  devtool: 'source-map',
 };