Merge branch '2026.1' into 2026.x

# Conflicts:
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/documentEditorIframe.html
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/main.html
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/mf-manifest.json
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/mf-stats.json
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/static/js/documentEditorIframe.d6d86727.js
#	public/build/c3c6c4c5-649e-43ca-9129-65a417bc1834/static/js/main.bc6a9271.js
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/exposeRemote.js
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/mf-manifest.json
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/mf-stats.json
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/static/css/async/6411.fbcf1b19.css
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/static/css/async/__federation_expose__internal___mf_bootstrap.da00a316.css
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/static/css/async/__federation_expose__internal___mf_bootstrap_document_editor_iframe.da00a316.css
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/static/js/index.14f98452.js
#	public/build/e6f5837c-d920-40a7-86d8-6ba45898cc34/static/js/remoteEntry.js

Author: Corepex

assets/js/src/core/components/many-to-one-relation/path-target.styles.ts

@@ -53,6 +53,9 @@ export const useStyles = createStyles(({ token, css }, { isDragActive, isOver, i
   }
 
   return {
-    input: getDragStyle()
+    input: getDragStyle(),
+    dropTargetIcon: css`
+      color: ${token.colorIcon};
+    `
   }
 })

assets/js/src/core/components/many-to-one-relation/path-target.tsx

@@ -11,6 +11,7 @@
 import { LoadingOutlined } from '@ant-design/icons'
 import { useDroppable } from '@Pimcore/components/drag-and-drop/hooks/use-droppable'
 import { ElementTag } from '@Pimcore/components/element-tag/element-tag'
+import { Icon } from '@Pimcore/components/icon/icon'
 import { Input } from '@Pimcore/components/input/input'
 import { SanitizeHtml } from '@Pimcore/components/sanitize-html/sanitize-html'
 import { SearchInput } from '@Pimcore/components/search-input/search-input'
