-
Notifications
You must be signed in to change notification settings - Fork 25
feat: Collabora Save As and Export #859
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7bcb0e1
feat: Collabora Save As and Export
kulmann 3dfb6dc
fix: changes after code review
kulmann 435364d
fix unit tests
AlexAndBear e977036
fix: changes after code review
kulmann 29c5429
fix: post message target
kulmann 0fb1c9f
fix infinite loop call on OcTextInputPassword select method
AlexAndBear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
packages/web-app-external/src/components/FileNameModal.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <template> | ||
| <form autocomplete="off" @submit.prevent="onConfirm"> | ||
| <oc-text-input | ||
| id="file-name-input" | ||
| v-model="newFileName" | ||
| class="oc-mb-s" | ||
| :label="$gettext('File name')" | ||
| required-mark | ||
| :error-message="errorMessage" | ||
| :fix-message-line="true" | ||
| :selection-range="inputSelectionRange" | ||
| @keydown.enter.prevent="emit('confirm')" | ||
| /> | ||
| <input type="submit" class="oc-hidden" /> | ||
| </form> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { extractNameWithoutExtension, Resource, SpaceResource } from '@opencloud-eu/web-client' | ||
| import { | ||
| Modal, | ||
| resolveFileNameDuplicate, | ||
| useClientService, | ||
| useIsResourceNameValid | ||
| } from '@opencloud-eu/web-pkg' | ||
| import { computed, ref, unref } from 'vue' | ||
| import { DavProperty } from '@opencloud-eu/web-client/webdav' | ||
| import { useTask } from 'vue-concurrency' | ||
|
|
||
| const { webdav } = useClientService() | ||
| const { isFileNameValid } = useIsResourceNameValid() | ||
|
|
||
| const { | ||
| space, | ||
| resource, | ||
| fileExtension = undefined, | ||
| callbackFn | ||
| } = defineProps<{ | ||
| space: SpaceResource | ||
| resource: Resource | ||
| fileExtension?: string | ||
| fileExtensionsShown?: boolean | ||
| modal: Modal | ||
| callbackFn: (newFileName: string) => Promise<void> | ||
| }>() | ||
| const emit = defineEmits(['confirm']) | ||
|
|
||
| const newFileName = ref('') | ||
| const parentResources = ref<Resource[]>([]) | ||
| const inputSelectionRange = ref<[number, number]>([0, resource?.name?.length || 0]) | ||
|
|
||
| const buildFileNameTask = useTask(function* () { | ||
| const { children: existingFiles } = yield webdav.listFiles( | ||
| space, | ||
| { fileId: resource.parentFolderId }, | ||
| { davProperties: [DavProperty.Name] } | ||
| ) | ||
| parentResources.value = existingFiles | ||
|
|
||
| const fileName = fileExtension | ||
| ? `${extractNameWithoutExtension(resource)}.${fileExtension}` | ||
| : resource.name | ||
| const hasConflict = existingFiles.some((f) => f.name === fileName) | ||
| newFileName.value = hasConflict | ||
| ? resolveFileNameDuplicate(fileName, fileExtension || resource.extension, existingFiles) | ||
| : fileName | ||
|
|
||
| inputSelectionRange.value = [ | ||
| 0, | ||
| extractNameWithoutExtension({ | ||
| name: unref(newFileName), | ||
| extension: fileExtension || resource.extension | ||
| } as Resource).length | ||
| ] | ||
| }) | ||
| buildFileNameTask.perform() | ||
|
|
||
| const errorMessage = computed(() => { | ||
| const { isValid, error } = isFileNameValid(resource, unref(newFileName), unref(parentResources)) | ||
| if (!isValid) { | ||
| return error | ||
| } | ||
| return undefined | ||
| }) | ||
|
|
||
| const onConfirm = async () => { | ||
| await callbackFn(unref(newFileName)) | ||
| } | ||
| defineExpose({ | ||
| onConfirm | ||
| }) | ||
| </script> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.