Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export class SiGridComponent implements OnInit, OnChanges, OnDestroy {
}

ngOnChanges(changes: SimpleChanges): void {
// Reload widgets if the dashboardId changes. Do not load on inital
// Reload widgets if the dashboardId changes. Do not load on initial
// dashboardId property binding as first load will be done in ngOnInit()
if (changes.dashboardId && !changes.dashboardId.firstChange) {
queueMicrotask(() => this.loadAndSubscribeWidgets());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ export class SiWidgetCatalogComponent implements OnInit, OnDestroy {
if (this.view() === 'list') {
this.setupWidgetInstanceEditor();
} else {
if (this.isEditorWizdard(this.widgetInstanceEditor)) {
if (this.isEditorWizard(this.widgetInstanceEditor)) {
this.widgetInstanceEditor.next();
this.editorWizardState.set(this.widgetInstanceEditor.state);
}
}
}

protected onPrevious(): void {
if (this.isEditorWizdard(this.widgetInstanceEditor) && this.editorWizardState()?.hasPrevious) {
if (this.isEditorWizard(this.widgetInstanceEditor) && this.editorWizardState()?.hasPrevious) {
this.widgetInstanceEditor.previous();
this.editorWizardState.set(this.widgetInstanceEditor.state);
} else if (!this.widgetConfigModified) {
Expand Down Expand Up @@ -310,7 +310,7 @@ export class SiWidgetCatalogComponent implements OnInit, OnDestroy {
);
}

if (this.isEditorWizdard(this.widgetInstanceEditor)) {
if (this.isEditorWizard(this.widgetInstanceEditor)) {
this.editorWizardState.set(this.widgetInstanceEditor.state);

if (this.widgetInstanceEditor.stateChange) {
Expand Down Expand Up @@ -380,7 +380,7 @@ export class SiWidgetCatalogComponent implements OnInit, OnDestroy {
}
}

private isEditorWizdard(
private isEditorWizard(
editor?: WidgetInstanceEditor | WidgetInstanceEditorWizard
): editor is WidgetInstanceEditorWizard {
return !!editor && 'state' in editor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class SiWidgetInstanceEditorDialogComponent implements OnInit, OnDestroy
}) as Subscription
);
}
if (this.isEditorWizdard(this.widgetInstanceEditor)) {
if (this.isEditorWizard(this.widgetInstanceEditor)) {
this.editorWizardState.set(this.widgetInstanceEditor.state);

if (this.widgetInstanceEditor.stateChange) {
Expand Down Expand Up @@ -220,14 +220,14 @@ export class SiWidgetInstanceEditorDialogComponent implements OnInit, OnDestroy
}

protected onNext(): void {
if (this.isEditorWizdard(this.widgetInstanceEditor)) {
if (this.isEditorWizard(this.widgetInstanceEditor)) {
this.widgetInstanceEditor.next();
this.editorWizardState.set(this.widgetInstanceEditor.state);
}
}

protected onPrevious(): void {
if (this.isEditorWizdard(this.widgetInstanceEditor) && this.editorWizardState()?.hasPrevious) {
if (this.isEditorWizard(this.widgetInstanceEditor) && this.editorWizardState()?.hasPrevious) {
this.widgetInstanceEditor.previous();
this.editorWizardState.set(this.widgetInstanceEditor.state);
}
Expand Down Expand Up @@ -255,7 +255,7 @@ export class SiWidgetInstanceEditorDialogComponent implements OnInit, OnDestroy
this.subscriptions = [];
}

private isEditorWizdard(
private isEditorWizard(
editor?: WidgetInstanceEditor | WidgetInstanceEditorWizard
): editor is WidgetInstanceEditorWizard {
return !!editor && 'state' in editor;
Expand Down
24 changes: 12 additions & 12 deletions projects/dashboards-ng/src/model/si-widget-storage.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ describe('SiDefaultWidgetStorage', () => {

describe('#load()', () => {
it('with dashboardId should return widget config observable', () => {
const widgitConfigs$ = widgetStorage.load('id');
expect(widgitConfigs$).toBeDefined();
const widgetConfigs$ = widgetStorage.load('id');
expect(widgetConfigs$).toBeDefined();
});
it('without dashboardId should return widget config observable', () => {
const widgitConfigs$ = widgetStorage.load();
expect(widgitConfigs$).toBeDefined();
const widgetConfigs$ = widgetStorage.load();
expect(widgetConfigs$).toBeDefined();
});
it('with different ids should return different objects', () => {
const widgitConfigs$ = widgetStorage.load();
const widgitConfigs1$ = widgetStorage.load('1');
const widgitConfigs2$ = widgetStorage.load('2');
expect(widgitConfigs$).not.toBe(widgitConfigs1$);
expect(widgitConfigs$).not.toBe(widgitConfigs2$);
const widgetConfigs$ = widgetStorage.load();
const widgetConfigs1$ = widgetStorage.load('1');
const widgetConfigs2$ = widgetStorage.load('2');
expect(widgetConfigs$).not.toBe(widgetConfigs1$);
expect(widgetConfigs$).not.toBe(widgetConfigs2$);
});
it('with same ids should return same objects', () => {
const widgitConfigs1$ = widgetStorage.load('1');
const widgitConfigs2$ = widgetStorage.load('1');
expect(widgitConfigs1$).toBe(widgitConfigs2$);
const widgetConfigs1$ = widgetStorage.load('1');
const widgetConfigs2$ = widgetStorage.load('1');
expect(widgetConfigs1$).toBe(widgetConfigs2$);
});
});
});
Loading