Merge pull request #3997 from nextcloud/fix/force_save

Make saving indicator a button for force-save
nextcloud · Mar 27, 2023 · 43ad16c · 43ad16c
2 parents 99c9c29 + bf64e0e
commit 43ad16c
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 28 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor/Status.vue b/src/components/Editor/Status.vue
@@ -23,8 +23,13 @@
 <template>
 	<div class="text-editor__session-list">
 		<div v-tooltip="lastSavedStatusTooltip" class="save-status" :class="saveStatusClass">
-			<SavingIndicator :saving="saveStatusClass === 'saving'"
-				:error="saveStatusClass === 'error'" />
+			<NcButton type="tertiary"
+				@click="onClickSave">
+				<template #icon>
+					<SavingIndicator :saving="saveStatusClass === 'saving'"
+						:error="saveStatusClass === 'error'" />
+				</template>
+			</NcButton>
 		</div>
 		<SessionList :sessions="sessions">
 			<p slot="lastSaved" class="last-saved">
@@ -38,19 +43,21 @@
 <script>
 
 import SavingIndicator from '../SavingIndicator.vue'
-import { ERROR_TYPE } from './../../services/SyncService.js'
+import { ERROR_TYPE } from '../../services/SyncService.js'
 import moment from '@nextcloud/moment'
-import { Tooltip } from '@nextcloud/vue'
+import { NcButton, Tooltip } from '@nextcloud/vue'
 import {
 	useIsMobileMixin,
 	useIsPublicMixin,
+	useSyncServiceMixin,
 } from '../Editor.provider.js'
 import refreshMoment from '../../mixins/refreshMoment.js'
 
 export default {
 	name: 'Status',
 
 	components: {
+		NcButton,
 		SavingIndicator,
 		SessionList: () => import(/* webpackChunkName: "editor-collab" */'./SessionList.vue'),
 		GuestNameDialog: () => import(/* webpackChunkName: "editor-guest" */'./GuestNameDialog.vue'),
@@ -60,7 +67,12 @@ export default {
 		Tooltip,
 	},
 
-	mixins: [useIsMobileMixin, useIsPublicMixin, refreshMoment],
+	mixins: [
+		useIsMobileMixin,
+		useIsPublicMixin,
+		useSyncServiceMixin,
+		refreshMoment,
+	],
 
 	props: {
 		hasConnectionIssue: {
@@ -124,13 +136,20 @@ export default {
 			return Object.values(this.sessions).find((session) => session.isCurrent)
 		},
 		lastSavedString() {
-			// Make this a dependent of refreshMoment so it will be recomputed
+			// Make this a dependent of refreshMoment, so it will be recomputed
 			/* eslint-disable-next-line no-unused-expressions */
 			this.refreshMoment
 			return moment(this.document.lastSavedVersionTime * 1000).fromNow()
 		},
 	},
 
+	methods: {
+		onClickSave() {
+			if (this.dirtyStateIndicator) {
+				this.$syncService.forceSave()
+			}
+		},
+	},
 }
 </script>
 

diff --git a/src/components/SavingIndicator.vue b/src/components/SavingIndicator.vue
@@ -20,7 +20,7 @@
 
 <template>
 	<span class="material-design-icon">
-		<CheckIcon />
+		<CheckIcon class="saving-indicator-check" />
 		<span class="saving-indicator-container" :class="{error, saving}">
 			<CircleMedium class="saving-indicator" />
 		</span>
@@ -53,6 +53,14 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+.saving-indicator-check {
+	cursor: pointer;
+
+	:deep(svg) {
+		fill: var(--color-text-lighter);
+	}
+}
+
 .saving-indicator-container {
 	display: none;
 	position: absolute;
@@ -63,14 +71,21 @@ export default defineComponent({
 			position: relative;
 			top: 6px;
 			left: 6px;
+			cursor: pointer;
 		}
 	}
 
 	&.saving > span {
 		color: var(--color-primary);
+		:deep(svg) {
+			fill: var(--color-primary);
+		}
 	}
 	&.error > span {
 		color: var(--color-error);
+		:deep(svg) {
+			fill: var(--color-primary);
+		}
 	}
 }
 </style>