Make orphan jobs idempotent

client/src/api/index.js

@@ -978,7 +978,7 @@ export function clearMockScimStatistics() {
 
 //SCIM
 export function sweep(service) {
-    return postPutJson(`/api/scim/v2/sweep?service_id=${service.id}`, {}, "PUT")
+    return postPutJson(`/api/scim/v2/sweep?service_id=${service.id}`, {}, "PUT", false);
 }
 
 

client/src/components/DateField.jsx

@@ -21,29 +21,32 @@ export default class DateField extends React.Component {
 
     toggle = () => this.component.setOpen(true);
 
+    invalidValue = (onChange) => {
+        setTimeout(() => onChange(moment().add(16, "days").toDate()), 250);
+    }
+
     validateOnBlur = e => {
-        const {onChange, maxDate = null, minDate = null, allowNull = false, performValidateOnBlur = true,
-        pastDatesAllowed = false} = this.props;
+        const {
+            onChange, maxDate = null, minDate = null, allowNull = false, performValidateOnBlur = true,
+            pastDatesAllowed = false
+        } = this.props;
         if (!performValidateOnBlur) {
             stopEvent(e);
             return;
         }
 
         if (e && e.target) {
             const minimalDate = minDate || moment().add(1, "day").toDate();
-            const maximalDate = maxDate || moment().add(31, "day").toDate();
+            minimalDate.setHours(0,0,0,0);
             const value = e.target.value;
             if (value) {
-                const m = moment(value, "dd/MM/yyyy");
+                const m = moment(value, "DD/MM/YYYY");
                 const d = m.toDate();
-                if (!pastDatesAllowed && (!m.isValid() || d > maximalDate || d < minimalDate)) {
-                    setTimeout(() => onChange(moment().add(16, "days").toDate()), 250);
-                }
-            } else {
-                if (!allowNull) {
-                    setTimeout(() => onChange(moment().add(16, "days").toDate()), 250);
+                if (!m.isValid() || (!pastDatesAllowed && d < minimalDate) || (maxDate && d > maxDate)) {
+                    this.invalidValue(onChange);
                 }
-
+            } else if (!allowNull) {
+                this.invalidValue(onChange);
             }
         }
     }
@@ -58,7 +61,7 @@ export default class DateField extends React.Component {
         return (
             <div className="date-field">
                 {name && <label className="date-field-label" htmlFor={name}>{name}
-                    {toolTip && <Tooltip tip={toolTip} />}
+                    {toolTip && <Tooltip tip={toolTip}/>}
                 </label>}
                 <label className={"date-picker-container"} htmlFor={name}>
                     <DatePicker

client/src/components/EmailField.jsx

@@ -23,7 +23,7 @@ export default function EmailField({
         if (!["Enter", "Spacebar", "Backspace", "Tab"].includes(e.key)) {
             setEmailErrors([]);
         }
-        setValue(e.target.state);
+        setValue(e.target.value);
     }
 
     const displayEmail = email => {

client/src/components/redesign/AboutService.scss

@@ -10,6 +10,7 @@ div.service-about-mod {
 
      @media (max-width: $tablet-max) {
         flex-direction: column;
+         padding: 32px 15px;
     }
 
     span.role {

client/src/components/redesign/JoinRequests.jsx

@@ -14,11 +14,10 @@ import {joinRequestAccept, joinRequestDecline, joinRequestDelete} from "../../ap
 import UserColumn from "./UserColumn";
 import moment from "moment";
 import {ReactComponent as MembersIcon} from "../../icons/single-neutral.svg";
-import {Tooltip} from "@surfnet/sds";
+import {Chip, Tooltip} from "@surfnet/sds";
 import Select from "react-select";
 import InstituteColumn from "./InstituteColumn";
 import {chipTypeForStatus} from "../../utils/UserRole";
-import {Chip} from "@surfnet/sds";
 
 const allValue = "all";
 
@@ -204,9 +203,8 @@ class JoinRequests extends React.Component {
                                 date: moment(joinRequest.created_at * 1000).format("LL"),
                                 name: joinRequest.user.name
                             })}</h2>
-                        {<span className={`status ${joinRequest.status}`}>
-                            {I18n.t(`collaborationRequest.statuses.${joinRequest.status}`)}
-                        </span>}
+                        {<Chip label={I18n.t(`collaborationRequest.statuses.${joinRequest.status}`)}
+                               type={chipTypeForStatus(joinRequest)}/>}
                     </div>
                     {joinRequest.reference && <InputField name={I18n.t("joinRequest.reference")}
                                                           value={joinRequest.reference}
@@ -281,7 +279,7 @@ class JoinRequests extends React.Component {
                 key: "status",
                 header: I18n.t("collaborationRequest.status"),
                 mapper: entity => <Chip type={chipTypeForStatus(entity)}
-                label={I18n.t(`collaborationRequest.statuses.${entity.status}`)} />
+                                        label={I18n.t(`collaborationRequest.statuses.${entity.status}`)}/>
             },
         ]
         const filteredJoinRequests = filterValue.value === allValue ? collaboration.join_requests :

client/src/components/redesign/JoinRequests.scss

@@ -1,7 +1,6 @@
 @import "../../stylesheets/vars";
 @import "../../stylesheets/forms";
 @import "../../stylesheets/unit_header";
-@import "../../stylesheets/entity_status";
 
 table.joinRequests {
 
@@ -91,9 +90,13 @@ table.joinRequests {
         }
 
         .join-request-header {
-            display: flex;
+                            display: flex;
+                align-items: center;
 
-            @include entity-status;
+            button.sds--chips {
+                margin-left: 25px;
+                max-height: 34px;
+            }
         }
 
         display: flex;

client/src/components/redesign/MemberJoinRequests.scss

@@ -1,6 +1,5 @@
 @import "../../stylesheets/vars";
 @import "../../stylesheets/unit_header";
-@import "../../stylesheets/entity_status";
 
 table.memberJoinRequests, table.systemJoinRequests, table.deletedJoinRequests {
 
@@ -14,6 +13,7 @@ table.memberJoinRequests, table.systemJoinRequests, table.deletedJoinRequests {
             &.user__name {
                 width: 35%;
             }
+
             &.user__schac_home_organisation {
                 width: 20%;
             }
@@ -96,12 +96,6 @@ table.memberJoinRequests, table.systemJoinRequests, table.deletedJoinRequests {
             padding: 15px 15px 0 15px;
         }
 
-        .join-request-header {
-            display: flex;
-
-            @include entity-status;
-        }
-
         display: flex;
         flex-direction: column;
 

client/src/components/redesign/OrganisationServices.jsx

@@ -112,7 +112,7 @@ class OrganisationServices extends React.Component {
     serviceSortProperty = (service, organisation) => {
         const tooltip = this.deductTooltip(service, organisation);
         const connected = organisation.services.some(s => s.id === service.id);
-        return (connected && !tooltip) ? 0 : tooltip ? 2 :  1;
+        return (connected && !tooltip) ? 0 : tooltip ? 2 : 1;
     }
 
     deductTooltip = (service, organisation) => {
@@ -121,10 +121,14 @@ class OrganisationServices extends React.Component {
         const allowed_org = service.allowed_organisations.some(org => org.id === organisation.id) || trusted_org;
         if (!service.allow_restricted_orgs && organisation.services_restricted) {
             tooltip = I18n.t("organisationServices.serviceRestrictedOrganisation");
-        } else if (!service.access_allowed_for_all && !allowed_org) {
-            tooltip = I18n.t("organisationServices.notEnabledOrganisation");
-        } else if (!service.automatic_connection_allowed && !trusted_org) {
+        } else if (service.non_member_users_access_allowed) {
+            tooltip = I18n.t("organisationServices.accessForNonMembersOrganisation");
+        } else if (service.access_allowed_for_all && !service.automatic_connection_allowed
+            && !trusted_org && !service.non_member_users_access_allowed) {
             tooltip = I18n.t("organisationServices.notAllowedOrganisation");
+        } else if (!service.access_allowed_for_all && !service.automatic_connection_allowed
+            && !allowed_org && !service.non_member_users_access_allowed) {
+            tooltip = I18n.t("organisationServices.notEnabledOrganisation");
         }
         return tooltip;
     }

client/src/components/redesign/ServiceConnectionRequests.jsx

@@ -122,7 +122,7 @@ class ServiceConnectionRequests extends React.Component {
                     <h2>{I18n.t("models.serviceConnectionRequests.details",
                         {
                             date: moment(serviceConnectionRequest.created_at * 1000).format("LL"),
-                            name: serviceConnectionRequest.requester.name,
+                            name: serviceConnectionRequest.requester.name || serviceConnectionRequest.requester.uid,
                             collaborationName: serviceConnectionRequest.collaboration.name
                         })}</h2>
 

client/src/components/redesign/UsedServices.jsx

@@ -77,6 +77,8 @@ class UsedServices extends React.Component {
                     .filter(service => {
                         return (service.allowed_organisations.some(org => org.id === collaboration.organisation_id)
                                 || service.access_allowed_for_all
+                                || service.automatic_connection_allowed
+                                || service.non_member_users_access_allowed
                                 || service.automatic_connection_allowed_organisations.some(org => org.id === collaboration.organisation_id))
                             && servicesInUse.indexOf(service.id) === -1
                             && (service.allow_restricted_orgs || !collaboration.organisation.services_restricted);
@@ -275,7 +277,7 @@ class UsedServices extends React.Component {
                     <h3>{I18n.t("models.serviceConnectionRequests.details",
                         {
                             date: moment(serviceConnectionRequest.created_at * 1000).format("LL"),
-                            name: serviceConnectionRequest.requester.name,
+                            name: serviceConnectionRequest.requester.name || serviceConnectionRequest.requester.uid,
                             collaborationName: collaboration.name
                         })}</h3>
                     <Logo src={serviceConnectionRequest.service.logo}/>

client/src/locale/en.js

@@ -599,7 +599,7 @@ I18n.translations.en = {
         sshKeyError: "This SSH cipher isn't recognized. Please refer to the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://edu.nl/87btm\">documentation</a> for supported formats.",
         sshConvertInfo: "Public key will be converted to the <code>OpenSSH</code> format when saving the profile",
         update: "Update",
-        download: "Download",
+        download: "Download profile",
         flash: {
             updated: "Your profile has been updated"
         },
@@ -1376,6 +1376,7 @@ I18n.translations.en = {
         noServices: "This organisation has no services connected.",
         searchServices: "Search, select and add services to the available services within organisation {{name}}.",
         deleteServiceTooltip: "Make this service unavailable in the organisation {{name}}. <strong>Note</strong>: the service itself is NOT deleted. It is only not available anymore for the members of the collaborations on this organisation",
+        accessForNonMembersOrganisation: "This service cannot be enabled for all collaborations, because all users of the platform can access this service, regardless of any collaboration membership.",
         notAllowedOrganisation: "This service cannot be enabled for all collaborations, because it does not allow automatic connections. Connections can still be requested by individual collaborations in your organisation.",
         notEnabledOrganisation: "This service cannot be enabled for all collaborations, because the service does not allow access for this organisation.",
         serviceRestrictedOrganisation: "This service cannot be made mandatory for all collaborations, because this organisation can only link SURF services.",
@@ -1996,11 +1997,11 @@ I18n.translations.en = {
     sfo: {
         title: "You do not have access to <i>{{name}}</i>",
         info: "Bad luck...",
-        info1: "You are not logged into SURF Research Access Management, and therefore you don't have access to <i>{{name}}</i>.",
-        info2: "<p>You are not logged into SURF Research Access Management as your profile is suspended, and therefore you don't have access to <i>{{name}}</i>.<p>Contact your admin(s) to enable access to this service.</p>",
-        info3: "You are logged into SURF Research Access Management, but the service <i>{{name}}</i> is unknown.",
+        info1: "<p>Access to <i>{{name}}</i> requires membership of a collaboration in SURF Research Access Management.</p><p>Contact your admin(s) to invite you to a collaboration that grants access to this service.</p>",
+        info2: "<p>Your profile in SURF Research Access Management is suspended, and therefore you don't have access to <i>{{name}}</i>.<p>Contact your admin(s) to enable access to this service.</p>",
+        info3: "You are logged in, but the service <i>{{name}}</i> is unknown to SURF Research Access Management.",
         info4: "<p>You are logged into SURF Research Access Management, but none of the collaborations you are member of grant you access to <i>{{name}}</i>.</p><p>Contact your admin(s) to enable access to this service.</p>",
-        info5: "<p>You are logged into SURF Research Access Management, but you don't have access to <i>{{name}}</i>. The collaboration which is connected to service <i>{{name}}</i> is not active.</p><p>Contact your admin(s) to enable access to this service.</p>",
+        info5: "<p>You are logged into SURF Research Access Management, but you don't have access to <i>{{name}}</i>. The collaboration which is connected to service <i>{{name}}</i> is inactive.</p><p>Contact your admin(s) to enable access to this service.</p>",
         info6: "<p>You are logged into SURF Research Access Management, but you don't have access to <i>{{name}}</i>. Your collaboration membership which grants you access to <i>{{name}}</i> is expired.</p><p>Contact your admin(s) to enable access to this service.</p>",
         ticket: "Copy & paste the following information if you contact <a href='mailto:sram-support@surf.nl'>sram-support@surf.nl</a>",
         entityId: "Entity ID",

client/src/locale/nl.js

@@ -599,7 +599,7 @@ I18n.translations.nl = {
         sshKeyError: "Deze SSH cipher wordt niet herkend. In de <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://edu.nl/87btm\">documentatie</a> staan de ondersteunde formaten.",
         sshConvertInfo: "Je publieke SSH-sleutel wordt geconverteerd naar het bestandsformaat <code>OpenSSH-key</code> bij het opslaan van het profiel",
         update: "Opslaan",
-        download: "Download",
+        download: "Download profiel",
         flash: {
             updated: "Je profiel is bijgewerkt"
         },
@@ -1376,6 +1376,7 @@ I18n.translations.nl = {
         noServices: "Deze organisatie heeft geen gekoppelde diensten.",
         searchServices: "Zoek, kies en voeg diensten toe aan organisatie {{name}}",
         deleteServiceTooltip: "Maak deze dienst ontoegankelijk voor samenwerking {{name}}. <strong>Let op</strong>: de dienst wordt niet verwijderd, alleen onbeschikbaar voor de samenwerkingen van deze organisatie.",
+        accessForNonMembersOrganisation: "Deze dienst kan niet worden verplicht voor alle samenwerkingen omdat alle gebruikers van het platform hebben toegang tot deze dienst, ongeacht lidmaatschap van en koppelingen met samenwerkingen\n",
         notAllowedOrganisation: "Deze dienst kan niet worden verplicht voor alle samenwerkingen omdat deze dienst automatische verbindingen niet toestaat. Aansluitingen kunnen nog steeds worden aangevraagd door individuele samenwerkingen in je organisatie.",
         notEnabledOrganisation: "Deze dienst kan niet worden verplicht voor alle samenwerkingen omdat deze dienst toegang voor deze organisatie niet toestaat.",
         serviceRestrictedOrganisation: "Deze dienst kan niet worden verplicht voor alle samenwerkingen omdat deze organisatie alleen SURF-diensten mag koppelen.",
@@ -1996,10 +1997,10 @@ I18n.translations.nl = {
     sfo: {
         title: "Je hebt geen toegang tot <i>{{name}}</i>",
         info: "Pech gehad...",
-        info1: "Je bent niet ingelogd bij SURF Research Access Management, daarom heb je geen toegang tot <i>{{name}}</i>.",
-        info2: "<p>Je bent niet ingelogd bij SURF Research Access Management omdat je profiel is geschorst. Daarom heb je geen toegang tot <i>{{name}}</i>.</p><p>Neem contact op met de beheerder(s) van jouw samenwerking(en) voor toegang tot deze dienst.</p>",
-        info3: "Je bent ingelogd bij SURF Research Access Management, maar de dienst <i>{{name}}</i> is onbekend.",
-        info4: "<p>Je bent ingelogd via SURF Research Access Management, maar de samenwerking(en) waar je lid van bent, geven geen toegang tot <i>{{name}}</i>.</p><p>Neem contact op met de beheerder(s) van jouw samenwerking(en) voor toegang tot deze dienst.</p>",
+        info1: "<p>Toegang tot <i>{{name}}</i> vereist lidmaatschap van een samenwerking in SURF Research Access Management.</p><p>Vraag de beheerder(s) om je uit te nodigen voor een samenwerking die toegang geeft tot deze dienst.</p>",
+        info2: "<p>Je profiel in SURF Research Access Management is geschorst. Daarom heb je geen toegang tot <i>{{name}}</i>.</p><p>Neem contact op met de beheerder(s) voor toegang tot deze dienst.</p>",
+        info3: "Je bent ingelogd bij, maar de dienst <i>{{name}}</i> is onbekend bij SURF Research Access Management.",
+        info4: "<p>Je bent ingelogd via SURF Research Access Management, maar geen van de samenwerking(en) waar je lid van bent geven toegang tot <i>{{name}}</i>.</p><p>Neem contact op met de beheerder(s) voor toegang tot deze dienst.</p>",
         info5: "<p>Je bent ingelogd via SURF Research Access Management, maar je hebt geen toegang tot <i>{{name}}</i> omdat de samenwerking(en) waarvan je lid bent niet actief zijn.</p><p>Neem contact op met de beheerder(s) van jouw samenwerking(en) voor toegang tot deze dienst.</p>",
         info6: "<p>Je bent ingelogd via SURF Research Access Management, maar je hebt geen toegang tot <i>{{name}}</i>. Je lidmaatschap van de samenwerking(en) waar je momenteel lid van bent zijn verlopen.</p><p>Neem contact op met de beheerder(s) van jouw samenwerking(en) voor toegang tot deze dienst.</p>",
         ticket: "Copy & paste de volgende informatie als je contact opneemt met <a href='mailto:sram-support@surf.nl'>sram-support@surf.nl</a>",