Fix vue-router and types post-rebase

Author: dannon

client/src/components/History/HistoryCard.vue

@@ -29,7 +29,7 @@
 
 import { storeToRefs } from "pinia";
 import { computed } from "vue";
-import { useRouter } from "vue-router/composables";
+import { useRouter } from "vue-router";
 
 import { userOwnsHistory } from "@/api";
 import type { AnyHistoryEntry } from "@/api/histories";

client/src/components/History/HistoryDatasetPermissions.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, ref } from "vue";
-import { useRoute } from "vue-router/composables";
+import { useRoute } from "vue-router";
 
 import { initRefs, updateRefs, useCallbacks } from "@/composables/datasetPermissions";
 import { useHistoryBreadCrumbsToForProps } from "@/composables/historyBreadcrumbs";

client/src/components/History/HistoryList.vue

@@ -23,7 +23,7 @@ import { faBurn, faPlus, faTags, faTrash, faTrashRestore } from "@fortawesome/fr
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BAlert, BButton, BNav, BNavItem, BOverlay, BPagination } from "bootstrap-vue";
 import { computed, onMounted, ref, watch } from "vue";
-import { useRouter } from "vue-router/composables";
+import { useRouter } from "vue-router";
 
 import {
     type AnyHistoryEntry,

client/src/composables/selectedItems/selectedItems.ts

@@ -82,7 +82,11 @@ export function useSelectedItems<T, ComponentType extends ComponentInstanceExten
     function setSelected(item: T, selected: boolean, checkInRange = true) {
         const key = getItemKey(item as T);
         const newSelected = new Map(selectedItems.value);
-        selected ? newSelected.set(key, item) : newSelected.delete(key);
+        if (selected) {
+            (newSelected as Map<string, T>).set(key, item);
+        } else {
+            newSelected.delete(key);
+        }
         selectedItems.value = newSelected;
         breakQuerySelection();
 
@@ -235,7 +239,7 @@ export function useSelectedItems<T, ComponentType extends ComponentInstanceExten
         const newItems = [...selectedItems.value.values(), ...itemsToSelect];
         const newEntries: Array<[string, T]> = newItems.map((item) => {
             const key = getItemKey(item as T);
-            return [key, item];
+            return [key, item as T];
         });
         selectedItems.value = new Map(newEntries);
         breakQuerySelection();