Skip to content

Warning callout for missing ports is displayed only on Settings tabs; Incorrect location for Steps callouts #1037

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
sofyakurilova merged 1 commit into from
Dec 31, 2024
Merged

Warning callout for missing ports is displayed only on Settings tabs; Incorrect location for Steps callouts #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions modules/ui/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ export class AppComponent implements AfterViewInit {
this.appStore.getReports();
this.appStore.getTestModules();
this.appStore.getNetworkAdapters();
this.appStore.getInterfaces();
this.appStore.getSystemConfig();
this.matIconRegistry.addSvgIcon(
'device_run',
this.domSanitizer.bypassSecurityTrustResourceUrl(DEVICES_RUN_URL)
Expand Down
18 changes: 18 additions & 0 deletions modules/ui/src/app/app.store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ import {
setDevices,
updateAdapters,
setTestModules,
fetchSystemConfig,
fetchInterfaces,
} from './store/actions';
import { MOCK_PROGRESS_DATA_IN_PROGRESS } from './mocks/testrun.mock';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
Expand Down Expand Up @@ -518,5 +520,21 @@ describe('AppStore', () => {
store.refreshState();
});
});

describe('getInterfaces', () => {
it('should dispatch action fetchInterfaces', () => {
appStore.getInterfaces();

expect(store.dispatch).toHaveBeenCalledWith(fetchInterfaces());
});
});

describe('getSystemConfig', () => {
it('should dispatch action fetchSystemConfig', () => {
appStore.getSystemConfig();

expect(store.dispatch).toHaveBeenCalledWith(fetchSystemConfig());
});
});
});
});
18 changes: 18 additions & 0 deletions modules/ui/src/app/app.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ import {
fetchReports,
setTestModules,
updateAdapters,
fetchInterfaces,
fetchSystemConfig,
} from './store/actions';
import { StatusOfTestrun, TestrunStatus } from './model/testrun-status';
import {
Expand Down Expand Up @@ -320,6 +322,22 @@ export class AppStore extends ComponentStore<AppComponentState> {
);
});

getInterfaces = this.effect(trigger$ => {
return trigger$.pipe(
tap(() => {
this.store.dispatch(fetchInterfaces());
})
);
});

getSystemConfig = this.effect(trigger$ => {
return trigger$.pipe(
tap(() => {
this.store.dispatch(fetchSystemConfig());
})
);
});

constructor() {
// @ts-expect-error get object is defined in index.html
const calloutState = sessionStorage.getObject(CALLOUT_STATE_KEY);
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/src/app/components/device-item/device-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ $border-radius: 12px;
width: 230px;
box-sizing: border-box;
text-align: start;
margin: 0;
}

.item-mac-address {
Expand Down Expand Up @@ -163,6 +162,7 @@ $border-radius: 12px;
max-width: -webkit-fill-available;
max-width: -moz-available;
text-align: left;
margin: 0;
}

