Moved Add Assets for Charts from PopUp during Save to Button in Edit Mode (apache#3853)

Co-authored-by: Philipp Zehnder <tenthe@users.noreply.github.com>
Co-authored-by: Dominik Riemer <dominik.riemer@gmail.com>

Author: 3 people

ui/cypress/support/utils/connect/ConnectBtns.ts

@@ -31,7 +31,7 @@ export class ConnectBtns {
     }
 
     public static editAdapter() {
-        return cy.dataCy('edit-adapter');
+        return cy.dataCy('edit-adapter', { timeout: 10000 });
     }
 
     public static stopAdapter() {

ui/cypress/support/utils/dataExplorer/DataExplorerBtns.ts

@@ -18,7 +18,7 @@
 
 import { GeneralUtils } from '../GeneralUtils';
 
-export class DataLakeBtns {
+export class DataExplorerBtns {
     public static refreshDataLakeMeasures() {
         return cy.dataCy('refresh-data-lake-measures');
     }
@@ -30,7 +30,21 @@ export class DataLakeBtns {
     public static saveDashboard() {
         return cy.dataCy('save-data-view').click();
     }
+    public static saveChartsToAssetBtn() {
+        return cy
+            .dataCy('add-to-Asset-data-view-btn', { timeout: 10000 })
+            .should('exist')
+            .click();
+    }
 
+    public static chartAssetCheckboxBtn() {
+        return cy.dataCy('sp-show-chart-asset-checkbox');
+    }
+    public static confirmAssetSelectionBtn() {
+        return cy
+            .dataCy('asset-dialog-confirm-delete', { timeout: 10000 })
+            .click();
+    }
     public static editDataViewButton(widgetName: string) {
         GeneralUtils.openMenuForRow(widgetName);
         return cy

ui/cypress/support/utils/dataExplorer/DataExplorerUtils.ts

@@ -26,6 +26,7 @@ import { ConnectBtns } from '../connect/ConnectBtns';
 import { AdapterBuilder } from '../../builder/AdapterBuilder';
 import { differenceInMonths } from 'date-fns';
 import { GeneralUtils } from '../GeneralUtils';
+import { DataExplorerBtns } from './DataExplorerBtns';
 
 export class DataExplorerUtils {
     public static goToDatalake() {
@@ -125,7 +126,6 @@ export class DataExplorerUtils {
 
         cy.get('mat-tree.asset-tree', { timeout: 10000 }).should('exist');
         assetNameList.forEach(assetName => {
-            console.log(assetName);
             cy.get('mat-tree.asset-tree')
                 .find('.mat-tree-node')
                 .contains(assetName)
@@ -254,15 +254,6 @@ export class DataExplorerUtils {
         cy.dataCy('save-data-view-btn', { timeout: 10000 }).click({
             force: true,
         });
-        cy.dataCy('asset-dialog-cancel-delete', { timeout: 10000 }).click({
-            force: true,
-        });
-    }
-
-    public static saveToAddAssets() {
-        cy.dataCy('save-data-view-btn', { timeout: 10000 }).click({
-            force: true,
-        });
     }
 
     public static saveDashboardConfiguration() {
@@ -273,6 +264,18 @@ export class DataExplorerUtils {
         return cy.dataCy('empty-dashboard');
     }
 
+    public static addChartsToAsset(assetNameList = []) {
+        DataExplorerBtns.saveChartsToAssetBtn();
+
+        cy.dataCy('sp-show-chart-asset-checkbox').then($checkbox => {
+            if (!$checkbox.is(':checked')) {
+                cy.wrap($checkbox).click({ force: true });
+            }
+        });
+        this.addToAsset(assetNameList);
+        DataExplorerBtns.confirmAssetSelectionBtn();
+    }
+
     public static addToAsset(assetNameList = []) {
         cy.get('mat-tree.asset-tree', { timeout: 10000 }).should('exist');
 
@@ -284,12 +287,6 @@ export class DataExplorerUtils {
         });
     }
 
-    public static saveAssetLinkFromChart() {
-        cy.dataCy('asset-dialog-confirm-delete', { timeout: 10000 }).click({
-            force: true,
-        });
-    }
-
     public static deleteDashboard(dashboardName: string) {
         GeneralUtils.openMenuForRow(dashboardName);
         cy.dataCy('delete-dashboard-' + dashboardName, {
@@ -663,8 +660,9 @@ export class DataExplorerUtils {
         // Create Diagram
         DataExplorerUtils.addDataViewAndTableWidget('NewWidget', 'Persist');
         //Save
-        DataExplorerUtils.saveToAddAssets();
-        DataExplorerUtils.addToAsset(assetNames);
-        DataExplorerUtils.saveAssetLinkFromChart();
+        DataExplorerUtils.addChartsToAsset(assetNames);
+        DataExplorerUtils.saveDataViewConfiguration();
+        //Necessary for the background task to finish otherwise it steps back to charts from the following task
+        cy.wait(500);
     }
 }

ui/cypress/tests/connect/editAdapter.smoke.spec.ts

@@ -21,7 +21,7 @@ import { ConnectBtns } from '../../support/utils/connect/ConnectBtns';
 import { AdapterBuilder } from '../../support/builder/AdapterBuilder';
 import { ConnectEventSchemaUtils } from '../../support/utils/connect/ConnectEventSchemaUtils';
 import { DataExplorerUtils } from '../../support/utils/dataExplorer/DataExplorerUtils';
-import { DataLakeBtns } from '../../support/utils/dataExplorer/DataExplorerBtns';
+import { DataExplorerBtns } from '../../support/utils/dataExplorer/DataExplorerBtns';
 
 describe('Test Edit Adapter', () => {
     beforeEach('Setup Test', () => {
@@ -110,7 +110,7 @@ describe('Test Edit Adapter', () => {
 
         cy.wait(3000);
 
-        DataLakeBtns.refreshDataLakeMeasures().click();
+        DataExplorerBtns.refreshDataLakeMeasures().click();
 
         DataExplorerUtils.waitForCountingResults();
 

ui/cypress/tests/dataExplorer/addAssetsToDataView.smoke.spec.ts

@@ -34,13 +34,17 @@ describe('Creates a new adapter with a linked asset', () => {
 
     it('Add Assets during Chart generation', () => {
         DataExplorerUtils.createDataViewWithAssets([assetName1, assetName2]);
+        AssetUtils.goToAssets();
+        AssetUtils.checkAmountOfAssets(3);
         //Test
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName1, 1);
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName2, 1);
     });
 
     it('Edit Assets during Chart generation', () => {
         DataExplorerUtils.createDataViewWithAssets([assetName1, assetName2]);
+        AssetUtils.goToAssets();
+        AssetUtils.checkAmountOfAssets(3);
         //Test
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName1, 1);
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName2, 1);
@@ -49,11 +53,13 @@ describe('Creates a new adapter with a linked asset', () => {
         DataExplorerUtils.goToDatalake();
         DataExplorerUtils.editDataView('NewWidget');
         DataExplorerUtils.renameWidget('Rename');
+        DataExplorerUtils.addChartsToAsset([assetName1, assetName3]);
+        DataExplorerUtils.saveDataViewConfiguration();
+        //Neceassary for Background Task to finish
+        cy.wait(500);
 
-        DataExplorerUtils.saveToAddAssets();
-        DataExplorerUtils.addToAsset([assetName1, assetName3]);
-        DataExplorerUtils.saveAssetLinkFromChart();
-
+        AssetUtils.goToAssets();
+        AssetUtils.checkAmountOfAssets(3);
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName2, 1);
         AssetUtils.checkAmountOfLinkedResourcesByAssetName(assetName3, 1);
         AssetUtils.checkResourceNamingByAssetName(assetName2, 'Rename');

ui/cypress/tests/dataExplorer/dataViewAssets.spec.ts

@@ -17,7 +17,7 @@
  */
 
 import { DataExplorerUtils } from '../../support/utils/dataExplorer/DataExplorerUtils';
-import { DataLakeBtns } from '../../support/utils/dataExplorer/DataExplorerBtns';
+import { DataExplorerBtns } from '../../support/utils/dataExplorer/DataExplorerBtns';
 import { DataExplorerWidget } from '../../support/model/DataExplorerWidget';
 
 describe('Test Time Order in Data Explorer', () => {
@@ -53,7 +53,7 @@ describe('Test Time Order in Data Explorer', () => {
 
         // Save and leave view, edit view again and check ascending order
         DataExplorerUtils.saveDataViewConfiguration();
-        DataLakeBtns.editDataViewButton('New chart');
+        DataExplorerBtns.editDataViewButton('New chart');
         DataExplorerUtils.clickOrderBy('ascending');
         DataExplorerUtils.openVisualizationConfig();
         DataExplorerUtils.selectVisualizationType(DataExplorerWidget.TABLE);

ui/cypress/tests/dataExplorer/timeOrderDataView.spec.ts

@@ -32,7 +32,7 @@
   "Stop pipeline": "Pipeline stoppen",
   "Name": "Name",
   "Last modified": "Zuletzt geändert",
-  "Show": "anzeigen",
+  "Show": "Anzeigen",
   "Edit": "Bearbeiten",
   "Manage permissions": "Berechtigungen verwalten",
   "Delete": "Löschen",

ui/deployment/i18n/de.json

@@ -298,7 +298,7 @@ export class AdapterStartedDialog implements OnInit {
 
             await this.saveAssets(linkageData);
 
-            this.setSuccessMessage(linkageData);
+            this.setSuccessMessage();
         } catch (err) {
             console.error('Error in addToAsset:', err);
         }
@@ -359,33 +359,15 @@ export class AdapterStartedDialog implements OnInit {
         );
     }
 
-    private setSuccessMessage(linkageData: LinkageData[]): void {
-        const assetTypesList = this.formatWithAnd(
-            linkageData.map(data => data.type),
-        );
+    private setSuccessMessage(): void {
         if (this.selectedAssets.length > 0) {
-            const assetIdsList = this.formatWithAnd(
-                this.selectedAssets.map(asset => asset.assetName),
-            );
-
             this.addToAssetText = this.translateService.instant(
-                'Your {{assetTypes}} were successfully added to {{assetIds}}.',
-                {
-                    assetTypes: assetTypesList,
-                    assetIds: assetIdsList,
-                },
+                'Your Assets were successfully added.',
             );
         }
         if (this.deselectedAssets && this.deselectedAssets.length > 0) {
-            const assetIdsRemovedList = this.formatWithAnd(
-                this.deselectedAssets.map(asset => asset.assetName),
-            );
             this.deletedFromAssetText = this.translateService.instant(
-                'Your {{assetTypes}} were successfully deleted from {{assetIds}}.',
-                {
-                    assetTypes: assetTypesList,
-                    assetIds: assetIdsRemovedList,
-                },
+                'Your Assets were successfully deleted.',
             );
         }
     }

ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts

@@ -36,6 +36,7 @@
             (updateDateRangeEmitter)="updateDateRange($event)"
             (saveDataViewEmitter)="saveDataView()"
             (discardDataViewEmitter)="discardChanges()"
+            (addToAssetEmitter)="addAssetDialog()"
             fxFlex="100"
         >
         </sp-data-explorer-data-view-toolbar>