diff --git a/dist/components/header.d.ts b/dist/components/header.d.ts index 3eedca87c..75014b62f 100644 --- a/dist/components/header.d.ts +++ b/dist/components/header.d.ts @@ -122,7 +122,7 @@ export declare class AppHeader { toggleReportBugLink(isVisible: boolean, contentGenerator?: (title: HTMLElement, content: HTMLElement) => void): void; private toggleAboutLink; hideDialog(selector: string): void; - showAndFocusOn(selector: string, focusSelector: string): void; + showAndFocusOn(selector: string, focusSelector: string): Promise; static create(parent: HTMLElement, options?: IAppHeaderOptions): AppHeader; } //# sourceMappingURL=header.d.ts.map \ No newline at end of file diff --git a/dist/components/header.d.ts.map b/dist/components/header.d.ts.map index 757ef03b2..5c729d6d8 100644 --- a/dist/components/header.d.ts.map +++ b/dist/components/header.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../src/components/header.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../src/components/header.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/components/header.js b/dist/components/header.js index 5719a64fc..540443be4 100644 --- a/dist/components/header.js +++ b/dist/components/header.js @@ -1,4 +1,5 @@ import { merge } from 'lodash'; +import { UserSession } from '../app/UserSession'; import { I18nextManager } from '../i18n'; import { BuildInfo } from './buildInfo'; import { AppMetaDataUtils } from './metaData'; @@ -384,15 +385,21 @@ export class AppHeader { $(selector).modal('hide'); }); } - showAndFocusOn(selector, focusSelector) { - import('jquery').then((jquery) => { - const $selector = $(selector); - $selector - .modal('show') - // @ts-ignore - .on('shown.bs.modal', function () { + async showAndFocusOn(selector, focusSelector) { + await import('jquery'); + const $selector = $(selector); + $selector + .modal('show') + // @ts-ignore + .on('shown.bs.modal', () => { + // Because the modal is async we should check if we were logged in + // exactly when the animation of opening the modal was happening + if (UserSession.getInstance().isLoggedIn()) { + this.hideDialog(selector); + } + else { $($selector).trigger('focus'); - }); + } }); } static create(parent, options = {}) { diff --git a/dist/components/header.js.map b/dist/components/header.js.map index 761a97f19..3cae4a9a2 100644 --- a/dist/components/header.js.map +++ b/dist/components/header.js.map @@ -1 +1 @@ -{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/components/header.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/components/header.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 7a3453069..94e359285 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tdp_core", "description": "Target discovery platform for exploring rankings of genes, disease models, and other entities.", - "version": "16.2.1", + "version": "16.2.2", "author": { "name": "datavisyn GmbH", "email": "contact@datavisyn.io", diff --git a/src/components/header.ts b/src/components/header.ts index 411bcaf62..f4f767066 100644 --- a/src/components/header.ts +++ b/src/components/header.ts @@ -1,4 +1,5 @@ import { merge } from 'lodash'; +import { UserSession } from '../app/UserSession'; import { I18nextManager } from '../i18n'; import { BuildInfo } from './buildInfo'; import { AppMetaDataUtils } from './metaData'; @@ -552,16 +553,21 @@ export class AppHeader { }); } - showAndFocusOn(selector: string, focusSelector: string) { - import('jquery').then((jquery) => { - const $selector = $(selector); - $selector - .modal('show') - // @ts-ignore - .on('shown.bs.modal', function () { + async showAndFocusOn(selector: string, focusSelector: string) { + await import('jquery'); + const $selector = $(selector); + $selector + .modal('show') + // @ts-ignore + .on('shown.bs.modal', () => { + // Because the modal is async we should check if we were logged in + // exactly when the animation of opening the modal was happening + if (UserSession.getInstance().isLoggedIn()) { + this.hideDialog(selector); + } else { $($selector).trigger('focus'); - }); - }); + } + }); } static create(parent: HTMLElement, options: IAppHeaderOptions = {}) { diff --git a/tdp_core/sql_filter.py b/tdp_core/sql_filter.py index ad2831715..244b7c8c4 100644 --- a/tdp_core/sql_filter.py +++ b/tdp_core/sql_filter.py @@ -2,8 +2,6 @@ from werkzeug.datastructures import MultiDict -from . import manager - _log = logging.getLogger(__name__) @@ -33,30 +31,6 @@ def add_namedset(vi): return list(union) -def _replace_range_in_ids(v, id_type, target_id_type): - union = set() - - def add_range(r): - # convert named sets to the primary ids - ids = r - if id_type != target_id_type: - # need to map the ids - mapped_ids = manager.id_mapping(id_type, target_id_type, ids) - for id in mapped_ids: - if id is not None and len(id) > 0: - union.add(id[0]) # just the first one for now - else: - for id in ids: - union.add(id) - - if isinstance(v, list): - for vi in v: - add_range(vi) - else: - add_range(v) - return list(union) - - def filter_logic(view, args): """ parses the request arguments for filter @@ -87,9 +61,8 @@ def filter_logic(view, args): if k.startswith("rangeOf"): del where_clause[k] # delete value id_type_and_key = k[7:] - id_type = id_type_and_key[: id_type_and_key.index("4")] real_key = id_type_and_key[id_type_and_key.index("4") + 1 :] # remove the range4 part - ids = _replace_range_in_ids(v, id_type, view.idtype) + ids = v if real_key not in where_clause: where_clause[real_key] = ids else: