diff --git a/src/features/dependencies/components/Dependencies.tsx b/src/features/dependencies/components/Dependencies.tsx index e01a0ece..b32a6cbd 100644 --- a/src/features/dependencies/components/Dependencies.tsx +++ b/src/features/dependencies/components/Dependencies.tsx @@ -108,7 +108,7 @@ export const Dependencies = ({ Package - Installed Version + Version diff --git a/src/features/requestedPackages/components/RequestedPackage.tsx b/src/features/requestedPackages/components/RequestedPackage.tsx index 2eae3375..433bb59e 100644 --- a/src/features/requestedPackages/components/RequestedPackage.tsx +++ b/src/features/requestedPackages/components/RequestedPackage.tsx @@ -2,6 +2,9 @@ import React from "react"; import Typography from "@mui/material/Typography"; import TableCell from "@mui/material/TableCell"; import { requestedPackageParser } from "../../../utils/helpers"; +import { useAppSelector } from "../../../hooks"; +import styled from "@mui/material/styles/styled"; + interface IRequestedPackageProps { /** * @param requestedPackage requested package @@ -10,48 +13,59 @@ interface IRequestedPackageProps { isLast: boolean; } +const StyledTableCell = styled(TableCell)(() => ({ + width: 190 +})); + +const StyledTypography = styled(Typography)(() => ({ + fontSize: "13px", + color: "#333" +})); + export const RequestedPackage = ({ requestedPackage, isLast }: IRequestedPackageProps) => { + const { versionsWithoutConstraints, versionsWithConstraints } = + useAppSelector(state => state.requestedPackages); const { constraint, name, version } = requestedPackageParser(requestedPackage); return ( <> - - - {name} - - - {name} + + + + {versionsWithConstraints[name] ?? versionsWithoutConstraints[name]}{" "} + + + - {constraint === "latest" ? "(no version requested)" : `${constraint.replace("==", "=")}${version}`} - - + + ); }; diff --git a/src/features/requestedPackages/components/RequestedPackageList.tsx b/src/features/requestedPackages/components/RequestedPackageList.tsx index 87764393..7f9fd60e 100644 --- a/src/features/requestedPackages/components/RequestedPackageList.tsx +++ b/src/features/requestedPackages/components/RequestedPackageList.tsx @@ -34,7 +34,7 @@ export const RequestedPackageList = ({ return ( Package + + Installed Version + Requested Version - {filteredPackageList.map((item, index) => ( + {filteredPackageList.map((item: string, index: number) => (