Skip to content

Commit

Permalink
fix(files_sharing): Correct property enforced property names
Browse files Browse the repository at this point in the history
Signed-off-by: nfebe <fenn25.fn@gmail.com>
  • Loading branch information
nfebe committed Dec 11, 2024
1 parent e7e902c commit ba32e9f
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions apps/files_sharing/src/components/SharingEntryLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -484,23 +484,22 @@ export default {
pendingDefaultExpirationDate() {
return (this.config.defaultExpirationDate instanceof Date || !isNaN(new Date(this.config.defaultExpirationDate).getTime())) && this.isPendingShare
},

isPendingShare() {
return !!(this.share && !this.share.id)
},
sharePolicyHasRequiredProperties() {
sharePolicyHasEnforcedProperties() {
return this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced
},

requiredPropertiesMissing() {
enforcedPropertiesMissing() {
// Ensure share exist and the share policy has required properties
if (!this.sharePolicyHasRequiredProperties) {
if (!this.sharePolicyHasEnforcedProperties) {
return false
}

if (!this.share) {
// if no share, we can't tell if properties are missing or not so we assume properties are missing
return true
return true
}

// If share has ID, then this is an incoming link share created from the existing link share
Expand Down Expand Up @@ -602,7 +601,7 @@ export default {
* @param {boolean} shareReviewComplete if the share was reviewed
* @return {boolean}
*/
shareRequiresReview(shareReviewComplete) {
shareRequiresReview(shareReviewComplete) {
// If a user clicks 'Create share' it means they have reviewed the share
if (shareReviewComplete) {
return false
Expand All @@ -613,7 +612,7 @@ export default {
* Create a new share link and append it to the list
* @param {boolean} shareReviewComplete if the share was reviewed
*/
async onNewLinkShare(shareReviewComplete = false) {
async onNewLinkShare(shareReviewComplete = false) {
this.logger.debug('onNewLinkShare called (with this.share)', this.share)
// do not run again if already loading
if (this.loading) {
Expand All @@ -629,7 +628,7 @@ export default {
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
}

this.logger.debug('Missing required properties?', this.requiredPropertiesMissing)
this.logger.debug('Missing required properties?', this.enforcedPropertiesMissing)
// Do not push yet if we need a password or an expiration date: show pending menu
// A share would require a review for example is default expiration date is set but not enforced, this allows
// the user to review the share and remove the expiration date if they don't want it
Expand Down

0 comments on commit ba32e9f

Please sign in to comment.