Fix naming and documentation

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
nextcloud · Sep 6, 2022 · 4115f93 · 4115f93
1 parent 062f7f0
commit 4115f93
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 23 deletions.
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
@@ -88,7 +88,7 @@
 				<!-- expiration date -->
 				<NcActionCheckbox :checked.sync="hasExpirationDate"
 					:disabled="config.isDefaultInternalExpireDateEnforced || saving"
-					@uncheck="uncheckExpirationDateCheckbox">
+					@uncheck="uncheckExpirationDate">
 					{{ config.isDefaultInternalExpireDateEnforced
 						? t('files_sharing', 'Expiration date enforced')
 						: t('files_sharing', 'Set expiration date') }}
@@ -99,7 +99,7 @@
 					:hide-label="true"
 					:class="{ error: errors.expireDate}"
 					:disabled="saving"
-					:value="computeValueExpiredDate"
+					:value="expireDate"
 					type="date"
 					:min="dateTomorrow"
 					:max="dateMaxEnforced"
@@ -176,7 +176,7 @@ export default {
 			permissionsDelete: OC.PERMISSION_DELETE,
 			permissionsRead: OC.PERMISSION_READ,
 			permissionsShare: OC.PERMISSION_SHARE,
-			isFirstInitExpiredDate: true,
+			isFirstInitOfExpireDate: true,
 		}
 	},
 
@@ -431,11 +431,15 @@ export default {
 			return this.isFolder || allowedMimetypes.includes(this.fileInfo.mimetype)
 		},
 
-		computeValueExpiredDate() {
-			if (this.isFirstInitExpiredDate) {
+		/**
+		 * Compute value for expiration input field
+		 * @return {Date}
+		 */
+		expireDate() {
+			if (this.isFirstInitOfExpireDate) {
 				// initial value needs to be set to one day after share.expireDate because the min value of input is dateTomorrow
 				// eslint-disable-next-line vue/no-side-effects-in-computed-properties
-				this.isFirstInitExpiredDate = false
+				this.isFirstInitOfExpireDate = false
 				return new Date(new Date().setDate(this.share.expireDate.getDate() + 1))
 			}
 			return this.share.expireDate
@@ -472,10 +476,13 @@ export default {
 			this.onNoteSubmit()
 		},
 
-		uncheckExpirationDateCheckbox() {
-			this.isFirstInitExpiredDate = true
-			return this.uncheckExpirationDateCheckbox
-		}
+		/**
+		 * Process unchecking of checkbox for expiration date
+		 */
+		uncheckExpirationDate() {
+			this.isFirstInitOfExpireDate = true
+			return this.onExpirationDisable()
+		},
 	},
 }
 </script>

diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -97,15 +97,14 @@
 				{{ t('files_sharing', 'Expiration date (enforced)') }}
 			</NcActionText>
 			<NcActionInput v-if="pendingExpirationDate"
-				:value="computeValueExpiredDate"
+				v-model="share.expireDate"
 				class="share-link-expire-date"
 				:disabled="saving"
 			    :is-native-picker="true"
 				:hide-label="true"
 				type="date"
 				:min="dateTomorrow"
-				:max="dateMaxEnforced"
-				@input="share.expireDate = $event">
+				:max="dateMaxEnforced">
 				<!-- let's not submit when picked, the user
 					might want to still edit or copy the password -->
 				{{ t('files_sharing', 'Enter a date') }}
@@ -207,7 +206,7 @@
 					<NcActionCheckbox :checked.sync="hasExpirationDate"
 						:disabled="config.isDefaultExpireDateEnforced || saving"
 						class="share-link-expire-date-checkbox"
-						@uncheck="uncheckExpirationDateCheckbox">
+						@uncheck="uncheckExpirationDate">
 						{{ config.isDefaultExpireDateEnforced
 							? t('files_sharing', 'Expiration date (enforced)')
 							: t('files_sharing', 'Set expiration date') }}
@@ -219,7 +218,7 @@
 						class="share-link-expire-date"
 						:class="{ error: errors.expireDate}"
 						:disabled="saving"
-						:value="computeValueExpiredDate"
+						:value="expireDate"
 						type="date"
 						:min="dateTomorrow"
 						:max="dateMaxEnforced"
@@ -359,7 +358,7 @@ export default {
 
 			ExternalLegacyLinkActions: OCA.Sharing.ExternalLinkActions.state,
 			ExternalShareActions: OCA.Sharing.ExternalShareActions.state,
-			isFirstInitExpiredDate: true,
+			isFirstInitOfExpireDate: true,
 		}
 	},
 
@@ -603,15 +602,19 @@ export default {
 			return this.fileInfo.shareAttributes.some(hasDisabledDownload)
 		},
 
-		computeValueExpiredDate() {
-			if (this.isFirstInitExpiredDate) {
+		/**
+		 * Compute value for expiration input field
+		 * @return {Date}
+		 */
+		expireDate() {
+			if (this.isFirstInitOfExpireDate) {
 				// initial value needs to be set to one day after share.expireDate because the min value of input is dateTomorrow
 				// eslint-disable-next-line vue/no-side-effects-in-computed-properties
-				this.isFirstInitExpiredDate = false
+				this.isFirstInitOfExpireDate = false
 				return new Date(new Date().setDate(this.share.expireDate.getDate() + 1))
 			}
 			return this.share.expireDate
-		}
+		},
 	},
 
 	methods: {
@@ -873,10 +876,13 @@ export default {
 			this.$emit('remove:share', this.share)
 		},
 
-		uncheckExpirationDateCheckbox() {
-			this.isFirstInitExpiredDate = true
+		/**
+		 * Process unchecking of checkbox for expiration date
+		 */
+		uncheckExpirationDate() {
+			this.isFirstInitOfExpireDate = true
 			return this.onExpirationDisable()
-		}
+		},
 	},
 }
 </script>