Merge branch '2026.1' into 2026.x

Author: ValeriaMaltseva

assets/js/src/core/components/background/background.styles.ts

@@ -92,7 +92,6 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
 
       .background-figure {
         position: absolute;
-        will-change: transform;
         flex-shrink: 0;
 
         ${isOrbiting
@@ -132,6 +131,7 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
                 top: -80%;
                 left: -30%;
                 transform: rotate(65.637deg);
+                filter: blur(90px);
               `
           }
         }
@@ -155,6 +155,7 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
                 top: 0;
                 left: 0;
                 transform: rotate(28.303deg);
+                filter: blur(90px);
               `
           }
         }
@@ -178,6 +179,7 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
                 top: 55%;
                 left: 33%;
                 transform: rotate(65.637deg);
+                filter: blur(90px);
               `
           }
         }
@@ -201,9 +203,16 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
     backdropBlur: css`
       position: absolute;
       inset: 0;
-      backdrop-filter: blur(90px);
-      -webkit-backdrop-filter: blur(90px);
       pointer-events: none;
+      opacity: ${isOrbiting ? 1 : 0};
+
+      ${isOrbiting
+        ? css`
+            backdrop-filter: blur(90px);
+            -webkit-backdrop-filter: blur(90px);
+          `
+        : ''
+      }
     `,
     logoImage: css`      position: absolute;
       top: 50%;
@@ -223,7 +232,6 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
       background: rgba(253, 255, 255, 0.35);
       filter: blur(75px);
       pointer-events: none;
