From f1669e2c5ff8d55d8c937001201565c8b885b2fb Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Thu, 19 Dec 2024 17:20:02 -0800 Subject: [PATCH 1/2] Somewhat speculative fix for flaky tests; it looks like previous dialog had not closed; I guess things can get sluggish. --- cypress/e2e/group3/githubAppTools.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/e2e/group3/githubAppTools.ts b/cypress/e2e/group3/githubAppTools.ts index f9491d372..93bd9e540 100644 --- a/cypress/e2e/group3/githubAppTools.ts +++ b/cypress/e2e/group3/githubAppTools.ts @@ -97,6 +97,7 @@ describe('GitHub App Tools', () => { cy.get('[data-cy=install-dockstore-app]'); cy.contains('Tool storage type').click(); cy.contains('Close').click(); + cy.contains('Close').should('not.exist'); // Wait for dialog to close before proceeding cy.intercept('GET', '/api/lambdaEvents/**').as('lambdaEvents1'); // GitHub App Logs From 19ba25a4c1494c0f3d838853e5023aee1414ecd3 Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Thu, 9 Jan 2025 17:36:38 -0800 Subject: [PATCH 2/2] Fix build failure --- src/app/workflow/versions/versions-datasource.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/app/workflow/versions/versions-datasource.ts b/src/app/workflow/versions/versions-datasource.ts index 47ce04f55..d9f763f67 100644 --- a/src/app/workflow/versions/versions-datasource.ts +++ b/src/app/workflow/versions/versions-datasource.ts @@ -57,10 +57,19 @@ export class VersionsDataSource implements DataSource { pageIndex, sortCol, sortDirection, + 'metrics', 'response' ); } else { - workflowVersions = this.workflowsService.getWorkflowVersions(workflowId, pageSize, pageIndex, sortCol, sortDirection, 'response'); + workflowVersions = this.workflowsService.getWorkflowVersions( + workflowId, + pageSize, + pageIndex, + sortCol, + sortDirection, + 'metrics', + 'response' + ); } workflowVersions.pipe(finalize(() => this.loadingSubject$.next(false))).subscribe((versions) => {