Merge pull request #1451 from chaynHQ/develop

Merge Develop onto Main

Author: annarhughes

.github/workflows/cypress-release-test.yml

@@ -32,16 +32,6 @@ jobs:
       contents: read
       checks: write
       deployments: read
-    strategy:
-      # when one test fails, DO NOT cancel the other
-      # containers, because this will kill Cypress processes
-      # leaving Cypress Cloud hanging ...
-      # https://github.com/cypress-io/github-action/issues/48
-      fail-fast: false
-      matrix:
-        # run 3 copies of the current job in parallel
-        # this will automatically load balance
-        containers: [1, 2, 3]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -59,7 +49,6 @@ jobs:
           config-file: cypress.config.ts
           headed: false
           record: true # send results to cypress dashboard
-          parallel: true
         env:
           NEXT_PUBLIC_ROLLBAR_ENV: CI
           NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA: ci

components/forms/UpdatePartnerAdminForm.tsx

@@ -45,16 +45,14 @@ const UpdatePartnerAdminForm = () => {
       setAutocompleteSearchQueryIsLoading(true);
       const searchCriteria = {
         email: autocompleteSearchQuery,
-        partnerAdmin: { partnerAdminId: 'IS NOT NULL' },
+        partnerAdmin: true,
         include: ['partnerAdmin'],
-        limit: '10',
+        limit: 10,
       };
 
       const result = await dispatch(
         api.endpoints.getUsers.initiate(
-          {
-            searchCriteria: JSON.stringify(searchCriteria),
-          },
+          { searchCriteria: JSON.stringify(searchCriteria) },
           // We don't want this request cached as a user might use this request to check their updates have worked on the form
           { forceRefetch: true },
         ),

components/forms/UpdateTherapyAdminForm.tsx

@@ -49,17 +49,15 @@ const UpdateTherapyAdminForm = () => {
       setAutocompleteSearchQueryIsLoading(true);
       const searchCriteria = {
         email: autocompleteSearchQuery,
-        partnerAccess: { featureTherapy: true, active: true },
+        partnerAccess: { featureTherapy: true as true, active: true as true },
         include: ['partnerAccess'],
-        fields: ['partnerAccess'],
-        limit: '10',
+        limit: 10,
       };
 
       const result = await dispatch(
         api.endpoints.getUsers.initiate(
-          {
-            searchCriteria: JSON.stringify(searchCriteria),
-          },
+          { searchCriteria: JSON.stringify(searchCriteria) },
+
           // We don't want this request cached as a user might use this request to check their updates have worked on the form
           { forceRefetch: true },
         ),