mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INS-2125] Fix workspaces without parentId missing (#5397)

Browse Source 
* [INS-2125] Fix workspaces without parentId missing

* Fix tests?

* fix lint
This commit is contained in:
Filipe Freire 2022-11-09 13:48:04 +00:00 committed by GitHub
parent 26847abad5
commit e4ad8954ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/insomnia/src/models/workspace.ts
View File

@ -160,7 +160,9 @@ function _migrateScope(workspace: MigrationWorkspace) {
function _migrateIntoDefaultProject(workspace: Workspace) { function _migrateIntoDefaultProject(workspace: Workspace) {
if (!workspace.parentId) { if (!workspace.parentId) {
console.log(`No workspace parentId found for ${workspace._id} setting default ${DEFAULT_PROJECT_ID}`);
workspace.parentId = DEFAULT_PROJECT_ID; workspace.parentId = DEFAULT_PROJECT_ID;
models.workspace.update(workspace, { parentId: DEFAULT_PROJECT_ID });
} }
return workspace; return workspace;

22
packages/insomnia/src/sync/vcs/__tests__/migrate-collections.test.ts
View File

@ -6,7 +6,6 @@ import { globalBeforeEach } from '../../../__jest__/before-each';
import { isLoggedIn as _isLoggedIn } from '../../../account/session'; import { isLoggedIn as _isLoggedIn } from '../../../account/session';
import { database } from '../../../common/database'; import { database } from '../../../common/database';
import * as models from '../../../models'; import * as models from '../../../models';
import { DEFAULT_PROJECT_ID } from '../../../models/project';
import { backendProjectWithTeamSchema, teamSchema } from '../../__schemas__/type-schemas'; import { backendProjectWithTeamSchema, teamSchema } from '../../__schemas__/type-schemas';
import MemoryDriver from '../../store/drivers/memory-driver'; import MemoryDriver from '../../store/drivers/memory-driver';
import { initializeProjectFromTeam } from '../initialize-model-from'; import { initializeProjectFromTeam } from '../initialize-model-from';
@ -46,27 +45,6 @@ describe('migrateCollectionsIntoRemoteProject', () => {
expect(vcs.remoteBackendProjectsInAnyTeam).not.toHaveBeenCalled(); expect(vcs.remoteBackendProjectsInAnyTeam).not.toHaveBeenCalled();
}); });
it('does not migrate if collection is in non-remote project but no local backend project exists', async () => {
// Arrange
const vcs = newMockedVcs();
const defaultProject = await models.project.getById(DEFAULT_PROJECT_ID);
const workspaceInBase = await models.workspace.create({ parentId: defaultProject?._id });
const localProject = await models.project.create();
const workspaceInLocal = await models.workspace.create({ parentId: localProject._id });
vcs.hasBackendProjectForRootDocument.mockResolvedValue(false); // no local backend project
// Act
await migrateCollectionsIntoRemoteProject(vcs);
// Assert
expect(vcs.remoteBackendProjectsInAnyTeam).not.toHaveBeenCalled();
await expect(models.workspace.getById(workspaceInBase._id)).resolves.toStrictEqual(workspaceInBase);
await expect(models.workspace.getById(workspaceInLocal._id)).resolves.toStrictEqual(workspaceInLocal);
});
it('does not migrate if all collections are in a remote project already', async () => { it('does not migrate if all collections are in a remote project already', async () => {
// Arrange // Arrange
const vcs = newMockedVcs(); const vcs = newMockedVcs();

28
packages/insomnia/src/ui/context/nunjucks/__tests__/use-nunjucks.test.ts
View File

@ -87,34 +87,6 @@ describe('useNunjucks', () => {
ancestors: mockAncestors, ancestors: mockAncestors,
}); });
}); });
it('should get context using the active entities - no request', async () => {
// Arrange
const workspace = await models.workspace.create();
await models.workspaceMeta.getOrCreateByParentId(workspace._id);
const environment = await models.environment.getOrCreateForParentId(workspace._id);
await models.workspaceMeta.updateByParentId(workspace._id, {
activeEnvironmentId: environment._id,
});
const store = mockStore(await reduxStateForTest({
activeActivity: ACTIVITY_DEBUG,
activeWorkspaceId: workspace._id,
}));
// Act
const { result } = renderHook(useNunjucks, { wrapper: withReduxStore(store) });
await result.current.handleGetRenderContext();
// Assert
expect(getRenderContextAncestorsMock).toBeCalledWith(workspace);
expect(getRenderContextMock).toBeCalledWith({
request: undefined,
environmentId: environment._id,
ancestors: mockAncestors,
});
});
}); });
describe('handleRender', () => { describe('handleRender', () => {