diff --git a/assets/src/hooks/usePersistedStateReducer.ts b/assets/src/hooks/usePersistedStateReducer.ts index 4bc3a6258..0fd697086 100644 --- a/assets/src/hooks/usePersistedStateReducer.ts +++ b/assets/src/hooks/usePersistedStateReducer.ts @@ -1,6 +1,5 @@ import { useEffect, useReducer } from "react" import { loadState, saveState } from "../localStorage" -import { defaultSettings } from "../settings" import { Dispatch, Reducer, State } from "../state" const APP_STATE_KEY = "mbta-skate-state" @@ -17,31 +16,7 @@ const usePersistedStateReducer = ( reducer: Reducer, defaultValue: State ): [State, Dispatch] => { - let loadedState = loadState(APP_STATE_KEY) as State | undefined - - // Update to new settings properties from saved values in local storage. - // This can be removed after it's live for awhile, along with property in Settings -- MSS 2019-09-11 - if ( - loadedState && - Object.keys(loadedState).includes("settings") && - Object.keys(loadedState.settings).length === 1 && - Object.keys(loadedState.settings)[0] === "vehicleLabel" - ) { - loadedState = { - ...loadedState, - settings: { - vehicleLabel: undefined, - ladderVehicleLabel: - loadedState.settings.vehicleLabel || - defaultSettings.ladderVehicleLabel, - shuttleVehicleLabel: defaultSettings.shuttleVehicleLabel, - }, - } - - // Save these changes right away - saveState(APP_STATE_KEY, filter(loadedState, PERSISTED_KEYS)) - } - + const loadedState = loadState(APP_STATE_KEY) as State | undefined const [state, dispatch] = useReducer( reducer, defaultValue, diff --git a/assets/src/settings.ts b/assets/src/settings.ts index 793e193aa..725f09083 100644 --- a/assets/src/settings.ts +++ b/assets/src/settings.ts @@ -7,16 +7,11 @@ export enum VehicleLabelSetting { } export interface Settings { - // DEPRECATED property - // Can be removed after a little while along with - // special handling code in usePersistedStateReducer. -- MSS 2019-09-11 - vehicleLabel: VehicleLabelSetting | undefined ladderVehicleLabel: VehicleLabelSetting shuttleVehicleLabel: VehicleLabelSetting } export const defaultSettings: Settings = { - vehicleLabel: undefined, ladderVehicleLabel: VehicleLabelSetting.RunNumber, shuttleVehicleLabel: VehicleLabelSetting.VehicleNumber, } diff --git a/assets/tests/hooks/usePersistedStateReducer.test.ts b/assets/tests/hooks/usePersistedStateReducer.test.ts index 5e1844071..433bd299c 100644 --- a/assets/tests/hooks/usePersistedStateReducer.test.ts +++ b/assets/tests/hooks/usePersistedStateReducer.test.ts @@ -43,7 +43,6 @@ describe("usePersistedStateReducer", () => { selectedShuttleRunIds: [], selectedVehicleId: "2", settings: { - vehicleLabel: undefined, ladderVehicleLabel: VehicleLabelSetting.RunNumber, shuttleVehicleLabel: VehicleLabelSetting.VehicleNumber, }, @@ -78,7 +77,6 @@ describe("usePersistedStateReducer", () => { selectedShuttleRunIds: [], selectedVehicleId: "2", settings: { - vehicleLabel: undefined, ladderVehicleLabel: VehicleLabelSetting.RunNumber, shuttleVehicleLabel: VehicleLabelSetting.VehicleNumber, }, @@ -95,7 +93,6 @@ describe("usePersistedStateReducer", () => { selectedShuttleRunIds: [], selectedVehicleId: "2", settings: { - vehicleLabel: undefined, ladderVehicleLabel: VehicleLabelSetting.RunNumber, shuttleVehicleLabel: VehicleLabelSetting.RunNumber, }, @@ -108,57 +105,6 @@ describe("usePersistedStateReducer", () => { expect(state).toEqual(expectedState) }) - - test("fixes deprecated vehicleLabel settings property", () => { - jest - .spyOn(window.localStorage, "getItem") - .mockImplementation( - (_stateKey: string) => - '{"selectedRouteIds":["28","39"],"settings":{"vehicleLabel":2}}' - ) - - const initialState: State = { - pickerContainerIsVisible: true, - search: { - text: "search text", - property: "run", - isActive: true, - }, - selectedRouteIds: ["1", "2"], - selectedShuttleRouteIds: [], - selectedShuttleRunIds: [], - selectedVehicleId: "2", - settings: { - vehicleLabel: undefined, - ladderVehicleLabel: VehicleLabelSetting.RunNumber, - shuttleVehicleLabel: VehicleLabelSetting.VehicleNumber, - }, - } - const expectedState: State = { - pickerContainerIsVisible: true, - search: { - text: "search text", - property: "run", - isActive: true, - }, - selectedRouteIds: ["28", "39"], - selectedShuttleRouteIds: [], - selectedShuttleRunIds: [], - selectedVehicleId: "2", - settings: { - vehicleLabel: undefined, - ladderVehicleLabel: VehicleLabelSetting.VehicleNumber, - shuttleVehicleLabel: VehicleLabelSetting.VehicleNumber, - }, - } - - const { result } = renderHook(() => - usePersistedStateReducer(reducer, initialState) - ) - const [state] = result.current - - expect(state).toEqual(expectedState) - }) }) describe("filter", () => {