Merge pull request #273 from JULIELab/cors

Cors
JULIELab · Jul 13, 2024 · a1aa6be · a1aa6be
2 parents e0db620 + f1e1692
commit a1aa6be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/components/GepiWidgetLayout.java b/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/components/GepiWidgetLayout.java
@@ -142,8 +142,8 @@ public JSONObject getWidgetSettings() {
         widgetSettings.put("handleId", getResizeHandleId());
         widgetSettings.put("widgetId", clientId);
         widgetSettings.put("viewMode", "small");
-        widgetSettings.put("toggleViewModeUrl", toggleViewModeEventLink.toAbsoluteURI());
-        widgetSettings.put("refreshContentsUrl", refreshContentEventLink.toAbsoluteURI());
+        widgetSettings.put("toggleViewModeUrl", toggleViewModeEventLink.toAbsoluteURI().replace(":80", ""));
+        widgetSettings.put("refreshContentsUrl", refreshContentEventLink.toAbsoluteURI().replace(":80", ""));
         widgetSettings.put("zoneElementId", widgetZone.getClientId());
         widgetSettings.put("useTapestryZoneUpdates", useTapestryZoneUpdates);
         widgetSettings.put("dataSessionId", requestData.getDataSessionId());

diff --git a/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/components/TableResultWidget.java b/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/components/TableResultWidget.java
@@ -293,7 +293,7 @@ public String getArgumentLink(int argPosition) {
 
     public void afterRender() {
         final Link downloadEventLink = resources.createEventLink("download");
-        javaScriptSupport.require("gepi/charts/tablewidget").invoke("download").with(downloadEventLink.toAbsoluteURI());
+        javaScriptSupport.require("gepi/charts/tablewidget").invoke("download").with(downloadEventLink.toAbsoluteURI().replace(":80", ""));
         javaScriptSupport.require("gepi/charts/tablewidget").invoke("setupHighlightTooltips");
         javaScriptSupport.require("gepi/base").invoke("setuptooltips");
     }

diff --git a/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/pages/Index.java b/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/pages/Index.java
@@ -173,7 +173,7 @@ public Future<EventRetrievalResult> getUnrolledResult4download() {
 
     void afterRender() {
         javaScriptSupport.require("gepi/base").invoke("setuptooltips");
-        javaScriptSupport.require("gepi/charts/data").invoke("setDataUrl").with(resources.createEventLink("loadDataToClient").toAbsoluteURI());
+        javaScriptSupport.require("gepi/charts/data").invoke("setDataUrl").with(resources.createEventLink("loadDataToClient").toAbsoluteURI().replace(":80", ""));
         javaScriptSupport.require("gepi/pages/index").invoke("setupDownloadUrlCopyButton");
         if (isResultPresent()) {
             // If there already is data at loading the page, the input panel is already hidden (see #getShowInputClass)
@@ -471,7 +471,7 @@ private boolean isBList() {
     private PageRenderLinkSource pageRenderLS;
 
     public String getResultFileDownloadLink() {
-        return pageRenderLS.createPageRenderLinkWithContext(ResultDownload.class, dataSessionId).toAbsoluteURI();
+        return pageRenderLS.createPageRenderLinkWithContext(ResultDownload.class, dataSessionId).toAbsoluteURI().replace(":80", "");
     }
 
 }
diff --git a/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/services/AppModule.java b/gepi/gepi-webapp/src/main/java/de/julielab/gepi/webapp/services/AppModule.java
@@ -77,8 +77,8 @@ public static void contributeFactoryDefaults(
         // in the early stages of development.
         configuration.override(SymbolConstants.PRODUCTION_MODE, true);
 
-        configuration.override(SymbolConstants.CORS_ENABLED, true);
-        configuration.override(SymbolConstants.CORS_ALLOWED_ORIGINS, "*");
+//        configuration.override(SymbolConstants.CORS_ENABLED, true);
+//        configuration.override(SymbolConstants.CORS_ALLOWED_ORIGINS, "*");
         configuration.add(SymbolConstants.CORS_MAX_AGE, "5");
     }
 

diff --git a/gepi/gepi-webapp/src/main/resources/META-INF/modules/gepi/components/widgetManager.js b/gepi/gepi-webapp/src/main/resources/META-INF/modules/gepi/components/widgetManager.js
@@ -64,7 +64,7 @@ define(['jquery', 't5/core/zone', 'gepi/pages/index'], function($, zoneManager,
 
   Widget.prototype.ajaxRefresh = function() {
     console.log('[trace] Issueing update of zone with ID ' + this.zoneElementId);
-    index.getReadySemaphor().done(() => zoneManager.deferredZoneUpdate(this.zoneElementId, this.refreshContentsUrl));
+    index.getReadySemaphor().done(() => zoneManager.deferredZoneUpdate(this.zoneElementId, this.refreshContentsUrl.replace(":80", "")));
     console.log('[trace] Returned from update of zone with ID ' + this.zoneElementId);
   };