Merge pull request #321 from EyeSeeTea/development-malaria

Hotfix Release 0.6.1
EyeSeeTea · Jan 14, 2020 · 359d594 · 359d594
2 parents a0b5d3c + 0e27eaf
commit 359d594
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en" dir="ltr">
   <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico?v=3">
 
     <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css"/>
     <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css"/>

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-    "short_name": "Metadata Sync",
-    "name": "Metadata Synchronization",
+    "short_name": "MetaData Synchronization",
+    "name": "MetaData Synchronization",
     "icons": [
         {
             "src": "favicon.ico",

diff --git a/src/models/syncRule.ts b/src/models/syncRule.ts
@@ -55,7 +55,7 @@ export default class SyncRule {
     }
 
     public get name(): string {
-        return this.syncRule.name;
+        return this.syncRule.name ?? "";
     }
 
     public get type(): SyncRuleType {
@@ -71,11 +71,11 @@ export default class SyncRule {
     }
 
     public get metadataIds(): string[] {
-        return this.syncRule.builder.metadataIds;
+        return this.syncRule.builder.metadataIds ?? [];
     }
 
     public get excludedIds(): string[] {
-        return this.syncRule.builder.excludedIds;
+        return this.syncRule.builder.excludedIds ?? [];
     }
 
     public get dataSyncAttributeCategoryOptions(): string[] {
@@ -111,11 +111,11 @@ export default class SyncRule {
     }
 
     public get targetInstances(): string[] {
-        return this.syncRule.builder.targetInstances;
+        return this.syncRule.builder.targetInstances ?? [];
     }
 
     public get enabled(): boolean {
-        return this.syncRule.enabled;
+        return this.syncRule.enabled ?? false;
     }
 
     public get frequency(): string | undefined {
@@ -141,23 +141,23 @@ export default class SyncRule {
     }
 
     public get publicAccess(): string {
-        return this.syncRule.publicAccess;
+        return this.syncRule.publicAccess ?? "--------";
     }
 
     public get userAccesses(): SharingSetting[] {
-        return this.syncRule.userAccesses;
+        return this.syncRule.userAccesses ?? [];
     }
 
     public get userGroupAccesses(): SharingSetting[] {
-        return this.syncRule.userGroupAccesses;
+        return this.syncRule.userGroupAccesses ?? [];
     }
 
     public get syncParams(): MetadataSynchronizationParams {
-        return this.syncRule.builder.syncParams || {};
+        return this.syncRule.builder.syncParams ?? {};
     }
 
     public get dataParams(): DataSynchronizationParams {
-        return this.syncRule.builder.dataParams || {};
+        return this.syncRule.builder.dataParams ?? {};
     }
 
     public static create(type: SyncRuleType = "metadata"): SyncRule {