From e38808e0e9f6f3d7db6fe1d9a5883dd38eab4e96 Mon Sep 17 00:00:00 2001 From: Vanessa Stoiber <52395160+dvvanessastoiber@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:32:06 +0200 Subject: [PATCH] Release 12.1.0 (#195) * Pass drug screen when multiple data types are selected * Clean up code * Add additional depletion screen scores https://github.com/Caleydo/tdp_bi_bioinfodb/issues/1364 * orphan import * Linting and other fixes * Linting * prepare next development version 12.0.1-SNAPSHOT * Replace `gene_map_ensgs` with idtype mapping Closes https://github.com/Caleydo/tdp_bi_bioinfodb/issues/419 * Replace `gene_map_ensgs` request with native idtype mapping * Remove python DB view * Remove `_id` from typing, as it was not returned by the API and was not used previously * Remove orphan import * Fix typo in depletion screen score name * Allow for the domain of the scores to be auto-inferred (#175) Co-authored-by: Holger Stitz * Fix Typescript compile errors in `selectionChanged` and `parameterCanged` of ranking views (#191) * Fix TS errors ranking views The return value of `selectionChanged` and `parameterCanged` has been typed/changed in https://github.com/datavisyn/tdp_core/pull/725 * Fix data type select in welcome tour (#192) * Fix outdated dist folder (#194) * Prepare github changes * Remove circleci * prepare release 12.1.0 * Update publish.yml Co-authored-by: oltionchampari Co-authored-by: Holger Stitz Co-authored-by: Champari Oltion <51322092+oltionchampari@users.noreply.github.com> Co-authored-by: anita-steiner <> Co-authored-by: Anita Steiner --- .circleci/config.yml | 119 ------------------ .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE/bug-report.md | 36 ++++++ .github/ISSUE_TEMPLATE/feature-request.md | 17 +++ .github/pull_request_template.md | 45 +++++++ .github/workflows/build.yml | 8 ++ .github/workflows/publish.yml | 9 ++ .github/workflows/release.yml | 8 ++ dist/common/config.d.ts | 4 + dist/common/config.d.ts.map | 2 +- dist/common/config.js | 55 +++++--- dist/common/config.js.map | 2 +- dist/scores/AggregatedScore.js | 2 +- dist/scores/AggregatedScore.js.map | 2 +- dist/scores/SingleScore.d.ts.map | 2 +- dist/scores/SingleScore.js | 4 +- dist/scores/SingleScore.js.map | 2 +- dist/tours/WelcomeTour.js | 2 +- dist/tours/WelcomeTour.js.map | 2 +- dist/views/ACombinedDependentTable.d.ts | 2 +- dist/views/ACombinedDependentTable.d.ts.map | 2 +- dist/views/ACombinedDependentTable.js | 3 +- dist/views/ACombinedDependentTable.js.map | 2 +- dist/views/CoExpression.d.ts | 1 - dist/views/CoExpression.d.ts.map | 2 +- dist/views/CombinedDependentSampleTable.d.ts | 2 +- .../CombinedDependentSampleTable.d.ts.map | 2 +- dist/views/CombinedDependentSampleTable.js | 5 +- .../views/CombinedDependentSampleTable.js.map | 2 +- dist/views/DependentGeneTable.d.ts | 2 +- dist/views/DependentSampleTable.d.ts | 2 +- dist/views/ExpressionVsCopyNumber.d.ts.map | 2 +- dist/views/ExpressionVsCopyNumber.js | 7 +- dist/views/ExpressionVsCopyNumber.js.map | 2 +- dist/views/GeneInstantView.d.ts.map | 2 +- dist/views/GeneInstantView.js | 5 +- dist/views/GeneInstantView.js.map | 2 +- dist/views/InfoTable.d.ts | 3 +- dist/views/InfoTable.d.ts.map | 2 +- dist/views/InfoTable.js | 4 +- dist/views/InfoTable.js.map | 2 +- dist/views/SimilarityView.d.ts | 4 +- dist/views/SimilarityView.d.ts.map | 2 +- dist/views/SimilarityView.js | 6 +- dist/views/SimilarityView.js.map | 2 +- dist/views/ViewUtils.d.ts | 1 - dist/views/ViewUtils.d.ts.map | 2 +- dist/views/ViewUtils.js | 24 ++-- dist/views/ViewUtils.js.map | 2 +- fakeUsers.db | Bin 0 -> 8192 bytes package.json | 6 +- requirements.txt | 2 +- src/common/config.ts | 59 ++++++--- src/scores/AggregatedScore.ts | 2 +- src/scores/SingleScore.ts | 8 +- src/tours/WelcomeTour.ts | 2 +- src/views/ACombinedDependentTable.ts | 5 +- src/views/CombinedDependentSampleTable.ts | 7 +- src/views/ExpressionVsCopyNumber.ts | 8 +- src/views/GeneInstantView.ts | 5 +- src/views/InfoTable.ts | 4 +- src/views/SimilarityView.ts | 8 +- src/views/ViewUtils.ts | 32 +++-- tdp_publicdb/data.py | 2 +- ..._1244_5a8dc3921597_new_depletion_scores.py | 105 ++++++++++++++++ tdp_publicdb/query_gene.py | 18 --- 66 files changed, 419 insertions(+), 277 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/publish.yml create mode 100644 .github/workflows/release.yml create mode 100644 fakeUsers.db create mode 100644 tdp_publicdb/migration/versions/20220614_1244_5a8dc3921597_new_depletion_scores.py diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 251ce44b..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,119 +0,0 @@ -version: 2.1 - -executors: - python-executor: - working_directory: ~/phovea-python - docker: - - image: circleci/python:3.10-buster - node-executor: - working_directory: ~/phovea-web - docker: - - image: circleci/node:14.17-buster - -jobs: - python-build: - executor: python-executor - steps: - - checkout - - restore_cache: - key: deps-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }} - - run: - name: Install pip requirements - command: | - virtualenv ~/venv - . ~/venv/bin/activate - make develop - - save_cache: - key: deps-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }} - paths: - - ~/venv - - run: - name: Force an update of pip dependencies from git repositories # not sure if this is working ? - command: | - . ~/venv/bin/activate - pip install --upgrade --upgrade-strategy=only-if-needed -e .[develop] - - run: - name: Show installed pip packages - command: | - . ~/venv/bin/activate - pip list || true - - run: - name: Linting - command: | - . ~/venv/bin/activate - make lint check-format - - run: - name: Run tests - command: | - . ~/venv/bin/activate - make test - - run: - name: Build wheel - command: | - . ~/venv/bin/activate - make build - - store_artifacts: - path: dist_python - destination: dist-python - - persist_to_workspace: - root: ~/. - paths: phovea-python - web-build: - executor: node-executor - steps: - - checkout - - run: - name: Show Node.js and npm version - command: | - node -v - npm -v - - restore_cache: - key: deps0-{{ .Branch }}-{{ checksum "package.json" }} - - run: - name: Install npm dependencies - command: npm install - - run: - name: Remove npm dependencies installed from git repositories (avoid caching of old commits) - command: | - (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf - - save_cache: - key: deps0-{{ .Branch }}-{{ checksum "package.json" }} - paths: ./node_modules - - run: - name: Install npm dependencies from git repositories (always get latest commit) - command: npm install - - run: - name: Show installed npm dependencies - command: npm list --depth=1 || true - - run: - name: Build - command: npm run dist - - store_artifacts: - path: dist - destination: dist-web - - persist_to_workspace: - root: ~/. - paths: phovea-web -workflows: - version: 2.1 -# build-nightly: -# triggers: -# - schedule: -# cron: "15 1 * * 1-5" # "At 01:15 on every day-of-week from Monday through Friday.โ€, see: https://crontab.guru/#15_1_*_*_1-5 -# filters: -# branches: -# only: -# - develop -# jobs: -# - python-build -# - web-build - build-branches-and-tags: - jobs: - - python-build: - filters: - tags: - only: /.*/ - - web-build: - filters: - tags: - only: /.*/ diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9836a901..4c1e8fa7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ * @thinkh + diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 00000000..d39e18b7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,36 @@ +--- +name: ๐Ÿ›Bug Report +about: Create a bug report to help us improve +title: "" +labels: ["type: bug"] +assignees: "" + +--- + +### Environment + + * Release number or git hash: + * Browser: + * Deployed / Local: +--- + +### Steps to reproduce the bug + +1. Open a list of ... / Search ... +2. Do something else + +### Observed Behavior + +> Please provide a short description of the actual behavior you observed +> If applicable, add screenshots to help explain your problem. +> - Any unexpected output or action (or lack of expected output or action) +> - Web browser console errors (including tracebacks) +> - Server errors (relevant messages and tracebacks) +> - Static or animated images showing the UI behavior + +### Expected Behavior + +> Please provide a short description which behavior you expected from your steps + +Thanks for taking the time to fill out this bug report ๐Ÿค— +Make sure there aren't any open/closed issues for this topic ๐Ÿ˜ƒ diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 00000000..1be6f2c1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,17 @@ +--- +name: โœจFeature Request +about: Request a new feature or enhancement +title: "" +labels: ["type: feature"] +--- + +## Short description + +Please provide a short description which summarizes the idea behind this feature request and why this is useful. + +## User stories + +* As a *user*, I want to ... so that ... + + +Please make sure this feature request hasn't been already submitted by someone by looking through other open/closed issues ๐Ÿ˜ƒ diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..266c6ef0 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,45 @@ +Closes *list issues numbers here* + +### Developer Checklist (Definition of Done) + +**Issue** + +- [ ] All acceptance criteria from the issue are met +- [ ] Tested in latest Chrome/Firefox + +**UI/UX/Vis** + +- [ ] Requires UI/UX/Vis review + - [ ] Reviewer(s) are notified (_tag assignees_) + - [ ] Review has occurred (_link to notes_) + - [ ] Feedback is included in this PR + - [ ] Reviewer(s) approve of concept and design + +**Code** + +- [ ] Branch is up-to-date with the branch to be merged with, i.e., develop +- [ ] Code is cleaned up and formatted +- [ ] Unit tests are written (frontend/backend if applicable) +- [ ] Integration tests are written (if applicable) + +**PR** + +- [ ] Descriptive title for this pull request is provided (will be used for release notes later) +- [ ] Reviewer and assignees are defined +- [ ] Add type label (e.g., *bug*, *feature*) to this pull request +- [ ] Add release label (e.g., `release: minor`) to this PR following [semver](https://semver.org/) +- [ ] The PR is connected to the corresponding issue (via `Closes #...`) +- [ ] [Summary of changes](#summary-of-changes) is written + + +### Summary of changes + +- + +### Screenshots + + +### Additional notes for the reviewer(s) + +- +Thanks for creating this pull request ๐Ÿค— diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..ddec7288 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,8 @@ +name: build + +on: [push, workflow_dispatch] + +jobs: + build: + uses: datavisyn/github-workflows/.github/workflows/build-node-python.yml@main + secrets: inherit diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..7b53cb6e --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,9 @@ +name: publish + +on: workflow_dispatch + +jobs: + publish: + uses: datavisyn/github-workflows/.github/workflows/publish-node-python.yml@main + secrets: + DV_DEVOPS: ${{ secrets.DV_DEVOPS }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..1720aaba --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,8 @@ +name: release + +on: workflow_dispatch + +jobs: + release: + uses: datavisyn/github-workflows/.github/workflows/release-source.yml@main + secrets: inherit diff --git a/dist/common/config.d.ts b/dist/common/config.d.ts index bd372840..72f56274 100644 --- a/dist/common/config.d.ts +++ b/dist/common/config.d.ts @@ -73,6 +73,10 @@ export interface IDataSubtypeConfig { domain?: number[]; missingValue?: number; constantDomain?: boolean; + /** + * Value of the column filter. + */ + filter?: string; } export declare const expression: IDataTypeConfig; export declare const copyNumber: IDataTypeConfig; diff --git a/dist/common/config.d.ts.map b/dist/common/config.d.ts.map index 8a9b47cf..6376cfb1 100644 --- a/dist/common/config.d.ts.map +++ b/dist/common/config.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAmB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD;;GAEG;AACH,UAAU,qBAAqB;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,aAAa,GAAG,qBAAqB,EAAE,CAAC;IAE1E;;OAEG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,eAAO,MAAM,QAAQ,EAAE,iBAwDtB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,iBA8DpB,CAAC;AA+BF,eAAO,MAAM,IAAI,EAAE,iBAkClB,CAAC;AAEF,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAE9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,GAAG,iBAAiB,CAqB7D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAG1B,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAG9D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,UAAU,EAAE,eAyBxB,CAAC;AAMF,eAAO,MAAM,UAAU,EAAE,eAkCxB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,eAoDtB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,eAkCvB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,eAkCxB,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,iBASlB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,eAAe,EAAuC,CAAC;AAE/E,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;EA2BzE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAI1G"} \ No newline at end of file +{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAmB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD;;GAEG;AACH,UAAU,qBAAqB;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,aAAa,GAAG,qBAAqB,EAAE,CAAC;IAE1E;;OAEG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,eAAO,MAAM,QAAQ,EAAE,iBAwDtB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,iBA8DpB,CAAC;AA+BF,eAAO,MAAM,IAAI,EAAE,iBAkClB,CAAC;AAEF,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAE9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,GAAG,iBAAiB,CAqB7D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAG1B,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAG9D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,UAAU,EAAE,eAyBxB,CAAC;AAMF,eAAO,MAAM,UAAU,EAAE,eAkCxB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,eAoDtB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,eAyDvB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,eAkCxB,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,iBASlB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,eAAe,EAAuC,CAAC;AAE/E,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;EA2BzE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAI1G"} \ No newline at end of file diff --git a/dist/common/config.js b/dist/common/config.js index 85a8bc43..823833ec 100644 --- a/dist/common/config.js +++ b/dist/common/config.js @@ -226,7 +226,7 @@ export const expression = { id: 'tpm', name: 'Normalized Gene Expression (TPM Values)', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: true, useForAggregation: 'tpm', @@ -235,7 +235,7 @@ export const expression = { id: 'counts', name: 'Raw Counts', type: dataSubtypes.number, - domain: [0, 10000], + domain: [null, null], missingValue: NaN, constantDomain: true, useForAggregation: 'counts', @@ -255,7 +255,7 @@ export const copyNumber = { id: 'relativecopynumber', name: 'Relative Copy Number', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, constantDomain: true, useForAggregation: 'relativecopynumber', @@ -264,7 +264,7 @@ export const copyNumber = { id: 'totalabscopynumber', name: 'Total Absolute Copy Number', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, constantDomain: true, useForAggregation: 'totalabscopynumber', @@ -293,7 +293,7 @@ export const mutation = { type: dataSubtypes.cat, categories: toLineUpCategories(Categories.mutationCat), useForAggregation: 'aa_mutated', - domain: [0, 100], + domain: [0, null], missingValue: Categories.unknownMutationValue, }, // just for single score: @@ -302,7 +302,7 @@ export const mutation = { name: 'AA Mutation', type: dataSubtypes.string, useForAggregation: '', - domain: [0, 100], + domain: [0, null], missingValue: NaN, }, { @@ -311,7 +311,7 @@ export const mutation = { type: dataSubtypes.cat, categories: toLineUpCategories(Categories.mutationCat), useForAggregation: 'dna_mutated', - domain: [0, 100], + domain: [0, null], missingValue: Categories.unknownMutationValue, }, // just for single score: @@ -320,14 +320,14 @@ export const mutation = { name: 'DNA Mutation', type: dataSubtypes.string, useForAggregation: '', - domain: [0, 100], + domain: [0, null], missingValue: NaN, }, { id: 'zygosity', name: 'Zygosity', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, useForAggregation: 'zygosity', }, @@ -335,7 +335,7 @@ export const mutation = { }; export const depletion = { id: 'depletion', - name: 'Depletion Screen ', + name: 'Depletion Screen', tableName: 'depletionscore', query: 'depletion_score', dataSubtypes: [ @@ -343,28 +343,51 @@ export const depletion = { id: 'rsa', name: 'DRIVE RSA (ER McDonald III et al., Cell, 2017)', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'rsa', + filter: 'Drive', }, { id: 'ataris', name: 'DRIVE ATARiS (ER McDonald III et al., Cell, 2017)', type: dataSubtypes.number, - domain: [0, 10000], + domain: [0, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ataris', + filter: 'Drive', }, { id: 'ceres', name: 'Avana CERES (Robin M. Meyers et al., Nature Genetics, 2017)', type: dataSubtypes.number, - domain: [0, 10000], + domain: [0, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ceres', + filter: 'Avana', + }, + { + id: 'chronos', + name: 'AVANA Chronos (DepMap.org)', + type: dataSubtypes.number, + domain: [0, null], + missingValue: NaN, + constantDomain: false, + useForAggregation: 'chronos', + filter: 'Avana', + }, + { + id: 'escore', + name: 'Sanger E-score (Fiona M. Behan et al., Nature 2019)', + type: dataSubtypes.number, + domain: [0, null], + missingValue: NaN, + constantDomain: false, + useForAggregation: 'escore', + filter: 'Sanger', }, ], }; @@ -378,7 +401,7 @@ export const drugScreen = { id: 'actarea', name: 'Activity Area', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'actarea', @@ -387,7 +410,7 @@ export const drugScreen = { id: 'ic50', name: 'IC50', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ic50', @@ -396,7 +419,7 @@ export const drugScreen = { id: 'ec50', name: 'EC50', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ec50', diff --git a/dist/common/config.js.map b/dist/common/config.js.map index 9f9b40c7..93a55d1a 100644 --- a/dist/common/config.js.map +++ b/dist/common/config.js.map @@ -1 +1 @@ -{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/scores/AggregatedScore.js b/dist/scores/AggregatedScore.js index c7d968b1..f2eaa0e1 100644 --- a/dist/scores/AggregatedScore.js +++ b/dist/scores/AggregatedScore.js @@ -29,7 +29,7 @@ export class AggregatedDepletionScore extends AAggregatedScore { } createFilter() { return { - depletionscreen: this.dataSubType.id === 'ceres' ? 'Avana' : 'Drive', + depletionscreen: this.dataSubType.filter, }; } // Factories for depletion scores for DRIVE data diff --git a/dist/scores/AggregatedScore.js.map b/dist/scores/AggregatedScore.js.map index e8f99e3d..2ba1a7f7 100644 --- a/dist/scores/AggregatedScore.js.map +++ b/dist/scores/AggregatedScore.js.map @@ -1 +1 @@ -{"version":3,"file":"AggregatedScore.js","sourceRoot":"","sources":["../../src/scores/AggregatedScore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;IACzC,aAAa;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,+BAA+B,CAAC,IAAI,EAAE,UAAuB;QAClE,OAAO,eAAe,CAAC,mCAAmC,CACxD,IAAI,EACJ,UAAU,EACV,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EACnE,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CACzF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,mCAAmC,CACxC,IAAI,EACJ,UAAuB,EACvB,sBAA2G,EAC3G,qBAA6H;QAE7H,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,WAAW,KAAK,WAAW,IAAI,WAAW,KAAK,OAAO,EAAE;YAC1D,8FAA8F;YAC9F,MAAM,SAAS,GAAG,WAAW,KAAK,OAAO,CAAC;YAC1C,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;SAClE;QACD,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;IAClD,aAAa;QACrB,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY;QACpB,OAAO;YACL,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;SACrE,CAAC;IACJ,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,8BAA8B,CAAC,IAAI,EAAE,UAAuB;QACjE,OAAO,eAAe,CAAC,mCAAmC,CACxD,IAAI,EACJ,UAAU,EACV,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC5E,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAClG,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"AggregatedScore.js","sourceRoot":"","sources":["../../src/scores/AggregatedScore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;IACzC,aAAa;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,+BAA+B,CAAC,IAAI,EAAE,UAAuB;QAClE,OAAO,eAAe,CAAC,mCAAmC,CACxD,IAAI,EACJ,UAAU,EACV,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EACnE,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CACzF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,mCAAmC,CACxC,IAAI,EACJ,UAAuB,EACvB,sBAA2G,EAC3G,qBAA6H;QAE7H,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,WAAW,KAAK,WAAW,IAAI,WAAW,KAAK,OAAO,EAAE;YAC1D,8FAA8F;YAC9F,MAAM,SAAS,GAAG,WAAW,KAAK,OAAO,CAAC;YAC1C,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;SAClE;QACD,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;IAClD,aAAa;QACrB,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY;QACpB,OAAO;YACL,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;SACzC,CAAC;IACJ,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,8BAA8B,CAAC,IAAI,EAAE,UAAuB;QACjE,OAAO,eAAe,CAAC,mCAAmC,CACxD,IAAI,EACJ,UAAU,EACV,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC5E,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAClG,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file diff --git a/dist/scores/SingleScore.d.ts.map b/dist/scores/SingleScore.d.ts.map index 2ea73ec6..95e83dda 100644 --- a/dist/scores/SingleScore.d.ts.map +++ b/dist/scores/SingleScore.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"SingleScore.d.ts","sourceRoot":"","sources":["../../src/scores/SingleScore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,UAAU,iBAAiB;IACzB,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAuBD,qBAAa,WAAY,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IAClE,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAGrG;AAED,qBAAa,oBAAqB,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IAC3E,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,YAAY,IAAI,OAAO;IAMjC,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAOpH;AAED,qBAAa,eAAgB,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB;IAK9G,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,YAAY,IAAI,OAAO;IAMjC,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAG/G"} \ No newline at end of file +{"version":3,"file":"SingleScore.d.ts","sourceRoot":"","sources":["../../src/scores/SingleScore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,UAAU,iBAAiB;IACzB,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AA2BD,qBAAa,WAAY,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IAClE,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAGrG;AAED,qBAAa,oBAAqB,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IAC3E,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,YAAY,IAAI,OAAO;IAMjC,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAOpH;AAED,qBAAa,eAAgB,SAAQ,YAAa,YAAW,MAAM,CAAC,GAAG,CAAC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB;IAK9G,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,YAAY,IAAI,OAAO;IAMjC,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE;CAG/G"} \ No newline at end of file diff --git a/dist/scores/SingleScore.js b/dist/scores/SingleScore.js index 015a7b54..7d8fbc67 100644 --- a/dist/scores/SingleScore.js +++ b/dist/scores/SingleScore.js @@ -8,7 +8,7 @@ function initializeScore(data, pluginDesc, singleScoreFactory) { const configs = data.data_types; function defineScore(name) { if (configs) { - return configs.map((ds) => singleScoreFactory({ name, data_type: ds[0], data_subtype: ds[1], maxDirectFilterRows: data.maxDirectFilterRows }, primary, opposite)); + return configs.map((ds) => singleScoreFactory({ name, screen_type: data.screen_type, data_type: ds[0], data_subtype: ds[1], maxDirectFilterRows: data.maxDirectFilterRows }, primary, opposite)); } return singleScoreFactory({ ...data, name }, primary, opposite); } @@ -31,7 +31,7 @@ export class SingleDepletionScore extends ASingleScore { } createFilter() { return { - depletionscreen: this.dataSubType.id === 'ceres' ? 'Avana' : 'Drive', + depletionscreen: this.dataSubType.filter, }; } static createSingleDepletionScore(data, pluginDesc) { diff --git a/dist/scores/SingleScore.js.map b/dist/scores/SingleScore.js.map index e2f574b5..37b76f4a 100644 --- a/dist/scores/SingleScore.js.map +++ b/dist/scores/SingleScore.js.map @@ -1 +1 @@ -{"version":3,"file":"SingleScore.js","sourceRoot":"","sources":["../../src/scores/SingleScore.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"SingleScore.js","sourceRoot":"","sources":["../../src/scores/SingleScore.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/tours/WelcomeTour.js b/dist/tours/WelcomeTour.js index 11a6e799..9a0e18a5 100644 --- a/dist/tours/WelcomeTour.js +++ b/dist/tours/WelcomeTour.js @@ -113,7 +113,7 @@ export class WelcomeTour { placement: 'centered', html: `As data type, we choose 'Relative Copy Number'`, postAction: () => { - TourUtils.setValueAndTrigger('.col > select', 'copy_number-relativecopynumber', 'change'); + TourUtils.setValueAndTrigger('.modal.show .col > select', 'copy_number-relativecopynumber', 'change'); }, }, { diff --git a/dist/tours/WelcomeTour.js.map b/dist/tours/WelcomeTour.js.map index cc97277b..0957a44f 100644 --- a/dist/tours/WelcomeTour.js.map +++ b/dist/tours/WelcomeTour.js.map @@ -1 +1 @@ -{"version":3,"file":"WelcomeTour.js","sourceRoot":"","sources":["../../src/tours/WelcomeTour.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"WelcomeTour.js","sourceRoot":"","sources":["../../src/tours/WelcomeTour.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/ACombinedDependentTable.d.ts b/dist/views/ACombinedDependentTable.d.ts index 748b40a8..8eb1b95e 100644 --- a/dist/views/ACombinedDependentTable.d.ts +++ b/dist/views/ACombinedDependentTable.d.ts @@ -9,7 +9,7 @@ export declare abstract class ACombinedDependentTable extends ARankingView { protected getParameterFormDescs(): import("tdp_core").IFormElementDesc[]; private get subTypes(); protected createSelectionAdapter(): import("tdp_core").ISelectionAdapter; - protected parameterChanged(name: string): void; + protected parameterChanged(name: string): Promise; protected loadColumnDesc(): Promise>; protected getColumnDescs(columns: IServerColumn[]): IAdditionalColumnDesc[]; protected loadRows(): Promise; diff --git a/dist/views/ACombinedDependentTable.d.ts.map b/dist/views/ACombinedDependentTable.d.ts.map index 72d2f716..8994e547 100644 --- a/dist/views/ACombinedDependentTable.d.ts.map +++ b/dist/views/ACombinedDependentTable.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ACombinedDependentTable.d.ts","sourceRoot":"","sources":["../../src/views/ACombinedDependentTable.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EAGZ,aAAa,EACb,qBAAqB,EACrB,SAAS,EAIV,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAElF,8BAAsB,uBAAwB,SAAQ,YAAY;IAGe,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE;IAF7H,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;gBAE5B,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAqB,QAAQ,EAAE,eAAe,EAAE,EAAE,OAAO,KAAK;IAoB3I,SAAS,CAAC,QAAQ,KAAK,kBAAkB,IAAI,iBAAiB,CAAC;IAE/D,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,qBAAqB;IAY/B,OAAO,KAAK,QAAQ,GAMnB;IAED,SAAS,CAAC,sBAAsB;IAiBhC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAOvC,SAAS,CAAC,cAAc;IAIxB,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE;IAIjD,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM;cAIzD,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAWhE,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;CAqB7G"} \ No newline at end of file +{"version":3,"file":"ACombinedDependentTable.d.ts","sourceRoot":"","sources":["../../src/views/ACombinedDependentTable.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EAGZ,aAAa,EACb,qBAAqB,EACrB,SAAS,EAIV,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAElF,8BAAsB,uBAAwB,SAAQ,YAAY;IAGe,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE;IAF7H,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;gBAE5B,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAqB,QAAQ,EAAE,eAAe,EAAE,EAAE,OAAO,KAAK;IAoB3I,SAAS,CAAC,QAAQ,KAAK,kBAAkB,IAAI,iBAAiB,CAAC;IAE/D,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,qBAAqB;IAY/B,OAAO,KAAK,QAAQ,GAMnB;IAED,SAAS,CAAC,sBAAsB;IAiBhC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvD,SAAS,CAAC,cAAc;IAIxB,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE;IAIjD,SAAS,CAAC,QAAQ;IAMlB,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM;cAIzD,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAWhE,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;CAqB7G"} \ No newline at end of file diff --git a/dist/views/ACombinedDependentTable.js b/dist/views/ACombinedDependentTable.js index a4d1008e..ad6aae81 100644 --- a/dist/views/ACombinedDependentTable.js +++ b/dist/views/ACombinedDependentTable.js @@ -58,8 +58,9 @@ export class ACombinedDependentTable extends ARankingView { parameterChanged(name) { super.parameterChanged(name); if (name === 'filter') { - this.reloadData(); + return this.reloadData(); } + return Promise.resolve(); } loadColumnDesc() { return RestBaseUtils.getTDPDesc(this.dataSource.db, this.oppositeDataSource.base); diff --git a/dist/views/ACombinedDependentTable.js.map b/dist/views/ACombinedDependentTable.js.map index a163058b..680843a5 100644 --- a/dist/views/ACombinedDependentTable.js.map +++ b/dist/views/ACombinedDependentTable.js.map @@ -1 +1 @@ -{"version":3,"file":"ACombinedDependentTable.js","sourceRoot":"","sources":["../../src/views/ACombinedDependentTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAGL,YAAY,EACZ,aAAa,EAKb,aAAa,EACb,WAAW,EACX,YAAY,GACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAsC,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAElF,MAAM,OAAgB,uBAAwB,SAAQ,YAAY;IAGhE,YAAY,OAAqB,EAAE,SAAqB,EAAE,MAAmB,EAAqB,QAA2B,EAAE,OAAO,GAAG,EAAE;QACzI,KAAK,CACH,OAAO,EACP,SAAS,EACT,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACrB,wBAAwB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB;YACvD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI;YAC5C,eAAe,EAAS,WAAW;YACnC,0BAA0B,EAAE,IAAI;YAChC,wBAAwB,EAAE;gBACxB,QAAQ,EAAE,aAAa;aACxB;YACD,GAAG,SAAS,CAAC,qBAAqB,EAAE;SACrC,CAAC,CACH,CAAC;QAf8F,aAAQ,GAAR,QAAQ,CAAmB;QAiB3H,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAID,IAAI,UAAU;QACZ,OAAO,aAAa,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACnF,CAAC;IAES,qBAAqB;QAC7B,OAAO,KAAK,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC;YAC1C;gBACE,GAAG,8BAA8B;gBACjC,KAAK,EAAE,cAAc;gBACrB,UAAU,EAAE;oBACV,KAAK,EAAE,aAAa;iBACrB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAY,QAAQ;QAClB,MAAM,KAAK,GAAmC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;QAC5G,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAChC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;YACjD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAES,sBAAsB;QAC9B,OAAO,YAAY,CAAC,KAAK,CAAC;YACxB,WAAW,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;gBAChC,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBACtH,OAAO,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YACD,QAAQ,EAAE,CAAC,EAAU,EAAE,KAA8B,EAA+B,EAAE;gBACpF,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;oBAC9B,yCAAyC;oBACzC,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;oBACtH,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,wCAAwC;gBAClG,CAAC,CAAC,CAAC;YACL,CAAC;YACD,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,CAAC,CAAC;IACL,CAAC;IAES,gBAAgB,CAAC,IAAY;QACrC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;IACH,CAAC;IAES,cAAc;QACtB,OAAO,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACpF,CAAC;IAES,cAAc,CAAC,OAAwB;QAC/C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAES,QAAQ;QAChB,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;QACnD,OAAO,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7G,CAAC;IAES,uBAAuB,CAAC,IAAY;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,GAAW,EAAE,IAAY;QAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACzE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE;YAC/C,MAAM,MAAM,GAAG,GAAG,MAAM,KAAK,KAAK,GAAG,CAAC;YACtC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAES,uBAAuB,CAAC,IAAY,EAAE,KAA8B;QAC5E,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjE,MAAM,KAAK,GAAY;YACrB,IAAI;YACJ,OAAO,EAAE,YAAY,CAAC,kBAAkB,EAAE;SAC3C,CAAC;QACF,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;QAEzE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9C,OAAO,aAAa,CAAC,WAAW,CAC9B,IAAI,CAAC,UAAU,CAAC,EAAE,EAClB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,eAAe,EACtE;gBACE,KAAK,EAAE,QAAQ,CAAC,SAAS;gBACzB,SAAS,EAAE,WAAW,CAAC,EAAE;gBACzB,GAAG,KAAK;aACT,EACD,MAAM,CACP,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"ACombinedDependentTable.js","sourceRoot":"","sources":["../../src/views/ACombinedDependentTable.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/CoExpression.d.ts b/dist/views/CoExpression.d.ts index e32ae109..713616dc 100644 --- a/dist/views/CoExpression.d.ts +++ b/dist/views/CoExpression.d.ts @@ -10,7 +10,6 @@ export declare class CoExpression extends ACoExpression { loadGeneList(ensgs: string[]): Promise<{ id: string; symbol: string; - _id: number; }[]>; loadData(ensg: string): Promise; loadFirstName(ensg: string): Promise; diff --git a/dist/views/CoExpression.d.ts.map b/dist/views/CoExpression.d.ts.map index f35057c7..eb40fddc 100644 --- a/dist/views/CoExpression.d.ts.map +++ b/dist/views/CoExpression.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"CoExpression.d.ts","sourceRoot":"","sources":["../../src/views/CoExpression.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAmB,gBAAgB,EAAsD,MAAM,UAAU,CAAC;AACjH,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,EAAgB,MAAM,UAAU,CAAC;AAK1F,qBAAa,YAAa,SAAQ,aAAa;IAC7C,SAAS,CAAC,qBAAqB,IAAI,gBAAgB,EAAE;IAqBrD,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,WAAW,GAEtB;IAED,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE;;;;;IAI5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmBvD,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,SAAS,CAAC,gBAAgB;IAI1B,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAOvC,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;CAI9D"} \ No newline at end of file +{"version":3,"file":"CoExpression.d.ts","sourceRoot":"","sources":["../../src/views/CoExpression.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAmB,gBAAgB,EAAsD,MAAM,UAAU,CAAC;AACjH,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,EAAgB,MAAM,UAAU,CAAC;AAK1F,qBAAa,YAAa,SAAQ,aAAa;IAC7C,SAAS,CAAC,qBAAqB,IAAI,gBAAgB,EAAE;IAqBrD,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,WAAW,GAEtB;IAED,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE;;;;IAI5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmBvD,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,SAAS,CAAC,gBAAgB;IAI1B,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAOvC,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;CAI9D"} \ No newline at end of file diff --git a/dist/views/CombinedDependentSampleTable.d.ts b/dist/views/CombinedDependentSampleTable.d.ts index 7d9538fb..3fb27d3b 100644 --- a/dist/views/CombinedDependentSampleTable.d.ts +++ b/dist/views/CombinedDependentSampleTable.d.ts @@ -5,7 +5,7 @@ export declare class CombinedDependentSampleTable extends ACombinedDependentTabl constructor(context: IViewContext, selection: ISelection, parent: HTMLElement, dataType: IDataTypeConfig[]); protected get oppositeDataSource(): IDataSourceConfig; protected getParameterFormDescs(): import("tdp_core").IFormElementDesc[]; - protected parameterChanged(name: string): void; + protected parameterChanged(name: string): Promise; protected getSelectionColumnLabel(ensg: string): Promise; static createCombinedDependentSampleTable(context: IViewContext, selection: ISelection, parent: HTMLElement): CombinedDependentSampleTable; } diff --git a/dist/views/CombinedDependentSampleTable.d.ts.map b/dist/views/CombinedDependentSampleTable.d.ts.map index 2ba92147..3f492a8c 100644 --- a/dist/views/CombinedDependentSampleTable.d.ts.map +++ b/dist/views/CombinedDependentSampleTable.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"CombinedDependentSampleTable.d.ts","sourceRoot":"","sources":["../../src/views/CombinedDependentSampleTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAA0C,eAAe,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,qBAAa,4BAA6B,SAAQ,uBAAuB;gBAC3D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE;IAM1G,SAAS,KAAK,kBAAkB,sBAE/B;IAED,SAAS,CAAC,qBAAqB;IAO/B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAQvC,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM;IAI9C,MAAM,CAAC,kCAAkC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW;CAG5G"} \ No newline at end of file +{"version":3,"file":"CombinedDependentSampleTable.d.ts","sourceRoot":"","sources":["../../src/views/CombinedDependentSampleTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAA0C,eAAe,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,qBAAa,4BAA6B,SAAQ,uBAAuB;gBAC3D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE;IAM1G,SAAS,KAAK,kBAAkB,sBAE/B;IAED,SAAS,CAAC,qBAAqB;IAO/B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvD,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM;IAI9C,MAAM,CAAC,kCAAkC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW;CAG5G"} \ No newline at end of file diff --git a/dist/views/CombinedDependentSampleTable.js b/dist/views/CombinedDependentSampleTable.js index e11a336b..78c7a2af 100644 --- a/dist/views/CombinedDependentSampleTable.js +++ b/dist/views/CombinedDependentSampleTable.js @@ -18,10 +18,9 @@ export class CombinedDependentSampleTable extends ACombinedDependentTable { } parameterChanged(name) { if (name === FORM_DATA_SOURCE.id) { - this.rebuild(); - return; // early abort since there is nothing worse than building from scratch + return this.rebuild(); } - super.parameterChanged(name); + return super.parameterChanged(name); } getSelectionColumnLabel(ensg) { return ViewUtils.loadFirstName(ensg); diff --git a/dist/views/CombinedDependentSampleTable.js.map b/dist/views/CombinedDependentSampleTable.js.map index bd7545e1..e7d33dee 100644 --- a/dist/views/CombinedDependentSampleTable.js.map +++ b/dist/views/CombinedDependentSampleTable.js.map @@ -1 +1 @@ -{"version":3,"file":"CombinedDependentSampleTable.js","sourceRoot":"","sources":["../../src/views/CombinedDependentSampleTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAsC,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IACvE,YAAY,OAAqB,EAAE,SAAqB,EAAE,MAAmB,EAAE,QAA2B;QACxG,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,IAAc,kBAAkB;QAC9B,OAA0B,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC;IAES,qBAAqB;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAES,gBAAgB,CAAC,IAAY;QACrC,IAAI,IAAI,KAAK,gBAAgB,CAAC,EAAE,EAAE;YAChC,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,CAAC,sEAAsE;SAC/E;QACD,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAES,uBAAuB,CAAC,IAAY;QAC5C,OAAO,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,kCAAkC,CAAC,OAAqB,EAAE,SAAqB,EAAE,MAAmB;QACzG,OAAO,IAAI,4BAA4B,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1G,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"CombinedDependentSampleTable.js","sourceRoot":"","sources":["../../src/views/CombinedDependentSampleTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAsC,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IACvE,YAAY,OAAqB,EAAE,SAAqB,EAAE,MAAmB,EAAE,QAA2B;QACxG,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,IAAc,kBAAkB;QAC9B,OAA0B,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC;IAES,qBAAqB;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAES,gBAAgB,CAAC,IAAY;QACrC,IAAI,IAAI,KAAK,gBAAgB,CAAC,EAAE,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;SACvB;QACD,OAAO,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAES,uBAAuB,CAAC,IAAY;QAC5C,OAAO,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,kCAAkC,CAAC,OAAqB,EAAE,SAAqB,EAAE,MAAmB;QACzG,OAAO,IAAI,4BAA4B,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1G,CAAC;CACF"} \ No newline at end of file diff --git a/dist/views/DependentGeneTable.d.ts b/dist/views/DependentGeneTable.d.ts index 959015cb..95d824d3 100644 --- a/dist/views/DependentGeneTable.d.ts +++ b/dist/views/DependentGeneTable.d.ts @@ -8,7 +8,7 @@ export declare class DependentGeneTable extends ARankingView { private readonly dataSource; constructor(context: IViewContext, selection: ISelection, parent: HTMLElement, dataType: IDataTypeConfig, options?: Partial); protected getParameterFormDescs(): import("tdp_core").IFormElementDesc[]; - protected parameterChanged(name: string): Promise; + protected parameterChanged(name: string): Promise; protected loadColumnDesc(): Promise>; protected createSelectionAdapter(): import("tdp_core").ISelectionAdapter; protected getColumnDescs(columns: IServerColumn[]): import("tdp_core").IAdditionalColumnDesc[]; diff --git a/dist/views/DependentSampleTable.d.ts b/dist/views/DependentSampleTable.d.ts index c46bd86a..feaeed55 100644 --- a/dist/views/DependentSampleTable.d.ts +++ b/dist/views/DependentSampleTable.d.ts @@ -10,7 +10,7 @@ export declare class DependentSampleTable extends ARankingView { get itemIDType(): import("tdp_core").IDType; private get dataSource(); private get dataSubType(); - protected parameterChanged(name: string): Promise; + protected parameterChanged(name: string): Promise; protected loadColumnDesc(): Promise>; protected createSelectionAdapter(): import("tdp_core").ISelectionAdapter; protected getColumnDescs(columns: IServerColumn[]): import("tdp_core").IAdditionalColumnDesc[]; diff --git a/dist/views/ExpressionVsCopyNumber.d.ts.map b/dist/views/ExpressionVsCopyNumber.d.ts.map index ecd23917..7df25719 100644 --- a/dist/views/ExpressionVsCopyNumber.d.ts.map +++ b/dist/views/ExpressionVsCopyNumber.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ExpressionVsCopyNumber.d.ts","sourceRoot":"","sources":["../../src/views/ExpressionVsCopyNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAS7E,qBAAa,sBAAuB,SAAQ,uBAAuB;IACjE,SAAS,CAAC,qBAAqB,IAAI,gBAAgB,EAAE;IAQrD,OAAO,KAAK,UAAU,GAErB;IAED,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAmB3D,SAAS,CAAC,mBAAmB;;;;;IAM7B,SAAS,CAAC,mBAAmB;;;;;IAM7B,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE;CAM/B"} \ No newline at end of file +{"version":3,"file":"ExpressionVsCopyNumber.d.ts","sourceRoot":"","sources":["../../src/views/ExpressionVsCopyNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsD,MAAM,UAAU,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAgB,MAAM,UAAU,CAAC;AAK3F,qBAAa,sBAAuB,SAAQ,uBAAuB;IACjE,SAAS,CAAC,qBAAqB,IAAI,gBAAgB,EAAE;IAQrD,OAAO,KAAK,UAAU,GAErB;IAED,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAmB3D,SAAS,CAAC,mBAAmB;;;;;IAM7B,SAAS,CAAC,mBAAmB;;;;;IAM7B,IAAI,UAAU,8BAEb;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE;CAM/B"} \ No newline at end of file diff --git a/dist/views/ExpressionVsCopyNumber.js b/dist/views/ExpressionVsCopyNumber.js index 8d4d354a..0337086c 100644 --- a/dist/views/ExpressionVsCopyNumber.js +++ b/dist/views/ExpressionVsCopyNumber.js @@ -1,8 +1,5 @@ -import { AExpressionVsCopyNumber } from 'tdp_gene'; -import { SpeciesUtils } from 'tdp_gene'; -import { IDTypeManager } from 'tdp_core'; -import { LineupUtils } from 'tdp_core'; -import { RestBaseUtils } from 'tdp_core'; +import { IDTypeManager, LineupUtils, RestBaseUtils } from 'tdp_core'; +import { AExpressionVsCopyNumber, SpeciesUtils } from 'tdp_gene'; import { ViewUtils } from './ViewUtils'; import { ParameterFormIds, FORM_TISSUE_OR_CELLLINE_FILTER, FORM_DATA_SOURCE, FORM_COLOR_CODING } from '../common/forms'; import { expression, copyNumber } from '../common/config'; diff --git a/dist/views/ExpressionVsCopyNumber.js.map b/dist/views/ExpressionVsCopyNumber.js.map index b3f4b627..1feeefa7 100644 --- a/dist/views/ExpressionVsCopyNumber.js.map +++ b/dist/views/ExpressionVsCopyNumber.js.map @@ -1 +1 @@ -{"version":3,"file":"ExpressionVsCopyNumber.js","sourceRoot":"","sources":["../../src/views/ExpressionVsCopyNumber.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ExpressionVsCopyNumber.js","sourceRoot":"","sources":["../../src/views/ExpressionVsCopyNumber.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/GeneInstantView.d.ts.map b/dist/views/GeneInstantView.d.ts.map index be5bb97f..3e65ea00 100644 --- a/dist/views/GeneInstantView.d.ts.map +++ b/dist/views/GeneInstantView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"GeneInstantView.d.ts","sourceRoot":"","sources":["../../src/views/GeneInstantView.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAiBxC,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,SAAS,CAAC,QAAQ;YAKJ,QAAQ;YAYR,KAAK;CAepB"} \ No newline at end of file +{"version":3,"file":"GeneInstantView.d.ts","sourceRoot":"","sources":["../../src/views/GeneInstantView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,YAAY,EAAoC,MAAM,UAAU,CAAC;AAezF,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,SAAS,CAAC,QAAQ;YAKJ,QAAQ;YAYR,KAAK;CAepB"} \ No newline at end of file diff --git a/dist/views/GeneInstantView.js b/dist/views/GeneInstantView.js index ebb78bc8..67e57e25 100644 --- a/dist/views/GeneInstantView.js +++ b/dist/views/GeneInstantView.js @@ -1,8 +1,5 @@ -import { IDTypeManager } from 'tdp_core'; -import { AInstantView } from 'tdp_core'; +import { IDTypeManager, AInstantView, RestBaseUtils, ErrorAlertHandler } from 'tdp_core'; import { SpeciesUtils } from 'tdp_gene'; -import { RestBaseUtils } from 'tdp_core'; -import { ErrorAlertHandler } from 'tdp_core'; import { gene } from '../common/config'; export class GeneInstantView extends AInstantView { initImpl() { diff --git a/dist/views/GeneInstantView.js.map b/dist/views/GeneInstantView.js.map index 990bbfa4..11dd5eaa 100644 --- a/dist/views/GeneInstantView.js.map +++ b/dist/views/GeneInstantView.js.map @@ -1 +1 @@ -{"version":3,"file":"GeneInstantView.js","sourceRoot":"","sources":["../../src/views/GeneInstantView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAaxC,MAAM,OAAO,eAAgB,SAAQ,YAAY;IACrC,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzH,OAAY,aAAa,CAAC,kBAAkB,CAC1C,IAAI,CAAC,EAAE,EACP,GAAG,IAAI,CAAC,IAAI,cAAc,EAC1B;YACE,OAAO,EAAE,YAAY,CAAC,kBAAkB,EAAE;SAC3C,EACD,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAC3B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,EAAE;aACZ,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG;cAChB,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,IAAI;aAC5B,KAAK,CAAC,IAAI;uBACA,KAAK,CAAC,UAAU,MAAM,KAAK,CAAC,OAAO;OACnD,CAAC;QACF,CAAC,CAAC;aACD,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;aACjD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"GeneInstantView.js","sourceRoot":"","sources":["../../src/views/GeneInstantView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAaxC,MAAM,OAAO,eAAgB,SAAQ,YAAY;IACrC,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzH,OAAY,aAAa,CAAC,kBAAkB,CAC1C,IAAI,CAAC,EAAE,EACP,GAAG,IAAI,CAAC,IAAI,cAAc,EAC1B;YACE,OAAO,EAAE,YAAY,CAAC,kBAAkB,EAAE;SAC3C,EACD,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAC3B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,EAAE;aACZ,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG;cAChB,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,IAAI;aAC5B,KAAK,CAAC,IAAI;uBACA,KAAK,CAAC,UAAU,MAAM,KAAK,CAAC,OAAO;OACnD,CAAC;QACF,CAAC,CAAC;aACD,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;aACjD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC;CACF"} \ No newline at end of file diff --git a/dist/views/InfoTable.d.ts b/dist/views/InfoTable.d.ts index 3fb86cdb..1828890b 100644 --- a/dist/views/InfoTable.d.ts +++ b/dist/views/InfoTable.d.ts @@ -1,8 +1,7 @@ /** * Created by Samuel Gratzl on 27.04.2016. */ -import { IViewContext, ISelection } from 'tdp_core'; -import { AD3View } from 'tdp_core'; +import { IViewContext, ISelection, AD3View } from 'tdp_core'; import { IDataSourceConfig } from '../common/config'; export declare abstract class AInfoTable extends AD3View { private readonly dataSource; diff --git a/dist/views/InfoTable.d.ts.map b/dist/views/InfoTable.d.ts.map index 0cf50ae8..7700a62d 100644 --- a/dist/views/InfoTable.d.ts.map +++ b/dist/views/InfoTable.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"InfoTable.d.ts","sourceRoot":"","sources":["../../src/views/InfoTable.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAwB,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAInC,OAAO,EAAE,iBAAiB,EAA0B,MAAM,kBAAkB,CAAC;AAE7E,8BAAsB,UAAW,SAAQ,OAAO;IAWiC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAV1G,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,IAAI,CAAgB;IAE5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsD;gBAEjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAmB,UAAU,EAAE,iBAAiB;IAQ7H,SAAS,CAAC,QAAQ;IAMlB,gBAAgB;YAKF,gBAAgB;YAahB,MAAM;IAYpB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,eAAe;IAyBvB,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE;CACjE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;gBACnC,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAoGpB;AAED,qBAAa,aAAc,SAAQ,UAAU;gBAC/B,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAgDpB;AAED,qBAAa,eAAgB,SAAQ,UAAU;gBACjC,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAwEpB"} \ No newline at end of file +{"version":3,"file":"InfoTable.d.ts","sourceRoot":"","sources":["../../src/views/InfoTable.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAwB,OAAO,EAAiB,MAAM,UAAU,CAAC;AAGlG,OAAO,EAAE,iBAAiB,EAA0B,MAAM,kBAAkB,CAAC;AAE7E,8BAAsB,UAAW,SAAQ,OAAO;IAWiC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAV1G,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAE1C,OAAO,CAAC,IAAI,CAAgB;IAE5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsD;gBAEjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAmB,UAAU,EAAE,iBAAiB;IAQ7H,SAAS,CAAC,QAAQ;IAMlB,gBAAgB;YAKF,gBAAgB;YAahB,MAAM;IAYpB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,eAAe;IAyBvB,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE;CACjE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;gBACnC,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAoGpB;AAED,qBAAa,aAAc,SAAQ,UAAU;gBAC/B,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAgDpB;AAED,qBAAa,eAAgB,SAAQ,UAAU;gBACjC,OAAO,KAAA,EAAE,SAAS,KAAA,EAAE,MAAM,KAAA;IAItC,SAAS,CAAC,SAAS;;;;CAwEpB"} \ No newline at end of file diff --git a/dist/views/InfoTable.js b/dist/views/InfoTable.js index f9f0fd11..384005cd 100644 --- a/dist/views/InfoTable.js +++ b/dist/views/InfoTable.js @@ -1,9 +1,7 @@ /** * Created by Samuel Gratzl on 27.04.2016. */ -import { IDTypeManager } from 'tdp_core'; -import { AD3View } from 'tdp_core'; -import { RestBaseUtils } from 'tdp_core'; +import { IDTypeManager, AD3View, RestBaseUtils } from 'tdp_core'; import { SpeciesUtils } from 'tdp_gene'; import { transpose as d3Transpose } from 'd3'; import { cellline, tissue, gene } from '../common/config'; diff --git a/dist/views/InfoTable.js.map b/dist/views/InfoTable.js.map index 7f410abb..537c63ed 100644 --- a/dist/views/InfoTable.js.map +++ b/dist/views/InfoTable.js.map @@ -1 +1 @@ -{"version":3,"file":"InfoTable.js","sourceRoot":"","sources":["../../src/views/InfoTable.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"InfoTable.js","sourceRoot":"","sources":["../../src/views/InfoTable.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/SimilarityView.d.ts b/dist/views/SimilarityView.d.ts index 09b6a2f3..2e980011 100644 --- a/dist/views/SimilarityView.d.ts +++ b/dist/views/SimilarityView.d.ts @@ -17,8 +17,8 @@ export declare class SimilarityView extends ARankingView { protected getColumnDescs(columns: any[]): IAdditionalColumnDesc[]; protected loadColumnDesc(): Promise; protected loadRows(): Promise; - protected parameterChanged(name: string): void; - protected selectionChanged(): void; + protected parameterChanged(name: string): Promise; + protected selectionChanged(): Promise; private updateImpl; protected createInitialRanking(provider: LocalDataProvider): void; } diff --git a/dist/views/SimilarityView.d.ts.map b/dist/views/SimilarityView.d.ts.map index bf260d43..6bf2362b 100644 --- a/dist/views/SimilarityView.d.ts.map +++ b/dist/views/SimilarityView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"SimilarityView.d.ts","sourceRoot":"","sources":["../../src/views/SimilarityView.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,EAMtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,iBAAiB,EAAqD,MAAM,UAAU,CAAC;AAKhG,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,MAAM,CAAsB;gBAExB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,oBAAoB,CAAM;IAc1H,SAAS,CAAC,qBAAqB;IAa/B,IAAI,UAAU,8BAEb;YAEa,iBAAiB;IAgB/B,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM;;;YAajB,QAAQ;IAuBtB,OAAO,CAAC,IAAI;IAOZ,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,qBAAqB,EAAE;IAIjE,SAAS,CAAC,cAAc;IAIxB,SAAS,CAAC,QAAQ;IAIlB,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAKvC,SAAS,CAAC,gBAAgB;IAK1B,OAAO,CAAC,UAAU;IAOlB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,iBAAiB;CAe3D"} \ No newline at end of file +{"version":3,"file":"SimilarityView.d.ts","sourceRoot":"","sources":["../../src/views/SimilarityView.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,EAMtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,iBAAiB,EAAqD,MAAM,UAAU,CAAC;AAKhG,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,MAAM,CAAsB;gBAExB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,oBAAoB,CAAM;IAc1H,SAAS,CAAC,qBAAqB;IAa/B,IAAI,UAAU,8BAEb;YAEa,iBAAiB;IAgB/B,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM;;;YAajB,QAAQ;IAuBtB,OAAO,CAAC,IAAI;IAOZ,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,qBAAqB,EAAE;IAIjE,SAAS,CAAC,cAAc;IAIxB,SAAS,CAAC,QAAQ;IAIlB,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvD,SAAS,CAAC,gBAAgB;IAK1B,OAAO,CAAC,UAAU;IAOlB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,iBAAiB;CAe3D"} \ No newline at end of file diff --git a/dist/views/SimilarityView.js b/dist/views/SimilarityView.js index af8bd313..772e4b4b 100644 --- a/dist/views/SimilarityView.js +++ b/dist/views/SimilarityView.js @@ -92,14 +92,14 @@ export class SimilarityView extends ARankingView { } parameterChanged(name) { super.parameterChanged(name); - this.updateImpl(); + return this.updateImpl(); } selectionChanged() { super.selectionChanged(); - this.updateImpl(); + return this.updateImpl(); } updateImpl() { - this.updateOptionsData().then(() => { + return this.updateOptionsData().then(() => { this.loader = null; this.rebuild(); }); diff --git a/dist/views/SimilarityView.js.map b/dist/views/SimilarityView.js.map index 90ee81b4..e93be3db 100644 --- a/dist/views/SimilarityView.js.map +++ b/dist/views/SimilarityView.js.map @@ -1 +1 @@ -{"version":3,"file":"SimilarityView.js","sourceRoot":"","sources":["../../src/views/SimilarityView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"SimilarityView.js","sourceRoot":"","sources":["../../src/views/SimilarityView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/ViewUtils.d.ts b/dist/views/ViewUtils.d.ts index 47c1ba4f..de60aa0e 100644 --- a/dist/views/ViewUtils.d.ts +++ b/dist/views/ViewUtils.d.ts @@ -8,7 +8,6 @@ export declare class ViewUtils { static loadGeneList(ensgs: string[]): Promise<{ id: string; symbol: string; - _id: number; }[]>; static postProcessScore(subType: IDataSubtypeConfig): (rows: IScoreRow[]) => any[]; static subTypeDesc(dataSubType: IDataSubtypeConfig, id: string, label: string, col?: string): import("tdp_core").IAdditionalColumnDesc; diff --git a/dist/views/ViewUtils.d.ts.map b/dist/views/ViewUtils.d.ts.map index c7d41207..ec023a73 100644 --- a/dist/views/ViewUtils.d.ts.map +++ b/dist/views/ViewUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ViewUtils.d.ts","sourceRoot":"","sources":["../../src/views/ViewUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAiB,SAAS,EAAmB,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,qBAAa,SAAS;IACpB,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOnD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAO5F,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,UACnC,UAAU,GAAG,CAAC,EAAE;IAgBhC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAc;IAUhG;;OAEG;IACH,MAAM,CAAC,qBAAqB;;;;;CAG7B"} \ No newline at end of file +{"version":3,"file":"ViewUtils.d.ts","sourceRoot":"","sources":["../../src/views/ViewUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,SAAS,EAAkC,MAAM,UAAU,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,qBAAa,SAAS;WACP,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAS5C,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcrF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,UACnC,UAAU,GAAG,CAAC,EAAE;IAgBhC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAc;IAUhG;;OAEG;IACH,MAAM,CAAC,qBAAqB;;;;;CAG7B"} \ No newline at end of file diff --git a/dist/views/ViewUtils.js b/dist/views/ViewUtils.js index 60f028c9..76f5d9bb 100644 --- a/dist/views/ViewUtils.js +++ b/dist/views/ViewUtils.js @@ -1,19 +1,21 @@ /** * Created by sam on 16.02.2017. */ -import { SpeciesUtils, FieldUtils } from 'tdp_gene'; -import { RestBaseUtils, ColumnDescUtils } from 'tdp_core'; +import { FieldUtils } from 'tdp_gene'; +import { ColumnDescUtils, IDTypeManager } from 'tdp_core'; +import { zipWith } from 'lodash'; export class ViewUtils { - static loadFirstName(ensg) { - return RestBaseUtils.getTDPData('publicdb', 'gene_map_ensgs', { - ensgs: `'${ensg}'`, - species: SpeciesUtils.getSelectedSpecies(), - }).then((r) => (r.length > 0 ? r[0].symbol || r[0].id : ensg)); + static async loadFirstName(ensg) { + const symbols = await IDTypeManager.getInstance().mapNameToFirstName(IDTypeManager.getInstance().resolveIdType('Ensembl'), [ensg], IDTypeManager.getInstance().resolveIdType('GeneSymbol')); + return symbols.length > 0 ? symbols[0] : ensg; } - static loadGeneList(ensgs) { - return RestBaseUtils.getTDPData('publicdb', 'gene_map_ensgs', { - ensgs: `'${ensgs.join("','")}'`, - species: SpeciesUtils.getSelectedSpecies(), + static async loadGeneList(ensgs) { + const symbols = await IDTypeManager.getInstance().mapNameToFirstName(IDTypeManager.getInstance().resolveIdType('Ensembl'), ensgs, IDTypeManager.getInstance().resolveIdType('GeneSymbol')); + return zipWith(ensgs, symbols, (ensg, symbol) => { + return { + id: ensg, + symbol, + }; }); } static postProcessScore(subType) { diff --git a/dist/views/ViewUtils.js.map b/dist/views/ViewUtils.js.map index 273c7033..86bb6c34 100644 --- a/dist/views/ViewUtils.js.map +++ b/dist/views/ViewUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"ViewUtils.js","sourceRoot":"","sources":["../../src/views/ViewUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,aAAa,EAAa,eAAe,EAAE,MAAM,UAAU,CAAC;AAGrE,MAAM,OAAO,SAAS;IACpB,MAAM,CAAC,aAAa,CAAC,IAAY;QAC/B,OAAO,aAAa,CAAC,UAAU,CAAM,UAAU,EAAE,gBAAgB,EAAE;YACjE,KAAK,EAAE,IAAI,IAAI,GAAG;YAClB,OAAO,EAAE,YAAY,CAAC,kBAAkB,EAAE;SAC3C,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAe;QACjC,OAAO,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,gBAAgB,EAAE;YAC5D,KAAK,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;YAC/B,OAAO,EAAE,YAAY,CAAC,kBAAkB,EAAE;SAC3C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,OAA2B;QACjD,OAAO,CAAC,IAAsB,EAAE,EAAE;YAChC,IAAI,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACpD,OAAO,UAAU,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aACtD;YACD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;gBAC1B,IAAI,GAAG,IAAI;qBACR,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC;qBACnC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACX,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACjC,OAAO,GAAG,CAAC;gBACb,CAAC,CAAC,CAAC;aACN;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,WAA+B,EAAE,EAAU,EAAE,KAAa,EAAE,GAAG,GAAG,OAAO,EAAE,EAAE;QAC9F,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE;YACnE,OAAO,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SAClD;QACD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,EAAE;YAC9B,OAAO,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SAC/E;QACD,OAAO,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,qBAAqB;QAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;IAClI,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"ViewUtils.js","sourceRoot":"","sources":["../../src/views/ViewUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAa,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGjC,MAAM,OAAO,SAAS;IACpB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAY;QACrC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAClE,aAAa,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,EACpD,CAAC,IAAI,CAAC,EACN,aAAa,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CACxD,CAAC;QACF,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,KAAe;QACvC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAClE,aAAa,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,EACpD,KAAK,EACL,aAAa,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CACxD,CAAC;QACF,OAAO,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAC9C,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,OAA2B;QACjD,OAAO,CAAC,IAAsB,EAAE,EAAE;YAChC,IAAI,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACpD,OAAO,UAAU,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aACtD;YACD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;gBAC1B,IAAI,GAAG,IAAI;qBACR,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC;qBACnC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACX,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACjC,OAAO,GAAG,CAAC;gBACb,CAAC,CAAC,CAAC;aACN;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,WAA+B,EAAE,EAAU,EAAE,KAAa,EAAE,GAAG,GAAG,OAAO,EAAE,EAAE;QAC9F,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE;YACnE,OAAO,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SAClD;QACD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,EAAE;YAC9B,OAAO,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SAC/E;QACD,OAAO,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,qBAAqB;QAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;IAClI,CAAC;CACF"} \ No newline at end of file diff --git a/fakeUsers.db b/fakeUsers.db new file mode 100644 index 0000000000000000000000000000000000000000..ec4027330f7057ee7fae0cbc7b3896d478e53bac GIT binary patch literal 8192 zcmeI#JqyAx5C-5xL?_XuxZbEBBDgvELANey2RAu2N+C9qM4bE2O|XKSyS_&*$sNh^ zY`0x!g;#Vo_R5~7q9>#jb0Q&x4A}_zj#xL}ML1*qEuac}n?WnWYpvG>Ci2S4DZc%SUu$ z=N`tM>e8|H_0<}!Tzx-U#lA4*{={LrfBn?#{9c<&@zEW|**pyW2nav`0uX=z1Rwwb P2tWV=5P$##epuiM)(A9k literal 0 HcmV?d00001 diff --git a/package.json b/package.json index ddc67b70..de9e24b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tdp_publicdb", "description": "", - "version": "12.0.0", + "version": "12.1.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -91,9 +91,9 @@ "react-select": "^4.1.0", "react-select-async-paginate": "^0.5.3", "react-virtualized": "^9.22.3", - "tdp_gene": "git+ssh://git@github.com:Caleydo/tdp_gene#semver:^11.0.0" + "tdp_gene": "git+ssh://git@github.com:Caleydo/tdp_gene#semver:^11.1.0" }, "optionalDependencies": { - "ordino": "git+ssh://git@github.com:Caleydo/ordino#semver:^12.0.0" + "ordino": "git+ssh://git@github.com:Caleydo/ordino#semver:^12.1.0" } } diff --git a/requirements.txt b/requirements.txt index a460bd96..6ec3d7ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tdp_core>=15.0.0,<16.0.0 \ No newline at end of file +tdp_core>=15.1.0,<16.0.0 \ No newline at end of file diff --git a/src/common/config.ts b/src/common/config.ts index e14e1edd..aa8cbc56 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -293,6 +293,10 @@ export interface IDataSubtypeConfig { domain?: number[]; missingValue?: number; constantDomain?: boolean; + /** + * Value of the column filter. + */ + filter?: string; } export const expression: IDataTypeConfig = { @@ -305,7 +309,7 @@ export const expression: IDataTypeConfig = { id: 'tpm', name: 'Normalized Gene Expression (TPM Values)', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], // domain will be auto-inferred missingValue: NaN, constantDomain: true, useForAggregation: 'tpm', @@ -314,7 +318,7 @@ export const expression: IDataTypeConfig = { id: 'counts', name: 'Raw Counts', type: dataSubtypes.number, - domain: [0, 10000], + domain: [null, null], missingValue: NaN, constantDomain: true, useForAggregation: 'counts', @@ -336,7 +340,7 @@ export const copyNumber: IDataTypeConfig = { id: 'relativecopynumber', name: 'Relative Copy Number', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, constantDomain: true, useForAggregation: 'relativecopynumber', @@ -345,7 +349,7 @@ export const copyNumber: IDataTypeConfig = { id: 'totalabscopynumber', name: 'Total Absolute Copy Number', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, constantDomain: true, useForAggregation: 'totalabscopynumber', @@ -375,7 +379,7 @@ export const mutation: IDataTypeConfig = { type: dataSubtypes.cat, categories: toLineUpCategories(Categories.mutationCat), useForAggregation: 'aa_mutated', - domain: [0, 100], + domain: [0, null], missingValue: Categories.unknownMutationValue, }, // just for single score: @@ -384,7 +388,7 @@ export const mutation: IDataTypeConfig = { name: 'AA Mutation', type: dataSubtypes.string, useForAggregation: '', - domain: [0, 100], + domain: [0, null], missingValue: NaN, }, { @@ -393,7 +397,7 @@ export const mutation: IDataTypeConfig = { type: dataSubtypes.cat, categories: toLineUpCategories(Categories.mutationCat), useForAggregation: 'dna_mutated', - domain: [0, 100], + domain: [0, null], missingValue: Categories.unknownMutationValue, }, // just for single score: @@ -402,14 +406,14 @@ export const mutation: IDataTypeConfig = { name: 'DNA Mutation', type: dataSubtypes.string, useForAggregation: '', - domain: [0, 100], + domain: [0, null], missingValue: NaN, }, { id: 'zygosity', name: 'Zygosity', type: dataSubtypes.number, - domain: [0, 15], + domain: [0, null], missingValue: NaN, useForAggregation: 'zygosity', }, @@ -418,7 +422,7 @@ export const mutation: IDataTypeConfig = { export const depletion: IDataTypeConfig = { id: 'depletion', - name: 'Depletion Screen ', + name: 'Depletion Screen', tableName: 'depletionscore', query: 'depletion_score', dataSubtypes: [ @@ -426,28 +430,51 @@ export const depletion: IDataTypeConfig = { id: 'rsa', name: 'DRIVE RSA (ER McDonald III et al., Cell, 2017)', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'rsa', + filter: 'Drive', }, { id: 'ataris', name: 'DRIVE ATARiS (ER McDonald III et al., Cell, 2017)', type: dataSubtypes.number, - domain: [0, 10000], + domain: [0, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ataris', + filter: 'Drive', }, { id: 'ceres', name: 'Avana CERES (Robin M. Meyers et al., Nature Genetics, 2017)', type: dataSubtypes.number, - domain: [0, 10000], + domain: [0, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ceres', + filter: 'Avana', + }, + { + id: 'chronos', + name: 'AVANA Chronos (DepMap.org)', + type: dataSubtypes.number, + domain: [0, null], + missingValue: NaN, + constantDomain: false, + useForAggregation: 'chronos', + filter: 'Avana', + }, + { + id: 'escore', + name: 'Sanger E-score (Fiona M. Behan et al., Nature 2019)', + type: dataSubtypes.number, + domain: [0, null], + missingValue: NaN, + constantDomain: false, + useForAggregation: 'escore', + filter: 'Sanger', }, ], }; @@ -462,7 +489,7 @@ export const drugScreen: IDataTypeConfig = { id: 'actarea', name: 'Activity Area', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'actarea', @@ -471,7 +498,7 @@ export const drugScreen: IDataTypeConfig = { id: 'ic50', name: 'IC50', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ic50', @@ -480,7 +507,7 @@ export const drugScreen: IDataTypeConfig = { id: 'ec50', name: 'EC50', type: dataSubtypes.number, - domain: [-3, 3], + domain: [null, null], missingValue: NaN, constantDomain: false, useForAggregation: 'ec50', diff --git a/src/scores/AggregatedScore.ts b/src/scores/AggregatedScore.ts index f46968c3..420da876 100644 --- a/src/scores/AggregatedScore.ts +++ b/src/scores/AggregatedScore.ts @@ -48,7 +48,7 @@ export class AggregatedDepletionScore extends AAggregatedScore implements IScore protected createFilter(): IParams { return { - depletionscreen: this.dataSubType.id === 'ceres' ? 'Avana' : 'Drive', + depletionscreen: this.dataSubType.filter, }; } diff --git a/src/scores/SingleScore.ts b/src/scores/SingleScore.ts index 61fac71b..b6941640 100644 --- a/src/scores/SingleScore.ts +++ b/src/scores/SingleScore.ts @@ -28,7 +28,11 @@ function initializeScore( function defineScore(name: { id: string; text: string }) { if (configs) { return configs.map((ds) => - singleScoreFactory({ name, data_type: ds[0], data_subtype: ds[1], maxDirectFilterRows: data.maxDirectFilterRows }, primary, opposite), + singleScoreFactory( + { name, screen_type: data.screen_type, data_type: ds[0], data_subtype: ds[1], maxDirectFilterRows: data.maxDirectFilterRows }, + primary, + opposite, + ), ); } return singleScoreFactory({ ...data, name }, primary, opposite); @@ -56,7 +60,7 @@ export class SingleDepletionScore extends ASingleScore implements IScore { protected createFilter(): IParams { return { - depletionscreen: this.dataSubType.id === 'ceres' ? 'Avana' : 'Drive', + depletionscreen: this.dataSubType.filter, }; } diff --git a/src/tours/WelcomeTour.ts b/src/tours/WelcomeTour.ts index cafb31f5..57ed70f0 100644 --- a/src/tours/WelcomeTour.ts +++ b/src/tours/WelcomeTour.ts @@ -114,7 +114,7 @@ export class WelcomeTour { placement: 'centered', html: `As data type, we choose 'Relative Copy Number'`, postAction: () => { - TourUtils.setValueAndTrigger('.col > select', 'copy_number-relativecopynumber', 'change'); + TourUtils.setValueAndTrigger('.modal.show .col > select', 'copy_number-relativecopynumber', 'change'); }, }, { diff --git a/src/views/ACombinedDependentTable.ts b/src/views/ACombinedDependentTable.ts index 730253fe..b32f65bb 100644 --- a/src/views/ACombinedDependentTable.ts +++ b/src/views/ACombinedDependentTable.ts @@ -82,11 +82,12 @@ export abstract class ACombinedDependentTable extends ARankingView { }); } - protected parameterChanged(name: string) { + protected parameterChanged(name: string): Promise { super.parameterChanged(name); if (name === 'filter') { - this.reloadData(); + return this.reloadData(); } + return Promise.resolve(); } protected loadColumnDesc() { diff --git a/src/views/CombinedDependentSampleTable.ts b/src/views/CombinedDependentSampleTable.ts index ace183ed..a6b5a9a0 100644 --- a/src/views/CombinedDependentSampleTable.ts +++ b/src/views/CombinedDependentSampleTable.ts @@ -22,12 +22,11 @@ export class CombinedDependentSampleTable extends ACombinedDependentTable { return base; } - protected parameterChanged(name: string) { + protected parameterChanged(name: string): Promise { if (name === FORM_DATA_SOURCE.id) { - this.rebuild(); - return; // early abort since there is nothing worse than building from scratch + return this.rebuild(); } - super.parameterChanged(name); + return super.parameterChanged(name); } protected getSelectionColumnLabel(ensg: string) { diff --git a/src/views/ExpressionVsCopyNumber.ts b/src/views/ExpressionVsCopyNumber.ts index 8438c950..20427206 100644 --- a/src/views/ExpressionVsCopyNumber.ts +++ b/src/views/ExpressionVsCopyNumber.ts @@ -1,9 +1,5 @@ -import { IFormElementDesc } from 'tdp_core'; -import { AExpressionVsCopyNumber, ICopyNumberDataFormatRow } from 'tdp_gene'; -import { SpeciesUtils } from 'tdp_gene'; -import { IDTypeManager } from 'tdp_core'; -import { LineupUtils } from 'tdp_core'; -import { RestBaseUtils, IParams } from 'tdp_core'; +import { IFormElementDesc, IDTypeManager, LineupUtils, RestBaseUtils, IParams } from 'tdp_core'; +import { AExpressionVsCopyNumber, ICopyNumberDataFormatRow, SpeciesUtils } from 'tdp_gene'; import { ViewUtils } from './ViewUtils'; import { ParameterFormIds, FORM_TISSUE_OR_CELLLINE_FILTER, FORM_DATA_SOURCE, FORM_COLOR_CODING } from '../common/forms'; import { expression, copyNumber, IDataSourceConfig } from '../common/config'; diff --git a/src/views/GeneInstantView.ts b/src/views/GeneInstantView.ts index e97e05c3..88cb5994 100644 --- a/src/views/GeneInstantView.ts +++ b/src/views/GeneInstantView.ts @@ -1,8 +1,5 @@ -import { IDTypeManager } from 'tdp_core'; -import { AInstantView } from 'tdp_core'; +import { IDTypeManager, AInstantView, RestBaseUtils, ErrorAlertHandler } from 'tdp_core'; import { SpeciesUtils } from 'tdp_gene'; -import { RestBaseUtils } from 'tdp_core'; -import { ErrorAlertHandler } from 'tdp_core'; import { gene } from '../common/config'; interface IGeneInfo { diff --git a/src/views/InfoTable.ts b/src/views/InfoTable.ts index b8cd2422..b46292d9 100644 --- a/src/views/InfoTable.ts +++ b/src/views/InfoTable.ts @@ -2,9 +2,7 @@ * Created by Samuel Gratzl on 27.04.2016. */ -import { IViewContext, ISelection, IView, IDTypeManager } from 'tdp_core'; -import { AD3View } from 'tdp_core'; -import { RestBaseUtils } from 'tdp_core'; +import { IViewContext, ISelection, IView, IDTypeManager, AD3View, RestBaseUtils } from 'tdp_core'; import { SpeciesUtils } from 'tdp_gene'; import { Primitive, transpose as d3Transpose, Selection } from 'd3'; import { IDataSourceConfig, cellline, tissue, gene } from '../common/config'; diff --git a/src/views/SimilarityView.ts b/src/views/SimilarityView.ts index d1814523..f2e1a376 100644 --- a/src/views/SimilarityView.ts +++ b/src/views/SimilarityView.ts @@ -125,18 +125,18 @@ export class SimilarityView extends ARankingView { return this.load().then((desc) => desc.rows); } - protected parameterChanged(name: string) { + protected parameterChanged(name: string): Promise { super.parameterChanged(name); - this.updateImpl(); + return this.updateImpl(); } protected selectionChanged() { super.selectionChanged(); - this.updateImpl(); + return this.updateImpl(); } private updateImpl() { - this.updateOptionsData().then(() => { + return this.updateOptionsData().then(() => { this.loader = null; this.rebuild(); }); diff --git a/src/views/ViewUtils.ts b/src/views/ViewUtils.ts index 172c0c96..2b66686a 100644 --- a/src/views/ViewUtils.ts +++ b/src/views/ViewUtils.ts @@ -2,22 +2,32 @@ * Created by sam on 16.02.2017. */ -import { SpeciesUtils, FieldUtils } from 'tdp_gene'; -import { RestBaseUtils, IScoreRow, ColumnDescUtils } from 'tdp_core'; +import { FieldUtils } from 'tdp_gene'; +import { IScoreRow, ColumnDescUtils, IDTypeManager } from 'tdp_core'; +import { zipWith } from 'lodash'; import { IDataSubtypeConfig } from '../common/config'; export class ViewUtils { - static loadFirstName(ensg: string): Promise { - return RestBaseUtils.getTDPData('publicdb', 'gene_map_ensgs', { - ensgs: `'${ensg}'`, - species: SpeciesUtils.getSelectedSpecies(), - }).then((r) => (r.length > 0 ? r[0].symbol || r[0].id : ensg)); + static async loadFirstName(ensg: string): Promise { + const symbols = await IDTypeManager.getInstance().mapNameToFirstName( + IDTypeManager.getInstance().resolveIdType('Ensembl'), + [ensg], + IDTypeManager.getInstance().resolveIdType('GeneSymbol'), + ); + return symbols.length > 0 ? symbols[0] : ensg; } - static loadGeneList(ensgs: string[]): Promise<{ id: string; symbol: string; _id: number }[]> { - return RestBaseUtils.getTDPData('publicdb', 'gene_map_ensgs', { - ensgs: `'${ensgs.join("','")}'`, - species: SpeciesUtils.getSelectedSpecies(), + static async loadGeneList(ensgs: string[]): Promise<{ id: string; symbol: string }[]> { + const symbols = await IDTypeManager.getInstance().mapNameToFirstName( + IDTypeManager.getInstance().resolveIdType('Ensembl'), + ensgs, + IDTypeManager.getInstance().resolveIdType('GeneSymbol'), + ); + return zipWith(ensgs, symbols, (ensg, symbol) => { + return { + id: ensg, + symbol, + }; }); } diff --git a/tdp_publicdb/data.py b/tdp_publicdb/data.py index deb84ca1..99f45121 100644 --- a/tdp_publicdb/data.py +++ b/tdp_publicdb/data.py @@ -20,7 +20,7 @@ DataEntity = namedtuple("DataEntity", ["schema", "tables", "attributes", "operators"]) depletion_tables = ["depletionscore"] -depletion_attributes = ["rsa", "ataris", "ceres"] +depletion_attributes = ["rsa", "ataris", "ceres", "chronos", "escore"] cellline_data = DataEntity(cellline.schema, tables, attributes, operators) tissue_data = DataEntity(tissue.schema, tables, attributes, operators) diff --git a/tdp_publicdb/migration/versions/20220614_1244_5a8dc3921597_new_depletion_scores.py b/tdp_publicdb/migration/versions/20220614_1244_5a8dc3921597_new_depletion_scores.py new file mode 100644 index 00000000..3fcca621 --- /dev/null +++ b/tdp_publicdb/migration/versions/20220614_1244_5a8dc3921597_new_depletion_scores.py @@ -0,0 +1,105 @@ +"""new_depletion_scores + +Revision ID: 5a8dc3921597 +Revises: ec6a94da4809 +Create Date: 2022-06-14 12:44:43.553285 + +""" +from alembic import op + +# revision identifiers, used by Alembic. +revision = "5a8dc3921597" +down_revision = "ec6a94da4809" +branch_labels = None +depends_on = None + + +def upgrade(): + connection = op.get_bind() + + connection.execute( + """ + ALTER TABLE cellline.processeddepletionscore + ADD COLUMN IF NOT EXISTS chronos real, + ADD COLUMN IF NOT EXISTS escore real; + + -- DROP VIEW cellline.processeddepletionscoreview; + + CREATE OR REPLACE VIEW cellline.processeddepletionscoreview + AS + SELECT d.ensg, + g.symbol, + d.celllinename, + d.depletionscreen, + d.rsa, + d.ataris, + d.ceres, + d.escore, + d.chronos + FROM cellline.processeddepletionscore d + JOIN gene g ON d.ensg = g.ensg; + + ALTER TABLE cellline.processeddepletionscoreview + OWNER TO postgres; + + CREATE OR REPLACE VIEW cellline.tdp_depletionscore + AS + SELECT ensg, + symbol, + celllinename, + depletionscreen, + rsa, + ataris, + ceres, + escore, + chronos + FROM cellline.processeddepletionscoreview; + + ALTER TABLE cellline.tdp_depletionscore + OWNER TO postgres; + """ + ) + + +def downgrade(): + connection = op.get_bind() + + connection.execute( + """ + + -- DROP VIEW cellline.processeddepletionscoreview; + -- INFO First alter the views to remove the dependencies to the columns and then drop the columns + CREATE OR REPLACE VIEW cellline.processeddepletionscoreview + AS + SELECT d.ensg, + g.symbol, + d.celllinename, + d.depletionscreen, + d.rsa, + d.ataris, + d.ceres + FROM cellline.processeddepletionscore d + JOIN gene g ON d.ensg = g.ensg; + + ALTER TABLE cellline.processeddepletionscoreview + OWNER TO postgres; + + CREATE OR REPLACE VIEW cellline.tdp_depletionscore + AS + SELECT ensg, + symbol, + celllinename, + depletionscreen, + rsa, + ataris, + ceres + FROM cellline.processeddepletionscoreview; + + ALTER TABLE cellline.tdp_depletionscore + OWNER TO postgres; + + ALTER TABLE cellline.processeddepletionscore + DROP COLUMN IF EXISTS chronos, + DROP COLUMN IF EXISTS escore; + """ + ) diff --git a/tdp_publicdb/query_gene.py b/tdp_publicdb/query_gene.py index 56cdb853..0c50847e 100644 --- a/tdp_publicdb/query_gene.py +++ b/tdp_publicdb/query_gene.py @@ -1,5 +1,3 @@ -import re - from tdp_core.dbview import DBViewBuilder, inject_where, limit_offset @@ -46,22 +44,6 @@ def create_gene(views, gene): .build() ) - views[gene.prefix + "_map_ensgs"] = ( - DBViewBuilder("helper") - .idtype(gene.idtype) - .query( - """ - SELECT {g.id} AS id, symbol - FROM {g.table} WHERE {g.id} IN ({{ensgs}}) AND species = :species - ORDER BY symbol ASC""".format( - g=gene - ) - ) - .replace("ensgs", re.compile(r"(\'[\w]+\')(,\'[\w]+\')*")) - .arg("species") - .build() - ) - views[gene.prefix + "_match_symbols"] = ( DBViewBuilder("helper") .query(