From 1d87385da43ab14007e9dd89be53363d8e0cd463 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:19:23 +0100
Subject: [PATCH 01/24] add index to parent_comment_id

---
 lib/galaxy/model/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 9495b3a82401..337e5cf7791a 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -7727,7 +7727,7 @@ class WorkflowStep(Base, RepresentById):
     uuid = Column(UUIDType)
     label = Column(Unicode(255))
     temp_input_connections: Optional[InputConnDictType]
-    parent_comment_id = Column(Integer, ForeignKey("workflow_comment.id"), nullable=True)
+    parent_comment_id = Column(Integer, ForeignKey("workflow_comment.id"), index=True, nullable=True)
 
     parent_comment = relationship(
         "WorkflowComment",
@@ -8174,7 +8174,7 @@ class WorkflowComment(Base, RepresentById):
     type = Column(String(16))
     color = Column(String(16))
     data = Column(JSONType)
-    parent_comment_id = Column(Integer, ForeignKey("workflow_comment.id"), nullable=True)
+    parent_comment_id = Column(Integer, ForeignKey("workflow_comment.id"), index=True, nullable=True)
 
     workflow = relationship(
         "Workflow",

From bfef9d4f81f6bbfa494840932044a80bec4231e8 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:41:05 +0100
Subject: [PATCH 02/24] 2dc3386d091f

---
 ...d091f_add_indexes_for_workflow_comment_.py | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 lib/galaxy/model/migrations/alembic/versions_gxy/2dc3386d091f_add_indexes_for_workflow_comment_.py

diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/2dc3386d091f_add_indexes_for_workflow_comment_.py b/lib/galaxy/model/migrations/alembic/versions_gxy/2dc3386d091f_add_indexes_for_workflow_comment_.py
new file mode 100644
index 000000000000..14c990e3086a
--- /dev/null
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/2dc3386d091f_add_indexes_for_workflow_comment_.py
@@ -0,0 +1,44 @@
+"""add_indexes_for_workflow_comment_foreign_keys
+
+Revision ID: 2dc3386d091f
+Revises: 8a19186a6ee7
+Create Date: 2024-03-13 15:25:52.587488
+
+"""
+
+from galaxy.model.database_object_names import build_index_name
+from galaxy.model.migrations.util import (
+    create_index,
+    drop_index,
+)
+
+# revision identifiers, used by Alembic.
+revision = "2dc3386d091f"
+down_revision = "8a19186a6ee7"
+branch_labels = None
+depends_on = None
+
+workflow_comment_table_name = "workflow_comment"
+workflow_step_table_name = "workflow_step"
+workflow_id_column_name = "workflow_id"
+parent_comment_id_column_name = "parent_comment_id"
+
+workflow_step_parent_comment_index_name = build_index_name(workflow_step_table_name, parent_comment_id_column_name)
+workflow_comment_workflow_id_index_name = build_index_name(workflow_comment_table_name, workflow_id_column_name)
+workflow_comment_parent_comment_index_name = build_index_name(
+    workflow_comment_table_name, parent_comment_id_column_name
+)
+
+
+def upgrade():
+    create_index(workflow_step_parent_comment_index_name, workflow_step_table_name, [parent_comment_id_column_name])
+    create_index(workflow_comment_workflow_id_index_name, workflow_comment_table_name, [workflow_id_column_name])
+    create_index(
+        workflow_comment_parent_comment_index_name, workflow_comment_table_name, [parent_comment_id_column_name]
+    )
+
+
+def downgrade():
+    drop_index(workflow_step_parent_comment_index_name, workflow_step_table_name)
+    drop_index(workflow_comment_workflow_id_index_name, workflow_comment_table_name)
+    drop_index(workflow_comment_parent_comment_index_name, workflow_comment_table_name)

From 3f1dc5ea8e75e585cd4218d1ef52d68e66bbb0cd Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:57:05 +0100
Subject: [PATCH 03/24] Use correct history count instead of hid_counter

---
 client/src/components/Grid/configs/histories.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index 678c55eaa993..8216cda71560 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -241,7 +241,7 @@ const fields: FieldArray = [
         ],
     },
     {
-        key: "hid_counter",
+        key: "count",
         title: "Items",
         type: "text",
     },

From f1e0779e9b14715a9578ff49663fc0f3be6f68a4 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:33:41 +0100
Subject: [PATCH 04/24] Improve published history listing in UI

Initially load only summary views, as the additional details are requested for each history after loading anyway.
---
 client/src/components/Grid/configs/historiesPublished.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Grid/configs/historiesPublished.ts b/client/src/components/Grid/configs/historiesPublished.ts
index 23dc4bcccaff..9a1fd770391f 100644
--- a/client/src/components/Grid/configs/historiesPublished.ts
+++ b/client/src/components/Grid/configs/historiesPublished.ts
@@ -20,6 +20,7 @@ type SortKeyLiteral = "name" | "update_time" | undefined;
  */
 async function getData(offset: number, limit: number, search: string, sort_by: string, sort_desc: boolean) {
     const { data, headers } = await historiesFetcher({
+        view: "summary",
         limit,
         offset,
         search,

From 5133abd79af570fe654c09539ca8c5a2064178b2 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 14 Mar 2024 13:24:43 +0100
Subject: [PATCH 05/24] Fix step type serialization for StoredWorkflowDetailed
 models

Fixes https://github.com/galaxyproject/galaxy/issues/17713.
---
 client/src/api/schema/schema.ts  | 99 ++++++++------------------------
 lib/galaxy/managers/workflows.py |  6 +-
 lib/galaxy/schema/schema.py      | 62 +++++++-------------
 lib/galaxy/schema/workflows.py   |  7 ++-
 4 files changed, 53 insertions(+), 121 deletions(-)

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 44f5457df6bf..118ff0830cc1 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -6835,27 +6835,13 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
-            /**
-             * Tool ID
-             * @description The unique name of the tool associated with this step.
-             */
-            tool_id?: string | null;
-            /**
-             * Tool Inputs
-             * @description TODO
-             */
-            tool_inputs?: Record<string, never>;
-            /**
-             * Tool Version
-             * @description The version of the tool associated with this step.
-             */
-            tool_version?: string | null;
             /**
              * Type
-             * @description The type of workflow module.
-             * @default data_collection_input
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "data_collection_input";
+            /** When */
+            when: string | null;
         };
         /** InputDataStep */
         InputDataStep: {
@@ -6876,27 +6862,13 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
-            /**
-             * Tool ID
-             * @description The unique name of the tool associated with this step.
-             */
-            tool_id?: string | null;
-            /**
-             * Tool Inputs
-             * @description TODO
-             */
-            tool_inputs?: Record<string, never>;
-            /**
-             * Tool Version
-             * @description The version of the tool associated with this step.
-             */
-            tool_version?: string | null;
             /**
              * Type
-             * @description The type of workflow module.
-             * @default data_input
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "data_input";
+            /** When */
+            when: string | null;
         };
         /** InputParameterStep */
         InputParameterStep: {
@@ -6917,27 +6889,13 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
-            /**
-             * Tool ID
-             * @description The unique name of the tool associated with this step.
-             */
-            tool_id?: string | null;
-            /**
-             * Tool Inputs
-             * @description TODO
-             */
-            tool_inputs?: Record<string, never>;
-            /**
-             * Tool Version
-             * @description The version of the tool associated with this step.
-             */
-            tool_version?: string | null;
             /**
              * Type
-             * @description The type of workflow module.
-             * @default parameter_input
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "parameter";
+            /** When */
+            when: string | null;
         };
         /** InputReferenceByLabel */
         InputReferenceByLabel: {
@@ -9705,10 +9663,11 @@ export interface components {
             };
             /**
              * Type
-             * @description The type of workflow module.
-             * @default pause
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "pause";
+            /** When */
+            when: string | null;
         };
         /** Person */
         Person: {
@@ -11111,10 +11070,11 @@ export interface components {
             };
             /**
              * Type
-             * @description The type of workflow module.
-             * @default subworkflow
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "subworkflow";
+            /** When */
+            when: string | null;
             /**
              * Workflow ID
              * @description The encoded ID of the workflow that will be run on this step.
@@ -11301,10 +11261,11 @@ export interface components {
             tool_version?: string | null;
             /**
              * Type
-             * @description The type of workflow module.
-             * @default tool
+             * @constant
              */
-            type?: components["schemas"]["WorkflowModuleType"];
+            type: "tool";
+            /** When */
+            when: string | null;
         };
         /** Tour */
         Tour: {
@@ -12303,18 +12264,6 @@ export interface components {
                 [key: string]: number | undefined;
             };
         };
-        /**
-         * WorkflowModuleType
-         * @description Available types of modules that represent a step in a Workflow.
-         * @enum {string}
-         */
-        WorkflowModuleType:
-            | "data_input"
-            | "data_collection_input"
-            | "parameter_input"
-            | "subworkflow"
-            | "tool"
-            | "pause";
         /** WriteInvocationStoreToPayload */
         WriteInvocationStoreToPayload: {
             /**
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index 43b65e6b0615..18a61ffba6c5 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -1615,9 +1615,9 @@ def callback(input, prefixed_name, **kwargs):
     def _workflow_to_dict_instance(self, trans, stored, workflow, legacy=True):
         encode = self.app.security.encode_id
         sa_session = self.app.model.context
-        item = stored.to_dict(view="element", value_mapper={"id": encode})
+        item = stored.to_dict(view="element")
         item["name"] = workflow.name
-        item["url"] = trans.url_builder("workflow", id=item["id"])
+        item["url"] = trans.url_builder("workflow", id=encode(stored.id))
         item["owner"] = stored.user.username
         item["email_hash"] = md5_hash_str(stored.user.email)
         item["slug"] = stored.slug
@@ -1668,7 +1668,7 @@ def _workflow_to_dict_instance(self, trans, stored, workflow, legacy=True):
                 del step_dict["tool_id"]
                 del step_dict["tool_version"]
                 del step_dict["tool_inputs"]
-                step_dict["workflow_id"] = encode(step.subworkflow.id)
+                step_dict["workflow_id"] = step.subworkflow.id
 
             for conn in step.input_connections:
                 step_id = step.id if legacy else step.order_index
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index ec96b40fede0..61ad7ec7824d 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -2099,7 +2099,7 @@ class JobFullDetails(JobDetails):
 
 
 class StoredWorkflowSummary(Model, WithModelClass):
-    id: DecodedDatabaseIdField
+    id: EncodedDatabaseIdField
     model_class: STORED_WORKFLOW_MODEL_CLASS = ModelClassField(STORED_WORKFLOW_MODEL_CLASS)
     create_time: datetime = CreateTimeField
     update_time: datetime = UpdateTimeField
@@ -2203,73 +2203,51 @@ class InputStep(Model):
     )
 
 
-class WorkflowModuleType(str, Enum):
-    """Available types of modules that represent a step in a Workflow."""
-
-    data_input = "data_input"
-    data_collection_input = "data_collection_input"
-    parameter_input = "parameter_input"
-    subworkflow = "subworkflow"
-    tool = "tool"
-    pause = "pause"  # Experimental
-
-
 class WorkflowStepBase(Model):
     id: int = Field(
         ...,
         title="ID",
         description="The identifier of the step. It matches the index order of the step inside the workflow.",
     )
-    type: WorkflowModuleType = Field(..., title="Type", description="The type of workflow module.")
     annotation: Optional[str] = AnnotationField
     input_steps: Dict[str, InputStep] = Field(
         ...,
         title="Input Steps",
         description="A dictionary containing information about the inputs connected to this workflow step.",
     )
+    when: Optional[str]
 
 
-class ToolBasedWorkflowStep(WorkflowStepBase):
-    tool_id: Optional[str] = Field(
-        None, title="Tool ID", description="The unique name of the tool associated with this step."
-    )
-    tool_version: Optional[str] = Field(
-        None, title="Tool Version", description="The version of the tool associated with this step."
-    )
-    tool_inputs: Any = Field(None, title="Tool Inputs", description="TODO")
+class InputDataStep(WorkflowStepBase):
+    type: Literal["data_input"]
 
 
-class InputDataStep(ToolBasedWorkflowStep):
-    type: WorkflowModuleType = Field(
-        WorkflowModuleType.data_input, title="Type", description="The type of workflow module."
-    )
+class InputDataCollectionStep(WorkflowStepBase):
+    type: Literal["data_collection_input"]
 
 
-class InputDataCollectionStep(ToolBasedWorkflowStep):
-    type: WorkflowModuleType = Field(
-        WorkflowModuleType.data_collection_input, title="Type", description="The type of workflow module."
-    )
-
-
-class InputParameterStep(ToolBasedWorkflowStep):
-    type: WorkflowModuleType = Field(
-        WorkflowModuleType.parameter_input, title="Type", description="The type of workflow module."
-    )
+class InputParameterStep(WorkflowStepBase):
+    type: Literal["parameter"]
 
 
 class PauseStep(WorkflowStepBase):
-    type: WorkflowModuleType = Field(WorkflowModuleType.pause, title="Type", description="The type of workflow module.")
+    type: Literal["pause"]
 
 
-class ToolStep(ToolBasedWorkflowStep):
-    type: WorkflowModuleType = Field(WorkflowModuleType.tool, title="Type", description="The type of workflow module.")
+class ToolStep(WorkflowStepBase):
+    type: Literal["tool"]
+    tool_id: Optional[str] = Field(
+        None, title="Tool ID", description="The unique name of the tool associated with this step."
+    )
+    tool_version: Optional[str] = Field(
+        None, title="Tool Version", description="The version of the tool associated with this step."
+    )
+    tool_inputs: Any = Field(None, title="Tool Inputs", description="TODO")
 
 
 class SubworkflowStep(WorkflowStepBase):
-    type: WorkflowModuleType = Field(
-        WorkflowModuleType.subworkflow, title="Type", description="The type of workflow module."
-    )
-    workflow_id: DecodedDatabaseIdField = Field(
+    type: Literal["subworkflow"]
+    workflow_id: EncodedDatabaseIdField = Field(
         ..., title="Workflow ID", description="The encoded ID of the workflow that will be run on this step."
     )
 
diff --git a/lib/galaxy/schema/workflows.py b/lib/galaxy/schema/workflows.py
index 598878d749c2..cbc5379e49e6 100644
--- a/lib/galaxy/schema/workflows.py
+++ b/lib/galaxy/schema/workflows.py
@@ -197,7 +197,12 @@ class StoredWorkflowDetailed(StoredWorkflowSummary):
             ToolStep,
             SubworkflowStep,
         ],
-    ] = Field({}, title="Steps", description="A dictionary with information about all the steps of the workflow.")
+    ] = Field(
+        {},
+        title="Steps",
+        description="A dictionary with information about all the steps of the workflow.",
+        discriminator="type",
+    )
     importable: Optional[bool] = Field(
         ...,
         title="Importable",

From d5a829d6d52b07eb1d5e34fffacbb7f46a7b0a80 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:50:53 +0100
Subject: [PATCH 06/24] Fix missing default value warning

---
 client/src/components/Grid/GridHistory.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Grid/GridHistory.vue b/client/src/components/Grid/GridHistory.vue
index a54e2437d3be..1f23b2e2084b 100644
--- a/client/src/components/Grid/GridHistory.vue
+++ b/client/src/components/Grid/GridHistory.vue
@@ -24,6 +24,7 @@ interface Props {
 
 const props = withDefaults(defineProps<Props>(), {
     activeList: "my",
+    username: undefined,
 });
 </script>
 

From babdcd9b031743a739c70ac92452ff70f4b865df Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:51:46 +0100
Subject: [PATCH 07/24] Display login required in tab when anonymous access
 archived histories

---
 client/src/components/Grid/GridHistory.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Grid/GridHistory.vue b/client/src/components/Grid/GridHistory.vue
index 1f23b2e2084b..76229f380ea8 100644
--- a/client/src/components/Grid/GridHistory.vue
+++ b/client/src/components/Grid/GridHistory.vue
@@ -66,8 +66,16 @@ const props = withDefaults(defineProps<Props>(), {
             <BNavItem id="histories-published-tab" :active="activeList === 'published'" to="/histories/list_published">
                 Public Histories
             </BNavItem>
-            <BNavItem id="histories-published-tab" :active="activeList === 'archived'" to="/histories/archived">
+            <BNavItem
+                id="histories-archived-tab"
+                :active="activeList === 'archived'"
+                :disabled="userStore.isAnonymous"
+                to="/histories/archived">
                 Archived Histories
+                <LoginRequired
+                    v-if="userStore.isAnonymous"
+                    target="histories-archived-tab"
+                    title="Manage your Histories" />
             </BNavItem>
         </BNav>
         <GridList v-if="activeList === 'my'" :grid-config="historiesGridConfig" embedded />

From c8777e45d453671206b3d22a4ae9f037e7ba4387 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:52:17 +0100
Subject: [PATCH 08/24] Redirect anonymous users when directly accessing
 histories/archived

---
 client/src/entry/analysis/router.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index aa9e540be7d6..2e93e6823d37 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -291,6 +291,7 @@ export function getRouter(Galaxy) {
                         props: {
                             activeList: "archived",
                         },
+                        redirect: redirectAnon(),
                     },
                     {
                         path: "histories/list",

From b3bce86f305a64108d1ffe5e1ea7ff51a6f04d95 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Thu, 14 Mar 2024 14:24:47 +0100
Subject: [PATCH 09/24] remove side-effect and add lastQueue

---
 .../CurrentCollection/CollectionPanel.vue     | 11 +++-
 client/src/stores/collectionElementsStore.ts  | 52 +++++++++++++------
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 2f58d1356e2a..cd83d5fbc56b 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -43,7 +43,16 @@ const dsc = computed(() => {
     }
     return currentCollection;
 });
-const collectionElements = computed(() => collectionElementsStore.getCollectionElements(dsc.value, offset.value));
+
+watch(
+    () => [dsc.value, offset.value],
+    () => {
+        collectionElementsStore.fetchMissingElements(dsc.value, offset.value);
+    },
+    { immediate: true }
+);
+
+const collectionElements = computed(() => collectionElementsStore.getCollectionElements(dsc.value));
 const loading = computed(() => collectionElementsStore.isLoadingCollectionElements(dsc.value));
 const jobState = computed(() => ("job_state_summary" in dsc.value ? dsc.value.job_state_summary : undefined));
 const populatedStateMsg = computed(() =>
diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index ddeb60102012..eb5dee564504 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -4,6 +4,8 @@ import { computed, del, ref, set } from "vue";
 import type { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase } from "@/api";
 import { isHDCA } from "@/api";
 import { fetchCollectionDetails, fetchElementsFromCollection } from "@/api/datasetCollections";
+import { mergeArray } from "@/store/historyStore/model/utilities";
+import { ActionSkippedError, LastQueue } from "@/utils/lastQueue";
 
 /**
  * Represents an element in a collection that has not been fetched yet.
@@ -46,10 +48,9 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
     }
 
     const getCollectionElements = computed(() => {
-        return (collection: CollectionEntry, offset = 0, limit = FETCH_LIMIT) => {
+        return (collection: CollectionEntry) => {
             const storedElements =
                 storedCollectionElements.value[getCollectionKey(collection)] ?? initWithPlaceholderElements(collection);
-            fetchMissingElements({ collection, storedElements, offset, limit });
             return storedElements;
         };
     });
@@ -60,17 +61,22 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         };
     });
 
-    async function fetchMissingElements(params: {
+    const lastQueue = new LastQueue(1000, true);
+
+    type FetchParams = {
         collection: CollectionEntry;
-        storedElements: DCEEntry[];
         offset: number;
         limit: number;
-    }) {
-        const collectionKey = getCollectionKey(params.collection);
+    };
+
+    async function fetchMissing({ collection, offset, limit = FETCH_LIMIT }: FetchParams) {
+        const collectionKey = getCollectionKey(collection);
+        const storedElements = getCollectionElements.value(collection);
+
         try {
             // We should fetch only missing (placeholder) elements from the range
-            const firstMissingIndexInRange = params.storedElements
-                .slice(params.offset, params.offset + params.limit)
+            const firstMissingIndexInRange = storedElements
+                .slice(offset, offset + limit)
                 .findIndex((element) => isPlaceholder(element) && !element.fetching);
 
             if (firstMissingIndexInRange === -1) {
@@ -78,26 +84,37 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
                 return;
             }
             // Adjust the offset to the first missing element
-            params.offset += firstMissingIndexInRange;
+            offset += firstMissingIndexInRange;
 
             set(loadingCollectionElements.value, collectionKey, true);
             // Mark all elements in the range as fetching
-            params.storedElements
-                .slice(params.offset, params.offset + params.limit)
+            storedElements
+                .slice(offset, offset + limit)
                 .forEach((element) => isPlaceholder(element) && (element.fetching = true));
+
             const fetchedElements = await fetchElementsFromCollection({
-                entry: params.collection,
-                offset: params.offset,
-                limit: params.limit,
+                entry: collection,
+                offset: offset,
+                limit: limit,
             });
-            // Update only the elements that were fetched
-            params.storedElements.splice(params.offset, fetchedElements.length, ...fetchedElements);
-            set(storedCollectionElements.value, collectionKey, params.storedElements);
+
+            return fetchedElements;
         } finally {
             del(loadingCollectionElements.value, collectionKey);
         }
     }
 
+    async function fetchMissingElements(collection: CollectionEntry, offset: number) {
+        try {
+            const elements = await lastQueue.enqueue(fetchMissing, { collection, offset });
+            mergeArray(getCollectionKey(collection), elements, storedCollectionElements.value, "id");
+        } catch (e) {
+            if (!(e instanceof ActionSkippedError)) {
+                throw e;
+            }
+        }
+    }
+
     async function loadCollectionElements(collection: CollectionEntry) {
         const elements = await fetchElementsFromCollection({ entry: collection });
         set(storedCollectionElements.value, getCollectionKey(collection), elements);
@@ -154,5 +171,6 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         loadCollectionElements,
         saveCollections,
         getCollectionKey,
+        fetchMissingElements,
     };
 });

From 1799e7c4d606cf3e74ce7986b713b704645f7b3e Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 14 Mar 2024 16:35:28 +0300
Subject: [PATCH 10/24] Always display grid pagination on the right hand side,
 regardless of batch operation availability

---
 client/src/components/Grid/GridList.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index da08de2739c5..16016ec5fa7f 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -363,7 +363,7 @@ watch(operationMessage, () => {
         </table>
         <div class="flex-grow-1 h-100" />
         <div class="grid-footer">
-            <div v-if="isAvailable && gridConfig.batch" class="d-flex justify-content-between pt-3">
+            <div v-if="isAvailable" class="d-flex justify-content-between pt-3">
                 <div class="d-flex">
                     <div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
                         <BButton
@@ -383,9 +383,6 @@ watch(operationMessage, () => {
                 </div>
                 <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
             </div>
-            <div v-else-if="isAvailable" class="d-flex justify-content-center pt-3">
-                <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
-            </div>
         </div>
     </div>
 </template>

From 1121548b87128b5fc3f6b65ce8ef0acd49c2559e Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 14 Mar 2024 17:11:30 +0300
Subject: [PATCH 11/24] Keep pagination sticky when scrolling horizontal

---
 client/src/components/Grid/GridList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 16016ec5fa7f..39cc6985aeec 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -399,6 +399,7 @@ watch(operationMessage, () => {
     top: 0;
 }
 .grid-sticky {
+    left: 0;
     z-index: 2;
     background: $white;
     opacity: 0.95;

From 12a79dae96cde69d7e92b76e5e9489b8df4f9b6c Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 14 Mar 2024 11:17:30 -0400
Subject: [PATCH 12/24] Fix date range popover cutoff.

Fixes https://github.com/galaxyproject/galaxy/issues/17711
---
 .../History/Modals/SelectorModal.vue          | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/client/src/components/History/Modals/SelectorModal.vue b/client/src/components/History/Modals/SelectorModal.vue
index a15aedf55295..4c7be641955d 100644
--- a/client/src/components/History/Modals/SelectorModal.vue
+++ b/client/src/components/History/Modals/SelectorModal.vue
@@ -100,6 +100,17 @@ function selectHistories() {
 function setFilterValue(newFilter: string, newValue: string) {
     filter.value = HistoriesFilters.setFilterValue(filter.value, newFilter, newValue);
 }
+
+// hacky workaround for popovers in date pickers being cutoff
+// https://github.com/galaxyproject/galaxy/issues/17711
+const modalBodyClasses = computed(() => {
+    return [
+        "history-selector-modal-body",
+        showAdvanced.value
+            ? "history-selector-modal-body-allow-overflow"
+            : "history-selector-modal-body-prevent-overflow",
+    ];
+});
 </script>
 
 <template>
@@ -107,9 +118,9 @@ function setFilterValue(newFilter: string, newValue: string) {
         <BModal
             ref="modal"
             v-model="propShowModal"
-            body-class="history-selector-modal-body"
             content-class="history-selector-modal-content"
             v-bind="$attrs"
+            :body-class="modalBodyClasses"
             static
             centered
             hide-footer
@@ -174,11 +185,18 @@ function setFilterValue(newFilter: string, newValue: string) {
 with scoped or lang="scss" */
 
 .history-selector-modal-body {
-    overflow: hidden;
     display: flex;
     flex-direction: column;
 }
 
+.history-selector-modal-body-allow-overflow {
+    overflow: visible;
+}
+
+.history-selector-modal-body-prevent-overflow {
+    overflow: hidden;
+}
+
 .history-selector-modal-content {
     max-height: 80vh !important;
 }

From ebaa9c77378613eae0aec87c8e76856def0548a1 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 14 Mar 2024 16:03:28 +0100
Subject: [PATCH 13/24] Include tool_id, tool_version, tool_inputs in every
 step

---
 client/src/api/schema/schema.ts | 75 +++++++++++++++++++++++++++++++++
 lib/galaxy/schema/schema.py     | 16 ++++---
 2 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 118ff0830cc1..2f41a56da3b0 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -6835,6 +6835,21 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
+            /**
+             * Tool ID
+             * @description The unique name of the tool associated with this step.
+             */
+            tool_id?: string | null;
+            /**
+             * Tool Inputs
+             * @description TODO
+             */
+            tool_inputs?: Record<string, never>;
+            /**
+             * Tool Version
+             * @description The version of the tool associated with this step.
+             */
+            tool_version?: string | null;
             /**
              * Type
              * @constant
@@ -6862,6 +6877,21 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
+            /**
+             * Tool ID
+             * @description The unique name of the tool associated with this step.
+             */
+            tool_id?: string | null;
+            /**
+             * Tool Inputs
+             * @description TODO
+             */
+            tool_inputs?: Record<string, never>;
+            /**
+             * Tool Version
+             * @description The version of the tool associated with this step.
+             */
+            tool_version?: string | null;
             /**
              * Type
              * @constant
@@ -6889,6 +6919,21 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
+            /**
+             * Tool ID
+             * @description The unique name of the tool associated with this step.
+             */
+            tool_id?: string | null;
+            /**
+             * Tool Inputs
+             * @description TODO
+             */
+            tool_inputs?: Record<string, never>;
+            /**
+             * Tool Version
+             * @description The version of the tool associated with this step.
+             */
+            tool_version?: string | null;
             /**
              * Type
              * @constant
@@ -9661,6 +9706,21 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
+            /**
+             * Tool ID
+             * @description The unique name of the tool associated with this step.
+             */
+            tool_id?: string | null;
+            /**
+             * Tool Inputs
+             * @description TODO
+             */
+            tool_inputs?: Record<string, never>;
+            /**
+             * Tool Version
+             * @description The version of the tool associated with this step.
+             */
+            tool_version?: string | null;
             /**
              * Type
              * @constant
@@ -11068,6 +11128,21 @@ export interface components {
             input_steps: {
                 [key: string]: components["schemas"]["InputStep"] | undefined;
             };
+            /**
+             * Tool ID
+             * @description The unique name of the tool associated with this step.
+             */
+            tool_id?: string | null;
+            /**
+             * Tool Inputs
+             * @description TODO
+             */
+            tool_inputs?: Record<string, never>;
+            /**
+             * Tool Version
+             * @description The version of the tool associated with this step.
+             */
+            tool_version?: string | null;
             /**
              * Type
              * @constant
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index 61ad7ec7824d..ab2e22909ca6 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -2216,6 +2216,15 @@ class WorkflowStepBase(Model):
         description="A dictionary containing information about the inputs connected to this workflow step.",
     )
     when: Optional[str]
+    # TODO: these should move to ToolStep, however we might be breaking scripts that iterate over steps and
+    # assume tool_id is a valid key for every step.
+    tool_id: Optional[str] = Field(
+        None, title="Tool ID", description="The unique name of the tool associated with this step."
+    )
+    tool_version: Optional[str] = Field(
+        None, title="Tool Version", description="The version of the tool associated with this step."
+    )
+    tool_inputs: Any = Field(None, title="Tool Inputs", description="TODO")
 
 
 class InputDataStep(WorkflowStepBase):
@@ -2236,13 +2245,6 @@ class PauseStep(WorkflowStepBase):
 
 class ToolStep(WorkflowStepBase):
     type: Literal["tool"]
-    tool_id: Optional[str] = Field(
-        None, title="Tool ID", description="The unique name of the tool associated with this step."
-    )
-    tool_version: Optional[str] = Field(
-        None, title="Tool Version", description="The version of the tool associated with this step."
-    )
-    tool_inputs: Any = Field(None, title="Tool Inputs", description="TODO")
 
 
 class SubworkflowStep(WorkflowStepBase):

From 689bb0d88c972a62c8324f6600ba6cc050df26f6 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 14 Mar 2024 17:00:15 +0100
Subject: [PATCH 14/24] Test subworkflow response at
 /api/worflows/{workflow_id}

---
 lib/galaxy_test/api/test_workflows.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 4f6f9a5cbe05..4919f6ca814e 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -328,6 +328,15 @@ def test_show_valid(self):
         # workflow was created first in this instance.
         assert sorted(step["id"] for step in workflow["steps"].values()) != [0, 1, 2]
 
+    def test_show_subworkflow(self):
+        workflow_id = self.workflow_populator.upload_yaml_workflow(WORKFLOW_NESTED_SIMPLE)
+        workflow = self._get(f"workflows/{workflow_id}", {"style": "instance"}).json()
+        assert isinstance(workflow["id"], str)
+        subworkflow_step = workflow["steps"]["2"]
+        assert subworkflow_step["type"] == "subworkflow"
+        assert isinstance(subworkflow_step["workflow_id"], str)
+        self._get(f"workflows/{subworkflow_step['workflow_id']}", {"style": "instance"}).json()
+
     def test_show_invalid_key_is_400(self):
         show_response = self._get(f"workflows/{self._random_key()}")
         self._assert_status_code_is(show_response, 400)

From 73d14be99b9437527a6c7a7cec22819b8e71d5e9 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Thu, 14 Mar 2024 14:37:59 +0100
Subject: [PATCH 15/24] =?UTF-8?q?=F0=9F=90=9B:=20fix=20name=20bleeding=20i?=
 =?UTF-8?q?n=20`WorkflowCard`=20and=20remove=20unused=20CSSs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Workflow/WorkflowActions.vue   |   2 +-
 .../src/components/Workflow/WorkflowCard.vue  | 126 ++++++++----------
 2 files changed, 55 insertions(+), 73 deletions(-)

diff --git a/client/src/components/Workflow/WorkflowActions.vue b/client/src/components/Workflow/WorkflowActions.vue
index 122f0571aeec..52d6037ff89b 100644
--- a/client/src/components/Workflow/WorkflowActions.vue
+++ b/client/src/components/Workflow/WorkflowActions.vue
@@ -242,7 +242,7 @@ const menuActions: ComputedRef<BAction[]> = computed(() => {
             :data-workflow-actions-dropdown="workflow.id"
             right
             no-caret
-            class="workflow-actions-dropdown show-in-card"
+            class="workflow-actions-dropdown"
             toggle-class="inline-icon-button"
             title="Workflow actions"
             variant="link">
diff --git a/client/src/components/Workflow/WorkflowCard.vue b/client/src/components/Workflow/WorkflowCard.vue
index f82a13870038..5734a6ae9ac6 100644
--- a/client/src/components/Workflow/WorkflowCard.vue
+++ b/client/src/components/Workflow/WorkflowCard.vue
@@ -123,38 +123,34 @@ async function onTagClick(tag: string) {
             :class="{
                 'workflow-shared': workflow.published,
             }">
-            <div>
-                <div class="d-flex justify-content-between align-items-center mb-1">
-                    <div>
-                        <WorkflowIndicators :workflow="workflow" :published-view="publishedView" />
-
-                        <span class="workflow-name font-weight-bold">
-                            {{ workflow.name }}
-                            <BButton
-                                v-if="!shared && !workflow.deleted"
-                                v-b-tooltip.hover.noninteractive
-                                :data-workflow-rename="workflow.id"
-                                class="inline-icon-button workflow-rename"
-                                variant="link"
-                                size="sm"
-                                title="Rename"
-                                @click="showRename = !showRename">
-                                <FontAwesomeIcon :icon="faPen" fixed-width />
-                            </BButton>
-                        </span>
-                    </div>
+            <div class="workflow-card-header">
+                <WorkflowIndicators :workflow="workflow" :published-view="publishedView" />
 
-                    <div class="workflow-count-actions">
-                        <WorkflowInvocationsCount v-if="!isAnonymous && !shared" class="mx-1" :workflow="workflow" />
+                <div class="workflow-count-actions">
+                    <WorkflowInvocationsCount v-if="!isAnonymous && !shared" class="mx-1" :workflow="workflow" />
 
-                        <WorkflowActions
-                            :workflow="workflow"
-                            :published="publishedView"
-                            @refreshList="emit('refreshList', true)"
-                            @toggleShowPreview="toggleShowPreview" />
-                    </div>
+                    <WorkflowActions
+                        :workflow="workflow"
+                        :published="publishedView"
+                        @refreshList="emit('refreshList', true)"
+                        @toggleShowPreview="toggleShowPreview" />
                 </div>
 
+                <span class="workflow-name font-weight-bold">
+                    {{ workflow.name }}
+                    <BButton
+                        v-if="!shared && !workflow.deleted"
+                        v-b-tooltip.hover.noninteractive
+                        :data-workflow-rename="workflow.id"
+                        class="inline-icon-button workflow-rename"
+                        variant="link"
+                        size="sm"
+                        title="Rename"
+                        @click="showRename = !showRename">
+                        <FontAwesomeIcon :icon="faPen" fixed-width />
+                    </BButton>
+                </span>
+
                 <TextSummary
                     v-if="description"
                     class="my-1"
@@ -272,47 +268,53 @@ async function onTagClick(tag: string) {
         border-radius: 0.5rem;
         padding: 0.5rem;
 
-        .workflow-count-actions {
-            display: flex;
-            align-self: baseline;
-            align-items: center;
-            flex-direction: row;
+        &.workflow-shared {
+            border-left: 0.25rem solid $brand-primary;
         }
 
-        .text-summary {
-            height: inherit;
-        }
+        .workflow-card-header {
+            display: grid;
 
-        .workflow-name {
-            font-size: 1rem;
-            font-weight: bold;
-        }
+            .workflow-count-actions {
+                display: flex;
+                align-items: center;
+                flex-direction: row;
+                position: absolute;
+                right: 0.5rem;
+            }
 
-        .workflow-card-actions {
-            display: flex;
-            gap: 0.25rem;
-            margin-top: 0.25rem;
-            align-items: center;
-            justify-content: end;
+            .workflow-name {
+                font-size: 1rem;
+                font-weight: bold;
+                word-break: break-all;
+            }
         }
 
         .workflow-card-footer {
             display: flex;
             justify-content: space-between;
             align-items: end;
-        }
 
-        .workflow-card-tags {
-            max-width: 60%;
+            .workflow-card-tags {
+                max-width: 60%;
+            }
+
+            .workflow-card-actions {
+                display: flex;
+                gap: 0.25rem;
+                margin-top: 0.25rem;
+                align-items: center;
+                justify-content: end;
+            }
         }
 
         @container workflow-card (max-width: #{$breakpoint-sm}) {
             .workflow-card-footer {
                 display: inline-block;
-            }
 
-            .workflow-card-tags {
-                max-width: 100%;
+                .workflow-card-tags {
+                    max-width: 100%;
+                }
             }
         }
 
@@ -329,19 +331,7 @@ async function onTagClick(tag: string) {
         }
     }
 
-    .workflow-shared {
-        border-left: 0.25rem solid $brand-primary;
-    }
-
     @container workflow-card (max-width: #{$breakpoint-md}) {
-        .hide-in-card {
-            display: none !important;
-        }
-
-        .show-in-card {
-            display: inline-block !important;
-        }
-
         .workflow-count-actions {
             align-items: baseline;
             justify-content: end;
@@ -353,14 +343,6 @@ async function onTagClick(tag: string) {
             align-items: end;
             flex-direction: column-reverse;
         }
-
-        .hide-in-card {
-            display: inline-block !important;
-        }
-
-        .show-in-card {
-            display: none !important;
-        }
     }
 }
 </style>

From 6431a736d41abd14805b73688101b0043805e2b4 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Thu, 14 Mar 2024 15:24:15 -0700
Subject: [PATCH 16/24] fix overflowing and hiding of storage popovers

- wrap content in a width-limited element
- add window boundary to storage popovers
---
 .../CurrentHistory/PreferredStorePopover.vue  | 40 +++++++++++--------
 .../ToolTargetPreferredObjectStorePopover.vue | 37 ++++++++++-------
 ...kflowTargetPreferredObjectStorePopover.vue | 36 +++++++++++------
 3 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
index 9ea39503c6bc..ff28f962fba7 100644
--- a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
+++ b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
@@ -22,24 +22,30 @@ const preferredObjectStoreId = computed(() => {
 </script>
 
 <template>
-    <BPopover :target="`history-storage-${historyId}`" triggers="hover" placement="bottomleft">
+    <BPopover :target="`history-storage-${historyId}`" triggers="hover" placement="bottomleft" boundary="window">
         <template v-slot:title>Preferred Target Object Store</template>
-
-        <p v-if="historyPreferredObjectStoreId" class="history-preferred-object-store-inherited">
-            This target object store has been set at the history level.
-        </p>
-        <p v-else class="history-preferred-object-store-not-inherited">
-            This target object store has been inherited from your user preferences (set in User -> Preferences ->
-            Preferred Object Store). If that option is updated, this history will target that new default.
-        </p>
-
-        <ShowSelectedObjectStore
-            v-if="preferredObjectStoreId"
-            :preferred-object-store-id="preferredObjectStoreId"
-            for-what="Galaxy will default to storing this history's datasets in " />
-
-        <div v-localize>
-            Change this preference object store target by clicking on the storage button in the history panel.
+        <div class="popover-wide">
+            <p v-if="historyPreferredObjectStoreId" class="history-preferred-object-store-inherited">
+                This target object store has been set at the history level.
+            </p>
+            <p v-else class="history-preferred-object-store-not-inherited">
+                This target object store has been inherited from your user preferences (set in User -> Preferences ->
+                Preferred Object Store). If that option is updated, this history will target that new default.
+            </p>
+
+            <ShowSelectedObjectStore
+                v-if="preferredObjectStoreId"
+                :preferred-object-store-id="preferredObjectStoreId"
+                for-what="Galaxy will default to storing this history's datasets in " />
+
+            <div v-localize>
+                Change this preference object store target by clicking on the storage button in the history panel.
+            </div>
         </div>
     </BPopover>
 </template>
+<style scoped lang="scss">
+.popover-wide {
+    max-width: 30rem;
+}
+</style>
diff --git a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
index b1d63c44c3c6..bdf4264144e2 100644
--- a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
@@ -1,20 +1,22 @@
 <template>
-    <b-popover target="tool-storage" triggers="hover" placement="bottomleft">
+    <b-popover target="tool-storage" triggers="hover" placement="bottomleft" boundary="window">
         <template v-slot:title>{{ title }}</template>
-        <p v-if="toolPreferredObjectStoreId">
-            This target object store has been set at the tool level, by default history or user preferences will be used
-            and if those are not set Galaxy will pick an adminstrator configured default.
-        </p>
-        <ShowSelectedObjectStore
-            v-if="toolPreferredObjectStoreId"
-            :preferred-object-store-id="toolPreferredObjectStoreId"
-            for-what="Galaxy will default to storing this tool run's output in">
-        </ShowSelectedObjectStore>
-        <div v-else>
-            No selection has been made for this tool execution. Defaults from history, user, or Galaxy will be used.
-        </div>
-        <div v-localize>
-            Change this preference object store target by clicking on the storage button in the tool header.
+        <div class="popover-wide">
+            <p v-if="toolPreferredObjectStoreId">
+                This target object store has been set at the tool level, by default history or user preferences will be
+                used and if those are not set Galaxy will pick an adminstrator configured default.
+            </p>
+            <ShowSelectedObjectStore
+                v-if="toolPreferredObjectStoreId"
+                :preferred-object-store-id="toolPreferredObjectStoreId"
+                for-what="Galaxy will default to storing this tool run's output in">
+            </ShowSelectedObjectStore>
+            <div v-else>
+                No selection has been made for this tool execution. Defaults from history, user, or Galaxy will be used.
+            </div>
+            <div v-localize>
+                Change this preference object store target by clicking on the storage button in the tool header.
+            </div>
         </div>
     </b-popover>
 </template>
@@ -33,3 +35,8 @@ export default {
     },
 };
 </script>
+<style scoped lang="scss">
+.popover-wide {
+    max-width: 30rem;
+}
+</style>
diff --git a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
index 197e2968a0ab..b78eb8db9255 100644
--- a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
@@ -1,18 +1,22 @@
 <template>
-    <b-popover :target="target" triggers="hover" placement="bottomleft">
+    <b-popover :target="target" triggers="hover" placement="bottomleft" boundary="window">
         <template v-slot:title>{{ title }}</template>
-        <p v-if="invocationPreferredObjectStoreId">This target object store has been set at the invocation level.</p>
-        <ShowSelectedObjectStore
-            v-if="invocationPreferredObjectStoreId"
-            :preferred-object-store-id="invocationPreferredObjectStoreId"
-            for-what="Galaxy will default to storing this tool run's output in">
-        </ShowSelectedObjectStore>
-        <div v-else>
-            No selection has been made for this worklfow invocation. Defaults from history, user, or Galaxy will be
-            used.
-        </div>
-        <div v-localize>
-            Change this preference object store target by clicking on the storage button in the worklfow run header.
+        <div class="popover-wide">
+            <p v-if="invocationPreferredObjectStoreId">
+                This target object store has been set at the invocation level.
+            </p>
+            <ShowSelectedObjectStore
+                v-if="invocationPreferredObjectStoreId"
+                :preferred-object-store-id="invocationPreferredObjectStoreId"
+                for-what="Galaxy will default to storing this tool run's output in">
+            </ShowSelectedObjectStore>
+            <div v-else>
+                No selection has been made for this worklfow invocation. Defaults from history, user, or Galaxy will be
+                used.
+            </div>
+            <div v-localize>
+                Change this preference object store target by clicking on the storage button in the worklfow run header.
+            </div>
         </div>
     </b-popover>
 </template>
@@ -34,3 +38,9 @@ export default {
     },
 };
 </script>
+
+<style scoped lang="scss">
+.popover-wide {
+    max-width: 30rem;
+}
+</style>

From 6bf0a6922c1b02024aa2cd27adff0253987fde4c Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:32:49 +0100
Subject: [PATCH 17/24] remove loadCollectionElements

---
 .../CurrentCollection/CollectionPanel.vue     |  4 +-
 .../src/store/historyStore/model/utilities.js |  6 +-
 client/src/stores/collectionElementsStore.ts  | 56 +++++++++++++------
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index cd83d5fbc56b..012b5a41e28b 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -52,7 +52,7 @@ watch(
     { immediate: true }
 );
 
-const collectionElements = computed(() => collectionElementsStore.getCollectionElements(dsc.value));
+const collectionElements = computed(() => collectionElementsStore.getCollectionElements(dsc.value) ?? []);
 const loading = computed(() => collectionElementsStore.isLoadingCollectionElements(dsc.value));
 const jobState = computed(() => ("job_state_summary" in dsc.value ? dsc.value.job_state_summary : undefined));
 const populatedStateMsg = computed(() =>
@@ -108,7 +108,7 @@ watch(
 watch(
     jobState,
     () => {
-        collectionElementsStore.loadCollectionElements(dsc.value);
+        collectionElementsStore.invalidateCollectionElements(dsc.value);
     },
     { deep: true }
 );
diff --git a/client/src/store/historyStore/model/utilities.js b/client/src/store/historyStore/model/utilities.js
index 86b5ac13bc61..6a7ccb2d3f0c 100644
--- a/client/src/store/historyStore/model/utilities.js
+++ b/client/src/store/historyStore/model/utilities.js
@@ -1,9 +1,9 @@
-import Vue from "vue";
+import { set } from "vue";
 
 /* This function merges the existing data with new incoming data. */
 export function mergeArray(id, payload, items, itemKey) {
     if (!items[id]) {
-        Vue.set(items, id, []);
+        set(items, id, []);
     }
     const itemArray = items[id];
     for (const item of payload) {
@@ -16,7 +16,7 @@ export function mergeArray(id, payload, items, itemKey) {
                 });
             }
         } else {
-            Vue.set(itemArray, itemIndex, item);
+            set(itemArray, itemIndex, item);
         }
     }
 }
diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index eb5dee564504..586b2eefcdc3 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -4,7 +4,6 @@ import { computed, del, ref, set } from "vue";
 import type { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase } from "@/api";
 import { isHDCA } from "@/api";
 import { fetchCollectionDetails, fetchElementsFromCollection } from "@/api/datasetCollections";
-import { mergeArray } from "@/store/historyStore/model/utilities";
 import { ActionSkippedError, LastQueue } from "@/utils/lastQueue";
 
 /**
@@ -26,7 +25,11 @@ export interface ContentPlaceholder {
     fetching?: boolean;
 }
 
-export type DCEEntry = ContentPlaceholder | DCESummary;
+export type InvalidDCEEntry = (ContentPlaceholder | DCESummary) & {
+    valid: false;
+};
+
+export type DCEEntry = ContentPlaceholder | DCESummary | InvalidDCEEntry;
 
 const FETCH_LIMIT = 50;
 
@@ -49,9 +52,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
 
     const getCollectionElements = computed(() => {
         return (collection: CollectionEntry) => {
-            const storedElements =
-                storedCollectionElements.value[getCollectionKey(collection)] ?? initWithPlaceholderElements(collection);
-            return storedElements;
+            return storedCollectionElements.value[getCollectionKey(collection)];
         };
     });
 
@@ -64,25 +65,26 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
     const lastQueue = new LastQueue(1000, true);
 
     type FetchParams = {
+        storedElements: DCEEntry[];
         collection: CollectionEntry;
         offset: number;
         limit: number;
     };
 
-    async function fetchMissing({ collection, offset, limit = FETCH_LIMIT }: FetchParams) {
+    async function fetchMissing({ storedElements, collection, offset, limit = FETCH_LIMIT }: FetchParams) {
         const collectionKey = getCollectionKey(collection);
-        const storedElements = getCollectionElements.value(collection);
 
         try {
             // We should fetch only missing (placeholder) elements from the range
             const firstMissingIndexInRange = storedElements
                 .slice(offset, offset + limit)
-                .findIndex((element) => isPlaceholder(element) && !element.fetching);
+                .findIndex((element) => (isPlaceholder(element) && !element.fetching) || isInvalid(element));
 
             if (firstMissingIndexInRange === -1) {
                 // All elements in the range are already stored or being fetched
                 return;
             }
+
             // Adjust the offset to the first missing element
             offset += firstMissingIndexInRange;
 
@@ -98,16 +100,32 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
                 limit: limit,
             });
 
-            return fetchedElements;
+            return { fetchedElements, elementOffset: offset };
         } finally {
             del(loadingCollectionElements.value, collectionKey);
         }
     }
 
-    async function fetchMissingElements(collection: CollectionEntry, offset: number) {
+    async function fetchMissingElements(collection: CollectionEntry, offset: number, limit = FETCH_LIMIT) {
+        const key = getCollectionKey(collection);
+        let storedElements = storedCollectionElements.value[key];
+
+        if (!storedElements) {
+            storedElements = initWithPlaceholderElements(collection);
+            set(storedCollectionElements.value, key, storedElements);
+        }
+
         try {
-            const elements = await lastQueue.enqueue(fetchMissing, { collection, offset });
-            mergeArray(getCollectionKey(collection), elements, storedCollectionElements.value, "id");
+            const data = await (lastQueue.enqueue(
+                fetchMissing,
+                { storedElements, collection, offset, limit },
+                key
+            ) as ReturnType<typeof fetchMissing>);
+
+            if (data) {
+                storedElements.splice(data.elementOffset, data.fetchedElements.length, ...data.fetchedElements);
+                set(storedCollectionElements.value, key, storedElements);
+            }
         } catch (e) {
             if (!(e instanceof ActionSkippedError)) {
                 throw e;
@@ -115,9 +133,11 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         }
     }
 
-    async function loadCollectionElements(collection: CollectionEntry) {
-        const elements = await fetchElementsFromCollection({ entry: collection });
-        set(storedCollectionElements.value, getCollectionKey(collection), elements);
+    async function invalidateCollectionElements(collection: CollectionEntry) {
+        const storedElements = storedCollectionElements.value[getCollectionKey(collection)] ?? [];
+        storedElements.forEach((element) => {
+            (element as InvalidDCEEntry).valid = false;
+        });
     }
 
     function saveCollections(historyContentsPayload: HistoryContentItemBase[]) {
@@ -152,6 +172,10 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         return "id" in element === false;
     }
 
+    function isInvalid(element: DCEEntry): element is InvalidDCEEntry {
+        return (element as InvalidDCEEntry)["valid"] === false;
+    }
+
     function initWithPlaceholderElements(collection: CollectionEntry): ContentPlaceholder[] {
         const totalElements = collection.element_count ?? 0;
         const placeholderElements = new Array<ContentPlaceholder>(totalElements);
@@ -168,7 +192,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         isLoadingCollectionElements,
         getCollection,
         fetchCollection,
-        loadCollectionElements,
+        invalidateCollectionElements,
         saveCollections,
         getCollectionKey,
         fetchMissingElements,

From eae4c39f1c18130ab1811f2086eb22607ae664f3 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:45:10 +0100
Subject: [PATCH 18/24] improve types

---
 client/src/stores/collectionElementsStore.ts | 10 +++-------
 client/src/utils/lastQueue.ts                |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index 586b2eefcdc3..51ec0a0ad23f 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -62,8 +62,6 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         };
     });
 
-    const lastQueue = new LastQueue(1000, true);
-
     type FetchParams = {
         storedElements: DCEEntry[];
         collection: CollectionEntry;
@@ -106,6 +104,8 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         }
     }
 
+    const lastQueue = new LastQueue<typeof fetchMissing>(1000, true);
+
     async function fetchMissingElements(collection: CollectionEntry, offset: number, limit = FETCH_LIMIT) {
         const key = getCollectionKey(collection);
         let storedElements = storedCollectionElements.value[key];
@@ -116,11 +116,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         }
 
         try {
-            const data = await (lastQueue.enqueue(
-                fetchMissing,
-                { storedElements, collection, offset, limit },
-                key
-            ) as ReturnType<typeof fetchMissing>);
+            const data = await lastQueue.enqueue(fetchMissing, { storedElements, collection, offset, limit }, key);
 
             if (data) {
                 storedElements.splice(data.elementOffset, data.fetchedElements.length, ...data.fetchedElements);
diff --git a/client/src/utils/lastQueue.ts b/client/src/utils/lastQueue.ts
index 317d7dfa3a3c..ff27690f0b5f 100644
--- a/client/src/utils/lastQueue.ts
+++ b/client/src/utils/lastQueue.ts
@@ -1,4 +1,4 @@
-type QueuedAction<T extends (...args: any) => R, R = unknown> = {
+type QueuedAction<T extends (...args: any) => R, R = ReturnType<T>> = {
     action: T;
     arg: Parameters<T>[0];
     resolve: (value: R) => void;
@@ -13,7 +13,7 @@ export class ActionSkippedError extends Error {}
  * This is useful when promises earlier enqueued become obsolete.
  * See also: https://stackoverflow.com/questions/53540348/js-async-await-tasks-queue
  */
-export class LastQueue<T extends (arg: any) => R, R = unknown> {
+export class LastQueue<T extends (arg: any) => R, R = ReturnType<T>> {
     throttlePeriod: number;
     /** Throw an error if a queued action is skipped. This avoids dangling promises */
     rejectSkipped: boolean;
@@ -34,7 +34,7 @@ export class LastQueue<T extends (arg: any) => R, R = unknown> {
         promise?.reject(new ActionSkippedError());
     }
 
-    async enqueue(action: T, arg: Parameters<T>[0], key: string | number = 0) {
+    async enqueue(action: T, arg: Parameters<T>[0], key: string | number = 0): Promise<R> {
         return new Promise((resolve, reject) => {
             this.skipPromise(key);
             this.queuedPromises[key] = { action, arg, resolve, reject };

From 7b33959630f887a7734e2147becf26adb4e460d3 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:53:02 +0100
Subject: [PATCH 19/24] fix tests

---
 .../stores/collectionElementsStore.test.ts    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/src/stores/collectionElementsStore.test.ts b/client/src/stores/collectionElementsStore.test.ts
index b34435288554..4a2c7be2e2ce 100644
--- a/client/src/stores/collectionElementsStore.test.ts
+++ b/client/src/stores/collectionElementsStore.test.ts
@@ -38,13 +38,15 @@ describe("useCollectionElementsStore", () => {
         expect(store.storedCollectionElements).toEqual({});
         expect(store.isLoadingCollectionElements(collection)).toEqual(false);
 
-        const offset = 0;
+        // Getting collection elements should be side effect free
+        store.getCollectionElements(collection);
+        expect(store.isLoadingCollectionElements(collection)).toEqual(false);
+        await flushPromises();
+        expect(fetchCollectionElements).not.toHaveBeenCalled();
+
         const limit = 5;
-        // Getting collection elements should trigger a fetch and change the loading state
-        store.getCollectionElements(collection, offset, limit);
-        expect(store.isLoadingCollectionElements(collection)).toEqual(true);
+        store.fetchMissingElements(collection, 0, limit);
         await flushPromises();
-        expect(store.isLoadingCollectionElements(collection)).toEqual(false);
         expect(fetchCollectionElements).toHaveBeenCalled();
 
         const collectionKey = store.getCollectionKey(collection);
@@ -70,18 +72,20 @@ describe("useCollectionElementsStore", () => {
         const offset = 0;
         const limit = storedCount;
         // Getting the same collection elements range should not trigger a fetch
-        store.getCollectionElements(collection, offset, limit);
+        store.fetchMissingElements(collection, offset, limit);
         expect(store.isLoadingCollectionElements(collection)).toEqual(false);
         expect(fetchCollectionElements).not.toHaveBeenCalled();
     });
 
     it("should fetch only missing elements if the requested range is not already stored", async () => {
+        jest.useFakeTimers();
+
         const totalElements = 10;
         const collection: HDCASummary = mockCollection("1", totalElements);
         const store = useCollectionElementsStore();
 
         const initialElements = 3;
-        store.getCollectionElements(collection, 0, initialElements);
+        store.fetchMissingElements(collection, 0, initialElements);
         await flushPromises();
         expect(fetchCollectionElements).toHaveBeenCalled();
         const collectionKey = store.getCollectionKey(collection);
@@ -92,11 +96,10 @@ describe("useCollectionElementsStore", () => {
 
         const offset = 2;
         const limit = 5;
-        // Getting collection elements should trigger a fetch in this case
-        store.getCollectionElements(collection, offset, limit);
-        expect(store.isLoadingCollectionElements(collection)).toEqual(true);
+        // Fetching collection elements should trigger a fetch in this case
+        store.fetchMissingElements(collection, offset, limit);
+        jest.runAllTimers();
         await flushPromises();
-        expect(store.isLoadingCollectionElements(collection)).toEqual(false);
         expect(fetchCollectionElements).toHaveBeenCalled();
 
         elements = store.storedCollectionElements[collectionKey];

From a9505a5041591314910933004c96eeca3a3cae23 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:25:41 +0100
Subject: [PATCH 20/24] insert unexpected elements

---
 client/src/stores/collectionElementsStore.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index 51ec0a0ad23f..b6b38c133fd9 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -4,6 +4,7 @@ import { computed, del, ref, set } from "vue";
 import type { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase } from "@/api";
 import { isHDCA } from "@/api";
 import { fetchCollectionDetails, fetchElementsFromCollection } from "@/api/datasetCollections";
+import { ensureDefined } from "@/utils/assertions";
 import { ActionSkippedError, LastQueue } from "@/utils/lastQueue";
 
 /**
@@ -119,7 +120,13 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
             const data = await lastQueue.enqueue(fetchMissing, { storedElements, collection, offset, limit }, key);
 
             if (data) {
-                storedElements.splice(data.elementOffset, data.fetchedElements.length, ...data.fetchedElements);
+                const from = data.elementOffset;
+                const to = from + data.fetchedElements.length;
+
+                for (let index = from; index < to; index++) {
+                    storedElements[index] = ensureDefined(data.fetchedElements[index - from]);
+                }
+
                 set(storedCollectionElements.value, key, storedElements);
             }
         } catch (e) {

From 5bbdb38c57314477d4c63dab3018a573fdce8098 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:29:45 +0100
Subject: [PATCH 21/24] also fetch instead of just invalidating

---
 .../src/components/History/CurrentCollection/CollectionPanel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 012b5a41e28b..10c830ca4601 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -109,6 +109,7 @@ watch(
     jobState,
     () => {
         collectionElementsStore.invalidateCollectionElements(dsc.value);
+        collectionElementsStore.fetchMissingElements(dsc.value, offset.value);
     },
     { deep: true }
 );

From 9e2b3330fd26e20eff6d0f880769a78aae145e0c Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:38:22 +0100
Subject: [PATCH 22/24] make manual splice reactive

---
 client/src/stores/collectionElementsStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index b6b38c133fd9..d265becded8b 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -124,7 +124,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
                 const to = from + data.fetchedElements.length;
 
                 for (let index = from; index < to; index++) {
-                    storedElements[index] = ensureDefined(data.fetchedElements[index - from]);
+                    set(storedElements, index, ensureDefined(data.fetchedElements[index - from]));
                 }
 
                 set(storedCollectionElements.value, key, storedElements);

From 740449394c4fe7c00756c635eb6b8b1ebd79acb5 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:49:05 +0100
Subject: [PATCH 23/24] add edge case for element_count bug

---
 client/src/stores/collectionElementsStore.ts | 29 ++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index d265becded8b..ac04e1839611 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -74,19 +74,25 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         const collectionKey = getCollectionKey(collection);
 
         try {
-            // We should fetch only missing (placeholder) elements from the range
-            const firstMissingIndexInRange = storedElements
-                .slice(offset, offset + limit)
-                .findIndex((element) => (isPlaceholder(element) && !element.fetching) || isInvalid(element));
+            if (storedElements.length !== 0) {
+                // We should fetch only missing (placeholder) elements from the range
+                const firstMissingIndexInRange = storedElements
+                    .slice(offset, offset + limit)
+                    .findIndex((element) => (isPlaceholder(element) && !element.fetching) || isInvalid(element));
+
+                if (firstMissingIndexInRange === -1) {
+                    // All elements in the range are already stored or being fetched
+                    return;
+                }
 
-            if (firstMissingIndexInRange === -1) {
-                // All elements in the range are already stored or being fetched
-                return;
+                // Adjust the offset to the first missing element
+                offset += firstMissingIndexInRange;
+            } else {
+                // Edge case where element_count is incorrect
+                // TODO: remove me once element_count is reported reliably
+                offset = 0;
             }
 
-            // Adjust the offset to the first missing element
-            offset += firstMissingIndexInRange;
-
             set(loadingCollectionElements.value, collectionKey, true);
             // Mark all elements in the range as fetching
             storedElements
@@ -124,7 +130,8 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
                 const to = from + data.fetchedElements.length;
 
                 for (let index = from; index < to; index++) {
-                    set(storedElements, index, ensureDefined(data.fetchedElements[index - from]));
+                    const element = ensureDefined(data.fetchedElements[index - from]);
+                    set(storedElements, index, element);
                 }
 
                 set(storedCollectionElements.value, key, storedElements);

From af17eb7c3c102915eff820c1d9da91a900322c1d Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:52:48 +0100
Subject: [PATCH 24/24] test element count directly

---
 client/src/stores/collectionElementsStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index ac04e1839611..73c63ade28a2 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -74,7 +74,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
         const collectionKey = getCollectionKey(collection);
 
         try {
-            if (storedElements.length !== 0) {
+            if (collection.element_count !== null) {
                 // We should fetch only missing (placeholder) elements from the range
                 const firstMissingIndexInRange = storedElements
                     .slice(offset, offset + limit)