removed all dismiss returns and all thrown errors.

src/app/journal/journal-home/details-panel/details-panel.component.ts

@@ -27,7 +27,7 @@ export class DetailsPanelComponent {
   }
 
   public dismissPanel(): void {
-    this.details.closePanel('dismiss');
+    this.details.closePanel('cancel');
   }
 
   public closePanel(): void {

src/app/journal/journal-inventory/food-details/food-details.component.html

@@ -33,9 +33,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-inventory/journal-inventory.component.ts

@@ -78,8 +78,6 @@ export class JournalInventoryComponent {
       this.dataAccessor.consumables = list;
     } else if (listName === 'miscellaneous') {
       this.dataAccessor.miscellaneous = list;
-    } else {
-      throw new Error('Unknown list name: ' + listName);
     }
   }
 
@@ -94,10 +92,8 @@ export class JournalInventoryComponent {
           this.updateDatabase(listName);
         } else if (result.state === 'update') {
           this.openItemModal(true, listName, list, index);
-        } else if (result.state === 'dismiss') {
+        } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -115,10 +111,8 @@ export class JournalInventoryComponent {
           this.dataAccessor.food = this.food;
         } else if (result.state === 'update') {
           this.openFoodModal(true, index);
-        } else if (result.state === 'dismiss') {
+        } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -142,10 +136,8 @@ export class JournalInventoryComponent {
         } else if (result.state === 'add') {
           this.food.push(result.data);
           this.updateFood();
-        } else if (result.state === 'dismiss') {
+        } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -175,8 +167,6 @@ export class JournalInventoryComponent {
           this.updateDatabase(listname);
         } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -185,26 +175,16 @@ export class JournalInventoryComponent {
 
   public addItem(table: string): void {
     if (table === 'items') {
-      switch (this.active) {
-        case 1:
-          this.openItemModal(false, 'weaponsAndArmor', this.weaponsAndArmor);
-          break;
-        case 2:
-          this.openItemModal(false, 'miscellaneous', this.miscellaneous);
-          break;
-        default:
-          throw new Error('Unknown active tab: ' + this.active);
+      if (this.active === 1) {
+        this.openItemModal(false, 'weaponsAndArmor', this.weaponsAndArmor);
+      } else {
+        this.openItemModal(false, 'miscellaneous', this.miscellaneous);
       }
     } else if (table === 'consumables') {
-      switch (this.foodActive) {
-        case 1:
-          this.openFoodModal(false);
-          break;
-        case 2:
-          this.openItemModal(false, 'consumables', this.consumables);
-          break;
-        default:
-          throw new Error('Unknown food active tab: ' + this.foodActive);
+      if (this.foodActive === 1) {
+        this.openFoodModal(false);
+      } else if (this.foodActive === 2) {
+        this.openItemModal(false, 'consumables', this.consumables);
       }
     }
   }
@@ -218,8 +198,6 @@ export class JournalInventoryComponent {
       this.dataAccessor.consumables = this.consumables;
     } else if (listname === 'miscellaneous') {
       this.dataAccessor.miscellaneous = this.miscellaneous;
-    } else {
-      throw new Error('DND-ERROR: Unknown list name: ' + listname);
     }
     this.updateWeight();
   }

src/app/journal/journal-inventory/simple-item-details/simple-item-details.component.html

@@ -33,9 +33,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-inventory/simple-item-modal/simple-item-modal.component.html

@@ -36,7 +36,7 @@
     ></ui-button>
     }
     <ui-button
-      [type]="'dismiss'"
+      [type]="'cancel'"
       [size]="'xlarge'"
       [color]="'primary'"
       (click)="cancel()"

src/app/journal/journal-spellcards/add-card/add-card.component.html

@@ -20,7 +20,7 @@
     Einen neuen Zauber erstellen
   </button>
 
-  <button class="abort-button" (click)="resetThis()">Abbrechen</button>
+  <button class="cancel-button" (click)="resetThis()">Abbrechen</button>
   } @else if (state === 3) {
 
   <input
@@ -49,6 +49,6 @@
       } @empty { Keine Zauber gefunden }
     </ul>
   </div>
-  <button class="abort-button" (click)="resetThis()">Abbrechen</button>
+  <button class="cancel-button" (click)="resetThis()">Abbrechen</button>
   }
 </div>

src/app/journal/journal-spellcards/add-card/add-card.component.scss

