From 6e574515e0e70f5888e9bc52789eafaa3112f988 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:16:47 +0530 Subject: [PATCH] fix: module delete modal outside click event propagation (#4265) --- web/components/modules/module-list-item.tsx | 178 ++++++++++---------- 1 file changed, 88 insertions(+), 90 deletions(-) diff --git a/web/components/modules/module-list-item.tsx b/web/components/modules/module-list-item.tsx index c6d59471b..7503811fb 100644 --- a/web/components/modules/module-list-item.tsx +++ b/web/components/modules/module-list-item.tsx @@ -135,103 +135,101 @@ export const ModuleListItem: React.FC = observer((props) => { const completedModuleCheck = moduleDetails.status === "completed"; return ( - { - if (isArchived) { - openModuleOverview(e); - } - }} - > -
-
-
-
- - - {completedModuleCheck ? ( - progress === 100 ? ( - - ) : ( - {`!`} - ) - ) : progress === 100 ? ( +
+ { + if (isArchived) { + openModuleOverview(e); + } + }} + className="relative flex w-full items-center justify-between gap-3 overflow-hidden" + > +
+
+ + + {completedModuleCheck ? ( + progress === 100 ? ( ) : ( - {`${progress}%`} - )} - - - - {moduleDetails.name} - -
- -
-
- {moduleStatus && ( - - {moduleStatus.label} - - )} + {`!`} + ) + ) : progress === 100 ? ( + + ) : ( + {`${progress}%`} + )} + + + + {moduleDetails.name} +
+ +
+
+ {moduleStatus && ( + + {moduleStatus.label} + + )} +
+ +
+
+ {renderDate && ( + + {renderFormattedDate(startDate) ?? "_ _"} - {renderFormattedDate(endDate) ?? "_ _"} + + )}
-
-
- {renderDate && ( - - {renderFormattedDate(startDate) ?? "_ _"} - {renderFormattedDate(endDate) ?? "_ _"} - - )} -
+
+ +
+ {moduleDetails.member_ids.length > 0 ? ( + + {moduleDetails.member_ids.map((member_id) => { + const member = getUserDetails(member_id); + return ; + })} + + ) : ( + + + + )} +
+
-
- -
- {moduleDetails.member_ids.length > 0 ? ( - - {moduleDetails.member_ids.map((member_id) => { - const member = getUserDetails(member_id); - return ; - })} - - ) : ( - - - - )} -
-
- - {isEditingAllowed && !isArchived && ( - { - if (moduleDetails.is_favorite) handleRemoveFromFavorites(e); - else handleAddToFavorites(e); - }} - selected={moduleDetails.is_favorite} - /> - )} - {workspaceSlug && projectId && ( - - )} -
+ {isEditingAllowed && !isArchived && ( + { + if (moduleDetails.is_favorite) handleRemoveFromFavorites(e); + else handleAddToFavorites(e); + }} + selected={moduleDetails.is_favorite} + /> + )} + {workspaceSlug && projectId && ( + + )}
- +
); });