playwright tissue request test

Author: aweng98

.circleci/config.yml

@@ -61,9 +61,10 @@ executors:
     resource_class: medium+
     docker:
       # Playwright docker image version MUST match Playwright version in project
-      - image: mcr.microsoft.com/playwright:v1.31.0-focal
+      - image: mcr.microsoft.com/playwright:v1.38.0-jammy
     working_directory: *playwright_path
     environment:
+      TZ: "America/New_York"
       NODE_ENV: development # Needed if playwright is in devDependencies
 
 commands:
@@ -700,7 +701,7 @@ jobs:
           command: npx playwright install --with-deps chromium # Only need Chrome browser
 
       - run:
-          name: Running Playwright tests
+          name: Running Playwright tests on << parameters.env >>
           working_directory: *playwright_path
           command: |            
             npx playwright test --list | grep -o 'tests/.*.spec.ts' | sort | uniq > e2e_tests.txt
@@ -843,15 +844,6 @@ workflows:
     jobs:
       - deploy-stored-build-job:
           study_key: << pipeline.parameters.study_key >>
-      - playwright-build:
-          env: << pipeline.parameters.deploy_env >>
-      - playwright-test:
-          env: << pipeline.parameters.deploy_env >>
-          parallelism_num: 2
-          test_suite: UNKNOWN
-          requires:
-            - playwright-build
-            - deploy-stored-build-job
 
   api-run-tests-workflow:
     # Run ui tests for study specified in api call by run_ci.sh and tests for sdk and toolkit

build-utils/findmodifiedprojects.sh

@@ -4,7 +4,7 @@
 # If a file from a common area, like the root diretory was modified, we call that _SHARED_
 set +x
 #ignore these file name patterns when figuring out what modules changed
-declare -a exclude_patterns=( '^.*\.md' '^.*.pdf', '^.*\.spec\.ts' )
+declare -a exclude_patterns=( '^.*\.md' '^.*.pdf', '^.*\.spec\.ts', 'playwright' )
 
 EXCLUDE_CMD='grep -v -E'
 

ddp-workspace/projects/ddp-atcp/src/app/components/app/app.component.ts

@@ -111,7 +111,7 @@ export class AppComponent implements OnInit, OnDestroy {
       });
     });
     const modalClose = this.communicationService.closePopupMessage$.subscribe(() => {
-      this.dialog.getDialogById('ServerMessage').close();
+      this.dialog.getDialogById('ServerMessage')?.close();
     });
     this.anchor.addNew(modalOpen).addNew(modalClose);
   }

ddp-workspace/projects/ddp-atcp/src/app/components/participant-list/participant-list.component.ts

@@ -1,28 +1,29 @@
 import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
-import { forkJoin, Observable, of } from 'rxjs';
-import { map, take, switchMap, tap, skipWhile, mergeMap, filter } from 'rxjs/operators';
+import {forkJoin, mergeMap, Observable, of} from 'rxjs';
+import { map, take, switchMap, tap } from 'rxjs/operators';
 
 import {
-  SessionMementoService,
-  ConfigurationService,
-  GovernedParticipantsServiceAgent,
-  UserProfile,
-  ActivityInstance,
-  UserActivityServiceAgent,
-  UserManagementServiceAgent,
-  WorkflowServiceAgent,
-  LanguageService,
-  CompositeDisposable,
-  UserStatusServiceAgent,
-  ParticipantProfileServiceAgent
+    SessionMementoService,
+    ConfigurationService,
+    GovernedParticipantsServiceAgent,
+    UserProfile,
+    ActivityInstance,
+    UserActivityServiceAgent,
+    UserManagementServiceAgent,
+    WorkflowServiceAgent,
+    LanguageService,
+    CompositeDisposable,
+    UserStatusServiceAgent,
+    UserProfileServiceAgent, UserProfileDecorator
 } from 'ddp-sdk';
 
 import { ActivityService } from '../../services/activity.service';
 import { RegistrationStatusService } from '../../services/registrationStatus.service';
 import * as RouterResources from '../../router-resources';
 import { ActivityCodes } from '../../sdk/constants/activityCodes';
 import { WorkflowModel } from '../../models/workflow.model';
