From 12a4bb522a64af87ab6d5fb790d6bb9045d3c665 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 24 Apr 2023 17:01:40 -0400
Subject: [PATCH 1/6] Return object for asset validation errors

The object maps asset paths to their corresponding errors
---
 dandiapi/api/models/version.py     | 30 +++++++++++++----------
 dandiapi/api/tests/test_version.py | 38 ++++++++++++------------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/dandiapi/api/models/version.py b/dandiapi/api/models/version.py
index c3ce3e17e..118ebddc3 100644
--- a/dandiapi/api/models/version.py
+++ b/dandiapi/api/models/version.py
@@ -81,7 +81,7 @@ def valid(self) -> bool:
         return not self.assets.exclude(status=Asset.Status.VALID).exists()
 
     @property
-    def asset_validation_errors(self) -> list[str]:
+    def asset_validation_errors(self) -> dict[str, list[dict[str, str]]]:
         # Import here to avoid dependency cycle
         from .asset import Asset
 
@@ -90,20 +90,24 @@ def asset_validation_errors(self) -> list[str]:
             status=Asset.Status.VALID
         ).values('status', 'path', 'validation_errors')
 
-        # Aggregate errors
-        errors = []
+        asset_validating_error = {
+            'field': '',
+            'message': 'asset is currently being validated, please wait.',
+        }
+
+        # Aggregate errors, ensuring the path of the asset is included
+        asset_error_map = {}
         for asset in invalid_assets:
-            if asset['status'] == Asset.Status.INVALID:
-                errors.extend(asset['validation_errors'])
-            else:
-                errors.append(
-                    {
-                        'field': asset['path'],
-                        'message': 'asset is currently being validated, please wait.',
-                    }
-                )
+            # Must be pending or validating
+            if asset['status'] != Asset.Status.INVALID:
+                asset_error_map[asset['path']] = [asset_validating_error]
+                continue
+
+            # Must be invalid, only add entry in map if it has any errors
+            if asset['validation_errors']:
+                asset_error_map[asset['path']] = asset['validation_errors']
 
-        return errors
+        return asset_error_map
 
     @staticmethod
     def datetime_to_version(time: datetime.datetime) -> str:
diff --git a/dandiapi/api/tests/test_version.py b/dandiapi/api/tests/test_version.py
index eb33ce59c..05ebd3cfd 100644
--- a/dandiapi/api/tests/test_version.py
+++ b/dandiapi/api/tests/test_version.py
@@ -414,7 +414,7 @@ def test_version_rest_info(api_client, version):
         'metadata': version.metadata,
         'size': version.size,
         'status': 'Pending',
-        'asset_validation_errors': [],
+        'asset_validation_errors': {},
         'version_validation_errors': [],
         'contact_person': version.metadata['contributor'][0]['name'],
     }
@@ -422,35 +422,27 @@ def test_version_rest_info(api_client, version):
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(
-    'asset_status,expected_validation_error',
-    [
-        (
-            Asset.Status.PENDING,
-            [{'field': '', 'message': 'asset is currently being validated, please wait.'}],
-        ),
-        (
-            Asset.Status.VALIDATING,
-            [{'field': '', 'message': 'asset is currently being validated, please wait.'}],
-        ),
-        (Asset.Status.VALID, []),
-        (Asset.Status.INVALID, []),
-    ],
+    'asset_status',
+    [Asset.Status.PENDING, Asset.Status.VALIDATING, Asset.Status.VALID, Asset.Status.INVALID],
 )
 def test_version_rest_info_with_asset(
-    api_client,
-    draft_version_factory,
-    draft_asset_factory,
-    asset_status: Asset.Status,
-    expected_validation_error: str,
+    api_client, draft_version_factory, draft_asset_factory, asset_status: Asset.Status
 ):
     version = draft_version_factory(status=Version.Status.VALID)
     asset = draft_asset_factory(status=asset_status)
     version.assets.add(asset)
     add_version_asset_paths(version=version)
 
