From 1ff1b89a3cbd70b042b46f23a12ae284b9cd1f9c Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Mon, 4 Nov 2024 10:29:39 -0800
Subject: [PATCH 1/5] Fix various structures form state issues

---
 .../pfrs-proposal/pfrs-proposal.component.ts  | 61 ++++++++++++++++++-
 .../pofo-proposal/pofo-proposal.component.ts  | 61 ++++++++++++++++++-
 .../roso-proposal/roso-proposal.component.ts  | 61 ++++++++++++++++++-
 3 files changed, 177 insertions(+), 6 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 074b8f06e0..37d1361851 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -199,8 +199,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         }
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
+        this.updateStructureTypeFields();
         if (this.showErrors) {
           this.form.markAllAsTouched();
+          this.structuresForm.markAllAsTouched();
         }
       }
     });
@@ -244,7 +246,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   protected async save() {
-    if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+    if (this.fileId && (this.form.dirty || this.structuresForm.dirty || this.areComponentsDirty)) {
       const isNewStructure = this.isNewStructure.getRawValue();
       const isFollowUp = this.isFollowUp.getRawValue();
       const followUpIDs = this.followUpIDs.getRawValue();
@@ -474,14 +476,67 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
       this.structureTypeCounts[structure.type]--;
     }
-
     this.structureTypeCounts[newType]++;
 
     structure.type = newType;
 
+    this.updateStructureTypeFields();
     this.form.markAsDirty();
   }
 
+  updateStructureTypeFields() {
+    // Remove
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] === 0) {
+      this.soilStructureFarmUseReason.removeValidators([Validators.required]);
+      this.soilStructureFarmUseReason.reset();
+      this.soilAgriParcelActivity.removeValidators([Validators.required]);
+      this.soilAgriParcelActivity.reset();
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0
+    ) {
+      this.soilStructureResidentialUseReason.reset();
+      this.soilStructureResidentialUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] === 0) {
+      this.soilStructureResidentialAccessoryUseReason.reset();
+      this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0) {
+      this.soilStructureOtherUseReason.reset();
+      this.soilStructureOtherUseReason.removeValidators([Validators.required]);
+    }
+
+    // Add
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] > 0) {
+      this.soilStructureFarmUseReason.setValidators([Validators.required]);
+      this.soilAgriParcelActivity.setValidators([Validators.required]);
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0
+    ) {
+      this.soilStructureResidentialUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0) {
+      this.soilStructureResidentialAccessoryUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] > 0) {
+      this.soilStructureOtherUseReason.setValidators([Validators.required]);
+    }
+  }
+
   onStructureAdd() {
     if (this.isMobile) {
       const dialog = this.dialog.open(AddStructureDialogComponent, {
@@ -523,6 +578,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     if (type) {
       this.structureTypeCounts[type]++;
     }
+
+    this.structuresForm.markAsDirty();
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 63c4dd55ee..e5cec70d5b 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -160,8 +160,10 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
         }
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
+        this.updateStructureTypeFields();
         if (this.showErrors) {
           this.form.markAllAsTouched();
+          this.structuresForm.markAllAsTouched();
         }
       }
     });
@@ -199,7 +201,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   protected async save() {
-    if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+    if (this.fileId && (this.form.dirty || this.structuresForm.dirty || this.areComponentsDirty)) {
       const isNewStructure = this.isNewStructure.getRawValue();
       const isFollowUp = this.isFollowUp.getRawValue();
       const soilFollowUpIDs = this.followUpIDs.getRawValue();
@@ -400,14 +402,67 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
       this.structureTypeCounts[structure.type]--;
     }
-
     this.structureTypeCounts[newType]++;
 
     structure.type = newType;
 
+    this.updateStructureTypeFields();
     this.form.markAsDirty();
   }
 
