This is an automated email from the ASF dual-hosted git repository.
dominikriemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new f29eb98129 test: standardize Cypress chart naming (#4711)
f29eb98129 is described below
commit f29eb98129e56ebf2f15b9ca42c68fa361960597
Author: Philipp Zehnder <[email protected]>
AuthorDate: Sat Jul 11 09:30:59 2026 +0200
test: standardize Cypress chart naming (#4711)
---
ui/cypress/support/utils/DashboardUtils.ts | 4 +-
.../support/utils/DataDownloadDialogUtils.ts | 2 +-
ui/cypress/support/utils/chart/ChartBtns.ts | 57 +++----
ui/cypress/support/utils/chart/ChartUtils.ts | 190 ++++++++++-----------
.../support/utils/chart/ChartWidgetTableUtils.ts | 2 +-
.../tests/chart/addAssetToDashboard.smoke.spec.ts | 18 +-
...moke.spec.ts => addAssetsToChart.smoke.spec.ts} | 12 +-
.../chart/advancedFilterExpressions.smoke.spec.ts | 6 +-
ui/cypress/tests/chart/autoAggregateTable.spec.ts | 2 +-
ui/cypress/tests/chart/chart-types/heatmap.spec.ts | 5 +-
.../tests/chart/chart-types/histogram.spec.ts | 2 +-
.../tests/chart/chart-types/indicator.spec.ts | 2 +-
ui/cypress/tests/chart/chart-types/map.spec.ts | 12 +-
.../tests/chart/chart-types/progress-bar.spec.ts | 5 +-
.../tests/chart/chart-types/scatter.smoke.spec.ts | 5 +-
ui/cypress/tests/chart/chart-types/table.spec.ts | 4 +-
.../tests/chart/chart-types/timeSeriesSave.spec.ts | 22 +--
.../tests/chart/chart-types/value-card.spec.ts | 9 +-
.../tests/chart/chartDataPreview.smoke.spec.ts | 2 +-
...ard.spec.ts => deleteChartAndDashboard.spec.ts} | 22 +--
.../tests/chart/dynamicColumnFilter.smoke.spec.ts | 4 +-
.../chart/filterNumericalStringProperties.spec.ts | 4 +-
.../tests/chart/missingDataInDataLake.spec.ts | 2 +-
ui/cypress/tests/chart/publicDashboardLink.spec.ts | 6 +-
...rderDataView.spec.ts => timeOrderChart.spec.ts} | 6 +-
ui/cypress/tests/chart/timeRangeSelectors.spec.ts | 2 +-
.../chart/widgetDataConfiguration.smoke.spec.ts | 6 +-
.../editAdapterDataLakeSchemaUpdate.spec.ts | 4 +-
.../editAdapterSettingsAndPipeline.smoke.spec.ts | 2 +-
.../tests/connect/rules/schemaRules.smoke.spec.ts | 2 +-
ui/cypress/tests/connect/rules/valueRules.spec.ts | 2 +-
.../dataDownloadDialogTest.smoke.spec.ts | 14 +-
.../pipeline/pipelineDataLakeSchemaUpdate.spec.ts | 4 +-
.../testAddAssetOnResourceCreation.ts | 4 +-
.../userManagement/testUserRoleCharts.spec.ts | 4 +-
.../userManagement/testUserRoleDashboard.spec.ts | 18 +-
.../userManagement/testUserRoleDataset.spec.ts | 16 +-
.../map/config/map-widget-config.component.html | 10 +-
.../chart-overview-table.component.html | 2 +-
.../chart-overview-table.component.ts | 6 +-
.../chart-overview/chart-overview.component.html | 2 +-
.../toolbar/chart-view-toolbar.component.html | 2 +-
.../chart-selection/chart-selection.component.ts | 2 +-
.../edit-dashboard-dialog.component.html | 2 +-
44 files changed, 237 insertions(+), 272 deletions(-)
diff --git a/ui/cypress/support/utils/DashboardUtils.ts
b/ui/cypress/support/utils/DashboardUtils.ts
index 98e28538b7..3a8cdcbcca 100644
--- a/ui/cypress/support/utils/DashboardUtils.ts
+++ b/ui/cypress/support/utils/DashboardUtils.ts
@@ -87,7 +87,7 @@ export class DashboardUtils {
.should('be.gte', amountOfEvents);
}
- public static removeWidgetFromDashboard(dashboardName: string) {
+ public static removeChartFromDashboard(dashboardName: string) {
cy.visit('#/dashboard');
cy.dataCy('edit-dashboard-' + dashboardName).click();
cy.dataCy('widget-remove-button').click();
@@ -117,7 +117,7 @@ export class DashboardUtils {
);
}
- DashboardUtils.removeWidgetFromDashboard(dashboardName);
+ DashboardUtils.removeChartFromDashboard(dashboardName);
}
public static checkAmountOfDashboards(amount: number) {
diff --git a/ui/cypress/support/utils/DataDownloadDialogUtils.ts
b/ui/cypress/support/utils/DataDownloadDialogUtils.ts
index f97d5813df..84456f9ce4 100644
--- a/ui/cypress/support/utils/DataDownloadDialogUtils.ts
+++ b/ui/cypress/support/utils/DataDownloadDialogUtils.ts
@@ -31,7 +31,7 @@ export class DataDownloadDialogUtils {
ChartUtils.goToDatalake();
// select data view in edit mode
- ChartUtils.editDataView(dataViewName);
+ ChartUtils.editChart(dataViewName);
// select download button
cy.dataCy('data-view-data-download-btn').click();
diff --git a/ui/cypress/support/utils/chart/ChartBtns.ts
b/ui/cypress/support/utils/chart/ChartBtns.ts
index ff71cc1555..13048d8f27 100644
--- a/ui/cypress/support/utils/chart/ChartBtns.ts
+++ b/ui/cypress/support/utils/chart/ChartBtns.ts
@@ -21,11 +21,11 @@ export class ChartBtns {
return cy.dataCy('refresh-data-lake-measures');
}
- public static saveDataViewButton() {
- return cy.dataCy('save-data-view-btn', { timeout: 10000 });
+ public static saveChartButton() {
+ return cy.dataCy('save-chart-btn', { timeout: 10000 });
}
- public static saveDataViewBtn() {
+ public static saveChartBtn() {
return cy.dataCy('sp-manage-save');
}
@@ -47,8 +47,8 @@ export class ChartBtns {
});
}
- public static deleteDataViewBtn(dataViewName) {
- return cy.dataCy('delete-data-view-' + dataViewName, {
+ public static deleteChartBtn(chartName) {
+ return cy.dataCy('delete-chart-' + chartName, {
timeout: 10000,
});
}
@@ -57,8 +57,8 @@ export class ChartBtns {
return cy.dataCy('save-dashboard-btn', { timeout: 10000 });
}
- public static removeWidgetBtn(dataViewName) {
- return cy.dataCy('remove-' + dataViewName);
+ public static removeChartBtn(chartName) {
+ return cy.dataCy('remove-' + chartName);
}
public static createChartBtn() {
@@ -77,15 +77,14 @@ export class ChartBtns {
return cy.dataCy('open-manage-permissions-' + dashboardName);
}
- public static openNewDataViewBtn() {
- return cy.dataCy('open-new-data-view', { timeout: 10000 });
+ public static openNewChartBtn() {
+ return cy.dataCy('open-new-chart', { timeout: 10000 });
}
- public static addDataViewBtn(dataViewName: string) {
- return cy.dataCy(
- 'add-data-view-btn-' + dataViewName.replaceAll(' ', ''),
- { timeout: 10000 },
- );
+ public static addChartBtn(chartName: string) {
+ return cy.dataCy('add-chart-btn-' + chartName.replaceAll(' ', ''), {
+ timeout: 10000,
+ });
}
public static refreshChartSelectionBtn() {
@@ -97,7 +96,7 @@ export class ChartBtns {
}
public static chartAssetCheckboxBtn() {
- return cy.dataCy('add-to-Asset-data-view-btn');
+ return cy.dataCy('add-to-asset-chart-btn');
}
public static chartOptionsBtn() {
@@ -126,8 +125,8 @@ export class ChartBtns {
.find('input[type="checkbox"]');
}
- public static editDataViewButton(dataViewName: string) {
- return cy.dataCy('edit-data-view-' + dataViewName.replace(/ /g, ''));
+ public static editChartButton(chartName: string) {
+ return cy.dataCy('edit-chart-' + chartName.replace(/ /g, ''));
}
public static chartSyncProblemIcon() {
@@ -138,27 +137,27 @@ export class ChartBtns {
return cy.dataCy('chart-requires-attention-warning');
}
- public static editWidget(widgetName: string) {
- return cy.dataCy('edit-' + widgetName);
+ public static editChart(chartName: string) {
+ return cy.dataCy('edit-' + chartName);
}
- public static viewWidget(widgetName: string) {
- return cy.dataCy('show-data-view-' + widgetName);
+ public static viewChart(chartName: string) {
+ return cy.dataCy('show-chart-' + chartName);
}
- public static moreOptionsBtn(widgetName) {
- return cy.dataCy('more-options-' + widgetName);
+ public static moreOptionsBtn(chartName) {
+ return cy.dataCy('more-options-' + chartName);
}
- public static startEditWidget(widgetName) {
- return cy.dataCy('start-edit-' + widgetName);
+ public static startEditChart(chartName) {
+ return cy.dataCy('start-edit-' + chartName);
}
public static goBackToOverviewBtn() {
return cy.dataCy('save-data-explorer-go-back-to-overview');
}
- public static discardDataExplorerWidgetBtn() {
+ public static discardChartBtn() {
return cy.dataCy('save-data-explorer-go-back-to-overview');
}
@@ -326,8 +325,8 @@ export class ChartBtns {
return cy.dataCy('progress-bar-secondary-label');
}
- public static addNewWidgetBtn() {
- return cy.dataCy('add-new-widget', { timeout: 10000 });
+ public static addNewChartBtn() {
+ return cy.dataCy('add-new-chart', { timeout: 10000 });
}
public static dashboardAssetCheckboxBtn() {
@@ -335,7 +334,7 @@ export class ChartBtns {
}
public static closeDashboardCreate() {
- return cy.dataCy('close-data-view');
+ return cy.dataCy('close-dashboard');
}
public static advancedFilterBtn() {
diff --git a/ui/cypress/support/utils/chart/ChartUtils.ts
b/ui/cypress/support/utils/chart/ChartUtils.ts
index 1790c8b637..e98c79a244 100644
--- a/ui/cypress/support/utils/chart/ChartUtils.ts
+++ b/ui/cypress/support/utils/chart/ChartUtils.ts
@@ -74,14 +74,14 @@ export class ChartUtils {
public static checkChartCanBeEdited(chartName: string) {
GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.editDataViewButton(chartName).should('exist');
+ ChartBtns.editChartButton(chartName).should('exist');
});
}
public static checkChartCanNotBeEdited(chartName: string) {
GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.editDataViewButton(chartName).should('not.exist');
+ ChartBtns.editChartButton(chartName).should('not.exist');
});
}
@@ -129,13 +129,13 @@ export class ChartUtils {
}
}
- public static addDataViewAndWidget(
+ public static createChart(
dataSet: string,
widgetType: string,
ignoreTimeSelection = false,
) {
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
if (!ignoreTimeSelection) {
ChartUtils.selectTimeRange(
@@ -144,7 +144,6 @@ export class ChartUtils {
);
}
- // ChartUtils.addNewWidget();
ChartUtils.selectDataSet(dataSet);
ChartUtils.dataConfigSelectAllFields();
@@ -195,7 +194,7 @@ export class ChartUtils {
ChartUtils.goToDashboard();
ChartUtils.addNewDashboard(name);
ChartUtils.addAssetsToDashboard(assetNameList);
- ChartUtils.saveDataView();
+ ChartUtils.saveChart();
ChartUtils.waitForDashboardInOverview(name);
}
@@ -203,7 +202,7 @@ export class ChartUtils {
ChartBtns.newDashboardDialogBtn().click();
ChartBtns.saveDashboardBtn().click();
cy.dataCy('managed-resource-name').type(name);
- ChartBtns.saveDataViewBtn().click();
+ ChartBtns.saveChartBtn().click();
}
public static addNewDashboardwithAssets(name: string, assetNameList) {
@@ -211,19 +210,15 @@ export class ChartUtils {
ChartBtns.saveDashboardBtn().click();
cy.dataCy('managed-resource-name').type(name);
ChartUtils.addAssetsToDashboard(assetNameList);
- ChartBtns.saveDataViewBtn().click();
+ ChartBtns.saveChartBtn().click();
}
- public static createDashboardWithLinkedAssets(
- dataView,
- name,
- assetNameList,
- ) {
+ public static createDashboardWithLinkedAssets(chart, name, assetNameList) {
ChartUtils.goToDatalake();
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
- ChartUtils.saveDataViewConfiguration(false, false, dataView);
+ ChartUtils.saveChartConfiguration(false, false, chart);
ChartUtils.goToDashboard();
@@ -232,8 +227,8 @@ export class ChartUtils {
ChartUtils.waitForDashboardInOverview(name);
}
- public static saveDataView() {
- return ChartBtns.saveDataViewBtn().click();
+ public static saveChart() {
+ return ChartBtns.saveChartBtn().click();
}
public static saveDashboard() {
@@ -248,21 +243,17 @@ export class ChartUtils {
}).should('be.visible');
}
- public static addDataViewAndTableWidget(
+ public static createTableChart(
dataSet: string,
ignoreTimeSelection = false,
) {
- this.addDataViewAndWidget(
- dataSet,
- ChartWidget.TABLE,
- ignoreTimeSelection,
- );
+ this.createChart(dataSet, ChartWidget.TABLE, ignoreTimeSelection);
}
- public static addDataViewAndTimeSeriesWidget(dataSet: string) {
- this.addDataViewAndWidget(dataSet, ChartWidget.TIME_SERIES);
+ public static createTimeSeriesChart(dataSet: string) {
+ this.createChart(dataSet, ChartWidget.TIME_SERIES);
}
- public static renameWidget(newName: string) {
+ public static renameChart(newName: string) {
cy.dataCy('managed-resource-name').clear().type(newName);
cy.dataCy('managed-resource-name').should('have.value', newName);
}
@@ -277,12 +268,12 @@ export class ChartUtils {
}
public static createAndEditDashboard(name: string) {
- // Create new data view
+ // Create new dashboard
ChartBtns.newDashboardDialogBtn().click();
ChartBtns.saveDashboardBtn().click();
- // Configure data view
+ // Configure dashboard
cy.dataCy('managed-resource-name').type(name);
- ChartBtns.saveDataViewBtn().click();
+ ChartBtns.saveChartBtn().click();
cy.contains('[role="row"], tr, mat-row', name, {
timeout: 10000,
}).should('be.visible');
@@ -290,8 +281,8 @@ export class ChartUtils {
this.editDashboard(name);
}
- public static addDataViewToDashboard(
- dataViewName: string,
+ public static addChartToDashboard(
+ chartName: string,
ignoreTimeRange = false,
) {
if (!ignoreTimeRange) {
@@ -302,20 +293,19 @@ export class ChartUtils {
}
ChartBtns.refreshChartSelectionBtn().should('not.be.disabled');
- ChartBtns.addDataViewBtn(dataViewName)
+ ChartBtns.addChartBtn(chartName)
.should('be.visible')
.click('bottom', { scrollBehavior: false });
}
- public static createAndEditDataView() {
- // Create new data view
- ChartBtns.openNewDataViewBtn().click();
+ public static createAndEditChart() {
+ ChartBtns.openNewChartBtn().click();
cy.location('hash').should('include', '/chart/create');
cy.location('hash').should('include', 'editMode=true');
}
- public static removeWidget(dataViewName: string) {
- ChartBtns.removeWidgetBtn(dataViewName).click();
+ public static removeChart(chartName: string) {
+ ChartBtns.removeChartBtn(chartName).click();
}
public static editDashboard(dashboardName: string) {
@@ -339,45 +329,45 @@ export class ChartUtils {
});
}
- public static editDataView(dataViewName: string) {
+ public static editChart(chartName: string) {
// Click edit button
// following only works if single view is available
- GeneralUtils.openMenuForRow(dataViewName);
+ GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.editDataViewButton(dataViewName).click();
+ ChartBtns.editChartButton(chartName).click();
});
}
- public static manageDataView(dataViewName: string) {
+ public static manageChart(chartName: string) {
// Click edit button
// following only works if single view is available
- GeneralUtils.openMenuForRow(dataViewName);
+ GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.manageChartButton(dataViewName).click();
+ ChartBtns.manageChartButton(chartName).click();
});
}
- public static saveDataViewConfiguration(
+ public static saveChartConfiguration(
confirmSave: boolean = false,
withoutConfig: boolean = true,
name: string = 'New Chart',
) {
if (withoutConfig) {
- ChartBtns.saveDataViewButton().click({
+ ChartBtns.saveChartButton().click({
force: true,
});
} else {
- ChartBtns.saveDataViewButton().click({
+ ChartBtns.saveChartButton().click({
force: true,
});
cy.dataCy('managed-resource-name').clear().type(name);
- ChartBtns.saveDataViewBtn().should('be.visible');
- ChartBtns.saveDataViewBtn().click();
+ ChartBtns.saveChartBtn().should('be.visible');
+ ChartBtns.saveChartBtn().click();
}
if (confirmSave) {
SharedBtns.confirmDialogConfirmBtn().click();
}
- ChartBtns.openNewDataViewBtn().should('be.visible');
+ ChartBtns.openNewChartBtn().should('be.visible');
}
public static saveDashboardConfiguration() {
@@ -394,7 +384,7 @@ export class ChartUtils {
ChartBtns.manageChartBtn().click();
});
ChartUtils.addDashboardToAsset(assetNameList);
- ChartBtns.saveDataViewBtn().click();
+ ChartBtns.saveChartBtn().click();
}
public static addChartDialogAssets(assetNameList = []) {
@@ -435,10 +425,10 @@ export class ChartUtils {
SharedBtns.confirmDialogConfirmBtn().click();
}
- public static deleteDataView(dataViewName: string) {
- GeneralUtils.openMenuForRow(dataViewName);
+ public static deleteChart(chartName: string) {
+ GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.deleteDataViewBtn(dataViewName).click();
+ ChartBtns.deleteChartBtn(chartName).click();
});
SharedBtns.confirmDialogConfirmBtn().click();
}
@@ -451,37 +441,37 @@ export class ChartUtils {
SharedBtns.confirmDialogCancelBtn().click();
}
- public static cancelDeleteDataView(dataViewName: string) {
- GeneralUtils.openMenuForRow(dataViewName);
+ public static cancelDeleteChart(chartName: string) {
+ GeneralUtils.openMenuForRow(chartName);
GeneralUtils.visibleMaterialMenu().within(() => {
- ChartBtns.deleteDataViewBtn(dataViewName).click();
+ ChartBtns.deleteChartBtn(chartName).click();
});
SharedBtns.confirmDialogCancelBtn().click();
}
- public static editWidget(widgetName: string) {
- ChartBtns.editWidget(widgetName).click();
+ public static editSavedChart(chartName: string) {
+ ChartBtns.editChart(chartName).click();
}
- public static startEditWidget(widgetName: string) {
- ChartBtns.moreOptionsBtn(widgetName).click();
- ChartBtns.startEditWidget(widgetName).click();
+ public static startEditChart(chartName: string) {
+ ChartBtns.moreOptionsBtn(chartName).click();
+ ChartBtns.startEditChart(chartName).click();
}
- public static saveAndReEditWidget(dataViewName: string) {
- // Save data view configuration
- ChartBtns.saveDataViewButton().click();
- ChartBtns.openNewDataViewBtn().should('be.visible');
- ChartUtils.editDataView(dataViewName);
+ public static saveAndReEditChart(chartName: string) {
+ // Save chart configuration
+ ChartBtns.saveChartButton().click();
+ ChartBtns.openNewChartBtn().should('be.visible');
+ ChartUtils.editChart(chartName);
}
- public static saveAndEditWidget(dataViewName: string) {
- // Save data view configuration
- ChartBtns.saveDataViewButton().click();
- cy.dataCy('managed-resource-name').clear().type(dataViewName);
- ChartBtns.saveDataViewBtn().click();
- ChartBtns.openNewDataViewBtn().should('be.visible');
- ChartUtils.editDataView(dataViewName);
+ public static saveAndEditChart(chartName: string) {
+ // Save chart configuration
+ ChartBtns.saveChartButton().click();
+ cy.dataCy('managed-resource-name').clear().type(chartName);
+ ChartBtns.saveChartBtn().click();
+ ChartBtns.openNewChartBtn().should('be.visible');
+ ChartUtils.editChart(chartName);
}
public static saveAndReEditDashboard(dashboardName: string) {
@@ -499,8 +489,8 @@ export class ChartUtils {
ChartBtns.goBackToOverviewBtn().click();
}
- public static addNewWidget() {
- ChartBtns.addNewWidgetBtn().click();
+ public static addNewChart() {
+ ChartBtns.addNewChartBtn().click();
}
public static selectDataSet(dataSet: string) {
@@ -522,7 +512,7 @@ export class ChartUtils {
}
/**
- * Checks if in the widget configuration the filters are set or not
+ * Checks if filters are set in the chart configuration.
* @param amountOfFilter the amount of filters that should be set. 0 if no
filter should be visible
*/
public static checkIfFilterIsSet(amountOfFilter: number) {
@@ -651,42 +641,42 @@ export class ChartUtils {
}
public static selectDataConfig() {
- this.selectDataViewConfigTab(0);
+ this.selectChartConfigTab(0);
}
public static openVisualizationConfig() {
- this.selectDataViewConfigTab(1);
+ this.selectChartConfigTab(1);
}
public static selectAppearanceConfig() {
- this.selectDataViewConfigTab(2);
+ this.selectChartConfigTab(2);
}
// Workaround: mat-tab does not render the data-cy attribute, so we select
tabs by index.
// Using the label is not reliable due to multi-language support.
- private static selectDataViewConfigTab(tabNumber: number) {
+ private static selectChartConfigTab(tabNumber: number) {
cy.get('div[role=tab]').eq(tabNumber).click();
}
- public static selectDataViewNameAndSave(dataViewName: string) {
- ChartBtns.saveDataViewButton().click();
- cy.dataCy('managed-resource-name').clear().type(dataViewName);
- ChartBtns.saveDataViewBtn().click();
+ public static selectChartNameAndSave(chartName: string) {
+ ChartBtns.saveChartButton().click();
+ cy.dataCy('managed-resource-name').clear().type(chartName);
+ ChartBtns.saveChartBtn().click();
}
public static clickCreateButton() {
- // Create widget
+ // Create chart
cy.dataCy('data-explorer-select-data-set-create-btn').click();
}
public static checkResults(
- measurementName: string,
+ datasetName: string,
fileRoute: string,
ignoreTime: boolean,
) {
const fileType = this.getFileType(fileRoute);
- this.fetchDataLakeResults(measurementName, fileType).then(
+ this.fetchDataLakeResults(datasetName, fileType).then(
actualResultString =>
this.compareResults(
actualResultString,
@@ -697,12 +687,12 @@ export class ChartUtils {
);
}
- public static clearMeasurementData(measurementName: string) {
+ public static clearDatasetData(datasetName: string) {
const token = window.localStorage.getItem('auth-token');
return cy
.request({
method: 'DELETE',
- url:
`/streampipes-backend/api/v4/datalake/measurements/${measurementName}`,
+ url:
`/streampipes-backend/api/v4/datalake/measurements/${datasetName}`,
failOnStatusCode: false,
headers: {
Authorization: `Bearer ${token}`,
@@ -718,13 +708,13 @@ export class ChartUtils {
}
private static fetchDataLakeResults(
- measurementName: string,
+ datasetName: string,
fileType: 'csv' | 'json',
): Cypress.Chainable<string> {
return cy
.request({
method: 'GET',
- url:
`/streampipes-backend/api/v4/datalake/measurements/${measurementName}/download?format=${fileType}&delimiter=semicolon`,
+ url:
`/streampipes-backend/api/v4/datalake/measurements/${datasetName}/download?format=${fileType}&delimiter=semicolon`,
headers: {
'content-type': 'application/octet-stream',
},
@@ -819,8 +809,8 @@ export class ChartUtils {
}).should('have.length', amount);
}
- public static checkRowsViewsTable(amount: number) {
- cy.dataCy('data-views-table-overview', {
+ public static checkRowsChartsTable(amount: number) {
+ cy.dataCy('charts-table-overview', {
timeout: 10000,
}).should('have.length', amount);
}
@@ -828,20 +818,20 @@ export class ChartUtils {
public static checkIfConfirmationDialogIsShowing(): void {
cy.dataCy('confirm-dialog').should('be.visible');
}
- public static createDataViewWithAssets(assetNames) {
+ public static createChartWithAssets(assetNames) {
ChartUtils.loadDataIntoDataLake('datalake/sample.csv');
// Create Diagram
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
//Save
- ChartBtns.saveDataViewButton().click();
- ChartUtils.addDataViewName('NewWidget');
+ ChartBtns.saveChartButton().click();
+ ChartUtils.addChartName('NewWidget');
ChartUtils.addDashboardToAsset(assetNames);
- ChartBtns.saveDataViewBtn().click();
- ChartBtns.openNewDataViewBtn().should('be.visible');
+ ChartBtns.saveChartBtn().click();
+ ChartBtns.openNewChartBtn().should('be.visible');
}
- public static addDataViewName(name) {
+ public static addChartName(name) {
cy.dataCy('managed-resource-name').clear().type(name);
}
}
diff --git a/ui/cypress/support/utils/chart/ChartWidgetTableUtils.ts
b/ui/cypress/support/utils/chart/ChartWidgetTableUtils.ts
index 68b4893b93..ec84ff96ab 100644
--- a/ui/cypress/support/utils/chart/ChartWidgetTableUtils.ts
+++ b/ui/cypress/support/utils/chart/ChartWidgetTableUtils.ts
@@ -31,7 +31,7 @@ export class ChartWidgetTableUtils {
}
/**
- * Checks how many rows are visible within the table widget in charts
+ * Checks how many rows are visible within a table chart.
* @param amount of expected rows
*/
public static checkAmountOfRows(amount: number) {
diff --git a/ui/cypress/tests/chart/addAssetToDashboard.smoke.spec.ts
b/ui/cypress/tests/chart/addAssetToDashboard.smoke.spec.ts
index c0048a2186..c6b18964a3 100644
--- a/ui/cypress/tests/chart/addAssetToDashboard.smoke.spec.ts
+++ b/ui/cypress/tests/chart/addAssetToDashboard.smoke.spec.ts
@@ -38,16 +38,12 @@ describe('Test add Assets To Dashboard', () => {
});
it('Create Dashboard and add Assets', () => {
- const dataView = 'TestView';
+ const chart = 'TestView';
const name = 'Dashboard1';
const assetNameList = [assetName1, assetName2];
- ChartUtils.createDashboardWithLinkedAssets(
- dataView,
- name,
- assetNameList,
- );
+ ChartUtils.createDashboardWithLinkedAssets(chart, name, assetNameList);
//Go Back to Asset
AssetUtils.goToAssets();
@@ -60,22 +56,18 @@ describe('Test add Assets To Dashboard', () => {
});
it('Edit Dashboard and edit Asset Links', () => {
- const dataView = 'TestView';
+ const chart = 'TestView';
const name = 'Dashboard1';
const assetNameList = [assetName1, assetName2];
- ChartUtils.createDashboardWithLinkedAssets(
- dataView,
- name,
- assetNameList,
- );
+ ChartUtils.createDashboardWithLinkedAssets(chart, name, assetNameList);
ChartUtils.goToDashboard();
ChartUtils.editDashboardSettings(name);
ChartUtils.renameDashboard('NEW');
const assetNameList2 = [assetName2, assetName3];
ChartUtils.addToAsset(assetNameList2);
- ChartUtils.saveDataView();
+ ChartUtils.saveChart();
AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName1, 1);
AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName3, 1);
diff --git a/ui/cypress/tests/chart/addAssetsToDataView.smoke.spec.ts
b/ui/cypress/tests/chart/addAssetsToChart.smoke.spec.ts
similarity index 88%
rename from ui/cypress/tests/chart/addAssetsToDataView.smoke.spec.ts
rename to ui/cypress/tests/chart/addAssetsToChart.smoke.spec.ts
index 2189cf0707..ec3b12bbff 100644
--- a/ui/cypress/tests/chart/addAssetsToDataView.smoke.spec.ts
+++ b/ui/cypress/tests/chart/addAssetsToChart.smoke.spec.ts
@@ -39,7 +39,7 @@ describe('Creates a new adapter with a linked asset', () => {
});
it('Add Assets during Chart generation', () => {
- ChartUtils.createDataViewWithAssets([assetName1, assetName2]);
+ ChartUtils.createChartWithAssets([assetName1, assetName2]);
AssetUtils.checkAmountOfAssets(3);
//Test
AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName1, 1);
@@ -47,7 +47,7 @@ describe('Creates a new adapter with a linked asset', () => {
});
it('Edit Assets during Chart generation', () => {
- ChartUtils.createDataViewWithAssets([assetName1, assetName2]);
+ ChartUtils.createChartWithAssets([assetName1, assetName2]);
AssetUtils.checkAmountOfAssets(3);
//Test
@@ -57,11 +57,11 @@ describe('Creates a new adapter with a linked asset', () =>
{
// Go To Chart and Edit
ChartUtils.goToDatalake();
cy.wait(1000);
- ChartUtils.manageDataView('NewWidget');
- ChartUtils.renameWidget('Rename');
+ ChartUtils.manageChart('NewWidget');
+ ChartUtils.renameChart('Rename');
ChartUtils.addDashboardToAsset([assetName1, assetName3]);
- ChartBtns.saveDataViewBtn().click();
- ChartBtns.openNewDataViewBtn().should('be.visible');
+ ChartBtns.saveChartBtn().click();
+ ChartBtns.openNewChartBtn().should('be.visible');
AssetUtils.checkAmountOfAssets(3);
AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName2, 1);
diff --git a/ui/cypress/tests/chart/advancedFilterExpressions.smoke.spec.ts
b/ui/cypress/tests/chart/advancedFilterExpressions.smoke.spec.ts
index 537ba6b137..5498eca95c 100644
--- a/ui/cypress/tests/chart/advancedFilterExpressions.smoke.spec.ts
+++ b/ui/cypress/tests/chart/advancedFilterExpressions.smoke.spec.ts
@@ -27,7 +27,7 @@ describe('Advanced Filter Expressions in Charts', () => {
});
it('Applies nested advanced filter expressions and persists them', () => {
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
ChartWidgetTableUtils.checkAmountOfRows(10);
ChartUtils.selectDataConfig();
@@ -64,7 +64,7 @@ describe('Advanced Filter Expressions in Charts', () => {
// a AND (22 OR 56) => 2 rows in sample.csv
ChartWidgetTableUtils.checkAmountOfRows(2);
- ChartUtils.saveAndEditWidget('AdvancedFilterWidget');
+ ChartUtils.saveAndEditChart('AdvancedFilterWidget');
ChartWidgetTableUtils.checkAmountOfRows(2);
ChartUtils.selectDataConfig();
ChartBtns.advancedFilterBtn().should('be.visible');
@@ -76,7 +76,7 @@ describe('Advanced Filter Expressions in Charts', () => {
});
it('Closes table filter dropdown with ESC', () => {
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
cy.dataCy('column-filter-trigger-randomtext').click({ force: true });
cy.get('.column-filter-dropdown').should('be.visible');
diff --git a/ui/cypress/tests/chart/autoAggregateTable.spec.ts
b/ui/cypress/tests/chart/autoAggregateTable.spec.ts
index fdae6c7809..0ef66208f2 100644
--- a/ui/cypress/tests/chart/autoAggregateTable.spec.ts
+++ b/ui/cypress/tests/chart/autoAggregateTable.spec.ts
@@ -48,7 +48,7 @@ describe('Test auto aggregate table result size', () => {
},
);
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
ChartUtils.selectDataConfig();
ChartUtils.selectAggregatedQueryType();
ChartUtils.enableAutoAggregate();
diff --git a/ui/cypress/tests/chart/chart-types/heatmap.spec.ts
b/ui/cypress/tests/chart/chart-types/heatmap.spec.ts
index 6b96c907d4..18e91e3f04 100644
--- a/ui/cypress/tests/chart/chart-types/heatmap.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/heatmap.spec.ts
@@ -25,10 +25,7 @@ describe('Test Heatmap View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
- PrepareTestDataUtils.dataName,
- 'heatmap',
- );
+ ChartUtils.createChart(PrepareTestDataUtils.dataName, 'heatmap');
// Check checkbox
ChartUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/chart/chart-types/histogram.spec.ts
b/ui/cypress/tests/chart/chart-types/histogram.spec.ts
index 540aa8ebb7..6724346b0d 100644
--- a/ui/cypress/tests/chart/chart-types/histogram.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/histogram.spec.ts
@@ -25,7 +25,7 @@ describe('Test Histogram View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
+ ChartUtils.createChart(
PrepareTestDataUtils.dataName,
'histogram-chart',
);
diff --git a/ui/cypress/tests/chart/chart-types/indicator.spec.ts
b/ui/cypress/tests/chart/chart-types/indicator.spec.ts
index 8d1fdae31e..7d0c4fbd1c 100644
--- a/ui/cypress/tests/chart/chart-types/indicator.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/indicator.spec.ts
@@ -26,7 +26,7 @@ describe('Test Indicator View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
+ ChartUtils.createChart(
PrepareTestDataUtils.dataName,
'indicator-chart',
);
diff --git a/ui/cypress/tests/chart/chart-types/map.spec.ts
b/ui/cypress/tests/chart/chart-types/map.spec.ts
index d283137081..5973b98692 100644
--- a/ui/cypress/tests/chart/chart-types/map.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/map.spec.ts
@@ -25,16 +25,16 @@ describe('Test Map View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(PrepareTestDataUtils.dataName, 'map');
+ ChartUtils.createChart(PrepareTestDataUtils.dataName, 'map');
// Change marker positions
ChartUtils.openVisualizationConfig();
- cy.dataCy('data-view-map-select-latitude')
+ cy.dataCy('chart-map-select-latitude')
.click()
.find('mat-option')
.contains('count (prepared_data #1)')
.click();
- cy.dataCy('data-view-map-select-longitude')
+ cy.dataCy('chart-map-select-longitude')
.click()
.find('mat-option')
.contains('randomnumber (prepared_data #1)')
@@ -50,9 +50,9 @@ describe('Test Map View in Charts', () => {
// Change from markers to trace
ChartUtils.openVisualizationConfig();
- cy.dataCy('data-view-map-select-marker-or-trace').click();
- cy.dataCy('data-view-map-option-trace').click();
- cy.dataCy('data-view-map-option-trace').should('not.exist');
+ cy.dataCy('chart-map-select-marker-or-trace').click();
+ cy.dataCy('chart-map-option-trace').click();
+ cy.dataCy('chart-map-option-trace').should('not.exist');
// Check if trace is visible
cy.get('path').should('have.class', 'leaflet-interactive');
diff --git a/ui/cypress/tests/chart/chart-types/progress-bar.spec.ts
b/ui/cypress/tests/chart/chart-types/progress-bar.spec.ts
index 924f744214..7a3618a855 100644
--- a/ui/cypress/tests/chart/chart-types/progress-bar.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/progress-bar.spec.ts
@@ -26,10 +26,7 @@ describe('Test Progress Bar View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
- PrepareTestDataUtils.dataName,
- 'progress-bar',
- );
+ ChartUtils.createChart(PrepareTestDataUtils.dataName, 'progress-bar');
ChartUtils.openVisualizationConfig();
ChartBtns.progressBarTitleInput().type('Job Progress');
diff --git a/ui/cypress/tests/chart/chart-types/scatter.smoke.spec.ts
b/ui/cypress/tests/chart/chart-types/scatter.smoke.spec.ts
index c5bd08abb0..9cee156d30 100644
--- a/ui/cypress/tests/chart/chart-types/scatter.smoke.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/scatter.smoke.spec.ts
@@ -25,10 +25,7 @@ describe('Test Scatter View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
- PrepareTestDataUtils.dataName,
- 'scatter-chart',
- );
+ ChartUtils.createChart(PrepareTestDataUtils.dataName, 'scatter-chart');
// Check if scatter plot is displayed
cy.dataCy('scatter-chart').should('be.visible');
diff --git a/ui/cypress/tests/chart/chart-types/table.spec.ts
b/ui/cypress/tests/chart/chart-types/table.spec.ts
index 0b543a7e7b..b331a0d76e 100644
--- a/ui/cypress/tests/chart/chart-types/table.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/table.spec.ts
@@ -28,7 +28,7 @@ describe('Test Table View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
+ ChartUtils.createChart(
PrepareTestDataUtils.dataName,
ChartWidget.TABLE,
);
@@ -38,7 +38,7 @@ describe('Test Table View in Charts', () => {
});
it('Renames table field labels', () => {
- ChartUtils.addDataViewAndWidget(
+ ChartUtils.createChart(
PrepareTestDataUtils.dataName,
ChartWidget.TABLE,
);
diff --git a/ui/cypress/tests/chart/chart-types/timeSeriesSave.spec.ts
b/ui/cypress/tests/chart/chart-types/timeSeriesSave.spec.ts
index 544536c8f2..c7efc4f913 100644
--- a/ui/cypress/tests/chart/chart-types/timeSeriesSave.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/timeSeriesSave.spec.ts
@@ -22,23 +22,19 @@ import { PrepareTestDataUtils } from
'../../../support/utils/PrepareTestDataUtil
const testView1 = 'TestView1';
const testView2 = 'TestView2';
-describe('Test if widget configuration is updated correctly', () => {
+describe('Test if chart configuration is updated correctly', () => {
beforeEach('Setup Test', () => {
ChartUtils.initDataLakeTests();
- // Create first test data view with one time series widget
- ChartUtils.addDataViewAndTimeSeriesWidget(
- PrepareTestDataUtils.dataName,
- );
+ // Create first time series chart
+ ChartUtils.createTimeSeriesChart(PrepareTestDataUtils.dataName);
- ChartUtils.saveDataViewConfiguration(false, false, testView1);
+ ChartUtils.saveChartConfiguration(false, false, testView1);
cy.wait(1000);
- // Create second test data view with one time series widget
- ChartUtils.addDataViewAndTimeSeriesWidget(
- PrepareTestDataUtils.dataName,
- );
- ChartUtils.saveDataViewConfiguration(false, false, testView2);
+ // Create second time series chart
+ ChartUtils.createTimeSeriesChart(PrepareTestDataUtils.dataName);
+ ChartUtils.saveChartConfiguration(false, false, testView2);
});
it('Perform Test', () => {
@@ -47,8 +43,8 @@ describe('Test if widget configuration is updated correctly',
() => {
});
const runTestCase = () => {
- // Visit settings of widget
- ChartUtils.editDataView(testView1);
+ // Visit chart settings
+ ChartUtils.editChart(testView1);
// Change first field from line plot to scatter plot
ChartUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/chart/chart-types/value-card.spec.ts
b/ui/cypress/tests/chart/chart-types/value-card.spec.ts
index 713a184c6a..8a5d39fae9 100644
--- a/ui/cypress/tests/chart/chart-types/value-card.spec.ts
+++ b/ui/cypress/tests/chart/chart-types/value-card.spec.ts
@@ -26,10 +26,7 @@ describe('Test Value Card View in Charts', () => {
});
it('Perform Test', () => {
- ChartUtils.addDataViewAndWidget(
- PrepareTestDataUtils.dataName,
- 'value-card',
- );
+ ChartUtils.createChart(PrepareTestDataUtils.dataName, 'value-card');
ChartUtils.openVisualizationConfig();
ChartBtns.valueCardShowTimestampCheckbox()
@@ -37,14 +34,14 @@ describe('Test Value Card View in Charts', () => {
.should('be.checked');
ChartBtns.valueCardTitleInput().type('Current Snapshot');
ChartBtns.valueCardDescriptionInput().type(
- 'First returned values from the data view.',
+ 'First returned values from the chart.',
);
ChartBtns.valueCardWidget().should('be.visible');
ChartBtns.valueCardTitle().should('contain.text', 'Current Snapshot');
ChartBtns.valueCardDescription().should(
'contain.text',
- 'First returned values from the data view.',
+ 'First returned values from the chart.',
);
ChartBtns.valueCardTimestamp().should('be.visible');
ChartBtns.valueCardItems().should('have.length.greaterThan', 0);
diff --git a/ui/cypress/tests/chart/chartDataPreview.smoke.spec.ts
b/ui/cypress/tests/chart/chartDataPreview.smoke.spec.ts
index ba47cbc772..5dc06bbbd5 100644
--- a/ui/cypress/tests/chart/chartDataPreview.smoke.spec.ts
+++ b/ui/cypress/tests/chart/chartDataPreview.smoke.spec.ts
@@ -26,7 +26,7 @@ describe('Test Chart Data Preview in Charts', () => {
});
it('Shows and toggles the chart data preview', () => {
- ChartUtils.addDataViewAndWidget(
+ ChartUtils.createChart(
PrepareTestDataUtils.dataName,
ChartWidget.TIME_SERIES,
);
diff --git a/ui/cypress/tests/chart/deleteViewAndDashboard.spec.ts
b/ui/cypress/tests/chart/deleteChartAndDashboard.spec.ts
similarity index 76%
rename from ui/cypress/tests/chart/deleteViewAndDashboard.spec.ts
rename to ui/cypress/tests/chart/deleteChartAndDashboard.spec.ts
index b73b9c4e7a..1cd1f3e593 100644
--- a/ui/cypress/tests/chart/deleteViewAndDashboard.spec.ts
+++ b/ui/cypress/tests/chart/deleteChartAndDashboard.spec.ts
@@ -17,7 +17,7 @@
*/
import { ChartUtils } from '../../support/utils/chart/ChartUtils';
-describe('Test Deletion of Data View and Dashboard', () => {
+describe('Test Deletion of Chart and Dashboard', () => {
beforeEach('Setup Test', () => {
cy.initStreamPipesTest();
ChartUtils.loadDataIntoDataLake('datalake/sample.csv');
@@ -25,21 +25,21 @@ describe('Test Deletion of Data View and Dashboard', () => {
it('Perform Test', () => {
const dashboard = 'TestDashboard';
- const dataView = 'TestView';
+ const chart = 'TestView';
ChartUtils.goToDatalake();
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
- ChartUtils.saveDataViewConfiguration(false, false, dataView);
+ ChartUtils.saveChartConfiguration(false, false, chart);
- ChartUtils.checkRowsViewsTable(1);
+ ChartUtils.checkRowsChartsTable(1);
ChartUtils.goToDashboard();
ChartUtils.createAndEditDashboard(dashboard);
- ChartUtils.addDataViewToDashboard(dataView, true);
+ ChartUtils.addChartToDashboard(chart, true);
ChartUtils.saveDashboardConfiguration();
@@ -52,19 +52,19 @@ describe('Test Deletion of Data View and Dashboard', () => {
ChartUtils.goToDatalake();
- ChartUtils.cancelDeleteDataView(dataView);
+ ChartUtils.cancelDeleteChart(chart);
- ChartUtils.checkRowsViewsTable(1);
+ ChartUtils.checkRowsChartsTable(1);
- ChartUtils.deleteDataView(dataView);
+ ChartUtils.deleteChart(chart);
- ChartUtils.checkRowsViewsTable(0);
+ ChartUtils.checkRowsChartsTable(0);
ChartUtils.goToDashboard();
ChartUtils.editDashboard(dashboard);
- // Validate that data view is removed from dashboard
+ // Validate that chart is removed from dashboard
ChartUtils.getEmptyDashboardInformation().should('be.visible');
ChartUtils.saveDashboardConfiguration();
diff --git a/ui/cypress/tests/chart/dynamicColumnFilter.smoke.spec.ts
b/ui/cypress/tests/chart/dynamicColumnFilter.smoke.spec.ts
index 98f3c71779..a4c373ead7 100644
--- a/ui/cypress/tests/chart/dynamicColumnFilter.smoke.spec.ts
+++ b/ui/cypress/tests/chart/dynamicColumnFilter.smoke.spec.ts
@@ -20,14 +20,14 @@ import { ChartUtils } from
'../../support/utils/chart/ChartUtils';
import { ChartBtns } from '../../support/utils/chart/ChartBtns';
import { ChartWidgetTableUtils } from
'../../support/utils/chart/ChartWidgetTableUtils';
-describe('Dynamic Column Filters in Table Widget', () => {
+describe('Dynamic Column Filters in Table Charts', () => {
beforeEach('Setup Test', () => {
cy.initStreamPipesTest();
ChartUtils.loadDataIntoDataLake('datalake/sample.csv');
});
it('Applies a Top 10 number filter on a numeric column', () => {
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
ChartWidgetTableUtils.checkAmountOfRows(10);
diff --git a/ui/cypress/tests/chart/filterNumericalStringProperties.spec.ts
b/ui/cypress/tests/chart/filterNumericalStringProperties.spec.ts
index fcd5748a23..d6818256c6 100644
--- a/ui/cypress/tests/chart/filterNumericalStringProperties.spec.ts
+++ b/ui/cypress/tests/chart/filterNumericalStringProperties.spec.ts
@@ -41,9 +41,9 @@ describe('Validate that filter works for numerical dimension
property', () => {
it('Perform Test', () => {
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
- // create table widget and select time range
+ // Create table chart and select time range
const startDate = new Date(1737029442000);
const endDate = new Date(1742220659000);
diff --git a/ui/cypress/tests/chart/missingDataInDataLake.spec.ts
b/ui/cypress/tests/chart/missingDataInDataLake.spec.ts
index 1da23cfdff..e2ad482322 100644
--- a/ui/cypress/tests/chart/missingDataInDataLake.spec.ts
+++ b/ui/cypress/tests/chart/missingDataInDataLake.spec.ts
@@ -43,7 +43,7 @@ describe('Test missing properties in data lake', () => {
});
it('Test table with missing properties', () => {
- ChartUtils.addDataViewAndTableWidget(PrepareTestDataUtils.dataName);
+ ChartUtils.createTableChart(PrepareTestDataUtils.dataName);
ChartWidgetTableUtils.checkAmountOfRows(5);
diff --git a/ui/cypress/tests/chart/publicDashboardLink.spec.ts
b/ui/cypress/tests/chart/publicDashboardLink.spec.ts
index a2e506c92e..7d62e7d289 100644
--- a/ui/cypress/tests/chart/publicDashboardLink.spec.ts
+++ b/ui/cypress/tests/chart/publicDashboardLink.spec.ts
@@ -57,12 +57,12 @@ describe('Public dashboard links', () => {
});
function createPublicDashboardWithTableChart(): void {
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
- ChartUtils.saveDataViewConfiguration(false, false, chartName);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
ChartUtils.goToDashboard();
ChartUtils.createAndEditDashboard(dashboardName);
- ChartUtils.addDataViewToDashboard(chartName, true);
+ ChartUtils.addChartToDashboard(chartName, true);
ChartUtils.saveDashboardConfiguration();
PermissionUtils.markElementAsAnonymousPublic(dashboardName);
diff --git a/ui/cypress/tests/chart/timeOrderDataView.spec.ts
b/ui/cypress/tests/chart/timeOrderChart.spec.ts
similarity index 95%
rename from ui/cypress/tests/chart/timeOrderDataView.spec.ts
rename to ui/cypress/tests/chart/timeOrderChart.spec.ts
index 1881d51c4e..a13c8c33f6 100644
--- a/ui/cypress/tests/chart/timeOrderDataView.spec.ts
+++ b/ui/cypress/tests/chart/timeOrderChart.spec.ts
@@ -24,7 +24,7 @@ describe('Test Time Order in Charts', () => {
cy.initStreamPipesTest();
ChartUtils.loadDataIntoDataLake('datalake/sample.csv');
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
});
it('Perform Test with ascending and descending order', () => {
@@ -53,8 +53,8 @@ describe('Test Time Order in Charts', () => {
// Save and leave view, edit view again and check ascending order
ChartUtils.selectAppearanceConfig();
- ChartUtils.saveDataViewConfiguration(false, false, chartName);
- ChartUtils.editDataView(chartName);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
+ ChartUtils.editChart(chartName);
ChartUtils.clickOrderBy('ascending');
ChartUtils.openVisualizationConfig();
ChartUtils.selectVisualizationType(ChartWidget.TABLE);
diff --git a/ui/cypress/tests/chart/timeRangeSelectors.spec.ts
b/ui/cypress/tests/chart/timeRangeSelectors.spec.ts
index e913f180ec..b0b88b8c77 100644
--- a/ui/cypress/tests/chart/timeRangeSelectors.spec.ts
+++ b/ui/cypress/tests/chart/timeRangeSelectors.spec.ts
@@ -51,7 +51,7 @@ describe('Test Time Range Selectors in Charts', () => {
it('Perform Test', () => {
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
periods.forEach(period => {
cy.log('Testing period: ' + period.selector);
diff --git a/ui/cypress/tests/chart/widgetDataConfiguration.smoke.spec.ts
b/ui/cypress/tests/chart/widgetDataConfiguration.smoke.spec.ts
index 81a96ced85..e8cb8e1ef1 100644
--- a/ui/cypress/tests/chart/widgetDataConfiguration.smoke.spec.ts
+++ b/ui/cypress/tests/chart/widgetDataConfiguration.smoke.spec.ts
@@ -30,7 +30,7 @@ describe('Test Table View in Charts', () => {
/**
* Prepare tests
*/
- ChartUtils.addDataViewAndTableWidget(ChartUtils.ADAPTER_NAME);
+ ChartUtils.createTableChart(ChartUtils.ADAPTER_NAME);
// Validate that X lines are available
ChartWidgetTableUtils.checkAmountOfRows(10);
@@ -81,7 +81,7 @@ describe('Test Table View in Charts', () => {
ChartUtils.validateAutoCompleteOptions(['a', 'b', 'c']);
cy.dataCy('design-panel-data-settings-filter-value').type('{esc}');
- ChartUtils.saveAndEditWidget('NewWidget');
+ ChartUtils.saveAndEditChart('NewWidget');
ChartUtils.checkIfFilterIsSet(1);
ChartWidgetTableUtils.checkAmountOfRows(4);
ChartUtils.dataConfigRemoveFilter();
@@ -99,7 +99,7 @@ describe('Test Table View in Charts', () => {
.first({ timeout: 10000 })
.contains('c', { timeout: 10000 });
ChartWidgetTableUtils.checkAmountOfRows(10);
- ChartUtils.saveAndReEditWidget('NewWidget');
+ ChartUtils.saveAndReEditChart('NewWidget');
cy.dataCy('data-explorer-group-by-randomtext')
.find('input')
.should('be.checked');
diff --git a/ui/cypress/tests/connect/editAdapterDataLakeSchemaUpdate.spec.ts
b/ui/cypress/tests/connect/editAdapterDataLakeSchemaUpdate.spec.ts
index 6d0afb1867..2ebf5d07d2 100644
--- a/ui/cypress/tests/connect/editAdapterDataLakeSchemaUpdate.spec.ts
+++ b/ui/cypress/tests/connect/editAdapterDataLakeSchemaUpdate.spec.ts
@@ -132,8 +132,8 @@ describe('Test adapter updates with data lake schema
changes', () => {
}
function addTableChart(measurementName: string) {
- ChartUtils.addDataViewAndTableWidget(measurementName, true);
- ChartUtils.saveDataViewConfiguration(false, false, chartName);
+ ChartUtils.createTableChart(measurementName, true);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
ChartUtils.checkAmount(1);
}
diff --git
a/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
b/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
index 25976d49f0..b1ea22176a 100644
--- a/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
+++ b/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
@@ -106,7 +106,7 @@ describe('Test Edit Adapter and Pipeline', () => {
// Visit dashboard
cy.wait(5000);
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
cy.dataCy('data-explorer-field-selection-panel').should(
'include.text',
diff --git a/ui/cypress/tests/connect/rules/schemaRules.smoke.spec.ts
b/ui/cypress/tests/connect/rules/schemaRules.smoke.spec.ts
index 8a0e52ee8f..b3ea2ce7a2 100644
--- a/ui/cypress/tests/connect/rules/schemaRules.smoke.spec.ts
+++ b/ui/cypress/tests/connect/rules/schemaRules.smoke.spec.ts
@@ -54,7 +54,7 @@ describe('Connect schema rule transformations', () => {
ConnectUtils.finishConfigureFieldsConfiguration();
- ChartUtils.clearMeasurementData('Adapter to test rules').then(() => {
+ ChartUtils.clearDatasetData('Adapter to test rules').then(() => {
ConnectUtils.startAdapter(adapterConfiguration, true);
ConnectUtils.restartAdapter(adapterConfiguration.adapterName);
diff --git a/ui/cypress/tests/connect/rules/valueRules.spec.ts
b/ui/cypress/tests/connect/rules/valueRules.spec.ts
index 1c564ef35b..84a3b79be3 100644
--- a/ui/cypress/tests/connect/rules/valueRules.spec.ts
+++ b/ui/cypress/tests/connect/rules/valueRules.spec.ts
@@ -49,7 +49,7 @@ describe('Connect value rule transformations', () => {
ConnectEventSchemaUtils.markPropertyAsTimestamp('timestamp');
ConnectUtils.finishConfigureFieldsConfiguration();
- ChartUtils.clearMeasurementData('Adapter to test rules').then(() => {
+ ChartUtils.clearDatasetData('Adapter to test rules').then(() => {
ConnectUtils.tearDownPreprocessingRuleTest(
adapterConfiguration,
'cypress/fixtures/connect/valueRules/expected.csv',
diff --git
a/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
b/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
index e259c702e2..221cb4a808 100644
--- a/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
+++ b/ui/cypress/tests/dataDownloadDialog/dataDownloadDialogTest.smoke.spec.ts
@@ -29,8 +29,8 @@ describe('Test chart data download dialog', () => {
'json_array',
);
- ChartUtils.addDataViewAndTableWidget(PrepareTestDataUtils.dataName);
- ChartUtils.saveDataViewConfiguration(false, false, dataViewName);
+ ChartUtils.createTableChart(PrepareTestDataUtils.dataName);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
});
beforeEach('Setup Test', () => {
@@ -38,7 +38,7 @@ describe('Test chart data download dialog', () => {
cy.login();
});
- const dataViewName = 'NewWidget';
+ const chartName = 'NewChart';
const formatTestsExportConfig: ExportConfig = {
formatExportConfig: undefined,
@@ -60,7 +60,7 @@ describe('Test chart data download dialog', () => {
DataDownloadDialogUtils.testDownload(
formatTestsExportConfig,
resultFile,
- dataViewName,
+ chartName,
);
});
@@ -75,7 +75,7 @@ describe('Test chart data download dialog', () => {
DataDownloadDialogUtils.testDownload(
formatTestsExportConfig,
resultFile,
- dataViewName,
+ chartName,
);
});
@@ -88,7 +88,7 @@ describe('Test chart data download dialog', () => {
DataDownloadDialogUtils.testDownload(
formatTestsExportConfig,
resultFile,
- dataViewName,
+ chartName,
);
});
@@ -105,7 +105,7 @@ describe('Test chart data download dialog', () => {
DataDownloadDialogUtils.testDownload(
formatTestsExportConfig,
resultFile,
- dataViewName,
+ chartName,
);
});
});
diff --git a/ui/cypress/tests/pipeline/pipelineDataLakeSchemaUpdate.spec.ts
b/ui/cypress/tests/pipeline/pipelineDataLakeSchemaUpdate.spec.ts
index a2b324ad4b..093ef80fe4 100644
--- a/ui/cypress/tests/pipeline/pipelineDataLakeSchemaUpdate.spec.ts
+++ b/ui/cypress/tests/pipeline/pipelineDataLakeSchemaUpdate.spec.ts
@@ -169,8 +169,8 @@ describe('Test pipeline updates with data lake schema
changes', () => {
}
function addTableChart(measurementName: string) {
- ChartUtils.addDataViewAndTableWidget(measurementName, true);
- ChartUtils.saveDataViewConfiguration(false, false, chartName);
+ ChartUtils.createTableChart(measurementName, true);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
ChartUtils.checkAmount(1);
}
diff --git a/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
b/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
index 78e7be9a02..e893aad840 100644
--- a/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
+++ b/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
@@ -108,7 +108,7 @@ describe('Test that resources can be added to assets on
creation', () => {
UserUtils.switchUser(newUser);
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
ChartBtns.chartAssetCheckboxBtn().should('exist');
@@ -117,7 +117,7 @@ describe('Test that resources can be added to assets on
creation', () => {
UserUtils.switchUser(newUser);
ChartUtils.goToDatalake();
- ChartUtils.createAndEditDataView();
+ ChartUtils.createAndEditChart();
ChartBtns.chartAssetCheckboxBtn().should('not.exist');
});
diff --git a/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
index b8f1dc8796..4455e17f22 100644
--- a/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
@@ -118,8 +118,8 @@ describe('Test User Roles for Charts', () => {
function setup() {
UserUtils.switchUser(chartAdmin1);
ConnectUtils.addMachineDataSimulator('simulator', true);
- ChartUtils.addDataViewAndTableWidget('simulator', true);
- ChartUtils.saveDataViewConfiguration(false, false, chartName);
+ ChartUtils.createTableChart('simulator', true);
+ ChartUtils.saveChartConfiguration(false, false, chartName);
ChartUtils.checkAmount(1);
ChartUtils.goToDatalake();
}
diff --git a/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
index 899f503449..714852ba70 100644
--- a/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
@@ -137,8 +137,8 @@ describe('Test User Roles for Dashboards', () => {
ChartUtils.createNewDashboard(dashboardName);
ChartUtils.editDashboard(dashboardName);
- ChartUtils.addDataViewToDashboard('chart1', true);
- ChartUtils.addDataViewToDashboard('chart2', true);
+ ChartUtils.addChartToDashboard('chart1', true);
+ ChartUtils.addChartToDashboard('chart2', true);
ChartUtils.saveDashboard();
PermissionUtils.markElementAsPublic(dashboardName);
@@ -148,19 +148,19 @@ describe('Test User Roles for Dashboards', () => {
ChartUtils.viewDashboard(dashboardName);
ChartBtns.moreOptionsBtn('chart1').should('exist');
ChartBtns.moreOptionsBtn('chart2').should('exist');
- ChartBtns.removeWidgetBtn('chart1').should('not.exist');
- ChartBtns.removeWidgetBtn('chart2').should('not.exist');
+ ChartBtns.removeChartBtn('chart1').should('not.exist');
+ ChartBtns.removeChartBtn('chart2').should('not.exist');
ChartUtils.goToDashboard();
ChartUtils.editDashboard(dashboardName);
ChartBtns.moreOptionsBtn('chart1').should('exist');
ChartBtns.moreOptionsBtn('chart2').should('exist');
- ChartBtns.removeWidgetBtn('chart1').should('exist');
- ChartBtns.removeWidgetBtn('chart2').should('exist');
+ ChartBtns.removeChartBtn('chart1').should('exist');
+ ChartBtns.removeChartBtn('chart2').should('exist');
// Validate to add new widget to dashboard
ChartBtns.createChartBtn().should('not.exist');
- ChartBtns.removeWidgetBtn('chart2').click();
+ ChartBtns.removeChartBtn('chart2').click();
ChartUtils.saveDashboard();
UserUtils.switchUser(dashboardUser1);
@@ -200,7 +200,7 @@ describe('Test User Roles for Dashboards', () => {
}
function addChart(chartName: string, saveConfig: boolean = true) {
- ChartUtils.addDataViewAndTableWidget(datasetName, true);
- ChartUtils.saveDataViewConfiguration(false, saveConfig, chartName);
+ ChartUtils.createTableChart(datasetName, true);
+ ChartUtils.saveChartConfiguration(false, saveConfig, chartName);
}
});
diff --git a/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
index 25819aa64f..3a7e924e65 100644
--- a/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
@@ -111,7 +111,7 @@ describe('Test Dataset Permissions', () => {
GeneralUtils.openMenuForRow('test');
- ChartBtns.viewWidget('test').click();
+ ChartBtns.viewChart('test').click();
assertAlertBanner(true);
@@ -125,7 +125,7 @@ describe('Test Dataset Permissions', () => {
GeneralUtils.openMenuForRow('test');
- ChartBtns.viewWidget('test').click();
+ ChartBtns.viewChart('test').click();
assertAlertBanner(false);
});
@@ -167,15 +167,15 @@ describe('Test Dataset Permissions', () => {
function assertDatasetAvailabilityInCharts(available: boolean) {
ChartUtils.goToDatalake();
- ChartBtns.openNewDataViewBtn().click();
+ ChartBtns.openNewChartBtn().click();
if (!available) {
cy.get('sp-alert-banner').should('be.visible');
- ChartBtns.discardDataExplorerWidgetBtn().click();
+ ChartBtns.discardChartBtn().click();
} else {
ChartUtils.selectDataSet(datasetName);
- ChartBtns.discardDataExplorerWidgetBtn().click();
- ChartUtils.addDataViewAndTableWidget(datasetName, true);
- ChartUtils.saveDataViewConfiguration(false, false, 'test');
+ ChartBtns.discardChartBtn().click();
+ ChartUtils.createTableChart(datasetName, true);
+ ChartUtils.saveChartConfiguration(false, false, 'test');
}
}
@@ -193,7 +193,7 @@ describe('Test Dataset Permissions', () => {
ChartUtils.goToDashboard();
ChartUtils.createNewDashboard(name);
ChartUtils.editDashboard(name);
- ChartUtils.addDataViewToDashboard('test', true);
+ ChartUtils.addChartToDashboard('test', true);
}
function assertDatasetIsVisibleAndEditableCanChangePermissions(user: User)
{
UserUtils.switchUser(user);
diff --git
a/ui/src/app/chart-shared/components/charts/map/config/map-widget-config.component.html
b/ui/src/app/chart-shared/components/charts/map/config/map-widget-config.component.html
index 12a71635b5..e3ce7fc28a 100644
---
a/ui/src/app/chart-shared/components/charts/map/config/map-widget-config.component.html
+++
b/ui/src/app/chart-shared/components/charts/map/config/map-widget-config.component.html
@@ -34,7 +34,7 @@
(changeSelectedProperty)="
setSelectedLatitudeProperty($event)
"
- data-cy="data-view-map-select-latitude"
+ data-cy="chart-map-select-latitude"
>
</sp-select-single-property-config>
</sp-form-field>
@@ -49,7 +49,7 @@
(changeSelectedProperty)="
setSelectedLongitudeProperty($event)
"
- data-cy="data-view-map-select-longitude"
+ data-cy="chart-map-select-longitude"
>
</sp-select-single-property-config>
</sp-form-field>
@@ -85,16 +85,16 @@
.selectedMarkerOrTrace
"
(selectionChange)="triggerViewRefresh()"
- data-cy="data-view-map-select-marker-or-trace"
+ data-cy="chart-map-select-marker-or-trace"
>
<mat-option
[value]="'marker'"
- data-cy="data-view-map-option-marker"
+ data-cy="chart-map-option-marker"
>{{ 'Marker' | translate }}</mat-option
>
<mat-option
[value]="'trace'"
- data-cy="data-view-map-option-trace"
+ data-cy="chart-map-option-trace"
>{{ 'Trace' | translate }}</mat-option
>
</mat-select>
diff --git
a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.html
b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.html
index 48adec8070..0df252e181 100644
---
a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.html
+++
b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.html
@@ -71,7 +71,7 @@
</th>
<td
mat-cell
- data-cy="data-views-table-overview"
+ data-cy="charts-table-overview"
*matCellDef="let element"
>
<div
diff --git
a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts
b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts
index 28d2659fda..3fcc7a1a78 100644
---
a/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts
+++
b/ui/src/app/chart/components/chart-overview/chart-overview-table/chart-overview-table.component.ts
@@ -383,10 +383,10 @@ export class ChartOverviewTableComponent implements
OnInit, OnDestroy {
showLegacyWarning: !!chart.multiSourceChart,
showRequiresAttentionWarning:
chart.healthStatus === 'REQUIRES_ATTENTION',
- showDataCyId: `show-data-view-${sanitizedName}`,
- editDataCyId: `edit-data-view-${sanitizedName}`,
+ showDataCyId: `show-chart-${sanitizedName}`,
+ editDataCyId: `edit-chart-${sanitizedName}`,
manageDataCyId: `open-manage-permissions-${sanitizedName}`,
- deleteDataCyId: `delete-data-view-${chart.name}`,
+ deleteDataCyId: `delete-chart-${chart.name}`,
};
}
}
diff --git
a/ui/src/app/chart/components/chart-overview/chart-overview.component.html
b/ui/src/app/chart/components/chart-overview/chart-overview.component.html
index 299e3ce368..ade29f4527 100644
--- a/ui/src/app/chart/components/chart-overview/chart-overview.component.html
+++ b/ui/src/app/chart/components/chart-overview/chart-overview.component.html
@@ -29,7 +29,7 @@
mat-button
mat-flat-button
color="accent"
- data-cy="open-new-data-view"
+ data-cy="open-new-chart"
(click)="createNewChart()"
class="mr-10"
>
diff --git
a/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.html
b/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.html
index 7835c290b2..768b16a624 100644
---
a/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.html
+++
b/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.html
@@ -31,7 +31,7 @@
[matTooltip]="(createMode ? 'Create' : 'Save') | translate"
class="edit-menu-btn"
(click)="saveDataViewEmitter.emit()"
- data-cy="save-data-view-btn"
+ data-cy="save-chart-btn"
>
<mat-icon>save</mat-icon>
{{ (createMode ? 'Create' : 'Save') | translate }}
diff --git
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
index dc3bd91733..e191fb94dc 100644
---
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
+++
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
@@ -188,7 +188,7 @@ export class ChartSelectionComponent implements OnInit {
chart,
widgetTypeLabel,
widgetTypeIcon: template?.icon ?? 'insert_chart',
- dataCyId: `add-data-view-btn-${chart.name.replaceAll(' ', '')}`,
+ dataCyId: `add-chart-btn-${chart.name.replaceAll(' ', '')}`,
searchText: [
chart.name,
chart.datasetName,
diff --git
a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
index ff43ce6e24..43f8ca7fee 100644
---
a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
+++
b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.html
@@ -204,7 +204,7 @@
mat-flat-button
class="mat-basic mr-10"
(click)="onCancel()"
- data-cy="close-data-view"
+ data-cy="close-dashboard"
>
{{ 'Close' | translate }}
</button>