-    # These validation error types should have the asset path prepended to them:
-    if asset_status == Asset.Status.PENDING or asset_status == Asset.Status.VALIDATING:
-        expected_validation_error[0]['field'] = asset.path
+    # Create expected validation errors for pending/validating assets
+    asset_validating_error = {
+        'field': '',
+        'message': 'asset is currently being validated, please wait.',
+    }
+    expected_validation_error = (
+        {asset.path: [asset_validating_error]}
+        if asset_status in [Asset.Status.PENDING, Asset.Status.VALIDATING]
+        else {}
+    )
 
     assert api_client.get(
         f'/api/dandisets/{version.dandiset.identifier}/versions/{version.version}/info/'
@@ -545,7 +537,7 @@ def test_version_rest_update(api_client, user, draft_version):
         'metadata': saved_metadata,
         'size': draft_version.size,
         'status': 'Pending',
-        'asset_validation_errors': [],
+        'asset_validation_errors': {},
         'version_validation_errors': [],
         'contact_person': 'Vargas, Getúlio',
     }

From 3a2337977bf78fe208846f5b4189683f4a9efb2b Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 24 Apr 2023 17:03:46 -0400
Subject: [PATCH 2/6] Move version/asset validation errors into dialog

---
 .../components/DLP/ValidationErrorDialog.vue  | 152 +++++++++++
 web/src/types/index.ts                        |   2 +-
 .../DandisetLandingView/DandisetPublish.vue   | 252 +++++++-----------
 3 files changed, 247 insertions(+), 159 deletions(-)
 create mode 100644 web/src/components/DLP/ValidationErrorDialog.vue

diff --git a/web/src/components/DLP/ValidationErrorDialog.vue b/web/src/components/DLP/ValidationErrorDialog.vue
new file mode 100644
index 000000000..fae705d08
--- /dev/null
+++ b/web/src/components/DLP/ValidationErrorDialog.vue
@@ -0,0 +1,152 @@
+<template>
+  <v-card
+    min-height="90vh"
+    class="pa-2"
+  >
+    <v-tabs v-model="tab">
+      <v-tab
+        v-if="showMetadataTab"
+        key="metadata"
+        href="#metadata"
+      >
+        Metadata
+      </v-tab>
+      <v-tab
+        v-if="showAssetsTab"
+        key="assets"
+        href="#assets"
+      >
+        Assets
+      </v-tab>
+    </v-tabs>
+    <v-tabs-items v-model="tab">
+      <!-- Metadata -->
+      <v-tab-item
+        v-if="showMetadataTab"
+        key="metadata"
+        value="metadata"
+        :transition="false"
+      >
+        <v-btn
+          v-if="owner"
+          class="mt-1"
+          color="primary"
+          @click="$emit('openMeditor')"
+        >
+          Fix issues
+        </v-btn>
+        <v-list
+          class="overflow-y-auto"
+        >
+          <div
+            v-for="(error, index) in versionValidationErrors"
+            :key="index"
+          >
+            <v-list-item>
+              <v-list-item-icon>
+                <v-icon>
+                  {{ getValidationErrorIcon(error.field) }}
+                </v-icon>
+              </v-list-item-icon>
+
+              <v-list-item-content>
+                <template v-if="error.field">
+                  {{ error.field }}:
+                </template>
+                {{ error.message }}
+              </v-list-item-content>
+            </v-list-item>
+            <v-divider />
+          </div>
+        </v-list>
+      </v-tab-item>
+
+      <!-- Assets -->
+      <v-tab-item
+        v-if="showAssetsTab"
+        key="assets"
+        value="assets"
+        :transition="false"
+      >
+        <v-list
+          class="overflow-y-auto"
+        >
+          <v-expansion-panels multiple>
+            <v-expansion-panel
+              v-for="(errors, path) in assetValidationErrors"
+              :key="path"
+            >
+              <v-expansion-panel-header>
+                {{ path }}
+              </v-expansion-panel-header>
+              <v-expansion-panel-content>
+                <v-list-item
+                  v-for="error in errors"
+                  :key="`${error.field}-${error.message}`"
+                >
+                  <v-list-item-icon>
+                    <v-icon>
+                      {{ getValidationErrorIcon(error.field) }}
+                    </v-icon>
+                  </v-list-item-icon>
+                  <v-list-item-content>
+                    <template v-if="error.field">
+                      {{ error.field }}:
+                    </template>
+                    {{ error.message }}
+                  </v-list-item-content>
+                </v-list-item>
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </v-expansion-panels>
+        </v-list>
+      </v-tab-item>
+    </v-tabs-items>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+import type { ValidationError } from '@/types';
+import type { PropType } from 'vue';
+import { watch, computed, ref } from 'vue';
+
+import { VALIDATION_ICONS } from '@/utils/constants';
+
+const props = defineProps({
+  assetValidationErrors: {
+    type: Object as PropType<Record<string, ValidationError[]>>,
+    required: true,
+  },
+  versionValidationErrors: {
+    type: Array as PropType<ValidationError[]>,
+    required: true,
+  },
+  selectedTab: {
+    type: String as PropType<'metadata' | 'assets'>,
+    required: false,
+    default: 'metadata',
+  },
+  owner: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+});
+
+const tab = ref(props.selectedTab);
+watch(() => props.selectedTab, (val) => {
+  tab.value = val;
+});
+
+const showMetadataTab = computed(() => !!props.versionValidationErrors.length);
+const showAssetsTab = computed(() => !!Object.keys(props.assetValidationErrors));
+
+function getValidationErrorIcon(errorField: string): string {
+  const icons = Object.keys(VALIDATION_ICONS).filter((field) => errorField.includes(field));
+  if (icons.length > 0) {
+    return (VALIDATION_ICONS as any)[icons[0]];
+  }
+  return VALIDATION_ICONS.DEFAULT;
+}
+
+</script>
diff --git a/web/src/types/index.ts b/web/src/types/index.ts
index 550ea4d08..bdba4b10c 100644
--- a/web/src/types/index.ts
+++ b/web/src/types/index.ts
@@ -43,7 +43,7 @@ export interface Version {
   modified: string,
   dandiset: Dandiset,
   metadata?: DandisetMetadata,
-  asset_validation_errors: ValidationError[],
+  asset_validation_errors: Record<string, ValidationError[]>,
   version_validation_errors: ValidationError[],
   contact_person?: string,
 }
