From 28d86bae1b27df3b427639658d62757eefc303f1 Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:38:56 -0500
Subject: [PATCH 1/7] add delete option to germplasm list management

---
 src/breeding-insight/dao/GermplasmDAO.ts      |   2 +-
 .../{GermplasmFilter.ts => ListFilter.ts}     |  11 +-
 .../service/GermplasmService.ts               |   5 +-
 src/breeding-insight/service/ListService.ts   | 157 +++++++++++
 .../germplasm/GermplasmListDeletionlModal.vue |  89 +++++++
 src/components/germplasm/GermplasmTable.vue   |   2 +-
 src/store/filtering/getters.ts                |   2 +-
 src/store/filtering/index.ts                  |   2 +-
 src/store/filtering/mutations.ts              |   2 +-
 src/store/filtering/types.ts                  |   2 +-
 src/util/ListType.ts                          |   2 +-
 src/views/germplasm/GermplasmByList.vue       | 252 +++++++++++++-----
 src/views/germplasm/GermplasmLists.vue        |  30 +--
 13 files changed, 470 insertions(+), 88 deletions(-)
 rename src/breeding-insight/model/{GermplasmFilter.ts => ListFilter.ts} (86%)
 create mode 100644 src/breeding-insight/service/ListService.ts
 create mode 100644 src/components/germplasm/GermplasmListDeletionlModal.vue

