From 0b421e68fa656f041314e294e825311f3bab3a7f Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Tue, 21 Jun 2022 19:43:10 +0430
Subject: [PATCH 1/2] Get last history list offset and restore on return

---
 .../History/CurrentHistory/HistoryPanel.vue          | 12 +++++++++---
 client/src/components/History/Index.vue              |  5 ++++-
 client/src/components/History/Layout/Listing.vue     |  7 ++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index 19e41246cbf..6dc788b0f07 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -91,8 +91,13 @@
                                     No data found for selected filter.
                                 </b-alert>
                             </div>
-                            <Listing v-else :items="itemsLoaded" :query-key="queryKey" @scroll="onScroll">
-                                <template v-slot:item="{ item }">
+                            <Listing
+                                v-else
+                                :offset="listOffset"
+                                :items="itemsLoaded"
+                                :query-key="queryKey"
+                                @scroll="onScroll">
+                                <template v-slot:item="{ item, getOffset }">
                                     <ContentItem
                                         v-if="!invisible[item.hid]"
                                         :id="item.hid"
@@ -109,7 +114,7 @@
                                         @toggleHighlights="toggleHighlights"
                                         @update:expand-dataset="setExpanded(item, $event)"
                                         @update:selected="setSelected(item, $event)"
-                                        @view-collection="$emit('view-collection', item)"
+                                        @view-collection="$emit('view-collection', item, getOffset)"
                                         @delete="onDelete(item)"
                                         @undelete="onUndelete(item)"
                                         @unhide="onUnhide(item)" />
@@ -165,6 +170,7 @@ export default {
         OperationErrorDialog,
     },
     props: {
+        listOffset: { type: Number, default: 0 },
         history: { type: Object, required: true },
     },
     data() {
diff --git a/client/src/components/History/Index.vue b/client/src/components/History/Index.vue
index d8f26596c80..f491a2d9a89 100644
--- a/client/src/components/History/Index.vue
+++ b/client/src/components/History/Index.vue
@@ -4,6 +4,7 @@
             <div v-if="currentHistory" id="current-history-panel" class="history-index">
                 <CurrentHistory
                     v-if="!breadcrumbs.length"
+                    :list-offset="listOffset"
                     :history="currentHistory"
                     v-on="handlers"
                     @view-collection="onViewCollection">
@@ -51,10 +52,12 @@ export default {
         return {
             // list of collections we have drilled down into
             breadcrumbs: [],
+            listOffset: 0,
         };
     },
     methods: {
-        onViewCollection(collection) {
+        onViewCollection(collection, getListOffset) {
+            this.listOffset = getListOffset();
             this.breadcrumbs = [...this.breadcrumbs, collection];
         },
     },
diff --git a/client/src/components/History/Layout/Listing.vue b/client/src/components/History/Layout/Listing.vue
index a84a3ec7d38..0529f5deeb5 100644
--- a/client/src/components/History/Layout/Listing.vue
+++ b/client/src/components/History/Layout/Listing.vue
@@ -4,11 +4,12 @@
             ref="listing"
             class="listing"
             data-key="id"
+            :offset="offset"
             :data-sources="items"
             :data-component="{}"
             @scroll="onScroll">
             <template v-slot:item="{ item }">
-                <slot name="item" :item="item" />
+                <slot name="item" :item="item" :get-offset="getOffset" />
             </template>
             <template v-slot:footer>
                 <LoadingSpan v-if="loading" class="m-2" message="Loading" />
@@ -27,6 +28,7 @@ export default {
         VirtualList,
     },
     props: {
+        offset: { type: Number, default: 0 },
         loading: { type: Boolean, default: false },
         items: { type: Array, default: null },
         queryKey: { type: String, default: null },
@@ -74,6 +76,9 @@ export default {
             const rangeStart = this.$refs.listing.range.start;
             this.$emit("scroll", rangeStart);
         },
+        getOffset() {
+            return this.$refs.listing.getOffset();
+        },
     },
 };
 </script>

From e7a8adca33bb3d1549c7470316bdc82e7ccd7f16 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Wed, 22 Jun 2022 00:40:26 +0430
Subject: [PATCH 2/2] Improve current list offset calculation

---
 client/src/components/History/CurrentHistory/HistoryPanel.vue | 4 ++--
 client/src/components/History/Index.vue                       | 4 ++--
 client/src/components/History/Layout/Listing.vue              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index 6dc788b0f07..f90a3965007 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -97,7 +97,7 @@
                                 :items="itemsLoaded"
                                 :query-key="queryKey"
                                 @scroll="onScroll">
-                                <template v-slot:item="{ item, getOffset }">
+                                <template v-slot:item="{ item, currentOffset }">
                                     <ContentItem
                                         v-if="!invisible[item.hid]"
                                         :id="item.hid"
@@ -114,7 +114,7 @@
                                         @toggleHighlights="toggleHighlights"
                                         @update:expand-dataset="setExpanded(item, $event)"
                                         @update:selected="setSelected(item, $event)"
-                                        @view-collection="$emit('view-collection', item, getOffset)"
+                                        @view-collection="$emit('view-collection', item, currentOffset)"
                                         @delete="onDelete(item)"
                                         @undelete="onUndelete(item)"
                                         @unhide="onUnhide(item)" />
diff --git a/client/src/components/History/Index.vue b/client/src/components/History/Index.vue
index f491a2d9a89..da6677092f2 100644
--- a/client/src/components/History/Index.vue
+++ b/client/src/components/History/Index.vue
@@ -56,8 +56,8 @@ export default {
         };
     },
     methods: {
-        onViewCollection(collection, getListOffset) {
-            this.listOffset = getListOffset();
+        onViewCollection(collection, currentOffset) {
+            this.listOffset = currentOffset;
             this.breadcrumbs = [...this.breadcrumbs, collection];
         },
     },
diff --git a/client/src/components/History/Layout/Listing.vue b/client/src/components/History/Layout/Listing.vue
index 0529f5deeb5..b4bec4e56ed 100644
--- a/client/src/components/History/Layout/Listing.vue
+++ b/client/src/components/History/Layout/Listing.vue
@@ -9,7 +9,7 @@
             :data-component="{}"
             @scroll="onScroll">
             <template v-slot:item="{ item }">
-                <slot name="item" :item="item" :get-offset="getOffset" />
+                <slot name="item" :item="item" :current-offset="getOffset()" />
             </template>
             <template v-slot:footer>
                 <LoadingSpan v-if="loading" class="m-2" message="Loading" />
@@ -77,7 +77,7 @@ export default {
             this.$emit("scroll", rangeStart);
         },
         getOffset() {
-            return this.$refs.listing.getOffset();
+            return this.$refs.listing?.getOffset() || 0;
         },
     },
 };