From dfc710184045207da0bc82c6e6563116ab4c280c Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Sat, 13 Dec 2025 18:26:02 -0500
Subject: [PATCH 01/39] Add how to cite tab

---
 web/package-lock.json                         |  18 -
 web/src/components/DLP/HowToCiteTab.vue       | 313 ++++++++++++++++++
 .../DandisetLandingView/DandisetActions.vue   |   6 -
 .../DandisetLandingView/DandisetMain.vue      |  69 ++--
 4 files changed, 336 insertions(+), 70 deletions(-)
 create mode 100644 web/src/components/DLP/HowToCiteTab.vue

diff --git a/web/package-lock.json b/web/package-lock.json
index 6ee446c50..61297104f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -804,7 +804,6 @@
       "resolved": "https://registry.npmjs.org/@json-layout/vocabulary/-/vocabulary-2.1.0.tgz",
       "integrity": "sha512-5B6jMvxGU9+jONoY7tDVfWuPT9vjyPwz4YHWCtysNwDKaWHnMCv/1JdHH1EcyQXMh4BlXGsSLKmOKo9OtG+Uew==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ajv": "^8.17.1",
         "ajv-errors": "^3.0.0",
@@ -1639,7 +1638,6 @@
       "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -1699,7 +1697,6 @@
       "integrity": "sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.24.0",
         "@typescript-eslint/types": "8.24.0",
@@ -2262,7 +2259,6 @@
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2285,7 +2281,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -3363,7 +3358,6 @@
       "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3424,7 +3418,6 @@
       "integrity": "sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "globals": "^13.24.0",
@@ -5111,7 +5104,6 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -5124,7 +5116,6 @@
       "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.1.tgz",
       "integrity": "sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^7.7.2"
       },
@@ -5510,7 +5501,6 @@
       "integrity": "sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -5623,7 +5613,6 @@
       "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -5645,7 +5634,6 @@
       "integrity": "sha512-0i+3h2Df/c71afluxC1SXqyyMmJlnKWfu9ZGdzwuKRM1OftEa2XM2myt5tR36CF3PanYrMjFKtRIj8PfSf838w==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@bufbuild/protobuf": "^2.0.0",
         "buffer-builder": "^0.2.0",
@@ -6861,7 +6849,6 @@
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -7170,7 +7157,6 @@
       "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "postcss": "^8.5.3",
@@ -7260,7 +7246,6 @@
       "integrity": "sha512-4wEAQtZaigPpwbFcZbrKpYwutOsWwWdeXn22B9XHzDPQNxVsKT+K9lKcXZnI5JESO1Iaql48S9rOk8RZZEt+Mw==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vuetify/loader-shared": "^2.1.0",
         "debug": "^4.3.3",
@@ -7294,7 +7279,6 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.13",
         "@vue/compiler-sfc": "3.5.13",
@@ -7377,7 +7361,6 @@
       "integrity": "sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^6.6.4"
       },
@@ -7434,7 +7417,6 @@
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.7.15.tgz",
       "integrity": "sha512-kBZzwXI5EcAMiW5TRMgK1reXQd0K/PpUt+ekX4Alvm7n09uzJ1my1TLNbX1sQ8/0KYgoxOf17C8qOJzBGkT+PA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^12.20 || >=14.13"
       },
diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
new file mode 100644
index 000000000..5ce625b9f
--- /dev/null
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -0,0 +1,313 @@
+<template>
+  <div>
+    <v-card
+      variant="outlined"
+      class="pa-6"
+    >
+      <v-card-title class="d-flex align-center px-0 pt-0">
+        <v-icon
+          color="primary"
+          class="mr-2"
+        >
+          mdi-format-quote-close
+        </v-icon>
+        How to Cite this Dataset
+      </v-card-title>
+
+      <v-card-text class="px-0">
+        <p class="text-body-1 mb-4">
+          To promote reproducibility and give credit to researchers who share their data,
+          please acknowledge the contributors and cite this dataset in your publications.
+          For more information, see our
+          <a
+            href="https://docs.dandiarchive.org/user-guide-using/citing-dandisets/"
+            target="_blank"
+            rel="noopener"
+          >guide on citing dandisets</a>.
+        </p>
+
+        <!-- Citation -->
+        <h3 class="text-h6 mb-2">
+          Full Citation
+        </h3>
+        <div
+          v-if="citation"
+          class="copy-block mb-4"
+        >
+          <div class="copy-block-content">
+            <span>{{ citation }}</span>
+            <v-btn
+              icon
+              size="small"
+              variant="text"
+              class="copy-btn"
+              @click="copyToClipboard(citation)"
+            >
+              <v-icon size="small">
+                mdi-content-copy
+              </v-icon>
+              <v-tooltip
+                activator="parent"
+                location="top"
+              >
+                Copy citation to clipboard
+              </v-tooltip>
+            </v-btn>
+          </div>
+        </div>
+        <p
+          v-else
+          class="text-body-2 font-italic mb-4"
+        >
+          Citation will be available after the dandiset is published.
+        </p>
+
+        <!-- DOI info for published versions -->
+        <div
+          v-if="doi"
+          class="mb-4"
+        >
+          <v-chip
+            :href="`https://doi.org/${doi}`"
+            target="_blank"
+            color="primary"
+            variant="outlined"
+          >
+            <v-icon
+              start
+              size="small"
+            >
+              mdi-link
+            </v-icon>
+            DOI: {{ doi }}
+          </v-chip>
+        </div>
+
+        <v-divider class="my-4" />
+
+        <!-- Materials and Methods -->
+        <h3 class="text-h6 mb-2">
+          Materials and Methods
+        </h3>
+        <p class="text-body-2 mb-2">
+          Suggested text for the Methods section of your manuscript:
+        </p>
+        <div class="copy-block mb-4">
+          <div class="copy-block-content">
+            <span>{{ methodsText }}</span>
+            <v-btn
+              icon
+              size="small"
+              variant="text"
+              class="copy-btn"
+              @click="copyToClipboard(methodsText)"
+            >
+              <v-icon size="small">
+                mdi-content-copy
+              </v-icon>
+              <v-tooltip
+                activator="parent"
+                location="top"
+              >
+                Copy to clipboard
+              </v-tooltip>
+            </v-btn>
+          </div>
+        </div>
+
+        <!-- Data Availability Statement -->
+        <h3 class="text-h6 mb-2">
+          Data Availability Statement
+        </h3>
+        <p class="text-body-2 mb-2">
+          Suggested statement for your manuscript:
+        </p>
+        <div class="copy-block mb-4">
+          <div class="copy-block-content">
+            <span>{{ dataAvailabilityText }}</span>
+            <v-btn
+              icon
+              size="small"
+              variant="text"
+              class="copy-btn"
+              @click="copyToClipboard(dataAvailabilityText)"
+            >
+              <v-icon size="small">
+                mdi-content-copy
+              </v-icon>
+              <v-tooltip
+                activator="parent"
+                location="top"
+              >
+                Copy to clipboard
+              </v-tooltip>
+            </v-btn>
+          </div>
+        </div>
+
+        <v-divider class="my-4" />
+
+        <!-- DANDI Identifier -->
+        <h3 class="text-h6 mb-2">
+          DANDI Identifier
+        </h3>
+        <div class="copy-block mb-2">
+          <div class="copy-block-content copy-block-inline">
+            <span>{{ dandiIdentifier }}</span>
+            <v-btn
+              icon
+              size="small"
+              variant="text"
+              class="copy-btn"
+              @click="copyToClipboard(dandiIdentifier)"
+            >
+              <v-icon size="small">
+                mdi-content-copy
+              </v-icon>
+              <v-tooltip
+                activator="parent"
+                location="top"
+              >
+                Copy identifier to clipboard
+              </v-tooltip>
+            </v-btn>
+          </div>
+        </div>
+        <p class="text-body-2 text-grey mb-4">
+          DANDI Archive RRID: SCR_017571
+        </p>
+
+        <!-- License Information -->
+        <div v-if="licenses && licenses.length">
+          <h3 class="text-h6 mb-2">
+            License
+          </h3>
+          <p class="text-body-2 mb-2">
+            This dataset is shared under:
+            <v-chip
+              v-for="(license, i) in licenses"
+              :key="i"
+              class="ml-2"
+              color="primary"
+              variant="outlined"
+              size="small"
+            >
+              {{ formatLicense(license) }}
+            </v-chip>
+          </p>
+        </div>
+
+        <v-divider class="my-4" />
+
+        <!-- More citation formats link -->
+        <p class="text-body-2 text-center">
+          More citations available at:
+          <a
+            href="https://citation.doi.org/"
+            target="_blank"
+            rel="noopener"
+          >
+            DOI Citation Formatter
+            <v-icon size="small">mdi-open-in-new</v-icon>
+          </a>
+        </p>
+      </v-card-text>
+    </v-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, type PropType } from 'vue';
+
+import { useDandisetStore } from '@/stores/dandiset';
+import type { DandisetMetadata } from '@/types';
+
+const props = defineProps({
+  schema: {
+    type: Object,
+    required: true,
+  },
+  meta: {
+    type: Object as PropType<DandisetMetadata>,
+    required: true,
+  },
+});
+
+const store = useDandisetStore();
+const currentDandiset = computed(() => store.dandiset);
+
+const citation = computed(() => props.meta?.citation);
+const doi = computed(() => props.meta?.doi);
+const licenses = computed(() => props.meta?.license);
+
+const dandiIdentifier = computed(() => {
+  if (!currentDandiset.value) return '';
+  const { identifier } = currentDandiset.value.dandiset;
+  const version = props.meta?.version || currentDandiset.value.version;
+  return `DANDI:${identifier}/${version}`;
+});
+
+const dandiUrl = computed(() => {
+  if (doi.value) {
+    return `https://doi.org/${doi.value}`;
+  }
+  if (!currentDandiset.value) return '';
+  const { identifier } = currentDandiset.value.dandiset;
+  return `https://dandiarchive.org/dandiset/${identifier}`;
+});
+
+const methodsText = computed(() => {
+  const url = dandiUrl.value;
+  return `Data associated with this study are available on the DANDI Archive (RRID:SCR_017571): ${url}`;
+});
+
+const dataAvailabilityText = computed(() => {
+  const url = dandiUrl.value;
+  return `Data are publicly available on the DANDI Archive (RRID:SCR_017571) at the following URL: ${url}`;
+});
+
+function formatLicense(license: string): string {
+  // Convert spdx:CC0-1.0 to CC0 1.0, spdx:CC-BY-4.0 to CC BY 4.0, etc.
+  return license
+    .replace('spdx:', '')
+    .replace(/-/g, ' ')
+    .replace(/(\d)\.(\d)/, '$1.$2');
+}
+
+async function copyToClipboard(text: string) {
+  try {
+    await navigator.clipboard.writeText(text);
+  } catch (err) {
+    console.error('Failed to copy:', err);
+  }
+}
+</script>
+
+<style scoped>
+.copy-block {
+  background-color: #f5f5f5;
+  border-radius: 4px;
+  padding: 12px 16px;
+}
+
+.copy-block-content {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.copy-block-content span {
+  flex: 1;
+  word-break: break-word;
+  line-height: 1.5;
+}
+
+.copy-block-inline {
+  align-items: center;
+}
+
+.copy-btn {
+  flex-shrink: 0;
+}
+</style>
diff --git a/web/src/views/DandisetLandingView/DandisetActions.vue b/web/src/views/DandisetLandingView/DandisetActions.vue
index 2eec4e3f8..ecfeebd2d 100644
--- a/web/src/views/DandisetLandingView/DandisetActions.vue
+++ b/web/src/views/DandisetLandingView/DandisetActions.vue
@@ -15,11 +15,6 @@
       <!-- Download -->
       <DownloadDialog />
 
-      <!-- Cite As -->
-      <div v-if="currentDandiset.dandiset.embargo_status === 'OPEN'">
-        <CiteAsDialog />
-      </div>
-
       <!-- Contact -->
       <ContactDialog />
 
@@ -115,7 +110,6 @@ import { useDandisetStore } from '@/stores/dandiset';
 
 import { open as openMeditor } from '@/components/Meditor/state';
 import DownloadDialog from './DownloadDialog.vue';
-import CiteAsDialog from './CiteAsDialog.vue';
 import ShareDialog from './ShareDialog.vue';
 import ContactDialog from './ContactDialog.vue';
 import ExternalDandisetServicesDialog from './ExternalDandisetServicesDialog.vue';
diff --git a/web/src/views/DandisetLandingView/DandisetMain.vue b/web/src/views/DandisetLandingView/DandisetMain.vue
index e946897ab..3b619bb5b 100644
--- a/web/src/views/DandisetLandingView/DandisetMain.vue
+++ b/web/src/views/DandisetLandingView/DandisetMain.vue
@@ -228,26 +228,26 @@
           </v-card>
         </v-col>
       </v-row>
-      <!-- TODO: Re-enable these tab components when the others are complete -->
+    </v-card>
 
-      <!-- <v-tabs
-        v-model="currentTab"
-        background-color="grey lighten-5"
-        class="ml-3"
-        show-arrows
+    <!-- Tab navigation -->
+    <v-tabs
+      v-model="currentTab"
+      bg-color="grey-lighten-5"
+      class="border-b pl-9"
+      show-arrows
+    >
+      <v-tab
+        v-for="(tab, index) in tabs"
+        :key="tab.name"
+        :value="index"
       >
-        <v-tabs-slider />
-
-        <v-tab
-          v-for="(tab, index) in tabs"
-          :key="tab.name"
-          :href="`#${index}`"
-        >
-          <v-icon>{{ tab.icon }}</v-icon>
-          {{ tab.name }}
-        </v-tab>
-      </v-tabs> -->
-    </v-card>
+        <v-icon start>
+          {{ tab.icon }}
+        </v-icon>
+        {{ tab.name }}
+      </v-tab>
+    </v-tabs>
 
     <!-- Dynamically render component based on current tab -->
     <v-row class="justify-center">
@@ -281,12 +281,8 @@ import { useDandisetStore } from '@/stores/dandiset';
 import { getDoiMetadata } from '@/utils/doi';
 import type { AccessInformation, DandisetStats, SubjectMatterOfTheDataset } from '@/types';
 
-import AccessInformationTab from '@/components/DLP/AccessInformationTab.vue';
-import AssetSummaryTab from '@/components/DLP/AssetSummaryTab.vue';
-import ContributorsTab from '@/components/DLP/ContributorsTab.vue';
+import HowToCiteTab from '@/components/DLP/HowToCiteTab.vue';
 import OverviewTab from '@/components/DLP/OverviewTab.vue';
-import RelatedResourcesTab from '@/components/DLP/RelatedResourcesTab.vue';
-import SubjectMatterTab from '@/components/DLP/SubjectMatterTab.vue';
 import ShareDialog from './ShareDialog.vue';
 import StarButton from '@/components/StarButton.vue';
 
@@ -297,31 +293,12 @@ const tabs = [
   {
     name: 'Overview',
     component: OverviewTab,
+    icon: 'mdi-information-outline',
   },
   {
-    name: 'Contributors',
-    component: ContributorsTab,
-    icon: 'mdi-account',
-  },
-  {
-    name: 'Subject Matter',
-    component: SubjectMatterTab,
-    icon: 'mdi-notebook-outline',
-  },
-  {
-    name: 'Access Information',
-    component: AccessInformationTab,
-    icon: 'mdi-account-question',
-  },
-  {
-    name: 'Asset Summary',
-    component: AssetSummaryTab,
-    icon: 'mdi-clipboard-list',
-  },
-  {
-    name: 'Related Resources',
-    component: RelatedResourcesTab,
-    icon: 'mdi-book',
+    name: 'How to Cite',
+    component: HowToCiteTab,
+    icon: 'mdi-format-quote-close',
   },
 ];
 

From 83b748ed0652054c0f9fac49ecab2887cf8e0701 Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Sun, 14 Dec 2025 09:23:57 -0500
Subject: [PATCH 02/39] Add warning for citing draft dandisets and remove
 CiteAsDialog component

---
 web/src/components/DLP/HowToCiteTab.vue       | 11 +++++
 .../DandisetLandingView/CiteAsDialog.vue      | 46 -------------------
 2 files changed, 11 insertions(+), 46 deletions(-)
 delete mode 100644 web/src/views/DandisetLandingView/CiteAsDialog.vue

diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
index 5ce625b9f..29e99158e 100644
--- a/web/src/components/DLP/HowToCiteTab.vue
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -15,6 +15,16 @@
       </v-card-title>
 
       <v-card-text class="px-0">
+        <v-alert
+          v-if="isDraft"
+          type="warning"
+          variant="tonal"
+          class="mb-4"
+        >
+          <strong>Citing draft dandisets is not recommended</strong> as the content may change.
+          Please contact the authors to request publication of this dandiset.
+        </v-alert>
+
         <p class="text-body-1 mb-4">
           To promote reproducibility and give credit to researchers who share their data,
           please acknowledge the contributors and cite this dataset in your publications.
@@ -235,6 +245,7 @@ const props = defineProps({
 
 const store = useDandisetStore();
 const currentDandiset = computed(() => store.dandiset);
+const isDraft = computed(() => store.version === 'draft');
 
 const citation = computed(() => props.meta?.citation);
 const doi = computed(() => props.meta?.doi);
diff --git a/web/src/views/DandisetLandingView/CiteAsDialog.vue b/web/src/views/DandisetLandingView/CiteAsDialog.vue
deleted file mode 100644
index c3f145923..000000000
--- a/web/src/views/DandisetLandingView/CiteAsDialog.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <v-menu
-    :close-on-content-click="false"
-    min-width="420"
-    max-width="420"
-  >
-    <template #activator="{ props }">
-      <v-list-item
-        id="cite_as"
-        class="justify-space-between border border-b-0"
-        v-bind="props"
-      >
-        <template #prepend>
-          <v-icon
-            color="primary"
-            start
-          >
-            mdi-format-quote-close
-          </v-icon>
-          <v-list-item-title>Cite As</v-list-item-title>
-        </template>
-        <template #append>
-          <v-icon end>
-            mdi-chevron-down
-          </v-icon>
-        </template>
-      </v-list-item>
-    </template>
-    <v-card>
-      <CopyText
-        class="pa-2"
-        :text="citation"
-        icon-hover-text="Copy citation to clipboard"
-      />
-    </v-card>
-  </v-menu>
-</template>
-<script setup lang="ts">
-import CopyText from '@/components/CopyText.vue';
-import { computed } from 'vue';
-import { useDandisetStore } from '@/stores/dandiset';
-
-const store = useDandisetStore();
-
-const citation = computed(() => store.dandiset?.metadata?.citation);
-</script>

From c0f7c755cd052f08b36d25dbefc360aac4d5e1fd Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Sun, 14 Dec 2025 09:30:42 -0500
Subject: [PATCH 03/39] Enhance draft citation warnings to include links to the
 latest published version

---
 web/src/components/DLP/HowToCiteTab.vue | 30 +++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
index 29e99158e..c392e3e02 100644
--- a/web/src/components/DLP/HowToCiteTab.vue
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -16,13 +16,27 @@
 
       <v-card-text class="px-0">
         <v-alert
-          v-if="isDraft"
+          v-if="isDraft && hasPublishedVersions"
           type="warning"
           variant="tonal"
           class="mb-4"
         >
           <strong>Citing draft dandisets is not recommended</strong> as the content may change.
-          Please contact the authors to request publication of this dandiset.
+          Please cite the
+          <router-link :to="latestPublishedVersionLink">
+            latest published version ({{ latestPublishedVersion }})
+          </router-link>
+          instead.
+        </v-alert>
+
+        <v-alert
+          v-else-if="isDraft"
+          type="warning"
+          variant="tonal"
+          class="mb-4"
+        >
+          <strong>Citing draft dandisets is not recommended</strong> as the content may change.
+          Please contact the authors to request publication of this dandiset before citing.
         </v-alert>
 
         <p class="text-body-1 mb-4">
@@ -246,6 +260,18 @@ const props = defineProps({
 const store = useDandisetStore();
 const currentDandiset = computed(() => store.dandiset);
 const isDraft = computed(() => store.version === 'draft');
+const publishedVersions = computed(() => store.publishedVersions);
+const hasPublishedVersions = computed(() => publishedVersions.value && publishedVersions.value.length > 0);
+const latestPublishedVersion = computed(() => {
+  if (!publishedVersions.value || publishedVersions.value.length === 0) return null;
+  // Versions are sorted, so the first one is the latest
+  return publishedVersions.value[0].version;
+});
+const latestPublishedVersionLink = computed(() => {
+  if (!currentDandiset.value || !latestPublishedVersion.value) return '';
+  const { identifier } = currentDandiset.value.dandiset;
+  return `/dandiset/${identifier}/${latestPublishedVersion.value}`;
+});
 
 const citation = computed(() => props.meta?.citation);
 const doi = computed(() => props.meta?.doi);

From 50ba3b056ef520e8b01a7ef07b4c9273bac1676c Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Mon, 15 Dec 2025 19:48:00 -0500
Subject: [PATCH 04/39] Revert accidental web/package-lock.json changes

---
 web/package-lock.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/web/package-lock.json b/web/package-lock.json
index 61297104f..6ee446c50 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -804,6 +804,7 @@
       "resolved": "https://registry.npmjs.org/@json-layout/vocabulary/-/vocabulary-2.1.0.tgz",
       "integrity": "sha512-5B6jMvxGU9+jONoY7tDVfWuPT9vjyPwz4YHWCtysNwDKaWHnMCv/1JdHH1EcyQXMh4BlXGsSLKmOKo9OtG+Uew==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ajv": "^8.17.1",
         "ajv-errors": "^3.0.0",
@@ -1638,6 +1639,7 @@
       "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -1697,6 +1699,7 @@
       "integrity": "sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.24.0",
         "@typescript-eslint/types": "8.24.0",
@@ -2259,6 +2262,7 @@
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2281,6 +2285,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -3358,6 +3363,7 @@
       "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3418,6 +3424,7 @@
       "integrity": "sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "globals": "^13.24.0",
@@ -5104,6 +5111,7 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -5116,6 +5124,7 @@
       "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.1.tgz",
       "integrity": "sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^7.7.2"
       },
@@ -5501,6 +5510,7 @@
       "integrity": "sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -5613,6 +5623,7 @@
       "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -5634,6 +5645,7 @@
       "integrity": "sha512-0i+3h2Df/c71afluxC1SXqyyMmJlnKWfu9ZGdzwuKRM1OftEa2XM2myt5tR36CF3PanYrMjFKtRIj8PfSf838w==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@bufbuild/protobuf": "^2.0.0",
         "buffer-builder": "^0.2.0",
@@ -6849,6 +6861,7 @@
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -7157,6 +7170,7 @@
       "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "postcss": "^8.5.3",
@@ -7246,6 +7260,7 @@
       "integrity": "sha512-4wEAQtZaigPpwbFcZbrKpYwutOsWwWdeXn22B9XHzDPQNxVsKT+K9lKcXZnI5JESO1Iaql48S9rOk8RZZEt+Mw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vuetify/loader-shared": "^2.1.0",
         "debug": "^4.3.3",
@@ -7279,6 +7294,7 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.13",
         "@vue/compiler-sfc": "3.5.13",
@@ -7361,6 +7377,7 @@
       "integrity": "sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^6.6.4"
       },
@@ -7417,6 +7434,7 @@
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.7.15.tgz",
       "integrity": "sha512-kBZzwXI5EcAMiW5TRMgK1reXQd0K/PpUt+ekX4Alvm7n09uzJ1my1TLNbX1sQ8/0KYgoxOf17C8qOJzBGkT+PA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.20 || >=14.13"
       },

From 9d7d72b8a813630627dbe29791e4d664851e73bb Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Tue, 16 Dec 2025 13:43:13 -0500
Subject: [PATCH 05/39] Implement citation format selection and add CFF utility
 functions for citation generation

---
 web/src/components/DLP/HowToCiteTab.vue | 157 ++++++-
 web/src/utils/cff.ts                    | 579 ++++++++++++++++++++++++
 2 files changed, 715 insertions(+), 21 deletions(-)
 create mode 100644 web/src/utils/cff.ts

diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
index c392e3e02..a644c8b13 100644
--- a/web/src/components/DLP/HowToCiteTab.vue
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -51,21 +51,34 @@
         </p>
 
         <!-- Citation -->
-        <h3 class="text-h6 mb-2">
-          Full Citation
-        </h3>
+        <div class="d-flex align-center mb-2">
+          <h3 class="text-h6 mr-4">
+            Full Citation
+          </h3>
+          <v-select
+            v-model="selectedCitationFormat"
+            :items="citationFormats"
+            item-title="text"
+            item-value="value"
+            variant="outlined"
+            density="compact"
+            hide-details
+            class="citation-format-select"
+          />
+        </div>
         <div
-          v-if="citation"
+          v-if="currentCitation"
           class="copy-block mb-4"
         >
           <div class="copy-block-content">
-            <span>{{ citation }}</span>
+            <pre v-if="isCodeFormat" class="citation-text-code">{{ currentCitation }}</pre>
+            <span v-else class="citation-text">{{ currentCitation }}</span>
             <v-btn
               icon
               size="small"
               variant="text"
               class="copy-btn"
-              @click="copyToClipboard(citation)"
+              @click="copyToClipboard(currentCitation)"
             >
               <v-icon size="small">
                 mdi-content-copy
@@ -221,30 +234,17 @@
           </p>
         </div>
 
-        <v-divider class="my-4" />
-
-        <!-- More citation formats link -->
-        <p class="text-body-2 text-center">
-          More citations available at:
-          <a
-            href="https://citation.doi.org/"
-            target="_blank"
-            rel="noopener"
-          >
-            DOI Citation Formatter
-            <v-icon size="small">mdi-open-in-new</v-icon>
-          </a>
-        </p>
       </v-card-text>
     </v-card>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, type PropType } from 'vue';
+import { computed, type PropType, ref } from 'vue';
 
 import { useDandisetStore } from '@/stores/dandiset';
 import type { DandisetMetadata } from '@/types';
+import { dandisetToCFF, cffToBibTeX, cffToAPA, cffToMLA, cffToChicago, cffToHarvard, cffToVancouver, cffToIEEE, cffToRIS, cffToYAML } from '@/utils/cff';
 
 const props = defineProps({
   schema: {
@@ -273,10 +273,79 @@ const latestPublishedVersionLink = computed(() => {
   return `/dandiset/${identifier}/${latestPublishedVersion.value}`;
 });
 
+// Define citation format types
+type CitationFormat = 'apa' | 'mla' | 'chicago' | 'harvard' | 'vancouver' | 'ieee' | 'bibtex' | 'ris' | 'cff';
+
+// Citation format state
+const selectedCitationFormat = ref<CitationFormat>('apa'); // For the dropdown in Full Citation section
+
+// Generate CFF object from metadata
+const cffObject = computed(() => {
+  if (!props.meta) return null;
+  return dandisetToCFF(props.meta, typeof doi.value === 'string' ? doi.value : undefined);
+});
+
+// Generate citations in different formats
+const formattedCitations = computed<Record<CitationFormat, string>>(() => {
+  if (!cffObject.value || !currentDandiset.value) {
+    return {
+      apa: '',
+      mla: '',
+      chicago: '',
+      harvard: '',
+      vancouver: '',
+      ieee: '',
+      bibtex: '',
+      ris: '',
+      cff: '',
+    };
+  }
+  const identifier = dandiIdentifier.value;
+
+  return {
+    apa: cffToAPA(cffObject.value),
+    mla: cffToMLA(cffObject.value),
+    chicago: cffToChicago(cffObject.value),
+    harvard: cffToHarvard(cffObject.value),
+    vancouver: cffToVancouver(cffObject.value),
+    ieee: cffToIEEE(cffObject.value),
+    bibtex: cffToBibTeX(cffObject.value, identifier),
+    ris: cffToRIS(cffObject.value, identifier),
+    cff: cffToYAML(cffObject.value),
+  };
+});
+
+const citationFormats: Array<{ value: CitationFormat; text: string; icon: string }> = [
+  { value: 'apa', text: 'APA 7th', icon: 'mdi-format-text' },
+  { value: 'mla', text: 'MLA 9th', icon: 'mdi-format-text' },
+  { value: 'chicago', text: 'Chicago', icon: 'mdi-format-text' },
+  { value: 'harvard', text: 'Harvard', icon: 'mdi-format-text' },
+  { value: 'vancouver', text: 'Vancouver', icon: 'mdi-format-text' },
+  { value: 'ieee', text: 'IEEE', icon: 'mdi-format-text' },
+  { value: 'bibtex', text: 'BibTeX', icon: 'mdi-code-braces' },
+  { value: 'ris', text: 'RIS', icon: 'mdi-file-export' },
+  { value: 'cff', text: 'CFF (YAML)', icon: 'mdi-file-code' },
+];
+
 const citation = computed(() => props.meta?.citation);
 const doi = computed(() => props.meta?.doi);
 const licenses = computed(() => props.meta?.license);
 
+// Current citation based on selected format
+const currentCitation = computed(() => {
+  // For published versions with a citation, allow format selection
+  if (citation.value && formattedCitations.value[selectedCitationFormat.value]) {
+    return formattedCitations.value[selectedCitationFormat.value];
+  }
+  // For drafts or when CFF generation fails, show the original citation if available
+  return citation.value || '';
+});
+
+// Check if the selected format is a code-like format that needs preformatted text
+const isCodeFormat = computed(() => {
+  return ['bibtex', 'ris', 'cff'].includes(selectedCitationFormat.value);
+});
+
 const dandiIdentifier = computed(() => {
   if (!currentDandiset.value) return '';
   const { identifier } = currentDandiset.value.dandiset;
@@ -347,4 +416,50 @@ async function copyToClipboard(text: string) {
 .copy-btn {
   flex-shrink: 0;
 }
+
+.citation-preview {
+  position: relative;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+  padding: 16px;
+  padding-top: 32px;
+}
+
+.citation-preview pre {
+  margin: 0;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: 'Roboto Mono', monospace;
+  font-size: 0.875rem;
+  line-height: 1.5;
+}
+
+.copy-preview-btn {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+}
+
+.citation-format-select {
+  max-width: 200px;
+  min-width: 150px;
+}
+
+.citation-text {
+  flex: 1;
+  word-break: break-word;
+  line-height: 1.5;
+}
+
+.citation-text-code {
+  flex: 1;
+  margin: 0;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: 'Roboto Mono', monospace;
+  font-size: 0.875rem;
+  line-height: 1.5;
+  background: transparent;
+  padding: 0;
+}
 </style>
diff --git a/web/src/utils/cff.ts b/web/src/utils/cff.ts
new file mode 100644
index 000000000..ae8340d31
--- /dev/null
+++ b/web/src/utils/cff.ts
@@ -0,0 +1,579 @@
+import type { DandisetMetadata, Person, Organization } from '@/types';
+
+export interface CFFAuthor {
+  given_names?: string;
+  family_names?: string;
+  name?: string; // For organizations
+  orcid?: string;
+  email?: string;
+  affiliation?: string;
+}
+
+export interface CFF {
+  'cff-version': string;
+  message: string;
+  type: string;
+  title: string;
+  abstract?: string;
+  authors: CFFAuthor[];
+  identifiers?: Array<{
+    type: 'doi' | 'url';
+    value: string;
+    description?: string;
+  }>;
+  doi?: string;
+  url?: string;
+  repository?: string;
+  keywords?: string[];
+  license?: string;
+  version?: string;
+  'date-released'?: string;
+  references?: Array<{
+    type: string;
+    title?: string;
+    authors?: CFFAuthor[];
+    doi?: string;
+    url?: string;
+  }>;
+}
+
+/**
+ * Convert a DANDI Person contributor to CFF Author format
+ */
+function personToCFFAuthor(person: Person): CFFAuthor {
+  const nameParts = person.name.split(',').map(s => s.trim());
+  const author: CFFAuthor = {};
+
+  if (nameParts.length >= 2) {
+    author.family_names = nameParts[0];
+    author.given_names = nameParts.slice(1).join(' ');
+  } else {
+    // If no comma, assume it's all given names
+    author.given_names = person.name;
+  }
+
+  if (person.identifier) {
+    author.orcid = person.identifier.replace('ORCID:', '').replace('https://orcid.org/', '');
+  }
+
+  if (person.email) {
+    author.email = person.email;
+  }
+
+  if (person.affiliation && person.affiliation.length > 0) {
+    author.affiliation = person.affiliation.map(aff => aff.name).join('; ');
+  }
+
+  return author;
+}
+
+/**
+ * Convert a DANDI Organization contributor to CFF Author format
+ */
+function organizationToCFFAuthor(org: Organization): CFFAuthor {
+  const author: CFFAuthor = {
+    name: org.name || 'Unknown Organization'
+  };
+
+  if (org.email) {
+    author.email = org.email;
+  }
+
+  return author;
+}
+
+/**
+ * Convert DANDI dandiset metadata to CFF format
+ */
+export function dandisetToCFF(metadata: DandisetMetadata, doi?: string): CFF {
+  const cff: CFF = {
+    'cff-version': '1.2.0',
+    message: 'If you use this dataset, please cite it as below.',
+    type: 'dataset',
+    title: metadata.name,
+    authors: []
+  };
+
+  // Add abstract/description
+  if (metadata.description) {
+    cff.abstract = metadata.description;
+  }
+
+  // Convert contributors who should be included in citation
+  metadata.contributor.forEach(contributor => {
+    if (contributor.includeInCitation !== false) {
+      if (contributor.schemaKey === 'Person') {
+        cff.authors.push(personToCFFAuthor(contributor as Person));
+      } else if (contributor.schemaKey === 'Organization') {
+        cff.authors.push(organizationToCFFAuthor(contributor as Organization));
+      }
+    }
+  });
+
+  // Add identifiers
+  cff.identifiers = [];
+
+  if (doi) {
+    cff.doi = doi;
+    cff.identifiers.push({
+      type: 'doi',
+      value: doi,
+      description: 'Digital Object Identifier'
+    });
+  }
+
+  if (metadata.identifier) {
+    cff.identifiers.push({
+      type: 'url',
+      value: `https://dandiarchive.org/dandiset/${metadata.identifier}`,
+      description: 'DANDI Archive URL'
+    });
+  }
+
+  // Add URL
+  if (metadata.url) {
+    cff.url = metadata.url;
+  } else if (doi) {
+    cff.url = `https://doi.org/${doi}`;
+  } else if (metadata.identifier) {
+    cff.url = `https://dandiarchive.org/dandiset/${metadata.identifier}`;
+  }
+
+  // Add repository
+  if (metadata.repository) {
+    cff.repository = metadata.repository;
+  }
+
+  // Add keywords
+  if (metadata.keywords && metadata.keywords.length > 0) {
+    cff.keywords = metadata.keywords;
+  }
+
+  // Add license
+  if (metadata.license && metadata.license.length > 0) {
+    // Convert SPDX license identifiers to simple format
+    cff.license = metadata.license.map(l => l.replace('spdx:', '')).join(', ');
+  }
+
+  // Add version
+  if (metadata.version) {
+    cff.version = metadata.version;
+  }
+
+  // Add release date
+  if (metadata.dateModified) {
+    cff['date-released'] = metadata.dateModified.split('T')[0]; // Extract date part
+  }
+
+  // Add related resources as references
+  if (metadata.relatedResource && metadata.relatedResource.length > 0) {
+    cff.references = metadata.relatedResource.map(resource => {
+      const ref: any = {
+        type: mapResourceTypeToCFF(resource.resourceType),
+      };
+
+      if (resource.name) {
+        ref.title = resource.name;
+      }
+
+      if (resource.identifier && resource.identifier.startsWith('doi:')) {
+        ref.doi = resource.identifier.replace('doi:', '');
+      }
+
+      if (resource.url) {
+        ref.url = resource.url;
+      }
+
+      return ref;
+    });
+  }
+
+  return cff;
+}
+
+/**
+ * Map DANDI resource types to CFF reference types
+ */
+function mapResourceTypeToCFF(resourceType?: string): string {
+  const mapping: Record<string, string> = {
+    'dcite:JournalArticle': 'article',
+    'dcite:ConferencePaper': 'conference-paper',
+    'dcite:Book': 'book',
+    'dcite:Dataset': 'dataset',
+    'dcite:Software': 'software',
+    'dcite:Report': 'report',
+    'dcite:Dissertation': 'thesis',
+  };
+
+  return mapping[resourceType || ''] || 'generic';
+}
+
+/**
+ * Convert CFF to BibTeX format
+ */
+export function cffToBibTeX(cff: CFF, identifier: string): string {
+  const type = '@dataset';
+  const key = `dandi:${identifier.replace('/', '_')}`;
+
+  const authors = cff.authors.map(author => {
+    if (author.name) {
+      return `{${author.name}}`;
+    }
+    return `${author.family_names || ''}, ${author.given_names || ''}`.trim();
+  }).join(' and ');
+
+  let bibtex = `${type}{${key},\n`;
+  bibtex += `  title = {${cff.title}},\n`;
+  bibtex += `  author = {${authors}},\n`;
+
+  if (cff.doi) {
+    bibtex += `  doi = {${cff.doi}},\n`;
+  }
+
+  if (cff.url) {
+    bibtex += `  url = {${cff.url}},\n`;
+  }
+
+  if (cff.abstract) {
+    bibtex += `  abstract = {${cff.abstract.replace(/\n/g, ' ')}},\n`;
+  }
+
+  if (cff.keywords) {
+    bibtex += `  keywords = {${cff.keywords.join(', ')}},\n`;
+  }
+
+  if (cff.version) {
+    bibtex += `  version = {${cff.version}},\n`;
+  }
+
+  if (cff['date-released']) {
+    const year = cff['date-released'].split('-')[0];
+    bibtex += `  year = {${year}},\n`;
+  }
+
+  bibtex += `  publisher = {DANDI Archive},\n`;
+  bibtex += `  note = {DANDI:${identifier}}\n`;
+  bibtex += '}';
+
+  return bibtex;
+}
+
+/**
+ * Convert CFF to APA format (7th edition)
+ */
+export function cffToAPA(cff: CFF): string {
+  const authors = cff.authors.map((author) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    const initials = author.given_names
+      ?.split(/\s+/)
+      .map(name => name.charAt(0).toUpperCase() + '.')
+      .join(' ');
+
+    return `${author.family_names}, ${initials}`;
+  });
+
+  let authorString = '';
+  if (authors.length === 1) {
+    authorString = authors[0];
+  } else if (authors.length === 2) {
+    authorString = `${authors[0]} & ${authors[1]}`;
+  } else {
+    authorString = authors.slice(0, -1).join(', ') + ', & ' + authors[authors.length - 1];
+  }
+
+  const year = cff['date-released'] ? ` (${cff['date-released'].split('-')[0]})` : '';
+  const version = cff.version ? ` (Version ${cff.version})` : '';
+  const doi = cff.doi ? ` https://doi.org/${cff.doi}` : '';
+
+  return `${authorString}${year}. ${cff.title}${version} [Data set]. DANDI Archive.${doi}`;
+}
+
+/**
+ * Convert CFF to MLA format (9th edition)
+ */
+export function cffToMLA(cff: CFF): string {
+  const authors = cff.authors.map((author, index) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    if (index === 0) {
+      // First author: Last, First
+      return `${author.family_names}, ${author.given_names}`;
+    }
+    // Subsequent authors: First Last
+    return `${author.given_names} ${author.family_names}`;
+  });
+
+  let authorString = '';
+  if (authors.length === 1) {
+    authorString = authors[0];
+  } else if (authors.length === 2) {
+    authorString = `${authors[0]}, and ${authors[1]}`;
+  } else if (authors.length === 3) {
+    authorString = `${authors[0]}, ${authors[1]}, and ${authors[2]}`;
+  } else {
+    authorString = `${authors[0]}, et al`;
+  }
+
+  const year = cff['date-released'] ? cff['date-released'].split('-')[0] : 'n.d.';
+  const doi = cff.doi ? ` doi:${cff.doi}` : '';
+
+  return `${authorString}. "${cff.title}." DANDI Archive, ${year}.${doi}`;
+}
+
+/**
+ * Convert CFF to Chicago format (17th edition, Author-Date)
+ */
+export function cffToChicago(cff: CFF): string {
+  const authors = cff.authors.map((author, index) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    if (index === 0) {
+      // First author: Last, First
+      return `${author.family_names}, ${author.given_names}`;
+    }
+    // Subsequent authors: First Last
+    return `${author.given_names} ${author.family_names}`;
+  });
+
+  let authorString = '';
+  if (authors.length === 1) {
+    authorString = authors[0];
+  } else if (authors.length <= 3) {
+    authorString = authors.slice(0, -1).join(', ') + ', and ' + authors[authors.length - 1];
+  } else {
+    authorString = `${authors[0]} et al.`;
+  }
+
+  const year = cff['date-released'] ? cff['date-released'].split('-')[0] : 'n.d.';
+  const version = cff.version ? `, version ${cff.version}` : '';
+  const doi = cff.doi ? ` https://doi.org/${cff.doi}` : '';
+
+  return `${authorString}. ${year}. "${cff.title}." Data set${version}. DANDI Archive.${doi}`;
+}
+
+/**
+ * Convert CFF to Harvard format
+ */
+export function cffToHarvard(cff: CFF): string {
+  const authors = cff.authors.map((author) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    const initials = author.given_names
+      ?.split(/\s+/)
+      .map(name => name.charAt(0).toUpperCase() + '.')
+      .join('');
+
+    return `${author.family_names}, ${initials}`;
+  });
+
+  let authorString = '';
+  if (authors.length === 1) {
+    authorString = authors[0];
+  } else if (authors.length === 2) {
+    authorString = `${authors[0]} and ${authors[1]}`;
+  } else if (authors.length === 3) {
+    authorString = `${authors[0]}, ${authors[1]} and ${authors[2]}`;
+  } else {
+    authorString = `${authors[0]} et al.`;
+  }
+
+  const year = cff['date-released'] ? cff['date-released'].split('-')[0] : 'n.d.';
+  const doi = cff.doi ? ` Available at: https://doi.org/${cff.doi}` : '';
+
+  return `${authorString} (${year}) '${cff.title}', DANDI Archive. Data set.${doi}`;
+}
+
+/**
+ * Convert CFF to Vancouver format (used in biomedical sciences)
+ */
+export function cffToVancouver(cff: CFF): string {
+  const authors = cff.authors.map((author) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    const initials = author.given_names
+      ?.split(/\s+/)
+      .map(name => name.charAt(0).toUpperCase())
+      .join('');
+
+    return `${author.family_names} ${initials}`;
+  });
+
+  // Vancouver limits to 6 authors, then "et al."
+  let authorString = '';
+  if (authors.length <= 6) {
+    authorString = authors.join(', ');
+  } else {
+    authorString = authors.slice(0, 6).join(', ') + ', et al';
+  }
+
+  const year = cff['date-released'] ? cff['date-released'].split('-')[0] : '';
+  const doi = cff.doi ? ` doi: ${cff.doi}` : '';
+
+  return `${authorString}. ${cff.title} [Data set]. DANDI Archive; ${year}.${doi}`;
+}
+
+/**
+ * Convert CFF to IEEE format
+ */
+export function cffToIEEE(cff: CFF): string {
+  const authors = cff.authors.map((author) => {
+    if (author.name) {
+      return author.name;
+    }
+
+    const initials = author.given_names
+      ?.split(/\s+/)
+      .map(name => name.charAt(0).toUpperCase() + '.')
+      .join(' ');
+
+    return `${initials} ${author.family_names}`;
+  });
+
+  let authorString = '';
+  if (authors.length === 1) {
+    authorString = authors[0];
+  } else if (authors.length === 2) {
+    authorString = `${authors[0]} and ${authors[1]}`;
+  } else {
+    authorString = authors.slice(0, -1).join(', ') + ', and ' + authors[authors.length - 1];
+  }
+
+  const year = cff['date-released'] ? cff['date-released'].split('-')[0] : '';
+  const doi = cff.doi ? ` doi: ${cff.doi}` : '';
+
+  return `${authorString}, "${cff.title}," DANDI Archive, ${year}.${doi}`;
+}
+
+/**
+ * Convert CFF to RIS format
+ */
+export function cffToRIS(cff: CFF, identifier: string): string {
+  let ris = 'TY  - DATA\n';
+  ris += `TI  - ${cff.title}\n`;
+
+  cff.authors.forEach(author => {
+    if (author.name) {
+      ris += `AU  - ${author.name}\n`;
+    } else {
+      ris += `AU  - ${author.family_names || ''}, ${author.given_names || ''}\n`;
+    }
+  });
+
+  if (cff.abstract) {
+    ris += `AB  - ${cff.abstract.replace(/\n/g, ' ')}\n`;
+  }
+
+  if (cff.keywords) {
+    cff.keywords.forEach(keyword => {
+      ris += `KW  - ${keyword}\n`;
+    });
+  }
+
+  if (cff.doi) {
+    ris += `DO  - ${cff.doi}\n`;
+  }
+
+  if (cff.url) {
+    ris += `UR  - ${cff.url}\n`;
+  }
+
+  if (cff['date-released']) {
+    const dateParts = cff['date-released'].split('-');
+    ris += `PY  - ${dateParts[0]}\n`;
+    if (dateParts[1]) ris += `Y2  - ${dateParts[0]}/${dateParts[1]}/${dateParts[2] || '01'}\n`;
+  }
+
+  ris += 'PB  - DANDI Archive\n';
+  ris += `N1  - DANDI:${identifier}\n`;
+
+  if (cff.version) {
+    ris += `VL  - ${cff.version}\n`;
+  }
+
+  ris += 'ER  -\n';
+
+  return ris;
+}
+
+/**
+ * Convert CFF to YAML string
+ */
+export function cffToYAML(cff: CFF): string {
+  // Simple YAML serialization (could be replaced with a proper YAML library)
+  return stringifyYAML(cff, 0);
+}
+
+function stringifyYAML(obj: any, indent: number = 0): string {
+  const spaces = '  '.repeat(indent);
+  let yaml = '';
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === undefined || value === null) continue;
+
+    yaml += `${spaces}${key}:`;
+
+    if (typeof value === 'string') {
+      // Quote strings that contain special characters
+      if (value.includes(':') || value.includes('\n') || value.includes('"') || value.includes("'")) {
+        yaml += ` "${value.replace(/"/g, '\\"').replace(/\n/g, '\\n')}"\n`;
+      } else {
+        yaml += ` ${value}\n`;
+      }
+    } else if (typeof value === 'number' || typeof value === 'boolean') {
+      yaml += ` ${value}\n`;
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        yaml += ' []\n';
+      } else if (typeof value[0] === 'string' || typeof value[0] === 'number') {
+        // Simple array
+        yaml += '\n';
+        value.forEach(item => {
+          yaml += `${spaces}  - ${item}\n`;
+        });
+      } else {
+        // Array of objects - use inline format for first property
+        yaml += '\n';
+        value.forEach(item => {
+          const entries = Object.entries(item).filter(([, v]) => v !== undefined && v !== null);
+          if (entries.length > 0) {
+            const [firstKey, firstValue] = entries[0];
+            yaml += `${spaces}  - ${firstKey}: ${formatYAMLValue(firstValue)}\n`;
+            // Remaining properties
+            for (let i = 1; i < entries.length; i++) {
+              const [k, v] = entries[i];
+              yaml += `${spaces}    ${k}: ${formatYAMLValue(v)}\n`;
+            }
+          }
+        });
+      }
+    } else if (typeof value === 'object') {
+      yaml += '\n';
+      yaml += stringifyYAML(value, indent + 1);
+    }
+  }
+
+  return yaml;
+}
+
+function formatYAMLValue(value: any): string {
+  if (typeof value === 'string') {
+    if (value.includes(':') || value.includes('\n') || value.includes('"') || value.includes("'")) {
+      return `"${value.replace(/"/g, '\\"').replace(/\n/g, '\\n')}"`;
+    }
+    return value;
+  } else if (typeof value === 'number' || typeof value === 'boolean') {
+    return String(value);
+  }
+  return String(value);
+}

