8000 fix: fix switch panels between problem and output by mortalYoung · Pull Request #814 · DTStack/molecule · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: fix switch panels between problem and output #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2022
Merged

fix: fix switch panels between problem and output #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66361b8
fix: fix switch panels between problem and output
mortalYoung Oct 20, 2022
35514fc
test: update test
mortalYoung Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/services/__tests__/panelService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'reflect-metadata';
import { container } from 'tsyringe';
import { PanelService } from '../workbench/panelService';
import { StandaloneEditor } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor';
import { PanelEvent } from 'mo/model/workbench/panel';
import { expectLoggerErrorToBeCalled } from '@test/utils';
import { modules } from '../builtinService/const';
Expand All @@ -13,6 +14,15 @@ const restore = modules.builtInPanelToolboxReStore();

const panelService = container.resolve(PanelService);

jest.mock(
'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor',
() => {
return {
StandaloneEditor: class {},
};
}
);

describe('The PanelService test', () => {
afterEach(() => {
panelService.reset();
Expand Down Expand Up @@ -128,20 +138,20 @@ describe('The PanelService test', () => {
});

test('Should NOT clone StandaloneEditor when get the panel', () => {
class StandaloneEditor {}
const standaloneEditor = new StandaloneEditor();
panelService.setState({
data: [
{
...paneOutput,
outputEditorInstance: standaloneEditor,
outputEditorInstance: new StandaloneEditor(),
} as any,
],
});

const target = panelService.getPanel(paneOutput.id);
expect(target).toEqual(expect.objectContaining(paneOutput));
expect((target as any).outputEditorInstance).toBe(standaloneEditor);
expect((target as any).outputEditorInstance).toBeInstanceOf(
StandaloneEditor
);
});

test('Should support to active a exist panel', () => {
Expand Down
3 changes: 2 additions & 1 deletion src/services/workbench/panelService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'reflect-metadata';
import { singleton, container } from 'tsyringe';
import { editor as MonacoEditor } from 'monaco-editor';
import { StandaloneEditor } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor';
import { cloneDeepWith, cloneDeep } from 'lodash';
import pickBy from 'lodash/pickBy';
import { Component } from 'mo/react';
Expand Down Expand Up @@ -194,7 +195,7 @@ export class PanelService extends Component<IPanel> implements IPanelService {
if (
value &&
typeof value === 'object' &&
value.constructor.name === 'StandaloneEditor'
value instanceof StandaloneEditor
) {
return value;
}
Expand Down
0