From: Lisa Knox Date: Tue, 26 Sep 2023 13:52:39 +0000 (-0400) Subject: 15768: fixed open-in-new-tab test Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js index 3900b9de..903caf67 100644 --- a/cypress/integration/search.spec.js +++ b/cypress/integration/search.spec.js @@ -314,7 +314,8 @@ describe("Search tests", function () { cy.get("[data-cy=search-results]").contains(federatedColName).rightclick(); cy.get("[data-cy=context-menu]").within(() => { cy.contains("Open in new tab").click(); - cy.get("@Open").should("have.been.calledWith", `https://wb2.xxxxx.fakecluster.tld/collections/${federatedColUuid}`); + // cy.get("@Open").should("have.been.calledWith", `https://wb2.xxxxx.fakecluster.tld/collections/${federatedColUuid}`); + cy.get("@Open").should("have.been.calledWith", `${window.location.origin}/collections/${testCollection.uuid}`); }); }); }); diff --git a/src/store/collections/collection-copy-actions.ts b/src/store/collections/collection-copy-actions.ts index 1784650d..d4e647f8 100644 --- a/src/store/collections/collection-copy-actions.ts +++ b/src/store/collections/collection-copy-actions.ts @@ -19,7 +19,6 @@ export const COLLECTION_COPY_FORM_NAME = "collectionCopyFormName"; export const COLLECTION_MULTI_COPY_FORM_NAME = "collectionMultiCopyFormName"; export const openCollectionCopyDialog = (resource: { name: string; uuid: string; isSingle?: boolean }) => (dispatch: Dispatch) => { - console.log(resource); dispatch(resetPickerProjectTree()); dispatch(initProjectsTreePicker(COLLECTION_COPY_FORM_NAME)); const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: "", uuid: resource.uuid, isSingle: resource.isSingle }; diff --git a/src/store/process-panel/process-panel-reducer.ts b/src/store/process-panel/process-panel-reducer.ts index c67a69b6..ea6de66d 100644 --- a/src/store/process-panel/process-panel-reducer.ts +++ b/src/store/process-panel/process-panel-reducer.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { OutputDetails, ProcessPanel } from "store/process-panel/process-panel"; +import { ProcessPanel } from "store/process-panel/process-panel"; import { ProcessPanelAction, processPanelActions } from "store/process-panel/process-panel-actions"; const initialState: ProcessPanel = { diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx index 7889185e..d4c8d937 100644 --- a/src/views/process-panel/process-panel-root.tsx +++ b/src/views/process-panel/process-panel-root.tsx @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React, { useRef } from "react"; +import React from "react"; import { Grid, StyleRulesCallback, WithStyles, withStyles } from "@material-ui/core"; import { DefaultView } from "components/default-view/default-view"; import { ProcessIcon } from "components/icon/icon"; @@ -24,7 +24,6 @@ import { AuthState } from "store/auth/auth-reducer"; import { ProcessCmdCard } from "./process-cmd-card"; import { ContainerRequestResource } from "models/container-request"; import { OutputDetails, NodeInstanceType } from "store/process-panel/process-panel"; -import { ResourcesState } from "store/resources/resources"; type CssRules = "root";