Skip to content

Properly build the node we pass to the Viewer #675

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julien-nc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Properly build the node we pass to the Viewer #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions src/components/fields/ListOfMediaField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,10 @@ import ChooseInputFileButton from './ChooseInputFileButton.vue'
import UploadInputFileButton from './UploadInputFileButton.vue'
import AudioRecorderWrapper from './AudioRecorderWrapper.vue'

import { generateOcsUrl, generateUrl, generateRemoteUrl } from '@nextcloud/router'
import { generateOcsUrl, generateUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { getCurrentUser } from '@nextcloud/auth'
import { File } from '@nextcloud/files'
import { getClient, getDefaultPropfind, getRootPath, resultToNode } from '@nextcloud/files/dav'
import { getViewer, registerDefaultHandlers } from '@nextcloud/viewer'
import { uploadInputFile } from '../../utils.js'

Expand Down Expand Up @@ -335,17 +334,14 @@ export default {
taskId: this.providedCurrentTaskId(),
fileId,
})
return axios.post(url).then(response => {
return axios.post(url).then(async response => {
const savedPath = response.data.ocs.data.path
console.debug('[assistant] view output file', savedPath)
const user = getCurrentUser()
const node = new File({
source: generateRemoteUrl('dav') + `/files/${user.uid}${savedPath}`,
id: response.data.ocs.data.fileId,
root: `/files/${user.uid}`,
owner: user.uid,
mime: response.data.ocs.data.mime,
const { data } = await getClient().stat(`${getRootPath()}${savedPath}`, {
details: true,
data: getDefaultPropfind(),
})
const node = resultToNode(data)
registerDefaultHandlers()
getViewer().open([node], node)
}).catch(error => {
Expand Down
18 changes: 7 additions & 11 deletions src/components/fields/MediaField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,10 @@ import ChooseInputFileButton from './ChooseInputFileButton.vue'

import { SHAPE_TYPE_NAMES, VALID_AUDIO_MIME_TYPES, VALID_IMAGE_MIME_TYPES, VALID_VIDEO_MIME_TYPES } from '../../constants.js'

import { generateOcsUrl, generateUrl, generateRemoteUrl } from '@nextcloud/router'
import { generateOcsUrl, generateUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { getCurrentUser } from '@nextcloud/auth'
import { File } from '@nextcloud/files'
import { getClient, getDefaultPropfind, getRootPath, resultToNode } from '@nextcloud/files/dav'
import { getViewer, registerDefaultHandlers } from '@nextcloud/viewer'
import { uploadInputFile } from '../../utils.js'

Expand Down Expand Up @@ -312,17 +311,14 @@ export default {
taskId: this.providedCurrentTaskId(),
fileId: this.value,
})
return axios.post(url).then(response => {
return axios.post(url).then(async response => {
const savedPath = response.data.ocs.data.path
console.debug('[assistant] view output file', savedPath)
const user = getCurrentUser()
const node = new File({
source: generateRemoteUrl('dav') + `/files/${user.uid}${savedPath}`,
id: response.data.ocs.data.fileId,
root: `/files/${user.uid}`,
owner: user.uid,
mime: response.data.ocs.data.mime,
const { data } = await getClient().stat(`${getRootPath()}${savedPath}`, {
details: true,
data: getDefaultPropfind(),
})
const node = resultToNode(data)
registerDefaultHandlers()
getViewer().open([node], node)
}).catch(error => {
Expand Down
Loading