+import {AddParticipantPayload} from '../../../../../ddp-sdk/src/lib/models/addParticipantPayload';
 
 export interface Participant {
   guid: string;
@@ -55,7 +56,7 @@ export class ParticipantListComponent implements OnInit, OnDestroy {
     private readonly userStatusService: UserStatusServiceAgent,
     private readonly registrationStatusService: RegistrationStatusService,
     @Inject('ddp.config') private readonly config: ConfigurationService,
-    private participantProfileService: ParticipantProfileServiceAgent
+    private readonly userProfileServiceAgent: UserProfileServiceAgent,
   ) {}
 
   ngOnInit(): void {
@@ -79,24 +80,32 @@ export class ParticipantListComponent implements OnInit, OnDestroy {
 
   onAddParticipantClick(): void {
     this.disableAddParticipantsButton = true;
+      const payload: AddParticipantPayload = {
+          timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      };
+
+    const addParticipantObs = this.userProfileServiceAgent.profile
+        .pipe(
+            mergeMap(({profile: {preferredLanguage}}: UserProfileDecorator) =>
+                this.governedParticipantsAgent
+                    .addParticipant(this.config.studyGuid, {...payload, languageCode: preferredLanguage})
+            ),
+            take(1),
+            tap(participantGuid => this.session.setParticipant(participantGuid)),
+            switchMap(() => this.workflowAgent.fromParticipantList())
+        )
+        .subscribe({
+            next: () => {
+                this.disableAddParticipantsButton = false;
+                this.activityService.setCurrentActivity(null);
+                this.router.navigateByUrl(RouterResources.Survey);
+            },
+            error: () => {
+                this.disableAddParticipantsButton = false;
+            }
+        });
 
-    this.governedParticipantsAgent
-      .addParticipant(this.config.studyGuid)
-      .pipe(
-        take(1),
-        tap(participantGuid => this.session.setParticipant(participantGuid)),
-        switchMap(() => this.workflowAgent.fromParticipantList()),
-      )
-      .subscribe({
-        next: () => {
-          this.disableAddParticipantsButton = false;
-          this.activityService.setCurrentActivity(null);
-          this.router.navigateByUrl(RouterResources.Survey);
-        },
-        error: () => {
-          this.disableAddParticipantsButton = false;
-        }
-      });
+      this.anchor.addNew(addParticipantObs);
   }
 
   private getParticipants(): void {

ddp-workspace/projects/ddp-atcp/src/app/components/welcome/welcome.ts

@@ -38,11 +38,13 @@ export class WelcomeComponent implements OnInit, OnDestroy {
   }
 
   public ngOnInit(): void {
-    const translate$ = this.ngxTranslate.getTranslation(['HomePage.Participate.Steps.Second.Ul'])
-      .subscribe((list: string[]) => {
-        this.list = list['HomePage.Participate.Steps.Second.Ul'];
-      });
-    this.anchor.addNew(translate$);
+    if(this.ngxTranslate) {
+        const translate$ = this.ngxTranslate.getTranslation(['HomePage.Participate.Steps.Second.Ul'])
+            .subscribe((list: object) => {
+                this.list = list['HomePage.Participate.Steps.Second.Ul'];
+            });
+        this.anchor.addNew(translate$);
+    }
   }
 
   public ngOnDestroy(): void {

ddp-workspace/projects/ddp-brugada/src/app/components/progress-bar/progress-bar.component.scss

@@ -2,7 +2,7 @@
 @import '../../../styles/breakpoints';
 
 .wrapper {
-  height: 92px;
+  min-height: 92px;
   display: flex;
   margin: 5rem 0;
   position: relative;
@@ -30,7 +30,7 @@
   &_active {
     color: map-get($colors, 'progress_bar-active');
 
-    & .circular { 
+    & .circular {
       background: map-get($colors, 'progress_bar-active');
       border: 3px solid map-get($colors, 'progress_bar-active-border');
       & .number {
@@ -43,7 +43,7 @@
     }
 
     &_white {
-      & .circular { 
+      & .circular {
         background: map-get($colors, 'white');
         border: 3px solid map-get($colors, 'progress_bar-active-border');
         & .number {

ddp-workspace/projects/ddp-dsm-ui/src/app/filter-column/filter-column.component.html

@@ -22,7 +22,7 @@
     <mat-checkbox color="primary" disableRipple
                [checked]="dataFilter.value1" [(ngModel)]="dataFilter.value1" (change)="changeValue($event, dataFilter)"> Yes
     </mat-checkbox>
-    <mat-checkbox color="primary" disableRipple
+    <mat-checkbox *ngIf="showSearchParameter(dataFilter)" color="primary" disableRipple
                 [checked]="dataFilter.value2" [(ngModel)]="dataFilter.value2" (change)="changeValue2($event, dataFilter)"> No
     </mat-checkbox>
   </ng-container>

ddp-workspace/projects/ddp-dsm-ui/src/app/filter-column/filter-column.component.ts

@@ -14,6 +14,11 @@ export class FilterColumnComponent implements OnInit {
   showOptions = false;
   selected: number;
 
+  // Hide a search parameter for the following RGP columns
+  rgpHideSearchParamColumns = [
+    { displayName: 'Specialty Project: R21', name: 'r21', tableAlias: 'r' }
+  ];
+
   ngOnInit(): void {
     if (this.dataFilter.singleOption) {
       for (const [ key, value ] of Object.entries(this.dataFilter.selectedOptions)) {
@@ -87,4 +92,16 @@ export class FilterColumnComponent implements OnInit {
     this.dataFilter.notEmpty = false;
     this.dataFilter.empty = false;
   }
+
+  /**
+   * Show or hide (remove) a search parameter.
+   * @param dataFilter
+   * @returns Return true if dataFilter column is not found in hardcoded rgpHideSearchParamColumns array.
+   */
+  showSearchParameter(dataFilter: Filter): boolean {
+    const found = this.rgpHideSearchParamColumns.findIndex(column => dataFilter?.participantColumn?.display === column.displayName
+        && dataFilter?.participantColumn?.name === column.name
+        && dataFilter?.participantColumn?.tableAlias === column.tableAlias);
+    return found === -1;
+  }
 }

ddp-workspace/projects/ddp-dsm-ui/src/app/onc-history-detail/onc-history-detail.component.ts

@@ -86,14 +86,18 @@ export class OncHistoryDetailComponent implements OnInit {
       }
     }
     if (v != null) {
+      let ddpParticipantId = this.participant.data.profile['guid'];
+      if (this.participant.data.profile['legacyAltPid']) {
+        ddpParticipantId = this.participant.data.profile['legacyAltPid'];
+      }
       const realm: string = sessionStorage.getItem(ComponentService.MENU_SELECTED_REALM);
       const patch1 = new PatchUtil(
         this.oncHistory[index].oncHistoryDetailId, this.role.userMail(),
         {
           name: parameterName,
           value: v
         }, null, 'participantId', this.participant.participant.participantId,
-        Statics.ONCDETAIL_ALIAS, null, realm, this.participant.data.profile['guid']
+        Statics.ONCDETAIL_ALIAS, null, realm, ddpParticipantId
       );
       const patch = patch1.getPatch();
       this.patchFinished = false;

ddp-workspace/projects/ddp-dsm-ui/src/app/services/dsm.service.ts

@@ -1138,9 +1138,11 @@ export class DSMService {
     );
   }
 
-  public applyDestructionPolicyToAll(source: string, json: string): Observable<any> {
+  public applyDestructionPolicyToAll(realm: string, json: string): Observable<any> {
     const url = this.baseUrl + DSMService.UI + 'institutions';
-    return this.http.patch(url, json, this.buildHeader()).pipe(
+    const map: { name: string; value: any }[] = [];
+    map.push({name: DSMService.REALM, value: realm});
+    return this.http.patch(url, json, this.buildQueryHeader(map)).pipe(
       catchError(this.handleError)
     );
   }