From e6f947ad90b4139388b1c50ee9646c0de9ae1710 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Mon, 13 Nov 2023 14:42:45 +0530 Subject: [PATCH] style: ui improvements and bug fixes (#2758) * style: add transition to favorite projects dropdown. * style: update project integration settings borders. * style: fix text overflow issue in project views. * fix: issue with non-functional cancel button in leave project modal. --- web/components/project/integration-card.tsx | 2 +- .../project/leave-project-modal.tsx | 3 +- web/components/project/sidebar-list.tsx | 55 +++++++++++-------- web/components/views/delete-view-modal.tsx | 2 +- web/components/views/view-list-item.tsx | 6 +- .../[projectId]/settings/integrations.tsx | 2 +- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/web/components/project/integration-card.tsx b/web/components/project/integration-card.tsx index 8a53fa50d..786f5d79e 100644 --- a/web/components/project/integration-card.tsx +++ b/web/components/project/integration-card.tsx @@ -91,7 +91,7 @@ export const IntegrationCard: React.FC = ({ integration }) => { return ( <> {integration && ( -
+
= observer((props) => { - const { project, isOpen } = props; + const { project, isOpen, onClose } = props; // router const router = useRouter(); const { workspaceSlug } = router.query; @@ -48,6 +48,7 @@ export const LeaveProjectModal: FC = observer((props) => { const handleClose = () => { reset({ ...defaultValues }); + onClose(); }; const onSubmit = async (data: any) => { diff --git a/web/components/project/sidebar-list.tsx b/web/components/project/sidebar-list.tsx index cb501a697..a889e7fae 100644 --- a/web/components/project/sidebar-list.tsx +++ b/web/components/project/sidebar-list.tsx @@ -149,29 +149,38 @@ export const ProjectSidebarList: FC = observer(() => {
)} - - {orderedFavProjects.map((project, index) => ( - - {(provided, snapshot) => ( -
- handleCopyText(project.id)} - shortContextMenu - /> -
- )} -
- ))} -
+ + + {orderedFavProjects.map((project, index) => ( + + {(provided, snapshot) => ( +
+ handleCopyText(project.id)} + shortContextMenu + /> +
+ )} +
+ ))} +
+
{provided.placeholder} )} diff --git a/web/components/views/delete-view-modal.tsx b/web/components/views/delete-view-modal.tsx index 5bf07fb66..31be08379 100644 --- a/web/components/views/delete-view-modal.tsx +++ b/web/components/views/delete-view-modal.tsx @@ -104,7 +104,7 @@ export const DeleteProjectViewModal: React.FC = observer((props) => {

Are you sure you want to delete view-{" "} - {data?.name}? All of the + {data?.name}? All of the data related to the view will be permanently removed. This action cannot be undone.

diff --git a/web/components/views/view-list-item.tsx b/web/components/views/view-list-item.tsx index 3f145be53..41e3a7ae8 100644 --- a/web/components/views/view-list-item.tsx +++ b/web/components/views/view-list-item.tsx @@ -61,12 +61,12 @@ export const ProjectViewListItem: React.FC = observer((props) => {
-
+
-

{truncateText(view.name, 75)}

- {view?.description &&

{view.description}

} +

{truncateText(view.name, 75)}

+ {view?.description &&

{view.description}

}
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/integrations.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/integrations.tsx index 06b8c25b2..08bce4c4c 100644 --- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/integrations.tsx +++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/integrations.tsx @@ -43,7 +43,7 @@ const ProjectIntegrationsPage: NextPageWithLayout = () => { return (
-
+

Integrations

{workspaceIntegrations ? (