Formula refactoring (#12)

* refactoring * move main column generation into parse module * fix tests
wylieconlon · May 10, 2021 · b4a36ad · b4a36ad
1 parent b2272f9
commit b4a36ad
Show file tree

Hide file tree

Showing 16 changed files with 1,099 additions and 1,047 deletions.
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx
@@ -63,7 +63,8 @@ export function LayerPanels(
     () => (datasourceId: string, newState: unknown) => {
       dispatch({
         type: 'UPDATE_DATASOURCE_STATE',
-        updater: () => newState,
+        updater: (prevState: unknown) =>
+          typeof newState === 'function' ? newState(prevState) : newState,
         datasourceId,
         clearStagedPreview: false,
       });

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -144,7 +144,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
   };
 
   const setIsCloseable = (isCloseable: boolean) => {
-    setState({ ...state, isDimensionClosePrevented: !isCloseable });
+    setState((prevState) => ({ ...prevState, isDimensionClosePrevented: !isCloseable }));
   };
 
   const selectedOperationDefinition =

diff --git a/...erations/definitions/formula/formula.scss → ...s/definitions/formula/editor/formula.scss b/...erations/definitions/formula/formula.scss → ...s/definitions/formula/editor/formula.scss