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 #92

Merged
merged 279 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
279 commits
Select commit Hold shift + click to select a range
d0f731b
Merge pull request #2400 from JohnDuprey/dev
JohnDuprey May 2, 2024
3477cb2
Added checkbox to QuarantineList
OfficialEsco May 2, 2024
fff9cf1
Merge pull request #2379 from Ren-Roros-Digital/PlacesPR
KelvinTegelaar May 3, 2024
55aab74
comma correction
KelvinTegelaar May 3, 2024
40e6860
Merge pull request #2397 from kris6673/dev
KelvinTegelaar May 3, 2024
9823b09
Update GDAPRoles.json
peter-fisher May 3, 2024
ce8861b
Update GDAPRoles.json
peter-fisher May 3, 2024
107df24
Merge pull request #2408 from SwiftPuppy-Technologies/dev
KelvinTegelaar May 3, 2024
8b7a1ab
prettified SAM wizard
KelvinTegelaar May 4, 2024
88d5695
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 4, 2024
3109e1f
added clear callout
KelvinTegelaar May 4, 2024
c7b5064
updating wizard
KelvinTegelaar May 4, 2024
507951b
fixes incorrect showing of completed steps
KelvinTegelaar May 4, 2024
c9ab7cb
prettification
KelvinTegelaar May 4, 2024
b53f012
Merge pull request #33 from KelvinTegelaar/dev
kris6673 May 5, 2024
b62c98e
improvements to experience.
KelvinTegelaar May 6, 2024
94313cb
improvements to setup experience.
KelvinTegelaar May 6, 2024
f940bfd
conditional loading
KelvinTegelaar May 6, 2024
833febd
prevent rerenders
KelvinTegelaar May 6, 2024
82298e4
redo check if step is 5 again
KelvinTegelaar May 6, 2024
1f684c9
prettification
KelvinTegelaar May 6, 2024
591bb9b
prevent reload
KelvinTegelaar May 6, 2024
c72a112
length for errors
KelvinTegelaar May 6, 2024
a387743
nullsafe
KelvinTegelaar May 6, 2024
7a5d157
fixes empty callout
KelvinTegelaar May 6, 2024
09c1e74
fixes
KelvinTegelaar May 6, 2024
1ae8269
interface changes
KelvinTegelaar May 6, 2024
cbae98b
Merge pull request #34 from KelvinTegelaar/dev
kris6673 May 6, 2024
5dbd155
new alert wizard prep
KelvinTegelaar May 7, 2024
12f9cd4
Update TransportRules.jsx
PremierOneData May 7, 2024
16d8a9b
Merge pull request #2416 from PremierOneData/patch-1
JohnDuprey May 7, 2024
8dd4b09
create auditlog schema
KelvinTegelaar May 7, 2024
c44694c
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 7, 2024
55205d2
Replace maintenance page with Durable Functions
JohnDuprey May 7, 2024
0cafcaa
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 7, 2024
46e5d95
Merge pull request #2418 from JohnDuprey/dev
JohnDuprey May 7, 2024
36762be
base setup for new alerting
KelvinTegelaar May 7, 2024
27a7ff7
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 7, 2024
c0c3fa0
button added
KelvinTegelaar May 7, 2024
2debd7b
Durable maintenance tweaks
JohnDuprey May 8, 2024
60766d6
Add spin, disable button when fetching
JohnDuprey May 8, 2024
c0067e0
Add purge orchestrator option
JohnDuprey May 8, 2024
b041c3b
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 8, 2024
49fcdcd
Merge pull request #2419 from JohnDuprey/dev
JohnDuprey May 8, 2024
0ef8910
Update AlertWizard.jsx
JohnDuprey May 8, 2024
dfdc835
Merge pull request #2420 from JohnDuprey/dev
JohnDuprey May 8, 2024
69938a1
Update CippTable.jsx
JohnDuprey May 8, 2024
c374ce7
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 8, 2024
1bfe923
updates to wizard
KelvinTegelaar May 8, 2024
2ef9e4a
Added Add New Blocklist Item
OfficialEsco May 3, 2024
0b1a58e
Rewrite ListTenantAllowBlockList
OfficialEsco May 3, 2024
9be4242
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 8, 2024
d82d169
Comment not ready code
OfficialEsco May 8, 2024
a5855bd
Tweaks to Durable Maintenance
JohnDuprey May 8, 2024
1e31a90
Merge pull request #2425 from JohnDuprey/dev
JohnDuprey May 8, 2024
5cc5060
fix schema
KelvinTegelaar May 8, 2024
c95d6fd
Fix schema 2
KelvinTegelaar May 8, 2024
ba8b02d
Added timezoneList
OfficialEsco May 8, 2024
1929231
Timezone Selection
OfficialEsco May 8, 2024
6828ae8
Merge pull request #2424 from Ren-Roros-Digital/timezoneList
KelvinTegelaar May 8, 2024
d1ae131
Merge pull request #2423 from Ren-Roros-Digital/blocklist
KelvinTegelaar May 8, 2024
bc20fc0
JIT Admin frontend
JohnDuprey May 9, 2024
41bc439
Merge branch 'jit-admin' into jit-admin
JohnDuprey May 9, 2024
2c4f0aa
Merge pull request #2427 from JohnDuprey/jit-admin
JohnDuprey May 9, 2024
eb70d9c
classic alerts
KelvinTegelaar May 9, 2024
7845ec5
fix stuff
KelvinTegelaar May 9, 2024
5891171
fix stuff
KelvinTegelaar May 9, 2024
cb57570
Merge pull request #35 from KelvinTegelaar/dev
kris6673 May 9, 2024
974ae6f
fix form click issues
JohnDuprey May 9, 2024
c5ecb6f
Merge pull request #172 from KelvinTegelaar/dev
JohnDuprey May 9, 2024
1fc0b8b
Merge pull request #2428 from JohnDuprey/dev
JohnDuprey May 9, 2024
41e17d3
Merge branch 'jit-admin' into dev
JohnDuprey May 9, 2024
6a41fba
Merge pull request #173 from JohnDuprey/dev
JohnDuprey May 9, 2024
f873014
Update DeployJITAdmin.jsx
JohnDuprey May 9, 2024
dee71f5
Update DeployJITAdmin.jsx
JohnDuprey May 9, 2024
a8b678c
fixes securescore bug
KelvinTegelaar May 10, 2024
8b59c6d
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 10, 2024
4cb9fef
added reload after save
KelvinTegelaar May 10, 2024
d214ad3
moved boxes over card.
KelvinTegelaar May 10, 2024
720fe23
Merge pull request #36 from KelvinTegelaar/dev
kris6673 May 10, 2024
adf28af
fixed error with lookup
KelvinTegelaar May 10, 2024
492535d
prettification
KelvinTegelaar May 10, 2024
5a135af
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 10, 2024
7a5a544
Update edit standards page
JohnDuprey May 10, 2024
4fc3215
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 10, 2024
526b262
Revert "Merge branch 'jit-admin' into dev"
JohnDuprey May 10, 2024
cb1561f
Merge branch 'dev' of https://github.com/johnduprey/CIPP into dev
JohnDuprey May 10, 2024
e3b9262
Merge pull request #2433 from JohnDuprey/dev
JohnDuprey May 10, 2024
3d57a56
Standards - Fix all tenant settings
JohnDuprey May 10, 2024
035a086
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 10, 2024
c56b4a2
Merge pull request #2434 from JohnDuprey/dev
JohnDuprey May 10, 2024
50f2645
Update ListAppliedStandards.jsx
JohnDuprey May 10, 2024
fc03791
Update DefaultLayout.jsx
JohnDuprey May 10, 2024
dc23f1f
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 10, 2024
ca9e316
Merge pull request #2435 from JohnDuprey/dev
JohnDuprey May 10, 2024
fb402d1
fix standards layout
JohnDuprey May 10, 2024
7f1068b
auto select recommended time.
KelvinTegelaar May 11, 2024
42e9b32
prepping templates
KelvinTegelaar May 11, 2024
61a0c3b
building templates
KelvinTegelaar May 11, 2024
05aab00
frontend updates
KelvinTegelaar May 11, 2024
6558f65
changes
KelvinTegelaar May 11, 2024
b5c46b8
Fix input bug.
KelvinTegelaar May 12, 2024
d75a237
added multi select
KelvinTegelaar May 12, 2024
8bd0954
Add action button to remove GA from GDAP relations
May 12, 2024
6de5f4c
updated schemas
KelvinTegelaar May 12, 2024
3f171f0
add option for actions
KelvinTegelaar May 12, 2024
b19c7d2
improved wizard interface
KelvinTegelaar May 12, 2024
143b433
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 13, 2024
14d21dc
added validation to required fields.
KelvinTegelaar May 13, 2024
c09dc4f
Change nav items(Down with classic alerts!)
KelvinTegelaar May 13, 2024
d346a20
Fix recent job load error for single task
JohnDuprey May 13, 2024
1dca41d
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 13, 2024
9c67618
Merge pull request #2438 from JohnDuprey/dev
JohnDuprey May 13, 2024
5d81b46
added repeats every
KelvinTegelaar May 13, 2024
56d17ff
Added branding standard
OfficialEsco May 13, 2024
d265bba
Improve Extension Mappings
JohnDuprey May 13, 2024
b0ed799
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 13, 2024
f6d09ef
Merge pull request #2439 from JohnDuprey/dev
JohnDuprey May 13, 2024
ca8fc7f
Update MFAReport.jsx
PremierOneData May 13, 2024
39b19e1
Merge pull request #2441 from PremierOneData/patch-2
KelvinTegelaar May 13, 2024
8537576
Merge pull request #2440 from Ren-Roros-Digital/branding
KelvinTegelaar May 13, 2024
4364993
Merge pull request #2436 from rvdwegen/dev
KelvinTegelaar May 13, 2024
268abe5
Extension Accordions
JohnDuprey May 13, 2024
ad2a04f
Merge pull request #2403 from Ren-Roros-Digital/QuarantineCheckbox
KelvinTegelaar May 13, 2024
5817ce6
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 13, 2024
2a024fd
Merge pull request #2442 from JohnDuprey/dev
JohnDuprey May 13, 2024
8f8b376
Update ConnectorList.jsx
PremierOneData May 13, 2024
1ef999f
fix linting issue
KelvinTegelaar May 13, 2024
50aa7e1
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 13, 2024
ae6c03d
Merge pull request #2443 from PremierOneData/patch-3
JohnDuprey May 14, 2024
ef95912
Add additional template types
JohnDuprey May 14, 2024
1fc6c2e
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 14, 2024
cd5b956
Merge pull request #2446 from JohnDuprey/dev
JohnDuprey May 14, 2024
5029187
fix linting issue
JohnDuprey May 14, 2024
e2bf01e
On prem sync warnings
JohnDuprey May 14, 2024
00f64ba
Merge pull request #37 from KelvinTegelaar/dev
kris6673 May 14, 2024
7313277
updated audit log template
KelvinTegelaar May 14, 2024
8c68bea
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 14, 2024
f0e0bfe
Add filter for non-Microsoft service principals in ListEnterpriseApps…
kris6673 May 14, 2024
31403fd
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 14, 2024
7f546ca
Tenant Onboarding v2
JohnDuprey May 14, 2024
a55fc62
Merge pull request #2449 from JohnDuprey/dev
JohnDuprey May 14, 2024
c8bcc83
Onboarding Standards Exclusion
JohnDuprey May 15, 2024
cc8daf0
Merge pull request #2452 from JohnDuprey/dev
JohnDuprey May 15, 2024
d230813
Add standard exclusion to partner webhook
JohnDuprey May 15, 2024
7d62cd1
Merge pull request #2453 from JohnDuprey/dev
JohnDuprey May 15, 2024
604582f
add member to role update
KelvinTegelaar May 15, 2024
a9effcd
strong authentication
KelvinTegelaar May 15, 2024
fcb2b70
Dashboard - Clickable user chart
JohnDuprey May 15, 2024
5e4d872
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 15, 2024
0460f6f
Merge pull request #2454 from JohnDuprey/dev
JohnDuprey May 15, 2024
7a7a8ca
version up
KelvinTegelaar May 15, 2024
1fa566f
Merge pull request #2448 from kris6673/dev
KelvinTegelaar May 15, 2024
0c371e4
Merge pull request #38 from KelvinTegelaar/dev
kris6673 May 17, 2024
eef83c8
Prevent mapping with API errors
JohnDuprey May 17, 2024
b217bcf
Update Activity Based Timeout standard to have options
kris6673 May 17, 2024
895ad36
Roles View Update
OfficialEsco May 22, 2024
1b4a459
Merge pull request #2463 from kris6673/dev
KelvinTegelaar May 26, 2024
210829d
Merge pull request #2472 from Ren-Roros-Digital/roleview
KelvinTegelaar May 26, 2024
7a36687
added top 300
KelvinTegelaar May 26, 2024
42f81ab
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 26, 2024
cfd802e
fixes offboarding wizard speed
KelvinTegelaar May 26, 2024
202962f
removed data from loop
KelvinTegelaar May 26, 2024
fe06f78
added bulk options for policies
KelvinTegelaar May 26, 2024
25f3801
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 26, 2024
a5505d3
Add shorten meetings standard
kris6673 May 26, 2024
c6265ac
Merge pull request #2480 from kris6673/shorten-meetings
KelvinTegelaar May 27, 2024
5059a03
Graph Explorer Scheduler
JohnDuprey May 27, 2024
b26aea1
improvements to autopilot.
KelvinTegelaar May 28, 2024
65c7a36
pretification
KelvinTegelaar May 28, 2024
84e24b1
Update Users.jsx
PremierOneData May 28, 2024
1da3471
Merge pull request #2484 from PremierOneData/patch-4
KelvinTegelaar May 28, 2024
6fd3c25
Custom Roles
JohnDuprey May 29, 2024
dafe571
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 29, 2024
551ae1d
Custom Role Info
JohnDuprey May 29, 2024
17dcf39
Update SettingsCustomRoles.jsx
JohnDuprey May 29, 2024
ed01c11
Merge pull request #2490 from JohnDuprey/dev
JohnDuprey May 29, 2024
8fc74f7
Merge pull request #40 from KelvinTegelaar/dev
kris6673 May 29, 2024
6ed7aa3
Fix scripted alert react error
JohnDuprey May 29, 2024
2b7edbd
Add beta notice
JohnDuprey May 29, 2024
9aed574
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey May 29, 2024
2e67192
Fix meta.error on RFFSelectSearch
JohnDuprey May 29, 2024
215de12
Merge pull request #2492 from JohnDuprey/dev
JohnDuprey May 29, 2024
25688a6
remove accordian for superadmin
KelvinTegelaar May 29, 2024
0c07f2c
Update ListAppliedStandards.jsx
JohnDuprey May 30, 2024
f288e02
Merge pull request #2493 from JohnDuprey/dev
JohnDuprey May 30, 2024
875d47b
Custom role callouts
JohnDuprey May 30, 2024
7a12be5
Update SettingsCustomRoles.jsx
JohnDuprey May 30, 2024
9f62c0a
new extension config page
KelvinTegelaar May 30, 2024
0793819
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 30, 2024
4488741
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 30, 2024
7d90d70
Merge pull request #2494 from KelvinTegelaar/jit-admin
JohnDuprey May 30, 2024
6c9c789
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 30, 2024
5eeccda
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 30, 2024
b8ea2ae
Merge branch 'dev' of https://github.com/johnduprey/CIPP into dev
JohnDuprey May 30, 2024
40d54d6
remove old extensions
KelvinTegelaar May 30, 2024
15dcc67
JIT admin route/nav
JohnDuprey May 30, 2024
c74cd41
Remove extension tabs from settings
JohnDuprey May 30, 2024
04a4111
Merge branch 'dev' into dev
JohnDuprey May 30, 2024
6499786
Merge pull request #2495 from JohnDuprey/dev
JohnDuprey May 30, 2024
a6c1f61
fix nav/route
JohnDuprey May 30, 2024
9ac5e9e
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 30, 2024
7be941d
fixes bpa if never run
KelvinTegelaar May 30, 2024
5aff8e1
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 30, 2024
51d69c1
Merge pull request #41 from KelvinTegelaar/dev
kris6673 May 31, 2024
4c03185
Add CloudMessageRecall standard
kris6673 May 31, 2024
472d523
fixes errormessages not showing up
KelvinTegelaar May 31, 2024
01dc70a
update settings
KelvinTegelaar May 31, 2024
8da455d
Add TeamsMeetingsByDefault standard
kris6673 May 31, 2024
180f176
permissions fix
KelvinTegelaar May 31, 2024
900c007
fixed
KelvinTegelaar May 31, 2024
e7738cf
Add bookings standard
kris6673 May 31, 2024
8bb45a4
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey May 31, 2024
898fcd2
Merge pull request #2503 from kris6673/cloudrecall
KelvinTegelaar May 31, 2024
1d326a7
Merge pull request #2502 from kris6673/teamsmeetings
KelvinTegelaar May 31, 2024
96b32e9
Merge pull request #2501 from kris6673/bookings
KelvinTegelaar May 31, 2024
e685d04
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jun 2, 2024
ffdc744
Fix JIT route
JohnDuprey Jun 2, 2024
6ea3f5e
Merge pull request #43 from KelvinTegelaar/dev
kris6673 Jun 3, 2024
5ede288
JIT Admin
JohnDuprey Jun 3, 2024
0604ba7
Merge pull request #2507 from JohnDuprey/dev
JohnDuprey Jun 3, 2024
b542489
Update JIT actions
JohnDuprey Jun 3, 2024
5423ed5
Merge pull request #2508 from JohnDuprey/dev
JohnDuprey Jun 3, 2024
c889ed1
Update DeployJITAdmin.jsx
JohnDuprey Jun 4, 2024
70dddff
Merge pull request #2511 from JohnDuprey/dev
JohnDuprey Jun 4, 2024
a540aa5
Added more Anti-Phishing actions
OfficialEsco Jun 5, 2024
5d8dee5
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Jun 5, 2024
651de59
Tenant block list
JohnDuprey Jun 5, 2024
9ee4e4b
Merge pull request #2514 from JohnDuprey/dev
JohnDuprey Jun 5, 2024
af8202c
Add sort
JohnDuprey Jun 5, 2024
8b35938
Add Pronouns standard
kris6673 Jun 5, 2024
8a979de
Update SettingsCustomRoles.jsx
JohnDuprey Jun 5, 2024
622e1dd
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jun 5, 2024
4f9fdf1
Merge pull request #2516 from JohnDuprey/dev
JohnDuprey Jun 5, 2024
e742061
Add input list for string[] values
JohnDuprey Jun 5, 2024
665aafe
Update SettingsCustomRoles.jsx
JohnDuprey Jun 5, 2024
8238f95
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Jun 5, 2024
49218f0
Merge pull request #2518 from JohnDuprey/dev
JohnDuprey Jun 5, 2024
c569c82
Merge pull request #2513 from Ren-Roros-Digital/antiphishpolicy
KelvinTegelaar Jun 5, 2024
5bdb4c1
Merge pull request #2515 from kris6673/pronouns
KelvinTegelaar Jun 5, 2024
95ee284
Extension tweaks
JohnDuprey Jun 5, 2024
aeeb2eb
Merge pull request #182 from KelvinTegelaar/dev
JohnDuprey Jun 5, 2024
5d3c33e
Merge pull request #2522 from JohnDuprey/dev
JohnDuprey Jun 5, 2024
3624930
Update Extensions.json
JohnDuprey Jun 5, 2024
722274f
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Jun 5, 2024
bc2d74f
Merge pull request #2523 from JohnDuprey/dev
JohnDuprey Jun 5, 2024
8e0710d
fixes bug with rffcomponents and input
KelvinTegelaar Jun 6, 2024
b544f43
improved fuzzy search
KelvinTegelaar Jun 6, 2024
de39748
remove console.log
KelvinTegelaar Jun 6, 2024
68f666c
add language option to autopilot profile
KelvinTegelaar Jun 6, 2024
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
13 changes: 11 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "5.6.0",
"version": "5.7.1",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down Expand Up @@ -64,6 +64,7 @@
"react": "^18.2.0",
"react-app-polyfill": "^2.0.0",
"react-bootstrap": "^1.6.5",
"react-circular-progressbar": "^2.1.0",
"react-copy-to-clipboard": "^5.1.0",
"react-data-table-component": "^7.4.5",
"react-datepicker": "^4.10.0",
Expand Down
16 changes: 16 additions & 0 deletions public/GDAPRoles.json
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,22 @@
"Name": "Virtual Visits Administrator",
"ObjectId": "e300d9e7-4a2b-4295-9eff-f1c78b36cc98"
},
{
"ExtensionData": {},
"Description": "Manage and configure all aspects of Microsoft Viva Goals.",
"IsEnabled": true,
"IsSystem": true,
"Name": "Viva Goals Administrator",
"ObjectId": "92b086b3-e367-4ef2-b869-1de128fb986e"
},
{
"ExtensionData": {},
"Description": "Can manage all settings for Microsoft Viva Pulse app.",
"IsEnabled": true,
"IsSystem": true,
"Name": "Viva Pulse Administrator",
"ObjectId": "87761b17-1ed2-4af3-9acd-92a150038160"
},
{
"ExtensionData": {},
"Description": "Can provision and manage all aspects of Cloud PCs.",
Expand Down
2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.6.0
5.7.1
108 changes: 53 additions & 55 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { Suspense } from 'react'
import { BrowserRouter, Route, Routes, Navigate } from 'react-router-dom'
import { BrowserRouter, Route, Routes, Navigate, useLocation } from 'react-router-dom'
import { PrivateRoute, FullScreenLoading, ErrorBoundary } from 'src/components/utilities'
import 'src/scss/style.scss'
import { Helmet } from 'react-helmet-async'
import { Helmet, HelmetProvider } from 'react-helmet-async'
import Skeleton from 'react-loading-skeleton'
import TimeAgo from 'javascript-time-ago'
import en from 'javascript-time-ago/locale/en.json'
TimeAgo.addDefaultLocale(en)
import { library } from '@fortawesome/fontawesome-svg-core'
import { fas } from '@fortawesome/free-solid-svg-icons'
import routes from 'src/routes'
import { useAuthCheck } from './components/utilities/CippauthCheck'
import importsMap from './importsMap'

library.add(fas)
Expand All @@ -32,59 +31,58 @@ const Logout = React.lazy(() => import('./views/pages/login/Logout'))
const App = () => {
return (
<BrowserRouter>
<Suspense fallback={<FullScreenLoading />}>
<Helmet>
<title>CIPP</title>
</Helmet>
<Routes>
<Route exact path="/LogoutRedirect" name="LogoutRedirect" element={<PageLogOut />} />
<Route exact path="/401" name="Page 401" element={<Page401 />} />
<Route exact path="/403" name="Page 403" element={<Page403 />} />
<Route exact path="/404" name="Page 404" element={<Page404 />} />
<Route exact path="/500" name="Page 500" element={<Page500 />} />
<Route exact path="/login" name="Login" element={<Login />} />
<Route exact path="/logout" name="Logout" element={<Logout />} />
<Route
path="/"
element={
<PrivateRoute>
<DefaultLayout />
</PrivateRoute>
}
>
{routes.map((route, idx) => {
const allowedRoles = route.allowedRoles
const Routecomponent = dynamicImport(route.path)
//console.log('route', route)
//console.log('Routecomponent', Routecomponent)
return (
route.component && (
<Route
key={`route-${idx}`}
path={route.path}
exact={route.exact}
name={route.name}
element={
<PrivateRoute allowedRoles={allowedRoles}>
<Suspense fallback={<Skeleton />}>
<Helmet>
<title>CIPP - {route.name}</title>
</Helmet>
<ErrorBoundary key={route.name}>
<Routecomponent />
</ErrorBoundary>
</Suspense>
</PrivateRoute>
}
/>
<HelmetProvider>
<Suspense fallback={<FullScreenLoading />}>
<Helmet>
<title>CIPP</title>
</Helmet>
<Routes>
<Route exact path="/LogoutRedirect" name="LogoutRedirect" element={<PageLogOut />} />
<Route exact path="/401" name="Page 401" element={<Page401 />} />
<Route exact path="/403" name="Page 403" element={<Page403 />} />
<Route exact path="/404" name="Page 404" element={<Page404 />} />
<Route exact path="/500" name="Page 500" element={<Page500 />} />
<Route exact path="/login" name="Login" element={<Login />} />
<Route exact path="/logout" name="Logout" element={<Logout />} />
<Route
path="/"
element={
<PrivateRoute>
<DefaultLayout />
</PrivateRoute>
}
>
{routes.map((route, idx) => {
const allowedRoles = route.allowedRoles
const Routecomponent = dynamicImport(route.path)
//console.log('route', route)
//console.log('Routecomponent', Routecomponent)
return (
route.component && (
<Route
key={`route-${idx}`}
path={route.path}
exact={route.exact}
name={route.name}
element={
<PrivateRoute allowedRoles={allowedRoles}>
<Suspense fallback={<Skeleton />}>
<ErrorBoundary key={route.name}>
<Routecomponent />
</ErrorBoundary>
</Suspense>
</PrivateRoute>
}
/>
)
)
)
})}
<Route path="/" element={<Navigate to="/home" replace={true} />} />
</Route>
<Route path="*" name="Page 404" element={<Page404 />} />
</Routes>
</Suspense>
})}
<Route path="/" element={<Navigate to="/home" replace={true} />} />
</Route>
<Route path="*" name="Page 404" element={<Page404 />} />
</Routes>
</Suspense>
</HelmetProvider>
</BrowserRouter>
)
}
Expand Down
38 changes: 31 additions & 7 deletions src/_nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ const _nav = [
name: 'Roles',
to: '/identity/administration/roles',
},
{
component: CNavItem,
name: 'JIT Admin',
to: '/identity/administration/jit-admin',
},
{
component: CNavItem,
name: 'Offboarding Wizard',
Expand Down Expand Up @@ -129,14 +134,9 @@ const _nav = [
},
{
component: CNavItem,
name: 'Alerts (Classic)',
name: 'Alerts',
to: '/tenant/administration/alertsqueue',
},
{
component: CNavItem,
name: 'Alert Rules',
to: '/tenant/administration/AlertRules',
},
{
component: CNavItem,
name: 'Enterprise Applications',
Expand All @@ -155,7 +155,7 @@ const _nav = [
{
component: CNavItem,
name: 'Tenant Onboarding',
to: '/tenant/administration/tenant-onboarding-wizard',
to: '/tenant/administration/tenant-onboarding',
},
{
component: CNavItem,
Expand Down Expand Up @@ -707,6 +707,25 @@ const _nav = [
},
],
},
{
component: CNavGroup,
name: ' Room Management',
section: 'Email & Exchange',
to: '/rooms/management',
icon: <FontAwesomeIcon icon={faToolbox} className="nav-icon" />,
items: [
{
component: CNavItem,
name: 'Rooms',
to: '/rooms/management/list-rooms',
},
{
component: CNavItem,
name: 'Room Lists',
to: '/rooms/management/room-lists',
},
],
},
{
component: CNavGroup,
name: 'Reports',
Expand Down Expand Up @@ -757,6 +776,11 @@ const _nav = [
name: 'Application Settings',
to: '/cipp/settings',
},
{
component: CNavItem,
name: 'Extensions Settings',
to: '/cipp/extensions',
},
{
component: CNavItem,
name: 'User Settings',
Expand Down
49 changes: 49 additions & 0 deletions src/components/contentcards/CippAccordionItem.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from 'react'
import {
CAccordionBody,
CAccordionHeader,
CAccordionItem,
CCard,
CCardBody,
CCardFooter,
CCardHeader,
CCardTitle,
} from '@coreui/react'
import Skeleton from 'react-loading-skeleton'
import PropTypes from 'prop-types'

export default function CippAccordionItem({
title,
titleType = 'normal',
CardButton,
children,
isFetching,
}) {
return (
<CAccordionItem>
<CAccordionHeader>{title}</CAccordionHeader>
<CAccordionBody>
<CCard>
<CCardHeader>
<CCardTitle>
{titleType === 'big' ? <h3 className="underline mb-3">{title}</h3> : title}
</CCardTitle>
</CCardHeader>
<CCardBody className="my-3">
{isFetching && <Skeleton />}
{children}
</CCardBody>
<CCardFooter>{CardButton}</CCardFooter>
</CCard>
</CAccordionBody>
</CAccordionItem>
)
}

CippAccordionItem.propTypes = {
title: PropTypes.string.isRequired,
titleType: PropTypes.string,
CardButton: PropTypes.element.isRequired,
children: PropTypes.element.isRequired,
isFetching: PropTypes.bool.isRequired,
}
10 changes: 9 additions & 1 deletion src/components/contentcards/CippButtonCard.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { CCard, CCardBody, CCardFooter, CCardHeader, CCardTitle } from '@coreui/react'
import Skeleton from 'react-loading-skeleton'
import PropTypes from 'prop-types'

export default function CippButtonCard({
title,
Expand All @@ -25,3 +25,11 @@ export default function CippButtonCard({
</CCard>
)
}

CippButtonCard.propTypes = {
title: PropTypes.string.isRequired,
titleType: PropTypes.string,
CardButton: PropTypes.element.isRequired,
children: PropTypes.element.isRequired,
isFetching: PropTypes.bool.isRequired,
}
Loading