opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[24.0] History Multiview panel shows pinned histories on top

Browse Source 
Fixes https://github.com/galaxyproject/galaxy/issues/18082
This commit is contained in:
Ahmed Awan
2024-05-03 10:32:31 -05:00
parent dcf8207ba3
commit bb24c23650
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/History/HistoryScrollList.vue
+11 -3
View File
@@ -148,6 +148,10 @@ const filtered = computed<HistorySummary[]>(() => {
return -1;
} else if (!isMultiviewPanel.value && b.id == currentHistoryId.value) {
return 1;
} else if (isMultiviewPanel.value && isPinned(a.id) && !isPinned(b.id)) {
return -1;
} else if (isMultiviewPanel.value && !isPinned(a.id) && isPinned(b.id)) {
return 1;
} else if (a.update_time < b.update_time) {
return 1;
} else {
@@ -161,16 +165,20 @@ const isMultiviewPanel = computed(() => !props.inModal && props.multiple);
function isActiveItem(history: HistorySummary) {
if (isMultiviewPanel.value) {
return pinnedHistories.value.some((item: PinnedHistory) => item.id == history.id);
return isPinned(history.id);
} else {
return props.selectedHistories.some((item: PinnedHistory) => item.id == history.id);
}
}
function isPinned(historyId: string) {
return pinnedHistories.value.some((item: PinnedHistory) => item.id == historyId);
}
function historyClicked(history: HistorySummary) {
emit("selectHistory", history);
if (isMultiviewPanel.value) {
if (pinnedHistories.value.some((item: PinnedHistory) => item.id == history.id)) {
if (isPinned(history.id)) {
historyStore.unpinHistories([history.id]);
} else {
openInMulti(history);
@@ -263,7 +271,7 @@ async function loadMore(noScroll = false) {
<i v-if="history.id === currentHistoryId">(Current)</i>
</Heading>
<i
v-if="props.multiple && pinnedHistories.some((h) => h.id === history.id)"
v-if="props.multiple && isPinned(history.id)"
v-b-tooltip.noninteractive.hover
title="This history is currently pinned in the multi-history view">
(currently pinned)