Do not allow for migrations without applications

OpenConext · Dec 7, 2023 · c4be9a9 · c4be9a9
1 parent 211446a
commit c4be9a9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/teams-gui/src/components/MigrateTeamForm.js b/teams-gui/src/components/MigrateTeamForm.js
@@ -6,6 +6,7 @@ import {ReactComponent as BackIcon} from "../icons/arrow-left-1.svg";
 import {teamInviteAppDetails} from "../api";
 import {SpinnerField} from "./SpinnerField";
 import {Button} from "./Button";
+import {isEmpty} from "../utils/utils";
 
 export const MigrateTeamForm = ({migrateTeam, team, setShowForm}) => {
 
@@ -23,6 +24,7 @@ export const MigrateTeamForm = ({migrateTeam, team, setShowForm}) => {
         return <SpinnerField/>;
     }
 
+    let noApplications = isEmpty(teamDetails.applications);
     return (
         <div className="migrate-teams-form-container">
             <button className="back" onClick={() => {
@@ -84,7 +86,9 @@ export const MigrateTeamForm = ({migrateTeam, team, setShowForm}) => {
                 </tbody>
             </table>
             <div className={"actions"}>
-                <Button onClick={migrateTeam} txt={I18n.t("migrateTeam.migrate")}/>
+                {noApplications &&
+                    <p className={"error"}>{I18n.t("migrateTeam.missingApplications")}</p>}
+                <Button onClick={migrateTeam} txt={I18n.t("migrateTeam.migrate")} disabled={noApplications}/>
             </div>
 
 

diff --git a/teams-gui/src/components/MigrateTeamForm.scss b/teams-gui/src/components/MigrateTeamForm.scss
@@ -75,8 +75,15 @@ div.migrate-teams-form-container {
     div.actions {
         display: flex;
         margin-bottom: 25px;
+        align-items: center;
+
+        p.error {
+            color: $primary-red;
+            font-weight: 600;
+            margin: 0;
+        }
 
-        a {
+        a, label {
             margin: 0 25px 25px auto;
         }
     }

diff --git a/teams-gui/src/locale/en.js b/teams-gui/src/locale/en.js
@@ -356,6 +356,7 @@ I18n.translations.en = {
     migrateTeam: {
         header: "Migration",
         info: "Review the applications and schacHome values of the persons and hit 'Migrate' to transfer this team to the invite application. The team will be deleted after an successful migration.",
+        missingApplications: "This team can not be migrated, as there are no applications linked.",
         migrate: "Migrate",
         success: "Team {{name}} has been migrated to the invite-database and has been deleted in teams.",
         error: "An error occurred while migrating this team. {{error}}",

diff --git a/teams-gui/src/locale/nl.js b/teams-gui/src/locale/nl.js
@@ -356,6 +356,7 @@ I18n.translations.nl = {
     migrateTeam: {
         header: "Migration",
         info: "Review the applications and schacHome values of the persons and hit 'Migrate' to transfer this team to the invite application. The team will be deleted after an successful migration.",
+        missingApplications: "This team can not be migrated, as there are no applications linked.",
         migrate: "Migrate",
         success: "Team {{name}} has been migrated to the invite-database and has been deleted in teams.",
         error: "An error occurred while migrating this team. {{error}}",

diff --git a/teams-server/src/main/java/teams/shibboleth/mock/MockShibbolethFilter.java b/teams-server/src/main/java/teams/shibboleth/mock/MockShibbolethFilter.java
@@ -15,8 +15,8 @@ public class MockShibbolethFilter extends GenericFilterBean {
 
     private final boolean test;
 
+//    private final String userUrn = "urn:collab:person:surfnet.nl:super_admin";
     private final String userUrn = "urn:collab:person:surfnet.nl:jdoe";
-    //"urn:collab:person:surfnet.nl:super_admin"
 
     public MockShibbolethFilter(boolean test) {
         this.test = test;