Skip to content

Commit 67d0f63

Browse files
committed
fix(settings): migrate from checked to model-value
- split modelValue array for checkboxes Signed-off-by: Maksim Sukharev <[email protected]>
1 parent af557c1 commit 67d0f63

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

src/components/settings/SettingsDatetimeFormat.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
<fieldset>
88
<legend>{{ fieldsetLegend }}</legend>
99
<NcCheckboxRadioSwitch
10-
:checked="dateTimeFormat"
10+
:model-value="dateTimeFormat"
1111
value="raw"
1212
name="timestamp_format"
1313
type="radio"
14-
@update:checked="setDateTimeFormat">
14+
@update:model-value="setDateTimeFormat">
1515
{{ t('logreader', 'Raw data') }}
1616
</NcCheckboxRadioSwitch>
1717
<NcCheckboxRadioSwitch
18-
:checked="dateTimeFormat"
18+
:model-value="dateTimeFormat"
1919
:disabled="isLocalLogfile"
2020
value="local"
2121
name="timestamp_format"
2222
type="radio"
23-
@update:checked="setDateTimeFormat">
23+
@update:model-value="setDateTimeFormat">
2424
{{ t('logreader', 'Local time') }}
2525
</NcCheckboxRadioSwitch>
2626
<NcCheckboxRadioSwitch
27-
:checked="dateTimeFormat"
27+
:model-value="dateTimeFormat"
2828
:disabled="isLocalLogfile"
2929
value="utc"
3030
name="timestamp_format"
3131
type="radio"
32-
@update:checked="setDateTimeFormat">
32+
@update:model-value="setDateTimeFormat">
3333
{{ t('logreader', 'UTC time') }}
3434
</NcCheckboxRadioSwitch>
3535
<NcCheckboxRadioSwitch
36-
:checked="dateTimeFormat"
36+
:model-value="dateTimeFormat"
3737
:disabled="isLocalLogfile"
3838
value="relative"
3939
name="timestamp_format"
4040
type="radio"
41-
@update:checked="setDateTimeFormat">
41+
@update:model-value="setDateTimeFormat">
4242
{{ t('logreader', 'Relative') }}
4343
</NcCheckboxRadioSwitch>
4444
</fieldset>

src/components/settings/SettingsLiveView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<NcNoteCard v-if="!settingsStore.enabled" type="info">
99
{{ t('logreader', 'Polling is disabled because server is not configured to log to file') }}
1010
</NcNoteCard>
11-
<NcCheckboxRadioSwitch :checked.sync="liveLog" :disabled="!settingsStore.enabled">
11+
<NcCheckboxRadioSwitch v-model="liveLog" :disabled="!settingsStore.enabled">
1212
{{
1313
t('logreader', 'Polling (live view)')
1414
}}

src/components/settings/SettingsLogLevels.vue

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
<fieldset>
99
<legend>{{ t('logreader', 'Filter logging levels') }}</legend>
1010
<NcCheckboxRadioSwitch
11-
v-for="levelName, levelId in LOGGING_LEVEL_NAMES"
11+
v-for="(levelName, levelId) in LOGGING_LEVEL_NAMES"
1212
:key="levelId"
13-
:checked="shownLevels"
14-
:value="`${levelId}`"
15-
name="logging_level"
16-
@update:checked="setShowLevels">
13+
:model-value="shownLevels[levelId]"
14+
@update:model-value="setShowLevels(levelId)">
1715
{{ levelName }}
1816
</NcCheckboxRadioSwitch>
1917
</fieldset>
@@ -36,10 +34,21 @@ const settingsStore = useSettingsStore()
3634
/**
3735
* Get shown logging levels (to allow filter levels)
3836
*/
39-
const shownLevels = computed(() => settingsStore.shownLevels.map((l) => `${l}`))
40-
41-
const setShowLevels = debounce((levels: string[]) => {
42-
const numericLevels = levels.map((level) => parseInt(level)) as IAppSettings['shownLevels']
37+
const shownLevels = computed(() => {
38+
return Object.fromEntries(Object.keys(LOGGING_LEVEL_NAMES).map((level) => {
39+
return [level, settingsStore.shownLevels.includes(parseInt(level))]
40+
}))
41+
})
42+
43+
const setShowLevels = debounce((level: number) => {
44+
const newShownLevels = {
45+
...shownLevels.value,
46+
[level]: !shownLevels.value[level],
47+
}
48+
49+
const numericLevels = Object.keys(newShownLevels)
50+
.filter((level) => newShownLevels[level])
51+
.map((level) => parseInt(level)) as IAppSettings['shownLevels']
4352
4453
settingsStore.setSetting('shownLevels', numericLevels)
4554
.catch(() => showError(t('logreader', 'Could not set logging levels to show')))

src/components/settings/SettingsSetLogLevel.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<fieldset>
88
<legend>{{ t('logreader', 'Set backend loglevel') }}</legend>
99
<NcCheckboxRadioSwitch
10-
v-for="levelName, levelId in LOGGING_LEVEL_NAMES"
10+
v-for="(levelName, levelId) in LOGGING_LEVEL_NAMES"
1111
:key="levelId"
12-
:checked="logLevel"
12+
:model-value="logLevel"
1313
:value="`${levelId}`"
1414
type="radio"
1515
name="loglevel"
16-
@update:checked="setLogLevel">
16+
@update:model-value="setLogLevel">
1717
{{ levelName }}
1818
</NcCheckboxRadioSwitch>
1919
</fieldset>

0 commit comments

Comments
 (0)