Add hidden columns selector

js/initialStates/local-state.js

@@ -5,6 +5,7 @@ export default Immutable.fromJS({
     pageSize: 10,
     currentPage: 1,
   },
+  metadataColumns: [],
   filter: '',
   sortColumns: [],
   sortDirections: []

js/reducers/__tests__/localReducerTest.js

@@ -13,7 +13,12 @@ import LocalReducer, {
 
 import extend from 'lodash.assign';
 
-const initialState = {renderProperties: {columnProperties: null}};
+const initialState = {
+  renderProperties: {columnProperties: null},
+  sortDirections: [],
+  sortColumns: []
+};
+
 //TODO: Import the testHelpers instead of using this directly
 const getMethod = (options) => {
   if(!options.method) {

js/selectors/__tests__/localSelectorsTest.js

@@ -18,7 +18,9 @@ function getBasicState() {
       pageSize: 1,
       currentPage: 0,
       maxPage: 2
-    }
+    },
+    sortColumns: [],
+    sortDirections: []
   });
 }
 
@@ -44,7 +46,9 @@ export function get3ColState() {
       pageSize: 1,
       currentPage: 0,
       maxPage: 2
-    }
+    },
+    sortColumns: [],
+    sortDirections: []
   });
 }
 
@@ -137,6 +141,30 @@ describe('localSelectors', () => {
     })
   })
 
+  describe ('with metadata columns', () => {
+    it('gets metadata columns', () => {
+      const state = get3ColState().set('metadataColumns', Immutable.List(['two']));
+      const metaDataColumns = selectors.metaDataColumnsSelector(state);
+      expect(metaDataColumns.toJSON()).toEqual(['two'])
+    })
+  })
+
+  describe ('hidden columns', () => {
+    it('gets hidden columns without visible / metadata columns', () => {
+      const state = withRenderProperties(get3ColState()
+        .set('metadataColumns', Immutable.List(['two'])));
+
+      const hidden = selectors.hiddenColumnsSelector(state)
+      expect(hidden).toEqual(['three'])
+    });
+
+    it('returns empty when none', () => {
+      const state = withRenderProperties(getBasicState())
+      const hidden = selectors.hiddenColumnsSelector(state)
+      expect(hidden).toEqual([]);
+    });
+  })
+
   describe('visible columns', () => {
     it('gets the renderProperties', () => {
       const state = withRenderProperties(getBasicState());

js/selectors/localSelectors.js

@@ -1,7 +1,7 @@
 import Immutable from 'immutable';
 import MAX_SAFE_INTEGER from 'max-safe-integer';
 import { createSelector } from 'reselect';
-import { getVisibleDataColumns, getMetaData } from '../utils/dataUtils'
+import { getVisibleDataColumns, getDataForColumns } from '../utils/dataUtils'
 
 //oy - not a fan -- refactor asap because this is no good
 let localUtils = null;
@@ -53,6 +53,9 @@ export const allColumnsSelector = createSelector(
   (data) => (data.size === 0 ? [] : data.get(0).keySeq().toJSON())
 )
 
+//gets the metadata columns or nothing
+export const metaDataColumnsSelector = state => (state.get('metadataColumns') || [])
+
 //gets the column property objects ordered by order
 export const sortedColumnPropertiesSelector = createSelector(
   renderPropertiesSelector,
@@ -129,11 +132,34 @@ export const visibleDataSelector = createSelector(
   (currentPageData, visibleColumns) => getVisibleDataColumns(currentPageData, visibleColumns)
 )
 
+export const hiddenColumnsSelector = createSelector(
+  visibleColumnsSelector,
+  allColumnsSelector,
+  metaDataColumnsSelector,
+  (visibleColumns, allColumns, metaDataColumns) => {
+    const removeColumns = [...visibleColumns, ...metaDataColumns];
+
+    return allColumns.filter(c => removeColumns.indexOf(c) === -1);
+  }
+)
+
 //TODO: this needs some tests
-export const metaDataSelector = createSelector(
+export const hiddenDataSelector = createSelector(
   currentPageDataSelector,
   visibleColumnsSelector,
-  (currentPageData, visibleColumns) => getMetaData(currentPageData, visibleColumns)
+  allColumnsSelector,
+  metaDataColumnsSelector,
+  (currentPageData, visibleColumns, allColumns, metaDataColumns) => {
+    debugger;
+    return getDataForColumns(currentPageData, keys)
+  }
+)
+
+//TODO: this needs some tests
+export const metaDataSelector = createSelector(
+  currentPageDataSelector,
+  metaDataColumnsSelector,
+  (currentPageData, metaDataColumns) => { return getDataForColumns(currentPageData, metaDataColumns) }
 )
 
 //TODO: This NEEDS tests

js/utils/dataUtils.js

@@ -18,15 +18,14 @@ export function addKeyToRows(data) {
   return data.map(row => row.set('griddleKey', getKey()));
 }
 
-export function getMetaData(data, nonMetaColumns) {
+export function getDataForColumns(data, columns) {
   if (data.size < 1) {
     return data;
   }
 
   const dataColumns = data.get(0).keySeq().toArray();
-
-  const columns = dataColumns.filter(item => nonMetaColumns.indexOf(item) < 0);
-  return data.map(d => d.filter(keyInArray(columns)));
+  const resultColumns = dataColumns.filter(item => columns.indexOf(item) >= 0);
+  return data.map(d => d.filter(keyInArray(resultColumns)));
 }
 
 //, {__metadata: d.filter(keyInArray(metadataColumns)).set('index', i)}