diff --git a/web/src/views/DandisetLandingView/DandisetPublish.vue b/web/src/views/DandisetLandingView/DandisetPublish.vue
index 0caf78b6b..d59f36aab 100644
--- a/web/src/views/DandisetLandingView/DandisetPublish.vue
+++ b/web/src/views/DandisetLandingView/DandisetPublish.vue
@@ -200,167 +200,78 @@
       </v-menu>
     </v-row>
 
-    <v-row
-      v-else-if="currentDandiset.version_validation_errors.length "
-      class="my-2 px-1"
-      no-gutters
+    <!-- Dialog where version and asset errors are shown -->
+    <v-dialog v-model="errorDialogOpen">
+      <ValidationErrorDialog
+        :selected-tab="selectedTab"
+        :asset-validation-errors="currentDandiset.asset_validation_errors"
+        :version-validation-errors="currentDandiset.version_validation_errors"
+        :owner="isOwner"
+        @openMeditor="openMeditor"
+      />
+    </v-dialog>
+
+    <!-- Version Validation Errors Button -->
+    <v-card
+      v-if="currentDandiset.version_validation_errors.length"
+      class="my-2 px-1 amber lighten-5 no-text-transform"
+      outlined
+      @click="openErrorDialog('metadata')"
     >
-      <v-menu
-        :nudge-width="200"
-        offset-y
-        open-on-hover
-      >
-        <template #activator="{ on: menu, attrs }">
-          <v-tooltip bottom>
-            <template #activator="{ on: tooltip }">
-              <v-card
-                class="amber lighten-5 no-text-transform"
-                outlined
-                v-bind="attrs"
-                v-on="{ ...tooltip, ...menu }"
-              >
-                <v-row class="align-center px-4">
-                  <v-col
-                    cols="1"
-                    class="justify-center py-0"
-                  >
-                    <v-icon
-                      color="warning"
-                      class="mr-1"
-                    >
-                      mdi-playlist-remove
-                    </v-icon>
-                  </v-col>
-                  <v-spacer />
-                  <v-col cols="9">
-                    <div
-                      v-if="currentDandiset"
-                      class="text-caption"
-                    >
-                      This Dandiset has {{ currentDandiset.version_validation_errors.length }}
-                      metadata validation error(s).
-                    </div>
-                  </v-col>
-                </v-row>
-              </v-card>
-            </template>
-            <span>Fix issues with metadata</span>
-          </v-tooltip>
-        </template>
-        <v-card class="pa-1">
-          <v-list
-            style="max-height: 200px"
-            class="overflow-y-auto"
+      <v-row class="align-center px-4">
+        <v-col
+          cols="1"
+          class="justify-center py-0"
+        >
+          <v-icon
+            color="warning"
+            class="mr-1"
           >
