Remove deprecated theme setting

web/packages/design/src/theme/index.ts

@@ -21,4 +21,3 @@ import lightTheme from './themes/lightTheme';
 import bblpTheme from './themes/bblpTheme';
 
 export { darkTheme, lightTheme, bblpTheme };
-export type { DeprecatedThemeOption } from './types';

web/packages/teleport/src/User/UserContext.test.tsx

@@ -22,7 +22,7 @@ import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { MemoryRouter } from 'react-router';
 
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 
 import '@testing-library/jest-dom';
 
@@ -73,34 +73,6 @@ describe('user context - success state', () => {
 
  expect(theme).toBeInTheDocument();
  });
-
- it('should migrate the previous theme setting from local storage', async () => {
- let updateBody: { theme?: Theme } = {};
-
- server.use(
- rest.put(cfg.api.userPreferencesPath, async (req, res, ctx) => {
- updateBody = await req.json();
-
- return res(ctx.status(200), ctx.json({}));
- })
- );
-
- localStorage.setItem(KeysEnum.THEME, 'dark');
-
- render(
- <MemoryRouter>
- <UserContextProvider>
- <ThemeName />
- </UserContextProvider>
- </MemoryRouter>
- );
-
- await waitFor(() => expect(updateBody.theme).toEqual(Theme.DARK));
-
- const theme = await screen.findByText(/theme: dark/i);
-
- expect(theme).toBeInTheDocument();
- });
 });
 
 describe('user context - error state', () => {
@@ -129,22 +101,6 @@ describe('user context - error state', () => {
  expect(theme).toBeInTheDocument();
  });
 
- it('should render with the theme from the previous local storage setting', async () => {
- localStorage.setItem(KeysEnum.THEME, 'dark');
-
- render(
- <MemoryRouter>
- <UserContextProvider>
- <ThemeName />
- </UserContextProvider>
- </MemoryRouter>
- );
-
- const theme = await screen.findByText(/theme: dark/i);
-
- expect(theme).toBeInTheDocument();
- });
-
  it('should render with the settings from local storage', async () => {
  localStorage.setItem(
  KeysEnum.USER_PREFERENCES,

web/packages/teleport/src/User/UserContext.tsx

@@ -34,17 +34,13 @@ import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpr
 
 import { ClusterUserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/cluster_preferences_pb';
 
-import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
-
 import { StyledIndicator } from 'teleport/Main';
 
 import * as service from 'teleport/services/userPreferences';
 import cfg from 'teleport/config';
 
 import { KeysEnum, storageService } from 'teleport/services/storageService';
 
-import { deprecatedThemeToThemePreference } from 'teleport/services/userPreferences/types';
-
 import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/userPreferences';
 
 export interface UserContextValue {
@@ -108,28 +104,11 @@ export function UserContextProvider(props: PropsWithChildren<unknown>) {
 
  async function loadUserPreferences() {
  const storedPreferences = storageService.getUserPreferences();
- const theme = storageService.getDeprecatedThemePreference();
 
  try {
  const preferences = await service.getUserPreferences();
  clusterPreferences.current[cfg.proxyCluster] =
  preferences.clusterPreferences;
- if (!storedPreferences) {
- // there are no mirrored user preferences in local storage so this is the first time
- // the user has requested their preferences in this browser session
-
- // if there is a legacy theme preference, update the preferences with it and remove it
- if (theme) {
- preferences.theme = deprecatedThemeToThemePreference(theme);
-
- if (preferences.theme !== Theme.LIGHT) {
- // the light theme is the default, so only update the backend if it is not light
- updatePreferences(preferences);
- }
-
- storageService.clearDeprecatedThemePreference();
- }
- }
 
  setPreferences(preferences);
  storageService.setUserPreferences(preferences);
@@ -139,13 +118,6 @@ export function UserContextProvider(props: PropsWithChildren<unknown>) {
 
  return;
  }
-
- if (theme) {
- setPreferences({
- ...preferences,
- theme: deprecatedThemeToThemePreference(theme),
- });
- }
  }
  }
 

web/packages/teleport/src/services/storageService/storageService.ts

@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { DeprecatedThemeOption } from 'design/theme/types';
-
 import { UserPreferences } from 'gen-proto-ts/teleport/userpreferences/v1/userpreferences_pb';
 
 import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
@@ -177,11 +175,6 @@ export const storageService = {
  return userPreferences.theme;
  }
 
- const theme = this.getDeprecatedThemePreference();
- if (theme) {
- return theme === 'light' ? Theme.LIGHT : Theme.DARK;
- }
-
  const prefersDark =
  window.matchMedia &&
  window.matchMedia('(prefers-color-scheme: dark)').matches;
@@ -205,16 +198,6 @@ export const storageService = {
  };
  },
 
- // DELETE IN 15 (ryan)
- getDeprecatedThemePreference(): DeprecatedThemeOption {
- return window.localStorage.getItem(KeysEnum.THEME) as DeprecatedThemeOption;
- },
-
- // TODO(ryan): remove in v15
- clearDeprecatedThemePreference() {
- window.localStorage.removeItem(KeysEnum.THEME);
- },
-
  arePinnedResourcesDisabled(): boolean {
  return (
  window.localStorage.getItem(KeysEnum.PINNED_RESOURCES_NOT_SUPPORTED) ===

web/packages/teleport/src/services/userPreferences/types.ts

@@ -16,24 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { DeprecatedThemeOption } from 'design/theme';
-
-import { Theme } from 'gen-proto-ts/teleport/userpreferences/v1/theme_pb';
-
 export type MarketingParams = {
  campaign: string;
  source: string;
  medium: string;
  intent: string;
 };
-
-export function deprecatedThemeToThemePreference(
- theme: DeprecatedThemeOption
-): Theme {
- switch (theme) {
- case 'light':
- return Theme.LIGHT;
- case 'dark':
- return Theme.DARK;
- }
-}