+  updateStructureTypeFields() {
+    // Remove
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] === 0) {
+      this.soilStructureFarmUseReason.removeValidators([Validators.required]);
+      this.soilStructureFarmUseReason.reset();
+      this.soilAgriParcelActivity.removeValidators([Validators.required]);
+      this.soilAgriParcelActivity.reset();
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0
+    ) {
+      this.soilStructureResidentialUseReason.reset();
+      this.soilStructureResidentialUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] === 0) {
+      this.soilStructureResidentialAccessoryUseReason.reset();
+      this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0) {
+      this.soilStructureOtherUseReason.reset();
+      this.soilStructureOtherUseReason.removeValidators([Validators.required]);
+    }
+
+    // Add
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] > 0) {
+      this.soilStructureFarmUseReason.setValidators([Validators.required]);
+      this.soilAgriParcelActivity.setValidators([Validators.required]);
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0
+    ) {
+      this.soilStructureResidentialUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0) {
+      this.soilStructureResidentialAccessoryUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] > 0) {
+      this.soilStructureOtherUseReason.setValidators([Validators.required]);
+    }
+  }
+
   onStructureAdd() {
     if (this.isMobile) {
       const dialog = this.dialog.open(AddStructureDialogComponent, {
@@ -449,6 +504,8 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     if (type) {
       this.structureTypeCounts[type]++;
     }
+
+    this.structuresForm.markAsDirty();
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index d27c0ec1bb..514c3364a3 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -157,8 +157,10 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
         }
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
+        this.updateStructureTypeFields();
         if (this.showErrors) {
           this.form.markAllAsTouched();
+          this.structuresForm.markAllAsTouched();
         }
       }
     });
@@ -196,7 +198,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   protected async save() {
-    if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+    if (this.fileId && (this.form.dirty || this.structuresForm.dirty || this.areComponentsDirty)) {
       const isNewStructure = this.isNewStructure.getRawValue();
       const isNOIFollowUp = this.isFollowUp.getRawValue();
       const soilFollowUpIDs = this.followUpIds.getRawValue();
@@ -360,6 +362,8 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     if (type) {
       this.structureTypeCounts[type]++;
     }
+
+    this.structuresForm.markAsDirty();
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
@@ -509,14 +513,67 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
       this.structureTypeCounts[structure.type]--;
     }
-
     this.structureTypeCounts[newType]++;
 
     structure.type = newType;
 
+    this.updateStructureTypeFields();
     this.form.markAsDirty();
   }
 
+  updateStructureTypeFields() {
+    // Remove
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] === 0) {
+      this.soilStructureFarmUseReason.removeValidators([Validators.required]);
+      this.soilStructureFarmUseReason.reset();
+      this.soilAgriParcelActivity.removeValidators([Validators.required]);
+      this.soilAgriParcelActivity.reset();
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] === 0 &&
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0
+    ) {
+      this.soilStructureResidentialUseReason.reset();
+      this.soilStructureResidentialUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] === 0) {
+      this.soilStructureResidentialAccessoryUseReason.reset();
+      this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] === 0) {
+      this.soilStructureOtherUseReason.reset();
+      this.soilStructureOtherUseReason.removeValidators([Validators.required]);
+    }
+
+    // Add
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.FARM_STRUCTURE] > 0) {
+      this.soilStructureFarmUseReason.setValidators([Validators.required]);
+      this.soilAgriParcelActivity.setValidators([Validators.required]);
+    }
+
+    if (
+      this.structureTypeCounts[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE] > 0 ||
+      this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0
+    ) {
+      this.soilStructureResidentialUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.ACCESSORY_STRUCTURE] > 0) {
+      this.soilStructureResidentialAccessoryUseReason.setValidators([Validators.required]);
+    }
+
+    if (this.structureTypeCounts[STRUCTURE_TYPES.OTHER_STRUCTURE] > 0) {
+      this.soilStructureOtherUseReason.setValidators([Validators.required]);
+    }
+  }
+
   markDirty() {
     this.areComponentsDirty = true;
   }

From a12556bbbe1175d2032296f44e62552f4b7b6e30 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:57:59 -0800
Subject: [PATCH 2/5] Show warning as soon as type changes

