diff --git a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemInitializer.tsx b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemInitializer.tsx index 78ebe20a41..36f90a4e38 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemInitializer.tsx +++ b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemInitializer.tsx @@ -25,27 +25,29 @@ const commonOptions: any = { useChildren() { const cm = useCollectionManager_deprecated(); const associatedFields = useAssociatedFields(); - const children = associatedFields.map((field) => ({ - name: field.key, - title: field.uiSchema?.title, - Component: 'AssociationFilterDesignerDisplayField', - schema: { - name: field.name, + const children = associatedFields + .filter((field) => !['JSONDocObject', 'JSONDocArray'].includes(field.interface)) + .map((field) => ({ + name: field.key, title: field.uiSchema?.title, - type: 'void', - // 'x-designer': 'AssociationFilter.Item.Designer', - 'x-toolbar': 'CollapseItemSchemaToolbar', - 'x-settings': 'fieldSettings:FilterCollapseItem', - 'x-component': 'AssociationFilter.Item', - 'x-use-component-props': 'useAssociationFilterBlockProps', - 'x-component-props': { - fieldNames: { - label: field.targetKey || cm.getCollection(field.target)?.getPrimaryKey() || 'id', + Component: 'AssociationFilterDesignerDisplayField', + schema: { + name: field.name, + title: field.uiSchema?.title, + type: 'void', + // 'x-designer': 'AssociationFilter.Item.Designer', + 'x-toolbar': 'CollapseItemSchemaToolbar', + 'x-settings': 'fieldSettings:FilterCollapseItem', + 'x-component': 'AssociationFilter.Item', + 'x-use-component-props': 'useAssociationFilterBlockProps', + 'x-component-props': { + fieldNames: { + label: field.targetKey || cm.getCollection(field.target)?.getPrimaryKey() || 'id', + }, }, + properties: {}, }, - properties: {}, - }, - })); + })); return children; }, }, diff --git a/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx b/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx index 94b61f02a7..d56a67afa2 100644 --- a/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx +++ b/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx @@ -111,6 +111,7 @@ export const getPopupPathFromParams = (params: PopupParams) => { puid, collection && 'collection', collection, + // filterbytk is possibly to be 0 filterbytk !== null && filterbytk !== undefined && 'filterbytk', filterbytk, sourceid && 'sourceid',