Merge pull request #20 from KelvinTegelaar/main

[pull] main from KelvinTegelaar:main
ACCIPP · Aug 13, 2024 · 3defb0a · 3defb0a
2 parents 13a7860 + 0061bbd
commit 3defb0a
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "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
@@ -1 +1 @@
-6.2.0
+6.2.2
diff --git a/src/data/AuditLogSchema.json b/src/data/AuditLogSchema.json
@@ -731,6 +731,7 @@
     { "value": "AR", "name": "Argentina" },
     { "value": "AM", "name": "Armenia" },
     { "value": "AW", "name": "Aruba" },
+    { "value": "AC", "name": "Ascension Island" },
     { "value": "AU", "name": "Australia" },
     { "value": "AT", "name": "Austria" },
     { "value": "AZ", "name": "Azerbaijan" },
@@ -779,6 +780,7 @@
     { "value": "CY", "name": "Cyprus" },
     { "value": "CZ", "name": "Czech Republic" },
     { "value": "DK", "name": "Denmark" },
+    { "value": "DG", "name": "Diego Garcia" },
     { "value": "DJ", "name": "Djibouti" },
     { "value": "DM", "name": "Dominica" },
     { "value": "DO", "name": "Dominican Republic" },
@@ -837,6 +839,7 @@
     { "value": "KI", "name": "Kiribati" },
     { "value": "KP", "name": "Korea, Democratic People's Republic of" },
     { "value": "KR", "name": "Korea, Republic of" },
+    { "value": "XK", "name": "Kosovo" },
     { "value": "KW", "name": "Kuwait" },
     { "value": "KG", "name": "Kyrgyzstan" },
     { "value": "LA", "name": "Lao People's Democratic Republic" },

diff --git a/src/data/countryList.json b/src/data/countryList.json
@@ -12,6 +12,7 @@
   { "Code": "AR", "Name": "Argentina" },
   { "Code": "AM", "Name": "Armenia" },
   { "Code": "AW", "Name": "Aruba" },
+  { "Code": "AC", "Name": "Ascension Island" },
   { "Code": "AU", "Name": "Australia" },
   { "Code": "AT", "Name": "Austria" },
   { "Code": "AZ", "Name": "Azerbaijan" },
@@ -60,6 +61,7 @@
   { "Code": "CY", "Name": "Cyprus" },
   { "Code": "CZ", "Name": "Czech Republic" },
   { "Code": "DK", "Name": "Denmark" },
+  { "Code": "DG", "Name": "Diego Garcia" },
   { "Code": "DJ", "Name": "Djibouti" },
   { "Code": "DM", "Name": "Dominica" },
   { "Code": "DO", "Name": "Dominican Republic" },
@@ -118,6 +120,7 @@
   { "Code": "KI", "Name": "Kiribati" },
   { "Code": "KP", "Name": "Korea, Democratic People's Republic of" },
   { "Code": "KR", "Name": "Korea, Republic of" },
+  { "Code": "XK", "Name": "Kosovo" },
   { "Code": "KW", "Name": "Kuwait" },
   { "Code": "KG", "Name": "Kyrgyzstan" },
   { "Code": "LA", "Name": "Lao People's Democratic Republic" },

diff --git 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"
           }
         ]
@@ -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"
@@ -2333,7 +2341,7 @@
             "value": "none"
           },
           {
-            "label": "Restirct sharing to specific domains",
+            "label": "Restrict sharing to specific domains",
             "value": "allowList"
           },
           {

diff --git 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>

diff --git a/src/views/identity/administration/Users.jsx b/src/views/identity/administration/Users.jsx
@@ -275,7 +275,8 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             color: 'info',
             modal: true,
             modalUrl: `/api/ExecResetPass?MustChange=true&TenantFilter=${tenant.defaultDomainName}&ID=${row.id}&displayName=${row.displayName}`,
-            modalMessage: 'Are you sure you want to reset the password for this user?',
+            modalMessage:
+              'Are you sure you want to reset the password for this user? The user must change their password at next logon.',
           },
           {
             label: 'Reset Password',
@@ -285,11 +286,11 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             modalMessage: 'Are you sure you want to reset the password for this user?',
           },
           {
-            label: 'Preprovision OneDrive',
+            label: 'Pre-provision OneDrive',
             color: 'info',
             modal: true,
             modalUrl: `/api/ExecOneDriveProvision?TenantFilter=${tenant.defaultDomainName}&UserPrincipalName=${row.userPrincipalName}`,
-            modalMessage: 'Are you sure you want to preprovision onedrive for this user??',
+            modalMessage: 'Are you sure you want to pre-provision OneDrive for this user??',
           },
           {
             label: 'Clear ImmutableId',

diff --git 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>
           </>

diff --git 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) => (

diff --git 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()

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-6.2.0
+6.2.2