Merge pull request #276 from lincbrain/ak-upgrade-ds

Upgrade dandischema to 0.10.4, Update UI references to dandi CLI instead of lincbrain CLI
lincbrain · Nov 18, 2024 · d847519 · d847519
2 parents 522a2cf + f6fd4af
commit d847519
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
     include_package_data=True,
     install_requires=[
         'celery',
-        'dandischema~=0.10.1',
+        'dandischema==0.10.4',
         'django~=4.1.0',
         'django-admin-display',
         # Require 0.58.0 as it is the first version to support postgres' native

diff --git a/web/src/components/FileBrowser/FileUploadInstructions.vue b/web/src/components/FileBrowser/FileUploadInstructions.vue
@@ -24,9 +24,9 @@
           >
             <div>{{ downloadCommand }}</div>
             <div>> cd {{ dandisetIdentifier }}</div>
-            <div>> lincbrain organize &lt;source_folder&gt; -f dry</div>
-            <div>> lincbrain organize &lt;source_folder&gt;</div>
-            <div>> lincbrain upload</div>
+            <div>> dandi organize &lt;source_folder&gt; -f dry</div>
+            <div>> dandi organize &lt;source_folder&gt;</div>
+            <div>> dandi upload -i linc</div>
           </v-sheet>
         </div>
       </div>

diff --git a/web/src/views/DandisetLandingView/DownloadDialog.vue b/web/src/views/DandisetLandingView/DownloadDialog.vue
@@ -63,10 +63,6 @@
                       label="Draft"
                       value="draft"
                     />
-                    <v-radio
-                      label="Latest version"
-                      value="latest"
-                    />
                     <v-radio
                       label="Other version"
                       value="other"
@@ -121,18 +117,19 @@ import { useDandisetStore } from '@/stores/dandiset';
 import CopyText from '@/components/CopyText.vue';
 
 function formatDownloadCommand(identifier: string, version: string): string {
-  if (version === 'draft') {
-    const baseUrl = import.meta.env.VITE_APP_DANDI_API_ROOT === 'https://staging-api.lincbrain.org/api/'
+  const baseUrl = import.meta.env.VITE_APP_DANDI_API_ROOT === 'https://staging-api.lincbrain.org/api/'
       ? 'https://staging.lincbrain.org/dandiset/'
       : 'https://lincbrain.org/dandiset/';
-    return `lincbrain download ${baseUrl}${identifier}/draft`;
+
+  if (version === 'draft') {
+    return `dandi download ${baseUrl}${identifier}/draft`;
   }
 
   if (!version) {
-    return `lincbrain download DANDI:${identifier}`;
+    return `dandi download ${baseUrl}:${identifier}`;
   }
 
-  return `lincbrain download DANDI:${identifier}/${version}`;
+  return `dandi download ${baseUrl}:${identifier}/${version}`;
 }