Merge pull request #2188 from NMDSdevopsServiceAdm/test

Staging to Live for preprod deployment to fix bug on pending workplaces
NMDSdevopsServiceAdm · Jun 2, 2020 · 0daf093 · 0daf093
2 parents 6800f41 + 0c91d57
commit 0daf093
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.html b/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.html
@@ -18,23 +18,22 @@ <h1 class="govuk-heading-l govuk-!-margin-bottom-0">
   </div>
 </div>
 
-<ng-container *ngIf="workplaces.length; else noWorkPlaces">
-  <ul class="govuk-list">
+<ul class="govuk-list">
+  <ng-container *ngIf="pendingWorkplaces.length">
     <li class="govuk-util__list-record govuk-!-margin-bottom-0 govuk-panel--light-blue" *ngFor="let workplaces of pendingWorkplaces">
-            <div>
-              Your application for {{workplaces.name}} is being reviewed by Skills for Care. <span class="govuk-util__float-right">Pending</span>
-            </div>
+      <div>
+        Your application for {{workplaces.name}} is being reviewed by Skills for Care. <span class="govuk-util__float-right">Pending</span>
+      </div>
     </li>
+  </ng-container>
+  <ng-container *ngIf="workplaces.length">
     <li class="govuk-util__list-record govuk-!-margin-bottom-0" *ngFor="let workplace of workplaces">
       <app-workplace-info-panel
         [workplace]="workplace"
         (changeOwnershipAndPermissionsEvent)="changeOwnershipAndPermissions($event)"
       >
       </app-workplace-info-panel>
     </li>
-  </ul>
-</ng-container>
-
-<ng-template #noWorkPlaces>
-  <p>There are no workplaces.</p>
-</ng-template>
+  </ng-container>
+</ul>
+<p *ngIf="pendingWorkplaces.length === 0 && workplaces.length === 0">There are no workplaces.</p>
diff --git a/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.ts b/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.ts
@@ -23,7 +23,7 @@ export class ViewMyWorkplacesComponent implements OnInit, OnDestroy {
   public serverErrorsMap: ErrorDefinition[] = [];
   public workplaces: Workplace[] = [];
   public workplacesCount = 0;
-  public pendingWorkplaces: any;
+  public pendingWorkplaces: Workplace[] = [];
 
   constructor(
     private breadcrumbService: BreadcrumbService,