-            <div
-              v-for="(error, index) in currentDandiset.version_validation_errors"
-              :key="index"
-            >
-              <v-list-item>
-                <v-list-item-icon>
-                  <v-icon>
-                    {{ getValidationErrorIcon(error.field) }}
-                  </v-icon>
-                </v-list-item-icon>
-
-                <v-list-item-content>
-                  <template v-if="error.field">
-                    {{ error.field }}:
-                  </template>
-                  {{ error.message }}
-                </v-list-item-content>
-              </v-list-item>
-              <v-divider />
-            </div>
-          </v-list>
-          <v-btn
-            v-if="isOwner"
-            color="primary"
-            @click="openMeditor = true"
+            mdi-playlist-remove
+          </v-icon>
+        </v-col>
+        <v-spacer />
+        <v-col cols="9">
+          <div
+            v-if="currentDandiset"
+            class="text-caption"
           >
-            Fix issues
-          </v-btn>
-        </v-card>
-      </v-menu>
-    </v-row>
-
-    <v-row
-      v-if="currentDandiset.asset_validation_errors.length"
-      class="my-2 px-1"
-      no-gutters
+            This Dandiset has {{ currentDandiset.version_validation_errors.length }}
+            metadata validation error(s).
+          </div>
+        </v-col>
+      </v-row>
+    </v-card>
+
+    <!-- Asset Validation Errors Button -->
+    <v-card
+      v-if="numAssetValidationErrors"
+      class="my-2 px-1 amber lighten-5 no-text-transform"
+      outlined
+      @click="openErrorDialog('assets')"
     >
-      <v-menu
-
-        :nudge-width="200"
-        offset-y
-        open-on-hover
-      >
-        <template #activator="{ on: menu, attrs }">
-          <v-tooltip bottom>
-            <template #activator="{ on: tooltip }">
-              <v-card
-                class="amber lighten-5 no-text-transform"
-                outlined
-                v-bind="attrs"
-                v-on="{ ...tooltip, ...menu }"
-              >
-                <v-row class="align-center px-4">
-                  <v-col
-                    cols="1"
-                    class="justify-center py-0"
-                  >
-                    <v-icon
-                      color="warning"
-                      class="mr-1"
-                    >
-                      mdi-database-remove
-                    </v-icon>
-                  </v-col>
-                  <v-spacer />
-                  <v-col cols="9">
-                    <div
-                      v-if="currentDandiset"
-                      class="text-caption"
-                    >
-                      This Dandiset has {{ currentDandiset.asset_validation_errors.length }}
-                      asset validation error(s).
-                    </div>
-                  </v-col>
-                </v-row>
-              </v-card>
-            </template>
-            <span>Fix issues with assets</span>
-          </v-tooltip>
-        </template>
-        <v-card class="pa-1">
-          <v-list
-            style="max-height: 200px"
-            class="overflow-y-auto"
+      <v-row class="align-center px-4">
+        <v-col
+          cols="1"
+          class="justify-center py-0"
+        >
+          <v-icon
+            color="warning"
+            class="mr-1"
           >
