Skip to content

fix: can't add the new panel when open it #390

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
wewoor merged 2 commits into from
Sep 2, 2021
Merged

fix: can't add the new panel when open it #390

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
ad1433d
fix(panel): add the new panel when invoke the open method
wewoor Sep 2, 2021
611a673
test: add the new panel when open it
wewoor Sep 2, 2021
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
7 changes: 5 additions & 2 deletions src/services/__tests__/panelService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,13 @@ describe('The PanelService test', () => {

test("Should support to open a panel that doesn't exist", () => {
const state = panelService.getState();
const newPanel = Object.assign({}, paneOutput, { id: 'test' });
expect(state.current).toBeNull();
expect(panelService.getPanel(newPanel.id)).toBeUndefined();

panelService.open(paneOutput);
expect(state.current).toEqual(paneOutput);
panelService.open(newPanel);
expect(state.current).toEqual(newPanel);
expect(panelService.getPanel(newPanel.id)).not.toBeUndefined();
});

test('Should support to toggle maximize status', () => {
Expand Down
11 changes: 8 additions & 3 deletions src/services/workbench/panelService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,14 @@ export class PanelService extends Component<IPanel> implements IPanelService {

public open(data: IPanelItem<any>): void {
const { data: stateData = [] } = this.state;
const cloneData = cloneDeep(data);
const index = stateData.findIndex(searchById(cloneData.id));
const current = index === -1 ? cloneData : stateData[index];
let current = cloneDeep(data);
const index = stateData.findIndex(searchById(current.id));
if (index > -1) {
current = stateData[index];
} else {
// Add the new panel item
this.add(current);
}

this.setState({
current,
Expand Down