diff --git a/src/breeding-insight/dao/GermplasmDAO.ts b/src/breeding-insight/dao/GermplasmDAO.ts
index af5eeb1f2..33072750b 100644
--- a/src/breeding-insight/dao/GermplasmDAO.ts
+++ b/src/breeding-insight/dao/GermplasmDAO.ts
@@ -30,7 +30,7 @@ export class GermplasmDAO {
         config.url = `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/lists`;
         config.method = 'get';
         config.programId = programId;
-        config.params = {listType: ListType.Germplasm};
+        config.params = {listType: ListType.GERMPLASM};
         if (paginationQuery.page) config.params.page = paginationQuery.page - 1;
         if (paginationQuery.pageSize) config.params.pageSize = paginationQuery.pageSize;
 
diff --git a/src/breeding-insight/model/GermplasmFilter.ts b/src/breeding-insight/model/ListFilter.ts
similarity index 86%
rename from src/breeding-insight/model/GermplasmFilter.ts
rename to src/breeding-insight/model/ListFilter.ts
index 0a0644472..e5bd51ffb 100644
--- a/src/breeding-insight/model/GermplasmFilter.ts
+++ b/src/breeding-insight/model/ListFilter.ts
@@ -18,14 +18,17 @@
 import {GermplasmSortField} from "@/breeding-insight/model/Sort";
 import {BaseFilter} from "@/breeding-insight/model/BaseFilter";
 
-export enum GermplasmBIField {
+export enum ListBIField {
     ListDbId = "listDbId",
     ListName = "listName",
 }
 
-export class GermplasmFilter extends BaseFilter {
-    [GermplasmBIField.ListDbId]: string;
-    [GermplasmBIField.ListName]: string;
+export class ListFilter extends BaseFilter {
+    [ListBIField.ListDbId]: string;
+    [ListBIField.ListName]: string;
+}
+
+export class GermplasmFilter extends ListFilter {
     [GermplasmSortField.AccessionNumber]: string;
     [GermplasmSortField.DefaultDisplayName]: string;
     [GermplasmSortField.BreedingMethod]: string;
diff --git a/src/breeding-insight/service/GermplasmService.ts b/src/breeding-insight/service/GermplasmService.ts
index 7049e37f2..4f943b413 100644
--- a/src/breeding-insight/service/GermplasmService.ts
+++ b/src/breeding-insight/service/GermplasmService.ts
@@ -24,7 +24,8 @@ import {Germplasm} from "@/breeding-insight/brapi/model/germplasm";
 import {Result, ResultGenerator} from "@/breeding-insight/model/Result";
 import {SortOrder} from "@/breeding-insight/model/Sort";
 import * as api from "@/util/api";
-import {GermplasmFilter} from "@/breeding-insight/model/GermplasmFilter";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
+
 
 export class GermplasmService {
 
@@ -67,7 +68,7 @@ export class GermplasmService {
             }
 
             //Get the list germplasm
-            const {data} = await api.call({
+            const {data}: any = await api.call({
                 url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/germplasm/lists/${listId}/records`,
                 method: 'get',
                 params: params
diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
new file mode 100644
index 000000000..bf3b38a7c
--- /dev/null
+++ b/src/breeding-insight/service/ListService.ts
@@ -0,0 +1,157 @@
+/*
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {GermplasmList} from "@/breeding-insight/model/GermplasmList";
+import {BiResponse, Metadata} from "@/breeding-insight/model/BiResponse";
+import {PaginationQuery} from "@/breeding-insight/model/PaginationQuery";
+import {PaginationUtilities} from "@/breeding-insight/model/view_models/PaginationUtilities";
+import {GermplasmDAO} from "@/breeding-insight/dao/GermplasmDAO";
+import {Germplasm} from "@/breeding-insight/brapi/model/germplasm";
+import {Result, ResultGenerator} from "@/breeding-insight/model/Result";
+import {GermplasmListSortField, SortOrder} from "@/breeding-insight/model/Sort";
+import * as api from "@/util/api";
+import {ListType} from "@/util/ListType";
+import {ListFilter} from "@/breeding-insight/model/ListFilter";
+
+export class ListService {
+    static async deleteList(programId: string | undefined, listDbId: string) {
+        if (programId == undefined) {
+            throw new Error("Not valid program");
+        }
+        try {
+            const response = await api.call({
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists/${listDbId}`,
+                method: 'delete',
+                params: { hardDelete: true }
+            }) as Response;
+
+            // If we get here, it means the call was successful (likely 200 OK)
+            return new BiResponse({ success: true });
+
+        } catch (error) {
+            // Check if the error is actually a 204 No Content response
+            if (error.response && error.response.status === 204) {
+                // This is actually a successful deletion
+                return new BiResponse({ success: true });
+            }
+
+            // For other errors, log and rethrow
+            console.error('Error in deleteList:', error);
+            throw error;
+        }
+    }
+
+    static async getLists<T>(listType: ListType,
+                             programId: string,
+                             sort: { field: T, order: SortOrder },
+                             pagination: {pageSize: number, page: number},
+                             filters?: any): Promise<BiResponse> {
+        if (!programId) throw 'Program ID required';
+
+        // Set list type, sort, and pagination
+        let params: any = { listType };
+        if(filters) {
+            params = filters;
+        }
+
+        if (sort.field) {
+            params['sortField'] = sort.field;
+        }
+        if (sort.order) {
+            params['sortOrder'] = sort.order;
+        }
+        if (pagination.page || pagination.page == 0) { //have to account for 0-index pagination since 0 falsy
+            params['page'] = pagination.page;
+        }
+        if (pagination.pageSize) {
+            params['pageSize'] = pagination.pageSize;
+        }
+
+        // Make the GET call
+        try {
+            const { data }: any = await api.call({
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists`,
+                method: 'get',
+                params: params
+            });
+
+            return new BiResponse(data);
+
+        } catch (error) {
+            throw error;
+        }
+    }
+
+    static async getAllInList<T, U extends ListFilter>(
+        listType: ListType,
+        programId: string,
+        sort: { field: T, order: SortOrder },
+        pagination: { pageSize: number, page: number },
+        { listDbId, listName, ...brapiFilters  }: U): Promise<BiResponse> {
+        // Form the query params including list type, sorting, pagination, and filtering
+        let params: any = { listType, ...brapiFilters };
+
+        if (sort.field) {
+            params['sortField'] = sort.field;
+        }
+        if (sort.order) {
+            params['sortOrder'] = sort.order;
+        }
+        if (pagination.page || pagination.page == 0) { //have to account for 0-index pagination since 0 falsy
+            params['page'] = pagination.page;
+        }
+        if (pagination.pageSize) {
+            params['pageSize'] = pagination.pageSize;
+        }
+
+        try {
+            let listId: String = '';
+
+            if(listName && !listDbId) {
+                //Get the list db id
+                const paginationQuery = new PaginationQuery(0, 20, true);
+                //const {result: {data: lists}} = await GermplasmDAO.getAllLists(programId, paginationQuery);
+                const {result: {data: lists}} = await ListService.getLists<GermplasmListSortField>(
+                    ListType.GERMPLASM,
+                    programId,
+                    { field: GermplasmListSortField.Name, order: SortOrder.Descending },
+                    new PaginationQuery(0, 200, true));
+                const matchingLists = lists.filter((list: any) => list.listName === listName);
+                if (matchingLists.length === 0) throw Error("List name is not valid for this program");
+                if (matchingLists.length > 1) throw Error("List name must be unique");
+                listId = matchingLists[0].listDbId;
+            } else if(listDbId) {
+                listId = listDbId;
+            } else {
+                throw Error("Missing list id and name");
+            }
+
+            //Get the list germplasm
+            const { data }: any = await api.call({
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists/${listId}`,
+                method: 'get',
+                params: params
+            }) as Response;
+
+            return new BiResponse(data);
+
+        } catch(error) {
+            throw error;
+        }
+    }
+
+}
diff --git a/src/components/germplasm/GermplasmListDeletionlModal.vue b/src/components/germplasm/GermplasmListDeletionlModal.vue
new file mode 100644
index 000000000..4d1da73c7
--- /dev/null
+++ b/src/components/germplasm/GermplasmListDeletionlModal.vue
@@ -0,0 +1,89 @@
+<!--
+- See the NOTICE file distributed with this work for additional information
+- regarding copyright ownership.
+-
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-     http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+-->
+
+<template>
+  <ConfirmationModal
+    v-bind:unique-id="listDbId"
+    v-bind:modal-title="modalTitle"
+    v-bind:confirmedAction="deleteList"
+    v-bind:active="active"
+    modal-class="experiment-observation-remove-collaborator-button"
+    v-on:deactivate="cancelDelete"
+  >
+    <template #form>
+      <p>Are you sure you want to delete the germplasm list? Note that deleting a germplasm list will not delete the associated germplasm records.</p>
+    </template>
+    <slot />
+  </ConfirmationModal>
+</template>
+
+<script lang="ts">
+import {Component, Vue, Prop} from "vue-property-decorator";
+import {validationMixin} from "vuelidate";
+import {mapGetters} from "vuex";
+import {Program} from "@/breeding-insight/model/Program";
+import {AlertTriangleIcon} from 'vue-feather-icons';
+import {Trial} from "@/breeding-insight/model/Trial";
+import ConfirmationModal from "@/components/modals/ConfirmationModal.vue";
+import {ExperimentService} from "@/breeding-insight/service/ExperimentService";
+import { Collaborator } from '@/breeding-insight/model/Collaborator';
+import { ListService } from '@/breeding-insight/service/ListService';
+
+@Component({
+  mixins: [validationMixin],
+  components: {ConfirmationModal, AlertTriangleIcon},
+  computed: {
+    ...mapGetters([
+      'activeProgram'
+    ])
+  }
+})
+export default class ExperimentCollaboratorRemovalModal extends Vue {
+
+  @Prop()
+  active!: boolean;
+  @Prop()
+  listDbId!: string;
+  @Prop()
+  modalTitle?: string;
+
+  private activeProgram?: Program;
+
+  async deleteList(): Promise<void> {
+    if (this.activeProgram) {
+      try {
+        // Call the service method and await its completion
+        await ListService.deleteList(this.activeProgram.id, this.listDbId)
+
+        // If the above call doesn't throw an error, we assume it was successful
+        // Emit the event after the promise is resolved
+        this.$emit('list-deleted');
+
+      } catch (error) {
+        // Handle any errors that might occur during the async operation
+        console.error('Error deleting the list:', error);
+        // Optionally emit an error event or handle the error in some way
+        this.$emit('show-error-notification', `Error while trying to delete the list`);
+      }
+    }
+  }
+
+  cancelDelete(){
+    this.$emit('deactivate');
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/germplasm/GermplasmTable.vue b/src/components/germplasm/GermplasmTable.vue
index 974efb163..2691c40ba 100644
--- a/src/components/germplasm/GermplasmTable.vue
+++ b/src/components/germplasm/GermplasmTable.vue
@@ -94,7 +94,7 @@ import {
 } from "@/breeding-insight/model/Sort";
 import {UPDATE_GERMPLASM_SORT} from "@/store/sorting/mutation-types";
 import { PaginationQuery } from '@/breeding-insight/model/PaginationQuery';
-import {GermplasmFilter} from "@/breeding-insight/model/GermplasmFilter";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
 
 @Component({
   mixins: [validationMixin],
diff --git a/src/store/filtering/getters.ts b/src/store/filtering/getters.ts
index b8d8a81a9..cfb45523a 100644
--- a/src/store/filtering/getters.ts
+++ b/src/store/filtering/getters.ts
@@ -18,7 +18,7 @@
 import {GetterTree} from 'vuex';
 import {RootState} from "@/store/types";
 import {FilterState} from "@/store/filtering/types";
-import {GermplasmFilter} from "@/breeding-insight/model/GermplasmFilter";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
 
 export const getters: GetterTree<FilterState, RootState> = {
     // germplasm
diff --git a/src/store/filtering/index.ts b/src/store/filtering/index.ts
index 12cb5078b..c0b5b6dff 100644
--- a/src/store/filtering/index.ts
+++ b/src/store/filtering/index.ts
@@ -20,7 +20,7 @@ import {getters} from '@/store/filtering/getters';
 import {mutations} from '@/store/filtering/mutations';
 import {RootState} from '@/store/types';
 import {FilterState} from "@/store/filtering/types";
-import {GermplasmFilter} from "@/breeding-insight/model/GermplasmFilter";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
 
 export let state: FilterState;
 state = {
diff --git a/src/store/filtering/mutations.ts b/src/store/filtering/mutations.ts
index 8a6212a69..5976d9bc1 100644
--- a/src/store/filtering/mutations.ts
+++ b/src/store/filtering/mutations.ts
@@ -17,7 +17,7 @@
 
 import {MutationTree} from 'vuex';
 import {FilterState} from "@/store/filtering/types";
-import {GermplasmFilter} from "@/breeding-insight/model/GermplasmFilter";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
 import {UPDATE_GERMPLASM_FILTER} from "@/store/filtering/mutation-types";
 
 export const mutations: MutationTree<FilterState> = {
diff --git a/src/store/filtering/types.ts b/src/store/filtering/types.ts
index 3d1c7b83f..6d9dd0daa 100644
--- a/src/store/filtering/types.ts
+++ b/src/store/filtering/types.ts
@@ -1,4 +1,4 @@
-import { GermplasmFilter } from "@/breeding-insight/model/GermplasmFilter";
+import { GermplasmFilter } from "@/breeding-insight/model/ListFilter";
 
 export interface FilterState {
     // germplasm table
diff --git a/src/util/ListType.ts b/src/util/ListType.ts
index 09a2b11c6..23df7121f 100644
--- a/src/util/ListType.ts
+++ b/src/util/ListType.ts
@@ -16,5 +16,5 @@
  */
 
 export enum ListType {
-    Germplasm = "germplasm",
+    GERMPLASM = "germplasm",
 }
diff --git a/src/views/germplasm/GermplasmByList.vue b/src/views/germplasm/GermplasmByList.vue
index 821a852f0..69985c08c 100644
--- a/src/views/germplasm/GermplasmByList.vue
+++ b/src/views/germplasm/GermplasmByList.vue
@@ -18,45 +18,100 @@
 <template>
   <div class="germplasm">
     <router-link
-        v-bind:to="{name: 'germplasm-lists', params: {programId: activeProgram.id}}"
+        v-bind:to="germplasmListsRoute()"
     >
       <a>&lt; Germplasm Lists</a>
     </router-link>
     <h1 class="title">
-      {{ list ? list.listName : "" | toStartCase }}
+      {{ toStartCase(list ? list.listName : "") }}
     </h1>
-<div class="columns">
-  <div class="column is-10">
-    <div class="columns is-multiline">
-      <div class="column germplasm-list-meta-field"><b>Description:</b></div>
-      <div class="column germplasm-list-meta-data">{{ list ? list.listDescription : ""}}</div>
-      <div class="column germplasm-list-meta-field"><b>User:</b></div>
-      <div class="column germplasm-list-meta-data">{{ list ? list.listOwnerName : ""}}</div>
-      <div class="column germplasm-list-meta-field"><b>Import Date:</b></div>
-      <div class="column germplasm-list-meta-data">{{ list ? list.dateCreated : "" | toYMD }}</div>
-      <div class="column germplasm-list-meta-field"><b>Total Entries:</b></div>
-      <div class="column germplasm-list-meta-data">{{ list ? list.listSize : ""}}</div>
-    </div>
-  </div>
-  <div class="column is-2">
-    <div class="columns is-multiline">
-      <div class="column is-full"></div>
-      <div class="column is-full"></div>
-      <div class="column is-full"></div>
-      <div class="column is-full buttons">
-        <GermplasmDownloadButton
-            v-bind:modal-title="`Download ${list ? list.listName : ''}`"
-            fieldset-legend="File Format"
-            v-bind:listDbId="list ? list.listDbId : '' "
-        >
-          <button class="button is-primary has-text-weight-bold">
-            <strong>Download</strong>
-          </button>
-        </GermplasmDownloadButton>
+
+    <GermplasmListDeletionModal
+        v-bind:active="deleteModalActive"
+        v-bind:list-db-id="listDbId"
+        v-bind:modal-title="`Delete ${list.listName}`"
+        v-on:show-error-notification="$emit('show-error-notification', $event)"
+        v-on:deactivate="deleteModalActive = false"
+        v-on:list-deleted="deleteSuccess"
+    />
+    <FormModal
+        v-bind:active.sync="downloadModalActive"
+        v-bind:title="`Download ${list ? list.listName : ''}`"
+        v-on:deactivate="closeDownloadModal"
+    >
+      <template #form>
+        <fieldset>
+          <legend class="label">
+            File Formnat
+          </legend>
+          <div
+              v-for="option in fileOptions"
+              v-bind:key="option.id"
+          >
+            <label class="radio">
+              <input
+                  v-model="fileExtension"
+                  type="radio"
+                  name="fileType"
+                  v-bind:value="option.id"
+              ><span class="check" />
+              <span class="control-label"> {{ option.name }} </span>
+            </label>
+          </div>
+        </fieldset>
+      </template>
+      <template #buttons>
+        <div class="columns">
+          <div class="column is-whole has-text-centered buttons">
+            <button
+                class="button is-primary has-text-weight-bold"
+                v-on:click="invokeDownload"
+            >
+              <strong>Download</strong>
+            </button>
+            <button
+                class="button"
+                v-on:click="closeDownloadModal"
+            >
+              Cancel
+            </button>
+          </div>
+        </div>
+      </template>
+    </FormModal>
+    <div class="columns">
+      <div class="column is-10">
+        <div class="columns is-multiline">
+          <div class="column germplasm-list-meta-field"><b>Description:</b></div>
+          <div class="column germplasm-list-meta-data">{{ list ? list.listDescription : ""}}</div>
+          <div class="column germplasm-list-meta-field"><b>User:</b></div>
+          <div class="column germplasm-list-meta-data">{{ list ? list.listOwnerName : ""}}</div>
+          <div class="column germplasm-list-meta-field"><b>Import Date:</b></div>
+          <div class="column germplasm-list-meta-data">{{ toYMD(list ? list.dateCreated : "") }}</div>
+          <div class="column germplasm-list-meta-field"><b>Total Entries:</b></div>
+          <div class="column germplasm-list-meta-data">{{ list ? list.listSize : ""}}</div>
+        </div>
+      </div>
+      <div class="column is-2">
+        <div class="columns is-multiline">
+          <div class="column is-full"></div>
+          <div class="column is-full"></div>
+          <div class="column is-full"></div>
+          <div class="column is-full buttons">
+            <ActionMenu
+                class = "is-pulled-right has-text-weight-bold above-tabs-button"
+                v-bind:is-primary="true"
+                v-bind:id="'manage-germplasm-list-dropdown-button'"
+                v-bind:button-text="'Manage List'"
+                v-bind:action-menu-items=actions
+                v-on:delete-list="deleteList()"
+                v-on:download-file="openDownloadModal()"
+            >
+            </ActionMenu>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-</div>
     <GermplasmTable
         v-bind:germplasmFetch="germplasmFetch"
         entryNumberVisible="true"
@@ -67,59 +122,136 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator'
+import {Component} from 'vue-property-decorator'
 import GermplasmBase from "@/components/germplasm/GermplasmBase.vue";
 import GermplasmTable from '@/components/germplasm/GermplasmTable.vue';
-import { GermplasmService } from '@/breeding-insight/service/GermplasmService';
-import { GermplasmSort } from '@/breeding-insight/model/Sort';
-import { BiResponse } from '@/breeding-insight/model/BiResponse';
-import { GermplasmDAO } from '@/breeding-insight/dao/GermplasmDAO';
-import { PaginationQuery } from '@/breeding-insight/model/PaginationQuery';
-import { mapGetters } from 'vuex';
-import { Program } from '@/breeding-insight/model/Program';
+import {GermplasmListSortField, GermplasmSort, SortOrder, GermplasmSortField} from '@/breeding-insight/model/Sort';
+import {BiResponse} from '@/breeding-insight/model/BiResponse';
+import {PaginationQuery} from '@/breeding-insight/model/PaginationQuery';
+import {mapGetters} from 'vuex';
+import {Program} from '@/breeding-insight/model/Program';
 import {StringFormatters} from "@/breeding-insight/utils/StringFormatters";
 import GermplasmDownloadButton from '@/components/germplasm/GermplasmDownloadButton.vue';
+import GermplasmListDeletionModal from '@/components/germplasm/GermplasmListDeletionlModal.vue'
 import {PaginationController} from "@/breeding-insight/model/view_models/PaginationController";
+import ActionMenu from "@/components/layouts/menus/ActionMenu.vue";
+import {ActionMenuItem} from "@/breeding-insight/model/ActionMenuItem";
+import {FileTypeOption} from '@/breeding-insight/model/FileTypeOption';
+import FormModal from "@/components/modals/FormModal.vue";
+import {ListService} from '@/breeding-insight/service/ListService';
+import {ListType} from "@/util/ListType";
+import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
 
 @Component({
-  components: { GermplasmTable, GermplasmDownloadButton },
+  components: { FormModal, GermplasmTable, GermplasmDownloadButton, GermplasmListDeletionModal, ActionMenu },
   computed: {
     ...mapGetters([
       'activeProgram'
     ])
-  },
-  filters: {
-    toStartCase: StringFormatters.toStartCase,
-    toYMD: (date) => date.split('T')[0]
   }
 })
 export default class GermplasmByList extends GermplasmBase {
 
   private activeProgram?: Program;
-  private list: any = null;
+  private downloadModalActive: boolean = false;
+  private deleteModalActive: boolean = false;
+  private fileOptions: FileTypeOption[] = Object.values(FileTypeOption);
+  private fileExtension: string = this.fileOptions[0].id;
+  private list: any = {};
   private referenceId?: string = '';
+  private actions: ActionMenuItem[] = [
+    new ActionMenuItem('germplasm-list-delete', 'delete-list', 'Delete', this.$ability.can('create', 'Import')),
+    new ActionMenuItem('germplasm-list-download-file', 'download-file', 'Download',  true)
+  ];
+
+  // Formatting filters
+  private toYMD(date: string | null | undefined): string {
+    if (!date) return ''; // Return an empty string if date is null, undefined, or empty
+    return date.split('T')[0];
+  }
+  private toStartCase(data: string): string | undefined {
+    return StringFormatters.toStartCase(data);
+  }
+
+  // Breadcrumb route
+  private germplasmListsRoute() {
+    if (this.activeProgram && this.activeProgram.id) {
+      return {name: 'germplasm-lists', params: {programId: this.activeProgram.id}};
+    } else {
+      return {name: 'germplasm-lists'};
+    }
+  }
+
 
   // Set the method used to populate the germplasm table
-  private germplasmFetch: (programId: string, sort: GermplasmSort, paginationController: PaginationController) => ((filters: any) => Promise<BiResponse>) =
-      function (programId: string, sort: GermplasmSort, paginationController: PaginationController) {
-        let id: string = this.$route.params.listId;
-        return function (filters: any) {
-          return GermplasmService.getAllInList(
-              programId,
-              sort,
-              {pageSize: paginationController.pageSize, page: paginationController.currentPage - 1},
-              {listDbId: `${id}`, ...filters})
-        };
-      };
+  private germplasmFetch = (
+      programId: string,
+      sort: GermplasmSort,
+      { pageSize, currentPage }: PaginationController
+  ) => (filters: any): Promise<BiResponse> =>
+      ListService.getAllInList<GermplasmSortField, GermplasmFilter>(
+          ListType.GERMPLASM,
+          programId,
+          sort,
+          { pageSize, page: currentPage - 1 },
+          { listDbId: this.$route.params.listId, ...filters }
+      );
+
 
   mounted() {
     this.getList();
   }
 
+  get listDbId(): string {
+    return this.$route.params.listId;
+  }
+
+  private deleteSuccess() {
+    // Navigate to the lists table since this list no longer exists
+    this.$router.push({ name: "germplasm-lists" });
+  }
+
+  async deleteList() {
+    this.deleteModalActive = true;
+  }
+
+  async openDownloadModal() {
+    this.downloadModalActive = true;
+  }
+
+  private closeDownloadModal() {
+    // Close the modal
+    this.downloadModalActive = false;
+
+    // Reset fileExtension.
+    this.fileExtension = this.fileOptions[0].id;
+
+  }
+
+  private downloadList(): boolean {
+    if (this.activeProgram) {
+      window.open(process.env.VUE_APP_BI_API_ROOT + '/v1/programs/' + this.activeProgram.id + '/deltalists/' + this.listDbId + '/export?fileExtension=' + this.fileExtension, '_blank');
+      return true;
+    }
+    return false;
+  }
+
+  private invokeDownload(){
+    // Invoke the download prop, which returns true if download succeeded.
+    if (this.downloadList())
+    {
+      // Close and deactivate modal.
+      this.closeDownloadModal();
+    }
+  }
+
   async getList() {
-    const paginationQuery = new PaginationQuery(0, 200, true);
-    const {result: {data: lists}} = await GermplasmDAO.getAllLists(this.activeProgram!.id!, paginationQuery);
-    const matchingLists: any[] = lists.filter(list => list.listDbId === this.$route.params.listId);
+    const {result: {data: lists}} = await ListService.getLists<GermplasmListSortField>(
+        ListType.GERMPLASM,
+        this.activeProgram!.id!,
+        { field: GermplasmListSortField.Name, order: SortOrder.Descending },
+        new PaginationQuery(0, 200, true));
+    const matchingLists: any[] = lists.filter((list: any) => list.listDbId === this.$route.params.listId);
     this.list = matchingLists[0];
 
     // Find the key used, if any, for this list in the list entry numbers map
diff --git a/src/views/germplasm/GermplasmLists.vue b/src/views/germplasm/GermplasmLists.vue
index 8f3e702d8..61dd713c4 100644
--- a/src/views/germplasm/GermplasmLists.vue
+++ b/src/views/germplasm/GermplasmLists.vue
@@ -27,33 +27,33 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator'
+import {Component} from 'vue-property-decorator'
 import ProgramsBase from "@/components/program/ProgramsBase.vue";
 import GermplasmListsTable from "@/components/germplasm/GermplasmListsTable.vue";
 import {GermplasmListSort, GermplasmListSortField} from "@/breeding-insight/model/Sort";
 import {PaginationController} from "@/breeding-insight/model/view_models/PaginationController";
 import {BiResponse} from "@/breeding-insight/model/BiResponse";
-import {BrAPIService, BrAPIType} from "@/breeding-insight/service/BrAPIService";
 import {ListType} from "@/util/ListType";
+import {ListService} from "@/breeding-insight/service/ListService";
+
 @Component({
   components: {
     GermplasmListsTable
   }
 })
 export default class GermplasmLists extends ProgramsBase {
-
-  private germplasmListFetch: (programId: string, sort: GermplasmListSort, paginationController: PaginationController) => ((filters: any) => Promise<BiResponse>) =
-      function (programId: string, sort: GermplasmListSort, paginationController: PaginationController) {
-        return function (filters: any) {
-          filters.listType=ListType.Germplasm;
-          return BrAPIService.get<GermplasmListSortField>(
-              BrAPIType.LIST,
-              programId,
-              sort,
-              { pageSize: paginationController.pageSize, page: paginationController.currentPage - 1 },
-              filters)
-        };
-      };
+  private germplasmListFetch = (
+      programId: string,
+      sort: GermplasmListSort,
+      { pageSize, currentPage }: PaginationController
+  ) => (filters: any): Promise<BiResponse> =>
+      ListService.getLists<GermplasmListSortField>(
+          ListType.GERMPLASM,
+          programId,
+          sort,
+          { pageSize, page: currentPage - 1 },
+          filters
+      );
 }
 
 </script>
\ No newline at end of file

From a18760e2c3af05b30fb8cab86eeb102baaa8f3de Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:39:20 -0500
Subject: [PATCH 2/7] add access control for list delete menu option

---
 src/breeding-insight/service/ListService.ts | 6 +++---
 src/config/AppAbility.ts                    | 3 ++-
 src/config/ability.ts                       | 2 ++
 src/views/germplasm/GermplasmByList.vue     | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
index bf3b38a7c..14b98261a 100644
--- a/src/breeding-insight/service/ListService.ts
+++ b/src/breeding-insight/service/ListService.ts
@@ -34,7 +34,7 @@ export class ListService {
         }
         try {
             const response = await api.call({
-                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists/${listDbId}`,
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/lists/${listDbId}`,
                 method: 'delete',
                 params: { hardDelete: true }
             }) as Response;
@@ -84,7 +84,7 @@ export class ListService {
         // Make the GET call
         try {
             const { data }: any = await api.call({
-                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists`,
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/lists`,
                 method: 'get',
                 params: params
             });
@@ -142,7 +142,7 @@ export class ListService {
 
             //Get the list germplasm
             const { data }: any = await api.call({
-                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/deltalists/${listId}`,
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/lists/${listId}`,
                 method: 'get',
                 params: params
             }) as Response;
diff --git a/src/config/AppAbility.ts b/src/config/AppAbility.ts
index f3cb76e4c..590f043af 100644
--- a/src/config/AppAbility.ts
+++ b/src/config/AppAbility.ts
@@ -19,7 +19,8 @@ import {Ability, AbilityClass} from '@casl/ability';
 
 type Actions = 'manage' | 'create' | 'read' | 'update' | 'delete' | 'archive' | 'access' | 'submit';
 type Subjects = 'ProgramUser' | 'Location' | 'User' | 'AdminSection' | 'Trait' | 'Import' | 'ProgramConfiguration' | 'Submission'
-    | 'Experiment' | 'Germplasm' | 'Ontology' | 'SampleManagement' | 'ProgramAdministration' | 'JobManagement' | 'Collaborator' | 'BrAPI' ;
+    | 'Experiment' | 'Germplasm' | 'Ontology' | 'SampleManagement' | 'ProgramAdministration' | 'JobManagement' | 'Collaborator' | 'BrAPI'
+    | 'List';
 
 export type AppAbility = Ability<[Actions, Subjects]>;
 export const AppAbility = Ability as AbilityClass<AppAbility>;
\ No newline at end of file
diff --git a/src/config/ability.ts b/src/config/ability.ts
index b91c01900..afb865d69 100644
--- a/src/config/ability.ts
+++ b/src/config/ability.ts
@@ -59,6 +59,7 @@ const rolePermissions: Record<string, DefinePermissions> = {
     can('access', 'BrAPI');
     can('access', 'JobManagement');
     can('manage', 'Collaborator');
+    can('delete', 'List');
 
   },
   systemadministrator(user, { can }) {
@@ -79,6 +80,7 @@ const rolePermissions: Record<string, DefinePermissions> = {
     can('access', 'BrAPI');
     can('access', 'JobManagement');
     can('manage', 'Collaborator');
+    can('delete', 'List');
 
   }
 };
diff --git a/src/views/germplasm/GermplasmByList.vue b/src/views/germplasm/GermplasmByList.vue
index 69985c08c..ca321fbd8 100644
--- a/src/views/germplasm/GermplasmByList.vue
+++ b/src/views/germplasm/GermplasmByList.vue
@@ -160,7 +160,7 @@ export default class GermplasmByList extends GermplasmBase {
   private list: any = {};
   private referenceId?: string = '';
   private actions: ActionMenuItem[] = [
-    new ActionMenuItem('germplasm-list-delete', 'delete-list', 'Delete', this.$ability.can('create', 'Import')),
+    new ActionMenuItem('germplasm-list-delete', 'delete-list', 'Delete', this.$ability.can('delete', 'List')),
     new ActionMenuItem('germplasm-list-download-file', 'download-file', 'Download',  true)
   ];
 
@@ -230,7 +230,7 @@ export default class GermplasmByList extends GermplasmBase {
 
   private downloadList(): boolean {
     if (this.activeProgram) {
-      window.open(process.env.VUE_APP_BI_API_ROOT + '/v1/programs/' + this.activeProgram.id + '/deltalists/' + this.listDbId + '/export?fileExtension=' + this.fileExtension, '_blank');
+      window.open(process.env.VUE_APP_BI_API_ROOT + '/v1/programs/' + this.activeProgram.id + '/brapi/v2/lists/' + this.listDbId + '/export?fileExtension=' + this.fileExtension, '_blank');
       return true;
     }
     return false;

From 2a6d70feba14e23063171ce7f4542993e560e23c Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:26:00 -0500
Subject: [PATCH 3/7] get germplasm list records via germplasm endpoints

---
 src/breeding-insight/service/GermplasmService.ts | 4 ++--
 src/breeding-insight/service/ListService.ts      | 2 --
 src/views/germplasm/GermplasmByList.vue          | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/breeding-insight/service/GermplasmService.ts b/src/breeding-insight/service/GermplasmService.ts
index 4f943b413..bd6c421ac 100644
--- a/src/breeding-insight/service/GermplasmService.ts
+++ b/src/breeding-insight/service/GermplasmService.ts
@@ -35,7 +35,7 @@ export class GermplasmService {
                          { listDbId, listName, ...brapiFilters  }: GermplasmFilter):
         Promise<BiResponse> {
         //Form the query params including sorting, pagination, and filtering
-        let params: any = { ...brapiFilters };
+        let params: any = {list: listDbId, ...brapiFilters };
 
         if (sort.field) {
             params['sortField'] = sort.field;
@@ -69,7 +69,7 @@ export class GermplasmService {
 
             //Get the list germplasm
             const {data}: any = await api.call({
-                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/germplasm/lists/${listId}/records`,
+                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/germplasm`,
                 method: 'get',
                 params: params
             }) as Response;
diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
index 14b98261a..33996ed7b 100644
--- a/src/breeding-insight/service/ListService.ts
+++ b/src/breeding-insight/service/ListService.ts
@@ -123,8 +123,6 @@ export class ListService {
 
             if(listName && !listDbId) {
                 //Get the list db id
-                const paginationQuery = new PaginationQuery(0, 20, true);
-                //const {result: {data: lists}} = await GermplasmDAO.getAllLists(programId, paginationQuery);
                 const {result: {data: lists}} = await ListService.getLists<GermplasmListSortField>(
                     ListType.GERMPLASM,
                     programId,
diff --git a/src/views/germplasm/GermplasmByList.vue b/src/views/germplasm/GermplasmByList.vue
index ca321fbd8..1fc17751e 100644
--- a/src/views/germplasm/GermplasmByList.vue
+++ b/src/views/germplasm/GermplasmByList.vue
@@ -141,6 +141,7 @@ import FormModal from "@/components/modals/FormModal.vue";
 import {ListService} from '@/breeding-insight/service/ListService';
 import {ListType} from "@/util/ListType";
 import {GermplasmFilter} from "@/breeding-insight/model/ListFilter";
+import {GermplasmService} from "@/breeding-insight/service/GermplasmService";
 
 @Component({
   components: { FormModal, GermplasmTable, GermplasmDownloadButton, GermplasmListDeletionModal, ActionMenu },
@@ -189,8 +190,7 @@ export default class GermplasmByList extends GermplasmBase {
       sort: GermplasmSort,
       { pageSize, currentPage }: PaginationController
   ) => (filters: any): Promise<BiResponse> =>
-      ListService.getAllInList<GermplasmSortField, GermplasmFilter>(
-          ListType.GERMPLASM,
+      GermplasmService.getAllInList<GermplasmSortField>(
           programId,
           sort,
           { pageSize, page: currentPage - 1 },

From c49c3d81fc571a7f09c256892e701c5f53250a2f Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:59:16 -0500
Subject: [PATCH 4/7] revert to germplasm endpoints

---
 src/breeding-insight/service/ListService.ts | 68 +--------------------
 src/views/germplasm/GermplasmByList.vue     |  2 +-
 2 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
index 33996ed7b..087923396 100644
--- a/src/breeding-insight/service/ListService.ts
+++ b/src/breeding-insight/service/ListService.ts
@@ -15,17 +15,10 @@
  * limitations under the License.
  */
 
-import {GermplasmList} from "@/breeding-insight/model/GermplasmList";
-import {BiResponse, Metadata} from "@/breeding-insight/model/BiResponse";
-import {PaginationQuery} from "@/breeding-insight/model/PaginationQuery";
-import {PaginationUtilities} from "@/breeding-insight/model/view_models/PaginationUtilities";
-import {GermplasmDAO} from "@/breeding-insight/dao/GermplasmDAO";
-import {Germplasm} from "@/breeding-insight/brapi/model/germplasm";
-import {Result, ResultGenerator} from "@/breeding-insight/model/Result";
-import {GermplasmListSortField, SortOrder} from "@/breeding-insight/model/Sort";
+import {BiResponse} from "@/breeding-insight/model/BiResponse";
+import {SortOrder} from "@/breeding-insight/model/Sort";
 import * as api from "@/util/api";
 import {ListType} from "@/util/ListType";
-import {ListFilter} from "@/breeding-insight/model/ListFilter";
 
 export class ListService {
     static async deleteList(programId: string | undefined, listDbId: string) {
@@ -95,61 +88,4 @@ export class ListService {
             throw error;
         }
     }
-
-    static async getAllInList<T, U extends ListFilter>(
-        listType: ListType,
-        programId: string,
-        sort: { field: T, order: SortOrder },
-        pagination: { pageSize: number, page: number },
-        { listDbId, listName, ...brapiFilters  }: U): Promise<BiResponse> {
-        // Form the query params including list type, sorting, pagination, and filtering
-        let params: any = { listType, ...brapiFilters };
-
-        if (sort.field) {
-            params['sortField'] = sort.field;
-        }
-        if (sort.order) {
-            params['sortOrder'] = sort.order;
-        }
-        if (pagination.page || pagination.page == 0) { //have to account for 0-index pagination since 0 falsy
-            params['page'] = pagination.page;
-        }
-        if (pagination.pageSize) {
-            params['pageSize'] = pagination.pageSize;
-        }
-
-        try {
-            let listId: String = '';
-
-            if(listName && !listDbId) {
-                //Get the list db id
-                const {result: {data: lists}} = await ListService.getLists<GermplasmListSortField>(
-                    ListType.GERMPLASM,
-                    programId,
-                    { field: GermplasmListSortField.Name, order: SortOrder.Descending },
-                    new PaginationQuery(0, 200, true));
-                const matchingLists = lists.filter((list: any) => list.listName === listName);
-                if (matchingLists.length === 0) throw Error("List name is not valid for this program");
-                if (matchingLists.length > 1) throw Error("List name must be unique");
-                listId = matchingLists[0].listDbId;
-            } else if(listDbId) {
-                listId = listDbId;
-            } else {
-                throw Error("Missing list id and name");
-            }
-
-            //Get the list germplasm
-            const { data }: any = await api.call({
-                url: `${process.env.VUE_APP_BI_API_V1_PATH}/programs/${programId}/brapi/v2/lists/${listId}`,
-                method: 'get',
-                params: params
-            }) as Response;
-
-            return new BiResponse(data);
-
-        } catch(error) {
-            throw error;
-        }
-    }
-
 }
diff --git a/src/views/germplasm/GermplasmByList.vue b/src/views/germplasm/GermplasmByList.vue
index 1fc17751e..d1a0569bb 100644
--- a/src/views/germplasm/GermplasmByList.vue
+++ b/src/views/germplasm/GermplasmByList.vue
@@ -230,7 +230,7 @@ export default class GermplasmByList extends GermplasmBase {
 
   private downloadList(): boolean {
     if (this.activeProgram) {
-      window.open(process.env.VUE_APP_BI_API_ROOT + '/v1/programs/' + this.activeProgram.id + '/brapi/v2/lists/' + this.listDbId + '/export?fileExtension=' + this.fileExtension, '_blank');
+      window.open(process.env.VUE_APP_BI_API_ROOT + '/v1/programs/' + this.activeProgram.id + '/germplasm/export?fileExtension=' + this.fileExtension + '&list=' + this.listDbId, '_blank');
       return true;
     }
     return false;

From a3297b8a3d0c064f93eae016531720a050324c81 Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:02:55 -0500
Subject: [PATCH 5/7] fix listType query param for lists call

---
 package-lock.json                             | 42 ++++++++++++-------
 src/assets/scss/main.scss                     |  2 +-
 src/breeding-insight/service/ListService.ts   |  3 +-
 .../germplasm/GermplasmListDeletionlModal.vue |  4 +-
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8cbddb6e..760481dde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8581,13 +8581,20 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/decamelize": {
@@ -10960,9 +10967,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -10972,6 +10979,11 @@
       ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
     "node_modules/for-in": {
@@ -31923,12 +31935,12 @@
       }
     },
     "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dev": true,
       "requires": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
       }
     },
     "decamelize": {
@@ -33867,9 +33879,9 @@
       "requires": {}
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true
     },
     "for-in": {
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index fedd7dd2d..66397d521 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -945,7 +945,7 @@ tr:nth-child(odd) td.db-filled {
   margin-right: 10px;
 }
 
-.sub-entity-dataset-modal, .experiment-observations-download-button, .experiment-observation-add-collaborator-button, .experiment-observation-remove-collaborator-button {
+.sub-entity-dataset-modal, .experiment-observations-download-button, .experiment-observation-add-collaborator-button, .experiment-observation-remove-collaborator-button, .germplasm-list-deletion-button {
   .modal {
     .modal-card {
       width: $medium-modal-content-width;
diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
index 087923396..f7c0301bf 100644
--- a/src/breeding-insight/service/ListService.ts
+++ b/src/breeding-insight/service/ListService.ts
@@ -57,8 +57,9 @@ export class ListService {
 
         // Set list type, sort, and pagination
         let params: any = { listType };
+
         if(filters) {
-            params = filters;
+            params = { listType, ...filters };
         }
 
         if (sort.field) {
diff --git a/src/components/germplasm/GermplasmListDeletionlModal.vue b/src/components/germplasm/GermplasmListDeletionlModal.vue
index 4d1da73c7..b24ec3ee5 100644
--- a/src/components/germplasm/GermplasmListDeletionlModal.vue
+++ b/src/components/germplasm/GermplasmListDeletionlModal.vue
@@ -21,7 +21,7 @@
     v-bind:modal-title="modalTitle"
     v-bind:confirmedAction="deleteList"
     v-bind:active="active"
-    modal-class="experiment-observation-remove-collaborator-button"
+    modal-class="germplasm-list-deletion-button"
     v-on:deactivate="cancelDelete"
   >
     <template #form>
@@ -52,7 +52,7 @@ import { ListService } from '@/breeding-insight/service/ListService';
     ])
   }
 })
-export default class ExperimentCollaboratorRemovalModal extends Vue {
+export default class GermplasmListDeletionlModal extends Vue {
 
   @Prop()
   active!: boolean;

From 05605115dcc1acd5bf7a57b93db728bf101befbe Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Fri, 20 Dec 2024 10:32:27 -0500
Subject: [PATCH 6/7] incorporate PR feedback

---
 src/breeding-insight/service/GermplasmService.ts | 2 +-
 src/breeding-insight/service/ListService.ts      | 3 ++-
 src/views/germplasm/GermplasmByList.vue          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/breeding-insight/service/GermplasmService.ts b/src/breeding-insight/service/GermplasmService.ts
index bd6c421ac..0c6903b4f 100644
--- a/src/breeding-insight/service/GermplasmService.ts
+++ b/src/breeding-insight/service/GermplasmService.ts
@@ -35,7 +35,7 @@ export class GermplasmService {
                          { listDbId, listName, ...brapiFilters  }: GermplasmFilter):
         Promise<BiResponse> {
         //Form the query params including sorting, pagination, and filtering
-        let params: any = {list: listDbId, ...brapiFilters };
+        let params: any = {listDbId: listDbId, ...brapiFilters };
 
         if (sort.field) {
             params['sortField'] = sort.field;
diff --git a/src/breeding-insight/service/ListService.ts b/src/breeding-insight/service/ListService.ts
index f7c0301bf..8b5b97d29 100644
--- a/src/breeding-insight/service/ListService.ts
+++ b/src/breeding-insight/service/ListService.ts
@@ -36,7 +36,8 @@ export class ListService {
             return new BiResponse({ success: true });
 
         } catch (error) {
-            // Check if the error is actually a 204 No Content response
+            // Check if the error is actually a 204 No Content response since http clients can be configured to
+            // automatically throw an error if the response has no content
             if (error.response && error.response.status === 204) {
                 // This is actually a successful deletion
                 return new BiResponse({ success: true });
diff --git a/src/views/germplasm/GermplasmByList.vue b/src/views/germplasm/GermplasmByList.vue
index d1a0569bb..8db93ead0 100644
--- a/src/views/germplasm/GermplasmByList.vue
+++ b/src/views/germplasm/GermplasmByList.vue
@@ -23,7 +23,7 @@
       <a>&lt; Germplasm Lists</a>
     </router-link>
     <h1 class="title">
-      {{ toStartCase(list ? list.listName : "") }}
+      {{ list ? list.listName : "" }}
     </h1>
 
     <GermplasmListDeletionModal

From 2bd27e7b70bacbb0de91ebde5a3671291c3c84cb Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:55:22 -0500
Subject: [PATCH 7/7] upadte package-lock.json

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 760481dde..494aa6ebf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bi-web",
-  "version": "v1.0.0+783",
+  "version": "v1.0.0+789",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bi-web",
-      "version": "v1.0.0+783",
+      "version": "v1.0.0+789",
       "hasInstallScript": true,
       "dependencies": {
         "@casl/ability": "~4.0.0",