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] main from KelvinTegelaar:main #3

Merged
merged 24 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d1f7a9
Merge pull request #11 from KelvinTegelaar/dev
kris6673 Mar 6, 2024
6006ad1
Merge pull request #13 from KelvinTegelaar/dev
kris6673 Mar 16, 2024
9258e95
Update Statistics.jsx
JohnDuprey Mar 16, 2024
9437488
update package-lock
JohnDuprey Mar 16, 2024
e5012de
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 16, 2024
ff0eacb
Merge pull request #2226 from JohnDuprey/dev
JohnDuprey Mar 16, 2024
9be0bcd
Merge pull request #149 from KelvinTegelaar/dev
JohnDuprey Mar 17, 2024
131df0f
fixes edit user bug
KelvinTegelaar Mar 18, 2024
aed7b03
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 18, 2024
86137e5
users fix
KelvinTegelaar Mar 19, 2024
a23f6b9
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 19, 2024
50e655a
Merge pull request #15 from KelvinTegelaar/dev
kris6673 Mar 20, 2024
ac12ae9
DisableAppCreation standard
kris6673 Mar 20, 2024
3804ccc
Merge pull request #2238 from kris6673/dev
KelvinTegelaar Mar 20, 2024
4a98750
Merge pull request #151 from KelvinTegelaar/dev
JohnDuprey Mar 21, 2024
0ce920a
Update formatters for alerts/scheduler
JohnDuprey Mar 22, 2024
8430b48
Merge pull request #2243 from JohnDuprey/dev
JohnDuprey Mar 22, 2024
393066f
up version
JohnDuprey Mar 22, 2024
211f2de
Update package-lock.json
JohnDuprey Mar 22, 2024
dc10a67
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 22, 2024
756c6a5
Merge pull request #2246 from JohnDuprey/dev
JohnDuprey Mar 22, 2024
8514b48
Add boolean switch to standards list
OfficialEsco Mar 22, 2024
a9ff314
Merge pull request #2247 from Ren-Roros-Digital/BooleanSwitch
JohnDuprey Mar 22, 2024
f052bc9
Merge pull request #2248 from KelvinTegelaar/dev
JohnDuprey Mar 22, 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
6,544 changes: 6 additions & 6,538 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "5.3.1",
"version": "5.3.2",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
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.3.1
5.3.2
10 changes: 10 additions & 0 deletions src/data/standards.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,16 @@
"impact": "Low Impact",
"impactColour": "info"
},
{
"name": "standards.DisableAppCreation",
"cat": "Entra (AAD) Standards",
"tag": ["lowimpact", "CIS"],
"helpText": "Disables the ability for users to create App registrations in the tenant.",
"addedComponent": [],
"label": "Disable App creation by users",
"impact": "Low Impact",
"impactColour": "info"
},
{
"name": "standards.DisableSecurityGroupUsers",
"cat": "Entra (AAD) Standards",
Expand Down
2 changes: 1 addition & 1 deletion src/views/cipp/Scheduler.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const Scheduler = () => {
name: 'Parameters',
selector: (row) => row['Parameters'],
sortable: true,
cell: (row) => CellTip(row['Parameters']),
cell: cellGenericFormatter(),
exportSelector: 'Parameters',
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/views/cipp/Statistics.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const Statistics = () => {
const { data, isFetching, error, isSuccess } = useGenericGetRequestQuery({
path: '/api/ListFunctionStats',
params: {
FunctionType: 'Queue',
FunctionType: 'Durable',
Interval: interval,
Time: time,
TenantFilter: tenant?.defaultDomainName,
Expand Down
10 changes: 6 additions & 4 deletions src/views/identity/administration/Users.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ import CippGraphUserFilter from 'src/components/utilities/CippGraphUserFilter'
const Offcanvas = (row, rowIndex, formatExtraData) => {
const tenant = useSelector((state) => state.app.currentTenant)
const [ocVisible, setOCVisible] = useState(false)
const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
const viewLink = row?.tenant
? `/identity/administration/users/view?userId=${row.id}&tenantDomain=${row.Tenant}&userEmail=${row.userPrincipalName}`
: `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
const editLink = row?.tenant
? `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${row.Tenant}`
: `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/UserAuthMethods/userId/${row.id}/hidePreviewBanner~/true`

let licenses = []
Expand All @@ -31,7 +34,6 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
})
var licJoined = licenses.join(', ')

//console.log(row)
return (
<>
<Link to={viewLink}>
Expand Down
4 changes: 2 additions & 2 deletions src/views/tenant/administration/AlertRules.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ const AlertRules = () => {
name: 'If',
selector: (row) => row['if'],
sortable: true,
cell: cellBadgeFormatter(),
cell: cellGenericFormatter(),
exportSelector: 'if',
},
{
name: 'Execute',
selector: (row) => row['execution'],
sortable: true,
cell: (row) => CellTip(row['execution']),
cell: cellGenericFormatter(),
exportSelector: 'execution',
},
{
Expand Down
7 changes: 7 additions & 0 deletions src/views/tenant/standards/ListAppliedStandards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,13 @@ const ApplyNewStandard = () => {
label={component.label}
/>
)}
{component.type === 'boolean' && (
<RFFCFormSwitch
name={component.name}
label={component.label}
initialValue={component.default}
/>
)}
{component.type === 'AdminRolesMultiSelect' && (
<RFFSelectSearch
multi={true}
Expand Down
2 changes: 1 addition & 1 deletion version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.1
5.3.2