@@ -79,7 +79,7 @@ ul {
     margin: 0;
 }
 
-.abort-button {
+.cancel-button {
     width: 10rem;
     height: 2.5rem;
     display: block;

src/app/journal/journal-spellcards/journal-spellcards.component.ts

@@ -131,8 +131,6 @@ export class JournalSpellcardsComponent {
             this.getSpellList(level).splice(index, 1);
             this.addSpell(result.data, result.data.level);
           }
-        } else {
-          throw new Error('REsult state from modal: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -212,7 +210,8 @@ export class JournalSpellcardsComponent {
       case 9:
         return this.level9;
       default:
-        throw new Error('Invalid spell level');
+        console.warn('Invalid spell level');
+        return [];
     }
   }
 
@@ -367,7 +366,8 @@ export class JournalSpellcardsComponent {
       case 'cdk-drop-list-9':
         return 9;
       default:
-        throw new Error('DND-ERROR: Invalid spell level');
+        console.warn('DND-ERROR: Invalid spell level');
+        return -1;
     }
   }
 

src/app/journal/journal-stats/ability-panel/ability-table/ability-details/ability-details.component.html

@@ -22,9 +22,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/ability-panel/ability-table/ability-modal/ability-modal.component.html

@@ -71,7 +71,7 @@
     ></ui-button>
     }
     <ui-button
-      [type]="'dismiss'"
+      [type]="'cancel'"
       [size]="'xlarge'"
       [color]="'primary'"
       (click)="cancel()"

src/app/journal/journal-stats/ability-panel/ability-table/ability-table.component.ts

@@ -149,8 +149,6 @@ export class AbilityTableComponent {
           this.deleteAbility(index);
         } else if (result.state === 'update') {
           this.openModal(true, index);
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }

src/app/journal/journal-stats/ability-panel/proficiencies-table/proficiencies-table.component.ts

@@ -64,8 +64,6 @@ export class ProficienciesTableComponent {
           this.updateDatabase();
         } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Invalid result state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }

src/app/journal/journal-stats/ability-panel/proficiencies-table/tools-modal/tools-modal.component.html

@@ -67,7 +67,7 @@
       (click)="update()"
     ></ui-button>
     <ui-button
-      [type]="'dismiss'"
+      [type]="'cancel'"
       [size]="'xlarge'"
       [color]="'primary'"
       (click)="cancel()"

src/app/journal/journal-stats/ability-panel/spellslots/spellslots-modal/spellslots-modal.component.html

@@ -65,7 +65,7 @@
       (click)="update()"
     ></ui-button>
     <ui-button
-      [type]="'dismiss'"
+      [type]="'cancel'"
       [size]="'xlarge'"
       [color]="'primary'"
       (click)="cancel()"

src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.ts

@@ -63,8 +63,6 @@ export class SpellslotsComponent {
       (result) => {
         if (result.state === 'update') {
           this.updateSlotsAndPoints(result.data);
-        } else {
-          throw new Error('DND-ERROR: Invalid state');
         }
         resultSubscription.unsubscribe();
       }

src/app/journal/journal-stats/ability-panel/trait-table/trait-details/trait-details.component.html

@@ -16,9 +16,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/ability-panel/trait-table/trait-modal/trait-modal.component.html

@@ -50,7 +50,7 @@
     ></ui-button>
     }
     <ui-button
-      [type]="'dismiss'"
+      [type]="'cancel'"
       [size]="'xlarge'"
       [color]="'primary'"
       (click)="cancel()"

src/app/journal/journal-stats/info-row/conditions/conditions-details/conditions-details.component.html

@@ -58,9 +58,9 @@
     (click)="close('update')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/info-row/conditions/conditions-details/conditions-details.component.ts

@@ -118,7 +118,7 @@ export class ConditionsDetailsComponent {
   public close(result: string): void {
     if (result === 'update') {
       this.detailsAccessor.closePanel(result, this.conditions);
-    } else if (result === 'dismiss') {
+    } else if (result === 'cancel') {
       this.detailsAccessor.closePanel({ state: result });
     }
   }

src/app/journal/journal-stats/info-row/conditions/conditions.component.ts

@@ -57,8 +57,6 @@ export class ConditionsComponent {
         if (result.state === 'update') {
           this.conditions = result.data;
           this.dataAccessor.conditions = this.conditions;
-        } else {
-          throw new Error('DND-ERROR: Invalid state');
         }
         resultSubscription.unsubscribe();
       }

src/app/journal/journal-stats/life-container/life/life-details/life-details.component.html

@@ -30,9 +30,9 @@
     (click)="close('update')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/life-container/life/life-details/life-details.component.ts

@@ -36,10 +36,8 @@ export class LifeDetailsComponent {
         temporaryHitPoints: this.temporaryHitPoints,
         hitDice: this.hitDice,
       });
