Skip to content

fix: ensure that the props are not being edited #3495

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

Merged
bfintal merged 1 commit into from
May 15, 2025
+21 −12
Merged

fix: ensure that the props are not being edited #3495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions src/welcome/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,8 +1171,11 @@ const GlobalSettings = props => {

const RoleManager = props => {
const groups = props.filteredSearchTree.find( tab => tab.id === 'role-manager' ).groups
props.roleManager = groups.find( group => group.id === 'role-manager' )
const groupLength = groups.reduce( ( acc, curr ) => acc + curr.children.length, 0 )
const propsToPass = {
...props,
roleManager: groups.find( group => group.id === 'role-manager' ),
}

const EditorModeSettings = applyFilters( 'stackable.admin.settings.editorModeSettings', Fragment )

Expand All @@ -1182,7 +1185,7 @@ const RoleManager = props => {
<h3>{ __( 'No matching settings', i18n ) }</h3>
) : (
<>
{ props.roleManager.children.length > 0 &&
{ propsToPass.roleManager.children.length > 0 &&
<div className="s-setting-group">
<h2>{ __( 'Role Manager', i18n ) }</h2>
<p className="s-settings-subtitle">
Expand All @@ -1200,7 +1203,7 @@ const RoleManager = props => {
{ isPro
? <Suspense fallback={ <Spinner /> }>
<div className="s-editing-mode-settings">
<EditorModeSettings { ...props } />
<EditorModeSettings { ...propsToPass } />
</div>
</Suspense>
: <p className="s-settings-pro">
Expand All @@ -1220,8 +1223,11 @@ const RoleManager = props => {

const CustomFields = props => {
const groups = props.filteredSearchTree.find( tab => tab.id === 'custom-fields-settings' ).groups
props.customFields = groups.find( group => group.id === 'custom-fields-settings' )
const groupLength = groups.reduce( ( acc, curr ) => acc + curr.children.length, 0 )
const propsToPass = {
...props,
customFields: groups.find( group => group.id === 'custom-fields-settings' ),
}

const CustomFieldsEnableSettings = applyFilters( 'stackable.admin.settings.customFieldsEnableSettings', Fragment )
const CustomFieldsManagerSettings = applyFilters( 'stackable.admin.settings.customFieldsManagerSettings', Fragment )
Expand All @@ -1232,14 +1238,14 @@ const CustomFields = props => {
<h3>{ __( 'No matching settings', i18n ) }</h3>
) : (
<>
{ props.customFields.children.length > 0 &&
{ propsToPass.customFields.children.length > 0 &&
<div className="s-setting-group">
<div className="s-custom-fields-settings-header">
<h2>{ __( 'Custom Fields', i18n ) }</h2>
{ isPro &&
<Suspense fallback={ <Spinner /> }>
<div className="s-custom-fields-enable">
<CustomFieldsEnableSettings { ...props } />
<CustomFieldsEnableSettings { ...propsToPass } />
</div>
</Suspense>
}
Expand All @@ -1253,7 +1259,7 @@ const CustomFields = props => {
{ isPro
? <Suspense fallback={ <Spinner /> }>
<div className="s-custom-fields-manager">
<CustomFieldsManagerSettings { ...props } />
<CustomFieldsManagerSettings { ...propsToPass } />
</div>
</Suspense>
: <p className="s-settings-pro">
Expand All @@ -1279,8 +1285,11 @@ const Integrations = props => {
} = props

const groups = filteredSearchTree.find( tab => tab.id === 'integrations' ).groups
props.integrations = groups.find( group => group.id === 'integrations' )
const groupLength = groups.reduce( ( acc, curr ) => acc + curr.children.length, 0 )
const propsToPass = {
...props,
integrations: groups.find( group => group.id === 'integrations' ),
}

const IconSettings = applyFilters( 'stackable.admin.settings.iconSettings', Fragment )

Expand All @@ -1290,13 +1299,13 @@ const Integrations = props => {
<h3>{ __( 'No matching settings', i18n ) }</h3>
) : (
<>
{ props.integrations.children.length > 0 &&
{ propsToPass.integrations.children.length > 0 &&
<div className="s-setting-group">
<h2>{ __( 'Integrations', i18n ) }</h2>
<p className="s-settings-subtitle">{ __( 'Here are settings for the different integrations available in Stackable.', i18n ) }</p>
<AdminTextSetting
label={ __( 'Google Maps API Key', i18n ) }
searchedSettings={ props.integrations.children }
searchedSettings={ propsToPass.integrations.children }
value={ settings.stackable_google_maps_api_key }
type="text"
onChange={ value => {
Expand All @@ -1316,7 +1325,7 @@ const Integrations = props => {
{ isPro
? <Suspense fallback={ <Spinner /> }>
<div className="ugb-admin-setting">
<IconSettings { ...props } />
<IconSettings { ...propsToPass } />
</div>
</Suspense>
: <>
Expand Down Expand Up @@ -1347,7 +1356,7 @@ const Integrations = props => {
<div className="s-icon-settings-fa-free-version">
<AdminSelectSetting
label={ __( 'FontAwesome Icon Library Version', i18n ) }
searchedSettings={ props.integrations.children }
searchedSettings={ propsToPass.integrations.children }
value={ settings.stackable_icons_fa_free_version }
options={ [
{
Expand Down
Loading