Merge branch '2026.1' into 2026.x

Author: ValeriaMaltseva

assets/build/api/docs.jsonopenapi.json

@@ -113,7 +113,11 @@ export const EditableHtmlDropContainer = ({
         {hasContent && !isLoading && isNil(error) && (
           <>
             <Tooltip title={ dropZoneText }>
-              <div className={ styles.renderedContent }>
+              {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
+              <div
+                className={ styles.renderedContent }
+                onClick={ (e) => { e.preventDefault() } }
+              >
                 {renderedContent}
               </div>
             </Tooltip>

assets/js/src/core/assets/icons/page-static.inline.svg

@@ -764,6 +764,30 @@ const slice = createSlice({
           }))
         }
       })
+    },
+    setDocumentNodeStaticGeneratorEnabled: (
+      state,
+      { payload }: PayloadAction<{ nodeId: string, staticGeneratorEnabled: boolean }>
+    ) => {
+      Object.keys(state).forEach(treeId => {
+        if (state[treeId].nodes[payload.nodeId]?.treeNodeProps?.elementType === elementTypes.document) {
+          updateNodeState(state, treeId, payload.nodeId, node => ({
+            ...node,
+            treeNodeProps: !isUndefined(node.treeNodeProps)
+              ? {
+                  ...node.treeNodeProps,
+                  metaData: {
+                    ...node.treeNodeProps.metaData,
+                    document: {
+                      ...node.treeNodeProps.metaData?.document,
+                      staticGeneratorEnabled: payload.staticGeneratorEnabled
+                    }
+                  }
+                }
+              : undefined
+          }))
+        }
+      })
     }
   }
 })
@@ -772,7 +796,7 @@ export const treeSliceName = slice.name
 
 injectSliceWithState(slice)
 
-export const { setNodeLoading, setNodeLoadingInAllTree, setNodeExpanded, setNodeHasChildren, setNodePage, setNodeSearchTerm, setSelectedNodeIds, setNodeScrollTo, updateNodesByParentId, locateInTree, setFetchTriggered, setRootFetchTriggered, setNodeFetching, setNodeFetchingInAllTrees, markNodeDeletingForTree, refreshNodeChildren, refreshTargetNode, refreshSourceNode, markNodeDeleting, renameNode, updateNodeData, updateNodeType, setNodePublished, setNodeAdditionalAttributes, setRootNode, setDocumentNodeSiteStatus, setNodeLocked, refreshTreeByElementType, setDocumentNodeNavigationExclude } = slice.actions
+export const { setNodeLoading, setNodeLoadingInAllTree, setNodeExpanded, setNodeHasChildren, setNodePage, setNodeSearchTerm, setSelectedNodeIds, setNodeScrollTo, updateNodesByParentId, locateInTree, setFetchTriggered, setRootFetchTriggered, setNodeFetching, setNodeFetchingInAllTrees, markNodeDeletingForTree, refreshNodeChildren, refreshTargetNode, refreshSourceNode, markNodeDeleting, renameNode, updateNodeData, updateNodeType, setNodePublished, setNodeAdditionalAttributes, setRootNode, setDocumentNodeSiteStatus, setNodeLocked, refreshTreeByElementType, setDocumentNodeNavigationExclude, setDocumentNodeStaticGeneratorEnabled } = slice.actions
 
 export const selectNodeState = createSelector(
   (state: RootState) => state.trees,

assets/js/src/core/components/editable-html-drop-container/editable-html-drop-container.tsx

@@ -47,7 +47,7 @@ export const Table = ({ items }: TableProps): React.JSX.Element => {
   const tableItems = items.map((item) => {
     return {
       ...item,
-      date: formatDateTime({ timestamp: item.date, dateStyle: 'short', timeStyle: 'short' }),
+      date: formatDateTime({ timestamp: item.date, dateStyle: 'short', timeStyle: 'medium' }),
       translatedPriority: t(`application-logger.filter.priority-level.${item.priority}`)
     }
   })

assets/js/src/core/components/element-tree/element-tree-slice.ts

@@ -21,6 +21,7 @@ import { uuid } from '@Pimcore/utils/uuid'
 import { type StackListItemProps } from '@Pimcore/components/stack-list/stack-list-item'
 import { type AvailableColumn } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/context-layer/provider/available-columns/available-columns-provider'
 import { isEmptyValue } from '@Pimcore/utils/type-utils'
+import { hasFieldDefinition } from '@Pimcore/modules/element/listing/decorators/utils/column-configuration/has-field-definition'
 
 interface GridConfigListProps {
   columns: AvailableColumn[]
@@ -44,7 +45,7 @@ export const GridConfigList = ({ columns }: GridConfigListProps): React.JSX.Elem
 
     let translationKey = `${column.key}`
 
-    if ('fieldDefinition' in column.config) {
+    if (hasFieldDefinition(column.config)) {
       const fieldDefinition = column.config.fieldDefinition as Record<string, any>
       translationKey = !isEmptyValue(fieldDefinition?.title) ? fieldDefinition?.title : column.key
     }

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

@@ -277,6 +277,7 @@ export const CollectionsTab = ({ storeId }: ICollectionsTabProps): React.JSX.Ele
                     setPageSize(newPageSize)
                   } }
                   showSizeChanger
+                  showTotal={ (total) => t('pagination.show-total', { total }) }
                   total={ total }
                 />
               </Toolbar>

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

@@ -180,6 +180,7 @@ export const CollectionGroupRelationsGrid = ({
                 setPageSize(newPageSize)
               } }
               showSizeChanger
+              showTotal={ (total) => t('pagination.show-total', { total }) }
               total={ total }
             />
           </Toolbar>

assets/js/src/core/modules/classification-store-config/components/store-editor/tabs/collections-tab.tsx

@@ -284,6 +284,7 @@ export const GroupsTab = ({ storeId }: IGroupsTabProps): React.JSX.Element => {
                     setPageSize(newPageSize)
                   } }
                   showSizeChanger
+                  showTotal={ (total) => t('pagination.show-total', { total }) }
                   total={ total }
                 />
               </Toolbar>

assets/js/src/core/modules/classification-store-config/components/store-editor/tabs/collections/collection-group-relations-grid.tsx

@@ -205,6 +205,7 @@ export const KeyGroupRelationsGrid = ({
                 setPageSize(newPageSize)
               } }
               showSizeChanger
+              showTotal={ (total) => t('pagination.show-total', { total }) }
               total={ total }
             />
           </Toolbar>