Fix the logic of the includeDescendants filter

assets/js/src/core/modules/asset/editor/types/folder/tab-manager/tabs/list/constants/filters.ts

@@ -13,7 +13,7 @@
 
 import type { FilterOptions, TagFilterOptions } from '../types/filterTypes'
 
-export const DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE: boolean = false
+export const DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE: boolean = true
 
 export const defaultFilterOptions: FilterOptions = {
   columnFilters: [],

assets/js/src/core/modules/asset/editor/types/folder/tab-manager/tabs/list/list-provider.tsx

@@ -16,7 +16,7 @@
 import React, { createContext, useEffect, useMemo, useState } from 'react'
 import { type AssetGetGridApiResponse, type GridColumnConfiguration, type GridDetailedConfiguration } from '@Pimcore/modules/asset/asset-api-slice-enhanced'
 import { type FilterOptions, type TagFilterOptions } from './types/filterTypes'
-import { defaultFilterOptions } from './constants/filters'
+import { DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE, defaultFilterOptions } from './constants/filters'
 import { type RowSelectionState, type SortingState } from '@tanstack/react-table'
 import { isEmptyValue } from '@Pimcore/utils/type-utils'
 
@@ -127,7 +127,7 @@ export const ListFilterOptionsProvider = ({ children }: ListFilterOptionsProvide
     }
 
     return acc
-  }, { columnFilters: [], includeDescendants: false }), [filterOptionsMap])
+  }, { columnFilters: [], includeDescendants: DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE }), [filterOptionsMap])
 
   return useMemo(() => (
     <ListFilterOptionsContext.Provider value={ { filterOptions, setFilterOptions } }>

assets/js/src/core/modules/asset/editor/types/folder/tab-manager/tabs/list/sidebar/filters/filter-container-inner.tsx

@@ -42,7 +42,7 @@ export const FilterContainerInner = (): React.JSX.Element => {
 
   const { resetFilters, filterOptions, filterError } = useFilters()
   const { setFilterOptions } = useListFilterOptions()
-  const { isIncludeDescendants, setIsIncludeDescendants, handleChangeIsIncludeDescendants } = useIncludeDescendantsFilter()
+  const { isShowOnlyDirectChildren, setIsShowOnlyDirectChildren, handleChangeIsIncludeDescendants } = useIncludeDescendantsFilter()
   const {
     pqlQueryValue,
     setPQLQueryValue,
@@ -62,7 +62,7 @@ export const FilterContainerInner = (): React.JSX.Element => {
   const handleApplyClick = (): void => { setFilterOptions('filters', filterOptions) }
 
   const handleResetAllFiltersClick = (): void => {
-    setIsIncludeDescendants(DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE)
+    setIsShowOnlyDirectChildren(!DEFAULT_IS_INCLUDE_DESCENDANTS_VALUE)
     setPQLQueryValue('')
     setSearchValue('')
     setIsShowPQLQueryError(false)
@@ -131,7 +131,7 @@ export const FilterContainerInner = (): React.JSX.Element => {
                   />
 
                   <Checkbox
-                    checked={ isIncludeDescendants }
+                    checked={ isShowOnlyDirectChildren }
                     onChange={ handleChangeIsIncludeDescendants }
                   >
                     only direct children

assets/js/src/core/modules/asset/editor/types/folder/tab-manager/tabs/list/sidebar/filters/hooks/use-include-descendants-filter.ts

@@ -16,26 +16,27 @@ import type { CheckboxChangeEvent } from 'antd/es/checkbox'
 import { useFilters } from './use-filters'
 
 interface IUseIncludeDescendantsFilterHookReturn {
-  isIncludeDescendants: boolean
-  setIsIncludeDescendants: (value: boolean) => void
+  isShowOnlyDirectChildren: boolean
+  setIsShowOnlyDirectChildren: (value: boolean) => void
   handleChangeIsIncludeDescendants: (e: CheckboxChangeEvent) => void
 }
 
 export const useIncludeDescendantsFilter = (): IUseIncludeDescendantsFilterHookReturn => {
-  const [isIncludeDescendants, setIsIncludeDescendants] = useState<boolean>(false)
+  const [isShowOnlyDirectChildren, setIsShowOnlyDirectChildren] = useState<boolean>(false)
 
   const { updateIsIncludeDescendants } = useFilters()
 
   const handleChangeIsIncludeDescendants = (e: CheckboxChangeEvent): void => {
-    const includeDescendantsValue = e.target.checked
+    const showOnlyDirectChildValue = e.target.checked
+    const includeDescendantsValue = !showOnlyDirectChildValue
 
-    setIsIncludeDescendants(includeDescendantsValue)
+    setIsShowOnlyDirectChildren(showOnlyDirectChildValue)
     updateIsIncludeDescendants(includeDescendantsValue)
   }
 
   return {
-    isIncludeDescendants,
-    setIsIncludeDescendants,
+    isShowOnlyDirectChildren,
+    setIsShowOnlyDirectChildren,
     handleChangeIsIncludeDescendants
   }
 }

public/build/534df091-d0b1-4d64-ac7e-401ffc66fc2d/entrypoints.json

@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "main": {
+      "js": [
+        "/bundles/pimcorestudioui/build/534df091-d0b1-4d64-ac7e-401ffc66fc2d/main.js"
+      ]
+    }
+  }
+}

public/build/534df091-d0b1-4d64-ac7e-401ffc66fc2d/manifest.json

@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/534df091-d0b1-4d64-ac7e-401ffc66fc2d/main.js": "/bundles/pimcorestudioui/build/534df091-d0b1-4d64-ac7e-401ffc66fc2d/main.js"
+}

public/build/6c2d4651-90a5-4e5d-892a-081dcf4d5c62/entrypoints.json

@@ -0,0 +1,12 @@
+{
+  "entrypoints": {
+    "core-dll": {
+      "css": [
+        "/bundles/pimcorestudioui/build/6c2d4651-90a5-4e5d-892a-081dcf4d5c62/core-dll.css"
+      ],
+      "js": [
+        "/bundles/pimcorestudioui/build/6c2d4651-90a5-4e5d-892a-081dcf4d5c62/core-dll.js"
+      ]
+    }
+  }
+}