From 308a44c3aaa9eba264f6fdf1209c851a059811d1 Mon Sep 17 00:00:00 2001
From: jdr8 <63188001+jdr8@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:34:38 +1000
Subject: [PATCH 1/7] Re-add Tenant Mode radio buttons

---
 .../cipp/app-settings/SettingsSuperAdmin.jsx  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/views/cipp/app-settings/SettingsSuperAdmin.jsx b/src/views/cipp/app-settings/SettingsSuperAdmin.jsx
index 18cb6b397980..e6c7c8facc8e 100644
--- a/src/views/cipp/app-settings/SettingsSuperAdmin.jsx
+++ b/src/views/cipp/app-settings/SettingsSuperAdmin.jsx
@@ -66,6 +66,42 @@ export function SettingsSuperAdmin() {
                 </p>
               </CCol>
             </CRow>
+            <CRow>
+              <CCol sm={12} md={12} className="mb-3">
+                <p className="fw-lighter">Tenant Mode</p>
+                <Form
+                  onSubmit={onSubmit}
+                  initialValues={partnerConfig.data}
+                  render={({ handleSubmit }) => (
+                    <>
+                      {partnerConfig.isFetching && <CSpinner size="sm" className="me-2" />}
+                      <CForm id="submitForm" onSubmit={handleSubmit}>
+                        <RFFCFormRadio
+                          name="TenantMode"
+                          label="Multi Tenant - GDAP Mode"
+                          value="default"
+                        />
+                        <RFFCFormRadio
+                          name="TenantMode"
+                          label="Multi Tenant - Add Partner Tenant"
+                          value="PartnerTenantAvailable"
+                        />
+                        <RFFCFormRadio
+                          name="TenantMode"
+                          label="Single Tenant - Own Tenant Mode"
+                          value="owntenant"
+                        />
+                      </CForm>
+                    </>
+                  )}
+                />
+                {webhookCreateResult.isSuccess && (
+                  <CippCallout color="info" dismissible>
+                    {webhookCreateResult?.data?.results}
+                  </CippCallout>
+                )}
+              </CCol>
+            </CRow>
           </>
         </>
       </CippButtonCard>

From 275641eaf24055e4110a7ae39ea9df7e5ad43a2a Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Mon, 5 Aug 2024 11:55:54 -0400
Subject: [PATCH 2/7] fix titlebutton link

---
 src/views/tenant/administration/TenantOnboardingWizard.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
index ebbab2a8e178..981a047702d0 100644
--- a/src/views/tenant/administration/TenantOnboardingWizard.jsx
+++ b/src/views/tenant/administration/TenantOnboardingWizard.jsx
@@ -136,7 +136,10 @@ const TenantOnboardingWizard = () => {
         </center>
         <hr className="my-4" />
         <div className="mb-2">
-          <TitleButton href="/tenant/administration/gdap-invite" title="Create GDAP Invite" />
+          <TitleButton
+            href="/tenant/administration/gdap-invite-wizard"
+            title="Create GDAP Invite"
+          />
         </div>
         <Field name="selectedRelationships" validate={requiredArray}>
           {(props) => (

From 6f67e941479648371940a9829ef72627bd5425fb Mon Sep 17 00:00:00 2001
From: Esco <OfficialEsco@users.noreply.github.com>
Date: Tue, 6 Aug 2024 17:04:11 +0200
Subject: [PATCH 3/7] added very important T

---
 src/data/standards.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/standards.json b/src/data/standards.json
index ef14f236cd1a..40380a53a9f0 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -93,7 +93,7 @@
             "value": "default"
           },
           {
-            "label": "Parial-screen background",
+            "label": "Partial-screen background",
             "value": "verticalSplit"
           }
         ]

From 28d3600435f84ab999dc62bdf9c542e82a524bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= <kris6673@hotmail.com>
Date: Wed, 7 Aug 2024 18:11:52 +0200
Subject: [PATCH 4/7] Update DeletedUserRentention based on MC836942

---
 src/data/standards.json | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/data/standards.json b/src/data/standards.json
index 40380a53a9f0..b767bf142194 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -1985,14 +1985,22 @@
     "name": "standards.DeletedUserRentention",
     "cat": "SharePoint Standards",
     "tag": ["lowimpact"],
-    "helpText": "Sets the retention period for deleted users OneDrive to the specified number of years. The default is 1 year.",
-    "docsDescription": "When a OneDrive user gets deleted, the personal SharePoint site is saved for selected time in years and data can be retrieved from it.",
+    "helpText": "Sets the retention period for deleted users OneDrive to the specified period of time. The default is 30 days.",
+    "docsDescription": "When a OneDrive user gets deleted, the personal SharePoint site is saved for selected amount of time that data can be retrieved from it.",
     "addedComponent": [
       {
         "type": "Select",
         "name": "standards.DeletedUserRentention.Days",
-        "label": "Retention in years (Default 1)",
+        "label": "Retention time (Default 30 days)",
         "values": [
+          {
+            "label": "30 days",
+            "value": "30"
+          },
+          {
+            "label": "90 days",
+            "value": "90"
+          },
           {
             "label": "1 year",
             "value": "365"

From 6a77f2b58c81ca323b763e71e1ee407a773a0104 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 8 Aug 2024 15:55:35 -0400
Subject: [PATCH 5/7] Add confirmation dialog to save standards

---
 .../tenant/standards/ListAppliedStandards.jsx | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
index 10eab27c96fd..226f2cf028c6 100644
--- a/src/views/tenant/standards/ListAppliedStandards.jsx
+++ b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -76,6 +76,7 @@ const DeleteAction = () => {
     </>
   )
 }
+
 const ApplyNewStandard = () => {
   const [templateStandard, setTemplateStandard] = useState()
   const [loadedTemplate, setLoadedTemplate] = useState(false)
@@ -268,6 +269,7 @@ const ApplyNewStandard = () => {
     })
 
   const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
+  const tenantDisplayName = useSelector((state) => state.app.currentTenant.displayName)
   //console.log('tenantDomain', tenantDomain)
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
 
@@ -294,20 +296,27 @@ const ApplyNewStandard = () => {
   })
 
   const handleSubmit = async (values) => {
-    Object.keys(values.standards).filter(function (x) {
-      if (values.standards[x] === false) {
-        delete values.standards[x]
-      }
-      return null
-    })
-
-    //filter on only objects that are 'true'
-    genericPostRequest({
-      path: '/api/AddStandardsDeploy',
-      values: { ...values.standards, tenant: tenantDomain },
-    }).then(() => {
-      refetchStandards()
-      refetchConsolidated()
+    ModalService.confirm({
+      title: 'Save Standards',
+      body: (
+        <div>
+          <p>
+            Are you sure you want to save these standards to {tenantDisplayName}? This will apply
+            all Remediate options on the next run.
+          </p>
+        </div>
+      ),
+      confirmLabel: 'Save',
+      cancelLabel: 'Cancel',
+      onConfirm: () => {
+        genericPostRequest({
+          path: '/api/AddStandardsDeploy',
+          values: { ...values.standards, tenant: tenantDomain },
+        }).then(() => {
+          refetchStandards()
+          refetchConsolidated()
+        })
+      },
     })
   }
   const [intuneGetRequest, intuneTemplates] = useLazyGenericGetRequestQuery()

From 5739fc4e144952a3deb617436d2e3141a8ae50fe Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 8 Aug 2024 15:57:49 -0400
Subject: [PATCH 6/7] fix link

---
 src/views/tenant/administration/GDAPRoleWizard.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tenant/administration/GDAPRoleWizard.jsx b/src/views/tenant/administration/GDAPRoleWizard.jsx
index acaca41de84a..8607617cfb0a 100644
--- a/src/views/tenant/administration/GDAPRoleWizard.jsx
+++ b/src/views/tenant/administration/GDAPRoleWizard.jsx
@@ -168,7 +168,7 @@ const GDAPRoleWizard = () => {
                 return <li key={idx}>{message}</li>
               })}
             </CCallout>
-            <Link to="/tenant/administration/gdap-invite">
+            <Link to="/tenant/administration/gdap-invite-wizard">
               <CButton>Create GDAP Invite</CButton>
             </Link>
           </>

From 28a551d709a5a0f1597336ee50bdcd5c8e13fccd Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 8 Aug 2024 16:30:20 -0400
Subject: [PATCH 7/7] Up version

---
 package.json              | 2 +-
 public/version_latest.txt | 2 +-
 version_latest.txt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index dde03c41dba7..9e3b09fd6c58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
diff --git a/public/version_latest.txt b/public/version_latest.txt
index 6abaeb2f9072..024b066c0bb7 100644
--- a/public/version_latest.txt
+++ b/public/version_latest.txt
@@ -1 +1 @@
-6.2.0
+6.2.1
diff --git a/version_latest.txt b/version_latest.txt
index 6abaeb2f9072..024b066c0bb7 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-6.2.0
+6.2.1