-      will-change: transform;
 
       ${isOrbiting
         ? css`animation: ${logoOrbitCW} 3s linear infinite;`
@@ -245,7 +253,6 @@ export const useStyle = createStyles(({ css }, { phase, backgroundShade }: Style
       background: rgba(253, 255, 255, 0.35);
       filter: blur(75px);
       pointer-events: none;
-      will-change: transform;
 
       ${isOrbiting
         ? css`animation: ${logoOrbitCCW} 4s linear infinite;`

assets/js/src/core/components/form/localisation/localized-fields/form-item/types/form-control-with-element-context.tsx

@@ -24,6 +24,7 @@ import { useElementContext } from '@Pimcore/modules/element/hooks/use-element-co
 import { useLanguageSelection } from '@Pimcore/components/language-selection'
 import { useElementDraft } from '@Pimcore/modules/element/hooks/use-element-draft'
 import { useUser } from '@Pimcore/modules/auth/hooks/use-user'
+import { useLocalizedFields } from '../../provider/localized-fields-provider/use-localized-fields'
 
 export interface KeyedFormItemControlProps {
   children: React.ReactNode
@@ -41,15 +42,21 @@ export const FormControlWithElementContext = ({ children, ...props }: KeyedFormI
   const element = useElementContext()
   const elementDraft = useElementDraft(element.id, element.elementType)
   const languageSelection = useLanguageSelection()
+  const localizedContext = useLocalizedFields()
+  const activeLanguage = localizedContext?.locales[0] ?? languageSelection.currentLanguage
 
   if ('permissions' in elementDraft) {
     const permissions: Record<string, any> = elementDraft.permissions as Record<string, any>
     let editableLanguages: string[] = permissions?.localizedEdit?.split(',') ?? []
-    if ((editableLanguages.length === 1 && editableLanguages[0] === 'default') || (editableLanguages.length === 0)) {
+
+    const isEmptyEditableLanguages = editableLanguages.length === 0
+
+    // empty array or 'default' means all languages are editable
+    if ((editableLanguages.length === 1 && editableLanguages[0] === 'default') || isEmptyEditableLanguages) {
       editableLanguages = Array.isArray(user.contentLanguages) ? user.contentLanguages as string[] : []
     }
 
-    isDisabled = !editableLanguages.includes(languageSelection.currentLanguage)
+    isDisabled = !isEmptyEditableLanguages && !editableLanguages.includes(activeLanguage)
   }
 
   if (!isValidElement(Child)) {
@@ -64,5 +71,5 @@ export const FormControlWithElementContext = ({ children, ...props }: KeyedFormI
       { ...props }
       disabled={ Child.props.disabled === true || (props.disabled !== true ? isDisabled : false) }
     />
-  ), [Child, props])
+  ), [Child, isDisabled, props])
 }

assets/js/src/core/components/language-selection/language-selection.tsx

@@ -138,8 +138,10 @@ export const LanguageSelection = ({ languages, customKeys = [], selectedLanguage
     })
   }, [customKeys, filteredLanguages, t, validLocales])
 
-  const handleMenuClick: MenuProps['onClick'] = ({ key }) => {
-    handleLanguageChange(String(key))
+  const handleMenuClick: MenuProps['onClick'] = (e) => {
+    e.domEvent.stopPropagation()
+
+    handleLanguageChange(String(e.key))
     setDropdownOpen(false)
     setSearchQuery('')
   }

assets/js/src/core/modules/application-logger/components/table/table.tsx

@@ -85,7 +85,7 @@ export const Table = ({ items, isLoading, sorting, onSortingChange }: TableProps
       enableSorting: true,
       cell: ({ row }): React.JSX.Element => {
         const column = row.original
-        const fileObjectBasePath = '/admin/bundle/applicationlogger/log/show-file-object?filePath='
+        const fileObjectBasePath = '/pimcore-studio/api/bundle/application-logger/file-object?filePath='
 
         if (isNil(column.fileObject)) {
           return <></>

assets/js/src/core/modules/data-object/editor/toolbar/language-comparison-view/language-comparison-content.tsx

@@ -26,6 +26,7 @@ import { useStyles } from './language-comparison-modal.styles'
 
 interface ILanguageComparisonColumnProps {
   locales: string[]
+  editableLanguages: string[]
   layoutData: ILocalizedFieldDescriptor[]
   isAllowedToEdit: boolean
 }
@@ -52,7 +53,7 @@ const groupIntoSections = (items: ILocalizedFieldDescriptor[]): ILocalizedSectio
   return sections
 }
 
-export const LanguageComparisonContent = ({ layoutData, locales, isAllowedToEdit }: ILanguageComparisonColumnProps): React.JSX.Element => {
+export const LanguageComparisonContent = ({ layoutData, locales, editableLanguages, isAllowedToEdit }: ILanguageComparisonColumnProps): React.JSX.Element => {
   const { styles } = useStyles()
 
   const renderSectionTitle = ({ breadcrumbTitle, hideSectionTitle }: { breadcrumbTitle: string, hideSectionTitle: boolean }): React.JSX.Element | null => {
@@ -85,6 +86,9 @@ export const LanguageComparisonContent = ({ layoutData, locales, isAllowedToEdit
     const shouldWrapLocalizedProvider = item.localeInFormPath !== true
     const fieldKey = `${item.formPath.join('.')}-${fieldIndex}-${locale}`
 
+    // empty array means all languages are editable
+    const isEmptyEditableLanguages = editableLanguages.length === 0
+
     const fieldNode = (
       <CombinedFieldNameProvider
         combinedFieldNameParent={ combinedFieldNameParent }
@@ -93,7 +97,7 @@ export const LanguageComparisonContent = ({ layoutData, locales, isAllowedToEdit
         <Form.Group name={ resolvedGroupPath }>
           <ObjectComponent
             { ...item.fieldData }
-            noteditable={ !isAllowedToEdit }
+            noteditable={ !isAllowedToEdit || (!isEmptyEditableLanguages && !editableLanguages.includes(locale)) }
           />
         </Form.Group>
       </CombinedFieldNameProvider>

assets/js/src/core/modules/data-object/editor/toolbar/language-comparison-view/language-comparison-modal.tsx

@@ -69,6 +69,8 @@ export const LanguageComparisonModal = ({ open, onClose }: LanguageComparisonMod
   const [changedValues, setChangedValues] = useState<Record<string, any>>({})
 
   const isAllowedToEdit = checkElementPermission(dataObject?.permissions, 'save')
+  const viewableLanguages: string[] = useMemo(() => dataObject?.permissions?.localizedView?.split(',') ?? [], [dataObject?.permissions])
+  const editableLanguages: string[] = useMemo(() => dataObject?.permissions?.localizedEdit?.split(',') ?? [], [dataObject?.permissions])
 
   const initialValues: Partial<any> = useMemo(() => {
     return editForm.getFieldsValue(true)
@@ -86,11 +88,11 @@ export const LanguageComparisonModal = ({ open, onClose }: LanguageComparisonMod
 
   useEffect(() => {
     if (open) {
-      const languagesByPriority = [currentLanguage, ...contentLanguages.filter(language => language !== currentLanguage)]
+      const languagesByPriority = [currentLanguage, ...contentLanguages.filter(language => viewableLanguages.includes(language) && language !== currentLanguage)]
 
       setSelectedLocales([languagesByPriority[0] ?? currentLanguage, languagesByPriority[1] ?? null])
     }
-  }, [open, currentLanguage, contentLanguages])
+  }, [open, currentLanguage, contentLanguages, viewableLanguages])
 
   useEffect(() => {
     if (isNil(layoutData) || !open) {
@@ -211,6 +213,7 @@ export const LanguageComparisonModal = ({ open, onClose }: LanguageComparisonMod
               preserve
             >
               <LanguageComparisonContent
+                editableLanguages={ editableLanguages }
                 isAllowedToEdit={ isAllowedToEdit }
                 layoutData={ localizedFields }
                 locales={ selectedLocales }

assets/js/src/core/modules/document/editor/shared-tab-manager/tabs/edit/components/editables-dialog/editable-dialog.tsx

@@ -142,10 +142,10 @@ export const EditableDialog = ({ config, visible, onClose, editableDefinitions }
   return (
     <WindowModal
       cancelButtonProps={ { style: { display: 'none' } } }
+      closable={ false }
       destroyOnClose
       getContainer={ () => document.body }
       okText={ t('save') }
-      onCancel={ onClose }
       onOk={ onClose }
       open={ visible }
       size="L"

assets/js/src/core/modules/element/dynamic-types/definitions/pipelines/grid/source-fields/components/simple-field/simple-field.tsx

@@ -11,22 +11,83 @@
 import { Form } from '@Pimcore/components/form/form'
 import { usePipelineConfig } from '@Pimcore/components/pipeline/provider/pipeline-config/use-pipeline-config'
 import { Select } from '@Pimcore/components/select/select'
-import React from 'react'
+import React, { useContext, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { AvailableColumnsContext } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/available-columns-provider'
+
+interface SimpleFieldOption {
+  label: string
+  value: string
+}
+
+const resolveGroupLabel = (group: unknown, translate: (key: string) => string): string | undefined => {
+  if (group === undefined || group === null) {
+    return undefined
+  }
+
+  let parts: string[] = []
+
+  if (typeof group === 'string') {
+    parts = group.split('.')
+  } else if (Array.isArray(group)) {
+    if (group.length === 0) {
+      return undefined
+    }
+
+    const firstPath = Array.isArray(group[0]) ? group[0] : group
+    parts = (firstPath as unknown[]).map(part => String(part))
+  } else {
+    return undefined
+  }
+
+  const labeledParts = parts.filter(part => part !== '').map(part => translate(part))
+
+  return labeledParts.length > 0 ? labeledParts.join(' / ') : undefined
+}
 
 export const DynamicTypePipelineGridSourceFieldsSimpleFieldComponent = (): React.JSX.Element => {
   const { config } = usePipelineConfig()
   const { t } = useTranslation()
+  const availableColumnsContext = useContext(AvailableColumnsContext)
 
   const sourceFieldConfig = config?.simpleField
   if (sourceFieldConfig === undefined) {
     throw new Error('Source field configuration is missing')
   }
 
-  const sourceFieldOptions = sourceFieldConfig.map(configOption => ({
-    label: configOption.name,
-    value: configOption.key
-  }))
+  const sourceFieldOptions = useMemo(() => {
+    const groupByKey = new Map<string, string | undefined>()
+    for (const column of availableColumnsContext?.availableColumns ?? []) {
+      groupByKey.set(String(column.key), resolveGroupLabel(column.group, t))
+    }
+
+    const groups = new Map<string, SimpleFieldOption[]>()
+    const ungrouped: SimpleFieldOption[] = []
+
+    for (const configOption of sourceFieldConfig) {
+      const key = String(configOption.key)
+      const option: SimpleFieldOption = {
+        label: String(configOption.name),
+        value: key
+      }
+      const groupLabel = groupByKey.get(key)
+
+      if (groupLabel === undefined) {
+        ungrouped.push(option)
+        continue
+      }
+
+      const bucket = groups.get(groupLabel) ?? []
+      bucket.push(option)
+      groups.set(groupLabel, bucket)
+    }
+
+    const groupedOptions = [...groups.entries()]
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([label, options]) => ({ label, options }))
+
+    return [...groupedOptions, ...ungrouped]
+  }, [sourceFieldConfig, availableColumnsContext?.availableColumns, t])
 
   return (
     <Form.Item

assets/js/src/core/modules/execution-engine/jobs/batch-delete/abstract-batch-delete-job.ts

@@ -12,7 +12,7 @@ import { isNil } from 'lodash'
 import trackError, { GeneralError } from '@Pimcore/modules/app/error-handler'
 import { type JobInterface, type JobRunOptions } from '../job-interface'
 import { MessageBusJobHandler, type JobCompletionData } from '../../message-handlers/message-bus-job/message-bus-job-handler'
-import { StepCompletionCalculator } from '../../message-handlers/message-bus-job/progress-calculator/step-completion-calculator'
+import { BatchedStepProgressCalculator } from '../../message-handlers/message-bus-job/progress-calculator/batched-step-progress-calculator'
 import { t } from 'i18next'
 
 export interface AbstractBatchDeleteJobOptions {
@@ -85,7 +85,7 @@ export abstract class AbstractBatchDeleteJob implements JobInterface {
     return new MessageBusJobHandler({
       jobRunId: options.jobRunId,
       title: t('batch-delete.job-title'),
-      progressCalculator: new StepCompletionCalculator(),
+      progressCalculator: new BatchedStepProgressCalculator(),
       onJobCompletion: options.onJobCompletion,
       onRetry: options.onRetry
     })

assets/js/src/core/modules/execution-engine/jobs/delete/element-delete-job.ts

@@ -15,7 +15,7 @@ import trackError, { ApiError, GeneralError } from '@Pimcore/modules/app/error-h
 import { type JobInterface, type JobRunOptions } from '../job-interface'
 import { type ElementType } from '@Pimcore/types/enums/element/element-type'
 import { MessageBusJobHandler, type JobCompletionData } from '../../message-handlers/message-bus-job/message-bus-job-handler'
-import { StepCompletionCalculator } from '../../message-handlers/message-bus-job/progress-calculator/step-completion-calculator'
+import { BatchedStepProgressCalculator } from '../../message-handlers/message-bus-job/progress-calculator/batched-step-progress-calculator'
 import { api as elementApi } from '@Pimcore/modules/element/element-api-slice.gen'
 import { t } from 'i18next'
 import { type RehydratableJob, type JobRunList } from '../../services/job-rehydration-registry'
@@ -155,7 +155,7 @@ export class DeleteJob implements JobInterface {
     return new MessageBusJobHandler({
       jobRunId: options.jobRunId,
       title: t('element.delete.deleting-folder'),
-      progressCalculator: new StepCompletionCalculator(),
+      progressCalculator: new BatchedStepProgressCalculator(),
       onJobCompletion: options.onJobCompletion,
       onRetry: options.onRetry
     })