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

Jump to bottom

BUG/ENH/UX: lots of JS tweaks #299

Merged
merged 6 commits into from
Apr 19, 2023
Merged

BUG/ENH/UX: lots of JS tweaks #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9c14c1
fix GIN url stripping and sunstring replacing
jsheunis Apr 19, 2023
10d7eb3
replace funding tab icon
jsheunis Apr 19, 2023
8155806
rephrase ambiguous status of license and doi to 'unknown'
jsheunis Apr 19, 2023
c43e638
rephrase ambiguous search instructions: filter
jsheunis Apr 19, 2023
76f60c2
strip white space and newlines from copied clone command
jsheunis Apr 19, 2023
8598907
hide properties with value == 0
jsheunis Apr 19, 2023
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
7 changes: 7 additions & 0 deletions datalad_catalog/catalog/assets/app_component_dataset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ const datasetView = () =>
if (dataset.url[i].toLowerCase().indexOf("gin.g-node") >= 0) {
disp_dataset.is_gin = true;
disp_dataset.url = dataset.url[i];
disp_dataset.url = disp_dataset.url.replace('ssh://', '');
disp_dataset.url = disp_dataset.url.replace('[email protected]:', 'https://gin.g-node.org');
disp_dataset.url = disp_dataset.url.replace('[email protected]', 'https://gin.g-node.org');
disp_dataset.url = disp_dataset.url.replace('.git', '');
}
}
if (!disp_dataset.url) {
Expand Down Expand Up @@ -268,6 +271,10 @@ const datasetView = () =>
// https://stackoverflow.com/questions/60581285/execcommand-is-now-obsolete-whats-the-alternative
// https://www.sitepoint.com/clipboard-api/
selectText = document.getElementById("clone_code").textContent;
selectText = '\n ' + selectText + ' \n\n '
console.log(selectText)
selectText = selectText.replace(/^\s+|\s+$/g, '');
console.log(selectText)
navigator.clipboard
.writeText(selectText)
.then(() => {})
Expand Down
14 changes: 7 additions & 7 deletions datalad_catalog/catalog/templates/dataset-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<strong>Version:</strong> {{selectedDataset.dataset_version.substring(0,7)}}&nbsp;
<strong>Last updated:</strong> {{displayData.last_updated}}&nbsp;
<strong>DOI:</strong> <span v-if="selectedDataset.doi"><a :href="selectedDataset.doi" target="_blank"> {{selectedDataset.doi.replace("https://doi.org/", "")}}</a></span>
<span v-else><em>not available</em></span>&nbsp;
<span v-else><em>unknown</em></span>&nbsp;
<strong>License:</strong> <span v-if="selectedDataset.license && selectedDataset.license.name"><a :href="selectedDataset.license.url" target="_blank"> {{selectedDataset.license.name}}</a></span>
<span v-else><em>not available</em></span>
<span v-else><em>unknown</em></span>
</b-card-text>
<!-- DATASET BUTTONS -->
<div style="text-align: left;">
Expand Down Expand Up @@ -132,9 +132,9 @@ <h3>Cite dataset</h3>

<b-card-text>
<strong>Properties:</strong> <br>
<span><b-button disabled size="sm" variant="outline-dark">Subdatasets: {{selectedDataset.subdatasets_available_count}}</b-button>&nbsp;</span>
<span v-if="selectedDataset.subdatasets_available_count"><b-button disabled size="sm" variant="outline-dark">Subdatasets: {{selectedDataset.subdatasets_available_count}}</b-button>&nbsp;</span>
<span v-if="selectedDataset.top_display && selectedDataset.top_display.length">
<span v-for="display_property in selectedDataset.top_display"><b-button disabled size="sm" variant="outline-dark">{{display_property.name}}: {{display_property.value}}</b-button>&nbsp;</span>
<span v-for="display_property in selectedDataset.top_display" v-if="display_property.value"><b-button disabled size="sm" variant="outline-dark">{{display_property.name}}: {{display_property.value}}</b-button>&nbsp;</span>
</span>
</b-card-text>
</b-col>
Expand Down Expand Up @@ -172,7 +172,7 @@ <h3>Cite dataset</h3>
Modified
</b-button>
</b-button-group>&nbsp;&nbsp;
<b-form-input id="input-1" type="search" placeholder="Search by dataset or author name" required v-model="search_text" ref="text_search_input"></b-form-input>
<b-form-input id="input-1" type="search" placeholder="Filter by dataset or author name" required v-model="search_text" ref="text_search_input"></b-form-input>
</b-input-group>
</b-col>
<b-col md="5">
Expand All @@ -184,7 +184,7 @@ <h3>Cite dataset</h3>
v-bind="inputAttrs"
v-model="tag_text"
v-on="inputHandlers"
placeholder="Search by keyword (select or press enter to add)"
placeholder="Filter by keyword (select or press enter to add)"
class="form-control"
ref="tag_search_input"
@input="inputTagText()"
Expand Down Expand Up @@ -313,7 +313,7 @@ <h5>{{pub.title}}</h5>
<span v-if="selectedDataset.funding && selectedDataset.funding.length">
<b-tab key="funding" ref="tabelement">
<template v-slot:title>
<i class="fas fa-dollar-sign"></i> Funding
<i class="fas fa-building-columns"></i> Funding
</template>
<span v-if="!selectedDataset.funding || !selectedDataset.funding.length"><em>There are no funding sources listed for the current dataset</em></span>
<span v-else v-for="fund in selectedDataset.funding">
Expand Down