Merge branch 'master' into feature-display-uri-descriptions-2

PavlidisLab · May 17, 2024 · 913ce4d · 913ce4d
2 parents 365c1ca + 19fe25e
commit 913ce4d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/components/DatasetPreview.vue b/src/components/DatasetPreview.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="py-3">
- <h3>{{ dataset.name }}</h3>
+ <h3> <a v-bind:href="datasetUrl">{{ dataset.shortName }}</a>: {{ dataset.name }}</h3>
  <v-chip v-for="term in includedTerms" :key="getId(term)"
  @[getClickEventName(term)]="handleChipClick(term)"
  small :color="getChipColor(term.objectClass)"
@@ -56,7 +56,13 @@ export default {
  if (this.dataset.searchResult !== undefined && this.dataset.searchResult.highlights !== null && "description" in this.dataset.searchResult.highlights) {
  return marked.parseInline(highlight(this.dataset.description, this.dataset.searchResult.highlights.description));
  }
- return marked.parseInline(this.dataset.description);
+ let ds = this.dataset.description
+ let words = ds.split(" ")
+ if(words.length>150){
+ words = words.slice(0,150)
+ ds = words.join(" ") + "…"
+ }
+ return marked.parseInline(ds);
  },
  chipColorMap() {
  return {
@@ -65,6 +71,9 @@ export default {
  BioMaterial: "blue lighten-3"
  };
  },
+ datasetUrl(){
+ return baseUrl + "/expressionExperiment/showExpressionExperiment.html?id=" + this.dataset.id
+ },
  /**
  * IDs of selected categories.
  */

diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -36,6 +36,9 @@ export function formatDecimal(d) {
 }
 
 export function pluralize(s) {
+ if (s.endsWith("y")) {
+ return s.slice(0, -1) + "ies";
+ }
  return s.endsWith("x") || s.endsWith("s") ? s + "es" : s + "s";
 }
 

diff --git a/src/views/Browser.vue b/src/views/Browser.vue
@@ -57,11 +57,13 @@
  <span>{{ item }}</span>
  </template>
  <template v-slot:item.name="{item}">
- <span v-html="getName(item)"/>
- <br v-if="debug && hasHighlight(item)"/>
- <small v-if="debug && hasHighlight(item)"
- v-html="getHighlight(item)">
- </small>
+ <td style="width: 100%">
+ <span v-html="getName(item)"/>
+ <br v-if="debug && hasHighlight(item)"/>
+ <small v-if="debug && hasHighlight(item)"
+ v-html="getHighlight(item)">
+ </small>
+ </td>
  </template>
  <template v-slot:item.geeq.publicQualityScore="{ item }">
  <v-tooltip v-if="item.geeq" left>