Change customWildcardFields to customWildcardFieldDefs during rebase

vega · Mar 9, 2018 · aef4b0f · aef4b0f
1 parent 8ea9ee7
commit aef4b0f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/lib-voyager.test.ui.tsx b/src/lib-voyager.test.ui.tsx
@@ -82,7 +82,7 @@ describe('lib-voyager', () => {
 
           expect(state).toHaveProperty('config');
           expect(state).toHaveProperty('dataset');
-          expect(state.customWildcardFields).toBeDefined();
+          expect(state.customWildcardFieldDefs).toBeDefined();
           expect(state.tab.activeTabID).toBeDefined();
           expect(state.tab.list[DEFAULT_ACTIVE_TAB_ID]).toHaveProperty('result');
           expect(state.tab.list[DEFAULT_ACTIVE_TAB_ID]).toHaveProperty('shelf');
@@ -99,7 +99,7 @@ describe('lib-voyager', () => {
 
               expect(newState).toHaveProperty('config');
               expect(newState).toHaveProperty('dataset');
-              expect(state.customWildcardFields).toBeDefined();
+              expect(state.customWildcardFieldDefs).toBeDefined();
               expect(state.tab.activeTabID).toBeDefined();
               expect(newState.tab.list[DEFAULT_ACTIVE_TAB_ID]).toHaveProperty('result');
               expect(newState.tab.list[DEFAULT_ACTIVE_TAB_ID]).toHaveProperty('shelf');
@@ -132,7 +132,7 @@ describe('lib-voyager', () => {
           const handleStateChange = (state: SerializableState) => {
             expect(state.config).toBeDefined();
             expect(state.dataset).toBeDefined();
-            expect(state.customWildcardFields).toBeDefined();
+            expect(state.customWildcardFieldDefs).toBeDefined();
             expect(state.tab.activeTabID).toBeDefined();
             expect(state.tab.list[DEFAULT_ACTIVE_TAB_ID].result).toBeDefined();
             expect(state.tab.list[DEFAULT_ACTIVE_TAB_ID].shelf).toBeDefined();

diff --git a/src/reducers/index.test.ts b/src/reducers/index.test.ts
@@ -38,7 +38,7 @@ describe('reducers/index', () => {
   });
 
   describe('RESET', () => {
-    it('should reset bookmark, dataset, shelf, result, customWildcardFields, tab', () => {
+    it('should reset bookmark, dataset, shelf, result, customWildcardFieldDefs, tab', () => {
       const oldState: State = {
         ...DEFAULT_STATE,
         persistent: {
@@ -55,6 +55,7 @@ describe('reducers/index', () => {
               schema: null,
               data: null
             },
+            customWildcardFieldDefs: DEFAULT_CUSTOM_WILDCARD_FIELDDEFS,
             tab: {
               activeTabID: 1,
               list: [

diff --git a/src/selectors/index.test.ts b/src/selectors/index.test.ts
@@ -1,7 +1,7 @@
 
 import {DEFAULT_BOOKMARK} from '../models/bookmark';
 import {DEFAULT_VOYAGER_CONFIG} from '../models/config';
-import {DEFAULT_CUSTOM_WILDCARD_FIELDS} from '../models/custom-wildcard-field';
+import {DEFAULT_CUSTOM_WILDCARD_FIELDDEFS as DEFAULT_CUSTOM_WILDCARD_FIELDS} from '../models/custom-wildcard-field';
 import {DEFAULT_DATASET} from '../models/dataset';
 import {DEFAULT_ACTIVE_TAB_ID, DEFAULT_PLOT_TAB_STATE, DEFAULT_STATE, State} from '../models/index';
 import {DEFAULT_LOG} from '../models/log';
@@ -48,7 +48,7 @@ describe('selectors/index', () => {
                 values: [{a: 1}, {a: 3}]
               }
             },
-            customWildcardFields: DEFAULT_CUSTOM_WILDCARD_FIELDS,
+            customWildcardFieldDefs: DEFAULT_CUSTOM_WILDCARD_FIELDS,
             tab: {
               activeTabID: DEFAULT_ACTIVE_TAB_ID,
               list: [{

diff --git a/src/selectors/result.test.ts b/src/selectors/result.test.ts
@@ -4,7 +4,7 @@ import {ExpandedType} from 'compassql/build/src/query/expandedtype';
 import {SpecQuery} from 'compassql/build/src/query/spec';
 import {Schema} from 'compassql/build/src/schema';
 import {Data} from 'vega-lite/build/src/data';
-import {DEFAULT_CUSTOM_WILDCARD_FIELDS} from '../models/custom-wildcard-field';
+import {DEFAULT_CUSTOM_WILDCARD_FIELDDEFS} from '../models/custom-wildcard-field';
 import {DEFAULT_DATASET} from '../models/dataset';
 import {DEFAULT_ACTIVE_TAB_ID, DEFAULT_PERSISTENT_STATE, DEFAULT_PLOT_TAB_STATE,
   DEFAULT_STATE, State} from '../models/index';
@@ -54,7 +54,7 @@ const stateSpecific: State = {
         ...DEFAULT_DATASET,
         data
       },
-      customWildcardFields: DEFAULT_CUSTOM_WILDCARD_FIELDS,
+      customWildcardFieldDefs: DEFAULT_CUSTOM_WILDCARD_FIELDDEFS,
       tab: {
         activeTabID: DEFAULT_ACTIVE_TAB_ID,
         list: [{

diff --git a/src/selectors/shelf.test.ts b/src/selectors/shelf.test.ts
@@ -1,5 +1,5 @@
 import {Schema} from 'compassql/build/src/schema';
-import {DEFAULT_CUSTOM_WILDCARD_FIELDS} from '../models/custom-wildcard-field';
+import {DEFAULT_CUSTOM_WILDCARD_FIELDDEFS} from '../models/custom-wildcard-field';
 import {DEFAULT_ACTIVE_TAB_ID, DEFAULT_PERSISTENT_STATE, DEFAULT_PLOT_TAB_STATE,
   DEFAULT_STATE, DEFAULT_UNDOABLE_STATE_BASE, State} from '../models/index';
 import {DEFAULT_SHELF, toQuery} from '../models/shelf/index';
@@ -29,7 +29,7 @@ describe('selectors/shelf', () => {
                 fields: []
               }),
             },
-            customWildcardFields: DEFAULT_CUSTOM_WILDCARD_FIELDS,
+            customWildcardFieldDefs: DEFAULT_CUSTOM_WILDCARD_FIELDDEFS,
             tab: {
               activeTabID: DEFAULT_ACTIVE_TAB_ID,
               list: [{