Merge branch '2025.4' into 2026.1

Author: Corepex

assets/js/src/core/components/toolbar/toolbar.styles.tsx

@@ -13,7 +13,6 @@ import { createStyles } from 'antd-style'
 export const useStyles = createStyles(({ token, css }) => {
   return {
     toolbar: css`
-      width: 100%;
       height: 48px;
       padding: ${token.paddingXS}px;
 

assets/js/src/core/modules/asset/listing/decorator/column-configuration/view-layer/components/sidebar/tabs/grid-config/grid-config-inner.tsx

@@ -24,8 +24,8 @@ import { SaveView } from './views/save-view'
 import { defaultValues } from './forms/save-form'
 import { type DropdownMenuProps } from '@Pimcore/components/dropdown/dropdown'
 import { Content } from '@Pimcore/components/content/content'
-import { useRoleGetCollectionQuery } from '@Pimcore/modules/user/roles/roles-api-slice-enhanced'
-import { useUserGetCollectionQuery } from '@Pimcore/modules/user/user-api-slice-enhanced'
+import { useRoleGetShareCollectionQuery } from '@Pimcore/modules/user/roles/roles-api-slice-enhanced'
+import { useUserGetShareCollectionQuery } from '@Pimcore/modules/user/user-api-slice-enhanced'
 import { useAvailableColumns } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/use-available-columns'
 import { type AvailableColumn } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/available-columns-provider'
 import { useSelectedColumns } from '@Pimcore/modules/element/listing/abstract/configuration-layer/provider/selected-columns/use-selected-columns'
@@ -51,8 +51,8 @@ export const GridConfigInner = (): React.JSX.Element => {
   const { id: selectedGridConfigId, setId: setSelectedGridConfigId } = useSelectedGridConfigId()
   const { gridConfig, setGridConfig } = useGridConfig()
   const { isLoading, isFetching, data } = useAssetGetSavedGridConfigurationsQuery()
-  const { data: roleList } = useRoleGetCollectionQuery()
-  const { data: userList } = useUserGetCollectionQuery()
+  const { data: roleList } = useRoleGetShareCollectionQuery()
+  const { data: userList } = useUserGetShareCollectionQuery()
   const { isFetching: gridConfigIsLoading } = useAssetGetGridConfigurationByFolderIdQuery({
     folderId: getId(),
     configurationId: selectedGridConfigId

assets/js/src/core/modules/class-definition/class-definition-slice-enhanced.ts

@@ -147,6 +147,9 @@ const api = baseApi.enhanceEndpoints({
     classFieldCollectionGetTree: {
       providesTags: () => providingTags.FIELD_COLLECTION_COLLECTION()
     },
+    classObjectBrickClasses: {
+      providesTags: () => providingTags.CLASS_DEFINITION_COLLECTION()
+    },
     classObjectBrickCollection: {
       providesTags: () => providingTags.OBJECT_BRICK_COLLECTION()
     },

assets/js/src/core/modules/data-object/listing/decorator/column-configuration/view-layer/components/grid/hooks/use-grid-options/tabs/grid-config/grid-config-inner.tsx

@@ -19,8 +19,8 @@ import { SaveView } from './views/save-view'
 import { defaultValues } from './forms/save-form'
 import { type DropdownMenuProps } from '@Pimcore/components/dropdown/dropdown'
 import { Content } from '@Pimcore/components/content/content'
-import { useRoleGetCollectionQuery } from '@Pimcore/modules/user/roles/roles-api-slice-enhanced'
-import { useUserGetCollectionQuery } from '@Pimcore/modules/user/user-api-slice-enhanced'
+import { useRoleGetShareCollectionQuery } from '@Pimcore/modules/user/roles/roles-api-slice-enhanced'
+import { useUserGetShareCollectionQuery } from '@Pimcore/modules/user/user-api-slice-enhanced'
 import { useAvailableColumns } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/use-available-columns'
 import { type AvailableColumn } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/available-columns-provider'
 import { useSelectedColumns } from '@Pimcore/modules/element/listing/abstract/configuration-layer/provider/selected-columns/use-selected-columns'
@@ -56,8 +56,8 @@ export const GridConfigInner = (): React.JSX.Element => {
   const { isLoading, isFetching, data } = useDataObjectListSavedGridConfigurationsQuery({
     classId: selectedClassDefinition?.id ?? ''
   }, { skip: selectedClassDefinition === undefined })
-  const { data: roleList } = useRoleGetCollectionQuery()
-  const { data: userList } = useUserGetCollectionQuery()
+  const { data: roleList } = useRoleGetShareCollectionQuery()
+  const { data: userList } = useUserGetShareCollectionQuery()
   const { isFetching: gridConfigIsLoading } = useDataObjectGetGridConfigurationQuery({
     classId: selectedClassDefinition?.id ?? '',
     folderId: getId(),