Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dandischema to 0.10.4, Update UI references to dandi CLI instead of lincbrain CLI #276

Merged
merged 4 commits into from
Nov 18, 2024
Merged

Upgrade dandischema to 0.10.4, Update UI references to dandi CLI instead of lincbrain CLI #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6b0e67
Upgrade dandischema to 0.10.4
Nov 12, 2024
27ed965
update reference to lincbrain cli to dandi cli
Nov 12, 2024
21bf2a6
updates per Kabi's comments
Nov 18, 2024
f6fd4af
remove latest radio button
Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/FileBrowser/FileUploadInstructions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 6 additions & 9 deletions web/src/views/DandisetLandingView/DownloadDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@
label="Draft"
value="draft"
/>
<v-radio
label="Latest version"
value="latest"
/>
<v-radio
label="Other version"
value="other"
Expand Down Expand Up @@ -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}`;
}


Expand Down
Loading