diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-single/RecordReadPrettyFormBlockInitializer.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-single/RecordReadPrettyFormBlockInitializer.tsx index fc35bfbd83..89519efc31 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-single/RecordReadPrettyFormBlockInitializer.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-single/RecordReadPrettyFormBlockInitializer.tsx @@ -13,7 +13,7 @@ import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } import { useCollection_deprecated } from '../../../../collection-manager'; import { useAssociationName, useCollectionManager } from '../../../../data-source'; import { useRecordCollectionDataSourceItems } from '../../../../schema-initializer/utils'; -import { useSchemaTemplateManager } from '../../../../schema-templates'; +import { useBlockTemplateContext, useSchemaTemplateManager } from '../../../../schema-templates'; import { createDetailsUISchema } from './createDetailsUISchema'; export const RecordReadPrettyFormBlockInitializer = () => { @@ -38,11 +38,12 @@ export function useCreateSingleDetailsSchema() { const { getTemplateSchemaByMode } = useSchemaTemplateManager(); const association = useAssociationName(); const cm = useCollectionManager(); + const { componentNamePrefix } = useBlockTemplateContext(); const templateWrap = useCallback( (templateSchema, options) => { const { item } = options; - if (item.template.componentName === 'ReadPrettyFormItem') { + if (item.template.componentName === `${componentNamePrefix}ReadPrettyFormItem`) { const collectionName = item.collectionName || item.name; const collection = cm.getCollection(collectionName); const blockSchema = createDetailsUISchema( @@ -69,7 +70,7 @@ export function useCreateSingleDetailsSchema() { return templateSchema; } }, - [association, cm], + [association, cm, componentNamePrefix], ); const createSingleDetailsSchema = useCallback( diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/RecordFormBlockInitializer.tsx b/packages/core/client/src/modules/blocks/data-blocks/form/RecordFormBlockInitializer.tsx index b9fc36213f..ac496ce3ff 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/RecordFormBlockInitializer.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/form/RecordFormBlockInitializer.tsx @@ -13,7 +13,7 @@ import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } import { useCollection_deprecated } from '../../../../collection-manager'; import { useAssociationName, useCollectionManager } from '../../../../data-source'; import { useRecordCollectionDataSourceItems } from '../../../../schema-initializer/utils'; -import { useSchemaTemplateManager } from '../../../../schema-templates'; +import { useBlockTemplateContext, useSchemaTemplateManager } from '../../../../schema-templates'; import { createEditFormBlockUISchema } from './createEditFormBlockUISchema'; /** @@ -50,6 +50,7 @@ export function useCreateEditFormBlock() { const { insert } = useSchemaInitializer(); const association = useAssociationName(); const cm = useCollectionManager(); + const { componentNamePrefix } = useBlockTemplateContext(); const createEditFormBlock = useCallback( ({ item }) => { @@ -76,7 +77,7 @@ export function useCreateEditFormBlock() { const templateWrap = useCallback( (templateSchema, { item }) => { - if (item.template.componentName === 'FormItem') { + if (item.template.componentName === `${componentNamePrefix}FormItem`) { const collectionName = item.collectionName || item.name; const collection = cm.getCollection(collectionName); const blockSchema = createEditFormBlockUISchema( @@ -102,7 +103,7 @@ export function useCreateEditFormBlock() { return templateSchema; } }, - [association, cm], + [association, cm, componentNamePrefix], ); return { createEditFormBlock, templateWrap }; diff --git a/packages/core/client/src/schema-initializer/items/RecordAssociationFormBlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/RecordAssociationFormBlockInitializer.tsx index 5bd386ddfb..9c6a730b6e 100644 --- a/packages/core/client/src/schema-initializer/items/RecordAssociationFormBlockInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/RecordAssociationFormBlockInitializer.tsx @@ -13,7 +13,7 @@ import React, { useCallback, useMemo } from 'react'; import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '../../application'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { createCreateFormBlockUISchema } from '../../modules/blocks/data-blocks/form/createCreateFormBlockUISchema'; -import { useSchemaTemplateManager } from '../../schema-templates'; +import { useBlockTemplateContext, useSchemaTemplateManager } from '../../schema-templates'; import { useRecordCollectionDataSourceItems } from '../utils'; /** @@ -70,6 +70,7 @@ export const RecordAssociationFormBlockInitializer = () => { export function useCreateAssociationFormBlock() { const { insert } = useSchemaInitializer(); const { getCollection } = useCollectionManager_deprecated(); + const { componentNamePrefix } = useBlockTemplateContext(); const createAssociationFormBlock = useCallback( ({ item }) => { @@ -88,7 +89,7 @@ export function useCreateAssociationFormBlock() { const templateWrap = useCallback( (templateSchema, { item }) => { - if (item.template.componentName === 'FormItem' && item.associationField) { + if (item.template.componentName === `${componentNamePrefix}FormItem` && item.associationField) { const field = item.associationField; const collection = getCollection(field.target); const blockSchema = createCreateFormBlockUISchema({ @@ -104,7 +105,7 @@ export function useCreateAssociationFormBlock() { return templateSchema; } }, - [getCollection], + [getCollection, componentNamePrefix], ); return { createAssociationFormBlock, templateWrap }; diff --git a/packages/core/client/src/schema-initializer/items/RecordReadPrettyAssociationFormBlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/RecordReadPrettyAssociationFormBlockInitializer.tsx index bcb339b675..d079c0363a 100644 --- a/packages/core/client/src/schema-initializer/items/RecordReadPrettyAssociationFormBlockInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/RecordReadPrettyAssociationFormBlockInitializer.tsx @@ -11,10 +11,10 @@ import { FormOutlined } from '@ant-design/icons'; import React, { useCallback } from 'react'; import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '../../application'; -import { useSchemaTemplateManager } from '../../schema-templates'; -import { useRecordCollectionDataSourceItems } from '../utils'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { createDetailsUISchema } from '../../modules/blocks/data-blocks/details-single/createDetailsUISchema'; +import { useBlockTemplateContext, useSchemaTemplateManager } from '../../schema-templates'; +import { useRecordCollectionDataSourceItems } from '../utils'; /** * @deprecated @@ -69,6 +69,7 @@ export const RecordReadPrettyAssociationFormBlockInitializer = () => { export function useCreateAssociationDetailsWithoutPagination() { const { insert } = useSchemaInitializer(); const { getCollection } = useCollectionManager_deprecated(); + const { componentNamePrefix } = useBlockTemplateContext(); const createAssociationDetailsWithoutPagination = useCallback( ({ item }) => { @@ -90,7 +91,7 @@ export function useCreateAssociationDetailsWithoutPagination() { const field = item.associationField; const collection = getCollection(field.target); - if (item.template.componentName === 'ReadPrettyFormItem') { + if (item.template.componentName === `${componentNamePrefix}ReadPrettyFormItem`) { const blockSchema = createDetailsUISchema({ dataSource: collection.dataSource, association: `${field.collectionName}.${field.name}`, @@ -104,7 +105,7 @@ export function useCreateAssociationDetailsWithoutPagination() { return templateSchema; } }, - [getCollection], + [getCollection, componentNamePrefix], ); return { createAssociationDetailsWithoutPagination, templateWrap };