Merge branch 'bugfix/rules-typescript-errors'

Author: BashPrime

src/client/src/app/settings/rules/rules.component.html

@@ -118,9 +118,9 @@
           <div class="control">
             <input class="input has-width-auto is-small" type="number" formControlName="minimum"
               [pTooltip]="DETAILS.randomStartingItems.items.minimum.description">
-            <div *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors">
-              <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors.min">Minimum count is 0.</p>
-              <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors.max">Maximum count is 25.</p>
+            <div *ngIf="getRandomStartingItemsFormGroup().controls.minimum.errors">
+              <p class="help is-danger" *ngIf="getRandomStartingItemsFormGroup().controls.minimum.errors.min">Minimum count is 0.</p>
+              <p class="help is-danger" *ngIf="getRandomStartingItemsFormGroup().controls.minimum.errors.max">Maximum count is 25.</p>
             </div>
           </div>
         </div>
@@ -129,9 +129,9 @@
           <div class="control">
             <input class="input has-width-auto is-small" type="number" formControlName="maximum"
               [pTooltip]="DETAILS.randomStartingItems.items.maximum.description">
-              <div *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors">
-                <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors.min">Minimum count is 0.</p>
-                <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors.max">Maximum count is 25.</p>
+              <div *ngIf="getRandomStartingItemsFormGroup().controls.maximum.errors">
+                <p class="help is-danger" *ngIf="getRandomStartingItemsFormGroup().controls.maximum.errors.min">Minimum count is 0.</p>
+                <p class="help is-danger" *ngIf="getRandomStartingItemsFormGroup().controls.maximum.errors.max">Maximum count is 25.</p>
               </div>
           </div>
         </div>

src/client/src/app/settings/rules/rules.component.ts

@@ -27,6 +27,10 @@ export class RulesComponent extends SettingsSection implements OnInit {
     return this.formGroup;
   }
 
+  getRandomStartingItemsFormGroup(): FormGroup {
+    return this.formGroup.controls.randomStartingItems as FormGroup;
+  }
+
   isArtifactCollectionSelected(): boolean {
     return this.formGroup.get('goal').value === this.ARTIFACT_COLLECTION;
   }