Updates to sharing flow

- Show enforced expiry date for new shares. - Improve quick share dropdown visibility in dark mode. - Prevent expiry date from showing expire for incoming shares. by updating the check for `share.passwordExpirationTime` to equally check for `undefined`. - Move "Download permission/attribute" from custom setting (as it is just another advanced setting and not an actual permission). - Show correct text for upload/editing when "allow public uploads" is enabled or disabled by admin. Signed-off-by: fenn-cs <[email protected]>
nextcloud · nfebe · Oct 2, 2023 · Sep 26, 2023 · Sep 28, 2023 · Oct 2, 2023
commit a092bae72008ac0fa6297013ae4ba86a1827fc93
@@ -238,6 +238,7 @@ export default {
 		background-color: var(--color-main-background);
 		border-radius: 8px;
 		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+		border: 1px solid var(--color-border);
 		padding: 4px 0;
 		z-index: 1;
 
@@ -256,11 +257,11 @@ export default {
 			text-align: left;
 
 			&:hover {
-				background-color: #f2f2f2;
+				background-color: var(--color-background-dark);
 			}
 
 			&.selected {
-				background-color: #f0f0f0;
+				background-color: var(--color-background-dark);
 			}
 		}
 	}

@@ -36,7 +36,13 @@
 					type="radio"
 					button-variant-grouped="vertical"
 					@update:checked="toggleCustomPermissions">
-					{{ t('files_sharing', 'Allow upload and editing') }}
+					<template v-if="allowsFileDrop">
+						{{ t('files_sharing', 'Allow upload and editing') }}
+					</template>
+					<template v-else>
+						{{ t('files_sharing', 'Allow editing') }}
+					</template>
+
 					<template #icon>
 						<EditIcon :size="20" />
 					</template>
@@ -132,6 +138,9 @@
 					@update:checked="onPasswordProtectedByTalkChange">
 					{{ t('file_sharing', 'Video verification') }}
 				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
+					{{ t('file_sharing', 'Allow download') }}
+				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="writeNoteToRecipientIsChecked">
 					{{ t('file_sharing', 'Note to recipient') }}
 				</NcCheckboxRadioSwitch>
@@ -145,7 +154,8 @@
 					{{ t('file_sharing', 'Custom permissions') }}
 				</NcCheckboxRadioSwitch>
 				<section v-if="setCustomPermissions" class="custom-permissions-group">
-					<NcCheckboxRadioSwitch :disabled="!allowsFileDrop && share.type === SHARE_TYPES.SHARE_TYPE_LINK" :checked.sync="hasRead">
+					<NcCheckboxRadioSwitch :disabled="!allowsFileDrop && share.type === SHARE_TYPES.SHARE_TYPE_LINK"
+						:checked.sync="hasRead">
 						{{ t('file_sharing', 'Read') }}
 					</NcCheckboxRadioSwitch>
 					<NcCheckboxRadioSwitch v-if="isFolder" :disabled="!canSetCreate" :checked.sync="canCreate">
@@ -154,12 +164,11 @@
 					<NcCheckboxRadioSwitch :disabled="!canSetEdit" :checked.sync="canEdit">
 						{{ t('file_sharing', 'Update') }}
 					</NcCheckboxRadioSwitch>
-					<NcCheckboxRadioSwitch v-if="config.isResharingAllowed && share.type !== SHARE_TYPES.SHARE_TYPE_LINK" :disabled="!canSetReshare" :checked.sync="canReshare">
+					<NcCheckboxRadioSwitch v-if="config.isResharingAllowed && share.type !== SHARE_TYPES.SHARE_TYPE_LINK"
+						:disabled="!canSetReshare"
+						:checked.sync="canReshare">
 						{{ t('file_sharing', 'Share') }}
 					</NcCheckboxRadioSwitch>
-					<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
-						{{ t('file_sharing', 'Download') }}
-					</NcCheckboxRadioSwitch>
 					<NcCheckboxRadioSwitch :disabled="!canSetDelete" :checked.sync="canDelete">
 						{{ t('file_sharing', 'Delete') }}
 					</NcCheckboxRadioSwitch>
