Skip to content

Check array length against explicit value to avoid displaying a zero … #2850

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
mkimberlin merged 2 commits into from
Feb 5, 2025
Merged

Check array length against explicit value to avoid displaying a zero … #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6ba465
Check array length against explicit value to avoid displaying a zero …
ocielliottc Jan 29, 2025
a30d08a
Merge branch 'develop' into bugfix-2849/brief-zero-settings-page
mkimberlin Feb 5, 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
22 changes: 11 additions & 11 deletions web-ui/src/pages/SettingsPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ const SettingsPage = () => {
}
}, [state, csrf]);

// For specific settings, add a handleFunction to the settings object.
// Format should be handleSetting and then add it to the handlers object
// with the setting name as the key.
const handleLogoUrl = file => {
if (csrf) {
// TODO: Need to upload the file to a storage bucket...
Expand Down Expand Up @@ -200,17 +197,20 @@ const SettingsPage = () => {
} else {
categories[info.category] = true;
return (
<>
<Typography data-testid={info.category}
variant="h4"
sx={{textDecoration: 'underline'}}
display="inline">{titleCase(info.category)}</Typography>
<Component key={index} {...info} />
</>
<div key={index}>
<Typography data-testid={info.category}
variant="h4"
sx={{textDecoration: 'underline'}}
display="inline">{titleCase(info.category)}
</Typography>
<Component {...info} />
</div>
);
}
})}
{settingsControls && settingsControls.length &&
{// Check length against an explicit value. If length is zero, it will
// be displayed instead of evaluated to false.
settingsControls && settingsControls.length > 0 &&
selectHasAdministerSettingsPermission(state) &&
<div className="buttons">
<Button
Expand Down
124 changes: 64 additions & 60 deletions web-ui/src/pages/__snapshots__/SettingsPage.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,77 +13,81 @@ exports[`SettingsPage > renders correctly 1`] = `
<div
class="settings-page"
>
<h4
class="MuiTypography-root MuiTypography-h4 css-13d5t77-MuiTypography-root"
data-testid="INTEGRATIONS"
>
Integrations
</h4>
<div
class="settings-type"
>
<label
for="another-setting"
<div>
<h4
class="MuiTypography-root MuiTypography-h4 css-13d5t77-MuiTypography-root"
data-testid="INTEGRATIONS"
>
<h5
class="MuiTypography-root MuiTypography-h5 MuiTypography-gutterBottom css-h93ljk-MuiTypography-root"
>
Another Setting
</h5>
</label>
<p>
The description
</p>
<span
class="MuiSwitch-root MuiSwitch-sizeMedium settings-control css-julti5-MuiSwitch-root"
Integrations
</h4>
<div
class="settings-type"
>
<label
for="another-setting"
>
<h5
class="MuiTypography-root MuiTypography-h5 MuiTypography-gutterBottom css-h93ljk-MuiTypography-root"
>
Another Setting
</h5>
</label>
<p>
The description
</p>
<span
class="MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary css-byenzh-MuiButtonBase-root-MuiSwitch-switchBase"
class="MuiSwitch-root MuiSwitch-sizeMedium settings-control css-julti5-MuiSwitch-root"
>
<input
class="PrivateSwitchBase-input MuiSwitch-input css-1m9pwf3"
id="another-setting"
type="checkbox"
/>
<span
class="MuiSwitch-thumb css-jsexje-MuiSwitch-thumb"
class="MuiButtonBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary PrivateSwitchBase-root MuiSwitch-switchBase MuiSwitch-colorPrimary css-byenzh-MuiButtonBase-root-MuiSwitch-switchBase"
>
<input
class="PrivateSwitchBase-input MuiSwitch-input css-1m9pwf3"
id="another-setting"
type="checkbox"
/>
<span
class="MuiSwitch-thumb css-jsexje-MuiSwitch-thumb"
/>
</span>
<span
class="MuiSwitch-track css-1yjjitx-MuiSwitch-track"
/>
</span>
<span
class="MuiSwitch-track css-1yjjitx-MuiSwitch-track"
/>
</span>
</div>
</div>
<h4
class="MuiTypography-root MuiTypography-h4 css-13d5t77-MuiTypography-root"
data-testid="THEME"
>
Theme
</h4>
<div
class="settings-type"
>
<label
for="other-setting"
<div>
<h4
class="MuiTypography-root MuiTypography-h4 css-13d5t77-MuiTypography-root"
data-testid="THEME"
>
<h5
class="MuiTypography-root MuiTypography-h5 MuiTypography-gutterBottom css-h93ljk-MuiTypography-root"
>
Other Setting
</h5>
</label>
<p>
The description
</p>
Theme
</h4>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary settings-control css-bz5ng3-MuiInputBase-root-MuiInput-root"
class="settings-type"
>
<input
class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
id="other-setting"
type="number"
value="42"
/>
<label
for="other-setting"
>
<h5
class="MuiTypography-root MuiTypography-h5 MuiTypography-gutterBottom css-h93ljk-MuiTypography-root"
>
Other Setting
</h5>
</label>
<p>
The description
</p>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary settings-control css-bz5ng3-MuiInputBase-root-MuiInput-root"
>
<input
class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
id="other-setting"
type="number"
value="42"
/>
</div>
</div>
</div>
<div
Expand Down
Loading