From 20ab4acf5fe679387ba7a4f4ac82abfa1a146dc9 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 30 Dec 2025 16:51:45 -0500
Subject: [PATCH 06/39] Don't return `null` names or usernames from user search
 endpoint

---
 dandiapi/api/tests/test_users.py | 24 ++++++++++++++++++++++++
 dandiapi/api/views/users.py      |  6 +++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/dandiapi/api/tests/test_users.py b/dandiapi/api/tests/test_users.py
index cfb7cbed4..0b7a2551b 100644
--- a/dandiapi/api/tests/test_users.py
+++ b/dandiapi/api/tests/test_users.py
@@ -157,6 +157,30 @@ def test_user_search_extra_data(api_client):
     assert api_client.get('/api/users/search/?', {'username': 'odysseus'}).data == []
 
 
+@pytest.mark.django_db
+def test_user_search_extra_data_no_name(api_client):
+    """Test that a `null` name field in extra_data doesn't result in a `null` in the output."""
+    user = UserFactory.create(social_account__extra_data__name=None)
+
+    api_client.force_authenticate(user=user)
+
+    resp = api_client.get('/api/users/search/?', {'username': user.username})
+    assert len(resp.data) == 1
+    assert resp.data[0]['name'] == user.get_full_name()
+
+
+@pytest.mark.django_db
+def test_user_search_extra_data_no_username(api_client):
+    """Test that a `null` username field in extra_data doesn't result in a `null` in the output."""
+    user = UserFactory.create(social_account__extra_data__login=None)
+
+    api_client.force_authenticate(user=user)
+
+    resp = api_client.get('/api/users/search/?', {'username': user.username})
+    assert len(resp.data) == 1
+    assert resp.data[0]['username'] == user.username
+
+
 @pytest.mark.parametrize(
     ('status', 'expected_status_code', 'expected_search_results_value'),
     [
diff --git a/dandiapi/api/views/users.py b/dandiapi/api/views/users.py
index 7ee076e18..9937ab61c 100644
--- a/dandiapi/api/views/users.py
+++ b/dandiapi/api/views/users.py
@@ -67,12 +67,12 @@ def social_account_to_dict(social_account: SocialAccount):
 def serialize_user(user: User):
     """Serialize a user that's been annotated with a `social_account_data` field."""
     username = user.username
-    name = f'{user.first_name} {user.last_name}'.strip()
+    name = user.get_full_name()
 
     # Prefer social account info if present
     if user.social_account_data is not None:
-        username = user.social_account_data.get('login', username)
-        name = user.social_account_data.get('name', name)
+        username = user.social_account_data.get('login') or username
+        name = user.social_account_data.get('name') or name
 
     return {
         'admin': user.is_superuser,

From cf725e6c6b70040f7ec26d4a21217b09d6e80329 Mon Sep 17 00:00:00 2001
From: Kabilar Gunalan <kabi@mit.edu>
Date: Fri, 9 Jan 2026 17:01:17 -0600
Subject: [PATCH 07/39] Update URL for user support

---
 dandiapi/api/templates/api/mail/approved_user_message.txt | 3 +--
 dandiapi/api/templates/api/mail/registered_message.txt    | 3 +--
 web/src/components/AppBar/AppBar.vue                      | 2 +-
 web/src/utils/constants.ts                                | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dandiapi/api/templates/api/mail/approved_user_message.txt b/dandiapi/api/templates/api/mail/approved_user_message.txt
index 8ac12b018..893464451 100644
--- a/dandiapi/api/templates/api/mail/approved_user_message.txt
+++ b/dandiapi/api/templates/api/mail/approved_user_message.txt
@@ -6,8 +6,7 @@ Your DANDI account has been approved. You can go to {{ dandi_web_app_url }} and
 Please use the following links to post any questions or issues.
 
 DANDI Docs: https://docs.dandiarchive.org
-Discussions: https://github.com/dandi/helpdesk/discussions
-Issues: https://github.com/dandi/helpdesk/issues/new/choose
+Support: https://docs.dandiarchive.org/support/
 YouTube: https://www.youtube.com/@dandiarchive
 (please Subscribe)
 
diff --git a/dandiapi/api/templates/api/mail/registered_message.txt b/dandiapi/api/templates/api/mail/registered_message.txt
index 7e04c13de..38329f24a 100644
--- a/dandiapi/api/templates/api/mail/registered_message.txt
+++ b/dandiapi/api/templates/api/mail/registered_message.txt
@@ -15,8 +15,7 @@ registered with our Slack workspace.
 Please use the following links to post any questions or issues.
 
 DANDI Docs: https://docs.dandiarchive.org
-Discussions: https://github.com/dandi/helpdesk/discussions
-Issues: https://github.com/dandi/helpdesk/issues/new/choose
+Support: https://docs.dandiarchive.org/support/
 YouTube: https://www.youtube.com/@dandiarchive
 (please Subscribe)
 
diff --git a/web/src/components/AppBar/AppBar.vue b/web/src/components/AppBar/AppBar.vue
index 60e2667c5..f007620eb 100644
--- a/web/src/components/AppBar/AppBar.vue
+++ b/web/src/components/AppBar/AppBar.vue
@@ -199,7 +199,7 @@ const navItems: NavigationItem[] = [
     external: true,
   },
   {
-    text: 'Help',
+    text: 'Support',
     to: dandiHelpUrl,
     external: true,
   },
diff --git a/web/src/utils/constants.ts b/web/src/utils/constants.ts
index 5a96b2716..470199da3 100644
--- a/web/src/utils/constants.ts
+++ b/web/src/utils/constants.ts
@@ -1,7 +1,7 @@
 const dandiUrl = 'https://dandiarchive.org';
 const dandiAboutUrl = 'https://about.dandiarchive.org/';
 const dandiDocumentationUrl = 'https://docs.dandiarchive.org';
-const dandiHelpUrl = 'https://github.com/dandi/helpdesk/issues/new/choose';
+const dandiHelpUrl = 'https://docs.dandiarchive.org/support/';
 const dandihubUrl = 'https://hub.dandiarchive.org/';
 const sandboxDocsUrl = `${dandiDocumentationUrl}/getting-started/creating-account/`;
 

From afc984df86787c86da100fb37a2fd0273bbee45c Mon Sep 17 00:00:00 2001
From: Heberto Mayorquin <h.mayorquin@gmail.com>
Date: Mon, 19 Jan 2026 13:55:31 -0600
Subject: [PATCH 08/39] Fix propagation of embargoed date from dandisets to
 assets

---
 dandiapi/api/models/asset.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/dandiapi/api/models/asset.py b/dandiapi/api/models/asset.py
index ef3756f94..95f1899a5 100644
--- a/dandiapi/api/models/asset.py
+++ b/dandiapi/api/models/asset.py
@@ -242,17 +242,29 @@ def full_metadata(self):
             'asset-download',
             kwargs={'asset_id': str(self.asset_id)},
         )
+
+        is_embargoed = self.is_embargoed
+        if is_embargoed:
+            # Embargo info is only set on the first version's metadata
+            first_version = self.versions.first()
+            access = {
+                'schemaKey': 'AccessRequirements',
+                'status': AccessType.EmbargoedAccess.value,
+            }
+            # Some tests create assets without an associated version
+            if first_version:
+                embargoed_until = first_version.metadata['access'][0]['embargoedUntil']
+                access['embargoedUntil'] = embargoed_until
+        else:
+            access = {
+                'schemaKey': 'AccessRequirements',
+                'status': AccessType.OpenAccess.value,
+            }
+
         metadata = {
             **self.metadata,
             'id': self.dandi_asset_id(self.asset_id),
-            'access': [
-                {
-                    'schemaKey': 'AccessRequirements',
-                    'status': AccessType.EmbargoedAccess.value
-                    if self.is_embargoed
-                    else AccessType.OpenAccess.value,
-                }
-            ],
+            'access': [access],
             'path': self.path,
             'identifier': str(self.asset_id),
             'contentUrl': [download_url, self.s3_url],

From 29e38848afbf571c8408291e0cb02a79c9519c02 Mon Sep 17 00:00:00 2001
From: William Allen <william.allen@kitware.com>
Date: Mon, 19 Jan 2026 11:35:19 -0500
Subject: [PATCH 09/39] Fix dandiset ID parsing during upload initialization

Closes https://github.com/dandi/dandi-archive/issues/2649
---
 dandiapi/api/tests/test_upload.py | 20 ++++++++++++++++++++
 dandiapi/api/views/upload.py      |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/dandiapi/api/tests/test_upload.py b/dandiapi/api/tests/test_upload.py
index 842011d31..79ace220a 100644
--- a/dandiapi/api/tests/test_upload.py
+++ b/dandiapi/api/tests/test_upload.py
@@ -101,6 +101,26 @@ def test_upload_initialize(api_client, embargoed):
     assert upload.blob.name == f'blobs/{upload_id[:3]}/{upload_id[3:6]}/{upload_id}'
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize('dandiset_id', ['DANDI:abc', 'DANDI:123456', '001'])
+def test_upload_initialize_invalid_dandiset(api_client, dandiset_id):
+    user = UserFactory.create()
+    DandisetFactory.create(embargo_status=Dandiset.EmbargoStatus.UNEMBARGOING, owners=[user])
+    api_client.force_authenticate(user=user)
+
+    content_size = 123
+    resp = api_client.post(
+        '/api/uploads/initialize/',
+        {
+            'contentSize': content_size,
+            'digest': {'algorithm': 'dandi:dandi-etag', 'value': 'f' * 32 + '-1'},
+            'dandiset': dandiset_id,
+        },
+    )
+
+    assert resp.status_code == 400
+
+
 @pytest.mark.django_db
 def test_upload_initialize_unembargo_in_progress(api_client):
     user = UserFactory.create()
diff --git a/dandiapi/api/views/upload.py b/dandiapi/api/views/upload.py
index 5da16a0d8..a0dadec23 100644
--- a/dandiapi/api/views/upload.py
+++ b/dandiapi/api/views/upload.py
@@ -39,7 +39,7 @@ class DigestSerializer(serializers.Serializer):
 class UploadInitializationRequestSerializer(serializers.Serializer):
     contentSize = serializers.IntegerField(min_value=1)  # noqa: N815
     digest = DigestSerializer()
-    dandiset = serializers.RegexField(Dandiset.IDENTIFIER_REGEX)
+    dandiset = serializers.RegexField(f'^{Dandiset.IDENTIFIER_REGEX}$')
 
 
 class PartInitializationResponseSerializer(serializers.Serializer):
@@ -131,7 +131,7 @@ def upload_initialize_view(request: AuthenticatedRequest) -> HttpResponseBase:
     if digest['algorithm'] != 'dandi:dandi-etag':
         return Response('Unsupported Digest Type', status=400)
     etag = digest['value']
-    dandiset_id = request_serializer.validated_data['dandiset']
+    dandiset_id = int(request_serializer.validated_data['dandiset'])
     dandiset = get_object_or_404(
         get_visible_dandisets(request.user),
         id=dandiset_id,

From cf188ed2d266971ce823dae7f81a6c4814814011 Mon Sep 17 00:00:00 2001
From: Kabilar Gunalan <kabi@mit.edu>
Date: Fri, 30 Jan 2026 12:15:46 -0600
Subject: [PATCH 10/39] Update copyright year in footer

---
 web/src/components/DandiFooter.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/components/DandiFooter.vue b/web/src/components/DandiFooter.vue
index b33db4d08..113c2bc2c 100644
--- a/web/src/components/DandiFooter.vue
+++ b/web/src/components/DandiFooter.vue
@@ -4,7 +4,7 @@
       <CookieBanner />
       <v-row>
         <v-col offset="2">
-          &copy; 2019 - 2025 The DANDI Team<br>
+          &copy; 2019 - {{ currentYear }} The DANDI Team<br>
           <a
             target="_blank"
             rel="noopener"
@@ -103,6 +103,7 @@ import { dandiDocumentationUrl } from '@/utils/constants';
 
 const version = import.meta.env.VITE_APP_VERSION;
 const githubLink = import.meta.env.VITE_APP_GIT_REVISION ? `https://github.com/dandi/dandi-archive/commit/${import.meta.env.VITE_APP_GIT_REVISION}` : 'https://github.com/dandi/dandi-archive';
+const currentYear = new Date().getFullYear();
 </script>
 
 <style scoped>

From 2a2ebb85298c567af2d723d338ce3a056e17fb97 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Mon, 2 Feb 2026 19:12:31 +0000
Subject: [PATCH 11/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d0263b59..eac537b4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# v0.21.3 (Mon Feb 02 2026)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, William Allen ([@williamjallen](https://github.com/williamjallen)), for all your work!
+
+#### 🐛 Bug Fix
+
+- Update URL for user support [#2688](https://github.com/dandi/dandi-archive/pull/2688) ([@kabilar](https://github.com/kabilar))
+- Fix dandiset ID parsing during upload initialization [#2696](https://github.com/dandi/dandi-archive/pull/2696) ([@williamjallen](https://github.com/williamjallen))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- William Allen ([@williamjallen](https://github.com/williamjallen))
+
+---
+
 # v0.21.2 (Tue Jan 13 2026)
 
 #### 🐛 Bug Fix

From 538abed708a24c53db259582c832f3661e0884f8 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Thu, 5 Feb 2026 18:39:22 +0000
Subject: [PATCH 12/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac537b4f..c405de6f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v0.21.4 (Thu Feb 05 2026)
+
+#### 🐛 Bug Fix
+
+- Update copyright year in footer [#2701](https://github.com/dandi/dandi-archive/pull/2701) ([@kabilar](https://github.com/kabilar))
+
+#### Authors: 1
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+
+---
+
 # v0.21.3 (Mon Feb 02 2026)
 
 :tada: This release contains work from a new contributor! :tada:

From c7baa97389aed255867f2f5f5feffc185c528904 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Fri, 6 Feb 2026 16:17:38 -0500
Subject: [PATCH 13/39] Don't use one-liner ifs without braces

---
 web/src/components/DLP/HowToCiteTab.vue | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
index a644c8b13..ea18a33bb 100644
--- a/web/src/components/DLP/HowToCiteTab.vue
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -263,12 +263,18 @@ const isDraft = computed(() => store.version === 'draft');
 const publishedVersions = computed(() => store.publishedVersions);
 const hasPublishedVersions = computed(() => publishedVersions.value && publishedVersions.value.length > 0);
 const latestPublishedVersion = computed(() => {
-  if (!publishedVersions.value || publishedVersions.value.length === 0) return null;
+  if (!publishedVersions.value || publishedVersions.value.length === 0) {
+    return null;
+  }
+
   // Versions are sorted, so the first one is the latest
   return publishedVersions.value[0].version;
 });
 const latestPublishedVersionLink = computed(() => {
-  if (!currentDandiset.value || !latestPublishedVersion.value) return '';
+  if (!currentDandiset.value || !latestPublishedVersion.value) {
+    return '';
+  }
+
   const { identifier } = currentDandiset.value.dandiset;
   return `/dandiset/${identifier}/${latestPublishedVersion.value}`;
 });
@@ -281,7 +287,10 @@ const selectedCitationFormat = ref<CitationFormat>('apa'); // For the dropdown i
 
 // Generate CFF object from metadata
 const cffObject = computed(() => {
-  if (!props.meta) return null;
+  if (!props.meta) {
+    return null;
+  }
+
   return dandisetToCFF(props.meta, typeof doi.value === 'string' ? doi.value : undefined);
 });
 
@@ -347,7 +356,10 @@ const isCodeFormat = computed(() => {
 });
 
 const dandiIdentifier = computed(() => {
-  if (!currentDandiset.value) return '';
+  if (!currentDandiset.value) {
+    return '';
+  }
+
   const { identifier } = currentDandiset.value.dandiset;
   const version = props.meta?.version || currentDandiset.value.version;
   return `DANDI:${identifier}/${version}`;
@@ -357,7 +369,10 @@ const dandiUrl = computed(() => {
   if (doi.value) {
     return `https://doi.org/${doi.value}`;
   }
-  if (!currentDandiset.value) return '';
+  if (!currentDandiset.value) {
+    return '';
+  }
+
   const { identifier } = currentDandiset.value.dandiset;
   return `https://dandiarchive.org/dandiset/${identifier}`;
 });

From 8e08a2a582caef5441ef3706ca11a6166107fc98 Mon Sep 17 00:00:00 2001
From: Ben Dichter <ben.dichter@gmail.com>
Date: Fri, 6 Feb 2026 16:38:37 -0500
Subject: [PATCH 14/39] Add e2e tests for How to Cite tab

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 e2e/tests/dandisetLandingPage.spec.ts | 80 +++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/e2e/tests/dandisetLandingPage.spec.ts b/e2e/tests/dandisetLandingPage.spec.ts
index 95314d263..63d6948b8 100644
--- a/e2e/tests/dandisetLandingPage.spec.ts
+++ b/e2e/tests/dandisetLandingPage.spec.ts
@@ -45,4 +45,84 @@ test.describe("dandiset landing page", async () => {
     await page.waitForLoadState("networkidle");
     await expect(page.getByText("Error: Dandiset does not exist")).toHaveCount(1);
   });
+
+  test.describe("how to cite tab", () => {
+    let dandisetId: string | undefined;
+
+    test.beforeEach(async ({ page }) => {
+      await registerNewUser(page);
+      const dandisetName = faker.lorem.words();
+      const dandisetDescription = faker.lorem.sentences();
+      dandisetId = await registerDandiset(page, dandisetName, dandisetDescription);
+    });
+
+    test("navigate to the How to Cite tab", async ({ page }) => {
+      // Click the "How to Cite" tab
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      // Verify the tab content is displayed
+      await expect(page.getByText("How to Cite this Dataset")).toBeVisible();
+    });
+
+    test("displays draft warning for unpublished dandisets", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      await expect(
+        page.getByText("Citing draft dandisets is not recommended"),
+      ).toBeVisible();
+      await expect(
+        page.getByText("Please contact the authors to request publication"),
+      ).toBeVisible();
+    });
+
+    test("displays citation not available message for drafts", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      await expect(
+        page.getByText("Citation will be available after the dandiset is published."),
+      ).toBeVisible();
+    });
+
+    test("displays all expected sections", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      // Check all section headers are present
+      await expect(page.getByRole("heading", { name: "Full Citation" })).toBeVisible();
+      await expect(page.getByRole("heading", { name: "Materials and Methods" })).toBeVisible();
+      await expect(page.getByRole("heading", { name: "Data Availability Statement" })).toBeVisible();
+      await expect(page.getByRole("heading", { name: "DANDI Identifier" })).toBeVisible();
+      await expect(page.getByRole("heading", { name: "License" })).toBeVisible();
+    });
+
+    test("displays DANDI identifier with correct format", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      // The identifier should follow the format DANDI:<id>/draft
+      await expect(page.getByText(`DANDI:${dandisetId}/draft`)).toBeVisible();
+      await expect(page.getByText("DANDI Archive RRID: SCR_017571")).toBeVisible();
+    });
+
+    test("displays citation format selector", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      // The format dropdown should be visible with APA 7th as default
+      await expect(page.getByText("APA 7th")).toBeVisible();
+    });
+
+    test("displays guide link", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+
+      await expect(
+        page.getByRole("link", { name: "guide on citing dandisets" }),
+      ).toBeVisible();
+    });
+
+    test("can switch back to Overview tab", async ({ page }) => {
+      await page.getByRole("tab", { name: "How to Cite" }).click();
+      await expect(page.getByText("How to Cite this Dataset")).toBeVisible();
+
+      await page.getByRole("tab", { name: "Overview" }).click();
+      await expect(page.getByText("How to Cite this Dataset")).not.toBeVisible();
+    });
+  });
 });

From ffd4ba2e97c953243bb13f7f7e96689b9d8bf2fe Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 2 Dec 2025 15:42:45 -0500
Subject: [PATCH 15/39] test: pass -s to pytest  so prompts etc would be
 displayed

Potentially could assist in troubleshooting
https://github.com/dandi/dandi-cli/issues/1762
---
 .github/workflows/cli-integration.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cli-integration.yml b/.github/workflows/cli-integration.yml
index 5f07acf61..89bbc4a8c 100644
--- a/.github/workflows/cli-integration.yml
+++ b/.github/workflows/cli-integration.yml
@@ -68,7 +68,7 @@ jobs:
         if: matrix.dandi-version == 'release'
         run: >
           uvx --with dandi[test]
-          pytest --pyargs -v --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 
@@ -76,7 +76,7 @@ jobs:
         if: matrix.dandi-version == 'master'
         run: >
           uvx --with "dandi[test] @ git+https://github.com/dandi/dandi-cli"
-          pytest --pyargs -v --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 

From c88d5c374f83ca12a1299acce9c7338fdcdd4158 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 2 Dec 2025 20:35:41 -0500
Subject: [PATCH 16/39] bf(test): test_nwb2asset_remote_asset which might be
 stalling here

---
 .github/workflows/cli-integration.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cli-integration.yml b/.github/workflows/cli-integration.yml
index 89bbc4a8c..c9136b225 100644
--- a/.github/workflows/cli-integration.yml
+++ b/.github/workflows/cli-integration.yml
@@ -68,7 +68,7 @@ jobs:
         if: matrix.dandi-version == 'release'
         run: >
           uvx --with dandi[test]
-          pytest --pyargs -v -s --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api -k "not test_nwb2asset_remote_asset" dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 
@@ -76,7 +76,7 @@ jobs:
         if: matrix.dandi-version == 'master'
         run: >
           uvx --with "dandi[test] @ git+https://github.com/dandi/dandi-cli"
-          pytest --pyargs -v -s --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api -k "not test_nwb2asset_remote_asset" dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 

From b54f73ae087e685af1b4641fbb3ce4a5e3b6cd81 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 9 Feb 2026 17:42:55 -0500
Subject: [PATCH 17/39] Remove handling of missing citation case

Every dandiset version should always have a `citation` field, as it is
generated and placed into the metadata on save.
---
 e2e/tests/dandisetLandingPage.spec.ts   |  8 --------
 web/src/components/DLP/HowToCiteTab.vue | 16 ++++------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/e2e/tests/dandisetLandingPage.spec.ts b/e2e/tests/dandisetLandingPage.spec.ts
index 63d6948b8..fdbb25e8e 100644
--- a/e2e/tests/dandisetLandingPage.spec.ts
+++ b/e2e/tests/dandisetLandingPage.spec.ts
@@ -75,14 +75,6 @@ test.describe("dandiset landing page", async () => {
       ).toBeVisible();
     });
 
-    test("displays citation not available message for drafts", async ({ page }) => {
-      await page.getByRole("tab", { name: "How to Cite" }).click();
-
-      await expect(
-        page.getByText("Citation will be available after the dandiset is published."),
-      ).toBeVisible();
-    });
-
     test("displays all expected sections", async ({ page }) => {
       await page.getByRole("tab", { name: "How to Cite" }).click();
 
diff --git a/web/src/components/DLP/HowToCiteTab.vue b/web/src/components/DLP/HowToCiteTab.vue
index ea18a33bb..0a480aaf8 100644
--- a/web/src/components/DLP/HowToCiteTab.vue
+++ b/web/src/components/DLP/HowToCiteTab.vue
@@ -66,10 +66,7 @@
             class="citation-format-select"
           />
         </div>
-        <div
-          v-if="currentCitation"
-          class="copy-block mb-4"
-        >
+        <div class="copy-block mb-4">
           <div class="copy-block-content">
             <pre v-if="isCodeFormat" class="citation-text-code">{{ currentCitation }}</pre>
             <span v-else class="citation-text">{{ currentCitation }}</span>
@@ -92,12 +89,6 @@
             </v-btn>
           </div>
         </div>
-        <p
-          v-else
-          class="text-body-2 font-italic mb-4"
-        >
-          Citation will be available after the dandiset is published.
-        </p>
 
         <!-- DOI info for published versions -->
         <div
@@ -346,8 +337,9 @@ const currentCitation = computed(() => {
   if (citation.value && formattedCitations.value[selectedCitationFormat.value]) {
     return formattedCitations.value[selectedCitationFormat.value];
   }
-  // For drafts or when CFF generation fails, show the original citation if available
-  return citation.value || '';
+
+  // Default to the original citation value
+  return citation.value;
 });
 
 // Check if the selected format is a code-like format that needs preformatted text

From c89ed0da26e68bad9d21f204c963099cfb7bfe4d Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Thu, 12 Feb 2026 17:18:26 -0500
Subject: [PATCH 18/39] Improve setting of asset embargo end date

* Fix version retrieval (a simple .first() won't return `draft` if other versions
  are present)
* Factor access logic out into separate method
* Raise exception if dandiset is OPEN with an embargoed asset
* Don't assume `embargoedUntil` is present on version metadata
---
 dandiapi/api/models/asset.py | 56 ++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/dandiapi/api/models/asset.py b/dandiapi/api/models/asset.py
index 95f1899a5..6fd8e3bf4 100644
--- a/dandiapi/api/models/asset.py
+++ b/dandiapi/api/models/asset.py
@@ -17,10 +17,16 @@
 from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
 
+from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.models.metadata import PublishableMetadataMixin
 
 from .version import Version
 
+
+class EmbargoedAssetWithinOpenDandisetError(Exception):
+    """Raised when an embargoed asset exists in an open dandiset."""
+
+
 ASSET_CHARS_REGEX = r'[A-z0-9(),&\s#+~_=-]'
 ASSET_PATH_REGEX = rf'^({ASSET_CHARS_REGEX}?\/?\.?{ASSET_CHARS_REGEX})+$'
 ASSET_COMPUTED_FIELDS = [
@@ -236,6 +242,36 @@ def is_different_from(
     def dandi_asset_id(asset_id: str | uuid.UUID):
         return f'dandiasset:{asset_id}'
 
+    def access_metadata(self):
+        # Default to open access
+        embargoed = self.is_embargoed
+        access = {
+            'schemaKey': 'AccessRequirements',
+            'status': AccessType.EmbargoedAccess.value
+            if embargoed
+            else AccessType.OpenAccess.value,
+        }
+
+        if embargoed:
+            draft_version = self.versions.select_related('dandiset').filter(version='draft').first()
+
+            # Only bother with embargoedUntil if this asset is associated with an embargoed dandiset
+            # draft version. Otherwise, we wouldn't have a date to put here, and it won't be checked
+            # anyway.
+            if draft_version is not None:
+                # This shouldn't ever occur, but if it does, we'll want to know about it.
+                if draft_version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN:
+                    raise EmbargoedAssetWithinOpenDandisetError(
+                        'Embargoed asset contained within OPEN dandiset'
+                    )
+
+                # EmbargoedUntil isn't guaranteed to be set
+                embargo_end_date = draft_version.metadata['access'][0].get('embargoedUntil')
+                if embargo_end_date is not None:
+                    access['embargoedUntil'] = embargo_end_date
+
+        return access
+
     @property
     def full_metadata(self):
         download_url = settings.DANDI_API_URL + reverse(
@@ -243,28 +279,10 @@ def full_metadata(self):
             kwargs={'asset_id': str(self.asset_id)},
         )
 
-        is_embargoed = self.is_embargoed
-        if is_embargoed:
-            # Embargo info is only set on the first version's metadata
-            first_version = self.versions.first()
-            access = {
-                'schemaKey': 'AccessRequirements',
-                'status': AccessType.EmbargoedAccess.value,
-            }
-            # Some tests create assets without an associated version
-            if first_version:
-                embargoed_until = first_version.metadata['access'][0]['embargoedUntil']
-                access['embargoedUntil'] = embargoed_until
-        else:
-            access = {
-                'schemaKey': 'AccessRequirements',
-                'status': AccessType.OpenAccess.value,
-            }
-
         metadata = {
             **self.metadata,
             'id': self.dandi_asset_id(self.asset_id),
-            'access': [access],
+            'access': [self.access_metadata()],
             'path': self.path,
             'identifier': str(self.asset_id),
             'contentUrl': [download_url, self.s3_url],

From 60544b27db08d5db07853ae458314b228e1bde4b Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Fri, 13 Feb 2026 18:04:42 -0500
Subject: [PATCH 19/39] Handle zarr and asset blob cases separately

---
 dandiapi/api/models/asset.py | 53 +++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/dandiapi/api/models/asset.py b/dandiapi/api/models/asset.py
index 6fd8e3bf4..ab5a0e5f6 100644
--- a/dandiapi/api/models/asset.py
+++ b/dandiapi/api/models/asset.py
@@ -13,7 +13,8 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models import Q
+from django.db.models import CharField, DateField, Min, Q
+from django.db.models.functions import Cast
 from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
 
@@ -252,24 +253,56 @@ def access_metadata(self):
             else AccessType.OpenAccess.value,
         }
 
-        if embargoed:
-            draft_version = self.versions.select_related('dandiset').filter(version='draft').first()
+        # Nothing else to do if not embargoed
+        if not embargoed:
+            return access
+
+        # For zarr assets, is_embargoed is based on the dandiset directly, and a zarr can
+        # only be associated with one dandiset, so we know this dandiset is embargoed
+        if self.zarr is not None:
+            draft_version = self.versions.filter(version='draft').first()
 
             # Only bother with embargoedUntil if this asset is associated with an embargoed dandiset
             # draft version. Otherwise, we wouldn't have a date to put here, and it won't be checked
             # anyway.
             if draft_version is not None:
-                # This shouldn't ever occur, but if it does, we'll want to know about it.
-                if draft_version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN:
-                    raise EmbargoedAssetWithinOpenDandisetError(
-                        'Embargoed asset contained within OPEN dandiset'
-                    )
-
                 # EmbargoedUntil isn't guaranteed to be set
-                embargo_end_date = draft_version.metadata['access'][0].get('embargoedUntil')
+                embargo_end_date: str | None = draft_version.metadata['access'][0].get(
+                    'embargoedUntil'
+                )
                 if embargo_end_date is not None:
                     access['embargoedUntil'] = embargo_end_date
 
+            return access
+
+        # In the blob case, we need to consider all dandisets this blob might be associated with,
+        # and take the minimum embargo end date
+
+        # This blob should only be associated with embargoed dandisets
+        open_dandisets = self.blob.assets.filter(
+            versions__dandiset__embargo_status=Dandiset.EmbargoStatus.OPEN
+        )
+        if open_dandisets.exists():
+            raise EmbargoedAssetWithinOpenDandisetError(
+                'Embargoed asset contained within OPEN dandiset'
+            )
+
+        # Retrieve the minimum embargo end date, across all dandisets
+        embargo_end_date: datetime.date | None = (
+            self.blob.assets.filter(versions__isnull=False)
+            .annotate(
+                embargo_end_date=Cast(
+                    Cast('versions__metadata__access__0__embargoedUntil', output_field=CharField()),
+                    output_field=DateField(),
+                )
+            )
+            .aggregate(min_embargo_end_date=Min('embargo_end_date'))['min_embargo_end_date']
+        )
+
+        if embargo_end_date is None:
+            return access
+
+        access['embargoedUntil'] = embargo_end_date.isoformat()
         return access
 
     @property

From 220b536e6264e5b126ef76d1cfc345a06e0e166d Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sat, 14 Feb 2026 10:02:58 -0500
Subject: [PATCH 20/39] Revert "bf(test): test_nwb2asset_remote_asset which
 might be stalling here"

This reverts commit c88d5c374f83ca12a1299acce9c7338fdcdd4158.

Should not be needed with 0.74.3 after

- https://github.com/dandi/dandi-cli/pull/1795

but who knows?!
---
 .github/workflows/cli-integration.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cli-integration.yml b/.github/workflows/cli-integration.yml
index c9136b225..89bbc4a8c 100644
--- a/.github/workflows/cli-integration.yml
+++ b/.github/workflows/cli-integration.yml
@@ -68,7 +68,7 @@ jobs:
         if: matrix.dandi-version == 'release'
         run: >
           uvx --with dandi[test]
-          pytest --pyargs -v -s --dandi-api -k "not test_nwb2asset_remote_asset" dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 
@@ -76,7 +76,7 @@ jobs:
         if: matrix.dandi-version == 'master'
         run: >
           uvx --with "dandi[test] @ git+https://github.com/dandi/dandi-cli"
-          pytest --pyargs -v -s --dandi-api -k "not test_nwb2asset_remote_asset" dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 

From 042b969f0324bd1744c68b6ad16dd172a80cb30f Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 16 Feb 2026 11:25:53 -0500
Subject: [PATCH 21/39] bf: fix GarbageCollectionEvent.__str__ referencing
 nonexistent field

`__str__` referenced `self.created` which does not exist on the model;
the actual field is `self.timestamp` (DateTimeField with auto_now_add).
This causes an AttributeError whenever the string representation is
requested (e.g. in Django admin or logging).

Added tests for both GarbageCollectionEvent and
GarbageCollectionEventRecord __str__ methods.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 dandiapi/api/models/garbage_collection.py     |  2 +-
 dandiapi/api/tests/test_garbage_collection.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dandiapi/api/models/garbage_collection.py b/dandiapi/api/models/garbage_collection.py
index 2583ddc2d..945a778f2 100644
--- a/dandiapi/api/models/garbage_collection.py
+++ b/dandiapi/api/models/garbage_collection.py
@@ -10,7 +10,7 @@ class GarbageCollectionEvent(models.Model):
     )
 
     def __str__(self) -> str:
-        return f'{self.type} ({self.created})'
+        return f'{self.type} ({self.timestamp})'
 
 
 class GarbageCollectionEventRecord(models.Model):
diff --git a/dandiapi/api/tests/test_garbage_collection.py b/dandiapi/api/tests/test_garbage_collection.py
index b143bfe1c..817dc3d3c 100644
--- a/dandiapi/api/tests/test_garbage_collection.py
+++ b/dandiapi/api/tests/test_garbage_collection.py
@@ -13,6 +13,25 @@
 from dandiapi.api.services import garbage_collection
 
 
+@pytest.mark.django_db
+@pytest.mark.ai_generated
+def test_garbage_collection_event_str():
+    """Test that GarbageCollectionEvent.__str__ uses the timestamp field."""
+    event = GarbageCollectionEvent.objects.create(type='AssetBlob')
+    result = str(event)
+    assert 'AssetBlob' in result
+    assert str(event.timestamp.year) in result
+
+
+@pytest.mark.django_db
+@pytest.mark.ai_generated
+def test_garbage_collection_event_record_str():
+    """Test that GarbageCollectionEventRecord.__str__ includes event type."""
+    event = GarbageCollectionEvent.objects.create(type='Upload')
+    record = GarbageCollectionEventRecord.objects.create(event=event, record={'id': 1})
+    assert str(record) == 'Upload record'
+
+
 @pytest.mark.django_db
 def test_garbage_collect_uploads(upload_factory):
     # Create an expired upload by setting its created date to the past.

From 0d26df3bc0ed679eaff18ac2cdab8b270da74ca5 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 16 Feb 2026 11:21:30 -0500
Subject: [PATCH 22/39] doc: fix incorrect manage.py path in e2e README

After `cd e2e`, the command `./manage.py loaddata playwright` would fail
because manage.py lives in the repo root, not in e2e/. Changed to
`../manage.py` and added a clarifying comment.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 e2e/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/README.md b/e2e/README.md
index 87588408c..169e0fb23 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -29,8 +29,8 @@ Prior to executing the tests, you will need to login at `localhost:8085` to prov
 ```bash
 cd e2e
 
-# Install testdata
-./manage.py loaddata playwright
+# Install testdata (manage.py is in the repo root)
+../manage.py loaddata playwright
 
 # Run all tests
 npx playwright test

From ccbd66fd39ab3590cbd84d7dee0a90c0e31c88da Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 16 Feb 2026 11:21:36 -0500
Subject: [PATCH 23/39] doc: use consistent ./manage.py invocation in
 DEVELOPMENT.md

The create_dev_dandiset example used `python manage.py` while every
other command in the document uses `./manage.py`. Standardize on the
latter for consistency.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 DEVELOPMENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 65349f538..eced9615e 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -147,7 +147,7 @@ For frequent deployment administration tasks, `django-extensions` provides a con
 ### create_dev_dandiset
 
 ```
-python manage.py create_dev_dandiset --owner $(git config user.email) --name My Dummy Dandiset
+./manage.py create_dev_dandiset --owner $(git config user.email) --name My Dummy Dandiset
 ```
 
 This creates a dummy dandiset with valid metadata and a single dummy asset.

From 8ce0267ed51ec4adf4dfce031d8ea1e84afda442 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 16 Feb 2026 12:49:45 -0500
Subject: [PATCH 24/39] Remove superfluous tests

---
 dandiapi/api/tests/test_garbage_collection.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/dandiapi/api/tests/test_garbage_collection.py b/dandiapi/api/tests/test_garbage_collection.py
index 817dc3d3c..b143bfe1c 100644
--- a/dandiapi/api/tests/test_garbage_collection.py
+++ b/dandiapi/api/tests/test_garbage_collection.py
@@ -13,25 +13,6 @@
 from dandiapi.api.services import garbage_collection
 
 
-@pytest.mark.django_db
-@pytest.mark.ai_generated
-def test_garbage_collection_event_str():
-    """Test that GarbageCollectionEvent.__str__ uses the timestamp field."""
-    event = GarbageCollectionEvent.objects.create(type='AssetBlob')
-    result = str(event)
-    assert 'AssetBlob' in result
-    assert str(event.timestamp.year) in result
-
-
-@pytest.mark.django_db
-@pytest.mark.ai_generated
-def test_garbage_collection_event_record_str():
-    """Test that GarbageCollectionEventRecord.__str__ includes event type."""
-    event = GarbageCollectionEvent.objects.create(type='Upload')
-    record = GarbageCollectionEventRecord.objects.create(event=event, record={'id': 1})
-    assert str(record) == 'Upload record'
-
-
 @pytest.mark.django_db
 def test_garbage_collect_uploads(upload_factory):
     # Create an expired upload by setting its created date to the past.

From 269d0333b49b1e5163bd9b789639508e8022c08e Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 16 Feb 2026 17:28:33 -0500
Subject: [PATCH 25/39] Add tests for asset access metadata

---
 dandiapi/api/tests/test_asset.py              |  38 ----
 .../api/tests/test_asset_access_metadata.py   | 201 ++++++++++++++++++
 2 files changed, 201 insertions(+), 38 deletions(-)
 create mode 100644 dandiapi/api/tests/test_asset_access_metadata.py

diff --git a/dandiapi/api/tests/test_asset.py b/dandiapi/api/tests/test_asset.py
index ac0428888..b69384b8d 100644
--- a/dandiapi/api/tests/test_asset.py
+++ b/dandiapi/api/tests/test_asset.py
@@ -235,44 +235,6 @@ def test_asset_full_metadata_zarr(draft_asset_factory):
     }
 
 
-@pytest.mark.django_db
-def test_asset_full_metadata_access(
-    draft_asset_factory, asset_blob_factory, zarr_archive_factory, embargoed_zarr_archive_factory
-):
-    raw_metadata = {
-        'foo': 'bar',
-        'schemaVersion': DANDI_SCHEMA_VERSION,
-    }
-    embargoed_zarr_asset: Asset = draft_asset_factory(
-        metadata=raw_metadata, blob=None, zarr=embargoed_zarr_archive_factory()
-    )
-    open_zarr_asset: Asset = draft_asset_factory(
-        metadata=raw_metadata, blob=None, zarr=zarr_archive_factory()
-    )
-
-    embargoed_blob_asset: Asset = draft_asset_factory(
-        metadata=raw_metadata, blob=asset_blob_factory(embargoed=True), zarr=None
-    )
-    open_blob_asset: Asset = draft_asset_factory(
-        metadata=raw_metadata, blob=asset_blob_factory(embargoed=False), zarr=None
-    )
-
-    # Test that access is correctly inferred from embargo status
-    assert embargoed_zarr_asset.full_metadata['access'] == [
-        {'schemaKey': 'AccessRequirements', 'status': AccessType.EmbargoedAccess.value}
-    ]
-    assert embargoed_blob_asset.full_metadata['access'] == [
-        {'schemaKey': 'AccessRequirements', 'status': AccessType.EmbargoedAccess.value}
-    ]
-
-    assert open_zarr_asset.full_metadata['access'] == [
-        {'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}
-    ]
-    assert open_blob_asset.full_metadata['access'] == [
-        {'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}
-    ]
-
-
 # API Tests
 
 
diff --git a/dandiapi/api/tests/test_asset_access_metadata.py b/dandiapi/api/tests/test_asset_access_metadata.py
new file mode 100644
index 000000000..c4402c359
--- /dev/null
+++ b/dandiapi/api/tests/test_asset_access_metadata.py
@@ -0,0 +1,201 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from dandischema.consts import DANDI_SCHEMA_VERSION
+from dandischema.models import AccessType
+import pytest
+
+from dandiapi.api.models.asset import EmbargoedAssetWithinOpenDandisetError
+from dandiapi.api.models.dandiset import Dandiset
+from dandiapi.api.tests.factories import (
+    DraftVersionFactory,
+)
+
+if TYPE_CHECKING:
+    from dandiapi.api.models import Asset
+
+
+@pytest.mark.django_db
+def test_asset_full_metadata_access(
+    draft_asset_factory, asset_blob_factory, zarr_archive_factory, embargoed_zarr_archive_factory
+):
+    raw_metadata = {
+        'foo': 'bar',
+        'schemaVersion': DANDI_SCHEMA_VERSION,
+    }
+    embargoed_zarr_asset: Asset = draft_asset_factory(
+        metadata=raw_metadata, blob=None, zarr=embargoed_zarr_archive_factory()
+    )
+    open_zarr_asset: Asset = draft_asset_factory(
+        metadata=raw_metadata, blob=None, zarr=zarr_archive_factory()
+    )
+
+    embargoed_blob_asset: Asset = draft_asset_factory(
+        metadata=raw_metadata, blob=asset_blob_factory(embargoed=True), zarr=None
+    )
+    open_blob_asset: Asset = draft_asset_factory(
+        metadata=raw_metadata, blob=asset_blob_factory(embargoed=False), zarr=None
+    )
+
+    # Test that access is correctly inferred from embargo status
+    assert embargoed_zarr_asset.full_metadata['access'] == [
+        {'schemaKey': 'AccessRequirements', 'status': AccessType.EmbargoedAccess.value}
+    ]
+    assert embargoed_blob_asset.full_metadata['access'] == [
+        {'schemaKey': 'AccessRequirements', 'status': AccessType.EmbargoedAccess.value}
+    ]
+
+    assert open_zarr_asset.full_metadata['access'] == [
+        {'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}
+    ]
+    assert open_blob_asset.full_metadata['access'] == [
+        {'schemaKey': 'AccessRequirements', 'status': AccessType.OpenAccess.value}
+    ]
+
+
+@pytest.mark.django_db
+def test_access_metadata_open_blob_asset(asset_blob_factory, draft_asset_factory):
+    """Open blob asset returns no embargoedUntil."""
+    asset = draft_asset_factory(blob=asset_blob_factory(embargoed=False))
+    assert asset.access_metadata() == {
+        'schemaKey': 'AccessRequirements',
+        'status': AccessType.OpenAccess.value,
+    }
+
+
+@pytest.mark.django_db
+def test_access_metadata_open_zarr_asset(zarr_archive_factory, draft_asset_factory):
+    """Open zarr asset returns no embargoedUntil."""
+    zarr = zarr_archive_factory(dandiset__embargo_status=Dandiset.EmbargoStatus.OPEN)
+    asset = draft_asset_factory(zarr=zarr, blob=None)
+    assert asset.access_metadata() == {
+        'schemaKey': 'AccessRequirements',
+        'status': AccessType.OpenAccess.value,
+    }
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_zarr_with_embargoed_until(
+    embargoed_zarr_archive_factory, draft_asset_factory
+):
+    """Embargoed zarr asset returns embargoedUntil from draft version."""
+    zarr = embargoed_zarr_archive_factory()
+    draft_version = zarr.dandiset.draft_version
+    draft_version.metadata['access'][0]['embargoedUntil'] = '2026-06-15'
+    draft_version.save()
+
+    asset = draft_asset_factory(zarr=zarr, blob=None)
+    draft_version.assets.add(asset)
+
+    assert asset.access_metadata() == {
+        'schemaKey': 'AccessRequirements',
+        'status': AccessType.EmbargoedAccess.value,
+        'embargoedUntil': '2026-06-15',
+    }
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_zarr_without_embargoed_until(
+    embargoed_zarr_archive_factory, draft_asset_factory
+):
+    """Embargoed zarr asset without embargoedUntil on version has no embargoedUntil in access."""
+    zarr = embargoed_zarr_archive_factory()
+    asset = draft_asset_factory(zarr=zarr, blob=None)
+    zarr.dandiset.draft_version.assets.add(asset)
+
+    assert 'embargoedUntil' not in asset.access_metadata()
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_blob_with_embargoed_until(
+    embargoed_asset_blob, draft_asset_factory
+):
+    """Embargoed blob asset returns embargoedUntil from version."""
+    draft_version = DraftVersionFactory.create(
+        dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED
+    )
+    draft_version.metadata['access'][0]['embargoedUntil'] = '2026-06-15'
+    draft_version.save()
+
+    asset = draft_asset_factory(blob=embargoed_asset_blob)
+    draft_version.assets.add(asset)
+
+    assert asset.access_metadata() == {
+        'schemaKey': 'AccessRequirements',
+        'status': AccessType.EmbargoedAccess.value,
+        'embargoedUntil': '2026-06-15',
+    }
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_blob_shared_across_embargoed_dandisets(
+    embargoed_asset_blob, draft_asset_factory
+):
+    """Blob shared by multiple embargoed dandisets returns minimum embargo end date."""
+    version_a = DraftVersionFactory.create(
+        dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED
+    )
+    version_a.metadata['access'][0]['embargoedUntil'] = '2026-08-01'
+    version_a.save()
+    asset_a = draft_asset_factory(blob=embargoed_asset_blob)
+    version_a.assets.add(asset_a)
+
+    version_b = DraftVersionFactory.create(
+        dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED
+    )
+    version_b.metadata['access'][0]['embargoedUntil'] = '2018-10-25'
+    version_b.save()
+    asset_b = draft_asset_factory(blob=embargoed_asset_blob)
+    version_b.assets.add(asset_b)
+
+    # Both assets should report the minimum embargo end date
+    assert asset_a.access_metadata()['embargoedUntil'] == '2018-10-25'
+    assert asset_b.access_metadata()['embargoedUntil'] == '2018-10-25'
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_blob_in_open_dandiset_raises(
+    embargoed_asset_blob, draft_asset_factory
+):
+    """Embargoed blob in an open dandiset raises EmbargoedAssetWithinOpenDandisetError."""
+    draft_version = DraftVersionFactory.create(dandiset__embargo_status=Dandiset.EmbargoStatus.OPEN)
+    asset = draft_asset_factory(blob=embargoed_asset_blob, zarr=None)
+    draft_version.assets.add(asset)
+
+    with pytest.raises(EmbargoedAssetWithinOpenDandisetError):
+        asset.access_metadata()
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_blob_no_embargoed_until(
+    embargoed_asset_blob, draft_asset_factory
+):
+    """Embargoed blob with no embargoedUntil on any version has no embargoedUntil in access."""
+    assets = []
+    for _ in range(5):
+        draft_version = DraftVersionFactory.create(
+            dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED
+        )
+        asset = draft_asset_factory(blob=embargoed_asset_blob)
+        draft_version.assets.add(asset)
+        assets.append(asset)
+
+    for asset in assets:
+        assert 'embargoedUntil' not in asset.access_metadata()
+
+
+@pytest.mark.django_db
+def test_access_metadata_embargoed_zarr_not_in_draft_version(
+    embargoed_zarr_archive_factory, draft_asset_factory
+):
+    """Embargoed zarr asset not in any draft version has no embargoedUntil."""
+    zarr = embargoed_zarr_archive_factory()
+    asset = draft_asset_factory(blob=None, zarr=zarr)
+    # Do not add asset to any version; asset.versions.filter(version='draft').first() is None
+    access = asset.access_metadata()
+    assert access == {
+        'schemaKey': 'AccessRequirements',
+        'status': AccessType.EmbargoedAccess.value,
+    }
+    assert 'embargoedUntil' not in access

From d89b91dc0b3dc51e09fa0f44662be088171cd6d5 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 17 Feb 2026 11:31:49 -0500
Subject: [PATCH 26/39] Use zarr dandiset draft version directly

---
 dandiapi/api/models/asset.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/dandiapi/api/models/asset.py b/dandiapi/api/models/asset.py
index ab5a0e5f6..ec4109d8b 100644
--- a/dandiapi/api/models/asset.py
+++ b/dandiapi/api/models/asset.py
@@ -260,18 +260,12 @@ def access_metadata(self):
         # For zarr assets, is_embargoed is based on the dandiset directly, and a zarr can
         # only be associated with one dandiset, so we know this dandiset is embargoed
         if self.zarr is not None:
-            draft_version = self.versions.filter(version='draft').first()
-
-            # Only bother with embargoedUntil if this asset is associated with an embargoed dandiset
-            # draft version. Otherwise, we wouldn't have a date to put here, and it won't be checked
-            # anyway.
-            if draft_version is not None:
-                # EmbargoedUntil isn't guaranteed to be set
-                embargo_end_date: str | None = draft_version.metadata['access'][0].get(
-                    'embargoedUntil'
-                )
-                if embargo_end_date is not None:
-                    access['embargoedUntil'] = embargo_end_date
+            draft_version = self.zarr.dandiset.draft_version
+
+            # EmbargoedUntil isn't guaranteed to be set
+            embargo_end_date: str | None = draft_version.metadata['access'][0].get('embargoedUntil')
+            if embargo_end_date is not None:
+                access['embargoedUntil'] = embargo_end_date
 
             return access
 

From 25e55d7553d793c8680aef2ce4f1234e28b808af Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 17 Feb 2026 11:32:33 -0500
Subject: [PATCH 27/39] Use .save in add_asset_to_version

This is to prevent the object from becoming stale
---
 dandiapi/api/services/asset/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dandiapi/api/services/asset/__init__.py b/dandiapi/api/services/asset/__init__.py
index b50dfa6c1..ddc7d8cc0 100644
--- a/dandiapi/api/services/asset/__init__.py
+++ b/dandiapi/api/services/asset/__init__.py
@@ -178,7 +178,9 @@ def add_asset_to_version(
             and asset_blob.embargoed
             and version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN
         ):
-            AssetBlob.objects.filter(blob_id=asset_blob.blob_id).update(embargoed=False)
+            asset_blob.embargoed = False
+            asset_blob.save()
+
             transaction.on_commit(
                 lambda: remove_asset_blob_embargoed_tag_task.delay(blob_id=asset_blob.blob_id)
             )

From a3993b712e109d364651f710b7cffc202fe00902 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 17 Feb 2026 11:42:50 -0500
Subject: [PATCH 28/39] Fix incorrectly formed test

---
 dandiapi/api/tests/test_asset.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dandiapi/api/tests/test_asset.py b/dandiapi/api/tests/test_asset.py
index b69384b8d..dc74f0e90 100644
--- a/dandiapi/api/tests/test_asset.py
+++ b/dandiapi/api/tests/test_asset.py
@@ -1297,7 +1297,9 @@ def test_asset_rest_update(api_client, asset, asset_blob):
 @pytest.mark.django_db
 def test_asset_rest_update_embargo(api_client, asset, embargoed_asset_blob):
     user = UserFactory.create()
-    draft_version = DraftVersionFactory.create(dandiset__owners=[user])
+    draft_version = DraftVersionFactory.create(
+        dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED, dandiset__owners=[user]
+    )
     api_client.force_authenticate(user=user)
     draft_version.assets.add(asset)
     add_asset_paths(asset=asset, version=draft_version)

From a1ec2c29c68656576ac4e477f81bf4cd5af07b0d Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 17 Feb 2026 12:46:31 -0500
Subject: [PATCH 29/39] Don't return excessively

---
 dandiapi/api/models/asset.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dandiapi/api/models/asset.py b/dandiapi/api/models/asset.py
index ec4109d8b..d8c2c3646 100644
--- a/dandiapi/api/models/asset.py
+++ b/dandiapi/api/models/asset.py
@@ -293,10 +293,9 @@ def access_metadata(self):
             .aggregate(min_embargo_end_date=Min('embargo_end_date'))['min_embargo_end_date']
         )
 
-        if embargo_end_date is None:
-            return access
+        if embargo_end_date is not None:
+            access['embargoedUntil'] = embargo_end_date.isoformat()
 
-        access['embargoedUntil'] = embargo_end_date.isoformat()
         return access
 
     @property

From 3e811841a42eeaea213e15e6a4a2528ac44c1833 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 17 Feb 2026 12:53:04 -0500
Subject: [PATCH 30/39] Remove outdated test

---
 dandiapi/api/tests/test_asset_access_metadata.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/dandiapi/api/tests/test_asset_access_metadata.py b/dandiapi/api/tests/test_asset_access_metadata.py
index c4402c359..cdecd7da9 100644
--- a/dandiapi/api/tests/test_asset_access_metadata.py
+++ b/dandiapi/api/tests/test_asset_access_metadata.py
@@ -183,19 +183,3 @@ def test_access_metadata_embargoed_blob_no_embargoed_until(
 
     for asset in assets:
         assert 'embargoedUntil' not in asset.access_metadata()
-
-
-@pytest.mark.django_db
-def test_access_metadata_embargoed_zarr_not_in_draft_version(
-    embargoed_zarr_archive_factory, draft_asset_factory
-):
-    """Embargoed zarr asset not in any draft version has no embargoedUntil."""
-    zarr = embargoed_zarr_archive_factory()
-    asset = draft_asset_factory(blob=None, zarr=zarr)
-    # Do not add asset to any version; asset.versions.filter(version='draft').first() is None
-    access = asset.access_metadata()
-    assert access == {
-        'schemaKey': 'AccessRequirements',
-        'status': AccessType.EmbargoedAccess.value,
-    }
-    assert 'embargoedUntil' not in access

From 34c0a46223c63d8069f4b8dbbbefe2a6d9be1516 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Tue, 17 Feb 2026 18:12:28 +0000
Subject: [PATCH 31/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c405de6f8..ecce3f902 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# v0.21.5 (Tue Feb 17 2026)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, Heberto Mayorquin ([@h-mayorquin](https://github.com/h-mayorquin)), for all your work!
+
+#### 🐛 Bug Fix
+
+- Fix propagation of embargoed date from dandisets to assets [#2698](https://github.com/dandi/dandi-archive/pull/2698) ([@h-mayorquin](https://github.com/h-mayorquin) [@jjnesbitt](https://github.com/jjnesbitt))
+- bf: fix GarbageCollectionEvent.__str__ referencing nonexistent field [#2710](https://github.com/dandi/dandi-archive/pull/2710) ([@yarikoptic](https://github.com/yarikoptic) [@jjnesbitt](https://github.com/jjnesbitt))
+- Add "How to Cite" Tab to Dandiset Landing Page [#2671](https://github.com/dandi/dandi-archive/pull/2671) ([@bendichter](https://github.com/bendichter) [@jjnesbitt](https://github.com/jjnesbitt))
+
+#### 📝 Documentation
+
+- Fixes of minor inconsistencies in docs claude identified [#2709](https://github.com/dandi/dandi-archive/pull/2709) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### 🧪 Tests
+
+- Revert "bf(test): test_nwb2asset_remote_asset which might be stalling here" [#2708](https://github.com/dandi/dandi-archive/pull/2708) ([@yarikoptic](https://github.com/yarikoptic))
+- ci(tests): pass -s to pytest  and skip hanging test_nwb2asset_remote_asset [#2662](https://github.com/dandi/dandi-archive/pull/2662) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### Authors: 4
+
+- Ben Dichter ([@bendichter](https://github.com/bendichter))
+- Heberto Mayorquin ([@h-mayorquin](https://github.com/h-mayorquin))
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
 # v0.21.4 (Thu Feb 05 2026)
 
 #### 🐛 Bug Fix

From 28c50d39c96b411ab3ebd4049928d37c5325a35f Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Wed, 18 Feb 2026 13:10:38 -0500
Subject: [PATCH 32/39] Move asset blob unembargo to _add_asset_to_version

It was previously in add_asset_to_version (no underscore), resulting in
that behavior being skipped when updating an existing asset.
---
 dandiapi/api/services/asset/__init__.py | 35 ++++++++++--------
 dandiapi/api/tests/test_asset.py        | 49 +++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/dandiapi/api/services/asset/__init__.py b/dandiapi/api/services/asset/__init__.py
index ddc7d8cc0..a597e626d 100644
--- a/dandiapi/api/services/asset/__init__.py
+++ b/dandiapi/api/services/asset/__init__.py
@@ -46,6 +46,9 @@ def _create_asset(
     return asset
 
 
+# NOTE: There is intentionally no transaction.atomic decorator on this function, as it's meant
+# to be called from the high level service functions within this file, which do wrap this in a
+# transaction. In production code, this function should never be called outside of a transaction.
 def _add_asset_to_version(
     *,
     version: Version,
@@ -53,6 +56,22 @@ def _add_asset_to_version(
     zarr_archive: ZarrArchive | None,
     metadata: dict,
 ) -> Asset:
+    # Creating an asset in an OPEN dandiset that points to an
+    # embargoed blob results in that blob being unembargoed.
+    # NOTE: This only applies to asset blobs, as zarrs cannot belong to
+    # multiple dandisets at once.
+    if (
+        asset_blob is not None
+        and asset_blob.embargoed
+        and version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN
+    ):
+        asset_blob.embargoed = False
+        asset_blob.save()
+
+        transaction.on_commit(
+            lambda: remove_asset_blob_embargoed_tag_task.delay(blob_id=asset_blob.blob_id)
+        )
+
     path = metadata['path']
     asset = _create_asset(
         path=path, asset_blob=asset_blob, zarr_archive=zarr_archive, metadata=metadata
@@ -169,22 +188,6 @@ def add_asset_to_version(
         raise ZarrArchiveBelongsToDifferentDandisetError
 
     with transaction.atomic():
-        # Creating an asset in an OPEN dandiset that points to an
-        # embargoed blob results in that blob being unembargoed.
-        # NOTE: This only applies to asset blobs, as zarrs cannot belong to
-        # multiple dandisets at once.
-        if (
-            asset_blob is not None
-            and asset_blob.embargoed
-            and version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN
-        ):
-            asset_blob.embargoed = False
-            asset_blob.save()
-
-            transaction.on_commit(
-                lambda: remove_asset_blob_embargoed_tag_task.delay(blob_id=asset_blob.blob_id)
-            )
-
         asset = _add_asset_to_version(
             version=version,
             asset_blob=asset_blob,
diff --git a/dandiapi/api/tests/test_asset.py b/dandiapi/api/tests/test_asset.py
index dc74f0e90..a23b7565a 100644
--- a/dandiapi/api/tests/test_asset.py
+++ b/dandiapi/api/tests/test_asset.py
@@ -872,6 +872,7 @@ def test_asset_create_unembargo_in_progress(api_client, embargoed_asset_blob):
 
 @pytest.mark.django_db(transaction=True)
 def test_asset_create_embargoed_asset_blob_open_dandiset(api_client, embargoed_asset_blob, mocker):
+    """Test that creating an asset in an open dandiset unembargoes the asset blob."""
     user = UserFactory.create()
     draft_version = DraftVersionFactory.create(dandiset__owners=[user])
     api_client.force_authenticate(user=user)
@@ -911,6 +912,54 @@ def test_asset_create_embargoed_asset_blob_open_dandiset(api_client, embargoed_a
     assert draft_version.status == Version.Status.PENDING
 
 
+@pytest.mark.django_db(transaction=True)
+def test_asset_update_embargoed_asset_blob_open_dandiset(
+    api_client, draft_asset_factory, asset_blob, embargoed_asset_blob, mocker
+):
+    """Test that updating an asset in an open dandiset unembargoes the asset blob."""
+    # First, create asset pointing to a different blob in an open dandiset
+    user = UserFactory.create()
+    draft_version = DraftVersionFactory.create(dandiset__owners=[user])
+    asset = draft_asset_factory(blob=asset_blob)
+    draft_version.assets.add(asset)
+
+    # Now, update asset to point to an embargoed blob
+    assert draft_version.dandiset.embargo_status == Dandiset.EmbargoStatus.OPEN
+    assert embargoed_asset_blob.embargoed
+
+    # Mock this so we can check that it's been called later
+    mocked_func = mocker.patch('dandiapi.api.services.embargo.remove_asset_blob_embargoed_tag')
+
+    api_client.force_authenticate(user=user)
+    resp = api_client.put(
+        f'/api/dandisets/{draft_version.dandiset.identifier}'
+        f'/versions/{draft_version.version}/assets/{asset.asset_id}/',
+        {
+            'metadata': {
+                'encodingFormat': 'application/x-nwb',
+                'path': 'test/create/asset.txt',
+                'meta': 'data',
+                'foo': ['bar', 'baz'],
+                '1': 2,
+            },
+            'blob_id': embargoed_asset_blob.blob_id,
+        },
+    )
+    assert resp.status_code == 200
+    new_asset = Asset.objects.get(asset_id=resp.json()['asset_id'])
+
+    # Ensure the blob is now OPEN
+    assert new_asset.blob == embargoed_asset_blob
+    assert not new_asset.blob.embargoed
+
+    # We can't test that the tags were correctly removed in a testing env, but we can test that the
+    # function which removes the tags was correctly invoked
+    mocked_func.assert_called_once()
+
+    # Adding an Asset should trigger a revalidation
+    assert draft_version.status == Version.Status.PENDING
+
+
 @pytest.mark.django_db
 def test_asset_create_zarr(api_client):
     user = UserFactory.create()

From 836ea7d863a70fc3532308680c0300590efdccc7 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Wed, 18 Feb 2026 18:57:01 +0000
Subject: [PATCH 33/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecce3f902..e0520684b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v0.21.6 (Wed Feb 18 2026)
+
+#### 🐛 Bug Fix
+
+- Properly unembargo blobs when asset is updated [#2713](https://github.com/dandi/dandi-archive/pull/2713) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 1
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
 # v0.21.5 (Tue Feb 17 2026)
 
 :tada: This release contains work from a new contributor! :tada:

From 10bfe33b0e3f3205fc7976aa129296ba7dc455ef Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 26 Feb 2026 10:44:54 -0500
Subject: [PATCH 34/39] Remove redundant `DANDI_DANDISETS_BUCKET_NAME` setting

This ensures that the bucket name is exclusively
determined by `default_storage.bucket_name`.
---
 .../api/management/commands/cleanup_blobs.py  | 19 ++++++-------------
 dandiapi/api/services/embargo/utils.py        |  3 +--
 dandiapi/settings/base.py                     |  1 -
 dandiapi/settings/development.py              |  1 -
 dandiapi/settings/production.py               |  3 +--
 dandiapi/settings/testing.py                  |  1 -
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dandiapi/api/management/commands/cleanup_blobs.py b/dandiapi/api/management/commands/cleanup_blobs.py
index 4051616f8..c573aa0d9 100644
--- a/dandiapi/api/management/commands/cleanup_blobs.py
+++ b/dandiapi/api/management/commands/cleanup_blobs.py
@@ -1,35 +1,28 @@
 from __future__ import annotations
 
-from django.conf import settings
+from django.core.files.storage import default_storage
 import djclick as click
-from storages.backends.s3 import S3Storage
 
 from dandiapi.api.models.upload import AssetBlob
 
-BUCKET = settings.DANDI_DANDISETS_BUCKET_NAME
-
-
-def s3_client():
-    storage = S3Storage(bucket_name=BUCKET)
-    return storage.connection.meta.client
-
 
 @click.command()
 @click.option('--delete', is_flag=True, default=False)
 def cleanup_blobs(*, delete: bool):
-    client = s3_client()
+    client = default_storage.s3_client
+    bucket_name = default_storage.bucket_name
     # Ignore pagination for now, hopefully there aren't enough objects to matter
-    objs = client.list_object_versions(Bucket=BUCKET, Prefix='dev/')
+    objs = client.list_object_versions(Bucket=bucket_name, Prefix='dev/')
     for version in objs['Versions']:
         if not AssetBlob.objects.filter(etag=version['ETag'][1:-1]).exists():
             click.echo(f'Deleting version {version["Key"]}')
             if delete:
                 client.delete_object(
-                    Bucket=BUCKET, Key=version['Key'], VersionId=version['VersionId']
+                    Bucket=bucket_name, Key=version['Key'], VersionId=version['VersionId']
                 )
     for delete_marker in objs['DeleteMarkers']:
         click.echo(f'Deleting delete marker {delete_marker["Key"]}')
         if delete:
             client.delete_object(
-                Bucket=BUCKET, Key=delete_marker['Key'], VersionId=delete_marker['VersionId']
+                Bucket=bucket_name, Key=delete_marker['Key'], VersionId=delete_marker['VersionId']
             )
diff --git a/dandiapi/api/services/embargo/utils.py b/dandiapi/api/services/embargo/utils.py
index 64c3117d8..dda5c09de 100644
--- a/dandiapi/api/services/embargo/utils.py
+++ b/dandiapi/api/services/embargo/utils.py
@@ -4,7 +4,6 @@
 import logging
 from typing import TYPE_CHECKING
 
-from django.conf import settings
 from django.core.files.storage import default_storage
 from django.db.models import Q
 from more_itertools import chunked
@@ -32,7 +31,7 @@ def _delete_object_tags(blob: str):
 def _delete_zarr_object_tags(zarr: str):
     paginator = ZarrArchive.storage.s3_client.get_paginator('list_objects_v2')
     pages = paginator.paginate(
-        Bucket=settings.DANDI_DANDISETS_BUCKET_NAME, Prefix=zarr_s3_path(zarr_id=zarr)
+        Bucket=default_storage.bucket_name, Prefix=zarr_s3_path(zarr_id=zarr)
     )
 
     # Constant low thread number to limit memory usage, as each thread
diff --git a/dandiapi/settings/base.py b/dandiapi/settings/base.py
index f257a8a78..abef872c9 100644
--- a/dandiapi/settings/base.py
+++ b/dandiapi/settings/base.py
@@ -102,7 +102,6 @@
         'BACKEND': 'whitenoise.storage.CompressedStaticFilesStorage',
     },
 }
-DANDI_DANDISETS_BUCKET_NAME: str
 
 STATIC_ROOT = BASE_DIR / 'staticfiles'
 # Django staticfiles auto-creates any intermediate directories, but do so here to prevent warnings.
diff --git a/dandiapi/settings/development.py b/dandiapi/settings/development.py
index 7fac23a24..977303733 100644
--- a/dandiapi/settings/development.py
+++ b/dandiapi/settings/development.py
@@ -56,7 +56,6 @@
         'media_url': _storage_media_url,
     },
 }
-DANDI_DANDISETS_BUCKET_NAME = STORAGES['default']['OPTIONS']['bucket_name']  # TODO: remove
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
diff --git a/dandiapi/settings/production.py b/dandiapi/settings/production.py
index a45e507a5..fe7e4c694 100644
--- a/dandiapi/settings/production.py
+++ b/dandiapi/settings/production.py
@@ -31,14 +31,13 @@
 # (specifically when DEBUG is True), 'localhost' and '127.0.0.1' will be added.
 ALLOWED_HOSTS: list[str] = env.list('DJANGO_ALLOWED_HOSTS', cast=str)
 
-DANDI_DANDISETS_BUCKET_NAME: str = env.str('DJANGO_STORAGE_BUCKET_NAME')
 STORAGES['default'] = {
     'BACKEND': 'dandiapi.storage.DandiS3Storage',
     'OPTIONS': {
         'region_name': env.str('AWS_DEFAULT_REGION'),
         'access_key': env.str('AWS_ACCESS_KEY_ID'),
         'secret_key': env.str('AWS_SECRET_ACCESS_KEY'),
-        'bucket_name': DANDI_DANDISETS_BUCKET_NAME,
+        'bucket_name': env.str('DJANGO_STORAGE_BUCKET_NAME'),
         'querystring_expire': int(timedelta(hours=6).total_seconds()),
         'max_memory_size': 5 * 1024 * 1024,
     },
diff --git a/dandiapi/settings/testing.py b/dandiapi/settings/testing.py
index f7e399a3f..b4d9000f3 100644
--- a/dandiapi/settings/testing.py
+++ b/dandiapi/settings/testing.py
@@ -18,7 +18,6 @@
         'querystring_expire': int(timedelta(hours=6).total_seconds()),
     },
 }
-DANDI_DANDISETS_BUCKET_NAME = 'test-django-storage'
 
 # Testing will set EMAIL_BACKEND to use the memory backend
 

From 017d48cd196f79550563f9759054d4e9932fac3a Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 26 Feb 2026 10:44:55 -0500
Subject: [PATCH 35/39] Upgrade to Resonant v0.44.0

---
 .copier-answers.resonant.yml                 |  3 ++-
 dandiapi/api/migrations/0001_default_site.py |  6 +++---
 dandiapi/settings/base.py                    |  5 ++++-
 dandiapi/settings/development.py             |  2 +-
 dandiapi/settings/production.py              |  2 --
 dandiapi/settings/testing.py                 |  4 +++-
 gunicorn.conf.py                             |  8 +++++---
 pyproject.toml                               |  4 ++--
 uv.lock                                      | 20 ++++++++++++++------
 9 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/.copier-answers.resonant.yml b/.copier-answers.resonant.yml
index d4d08164a..3e0c64663 100644
--- a/.copier-answers.resonant.yml
+++ b/.copier-answers.resonant.yml
@@ -1,4 +1,4 @@
-_commit: v0.41.0
+_commit: v0.44.0
 _src_path: gh:kitware-resonant/cookiecutter-resonant
 core_app_name: api
 include_example_code: false
@@ -6,3 +6,4 @@ project_name: DANDI Archive
 project_slug: dandiapi
 python_package_name: dandiapi
 site_domain: api.dandiarchive.org
+use_asgi: false
diff --git a/dandiapi/api/migrations/0001_default_site.py b/dandiapi/api/migrations/0001_default_site.py
index f5da225e1..19679e0fb 100644
--- a/dandiapi/api/migrations/0001_default_site.py
+++ b/dandiapi/api/migrations/0001_default_site.py
@@ -10,7 +10,7 @@
     from django.db.migrations.state import StateApps
 
 
-def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
+def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
     Site = apps.get_model('sites', 'Site')
 
     # A default site object may or may not exist.
@@ -27,7 +27,7 @@ def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor
     )
 
 
-def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
+def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
     Site = apps.get_model('sites', 'Site')
 
     # This is the initial value of the default site object, as populated by the sites app.
@@ -42,5 +42,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_default_site, rollback_default_site),
+        migrations.RunPython(update_default_site, rollback_default_site, elidable=False),
     ]
diff --git a/dandiapi/settings/base.py b/dandiapi/settings/base.py
index abef872c9..911dcf451 100644
--- a/dandiapi/settings/base.py
+++ b/dandiapi/settings/base.py
@@ -30,6 +30,8 @@
 
 ROOT_URLCONF = 'dandiapi.urls'
 
+WSGI_APPLICATION = 'dandiapi.wsgi.application'
+
 INSTALLED_APPS = [
     # Install local apps first, to ensure any overridden resources are found first
     'dandiapi.api.apps.ApiConfig',
@@ -79,6 +81,7 @@
     # Add username middleware after authentication to capture username for gunicorn access logs
     'dandiapi.api.middleware.GunicornUsernameMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'django.contrib.sites.middleware.CurrentSiteMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'allauth.account.middleware.AccountMiddleware',
 ]
@@ -90,7 +93,7 @@
     'default': {
         **env.db_url('DJANGO_DATABASE_URL', engine='django.db.backends.postgresql'),
         'CONN_MAX_AGE': timedelta(minutes=10).total_seconds(),
-    }
+    },
 }
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
diff --git a/dandiapi/settings/development.py b/dandiapi/settings/development.py
index 977303733..0d4acd817 100644
--- a/dandiapi/settings/development.py
+++ b/dandiapi/settings/development.py
@@ -12,7 +12,7 @@
     'debug_toolbar',
     'django_browser_reload',
 ]
-# Force WhiteNoice to serve static files, even when using 'manage.py runserver_plus'
+# Force WhiteNoise to serve static files, even when using 'manage.py runserver_plus'
 staticfiles_index = INSTALLED_APPS.index('django.contrib.staticfiles')
 INSTALLED_APPS.insert(staticfiles_index, 'whitenoise.runserver_nostatic')
 
diff --git a/dandiapi/settings/production.py b/dandiapi/settings/production.py
index fe7e4c694..ffb7873e7 100644
--- a/dandiapi/settings/production.py
+++ b/dandiapi/settings/production.py
@@ -15,8 +15,6 @@
 from resonant_settings.production.email import *  # isort: skip
 from resonant_settings.production.https import *  # isort: skip
 
-WSGI_APPLICATION = 'dandiapi.wsgi.application'
-
 SECRET_KEY: str = env.str('DJANGO_SECRET_KEY')
 
 INSTALLED_APPS += [
diff --git a/dandiapi/settings/testing.py b/dandiapi/settings/testing.py
index b4d9000f3..32f8f6bc5 100644
--- a/dandiapi/settings/testing.py
+++ b/dandiapi/settings/testing.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from secrets import randbelow
+
 from .base import *
 
 SECRET_KEY = 'insecure-secret'  # noqa: S105
@@ -14,7 +16,7 @@
         'endpoint_url': f'{_minio_url.scheme}://{_minio_url.hostname}:{_minio_url.port}',
         'access_key': _minio_url.username,
         'secret_key': _minio_url.password,
-        'bucket_name': 'test-django-storage',
+        'bucket_name': f'test-django-storage-{randbelow(1_000_000):06d}',
         'querystring_expire': int(timedelta(hours=6).total_seconds()),
     },
 }
diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index f74848b77..e8bd77b87 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -6,9 +6,11 @@
 
 bind = f'0.0.0.0:{os.environ.get("PORT", "8000")}'
 
-# Explicitly set the timeout to 5 seconds less than the Heroku request timeout so
-# that gunicorn can gracefully shut down the worker if a request times out.
-timeout = 25
+# Set `graceful_timeout` to shorter than the 30 second limit imposed by Heroku restarts
+graceful_timeout = 25
+
+# Set `timeout` to shorter than the 30 second limit imposed by the Heroku router
+timeout = 15
 
 # Add the username to the access log (set by Django middleware)
 access_log_format = AccessLogFormat.default + ' <username:%({x-request-username}o)s>'
diff --git a/pyproject.toml b/pyproject.toml
index bff794d16..fa9b1c6e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   "django-guardian",
   "django-oauth-toolkit",
   "django-resonant-settings[allauth,celery]",
-  "django-resonant-utils",
+  "django-resonant-utils[allauth,s3_storage]",
   "django-stubs-ext",
   # TODO: pin djangorestframework until we figure out what the cause of
   # https://github.com/dandi/dandi-archive/issues/1896 is.
@@ -45,8 +45,8 @@ dependencies = [
   # Production-only
   "django-s3-file-field[s3]",
   "django-storages[s3]",
-  "gunicorn",
   "sentry-sdk[celery,django,pure_eval]",
+  "gunicorn",
   # Development-only, but required
   "tqdm",
 ]
diff --git a/uv.lock b/uv.lock
index 773b6462d..fdbe3bb79 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.13"
 resolution-markers = [
     "python_full_version >= '3.14' and platform_machine != 'arm64' and sys_platform == 'darwin'",
@@ -697,7 +697,7 @@ dependencies = [
     { name = "django-guardian" },
     { name = "django-oauth-toolkit" },
     { name = "django-resonant-settings", extra = ["allauth", "celery"] },
-    { name = "django-resonant-utils" },
+    { name = "django-resonant-utils", extra = ["allauth", "s3-storage"] },
     { name = "django-s3-file-field", extra = ["s3"] },
     { name = "django-storages", extra = ["s3"] },
     { name = "django-stubs-ext" },
@@ -781,7 +781,7 @@ requires-dist = [
     { name = "django-guardian" },
     { name = "django-oauth-toolkit" },
     { name = "django-resonant-settings", extras = ["allauth", "celery"] },
-    { name = "django-resonant-utils" },
+    { name = "django-resonant-utils", extras = ["allauth", "s3-storage"] },
     { name = "django-s3-file-field", extras = ["s3"] },
     { name = "django-storages", extras = ["s3"] },
     { name = "django-stubs-ext" },
@@ -1026,14 +1026,14 @@ wheels = [
 
 [[package]]
 name = "django-resonant-settings"
-version = "0.41.0"
+version = "0.44.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "django-environ" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ee/19/4fa035cec41b5c7ceb1348f5aec7692ec6a71b0a1d79cec7746aa2e1926a/django_resonant_settings-0.41.0.tar.gz", hash = "sha256:1324c12d33329a36a198c500695434db57206ac75ee63fa8da35d390831bc8de", size = 17654, upload-time = "2025-10-16T20:11:42.172Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/eb/0a/56cdf3b7e1bce9f110b3182abe8a3e4d8a8413b57a0bd6f3da87bb6d116e/django_resonant_settings-0.44.0.tar.gz", hash = "sha256:8a7f90b7b0f2cbd7373eaff2209c4c67a0efe8dbb328285034be9e29a957a102", size = 18244, upload-time = "2025-12-17T05:25:10.655Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/38/d3/ac3e2ffd10139f3f209acafc1f8dd7b9d177c1b7b26b71cdd60e2f36020e/django_resonant_settings-0.41.0-py3-none-any.whl", hash = "sha256:10be63da455eaaa67a34b057dabe9f15b380917c945cb8c33f929ad1afde2b47", size = 24123, upload-time = "2025-10-16T20:11:41.112Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/15/1fdc2342aa7b06917e9faab5edd90a1ab9dc346d83fe890ce4153201ba07/django_resonant_settings-0.44.0-py3-none-any.whl", hash = "sha256:74b75d93d843821c8813972aa85cfd5ef732c99c0c93ba2cccee619b0e346937", size = 24956, upload-time = "2025-12-17T05:25:11.621Z" },
 ]
 
 [package.optional-dependencies]
@@ -1056,6 +1056,14 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b9/49/394af41df5f9c73cd3703374364be8ce8581c0b0390761498958410dc648/django_resonant_utils-0.16.0-py3-none-any.whl", hash = "sha256:3f7b8b7e284269cac704122ef823be415eaf777d601d51a46369250294c276c4", size = 14201, upload-time = "2025-07-10T19:31:34.29Z" },
 ]
 
+[package.optional-dependencies]
+allauth = [
+    { name = "django-allauth" },
+]
+s3-storage = [
+    { name = "django-storages", extra = ["s3"] },
+]
+
 [[package]]
 name = "django-s3-file-field"
 version = "1.1.0"

From afb02f3f442e51750037c6abe95dacf4de7cb15d Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Thu, 26 Feb 2026 10:44:58 -0500
Subject: [PATCH 36/39] Upgrade to Resonant v0.47

---
 .copier-answers.resonant.yml                  |   2 +-
 .editorconfig                                 |  21 ++-
 dandiapi/api/management/__init__.py           |   0
 dandiapi/api/management/commands/__init__.py  |   0
 .../management/commands/createsuperuser.py    |   3 +-
 dandiapi/settings/base.py                     |   1 +
 dandiapi/settings/development.py              |   8 +-
 dandiapi/settings/heroku_production.py        |   2 +-
 dandiapi/settings/production.py               |  12 +-
 dandiapi/settings/testing.py                  |   2 +-
 dandiapi/zarr/management/__init__.py          |   0
 dandiapi/zarr/management/commands/__init__.py |   0
 pyproject.toml                                | 128 ++++++++++--------
 tox.ini                                       |   2 +-
 uv.lock                                       |  21 +--
 15 files changed, 111 insertions(+), 91 deletions(-)
 create mode 100644 dandiapi/api/management/__init__.py
 create mode 100644 dandiapi/api/management/commands/__init__.py
 create mode 100644 dandiapi/zarr/management/__init__.py
 create mode 100644 dandiapi/zarr/management/commands/__init__.py

diff --git a/.copier-answers.resonant.yml b/.copier-answers.resonant.yml
index 3e0c64663..e12dbcc2a 100644
--- a/.copier-answers.resonant.yml
+++ b/.copier-answers.resonant.yml
@@ -1,4 +1,4 @@
-_commit: v0.44.0
+_commit: v0.47.1
 _src_path: gh:kitware-resonant/cookiecutter-resonant
 core_app_name: api
 include_example_code: false
diff --git a/.editorconfig b/.editorconfig
index a0cb1cc0e..b6494e09d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,21 +7,28 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-[*.py]
-indent_size = 4
-max_line_length = 100
+[*.{css,pcss}]
+indent_size = 2
 
 [*.html]
 indent_size = 2
 
-[*.css]
+[*.ini]
+indent_size = 4
+
+[*.{js,ts,vue}]
 indent_size = 2
+max_line_length = 100
 
-[{*.yml,*.yaml}]
+[*.{json,jsonc,json5}]
 indent_size = 2
 
-[*.ini]
+[*.py]
 indent_size = 4
+max_line_length = 100
+
+[*.toml]
+indent_size = 2
 
-[*.sh]
+[*.{yml,yaml}]
 indent_size = 2
diff --git a/dandiapi/api/management/__init__.py b/dandiapi/api/management/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/dandiapi/api/management/commands/__init__.py b/dandiapi/api/management/commands/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/dandiapi/api/management/commands/createsuperuser.py b/dandiapi/api/management/commands/createsuperuser.py
index 2bf5d644b..31320013c 100644
--- a/dandiapi/api/management/commands/createsuperuser.py
+++ b/dandiapi/api/management/commands/createsuperuser.py
@@ -3,10 +3,11 @@
 from typing import TYPE_CHECKING
 
 from django.db.models.signals import post_init, post_save
-from resonant_settings.allauth_support.management.commands import createsuperuser
 
 from dandiapi.api.models.user import UserMetadata
 
+from resonant_settings.allauth_support.management.commands import createsuperuser
+
 if TYPE_CHECKING:
     from resonant_settings.allauth_support.createsuperuser import EmailAsUsernameProxyUser
 
diff --git a/dandiapi/settings/base.py b/dandiapi/settings/base.py
index 911dcf451..8edcd33b1 100644
--- a/dandiapi/settings/base.py
+++ b/dandiapi/settings/base.py
@@ -10,6 +10,7 @@
 from corsheaders.defaults import default_headers
 import django_stubs_ext
 from environ import Env
+
 from resonant_settings.allauth import *
 from resonant_settings.celery import *
 from resonant_settings.django import *
diff --git a/dandiapi/settings/development.py b/dandiapi/settings/development.py
index 0d4acd817..9b5ecff75 100644
--- a/dandiapi/settings/development.py
+++ b/dandiapi/settings/development.py
@@ -5,14 +5,14 @@
 from .base import *
 
 # Import these afterwards, to override
-from resonant_settings.development.celery import *  # isort: skip
-from resonant_settings.development.debug_toolbar import *  # isort: skip
+from resonant_settings.development.celery import *
+from resonant_settings.development.debug_toolbar import *
 
 INSTALLED_APPS += [
     'debug_toolbar',
     'django_browser_reload',
 ]
-# Force WhiteNoise to serve static files, even when using 'manage.py runserver_plus'
+# Force WhiteNoise to serve static files, even when using "manage.py runserver_plus"
 staticfiles_index = INSTALLED_APPS.index('django.contrib.staticfiles')
 INSTALLED_APPS.insert(staticfiles_index, 'whitenoise.runserver_nostatic')
 
@@ -33,7 +33,7 @@
 # to add new settings as individual feature flags.
 DEBUG = True
 
-SECRET_KEY = 'insecure-secret'  # noqa: S105
+SECRET_KEY = 'insecure-secret'
 
 # This is typically only overridden when running from Docker.
 INTERNAL_IPS = InternalIPS(env.list('DJANGO_INTERNAL_IPS', cast=str, default=['127.0.0.1']))
diff --git a/dandiapi/settings/heroku_production.py b/dandiapi/settings/heroku_production.py
index 06b55f86e..ed85a97e3 100644
--- a/dandiapi/settings/heroku_production.py
+++ b/dandiapi/settings/heroku_production.py
@@ -8,7 +8,7 @@
 # Provided by https://github.com/ianpurvis/heroku-buildpack-version
 os.environ['DJANGO_SENTRY_RELEASE'] = os.environ['SOURCE_VERSION']
 
-from .production import *  # isort: skip
+from .production import *
 
 # This needs to be set by the HTTPS terminating reverse proxy.
 # Heroku and Render automatically set this.
diff --git a/dandiapi/settings/production.py b/dandiapi/settings/production.py
index ffb7873e7..1be6bf7a0 100644
--- a/dandiapi/settings/production.py
+++ b/dandiapi/settings/production.py
@@ -12,8 +12,8 @@
 from .base import *
 
 # Import these afterwards, to override
-from resonant_settings.production.email import *  # isort: skip
-from resonant_settings.production.https import *  # isort: skip
+from resonant_settings.production.email import *
+from resonant_settings.production.https import *
 
 SECRET_KEY: str = env.str('DJANGO_SECRET_KEY')
 
@@ -25,8 +25,8 @@
 # Only allow GitHub auth on production, no username/password
 SOCIALACCOUNT_ONLY = True
 
-# This only needs to be defined in production. Testing will add 'testserver'. In development
-# (specifically when DEBUG is True), 'localhost' and '127.0.0.1' will be added.
+# This only needs to be defined in production. Testing will add "testserver". In development
+# (specifically when DEBUG is True), "localhost" and "127.0.0.1" will be added.
 ALLOWED_HOSTS: list[str] = env.list('DJANGO_ALLOWED_HOSTS', cast=str)
 
 STORAGES['default'] = {
@@ -50,8 +50,8 @@
 DANDI_DEV_EMAIL: str = env.str('DJANGO_DANDI_DEV_EMAIL')
 DANDI_ADMIN_EMAIL: str = env.str('DJANGO_DANDI_ADMIN_EMAIL')
 
-# sentry_sdk is able to directly use environment variables like 'SENTRY_DSN', but prefix them
-# with 'DJANGO_' to avoid conflicts with other Sentry-using services.
+# sentry_sdk is able to directly use environment variables like "SENTRY_DSN", but prefix them
+# with "DJANGO_" to avoid conflicts with other Sentry-using services.
 sentry_sdk.init(
     dsn=env.str('DJANGO_SENTRY_DSN', default=None),
     environment=env.str('DJANGO_SENTRY_ENVIRONMENT', default=None),
diff --git a/dandiapi/settings/testing.py b/dandiapi/settings/testing.py
index 32f8f6bc5..bc5c91efe 100644
--- a/dandiapi/settings/testing.py
+++ b/dandiapi/settings/testing.py
@@ -4,7 +4,7 @@
 
 from .base import *
 
-SECRET_KEY = 'insecure-secret'  # noqa: S105
+SECRET_KEY = 'insecure-secret'
 
 # Use a fast, insecure hasher to speed up tests
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
diff --git a/dandiapi/zarr/management/__init__.py b/dandiapi/zarr/management/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/dandiapi/zarr/management/commands/__init__.py b/dandiapi/zarr/management/commands/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/pyproject.toml b/pyproject.toml
index fa9b1c6e2..040dffa34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -75,15 +75,12 @@ dev = [
 lint = [
   "ruff",
 ]
-format = [
-  "ruff",
-]
 type = [
   "mypy",
   "boto3-stubs[s3]",
   "celery-types",
   "django-stubs[compatible-mypy]",
-  "djangorestframework-stubs",
+  "djangorestframework-stubs[compatible-mypy]",
 ]
 test = [
   "djangorestframework-yaml",
@@ -104,7 +101,7 @@ test = [
 ]
 
 [tool.hatch.build]
-packages = [
+only-include = [
   "dandiapi",
 ]
 
@@ -123,26 +120,8 @@ only-include = [
 source = "vcs"
 raw-options = {version_scheme = "no-guess-dev"}
 
-[tool.mypy]
-ignore_missing_imports = true
-show_error_codes = true
-disable_error_code = ["attr-defined", "var-annotated"]
-follow_imports = "skip" # Don't follow imports into other files. This should be removed once all type errors have been resolved.
-exclude = [
-    "^dandiapi/api/tests/",
-    "^dandiapi/api/views/",
-    "^dandiapi/zarr/tests/",
-]
-
-# Re-enable these when https://github.com/typeddjango/django-stubs/issues/417 is fixed.
-# plugins = ["mypy_django_plugin.main", "mypy_drf_plugin.main"]
-
-# [tool.django-stubs]
-# django_settings_module = "dandiapi.settings"
-
 [tool.ruff]
 line-length = 100
-target-version = "py313"
 
 [tool.ruff.lint]
 select = ["ALL"]
@@ -151,7 +130,7 @@ ignore = [
   # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
   "COM812", # missing-trailing-comma
   "COM819", # prohibited-trailing-comma
-  "D206", # indent-with-spaces
+  "D206", # docstring-tab-indentation
   "D300", # triple-single-quotes
   "E111", # indentation-with-invalid-multiple
   "E114", # indentation-with-invalid-multiple-comment
@@ -161,54 +140,60 @@ ignore = [
   "Q", # flake8-quotes
   "W191", # tab-indentation
 
-  "A003", # Class attribute is shadowing a Python builtin
+  # Incompatible with Django
+  "A003", # builtin-attribute-shadowing
+  "ARG001", # unused-function-argument
+  "ARG002", # unused-method-argument
+  "RUF012", # mutable-class-default
+
+  # Overly burdensome
   "ANN", # flake8-annotations
-  "ARG001", # Unused function argument
-  "ARG002", # Unused method argument
-  "D1", # Missing docstring
-  "EM101", # Exception must not use a string literal, assign to variable first
-  "EM102", # Exception must not use an f-string literal, assign to variable first
-  "ERA001", # Found commented-out code
+  "D1", # undocumented-*
+  "EM", # flake8-errmsg
+  "ERA001", # commented-out-code
   "FIX", # flake8-fixme
-  "TD002", # Missing author in TODO
-  "TD003", # Missing issue link on the line following this TODO
-  "TRY003", # Avoid specifying long messages outside the exception class
-
-  # Try to fix upstream
-  "RUF012", #  Mutable class attributes should be annotated with `typing.ClassVar`
+  "PLR2004", # magic-value-comparison
+  "RET505", # superfluous-else-return
+  "RET506", # superfluous-else-raise
+  "RET507", # superfluous-else-continue
+  "RET508", # superfluous-else-break
+  "TD002", # missing-todo-author
+  "TD003", # missing-todo-link
+  "TRY003", # raise-vanilla-args
 
-  # Fix in DANDI codebase. PR that will fix this:
-  # https://github.com/dandi/dandi-archive/pull/1782
-  "PTH119", # TODO: re-enable this when it's fixed
-  "PLC0415", # `import` should be at the top-level of a file
+  # Project-specific
+  "PLC0415", # import-outside-top-level
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"scripts/**" = [
-  "INP001", # File is part of an implicit namespace package
+"**/migrations/**" = [
+  "N806", # non-lowercase-variable-in-function
+  "RUF012", # mutable-class-default
 ]
 "**/settings/**" = [
-  "F403", # unable to detect undefined names
-  "F405", # may be undefined, or defined from star imports
-]
-"**/migrations/**" = [
-  "N806", # Variable in function should be lowercase
-  "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
+  "F403", # undefined-local-with-import-star
+  "F405", # undefined-local-with-import-star-usage
 ]
-"**/management/commands/**" = [
-  "INP001", # File is part of an implicit namespace package
+"**/settings/{development,testing}.py" = [
+  "S105", # hardcoded-password-string
 ]
 "**/tests/**" = [
-  "DJ007", # Do not use `__all__`
-  "DJ008", # Model does not define `__str__` method
-  "PLR0913", # Too many arguments to function call
-  "PLR2004", # Magic value used in comparison
+  "DJ007", # django-all-with-model-form
+  "DJ008", # django-model-without-dunder-str
+  "INP001", # implicit-namespace-package
+  "PLR0913", # too-many-arguments
   "S", # flake8-bandit
-  "SLF001", # Private member accessed
+  "SLF001", # private-member-access
+]
+"scripts/**" = [
+  "INP001", # implicit-namespace-package
 ]
 
-[tool.ruff.format]
-quote-style = "single"
+[tool.ruff.lint.flake8-boolean-trap]
+extend-allowed-calls = ["pydantic.Field", "django.db.models.Value"]
+
+[tool.ruff.lint.flake8-bugbear]
+extend-immutable-calls = ["ninja.Query"]
 
 [tool.ruff.lint.flake8-self]
 extend-ignore-names = ["_base_manager", "_default_manager",  "_meta"]
@@ -216,12 +201,35 @@ extend-ignore-names = ["_base_manager", "_default_manager",  "_meta"]
 [tool.ruff.lint.isort]
 # Sort by name, don't cluster "from" vs "import"
 force-sort-within-sections = true
-# Deferred annotations allows TCH rules to move more imports into TYPE_CHECKING blocks
+# Deferred annotations allows TC* rules to move more imports into TYPE_CHECKING blocks
 required-imports = ["from __future__ import annotations"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder", "resonant-settings"]
+sections = {"resonant-settings" = ["resonant_settings"] }
 
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"
 
+[tool.ruff.format]
+quote-style = "single"
+
+[tool.mypy]
+files = [
+  "dandiapi",
+]
+check_untyped_defs = true
+ignore_missing_imports = true
+show_error_codes = true
+warn_redundant_casts = true
+warn_unused_configs = true
+warn_unused_ignores = true
+plugins = [
+  "mypy_django_plugin.main",
+  "mypy_drf_plugin.main",
+]
+
+[tool.django-stubs]
+django_settings_module = "dandiapi.settings.testing"
+
 [tool.pytest.ini_options]
 addopts = [
   # Test utilities should be imported absolutely from the pythonpath,
@@ -237,7 +245,7 @@ addopts = [
 filterwarnings = [
   "error",
   # pytest often causes unclosed socket warnings
-  "ignore:unclosed <socket\\.socket:ResourceWarning",
+  'ignore:unclosed <socket\.socket:ResourceWarning',
   # TODO: Remove this with pytest_factoryboy
   "ignore:Using a <class 'dict'> as model type:UserWarning:pytest_factoryboy.fixture",
 ]
diff --git a/tox.ini b/tox.ini
index 7fda32016..b5d0aba57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands =
 [testenv:format]
 package = skip
 dependency_groups =
-    format
+    lint
 commands =
     ruff check --fix-only
     ruff format
diff --git a/uv.lock b/uv.lock
index fdbe3bb79..f714f652d 100644
--- a/uv.lock
+++ b/uv.lock
@@ -734,9 +734,6 @@ dev = [
     { name = "tox" },
     { name = "tox-uv" },
 ]
-format = [
-    { name = "ruff" },
-]
 lint = [
     { name = "ruff" },
 ]
@@ -758,7 +755,7 @@ type = [
     { name = "boto3-stubs", extra = ["s3"] },
     { name = "celery-types" },
     { name = "django-stubs", extra = ["compatible-mypy"] },
-    { name = "djangorestframework-stubs" },
+    { name = "djangorestframework-stubs", extra = ["compatible-mypy"] },
     { name = "mypy" },
 ]
 
@@ -813,7 +810,6 @@ dev = [
     { name = "tox" },
     { name = "tox-uv" },
 ]
-format = [{ name = "ruff" }]
 lint = [{ name = "ruff" }]
 test = [
     { name = "djangorestframework-yaml" },
@@ -833,7 +829,7 @@ type = [
     { name = "boto3-stubs", extras = ["s3"] },
     { name = "celery-types" },
     { name = "django-stubs", extras = ["compatible-mypy"] },
-    { name = "djangorestframework-stubs" },
+    { name = "djangorestframework-stubs", extras = ["compatible-mypy"] },
     { name = "mypy" },
 ]
 
@@ -1026,14 +1022,15 @@ wheels = [
 
 [[package]]
 name = "django-resonant-settings"
-version = "0.44.0"
+version = "0.47.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
+    { name = "django" },
     { name = "django-environ" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/eb/0a/56cdf3b7e1bce9f110b3182abe8a3e4d8a8413b57a0bd6f3da87bb6d116e/django_resonant_settings-0.44.0.tar.gz", hash = "sha256:8a7f90b7b0f2cbd7373eaff2209c4c67a0efe8dbb328285034be9e29a957a102", size = 18244, upload-time = "2025-12-17T05:25:10.655Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/07/e2/0961283ccaf797307f3671a7ff3965b5a54d816ff86c9091713cdcfde562/django_resonant_settings-0.47.1.tar.gz", hash = "sha256:3d58bed8d0595806a42007ef63f58348523d95699e5811068ca3337483ef5843", size = 19179, upload-time = "2026-02-26T15:46:42.839Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0d/15/1fdc2342aa7b06917e9faab5edd90a1ab9dc346d83fe890ce4153201ba07/django_resonant_settings-0.44.0-py3-none-any.whl", hash = "sha256:74b75d93d843821c8813972aa85cfd5ef732c99c0c93ba2cccee619b0e346937", size = 24956, upload-time = "2025-12-17T05:25:11.621Z" },
+    { url = "https://files.pythonhosted.org/packages/da/7d/a5f08da9e00e626b26beebcb94c5adfa26f78f54c1c9c3b61b8654ae5f02/django_resonant_settings-0.47.1-py3-none-any.whl", hash = "sha256:c96756aeac75248eca14b580228c6c41e2e6186030dbc47723cdb1b959f8a4ef", size = 26093, upload-time = "2026-02-26T15:46:41.69Z" },
 ]
 
 [package.optional-dependencies]
@@ -1162,6 +1159,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ba/45/63fac5c34313986acc005529fdba638822bae973f2b61a0542a6c8494847/djangorestframework_stubs-3.16.4-py3-none-any.whl", hash = "sha256:3b27353fa797876f55da87eceafe4c2f265a93924fa7763d257e509d865df1b2", size = 56503, upload-time = "2025-09-29T20:11:19.317Z" },
 ]
 
+[package.optional-dependencies]
+compatible-mypy = [
+    { name = "django-stubs", extra = ["compatible-mypy"] },
+    { name = "mypy" },
+]
+
 [[package]]
 name = "djangorestframework-yaml"
 version = "2.0.0"

From 143924f852ee5d050afe169cbf9f86f65208384f Mon Sep 17 00:00:00 2001
From: Kabilar Gunalan <kabi@mit.edu>
Date: Thu, 5 Mar 2026 22:54:51 -0600
Subject: [PATCH 37/39] Add scrollbar to Meditor component for overflowing
 content

---
 web/src/components/Meditor/Meditor.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/components/Meditor/Meditor.vue b/web/src/components/Meditor/Meditor.vue
index d6c2f8f7f..d2ea85c70 100644
--- a/web/src/components/Meditor/Meditor.vue
+++ b/web/src/components/Meditor/Meditor.vue
@@ -210,7 +210,8 @@
         >
           <v-card class="pa-2 px-1">
             <v-form
-              class="px-7"
+              class="px-7 overflow-y-auto"
+              style="height: 70vh;"
             >
               <v-jsf-wrapper
                 :prop-key="propKey"

From 6be5a8c67cfd28f01633feedadc01eef5b17f2b8 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Fri, 6 Mar 2026 20:12:50 +0000
Subject: [PATCH 38/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0520684b..6d8d52cd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v0.21.7 (Fri Mar 06 2026)
+
+#### 🐛 Bug Fix
+
+- Add scrollbar to meditor component for overflowing content [#2724](https://github.com/dandi/dandi-archive/pull/2724) ([@kabilar](https://github.com/kabilar))
+- Don't return `null` names or usernames from user search endpoint [#2681](https://github.com/dandi/dandi-archive/pull/2681) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 2
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+
+---
+
 # v0.21.6 (Wed Feb 18 2026)
 
 #### 🐛 Bug Fix

From c07610b18d993296f2cef5b968642ed130da5895 Mon Sep 17 00:00:00 2001
From: dandibot <dandibot@mit.edu>
Date: Fri, 6 Mar 2026 20:26:41 +0000
Subject: [PATCH 39/39] auto shipit - CHANGELOG.md etc

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d8d52cd9..86d4dcd9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v0.21.8 (Fri Mar 06 2026)
+
+#### 🐛 Bug Fix
+
+- Upgrade to Resonant v0.47 [#2692](https://github.com/dandi/dandi-archive/pull/2692) ([@brianhelba](https://github.com/brianhelba))
+
+#### Authors: 1
+
+- Brian Helba ([@brianhelba](https://github.com/brianhelba))
+
+---
+
 # v0.21.7 (Fri Mar 06 2026)
 
 #### 🐛 Bug Fix