[Sample data] replace legacy control visualizations with dashboard co…

…ntrols (#141824) * [Sample data] replace legacy control visualizations with dashboard controls * i18n wrappings for title and description * update screen shots * fix functional tests * update functional test expects * more functional test expect updates Co-authored-by: Kibana Machine <[email protected]>
elastic · Oct 4, 2022 · 999bc84 · 999bc84
1 parent aa12bea
commit 999bc84
Show file tree

Hide file tree

Showing 18 changed files with 214 additions and 204 deletions.
diff --git a/src/plugins/home/public/assets/sample_data_resources/ecommerce/dashboard.webp b/src/plugins/home/public/assets/sample_data_resources/ecommerce/dashboard.webp
diff --git a/src/plugins/home/public/assets/sample_data_resources/ecommerce/dashboard_dark.webp b/src/plugins/home/public/assets/sample_data_resources/ecommerce/dashboard_dark.webp
diff --git a/src/plugins/home/public/assets/sample_data_resources/flights/dashboard.webp b/src/plugins/home/public/assets/sample_data_resources/flights/dashboard.webp
diff --git a/src/plugins/home/public/assets/sample_data_resources/flights/dashboard_dark.webp b/src/plugins/home/public/assets/sample_data_resources/flights/dashboard_dark.webp
diff --git a/src/plugins/home/public/assets/sample_data_resources/logs/dashboard.webp b/src/plugins/home/public/assets/sample_data_resources/logs/dashboard.webp
diff --git a/src/plugins/home/public/assets/sample_data_resources/logs/dashboard_dark.webp b/src/plugins/home/public/assets/sample_data_resources/logs/dashboard_dark.webp
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
diff --git a/test/analytics/tests/instrumented_events/from_the_browser/loaded_dashboard.ts b/test/analytics/tests/instrumented_events/from_the_browser/loaded_dashboard.ts
@@ -200,7 +200,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         );
 
         expect(event.properties.key2).to.be('num_of_panels');
