Skip to content

Metabolic pathways visualisation (#731): display species name in table filter is applicable #809

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

Open
DmitriiKrasnov wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Metabolic pathways visualisation (#731): display species name in table filter is applicable #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions ...le/ngbInternalPathwaysTableFilter/ngbInternalPathwaysFilterList/ngbFilterList.elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import {deepSearch} from '../../../../../shared/utils/deepSearch';

const MAX_ITEMS_TO_DISPLAY = 100;
const Math = window.Math;

Expand Down Expand Up @@ -89,11 +91,17 @@ export default class ListElements {
items = await this.listFn(searchString);
} else if (searchString && searchString.length > 0) {
if (this.fullList && this.fullList.model.length) {
const filteredList = this.fullList.model.filter(i => i.toLowerCase().indexOf(searchString.toLowerCase()) === 0);
items = {
model: filteredList,
view: filteredList
model: [],
view: []
};
this.fullList.model.forEach((model, index) => {
if (model.toLowerCase().indexOf(searchString.toLowerCase()) === 0
|| deepSearch(this.fullList.view[index], searchString.toLowerCase(), [])) {
items.model.push(model);
items.view.push(this.fullList.view[index]);
}
});
shouldUpdateScope = false;
} else {
items = await this.listFn(searchString);
Expand Down
83 changes: 67 additions & 16 deletions ...waysTableFilter/ngbInternalPathwaysFilterList/ngbInternalPathwaysFilterList.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ export default class ngbInternalPathwaysFilterListController {
case 'organisms': {
if (this.ngbInternalPathwaysTableService.internalPathwaysFilter.organisms) {
this.selectedItems = this.ngbInternalPathwaysTableService.speciesList
.filter(organism => this.ngbInternalPathwaysTableService.internalPathwaysFilter.organisms.indexOf(organism.taxId) >= 0)
.map(organism => organism.taxId);
this.displayText = [...this.selectedItems].join(', ');
.filter(organism => this.ngbInternalPathwaysTableService.internalPathwaysFilter.organisms.indexOf(organism.taxId) >= 0);
this.displayText = [...this.selectedItems].map(organism => organism.speciesName || organism.taxId).join(', ');
}
break;
}
Expand All @@ -46,11 +45,30 @@ export default class ngbInternalPathwaysFilterListController {
last = parts[parts.length - 1];
parts.splice(parts.length - 1, 1);
}
if (this.listElements.fullList && this.listElements.fullList.model.length > 0) {
this.selectedItems = this.listElements.fullList.model.filter(item => parts.indexOf(item.toLowerCase()) >= 0);
const [fullMatch] = this.listElements.fullList.model.filter(item => item.toLowerCase() === last.toLowerCase());
if (fullMatch) {
this.selectedItems.push(fullMatch);
if (this.listElements.fullList && this.listElements.fullList.view.length > 0) {
switch (this.field.field) {
case 'organisms': {
this.selectedItems = this.listElements.fullList.view
.filter(item => {
if (item.speciesName) {
return parts.indexOf(item.speciesName.toLowerCase()) >= 0;
} else {
return parts.indexOf(item.taxId) >= 0;
}
});
const [fullMatch] = this.listElements.fullList.view
.filter(item => {
if (item.speciesName) {
return item.speciesName.toLowerCase() === last.toLowerCase() || item.taxId === last.toLowerCase();
} else {
return item.taxId === last.toLowerCase();
}
});
if (fullMatch) {
this.selectedItems.push(fullMatch);
}
break;
}
}
}
if (shouldUpdateScope) {
Expand Down Expand Up @@ -98,7 +116,20 @@ export default class ngbInternalPathwaysFilterListController {
}

itemIsSelected(item) {
return this.selectedItems.filter(listItem => listItem.toLowerCase() === item.toLowerCase()).length > 0;
// TODO: make optional fn to determine display value text and refactor mappedSelectedItems and other dependant entries
let mappedSelectedItems, selectedItem;
switch (this.field.field) {
case 'organisms': {
selectedItem = item.speciesName || item.taxId.toString();
mappedSelectedItems = this.selectedItems.map(item => item.speciesName || item.taxId);
break;
}
default: {
selectedItem = item;
mappedSelectedItems = this.selectedItems;
}
}
return mappedSelectedItems.filter(listItem => listItem.toLowerCase() === selectedItem.toLowerCase()).length > 0;
}

inputChanged() {
Expand All @@ -113,12 +144,25 @@ export default class ngbInternalPathwaysFilterListController {
this.hideListTimeout = null;
}
this.input.focus();
const index = this.selectedItems.indexOf(item);
let mappedSelectedItems, selectedItem;
switch (this.field.field) {
case 'organisms': {
selectedItem = item.speciesName || item.taxId.toString();
mappedSelectedItems = this.selectedItems.map(item => item.speciesName || item.taxId);
break;
}
default: {
selectedItem = item;
mappedSelectedItems = this.selectedItems;
}
}
const index = mappedSelectedItems.indexOf(selectedItem);
if (index >= 0) {
this.selectedItems.splice(index, 1);
mappedSelectedItems.splice(index, 1);
} else {
this.selectedItems.push(item);
mappedSelectedItems.push(selectedItem);
}
this.selectedItems = mappedSelectedItems;
if (this.selectedItems.length) {
this.displayText = [...this.selectedItems, ''].join(', ');
} else {
Expand All @@ -129,19 +173,26 @@ export default class ngbInternalPathwaysFilterListController {

apply() {
const parts = this.displayText.split(',').map(part => part.trim().toLowerCase());
if (this.listElements.fullList && this.listElements.length > 0) {
this.selectedItems = this.listElements.fullList.model.filter(item => parts.indexOf(item.toLowerCase()) >= 0);
if (this.listElements.fullList && this.listElements.fullList.view.length > 0) {
this.selectedItems = this.listElements.fullList.view
.filter(item => {
if (item.speciesName) {
return parts.indexOf(item.speciesName.toLowerCase()) >= 0;
} else {
return parts.indexOf(item.taxId.toLowerCase()) >= 0;
}
});
} else {
this.selectedItems = parts.filter(part => part !== '');
}
this.displayText = this.selectedItems.join(', ');
this.displayText = this.selectedItems.map(item => item.speciesName || item.taxId).join(', ');
this.listIsDisplayed = false;
if (!this.ngbInternalPathwaysTableService.canScheduleFilterInternalPathways()) {
return;
}
switch (this.field.field) {
case 'organisms': {
const selectedItemsLowerCase = this.selectedItems.map(i => i.toLowerCase());
const selectedItemsLowerCase = this.selectedItems.map(i => i.taxId.toString());
const prevValue = (this.ngbInternalPathwaysTableService.internalPathwaysFilter.organisms || []);
prevValue.sort();
const prevValueStr = JSON.stringify(prevValue).toUpperCase();
Expand Down
5 changes: 3 additions & 2 deletions ...lPathwaysTableFilter/ngbInternalPathwaysFilterList/ngbInternalPathwaysFilterList.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
prevent-parent-scroll>
<div class="ngb-filter-list-item"
ng-if="!$ctrl.listElements.isLoading" ng-repeat="(index, item) in $ctrl.listElements.preLoadedList.model track by $index">
<md-checkbox aria-label="{{item}} checkbox" ng-checked="$ctrl.itemIsSelected(item)"
ng-click="$ctrl.didClickOnItem(item)"
<md-checkbox aria-label="{{item.taxId}} checkbox"
ng-checked="$ctrl.itemIsSelected($ctrl.listElements.preLoadedList.view[index])"
ng-click="$ctrl.didClickOnItem($ctrl.listElements.preLoadedList.view[index])"
ng-if="!item.placeholder && !item.divider && $ctrl.field.field === 'organisms'">
<span class="context-menu-item">{{$ctrl.listElements.preLoadedList.view[index].taxId}}</span>
<span class="context-menu-item-subtitle">{{$ctrl.listElements.preLoadedList.view[index].speciesName.toUpperCase()}}</span>
Expand Down
17 changes: 17 additions & 0 deletions client/client/app/shared/utils/deepSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export function deepSearch(obj, term, fieldsToIgnore = []) {
let result = false;
for (const key in obj) {
if (fieldsToIgnore.indexOf(key) > -1) continue;
if (!obj.hasOwnProperty(key) || !obj[key]) continue;
if (obj[key] instanceof Object || obj[key] instanceof Array) {
result = deepSearch(obj[key], term, fieldsToIgnore);
} else {
result = obj[key].toString().toLocaleLowerCase()
.includes(term.toLocaleLowerCase());
}
if (result) {
return true;
}
}
return false;
}