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

Jump to bottom

Deliberate typo #5080

Closed
wants to merge 6 commits into from
Closed

Deliberate typo #5080

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
505254f
Deliberate typo
ericpromislow Jun 28, 2023
43d7335
Test powershell case and typos.
ericpromislow Jun 28, 2023
cd86a3a
Undo the notification typo.
ericpromislow Jun 28, 2023
c87520f
More deliberate typos.
ericpromislow Jun 29, 2023
5ac57a5
More typos.
ericpromislow Jun 29, 2023
6b1d096
More github case experiments.
ericpromislow Jun 29, 2023
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
4 changes: 2 additions & 2 deletions background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
}
await pathManager.enforce();

if (newSettings.application.hideNotificationIcon) {
if (newSettings.application.hideNotivicationIcon) {
Fixed Show fixed Hide fixed
Tray.getInstance(cfg).hide();
} else {
if (firstRunDialogComplete) {
Expand Down Expand Up @@ -262,7 +262,7 @@
iconPath: path.join(paths.resources, 'icons', 'logo-square-512.png'),
});

if (!cfg.application.hideNotificationIcon) {
if (!cfg.application.hideNotivicationIcon) {
Fixed Show fixed Hide fixed
Tray.getInstance(cfg).show();
}

Expand Down
6 changes: 3 additions & 3 deletions bats/tests/containers/auto-start.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
run get_setting '.application.window.quitOnClose'
assert_success
assert_output false
run get_setting '.application.hideNotificationIcon'
run get_setting '.application.hideNotivicationIcon'
Fixed Show fixed Hide fixed
assert_success
assert_output false
}
Expand Down Expand Up @@ -101,14 +101,14 @@

@test 'Enable hide-notification-icon' {
rdctl set --application.hide-notification-icon=true
run get_setting '.application.hideNotificationIcon'
run get_setting '.application.hideNotivicationIcon'
Fixed Show fixed Hide fixed
assert_success
assert_output true
}

@test 'Disable hide-notification-icon' {
rdctl set --application.hide-notification-icon=false
run get_setting '.application.hideNotificationIcon'
run get_setting '.application.hideNotivicationIcon'
Fixed Show fixed Hide fixed
assert_success
assert_output false
}
2 changes: 1 addition & 1 deletion pkg/rancher-desktop/assets/specs/command-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ components:
startInBackground:
type: boolean
x-rd-usage: start app without window
hideNotificationIcon:
hideNotivicationIcon:
type: boolean
x-rd-usage: don't show notification icon
window:
Expand Down
6 changes: 3 additions & 3 deletions pkg/rancher-desktop/components/Preferences/ApplicationBehavior.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ export default Vue.extend({
>
<rd-checkbox
:label="t('application.behavior.notificationIcon.label')"
:value="preferences.application.hideNotificationIcon"
:is-locked="isPreferenceLocked('application.hideNotificationIcon')"
@input="onChange('application.hideNotificationIcon', $event)"
:value="preferences.application.hideNotivicationIcon"
:is-locked="isPreferenceLocked('application.hideNotivicationIcon')"
@input="onChange('application.hideNotivicationIcon', $event)"
/>
</rd-fieldset>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pkg/rancher-desktop/config/__tests__/commandLineOptions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ describe('commandLineOptions', () => {
'--application.updater.enabled',
'--application.autoStart',
'--application.startInBackground',
'--application.hideNotificationIcon',
'--application.hideNotivicationIcon',
'--application.window.quitOnClose',
'--containerEngine.allowedImages.enabled',
['--containerEngine.name', 'containerd'],
Expand Down
4 changes: 2 additions & 2 deletions pkg/rancher-desktop/config/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const defaultSettings = {
updater: { enabled: true },
autoStart: false,
startInBackground: false,
hideNotificationIcon: false,
hideNotivicationIcon: false,
window: { quitOnClose: false },
},
containerEngine: {
Expand Down Expand Up @@ -480,7 +480,7 @@ const updateTable: Record<number, (settings: any) => void> = {
}
delete settings.virtualMachine.experimental;
}
for (const field of ['autoStart', 'hideNotificationIcon', 'startInBackground', 'window']) {
for (const field of ['autoStart', 'hideNotivicationIcon', 'startInBackground', 'window']) {
if (field in settings) {
settings.application[field] = settings[field];
delete settings[field];
Expand Down
2 changes: 1 addition & 1 deletion pkg/rancher-desktop/main/commandServer/settingsValidator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default class SettingsValidator {
updater: { enabled: this.checkBoolean },
autoStart: this.checkBoolean,
startInBackground: this.checkBoolean,
hideNotificationIcon: this.checkBoolean,
hideNotivicationIcon: this.checkBoolean,
window: { quitOnClose: this.checkBoolean },
},
containerEngine: {
Expand Down
Loading