Merge pull request #650 from contember/fix/datagrid-persist

datagrid fixes
contember · Dec 8, 2023 · 9c97e28 · 9c97e28
2 parents c2005dc + afb870c
commit 9c97e28
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/build/api/admin.api.md b/build/api/admin.api.md
@@ -800,10 +800,13 @@ export const DataGridPageRenderer: React.NamedExoticComponent<LayoutRendererProp
 export type DataGridPageRendererProps = LayoutRendererProps & DataGridContainerProps;
 
 // @public (undocumented)
-export const DataGridScope: <StateProps>({ stateComponent, stateProps, ...props }: DataGridScopeProps<StateProps>) => JSX.Element;
+export const DataGridScope: <StateProps>({ stateComponent, stateProps, skipBindingStateUpdateAfterPersist, refreshDataBindingOnPersist, ...props }: DataGridScopeProps<StateProps>) => JSX.Element;
 
 // @public (undocumented)
-export type DataGridScopeProps<StateProps> = PropsWithChildren<DataGridProps<DataGridContainerPublicProps>> & DataBindingProviderStateComponent<StateProps>;
+export type DataGridScopeProps<StateProps> = PropsWithChildren<DataGridProps<DataGridContainerPublicProps>> & DataBindingProviderStateComponent<StateProps> & {
+    refreshDataBindingOnPersist?: boolean;
+    skipBindingStateUpdateAfterPersist?: boolean;
+};
 
 // @public (undocumented)
 export const DefaultElement: FunctionComponent<DefaultElementProps>;

diff --git a/packages/admin/src/components/pageRouting/Scopes/DataGridScope.tsx b/packages/admin/src/components/pageRouting/Scopes/DataGridScope.tsx
@@ -7,13 +7,22 @@ import { scopeComponent } from './scopeComponent'
 export type DataGridScopeProps<StateProps> =
 	& PropsWithChildren<DataGridProps<DataGridContainerPublicProps>>
 	& DataBindingProviderStateComponent<StateProps>
+	& {
+		refreshDataBindingOnPersist?: boolean
+		skipBindingStateUpdateAfterPersist?: boolean
+	}
 
 /**
  * @group Scopes
  */
 export const DataGridScope = scopeComponent(
-	<StateProps, /*JSX FIX*/>({ stateComponent, stateProps, ...props }: DataGridScopeProps<StateProps>) => (
-		<DataBindingProvider stateComponent={stateComponent ?? FeedbackRenderer} stateProps={stateProps}>
+	<StateProps, >({ stateComponent, stateProps, skipBindingStateUpdateAfterPersist, refreshDataBindingOnPersist, ...props }: DataGridScopeProps<StateProps>) => (
+		<DataBindingProvider
+			stateComponent={stateComponent ?? FeedbackRenderer}
+			stateProps={stateProps}
+			skipStateUpdateAfterPersist={skipBindingStateUpdateAfterPersist}
+			refreshOnPersist={refreshDataBindingOnPersist ?? true}
+		>
 			<DataGrid {...props} />
 		</DataBindingProvider>
 	),

diff --git a/packages/react-datagrid/src/grid/createDataGrid.tsx b/packages/react-datagrid/src/grid/createDataGrid.tsx
@@ -36,6 +36,8 @@ const dummyStateMethods: DataGridStateMethods = {
 
 const createInitialState = (props: DataGridProps<{}>, environment: Environment): DataGridState<any> => {
 	const columns = extractDataGridColumns(props.children, environment)
+	const entities = QueryLanguage.desugarQualifiedEntityList({ entities: props.entities }, environment)
+	const filter = { and: [entities.filter ?? {}] }
 	return {
 		columns,
 		paging: {
@@ -46,8 +48,8 @@ const createInitialState = (props: DataGridProps<{}>, environment: Environment):
 		filterArtifacts: {},
 		orderDirections: {},
 		orderBy: [],
-		entities: QueryLanguage.desugarQualifiedEntityList({ entities: props.entities }, environment),
-		filter: { and: [{}] },
+		entities: entities,
+		filter,
 		layout: 'default',
 	}
 }