From 384e09fc59a634980f55e1d49ac86ce49c744afa Mon Sep 17 00:00:00 2001 From: Florian Engertsberger Date: Tue, 30 Nov 2021 13:06:30 +0100 Subject: [PATCH 01/15] add data-testid --- dist/common/forms.d.ts | 2 +- dist/menu/DatasetCard.js | 7 +++--- dist/menu/DatasetCard.js.map | 2 +- dist/menu/DatasetSearchBox.js | 4 +-- dist/menu/DatasetSearchBox.js.map | 2 +- dist/scores/forms.d.ts | 42 +++++++++++++++---------------- src/menu/DatasetCard.tsx | 7 +++--- src/menu/DatasetSearchBox.tsx | 4 +-- 8 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dist/common/forms.d.ts b/dist/common/forms.d.ts index 7280ad5e..d9d379e5 100644 --- a/dist/common/forms.d.ts +++ b/dist/common/forms.d.ts @@ -149,7 +149,7 @@ export declare const FORM_GENE_FILTER: { return: string; optionsData: () => Promise<{ name: string; - value: string | number; + value: import("lineupjs").ICompareValue; }[]>; options: { placeholder: string; diff --git a/dist/menu/DatasetCard.js b/dist/menu/DatasetCard.js index 59315eb7..596b29e7 100644 --- a/dist/menu/DatasetCard.js +++ b/dist/menu/DatasetCard.js @@ -6,6 +6,7 @@ import { DatasetSearchBox } from './DatasetSearchBox'; import { Species, SpeciesUtils } from 'tdp_gene'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }) { var _a, _b; + const testId = `datasetcard-${cssClass}`; const { app } = React.useContext(OrdinoContext); const [dirtyNamedSets, setDirtyNamedSets] = React.useState(false); const loadPredefinedSet = React.useMemo(() => { @@ -74,7 +75,7 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, }; const id = React.useMemo(() => UniqueIdManager.getInstance().uniqueId(), []); const activeTabIndex = 0; - return (React.createElement("div", { className: `ordino-dataset ${cssClass || ''}` }, + return (React.createElement("div", { className: `ordino-dataset ${cssClass || ''}`, "data-testid": testId }, React.createElement("h4", { className: "text-start mb-3" }, React.createElement("i", { className: 'me-2 ordino-icon-2 ' + icon }), name), @@ -82,13 +83,13 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, React.createElement("div", { className: "card-body p-3" }, React.createElement("ul", { className: "nav nav-pills session-tab" }, tabs.map((tab, index) => { return (React.createElement("li", { key: tab.id, className: "nav-item", role: "presentation" }, - React.createElement("a", { className: `nav-link ${(index === activeTabIndex) ? 'active' : ''}`, id: `dataset-tab-${tab.id}-${id}`, "data-bs-toggle": "tab", href: `#dataset-panel-${tab.id}-${id}`, role: "tab", "aria-controls": `dataset-panel-${tab.id}-${id}`, "aria-selected": (index === activeTabIndex) }, + React.createElement("a", { className: `nav-link ${(index === activeTabIndex) ? 'active' : ''}`, "data-testid": `${tab.id}-link`, id: `dataset-tab-${tab.id}-${id}`, "data-bs-toggle": "tab", href: `#dataset-panel-${tab.id}-${id}`, role: "tab", "aria-controls": `dataset-panel-${tab.id}-${id}`, "aria-selected": (index === activeTabIndex) }, React.createElement("i", { className: 'me-2 ' + tab.icon }), tab.name))); })), React.createElement("div", { className: "tab-content" }, tabs.map((tab, index) => { const separators = tokenSeparators ? { tokenSeparators } : null; - return (React.createElement("div", { key: tab.id, className: `tab-pane fade mt-4 ${(index === activeTabIndex) ? 'show active' : ''}`, role: "tabpanel", id: `dataset-panel-${tab.id}-${id}`, "aria-labelledby": `dataset-tab-${tab.id}-${id}` }, + return (React.createElement("div", { key: tab.id, className: `tab-pane fade mt-4 ${(index === activeTabIndex) ? 'show active' : ''}`, "data-testid": `${tab.id}-tab`, role: "tabpanel", id: `dataset-panel-${tab.id}-${id}`, "aria-labelledby": `dataset-tab-${tab.id}-${id}` }, React.createElement(DatasetSearchBox, Object.assign({ placeholder: `Add ${name}`, dataSource: dataSource, params: { species: tab.id }, onSaveAsNamedSet: (items) => onSaveAsNamedSet(items, { key: Species.SPECIES_SESSION_KEY, value: tab.id }), onOpen: (event, searchResult) => { onOpenSearchResult(event, { searchResult, species: tab.id }); } }, separators)), React.createElement("div", { className: "row mt-4" }, React.createElement(NamedSetList, { headerIcon: "fas fa-database", headerText: "Predefined Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); }, status: predefinedNamedSets.status, value: filterValue(predefinedNamedSets.value, tab.id) }), diff --git a/dist/menu/DatasetCard.js.map b/dist/menu/DatasetCard.js.map index 6286b643..3af1cad3 100644 --- a/dist/menu/DatasetCard.js.map +++ b/dist/menu/DatasetCard.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index ec4127ff..88a667b0 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -103,8 +103,8 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName } }) } }), - React.createElement("button", { className: "btn btn-secondary", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), - React.createElement("button", { className: "btn btn-outline-secondary", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); + React.createElement("button", { className: "btn btn-secondary", "data-testid": "open-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), + React.createElement("button", { className: "btn btn-outline-secondary", "data-testid": "save-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); } function Input(props) { const { onPaste } = props.selectProps; diff --git a/dist/menu/DatasetSearchBox.js.map b/dist/menu/DatasetSearchBox.js.map index 03a42586..b1a1a6e4 100644 --- a/dist/menu/DatasetSearchBox.js.map +++ b/dist/menu/DatasetSearchBox.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/scores/forms.d.ts b/dist/scores/forms.d.ts index 34fd9e19..d8ea6ed3 100644 --- a/dist/scores/forms.d.ts +++ b/dist/scores/forms.d.ts @@ -137,22 +137,6 @@ export declare const FORM_SINGLE_SCORE: { useSession: boolean; }[]; export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ - type: FormElementType; - label: string; - id: string; - attributes: { - style: string; - }; - required: boolean; - options: { - placeholder: string; - data: { - id: string; - text: string; - }[]; - }; - useSession: boolean; -} | { type: FormElementType; label: string; id: string; @@ -199,8 +183,7 @@ export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ step: string; optionsData?: undefined; }; -})[]; -export declare const FORM_SINGLE_SCORE_DEPLETION: { +} | { type: FormElementType; label: string; id: string; @@ -216,8 +199,8 @@ export declare const FORM_SINGLE_SCORE_DEPLETION: { }[]; }; useSession: boolean; -}[]; -export declare const FORM_SINGLE_SCORE_DRUG: ({ +})[]; +export declare const FORM_SINGLE_SCORE_DEPLETION: { type: FormElementType; label: string; id: string; @@ -233,7 +216,8 @@ export declare const FORM_SINGLE_SCORE_DRUG: ({ }[]; }; useSession: boolean; -} | { +}[]; +export declare const FORM_SINGLE_SCORE_DRUG: ({ type: FormElementType; label: string; id: string; @@ -249,4 +233,20 @@ export declare const FORM_SINGLE_SCORE_DRUG: ({ format: typeof import("..").GeneUtils.formatDrugScreen; }; useSession: boolean; +} | { + type: FormElementType; + label: string; + id: string; + attributes: { + style: string; + }; + required: boolean; + options: { + placeholder: string; + data: { + id: string; + text: string; + }[]; + }; + useSession: boolean; })[]; diff --git a/src/menu/DatasetCard.tsx b/src/menu/DatasetCard.tsx index dd85b42f..a2387d83 100644 --- a/src/menu/DatasetCard.tsx +++ b/src/menu/DatasetCard.tsx @@ -7,6 +7,7 @@ import {Species, SpeciesUtils, IACommonListOptions} from 'tdp_gene'; import {IPublicDbStartMenuDatasetSectionDesc} from '../base/extensions'; export default function DatasetCard({name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators}: IPublicDbStartMenuDatasetSectionDesc) { + const testId = `datasetcard-${cssClass}`; const {app} = React.useContext(OrdinoContext); const [dirtyNamedSets, setDirtyNamedSets] = React.useState(false); @@ -90,7 +91,7 @@ export default function DatasetCard({name, icon, tabs, startViewId, dataSource, const activeTabIndex = 0; return ( -
+

{name}

@@ -98,7 +99,7 @@ export default function DatasetCard({name, icon, tabs, startViewId, dataSource, {tabs.map((tab, index) => { return (
  • - + {tab.name}
  • @@ -109,7 +110,7 @@ export default function DatasetCard({name, icon, tabs, startViewId, dataSource, {tabs.map((tab, index) => { const separators = tokenSeparators ? {tokenSeparators} : null; return ( -
    +
    - - + +
    ); } From e464ad309bcc81a61f9fd58b1a9b2ac23d3d0a39 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 13 Dec 2021 16:00:40 +0100 Subject: [PATCH 02/15] add id for dataset searchbox --- dist/common/forms.d.ts | 2 +- dist/menu/DatasetCard.d.ts | 1 - dist/menu/DatasetSearchBox.js | 6 +++-- dist/menu/DatasetSearchBox.js.map | 2 +- dist/scores/forms.d.ts | 42 +++++++++++++++---------------- src/menu/DatasetSearchBox.tsx | 6 +++-- 6 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dist/common/forms.d.ts b/dist/common/forms.d.ts index d9d379e5..7280ad5e 100644 --- a/dist/common/forms.d.ts +++ b/dist/common/forms.d.ts @@ -149,7 +149,7 @@ export declare const FORM_GENE_FILTER: { return: string; optionsData: () => Promise<{ name: string; - value: import("lineupjs").ICompareValue; + value: string | number; }[]>; options: { placeholder: string; diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index efe4fcf9..238cd908 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,3 +1,2 @@ -/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index 88a667b0..147fd600 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -54,7 +54,7 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName type: dataSource.tableName } }; - return (React.createElement("div", { className: "hstack gap-3 ordino-dataset-searchbox" }, + return (React.createElement("div", { className: "hstack gap-3 ordino-dataset-searchbox", "data-testid": "ordino-dataset-searchbox" }, React.createElement(AsyncPaginate, { className: "flex-fill", onPaste: onPaste, placeholder: placeholder, noOptionsMessage: () => 'No results found', isMulti: true, loadOptions: loadOptions, inputValue: inputValue, value: items, onChange: setItems, onInputChange: setInputValue, formatOptionLabel: formatOptionLabel, hideSelectedOptions: true, getOptionLabel: (option) => option.text, getOptionValue: (option) => option.id, captureMenuScroll: false, additional: { page: 0 // page starts from index 0 }, components: { Input }, styles: { @@ -108,6 +108,8 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName } function Input(props) { const { onPaste } = props.selectProps; - return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, props))); + const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input-component' }, props); + delete modifiedProps.popoverType; // remove the "illegal" prop from the copy + return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, modifiedProps))); } //# sourceMappingURL=DatasetSearchBox.js.map \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js.map b/dist/menu/DatasetSearchBox.js.map index b1a1a6e4..7220e425 100644 --- a/dist/menu/DatasetSearchBox.js.map +++ b/dist/menu/DatasetSearchBox.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/scores/forms.d.ts b/dist/scores/forms.d.ts index d8ea6ed3..34fd9e19 100644 --- a/dist/scores/forms.d.ts +++ b/dist/scores/forms.d.ts @@ -137,6 +137,22 @@ export declare const FORM_SINGLE_SCORE: { useSession: boolean; }[]; export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ + type: FormElementType; + label: string; + id: string; + attributes: { + style: string; + }; + required: boolean; + options: { + placeholder: string; + data: { + id: string; + text: string; + }[]; + }; + useSession: boolean; +} | { type: FormElementType; label: string; id: string; @@ -183,7 +199,8 @@ export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ step: string; optionsData?: undefined; }; -} | { +})[]; +export declare const FORM_SINGLE_SCORE_DEPLETION: { type: FormElementType; label: string; id: string; @@ -199,8 +216,8 @@ export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ }[]; }; useSession: boolean; -})[]; -export declare const FORM_SINGLE_SCORE_DEPLETION: { +}[]; +export declare const FORM_SINGLE_SCORE_DRUG: ({ type: FormElementType; label: string; id: string; @@ -216,8 +233,7 @@ export declare const FORM_SINGLE_SCORE_DEPLETION: { }[]; }; useSession: boolean; -}[]; -export declare const FORM_SINGLE_SCORE_DRUG: ({ +} | { type: FormElementType; label: string; id: string; @@ -233,20 +249,4 @@ export declare const FORM_SINGLE_SCORE_DRUG: ({ format: typeof import("..").GeneUtils.formatDrugScreen; }; useSession: boolean; -} | { - type: FormElementType; - label: string; - id: string; - attributes: { - style: string; - }; - required: boolean; - options: { - placeholder: string; - data: { - id: string; - text: string; - }[]; - }; - useSession: boolean; })[]; diff --git a/src/menu/DatasetSearchBox.tsx b/src/menu/DatasetSearchBox.tsx index 68b75f5b..548e2eec 100644 --- a/src/menu/DatasetSearchBox.tsx +++ b/src/menu/DatasetSearchBox.tsx @@ -92,7 +92,7 @@ export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamed }; return ( -
    +
    ); + const modifiedProps = Object.assign({'data-testid': 'async-paginate-input-component'}, props); + delete modifiedProps.popoverType; // remove the "illegal" prop from the copy + return (); } From 5879b89ba2fbb426b72981f1166457df7757f2da Mon Sep 17 00:00:00 2001 From: Florian Engertsberger Date: Tue, 4 Jan 2022 10:27:25 +0100 Subject: [PATCH 03/15] add data-testid to react select components --- dist/menu/DatasetCard.d.ts | 1 + dist/menu/DatasetSearchBox.js | 16 ++- dist/menu/DatasetSearchBox.js.map | 2 +- src/menu/DatasetSearchBox.tsx | 192 ++++++++++++++++++------------ 4 files changed, 135 insertions(+), 76 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 238cd908..efe4fcf9 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,2 +1,3 @@ +/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index 147fd600..7380b68b 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -57,7 +57,13 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName return (React.createElement("div", { className: "hstack gap-3 ordino-dataset-searchbox", "data-testid": "ordino-dataset-searchbox" }, React.createElement(AsyncPaginate, { className: "flex-fill", onPaste: onPaste, placeholder: placeholder, noOptionsMessage: () => 'No results found', isMulti: true, loadOptions: loadOptions, inputValue: inputValue, value: items, onChange: setItems, onInputChange: setInputValue, formatOptionLabel: formatOptionLabel, hideSelectedOptions: true, getOptionLabel: (option) => option.text, getOptionValue: (option) => option.id, captureMenuScroll: false, additional: { page: 0 // page starts from index 0 - }, components: { Input }, styles: { + }, components: { + Input, + Option: addDataTestId(Option, "async-paginate-option"), + MultiValueRemove: addDataTestId(MultiValueRemove, "async-paginate-multiselect-remove"), + ClearIndicator: addDataTestId(ClearIndicator, "async-paginate-clearindicator"), + DropdownIndicator: addDataTestId(DropdownIndicator, "async-paginate-dropdownindicator") + }, styles: { multiValue: (styles, { data }) => ({ ...styles, border: `1px solid #CCC`, @@ -106,10 +112,16 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName React.createElement("button", { className: "btn btn-secondary", "data-testid": "open-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), React.createElement("button", { className: "btn btn-outline-secondary", "data-testid": "save-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); } +// functions to add data-testid attribute to react-select components +const addDataTestId = (Component, dataTestId) => (props => (React.createElement(Component, Object.assign({}, props, { innerProps: Object.assign({}, props.innerProps, { 'data-testid': `${dataTestId}${props.data ? "-" + props.data.id : ""}` }) })))); function Input(props) { const { onPaste } = props.selectProps; - const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input-component' }, props); + const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input' }, props); delete modifiedProps.popoverType; // remove the "illegal" prop from the copy return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, modifiedProps))); } +const ClearIndicator = props => (components.ClearIndicator && (React.createElement(components.ClearIndicator, Object.assign({}, props)))); +const DropdownIndicator = props => (components.DropdownIndicator && (React.createElement(components.DropdownIndicator, Object.assign({}, props)))); +const Option = props => (components.Option && (React.createElement(components.Option, Object.assign({}, props)))); +const MultiValueRemove = props => (components.MultiValueRemove && (React.createElement(components.MultiValueRemove, Object.assign({}, props)))); //# sourceMappingURL=DatasetSearchBox.js.map \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js.map b/dist/menu/DatasetSearchBox.js.map index 7220e425..ae9e31b5 100644 --- a/dist/menu/DatasetSearchBox.js.map +++ b/dist/menu/DatasetSearchBox.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,aAAa,EAAc,YAAY,EAAC,MAAM,UAAU,CAAC;AACjE,OAAO,EAAC,UAAU,EAAwB,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAoB,MAAM,WAAW,CAAC;AAyBvD,MAAM,UAAU,gBAAgB,CAAC,EAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,EAAE,EAAE,eAAe,GAAG,WAAW,EAAyB;IACpJ,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAyB,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,KAAK,EAAE,KAAa,EAAE,CAAC,EAAE,EAAC,IAAI,EAAiB,EAAE,EAAE;QACnE,MAAM,EAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAC,GAAG,UAAU,CAAC;QACxD,OAAO,aAAa,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,GAAG,YAAY,EAAE;YACvD,MAAM,EAAE,UAAU;YAClB,GAAG,MAAM;YACT,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACZ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;YACxB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE;gBACR,IAAI,EAAE,IAAI,GAAG,CAAC;aACjB;SACJ,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,MAA4B,EAAE,GAAsD,EAAE,EAAE;;QAC/G,qCAAqC;QACrC,UAAI,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,GAAG;YAClD,OAAO,MAAM,CAAC,IAAI,CAAC;SACtB;QACD,OAAO,CACH;YACI,oBAAC,WAAW,IACR,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAC7B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,MAAM,CAAC,IAAI,GAC9B;YACD,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE;gBACtB,8BAAM,SAAS,EAAC,uBAAuB,IAAE,MAAM,CAAC,EAAE,CAAQ,CAC/D,CACN,CAAC;IACN,CAAC,CAAC;IAGF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,aAAa,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,OAAO,GAAG,KAAK,EAAE,KAA2B,EAAE,EAAE;;QAClD,MAAM,UAAU,SAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,0CAAE,iBAAiB,EAAE,CAAC;QAC5E,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7H,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEzE,MAAM,WAAW,GAAG,SAAS;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;aACtK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACnD,QAAQ,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG;QAClB,MAAM,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,UAAU,CAAC,SAAS;SAC7B;KACJ,CAAC;IAEF,OAAO,CACH,6BAAK,SAAS,EAAC,uCAAuC,iBAAa,0BAA0B;QACzF,oBAAC,aAAa,IACV,SAAS,EAAC,WAAW,EACrB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,GAAG,EAAE,CAAC,kBAAkB,EAC1C,OAAO,EAAE,IAAI,EACb,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,QACnB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EACvC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EACrC,iBAAiB,EAAE,KAAK,EACxB,UAAU,EAAE;gBACR,IAAI,EAAE,CAAC,CAAC,2BAA2B;aACtC,EACD,UAAU,EAAE;gBACR,KAAK;gBACL,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,uBAAuB,CAAC;gBACtD,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,EAAE,mCAAmC,CAAC;gBACtF,cAAc,EAAE,aAAa,CAAC,cAAc,EAAE,+BAA+B,CAAC;gBAC9E,iBAAiB,EAAE,aAAa,CAAC,iBAAiB,EAAE,kCAAkC,CAAC;aAC1F,EACD,MAAM,EAAE;gBAEJ,UAAU,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBAC7B,GAAG,MAAM;oBACT,MAAM,EAAE,gBAAgB;oBACxB,YAAY,EAAE,KAAK;iBACtB,CAAC;gBACF,eAAe,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBAClC,GAAG,MAAM;oBACT,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM;oBACtD,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,eAAe,EAAE,OAAO;oBACxB,KAAK,EAAE,CAAC;oBACR,WAAW,EAAE,GAAG;oBAChB,YAAY,EAAE,KAAK;iBACtB,CAAC;gBACF,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBACnC,GAAG,MAAM;oBACT,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;oBACpC,eAAe,EAAE,OAAO;oBACxB,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE;wBACN,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,SAAS;qBACpB;iBACJ,CAAC;gBAEF,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACxB,GAAG,QAAQ;oBACX,mCAAmC;oBACnC,aAAa,EAAE,MAAM;oBACrB,UAAU,EAAE,MAAM;iBACrB,CAAC;gBACF,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACb,GAAG,GAAG;oBACN,gCAAgC;oBAChC,IAAI,EAAE,UAAU;oBAChB,uCAAuC;oBACvC,OAAO,EAAE;wBACL,KAAK,EAAE,MAAM;qBAChB;oBACD,mCAAmC;oBACnC,KAAK,EAAE;wBACH,KAAK,EAAE,iBAAiB;wBACxB,SAAS,EAAE,MAAM;qBACpB;iBACJ,CAAC;aACL,GACH;QACF,gCAAQ,SAAS,EAAC,mBAAmB,iBAAa,aAAa,EAAC,QAAQ,EAAE,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,WAAe;QAC9J,gCAAQ,SAAS,EAAC,2BAA2B,iBAAa,aAAa,EAAC,QAAQ,EAAE,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,kBAAsB,CACtK,CACT,CAAC;AACN,CAAC;AAED,oEAAoE;AACpE,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAC7C,KAAK,CAAC,EAAE,CAAC,CACL,oBAAC,SAAS,oBACF,KAAK,IACT,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,EAAC,aAAa,EAAE,GAAG,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAC,CAAC,IAC3H,CACL,CACJ,CAAC;AAEF,SAAS,KAAK,CAAC,KAAU;IACrB,MAAM,EAAC,OAAO,EAAC,GAAG,KAAK,CAAC,WAAW,CAAC;IACpC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAC,aAAa,EAAE,sBAAsB,EAAC,EAAE,KAAK,CAAC,CAAC;IACpF,OAAO,aAAa,CAAC,WAAW,CAAC,CAAE,0CAA0C;IAC7E,OAAO,CAAC,oBAAC,UAAU,CAAC,KAAK,kBAAC,OAAO,EAAE,OAAO,IAAM,aAAa,EAAI,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,cAAc,GAAG,KAAK,CAAC,EAAE,CAAC,CAC5B,UAAU,CAAC,cAAc,IAAI,CACzB,oBAAC,UAAU,CAAC,cAAc,oBAAK,KAAK,EACR,CAC/B,CACJ,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,EAAE,CAAC,CAC/B,UAAU,CAAC,iBAAiB,IAAI,CAC5B,oBAAC,UAAU,CAAC,iBAAiB,oBAAK,KAAK,EACR,CAClC,CACJ,CAAC;AAEF,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,CACpB,UAAU,CAAC,MAAM,IAAI,CACjB,oBAAC,UAAU,CAAC,MAAM,oBAAK,KAAK,EACR,CACvB,CACJ,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE,CAAC,CAC9B,UAAU,CAAC,gBAAgB,IAAI,CAC3B,oBAAC,UAAU,CAAC,gBAAgB,oBAAK,KAAK,EACR,CACjC,CACJ,CAAC"} \ No newline at end of file diff --git a/src/menu/DatasetSearchBox.tsx b/src/menu/DatasetSearchBox.tsx index 548e2eec..2557ae49 100644 --- a/src/menu/DatasetSearchBox.tsx +++ b/src/menu/DatasetSearchBox.tsx @@ -93,84 +93,130 @@ export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamed return (
    - 'No results found'} - isMulti={true} - loadOptions={loadOptions} - inputValue={inputValue} - value={items} - onChange={setItems} - onInputChange={setInputValue} - formatOptionLabel={formatOptionLabel} - hideSelectedOptions - getOptionLabel={(option) => option.text} - getOptionValue={(option) => option.id} - captureMenuScroll={false} - additional={{ - page: 0 // page starts from index 0 - }} - components={{Input}} - styles={{ - - multiValue: (styles, {data}) => ({ - ...styles, - border: `1px solid #CCC`, - borderRadius: '3px' - }), - multiValueLabel: (styles, {data}) => ({ - ...styles, - textDecoration: data.invalid ? 'line-through' : 'none', - color: data.color, - backgroundColor: 'white', - order: 2, - paddingLeft: '0', - paddingRight: '6px' - }), - multiValueRemove: (styles, {data}) => ({ - ...styles, - color: data.invalid ? 'red' : '#999', - backgroundColor: 'white', - order: 1, - ':hover': { - color: '#333', - cursor: 'pointer' - }, - }), - - placeholder: (provided) => ({ - ...provided, - // disable placeholder mouse events - pointerEvents: 'none', - userSelect: 'none', - }), - input: (css) => ({ - ...css, - //expand the Input Component div - flex: '1 1 auto', - // expand the Input Component child div - '> div': { - width: '100%' - }, - // expand the Input Component input - input: { - width: '100% !important', - textAlign: 'left' - } - }) - }} - /> - - + 'No results found'} + isMulti={true} + loadOptions={loadOptions} + inputValue={inputValue} + value={items} + onChange={setItems} + onInputChange={setInputValue} + formatOptionLabel={formatOptionLabel} + hideSelectedOptions + getOptionLabel={(option) => option.text} + getOptionValue={(option) => option.id} + captureMenuScroll={false} + additional={{ + page: 0 // page starts from index 0 + }} + components={{ + Input, + Option: addDataTestId(Option, "async-paginate-option"), + MultiValueRemove: addDataTestId(MultiValueRemove, "async-paginate-multiselect-remove"), + ClearIndicator: addDataTestId(ClearIndicator, "async-paginate-clearindicator"), + DropdownIndicator: addDataTestId(DropdownIndicator, "async-paginate-dropdownindicator") + }} + styles={{ + + multiValue: (styles, {data}) => ({ + ...styles, + border: `1px solid #CCC`, + borderRadius: '3px' + }), + multiValueLabel: (styles, {data}) => ({ + ...styles, + textDecoration: data.invalid ? 'line-through' : 'none', + color: data.color, + backgroundColor: 'white', + order: 2, + paddingLeft: '0', + paddingRight: '6px' + }), + multiValueRemove: (styles, {data}) => ({ + ...styles, + color: data.invalid ? 'red' : '#999', + backgroundColor: 'white', + order: 1, + ':hover': { + color: '#333', + cursor: 'pointer' + }, + }), + + placeholder: (provided) => ({ + ...provided, + // disable placeholder mouse events + pointerEvents: 'none', + userSelect: 'none', + }), + input: (css) => ({ + ...css, + //expand the Input Component div + flex: '1 1 auto', + // expand the Input Component child div + '> div': { + width: '100%' + }, + // expand the Input Component input + input: { + width: '100% !important', + textAlign: 'left' + } + }) + }} + /> + +
    ); } +// functions to add data-testid attribute to react-select components +const addDataTestId = (Component, dataTestId) => ( + props => ( + + ) +); + function Input(props: any) { const {onPaste} = props.selectProps; - const modifiedProps = Object.assign({'data-testid': 'async-paginate-input-component'}, props); + const modifiedProps = Object.assign({'data-testid': 'async-paginate-input'}, props); delete modifiedProps.popoverType; // remove the "illegal" prop from the copy - return (); + return (); } + +const ClearIndicator = props => ( + components.ClearIndicator && ( + + + ) +); + +const DropdownIndicator = props => ( + components.DropdownIndicator && ( + + + ) +); + +const Option = props => ( + components.Option && ( + + + ) +); + +const MultiValueRemove = props => ( + components.MultiValueRemove && ( + + + ) +); + + From 452b83e12263d4f7c2b9e98d0f303d1163bfb8c7 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 17 Jan 2022 14:25:55 +0100 Subject: [PATCH 04/15] fix lint --- dist/menu/DatasetCard.d.ts | 1 - dist/menu/DatasetSearchBox.js | 33 ++++----- dist/menu/DatasetSearchBox.js.map | 2 +- dist/views/DependentGeneTable.d.ts | 2 +- dist/views/DependentSampleTable.d.ts | 2 +- src/menu/DatasetSearchBox.tsx | 102 +++++++++++++-------------- 6 files changed, 71 insertions(+), 71 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index efe4fcf9..238cd908 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,3 +1,2 @@ -/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index 7380b68b..ffada278 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -4,6 +4,19 @@ import { components } from 'react-select'; import { AsyncPaginate } from 'react-select-async-paginate'; import Highlighter from 'react-highlight-words'; import { GeneUtils } from '../common'; +// functions to add data-testid attribute to react-select components +/* tslint:disable-next-line:variable-name */ +const addDataTestId = (Component, dataTestId) => ((props) => (React.createElement(Component, Object.assign({}, props, { innerProps: Object.assign({}, props.innerProps, { 'data-testid': `${dataTestId}${props.data ? '-' + props.data.id : ''}` }) })))); +function Input(props) { + const { onPaste } = props.selectProps; + const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input' }, props); + delete modifiedProps.popoverType; // remove the "illegal" prop from the copy + return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, modifiedProps))); +} +const clearIndicator = (props) => (components.ClearIndicator && (React.createElement(components.ClearIndicator, Object.assign({}, props)))); +const dropdownIndicator = (props) => (components.DropdownIndicator && (React.createElement(components.DropdownIndicator, Object.assign({}, props)))); +const option = (props) => (components.Option && (React.createElement(components.Option, Object.assign({}, props)))); +const multiValueRemove = (props) => (components.MultiValueRemove && (React.createElement(components.MultiValueRemove, Object.assign({}, props)))); export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsNamedSet, params = {}, tokenSeparators = /[\s;,]+/gm }) { const [items, setItems] = React.useState([]); const [inputValue, setInputValue] = React.useState(''); @@ -59,10 +72,10 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName page: 0 // page starts from index 0 }, components: { Input, - Option: addDataTestId(Option, "async-paginate-option"), - MultiValueRemove: addDataTestId(MultiValueRemove, "async-paginate-multiselect-remove"), - ClearIndicator: addDataTestId(ClearIndicator, "async-paginate-clearindicator"), - DropdownIndicator: addDataTestId(DropdownIndicator, "async-paginate-dropdownindicator") + Option: addDataTestId(Option, 'async-paginate-option'), + MultiValueRemove: addDataTestId(multiValueRemove, 'async-paginate-multiselect-remove'), + ClearIndicator: addDataTestId(clearIndicator, 'async-paginate-clearindicator'), + DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator') }, styles: { multiValue: (styles, { data }) => ({ ...styles, @@ -112,16 +125,4 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName React.createElement("button", { className: "btn btn-secondary", "data-testid": "open-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), React.createElement("button", { className: "btn btn-outline-secondary", "data-testid": "save-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); } -// functions to add data-testid attribute to react-select components -const addDataTestId = (Component, dataTestId) => (props => (React.createElement(Component, Object.assign({}, props, { innerProps: Object.assign({}, props.innerProps, { 'data-testid': `${dataTestId}${props.data ? "-" + props.data.id : ""}` }) })))); -function Input(props) { - const { onPaste } = props.selectProps; - const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input' }, props); - delete modifiedProps.popoverType; // remove the "illegal" prop from the copy - return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, modifiedProps))); -} -const ClearIndicator = props => (components.ClearIndicator && (React.createElement(components.ClearIndicator, Object.assign({}, props)))); -const DropdownIndicator = props => (components.DropdownIndicator && (React.createElement(components.DropdownIndicator, Object.assign({}, props)))); -const Option = props => (components.Option && (React.createElement(components.Option, Object.assign({}, props)))); -const MultiValueRemove = props => (components.MultiValueRemove && (React.createElement(components.MultiValueRemove, Object.assign({}, props)))); //# sourceMappingURL=DatasetSearchBox.js.map \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js.map b/dist/menu/DatasetSearchBox.js.map index ae9e31b5..b5f93945 100644 --- a/dist/menu/DatasetSearchBox.js.map +++ b/dist/menu/DatasetSearchBox.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,aAAa,EAAc,YAAY,EAAC,MAAM,UAAU,CAAC;AACjE,OAAO,EAAC,UAAU,EAAwB,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAoB,MAAM,WAAW,CAAC;AAyBvD,MAAM,UAAU,gBAAgB,CAAC,EAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,EAAE,EAAE,eAAe,GAAG,WAAW,EAAyB;IACpJ,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAyB,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,KAAK,EAAE,KAAa,EAAE,CAAC,EAAE,EAAC,IAAI,EAAiB,EAAE,EAAE;QACnE,MAAM,EAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAC,GAAG,UAAU,CAAC;QACxD,OAAO,aAAa,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,GAAG,YAAY,EAAE;YACvD,MAAM,EAAE,UAAU;YAClB,GAAG,MAAM;YACT,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACZ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;YACxB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE;gBACR,IAAI,EAAE,IAAI,GAAG,CAAC;aACjB;SACJ,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,MAA4B,EAAE,GAAsD,EAAE,EAAE;;QAC/G,qCAAqC;QACrC,UAAI,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,GAAG;YAClD,OAAO,MAAM,CAAC,IAAI,CAAC;SACtB;QACD,OAAO,CACH;YACI,oBAAC,WAAW,IACR,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAC7B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,MAAM,CAAC,IAAI,GAC9B;YACD,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE;gBACtB,8BAAM,SAAS,EAAC,uBAAuB,IAAE,MAAM,CAAC,EAAE,CAAQ,CAC/D,CACN,CAAC;IACN,CAAC,CAAC;IAGF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,aAAa,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,OAAO,GAAG,KAAK,EAAE,KAA2B,EAAE,EAAE;;QAClD,MAAM,UAAU,SAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,0CAAE,iBAAiB,EAAE,CAAC;QAC5E,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7H,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEzE,MAAM,WAAW,GAAG,SAAS;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;aACtK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACnD,QAAQ,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG;QAClB,MAAM,EAAE;YACJ,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,UAAU,CAAC,SAAS;SAC7B;KACJ,CAAC;IAEF,OAAO,CACH,6BAAK,SAAS,EAAC,uCAAuC,iBAAa,0BAA0B;QACzF,oBAAC,aAAa,IACV,SAAS,EAAC,WAAW,EACrB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,GAAG,EAAE,CAAC,kBAAkB,EAC1C,OAAO,EAAE,IAAI,EACb,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,QACnB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EACvC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EACrC,iBAAiB,EAAE,KAAK,EACxB,UAAU,EAAE;gBACR,IAAI,EAAE,CAAC,CAAC,2BAA2B;aACtC,EACD,UAAU,EAAE;gBACR,KAAK;gBACL,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,uBAAuB,CAAC;gBACtD,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,EAAE,mCAAmC,CAAC;gBACtF,cAAc,EAAE,aAAa,CAAC,cAAc,EAAE,+BAA+B,CAAC;gBAC9E,iBAAiB,EAAE,aAAa,CAAC,iBAAiB,EAAE,kCAAkC,CAAC;aAC1F,EACD,MAAM,EAAE;gBAEJ,UAAU,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBAC7B,GAAG,MAAM;oBACT,MAAM,EAAE,gBAAgB;oBACxB,YAAY,EAAE,KAAK;iBACtB,CAAC;gBACF,eAAe,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBAClC,GAAG,MAAM;oBACT,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM;oBACtD,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,eAAe,EAAE,OAAO;oBACxB,KAAK,EAAE,CAAC;oBACR,WAAW,EAAE,GAAG;oBAChB,YAAY,EAAE,KAAK;iBACtB,CAAC;gBACF,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;oBACnC,GAAG,MAAM;oBACT,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;oBACpC,eAAe,EAAE,OAAO;oBACxB,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE;wBACN,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,SAAS;qBACpB;iBACJ,CAAC;gBAEF,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACxB,GAAG,QAAQ;oBACX,mCAAmC;oBACnC,aAAa,EAAE,MAAM;oBACrB,UAAU,EAAE,MAAM;iBACrB,CAAC;gBACF,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACb,GAAG,GAAG;oBACN,gCAAgC;oBAChC,IAAI,EAAE,UAAU;oBAChB,uCAAuC;oBACvC,OAAO,EAAE;wBACL,KAAK,EAAE,MAAM;qBAChB;oBACD,mCAAmC;oBACnC,KAAK,EAAE;wBACH,KAAK,EAAE,iBAAiB;wBACxB,SAAS,EAAE,MAAM;qBACpB;iBACJ,CAAC;aACL,GACH;QACF,gCAAQ,SAAS,EAAC,mBAAmB,iBAAa,aAAa,EAAC,QAAQ,EAAE,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,WAAe;QAC9J,gCAAQ,SAAS,EAAC,2BAA2B,iBAAa,aAAa,EAAC,QAAQ,EAAE,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,kBAAsB,CACtK,CACT,CAAC;AACN,CAAC;AAED,oEAAoE;AACpE,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAC7C,KAAK,CAAC,EAAE,CAAC,CACL,oBAAC,SAAS,oBACF,KAAK,IACT,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,EAAC,aAAa,EAAE,GAAG,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAC,CAAC,IAC3H,CACL,CACJ,CAAC;AAEF,SAAS,KAAK,CAAC,KAAU;IACrB,MAAM,EAAC,OAAO,EAAC,GAAG,KAAK,CAAC,WAAW,CAAC;IACpC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAC,aAAa,EAAE,sBAAsB,EAAC,EAAE,KAAK,CAAC,CAAC;IACpF,OAAO,aAAa,CAAC,WAAW,CAAC,CAAE,0CAA0C;IAC7E,OAAO,CAAC,oBAAC,UAAU,CAAC,KAAK,kBAAC,OAAO,EAAE,OAAO,IAAM,aAAa,EAAI,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,cAAc,GAAG,KAAK,CAAC,EAAE,CAAC,CAC5B,UAAU,CAAC,cAAc,IAAI,CACzB,oBAAC,UAAU,CAAC,cAAc,oBAAK,KAAK,EACR,CAC/B,CACJ,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,EAAE,CAAC,CAC/B,UAAU,CAAC,iBAAiB,IAAI,CAC5B,oBAAC,UAAU,CAAC,iBAAiB,oBAAK,KAAK,EACR,CAClC,CACJ,CAAC;AAEF,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,CACpB,UAAU,CAAC,MAAM,IAAI,CACjB,oBAAC,UAAU,CAAC,MAAM,oBAAK,KAAK,EACR,CACvB,CACJ,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE,CAAC,CAC9B,UAAU,CAAC,gBAAgB,IAAI,CAC3B,oBAAC,UAAU,CAAC,gBAAgB,oBAAK,KAAK,EACR,CACjC,CACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/DependentGeneTable.d.ts b/dist/views/DependentGeneTable.d.ts index 89cf133c..2b63ecb2 100644 --- a/dist/views/DependentGeneTable.d.ts +++ b/dist/views/DependentGeneTable.d.ts @@ -10,7 +10,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): void; + 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 2ea0bc03..e5162f5d 100644 --- a/dist/views/DependentSampleTable.d.ts +++ b/dist/views/DependentSampleTable.d.ts @@ -12,7 +12,7 @@ export declare class DependentSampleTable extends ARankingView { get itemIDType(): import("tdp_core").IDType; private get dataSource(); private get dataSubType(); - protected parameterChanged(name: string): void; + 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/src/menu/DatasetSearchBox.tsx b/src/menu/DatasetSearchBox.tsx index 2557ae49..0a4db205 100644 --- a/src/menu/DatasetSearchBox.tsx +++ b/src/menu/DatasetSearchBox.tsx @@ -28,6 +28,53 @@ interface IDatasetSearchBoxProps { tokenSeparators?: RegExp; } +// functions to add data-testid attribute to react-select components +/* tslint:disable-next-line:variable-name */ +const addDataTestId = (Component, dataTestId) => ( + (props) => ( + + ) +); + +function Input(props: any) { + const {onPaste} = props.selectProps; + const modifiedProps = Object.assign({'data-testid': 'async-paginate-input'}, props); + delete modifiedProps.popoverType; // remove the "illegal" prop from the copy + return (); +} + +const clearIndicator = (props) => ( + components.ClearIndicator && ( + + + ) +); + +const dropdownIndicator = (props) => ( + components.DropdownIndicator && ( + + + ) +); + +const option = (props) => ( + components.Option && ( + + + ) +); + +const multiValueRemove = (props) => ( + components.MultiValueRemove && ( + + + ) +); + + export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamedSet, params = {}, tokenSeparators = /[\s;,]+/gm}: IDatasetSearchBoxProps) { const [items, setItems] = React.useState([]); const [inputValue, setInputValue] = React.useState(''); @@ -114,10 +161,10 @@ export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamed }} components={{ Input, - Option: addDataTestId(Option, "async-paginate-option"), - MultiValueRemove: addDataTestId(MultiValueRemove, "async-paginate-multiselect-remove"), - ClearIndicator: addDataTestId(ClearIndicator, "async-paginate-clearindicator"), - DropdownIndicator: addDataTestId(DropdownIndicator, "async-paginate-dropdownindicator") + Option: addDataTestId(Option, 'async-paginate-option'), + MultiValueRemove: addDataTestId(multiValueRemove, 'async-paginate-multiselect-remove'), + ClearIndicator: addDataTestId(clearIndicator, 'async-paginate-clearindicator'), + DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator') }} styles={{ @@ -173,50 +220,3 @@ export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamed
    ); } - -// functions to add data-testid attribute to react-select components -const addDataTestId = (Component, dataTestId) => ( - props => ( - - ) -); - -function Input(props: any) { - const {onPaste} = props.selectProps; - const modifiedProps = Object.assign({'data-testid': 'async-paginate-input'}, props); - delete modifiedProps.popoverType; // remove the "illegal" prop from the copy - return (); -} - -const ClearIndicator = props => ( - components.ClearIndicator && ( - - - ) -); - -const DropdownIndicator = props => ( - components.DropdownIndicator && ( - - - ) -); - -const Option = props => ( - components.Option && ( - - - ) -); - -const MultiValueRemove = props => ( - components.MultiValueRemove && ( - - - ) -); - - From d81f7a9acf0374de05e09d2a1abc8de7edb3ef1f Mon Sep 17 00:00:00 2001 From: Florian Engertsberger Date: Tue, 18 Jan 2022 08:23:45 +0100 Subject: [PATCH 05/15] fix react select error --- dist/menu/DatasetCard.d.ts | 1 + dist/menu/DatasetSearchBox.js | 2 +- src/menu/DatasetSearchBox.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 238cd908..efe4fcf9 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,2 +1,3 @@ +/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index ffada278..e0224028 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -72,7 +72,7 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName page: 0 // page starts from index 0 }, components: { Input, - Option: addDataTestId(Option, 'async-paginate-option'), + Option: addDataTestId(option, 'async-paginate-option'), MultiValueRemove: addDataTestId(multiValueRemove, 'async-paginate-multiselect-remove'), ClearIndicator: addDataTestId(clearIndicator, 'async-paginate-clearindicator'), DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator') diff --git a/src/menu/DatasetSearchBox.tsx b/src/menu/DatasetSearchBox.tsx index 0a4db205..0d0a68fb 100644 --- a/src/menu/DatasetSearchBox.tsx +++ b/src/menu/DatasetSearchBox.tsx @@ -161,7 +161,7 @@ export function DatasetSearchBox({placeholder, dataSource, onOpen, onSaveAsNamed }} components={{ Input, - Option: addDataTestId(Option, 'async-paginate-option'), + Option: addDataTestId(option, 'async-paginate-option'), MultiValueRemove: addDataTestId(multiValueRemove, 'async-paginate-multiselect-remove'), ClearIndicator: addDataTestId(clearIndicator, 'async-paginate-clearindicator'), DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator') From 761c42f655e36cfb5f003fc6f57cb301948b6f64 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 22 Mar 2022 13:31:03 +0100 Subject: [PATCH 06/15] update dist --- dist/menu/DatasetCard.d.ts | 1 - dist/menu/DatasetCard.d.ts.map | 2 +- dist/menu/DatasetCard.js | 81 ++++++++++++++++------------ dist/menu/DatasetCard.js.map | 2 +- dist/menu/DatasetSearchBox.d.ts.map | 2 +- dist/menu/DatasetSearchBox.js | 73 ++++++++++++++----------- dist/menu/DatasetSearchBox.js.map | 2 +- dist/views/DependentGeneTable.d.ts | 5 +- dist/views/DependentSampleTable.d.ts | 5 +- 9 files changed, 97 insertions(+), 76 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 2587b238..836b542b 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,4 +1,3 @@ -/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; //# sourceMappingURL=DatasetCard.d.ts.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.d.ts.map b/dist/menu/DatasetCard.d.ts.map index b2fb68d6..2fd90cae 100644 --- a/dist/menu/DatasetCard.d.ts.map +++ b/dist/menu/DatasetCard.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":";AAiBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eAqLjJ"} \ No newline at end of file +{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eAwLjJ"} \ No newline at end of file diff --git a/dist/menu/DatasetCard.js b/dist/menu/DatasetCard.js index 596b29e7..ad011a04 100644 --- a/dist/menu/DatasetCard.js +++ b/dist/menu/DatasetCard.js @@ -1,29 +1,34 @@ import React from 'react'; -import { ENamedSetType, RestBaseUtils, RestStorageUtils, StoreUtils } from 'tdp_core'; +import { ENamedSetType, RestBaseUtils, RestStorageUtils, StoreUtils, UserSession, UniqueIdManager, I18nextManager, IDTypeManager, useAsync, } from 'tdp_core'; import { NamedSetList, OrdinoContext } from 'ordino'; -import { UserSession, UniqueIdManager, I18nextManager, IDTypeManager, useAsync } from 'tdp_core'; +import { Species } from 'tdp_gene'; import { DatasetSearchBox } from './DatasetSearchBox'; -import { Species, SpeciesUtils } from 'tdp_gene'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }) { var _a, _b; const testId = `datasetcard-${cssClass}`; const { app } = React.useContext(OrdinoContext); const [dirtyNamedSets, setDirtyNamedSets] = React.useState(false); const loadPredefinedSet = React.useMemo(() => { - return () => RestBaseUtils.getTDPData(dataSource.db, `${dataSource.base}_panel`) - .then((panels) => { - return [{ - name: 'All', - type: ENamedSetType.CUSTOM, - subTypeKey: Species.SPECIES_SESSION_KEY, - subTypeFromSession: true, - subTypeValue: SpeciesUtils.getSelectedSpecies(), - description: '', - idType: '', - ids: '', - creator: '' - }, ...panels - .map(function panel2NamedSet({ id, description, species }) { + return async () => { + const panels = await RestBaseUtils.getTDPData(dataSource.db, `${dataSource.base}_panel`); + const uniqueSpecies = [...new Set(panels.map(({ species }) => species))]; + return [ + // first add an `All` named set for each species ... + ...uniqueSpecies.map((species) => { + return { + name: I18nextManager.getInstance().i18n.t(`tdp:datasetCard.predefinedSet.all.name`), + type: ENamedSetType.CUSTOM, + subTypeKey: Species.SPECIES_SESSION_KEY, + subTypeFromSession: true, + subTypeValue: species, + description: I18nextManager.getInstance().i18n.t(`tdp:datasetCard.predefinedSet.all.description`, { species }), + idType: '', + ids: '', + creator: '', + }; + }), + // ... then add all the predefined sets loaded from the backend + ...panels.map(({ id, description, species }) => { return { type: ENamedSetType.PANEL, id, @@ -32,13 +37,16 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, subTypeKey: Species.SPECIES_SESSION_KEY, subTypeFromSession: false, subTypeValue: species, - idType: '' + idType: '', }; - })]; - }); + }), + ]; + }; + // eslint-disable-next-line react-hooks/exhaustive-deps }, [dataSource.idType]); const loadNamedSets = React.useMemo(() => { return () => RestStorageUtils.listNamedSets(dataSource.idType); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [dataSource.idType, dirtyNamedSets]); const predefinedNamedSets = useAsync(loadPredefinedSet, []); const me = UserSession.getInstance().currentUserNameOrAnonymous(); @@ -49,7 +57,7 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, const onOpenNamedSet = (event, { namedSet, species }) => { event.preventDefault(); const defaultSessionValues = { - [Species.SPECIES_SESSION_KEY]: species + [Species.SPECIES_SESSION_KEY]: species, }; // store the selected species/tab as it is necessary in the rankings UserSession.getInstance().store(Species.SPECIES_SESSION_KEY, species); @@ -58,18 +66,17 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, const onOpenSearchResult = (event, { searchResult, species }) => { event.preventDefault(); const defaultSessionValues = { - [Species.SPECIES_SESSION_KEY]: species + [Species.SPECIES_SESSION_KEY]: species, }; // store the selected species UserSession.getInstance().store(Species.SPECIES_SESSION_KEY, species); app.startNewSession(startViewId, searchResult, defaultSessionValues); }; const onSaveAsNamedSet = (items, subtype) => { - StoreUtils.editDialog(null, I18nextManager.getInstance().i18n.t(`tdp:core.editDialog.listOfEntities.default`), async (name, description, isPublic) => { + StoreUtils.editDialog(null, I18nextManager.getInstance().i18n.t(`tdp:core.editDialog.listOfEntities.default`), async (n, description, isPublic) => { const idStrings = items === null || items === void 0 ? void 0 : items.map((i) => i.id); const idType = IDTypeManager.getInstance().resolveIdType(dataSource.idType); - const ids = await idType.map(idStrings); - await RestStorageUtils.saveNamedSet(name, idType, ids, subtype, description, isPublic); + await RestStorageUtils.saveNamedSet(name, idType, idStrings, subtype, description, isPublic); setDirtyNamedSets((d) => !d); }); }; @@ -77,24 +84,32 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, const activeTabIndex = 0; return (React.createElement("div", { className: `ordino-dataset ${cssClass || ''}`, "data-testid": testId }, React.createElement("h4", { className: "text-start mb-3" }, - React.createElement("i", { className: 'me-2 ordino-icon-2 ' + icon }), + React.createElement("i", { className: `me-2 ordino-icon-2 ${icon}` }), name), React.createElement("div", { className: "card shadow-sm" }, React.createElement("div", { className: "card-body p-3" }, React.createElement("ul", { className: "nav nav-pills session-tab" }, tabs.map((tab, index) => { return (React.createElement("li", { key: tab.id, className: "nav-item", role: "presentation" }, - React.createElement("a", { className: `nav-link ${(index === activeTabIndex) ? 'active' : ''}`, "data-testid": `${tab.id}-link`, id: `dataset-tab-${tab.id}-${id}`, "data-bs-toggle": "tab", href: `#dataset-panel-${tab.id}-${id}`, role: "tab", "aria-controls": `dataset-panel-${tab.id}-${id}`, "aria-selected": (index === activeTabIndex) }, - React.createElement("i", { className: 'me-2 ' + tab.icon }), + React.createElement("a", { className: `nav-link ${index === activeTabIndex ? 'active' : ''}`, "data-testid": `${tab.id}-link`, id: `dataset-tab-${tab.id}-${id}`, "data-bs-toggle": "tab", href: `#dataset-panel-${tab.id}-${id}`, role: "tab", "aria-controls": `dataset-panel-${tab.id}-${id}`, "aria-selected": index === activeTabIndex }, + React.createElement("i", { className: `me-2 ${tab.icon}` }), tab.name))); })), React.createElement("div", { className: "tab-content" }, tabs.map((tab, index) => { const separators = tokenSeparators ? { tokenSeparators } : null; - return (React.createElement("div", { key: tab.id, className: `tab-pane fade mt-4 ${(index === activeTabIndex) ? 'show active' : ''}`, "data-testid": `${tab.id}-tab`, role: "tabpanel", id: `dataset-panel-${tab.id}-${id}`, "aria-labelledby": `dataset-tab-${tab.id}-${id}` }, - React.createElement(DatasetSearchBox, Object.assign({ placeholder: `Add ${name}`, dataSource: dataSource, params: { species: tab.id }, onSaveAsNamedSet: (items) => onSaveAsNamedSet(items, { key: Species.SPECIES_SESSION_KEY, value: tab.id }), onOpen: (event, searchResult) => { onOpenSearchResult(event, { searchResult, species: tab.id }); } }, separators)), + return (React.createElement("div", { key: tab.id, className: `tab-pane fade mt-4 ${index === activeTabIndex ? 'show active' : ''}`, "data-testid": `${tab.id}-tab`, role: "tabpanel", id: `dataset-panel-${tab.id}-${id}`, "aria-labelledby": `dataset-tab-${tab.id}-${id}` }, + React.createElement(DatasetSearchBox, { placeholder: `Add ${name}`, dataSource: dataSource, params: { species: tab.id }, onSaveAsNamedSet: (items) => onSaveAsNamedSet(items, { key: Species.SPECIES_SESSION_KEY, value: tab.id }), onOpen: (event, searchResult) => { + onOpenSearchResult(event, { searchResult, species: tab.id }); + }, ...separators }), React.createElement("div", { className: "row mt-4" }, - React.createElement(NamedSetList, { headerIcon: "fas fa-database", headerText: "Predefined Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); }, status: predefinedNamedSets.status, value: filterValue(predefinedNamedSets.value, tab.id) }), - React.createElement(NamedSetList, { headerIcon: "fas fa-user", headerText: "My Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); }, status: myNamedSets.status, value: filterValue(myNamedSets.value, tab.id) }), - React.createElement(NamedSetList, { headerIcon: "fas fa-users", headerText: "Other Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); }, status: publicNamedSets.status, value: filterValue(publicNamedSets.value, tab.id) })))); + React.createElement(NamedSetList, { headerIcon: "fas fa-database", headerText: "Predefined Sets", onOpen: (event, namedSet) => { + onOpenNamedSet(event, { namedSet, species: tab.id }); + }, status: predefinedNamedSets.status, value: filterValue(predefinedNamedSets.value, tab.id) }), + React.createElement(NamedSetList, { headerIcon: "fas fa-user", headerText: "My Sets", onOpen: (event, namedSet) => { + onOpenNamedSet(event, { namedSet, species: tab.id }); + }, status: myNamedSets.status, value: filterValue(myNamedSets.value, tab.id) }), + React.createElement(NamedSetList, { headerIcon: "fas fa-users", headerText: "Other Sets", onOpen: (event, namedSet) => { + onOpenNamedSet(event, { namedSet, species: tab.id }); + }, status: publicNamedSets.status, value: filterValue(publicNamedSets.value, tab.id) })))); })))))); } //# sourceMappingURL=DatasetCard.js.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.js.map b/dist/menu/DatasetCard.js.map index 3af1cad3..a6f318a0 100644 --- a/dist/menu/DatasetCard.js.map +++ b/dist/menu/DatasetCard.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.d.ts.map b/dist/menu/DatasetSearchBox.d.ts.map index 51d6774a..d19b6b47 100644 --- a/dist/menu/DatasetSearchBox.d.ts.map +++ b/dist/menu/DatasetSearchBox.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,UAAU,EAAgB,MAAM,UAAU,CAAC;AAInE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAa,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAazD,UAAU,uBAAuB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,UAAU,sBAAsB;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,gBAAgB,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IAC7F;;OAEG;IACH,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,gBAAgB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAW,EAAE,eAA6B,EAAE,EAAE,sBAAsB,eA6IzJ"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,UAAU,EAAgB,MAAM,UAAU,CAAC;AAInE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAa,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAQzD,UAAU,uBAAuB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,UAAU,sBAAsB;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,gBAAgB,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IAC7F;;OAEG;IACH,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AA2BD,wBAAgB,gBAAgB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAW,EAAE,eAA6B,EAAE,EAAE,sBAAsB,eAgKzJ"} \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js b/dist/menu/DatasetSearchBox.js index e0224028..34913c36 100644 --- a/dist/menu/DatasetSearchBox.js +++ b/dist/menu/DatasetSearchBox.js @@ -5,18 +5,24 @@ import { AsyncPaginate } from 'react-select-async-paginate'; import Highlighter from 'react-highlight-words'; import { GeneUtils } from '../common'; // functions to add data-testid attribute to react-select components -/* tslint:disable-next-line:variable-name */ -const addDataTestId = (Component, dataTestId) => ((props) => (React.createElement(Component, Object.assign({}, props, { innerProps: Object.assign({}, props.innerProps, { 'data-testid': `${dataTestId}${props.data ? '-' + props.data.id : ''}` }) })))); +// eslint-disable-next-line +const addDataTestId = (Component, dataTestId) => ( +// eslint-disable-next-line +(props) => ( +// eslint-disable-next-line +React.createElement(Component, { ...props, + // eslint-disable-next-line + innerProps: Object.assign({}, props.innerProps, { 'data-testid': `${dataTestId}${props.data ? '-' + props.data.id : ''}` }) }))); function Input(props) { const { onPaste } = props.selectProps; - const modifiedProps = Object.assign({ 'data-testid': 'async-paginate-input' }, props); + const modifiedProps = { 'data-testid': 'async-paginate-input', ...props }; delete modifiedProps.popoverType; // remove the "illegal" prop from the copy - return (React.createElement(components.Input, Object.assign({ onPaste: onPaste }, modifiedProps))); + return React.createElement(components.Input, { onPaste: onPaste, ...modifiedProps }); } -const clearIndicator = (props) => (components.ClearIndicator && (React.createElement(components.ClearIndicator, Object.assign({}, props)))); -const dropdownIndicator = (props) => (components.DropdownIndicator && (React.createElement(components.DropdownIndicator, Object.assign({}, props)))); -const option = (props) => (components.Option && (React.createElement(components.Option, Object.assign({}, props)))); -const multiValueRemove = (props) => (components.MultiValueRemove && (React.createElement(components.MultiValueRemove, Object.assign({}, props)))); +const clearIndicator = (props) => components.ClearIndicator && React.createElement(components.ClearIndicator, { ...props }); +const dropdownIndicator = (props) => components.DropdownIndicator && React.createElement(components.DropdownIndicator, { ...props }); +const option = (props) => components.Option && React.createElement(components.Option, { ...props }); +const multiValueRemove = (props) => components.MultiValueRemove && React.createElement(components.MultiValueRemove, { ...props }); export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsNamedSet, params = {}, tokenSeparators = /[\s;,]+/gm }) { const [items, setItems] = React.useState([]); const [inputValue, setInputValue] = React.useState(''); @@ -27,15 +33,16 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName ...params, query, page, - limit: 10 - }).then(({ items, more }) => ({ - options: items, + limit: 10, + }).then(({ items: elements, more }) => ({ + options: elements, hasMore: more, additional: { - page: page + 1 - } + page: page + 1, + }, })); }; + // eslint-disable-next-line @typescript-eslint/no-shadow const formatOptionLabel = (option, ctx) => { var _a; // do not highlight selected elements @@ -44,8 +51,7 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName } return (React.createElement(React.Fragment, null, React.createElement(Highlighter, { searchWords: [ctx.inputValue], autoEscape: true, textToHighlight: option.text }), - option.text !== option.id && - React.createElement("span", { className: "small text-muted ms-1" }, option.id))); + option.text !== option.id && React.createElement("span", { className: "small text-muted ms-1" }, option.id))); }; React.useEffect(() => { setInputValue(''); @@ -53,10 +59,13 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName const onPaste = async (event) => { var _a; const pastedData = (_a = event.clipboardData.getData('text')) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase(); - const splitData = Select3Utils.splitEscaped(pastedData, tokenSeparators, false).map((d) => d.trim()).filter((d) => d !== ''); + const splitData = Select3Utils.splitEscaped(pastedData, tokenSeparators, false) + .map((d) => d.trim()) + .filter((d) => d !== ''); const validData = await GeneUtils.validateGeneric(dataSource, splitData); const invalidData = splitData - .filter((s) => !validData.length || validData.every((o) => o.id.toLocaleLowerCase() !== s.toLocaleLowerCase() && o.text.toLocaleLowerCase() !== s.toLocaleLowerCase())) + .filter((s) => !validData.length || + validData.every((o) => o.id.toLocaleLowerCase() !== s.toLocaleLowerCase() && o.text.toLocaleLowerCase() !== s.toLocaleLowerCase())) .map((s) => ({ id: s, text: s, invalid: true })); setItems([...validData, ...invalidData]); }; @@ -64,23 +73,23 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName const searchResults = { search: { ids: validItems.map((i) => i.id), - type: dataSource.tableName - } + type: dataSource.tableName, + }, }; return (React.createElement("div", { className: "hstack gap-3 ordino-dataset-searchbox", "data-testid": "ordino-dataset-searchbox" }, - React.createElement(AsyncPaginate, { className: "flex-fill", onPaste: onPaste, placeholder: placeholder, noOptionsMessage: () => 'No results found', isMulti: true, loadOptions: loadOptions, inputValue: inputValue, value: items, onChange: setItems, onInputChange: setInputValue, formatOptionLabel: formatOptionLabel, hideSelectedOptions: true, getOptionLabel: (option) => option.text, getOptionValue: (option) => option.id, captureMenuScroll: false, additional: { - page: 0 // page starts from index 0 + React.createElement(AsyncPaginate, { className: "flex-fill", onPaste: onPaste, placeholder: placeholder, noOptionsMessage: () => 'No results found', isMulti: true, loadOptions: loadOptions, inputValue: inputValue, value: items, onChange: setItems, onInputChange: setInputValue, formatOptionLabel: formatOptionLabel, hideSelectedOptions: true, getOptionLabel: (opt) => opt.text, getOptionValue: (opt) => opt.id, captureMenuScroll: false, additional: { + page: 0, // page starts from index 0 }, components: { Input, Option: addDataTestId(option, 'async-paginate-option'), MultiValueRemove: addDataTestId(multiValueRemove, 'async-paginate-multiselect-remove'), ClearIndicator: addDataTestId(clearIndicator, 'async-paginate-clearindicator'), - DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator') + DropdownIndicator: addDataTestId(dropdownIndicator, 'async-paginate-dropdownindicator'), }, styles: { multiValue: (styles, { data }) => ({ ...styles, border: `1px solid #CCC`, - borderRadius: '3px' + borderRadius: '3px', }), multiValueLabel: (styles, { data }) => ({ ...styles, @@ -89,7 +98,7 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName backgroundColor: 'white', order: 2, paddingLeft: '0', - paddingRight: '6px' + paddingRight: '6px', }), multiValueRemove: (styles, { data }) => ({ ...styles, @@ -98,7 +107,7 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName order: 1, ':hover': { color: '#333', - cursor: 'pointer' + cursor: 'pointer', }, }), placeholder: (provided) => ({ @@ -109,20 +118,20 @@ export function DatasetSearchBox({ placeholder, dataSource, onOpen, onSaveAsName }), input: (css) => ({ ...css, - //expand the Input Component div + // expand the Input Component div flex: '1 1 auto', // expand the Input Component child div '> div': { - width: '100%' + width: '100%', }, // expand the Input Component input input: { width: '100% !important', - textAlign: 'left' - } - }) + textAlign: 'left', + }, + }), } }), - React.createElement("button", { className: "btn btn-secondary", "data-testid": "open-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), - React.createElement("button", { className: "btn btn-outline-secondary", "data-testid": "save-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); + React.createElement("button", { type: "button", className: "btn btn-secondary", "data-testid": "open-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: (event) => onOpen(event, searchResults) }, "Open"), + React.createElement("button", { type: "button", className: "btn btn-outline-secondary", "data-testid": "save-button", disabled: !(validItems === null || validItems === void 0 ? void 0 : validItems.length), onClick: () => onSaveAsNamedSet(validItems) }, "Save as set"))); } //# sourceMappingURL=DatasetSearchBox.js.map \ No newline at end of file diff --git a/dist/menu/DatasetSearchBox.js.map b/dist/menu/DatasetSearchBox.js.map index b5f93945..e903e9d9 100644 --- a/dist/menu/DatasetSearchBox.js.map +++ b/dist/menu/DatasetSearchBox.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetSearchBox.js","sourceRoot":"","sources":["../../src/menu/DatasetSearchBox.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/views/DependentGeneTable.d.ts b/dist/views/DependentGeneTable.d.ts index 2b63ecb2..959015cb 100644 --- a/dist/views/DependentGeneTable.d.ts +++ b/dist/views/DependentGeneTable.d.ts @@ -1,10 +1,8 @@ /** * Created by Marc Streit on 28.07.2016. */ -import { ARankingView, IARankingViewOptions } from 'tdp_core'; +import { ARankingView, IARankingViewOptions, ISelection, IViewContext, IServerColumn } from 'tdp_core'; import { IDataTypeConfig } from '../common/config'; -import { ISelection, IViewContext } from 'tdp_core'; -import { IServerColumn } from 'tdp_core'; export declare class DependentGeneTable extends ARankingView { private readonly dataType; private readonly dataSource; @@ -21,3 +19,4 @@ export declare class DependentGeneTable extends ARankingView { static createCopyNumberDependentGeneTable(context: IViewContext, selection: ISelection, parent: HTMLElement, options?: any): DependentGeneTable; static createMutationDependentGeneTable(context: IViewContext, selection: ISelection, parent: HTMLElement, options?: any): DependentGeneTable; } +//# sourceMappingURL=DependentGeneTable.d.ts.map \ No newline at end of file diff --git a/dist/views/DependentSampleTable.d.ts b/dist/views/DependentSampleTable.d.ts index e5162f5d..c46bd86a 100644 --- a/dist/views/DependentSampleTable.d.ts +++ b/dist/views/DependentSampleTable.d.ts @@ -1,10 +1,8 @@ /** * Created by Marc Streit on 26.07.2016. */ -import { ARankingView, IARankingViewOptions } from 'tdp_core'; +import { ARankingView, IARankingViewOptions, ISelection, IViewContext, IServerColumn } from 'tdp_core'; import { IDataTypeConfig } from '../common/config'; -import { ISelection, IViewContext } from 'tdp_core'; -import { IServerColumn } from 'tdp_core'; export declare class DependentSampleTable extends ARankingView { private readonly dataType; constructor(context: IViewContext, selection: ISelection, parent: HTMLElement, dataType: IDataTypeConfig, options?: Partial); @@ -22,3 +20,4 @@ export declare class DependentSampleTable extends ARankingView { static createCopyNumberDependentSampleTable(context: IViewContext, selection: ISelection, parent: HTMLElement, options?: any): DependentSampleTable; static createMutationDependentSampleTable(context: IViewContext, selection: ISelection, parent: HTMLElement, options?: any): DependentSampleTable; } +//# sourceMappingURL=DependentSampleTable.d.ts.map \ No newline at end of file From caec0d4d624c79ca80651d9209e8572ea322b830 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 30 May 2022 15:44:43 +0200 Subject: [PATCH 07/15] update dist --- dist/menu/DatasetCard.d.ts | 1 + dist/menu/DatasetCard.d.ts.map | 2 +- dist/menu/DatasetCard.js | 41 +++++++++++++++++++++------------- dist/menu/DatasetCard.js.map | 2 +- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 836b542b..2587b238 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,3 +1,4 @@ +/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; //# sourceMappingURL=DatasetCard.d.ts.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.d.ts.map b/dist/menu/DatasetCard.d.ts.map index 2fd90cae..d3463b7e 100644 --- a/dist/menu/DatasetCard.d.ts.map +++ b/dist/menu/DatasetCard.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eAwLjJ"} \ No newline at end of file +{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eA+MjJ"} \ No newline at end of file diff --git a/dist/menu/DatasetCard.js b/dist/menu/DatasetCard.js index ad011a04..6bea9eb9 100644 --- a/dist/menu/DatasetCard.js +++ b/dist/menu/DatasetCard.js @@ -1,13 +1,13 @@ import React from 'react'; -import { ENamedSetType, RestBaseUtils, RestStorageUtils, StoreUtils, UserSession, UniqueIdManager, I18nextManager, IDTypeManager, useAsync, } from 'tdp_core'; +import { ENamedSetType, RestBaseUtils, RestStorageUtils, StoreUtils, UserSession, UniqueIdManager, I18nextManager, IDTypeManager, useAsync, GlobalEventHandler, AView, } from 'tdp_core'; import { NamedSetList, OrdinoContext } from 'ordino'; import { Species } from 'tdp_gene'; import { DatasetSearchBox } from './DatasetSearchBox'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }) { - var _a, _b; const testId = `datasetcard-${cssClass}`; const { app } = React.useContext(OrdinoContext); - const [dirtyNamedSets, setDirtyNamedSets] = React.useState(false); + const [namedSets, setNamedSets] = React.useState([]); + const [dirtyNamedSets, setDirtyNamedSets] = React.useState(true); const loadPredefinedSet = React.useMemo(() => { return async () => { const panels = await RestBaseUtils.getTDPData(dataSource.db, `${dataSource.base}_panel`); @@ -44,15 +44,26 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, }; // eslint-disable-next-line react-hooks/exhaustive-deps }, [dataSource.idType]); - const loadNamedSets = React.useMemo(() => { - return () => RestStorageUtils.listNamedSets(dataSource.idType); - // eslint-disable-next-line react-hooks/exhaustive-deps + const loadNamedSets = React.useCallback(async () => { + // if dirty is false do not reload data again + if (!dirtyNamedSets) { + return; + } + setNamedSets(await RestStorageUtils.listNamedSets(dataSource.idType)); + setDirtyNamedSets(false); }, [dataSource.idType, dirtyNamedSets]); + React.useEffect(() => { + const entryPointChanged = () => setDirtyNamedSets(true); + GlobalEventHandler.getInstance().on(AView.EVENT_UPDATE_ENTRY_POINT, entryPointChanged); + return () => { + GlobalEventHandler.getInstance().off(AView.EVENT_UPDATE_ENTRY_POINT, entryPointChanged); + }; + }, []); const predefinedNamedSets = useAsync(loadPredefinedSet, []); const me = UserSession.getInstance().currentUserNameOrAnonymous(); - const namedSets = useAsync(loadNamedSets, []); - const myNamedSets = { ...namedSets, ...{ value: (_a = namedSets.value) === null || _a === void 0 ? void 0 : _a.filter((d) => d.type === ENamedSetType.NAMEDSET && d.creator === me) } }; - const publicNamedSets = { ...namedSets, ...{ value: (_b = namedSets.value) === null || _b === void 0 ? void 0 : _b.filter((d) => d.type === ENamedSetType.NAMEDSET && d.creator !== me) } }; + const { status: namedSetsStatus } = useAsync(loadNamedSets, []); + const myNamedSets = { ...namedSets, ...{ value: namedSets === null || namedSets === void 0 ? void 0 : namedSets.filter((d) => d.type === ENamedSetType.NAMEDSET && d.creator === me) } }; + const publicNamedSets = { ...namedSets, ...{ value: namedSets === null || namedSets === void 0 ? void 0 : namedSets.filter((d) => d.type === ENamedSetType.NAMEDSET && d.creator !== me) } }; const filterValue = (value, tab) => value === null || value === void 0 ? void 0 : value.filter((entry) => entry.subTypeValue === tab); const onOpenNamedSet = (event, { namedSet, species }) => { event.preventDefault(); @@ -73,11 +84,11 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, app.startNewSession(startViewId, searchResult, defaultSessionValues); }; const onSaveAsNamedSet = (items, subtype) => { - StoreUtils.editDialog(null, I18nextManager.getInstance().i18n.t(`tdp:core.editDialog.listOfEntities.default`), async (n, description, isPublic) => { + StoreUtils.editDialog(null, I18nextManager.getInstance().i18n.t(`tdp:core.editDialog.listOfEntities.default`), async (datasetName, description, isPublic) => { const idStrings = items === null || items === void 0 ? void 0 : items.map((i) => i.id); const idType = IDTypeManager.getInstance().resolveIdType(dataSource.idType); - await RestStorageUtils.saveNamedSet(name, idType, idStrings, subtype, description, isPublic); - setDirtyNamedSets((d) => !d); + await RestStorageUtils.saveNamedSet(datasetName, idType, idStrings, subtype, description, isPublic); + setDirtyNamedSets(true); }); }; const id = React.useMemo(() => UniqueIdManager.getInstance().uniqueId(), []); @@ -103,13 +114,13 @@ export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, React.createElement("div", { className: "row mt-4" }, React.createElement(NamedSetList, { headerIcon: "fas fa-database", headerText: "Predefined Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); - }, status: predefinedNamedSets.status, value: filterValue(predefinedNamedSets.value, tab.id) }), + }, onEditNamedSet: () => setDirtyNamedSets(true), onDeleteNamedSet: () => setDirtyNamedSets(true), status: predefinedNamedSets.status, value: filterValue(predefinedNamedSets.value, tab.id) }), React.createElement(NamedSetList, { headerIcon: "fas fa-user", headerText: "My Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); - }, status: myNamedSets.status, value: filterValue(myNamedSets.value, tab.id) }), + }, onEditNamedSet: () => setDirtyNamedSets(true), onDeleteNamedSet: () => setDirtyNamedSets(true), status: namedSetsStatus, value: filterValue(myNamedSets.value, tab.id) }), React.createElement(NamedSetList, { headerIcon: "fas fa-users", headerText: "Other Sets", onOpen: (event, namedSet) => { onOpenNamedSet(event, { namedSet, species: tab.id }); - }, status: publicNamedSets.status, value: filterValue(publicNamedSets.value, tab.id) })))); + }, onEditNamedSet: () => setDirtyNamedSets(true), onDeleteNamedSet: () => setDirtyNamedSets(true), status: namedSetsStatus, value: filterValue(publicNamedSets.value, tab.id) })))); })))))); } //# sourceMappingURL=DatasetCard.js.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.js.map b/dist/menu/DatasetCard.js.map index a6f318a0..ba8d89da 100644 --- a/dist/menu/DatasetCard.js.map +++ b/dist/menu/DatasetCard.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file From e71f24ed4b227cf8b349f18b4f1328f7301d8d42 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 7 Jun 2022 14:53:01 +0200 Subject: [PATCH 08/15] rename for constistency --- dist/menu/DatasetCard.js | 2 +- dist/menu/DatasetCard.js.map | 2 +- src/menu/DatasetCard.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/menu/DatasetCard.js b/dist/menu/DatasetCard.js index 6bea9eb9..c1666290 100644 --- a/dist/menu/DatasetCard.js +++ b/dist/menu/DatasetCard.js @@ -4,7 +4,7 @@ import { NamedSetList, OrdinoContext } from 'ordino'; import { Species } from 'tdp_gene'; import { DatasetSearchBox } from './DatasetSearchBox'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }) { - const testId = `datasetcard-${cssClass}`; + const testId = `dataset-card-${cssClass}`; const { app } = React.useContext(OrdinoContext); const [namedSets, setNamedSets] = React.useState([]); const [dirtyNamedSets, setDirtyNamedSets] = React.useState(true); diff --git a/dist/menu/DatasetCard.js.map b/dist/menu/DatasetCard.js.map index ba8d89da..fdc2bfe7 100644 --- a/dist/menu/DatasetCard.js.map +++ b/dist/menu/DatasetCard.js.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DatasetCard.js","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/menu/DatasetCard.tsx b/src/menu/DatasetCard.tsx index 228380ad..ee81de24 100644 --- a/src/menu/DatasetCard.tsx +++ b/src/menu/DatasetCard.tsx @@ -20,7 +20,7 @@ import { DatasetSearchBox } from './DatasetSearchBox'; import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc) { - const testId = `datasetcard-${cssClass}`; + const testId = `dataset-card-${cssClass}`; const { app } = React.useContext(OrdinoContext); const [namedSets, setNamedSets] = React.useState([]); const [dirtyNamedSets, setDirtyNamedSets] = React.useState(true); From 3946d4ea4033aaed3420ed64d5746a71aadaaf1d Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 21 Jun 2022 10:46:46 +0200 Subject: [PATCH 09/15] update dist --- dist/menu/DatasetCard.d.ts | 1 - dist/menu/DatasetCard.d.ts.map | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 2587b238..836b542b 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,4 +1,3 @@ -/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; //# sourceMappingURL=DatasetCard.d.ts.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.d.ts.map b/dist/menu/DatasetCard.d.ts.map index d3463b7e..ce5bcc3d 100644 --- a/dist/menu/DatasetCard.d.ts.map +++ b/dist/menu/DatasetCard.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eA+MjJ"} \ No newline at end of file +{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"AAmBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eA+MjJ"} \ No newline at end of file From ee11bbc93de76527040dbcc31f5afa8b9f70f4f0 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Thu, 30 Jun 2022 11:07:44 +0200 Subject: [PATCH 10/15] Fix typings Requires https://github.com/datavisyn/tdp_core/pull/749 --- dist/menu/DatasetCard.d.ts | 1 + dist/menu/DatasetCard.d.ts.map | 2 +- dist/scores/forms.d.ts | 42 +++++++++---------- 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/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/SimilarityView.d.ts | 4 +- dist/views/SimilarityView.d.ts.map | 2 +- dist/views/SimilarityView.js | 8 ++-- dist/views/SimilarityView.js.map | 2 +- src/views/ACombinedDependentTable.ts | 5 ++- src/views/CombinedDependentSampleTable.ts | 5 +-- src/views/SimilarityView.ts | 9 ++-- 20 files changed, 52 insertions(+), 52 deletions(-) diff --git a/dist/menu/DatasetCard.d.ts b/dist/menu/DatasetCard.d.ts index 836b542b..2587b238 100644 --- a/dist/menu/DatasetCard.d.ts +++ b/dist/menu/DatasetCard.d.ts @@ -1,3 +1,4 @@ +/// import { IPublicDbStartMenuDatasetSectionDesc } from '../base/extensions'; export default function DatasetCard({ name, icon, tabs, startViewId, dataSource, cssClass, tokenSeparators }: IPublicDbStartMenuDatasetSectionDesc): JSX.Element; //# sourceMappingURL=DatasetCard.d.ts.map \ No newline at end of file diff --git a/dist/menu/DatasetCard.d.ts.map b/dist/menu/DatasetCard.d.ts.map index ce5bcc3d..d3463b7e 100644 --- a/dist/menu/DatasetCard.d.ts.map +++ b/dist/menu/DatasetCard.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":"AAmBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eA+MjJ"} \ No newline at end of file +{"version":3,"file":"DatasetCard.d.ts","sourceRoot":"","sources":["../../src/menu/DatasetCard.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,oCAAoC,eA+MjJ"} \ No newline at end of file diff --git a/dist/scores/forms.d.ts b/dist/scores/forms.d.ts index 35ef6e91..26902869 100644 --- a/dist/scores/forms.d.ts +++ b/dist/scores/forms.d.ts @@ -134,6 +134,22 @@ export declare const FORM_SINGLE_SCORE: { useSession: boolean; }[]; export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ + type: FormElementType; + label: string; + id: string; + attributes: { + style: string; + }; + required: boolean; + options: { + placeholder: string; + data: { + id: string; + text: string; + }[]; + }; + useSession: boolean; +} | { type: FormElementType; label: string; id: string; @@ -180,7 +196,8 @@ export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ step: string; optionsData?: undefined; }; -} | { +})[]; +export declare const FORM_SINGLE_SCORE_DEPLETION: { type: FormElementType; label: string; id: string; @@ -196,8 +213,8 @@ export declare const FORM_AGGREGATED_SCORE_DEPLETION: ({ }[]; }; useSession: boolean; -})[]; -export declare const FORM_SINGLE_SCORE_DEPLETION: { +}[]; +export declare const FORM_SINGLE_SCORE_DRUG: ({ type: FormElementType; label: string; id: string; @@ -213,8 +230,7 @@ export declare const FORM_SINGLE_SCORE_DEPLETION: { }[]; }; useSession: boolean; -}[]; -export declare const FORM_SINGLE_SCORE_DRUG: ({ +} | { type: FormElementType; label: string; id: string; @@ -230,21 +246,5 @@ export declare const FORM_SINGLE_SCORE_DRUG: ({ format: typeof import("..").GeneUtils.formatDrugScreen; }; useSession: boolean; -} | { - type: FormElementType; - label: string; - id: string; - attributes: { - style: string; - }; - required: boolean; - options: { - placeholder: string; - data: { - id: string; - text: string; - }[]; - }; - useSession: boolean; })[]; //# sourceMappingURL=forms.d.ts.map \ 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":"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"} \ 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/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..212ad41d 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;IAOvC,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..1ea5949f 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(); // early abort after rebuild since there is nothing worse than building from scratch } - 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..af86719a 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,CAAC,oFAAoF;SAC5G;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/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..6b412e9d 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,EAKtB,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 diff --git a/dist/views/SimilarityView.js b/dist/views/SimilarityView.js index af8bd313..36b7c019 100644 --- a/dist/views/SimilarityView.js +++ b/dist/views/SimilarityView.js @@ -92,16 +92,16 @@ 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(); + return this.rebuild(); }); } createInitialRanking(provider) { diff --git a/dist/views/SimilarityView.js.map b/dist/views/SimilarityView.js.map index 90ee81b4..454bf48e 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/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..8debe1f7 100644 --- a/src/views/CombinedDependentSampleTable.ts +++ b/src/views/CombinedDependentSampleTable.ts @@ -24,10 +24,9 @@ export class CombinedDependentSampleTable extends ACombinedDependentTable { protected parameterChanged(name: string) { if (name === FORM_DATA_SOURCE.id) { - this.rebuild(); - return; // early abort since there is nothing worse than building from scratch + return this.rebuild(); // early abort after rebuild since there is nothing worse than building from scratch } - super.parameterChanged(name); + return super.parameterChanged(name); } protected getSelectionColumnLabel(ensg: string) { diff --git a/src/views/SimilarityView.ts b/src/views/SimilarityView.ts index d1814523..e9079ac1 100644 --- a/src/views/SimilarityView.ts +++ b/src/views/SimilarityView.ts @@ -12,7 +12,6 @@ import { ColumnDescUtils, FormElementType, IFormSelectElement, - IDTypeManager, RestBaseUtils, } from 'tdp_core'; import { LocalDataProvider, createSelectionDesc, createStackDesc, StackColumn } from 'lineupjs'; @@ -127,18 +126,18 @@ export class SimilarityView extends ARankingView { protected parameterChanged(name: string) { 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(); + return this.rebuild(); }); } From fbc855a6eccf325182d2ee34df3a33181ca86d67 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 19 Jul 2022 07:58:42 +0200 Subject: [PATCH 11/15] add index.js --- cypress/integration/index.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 cypress/integration/index.js diff --git a/cypress/integration/index.js b/cypress/integration/index.js new file mode 100644 index 00000000..60357546 --- /dev/null +++ b/cypress/integration/index.js @@ -0,0 +1,4 @@ +export * from 'tdp_bi_bioinfodb/cypress/integration/long-running-score.spec'; +export * from './session_all_celllines.spec'; +export * from './session_all_genes.spec'; +export * from './session_all_tissues.spec'; From 2867237b4b72fe7f9cc47cd8af6e00e977bec824 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 19 Jul 2022 15:26:02 +0200 Subject: [PATCH 12/15] fix setup --- cypress/integration/index.js | 6 +- .../integration/long-running-score.spec.js | 46 ++++++ cypress/integration/ordino-video-test.spec.js | 156 ++++++++++++++++++ .../integration/session_all_celllines.spec.js | 27 +++ cypress/integration/session_all_genes.spec.js | 27 +++ .../integration/session_all_tissues.spec.js | 27 +++ 6 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 cypress/integration/long-running-score.spec.js create mode 100644 cypress/integration/ordino-video-test.spec.js create mode 100644 cypress/integration/session_all_celllines.spec.js create mode 100644 cypress/integration/session_all_genes.spec.js create mode 100644 cypress/integration/session_all_tissues.spec.js diff --git a/cypress/integration/index.js b/cypress/integration/index.js index 60357546..34429a2b 100644 --- a/cypress/integration/index.js +++ b/cypress/integration/index.js @@ -1,4 +1,6 @@ -export * from 'tdp_bi_bioinfodb/cypress/integration/long-running-score.spec'; -export * from './session_all_celllines.spec'; +export * from './long-running-score.spec'; export * from './session_all_genes.spec'; +export * from './session_all_celllines.spec'; export * from './session_all_tissues.spec'; + +export * from './ordino-video-test.spec'; diff --git a/cypress/integration/long-running-score.spec.js b/cypress/integration/long-running-score.spec.js new file mode 100644 index 00000000..4da2592b --- /dev/null +++ b/cypress/integration/long-running-score.spec.js @@ -0,0 +1,46 @@ +import {scrollElementIntoCenter, formSelect, select2SingleSelect} from 'tdp_core/dist/cypress/utils'; +import {waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils'; + +// https://www.youtube.com/watch?v=JZIIf-k852g&t=1s +it('Long Running Score', function() { + cy.visit(Cypress.env('host')); + // Login + cy.get('[data-testid=ordino-navbar] [data-testid=start-analysis-button]').click(); + + cy.login(); // use Cypress command registerd in Ordino app + + // Show you can select single genes if you wanted + scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + // wait intentionally a few seconds + cy.wait(2000) + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-link]').click(); + + // Open Lineup ranking + // Define api calls to wait: + cy.intercept('/api/tdp/db/publicdb/gene/desc').as('gene_desc'); + cy.intercept('/api/tdp/db/publicdb/gene/filter?filter_species=human&filter_panel=normal+chromosome+protein+coding+human+genes').as('human_genes'); + cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); + cy.wait('@gene_desc'); + cy.wait('@human_genes'); + waitLineupReadyOrdino(0) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.wait(2000); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); + select2SingleSelect("data-type", "Relative Copy Number") + formSelect("aggregation", "Boxplot") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 9) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); + formSelect("aggregation", "Frequency") + formSelect("comparison-operator", "> greater than") + cy.get(':nth-child(5) > .form-control').clear(); + cy.get(':nth-child(5) > .form-control').type('4'); + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['Frequency > 4'], 10) +}) \ No newline at end of file diff --git a/cypress/integration/ordino-video-test.spec.js b/cypress/integration/ordino-video-test.spec.js new file mode 100644 index 00000000..2ce4b2c4 --- /dev/null +++ b/cypress/integration/ordino-video-test.spec.js @@ -0,0 +1,156 @@ +import { cy, it, Cypress } from 'local-cypress'; +import { waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils'; +import { scrollElementIntoCenter, select2MultiSelect, formSelect, select2SingleSelect, waitTdpNotBusy} from 'tdp_core/dist/cypress/utils'; + +// https://www.youtube.com/watch?v=JZIIf-k852g&t=1s +it('ordino video', function() { + cy.visit(Cypress.env('host')); + + cy.get('[data-testid=ordino-navbar] [data-testid=start-analysis-button]').click(); + + cy.login(); // use Cypress command registerd in Ordino app + + // Show you can select single genes if you wanted + scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + // wait intentionally a few seconds + cy.wait(2000) + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-link]').click(); + + // Open Lineup ranking + // Define api calls to wait: + cy.intercept('/api/tdp/db/publicdb/gene/desc').as('gene_desc'); + cy.intercept('/api/tdp/db/publicdb/gene/filter?filter_species=human&filter_panel=normal+chromosome+protein+coding+human+genes').as('human_genes'); + cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); + cy.wait('@gene_desc'); + cy.wait('@human_genes'); + waitLineupReadyOrdino(0) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); + select2MultiSelect("cell-line", "HCC1954") + select2MultiSelect("data-type", "Relative Copy Number") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9); + + // Sort by column + // cy.get('[data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click(); + + // Show some information + cy.get('[data-testid="(un)collapse-button"] > .fas').click(); + // intentionally wait 1 second + cy.wait(1000) + // filter with histogram not possible + cy.get('[data-testid="(un)collapse-button"] > .fas').click(); + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); + select2MultiSelect("cell-line", "HCC1954") + select2MultiSelect("data-type", "Normalized Gene Expression (TPM Values)") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['HCC1954', 'Normalized Gene Expression (TPM Values)'], 10) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(5) > span').click(); + select2MultiSelect("cell-line", "HCC1954") + select2MultiSelect("data-type", "DRIVE RSA (ER McDonald III et al., Cell, 2017)") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['HCC1954', 'DRIVE RSA (ER McDonald III et al., Cell, 2017)'], 11) + + // Invert column + // Here the title should be used. For some reason cypress has problmes, because there is a " character in the title. For now I use the data-id + cy.get('[data-id="col10"] > .lu-toolbar > .lu-action-more').click(); + cy.get('.lu-action-data-mapping > span').click(); + cy.get('.browser-default').select('linear_invert'); + cy.get('.lu-dialog-buttons > [type="submit"]').click(); + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); + formSelect("row-1", "Tumor Type") + select2MultiSelect("row-1", "breast carcinoma") + select2SingleSelect("data-type", "Normalized Gene Expression (TPM Values)") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['Tumor Type', 'breast carcinoma', 'Normalized Gene Expression (TPM Values)'], 12) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.wait(2000); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); + select2SingleSelect("data-type", "Relative Copy Number") + formSelect("aggregation", "Boxplot") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 13) + + // Add column + cy.get('[data-testid=add-column-button]').click(); + cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); + formSelect("aggregation", "Frequency") + formSelect("comparison-operator", "> greater than") + cy.get(':nth-child(5) > .form-control').clear(); + cy.get(':nth-child(5) > .form-control').type('4'); + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(0, ['Frequency > 4'], 14) + + // Select elements and click on detail views + waitLineupReadyOrdino(0) + cy.get('[data-index="0"] > .lu-renderer-selection').click(); + cy.get('[data-testid=celllinedb_expression_vs_copynumber]').click(); + waitTdpNotBusy() + waitLineupReadyOrdino(0) + cy.wait(2000) + cy.get('[data-index="6"] > .lu-renderer-selection').click(); + waitTdpNotBusy() + waitLineupReadyOrdino(0) + cy.wait(2000) + cy.get('[data-index="6"] > .lu-renderer-selection').click(); + waitTdpNotBusy() + cy.wait(2000) + cy.get('[data-testid=targetvalidation]').click(); + waitTdpNotBusy() + cy.wait(2000) + cy.get('[data-testid=ensembl_org]').click(); + waitTdpNotBusy() + cy.wait(2000) + cy.get('[data-testid=copynumbertable]').click(); + waitTdpNotBusy() + cy.wait(2000) + + // Sort and filter columns + cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > :nth-child(1) > .le > .le-header > .le-thead > [data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click(); + cy.get('[title="Tumor Type"] > .lu-toolbar > .lu-action-filter').click(); + cy.get('.lu-dialog-table > :nth-child(1) > :nth-child(2) > div').click(); + cy.get('.lu-dialog-table > :nth-child(1) > input').uncheck(); + cy.get(':nth-child(6) > :nth-child(2) > .lu-dialog-filter-table-entry-label').click(); + cy.get('.lu-dialog-table > :nth-child(6) > input').check(); + cy.get('.lu-dialog-buttons > [type="submit"]').click(); + + // Add column + cy.get('[data-testid=viewWrapper-1] [data-testid=side-panel-wrapper] [data-testid=lu-adder-div] [data-testid=add-column-button]').click(); + cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > [data-testid=side-panel-wrapper] > .panel-header > :nth-child(2) > [data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); + select2MultiSelect("gene-symbol", ["BRCA1", "BRCA2"]) + select2MultiSelect("data-type", "AA Mutated") + cy.get('[data-testid=primary-dialog-button]').click(); + checkScoreColLoadedOrdino(1, ['BRCA1', 'AA Mutated'], 10) + checkScoreColLoadedOrdino(1, ['BRCA2', 'AA Mutated'], 10) + + waitLineupReadyOrdino(1) + cy.get('[data-testid=viewWrapper-1] [data-index="0"] > .lu-renderer-selection').click(); + cy.get('[data-testid=viewWrapper-1] [data-index="1"] > .lu-renderer-selection').click(); + cy.get('[data-testid=cosmic]').click(); + // Intentionally wait 2 seconds + waitTdpNotBusy() + cy.wait(2000) + cy.get('[data-testid=show] [data-testid=form-select]').select('907046'); + // Intentionally wait 2 seconds + waitTdpNotBusy() + cy.wait(2000) + cy.get('[data-testid=ordino_sessions_shortcut-link]').click(); + cy.get('[data-testid=current-session-sessionscard] [data-testid=ordino0] [data-testid=save-button]').click(); + cy.get('[data-testid=agree-input]').check(); + cy.get('[data-testid=primary-dialog-button]').click(); + cy.get('[data-testid=ordino_sessions_tab] [data-testid=close-button]').click(); +}) \ No newline at end of file diff --git a/cypress/integration/session_all_celllines.spec.js b/cypress/integration/session_all_celllines.spec.js new file mode 100644 index 00000000..22f7d563 --- /dev/null +++ b/cypress/integration/session_all_celllines.spec.js @@ -0,0 +1,27 @@ +import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; +import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; + +it('Load all Celllines', function() { + cy.visit(Cypress.env('host')); + + // Login + cy.get('[data-testid=ordino-navbar] [data-testid=start-analysis-button]').click(); + + cy.login(); // use Cypress command registerd in Ordino app + + // Show you can select single genes if you wanted + scrollElementIntoCenter('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.get('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + // wait intentionally a few seconds + cy.wait(2000) + cy.get('[data-testid=dataset-card-cellline-dataset] [data-testid=human-link]').click(); + + // Open Lineup ranking + // Define api calls to wait: + cy.intercept('/api/tdp/db/publicdb/cellline/desc').as('cellline_desc'); + cy.intercept('/api/tdp/db/publicdb/cellline/filter?filter_species=human&filter_panel=CCLE').as('human_cellline'); + cy.get('[data-testid=ccle-button]').click(); + cy.wait('@cellline_desc'); + cy.wait('@human_cellline'); + waitLineupReadyOrdino(0) +}); diff --git a/cypress/integration/session_all_genes.spec.js b/cypress/integration/session_all_genes.spec.js new file mode 100644 index 00000000..4f1f567f --- /dev/null +++ b/cypress/integration/session_all_genes.spec.js @@ -0,0 +1,27 @@ +import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; +import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; + +it('Load all Genes', function() { + cy.visit(Cypress.env('host')); + + // Login + cy.get('[data-testid=ordino-navbar] [data-testid=start-analysis-button]').click(); + + cy.login(); // use Cypress command registerd in Ordino app + + // Show you can select single genes if you wanted + scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + // wait intentionally a few seconds + cy.wait(2000) + cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-link]').click(); + + // Open Lineup ranking + // Define api calls to wait: + cy.intercept('/api/tdp/db/publicdb/gene/desc').as('gene_desc'); + cy.intercept('/api/tdp/db/publicdb/gene/filter?filter_species=human&filter_panel=normal+chromosome+protein+coding+human+genes').as('human_genes'); + cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); + cy.wait('@gene_desc'); + cy.wait('@human_genes'); + waitLineupReadyOrdino(0) +}); diff --git a/cypress/integration/session_all_tissues.spec.js b/cypress/integration/session_all_tissues.spec.js new file mode 100644 index 00000000..40b7bf9c --- /dev/null +++ b/cypress/integration/session_all_tissues.spec.js @@ -0,0 +1,27 @@ +import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; +import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; + +it('Load all Tissues', function() { + cy.visit(Cypress.env('host')); + + // Login + cy.get('[data-testid=ordino-navbar] [data-testid=start-analysis-button]').click(); + + cy.login(); // use Cypress command registerd in Ordino app + + // Show you can select single genes if you wanted + scrollElementIntoCenter('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.get('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + // wait intentionally a few seconds + cy.wait(2000) + cy.get('[data-testid=dataset-card-tissue-dataset] [data-testid=human-link]').click(); + + // Open Lineup ranking + // Define api calls to wait: + cy.intercept('/api/tdp/db/publicdb/tissue/desc').as('tissue_desc'); + cy.intercept('/api/tdp/db/publicdb/tissue/filter?filter_species=human&filter_panel=TCGA+normals').as('human_tissue'); + cy.get('[data-testid=tcga-normals-button]').click(); + cy.wait('@tissue_desc'); + cy.wait('@human_tissue'); + waitLineupReadyOrdino(0) +}); From e0d7459193828255e477fce56e44655d4bf9c795 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 20 Jul 2022 07:54:43 +0200 Subject: [PATCH 13/15] update imports and function calls --- .../integration/long-running-score.spec.js | 19 ++--- cypress/integration/ordino-video-test.spec.js | 76 +++++++++---------- .../integration/session_all_celllines.spec.js | 7 +- cypress/integration/session_all_genes.spec.js | 7 +- .../integration/session_all_tissues.spec.js | 7 +- 5 files changed, 51 insertions(+), 65 deletions(-) diff --git a/cypress/integration/long-running-score.spec.js b/cypress/integration/long-running-score.spec.js index 4da2592b..0c738c7a 100644 --- a/cypress/integration/long-running-score.spec.js +++ b/cypress/integration/long-running-score.spec.js @@ -1,6 +1,3 @@ -import {scrollElementIntoCenter, formSelect, select2SingleSelect} from 'tdp_core/dist/cypress/utils'; -import {waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils'; - // https://www.youtube.com/watch?v=JZIIf-k852g&t=1s it('Long Running Score', function() { cy.visit(Cypress.env('host')); @@ -10,7 +7,7 @@ it('Long Running Score', function() { cy.login(); // use Cypress command registerd in Ordino app // Show you can select single genes if you wanted - scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() // wait intentionally a few seconds cy.wait(2000) @@ -23,24 +20,24 @@ it('Long Running Score', function() { cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); cy.wait('@gene_desc'); cy.wait('@human_genes'); - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) // Add column cy.get('[data-testid=add-column-button]').click(); cy.wait(2000); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); - select2SingleSelect("data-type", "Relative Copy Number") - formSelect("aggregation", "Boxplot") + cy.select2SingleSelect("data-type", "Relative Copy Number") + cy.formSelect("aggregation", "Boxplot") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 9) + cy.checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 9) // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); - formSelect("aggregation", "Frequency") - formSelect("comparison-operator", "> greater than") + cy.formSelect("aggregation", "Frequency") + cy.formSelect("comparison-operator", "> greater than") cy.get(':nth-child(5) > .form-control').clear(); cy.get(':nth-child(5) > .form-control').type('4'); cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['Frequency > 4'], 10) + cy.checkScoreColLoadedOrdino(0, ['Frequency > 4'], 10) }) \ No newline at end of file diff --git a/cypress/integration/ordino-video-test.spec.js b/cypress/integration/ordino-video-test.spec.js index 2ce4b2c4..c59ce185 100644 --- a/cypress/integration/ordino-video-test.spec.js +++ b/cypress/integration/ordino-video-test.spec.js @@ -1,6 +1,4 @@ import { cy, it, Cypress } from 'local-cypress'; -import { waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils'; -import { scrollElementIntoCenter, select2MultiSelect, formSelect, select2SingleSelect, waitTdpNotBusy} from 'tdp_core/dist/cypress/utils'; // https://www.youtube.com/watch?v=JZIIf-k852g&t=1s it('ordino video', function() { @@ -11,7 +9,7 @@ it('ordino video', function() { cy.login(); // use Cypress command registerd in Ordino app // Show you can select single genes if you wanted - scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() // wait intentionally a few seconds cy.wait(2000) @@ -24,15 +22,15 @@ it('ordino video', function() { cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); cy.wait('@gene_desc'); cy.wait('@human_genes'); - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); - select2MultiSelect("cell-line", "HCC1954") - select2MultiSelect("data-type", "Relative Copy Number") + cy.select2MultiSelect("cell-line", "HCC1954") + cy.select2MultiSelect("data-type", "Relative Copy Number") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9); + cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9); // Sort by column // cy.get('[data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click(); @@ -47,18 +45,18 @@ it('ordino video', function() { // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); - select2MultiSelect("cell-line", "HCC1954") - select2MultiSelect("data-type", "Normalized Gene Expression (TPM Values)") + cy.select2MultiSelect("cell-line", "HCC1954") + cy.select2MultiSelect("data-type", "Normalized Gene Expression (TPM Values)") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['HCC1954', 'Normalized Gene Expression (TPM Values)'], 10) + cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'Normalized Gene Expression (TPM Values)'], 10) // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(5) > span').click(); - select2MultiSelect("cell-line", "HCC1954") - select2MultiSelect("data-type", "DRIVE RSA (ER McDonald III et al., Cell, 2017)") + cy.select2MultiSelect("cell-line", "HCC1954") + cy.select2MultiSelect("data-type", "DRIVE RSA (ER McDonald III et al., Cell, 2017)") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['HCC1954', 'DRIVE RSA (ER McDonald III et al., Cell, 2017)'], 11) + cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'DRIVE RSA (ER McDonald III et al., Cell, 2017)'], 11) // Invert column // Here the title should be used. For some reason cypress has problmes, because there is a " character in the title. For now I use the data-id @@ -70,53 +68,53 @@ it('ordino video', function() { // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); - formSelect("row-1", "Tumor Type") - select2MultiSelect("row-1", "breast carcinoma") - select2SingleSelect("data-type", "Normalized Gene Expression (TPM Values)") + cy.formSelect("row-1", "Tumor Type") + cy.select2MultiSelect("row-1", "breast carcinoma") + cy.select2SingleSelect("data-type", "Normalized Gene Expression (TPM Values)") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['Tumor Type', 'breast carcinoma', 'Normalized Gene Expression (TPM Values)'], 12) + cy.checkScoreColLoadedOrdino(0, ['Tumor Type', 'breast carcinoma', 'Normalized Gene Expression (TPM Values)'], 12) // Add column cy.get('[data-testid=add-column-button]').click(); cy.wait(2000); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); - select2SingleSelect("data-type", "Relative Copy Number") - formSelect("aggregation", "Boxplot") + cy.select2SingleSelect("data-type", "Relative Copy Number") + cy.formSelect("aggregation", "Boxplot") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 13) + cy.checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 13) // Add column cy.get('[data-testid=add-column-button]').click(); cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click(); - formSelect("aggregation", "Frequency") - formSelect("comparison-operator", "> greater than") + cy.formSelect("aggregation", "Frequency") + cy.formSelect("comparison-operator", "> greater than") cy.get(':nth-child(5) > .form-control').clear(); cy.get(':nth-child(5) > .form-control').type('4'); cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(0, ['Frequency > 4'], 14) + cy.checkScoreColLoadedOrdino(0, ['Frequency > 4'], 14) // Select elements and click on detail views - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) cy.get('[data-index="0"] > .lu-renderer-selection').click(); cy.get('[data-testid=celllinedb_expression_vs_copynumber]').click(); - waitTdpNotBusy() - waitLineupReadyOrdino(0) + cy.waitTdpNotBusy() + cy.waitLineupReadyOrdino(0) cy.wait(2000) cy.get('[data-index="6"] > .lu-renderer-selection').click(); - waitTdpNotBusy() - waitLineupReadyOrdino(0) + cy.waitTdpNotBusy() + cy.waitLineupReadyOrdino(0) cy.wait(2000) cy.get('[data-index="6"] > .lu-renderer-selection').click(); - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) cy.get('[data-testid=targetvalidation]').click(); - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) cy.get('[data-testid=ensembl_org]').click(); - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) cy.get('[data-testid=copynumbertable]').click(); - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) // Sort and filter columns @@ -131,22 +129,22 @@ it('ordino video', function() { // Add column cy.get('[data-testid=viewWrapper-1] [data-testid=side-panel-wrapper] [data-testid=lu-adder-div] [data-testid=add-column-button]').click(); cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > [data-testid=side-panel-wrapper] > .panel-header > :nth-child(2) > [data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click(); - select2MultiSelect("gene-symbol", ["BRCA1", "BRCA2"]) - select2MultiSelect("data-type", "AA Mutated") + cy.select2MultiSelect("gene-symbol", ["BRCA1", "BRCA2"]) + cy.select2MultiSelect("data-type", "AA Mutated") cy.get('[data-testid=primary-dialog-button]').click(); - checkScoreColLoadedOrdino(1, ['BRCA1', 'AA Mutated'], 10) - checkScoreColLoadedOrdino(1, ['BRCA2', 'AA Mutated'], 10) + cy.checkScoreColLoadedOrdino(1, ['BRCA1', 'AA Mutated'], 10) + cy.checkScoreColLoadedOrdino(1, ['BRCA2', 'AA Mutated'], 10) - waitLineupReadyOrdino(1) + cy.waitLineupReadyOrdino(1) cy.get('[data-testid=viewWrapper-1] [data-index="0"] > .lu-renderer-selection').click(); cy.get('[data-testid=viewWrapper-1] [data-index="1"] > .lu-renderer-selection').click(); cy.get('[data-testid=cosmic]').click(); // Intentionally wait 2 seconds - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) cy.get('[data-testid=show] [data-testid=form-select]').select('907046'); // Intentionally wait 2 seconds - waitTdpNotBusy() + cy.waitTdpNotBusy() cy.wait(2000) cy.get('[data-testid=ordino_sessions_shortcut-link]').click(); cy.get('[data-testid=current-session-sessionscard] [data-testid=ordino0] [data-testid=save-button]').click(); diff --git a/cypress/integration/session_all_celllines.spec.js b/cypress/integration/session_all_celllines.spec.js index 22f7d563..266f8330 100644 --- a/cypress/integration/session_all_celllines.spec.js +++ b/cypress/integration/session_all_celllines.spec.js @@ -1,6 +1,3 @@ -import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; -import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; - it('Load all Celllines', function() { cy.visit(Cypress.env('host')); @@ -10,7 +7,7 @@ it('Load all Celllines', function() { cy.login(); // use Cypress command registerd in Ordino app // Show you can select single genes if you wanted - scrollElementIntoCenter('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.scrollElementIntoCenter('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() cy.get('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() // wait intentionally a few seconds cy.wait(2000) @@ -23,5 +20,5 @@ it('Load all Celllines', function() { cy.get('[data-testid=ccle-button]').click(); cy.wait('@cellline_desc'); cy.wait('@human_cellline'); - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) }); diff --git a/cypress/integration/session_all_genes.spec.js b/cypress/integration/session_all_genes.spec.js index 4f1f567f..68eabe85 100644 --- a/cypress/integration/session_all_genes.spec.js +++ b/cypress/integration/session_all_genes.spec.js @@ -1,6 +1,3 @@ -import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; -import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; - it('Load all Genes', function() { cy.visit(Cypress.env('host')); @@ -10,7 +7,7 @@ it('Load all Genes', function() { cy.login(); // use Cypress command registerd in Ordino app // Show you can select single genes if you wanted - scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() // wait intentionally a few seconds cy.wait(2000) @@ -23,5 +20,5 @@ it('Load all Genes', function() { cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click(); cy.wait('@gene_desc'); cy.wait('@human_genes'); - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) }); diff --git a/cypress/integration/session_all_tissues.spec.js b/cypress/integration/session_all_tissues.spec.js index 40b7bf9c..3d430890 100644 --- a/cypress/integration/session_all_tissues.spec.js +++ b/cypress/integration/session_all_tissues.spec.js @@ -1,6 +1,3 @@ -import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils'; -import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils'; - it('Load all Tissues', function() { cy.visit(Cypress.env('host')); @@ -10,7 +7,7 @@ it('Load all Tissues', function() { cy.login(); // use Cypress command registerd in Ordino app // Show you can select single genes if you wanted - scrollElementIntoCenter('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() + cy.scrollElementIntoCenter('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() cy.get('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click() // wait intentionally a few seconds cy.wait(2000) @@ -23,5 +20,5 @@ it('Load all Tissues', function() { cy.get('[data-testid=tcga-normals-button]').click(); cy.wait('@tissue_desc'); cy.wait('@human_tissue'); - waitLineupReadyOrdino(0) + cy.waitLineupReadyOrdino(0) }); From 2fd228fa8ea2817ed7231051eb5744ddf026e436 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 22 Jul 2022 06:34:41 +0200 Subject: [PATCH 14/15] update video --- cypress/integration/ordino-video-test.spec.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/cypress/integration/ordino-video-test.spec.js b/cypress/integration/ordino-video-test.spec.js index c59ce185..b9d1fae5 100644 --- a/cypress/integration/ordino-video-test.spec.js +++ b/cypress/integration/ordino-video-test.spec.js @@ -33,7 +33,7 @@ it('ordino video', function() { cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9); // Sort by column - // cy.get('[data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click(); + cy.get('[data-testid=viewWrapper-0] > .view > .inner > .tdp-view > :nth-child(1) > .le > .le-header > .le-thead > section:nth-last-child(-n+1) > .lu-toolbar > .lu-action-sort').click(); // Show some information cy.get('[data-testid="(un)collapse-button"] > .fas').click(); @@ -100,13 +100,10 @@ it('ordino video', function() { cy.waitTdpNotBusy() cy.waitLineupReadyOrdino(0) cy.wait(2000) - cy.get('[data-index="6"] > .lu-renderer-selection').click(); - cy.waitTdpNotBusy() - cy.waitLineupReadyOrdino(0) - cy.wait(2000) - cy.get('[data-index="6"] > .lu-renderer-selection').click(); - cy.waitTdpNotBusy() - cy.wait(2000) + // cy.get('[data-index="6"] > .lu-renderer-selection').click(); + // cy.waitTdpNotBusy() + // cy.waitLineupReadyOrdino(0) + // cy.wait(2000) cy.get('[data-testid=targetvalidation]').click(); cy.waitTdpNotBusy() cy.wait(2000) @@ -118,7 +115,7 @@ it('ordino video', function() { cy.wait(2000) // Sort and filter columns - cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > :nth-child(1) > .le > .le-header > .le-thead > [data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click(); + cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > :nth-child(1) > .le > .le-header > .le-thead > section:nth-last-child(-n+1) > .lu-toolbar > .lu-action-sort').click(); cy.get('[title="Tumor Type"] > .lu-toolbar > .lu-action-filter').click(); cy.get('.lu-dialog-table > :nth-child(1) > :nth-child(2) > div').click(); cy.get('.lu-dialog-table > :nth-child(1) > input').uncheck(); @@ -137,12 +134,12 @@ it('ordino video', function() { cy.waitLineupReadyOrdino(1) cy.get('[data-testid=viewWrapper-1] [data-index="0"] > .lu-renderer-selection').click(); - cy.get('[data-testid=viewWrapper-1] [data-index="1"] > .lu-renderer-selection').click(); + cy.get('[data-testid=viewWrapper-1] [data-index="12"] > .lu-renderer-selection').click(); cy.get('[data-testid=cosmic]').click(); // Intentionally wait 2 seconds cy.waitTdpNotBusy() cy.wait(2000) - cy.get('[data-testid=show] [data-testid=form-select]').select('907046'); + cy.get('[data-testid=show] [data-testid=form-select]').select('687455'); // Intentionally wait 2 seconds cy.waitTdpNotBusy() cy.wait(2000) From eb3e1e49dc7ccc31281f58cf0ebebd165d93f9f7 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 4 Aug 2022 09:57:10 +0200 Subject: [PATCH 15/15] update dist --- dist/views/CombinedDependentSampleTable.d.ts.map | 2 +- dist/views/CombinedDependentSampleTable.js | 2 +- dist/views/CombinedDependentSampleTable.js.map | 2 +- dist/views/SimilarityView.d.ts.map | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/views/CombinedDependentSampleTable.d.ts.map b/dist/views/CombinedDependentSampleTable.d.ts.map index 212ad41d..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;IAOvC,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 1ea5949f..78c7a2af 100644 --- a/dist/views/CombinedDependentSampleTable.js +++ b/dist/views/CombinedDependentSampleTable.js @@ -18,7 +18,7 @@ export class CombinedDependentSampleTable extends ACombinedDependentTable { } parameterChanged(name) { if (name === FORM_DATA_SOURCE.id) { - return this.rebuild(); // early abort after rebuild since there is nothing worse than building from scratch + return this.rebuild(); } return super.parameterChanged(name); } diff --git a/dist/views/CombinedDependentSampleTable.js.map b/dist/views/CombinedDependentSampleTable.js.map index af86719a..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,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,oFAAoF;SAC5G;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 +{"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/SimilarityView.d.ts.map b/dist/views/SimilarityView.d.ts.map index 6b412e9d..3c40c144 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,EAKtB,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,EAKtB,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