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 conflict solution #849

Merged
merged 1 commit into from
Apr 24, 2022
Merged

fix conflict solution #849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/components/Note.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
<Modal v-if="note.conflict && showConflict" size="full" @close="showConflict=false">
<div class="conflict-modal">
<div class="conflict-header">
<SyncAlertIcon slot="icon" :size="30" fill-color="var(--color-error)" />
{{ t('notes', 'The note has been changed in another session. Please choose which version should be saved.') }}
</div>
<div class="conflict-solutions">
<ConflictSolution
:content="note.conflict.content"
:reference="note.reference.content"
:button="t('notes', 'Use version from server')"
@onChooseSolution="onUseRemoteVersion"
@on-choose-solution="onUseRemoteVersion"
/>
<ConflictSolution
:content="note.content"
:reference="note.reference.content"
:button="t('notes', 'Use current version')"
@onChooseSolution="onUseLocalVersion"
@on-choose-solution="onUseLocalVersion"
/>
</div>
</div>
Expand Down Expand Up @@ -64,19 +65,19 @@
</Actions>
<Actions v-if="note.readonly">
<ActionButton>
<PencilOffIcon slot="icon" :size="18" fill-color="var(--color-main-text)" />
<PencilOffIcon slot="icon" :size="20" fill-color="var(--color-main-text)" />
{{ t('notes', 'Note is read-only. You cannot change it.') }}
</ActionButton>
</Actions>
<Actions v-if="note.saveError" class="action-error">
<ActionButton @click="onManualSave">
<SyncAlertIcon slot="icon" :size="18" fill-color="var(--color-text)" />
<SyncAlertIcon slot="icon" :size="20" fill-color="var(--color-text)" />
{{ t('notes', 'Save failed. Click to retry.') }}
</ActionButton>
</Actions>
<Actions v-if="note.conflict" class="action-error">
<ActionButton @click="showConflict=true">
<SyncAlertIcon slot="icon" :size="18" fill-color="var(--color-text)" />
<SyncAlertIcon slot="icon" :size="20" fill-color="var(--color-text)" />
{{ t('notes', 'Update conflict. Click for resolving manually.') }}
</ActionButton>
</Actions>
Expand Down Expand Up @@ -383,11 +384,13 @@ export default {
},

onUseLocalVersion() {
console.debug('conflict solution: use local version')
conflictSolutionLocal(this.note)
this.showConflict = false
},

onUseRemoteVersion() {
console.debug('conflict solution: use remote version')
conflictSolutionRemote(this.note)
this.showConflict = false
},
Expand Down Expand Up @@ -461,13 +464,10 @@ export default {
top: 0px;
}

.action-buttons button {
padding: 15px;
}

/* Conflict Modal */
.conflict-modal {
width: 70vw;
margin: auto;
}

.conflict-header {
Expand Down