Merge pull request #330 from csf-dev/craigfowler/issue323

Resolve #323 - Omit empty properties

Author: craigfowler

CSF.Screenplay.JsonToHtmlReport.Template/src/js/ReportBehaviour/AssetBehaviour.js

@@ -6,7 +6,7 @@ export class AssetBehaviour {
     #assetModel;
 
     initialise() {
-        this.#linkElement.textContent = this.#assetModel.FileSummary;
+        this.#linkElement.textContent = this.#assetModel.Summary;
 
         if(imageTypes.includes(this.#assetModel.ContentType))
             this.#initialiseImage();
@@ -16,23 +16,23 @@ export class AssetBehaviour {
 
     #initialiseImage() {
         this.#linkElement.addEventListener('click', ev => {
-            const usesBlobUrl = !!this.#assetModel.FileData
-            const url = usesBlobUrl ? this.#getBlobUrl() : this.#assetModel.FilePath;
-            this.#litebox.open(url, this.#assetModel.FileName, this.#assetModel.FileSummary, usesBlobUrl);
+            const usesBlobUrl = !!this.#assetModel.Data
+            const url = usesBlobUrl ? this.#getBlobUrl() : this.#assetModel.Path;
+            this.#litebox.open(url, this.#assetModel.Name, this.#assetModel.Summary, usesBlobUrl);
             ev.preventDefault();
         });
         this.#linkElement.href = null;
     }
 
     #initialiseDownload() {
-        const usesBlobUrl = !!this.#assetModel.FileData
-        const url = usesBlobUrl ? this.#getBlobUrl() : this.#assetModel.FilePath;
+        const usesBlobUrl = !!this.#assetModel.Data
+        const url = usesBlobUrl ? this.#getBlobUrl() : this.#assetModel.Path;
         this.#linkElement.href = url;
-        this.#linkElement.download = this.#assetModel.FileName;
+        this.#linkElement.download = this.#assetModel.Name;
     }
 
     #getBlobUrl() {
-        const dataBytes = this.#base64ToBytes(this.#assetModel.FileData);
+        const dataBytes = this.#base64ToBytes(this.#assetModel.Data);
         const blob = new Blob([dataBytes], { type: this.#assetModel.ContentType });
         return URL.createObjectURL(blob);
     }

CSF.Screenplay.JsonToHtmlReport.Template/src/js/ReportLoader.js

@@ -28,7 +28,7 @@ export class ReportLoader {
         return {
             Metadata: {
                 Timestamp: new Date(),
-                ReportFormatVersion: "0.0.0",
+                ReportVersion: "0.0.0",
             },
             Performances: [],
         };

CSF.Screenplay.JsonToHtmlReport.Template/src/js/ReportLoader.spec.js

@@ -30,7 +30,7 @@ test('ReportLoader should return an empty report if the specified script element
     expect(jsonData).toEqual({
         Metadata: {
             Timestamp: new Date(),
-            ReportFormatVersion: "0.0.0",
+            ReportVersion: "0.0.0",
         },
         Performances: [],
     });

CSF.Screenplay.JsonToHtmlReport.Template/src/js/ReportWriter/FeatureElementCreator.js

@@ -19,8 +19,8 @@ export class FeatureElementCreator {
         featureElement.querySelector('.featureName').addEventListener('click', ev => ev.currentTarget.parentElement.classList.toggle('collapsed'));
 
         const featureIdentifierElement = featureElement.querySelector('.featureIdentifier');
-        if (feature.feature && !feature.feature.WasIdentifierAutoGenerated)
-            featureIdentifierElement.textContent = feature.feature.Identifier;
+        if (feature.feature && !feature.feature.IsGeneratedId)
+            featureIdentifierElement.textContent = feature.feature.Id;
         else
             featureIdentifierElement.remove();