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

Fix/custom ringtone validation [WTEL-4814] #739

Merged
merged 6 commits into from
Aug 5, 2024
Merged

Fix/custom ringtone validation [WTEL-4814] #739

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7c80e7
fix: add validation to save btn in custom ringtones [WTEL-4816]
liza-pohranichna Aug 1, 2024
4a0d8d6
fix: improvement of code style [WTEL-4816]
liza-pohranichna Aug 1, 2024
1da4dd9
fix: changes after review [WTEL-4816]
liza-pohranichna Aug 2, 2024
d9b8220
fix: changed isRingtoneSaved computed in custom ringtone component af…
liza-pohranichna Aug 5, 2024
367d64d
fix: remove test url form settings api [WTEL-4816]
liza-pohranichna Aug 5, 2024
5239e04
Merge branch 'master' into fix/custom-ringtone-validation
liza-pohranichna Aug 5, 2024
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
12 changes: 8 additions & 4 deletions src/modules/settings/components/custom-ringtone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
:autoplay="false"
/>
<wt-button
:disabled="savedRingtone === ringtone.name"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

давай у комп'ютед)

@click.prevent="saveRingtone"
>
{{ $t('objects.save') }}
Expand All @@ -47,16 +48,17 @@ export default {
isCustomRingtone: false,
ringtone: {},
options: [],
savedRingtone: undefined, // value from localStorage
}),
computed: {
isRingtoneSelected() {
return this.isCustomRingtone && this.ringtone.name;
},
audioLink() {
return this.isRingtoneSelected
? `${import.meta.env.VITE_RINGTONES_URL}/${this.ringtone.name}`
: '';
},
return this.isRingtoneSelected
? `${import.meta.env.VITE_RINGTONES_URL}/${this.ringtone.name}`
: '';
},
},
methods: {
selectRingtoneType() {
Expand All @@ -67,13 +69,15 @@ export default {
this.ringtone.name
? localStorage.setItem('settings/ringtone', this.ringtone.name)
: localStorage.removeItem('settings/ringtone');
this.savedRingtone = localStorage.getItem('settings/ringtone') || undefined;
},
async loadRingtonesOptions() {
this.options = await getRingtonesList();
},
restoreRingtone() {
const ringtoneName = localStorage.getItem('settings/ringtone');
if (ringtoneName) {
this.savedRingtone = ringtoneName;
this.ringtone = this.options.find(item => item.name === ringtoneName);
this.isCustomRingtone = true;
}
Expand Down
Loading