Merge branch 'main' into BC-4710-new-tldraw-manage

hpi-schul-cloud · Oct 10, 2023 · 21223cb · 21223cb
2 parents 5f682ea + 81cd33e
commit 21223cb
Show file tree

Hide file tree

Showing 51 changed files with 1,576 additions and 1,191 deletions.
diff --git a/src/components/feature-board-file-element/FileContentElement.unit.ts b/src/components/feature-board-file-element/FileContentElement.unit.ts
@@ -1,4 +1,8 @@
-import { FileRecordScanStatus, PreviewStatus } from "@/fileStorageApi/v3";
+import {
+	FileRecordScanStatus,
+	PreviewStatus,
+	PreviewWidth,
+} from "@/fileStorageApi/v3";
 import NotifierModule from "@/store/notifier";
 import { AnyContentElement } from "@/types/board/ContentElement";
 import { convertDownloadToPreviewUrl } from "@/utils/fileHelper";
@@ -10,8 +14,8 @@ import { fileElementResponseFactory } from "@@/tests/test-utils/factory/fileElem
 import { fileRecordResponseFactory } from "@@/tests/test-utils/factory/filerecordResponse.factory";
 import { MountOptions, shallowMount } from "@vue/test-utils";
 import Vue from "vue";
-import FileContent from "./content/FileContent.vue";
 import FileContentElement from "./FileContentElement.vue";
+import FileContent from "./content/FileContent.vue";
 import { FileProperties } from "./shared/types/file-properties";
 import FileUpload from "./upload/FileUpload.vue";
 
@@ -131,7 +135,10 @@ describe("FileContentElement", () => {
 					name: fileRecordResponse.name,
 					isDownloadAllowed: true,
 					url: fileRecordResponse.url,
-					previewUrl: convertDownloadToPreviewUrl(fileRecordResponse.url),
+					previewUrl: convertDownloadToPreviewUrl(
+						fileRecordResponse.url,
+						PreviewWidth._500
+					),
 					size: fileRecordResponse.size,
 					previewStatus: fileRecordResponse.previewStatus,
 					element,
@@ -441,7 +448,10 @@ describe("FileContentElement", () => {
 					name: fileRecordResponse.name,
 					isDownloadAllowed: true,
 					url: fileRecordResponse.url,
-					previewUrl: convertDownloadToPreviewUrl(fileRecordResponse.url),
+					previewUrl: convertDownloadToPreviewUrl(
+						fileRecordResponse.url,
+						PreviewWidth._500
+					),
 					size: fileRecordResponse.size,
 					previewStatus: fileRecordResponse.previewStatus,
 					element,

diff --git a/src/components/feature-board-file-element/FileContentElement.vue b/src/components/feature-board-file-element/FileContentElement.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { FileRecordParentType } from "@/fileStorageApi/v3";
+import { FileRecordParentType, PreviewWidth } from "@/fileStorageApi/v3";
 import { FileElementResponse } from "@/serverApi/v3";
 import {
 	convertDownloadToPreviewUrl,
@@ -84,7 +84,7 @@ export default defineComponent({
 			}
 
 			const previewUrl = isPreviewPossible(fileRecord.value?.previewStatus)
-				? convertDownloadToPreviewUrl(fileRecord.value.url)
+				? convertDownloadToPreviewUrl(fileRecord.value.url, PreviewWidth._500)
 				: undefined;
 
 			return {

diff --git a/src/components/feature-board-file-element/content/display/FileDisplay.unit.ts b/src/components/feature-board-file-element/content/display/FileDisplay.unit.ts
@@ -1,8 +1,8 @@
 import { fileElementResponseFactory } from "@@/tests/test-utils";
 import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import { shallowMount } from "@vue/test-utils";
-import FileDescription from "./file-description/FileDescription.vue";
 import FileDisplay from "./FileDisplay.vue";
+import FileDescription from "./file-description/FileDescription.vue";
 import ImageDisplay from "./image-display/ImageDisplay.vue";
 
 describe("FileDisplay", () => {
@@ -48,6 +48,7 @@ describe("FileDisplay", () => {
 			const { wrapper, fileNameProp, previewUrlProp } = setup();
 
 			const props = wrapper.findComponent(ImageDisplay).attributes();
+
 			expect(props.name).toBe(fileNameProp);
 			expect(props.previewurl).toBe(previewUrlProp);
 			expect(props.iseditmode).toBe("true");

diff --git a/src/components/feature-board-file-element/content/display/FileDisplay.vue b/src/components/feature-board-file-element/content/display/FileDisplay.vue
@@ -2,6 +2,7 @@
 	<div>
 		<ImageDisplay
 			v-if="fileProperties.previewUrl"
+			:url="fileProperties.url"
 			:preview-url="fileProperties.previewUrl"
 			:name="fileProperties.name"
 			:is-edit-mode="isEditMode"