Show flattened columns as extra columns in UI (#12524)

* Show each dimension as seperate column in html tables for flattened reports

* set default columns

* rename first dimension column for flattened reports to label

* modify rows right before rendering to prevent plugins to overwrite the displayed columns again

* Use datatable config to allow splitting dimensions into separate columns

* Hide datatable option if report has only one dimension

* ensure to add only needed metric dimensions

* adds ui test

* reorder datatable options

* Add additional columns before generic filters are applied to make sorting of those columns possible

* Improve table layout with multipe label columns

* show logo only in first column

* Add new metadata so the original combine label is still available for row actions

* improve check for multiple lables

* show row action always in last label column

* updates UI file

* fix Others handling for flattened reports

* ensure label translation is set correctly

* show concatenated dimension names as flatten report label

* search combined labels in flattened tables showing dimensions separately

* more ui tests

* fix handling of summary row for concatenated dimensions

* updates expected test files

* fix insights layout

* fix realtime visits table layout

* fix ui tests

* ensure dimensions have correct display order

24 files changed, 85 insertions, 9 deletions

diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
index 1a106c0617..e7341eb56b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
@@ -10,6 +10,7 @@
 		<min_bandwidth />
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
+		<is_summary>1</is_summary>
 		<Actions_DownloadUrl>Others</Actions_DownloadUrl>
 	</row>
 	<row>
@@ -23,6 +24,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_DownloadUrl>cloudsite5.com/ - Others</Actions_DownloadUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>cloudsite6.com/ - Others</label>
@@ -35,6 +37,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_DownloadUrl>cloudsite6.com/ - Others</Actions_DownloadUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>cloudsite7.com/ - Others</label>
@@ -47,6 +50,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_DownloadUrl>cloudsite7.com/ - Others</Actions_DownloadUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>cloudsite5.com/20/download</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
index a063a4311e..60f4e267b7 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
@@ -10,6 +10,7 @@
 		<min_bandwidth />
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
+		<is_summary>1</is_summary>
 		<Actions_ClickedUrl>Others</Actions_ClickedUrl>
 	</row>
 	<row>
@@ -23,6 +24,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_ClickedUrl>othersite10.com/ - Others</Actions_ClickedUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>othersite11.com/ - Others</label>
@@ -35,6 +37,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_ClickedUrl>othersite11.com/ - Others</Actions_ClickedUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>othersite12.com/ - Others</label>
@@ -47,6 +50,7 @@
 		<max_bandwidth />
 		<avg_bandwidth>0</avg_bandwidth>
 		<Actions_ClickedUrl>othersite12.com/ - Others</Actions_ClickedUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>othersite10.com/</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
index 4babbcd1e6..668bde9856 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
@@ -18,6 +18,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<is_summary>1</is_summary>
 		<Actions_PageTitle>Others</Actions_PageTitle>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
index 43565baee5..fb7fa5ba08 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
@@ -19,6 +19,7 @@
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252F-1</segment>
+		<is_summary>1</is_summary>
 		<Actions_PageUrl>Others</Actions_PageUrl>
 	</row>
 	<row>
@@ -41,6 +42,7 @@
 		<exit_rate>100%</exit_rate>
 		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252F0</segment>
 		<Actions_PageUrl>/0/ - Others</Actions_PageUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>/1/ - Others</label>
@@ -62,6 +64,7 @@
 		<exit_rate>100%</exit_rate>
 		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252F1</segment>
 		<Actions_PageUrl>/1/ - Others</Actions_PageUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>/2/ - Others</label>
@@ -83,6 +86,7 @@
 		<exit_rate>100%</exit_rate>
 		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252F2</segment>
 		<Actions_PageUrl>/2/ - Others</Actions_PageUrl>
+		<is_summary>1</is_summary>
 	</row>
 	<row>
 		<label>/0/</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml
index affe4b3dba..794dc442aa 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml
@@ -15,6 +15,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<is_summary>1</is_summary>
 		<Actions_Keyword>Others</Actions_Keyword>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
index 19dd3ebfa5..57b60302f4 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
@@ -3,6 +3,7 @@
 	<row>
 		<label>Others</label>
 		<nb_actions>60</nb_actions>
+		<is_summary>1</is_summary>
 		<CustomVariables_CustomVariableName>Others</CustomVariables_CustomVariableName>
 	</row>
 	<row>
@@ -16,6 +17,7 @@
 			</row>
 		</slots>
 		<CustomVariables_CustomVariableName>name</CustomVariables_CustomVariableName>
+		<is_summary>1</is_summary>
 		<CustomVariables_CustomVariableValue>Others</CustomVariables_CustomVariableValue>
 	</row>
 	<row>
@@ -42,6 +44,7 @@
 			</row>
 		</slots>
 		<CustomVariables_CustomVariableName>liked</CustomVariables_CustomVariableName>
+		<is_summary>1</is_summary>
 		<CustomVariables_CustomVariableValue>Others</CustomVariables_CustomVariableValue>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
index 4462b4428e..188899636a 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
@@ -11,6 +11,7 @@
 		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
+		<is_summary>1</is_summary>
 		<DevicesDetection_BrowserVersion>Others</DevicesDetection_BrowserVersion>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
index a356234a08..9980a0f955 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
@@ -11,6 +11,7 @@
 		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/os/UNK.png</logo>
+		<is_summary>1</is_summary>
 		<DevicesDetection_OsVersion>Others</DevicesDetection_OsVersion>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsCategory_day.xml
index 56b828aa22..6b91011da3 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsCategory_day.xml
@@ -8,6 +8,7 @@
 		<avg_price>30</avg_price>
 		<avg_quantity>0</avg_quantity>
 		<conversion_rate>0%</conversion_rate>
+		<is_summary>1</is_summary>
 		<Ecommerce_ProductCategory>Others</Ecommerce_ProductCategory>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsName_day.xml
index b5340e2da6..3f35409fb0 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Goals.getItemsName_day.xml
@@ -8,6 +8,7 @@
 		<avg_price>180</avg_price>
 		<avg_quantity>0</avg_quantity>
 		<conversion_rate>0%</conversion_rate>
+		<is_summary>1</is_summary>
 		<Ecommerce_ProductName>Others</Ecommerce_ProductName>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
index 4ce1373303..62d4e0246d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<is_summary>1</is_summary>
 		<Referrers_Referrer>Others</Referrers_Referrer>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
index 2ed256828f..b7c3e0cd22 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<is_summary>1</is_summary>
 		<Referrers_Keyword>Others</Referrers_Keyword>
 	</row>
 	<row>
@@ -24,6 +25,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo>
 		<Referrers_Keyword>this search term</Referrers_Keyword>
+		<is_summary>1</is_summary>
 		<Referrers_SearchEngine>Others</Referrers_SearchEngine>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
index 328713f102..cdb5c36986 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
@@ -10,8 +10,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<url>URL unknown!</url>
 		<logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo>
+		<is_summary>1</is_summary>
 		<Referrers_SearchEngine>Others</Referrers_SearchEngine>
 	</row>
 	<row>
@@ -24,9 +24,9 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<url>http://google.com</url>
 		<logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo>
 		<Referrers_SearchEngine>Google</Referrers_SearchEngine>
+		<is_summary>1</is_summary>
 		<Referrers_Keyword>Others</Referrers_Keyword>
 	</row>
 	<row>
@@ -39,9 +39,9 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<url>http://search.yahoo.com</url>
 		<logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo>
 		<Referrers_SearchEngine>Yahoo!</Referrers_SearchEngine>
+		<is_summary>1</is_summary>
 		<Referrers_Keyword>Others</Referrers_Keyword>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
index cf511774e2..739307c0f9 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<is_summary>1</is_summary>
 		<Referrers_Website>Others</Referrers_Website>
 	</row>
 	<row>
@@ -22,9 +23,9 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<url>Others</url>
 		<Referrers_Website>whatever0.com</Referrers_Website>
-		<Referrers_WebsitePage> - Others</Referrers_WebsitePage>
+		<is_summary>1</is_summary>
+		<Referrers_WebsitePage>Others</Referrers_WebsitePage>
 	</row>
 	<row>
 		<label>whatever0.com/index</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
index aa4dd45835..4231a73dea 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>45</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<is_summary>1</is_summary>
 		<Resolution_Configuration>Others</Resolution_Configuration>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
index 97ba64717f..47c523ddd6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<is_summary>1</is_summary>
 		<Resolution_Resolution>Others</Resolution_Resolution>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
index d743c41b62..98c7c05653 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
@@ -11,6 +11,7 @@
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
+		<is_summary>1</is_summary>
 		<UserCountry_City>Others</UserCountry_City>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
index b3fafd427d..34db2b4c40 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
@@ -11,6 +11,7 @@
 		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
+		<is_summary>1</is_summary>
 		<UserCountry_Region>Others</UserCountry_Region>
 	</row>
 	<row>
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
index ad53dc56d6..9aed6f1dca 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e62863bace998ad9a0ab526c1dd27bbbc4c61f04142207ba5100144e46fa6ed1
-size 69050
+oid sha256:af111d9fa698a6580f9354e76b2d66f307b03bf14debdb7077b97d5aee106a06
+size 70345
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
index 8dd6e37851..51e9b17ae6 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f66746af8ecf30ca0bf6438de3b90b7124316726636ed0aacc51125e2441f4
-size 72586
+oid sha256:66c87b4b6de1e793ae3acfb320bff8e77a474b13294446a4ef866ab47f61260f
+size 73865
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png
new file mode 100644
index 0000000000..29760f3937
--- /dev/null
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_columns.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd27f8ec626064401ce795c9553f3fa196245863b61069b4553a220fc4a3136a
+size 73925
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png
new file mode 100644
index 0000000000..d2e3e05657
--- /dev/null
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_dimension_search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6919c7b43ac9a13dad081a1912f7ce7e7d98039c0b77be979db6f5796c005190
+size 44652
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png
new file mode 100644
index 0000000000..e3f00f9b6d
--- /dev/null
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_flatten_search.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3e5a4a3568d6c375f64200e44f189a2c6fc35248277ec2b6ed2458051d84115
+size 44648
diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js
index 65159a6ab5..ce308f3c11 100644
--- a/tests/UI/specs/ViewDataTable_spec.js
+++ b/tests/UI/specs/ViewDataTable_spec.js
@@ -101,7 +101,45 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f
         expect(await page.screenshot({ fullPage: true })).to.matchImage('11_flattened');
     });
 
