Merge branch 'dev' of https://github.com/bcgov/House-Policy-STRDSS in…

…to dev
bcgov · Mar 15, 2024 · 5213deb · 5213deb
2 parents 8fc3ec9 + e3bbf2b
commit 5213deb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/frontend/src/app/common/consts/validators.const.ts b/frontend/src/app/common/consts/validators.const.ts
@@ -34,10 +34,7 @@ export function validateEmailListString(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
         let emailList;
 
-        if (control.value.constructor === Array) {
-            emailList = control.value;
-        }
-        else {
+        if (!!control.value) {
             emailList = (control.value as string).split(',').filter(x => !!x).map(x => x.trim()) as Array<string>;
         }
 

diff --git a/frontend/src/app/common/services/delisting.service.ts b/frontend/src/app/common/services/delisting.service.ts
@@ -25,15 +25,15 @@ export class DelistingService {
     return this.httpClient.post<{ content: string }>(`${environment.API_HOST}/delisting/warnings/preview`, complianceNotice)
   }
 
-  createComplianceNotice(complianceNotice: ComplianceNotice): Observable<void> {
-    return this.httpClient.post<void>(`${environment.API_HOST}/delisting/warnings`, complianceNotice)
+  createComplianceNotice(complianceNotice: ComplianceNotice): Observable<any> {
+    return this.httpClient.post<any>(`${environment.API_HOST}/delisting/warnings`, complianceNotice)
   }
 
   delistingRequestPreview(delistingRequest: ComplianceNotice): Observable<{ content: string }> {
     return this.httpClient.post<{ content: string }>(`${environment.API_HOST}/delisting/requests/preview`, delistingRequest)
   }
 
-  createDelistingRequest(delistingRequest: ComplianceNotice): Observable<void> {
-    return this.httpClient.post<void>(`${environment.API_HOST}/delisting/requests`, delistingRequest)
+  createDelistingRequest(delistingRequest: ComplianceNotice): Observable<any> {
+    return this.httpClient.post<any>(`${environment.API_HOST}/delisting/requests`, delistingRequest)
   }
 }
diff --git a/frontend/src/app/features/components/compliance-notice/compliance-notice.component.html b/frontend/src/app/features/components/compliance-notice/compliance-notice.component.html
@@ -103,7 +103,7 @@
         </div>
         <div class="form-group-row-col">
             <p-inputMask mask="(999) 999-9999" placeholder="(999) 999-9999" formControlName="LgContactPhone"
-                id="LgContactPhone" name="LgContactPhone">
+                inputId="LgContactPhone" name="LgContactPhone">
             </p-inputMask>
         </div>
     </div>

diff --git a/frontend/src/app/features/components/compliance-notice/compliance-notice.component.ts b/frontend/src/app/features/components/compliance-notice/compliance-notice.component.ts
@@ -10,7 +10,7 @@ import { DelistingService } from '../../../common/services/delisting.service';
 import { DropdownOption } from '../../../common/models/dropdown-option';
 import { DialogModule } from 'primeng/dialog';
 import { ButtonModule } from 'primeng/button';
-import { validateEmailListString, validatePhone, validateUrl } from '../../../common/consts/validators.const';
+import { validateEmailListString, validateUrl } from '../../../common/consts/validators.const';
 import { ToastModule } from 'primeng/toast';
 import { MessageService } from 'primeng/api';
 import { HttpErrorResponse } from '@angular/common/http';
@@ -71,6 +71,7 @@ export class ComplianceNoticeComponent implements OnInit {
   onSubmit(comment: string): void {
     if (this.myForm.valid) {
       const model: ComplianceNotice = this.myForm.value;
+      model.ccList = this.myForm.value['ccList'].prototype === Array ? this.myForm.value : (this.myForm.value['ccList'] as string).split(',').filter(x => !!x).map(x => x.trim())
       model.comment = comment;
 
       this.delistingService.createComplianceNotice(model).subscribe({