Merge branch 'dev' into ID-1174-combine-user-state-api-calls

Author: Ghost-in-a-Jar

.circleci/config.yml

@@ -182,7 +182,7 @@ commands:
             JEST_JUNIT_OUTPUT_DIR: "<< parameters.log_dir >>/<< parameters.env >>/test-results/junit"
             SCREENSHOT_DIR: "<< parameters.log_dir >>/<< parameters.env >>/test-results/failure-screenshots"
             ENVIRONMENT: << parameters.env >>
-          no_output_timeout: 25m
+          no_output_timeout: 30m
           command: |
             mkdir -p ${SCREENSHOT_DIR}
             TESTS_TO_RUN=$(yarn run jest --listTests | sed "s|$(pwd)/||")

.circleci/wait-for-job-finish.sh

@@ -3,8 +3,8 @@
 # Exit script if you try to use an uninitialized variable.
 set -o nounset
 
-# Use the error status of the first failure, rather than that of the last item in a pipeline.
-set -o pipefail
+# Use the error status of the first failure, rather than that of the last item in a pipeline. Also fail explicitly on any exit code.
+set -eo pipefail
 
 counter=0
 

integration-tests/tests/run-analysis-azure.ts

@@ -70,7 +70,7 @@ const testRunAnalysisAzure = _.flowRight(
   await findElement(page, clickable({ textContains: 'Creating' }));
 
   // Wait for env to finish creating, or break early on error
-  await findElement(page, clickable({ textContains: 'Running' }), { timeout: Millis.ofMinutes(20) });
+  await findElement(page, clickable({ textContains: 'Running' }), { timeout: Millis.ofMinutes(25) });
 
   // Here, we dismiss any errors or popups. Its common another areas of the application might throw an error or have pop-ups.
   // However, as long as we have a running runtime (which the previous section asserts), the pop-up is not relevant

src/components/ModalDrawer.tsx

@@ -39,7 +39,10 @@ const drawer = {
   }),
 } as const;
 
-export interface ModalDrawerProps extends RModal.Props {
+export interface ModalDrawerProps
+  extends Omit<RModal.Props, 'aria' | 'ariaHideApp' | 'isOpen' | 'parentSelector' | 'style' | 'onRequestClose'> {
+  'aria-label'?: string;
+  'aria-labelledby'?: string;
   children?: ReactNode;
   isOpen: boolean;
   width?: CSSProperties['width'];
@@ -54,7 +57,9 @@ const ModalDrawer = (props: ModalDrawerProps): ReactNode => {
       {(transitionState) => (
         <RModal
           aria={{
-            // @ts-expect-error TODO: Is this valid?
+            // Type definitions do not include all ARIA attributes (label and hidden), but react-modal does pass them through.
+            // https://github.com/reactjs/react-modal/blob/a275399059cc37aa02cac7e9385512b02ff5cf15/src/components/ModalPortal.js#L408
+            // @ts-expect-error
             label: props['aria-label'],
             labelledby: props['aria-labelledby'],
             modal: true,

src/registration/terms-of-service/TermsOfServicePage.test.ts

@@ -3,7 +3,12 @@ import { act, fireEvent, screen } from '@testing-library/react';
 import { h } from 'react-hyperscript-helpers';
 import { Ajax } from 'src/libs/ajax';
 import { SamUserTermsOfServiceDetails } from 'src/libs/ajax/TermsOfService';
-import { SamUserAttributes, SamUserCombinedStateResponse } from 'src/libs/ajax/User';
+import {
+  SamUserAllowances,
+  SamUserAttributes,
+  SamUserCombinedStateResponse,
+  SamUserResponse,
+} from 'src/libs/ajax/User';
 import { AuthState, authStore } from 'src/libs/state';
 import { TermsOfServicePage } from 'src/registration/terms-of-service/TermsOfServicePage';
 import { asMockedFn, renderWithAppContexts as render } from 'src/testing/test-utils';

src/workspace-data/Data.js

@@ -355,7 +355,9 @@ const DataTableActions = ({
                     downloadForm.current.submit();
                   } else if (dataProvider.features.supportsTsvAjaxDownload) {
                     // TODO: this overrides the filename specified by the WDS API. Is that ok?
-                    dataProvider.downloadTsv(signal, tableName).then((blob) => FileSaver.saveAs(blob, `${tableName}.tsv`));
+                    Utils.withBusyState(setLoading, dataProvider.downloadTsv)(signal, tableName).then((blob) =>
+                      FileSaver.saveAs(blob, `${tableName}.tsv`)
+                    );
                   }
                   Ajax().Metrics.captureEvent(Events.workspaceDataDownload, {
                     ...extractWorkspaceDetails(workspace.workspace),