Merge pull request #2015 from dandi/disable-unembargo-on-active-uploads

Disable GUI "Unembargo" button if there are active uploads
dandi · Sep 10, 2024 · 1cc461b · 1cc461b
2 parents ba8fd69 + 1368f37
commit 1cc461b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/dandiapi/api/models/version.py b/dandiapi/api/models/version.py
@@ -71,6 +71,10 @@ def size(self):
             or 0
         )
 
+    @property
+    def active_uploads(self):
+        return self.dandiset.uploads.count() if self.version == 'draft' else 0
+
     @property
     def publishable(self) -> bool:
         if self.status != Version.Status.VALID:

diff --git a/dandiapi/api/tests/test_dandiset.py b/dandiapi/api/tests/test_dandiset.py
@@ -343,6 +343,7 @@ def test_dandiset_rest_create(api_client, user):
             'version': 'draft',
             'name': name,
             'asset_count': 0,
+            'active_uploads': 0,
             'size': 0,
             'dandiset': {
                 'identifier': DANDISET_ID_RE,
@@ -436,6 +437,7 @@ def test_dandiset_rest_create_with_identifier(api_client, admin_user):
             'version': 'draft',
             'name': name,
             'asset_count': 0,
+            'active_uploads': 0,
             'size': 0,
             'dandiset': {
                 'identifier': identifier,
@@ -543,6 +545,7 @@ def test_dandiset_rest_create_with_contributor(api_client, admin_user):
             'version': 'draft',
             'name': name,
             'asset_count': 0,
+            'active_uploads': 0,
             'size': 0,
             'dandiset': {
                 'identifier': identifier,
@@ -633,6 +636,7 @@ def test_dandiset_rest_create_embargoed(api_client, user):
             'version': 'draft',
             'name': name,
             'asset_count': 0,
+            'active_uploads': 0,
             'size': 0,
             'dandiset': {
                 'identifier': DANDISET_ID_RE,

diff --git a/dandiapi/api/tests/test_version.py b/dandiapi/api/tests/test_version.py
@@ -423,6 +423,7 @@ def test_version_rest_list(api_client, version, draft_version_factory):
                 'created': TIMESTAMP_RE,
                 'modified': TIMESTAMP_RE,
                 'asset_count': 0,
+                'active_uploads': 0,
                 'size': 0,
                 'status': 'Pending',
             }
@@ -460,6 +461,7 @@ def test_version_rest_info(api_client, version):
         'created': TIMESTAMP_RE,
         'modified': TIMESTAMP_RE,
         'asset_count': 0,
+        'active_uploads': 0,
         'metadata': version.metadata,
         'size': version.size,
         'status': 'Pending',
@@ -510,6 +512,7 @@ def test_version_rest_info_with_asset(
         'created': TIMESTAMP_RE,
         'modified': TIMESTAMP_RE,
         'asset_count': 1,
+        'active_uploads': 0,
         'metadata': version.metadata,
         'size': version.size,
         'status': Asset.Status.VALID,
@@ -586,6 +589,7 @@ def test_version_rest_update(api_client, user, draft_version):
         'created': TIMESTAMP_RE,
         'modified': TIMESTAMP_RE,
         'asset_count': draft_version.asset_count,
+        'active_uploads': draft_version.active_uploads,
         'metadata': saved_metadata,
         'size': draft_version.size,
         'status': 'Pending',

diff --git a/dandiapi/api/views/serializers.py b/dandiapi/api/views/serializers.py
@@ -88,6 +88,7 @@ class Meta:
             'version',
             'name',
             'asset_count',
+            'active_uploads',
             'size',
             'status',
             'created',

diff --git a/web/src/types/index.ts b/web/src/types/index.ts
@@ -38,6 +38,7 @@ export interface Version {
   version: string,
   name: string,
   asset_count: number,
+  active_uploads: number
   size: number,
   status: 'Pending' | 'Validating' | 'Valid' | 'Invalid' | 'Published',
   validation_error?: string,

diff --git a/web/src/views/DandisetLandingView/DandisetUnembargo.vue b/web/src/views/DandisetLandingView/DandisetUnembargo.vue
@@ -65,7 +65,7 @@
     >
       <v-tooltip
         left
-        :disabled="!unembargo_in_progress"
+        :disabled="!unembargoDisabled"
       >
         <template #activator="{ on }">
           <div
@@ -77,7 +77,7 @@
               block
               color="info"
               depressed
-              :disabled="unembargo_in_progress"
+              :disabled="unembargoDisabled"
               @click="unembargo()"
             >
               {{ unembargo_in_progress ? 'Unembargoing' : 'Unembargo' }}
@@ -87,6 +87,7 @@
           </div>
         </template>
         <span v-if="unembargo_in_progress">This dandiset is being unembargoed, please wait.</span>
+        <span v-else-if="currentDandiset.active_uploads">This dandiset has active uploads. Please complete or clear these uploads before proceeding.</span>
       </v-tooltip>
     </v-row>
     <v-row>
@@ -127,6 +128,7 @@ const store = useDandisetStore();
 
 const currentDandiset = computed(() => store.dandiset);
 const unembargo_in_progress = computed(() => currentDandiset.value?.dandiset.embargo_status === 'UNEMBARGOING');
+const unembargoDisabled = computed(() => !!(unembargo_in_progress.value || currentDandiset.value === null || currentDandiset.value.active_uploads));
 const showWarningDialog = ref(false);
 const confirmationPhrase = ref('');