Merge pull request #304 from appukuttan-shailesh/master

Update CORS proxy
HumanBrainProject · Apr 1, 2021 · dca1906 · dca1906
2 parents feab16a + 78037ff
commit dca1906
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/apps/validation_framework_v2/src/ResultGraphs.js b/apps/validation_framework_v2/src/ResultGraphs.js
@@ -19,8 +19,6 @@ import LoadingIndicator from "./LoadingIndicator";
 import ResultDetail from './ResultDetail';
 import Theme from './theme';
 
-
-
 function ResultsFiguresTestIntance(props) {
     const Plot = createPlotlyComponent(Plotly);
     var traces = [];

diff --git a/apps/validation_framework_v2/src/ResultRelatedFiles.js b/apps/validation_framework_v2/src/ResultRelatedFiles.js
@@ -12,6 +12,7 @@ import Theme from './theme';
 import ContextMain from './ContextMain';
 import { copyToClipboard } from './utils';
 import { withSnackbar } from 'notistack';
+import { corsProxy } from "./globals";
 
 var filesize = require("filesize");
 
@@ -67,9 +68,7 @@ class ResultFile extends React.Component {
         }
         // Since Collaboratory v2 storage and CSCS storage gives CORS related issues,
         // we use an intermediate proxy server to resolve this
-        // previously used https://cors-anywhere.herokuapp.com/ - but now has request limits
-        // other options: https://cors-fixer.herokuapp.com/, https://cors-handler.herokuapp.com/ 
-        query_url = "https://cors-clear.herokuapp.com/" + query_url
+        query_url = corsProxy + query_url;
 
         axios.head(query_url, config)
             .then(res => {

diff --git a/apps/validation_framework_v2/src/globals.js b/apps/validation_framework_v2/src/globals.js
@@ -22,6 +22,11 @@ export const displayValid = ["Only Models", "Models and Tests", "Only Tests"];
 export const queryValid = ["model_id", "model_alias", "model_instance_id", "test_id", "test_alias", "test_instance_id", "result_id"];
 export const ADMIN_PROJECT_ID = "model-validation";
 
+// Since Collaboratory v2 storage and CSCS storage gives CORS related issues
+export const corsProxy = "https://corsproxy-sa.herokuapp.com/";
+// previously used https://cors-anywhere.herokuapp.com/ - but now has request limits
+// other options: https://cors-clear.herokuapp.com/, https://cors-fixer.herokuapp.com/, https://cors-handler.herokuapp.com/
+
 export const updateHash = (value) => {
 	window.location.hash = value;
 	if (isFramedApp) {