Reading range rejection

package.json

@@ -64,7 +64,6 @@
 		"bootstrap": "~5.3.3",
 		"csv": "~5.3.2",
 		"csv-stringify": "~5.6.5",
-		"d3": "~7.8.5",
 		"dotenv": "~16.4.5",
 		"escape-html": "~1.0.3",
 		"express": "~4.19.2",
@@ -105,7 +104,6 @@
 	},
 	"devDependencies": {
 		"@redux-devtools/extension": "~3.2.5",
-		"@types/d3": "~7.4.3",
 		"@types/lodash": "~4.17.4",
 		"@types/node": "~20.14.10",
 		"@types/plotly.js": "~2.29.2",

src/client/app/components/DashboardComponent.tsx

@@ -31,7 +31,7 @@ export default function DashboardComponent() {
 					<UIOptionsComponent />
 				</div>
 				<div className={`${optionsVisibility ? 'col-12 col-lg-10' : 'col-12'} align-self-auto text-center`} style={{ height: '100%' }}>
-					<div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+					<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', height: '100%' }}>
 						<PlotNavComponent />
 						{chartToRender === ChartTypes.line && <LineChartComponent />}
 						{chartToRender === ChartTypes.bar && <BarChartComponent />}

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">
 								<FormattedMessage id='units' />
 							</DropdownItem>
-							<DropdownItem
-								style={state.adminViewableLinkStyle}
-								disabled={state.shouldVisualUnitMapButtonDisabled}
-								tag={Link}
-								to="/visual-unit">
-								<FormattedMessage id='visual.unit' />
-							</DropdownItem>
 							<DropdownItem divider style={state.adminViewableLinkStyle} />
 							<DropdownItem
 								style={state.adminViewableLinkStyle}

src/client/app/components/LanguageSelectorComponent.tsx

@@ -6,9 +6,10 @@ import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
 import { selectSelectedLanguage, updateSelectedLanguage } from '../redux/slices/appStateSlice';
+import { selectOEDVersion } from '../redux/api/versionApi';
 import { useAppDispatch, useAppSelector } from '../redux/reduxHooks';
 import { LanguageTypes } from '../types/redux/i18n';
-import { selectHelpUrl } from '../redux/slices/adminSlice';
+import { selectBaseHelpUrl } from '../redux/slices/adminSlice';
 
 /**
  * A component that allows users to select which language the page should be displayed in.
@@ -18,7 +19,10 @@ export default function LanguageSelectorComponent() {
 	const dispatch = useAppDispatch();
 
 	const selectedLanguage = useAppSelector(selectSelectedLanguage);
-	const helpUrl = useAppSelector(selectHelpUrl);
+	const version = useAppSelector(selectOEDVersion);
+	const baseHelpUrl = useAppSelector(selectBaseHelpUrl);
+
+	const helpUrl = baseHelpUrl + version;
 
 	return (
 		<>
@@ -44,7 +48,7 @@ export default function LanguageSelectorComponent() {
 					</DropdownItem>
 					<DropdownItem divider />
 					<DropdownItem
-						href={helpUrl + '/language/'}>
+						href={helpUrl + '/language.html'}>
 						<FormattedMessage id="help" />
 					</DropdownItem>
 				</DropdownMenu>

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: <MetersCSVUploadComponent /> },
 					{ path: 'maps', element: <MapsDetailContainer /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
-					{ path: 'users', element: <UsersDetailComponent /> },
-					{ path: 'visual-unit', element: <VisualUnitDetailComponent/> }
+					{ path: 'users', element: <UsersDetailComponent /> }
 				]
 			},
 			{

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 (

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();