ALCS-2175 Code review adjustments

bcgov · Nov 14, 2024 · 645d1ca · 645d1ca
1 parent 1feab58
commit 645d1ca
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 39 deletions.
diff --git a/.../src/app/features/search/application-search-table/application-search-table.component.html b/.../src/app/features/search/application-search-table/application-search-table.component.html
@@ -53,9 +53,7 @@
           *ngIf="element.status"
           [type]="element.status"
         ></app-application-submission-status-type-pill>
-        <div class="spinner-overlay" *ngIf="!element.status">
-          <mat-spinner></mat-spinner>
-        </div>
+        <app-spinner-status *ngIf="!element.status" />
       </td>
     </ng-container>
 

diff --git a/.../src/app/features/search/application-search-table/application-search-table.component.scss b/.../src/app/features/search/application-search-table/application-search-table.component.scss
@@ -1,9 +0,0 @@
-.spinner-overlay {
-  z-index: 2;
-  opacity: 0.4;
-  width: 25px;
-  height: 25px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

diff --git a/...eatures/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/...eatures/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html
@@ -53,9 +53,7 @@
           *ngIf="element.status"
           [type]="element.status"
         ></app-application-submission-status-type-pill>
-        <div class="spinner-overlay" *ngIf="!element.status">
-          <mat-spinner></mat-spinner>
-        </div>
+        <app-spinner-status *ngIf="!element.status" />
       </td>
     </ng-container>
 

diff --git a/...eatures/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss b/...eatures/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss
@@ -1,9 +0,0 @@
-.spinner-overlay {
-  z-index: 2;
-  opacity: 0.4;
-  width: 25px;
-  height: 25px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

diff --git a/...rc/app/features/search/notification-search-table/notification-search-table.component.html b/...rc/app/features/search/notification-search-table/notification-search-table.component.html
@@ -53,9 +53,7 @@
           *ngIf="element.status"
           [type]="element.status"
         ></app-application-submission-status-type-pill>
-        <div class="spinner-overlay" *ngIf="!element.status">
-          <mat-spinner></mat-spinner>
-        </div>
+        <app-spinner-status *ngIf="!element.status" />
       </td>
     </ng-container>
 

diff --git a/...rc/app/features/search/notification-search-table/notification-search-table.component.scss b/...rc/app/features/search/notification-search-table/notification-search-table.component.scss
@@ -1,9 +0,0 @@
-.spinner-overlay {
-  z-index: 2;
-  opacity: 0.4;
-  width: 25px;
-  height: 25px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

diff --git a/alcs-frontend/src/app/features/search/search.module.ts b/alcs-frontend/src/app/features/search/search.module.ts
@@ -13,6 +13,7 @@ import { NotificationSearchTableComponent } from './notification-search-table/no
 import { SearchComponent } from './search.component';
 import { InquirySearchTableComponent } from './inquiry-search-table/inquiry-search-table.component';
 import { MatChipsModule } from '@angular/material/chips';
+import { SpinnerStatusComponent } from './spinner-status/spinner-status.component';
 
 const routes: Routes = [
   {
@@ -30,6 +31,7 @@ const routes: Routes = [
     NotificationSearchTableComponent,
     FileTypeFilterDropDownComponent,
     InquirySearchTableComponent,
+    SpinnerStatusComponent,
   ],
   imports: [
     CommonModule,

diff --git a/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.html b/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.html
@@ -0,0 +1,3 @@
+<div class="spinner-container">
+  <mat-spinner class="spinner-overlay"></mat-spinner>
+</div>
diff --git a/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.scss b/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.scss
@@ -0,0 +1,12 @@
+.spinner-container {
+  width: 25px;
+  height: 25px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.spinner-overlay {
+  z-index: 2;
+  opacity: 0.4;
+}
diff --git a/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.ts b/alcs-frontend/src/app/features/search/spinner-status/spinner-status.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-spinner-status',
+  templateUrl: './spinner-status.component.html',
+  styleUrls: ['./spinner-status.component.scss'],
+})
+export class SpinnerStatusComponent {}
diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts
@@ -22,7 +22,7 @@ export class ApplicationSearchResultDto {
   localGovernmentName?: string;
   fileNumber: string;
   boardCode?: string;
-  status?: string | null;
+  status?: string;
   dateSubmitted?: number;
   class: SearchEntityClass;
 }
@@ -34,7 +34,7 @@ export class NoticeOfIntentSearchResultDto {
   localGovernmentName?: string;
   fileNumber: string;
   boardCode?: string;
-  status?: string | null;
+  status?: string;
   dateSubmitted?: number;
   class: SearchEntityClass;
 }
@@ -57,7 +57,7 @@ export class NotificationSearchResultDto {
   localGovernmentName?: string;
   fileNumber: string;
   boardCode?: string;
-  status?: string | null;
+  status?: string;
   dateSubmitted?: number;
   class: SearchEntityClass;
 }