Skip to content

Commit 0b76ef7

Browse files
committed
tweaks and bugfixes
Add default [] for filters prop in tabletoptoolbar Add formatting for risky users Add mail prop to Edit Group form
1 parent b6a74b4 commit 0b76ef7

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

src/components/CippTable/CIPPTableToptoolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const CIPPTableToptoolbar = ({
4141
setColumnVisibility,
4242
title,
4343
actions,
44-
filters,
44+
filters = [],
4545
exportEnabled,
4646
refreshFunction,
4747
queryKeys,

src/pages/identity/administration/groups/edit.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const EditGroup = () => {
5555

5656
formControl.reset({
5757
tenantId: tenantFilter,
58+
mail: group.mail,
5859
allowExternal: group.allowExternal,
5960
sendCopies: group.sendCopies,
6061
groupName: group.displayName,

src/pages/identity/administration/risky-users/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Layout as DashboardLayout } from "/src/layouts/index.js";
22
import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
3+
import { Clear } from "@mui/icons-material";
34

45
const Page = () => {
56
const pageTitle = "Risky Users";
@@ -8,9 +9,12 @@ const Page = () => {
89
const actions = [
910
{
1011
label: "Dismiss Risk",
11-
color: "info",
12-
modal: true,
13-
modalUrl: `/api/ExecDismissRiskyUser?TenantFilter=Tenant&userid=!id&userDisplayName=!userDisplayName`,
12+
type: "POST",
13+
icon: <Clear />,
14+
url: "/api/ExecDismissRiskyUser",
15+
data: { userId: "id", userDisplayName: "userDisplayName" },
16+
confirmText: "Are you sure you want to dismiss the risk for this user?",
17+
multiPost: false,
1418
},
1519
];
1620

src/utils/get-cipp-formatting.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,21 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
335335
);
336336
}
337337

338+
// Handle riskLevel
339+
if (cellName === "riskLevel") {
340+
return getCippTranslation(data);
341+
}
342+
343+
// Handle riskState
344+
if (cellName === "riskState") {
345+
return getCippTranslation(data);
346+
}
347+
348+
// Handle riskDetail
349+
if (cellName === "riskDetail") {
350+
return getCippTranslation(data);
351+
}
352+
338353
// Handle boolean data
339354
if (typeof data === "boolean" || cellNameLower === "bool") {
340355
return isText ? (

0 commit comments

Comments
 (0)