diff --git a/src/ui/components/CERNMode.js b/src/ui/components/CERNMode.js deleted file mode 100644 index ac3331b2..00000000 --- a/src/ui/components/CERNMode.js +++ /dev/null @@ -1,7 +0,0 @@ -export const isCernMode = process.env.REACT_APP_CERN_MODE === 'TRUE'; - -export const withCernMode = WrappedComponent => isCernMode ? WrappedComponent : () => null; - -const CERNMode = props => isCernMode ? props.children : null; - -export default CERNMode; \ No newline at end of file diff --git a/src/ui/components/Toolbar.js b/src/ui/components/Toolbar.js index b800cf7c..6aca712c 100644 --- a/src/ui/components/Toolbar.js +++ b/src/ui/components/Toolbar.js @@ -8,7 +8,7 @@ import OpenInNewIcon from 'mdi-material-ui/OpenInNew' import {Barcode, ContentCopy, EmailOutline, Map, Printer, Domain, Camera, Eye, Repeat} from 'mdi-material-ui'; import { RadiationIcon } from "eam-components/dist/ui/components/icons"; import { Link } from "react-router-dom"; -import { isCernMode } from "./CERNMode"; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import EditWatchlistDialog from './watchlist/EditWatchlistDialog'; export const ENTITY_TYPE = { diff --git a/src/ui/components/iframes/ComponentIframe.js b/src/ui/components/iframes/ComponentIframe.js index 0d063470..b697968c 100644 --- a/src/ui/components/iframes/ComponentIframe.js +++ b/src/ui/components/iframes/ComponentIframe.js @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import queryString from "query-string" import ResizableIframe from "./ResizableIframe"; -import { withCernMode } from "../CERNMode"; +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; class ComponentIframe extends Component { docLightStyle = { diff --git a/src/ui/components/iframes/EDMSDoclightIframeContainer.js b/src/ui/components/iframes/EDMSDoclightIframeContainer.js index 0649d7fb..f0b0aa16 100644 --- a/src/ui/components/iframes/EDMSDoclightIframeContainer.js +++ b/src/ui/components/iframes/EDMSDoclightIframeContainer.js @@ -1,6 +1,6 @@ import {connect} from 'react-redux' import ComponentIframe from './ComponentIframe' -import { withCernMode } from '../CERNMode' +import { withCernMode } from 'eam-components/dist/tools/CERNMode' function mapStateToProps(state) { return { diff --git a/src/ui/components/iframes/EquipmentGraphIframe.js b/src/ui/components/iframes/EquipmentGraphIframe.js index a8c4b232..4547a7cd 100644 --- a/src/ui/components/iframes/EquipmentGraphIframe.js +++ b/src/ui/components/iframes/EquipmentGraphIframe.js @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; import ResizableIframe from "./ResizableIframe"; -import { withCernMode } from '../CERNMode' +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; const functionToEAMLightPageMapping = { 'OSOBJA': '/asset', diff --git a/src/ui/components/iframes/NCRIframeContainer.js b/src/ui/components/iframes/NCRIframeContainer.js index 671ce39e..801f8568 100644 --- a/src/ui/components/iframes/NCRIframeContainer.js +++ b/src/ui/components/iframes/NCRIframeContainer.js @@ -1,6 +1,6 @@ import {connect} from 'react-redux' import ComponentIframe from './ComponentIframe' -import { withCernMode } from '../CERNMode' +import { withCernMode } from 'eam-components/dist/tools/CERNMode' function mapStateToProps(state) { return { diff --git a/src/ui/components/servicelogin/ScanUser.js b/src/ui/components/servicelogin/ScanUser.js index acd2427a..c35808f6 100644 --- a/src/ui/components/servicelogin/ScanUser.js +++ b/src/ui/components/servicelogin/ScanUser.js @@ -4,7 +4,7 @@ import { Alert } from '@mui/material'; import KeyCode from 'eam-components/dist/enums/KeyCode'; import WS from '../../../tools/WS'; import BlockUi from 'react-block-ui'; -import { withCernMode } from '../CERNMode'; +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; import GridTools from '../../../tools/GridTools'; const setUser = (userId, onSuccess, onError, mode) => { diff --git a/src/ui/components/statusrow/StatusRow.js b/src/ui/components/statusrow/StatusRow.js index 3ac32947..c4ed0525 100644 --- a/src/ui/components/statusrow/StatusRow.js +++ b/src/ui/components/statusrow/StatusRow.js @@ -7,7 +7,7 @@ import LockIcon from '@mui/icons-material/Lock'; import ReportIcon from '@mui/icons-material/Report'; import ReportProblemIcon from '@mui/icons-material/ReportProblem'; import {EISIcon, RadioactiveWarningIcon} from 'eam-components/dist/ui/components/icons/index' -import {isCernMode} from '../CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; const STATUS_KEYS = { OUT_OF_SERVICE: "OUT_OF_SERVICE", diff --git a/src/ui/layout/Footer.js b/src/ui/layout/Footer.js index 46c89d1e..f66b2165 100644 --- a/src/ui/layout/Footer.js +++ b/src/ui/layout/Footer.js @@ -1,6 +1,6 @@ import React from "react"; import { useTheme } from '@mui/material/styles'; -import { isCernMode } from "ui/components/CERNMode"; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import {version} from '../../../package.json' import EAMFooter from 'eam-components/dist/ui/components/footer/Footer'; import { releaseNotesPath } from "Eamlight"; diff --git a/src/ui/layout/menu/EamlightMenu.js b/src/ui/layout/menu/EamlightMenu.js index 99df27d8..79c68594 100644 --- a/src/ui/layout/menu/EamlightMenu.js +++ b/src/ui/layout/menu/EamlightMenu.js @@ -18,7 +18,7 @@ import ScreenChange from "./ScreenChange"; import MenuTools from './MenuTools' import RoomIcon from '@mui/icons-material/Room'; import BuildIcon from '@mui/icons-material/Build'; -import CERNMode from '../../components/CERNMode'; +import CERNMode from 'eam-components/dist/tools/CERNMode'; import MenuLink from "./MenuLink"; import MenuItemInputHistory from './MenuItemInputHistory'; import EISPanel from 'ui/components/panel/Panel'; diff --git a/src/ui/pages/equipment/asset/Asset.js b/src/ui/pages/equipment/asset/Asset.js index 23390eab..014f05a7 100644 --- a/src/ui/pages/equipment/asset/Asset.js +++ b/src/ui/pages/equipment/asset/Asset.js @@ -17,7 +17,7 @@ import EntityRegions from "../../../components/entityregions/EntityRegions"; import EquipmentPartsMadeOf from "../components/EquipmentPartsMadeOf"; import WSParts from '../../../../tools/WSParts'; import EquipmentGraphIframe from '../../../components/iframes/EquipmentGraphIframe'; -import { isCernMode } from '../../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import { TAB_CODES } from '../../../components/entityregions/TabCodeMapping'; import { getTabAvailability, getTabInitialVisibility, registerCustomField } from '../../EntityTools'; import NCRIframeContainer from '../../../components/iframes/NCRIframeContainer'; diff --git a/src/ui/pages/equipment/components/EquipmentHistory.js b/src/ui/pages/equipment/components/EquipmentHistory.js index a9400401..5d49f8fe 100644 --- a/src/ui/pages/equipment/components/EquipmentHistory.js +++ b/src/ui/pages/equipment/components/EquipmentHistory.js @@ -3,7 +3,7 @@ import WSEquipment from '../../../../tools/WSEquipment'; import EISTable, {TRANSFORM_KEYS} from 'eam-components/dist/ui/components/table'; import SimpleEmptyState from 'eam-components/dist/ui/components/emptystates/SimpleEmptyState' import BlockUi from 'react-block-ui'; -import { withCernMode } from '../../../components/CERNMode'; +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; import Constants from 'eam-components/dist/enums/Constants'; import { formatDateTime } from 'ui/pages/EntityTools'; diff --git a/src/ui/pages/equipment/components/EquipmentMTFWorkOrders.js b/src/ui/pages/equipment/components/EquipmentMTFWorkOrders.js index f20d532a..61032d60 100644 --- a/src/ui/pages/equipment/components/EquipmentMTFWorkOrders.js +++ b/src/ui/pages/equipment/components/EquipmentMTFWorkOrders.js @@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'; import EAMTableGridRequestAdapter from "eam-components/dist/ui/components/eamtable/EAMTableGridRequestAdapter"; import compareAsc from 'date-fns/compareAsc' import parse from 'date-fns/parse' -import { withCernMode } from '../../../components/CERNMode'; +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; const DATE_FORMAT = "dd-LLL-yyyy"; diff --git a/src/ui/pages/equipment/components/EquipmentWorkOrders.js b/src/ui/pages/equipment/components/EquipmentWorkOrders.js index 85da61c4..ef0f30f2 100644 --- a/src/ui/pages/equipment/components/EquipmentWorkOrders.js +++ b/src/ui/pages/equipment/components/EquipmentWorkOrders.js @@ -5,7 +5,7 @@ import EISTable, {TRANSFORM_KEYS} from 'eam-components/dist/ui/components/table' import EISTableFilter from 'eam-components/dist/ui/components/table/EISTableFilter'; import EquipmentMTFWorkOrders from "./EquipmentMTFWorkOrders" import BlockUi from 'react-block-ui'; -import { isCernMode } from '../../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import Constants from 'eam-components/dist/enums/Constants'; import useLocalStorage from '../../../../hooks/useLocalStorage'; diff --git a/src/ui/pages/equipment/location/Location.js b/src/ui/pages/equipment/location/Location.js index e01c0c58..be9b820d 100644 --- a/src/ui/pages/equipment/location/Location.js +++ b/src/ui/pages/equipment/location/Location.js @@ -5,7 +5,7 @@ import React from "react"; import BlockUi from "react-block-ui"; import "react-block-ui/style.css"; import WSLocation from "../../../../tools/WSLocation"; -import { isCernMode } from '../../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import CustomFields from 'eam-components/dist/ui/components/customfields/CustomFields'; import EntityRegions from "../../../components/entityregions/EntityRegions"; import { TAB_CODES } from '../../../components/entityregions/TabCodeMapping'; diff --git a/src/ui/pages/equipment/position/Position.js b/src/ui/pages/equipment/position/Position.js index 20875615..6efc7e44 100644 --- a/src/ui/pages/equipment/position/Position.js +++ b/src/ui/pages/equipment/position/Position.js @@ -16,7 +16,7 @@ import {ENTITY_TYPE} from "../../../components/Toolbar"; import Comments from 'eam-components/dist/ui/components/comments/Comments'; import EntityRegions from "../../../components/entityregions/EntityRegions"; import EquipmentGraphIframe from '../../../components/iframes/EquipmentGraphIframe'; -import { isCernMode } from '../../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import { TAB_CODES } from '../../../components/entityregions/TabCodeMapping'; import { getTabAvailability, getTabInitialVisibility } from '../../EntityTools'; import NCRIframeContainer from '../../../components/iframes/NCRIframeContainer'; diff --git a/src/ui/pages/equipment/replaceeqp/ReplaceEqpContainer.js b/src/ui/pages/equipment/replaceeqp/ReplaceEqpContainer.js index dbef061b..6c91fc2c 100644 --- a/src/ui/pages/equipment/replaceeqp/ReplaceEqpContainer.js +++ b/src/ui/pages/equipment/replaceeqp/ReplaceEqpContainer.js @@ -1,7 +1,7 @@ import {connect} from 'react-redux' import {handleError, showError, showWarning, showNotification} from '../../../../actions/uiActions' import ReplaceEqp from "./ReplaceEqp"; -import { withCernMode } from '../../../components/CERNMode'; +import { withCernMode } from 'eam-components/dist/tools/CERNMode'; function mapStateToProps(state) { return { diff --git a/src/ui/pages/equipment/system/System.js b/src/ui/pages/equipment/system/System.js index 7976731f..3b5bcbc3 100644 --- a/src/ui/pages/equipment/system/System.js +++ b/src/ui/pages/equipment/system/System.js @@ -16,7 +16,7 @@ import EDMSDoclightIframeContainer from "../../../components/iframes/EDMSDocligh import {ENTITY_TYPE} from "../../../components/Toolbar"; import EntityRegions from "../../../components/entityregions/EntityRegions"; import EquipmentGraphIframe from '../../../components/iframes/EquipmentGraphIframe'; -import { isCernMode } from '../../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import { TAB_CODES } from '../../../components/entityregions/TabCodeMapping'; import { getTabAvailability, getTabInitialVisibility } from '../../EntityTools'; import useEntity from "hooks/useEntity"; diff --git a/src/ui/pages/part/Part.js b/src/ui/pages/part/Part.js index 67ce7a40..ac0ccde1 100644 --- a/src/ui/pages/part/Part.js +++ b/src/ui/pages/part/Part.js @@ -26,7 +26,7 @@ import DriveFileRenameOutlineIcon from '@mui/icons-material/DriveFileRenameOutli import ListAltIcon from '@mui/icons-material/ListAlt'; import AssignmentIndIcon from '@mui/icons-material/AssignmentInd'; import PlaceIcon from '@mui/icons-material/Place'; -import { isCernMode } from 'ui/components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; const Part = () => { const {screenLayout: partLayout, entity: part, loading, readOnly, isModified, diff --git a/src/ui/pages/part/PartStock.js b/src/ui/pages/part/PartStock.js index 1fef49ba..32ca0114 100644 --- a/src/ui/pages/part/PartStock.js +++ b/src/ui/pages/part/PartStock.js @@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react'; import WSParts from '../../../tools/WSParts' import EISTable from 'eam-components/dist/ui/components/table'; import {Link} from 'react-router-dom'; -import { isCernMode } from '../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import queryString from 'query-string'; function PartStock(props) { diff --git a/src/ui/pages/work/Workorder.js b/src/ui/pages/work/Workorder.js index e9453c5e..1006a9f2 100644 --- a/src/ui/pages/work/Workorder.js +++ b/src/ui/pages/work/Workorder.js @@ -25,7 +25,7 @@ import IconButton from '@mui/material/IconButton'; import PrintIcon from '@mui/icons-material/Print'; import TuneIcon from '@mui/icons-material/Tune'; import {IconSlash} from 'eam-components/dist/ui/components/icons/index'; -import { isCernMode } from '../../components/CERNMode'; +import { isCernMode } from 'eam-components/dist/tools/CERNMode'; import { TAB_CODES } from '../../components/entityregions/TabCodeMapping'; import { getTabAvailability, getTabInitialVisibility, registerCustomField } from '../EntityTools'; import WSParts from '../../../tools/WSParts';