Merge branch 'KelvinTegelaar:dev' into dev

KelvinTegelaar · May 5, 2023 · 8d6d9ce · 8d6d9ce
2 parents e5d6946 + 2fa5820
commit 8d6d9ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 33 deletions.
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-3.4.0
+3.5.0
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -57,6 +57,13 @@
     "addedComponent": null,
     "label": "Enable Usernames instead of pseudo anonymised names in reports"
   },
+  {
+    "name": "standards.DisableGuestDirectory",
+    "cat": "Global",
+    "helpText": "This is the default helptext",
+    "addedComponent": null,
+    "label": "Restrict guest user access to directory objects"
+  },
   {
     "name": "standards.ModernAuth",
     "cat": "Global",
@@ -307,35 +314,7 @@
     "addedComponent": null,
     "label": "Enable 1 hour Activity based Timeout"
   },
-  {
-    "name": "standards.sharingCapability.Enabled",
-    "cat": "SharePoint",
-    "helpText": "This is the default helptext",
-    "addedComponent": {
-      "type": "Select",
-      "label": "Select Sharing Level",
-      "name": "standards.sharingCapability.Level",
-      "values": [
-        {
-          "label": "Users can share only with people in the organization. No external sharing is allowed.",
-          "value": "disabled"
-        },
-        {
-          "label": "Users can share with new and existing guests. Guests must sign in or provide a verification code.",
-          "value": "externalUserSharingOnly"
-        },
-        {
-          "label": "Users can share with anyone by using links that do not require sign-in.",
-          "value": "externalUserAndGuestSharing"
-        },
-        {
-          "label": "Users can share with existing guests (those already in the directory of the organization).",
-          "value": "existingExternalUserSharingOnly"
-        }
-      ]
-    },
-    "label": "Set Sharing Level for OneDrive and Sharepoint"
-  },
+
   {
     "name": "standards.calDefault.Enabled",
     "cat": "Exchange",

diff --git a/src/views/home/Home.js b/src/views/home/Home.js
@@ -218,14 +218,16 @@ const Home = () => {
                 <p className="fw-lighter">Domain(s)</p>
                 {(isLoadingOrg || isFetchingOrg) && <Skeleton />}
                 {!isFetchingOrg &&
-                  organization?.verifiedDomains.map((item) => <li>{item.name}</li>)}
+                  issuccessOrg &&
+                  organization?.verifiedDomains?.map((item) => <li>{item.name}</li>)}
               </CCol>
               <CCol sm={12} md={4} className="mb-3">
                 <p className="fw-lighter">Capabilities</p>
                 {(isLoadingOrg || isFetchingOrg) && <Skeleton />}
                 {!isFetchingOrg &&
+                  issuccessOrg &&
                   organization?.assignedPlans
-                    .filter((p) => p.capabilityStatus == 'Enabled')
+                    ?.filter((p) => p.capabilityStatus == 'Enabled')
                     .reduce((plan, curr) => {
                       if (!plan.includes(curr.service)) {
                         plan.push(curr.service)

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-3.4.0
+3.5.0