-            <div
-              v-for="(error, index) in currentDandiset.asset_validation_errors"
-              :key="index"
-            >
-              <v-list-item>
-                <v-list-item-icon>
-                  <v-icon>
-                    {{ getValidationErrorIcon(error.field) }}
-                  </v-icon>
-                </v-list-item-icon>
-
-                <v-list-item-content>
-                  <template v-if="error.field">
-                    {{ error.field }}:
-                  </template>
-                  {{ error.message }}
-                </v-list-item-content>
-              </v-list-item>
-              <v-divider />
-            </div>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-row>
+            mdi-database-remove
+          </v-icon>
+        </v-col>
+        <v-spacer />
+        <v-col cols="9">
+          <div class="text-caption">
+            This Dandiset has {{ numAssetValidationErrors }}
+            asset validation error(s).
+          </div>
+        </v-col>
+      </v-row>
+    </v-card>
+
     <v-row>
       <v-subheader class="mb-2 black--text text-h5">
         This Version
@@ -449,7 +360,9 @@ import router from '@/router';
 import type { User, Version } from '@/types';
 
 import { draftVersion, VALIDATION_ICONS } from '@/utils/constants';
-import { open as openMeditor } from '@/components/Meditor/state';
+import { open as meditorOpen } from '@/components/Meditor/state';
+
+import ValidationErrorDialog from '@/components/DLP/ValidationErrorDialog.vue';
 
 const PUBLISH_CHECKLIST = [
   'A descriptive title (e.g., <span class="font-italic">Data related to foraging behavior in bees</span> rather than <span class="font-italic">Smith et al 2022</span>)',
@@ -586,9 +499,32 @@ onUnmounted(() => {
   window.clearInterval(timer);
 });
 
+// Error dialog
+const errorDialogOpen = ref(false);
+type ErrorCategory = 'metadata' | 'assets';
+const selectedTab = ref<ErrorCategory>('metadata');
+function openErrorDialog(tab: ErrorCategory) {
+  errorDialogOpen.value = true;
+  selectedTab.value = tab;
+}
+
+function openMeditor() {
+  errorDialogOpen.value = false;
+  meditorOpen.value = true;
+}
+
+const numAssetValidationErrors = computed(() => {
+  if (currentDandiset.value === null) {
+    return 0;
+  }
+
+  return Object.values(
+    currentDandiset.value.asset_validation_errors,
+  ).reduce((sum, errs) => sum + errs.length, 0);
+});
 const publishButtonDisabled = computed(() => !!(
   currentDandiset.value?.version_validation_errors.length
-      || currentDandiset.value?.asset_validation_errors.length
+      || numAssetValidationErrors.value
       || currentDandiset.value?.dandiset.embargo_status !== 'OPEN'
       || publishDisabledMessage.value
 ));

From 19ef5945a5405b36c4ab944f59ed9f471783b4e4 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 24 Apr 2023 17:26:38 -0400
Subject: [PATCH 3/6] Only group errors if multiple per asset

---
 .../components/DLP/ValidationErrorDialog.vue  | 82 +++++++++++++------
 1 file changed, 59 insertions(+), 23 deletions(-)

diff --git a/web/src/components/DLP/ValidationErrorDialog.vue b/web/src/components/DLP/ValidationErrorDialog.vue
index fae705d08..8a58ad859 100644
--- a/web/src/components/DLP/ValidationErrorDialog.vue
+++ b/web/src/components/DLP/ValidationErrorDialog.vue
@@ -72,32 +72,62 @@
           class="overflow-y-auto"
         >
           <v-expansion-panels multiple>
-            <v-expansion-panel
-              v-for="(errors, path) in assetValidationErrors"
-              :key="path"
-            >
-              <v-expansion-panel-header>
-                {{ path }}
-              </v-expansion-panel-header>
-              <v-expansion-panel-content>
-                <v-list-item
-                  v-for="error in errors"
-                  :key="`${error.field}-${error.message}`"
-                >
-                  <v-list-item-icon>
-                    <v-icon>
-                      {{ getValidationErrorIcon(error.field) }}
-                    </v-icon>
-                  </v-list-item-icon>
+            <template v-for="(errors, path) in assetValidationErrors">
+              <v-list-item
+                :key="path"
+              >
+                <v-list-item-icon>
+                  <v-icon>
+                    <template v-if="errors.length > 1">
+                      mdi-alert-plus
+                    </template>
+                    <template v-else>
+                      {{ getValidationErrorIcon(errors[0].field) }}
+                    </template>
+                  </v-icon>
+                </v-list-item-icon>
+
+                <!-- Inline single errors -->
+                <template v-if="errors.length === 1">
                   <v-list-item-content>
-                    <template v-if="error.field">
-                      {{ error.field }}:
+                    <strong>{{ path }}</strong>
+                    <template v-if="errors[0].field">
+                      {{ errors[0].field }} -
                     </template>
-                    {{ error.message }}
+                    {{ errors[0].message }}
                   </v-list-item-content>
-                </v-list-item>
-              </v-expansion-panel-content>
-            </v-expansion-panel>
+                </template>
+
+                <!-- Group multiple asset errors -->
+                <template v-else>
+                  <v-list-group class="multi-error-list-group">
+                    <template #activator>
+                      <v-list-item-content>
+                        <strong>{{ path }}</strong>
+                        <v-list-item-subtitle>Click to expand</v-list-item-subtitle>
+                      </v-list-item-content>
+                    </template>
+
+                    <v-list-item
+                      v-for="error in errors"
+                      :key="`${error.field}-${error.message}`"
+                    >
+                      <v-list-item-icon>
+                        <v-icon>
+                          {{ getValidationErrorIcon(error.field) }}
+                        </v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-content>
+                        <template v-if="error.field">
+                          {{ error.field }}:
+                        </template>
+                        {{ error.message }}
+                      </v-list-item-content>
+                    </v-list-item>
+                  </v-list-group>
+                </template>
+              </v-list-item>
+            </template>
           </v-expansion-panels>
         </v-list>
       </v-tab-item>
@@ -150,3 +180,9 @@ function getValidationErrorIcon(errorField: string): string {
 }
 
 </script>
+<style>
+.multi-error-list-group .v-list-group__header {
+  padding-left: 0;
+  padding-right: 0;
+}
+</style>

From 1c43f0ff5bf0a248343149242bed77036264b755 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Mon, 15 May 2023 13:25:20 -0400
Subject: [PATCH 4/6] Fix linting errors

---
 web/src/views/DandisetLandingView/DandisetPublish.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/web/src/views/DandisetLandingView/DandisetPublish.vue b/web/src/views/DandisetLandingView/DandisetPublish.vue
index d59f36aab..d0f675c5c 100644
--- a/web/src/views/DandisetLandingView/DandisetPublish.vue
+++ b/web/src/views/DandisetLandingView/DandisetPublish.vue
@@ -359,7 +359,7 @@ import { useDandisetStore } from '@/stores/dandiset';
 import router from '@/router';
 import type { User, Version } from '@/types';
 
-import { draftVersion, VALIDATION_ICONS } from '@/utils/constants';
+import { draftVersion } from '@/utils/constants';
 import { open as meditorOpen } from '@/components/Meditor/state';
 
 import ValidationErrorDialog from '@/components/DLP/ValidationErrorDialog.vue';
@@ -373,14 +373,6 @@ const PUBLISH_CHECKLIST = [
   'References to code in GitHub, related publications, etc.',
 ];
 
-function getValidationErrorIcon(errorField: string): string {
-  const icons = Object.keys(VALIDATION_ICONS).filter((field) => errorField.includes(field));
-  if (icons.length > 0) {
-    return (VALIDATION_ICONS as any)[icons[0]];
-  }
-  return VALIDATION_ICONS.DEFAULT;
-}
-
 // Sort versions from most recently modified to least recently modified.
 // The DRAFT version is always the first element when present.
 function sortVersions(v1: Version, v2: Version): number {

From 5aeacc3b0eaba7bdf490351e07f3986e4be2644d Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Wed, 24 May 2023 15:55:30 -0400
Subject: [PATCH 5/6] Use flat listing for asset validation errors

---
 dandiapi/api/models/version.py                | 13 ++++++-----
 dandiapi/api/tests/test_version.py            | 22 ++++++++++---------
 .../components/DLP/ValidationErrorDialog.vue  | 15 +++++++++++--
 web/src/types/index.ts                        |  3 ++-
 .../DandisetLandingView/DandisetPublish.vue   |  4 +---
 5 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/dandiapi/api/models/version.py b/dandiapi/api/models/version.py
index 118ebddc3..a0d7feed7 100644
--- a/dandiapi/api/models/version.py
+++ b/dandiapi/api/models/version.py
@@ -81,7 +81,7 @@ def valid(self) -> bool:
         return not self.assets.exclude(status=Asset.Status.VALID).exists()
 
     @property
-    def asset_validation_errors(self) -> dict[str, list[dict[str, str]]]:
+    def asset_validation_errors(self) -> list[dict[str, str]]:
         # Import here to avoid dependency cycle
         from .asset import Asset
 
@@ -95,19 +95,22 @@ def asset_validation_errors(self) -> dict[str, list[dict[str, str]]]:
             'message': 'asset is currently being validated, please wait.',
         }
 
+        def inject_path(asset: dict, err: dict):
+            return {**err, 'path': asset['path']}
+
         # Aggregate errors, ensuring the path of the asset is included
-        asset_error_map = {}
+        errors = []
         for asset in invalid_assets:
             # Must be pending or validating
             if asset['status'] != Asset.Status.INVALID:
-                asset_error_map[asset['path']] = [asset_validating_error]
+                errors.append(inject_path(asset, asset_validating_error))
                 continue
 
             # Must be invalid, only add entry in map if it has any errors
             if asset['validation_errors']:
-                asset_error_map[asset['path']] = asset['validation_errors']
+                errors.extend([inject_path(asset, err) for err in asset['validation_errors']])
 
-        return asset_error_map
+        return errors
 
     @staticmethod
     def datetime_to_version(time: datetime.datetime) -> str:
diff --git a/dandiapi/api/tests/test_version.py b/dandiapi/api/tests/test_version.py
index 05ebd3cfd..ae9994066 100644
--- a/dandiapi/api/tests/test_version.py
+++ b/dandiapi/api/tests/test_version.py
@@ -414,7 +414,7 @@ def test_version_rest_info(api_client, version):
         'metadata': version.metadata,
         'size': version.size,
         'status': 'Pending',
-        'asset_validation_errors': {},
+        'asset_validation_errors': [],
         'version_validation_errors': [],
         'contact_person': version.metadata['contributor'][0]['name'],
     }
