mirror/insomnia
1
0 Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-10-26 00:29:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

removes DEPRECATED_ACTIVITY_INSOMNIA (#4364)

Browse Source
This commit is contained in:
Dimitri Mitropoulos authored and GitHub committed 2022-01-14 17:14:08 +00:00
1 parent 4e9efb4d7d
commit 9ca90a58b7
4 files changed
-39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/insomnia-app/app/common/constants.ts
-1
View File
@@ -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);
packages/insomnia-app/app/models/workspace-meta.ts
-11
View File
@@ -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;
}
packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
-19
View File
@@ -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({
packages/insomnia-app/app/ui/redux/modules/global.tsx
-8
View File
@@ -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;
}