Skip to content

Commit 56e53ad

Browse files
committed
wc: fix cellbase v5 checks
1 parent 13e5bf6 commit 56e53ad

4 files changed

Lines changed: 7 additions & 19 deletions

File tree

.github/workflows/release-github-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: "Create GitHub Release"
1313
runs-on: ${{ vars.UBUNTU_VERSION }}
1414
steps:
15-
- uses: actions/download-artifact@v4gi
15+
- uses: actions/download-artifact@v4
1616
with:
1717
name: iva-app
1818
path: iva-${{ inputs.version }}.tar.gz

src/webcomponents/commons/filters/feature-filter.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,10 @@ export default class FeatureFilter extends LitElement {
108108
let restResponse;
109109
if (this.cellbaseClient) {
110110
if (params?.data?.term) {
111-
if (this.cellbaseClient.getConfig()?.version?.startsWith("v5")) {
112-
restResponse = await this.cellbaseClient.get("feature", "gene", params?.data?.term?.toUpperCase(), "startsWith", {
111+
restResponse = await this.cellbaseClient.get("feature", "gene", params?.data?.term?.toUpperCase(), "startsWith",
112+
{
113113
limit: this._config.limit,
114114
}, {});
115-
} else {
116-
restResponse = await this.cellbaseClient.get("feature", "id", params?.data?.term?.toUpperCase(), "starts_with", {
117-
limit: this._config.limit,
118-
}, {});
119-
}
120115
} else {
121116
restResponse = await this.cellbaseClient.get("feature", "gene", "search", "", {limit: this._config.limit}, {});
122117
}

src/webcomponents/commons/filters/ontology-autocomplete-filter.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,7 @@ export default class OntologyAutocompleteFilter extends LitElement {
8686
source: this._config.ontologyFilter
8787
};
8888
try {
89-
// FIXME to support old cellbase v4
90-
let fetchGoOntologies;
91-
if (this.cellbaseClient?._config?.version === "v4") {
92-
const cellbaseClient = new CellBaseClient({host: "https://ws.opencb.org/cellbase-5.0.0/", version: "v5"});
93-
fetchGoOntologies = await cellbaseClient.get("feature", "ontology", undefined, "search", query, {});
94-
} else {
95-
fetchGoOntologies = await this.cellbaseClient.get("feature", "ontology", undefined, "search", query, {});
96-
}
89+
const fetchGoOntologies = await this.cellbaseClient.get("feature", "ontology", undefined, "search", query, {});
9790
const results = fetchGoOntologies.responses[0].results;
9891
const data = results.map(ontology => ({name: ontology.name, id: ontology.id}));
9992
success(data);

src/webcomponents/variant/interpretation/variant-interpreter-grid-config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ export default class VariantInterpreterGridConfig extends LitElement {
337337
text: "Select the Gene Set to be displayed",
338338
display: {
339339
containerStyle: "margin: 5px 5px 5px 0px",
340-
visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
340+
// visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
341341
}
342342
},
343343
{
@@ -346,7 +346,7 @@ export default class VariantInterpreterGridConfig extends LitElement {
346346
text: "Ensembl",
347347
display: {
348348
containerStyle: "margin: 10px 5px",
349-
visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
349+
// visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
350350
}
351351
},
352352
{
@@ -355,7 +355,7 @@ export default class VariantInterpreterGridConfig extends LitElement {
355355
text: "RefSeq",
356356
display: {
357357
containerStyle: "margin: 10px 5px",
358-
visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
358+
// visible: () => this.opencgaSession?.project?.cellbase?.version.startsWith("v5")
359359
}
360360
},
361361
{

0 commit comments

Comments
 (0)