@@ -434,14 +434,16 @@ def test_version_rest_info_with_asset(
     add_version_asset_paths(version=version)
 
     # Create expected validation errors for pending/validating assets
-    asset_validating_error = {
-        'field': '',
-        'message': 'asset is currently being validated, please wait.',
-    }
-    expected_validation_error = (
-        {asset.path: [asset_validating_error]}
+    expected_validation_errors = (
+        [
+            {
+                'field': '',
+                'message': 'asset is currently being validated, please wait.',
+                'path': asset.path,
+            }
+        ]
         if asset_status in [Asset.Status.PENDING, Asset.Status.VALIDATING]
-        else {}
+        else []
     )
 
     assert api_client.get(
@@ -462,7 +464,7 @@ def test_version_rest_info_with_asset(
         'metadata': version.metadata,
         'size': version.size,
         'status': Asset.Status.VALID,
-        'asset_validation_errors': expected_validation_error,
+        'asset_validation_errors': expected_validation_errors,
         'version_validation_errors': [],
         'contact_person': version.metadata['contributor'][0]['name'],
     }
@@ -537,7 +539,7 @@ def test_version_rest_update(api_client, user, draft_version):
         'metadata': saved_metadata,
         'size': draft_version.size,
         'status': 'Pending',
-        'asset_validation_errors': {},
+        'asset_validation_errors': [],
         'version_validation_errors': [],
         'contact_person': 'Vargas, Getúlio',
     }
diff --git a/web/src/components/DLP/ValidationErrorDialog.vue b/web/src/components/DLP/ValidationErrorDialog.vue
index 8a58ad859..4cc7a96de 100644
--- a/web/src/components/DLP/ValidationErrorDialog.vue
+++ b/web/src/components/DLP/ValidationErrorDialog.vue
@@ -72,7 +72,7 @@
           class="overflow-y-auto"
         >
           <v-expansion-panels multiple>
-            <template v-for="(errors, path) in assetValidationErrors">
+            <template v-for="(errors, path) in groupedAssetValidationErrors">
               <v-list-item
                 :key="path"
               >
@@ -144,7 +144,7 @@ import { VALIDATION_ICONS } from '@/utils/constants';
 
 const props = defineProps({
   assetValidationErrors: {
-    type: Object as PropType<Record<string, ValidationError[]>>,
+    type: Array as PropType<ValidationError[]>,
     required: true,
   },
   versionValidationErrors: {
@@ -170,6 +170,17 @@ watch(() => props.selectedTab, (val) => {
 
 const showMetadataTab = computed(() => !!props.versionValidationErrors.length);
 const showAssetsTab = computed(() => !!Object.keys(props.assetValidationErrors));
+const groupedAssetValidationErrors = computed(() => {
+  const path_asset_map: Record<string, ValidationError[]> = {};
+  props.assetValidationErrors.forEach((err) => {
+    if (!(err.path in path_asset_map)) {
+      path_asset_map[err.path] = [];
+    }
+    path_asset_map[err.path].push(err);
+  });
+
+  return path_asset_map;
+});
 
 function getValidationErrorIcon(errorField: string): string {
   const icons = Object.keys(VALIDATION_ICONS).filter((field) => errorField.includes(field));
diff --git a/web/src/types/index.ts b/web/src/types/index.ts
index bdba4b10c..6be6486c4 100644
--- a/web/src/types/index.ts
+++ b/web/src/types/index.ts
@@ -30,6 +30,7 @@ export interface DandisetSearchResult extends Dandiset {
 export interface ValidationError {
   field: string,
   message: string,
+  path: string,
 }
 
 export interface Version {
@@ -43,7 +44,7 @@ export interface Version {
   modified: string,
   dandiset: Dandiset,
   metadata?: DandisetMetadata,
-  asset_validation_errors: Record<string, ValidationError[]>,
+  asset_validation_errors: ValidationError[],
   version_validation_errors: ValidationError[],
   contact_person?: string,
 }
diff --git a/web/src/views/DandisetLandingView/DandisetPublish.vue b/web/src/views/DandisetLandingView/DandisetPublish.vue
index d0f675c5c..0198a1e36 100644
--- a/web/src/views/DandisetLandingView/DandisetPublish.vue
+++ b/web/src/views/DandisetLandingView/DandisetPublish.vue
@@ -510,9 +510,7 @@ const numAssetValidationErrors = computed(() => {
     return 0;
   }
 
-  return Object.values(
-    currentDandiset.value.asset_validation_errors,
-  ).reduce((sum, errs) => sum + errs.length, 0);
+  return currentDandiset.value.asset_validation_errors.length;
 });
 const publishButtonDisabled = computed(() => !!(
   currentDandiset.value?.version_validation_errors.length

From 1ed3f25be007250d03c57d720b087ba05225bd90 Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 6 Jun 2023 11:04:11 -0400
Subject: [PATCH 6/6] Fix showAssetsTab logic

---
 web/src/components/DLP/ValidationErrorDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/DLP/ValidationErrorDialog.vue b/web/src/components/DLP/ValidationErrorDialog.vue
index 4cc7a96de..258e98dec 100644
--- a/web/src/components/DLP/ValidationErrorDialog.vue
+++ b/web/src/components/DLP/ValidationErrorDialog.vue
@@ -169,7 +169,7 @@ watch(() => props.selectedTab, (val) => {
 });
 
 const showMetadataTab = computed(() => !!props.versionValidationErrors.length);
-const showAssetsTab = computed(() => !!Object.keys(props.assetValidationErrors));
+const showAssetsTab = computed(() => !!Object.keys(props.assetValidationErrors).length);
 const groupedAssetValidationErrors = computed(() => {
   const path_asset_map: Record<string, ValidationError[]> = {};
   props.assetValidationErrors.forEach((err) => {