{chartToRender === ChartTypes.line &&
}
{chartToRender === ChartTypes.bar &&
}
diff --git a/src/client/app/components/HeaderButtonsComponent.tsx b/src/client/app/components/HeaderButtonsComponent.tsx
index e800c5895..3464c8a6c 100644
--- a/src/client/app/components/HeaderButtonsComponent.tsx
+++ b/src/client/app/components/HeaderButtonsComponent.tsx
@@ -36,7 +36,7 @@ export default function HeaderButtonsComponent() {
const version = useAppSelector(selectOEDVersion);
const helpUrl = useAppSelector(selectHelpUrl);
// options help
- const optionsHelp = helpUrl + '/optionsMenu/';
+ const optionsHelp = helpUrl + '/optionsMenu.html';
const loggedInAsAdmin = useAppSelector(selectIsAdmin);
const loggedIn = useAppSelector(selectIsLoggedIn);
@@ -64,7 +64,6 @@ export default function HeaderButtonsComponent() {
shouldCSVReadingsButtonDisabled: true,
shouldUnitsButtonDisabled: true,
shouldConversionsButtonDisabled: true,
- shouldVisualUnitMapButtonDisabled: true,
// Translated menu title that depend on whether logged in.
menuTitle: '',
// link to help page for page choices. Should not see default but use general help URL.
@@ -100,8 +99,7 @@ export default function HeaderButtonsComponent() {
shouldCSVMetersButtonDisabled: pathname === '/csvMeters',
shouldCSVReadingsButtonDisabled: pathname === '/csvReadings',
shouldUnitsButtonDisabled: pathname === '/units',
- shouldConversionsButtonDisabled: pathname === '/conversions',
- shouldVisualUnitMapButtonDisabled: pathname === '/visual-unit'
+ shouldConversionsButtonDisabled: pathname === '/conversions'
}));
}, [pathname]);
@@ -129,7 +127,7 @@ export default function HeaderButtonsComponent() {
display: pathname === '/' ? 'block' : 'none'
};
// Admin help or regular user page
- const neededPage = loggedInAsAdmin ? '/adminPageChoices/' : '/pageChoices/';
+ const neededPage = loggedInAsAdmin ? '/adminPageChoices.html' : '/pageChoices.html';
const currentPageChoicesHelp = helpUrl + neededPage;
setState(prevState => ({
@@ -229,13 +227,6 @@ export default function HeaderButtonsComponent() {
to="/units">
-
-
-
@@ -44,7 +48,7 @@ export default function LanguageSelectorComponent() {
+ href={helpUrl + '/language.html'}>
diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index cdf4389a3..a715dd891 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -25,7 +25,6 @@ import RoleOutlet from './router/RoleOutlet';
import UnitsDetailComponent from './unit/UnitsDetailComponent';
import ErrorComponent from './router/ErrorComponent';
import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
-import VisualUnitDetailComponent from './visual-unit/VisualUnitDetailComponent';
/**
* @returns the router component Responsible for client side routing.
@@ -59,8 +58,7 @@ const router = createBrowserRouter([
{ path: 'csvMeters', element:
},
{ path: 'maps', element:
},
{ path: 'units', element:
},
- { path: 'users', element:
},
- { path: 'visual-unit', element:
}
+ { path: 'users', element:
}
]
},
{
diff --git a/src/client/app/components/TooltipHelpComponent.tsx b/src/client/app/components/TooltipHelpComponent.tsx
index f48de775e..5a49d17c9 100644
--- a/src/client/app/components/TooltipHelpComponent.tsx
+++ b/src/client/app/components/TooltipHelpComponent.tsx
@@ -70,8 +70,7 @@ export default function TooltipHelpComponent(props: TooltipHelpProps) {
'help.home.toggle.chart.link': { link: `${helpUrl}/chartLink/` },
'help.groups.groupdetails': { link: `${helpUrl}/groupViewing/#groupDetails` },
'help.groups.groupview': { link: `${helpUrl}/groupViewing/` },
- 'help.meters.meterview': { link: `${helpUrl}/meterViewing/` },
- 'help.admin.unitconversionvisuals': { link: `${helpUrl}/adminUnitVisual/` }
+ 'help.meters.meterview': { link: `${helpUrl}/meterViewing/` }
};
return (
diff --git a/src/client/app/components/UnsavedWarningComponent.tsx b/src/client/app/components/UnsavedWarningComponent.tsx
index eb5bcd3d0..313a288d9 100644
--- a/src/client/app/components/UnsavedWarningComponent.tsx
+++ b/src/client/app/components/UnsavedWarningComponent.tsx
@@ -32,12 +32,14 @@ export function UnsavedWarningComponent(props: UnsavedWarningProps) {
submitChanges(changes)
.unwrap()
.then(() => {
+ //TODO translate me
showSuccessNotification(translate('unsaved.success'));
if (blocker.state === 'blocked') {
blocker.proceed();
}
})
.catch(() => {
+ //TODO translate me
showErrorNotification(translate('unsaved.failure'));
if (blocker.state === 'blocked') {
blocker.proceed();
diff --git a/src/client/app/components/csv/MetersCSVUploadComponent.tsx b/src/client/app/components/csv/MetersCSVUploadComponent.tsx
index d4599fb20..e7a6b4dbf 100644
--- a/src/client/app/components/csv/MetersCSVUploadComponent.tsx
+++ b/src/client/app/components/csv/MetersCSVUploadComponent.tsx
@@ -16,7 +16,6 @@ import { useAppDispatch, useAppSelector } from '../../redux/reduxHooks';
import { authApi, authPollInterval } from '../../redux/api/authApi';
import { selectIsAdmin } from '../../redux/slices/currentUserSlice';
import { selectVisibleMeterAndGroupData } from '../../redux/selectors/adminSelectors';
-import SpinnerComponent from '../SpinnerComponent';
/**
* Defines the CSV Meters page
@@ -27,8 +26,6 @@ export default function MetersCSVUploadComponent() {
const [meterData, setMeterData] = React.useState
(MetersCSVUploadDefaults);
const [selectedFile, setSelectedFile] = React.useState(null);
const [isValidFileType, setIsValidFileType] = React.useState(false);
- // tracks if should show spinner (true while loading data, false otherwise)
- const [showSpinner, setShowSpinner] = React.useState(false);
const dispatch = useAppDispatch();
// Check for admin status
const isAdmin = useAppSelector(selectIsAdmin);
@@ -75,10 +72,7 @@ export default function MetersCSVUploadComponent() {
const handleSubmit = async (e: React.MouseEvent) => {
e.preventDefault();
if (selectedFile) {
- // show spinner before calling api, then stop it immediately after
- setShowSpinner(true);
const { success, message } = await submitMeters(meterData, selectedFile, dispatch);
- setShowSpinner(false);
if (success) {
showSuccessNotification(message);
} else {
@@ -87,11 +81,6 @@ export default function MetersCSVUploadComponent() {
}
};
- const spinContainerStyle = {
- display: 'flex',
- justifyContent: 'center'
- };
-
const tooltipStyle = {
display: 'inline-block',
fontSize: '50%',
@@ -104,124 +93,118 @@ export default function MetersCSVUploadComponent() {
return (
- {showSpinner ? (
-
-
-
- ) : (<>
-
-