-    } else if (result === 'dismiss') {
+    } else if (result === 'cancel') {
       this.detailsAccessor.closePanel(result);
-    } else {
-      throw new Error('Unknown result: ' + result);
     }
   }
 

src/app/journal/journal-stats/life-container/life/life.component.ts

@@ -90,10 +90,8 @@ export class LifeComponent {
           console.log('HITDICE IN LIFE-RESPONSE: ', this.hitDice);
           this.calculatePercentages();
           this.updateDatabase();
-        } else if (result.state === 'dismiss') {
+        } else if (result.state === 'cancel') {
           // Do nothing
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }

src/app/journal/journal-stats/weapons-container/spell-table/spell-details/spell-details.component.html

@@ -67,9 +67,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.ts

@@ -70,8 +70,6 @@ export class SpellTableComponent {
         if (result.state === 'delete') {
           this.spells.splice(spellIndex, 1);
           this.updateSpellsInDatabase();
-        } else if (result.state !== 'cancel') {
-          throw new Error('Unexpected result state, please send a bug report.');
         }
       }
     );
@@ -92,8 +90,6 @@ export class SpellTableComponent {
           this.deleteSpell(index);
         } else if (result.state === 'update') {
           this.openModal(true, index);
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -115,8 +111,6 @@ export class SpellTableComponent {
           this.updateSpell(result.data, index!);
         } else if (result.state === 'add') {
           this.addSpell(result.data);
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
         }
         resultSubscription.unsubscribe();
       }
@@ -133,7 +127,7 @@ export class SpellTableComponent {
       (spell) => spell.german === spellname
     );
     if (newSpell.length !== 1) {
-      throw new Error('Spell not found.');
+      console.warn('Spell not found');
     } else {
       this.addSpell(newSpell[0]);
     }

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-details/weapon-details.component.html

@@ -89,9 +89,9 @@
     (click)="close('delete')"
   ></ui-button>
   <ui-button
-    [type]="'dismiss'"
+    [type]="'cancel'"
     [size]="'xlarge'"
     [color]="'primary'"
-    (click)="close('dismiss')"
+    (click)="close('cancel')"
   ></ui-button>
 </div>

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-modal/weapon-modal.component.html

@@ -190,7 +190,7 @@
       ></ui-button>
       }
       <ui-button
-        [type]="'dismiss'"
+        [type]="'cancel'"
         [size]="'xlarge'"
         [color]="'primary'"
         (click)="cancel()"

src/app/journal/journal-stats/weapons-container/weapon-table/weapon-table.component.ts

@@ -119,10 +119,7 @@ export class WeaponTableComponent {
           this.deleteWeapon(index);
         } else if (result.state === 'update') {
           this.openModal(true, index);
-        } else {
-          throw new Error('DND-Error: Unknown state: ' + result.state);
-        }
-        resultSubscription.unsubscribe();
+        } else resultSubscription.unsubscribe();
       }
     );
   }

src/app/journal/spell-modal/spell-modal.component.html

@@ -162,7 +162,7 @@
       ></ui-button>
       }
       <ui-button
-        [type]="'dismiss'"
+        [type]="'cancel'"
         [size]="'xlarge'"
         [color]="'primary'"
         (click)="cancel()"

src/app/shared-components/ui-button/ui-button.component.ts

@@ -17,7 +17,7 @@ export class UiButtonComponent {
     apply: 'Anwenden',
     edit: 'Anpassen',
     delete: 'Löschen',
-    dismiss: 'Abbrechen',
+    cancel: 'Abbrechen',
     update: 'Aktualisieren',
   };
 

src/services/species/species.service.ts

@@ -13,7 +13,6 @@ export class SpeciesService {
       case 'HalfElfDetection':
         return this.halfElfDetection;
       default:
-        // throw new Error(`DND-Error: Species ${name} not found`);
         return this.notImplementedYet;
     }
   }