Skip to content

Commit 0d117bf

Browse files
[Data Object Tree] Layout endpoint called when opening a folder (#3379)
* prevented the field collection layout call for folder object types * Automatic frontend build --------- Co-authored-by: ValeriaMaltseva <11871778+ValeriaMaltseva@users.noreply.github.com>
1 parent 1bf3881 commit 0d117bf

747 files changed

Lines changed: 30023 additions & 1 deletion

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assets/js/src/core/modules/element/dynamic-types/definitions/objects/data-related/components/field-collection/providers/field-collection-provider.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import React, { createContext } from 'react'
1212
import { useClassFieldCollectionObjectLayoutQuery } from '@Pimcore/modules/class-definition/class-definition-slice-enhanced'
1313
import { useElementContext } from '@Pimcore/modules/element/hooks/use-element-context'
14+
import { useDataObjectDraft } from '@Pimcore/modules/data-object/hooks/use-data-object-draft'
1415
import { Content } from '@Pimcore/components/content/content'
1516

1617
export type IFieldCollectionContext = ReturnType<typeof useClassFieldCollectionObjectLayoutQuery> | null
@@ -24,7 +25,14 @@ export interface IFieldCollectionProviderProps {
2425

2526
export const FieldCollectionProvider = ({ children, id }: IFieldCollectionProviderProps): React.JSX.Element => {
2627
const { id: elementId } = useElementContext()
27-
const fieldCollectionResult = useClassFieldCollectionObjectLayoutQuery({ objectId: id ?? elementId })
28+
const objectId = id ?? elementId
29+
30+
const { dataObject } = useDataObjectDraft(objectId)
31+
const isFolder = dataObject?.type === 'folder'
32+
33+
const fieldCollectionResult = useClassFieldCollectionObjectLayoutQuery({ objectId },
34+
{ skip: isFolder }
35+
)
2836

2937
const { isLoading } = fieldCollectionResult
3038

public/build/982938b9-f9e2-45b1-95fd-cc2c0513931b/entrypoints.json

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/982938b9-f9e2-45b1-95fd-cc2c0513931b/exposeRemote.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/982938b9-f9e2-45b1-95fd-cc2c0513931b/index.html

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/982938b9-f9e2-45b1-95fd-cc2c0513931b/manifest.json

Lines changed: 811 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)