Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dev from KelvinTegelaar:dev #114

Merged
merged 35 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
81f3057
Change to POST
kris6673 Feb 17, 2025
d683c91
Change to POST
kris6673 Feb 17, 2025
f9ea548
Change mailbox conversion actions from GET to POST and update API end…
kris6673 Feb 17, 2025
4843840
Change to POST
kris6673 Feb 17, 2025
a74d9b1
Change restore action type from GET to POST
kris6673 Feb 17, 2025
174b37f
Change spam filter actions from GET to POST
kris6673 Feb 17, 2025
bdbe851
Change remove mailbox rule action type from GET to POST
kris6673 Feb 17, 2025
892004c
Change Send MFA Push action type from GET to POST
kris6673 Feb 17, 2025
2789f7b
Change Enable Online Archive action type from GET to POST
kris6673 Feb 17, 2025
656809e
Change Block Sign In action type from GET to POST
kris6673 Feb 17, 2025
bebccd1
Change Reset Password action type from GET to POST
kris6673 Feb 17, 2025
3c9c4c0
Change Revoke all user sessions action type from GET to POST
kris6673 Feb 17, 2025
d836a27
Change Delete User action type from GET to POST
kris6673 Feb 17, 2025
d1aca5f
feat: TeamsGlobalMeetingPolicy AllowExternalParticipantGiveRequestCon…
OfficialEsco Feb 18, 2025
24a3166
feat: Standards addedDate property
OfficialEsco Feb 18, 2025
213e2d2
feat: InTune Template exclude
OfficialEsco Feb 19, 2025
5169104
Change Delete policy action type from GET to POST
kris6673 Feb 19, 2025
f4e81b7
GET to POST
kris6673 Feb 20, 2025
a50fc78
feat: nodejs 22 support
OfficialEsco Feb 21, 2025
59256bf
Remove useless more info and remove option to add own input to autoCo…
kris6673 Feb 21, 2025
9bf7ac1
Fix wrong property name
kris6673 Feb 22, 2025
9038ee6
Change action types from GET to POST for mailbox and group management…
kris6673 Feb 23, 2025
d10a2d1
Fix wrong endpoint used for deleting rooms and mailboxes
kris6673 Feb 23, 2025
9f58152
Change action types from GET to POST for Copy Sent Items operations
kris6673 Feb 23, 2025
4492e55
GET to POST
kris6673 Feb 23, 2025
7e89f0f
Change action types from GET to POST for antiphishing, malware, safe …
kris6673 Feb 23, 2025
230622b
Change action types from GET to POST for compliance policies and temp…
kris6673 Feb 23, 2025
df1475b
Change action types from GET to POST for various user and policy oper…
kris6673 Feb 23, 2025
9f13883
Merge pull request #3681 from Ren-Roros-Digital/node22
KelvinTegelaar Feb 24, 2025
4ffbe3f
Merge pull request #3674 from Ren-Roros-Digital/intuneExclude
KelvinTegelaar Feb 24, 2025
1cc076d
Merge pull request #3664 from Ren-Roros-Digital/AllowExternalParticip…
KelvinTegelaar Feb 24, 2025
c63c6a4
Merge pull request #3663 from Ren-Roros-Digital/DateAdded
KelvinTegelaar Feb 24, 2025
221ee8d
Merge pull request #3660 from kris6673/endpoints
JohnDuprey Feb 24, 2025
bff556e
fix version number in build steps
JohnDuprey Feb 24, 2025
33ac08f
make build process get node version
JohnDuprey Feb 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/cipp_dev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@ jobs:
uses: actions/checkout@v4.2.2

# Set up Node.js
- name: Get Node version
id: get_node_version
run: |
node_raw_version=$(node -p "require('./package.json').engines.node")
node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g')
echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT

- name: Set up Node.js
uses: actions/setup-node@v4.2.0
with:
node-version: '20.18.1'
node-version: ${{ steps.get_node_version.outputs.node_version }}

# Install dependencies
- name: Install Dependencies
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/cipp_frontend_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@ jobs:
uses: actions/checkout@v4.2.2

# Set up Node.js
- name: Get Node version
id: get_node_version
run: |
node_raw_version=$(node -p "require('./package.json').engines.node")
node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g')
echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT

- name: Set up Node.js
uses: actions/setup-node@v4.2.0
with:
node-version: '20.18.1'
node-version: ${{ steps.get_node_version.outputs.node_version }}

