From 2f21b0d9f1baeede5470e816c28d61e28c524b36 Mon Sep 17 00:00:00 2001 From: Daniel Jakab Date: Mon, 30 Sep 2024 14:11:29 +0200 Subject: [PATCH] Fix rebase --- pnpm-lock.yaml | 27 ----------- src/pages/Deployment/index.tsx | 2 - .../Overview/DeploymentsInProgress/index.tsx | 48 +++++++++++++------ .../Overview/DeploymentsInProgress/styles.ts | 5 -- .../Overview/InactiveDeployments/index.tsx | 2 +- .../Overview/InactiveDeployments/styles.ts | 3 +- 6 files changed, 36 insertions(+), 51 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1bca290..b4c1539 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,18 +18,8 @@ importers: specifier: ^1.0.1 version: 1.0.1(axios@1.7.2)(oidc-client-ts@3.0.1)(react-oidc-context@3.1.0(oidc-client-ts@3.0.1)(react@18.3.1))(react@18.3.1) '@carp-dk/client': -<<<<<<< HEAD -<<<<<<< HEAD specifier: 1.2.0 version: 1.2.0 -======= - specifier: link:../carp-client-ts/lib - version: link:../carp-client-ts/lib ->>>>>>> b0c7614 (InactiveDeployments without styling) -======= - specifier: 1.2.0 - version: 1.2.0 ->>>>>>> 4d1e0b8 (Remove kotlinx value datetime) '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -327,18 +317,9 @@ packages: react: '>=16.8.0' react-oidc-context: ^2.3.1 -<<<<<<< HEAD -<<<<<<< HEAD '@carp-dk/client@1.2.0': resolution: {integrity: sha512-b48+yhXWFbAfkMaImlq8ibJgt75idjLdQvwXJUPduFn96Xj6E8fEYNNcHG0iTtDovGmymyxGEIl+ikePlD4hQg==} -======= ->>>>>>> b0c7614 (InactiveDeployments without styling) -======= - '@carp-dk/client@1.2.0': - resolution: {integrity: sha512-b48+yhXWFbAfkMaImlq8ibJgt75idjLdQvwXJUPduFn96Xj6E8fEYNNcHG0iTtDovGmymyxGEIl+ikePlD4hQg==} - ->>>>>>> 4d1e0b8 (Remove kotlinx value datetime) '@carp-dk/eslint-config@1.1.0': resolution: {integrity: sha512-vIz9PJZBaSadbe3rO9nTJQoa01c8h9judJv1uVDYjlApienWU8W22Yi8aBJLHil3wI9dFXTPcDvx1yqMpkOo+w==} peerDependencies: @@ -3594,16 +3575,8 @@ snapshots: react: 18.3.1 react-oidc-context: 3.1.0(oidc-client-ts@3.0.1)(react@18.3.1) -<<<<<<< HEAD -<<<<<<< HEAD - '@carp-dk/client@1.2.0': {} - -======= ->>>>>>> b0c7614 (InactiveDeployments without styling) -======= '@carp-dk/client@1.2.0': {} ->>>>>>> 4d1e0b8 (Remove kotlinx value datetime) ? '@carp-dk/eslint-config@1.1.0(@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0))(eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.9.0(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.3(eslint@8.57.0))(eslint@8.57.0))(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint-plugin-prefer-arrow@1.2.3(eslint@8.57.0))(eslint-plugin-prettier@5.0.0-alpha.2(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.2))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react-refresh@0.4.7(eslint@8.57.0))(eslint-plugin-react@7.34.3(eslint@8.57.0))(eslint-plugin-unused-imports@4.0.0(@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)(prettier-plugin-organize-imports@3.2.4(prettier@3.3.2)(typescript@5.5.2))(prettier@3.3.2)' : dependencies: '@typescript-eslint/eslint-plugin': 7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2) diff --git a/src/pages/Deployment/index.tsx b/src/pages/Deployment/index.tsx index ba1fd31..3d32664 100644 --- a/src/pages/Deployment/index.tsx +++ b/src/pages/Deployment/index.tsx @@ -2,7 +2,6 @@ import StudyPageLayout from "@Components/Layout/StudyPageLayout"; import StudyHeader from "@Components/StudyHeader"; import BasicInfo from "./BasicInfo"; import Participants from "./Participants"; -import Devices from "./Devices"; const Deployment = () => { const sectionName = ["Deployments", "Deployment"]; @@ -13,7 +12,6 @@ const Deployment = () => { - {/* */} ); diff --git a/src/pages/StudyOverview/Overview/DeploymentsInProgress/index.tsx b/src/pages/StudyOverview/Overview/DeploymentsInProgress/index.tsx index b795272..14815bb 100644 --- a/src/pages/StudyOverview/Overview/DeploymentsInProgress/index.tsx +++ b/src/pages/StudyOverview/Overview/DeploymentsInProgress/index.tsx @@ -10,7 +10,7 @@ import { } from "@mui/material"; import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined"; import { useEffect, useState } from "react"; -import { useParams } from "react-router-dom"; +import { useNavigate, useParams } from "react-router-dom"; import { Stack } from "@mui/system"; import LoadingSkeleton from "../LoadingSkeleton"; import { @@ -29,6 +29,7 @@ import TooltipContent from "./TooltipContent"; const DeploymentsInProgress = () => { const { id: studyId } = useParams(); + const navigate = useNavigate(); const { data: deploymentsAccountAndStatus, isLoading: isDeploymentsAccountAndStatusLoading, @@ -116,25 +117,42 @@ const DeploymentsInProgress = () => { {deploymentProgress.map((g) => ( - + + navigate( + `/studies/${studyId}/participants/deployments/${g.deploymentId}`, + ) + } + sx={{ + "&:hover": { + backgroundColor: "#EDEDED", + transition: "background-color 0.2s ease-in-out", + cursor: "pointer", + borderRadius: "16px", + }, + }} + > {`... ${g.deploymentId.slice(-4)}`} - {g.devices.map((d) => ( - - - - {d.device.roleName} - - - ))} + + {g.devices.map((d) => ( + + + + {d.device.roleName} + + + ))} + diff --git a/src/pages/StudyOverview/Overview/DeploymentsInProgress/styles.ts b/src/pages/StudyOverview/Overview/DeploymentsInProgress/styles.ts index 3ea58fa..364f359 100644 --- a/src/pages/StudyOverview/Overview/DeploymentsInProgress/styles.ts +++ b/src/pages/StudyOverview/Overview/DeploymentsInProgress/styles.ts @@ -48,11 +48,6 @@ export const HeaderText = styled(Typography)(({ theme }) => ({ export const StyledTableRow = styled(TableRow)({ paddingLeft: 0, - "&:hover": { - backgroundColor: "#F5F5F5", - transition: "background-color 0.2s ease-in-out", - cursor: "pointer", - }, }); export const StyledTableCell = styled(TableCell)({ diff --git a/src/pages/StudyOverview/Overview/InactiveDeployments/index.tsx b/src/pages/StudyOverview/Overview/InactiveDeployments/index.tsx index 8fd2fc3..139a6f4 100644 --- a/src/pages/StudyOverview/Overview/InactiveDeployments/index.tsx +++ b/src/pages/StudyOverview/Overview/InactiveDeployments/index.tsx @@ -117,7 +117,7 @@ const InactiveDeployments = () => { navigate( - `/studies/${studyId}/participants/deployments/${participant.deploymentId}/participants/${participant.participantId}`, + `/studies/${studyId}/participants/deployments/${participant.deploymentId}`, ) } key={participant.deploymentId as unknown as string} diff --git a/src/pages/StudyOverview/Overview/InactiveDeployments/styles.ts b/src/pages/StudyOverview/Overview/InactiveDeployments/styles.ts index 3d7abf7..5088cda 100644 --- a/src/pages/StudyOverview/Overview/InactiveDeployments/styles.ts +++ b/src/pages/StudyOverview/Overview/InactiveDeployments/styles.ts @@ -38,9 +38,10 @@ export const HeaderText = styled(Typography)(({ theme }) => ({ export const StyledTableRow = styled(TableRow)({ paddingLeft: 0, "&:hover": { - backgroundColor: "#F5F5F5", + backgroundColor: "#EDEDED", transition: "background-color 0.2s ease-in-out", cursor: "pointer", + borderRadius: "16px", }, });