Merge branch 'merge-deps-1-22' into dependabot/npm_and_yarn/sveltejs/…

…kit-2.16.1
hms-dbmi · Jan 22, 2025 · 0cb97e8 · 0cb97e8
2 parents 3d33303 + 125db32
commit 0cb97e8
Show file tree

Hide file tree

Showing 27 changed files with 250 additions and 189 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:23.0.0-alpine3.19 AS builder
+FROM node:23.3.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .

diff --git a/Dockerfile.bdc b/Dockerfile.bdc
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:23.0.0-alpine3.19 AS builder
+FROM node:23.3.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:23.0.0-alpine3.19 AS builder
+FROM node:23.3.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,8 +20,8 @@
     "@skeletonlabs/skeleton": "2.10.3",
     "@skeletonlabs/tw-plugin": "0.4.0",
     "@sveltejs/adapter-auto": "^3.2.4",
-    "@sveltejs/adapter-node": "^2.1.2",
     "@sveltejs/kit": "^2.16.1",
+    "@sveltejs/adapter-node": "^5.2.10",
     "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.15",
@@ -42,7 +42,7 @@
     "svelte-check": "^3.8.5",
     "svelte-eslint-parser": "^0.40.0",
     "tailwindcss": "3.3.6",
-    "tslib": "^2.6.3",
+    "tslib": "^2.8.1",
     "typescript": "^5.6.3",
     "vite": "^5.4.8",
     "vite-plugin-tailwind-purgecss": "0.3.0",

diff --git a/src/lib/components/HelpInfoPopup.svelte b/src/lib/components/HelpInfoPopup.svelte
@@ -21,7 +21,7 @@
       data-popup={id}
     >
       {text}
-      <div class="arrow variant-filled-surface" />
+      <div class="arrow variant-filled-surface"></div>
     </div>
   </div>
 {/if}
diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
@@ -2,7 +2,7 @@
   import { AppBar, popup, type PopupSettings } from '@skeletonlabs/skeleton';
   import { page } from '$app/stores';
   import { goto } from '$app/navigation';
-  import { user, userRoutes, logout } from '$lib/stores/User';
+  import { user, userRoutes, isLoggedIn, logout } from '$lib/stores/User';
   import type { Route } from '$lib/models/Route';
   import Logo from '$lib/components/Logo.svelte';
   import type AuthData from '$lib/models/AuthProvider.ts';
@@ -113,7 +113,7 @@
   </nav>
   <svelte:fragment slot="trail">
     <div id="user-session-avatar">
