Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split up cql query by source for current page export #962

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Split up cql query by source for current page export #962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1542a3
Split up cql query by source for current page export
Jul 24, 2024
20ddef1
remove console log
Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions ...ontend/packages/catalog-ui-search/src/main/webapp/component/table-export/table-export.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import ProgressButton from '../../react-component/progress-button/progress-butto
import DialogContent from '@mui/material/DialogContent/DialogContent'
import DialogActions from '@mui/material/DialogActions/DialogActions'
import DialogContentText from '@mui/material/DialogContentText'
import { LazyQueryResult } from '../../js/model/LazyQueryResult/LazyQueryResult'

export type Props = {
selectionInterface: any
Expand Down Expand Up @@ -80,7 +81,6 @@ function getHits(sources: Source[]): number {
.filter((source) => source.id !== 'cache')
.reduce((hits, source) => (source.hits ? hits + source.hits : hits), 0)
}

function getExportCount({
exportSize,
selectionInterface,
Expand Down Expand Up @@ -129,6 +129,11 @@ export const getWarning = (exportCountInfo: ExportCountInfo): string => {
return warningMessage
}

type SourceIdPair = {
id: string
sourceId: string
}

export const getExportBody = async (ExportInfo: ExportInfo) => {
const { exportSize, customExportCount, selectionInterface } = ExportInfo
const exportResultLimit = StartupDataStore.Configuration.getExportLimit()
Expand All @@ -140,8 +145,6 @@ export const getExportBody = async (ExportInfo: ExportInfo) => {
const cacheId = query.get('cacheId')
const phonetics = query.get('phonetics')
const spellcheck = query.get('spellcheck')
const results = Object.keys(query.get('result').get('lazyResults').results)
const pageSize = results.length
const exportCount = Math.min(
getExportCount({ exportSize, selectionInterface, customExportCount }),
exportResultLimit
Expand All @@ -151,25 +154,46 @@ export const getExportBody = async (ExportInfo: ExportInfo) => {
columnOrder: columnOrder.length > 0 ? columnOrder : [],
columnAliasMap: StartupDataStore.Configuration.config?.attributeAliases,
}

const searches = []
let queryCount = exportCount
let cql = DEFAULT_USER_QUERY_OPTIONS.transformFilterTree({
originalFilterTree: query.get('filterTree'),
queryRef: query,
})
if (ExportInfo.exportSize === 'currentPage') {
queryCount = pageSize
cql = getResultSetCql(results)
}
const resultIdSourcePairs: SourceIdPair[] = Object.values(
query.get('result').get('lazyResults').results
).map((result: LazyQueryResult) => ({
id: result.plain.metacard.properties['id'],
sourceId: result.plain.metacard.properties['source-id'],
}))

const searches = [
{
const srcMap: Record<string, string[]> = resultIdSourcePairs.reduce(
(srcMap: Record<string, string[]>, curPair: SourceIdPair) => {
if (!srcMap[curPair.sourceId]) {
srcMap[curPair.sourceId] = []
}
srcMap[curPair.sourceId].push(curPair.id)
return srcMap
},
{} as Record<string, string[]>
)
Object.keys(srcMap).forEach((src) => {
searches.push({
srcs: [src],
cql: getResultSetCql(srcMap[src]),
count: srcMap[src].length,
cacheId,
})
})
} else {
searches.push({
srcs,
cql,
count: queryCount,
cacheId,
},
]
})
}

return {
phonetics,
Expand Down