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.

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

[stable27] 44032 fix show new shares without refresh #44464

Merged
merged 3 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
115 changes: 79 additions & 36 deletions apps/files_sharing/src/components/SharingEntryLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ import GeneratePassword from '../utils/GeneratePassword.js'
import Share from '../models/Share.js'
import SharesMixin from '../mixins/SharesMixin.js'
import ShareDetails from '../mixins/ShareDetails.js'
import { getLoggerBuilder } from '@nextcloud/logger'

export default {
name: 'SharingEntryLink',
Expand Down Expand Up @@ -238,6 +239,7 @@ export default {

data() {
return {
shareCreationComplete: false,
showDropdown: false,
copySuccess: true,
copied: false,
Expand All @@ -247,6 +249,10 @@ export default {

ExternalLegacyLinkActions: OCA.Sharing.ExternalLinkActions.state,
ExternalShareActions: OCA.Sharing.ExternalShareActions.state,
logger: getLoggerBuilder()
.setApp('files_sharing')
.detectUser()
.build(),
}
},

Expand Down Expand Up @@ -407,6 +413,32 @@ export default {
return this.config.isDefaultExpireDateEnforced && this.share && !this.share.id
},

sharePolicyHasRequiredProperties() {
return this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced
},

requiredPropertiesMissing() {
// Ensure share exist and the share policy has required properties
if (!this.sharePolicyHasRequiredProperties) {
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
}

// If share has ID, then this is an incoming link share created from the existing link share
// Hence assume required properties
if (this.share.id) {
return true
}
// Check if either password or expiration date is missing and enforced
const isPasswordMissing = this.config.enforcePasswordForPublicLink && !this.share.password
const isExpireDateMissing = this.config.isDefaultExpireDateEnforced && !this.share.expireDate

return isPasswordMissing || isExpireDateMissing
},
// if newPassword exists, but is empty, it means
// the user deleted the original password
hasUnsavedPassword() {
Expand Down Expand Up @@ -483,6 +515,7 @@ export default {
* Create a new share link and append it to the list
*/
async onNewLinkShare() {
this.logger.debug('onNewLinkShare called (with this.share)', this.share)
// do not run again if already loading
if (this.loading) {
return
Expand All @@ -497,28 +530,13 @@ export default {
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
}

this.logger.debug('Missing required properties?', this.requiredPropertiesMissing)
// do not push yet if we need a password or an expiration date: show pending menu
if (this.config.enableLinkPasswordByDefault || this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced) {
if (this.sharePolicyHasRequiredProperties && this.requiredPropertiesMissing) {
this.pending = true
this.shareCreationComplete = false

// if a share already exists, pushing it
if (this.share && !this.share.id) {
// if the share is valid, create it on the server
if (this.checkShare(this.share)) {
try {
await this.pushNewLinkShare(this.share, true)
} catch (e) {
this.pending = false
console.error(e)
return false
}
return true
} else {
this.open = true
OC.Notification.showTemporary(t('files_sharing', 'Error, please enter proper password and/or expiration date'))
return false
}
}
this.logger.info('Share policy requires mandated properties (password)...')

// ELSE, show the pending popovermenu
// if password default or enforced, pre-fill with random one
Expand All @@ -540,8 +558,32 @@ export default {

// Nothing is enforced, creating share directly
} else {

// if a share already exists, pushing it
if (this.share && !this.share.id) {
// if the share is valid, create it on the server
if (this.checkShare(this.share)) {
try {
this.logger.info('Sending existing share to server', this.share)
await this.pushNewLinkShare(this.share, true)
this.shareCreationComplete = true
this.logger.info('Share created on server', this.share)
} catch (e) {
this.pending = false
this.logger.error('Error creating share', e)
return false
}
return true
} else {
this.open = true
showError(t('files_sharing', 'Error, please enter proper password and/or expiration date'))
return false
}
}

const share = new Share(shareDefaults)
await this.pushNewLinkShare(share)
this.shareCreationComplete = true
}
},

Expand Down Expand Up @@ -581,8 +623,8 @@ export default {
const newShare = await this.createShare(options)

this.open = false
this.shareCreationComplete = true
console.debug('Link share created', newShare)

// if share already exists, copy link directly on next tick
let component
if (update) {
Expand Down Expand Up @@ -624,8 +666,10 @@ export default {
this.onSyncError('pending', message)
}
throw data

} finally {
this.loading = false
this.shareCreationComplete = true
}
},
async copyLink() {
Expand Down Expand Up @@ -728,7 +772,9 @@ export default {
// this.share already exists at this point,
// but is incomplete as not pushed to server
// YET. We can safely delete the share :)
this.$emit('remove:share', this.share)
if (!this.shareCreationComplete) {
this.$emit('remove:share', this.share)
}
},

toggleQuickShareSelect() {
Expand All @@ -752,25 +798,22 @@ export default {
width: 80%;
min-width: 80%;

&__desc {
display: flex;
flex-direction: column;
line-height: 1.2em;
&__desc {
display: flex;
flex-direction: column;
line-height: 1.2em;

p {
color: var(--color-text-maxcontrast);
}
p {
color: var(--color-text-maxcontrast);
}

&__title {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
&__title {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
}

&__copy {

}
}

&:not(.sharing-entry--share) &__actions {
Expand Down
3 changes: 2 additions & 1 deletion apps/files_sharing/src/mixins/ShareDetails.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Share from '../models/Share.js'
import Config from '../services/ConfigService.js'

export default {
methods: {
Expand Down Expand Up @@ -50,7 +51,7 @@ export default {
user: shareRequestObject.shareWith,
share_with_displayname: shareRequestObject.displayName,
subtitle: shareRequestObject.subtitle,
permissions: shareRequestObject.permissions,
permissions: shareRequestObject.permissions ?? new Config().defaultPermissions,
expiration: '',
}

Expand Down
1 change: 1 addition & 0 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@ export default {
this.share = share
this.$emit('add:share', this.share)
} else {
this.$emit('update:share', this.share)
this.queueUpdate(...permissionsAndAttributes)
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/views/SharingLinkList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default {
*/
addShare(share, resolve) {
// eslint-disable-next-line vue/no-mutating-props
this.shares.unshift(share)
this.shares = [share, ...this.shares]
this.awaitForShare(share, resolve)
},

Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

Loading