-      {#if $user.privileges && $user.email}
+      {#if $user.privileges && $user.email && $isLoggedIn}
         <!-- Logout -->
         <button id="user-session-popout" use:popup={logoutClick}>
           <span

diff --git a/src/lib/components/admin/user/cell/Actions.svelte b/src/lib/components/admin/user/cell/Actions.svelte
@@ -64,6 +64,7 @@
   data-testid={`user-view-btn-${data.cell}`}
   type="button"
   title="View"
+  aria-label="View"
   class="btn-icon-color"
   on:click|stopPropagation={() => goto(`/admin/users/${data.cell}`)}
 >
@@ -75,6 +76,7 @@
     data-testid={`user-edit-btn-${data.cell}`}
     type="button"
     title="Edit"
+    aria-label="Edit"
     class="btn-icon-color"
     on:click|stopPropagation={() => goto(`/admin/users/${data.cell}/edit`)}
   >
@@ -84,6 +86,7 @@
     data-testid={`user-deactivate-btn-${data.cell}`}
     type="button"
     title="Deactivate user"
+    aria-label="Deactivate user"
     class="btn-icon-color"
     on:click|stopPropagation={() => userActivation(false)}
   >
@@ -94,6 +97,7 @@
     data-testid={`user-activate-btn-${data.cell}`}
     type="button"
     title="Reactivate user"
+    aria-label="Reactivate user"
     class="btn-icon-color"
     on:click|stopPropagation={() => userActivation(true)}
   >

diff --git a/src/lib/components/buttons/CardButton.svelte b/src/lib/components/buttons/CardButton.svelte
@@ -27,7 +27,7 @@
     rel={disabled ? 'nofollow' : undefined}
     tabindex="0"
   >
-    {#if icon}<i class="icon {icon}" />{/if}
+    {#if icon}<i class="icon {icon}"></i>{/if}
     <div class="title">{title}</div>
     {#if subtitle && !['sm', 'md'].includes(size)}<div class="subtitle">{subtitle}</div>{/if}
   </a>
@@ -41,7 +41,7 @@
     on:click={onClick}
     {disabled}
   >
-    {#if icon}<i class="icon {icon}" />{/if}
+    {#if icon}<i class="icon {icon}"></i>{/if}
     <div class="title">{title}</div>
     {#if subtitle && !['sm', 'md'].includes(size)}<div class="subtitle">{subtitle}</div>{/if}
   </button>

diff --git a/src/lib/components/buttons/CopyButton.svelte b/src/lib/components/buttons/CopyButton.svelte
@@ -51,7 +51,7 @@
       data-popup={buttonId}
     >
       {altText}
-      <div class="arrow variant-filled-surface" />
+      <div class="arrow variant-filled-surface"></div>
     </div>
   </button>
 {:else}

diff --git a/src/lib/components/dataset/cell/Actions.svelte b/src/lib/components/dataset/cell/Actions.svelte
@@ -26,6 +26,7 @@
     data-testid={`dataset-action-restore-${data.cell}`}
     type="button"
     title="Restore"
+    aria-label="Restore"
     class="btn-icon-color"
     on:click|stopPropagation={toggleArchive}
   >
@@ -46,6 +47,7 @@
     data-testid={`dataset-action-archive-${data.cell}`}
     type="button"
     title="Delete"
+    aria-label="Delete"
     class="btn-icon-color"
     on:click|stopPropagation={toggleArchive}
   >

diff --git a/src/lib/components/datatable/RemoteTable.svelte b/src/lib/components/datatable/RemoteTable.svelte
@@ -125,11 +125,6 @@
 </div>
 
 <style>
-  .pic-sure-table-compact tbody td:not(.expandable-component) {
-    padding-top: 0.75rem !important;
-    padding-bottom: 0.75rem !important;
-  }
-
   table thead th {
     font-weight: normal !important;
   }

diff --git a/src/lib/components/datatable/Table.svelte b/src/lib/components/datatable/Table.svelte
@@ -111,11 +111,6 @@
 </div>
 
 <style>
-  .pic-sure-table-compact tbody td:not(.expandable-component) {
-    padding-top: 0.75rem !important;
-    padding-bottom: 0.75rem !important;
-  }
-
   table thead th {
     font-weight: normal !important;
   }

diff --git a/src/lib/components/explorer/AddFilter.svelte b/src/lib/components/explorer/AddFilter.svelte
@@ -202,6 +202,7 @@
       <button
         class="btn btn-icon variant-filled-primary m-1"
         data-testid="add-filter"
+        aria-label="Add Filter"
         on:click={addNewFilter}
         disabled={data.type === 'Categorical' && valuesSelected.length === 0}
       >

diff --git a/src/lib/components/explorer/FacetCategory.svelte b/src/lib/components/explorer/FacetCategory.svelte
@@ -141,7 +141,7 @@
         />
       {/if}
       {#each facetsToDisplay as facet}
-        <FacetItem {facet} {facetCategory} facetParent={undefined} {textFilterValue} />
+        <FacetItem {facet} {facetCategory} {textFilterValue} />
       {/each}
       {#if facets?.length > numFacetsToShow && !textFilterValue}
         <button
@@ -165,7 +165,11 @@
       <span class="overflow-hidden text-ellipsis whitespace-nowrap min-w-0">
         {facet.display}
       </span>
-      <button class="chip-close ml-1 flex-shrink-0" on:click={() => updateFacets([facet])}>
+      <button
+        class="chip-close ml-1 flex-shrink-0"
+        aria-label="Remove Facet"
+        on:click={() => updateFacets([facet])}
+      >
         <i class="fa-solid fa-times hover:text-secondary-500"></i>
       </button>
     </span>

diff --git a/src/lib/components/explorer/FacetItem.svelte b/src/lib/components/explorer/FacetItem.svelte
@@ -6,25 +6,8 @@
 
   export let facet: Facet;
   export let facetCategory: DictionaryFacetResult;
-  export let facetParent: Facet | undefined;
   export let textFilterValue: string | undefined;
 
-  if (facetParent) {
-    facet.parentRef = {
-      name: facetParent.name,
-      display: facetParent.display,
-      description: facetParent.description,
-    };
-  }
-
-  if (facetCategory) {
-    facet.categoryRef = {
-      name: facetCategory.name,
-      display: facetCategory.display,
-      description: facetCategory.description,
-    };
-  }
-
   let open = false;
 
   function toggleOpen() {
@@ -100,6 +83,7 @@
     <button
       type="button"
       class="arrow-button"
+      aria-label="Toggle Facet {open ? 'open' : 'closed'}"
       data-testId={`facet-${facet.name}-arrow`}
       on:click={toggleOpen}
     >
@@ -124,7 +108,7 @@
 {#if open && facetsToDisplay !== undefined && facetsToDisplay?.length > 0}
   <div class="flex flex-col ml-4" data-testId={`facet-${facet.name}-children`}>
     {#each facetsToDisplay as child}
-      <svelte:self facet={child} {facetCategory} facetParent={facet} {textFilterValue} />
+      <svelte:self facet={child} {facetCategory} {textFilterValue} />
     {/each}
   </div>
 {/if}