Merge pull request #2806 from woocommerce/fix/report-column-visibility

Fix bug with checking user preferences for report column visibility.

client/analytics/components/report-table/index.js

@@ -108,14 +108,19 @@ class ReportTable extends Component {
 	}
 
 	filterShownHeaders( headers, hiddenKeys ) {
-		if ( ! hiddenKeys || ! hiddenKeys.length ) {
-			return headers;
+		// If no user preferences, set visibilty based on column default.
+		if ( ! hiddenKeys ) {
+			return headers.map( header => ( {
+				...header,
+				visible: header.required || ! header.hiddenByDefault,
+			} ) );
 		}
 
-		return headers.map( header => {
-			const hidden = hiddenKeys.includes( header.key ) && ! header.required;
-			return { ...header, hiddenByDefault: hidden };
-		} );
+		// Set visibilty based on user preferences.
+		return headers.map( header => ( {
+			...header,
+			visible: header.required || ! hiddenKeys.includes( header.key ),
+		} ) );
 	}
 
 	render() {

packages/components/src/table/index.js

@@ -93,7 +93,15 @@ class TableCard extends Component {
 	}
 
 	getShowCols( headers ) {
-		return headers.map( ( { key, hiddenByDefault } ) => ! hiddenByDefault && key ).filter( Boolean );
+		return headers.map( ( { key, visible } ) => {
+			if (
+				'undefined' === typeof visible ||
+				visible
+			) {
+				return key;
+			}
+			return false;
+		} ).filter( Boolean );
 	}
 
 	getVisibleHeaders() {