gramene-search 1.6.42 → 1.6.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gramene-search",
3
- "version": "1.6.42",
3
+ "version": "1.6.44",
4
4
  "description": "search wrapper for gramene",
5
5
  "source": "src/index.js",
6
6
  "main": "dist/index.js",
@@ -30,7 +30,7 @@
30
30
  "flat-to-nested": "^1.1.1",
31
31
  "gramene-bins-client": "^2.3.3",
32
32
  "gramene-dbxrefs": "^3.0.15",
33
- "gramene-efp-browser": "^1.0.9",
33
+ "gramene-efp-browser": "^1.0.10",
34
34
  "gramene-genetree-vis": "^4.2.10",
35
35
  "gramene-mdview": "^2.0.6",
36
36
  "gramene-search-vis": "^4.2.4",
@@ -234,7 +234,14 @@ const grameneGermplasm = createAsyncResourceBundle( {
234
234
  getPromise: ({store}) => {
235
235
  return fetch(`${store.selectGrameneAPI()}/germplasm?rows=-1`)
236
236
  .then(res => res.json())
237
- .then(res => _.groupBy(res, 'ens_id'))
237
+ .then(res => {
238
+ res.forEach(g => {
239
+ if (!g.subpop) {
240
+ g.subpop = "?"
241
+ }
242
+ });
243
+ return _.groupBy(res, 'ens_id')
244
+ })
238
245
  }
239
246
  });
240
247
  grameneGermplasm.reactGrameneGermplasm = createSelector(
@@ -70,6 +70,16 @@ const AccessionLink = ({germplasm, gene_id}) => {
70
70
  }
71
71
  return <span>{germplasm.pub_id}</span>
72
72
  }
73
+ function compareGermplasm(a, b) {
74
+ const aSub = a?.germplasm?.subpop ?? '';
75
+ const bSub = b?.germplasm?.subpop ?? '';
76
+ const subCmp = aSub.localeCompare(bSub, 'en', { sensitivity: 'accent' });
77
+ if (subCmp !== 0) return subCmp;
78
+
79
+ const aPub = a?.germplasm?.pub_id ?? '';
80
+ const bPub = b?.germplasm?.pub_id ?? '';
81
+ return aPub.localeCompare(bPub, 'en', { sensitivity: 'accent' });
82
+ }
73
83
  function group_germplasm(gene, germplasmLUT, vep_obj) {
74
84
  let accessionTable = [];
75
85
  Object.entries(vep_obj).forEach(([key,accessions]) => {
@@ -108,7 +118,7 @@ function group_germplasm(gene, germplasmLUT, vep_obj) {
108
118
  status: status,
109
119
  tally: tally
110
120
  });
111
- groups[group].forEach(acc => {
121
+ groups[group].sort(compareGermplasm).forEach(acc => {
112
122
  id++;
113
123
  grouped.push({
114
124
  id: id,
@@ -217,6 +227,12 @@ const GridWithGroups = ({groups,gene_id,doGrin}) => {
217
227
  }
218
228
  return null;
219
229
  }},
230
+ { field: 'subpop', headerName: 'Subpopulation', filter:false, sortable: false, flex: 1, cellRenderer: (params) => {
231
+ if (params.data.accession && params.data.accession.germplasm.subpop && params.data.accession.germplasm.subpop !== "?") {
232
+ return params.data.accession.germplasm.subpop
233
+ }
234
+ return null;
235
+ }},
220
236
  { field: 'search', headerName: 'All LOF Genes', sortable:false, filter:false, flex: 1,
221
237
  cellRenderer: (params) => {
222
238
  if (params.data.accession) {
package/src/demo.js CHANGED
@@ -228,7 +228,7 @@ const panSites = [
228
228
  ensemblSite: 'https://oryza-ensembl.gramene.org',
229
229
  ensemblURL: 'https://oryza-ensembl.gramene.org',
230
230
  ensemblRest: 'https://data.gramene.org/pansite-ensembl-108',
231
- grameneData: 'https://data.gramene.org/oryza_v8',
231
+ grameneData: 'https://data.gramene.org/oryza_v9',
232
232
  targetTaxonId: 3702,
233
233
  alertText: 'Rice site',
234
234
  showViews: true,