Merge branch 'staging' into 10372-refactor

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 orbs:
   git-shallow-clone: guitarrapc/[email protected]
 
-efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.2.0
+efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.0
 
 parameters:
   run_build_and_deploy:

.github/workflows/typescript-untouched-files-check.yml

@@ -15,7 +15,11 @@ jobs:
 
       - name: Determine Target Branch
         id: target_branch
-        run: echo "TARGET_BRANCH=$(jq -r '.pull_request.base.ref' $GITHUB_EVENT_PATH) >> $GITHUB_ENV"
+        run: |
+          echo "GITHUB_EVENT_PATH: $GITHUB_EVENT_PATH"
+          TARGET_BRANCH=$(jq -r '.pull_request.base.ref' $GITHUB_EVENT_PATH)
+          echo "TARGET_BRANCH: $TARGET_BRANCH"
+          echo "TARGET_BRANCH=$TARGET_BRANCH" >> $GITHUB_ENV
 
       - name: Checkout Target Branch
         uses: actions/checkout@v4

Dockerfile

@@ -37,7 +37,7 @@ RUN apt-get install -y build-essential
 RUN apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
 
 ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.16.8.zip" -o "awscliv2.zip" && \
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.16.12.zip" -o "awscliv2.zip" && \
   unzip awscliv2.zip && \
   ./aws/install && \
   rm -rf awscliv2.zip

cypress/local-only/tests/integration/public/practitioner-search.cy.ts

@@ -0,0 +1,47 @@
+import { isValidRequest } from '../../../../readonly/support/helpers';
+
+describe('Public User - Search', () => {
+  beforeEach(() => {
+    cy.visit('/');
+  });
+
+  it('should display all search tabs', () => {
+    cy.get('[data-testid="tabs-menu"]').find('li').should('have.length', 4);
+
+    ['Case', 'Order', 'Opinion', 'Practitioner'].forEach(
+      (title: string, index: number) => {
+        cy.get('[data-testid="tabs-menu"]')
+          .find('li')
+          .eq(index)
+          .invoke('text')
+          .should('contain', title);
+      },
+    );
+  });
+
+  describe('Practitioner', () => {
+    beforeEach(() => {
+      cy.get('[data-testid="tabs-menu"]').find('li').eq(3).click();
+
+      cy.intercept({
+        method: 'GET',
+        url: '/public-api/practitioners?name=test',
+      }).as('getPractitionerByName');
+
+      cy.intercept({
+        method: 'GET',
+        url: '/public-api/practitioners/test',
+      }).as('getPractitionerByBarNumber');
+    });
+
+    it('should send the correct request when searching practitioner by Name and Bar Number', () => {
+      cy.get('input#practitioner-name').type('test');
+      cy.get('button#practitioner-search-by-name-button').click();
+      cy.wait('@getPractitionerByName').then(isValidRequest);
+
+      cy.get('input#bar-number').type('test');
+      cy.get('button#practitioner-search-by-bar-number-button').click();
+      cy.wait('@getPractitionerByBarNumber').then(isValidRequest);
+    });
+  });
+});

cypress/readonly/integration/authentication/login.cy.ts

@@ -8,8 +8,6 @@ describe('Given a user with a DAWSON account', () => {
   describe('When they login in with the correct email and password', () => {
     it('Then they should be taken to their dashboard', () => {
       cy.visit('/login');
-      // Login Button is Disabled till Enter Both Email and Password
-      cy.get('[data-testid="login-button"]').should('be.disabled');
       cy.get('[data-testid="email-input"]').type(
         '[email protected]',
       );