Merge pull request #531 from dandi/django-create-dandiset

Django create dandiset
dandi · Dec 28, 2020 · b38764d · b38764d
2 parents 337c8a8 + 6f53280
commit b38764d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/web/src/rest/publish.js b/web/src/rest/publish.js
@@ -107,6 +107,10 @@ const publishRest = new Vue({
     async dandisets(params) {
       return client.get('dandisets/', { params });
     },
+    async createDandiset(name, description) {
+      const metadata = { name, description };
+      return client.post('dandisets/', { name, metadata });
+    },
     async owners(identifier) {
       return client.get(`dandisets/${identifier}/users/`);
     },

diff --git a/web/src/views/CreateDandisetView/CreateDandisetView.vue b/web/src/views/CreateDandisetView/CreateDandisetView.vue
@@ -40,7 +40,8 @@
 </template>
 
 <script>
-import { girderRest, loggedIn } from '@/rest';
+import { girderRest, publishRest, loggedIn } from '@/rest';
+import toggles from '@/featureToggle';
 
 export default {
   name: 'CreateDandisetView',
@@ -63,18 +64,27 @@ export default {
   methods: {
     async registerDandiset() {
       const { name, description } = this;
-      const { data } = await girderRest.post('dandi', null, {
-        params: {
-          name,
-          description,
-        },
-      });
+      if (toggles.DJANGO_API) {
+        const { data } = await publishRest.createDandiset(name, description);
+        const { identifier } = data;
+        this.$router.push({
+          name: 'dandisetLanding',
+          params: { identifier },
+        });
+      } else {
+        const { data } = await girderRest.post('dandi', null, {
+          params: {
+            name,
+            description,
+          },
+        });
 
-      const { identifier } = data.meta.dandiset;
-      this.$router.push({
-        name: 'dandisetLanding',
-        params: { identifier },
-      });
+        const { identifier } = data.meta.dandiset;
+        this.$router.push({
+          name: 'dandisetLanding',
+          params: { identifier },
+        });
+      }
     },
   },
 };

diff --git a/web/src/views/FileBrowserView/FileBrowser.vue b/web/src/views/FileBrowserView/FileBrowser.vue
@@ -18,9 +18,9 @@
 <script>
 import { mapState, mapActions } from 'vuex';
 import { draftVersion } from '@/utils';
+import toggles from '@/featureToggle';
 import GirderFileBrowser from './GirderFileBrowser.vue';
 import PublishFileBrowser from './PublishFileBrowser.vue';
-import toggles from '@/featureToggle';
 
 export default {
   name: 'FileBrowser',
@@ -54,11 +54,9 @@ export default {
       if (!this.publishDandiset) {
         this.fetchPublishDandiset({ identifier, version });
       }
-    } else {
-      if (!this.girderDandiset) {
-        // Await so we can use this value afterwards
-        await this.fetchGirderDandiset({ identifier });
-      }
+    } else if (!this.girderDandiset) {
+      // Await so we can use this value afterwards
+      await this.fetchGirderDandiset({ identifier });
     }
   },
   methods: {