@@ -192,6 +193,12 @@ export const PathTarget = forwardRef(function PathTarget (
             placeholder={ showElementTagPrefix ? undefined : t(props.allowPathTextInput === true ? 'many-to-one-relation.drop-placeholder-text-input' : 'many-to-one-relation.drop-placeholder') }
             prefix={ inputPrefix }
             readOnly={ props.allowPathTextInput !== true }
+            suffix={ isNil(value) && !props.disabled ? (
+              <Icon
+                className={ styles.dropTargetIcon }
+                value="drop-target"
+              />
+            ) : undefined }
             value={ showElementTagPrefix ? undefined : displayText }
             { ...searchProps }
           />

assets/js/src/core/components/stack-list/stack-list-item.tsx

@@ -32,11 +32,12 @@ export interface StackListItemProps {
   children: React.ReactNode
   renderRightToolbar?: React.ReactNode
   body?: React.ReactNode
+  defaultActive?: boolean
   meta?: unknown
 }
 
 export const StackListItem = (props: StackListItemProps): React.JSX.Element => {
-  const { id, children, body, sortable = false, renderLeftToolbar, renderRightToolbar, type = StackListItemTypes.DEFAULT } = props
+  const { id, children, body, sortable = false, renderLeftToolbar, renderRightToolbar, type = StackListItemTypes.DEFAULT, defaultActive } = props
   const { styles } = useStyles()
   const { listeners, setNodeRef, setActivatorNodeRef, transform, transition } = useSortable({ id })
 
@@ -108,6 +109,7 @@ export const StackListItem = (props: StackListItemProps): React.JSX.Element => {
           <CollapseItem
             className={ styles.stackListItem }
             contentPadding={ 'none' }
+            defaultActive={ defaultActive }
             extra={ renderRightToolbar }
             extraPosition='end'
             label={ <>{leftSidebarContent}</> }

assets/js/src/core/modules/application-logger/components/sidebar/tabs/filter/provider/filter-provider/filter-provider.tsx

@@ -48,13 +48,24 @@ export interface DateFromFilter {
 
 export interface ColumnFilters extends Array<DateFromFilter> { }
 
-export const FilterProvider = (props: FilterProviderProps): React.JSX.Element => {
+export interface ApplicationLoggerFilterProviderProps extends FilterProviderProps {
+  initialRelatedObjectId?: number | null
+}
+
+const getInitialColumnFilters = (initialRelatedObjectId?: number | null): ColumnFilters => {
+  if (!isNil(initialRelatedObjectId)) {
+    return [{ key: 'relatedobject', type: 'equals', filterValue: initialRelatedObjectId }]
+  }
+  return []
+}
+
+export const FilterProvider = (props: ApplicationLoggerFilterProviderProps): React.JSX.Element => {
   const [dateFrom, setDateFrom] = React.useState<string | null>(null)
   const [dateTo, setDateTo] = React.useState<string | null>(null)
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFilters>([])
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFilters>(() => getInitialColumnFilters(props.initialRelatedObjectId))
   const [logLevel, setLogLevel] = React.useState<string | null>(null)
   const [component, setComponent] = React.useState<string | null>(null)
-  const [relatedObjectId, setRelatedObjectId] = React.useState<number | null>(null)
+  const [relatedObjectId, setRelatedObjectId] = React.useState<number | null>(props.initialRelatedObjectId ?? null)
   const [message, setMessage] = React.useState<string | null>(null)
   const [pid, setPid] = React.useState<number | null>(null)
   const [isLoading, setIsLoading] = React.useState<boolean>(false)

assets/js/src/core/modules/application-logger/tabs/object-tab/object-tab.tsx

@@ -0,0 +1,34 @@
+/**
+ * This source file is available under the terms of the
+ * Pimcore Open Core License (POCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (https://www.pimcore.com)
+ *  @license    Pimcore Open Core License (POCL)
+ */
+
+import React from 'react'
+import { Icon } from '@Pimcore/components/icon/icon'
+import { type IEditorTab } from '@Pimcore/modules/element/editor/tab-manager/interface/IEditorTab'
+import { useElementContext } from '@Pimcore/modules/element/hooks/use-element-context'
+import { ApplicationLoggerContainerInner } from '@Pimcore/modules/application-logger/application-logger-container-inner'
+import { FilterProvider } from '@Pimcore/modules/application-logger/components/sidebar/tabs/filter/provider/filter-provider/filter-provider'
+
+export const ObjectApplicationLoggerTab = (): React.JSX.Element => {
+  const { id } = useElementContext()
+
+  return (
+    <FilterProvider initialRelatedObjectId={ id }>
+      <ApplicationLoggerContainerInner />
+    </FilterProvider>
+  )
+}
+
+export const TAB_APPLICATION_LOGGER: IEditorTab = {
+  key: 'application-logger',
+  label: 'application-logger.label',
+  icon: <Icon value="application-logger" />,
+  children: <ObjectApplicationLoggerTab />,
+  hidden: (element) => !('showAppLoggerTab' in element && element.showAppLoggerTab === true)
+}

assets/js/src/core/modules/data-object/editor/types/object/index.tsx

@@ -21,6 +21,7 @@ import { TAB_PREVIEW, TAB_VERSIONS } from '@Pimcore/modules/data-object/editor/s
 import { TAB_EDIT } from './tab-manager/tabs/edit/edit-container'
 import { TAB_LISTING } from '../folder/tab-manager/tabs/listing/listing-container'
 import { TAB_VARIANTS } from '../variant/tab-manager/tabs/variants/variants-tab-container'
+import { TAB_APPLICATION_LOGGER } from '@Pimcore/modules/application-logger/tabs/object-tab/object-tab'
 
 moduleSystem.registerModule({
   onInit: () => {
@@ -42,5 +43,6 @@ moduleSystem.registerModule({
     objectEditorTabManager.register(childrenTab)
     objectEditorTabManager.register(TAB_VARIANTS)
     objectEditorTabManager.register(TAB_WORKFLOW)
+    objectEditorTabManager.register(TAB_APPLICATION_LOGGER)
   }
 })

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

@@ -54,6 +54,7 @@ export const GridConfigList = (): React.JSX.Element => {
       meta: column,
 
       type: isAdvancedColumn ? 'collapse' : 'default',
+      defaultActive: isAdvancedColumn,
       children: (
         () => isAdvancedColumn
           ? <Tag color='purple'>{advancedColumnName}</Tag>

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

@@ -53,6 +53,7 @@ export const GridConfigModal = (props: GridConfigModalProps): React.JSX.Element
         <PreviewItemProvider>
           <PipelineLayoutProvider pipelineLayout="verbose">
             <Modal
+              closable={ false }
               footer={ null }
               onCancel={ () => onOpenChange?.(false) }
               onClose={ () => onOpenChange?.(false) }
@@ -98,17 +99,17 @@ export const GridConfigModal = (props: GridConfigModalProps): React.JSX.Element
 
                   <Space size="extra-small">
                     <Button
-                      onClick={ onCancelClick }
+                      onClick={ () => { onCancelClick(); onOpenChange?.(false) } }
                       type='default'
                     >
-                      { t('button.cancel') }
+                      { t('grid-config.discard-all-changes') }
                     </Button>
 
                     <Button
                       onClick={ onApplyClick }
                       type='primary'
                     >
-                      { t('button.apply') }
+                      { t('grid-config.apply-changes') }
                     </Button>
                   </Space>
                 </Toolbar>