From 8b340e9b7ee25d329b37a71fd53c7bc43af75953 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 14 Jan 2021 19:50:53 +0100
Subject: [PATCH] form view fix

---
 packages/datalib/src/GridDisplay.ts   | 1 +
 packages/web/src/datagrid/DataGrid.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index b62689ec7..d84a78503 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -534,6 +534,7 @@ export abstract class GridDisplay {
             columns.map((x) => x.columnName)
           )
         : null,
+      formViewKeyRequested: null,
     }));
   }
 }
diff --git a/packages/web/src/datagrid/DataGrid.js b/packages/web/src/datagrid/DataGrid.js
index f284716e0..050eacf78 100644
--- a/packages/web/src/datagrid/DataGrid.js
+++ b/packages/web/src/datagrid/DataGrid.js
@@ -21,7 +21,7 @@ const DataGridContainer = styled.div`
 `;
 
 export default function DataGrid(props) {
-  const { GridCore, FormView, config, formDisplay } = props;
+  const { GridCore, FormView, formDisplay } = props;
   const theme = useTheme();
   const [managerSize, setManagerSize] = React.useState(0);
   const [selection, setSelection] = React.useState([]);
@@ -29,7 +29,7 @@ export default function DataGrid(props) {
   const [grider, setGrider] = React.useState(null);
   const [collapsedWidgets, setCollapsedWidgets] = React.useState([]);
   // const [formViewData, setFormViewData] = React.useState(null);
-  const isFormView = !!(config && config.isFormView);
+  const isFormView = !!(formDisplay && formDisplay.config && formDisplay.config.isFormView);
 
   return (
     <HorizontalSplitter initialValue="300px" size={managerSize} setSize={setManagerSize}>