---
 .../proposal/pfrs-proposal/pfrs-proposal.component.ts           | 2 ++
 .../proposal/pofo-proposal/pofo-proposal.component.ts           | 2 ++
 .../proposal/roso-proposal/roso-proposal.component.ts           | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 37d1361851..06f9d2973f 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -412,6 +412,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
       return;
     }
 
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
     if (this.hasInput(structure.type)) {
       this.confirmationDialogService
         .openDialog({
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index e5cec70d5b..209819b997 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -338,6 +338,8 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
       return;
     }
 
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
     if (this.hasInput(structure.type)) {
       this.confirmationDialogService
         .openDialog({
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index 514c3364a3..161c8861d1 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -449,6 +449,8 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
       return;
     }
 
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
     if (this.hasInput(structure.type)) {
       this.confirmationDialogService
         .openDialog({

From dcb90b16ce17454143832a656d1d4f85462b3b15 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:05:43 -0800
Subject: [PATCH 3/5] Fix structures table padding

---
 .../proposal/pfrs-proposal/pfrs-proposal.component.scss       | 4 ++++
 .../proposal/pofo-proposal/pofo-proposal.component.scss       | 4 ++++
 .../proposal/roso-proposal/roso-proposal.component.scss       | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
index f6303c5734..715791d050 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
@@ -13,6 +13,10 @@ section {
   width: 100%;
 }
 
+.mat-mdc-table .mdc-data-table__row {
+  height: rem(75);
+}
+
 .info-banner {
   background-color: rgba(colors.$secondary-color-light, 0.5);
   padding: rem(4);
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
index f6303c5734..715791d050 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
@@ -13,6 +13,10 @@ section {
   width: 100%;
 }
 
+.mat-mdc-table .mdc-data-table__row {
+  height: rem(75);
+}
+
 .info-banner {
   background-color: rgba(colors.$secondary-color-light, 0.5);
   padding: rem(4);
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
index f6303c5734..715791d050 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
@@ -13,6 +13,10 @@ section {
   width: 100%;
 }
 
+.mat-mdc-table .mdc-data-table__row {
+  height: rem(75);
+}
+
 .info-banner {
   background-color: rgba(colors.$secondary-color-light, 0.5);
   padding: rem(4);

From 3ae8fde7d1acbb07d6b2896ec00939c4c914c568 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:06:44 -0800
Subject: [PATCH 4/5] Show residential warning for accessory structures

---
 .../proposal/pfrs-proposal/pfrs-proposal.component.ts       | 6 +++++-
 .../proposal/pofo-proposal/pofo-proposal.component.ts       | 6 +++++-
 .../proposal/roso-proposal/roso-proposal.component.ts       | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 06f9d2973f..5902ad8281 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -585,7 +585,11 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
-    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+    return (
+      item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE
+    );
   }
 
   onStructureRemove(id: string) {
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 209819b997..c87f7086b2 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -511,7 +511,11 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
-    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+    return (
+      item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE
+    );
   }
 
   onStructureRemove(id: string) {
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index 161c8861d1..39b1640b2d 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -367,7 +367,11 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   isWarning(index: number, item: ProposedStructure): boolean {
-    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+    return (
+      item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+      item.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE
+    );
   }
 
   onStructureRemove(id: string) {

From 2d88d5fa6c3f3a76e3ef8f6141607c8ff6ae2c93 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:11:22 -0800
Subject: [PATCH 5/5] Remove building plans from public view

---
 .../pfrs-details/pfrs-details.component.html           | 10 ----------
 .../submission/pfrs-details/pfrs-details.component.ts  |  2 --
 .../pofo-details/pofo-details.component.html           | 10 ----------
 .../submission/pofo-details/pofo-details.component.ts  |  2 --
 .../roso-details/roso-details.component.html           | 10 ----------
 .../submission/roso-details/roso-details.component.ts  |  2 --
 6 files changed, 36 deletions(-)

diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
index e3871f481a..2c34f0b3ad 100644
--- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
@@ -289,16 +289,6 @@
     </div>
   </ng-container>
 
-  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
-    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
-    <div class="grid-double multiple-documents">
-      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
-        {{ file.fileName }}
-      </a>
-      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
-    </div>
-  </ng-container>
-
   <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
     <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
     <div class="grid-double">
diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
index a3d2aa239b..6e4521e559 100644
--- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
@@ -59,13 +59,11 @@ export class PfrsDetailsComponent {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
     this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
-    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
   reclamationPlans: PublicDocumentDto[] = [];
-  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}
 
diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
index aa679b05b8..840588f3eb 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
@@ -213,16 +213,6 @@
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
-    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
-    <div class="grid-double multiple-documents">
-      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
-        {{ file.fileName }}
-      </a>
-      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
-    </div>
-  </ng-container>
-
   <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
     <div class="subheading2 grid-1">Cross Sections</div>
     <div class="grid-double multiple-documents">
diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
index 7821e9c89e..17578631d6 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
@@ -57,12 +57,10 @@ export class PofoDetailsComponent {
   @Input() set applicationDocuments(documents: PublicDocumentDto[]) {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
-    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
-  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}
 
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
index c2cedcbfba..234d4ea449 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
@@ -205,16 +205,6 @@
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
-    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
-    <div class="grid-double multiple-documents">
-      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
-        {{ file.fileName }}
-      </a>
-      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
-    </div>
-  </ng-container>
-
   <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
     <div class="subheading2 grid-1">Cross Sections</div>
     <div class="grid-double multiple-documents">
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
index 9f2a7b14cb..cc61c040c9 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
@@ -57,12 +57,10 @@ export class RosoDetailsComponent {
   @Input() set applicationDocuments(documents: PublicDocumentDto[]) {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
-    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
-  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}