Component naming cleanup

src/pages/DevicePage/ActionModal.js

@@ -19,7 +19,7 @@ import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
 
-const ActionModalWidget = ({ show, toggleModal, title, directions, action }) => {
+const ActionModal = ({ show, toggleModal, title, directions, action }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
   const [hadFailure, setHadFailure] = useState(false);
   const [waiting, setWaiting] = useState(false);
@@ -179,7 +179,7 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action }) =>
   );
 };
 
-ActionModalWidget.propTypes = {
+ActionModal.propTypes = {
   show: PropTypes.bool.isRequired,
   toggleModal: PropTypes.func.isRequired,
   title: PropTypes.string.isRequired,
@@ -187,4 +187,4 @@ ActionModalWidget.propTypes = {
   action: PropTypes.string.isRequired,
 };
 
-export default ActionModalWidget;
+export default ActionModal;

src/pages/DevicePage/BlinkModal.js

@@ -22,7 +22,7 @@ import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
 
-const BlinkModalWidget = ({ show, toggleModal }) => {
+const BlinkModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
   const [hadFailure, setHadFailure] = useState(false);
   const [doingNow, setDoingNow] = useState(false);
@@ -213,9 +213,9 @@ const BlinkModalWidget = ({ show, toggleModal }) => {
   );
 };
 
-BlinkModalWidget.propTypes = {
+BlinkModal.propTypes = {
   show: PropTypes.bool.isRequired,
   toggleModal: PropTypes.func.isRequired,
 };
 
-export default BlinkModalWidget;
+export default BlinkModal;

src/pages/DevicePage/DeviceActions.js

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { CButton, CCard, CCardHeader, CCardBody, CRow, CCol } from '@coreui/react';
-import ActionModalWidget from './ActionModalWidget';
+import ActionModal from './ActionModal';
 import FirmwareUpgradeModal from './FirmwareUpgradeModal';
-import TraceModalWidget from './TraceModalWidget';
+import TraceModal from './TraceModal';
-import WifiScanModalWidget from './WifiScanModal';
+import WifiScanModal from './WifiScanModal';
-import BlinkModalWidget from './BlinkModalWidget';
+import BlinkModal from './BlinkModal';
 
 const DeviceActions = () => {
   const [showRebootModal, setShowRebootModal] = useState(false);
@@ -74,7 +74,7 @@ const DeviceActions = () => {
           </CCol>
         </CRow>
       </CCardBody>
-      <ActionModalWidget
+      <ActionModal
         show={showRebootModal}
         toggleModal={toggleRebootModal}
         title="Reboot Device"
@@ -82,10 +82,10 @@ const DeviceActions = () => {
         actionLabel="reboot"
         action="reboot"
       />
-      <BlinkModalWidget show={showBlinkModal} toggleModal={toggleBlinkModal} />
+      <BlinkModal show={showBlinkModal} toggleModal={toggleBlinkModal} />
       <FirmwareUpgradeModal show={showUpgradeModal} toggleModal={toggleUpgradeModal} />
-      <TraceModalWidget show={showTraceModal} toggleModal={toggleTraceModal} />
+      <TraceModal show={showTraceModal} toggleModal={toggleTraceModal} />
-      <WifiScanModalWidget show={showScanModal} toggleModal={toggleScanModal} />
+      <WifiScanModal show={showScanModal} toggleModal={toggleScanModal} />
     </CCard>
   );
 };

src/pages/DevicePage/TraceModal.js

@@ -21,7 +21,7 @@ import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
 
-const TraceModalWidget = ({ show, toggleModal }) => {
+const TraceModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
   const [hadFailure, setHadFailure] = useState(false);
   const [waiting, setWaiting] = useState(false);
@@ -224,9 +224,9 @@ const TraceModalWidget = ({ show, toggleModal }) => {
   );
 };
 
-TraceModalWidget.propTypes = {
+TraceModal.propTypes = {
   show: PropTypes.bool.isRequired,
   toggleModal: PropTypes.func.isRequired,
 };
 
-export default TraceModalWidget;
+export default TraceModal;

src/pages/DevicePage/WifiScanModal.js

@@ -20,7 +20,7 @@ import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
 
-const WifiScanModalWidget = ({ show, toggleModal }) => {
+const WifiScanModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
   const [hadFailure, setHadFailure] = useState(false);
   const [waiting, setWaiting] = useState(false);
@@ -169,9 +169,9 @@ const WifiScanModalWidget = ({ show, toggleModal }) => {
   );
 };
 
-WifiScanModalWidget.propTypes = {
+WifiScanModal.propTypes = {
   show: PropTypes.bool.isRequired,
   toggleModal: PropTypes.func.isRequired,
 };
 
-export default WifiScanModalWidget;
+export default WifiScanModal;

src/pages/DevicePage/WifiScanResultModal.js

@@ -12,7 +12,7 @@ import PropTypes from 'prop-types';
 import WifiChannelTable from './WifiChannelTable';
 import { prettyDate } from '../../utils/helper';
 
-const WifiScanResultModalWidget = ({ show, toggle, scanResults, date }) => {
+const WifiScanResultModal = ({ show, toggle, scanResults, date }) => {
   const parseThroughList = (scanList) => {
     const dbmNumber = 4294967295;
     const listOfChannels = [];
@@ -64,15 +64,15 @@ const WifiScanResultModalWidget = ({ show, toggle, scanResults, date }) => {
   );
 };
 
-WifiScanResultModalWidget.propTypes = {
+WifiScanResultModal.propTypes = {
   show: PropTypes.bool.isRequired,
   toggle: PropTypes.func.isRequired,
   scanResults: PropTypes.instanceOf(Array),
   date: PropTypes.string.isRequired,
 };
 
-WifiScanResultModalWidget.defaultProps = {
+WifiScanResultModal.defaultProps = {
   scanResults: [],
 };
 
-export default WifiScanResultModalWidget;
+export default WifiScanResultModal;