Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 12 additions & 1 deletion assets/js/src/core/app/api/pimcore/tags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export const invalidatingTags = {
ELEMENT_TAGS: (elementType: ElementType, id: number) => [getElementSpecificTag(tagNames.ELEMENT_TAGS, elementType, id)],
ROLE: () => [tagNames.ROLE],
PREDEFINED_ASSET_METADATA: () => [tagNames.PREDEFINED_ASSET_METADATA],
ELEMENT_DETAIL: (elementType: ElementType, id: number) => [getElementDetailTag(elementType, id)],
ELEMENT_DETAIL: (elementType: ElementType, id: number) => [getElementDetailTag(elementType, id), getElementGridTag(elementType)],
EMAIL_BLOCKLIST: () => [tagNames.EMAIL_BLOCKLIST],
EMAIL_BLOCKLIST_DETAIL: (id: string) => [{ type: tagNames.EMAIL_BLOCKLIST_DETAIL, id }],
APPLICATION_LOGGER: () => [tagNames.APPLICATION_LOGGER],
Expand Down Expand Up @@ -278,3 +278,14 @@ const getElementDetailTag = (elementType: ElementType, id: number): Tag => {
return { type: tagNames.DOCUMENT_DETAIL, id }
}
}

const getElementGridTag = (elementType: ElementType): Tag => {
switch (elementType) {
case 'asset':
return tagNames.ASSET_GRID
case 'data-object':
return tagNames.DATA_OBJECT_GRID
case 'document':
return tagNames.DOCUMENT
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { invalidatingTags, tagNames } from '@Pimcore/app/api/pimcore/tags'
import { type DocumentPermissions } from '../document/document-api-slice.gen'

const api = baseApi.enhanceEndpoints({
addTagTypes: [tagNames.DATA_OBJECT_DETAIL, tagNames.ASSET_DETAIL],
addTagTypes: [tagNames.DATA_OBJECT_DETAIL, tagNames.ASSET_DETAIL, tagNames.ASSET_GRID, tagNames.DATA_OBJECT_GRID],
endpoints: {
elementDelete: {
invalidatesTags: (result, error, args) => invalidatingTags.ELEMENT_DETAIL(args.elementType, args.id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,32 @@ export const WithRowSelection = (useBaseHook: IRowSelectionDecoratorProps['useGr
const { selectedRows, setSelectedRows, selectedRowsData, setSelectedRowsData } = useRowSelection()
const { availableColumns } = useAvailableColumns()

useEffect(() => {
if (data?.items === undefined) {
return
}

const items = data.items as Array<{ columns: Array<{ key: string, value: unknown }> }>
const dataItemIds = new Set(
items.map(item => item.columns.find(column => column.key === 'id')?.value).filter(Boolean)
)

const prunedSelectedRows: Record<string, boolean> = {}
let selectionChanged = false

for (const key in selectedRows) {
if (dataItemIds.has(Number.parseInt(key))) {
prunedSelectedRows[key] = selectedRows[key]
} else {
selectionChanged = true
}
}

if (selectionChanged) {
setSelectedRows(prunedSelectedRows)
}
}, [data?.items])

useEffect(() => {
const newSelectedRowsData: RowSelectionData['selectedRowsData'] = {}
const systemColumns = availableColumns.filter(column => Array.isArray(column.group) && column.group.includes('system'))
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions public/build/17bd6268-3b5a-438b-a622-17d09f6ee3cb/entrypoints.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions public/build/17bd6268-3b5a-438b-a622-17d09f6ee3cb/manifest.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions public/build/22b98483-c82e-4ca2-a8ec-112f00562251/entrypoints.json

This file was deleted.

Loading
Loading