Added media permalink resolver test.

Author: azaslonov

specs/mediaPermalinkResolver.spec.ts

@@ -0,0 +1,80 @@
+import { MediaContract } from "@paperbits/common/media";
+import { MediaPermalinkResolver } from "@paperbits/common/media/mediaPermalinkResolver.publish";
+import { PictureViewModelBinder } from "../src/picture/ko/pictureViewModelBinder";
+import { PictureModelBinder } from "../src/picture/pictureModelBinder";
+import { expect } from "chai";
+
+
+describe("Media permalink resolver", async () => {
+    const styleCompiler: any = {
+        getStyleModelAsync: (styles: any) => {
+            return Promise.resolve({});
+        }
+    }
+
+    const pictureContract: any = {
+        type: "picture",
+        caption: "Logo",
+        width: "150px",
+        height: "40px",
+        sourceKey: "uploads/7aa4ab1f-cf14-ef3c-c4c5-420434f4de9e"
+    }
+
+    it("Correctly resolves permalink for uploaded media.", async () => {
+        const mediaService: any = {
+            getMediaByKey: (mediaKey: string): Promise<MediaContract> => {
+                const mediaContract: MediaContract = {
+                    key: "uploads/7aa4ab1f-cf14-ef3c-c4c5-420434f4de9e",
+                    fileName: "your-specs-logo.svg",
+                    blobKey: "7aa4ab1f-cf14-ef3c-c4c5-420434f4de9e",
+                    description: "Company logo",
+                    keywords: "logo",
+                    permalink: "/content/your-specs-logo.svg",
+                    mimeType: "image/svg+xml",
+                    variants: []
+                }
+
+                return Promise.resolve(mediaContract);
+            }
+        };
+
+        const permalinkResolver = new MediaPermalinkResolver(mediaService);
+        const pictureViewModelBinder = new PictureViewModelBinder(styleCompiler, permalinkResolver, mediaService);
+        const modelBinder = new PictureModelBinder(permalinkResolver);
+
+        const pictureModel = await modelBinder.contractToModel(pictureContract, null);
+        const pictureWidgetState: any = {};
+        await pictureViewModelBinder.modelToState(pictureModel, pictureWidgetState);
+
+        expect(pictureWidgetState.sourceUrl).to.be.equal("/content/your-specs-logo.svg");
+    });
+
+    it("Correctly resolves permalink for referenced media.", async () => {
+        const mediaService: any = {
+            getMediaByKey: (mediaKey: string): Promise<MediaContract> => {
+                const mediaContract: MediaContract = {
+                    key: "uploads/7aa4ab1f-cf14-ef3c-c4c5-420434f4de9e",
+                    fileName: "your-specs-logo.svg",
+                    downloadUrl: "https://content/your-specs-logo.svg",
+                    description: "Company logo",
+                    keywords: "logo",
+                    permalink: "/content/your-specs-logo.svg",
+                    mimeType: "image/svg+xml",
+                    variants: []
+                }
+
+                return Promise.resolve(mediaContract);
+            }
+        };
+
+        const permalinkResolver = new MediaPermalinkResolver(mediaService);
+        const pictureViewModelBinder = new PictureViewModelBinder(styleCompiler, permalinkResolver, mediaService);
+        const modelBinder = new PictureModelBinder(permalinkResolver);
+
+        const pictureModel = await modelBinder.contractToModel(pictureContract, null);
+        const pictureWidgetState: any = {};
+        await pictureViewModelBinder.modelToState(pictureModel, pictureWidgetState);
+
+        expect(pictureWidgetState.sourceUrl).to.be.equal("/content/your-specs-logo.svg");
+    });
+});    

src/picture/ko/pictureViewModelBinder.ts

@@ -31,7 +31,7 @@ export class PictureViewModelBinder implements ViewModelBinder<PictureModel, Pic
         if (model.sourceKey) {
             const media = await this.mediaService.getMediaByKey(model.sourceKey);
 
-            if (media?.variants) {
+            if (media?.variants?.length > 0) {
                 const variants = media.variants.map(variantContract => {
                     const variantModel = new MediaVariantModel();
                     variantModel.width = variantContract.width;

src/publishing/mediaPublisher.ts

@@ -64,7 +64,7 @@ export class MediaPublisher implements IPublisher {
     private async publishFromStorageStream(permalink: string, mediaFile: MediaVariantContract): Promise<void> {
         try {
             const contentStream = await this.blobStorage.getBlobAsStream(mediaFile.blobKey);
-            
+
             if (!contentStream) {
                 this.logger.trackEvent("Publishing", { message: `Blob with key ${mediaFile.blobKey} not found in source storage.` });
                 return null;
@@ -89,7 +89,7 @@ export class MediaPublisher implements IPublisher {
 
     private async renderMediaFile(permalink: string, mediaFile: MediaVariantContract): Promise<void> {
         if (mediaFile.blobKey) {
-            if(this.blobStorage.getBlobAsStream) {
+            if (this.blobStorage.getBlobAsStream) {
                 await this.publishFromStorageStream(permalink, mediaFile);
             } else {
                 await this.publishFromStorage(permalink, mediaFile);

src/workshops/media/ko/mediaItem.ts

@@ -36,8 +36,8 @@ export class MediaItem {
         this.setThumbnail(mediaContract);
 
         this.isReferenced = ko.computed(() => {
-            return !!mediaContract.downloadUrl 
-                && (mediaContract.downloadUrl.startsWith("https://") || mediaContract.downloadUrl.startsWith("https//"));
+            return !mediaContract.blobKey
+                && (mediaContract.downloadUrl?.startsWith("http://") || mediaContract.downloadUrl?.startsWith("https//"));
         });
     }