chore(attachments): Remove obsolete code

* `getMetadata()` from AttachmentResolver class.
* `isSupportedImage` logic from ImageView node. Was never used.
* `hasPreview=true` logic from AttachmentResolver class.

Signed-off-by: Jonas <[email protected]>

cypress/e2e/nodes/ImageView.spec.js

@@ -83,23 +83,6 @@ describe('Image View', () => {
 				.should('have.attr', 'src')
 				.should('contain', `/dav/files/${user.userId}/github.png`)
 		})
-
-		it('with preview', () => {
-			cy.get('.files-fileList tr[data-file="github.png"]')
-				.should('have.attr', 'data-id')
-				.then(imageId => {
-					const fileName = `${Cypress.currentTest.title}.md`
-
-					createMarkdown(fileName, `# from image id\n\n ![${imageId}](github.png?fileId=${imageId}&hasPreview=true)`)
-
-					cy.openFile(fileName, { force: true })
-
-					cy.getContent()
-						.find('[data-component="image-view"] img')
-						.should('have.attr', 'src')
-						.should('contains', `core/preview?fileId=${imageId}&file=${encodeURIComponent('/github.png')}`, { timeout: 5000 })
-				})
-		})
 	})
 
 	describe('fail to load', () => {

src/helpers/mime.js

@@ -20,18 +20,6 @@
  *
  */
 
-const mimetypesImages = [
-	'image/png',
-	'image/jpeg',
-	'image/jpg',
-	'image/gif',
-	'image/x-xbitmap',
-	'image/x-ms-bmp',
-	'image/bmp',
-	'image/svg+xml',
-	'image/webp',
-]
-
 const openMimetypesMarkdown = [
 	'text/markdown',
 ]
@@ -68,7 +56,6 @@ if (!window.oc_appswebroots?.richdocuments && !window.oc_appswebroots?.onlyoffic
 const openMimetypes = [...openMimetypesMarkdown, ...openMimetypesPlainText]
 
 export {
-	mimetypesImages,
 	openMimetypes,
 	openMimetypesMarkdown,
 	openMimetypesPlainText,

src/nodes/ImageView.vue

@@ -107,13 +107,6 @@
 			</div>
 			<div v-else class="image-view__cant_display">
 				<transition name="fade">
-					<div v-show="loaded">
-						<a :href="internalLinkOrImage" target="_blank">
-							<span v-if="!isSupportedImage">{{ alt }}</span>
-						</a>
-					</div>
-				</transition>
-				<transition v-if="isSupportedImage" name="fade">
 					<div v-show="loaded" class="image__caption">
 						<input ref="altInput"
 							type="text"
@@ -139,12 +132,11 @@ import { showError } from '@nextcloud/dialogs'
 import ShowImageModal from '../components/ImageView/ShowImageModal.vue'
 import store from '../mixins/store.js'
 import { useAttachmentResolver } from '../components/Editor.provider.js'
-import { mimetypesImages as IMAGE_MIMES } from '../helpers/mime.js'
 import { emit } from '@nextcloud/event-bus'
-import { generateUrl } from '@nextcloud/router'
 import { NodeViewWrapper } from '@tiptap/vue-2'
 import { Image as ImageIcon, Delete as DeleteIcon } from '../components/icons.js'
 
+/*
 const getQueryVariable = (src, variable) => {
 	const query = src.split('?')[1]
 	if (typeof query === 'undefined') {
@@ -161,6 +153,7 @@ const getQueryVariable = (src, variable) => {
 		}
 	}
 }
+ */
 
 class LoadImageError extends Error {
 
@@ -219,29 +212,23 @@ export default {
 			return this.showDeleteIcon && !this.isMediaAttachment
 		},
 		canDisplayImage() {
-			if (!this.isSupportedImage) {
-				return false
-			}
-
 			if (this.failed && this.loaded) {
 				return true
 			}
 
 			return this.loaded && this.imageLoaded
 		},
+		/*
 		imageFileId() {
 			return getQueryVariable(this.src, 'fileId')
 		},
-		isSupportedImage() {
-			return typeof this.mime === 'undefined'
-				|| IMAGE_MIMES.indexOf(this.mime) !== -1
-		},
 		internalLinkOrImage() {
 			if (this.imageFileId) {
 				return generateUrl('/f/' + this.imageFileId)
 			}
 			return this.src
 		},
+		 */
 		src: {
 			get() {
 				return this.node.attrs.src || ''
@@ -272,14 +259,6 @@ export default {
 		this.editor.on('update', ({ editor }) => {
 			this.isEditable = editor.isEditable
 		})
-		if (!this.isSupportedImage) {
-			// TODO check if hasPreview and render a file preview if available
-			this.failed = true
-			this.imageLoaded = false
-			this.loaded = true
-			this.errorMessage = t('text', 'Unsupported image type')
-			return
-		}
 		this.loadPreview()
 			.catch(this.onImageLoadFailure)
 	},

src/services/AttachmentResolver.js

@@ -22,10 +22,7 @@
 
 import { generateUrl, generateRemoteUrl } from '@nextcloud/router'
 import pathNormalize from 'path-normalize'
-import axios from '@nextcloud/axios'
-import { formatFileSize } from '@nextcloud/files'
 
-import { logger } from '../helpers/logger.js'
 import store from '../store/index.js'
 
 const setAttachmentList = (val) => store.dispatch('text/setAttachmentList', val)
@@ -80,13 +77,6 @@ export default class AttachmentResolver {
 				attachment = findAttachment(imageFileName)
 			}
 
-			if (!attachment) {
-				// Native attachment not found. Let's stop here.
-				return []
-			}
-		}
-
-		if (attachment) {
 			return attachment
 		}
 
@@ -98,14 +88,6 @@ export default class AttachmentResolver {
 			}
 		}
 
-		if (hasPreview(src)) { // && this.#mime !== 'image/gif') {
-			return {
-				isImage: true,
-				previewUrl: this.#previewUrl(src),
-				fullUrl: src,
-			}
-		}
-
 		// Fallback: Return DAV url
 		return {
 			isImage: true,
@@ -114,40 +96,6 @@ export default class AttachmentResolver {
 		}
 	}
 
-	#textApiParams() {
-		if (this.#session) {
-			return {
-				documentId: this.#session.documentId,
-				sessionId: this.#session.id,
-				sessionToken: this.#session.token,
-			}
-		}
-
-		return {}
-	}
-
-	#previewUrl(src) {
-		const imageFileId = getQueryVariable(src, 'fileId')
-		const path = this.#filePath(src)
-		const fileQuery = `file=${encodeURIComponent(path)}`
-		const query = fileQuery + '&x=1024&y=1024&a=true'
-
-		if (this.#user && imageFileId) {
-			return generateUrl(`/core/preview?fileId=${imageFileId}&${query}`)
-		}
-
-		if (this.#user) {
-			return generateUrl(`/core/preview.png?${query}`)
-		}
-
-		if (this.#shareToken) {
-			return generateUrl(`/apps/files_sharing/publicpreview/${this.#shareToken}?${query}`)
-		}
-
-		logger.error('No way to authenticate image retrival - need to be logged in or provide a token')
-		return src
-	}
-
 	#davUrl(src) {
 		if (this.#user) {
 			const uid = this.#user.uid
@@ -184,17 +132,6 @@ export default class AttachmentResolver {
 		return pathNormalize(f)
 	}
 
-	async getMetadata(src) {
-		const headResponse = await axios.head(src)
-		const mimeType = headResponse.headers['content-type']
-		const size = formatFileSize(headResponse.headers['content-length'])
-		return { mimeType, size }
-	}
-
-	getMimeUrl(mimeType) {
-		return mimeType ? OC.MimeType.getIconUrl(mimeType) : null
-	}
-
 }
 
 /**
@@ -212,39 +149,3 @@ function isDirectUrl(src) {
 		|| src.match(/^(\/index.php)?\/core\/preview/)
 		|| src.match(/^(\/index.php)?\/apps\/files_sharing\/publicpreview\//)
 }
-
-/**
- * Check if the given url has a preview
- *
- * @param {string} src - the url to check
- */
-function hasPreview(src) {
-	return getQueryVariable(src, 'hasPreview') === 'true'
-}
-
-/**
- * Extract the value of a query variable from the given url
- *
- * @param {string} src - the url to extract query variable from
- * @param {string} variable - name of the variable to read out
- */
-function getQueryVariable(src, variable) {
-	const query = src.split('?')[1]
-
-	if (typeof query === 'undefined') {
-		return
-	}
-
-	const vars = query.split(/[&#]/)
-
-	if (typeof vars === 'undefined') {
-		return
-	}
-
-	for (let i = 0; i < vars.length; i++) {
-		const pair = vars[i].split('=')
-		if (decodeURIComponent(pair[0]) === variable) {
-			return decodeURIComponent(pair[1])
-		}
-	}
-}