lucasw89/KefinTweaks
1
0
Fork 0
mirror of https://github.com/ranaldsgift/KefinTweaks.git synced 2026-11-05 15:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-query previews, and ensure multi query merging respects section level sortby/sortorder

Browse Source
This commit is contained in:
HighImKevin
2026-10-21 19:07:57 -04:00
parent 688023a1d9
commit 820c2cec1f
4 changed files with 279 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/sectionHelper.js
+17 -6
View File
@@ -400,6 +400,17 @@
return sortItemsByConfiguredIds(cfg, postProcessedItems);
};
const itemsFromMerged = (raw) => {
if (Array.isArray(raw?.Items)) return raw.Items;
if (Array.isArray(raw)) return raw;
return [];
};
const finishMerged = (items) => {
const filtered = applyExcludeItemIdFilter(sectionConfig, items);
return sortItemsByConfiguredIds(sectionConfig, filtered);
};
let mappedDataPromise = null;
const result = {
data: { Items: [] },
@@ -463,19 +474,19 @@
result.refreshPromise = Promise.all(
results.map((r) => r._refreshPromise || Promise.resolve(r.data))
).then((allData) => {
const itemsByFreshQuery = [];
allData.forEach((data) => {
if (data?.Items) itemsByFreshQuery.push(data.Items);
else if (Array.isArray(data)) itemsByFreshQuery.push(data);
const itemsByFreshQuery = allData.map((data) => {
if (Array.isArray(data?.Items)) return data.Items;
if (Array.isArray(data)) return data;
return [];
});
const mergedFresh = window.cardBuilder?.postProcessItemsByQuery
? window.cardBuilder.postProcessItemsByQuery(sectionConfig, itemsByFreshQuery)
: itemsByFreshQuery.flat();
return postProcess(sectionConfig, mergedFresh);
return finishMerged(mergedFresh);
});
}
return postProcess(sectionConfig, raw);
return finishMerged(itemsFromMerged(raw));
}
const queryResult = results[0];