Skip to content

Commit fa4467e

Browse files
committed
version_validation_errors -> validation_errors
1 parent 265fce0 commit fa4467e

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

dandiapi/api/tests/test_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ def test_version_rest_info(api_client, version):
490490
'metadata': version.metadata,
491491
'size': version.size,
492492
'status': version.status,
493-
'version_validation_errors': [],
493+
'validation_errors': [],
494494
'contact_person': version.metadata['contributor'][0]['name'],
495495
}
496496

@@ -640,7 +640,7 @@ def test_version_rest_update(api_client):
640640
'metadata': saved_metadata,
641641
'size': draft_version.size,
642642
'status': 'Pending',
643-
'version_validation_errors': [],
643+
'validation_errors': [],
644644
'contact_person': 'Vargas, Getúlio',
645645
}
646646

dandiapi/api/views/serializers.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,15 +373,11 @@ class VersionDetailSerializer(VersionSerializer):
373373
class Meta(VersionSerializer.Meta):
374374
fields = [
375375
*VersionSerializer.Meta.fields,
376-
'version_validation_errors',
376+
'validation_errors',
377377
'metadata',
378378
'contact_person',
379379
]
380380

381-
# TODO: Rename back to just validation_errors
382-
# rename this field in the serializer to differentiate from asset_validation_errors
383-
version_validation_errors = serializers.JSONField(source='validation_errors')
384-
385381
def get_contact_person(self, obj):
386382
return extract_contact_person(obj)
387383

web/src/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export interface Version {
4747
dandiset: Dandiset,
4848
metadata?: DandisetMetadata,
4949
asset_validation_errors?: ValidationError[],
50-
version_validation_errors: ValidationError[],
50+
validation_errors: ValidationError[],
5151
contact_person?: string,
5252
}
5353

web/src/views/DandisetLandingView/DandisetPublish.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ const publishButtonDisabled = computed(() => {
372372
}
373373
374374
return Boolean(
375-
dandiset.version_validation_errors.length
375+
dandiset.validation_errors.length
376376
|| dandiset.asset_validation_errors.length
377377
|| dandiset.dandiset.embargo_status !== 'OPEN'
378378
|| publishDisabledMessage.value

web/src/views/DandisetLandingView/DandisetValidationErrors.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
<ValidationErrorDialog
2828
:selected-tab="selectedTab"
2929
:asset-validation-errors="dandiset.asset_validation_errors"
30-
:version-validation-errors="dandiset.version_validation_errors"
30+
:version-validation-errors="dandiset.validation_errors"
3131
:owner="isOwner"
3232
@open-meditor="openMeditor"
3333
/>
3434
</v-dialog>
3535

3636
<!-- Version Validation Errors Button -->
3737
<v-alert
38-
v-if="dandiset.version_validation_errors.length"
38+
v-if="dandiset.validation_errors.length"
3939
class="my-1"
4040
density="compact"
4141
icon="mdi-playlist-remove"
@@ -44,7 +44,7 @@
4444
@click="openErrorDialog('metadata')"
4545
>
4646
<v-alert-content class="text-body-2">
47-
This Dandiset has {{ dandiset.version_validation_errors.length }} metadata validation error(s).
47+
This Dandiset has {{ dandiset.validation_errors.length }} metadata validation error(s).
4848
</v-alert-content>
4949
</v-alert>
5050

0 commit comments

Comments
 (0)