Skip to content

Commit 67b4361

Browse files
committed
fix(settings): skip loading when persisting cache
1 parent 6db6954 commit 67b4361

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

src/components/views/settings/SettingsAccount.vue

+18-12
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ const userData = computed<UserSetting['user'] | undefined>(() => {
4646
};
4747
});
4848
49+
const settingsLoading = computed(() => {
50+
if (user.value === defaultUser) return true;
51+
if (user.value === userData.value?.username) return false;
52+
return userSettingLoading.value;
53+
});
54+
4955
const limits = computed<UserSetting['limits']>(() => userSetting.value?.limits);
5056
const episodeMinutes = computed(() => userStat.value?.episodes?.minutes);
5157
const episodeWatchTime = computed(() => {
@@ -129,35 +135,35 @@ onDeactivated(() => {
129135
<TextField
130136
:label="i18n('username')"
131137
:value="userData?.username"
132-
:loading="userSettingLoading"
138+
:loading="settingsLoading"
133139
grow
134140
label-width="4.5rem"
135141
/>
136142
<TextField
137143
:label="i18n('display')"
138144
:value="userData?.name"
139-
:loading="userSettingLoading"
145+
:loading="settingsLoading"
140146
grow
141147
label-width="4.5rem"
142148
/>
143149
<TextField
144150
:label="i18n('joined')"
145151
:value="joinDate"
146-
:loading="userSettingLoading"
152+
:loading="settingsLoading"
147153
label-width="4.5rem"
148154
/>
149155
</NFlex>
150156
<NFlex vertical class="flex-column" justify="center">
151157
<TextField
152158
:label="i18n('private')"
153159
:value="userData?.private"
154-
:loading="userSettingLoading"
160+
:loading="settingsLoading"
155161
label-width="3.25rem"
156162
/>
157163
<TextField
158164
:label="i18n('vip')"
159165
:value="userData?.vip"
160-
:loading="userSettingLoading"
166+
:loading="settingsLoading"
161167
label-width="3.25rem"
162168
/>
163169
</NFlex>
@@ -174,13 +180,13 @@ onDeactivated(() => {
174180
<TextField
175181
:label="i18n('location')"
176182
:value="userData?.location"
177-
:loading="userSettingLoading"
183+
:loading="settingsLoading"
178184
label-width="3.25rem"
179185
/>
180186
<TextField
181187
:label="i18n('about')"
182188
:value="userData?.about"
183-
:loading="userSettingLoading"
189+
:loading="settingsLoading"
184190
label-width="3.25rem"
185191
pre
186192
/>
@@ -193,33 +199,33 @@ onDeactivated(() => {
193199
<TextField
194200
:label="i18n('user_lists_maximum')"
195201
:value="limits?.list?.count"
196-
:loading="userSettingLoading"
202+
:loading="settingsLoading"
197203
label-width="9.75rem"
198204
/>
199205
<TextField
200206
:label="i18n('user_lists_max_items')"
201207
:value="limits?.list?.item_count"
202-
:loading="userSettingLoading"
208+
:loading="settingsLoading"
203209
label-width="9.75rem"
204210
/>
205211
</NFlex>
206212
<NFlex vertical class="flex-column" style="flex-basis: 12rem">
207213
<TextField
208214
:label="i18n('watchlist_max')"
209215
:value="limits?.watchlist?.item_count"
210-
:loading="userSettingLoading"
216+
:loading="settingsLoading"
211217
/>
212218
<TextField
213219
:label="i18n('favorites_max')"
214220
:value="limits?.favorites?.item_count"
215-
:loading="userSettingLoading"
221+
:loading="settingsLoading"
216222
/>
217223
</NFlex>
218224
<NFlex vertical class="flex-column">
219225
<TextField
220226
:label="i18n('recommendations_max')"
221227
:value="limits?.recommendations?.item_count"
222-
:loading="userSettingLoading"
228+
:loading="settingsLoading"
223229
label-width="9.75rem"
224230
grow
225231
/>

0 commit comments

Comments
 (0)