From 9ca90a58b7619f643a7175cf7058cc8df5e4347b Mon Sep 17 00:00:00 2001
From: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Date: Fri, 14 Jan 2022 12:14:08 -0500
Subject: [PATCH] removes DEPRECATED_ACTIVITY_INSOMNIA (#4364)

---
 packages/insomnia-app/app/common/constants.ts |  1 -
 .../insomnia-app/app/models/workspace-meta.ts | 11 -----------
 .../ui/redux/modules/__tests__/global.test.ts | 19 -------------------
 .../app/ui/redux/modules/global.tsx           |  8 --------
 4 files changed, 39 deletions(-)

diff --git a/packages/insomnia-app/app/common/constants.ts b/packages/insomnia-app/app/common/constants.ts
index a63c25478c..a54369eb9a 100644
--- a/packages/insomnia-app/app/common/constants.ts
+++ b/packages/insomnia-app/app/common/constants.ts
@@ -166,7 +166,6 @@ export const ACTIVITY_DEBUG: GlobalActivity = 'debug';
 export const ACTIVITY_UNIT_TEST: GlobalActivity = 'unittest';
 export const ACTIVITY_HOME: GlobalActivity = 'home';
 export const ACTIVITY_MIGRATION: GlobalActivity = 'migration';
-export const DEPRECATED_ACTIVITY_INSOMNIA = 'insomnia';
 
 export const isWorkspaceActivity = (activity?: string): activity is GlobalActivity =>
   isDesignActivity(activity) || isCollectionActivity(activity);
diff --git a/packages/insomnia-app/app/models/workspace-meta.ts b/packages/insomnia-app/app/models/workspace-meta.ts
index 841578e32f..6203a6b099 100644
--- a/packages/insomnia-app/app/models/workspace-meta.ts
+++ b/packages/insomnia-app/app/models/workspace-meta.ts
@@ -1,9 +1,7 @@
 import {
-  ACTIVITY_DEBUG,
   DEFAULT_PANE_HEIGHT,
   DEFAULT_PANE_WIDTH,
   DEFAULT_SIDEBAR_WIDTH,
-  DEPRECATED_ACTIVITY_INSOMNIA,
 } from '../common/constants';
 import { database as db } from '../common/database';
 import type { BaseModel } from './index';
@@ -63,15 +61,6 @@ export function init(): BaseWorkspaceMeta {
 }
 
 export function migrate(doc: WorkspaceMeta) {
-  doc = _migrateInsomniaActivity(doc);
-  return doc;
-}
-
-function _migrateInsomniaActivity(doc: WorkspaceMeta) {
-  if (doc.activeActivity === DEPRECATED_ACTIVITY_INSOMNIA) {
-    doc.activeActivity = ACTIVITY_DEBUG;
-  }
-
   return doc;
 }
 
diff --git a/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts b/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
index 2ed28c1e6e..548aab4b40 100644
--- a/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
+++ b/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
@@ -10,7 +10,6 @@ import {
   ACTIVITY_MIGRATION,
   ACTIVITY_SPEC,
   ACTIVITY_UNIT_TEST,
-  DEPRECATED_ACTIVITY_INSOMNIA,
   GlobalActivity,
   SORT_MODIFIED_DESC,
 } from '../../../../common/constants';
@@ -196,24 +195,6 @@ describe('global', () => {
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
-    it('should initialize from local storage and migrate deprecated activity', async () => {
-      const settings = createSettings(true, true);
-      const store = mockStore({
-        global: {},
-        entities: {
-          settings: [settings],
-        },
-      });
-      const activity = DEPRECATED_ACTIVITY_INSOMNIA;
-      global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = {
-        type: SET_ACTIVE_ACTIVITY,
-        activity: ACTIVITY_DEBUG,
-      };
-      store.dispatch(initActiveActivity());
-      expect(store.getActions()).toEqual([expectedEvent]);
-    });
-
     it('should go to home if initialized at migration', async () => {
       const settings = createSettings(true, true);
       const store = mockStore({
diff --git a/packages/insomnia-app/app/ui/redux/modules/global.tsx b/packages/insomnia-app/app/ui/redux/modules/global.tsx
index f304498ac2..6cb1031eac 100644
--- a/packages/insomnia-app/app/ui/redux/modules/global.tsx
+++ b/packages/insomnia-app/app/ui/redux/modules/global.tsx
@@ -12,7 +12,6 @@ import {
   ACTIVITY_DEBUG,
   ACTIVITY_HOME,
   ACTIVITY_MIGRATION,
-  DEPRECATED_ACTIVITY_INSOMNIA,
   isValidActivity,
 } from '../../../common/constants';
 import { database } from '../../../common/database';
@@ -652,14 +651,7 @@ export function initActiveWorkspace() {
   return setActiveWorkspace(workspaceId);
 }
 
-function _migrateDeprecatedActivity(activity: GlobalActivity): GlobalActivity {
-  // @ts-expect-error -- TSCONVERSION
-  return activity === DEPRECATED_ACTIVITY_INSOMNIA ? ACTIVITY_DEBUG : activity;
-}
-
 function _normalizeActivity(activity: GlobalActivity): GlobalActivity {
-  activity = _migrateDeprecatedActivity(activity);
-
   if (isValidActivity(activity)) {
     return activity;
   }