Skip to content
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

Jump to bottom

fix(#3247): Add waiting time and add test to smoke tests #3248

Merged
merged 6 commits into from
Sep 25, 2024
Merged

fix(#3247): Add waiting time and add test to smoke tests #3248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ac8523
fix(#3247): Add waiting time and add test to smoke tests
tenthe Sep 24, 2024
d468c39
fix(#3247): Fix linting
tenthe Sep 24, 2024
38a6e4b
fix(#3247): Try to remove the loop
tenthe Sep 24, 2024
27cdabd
fix(#3247): Add timeout to open new data view
tenthe Sep 24, 2024
0812486
Merge branch 'dev' into 3247-timerangeselectors-e2e-test-fails-in-nig…
tenthe Sep 25, 2024
7b95350
fix(#3247): Change opc ua test and rime range test
tenthe Sep 25, 2024
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
6 changes: 3 additions & 3 deletions ui/cypress/support/utils/datalake/DataLakeUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class DataLakeUtils {
widgetType: string,
) {
DataLakeUtils.goToDatalake();
DataLakeUtils.createAndEditDataView(dataViewName);
DataLakeUtils.createAndEditDataView();

DataLakeUtils.selectTimeRange(
new Date(2020, 10, 20, 22, 44),
Expand Down Expand Up @@ -162,7 +162,7 @@ export class DataLakeUtils {

public static createAndEditDataView() {
// Create new data view
cy.dataCy('open-new-data-view').click();
cy.dataCy('open-new-data-view', { timeout: 10000 }).click();
}

public static removeWidget(dataViewName: string) {
Expand Down Expand Up @@ -425,7 +425,7 @@ export class DataLakeUtils {
}

public static openTimeSelectorMenu() {
cy.dataCy('time-selector-menu').click();
cy.dataCy('time-selector-menu', { timeout: 10000 }).click();
}

public static applyCustomTimeSelection() {
Expand Down
5 changes: 3 additions & 2 deletions ui/cypress/tests/datalake/timeRangeSelectors.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ describe('Test Time Range Selectors in Data Explorer', () => {
before('Setup Tests', () => {
cy.initStreamPipesTest();
DataLakeUtils.loadDataIntoDataLake('datalake/sample.csv', false);
DataLakeUtils.goToDatalake();
DataLakeUtils.createAndEditDataView();
});

it('Perform Test', () => {
DataLakeUtils.goToDatalake();
DataLakeUtils.createAndEditDataView();

periods.forEach(period => {
cy.log('Testing period: ' + period.selector);
DataLakeUtils.openTimeSelectorMenu();
Expand Down
12 changes: 11 additions & 1 deletion ...es/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,17 @@ export class StaticRuntimeResolvableTreeInputComponent
}

ngOnInit(): void {
this.resetStaticPropertyStateAndReload();
// if a node is selected it is assumed the adapter was opened in edit mode
// when that is the case, the browse tree should be reloaded
// if the adapter is created, the reload should only be triggered if all previous configurations are set correctly
if (
this.staticProperty.selectedNodesInternalNames &&
this.staticProperty.selectedNodesInternalNames.length > 0
) {
this.resetStaticPropertyStateAndReload();
} else {
this.resetStaticPropertyState();
}

if (
this.staticProperty.nodes.length === 0 &&
Expand Down
Loading