# Install dependencies
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "AGPL-3.0",
"engines": {
"node": "^20.18.1"
"node": "^22.13.0"
},
"repository": {
"type": "git",
Expand Down
30 changes: 15 additions & 15 deletions src/components/CippComponents/CippUserActions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const CippUserActions = () => {
//tested

label: "Create Temporary Access Password",
type: "GET",
type: "POST",
icon: <Password />,
url: "/api/ExecCreateTAP",
data: { ID: "userPrincipalName" },
Expand All @@ -63,7 +63,7 @@ export const CippUserActions = () => {
{
//tested
label: "Re-require MFA registration",
type: "GET",
type: "POST",
icon: <PhonelinkSetup />,
url: "/api/ExecResetMFA",
data: { ID: "userPrincipalName" },
Expand Down Expand Up @@ -107,26 +107,26 @@ export const CippUserActions = () => {
{
//tested
label: "Convert to Shared Mailbox",
type: "GET",
type: "POST",
icon: <Email />,
url: "/api/ExecConvertToSharedMailbox",
data: { ID: "userPrincipalName" },
url: "/api/ExecConvertMailbox",
data: { ID: "userPrincipalName", MailboxType: "!Shared" },
confirmText: "Are you sure you want to convert this user to a shared mailbox?",
multiPost: false,
},
{
label: "Convert to User Mailbox",
type: "GET",
type: "POST",
icon: <Email />,
url: "/api/ExecConvertToSharedMailbox",
data: { ID: "userPrincipalName", ConvertToUser: true },
url: "/api/ExecConvertMailbox",
data: { ID: "userPrincipalName", MailboxType: "!Regular" },
confirmText: "Are you sure you want to convert this user to a user mailbox?",
multiPost: false,
},
{
//tested
label: "Enable Online Archive",
type: "GET",
type: "POST",
icon: <Archive />,
url: "/api/ExecEnableArchive",
data: { ID: "userPrincipalName" },
Expand Down Expand Up @@ -237,7 +237,7 @@ export const CippUserActions = () => {
},
{
label: "Block Sign In",
type: "GET",
type: "POST",
icon: <Block />,
url: "/api/ExecDisableUser",
data: { ID: "id" },
Expand All @@ -247,7 +247,7 @@ export const CippUserActions = () => {
},
{
label: "Unblock Sign In",
type: "GET",
type: "POST",
icon: <LockOpen />,
url: "/api/ExecDisableUser",
data: { ID: "id", Enable: true },
Expand All @@ -257,7 +257,7 @@ export const CippUserActions = () => {
},
{
label: "Reset Password (Must Change)",
type: "GET",
type: "POST",
icon: <LockReset />,
url: "/api/ExecResetPass",
data: {
Expand All @@ -271,7 +271,7 @@ export const CippUserActions = () => {
},
{
label: "Reset Password",
type: "GET",
type: "POST",
icon: <LockReset />,
url: "/api/ExecResetPass",
data: {
Expand All @@ -296,7 +296,7 @@ export const CippUserActions = () => {
},
{
label: "Revoke all user sessions",
type: "GET",
type: "POST",
icon: <PersonOff />,
url: "/api/ExecRevokeSessions",
data: { ID: "id", Username: "userPrincipalName" },
Expand All @@ -305,7 +305,7 @@ export const CippUserActions = () => {
},
{
label: "Delete User",
type: "GET",
type: "POST",
icon: <TrashIcon />,
url: "/api/RemoveUser",
data: { ID: "id" },
Expand Down
28 changes: 28 additions & 0 deletions src/components/CippStandards/CippStandardDialog.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { differenceInDays } from 'date-fns';
import {
Dialog,
DialogActions,
Expand Down Expand Up @@ -47,6 +48,12 @@ const CippStandardDialog = ({
[]
);

const isNewStandard = (dateAdded) => {
const currentDate = new Date();
const addedDate = new Date(dateAdded);
return differenceInDays(currentDate, addedDate) <= 30;
};

return (
<Dialog
open={dialogOpen}
Expand Down Expand Up @@ -86,8 +93,17 @@ const CippStandardDialog = ({
display: "flex",
flexDirection: "column",
height: "100%",
position: "relative",
}}
>
{isNewStandard(standard.addedDate) && (
<Chip
label="New"
size="small"
color="success"
sx={{ position: "absolute"}}
/>
)}
<CardContent sx={{ flexGrow: 1 }}>
<Typography variant="h6" gutterBottom>
{standard.label}
Expand Down Expand Up @@ -151,6 +167,18 @@ const CippStandardDialog = ({
</Typography>
</>
)}
{standard.addedDate?.length > 0 && (
<>
<Typography variant="subtitle2" sx={{ mt: 2 }}>
Date Added:
</Typography>
<Box sx={{ display: "flex", alignItems: "center" }}>
<Typography variant="body2" color="textSecondary">
{standard.addedDate}
</Typography>
</Box>
</>
)}
</CardContent>

<CardContent>
Expand Down
Loading