+    it("should show dimensions separately when option is clicked", async function () {
+        await page.click('.dropdownConfigureIcon');
+        await page.click('.dataTableShowDimensions');
+        await page.waitForNetworkIdle();
+        await page.mouse.move(-10, -10);
+        expect(await page.screenshot({ fullPage: true })).to.matchImage('dimension_columns');
+    });
+
+    it("should search in subtable dimensions even when they are displayed separately", async function () {
+        await page.click('.dataTableAction.searchAction');
+        await page.focus('.searchAction .dataTableSearchInput');
+        await page.keyboard.type('Bing');
+        await page.click('.searchAction .icon-search');
+        await page.waitForNetworkIdle();
+        await page.evaluate(() => document.activeElement.blur());
+        await page.waitFor(500);
+        expect(await page.screenshot({ fullPage: true })).to.matchImage('dimension_search');
+    });
+
+    it("search should still work when showing dimensions combined again", async function () {
+        await page.click('.dropdownConfigureIcon');
+        await page.click('.dataTableShowDimensions');
+        await page.waitForNetworkIdle();
+        await page.mouse.move(-10, -10);
+        expect(await page.screenshot({ fullPage: true })).to.matchImage('flatten_search');
+    });
+
+    it("search should still work when switching to back to separate dimensions", async function () {
+        await page.click('.dropdownConfigureIcon');
+        await page.click('.dataTableShowDimensions');
+        await page.waitForNetworkIdle();
+        await page.waitFor(500);
+        await page.mouse.move(-10, -10);
+        await page.evaluate(() => document.activeElement.blur());
+        expect(await page.screenshot({ fullPage: true })).to.matchImage('dimension_search');
+    });
+
     it("should show aggregate rows when the aggregate rows option is clicked", async function () {
+        await page.goto(url.replace(/filter_limit=5/, 'filter_limit=10') + '&flat=1');
         await page.click('.dropdownConfigureIcon');
         await page.click('.dataTableIncludeAggregateRows');
         await page.waitForNetworkIdle();