remove unused preference options

explore-flights · May 11, 2024 · 8a5f484 · 8a5f484
1 parent 4a778e3
commit 8a5f484
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 313 deletions.
diff --git a/ui/src/components/common/copy.tsx b/ui/src/components/common/copy.tsx
@@ -2,7 +2,6 @@ import {
   Box, BoxProps, Button, ButtonProps, Popover, PopoverProps, StatusIndicator, StatusIndicatorProps,
 } from '@cloudscape-design/components';
 import React, { useMemo } from 'react';
-import { useI18n } from '../util/context/i18n';
 import { useClipboard } from '../util/state/common';
 
 export interface CopyProps extends BoxProps {
@@ -27,7 +26,6 @@ export interface CopyButtonProps extends ButtonProps {
 }
 
 export function CopyButton({ copyText, position, ...buttonProps }: CopyButtonProps) {
-  const i18n = useI18n();
   const [loading, value, copy] = useClipboard();
   const [status, message] = useMemo<[StatusIndicatorProps.Type, string]>(() => {
     if (loading) {
@@ -39,7 +37,7 @@ export function CopyButton({ copyText, position, ...buttonProps }: CopyButtonPro
     }
 
     return ['error', 'Failed to copy'];
-  }, [i18n, loading, value]);
+  }, [loading, value]);
 
   return (
     <Popover

diff --git a/ui/src/components/contact/contact.tsx b/ui/src/components/contact/contact.tsx
@@ -2,11 +2,8 @@ import { Box, Link } from '@cloudscape-design/components';
 import React from 'react';
 import { Copy } from '../common/copy';
 import { KeyValuePairs, ValueWithLabel } from '../common/key-value-pairs';
-import { useI18n } from '../util/context/i18n';
 
 export function Contact() {
-  const i18n = useI18n();
-
   return (
     <KeyValuePairs columns={1}>
       <ValueWithLabel label={'E-Mail'}>

diff --git a/ui/src/components/cookie-preferences/cookie-preferences.tsx b/ui/src/components/cookie-preferences/cookie-preferences.tsx
@@ -12,7 +12,6 @@ import {
 } from '@cloudscape-design/components';
 import React, { useEffect, useState } from 'react';
 import { ConsentLevel } from '../../lib/consent.model';
-import { useI18n } from '../util/context/i18n';
 import { useConsent, useHasConsent } from '../util/state/use-consent';
 import { RouterLink } from '../common/router-link';
 
@@ -23,8 +22,6 @@ interface CategoryProps {
 }
 
 function Category({ name, description, checkbox }: CategoryProps) {
-  const i18n = useI18n();
-
   return (
     <>
       <Header variant={'h3'}>{name}</Header>
@@ -42,7 +39,6 @@ function Category({ name, description, checkbox }: CategoryProps) {
 }
 
 export default function CookiePreferences({ onDismiss, ...modalProps }: ModalProps) {
-  const i18n = useI18n();
   const hasConsent = useHasConsent();
   const [consentLevels, setConsentLevels] = useConsent();
   const [consent, setConsent] = useState({

diff --git a/ui/src/components/footer/footer.tsx b/ui/src/components/footer/footer.tsx
@@ -2,7 +2,6 @@ import {
   Box, Link, LinkProps, SpaceBetween,
 } from '@cloudscape-design/components';
 import React from 'react';
-import { useI18n } from '../util/context/i18n';
 import { useMobile } from '../util/state/common';
 import classes from './footer.module.scss';
 import { RouterLink } from '../common/router-link';
@@ -12,7 +11,6 @@ export interface FlightsFooterProps {
 }
 
 export default function FlightsFooter(props: FlightsFooterProps) {
-  const i18n = useI18n();
   const isMobile = useMobile();
 
   return (

diff --git a/ui/src/components/preferences/preferences.tsx b/ui/src/components/preferences/preferences.tsx
@@ -9,24 +9,18 @@ import {
   SpaceBetween,
   Tiles,
 } from '@cloudscape-design/components';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { ConsentLevel } from '../../lib/consent.model';
-import { I18N_FLIGHTS } from '../../lib/i18n/i18n-strings';
 import {
-  ColorScheme, DateFormat, Locale, Preferences, UIDensity, 
+  ColorScheme, Preferences, UIDensity,
 } from '../../lib/preferences.model';
-import { useI18n } from '../util/context/i18n';
 import { useConsent } from '../util/state/use-consent';
-import { ISO8601DateFormatter, localeDateFormatter, SystemDateFormatter } from '../util/state/use-dateformat';
-import { resolveEffectiveLocale, usePreferences, useSystemLocale } from '../util/state/use-preferences';
+import { usePreferences } from '../util/state/use-preferences';
 
 export function PreferencesModal(props: ModalProps) {
-  const i18n = useI18n();
   const [consentLevels] = useConsent();
-  const systemLocale = useSystemLocale();
   const [preferences, setPreferences] = usePreferences();
   const [tempPreferences, setTempPreferences] = useState<Preferences>(preferences);
-  const date = useMemo(() => new Date(), []);
 
   useEffect(() => {
     setTempPreferences(preferences);
@@ -67,51 +61,6 @@ export function PreferencesModal(props: ModalProps) {
         {
           !consentLevels.has(ConsentLevel.FUNCTIONALITY) && <Alert type={'warning'}><Box>You have not given permission for <Box variant={'strong'}>functional cookies</Box>. Your choice <Box variant={'strong'}>will not persist</Box> across page loads.</Box></Alert>
         }
-        <div>
-          <Header variant={'h3'}>Locale</Header>
-          <Tiles
-            value={tempPreferences.locale}
-            onChange={(e) => {
-              setTempPreferences((prev) => ({ ...prev, locale: e.detail.value as Locale }));
-            }}
-            items={[
-              {
-                label: 'System',
-                value: Locale.SYSTEM,
-              },
-              {
-                label: 'English',
-                value: Locale.EN,
-              },
-            ]}
-          />
-        </div>
-        <div>
-          <Header variant={'h3'}>Date and Time Format</Header>
-          <Tiles
-            value={tempPreferences.dateFormat}
-            onChange={(e) => {
-              setTempPreferences((prev) => ({ ...prev, dateFormat: e.detail.value as DateFormat }));
-            }}
-            items={[
-              {
-                label: 'System',
-                description: SystemDateFormatter.formatDateTime(date),
-                value: DateFormat.SYSTEM,
-              },
-              {
-                label: 'Locale',
-                description: localeDateFormatter(I18N_FLIGHTS[resolveEffectiveLocale(tempPreferences.locale, systemLocale)]).formatDateTime(date),
-                value: DateFormat.LOCALE,
-              },
-              {
-                label: 'ISO8601',
-                description: ISO8601DateFormatter.formatDateTime(date),
-                value: DateFormat.ISO_8601,
-              },
-            ]}
-          />
-        </div>
         <div>
           <Header variant={'h3'}>Theme</Header>
           <Tiles

diff --git a/ui/src/components/root.tsx b/ui/src/components/root.tsx
@@ -9,7 +9,6 @@ import {
   SplitPanel,
 } from '@cloudscape-design/components';
 import { I18nProvider as CSI18nProvider } from '@cloudscape-design/components/i18n';
-import deMessages from '@cloudscape-design/components/i18n/messages/all.de';
 import enMessages from '@cloudscape-design/components/i18n/messages/all.en';
 import {
   applyDensity, applyMode, Density, Mode,
@@ -18,7 +17,7 @@ import React, {
   createContext, useContext, useEffect, useMemo, useState,
 } from 'react';
 import { AuthInfo } from '../lib/api/api.model';
-import { customI18nMessages, I18N_FLIGHTS } from '../lib/i18n/i18n-strings';
+import { customI18nMessages } from '../lib/i18n/i18n-strings';
 import { ColorScheme, UIDensity } from '../lib/preferences.model';
 import { Breadcrumb } from './breadcrumb/breadcrumb';
 import CookiePreferences from './cookie-preferences/cookie-preferences';
@@ -28,8 +27,7 @@ import { SideNav } from './sidenav/sidenav';
 import { AppControlsProvider } from './util/context/app-controls';
 import { AuthInfoProvider, useAuthInfo } from './util/context/auth-info';
 import { BrowserStoreProvider } from './util/context/browser-store';
-import { HttpClientProvider, useHttpClient } from './util/context/http-client';
-import { I18nProvider } from './util/context/i18n';
+import { HttpClientProvider } from './util/context/http-client';
 import { useMobile } from './util/state/common';
 import { useHasConsent } from './util/state/use-consent';
 import { useDependentState } from './util/state/use-dependent-state';
@@ -159,7 +157,6 @@ export function BaseProviders({ children }: React.PropsWithChildren) {
 }
 
 function InternalBaseProviders({ children }: React.PropsWithChildren) {
-  const { apiClient } = useHttpClient();
   const [preferences] = usePreferences();
   const [authInfo, setAuthInfo] = useState<AuthInfo | null | undefined>(undefined);
   const [,setPreviousIssuer] = usePreviousIssuer();
@@ -215,21 +212,19 @@ function InternalBaseProviders({ children }: React.PropsWithChildren) {
   }), [tools, toolsOpen, splitPanel, notificationMessages]);
 
   return (
-    <CSI18nProvider locale={preferences.effectiveLocale} messages={[enMessages, deMessages, customI18nMessages]}>
-      <I18nProvider locale={preferences.effectiveLocale} messages={I18N_FLIGHTS}>
-        <AuthInfoProvider value={[authInfo, setAuthInfoInternal]}>
-          <AppControlsProvider
-            setTools={setTools}
-            setToolsOpen={setToolsOpen}
-            setSplitPanel={setSplitPanel}
-            setNotificationMessages={setNotificationMessages}
-          >
-            <AppControlsStateContext.Provider value={appControlsState}>
-              {children}
-            </AppControlsStateContext.Provider>
-          </AppControlsProvider>
-        </AuthInfoProvider>
-      </I18nProvider>
+    <CSI18nProvider locale={'en'} messages={[enMessages, customI18nMessages]}>
+      <AuthInfoProvider value={[authInfo, setAuthInfoInternal]}>
+        <AppControlsProvider
+          setTools={setTools}
+          setToolsOpen={setToolsOpen}
+          setSplitPanel={setSplitPanel}
+          setNotificationMessages={setNotificationMessages}
+        >
+          <AppControlsStateContext.Provider value={appControlsState}>
+            {children}
+          </AppControlsStateContext.Provider>
+        </AppControlsProvider>
+      </AuthInfoProvider>
     </CSI18nProvider>
   );
 }
diff --git a/ui/src/components/sidenav/sidenav.tsx b/ui/src/components/sidenav/sidenav.tsx
@@ -1,10 +1,8 @@
 import { SideNavigation } from '@cloudscape-design/components';
 import React from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { useI18n } from '../util/context/i18n';
 
 export function SideNav() {
-  const i18n = useI18n();
   const location = useLocation();
   const navigate = useNavigate();
 

diff --git a/ui/src/components/util/context/app-controls.tsx b/ui/src/components/util/context/app-controls.tsx
@@ -9,7 +9,6 @@ import React, {
 import { ApiError } from '../../../lib/api/api';
 import { Copy } from '../../common/copy';
 import { KeyValuePairs, ValueWithLabel } from '../../common/key-value-pairs';
-import { useI18n } from './i18n';
 
 export interface AppControls {
   readonly tools: {
@@ -195,8 +194,6 @@ export function catchNotify(notifications: AppControls['notification'] | Dispatc
 }
 
 function ErrorNotificationContent({ errText, error: e }: { errText?: string, error: unknown }) {
-  const i18n = useI18n();
-
   let errMessage: string | undefined;
   let errDetails: React.ReactNode;
 

diff --git a/ui/src/components/util/context/i18n.tsx b/ui/src/components/util/context/i18n.tsx
diff --git a/ui/src/components/util/state/use-dateformat.ts b/ui/src/components/util/state/use-dateformat.ts