Merge pull request #148 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippComponents/CippFormCondition.jsx

@@ -12,7 +12,6 @@ export const CippFormCondition = (props) => {
     formControl,
     disabled = false,
   } = props;
-
   if (
     field === undefined ||
     compareValue === undefined ||

src/components/CippTable/CIPPTableToptoolbar.js

@@ -429,6 +429,14 @@ export const CIPPTableToptoolbar = ({
                 <DeveloperMode />
               </IconButton>
             </Tooltip>
+            {
+              //add a little icon with how many rows are selected
+              (table.getIsAllRowsSelected() || table.getIsSomeRowsSelected()) && (
+                <Typography variant="body2" sx={{ alignSelf: "center" }}>
+                  {table.getSelectedRowModel().rows.length} rows selected
+                </Typography>
+              )
+            }
             <CippOffCanvas
               size="xl"
               title="API Response"

src/pages/tenant/administration/alert-configuration/alert.jsx

@@ -12,6 +12,7 @@ import {
   SvgIcon,
   IconButton,
   Skeleton,
+  Divider,
 } from "@mui/material";
 import { ArrowLeftIcon } from "@mui/x-date-pickers";
 import { useRouter } from "next/router";
@@ -218,6 +219,7 @@ const AlertWizard = () => {
     const postObject = {
       RowKey: router.query.clone ? undefined : router.query.id ? router.query.id : undefined,
       tenantFilter: values.tenantFilter?.value,
+      excludedTenants: values.excludedTenants,
       Name: `${values.tenantFilter.value}: ${values.command.label}`,
       Command: { value: `Get-CIPPAlert${values.command.value.name}` },
       Parameters: getInputParams(),
@@ -297,14 +299,32 @@ const AlertWizard = () => {
                     <Grid container spacing={4} justifyContent="space-around">
                       <Grid item xs={12} md={12}>
                         <CippButtonCard title="Tenant Selector" sx={{ mb: 3 }}>
-                          <Typography>
-                            Select the tenants you want to include in this Alert.
-                          </Typography>
-                          <CippFormTenantSelector
-                            multiple={true}
-                            formControl={formControl}
-                            allTenants={true}
-                          />
+                          <Grid container spacing={3}>
+                            <Grid item xs={12}>
+                              <CippFormTenantSelector
+                                multiple={true}
+                                formControl={formControl}
+                                allTenants={true}
+                                label="Included Tenants for alert"
+                              />
+                            </Grid>
+                            <CippFormCondition
+                              field="tenantFilter"
+                              formControl={formControl}
+                              compareType="valueContains"
+                              compareValue="AllTenants"
+                            >
+                              <Grid item xs={12}>
+                                <CippFormTenantSelector
+                                  multiple={true}
+                                  label="Excluded Tenants for alert"
+                                  formControl={formControl}
+                                  allTenants={false}
+                                  name="excludedTenants"
+                                />
+                              </Grid>
+                            </CippFormCondition>
+                          </Grid>
                         </CippButtonCard>
                       </Grid>
 
@@ -469,14 +489,32 @@ const AlertWizard = () => {
                     <Grid container spacing={3}>
                       <Grid item xs={12} md={12}>
                         <CippButtonCard title="Tenant Selector">
-                          <Typography>
-                            Select the tenants you want to include in this Alert.
-                          </Typography>
-                          <CippFormTenantSelector
-                            allTenants={true}
-                            multiple={false}
-                            formControl={formControl}
-                          />
+                          <Grid container spacing={3}>
+                            <Grid item xs={12}>
+                              <CippFormTenantSelector
+                                allTenants={true}
+                                multiple={false}
+                                formControl={formControl}
+                                label="Included Tenants for alert"
+                              />
+                            </Grid>
+                            <CippFormCondition
+                              field="tenantFilter"
+                              formControl={formControl}
+                              compareType="is"
+                              compareValue="AllTenants"
+                            >
+                              <Grid item xs={12}>
+                                <CippFormTenantSelector
+                                  multiple={true}
+                                  label="Excluded Tenants for alert"
+                                  formControl={formControl}
+                                  allTenants={false}
+                                  name="excludedTenants"
+                                />
+                              </Grid>
+                            </CippFormCondition>
+                          </Grid>
                         </CippButtonCard>
                       </Grid>
 

src/pages/tenant/administration/alert-configuration/index.js

@@ -52,7 +52,14 @@ const Page = () => {
         </Button>
       }
       actions={actions}
-      simpleColumns={["Tenants", "EventType", "Conditions", "RepeatsEvery", "Actions"]}
+      simpleColumns={[
+        "Tenants",
+        "EventType",
+        "Conditions",
+        "RepeatsEvery",
+        "Actions",
+        "excludedTenants",
+      ]}
       queryKey="ListAlertsQueue"
     />
   );