Fixes #210

Also fixed 404 when deleting a connection
Navigate to production details for "Request producion status"

Author: oharsta

client/src/connection/ConnectionAlert.jsx

@@ -58,7 +58,7 @@ export const ConnectionAlert = ({
                        alertType={AlertType.Warning}
                        asChild={true}
                        message={I18n.t("connection.productionActivationHint", {name: connectionsNeedActivationNames})}
-                       action={() => customProdTabAction ? customProdTabAction() : setTab("prod")}
+                       action={() => customProdTabAction ? customProdTabAction() : setTab("prod", "activate")}
                        actionLabel={I18n.t("connection.productionActivationAction")}/>
             )
     }

client/src/connection/Overview.jsx

@@ -1,10 +1,8 @@
 import "./Overview.scss";
-import React, {useState} from "react";
+import React from "react";
 import I18n from "../locale/I18n";
-import {Alert, AlertType} from "@surfnet/sds";
-import {isEmpty, splitListSemantically} from "../utils/Utils.js";
 import {STATUS_LINK_TYPE, StatusLink} from "../components/StatusLink.jsx";
-import {CONNECTION_STATUSES, ENVIRONMENTS} from "../utils/Manage.js";
+import {ENVIRONMENTS} from "../utils/Manage.js";
 import {ConnectionAlert} from "./ConnectionAlert.jsx";
 
 

client/src/connection/Testing.jsx

@@ -109,7 +109,6 @@ export const Testing = ({
     const {setFlash, config} = useAppStore(state => state);
     const navigate = useNavigate();
 
-    const [alertClosed, setAlertClosed] = useState(false);
     const [isCopyConnectionOpen, setIsCopyConnectionOpen] = useState(false);
     const [isMaxRefreshValidity, setIsMaxRefreshValidity] = useState(false);
     const [section, setSection] = useState(sections.technical);
@@ -138,10 +137,17 @@ export const Testing = ({
         if (!isEmpty(connectionId)) {
             const conn = application.connections.find(c => c.id === parseInt(connectionId, 10));
             if (isEmpty(conn)) {
-                navigate("/404");
+                navigate(`/connection/${application.id}/${isProduction ? "prod" : "testing"}`);
             } else {
                 showConnectionDetails(conn);
             }
+        } else {
+            const urlSearchParams = new URLSearchParams(window.location.search);
+            const action = urlSearchParams.get("action");
+            if (action === "activate") {
+                showConnectionDetails(connections
+                    .find(conn => conn.status === CONNECTION_STATUSES.COMPLETE || conn.status === CONNECTION_STATUSES.IN_PROGRESS))
+            }
         }
     }, [application]);
 
@@ -393,7 +399,7 @@ export const Testing = ({
         } else {
             setLoading(true);
             deleteConnectionById(connection.id).then(() => {
-                refresh();
+                refresh(isProduction ? "prod" : "testing");
                 setConfirmation({open: false});
                 setLoading(false);
                 setFlash(I18n.t("connection.flash.deleted", {
@@ -1299,17 +1305,17 @@ export const Testing = ({
         ]
 
         return (
-                <Entities entities={connections}
-                          modelName="table-connections"
-                          defaultSort="name"
-                          columns={columns}
-                          hideTitle={true}
-                          showNew={false}
-                          rowLinkMapper={(e, conn) => showConnectionDetails(conn)}
-                          displaySearch={false}
-                          searchAttributes={["name", "protocol"]}
-                          inputFocus={true}>
-                </Entities>
+            <Entities entities={connections}
+                      modelName="table-connections"
+                      defaultSort="name"
+                      columns={columns}
+                      hideTitle={true}
+                      showNew={false}
+                      rowLinkMapper={(e, conn) => showConnectionDetails(conn)}
+                      displaySearch={false}
+                      searchAttributes={["name", "protocol"]}
+                      inputFocus={true}>
+            </Entities>
         )
 
     };

client/src/pages/Connection.jsx

@@ -108,11 +108,14 @@ export const Connection = () => {
     }, [application]);
 
 
-    const refresh = () => {
+    const refresh = (newTab = null) => {
         setLoading(true);
         getApplicationById(applicationId)
             .then(res => {
                 setApplication(convertServerApplicationToClient(res, protocolOptions, profileOptions, arp));
+                if (!isEmpty(newTab)) {
+                    navigate(`/connection/${applicationId}/${newTab}`)
+                }
                 setConnection(null);
                 setDirty(false);
                 setLoading(false);
@@ -146,7 +149,7 @@ export const Connection = () => {
         navigate(`/connection/${applicationId}/${newTab}`);
     }
 
-    const changeTab = newTab => {
+    const changeTab = (newTab, action = null) => {
         if (dirty) {
             refresh()
         }
@@ -155,7 +158,8 @@ export const Connection = () => {
             setConnection(null);
         }
         setCurrentTab(newTab);
-        navigate(`/connection/${applicationId}/${newTab}`);
+        const queryPart = action !== null ? `?action=${action}` : "";
+        navigate(`/connection/${applicationId}/${newTab}${queryPart}`);
     }
 
     const renderCurrentTab = () => {

client/src/styles/application.scss

@@ -22,7 +22,7 @@
         }
     }
     svg.image-not-found, img {
-        height: 110px;
+        height: 80px;
         padding: 12px;
         border-radius: 4px;
         background-color: white;

server/src/main/java/access/repository/OrganizationRepository.java

@@ -20,7 +20,7 @@ public interface OrganizationRepository extends JpaRepository<Organization, Long
     Optional<Organization> findBySchacHomeOrganization(String schacHomeOrganization);
 
     @EntityGraph(attributePaths = {
-            "applications", "organizationMemberships.user", "invitations.invitee", "joinRequests.user"})
+            "applications.connections", "organizationMemberships.user", "invitations.invitee", "joinRequests.user"})
     Optional<Organization> findDetailsById(Long id);
 
     @EntityGraph(attributePaths = {"organizationMemberships.user"})