@@ -542,7 +551,7 @@ export default {
 			return this.share.newPassword !== undefined
 		},
 		passwordExpirationTime() {
-			if (this.share.passwordExpirationTime === null) {
+			if (!this.isValidShareAttribute(this.share.passwordExpirationTime)) {
 				return null
 			}
 
@@ -629,9 +638,6 @@ export default {
 			if (hasPermissions(this.share.permissions, ATOMIC_PERMISSIONS.SHARE)) {
 				perms.push('share')
 			}
-			if (this.share.hasDownloadPermission) {
-				perms.push('download')
-			}
 			const capitalizeFirstAndJoin = array => array.map((item, index) => index === 0 ? item[0].toUpperCase() + item.substring(1) : item).join(', ')
 
 			return capitalizeFirstAndJoin(perms)
@@ -676,7 +682,7 @@ export default {
 			}
 		},
 		expandCustomPermissions() {
-			if (!this.advancedSectionAccordionExpanded)	{
+			if (!this.advancedSectionAccordionExpanded) {
 				this.advancedSectionAccordionExpanded = true
 			}
 			this.toggleCustomPermissions()
@@ -687,34 +693,24 @@ export default {
 			this.setCustomPermissions = isCustomPermissions
 		},
 		async initializeAttributes() {
-			let hasAdvancedAttributes = false
 
 			if (this.isNewShare) {
 				if (this.isPasswordEnforced && this.isPublicShare) {
 					this.share.newPassword = await GeneratePassword()
 					this.advancedSectionAccordionExpanded = true
 				}
+				if (this.hasExpirationDate) {
+					this.share.expireDate = this.defaultExpiryDate
+					this.advancedSectionAccordionExpanded = true
+				}
 				return
 			}
 
-			if (this.isValidShareAttribute(this.share.note)) {
-				this.writeNoteToRecipientIsChecked = true
-				hasAdvancedAttributes = true
-			}
-
-			if (this.isValidShareAttribute(this.share.password)) {
-				hasAdvancedAttributes = true
-			}
-
-			if (this.isValidShareAttribute(this.share.expireDate)) {
-				hasAdvancedAttributes = true
-			}
-
-			if (this.isValidShareAttribute(this.share.label)) {
-				hasAdvancedAttributes = true
-			}
-
-			if (hasAdvancedAttributes) {
+			if (
+				this.isValidShareAttribute(this.share.password)
+				|| this.isValidShareAttribute(this.share.expireDate)
+				|| this.isValidShareAttribute(this.share.label)
+			) {
 				this.advancedSectionAccordionExpanded = true
 			}
 
@@ -1031,6 +1027,7 @@ export default {
 		flex-direction: column;
 		justify-content: space-between;
 		align-items: flex-start;
+		background: linear-gradient(to bottom, rgba(255, 255, 255, 0), var(--color-main-background));
 
 		.button-group {
 			display: flex;

diff --git a/dist/3609-3609.js b/dist/3609-3609.js
diff --git a/dist/3609-3609.js.map b/dist/3609-3609.js.map
diff --git a/dist/50-50.js b/dist/50-50.js
diff --git a/dist/50-50.js.map b/dist/50-50.js.map
diff --git a/dist/5329-5329.js b/dist/5329-5329.js
diff --git a/dist/485-485.js.LICENSE.txt → dist/5329-5329.js.LICENSE.txt b/dist/485-485.js.LICENSE.txt → dist/5329-5329.js.LICENSE.txt
diff --git a/dist/5329-5329.js.map b/dist/5329-5329.js.map
diff --git a/dist/5912-5912.js b/dist/5912-5912.js
diff --git a/dist/5912-5912.js.map b/dist/5912-5912.js.map
diff --git a/dist/6678-6678.js b/dist/6678-6678.js
diff --git a/dist/6678-6678.js.map b/dist/6678-6678.js.map
diff --git a/dist/6870-6870.js b/dist/6870-6870.js
diff --git a/dist/6870-6870.js.map b/dist/6870-6870.js.map
diff --git a/dist/7816-7816.js b/dist/7816-7816.js
diff --git a/dist/7816-7816.js.map b/dist/7816-7816.js.map
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-init.js b/dist/comments-init.js
diff --git a/dist/comments-init.js.map b/dist/comments-init.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.LICENSE.txt b/dist/core-common.js.LICENSE.txt
@@ -5,6 +5,17 @@
  * @license  MIT
  */
 
+/*!
+ * Sizzle CSS Selector Engine v2.3.10
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://js.foundation/
+ *
+ * Date: 2023-02-14
+ */
+
 /*!
  * The buffer module from node.js, for the browser.
  *
@@ -42,14 +53,17 @@
  */
 
 /*!
- * jQuery JavaScript Library v3.7.1
+ * jQuery JavaScript Library v3.6.4
  * https://jquery.com/
  *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2023-08-28T13:37Z
+ * Date: 2023-03-08T15:28Z
  */
 
 /*!

diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/core-unsupported-browser-redirect.js b/dist/core-unsupported-browser-redirect.js
diff --git a/dist/core-unsupported-browser-redirect.js.map b/dist/core-unsupported-browser-redirect.js.map
diff --git a/dist/core-unsupported-browser.js b/dist/core-unsupported-browser.js
diff --git a/dist/core-unsupported-browser.js.map b/dist/core-unsupported-browser.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.js.map
diff --git a/dist/federatedfilesharing-vue-settings-admin.js b/dist/federatedfilesharing-vue-settings-admin.js
diff --git a/dist/federatedfilesharing-vue-settings-admin.js.map b/dist/federatedfilesharing-vue-settings-admin.js.map
diff --git a/dist/federatedfilesharing-vue-settings-personal.js b/dist/federatedfilesharing-vue-settings-personal.js
diff --git a/dist/federatedfilesharing-vue-settings-personal.js.map b/dist/federatedfilesharing-vue-settings-personal.js.map
diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files-personal-settings.js b/dist/files-personal-settings.js
diff --git a/dist/files-personal-settings.js.map b/dist/files-personal-settings.js.map
diff --git a/dist/files-reference-files.js b/dist/files-reference-files.js
diff --git a/dist/files-reference-files.js.map b/dist/files-reference-files.js.map
diff --git a/dist/files-sidebar.js b/dist/files-sidebar.js
diff --git a/dist/files-sidebar.js.map b/dist/files-sidebar.js.map
diff --git a/dist/files_external-init.js b/dist/files_external-init.js
diff --git a/dist/files_external-init.js.map b/dist/files_external-init.js.map
diff --git a/dist/files_reminders-main.js b/dist/files_reminders-main.js
diff --git a/dist/files_reminders-main.js.map b/dist/files_reminders-main.js.map
diff --git a/dist/files_sharing-init.js b/dist/files_sharing-init.js
diff --git a/dist/files_sharing-init.js.map b/dist/files_sharing-init.js.map
diff --git a/dist/files_sharing-personal-settings.js b/dist/files_sharing-personal-settings.js
diff --git a/dist/files_sharing-personal-settings.js.map b/dist/files_sharing-personal-settings.js.map
diff --git a/dist/files_trashbin-main.js b/dist/files_trashbin-main.js
diff --git a/dist/files_trashbin-main.js.map b/dist/files_trashbin-main.js.map
diff --git a/dist/files_versions-files_versions.js b/dist/files_versions-files_versions.js