Merge branch '2026.1' into 2026.x

Author: ValeriaMaltseva

assets/js/src/core/modules/data-object/listing/decorator/column-configuration/view-layer/components/grid/hooks/use-grid-options/tabs/grid-config/forms/advanced-column-form/preview/preview-item-selection.tsx

@@ -28,7 +28,7 @@ export const PreviewItemSelection = (): React.JSX.Element => {
     },
     config: {
       objects: {
-        allowedTypes: [selectedClassDefinition?.name ?? '']
+        allowedClasses: selectedClassDefinition?.name !== undefined ? [selectedClassDefinition.name] : undefined
       }
     },
 

assets/js/src/core/modules/reports/reports-editor/components/report-configuration/components/general-settings/general-settings.tsx

@@ -13,6 +13,7 @@ import { useTranslation } from 'react-i18next'
 import { FormKit } from '@Pimcore/components/form/form-kit'
 import { Form } from '@Pimcore/components/form/form'
 import { Input } from '@Pimcore/components/input/input'
+import { IconSelector } from '@Pimcore/components/icon-selector/icon-selector'
 import { Switch } from '@Pimcore/components/switch/switch'
 
 export const GeneralSettings = (): React.JSX.Element => {
@@ -32,14 +33,24 @@ export const GeneralSettings = (): React.JSX.Element => {
     <FormKit.Panel title={ t('reports.editor.general-settings.title') }>
       {renderInputItem({ label: t('reports.editor.general-settings.name-label'), name: 'name', disabled: true })}
       {renderInputItem({ label: t('reports.editor.general-settings.display-name-label'), name: 'niceName' })}
-      {renderInputItem({ label: t('reports.editor.general-settings.icon-class-label'), name: 'iconClass' })}
+      <Form.Item
+        label={ t('reports.editor.general-settings.icon-class-label') }
+        name="iconClass"
+      >
+        <IconSelector />
+      </Form.Item>
       {renderInputItem({
         label: t('reports.editor.general-settings.group-label'),
         name: 'group',
         tooltip: t('reports.editor.general-settings.group-tooltip')
       })}
       {renderInputItem({ label: t('reports.editor.general-settings.report-class-label'), name: 'reportClass' })}
-      {renderInputItem({ label: t('reports.editor.general-settings.group-icon-class-label'), name: 'groupIconClass' })}
+      <Form.Item
+        label={ t('reports.editor.general-settings.group-icon-class-label') }
+        name="groupIconClass"
+      >
+        <IconSelector />
+      </Form.Item>
       <Form.Item name="menuShortcut">
         <Switch labelRight={ t('reports.editor.general-settings.shortcut-menu-label') } />
       </Form.Item>

assets/js/src/core/modules/reports/reports-editor/components/report-configuration/helpers.ts

@@ -12,8 +12,10 @@ import { castArray, isNull } from 'lodash'
 import { type ReportFormData } from '@Pimcore/modules/reports/reports-editor/hooks/use-report-form-state'
 import {
   type BundleCustomReportsColumnConfigurationUpdateData,
+  type BundleCustomReportUpdate,
   type CustomReportsConfigUpdateApiArg
 } from '@Pimcore/modules/reports/custom-reports-api-slice.gen'
+import { denormalizeIcon } from '@Pimcore/utils/normalize-icon'
 
 export const normalizeDataSourceConfig = (data: ReportFormData): {
   dataSourceConfig: CustomReportsConfigUpdateApiArg['bundleCustomReportUpdate']['dataSourceConfig']
@@ -58,3 +60,15 @@ export const normalizeColumnConfigurations = (data: ReportFormData): INormalizeC
     columnConfigurations: cleanedColumns
   }
 }
+
+interface INormalizeIconFieldsReturn {
+  iconClass: BundleCustomReportUpdate['iconClass']
+  groupIconClass: BundleCustomReportUpdate['groupIconClass']
+}
+
+export const normalizeIconFields = (data: ReportFormData): INormalizeIconFieldsReturn => {
+  return {
+    iconClass: denormalizeIcon(data?.iconClass) ?? '',
+    groupIconClass: denormalizeIcon(data?.groupIconClass) ?? ''
+  }
+}

assets/js/src/core/modules/reports/reports-editor/components/report-configuration/report-configuration.tsx

@@ -32,7 +32,8 @@ import { Permissions } from '@Pimcore/modules/reports/reports-editor/components/
 import {
   normalizeChartData,
   normalizeColumnConfigurations,
-  normalizeDataSourceConfig
+  normalizeDataSourceConfig,
+  normalizeIconFields
 } from '@Pimcore/modules/reports/reports-editor/components/report-configuration/helpers'
 import { Form } from '@Pimcore/components/form/form'
 import { loadReportsMenuItems } from '@Pimcore/modules/reports/utils/reports-loader'
@@ -104,6 +105,7 @@ export const ReportConfiguration = ({ report, isActive, modifiedReports, setModi
 
     const bundleCustomReportUpdateData: BundleCustomReportUpdate = {
       ...currentData,
+      ...normalizeIconFields(currentData),
       ...normalizeDataSourceConfig(currentData),
       ...normalizeChartData(currentData),
       ...normalizeColumnConfigurations(currentData),

assets/js/src/core/modules/reports/reports-editor/hooks/use-report-form-state.ts

@@ -10,15 +10,26 @@
 
 import { useMemo, useState } from 'react'
 import { isEqual, isNull } from 'lodash'
+import { type ElementIcon } from '@Pimcore/components/icon/icon'
 import { type BundleCustomReportsDetails } from '@Pimcore/modules/reports/custom-reports-api-slice.gen'
+import { normalizeIcon } from '@Pimcore/utils/normalize-icon'
 
-export type ReportFormData = BundleCustomReportsDetails
+export type ReportFormData = Omit<BundleCustomReportsDetails, 'iconClass' | 'groupIconClass'> & {
+  iconClass: ElementIcon | null
+  groupIconClass: ElementIcon | null
+}
+
+export const normalizeReportFormData = (data: BundleCustomReportsDetails): ReportFormData => ({
+  ...data,
+  iconClass: normalizeIcon(data?.iconClass),
+  groupIconClass: normalizeIcon(data?.groupIconClass)
+})
 
 interface IUseReportFormStateReturn {
   initialData: ReportFormData | null
   currentData: ReportFormData | null
   isDirty: boolean
-  initializeForm: (data: ReportFormData) => void
+  initializeForm: (data: BundleCustomReportsDetails) => void
   updateFormData: (data: Partial<ReportFormData>) => void
   markFormSaved: () => void
 }
@@ -27,9 +38,11 @@ export const useReportFormState = (): IUseReportFormStateReturn => {
   const [initialData, setInitialData] = useState<ReportFormData | null>(null)
   const [currentData, setCurrentData] = useState<ReportFormData | null>(null)
 
-  const initializeForm = (data: ReportFormData): void => {
-    setInitialData({ ...data })
-    setCurrentData({ ...data })
+  const initializeForm = (data: BundleCustomReportsDetails): void => {
+    const normalizedData = normalizeReportFormData(data)
+
+    setInitialData({ ...normalizedData })
+    setCurrentData({ ...normalizedData })
   }
 
   const updateFormData = (data: Partial<ReportFormData>): void => {

doc/03_Configuration_and_Administration/01_Configuration/04_Additional_CSS_or_JS_Files.md

@@ -7,7 +7,17 @@ title: Including Additional CSS or JS Files
 Pimcore Studio plugins typically require a frontend build and entry point files.
 For details, refer to the [Getting started with your first plugin guide](../../04_Extending/01_Getting_Started_with_Your_First_Plugin.md).
 
-However, if you want to include additional CSS or JS files that are not part of the frontend build (e.g., to add a basic CSS class or include an external script), configure them in the config tree:
+However, if you want to include additional CSS or JS files that are not part of the frontend build (e.g., to add a basic CSS class or include an external script), configure them in the config tree.
+
+> **Important — use absolute paths**
+>
+> The values configured below are rendered verbatim into `<link href="...">` and `<script src="...">` tags.
+> Always provide an **absolute, web-accessible URL path** (starting with `/`) or a full external URL — relative values like `my-custom-css.css` will not resolve correctly.
+>
+> Typical sources for these files:
+> - **Files shipped by a Pimcore bundle:** place them in the bundle's `public/` directory and run `bin/console assets:install --symlink --relative`. They are then served from `/bundles/<bundle-name>/...` (the bundle name is the lowercased class name without the `Bundle` suffix, e.g. `MyCustomBundle` → `/bundles/mycustom/`).
+> - **Files in the application's `public/` directory:** they are served from the path they live at, e.g. `public/static/custom.css` → `/static/custom.css`.
+> - **External resources:** provide the full URL, e.g. `https://cdn.example.com/lib.js`.
 
 ## Regular Pimcore Studio Resources
 
@@ -17,9 +27,11 @@ For the main Pimcore Studio interface:
 pimcore_studio_ui:
    static_resources:
       css:
-         - my-custom-css.css
+         - /bundles/mycustom/css/my-custom-css.css
+         - /static/global-overrides.css
       js:
-         - my-custom-js.js
+         - /bundles/mycustom/js/my-custom-js.js
+         - https://cdn.example.com/some-lib.min.js
 ```
 
 ## Document Editmode Resources
@@ -31,9 +43,9 @@ pimcore_studio_ui:
    static_resources:
       editmode:
          css:
-            - my-editmode-styles.css
+            - /bundles/mycustom/css/my-editmode-styles.css
          js:
-            - my-editmode-scripts.js
+            - /bundles/mycustom/js/my-editmode-scripts.js
 ```
 
 ## Multi-Bundle Configuration
@@ -45,21 +57,21 @@ When multiple bundles define static resources, they will be automatically merged
 pimcore_studio_ui:
    static_resources:
       css:
-         - bundle-a-styles.css
+         - /bundles/bundlea/css/bundle-a-styles.css
       editmode:
          css:
-            - bundle-a-editmode.css
+            - /bundles/bundlea/css/bundle-a-editmode.css
 ```
 
 **Bundle B:**
 ```yaml
 pimcore_studio_ui:
    static_resources:
       css:
-         - bundle-b-styles.css
+         - /bundles/bundleb/css/bundle-b-styles.css
       editmode:
          css:
-            - bundle-b-editmode.css
+            - /bundles/bundleb/css/bundle-b-editmode.css
 ```
 
 **Result:** All files from both bundles will be included in their respective contexts, with duplicates automatically removed.

doc/04_Extending/01_Getting_Started_with_Your_First_Plugin.md

@@ -10,7 +10,7 @@ Plugins provide additional tools, widgets, or settings that enhance the user exp
 
 ## Getting started
 
-Create your Pimcore Studio Plugin either in a [Pimcore Bundle](https://pimcore.com/docs/platform/Pimcore/Extending_Pimcore/Bundle_Developers_Guide/)
+Create your Pimcore Studio Plugin either in a [Pimcore Bundle](https://docs.pimcore.com/platform/Pimcore/Extending_Pimcore/Pimcore_Bundle_Developers_Guide/)
 (the way to go when your Studio Plugin should be reused in multiple Pimcore installations), or directly in your Pimcore App
 without creating a Pimcore Bundle.