Fixes #389

Author: oharsta

client/src/locale/en.js

@@ -211,12 +211,14 @@ const en = {
         disapproved_action: "Disapprove",
         name: "Name",
         schacHomeOrganization: "Schac home",
+        isInternal: "Internal",
         createdAt: "Created",
         memberCount: "# Members",
         applicationCount: "# Apps",
         status: "Status",
         searchPlaceHolder: "Search for organizations...",
         confirmation: "Are you sure you want to change the status to <strong>{{status}}</strong> for organization {{name}}?",
+        manageOrganizationInMutable: "Internal organizations (e.g. IdP's from Manage) are immutable in SURF Access. Only external organizations from external (commercial) service providers are mutable.",
         flash: {
             updated: "Organization {{name}} now has the status {{status}}",
             deleted: "Organization {{name}} has been deleted",
@@ -952,7 +954,12 @@ const en = {
         deleteWarning: "If you delete your organization, all of your applications and connections will also be deleted. There is no undo functionality for this action.",
         deleteButton: "Delete my organization",
         proceedButton: "Save",
-        flash: "Organization {{name}} is updated"
+        flash: "Organization {{name}} is updated",
+        generalInformation: "Algemene gegevens",
+        entityID: "Entity ID",
+        name: "name",
+        keyWords: "Keywords",
+        keyWordsInfo: "Keywords zijn shortcuts waarmee gebruikers in de WAYF snel deze organisatie terug kan vinden",
     },
     accessibleApps: {
         title: "Gekoppelde apps",

client/src/pages/MyOrganization.jsx

@@ -1,7 +1,12 @@
 import React, {useEffect, useMemo, useRef, useState} from "react";
 import {useAppStore} from "../stores/AppStore";
 import {useNavigate, useParams} from "react-router-dom";
-import {deleteOrganizationById, organizationById, updateOrganizationMetaData} from "../api/index.js";
+import {
+    deleteOrganizationById,
+    organizationById,
+    updateOrganizationMetaData,
+    updateOrganizationName
+} from "../api/index.js";
 import {isEmpty, stopEvent} from "../utils/Utils.js";
 import "./MyOrganization.scss";
 import I18n from "../locale/I18n";
@@ -12,6 +17,8 @@ import {Button, ButtonType, Loader} from "@surfnet/sds";
 import {ContactPersons} from "../components/ContactPersons.jsx";
 import {contactSectionValid, convertServerApplicationToClient} from "../utils/Application.js";
 import {mainMenuItems} from "../utils/MenuItems.js";
+import InputField from "../components/InputField.jsx";
+import SelectField from "../components/SelectField.jsx";
 
 const sections = {
     contactPersons: "contactPersons",
@@ -23,14 +30,17 @@ const MyOrganization = ({refreshUser}) => {
     const user = useAppStore(state => state.user);
     const setFlash = useAppStore(state => state.setFlash);
 
+    const externalUser = user.externalUser;
+
     const {organizationId} = useParams();
 
     const [loading, setLoading] = useState(true);
     const [organization, setOrganization] = useState({});
     const [confirmation, setConfirmation] = useState({});
-    const [section, setSection] = useState(user.externalUser ? sections.general : sections.contactPersons);
+    const [section, setSection] = useState(externalUser ? sections.general : sections.contactPersons);
     const [focusedId, setFocusedId] = useState(null);
     const [initial, setInitial] = useState(true);
+    const [dirty, setDirty] = useState(new Date());
 
     const inputRef = useRef(null);
 
@@ -56,7 +66,7 @@ const MyOrganization = ({refreshUser}) => {
             ],
             activeMenuItem: mainMenuItems.idp
         });
-    }, [navigate, organizationId]);
+    }, [navigate, organizationId, dirty]);
 
     useEffect(() => {
         if (inputRef.current) {
@@ -65,9 +75,10 @@ const MyOrganization = ({refreshUser}) => {
     }, [focusedId]);
 
     const availableSections = useMemo(() => {
+        const isExternalUser = externalUser;
         return Object.values(sections)
-            .filter(s => s !== sections.delete || (user.externalUser && (user.superUser || isOrganizationAdmin(user, organization))))
-            .filter(s => s !== sections.contactPersons || !user.externalUser)
+            .filter(s => s !== sections.delete || (isExternalUser && (user.superUser || isOrganizationAdmin(user, organization))))
+            .filter(s => s !== sections.contactPersons || !isExternalUser)
     }, [organization, user])
 
     if (loading) {
@@ -106,8 +117,46 @@ const MyOrganization = ({refreshUser}) => {
                                initial={initial}/>
     }
 
-    const renderGeneralSection = () => {
-        return <span>renderGeneralSection-TODO</span>
+    const changeKeyWords = options => {
+        const newMetaData = {...organization.metaData, keyWords: (options || []).map(option => option.value)}
+        setOrganization({...organization, metaData: newMetaData});
+    }
+
+    const renderInternalGeneralSection = () => {
+        return (
+            <section className="inner-right">
+                <h3>{I18n.t("myOrganization.generalInformation")}</h3>
+                <InputField name={I18n.t("myOrganization.name")}
+                            value={organization.name}
+                            disabled={true}/>
+
+                <InputField name={I18n.t("myOrganization.entityID")}
+                            value={organization.metaData.entityID}
+                            disabled={true}/>
+
+                <SelectField name={I18n.t("myOrganization.keyWords")}
+                             value={(organization.metaData.keyWords || []).map(word => ({
+                                 label: word,
+                                 value: word
+                             }))}
+                             onChange={changeKeyWords}
+                             isMulti={true}
+                             creatable={true}
+                />
+                <p className="info">{I18n.t("myOrganization.keyWordsInfo")}</p>
+            </section>
+        )
+    }
+
+    const renderExternalGeneralSection = () => {
+        return (
+            <section className="inner-right">
+                <h3>{I18n.t("myOrganization.generalInformation")}</h3>
+                <InputField name={I18n.t("myOrganization.name")}
+                            value={organization.name}
+                            onChange={e => setOrganization({...organization, name: e.target.value})}/>
+            </section>
+        )
     }
 
     const renderDeleteSection = () => {
@@ -125,33 +174,46 @@ const MyOrganization = ({refreshUser}) => {
         );
     }
 
-    const saveOrganization = () => {
+    const saveInternalOrganization = () => {
         setInitial(false);
         if (contactSectionValid(organization)) {
             setLoading(true);
-            updateOrganizationMetaData(organization.id, {contactPersons: organization.contactPersons})
+            updateOrganizationMetaData(organization.id, {
+                contactPersons: organization.contactPersons,
+                keyWords: organization.metaData.keyWords
+            })
+                .then(() => {
+                    setDirty(new Date());
+                    setLoading(false);
+                    setFlash(I18n.t("myOrganization.flash", {name: organization.name}));
+                });
+
+        }
+    }
+
+    const saveExternalOrganization = () => {
+        setInitial(false);
+        if (!isEmpty(organization.name)) {
+            setLoading(true);
+            updateOrganizationName(organization.id, organization.name)
                 .then(() => {
-                    //Re-fetch everything so there can be no mismatch is data
-                    organizationById(organizationId, true)
-                        .then(res => {
-                            const convertedOrganization = convertServerApplicationToClient(res);
-                            setOrganization(convertedOrganization);
-                            setLoading(false);
-                            setFlash(I18n.t("myOrganization.flash", {name: organization.name}));
-                        })
+                    setDirty(new Date());
+                    setLoading(false);
+                    setFlash(I18n.t("myOrganization.flash", {name: organization.name}));
                 });
 
         }
 
     }
 
+
     const renderCurrentSection = () => {
         switch (section) {
             case sections.contactPersons: {
                 return renderContactPersonsSection();
             }
             case sections.general: {
-                return renderGeneralSection();
+                return externalUser ? renderExternalGeneralSection() : renderInternalGeneralSection();
             }
             case sections.delete: {
                 return renderDeleteSection();
@@ -193,11 +255,10 @@ const MyOrganization = ({refreshUser}) => {
                 </div>
                 {section !== sections.delete &&
                     <div className="actions proceed">
-                        <Button onClick={saveOrganization}
-                                disabled={!initial && !contactSectionValid(organization)}
+                        <Button onClick={() => externalUser ? saveExternalOrganization() : saveInternalOrganization()}
+                                disabled={!initial && !contactSectionValid(organization) && isEmpty(organization.name)}
                                 txt={I18n.t("myOrganization.proceedButton")}
                         />
-
                     </div>}
 
             </div>

client/src/pages/MyOrganization.scss

@@ -63,6 +63,11 @@ div.my-organization-outer-container {
             margin: 0 0 25px 0;
         }
 
+        p.info {
+            margin-top: 5px;
+            color:var(--sds--color--gray--400);
+        }
+
     }
 
     .actions {

client/src/pages/Organizations.jsx

@@ -2,7 +2,7 @@ import React, {useEffect, useRef, useState} from "react";
 import "./Organizations.scss";
 import I18n from "../locale/I18n";
 import "../components/Entities.scss";
-import {Loader, Tooltip} from "@surfnet/sds";
+import {Loader, Tooltip, Checkbox} from "@surfnet/sds";
 import {Entities} from "../components/Entities";
 import {isEmpty} from "../utils/Utils";
 import {useAppStore} from "../stores/AppStore";
@@ -242,6 +242,11 @@ export const Organizations = ({pendingApproval, tab}) => {
             header: I18n.t("organizations.schacHomeOrganization"),
             mapper: org => <span>{org.schacHomeOrganization}</span>
         },
+        {
+            key: "manageIdentifier",
+            header: I18n.t("organizations.isInternal"),
+            mapper: org => <div className="wrapper"><Checkbox value={!isEmpty(org.manageIdentifier)} disabled={true}/></div>
+        },
         {
             key: "applicationCount",
             header: I18n.t("organizations.applicationCount"),
@@ -266,7 +271,7 @@ export const Organizations = ({pendingApproval, tab}) => {
             key: "buttons",
             header: "",
             nonSortable: true,
-            mapper: org =>
+            mapper: org => isEmpty(org.manageIdentifier) ?
                 <div className="top-header"
                      tabIndex={1}
                      onBlur={() => setTimeout(() => setDropDownActive(-1), 175)}>
@@ -275,7 +280,7 @@ export const Organizations = ({pendingApproval, tab}) => {
                                 <MenuIcon/>
                                 {dropDownActive === org.id && renderMenu(org)}
                             </span>
-                </div>
+                </div> : <Tooltip standalone={true} tip={I18n.t("organizations.manageOrganizationInMutable")}/>
         }
     ];
 

client/src/pages/Organizations.scss

@@ -18,48 +18,57 @@
         display: flex;
         position: relative;
         width: 100%;
+
         .input-field {
             width: 100%;
         }
+
         .action-icons {
             display: flex;
             gap: 5px;
             position: absolute;
             right: 8px;
             top: 12px;
+
             span {
                 cursor: pointer;
             }
         }
     }
+
     table.organizations {
 
         thead {
             th {
                 &.name {
-                    width: 22%;
+                    width: 20%;
                 }
 
                 &.schac_home_organization, &.schacHomeOrganization {
-                    width: 16%;
+                    width: 14%;
                 }
 
                 &.createdAt {
                     width: 12%;
                 }
 
+                &.manageIdentifier {
+                    text-align: center;
+                    width: 8%;
+                }
+
                 &.applicationCount {
                     text-align: center;
-                    width: 12%;
+                    width: 11%;
                 }
 
                 &.memberCount {
                     text-align: center;
-                    width: 12%;
+                    width: 11%;
                 }
 
                 &.status {
-                    width: 14%;
+                    width: 12%;
                 }
 
                 th.buttons {
@@ -70,8 +79,20 @@
 
         tbody {
             td {
+                &.manageIdentifier {
+                    text-align: center;
+
+                    .wrapper {
+                        display: flex;
+
+                        .sds--checkbox-container {
+                            margin: auto;
+                        }
+                    }
+                }
+
                 &.applicationCount {
-                   text-align: center;
+                    text-align: center;
                 }
 
                 &.memberCount {

server/src/main/java/access/api/UserController.java

@@ -116,6 +116,8 @@ public ResponseEntity<User> me(@Parameter(hidden = true) User user, Authenticati
                             String manageIdentifier = (String) identityProvider.get("_id");
                             Integer manageVersion = (Integer) identityProvider.get("version");
                             Organization organization = new Organization(organizationName, schacHomeOrganization, manageIdentifier, manageVersion);
+                            //Organizations created based on the IdP's in Manage are approved automatically
+                            organization.setStatus(OrganizationStatus.APPROVED);
                             organizationRepository.save(organization);
                             userFromDB.addOrganizationMembership(new OrganizationMembership(userFromDB, organization, authority));
                         }

server/src/main/java/access/manage/RemoteManage.java

@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static access.manage.ManageData.getData;
@@ -112,10 +113,13 @@ public Map<String, Object> providerById(EntityType entityType, String manageIden
     @Override
     public Map<String, Object> saveIdentityProvider(Organization organization) {
         Map<String, Object> provider = providerById(EntityType.saml20_idp, organization.getManageIdentifier(), Environment.PROD);
-        Map<String, Object> metaDataFields = getMetaDataFields (getData(provider));
+        Map<String, Object> metaDataFields = getMetaDataFields(getData(provider));
 
         Map<String, Object> metaDataOrganization = organization.getMetaData();
         converter.convertContactPersons(metaDataOrganization, metaDataFields);
+        String keyWords = String.join(" ", ((List<String>) metaDataOrganization.getOrDefault("keyWords", List.of())));
+        metaDataFields.put("keywords:0:nl", keyWords);
+        metaDataFields.put("keywords:0:en", keyWords);
 
         RestTemplate restTemplate = environmentRestTemplate(Environment.PROD);
         String url = environmentUrl(Environment.PROD);
@@ -236,7 +240,7 @@ public Map<String, Object> identityProviderByEntityID(String entityID) {
                 url,
                 baseQuery, List.class);
         if (identityProviders.isEmpty()) {
-            throw new NotFoundException("No identityProviders found for entityID: "+entityID);
+            throw new NotFoundException("No identityProviders found for entityID: " + entityID);
         }
         return identityProviders.getFirst();
     }
@@ -248,7 +252,7 @@ public List<Map<String, Object>> serviceProvidersByEntityID(List<String> entityI
         Map<String, Object> baseQuery = getBaseQuery(true);
         baseQuery.put("entityid", entityIdentifiers);
         return Stream.of(EntityType.oidc10_rp, EntityType.saml20_sp)
-                .flatMap( entityType -> {
+                .flatMap(entityType -> {
                     String url = String.format("%s/manage/api/internal/search/%s",
                             environmentUrl(activeEnvironment),
                             entityType.name());