-        expect(event.properties.value2).to.be(17);
+        expect(event.properties.value2).to.be(16);
       });
 
       /**

diff --git a/test/functional/apps/home/_sample_data.ts b/test/functional/apps/home/_sample_data.ts
@@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const panelCount = await PageObjects.dashboard.getPanelCount();
-        expect(panelCount).to.be(17);
+        expect(panelCount).to.be(16);
       });
 
       it('should render visualizations', async () => {
@@ -107,7 +107,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         log.debug('Checking saved searches rendered');
         await dashboardExpect.savedSearchRowCount(10);
         log.debug('Checking input controls rendered');
-        await dashboardExpect.inputControlItemCount(3);
+        await dashboardExpect.controlCount(3);
         log.debug('Checking tag cloud rendered');
         await dashboardExpect.tagCloudWithValuesFound(['Sunny', 'Rain', 'Clear', 'Cloudy', 'Hail']);
         log.debug('Checking vega chart rendered');
@@ -119,15 +119,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const panelCount = await PageObjects.dashboard.getPanelCount();
-        expect(panelCount).to.be(13);
+        expect(panelCount).to.be(12);
       });
 
       it('should launch sample ecommerce data set dashboard', async () => {
         await PageObjects.home.launchSampleDashboard('ecommerce');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const panelCount = await PageObjects.dashboard.getPanelCount();
-        expect(panelCount).to.be(15);
+        expect(panelCount).to.be(14);
       });
     });
 

diff --git a/test/functional/services/dashboard/expectations.ts b/test/functional/services/dashboard/expectations.ts
@@ -281,6 +281,7 @@ export class DashboardExpectService extends FtrService {
     });
   }
 
+  // legacy controls visualization
   async inputControlItemCount(expectedCount: number) {
     this.log.debug(`DashboardExpect.inputControlItemCount(${expectedCount})`);
     await this.retry.try(async () => {
@@ -289,6 +290,14 @@ export class DashboardExpectService extends FtrService {
     });
   }
 
+  async controlCount(expectedCount: number) {
+    this.log.debug(`DashboardExpect.controlCount(${expectedCount})`);
+    await this.retry.try(async () => {
+      const controls = await this.testSubjects.findAll('control-frame');
+      expect(controls.length).to.be(expectedCount);
+    });
+  }
+
   async lineChartPointsCount(expectedCount: number) {
     this.log.debug(`DashboardExpect.lineChartPointsCount(${expectedCount})`);
     await this.retry.try(async () => {

diff --git a/x-pack/performance/journeys/ecommerce_dashboard.ts b/x-pack/performance/journeys/ecommerce_dashboard.ts
@@ -52,5 +52,5 @@ export const journey = new Journey({
     await page.click(subj('launchSampleDataSetecommerce'));
     await page.click(subj('viewSampleDataSetecommerce-dashboard'));
 
-    await waitForVisualizations(page, 13);
+    await waitForVisualizations(page, 12);
   });
diff --git a/x-pack/performance/journeys/flight_dashboard.ts b/x-pack/performance/journeys/flight_dashboard.ts
@@ -52,7 +52,7 @@ export const journey = new Journey({
     await page.click(subj('launchSampleDataSetflights'));
     await page.click(subj('viewSampleDataSetflights-dashboard'));
 
-    await waitForVisualizations(page, 15);
+    await waitForVisualizations(page, 14);
   })
 
   .step('Go to Airport Connections Visualizations Edit', async ({ page }) => {

diff --git a/x-pack/performance/journeys/web_logs_dashboard.ts b/x-pack/performance/journeys/web_logs_dashboard.ts
@@ -52,5 +52,5 @@ export const journey = new Journey({
     await page.click(subj('launchSampleDataSetlogs'));
     await page.click(subj('viewSampleDataSetlogs-dashboard'));
 
-    await waitForVisualizations(page, 12);
+    await waitForVisualizations(page, 11);
   });
diff --git a/x-pack/test/functional/apps/dashboard/group2/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/group2/_async_dashboard.ts
@@ -179,7 +179,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       log.debug('Checking saved searches rendered');
       await dashboardExpect.savedSearchRowCount(10);
       log.debug('Checking input controls rendered');
-      await dashboardExpect.inputControlItemCount(3);
+      await dashboardExpect.controlCount(3);
       log.debug('Checking tag cloud rendered');
       await dashboardExpect.tagCloudWithValuesFound(['Sunny', 'Rain', 'Clear', 'Cloudy', 'Hail']);
       log.debug('Checking vega chart rendered');

diff --git a/...ssions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts b/...ssions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts
@@ -91,7 +91,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     log.debug('Checking saved searches rendered');
     await dashboardExpect.savedSearchRowCount(11);
     log.debug('Checking input controls rendered');
-    await dashboardExpect.inputControlItemCount(3);
+    await dashboardExpect.controlCount(3);
     log.debug('Checking tag cloud rendered');
     await dashboardExpect.tagCloudWithValuesFound(['Sunny', 'Rain', 'Clear', 'Cloudy', 'Hail']);
     log.debug('Checking vega chart rendered');

diff --git a/x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts b/x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts
@@ -58,7 +58,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           log.debug('Checking saved searches rendered');
           await dashboardExpect.savedSearchRowCount(49);
           log.debug('Checking input controls rendered');
-          await dashboardExpect.inputControlItemCount(3);
+          await dashboardExpect.controlCount(3);
           log.debug('Checking tag cloud rendered');
           await dashboardExpect.tagCloudWithValuesFound([
             'Sunny',
-Original file line number
+Diff line change
@@ Expand Up @@
             );
             expect(event.properties.key2).to.be('num_of_panels');
-            expect(event.properties.value2).to.be(17);
+            expect(event.properties.value2).to.be(16);
           });
           /**
@@ Expand Down @@