Merge pull request #229 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
KelvinTegelaar · Jan 16, 2025 · 19cc490 · 19cc490
2 parents dc72eb4 + 241a339
commit 19cc490
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 14 deletions.
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.0.3"
+  "version": "7.0.4"
 }
diff --git a/src/components/CippComponents/CippTenantSelector.jsx b/src/components/CippComponents/CippTenantSelector.jsx
@@ -217,7 +217,7 @@ export const CippTenantSelector = (props) => {
             icon: <Laptop />,
           },
           {
-            label: "Sharepoint Portal",
+            label: "SharePoint Portal",
             link: `https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=${currentTenant?.addedFields?.customerId}&CSDEST=SharePoint`,
             icon: <Share />,
           },

diff --git a/src/components/CippComponents/CippTranslations.jsx b/src/components/CippComponents/CippTranslations.jsx
@@ -35,7 +35,7 @@ export const CippTranslations = {
   portal_intune: "Intune Portal",
   portal_security: "Security Portal",
   portal_compliance: "Compliance Portal",
-  portal_sharepoint: "Sharepoint Portal",
+  portal_sharepoint: "SharePoint Portal",
   "@odata.type": "Type",
   roleDefinitionId: "GDAP Role",
   FromIP: "From IP",

diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx
@@ -249,6 +249,15 @@ const CippAddEditUser = (props) => {
           formControl={formControl}
         />
       </Grid>
+      <Grid item xs={12} md={6}>
+        <CippFormComponent
+          type="textField"
+          fullWidth
+          label="Alternate Email Address"
+          name="otherMails"
+          formControl={formControl}
+        />
+      </Grid>
       {userSettingsDefaults?.userAttributes?.map((attribute, idx) => (
         <Grid item xs={6} key={idx}>
           <CippFormComponent

diff --git a/src/data/CIPPDefaultGDAPRoles.json b/src/data/CIPPDefaultGDAPRoles.json
@@ -32,7 +32,7 @@
     "value": "69091246-20e8-4a56-aa4d-066075b2a7a8"
   },
   {
-    "label": "Sharepoint Administrator",
+    "label": "SharePoint Administrator",
     "value": "f28a1f50-f6e7-4571-818b-6a12f2af6b6c"
   },
   {

diff --git a/src/data/intuneCollection.json b/src/data/intuneCollection.json
@@ -73017,7 +73017,7 @@
   },
   {
     "id": "device_vendor_msft_policy_config_fslogixv1~policy~fslogix~odfc_odfcincludesharepoint",
-    "displayName": "Include Sharepoint",
+    "displayName": "Include SharePoint",
     "options": [
       {
         "id": "device_vendor_msft_policy_config_fslogixv1~policy~fslogix~odfc_odfcincludesharepoint_0",
@@ -209011,7 +209011,7 @@
   },
   {
     "id": "user_vendor_msft_policy_config_outlk16v2~policy~l_microsoftofficeoutlook~l_toolsaccounts~l_sharepointintegration_l_disablesharepointintegrationinoutlook",
-    "displayName": "Do not allow Sharepoint-Outlook integration (User)",
+    "displayName": "Do not allow SharePoint-Outlook integration (User)",
     "options": [
       {
         "id": "user_vendor_msft_policy_config_outlk16v2~policy~l_microsoftofficeoutlook~l_toolsaccounts~l_sharepointintegration_l_disablesharepointintegrationinoutlook_0",

diff --git a/src/data/portals.json b/src/data/portals.json
@@ -72,8 +72,8 @@
     "icon": "shield-alt"
   },
   {
-    "label": "Sharepoint Admin",
-    "name": "Sharepoint_Admin",
+    "label": "SharePoint Admin",
+    "name": "SharePoint_Admin",
     "url": "https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=customerId&CSDEST=SharePoint",
     "variable": "customerId",
     "target": "_blank",

diff --git a/src/data/standards.json b/src/data/standards.json
@@ -498,7 +498,7 @@
     "name": "standards.DisableM365GroupUsers",
     "cat": "Entra (AAD) Standards",
     "tag": ["lowimpact"],
-    "helpText": "Restricts M365 group creation to certain admin roles. This disables the ability to create Teams, Sharepoint sites, Planner, etc",
+    "helpText": "Restricts M365 group creation to certain admin roles. This disables the ability to create Teams, SharePoint sites, Planner, etc",
     "docsDescription": "Users by default are allowed to create M365 groups. This restricts M365 group creation to certain admin roles. This disables the ability to create Teams, SharePoint sites, Planner, etc",
     "addedComponent": [],
     "label": "Disable M365 Group creation by users",
@@ -1682,7 +1682,7 @@
     "name": "standards.AtpPolicyForO365",
     "cat": "Defender Standards",
     "tag": ["lowimpact", "CIS"],
-    "helpText": "This creates a Atp policy that enables Defender for Office 365 for Sharepoint, OneDrive and Microsoft Teams.",
+    "helpText": "This creates a Atp policy that enables Defender for Office 365 for SharePoint, OneDrive and Microsoft Teams.",
     "addedComponent": [
       {
         "type": "switch",
@@ -2360,7 +2360,7 @@
     "name": "standards.sharingCapability",
     "cat": "SharePoint Standards",
     "tag": ["highimpact", "CIS"],
-    "helpText": "Sets the default sharing level for OneDrive and Sharepoint. This is a tenant wide setting and overrules any settings set on the site level",
+    "helpText": "Sets the default sharing level for OneDrive and SharePoint. This is a tenant wide setting and overrules any settings set on the site level",
     "addedComponent": [
       {
         "type": "autoComplete",
@@ -2387,7 +2387,7 @@
         ]
       }
     ],
-    "label": "Set Sharing Level for OneDrive and Sharepoint",
+    "label": "Set Sharing Level for OneDrive and SharePoint",
     "impact": "High Impact",
     "impactColour": "danger",
     "powershellEquivalent": "Update-MgBetaAdminSharepointSetting",

diff --git a/src/pages/cipp/settings/tenants.js b/src/pages/cipp/settings/tenants.js
@@ -99,6 +99,19 @@ const Page = () => {
         actions={actions}
         offCanvas={offCanvas}
         simpleColumns={columns}
+        filters={[
+          {
+            filterName: "Included tenants",
+            //true or false filters by yes/no
+            value: [{ id: "Excluded", value: "No" }],
+            type: "column",
+          },
+          {
+            filterName: "Excluded tenants",
+            value: [{ id: "Excluded", value: "Yes" }],
+            type: "column",
+          },
+        ]}
       />
       <CippApiDialog
         title="Force Refresh Tenant"

diff --git a/src/pages/endpoint/MEM/list-appprotection-policies/index.js b/src/pages/endpoint/MEM/list-appprotection-policies/index.js
@@ -52,6 +52,7 @@ const Page = () => {
       apiData={{
         Endpoint: "deviceAppManagement/managedAppPolicies",
         $orderby: "displayName",
+        manualPagination: true,
       }}
       apiDataKey="Results"
       actions={actions}

diff --git a/src/pages/endpoint/MEM/list-compliance-policies/index.js b/src/pages/endpoint/MEM/list-compliance-policies/index.js
@@ -94,6 +94,7 @@ const Page = () => {
         $orderby: "displayName",
         $count: true,
         $expand: "assignments",
+        manualPagination: true,
       }}
       actions={actions}
       offCanvas={offCanvas}

diff --git a/src/pages/identity/administration/groups/edit.jsx b/src/pages/identity/administration/groups/edit.jsx
@@ -91,7 +91,7 @@ const EditGroup = () => {
         <CippFormPage
           formControl={formControl}
           queryKey={`ListGroups-${groupId}`}
-          title="Group"
+          title={`Group: ${groupInfo.data?.groupInfo?.displayName || ''}`}
           formPageType="Edit"
           backButtonTitle="Group Overview"
           postUrl="/api/EditGroup"

diff --git a/src/pages/identity/administration/users/index.js b/src/pages/identity/administration/users/index.js
@@ -68,7 +68,7 @@ const Page = () => {
     },
     {
       //tested
-      label: "Rerequire MFA registration",
+      label: "Re-require MFA registration",
       type: "GET",
       icon: <PhonelinkSetup />,
       url: "/api/ExecResetMFA",
@@ -322,6 +322,7 @@ const Page = () => {
       "department", // Department
       "onPremisesLastSyncDateTime", // OnPrem Last Sync
       "id", // Unique ID
+      "otherMails", // Alternate Email Addresses
     ],
     actions: actions,
   };

diff --git a/src/pages/identity/reports/risk-detections/index.js b/src/pages/identity/reports/risk-detections/index.js
@@ -68,6 +68,7 @@ const Page = () => {
         Endpoint: "identityProtection/riskDetections",
         manualPagination: true,
         $count: true,
+        $orderby: "detectedDateTime desc",
         $top: 500,
       }}
       apiDataKey="Results"