feat(release-notes): add support for release notes as array

EdricChan03 · Nov 13, 2019 · 7784351 · 7784351
1 parent e923f97
commit 7784351
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/projects/rss-reader/src/app/pages/release-notes/release-notes.component.html b/projects/rss-reader/src/app/pages/release-notes/release-notes.component.html
@@ -17,14 +17,17 @@ <h2 id="version-{{ version }}">
         <ng-container *ngIf="isStr(releaseNote) && isUrl(releaseNote)">
           <p>See this <a [href]="releaseNote">link</a> for the release notes.</p>
         </ng-container>
-        <ng-container *ngIf="!isStr(releaseNote)">
+        <ng-container *ngIf="!isStr(releaseNote) && isObj(releaseNote)">
           <ng-container *ngIf="isArray(releaseNote.summary)">
             <p [innerHTML]="joinReleaseNotes(releaseNote.summary) | markdown"></p>
           </ng-container>
           <ng-container *ngIf="!isArray(releaseNote.summary) && isUrl(releaseNote.summary)">
             <p>See this <a [href]="releaseNote.summary">link</a> for more info.</p>
           </ng-container>
         </ng-container>
+        <ng-container *ngIf="!isStr(releaseNote) && isArray(releaseNote)">
+          <p [innerHTML]="joinReleaseNotes(releaseNote) | markdown"></p>
+        </ng-container>
       </ng-container>
     </ng-container>
   </ng-container>

diff --git a/projects/rss-reader/src/app/pages/release-notes/release-notes.component.ts b/projects/rss-reader/src/app/pages/release-notes/release-notes.component.ts
@@ -77,32 +77,23 @@ export class ReleaseNotesComponent implements OnInit {
     return notes.join('\n');
   }
 
-  /**
-   * Checks if the specified `val` parameter is an array.
-   * @param val The value to check.
-   */
   isArray(val: any): boolean {
     return Array.isArray(val);
   }
 
-  /**
-   * Checks whether the specified `val` parameter is a URL.
-   * @param val The value to check.
-   *
-   * _See https://stackoverflow.com/a/46296668/6782707 for more info._
-   */
+  // See https://stackoverflow.com/a/46296668/6782707 for more info.
   isUrl(val: string): boolean {
     return /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/.test(val);
   }
 
-  /**
-   * Checks whether the specified `val` parameter is a string.
-   * @param val The value to check.
-   */
   isStr(val: any): boolean {
     return typeof val === 'string';
   }
 
+  isObj(val: any): boolean {
+    return typeof val === 'object';
+  }
+
   ngOnInit() {
   }
 

diff --git a/projects/rss-reader/src/app/pages/release-notes/release-notes.ts b/projects/rss-reader/src/app/pages/release-notes/release-notes.ts
@@ -29,7 +29,7 @@ export type ReleaseNotes = {
   summary: string[] | string;
   /** A detailed version of the release notes. */
   details?: string[] | string;
-} | string;
+} | string[] | string;
 
 export type ReleaseType = 'stable' | 'beta' | 'nightly';
 

diff --git a/projects/rss-reader/src/assets/release-notes-schema.json b/projects/rss-reader/src/assets/release-notes-schema.json
@@ -150,6 +150,12 @@
         {
           "type": "string",
           "format": "uri"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       ]
     },