Merge pull request #444 from broadinstitute/dk-egls-bug-fix

DK egls bug fix
broadinstitute · Dec 5, 2022 · 0fd5b97 · 0fd5b97
2 parents cd26c57 + 8652fe6
commit 0fd5b97
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 17 deletions.
diff --git a/src/views/EglMethod/main.js b/src/views/EglMethod/main.js
@@ -84,7 +84,7 @@ new Vue({
         appendCss(DATASET) {
             let file = document.createElement('link');
             file.rel = 'stylesheet';
-            file.href = 'https://kp4cd.org/sites/default/files/vueportal/egl_data/' + DATASET + '/' + DATASET + '.css'
+            file.href = 'https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/' + DATASET + '/' + DATASET + '.css'
             document.head.appendChild(file)
         },
         tableTop() {

diff --git a/src/views/EglMethod/store.js b/src/views/EglMethod/store.js
@@ -4,6 +4,7 @@ import Vuex from "vuex";
 import bioPortal from "@/modules/bioPortal";
 import kp4cd from "@/modules/kp4cd";
 import effectorGenes from "@/modules/effectorGenes";
+import hugeampkpncms from "@/modules/hugeampkpncms";
 
 import { BootstrapVue, IconsPlugin } from "bootstrap-vue";
 
@@ -19,7 +20,8 @@ export default new Vuex.Store({
     modules: {
         bioPortal,
         kp4cd,
-        effectorGenes
+        effectorGenes,
+        hugeampkpncms
     },
     state: {
         geneName: "",
@@ -58,25 +60,47 @@ export default new Vuex.Store({
             context.commit("setGene", gene);
         },
         async fetchConfig(context, config) {
-            let json = await fetch(
+            /*
+            let fetchUrl = (param.domain == "hugeampkpn") ? "https://hugeampkpncms.org/servedata/dataset?dataset=" + param.dataPoint : param.dataPoint;
+            let csv = await fetch(fetchUrl).then(resp => resp.text(fetchUrl));
+            */
+            /*let json = await fetch(
                 `https://kp4cd.org/egldata/config?dataset=${config.dataset}`
+            ).then(resp => resp.json());*/
+
+            //let configUrl = 'https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/'+config.dataset+
+
+            let json = await fetch(
+                `https://hugeampkpncms.org/servedata/dataset?dataset=https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/${config.dataset}/${config.dataset}_config.json`
             ).then(resp => resp.json());
-            context.commit("setConfig", json);
+
+
+
+            let parsedJson = JSON.parse(json)
+
+            context.commit("setConfig", parsedJson);
             context.commit("setPageTitle", {
-                config: json,
+                config: parsedJson,
                 dataset: config.dataset
             });
             context.commit("setPlotsConfig", {
-                config: json,
+                config: parsedJson,
                 dataset: config.dataset
             });
         },
         async fetchData(context, dataset) {
-            let json = await fetch(
+
+            /*let json = await fetch(
                 `https://kp4cd.org/egldata/dataset?dataset=${dataset.dataset}&trait=${dataset.trait}`
+            ).then(resp => resp.json());*/
+            let json = await fetch(
+                `https://hugeampkpncms.org/servedata/dataset?dataset=https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/${dataset.dataset}/${dataset.dataset}_${dataset.trait}.json`
             ).then(resp => resp.json());
-            context.commit("setTableData", json.data);
-            context.commit("setFilteredData", json.data);
+
+            let parsedJson = JSON.parse(json)
+
+            context.commit("setTableData", parsedJson.data);
+            context.commit("setFilteredData", parsedJson.data);
         },
         filteredData(context, filtered) {
             context.commit("setFilteredData", filtered);

diff --git a/src/views/Papers/PaperData/main.js b/src/views/Papers/PaperData/main.js
@@ -81,7 +81,7 @@ new Vue({
         appendCss(DATASET) {
             let file = document.createElement('link');
             file.rel = 'stylesheet';
-            file.href = 'https://kp4cd.org/sites/default/files/vueportal/egl_data/' + DATASET + '/' + DATASET + '.css'
+            file.href = 'https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/' + DATASET + '/' + DATASET + '.css'
             document.head.appendChild(file)
         }
     },

diff --git a/src/views/Papers/PaperData/store.js b/src/views/Papers/PaperData/store.js
@@ -58,25 +58,40 @@ export default new Vuex.Store({
             context.commit("setGene", gene);
         },
         async fetchConfig(context, config) {
-            let json = await fetch(
+            /*let json = await fetch(
                 `https://kp4cd.org/egldata/config?dataset=${config.dataset}`
+            ).then(resp => resp.json());*/
+
+            let json = await fetch(
+                `https://hugeampkpncms.org/servedata/dataset?dataset=https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/${config.dataset}/${config.dataset}_config.json`
             ).then(resp => resp.json());
-            context.commit("setConfig", json);
+
+            let parsedJson = JSON.parse(json)
+
+            context.commit("setConfig", parsedJson);
             context.commit("setPageTitle", {
-                config: json,
+                config: parsedJson,
                 dataset: config.dataset
             });
             context.commit("setPlotsConfig", {
-                config: json,
+                config: parsedJson,
                 dataset: config.dataset
             });
         },
         async fetchData(context, dataset) {
-            let json = await fetch(
+            /*let json = await fetch(
                 `https://kp4cd.org/egldata/dataset?dataset=${dataset.dataset}&trait=${dataset.trait}`
+            ).then(resp => resp.json());*/
+            /*context.commit("setTableData", json.data);
+            context.commit("setFilteredData", json.data);*/
+            let json = await fetch(
+                `https://hugeampkpncms.org/servedata/dataset?dataset=https://hugeampkpncms.org/sites/default/files/users/user1/egl_data/${dataset.dataset}/${dataset.dataset}_${dataset.trait}.json`
             ).then(resp => resp.json());
-            context.commit("setTableData", json.data);
-            context.commit("setFilteredData", json.data);
+
+            let parsedJson = JSON.parse(json)
+
+            context.commit("setTableData", parsedJson.data);
+            context.commit("setFilteredData", parsedJson.data);
         },
         filteredData(context, filtered) {
             context.commit("setFilteredData", filtered);