app-program-type-icon {
Expand Down
126 changes: 36 additions & 90 deletions modules/ui/src/app/pages/general-settings/general-settings.store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ import { skip, take } from 'rxjs';
import {
selectAdapters,
selectHasConnectionSettings,
selectInterfaces,
selectSystemConfig,
} from '../../store/selectors';
import { of } from 'rxjs/internal/observable/of';
import { fetchSystemConfigSuccess } from '../../store/actions';
import {
fetchInterfaces,
fetchSystemConfig,
fetchSystemConfigSuccess,
} from '../../store/actions';
import { fetchInterfacesSuccess } from '../../store/actions';
import { FormBuilder, FormControl } from '@angular/forms';
import { FormKey, SystemConfig } from '../../model/setting';
import { FormKey } from '../../model/setting';
import {
MOCK_ADAPTERS,
MOCK_DEVICE_VALUE,
Expand All @@ -52,11 +58,7 @@ describe('GeneralSettingsStore', () => {
let fb: FormBuilder;

beforeEach(() => {
mockService = jasmine.createSpyObj([
'getSystemInterfaces',
'createSystemConfig',
'getSystemConfig',
]);
mockService = jasmine.createSpyObj(['createSystemConfig']);

TestBed.configureTestingModule({
providers: [
Expand All @@ -66,6 +68,8 @@ describe('GeneralSettingsStore', () => {
selectors: [
{ selector: selectHasConnectionSettings, value: true },
{ selector: selectAdapters, value: {} },
{ selector: selectInterfaces, value: {} },
{ selector: selectSystemConfig, value: { network: {} } },
],
}),
FormBuilder,
Expand All @@ -83,28 +87,6 @@ describe('GeneralSettingsStore', () => {
});

describe('updaters', () => {
describe('setSystemConfig', () => {
it('should update systemConfig', (done: DoneFn) => {
const config = {
network: {
device_intf: 'enx207bd2620617',
internet_intf: 'enx207bd2620618',
},
log_level: 'INFO',
startup_timeout: 60,
monitor_period: 60,
runtime: 120,
} as SystemConfig;

settingsStore.viewModel$.pipe(skip(1), take(1)).subscribe(store => {
expect(store.systemConfig).toEqual(config);
done();
});

settingsStore.setSystemConfig(config);
});
});

it('should update isSubmitting', (done: DoneFn) => {
settingsStore.viewModel$.pipe(skip(1), take(1)).subscribe(store => {
expect(store.isSubmitting).toEqual(true);
Expand All @@ -115,8 +97,7 @@ describe('GeneralSettingsStore', () => {
});

it('should update interfaces', (done: DoneFn) => {
settingsStore.viewModel$.pipe(skip(3), take(1)).subscribe(store => {
expect(store.interfaces).toEqual(MOCK_INTERFACES);
settingsStore.viewModel$.pipe(skip(2), take(1)).subscribe(store => {
expect(store.deviceOptions).toEqual(MOCK_INTERFACES);
expect(store.internetOptions).toEqual({
mockDeviceKey: 'mockDeviceValue',
Expand Down Expand Up @@ -150,52 +131,18 @@ describe('GeneralSettingsStore', () => {

describe('effects', () => {
describe('getSystemConfig', () => {
beforeEach(() => {
mockService.getSystemConfig.and.returnValue(of({ network: {} }));
});

it('should dispatch action fetchSystemConfigSuccess', () => {
it('should dispatch action fetchSystemConfig', () => {
settingsStore.getSystemConfig();

expect(store.dispatch).toHaveBeenCalledWith(
fetchSystemConfigSuccess({ systemConfig: { network: {} } })
);
});

it('should update store', done => {
settingsStore.viewModel$.pipe(skip(1), take(1)).subscribe(store => {
expect(store.systemConfig).toEqual({ network: {} });
done();
});

settingsStore.getSystemConfig();
expect(store.dispatch).toHaveBeenCalledWith(fetchSystemConfig());
});
});

describe('getInterfaces', () => {
const interfaces = MOCK_INTERFACES;

beforeEach(() => {
mockService.getSystemInterfaces.and.returnValue(of(interfaces));
});

it('should dispatch action fetchInterfacesSuccess', () => {
settingsStore.getInterfaces();

expect(store.dispatch).toHaveBeenCalledWith(
fetchInterfacesSuccess({ interfaces })
);
});

it('should update store', done => {
settingsStore.viewModel$.pipe(skip(3), take(1)).subscribe(store => {
expect(store.interfaces).toEqual(interfaces);
expect(store.deviceOptions).toEqual(interfaces);
expect(store.internetOptions).toEqual(interfaces);
done();
});

settingsStore.getInterfaces();
expect(store.dispatch).toHaveBeenCalledWith(fetchInterfaces());
});
});

Expand All @@ -217,20 +164,6 @@ describe('GeneralSettingsStore', () => {
);
});

it('should update store', done => {
settingsStore.viewModel$.pipe(skip(1), take(1)).subscribe(store => {
expect(store.systemConfig).toEqual({ network: {} });
done();
});

settingsStore.updateSystemConfig(
of({
onSystemConfigUpdate: () => {},
config: { network: {} },
})
);
});

it('should call onSystemConfigUpdate', () => {
const effectParams = {
onSystemConfigUpdate: () => {},
Expand All @@ -249,8 +182,12 @@ describe('GeneralSettingsStore', () => {
describe('setDefaultFormValues', () => {
describe('when values are present', () => {
beforeEach(() => {
settingsStore.setSystemConfig(MOCK_SYSTEM_CONFIG_WITH_DATA);
settingsStore.setInterfaces(MOCK_INTERFACES);
store.overrideSelector(selectInterfaces, MOCK_INTERFACES);
store.overrideSelector(
selectSystemConfig,
MOCK_SYSTEM_CONFIG_WITH_DATA
);
store.refreshState();
});

it('should set default form values', () => {
Expand Down Expand Up @@ -279,8 +216,12 @@ describe('GeneralSettingsStore', () => {

describe('with single port mode', () => {
beforeEach(() => {
settingsStore.setSystemConfig(MOCK_SYSTEM_CONFIG_WITH_SINGLE_PORT);
settingsStore.setInterfaces(MOCK_INTERFACES);
store.overrideSelector(selectInterfaces, MOCK_INTERFACES);
store.overrideSelector(
selectSystemConfig,
MOCK_SYSTEM_CONFIG_WITH_SINGLE_PORT
);
store.refreshState();
});

it('should disable internet control', () => {
Expand All @@ -300,8 +241,12 @@ describe('GeneralSettingsStore', () => {

describe('when values are empty', () => {
beforeEach(() => {
settingsStore.setSystemConfig(MOCK_SYSTEM_CONFIG_WITH_NO_DATA);
settingsStore.setInterfaces(MOCK_INTERFACES);
store.overrideSelector(selectInterfaces, MOCK_INTERFACES);
store.overrideSelector(
selectSystemConfig,
MOCK_SYSTEM_CONFIG_WITH_NO_DATA
);
store.refreshState();
});

it('should set default form values', () => {
Expand Down Expand Up @@ -347,13 +292,14 @@ describe('GeneralSettingsStore', () => {

beforeEach(() => {
settingsStore.setInterfaces(MOCK_INTERFACES);
store.overrideSelector(selectInterfaces, MOCK_INTERFACES);
store.refreshState();
});

it('should update store', done => {
settingsStore.viewModel$
.pipe(skip(3), take(1))
.pipe(skip(2), take(1))
.subscribe(storeValue => {
expect(storeValue.interfaces).toEqual(updateInterfaces);
expect(storeValue.deviceOptions).toEqual(updateInterfaces);
expect(storeValue.internetOptions).toEqual(updateInternetOptions);

Expand Down
Loading
Loading