Merge branch 'nickmelis-issues/449' into develop

Author: LEDfan

src/main/java/eu/openanalytics/shinyproxy/controllers/BaseController.java

@@ -33,6 +33,7 @@
 import eu.openanalytics.containerproxy.service.hearbeat.HeartbeatService;
 import eu.openanalytics.containerproxy.util.ContextPathHelper;
 import eu.openanalytics.shinyproxy.AppRequestInfo;
+import eu.openanalytics.shinyproxy.ShinyProxySpecExtension;
 import eu.openanalytics.shinyproxy.ShinyProxySpecProvider;
 import eu.openanalytics.shinyproxy.UserAndAppNameAndInstanceNameProxyIndex;
 import jakarta.servlet.http.HttpServletRequest;
@@ -50,14 +51,19 @@
 import org.springframework.util.StreamUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.view.RedirectView;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 public abstract class BaseController {
@@ -156,6 +162,35 @@ protected void prepareMap(ModelMap map, HttpServletRequest request) {
         map.put("allowTransferApp", allowTransferApp);
         map.put("notificationMessage", environment.getProperty("proxy.notification-message"));
 
+        List<ProxySpec> apps = proxyService.getUserSpecs();
+        map.put("apps", apps);
+
+        // app logos
+        Map<ProxySpec, LogoInfo> appLogos = new HashMap<>();
+        for (ProxySpec app : apps) {
+            appLogos.put(app, getAppLogoInfo(app));
+        }
+        map.put("appLogos", appLogos);
+
+        // template groups
+        HashMap<String, ArrayList<ProxySpec>> groupedApps = new HashMap<>();
+        List<ProxySpec> ungroupedApps = new ArrayList<>();
+
+        for (ProxySpec app : apps) {
+            String groupId = app.getSpecExtension(ShinyProxySpecExtension.class).getTemplateGroup();
+            if (groupId != null) {
+                groupedApps.putIfAbsent(groupId, new ArrayList<>());
+                groupedApps.get(groupId).add(app);
+            } else {
+                ungroupedApps.add(app);
+            }
+        }
+
+        List<ShinyProxySpecProvider.TemplateGroup> templateGroups = shinyProxySpecProvider.getTemplateGroups().stream().filter((g) -> groupedApps.containsKey(g.getId())).toList();
+        map.put("templateGroups", templateGroups);
+        map.put("groupedApps", groupedApps);
+        map.put("ungroupedApps", ungroupedApps);
+
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
         HttpServletRequest httpServletRequest = servletRequestAttributes.getRequest();
         HttpServletResponse httpServletResponse = servletRequestAttributes.getResponse();

src/main/java/eu/openanalytics/shinyproxy/controllers/IndexController.java

@@ -21,7 +21,6 @@
 package eu.openanalytics.shinyproxy.controllers;
 
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.shinyproxy.ShinyProxySpecExtension;
 import eu.openanalytics.shinyproxy.ShinyProxySpecProvider;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.env.Environment;
@@ -32,10 +31,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Controller
 public class IndexController extends BaseController {
@@ -94,34 +90,6 @@ private Object index(ModelMap map, HttpServletRequest request) {
 
         prepareMap(map, request);
 
-        map.put("apps", apps);
-
-        // app logos
-        Map<ProxySpec, LogoInfo> appLogos = new HashMap<>();
-        for (ProxySpec app : apps) {
-            appLogos.put(app, getAppLogoInfo(app));
-        }
-        map.put("appLogos", appLogos);
-
-        // template groups
-        HashMap<String, ArrayList<ProxySpec>> groupedApps = new HashMap<>();
-        List<ProxySpec> ungroupedApps = new ArrayList<>();
-
-        for (ProxySpec app : apps) {
-            String groupId = app.getSpecExtension(ShinyProxySpecExtension.class).getTemplateGroup();
-            if (groupId != null) {
-                groupedApps.putIfAbsent(groupId, new ArrayList<>());
-                groupedApps.get(groupId).add(app);
-            } else {
-                ungroupedApps.add(app);
-            }
-        }
-
-        List<ShinyProxySpecProvider.TemplateGroup> templateGroups = shinyProxySpecProvider.getTemplateGroups().stream().filter((g) -> groupedApps.containsKey(g.getId())).toList();
-        map.put("templateGroups", templateGroups);
-        map.put("groupedApps", groupedApps);
-        map.put("ungroupedApps", ungroupedApps);
-
         // navbar
         map.put("page", "index");