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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 17, 2024
Merged

[pull] main from KelvinTegelaar:main #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b08a54c
Add null safe operator to default settings
JohnDuprey Mar 15, 2024
8197a11
up version
JohnDuprey Mar 15, 2024
3697f63
Merge pull request #2221 from JohnDuprey/dev
JohnDuprey Mar 15, 2024
c2e94b0
Merge pull request #2222 from KelvinTegelaar/dev
JohnDuprey Mar 15, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "5.2.1",
"version": "5.3.1",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.0
5.3.1
2 changes: 1 addition & 1 deletion src/views/identity/administration/AddUser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ const AddUser = () => {
</CCol>
</CRow>
<>
{currentSettings.userSettingsDefaults.defaultAttributes.map(
{currentSettings?.userSettingsDefaults?.defaultAttributes.map(
(attribute, idx) => (
<CRow key={idx}>
<CCol>
Expand Down
4 changes: 2 additions & 2 deletions src/views/identity/administration/EditUser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const EditUser = () => {
},
license: precheckedLicenses,
//if currentSettings.defaultAttributes exists. Set each of the keys inside of currentSettings.defaultAttributes.label to the value of the user attribute found in the user object.
defaultAttributes: currentSettings.userSettingsDefaults.defaultAttributes.reduce(
defaultAttributes: currentSettings?.userSettingsDefaults?.defaultAttributes.reduce(
(o, key) => Object.assign(o, { [key.label]: { Value: user[key.label] } }),
{},
),
Expand Down Expand Up @@ -410,7 +410,7 @@ const EditUser = () => {
</CCol>
</CRow>
<>
{currentSettings.userSettingsDefaults.defaultAttributes.map(
{currentSettings?.userSettingsDefaults?.defaultAttributes.map(
(attribute, idx) => (
<CRow key={idx}>
<CCol>
Expand Down
4 changes: 2 additions & 2 deletions src/views/identity/administration/OffboardingWizard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const OffboardingWizard = () => {

return (
<CippWizard
initialValues={currentSettings.userSettingsDefaults}
initialValues={currentSettings?.userSettingsDefaults}
onSubmit={handleSubmit}
wizardTitle="Offboarding Wizard"
>
Expand Down Expand Up @@ -132,7 +132,7 @@ const OffboardingWizard = () => {
<hr className="my-4" />
</CippWizard.Page>
<CippWizard.Page
initialvalues={currentSettings.userSettingsDefaults}
initialvalues={currentSettings?.userSettingsDefaults}
title="Offboarding Settings"
description="Select the offboarding options."
>
Expand Down
4 changes: 2 additions & 2 deletions src/views/tenant/administration/TenantOffboardingWizard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const TenantOffboardingWizard = () => {

return (
<CippWizard
initialValues={currentSettings.userSettingsDefaults}
initialValues={currentSettings?.userSettingsDefaults}
onSubmit={handleSubmit}
wizardTitle="Tenant Offboarding Wizard"
>
Expand All @@ -88,7 +88,7 @@ const TenantOffboardingWizard = () => {
<hr className="my-4" />
</CippWizard.Page>
<CippWizard.Page
initialvalues={currentSettings.tenantuserSettingsDefaults}
initialvalues={currentSettings?.tenantuserSettingsDefaults}
title="Tenant Offboarding Settings"
description="Select the tenant offboarding actions you wish to take."
>
Expand Down
2 changes: 1 addition & 1 deletion version_latest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.0
5.3.1