diff --git a/ui/src/App.tsx b/ui/src/App.tsx index 3f5f2805..8f1dd13e 100644 --- a/ui/src/App.tsx +++ b/ui/src/App.tsx @@ -7,7 +7,7 @@ import { import Home from "./views/home" import Repo from "./views/Repo" -import Deployment from "./views/Deployment" +import Deployment from "./views/deployment" import Settings from "./views/settings" import Members from "./views/members" diff --git a/ui/src/components/DeploymentDescriptor/index.tsx b/ui/src/components/DeploymentDescriptor/index.tsx deleted file mode 100644 index eccc5548..00000000 --- a/ui/src/components/DeploymentDescriptor/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import DeploymentDescriptor from "./DeploymentDescriptor" - -export default DeploymentDescriptor diff --git a/ui/src/components/DeploymentDescriptor/CommitChanges.tsx b/ui/src/views/deployment/CommitChanges.tsx similarity index 100% rename from ui/src/components/DeploymentDescriptor/CommitChanges.tsx rename to ui/src/views/deployment/CommitChanges.tsx diff --git a/ui/src/components/DeploymentDescriptor/DeploymentDescriptor.tsx b/ui/src/views/deployment/DeploymentDescriptor.tsx similarity index 69% rename from ui/src/components/DeploymentDescriptor/DeploymentDescriptor.tsx rename to ui/src/views/deployment/DeploymentDescriptor.tsx index 1fb14caa..21dbb7fe 100644 --- a/ui/src/components/DeploymentDescriptor/DeploymentDescriptor.tsx +++ b/ui/src/views/deployment/DeploymentDescriptor.tsx @@ -1,22 +1,25 @@ +import { useState } from "react" import { Button, Descriptions, Modal, Typography } from "antd" import moment from "moment" -import DeploymentStatusBadge from "../DeploymentStatusBadge" -import UserAvatar from "../UserAvatar" import CommitChanges from "./CommitChanges" +import DeploymentStatusBadge from "../../components/DeploymentStatusBadge" +import UserAvatar from "../../components/UserAvatar" import { Commit, Deployment } from "../../models" import { getShortRef } from "../../libs" -import { useState } from "react" const { Text } = Typography -interface DeploymentDescriptorProps { +export interface DeploymentDescriptorProps { deployment: Deployment - commits: Commit[] + changes: Commit[] } -export default function DeploymentDescriptor(props: DeploymentDescriptorProps): JSX.Element { +export default function DeploymentDescriptor({ + deployment, + changes +}: DeploymentDescriptorProps): JSX.Element { const [visible, setVisible] = useState(false) const showModal = () => { @@ -29,18 +32,20 @@ export default function DeploymentDescriptor(props: DeploymentDescriptorProps): return ( - {props.deployment.env} + + {deployment.env} + - {getShortRef(props.deployment)} + {getShortRef(deployment)} - + - + - {moment(props.deployment.createdAt).format("YYYY-MM-DD HH:mm:ss")} + {moment(deployment.createdAt).format("YYYY-MM-DD HH:mm:ss")} + : + } - } + )} > -