diff --git a/web/components/issues/confirm-issue-discard.tsx b/web/components/issues/confirm-issue-discard.tsx index 98b4eaf48..eca797e64 100644 --- a/web/components/issues/confirm-issue-discard.tsx +++ b/web/components/issues/confirm-issue-discard.tsx @@ -73,7 +73,7 @@ export const ConfirmIssueDiscard: React.FC = (props) => { Discard -
+
diff --git a/web/components/issues/issue-layouts/kanban/roots/project-root.tsx b/web/components/issues/issue-layouts/kanban/roots/project-root.tsx index 927751249..999f013f5 100644 --- a/web/components/issues/issue-layouts/kanban/roots/project-root.tsx +++ b/web/components/issues/issue-layouts/kanban/roots/project-root.tsx @@ -105,6 +105,7 @@ export const KanBanLayout: React.FC = observer(() => { displayProperties={displayProperties} kanBanToggle={issueKanBanViewStore?.kanBanToggle} handleKanBanToggle={handleKanBanToggle} + enableQuickIssueCreate /> ) : ( = observer((props) => { const { module: moduleStore } = useMobxStore(); - const completionPercentage = (module.completed_issues / module.total_issues) * 100; + const moduleTotalIssues = + module.backlog_issues + + module.unstarted_issues + + module.started_issues + + module.completed_issues + + module.cancelled_issues; + + const completionPercentage = (module.completed_issues / moduleTotalIssues) * 100; const endDate = new Date(module.target_date ?? ""); const startDate = new Date(module.start_date ?? ""); @@ -47,15 +54,13 @@ export const ModuleCardItem: React.FC = observer((props) => { const moduleStatus = MODULE_STATUS.find((status) => status.value === module.status); const issueCount = - module.completed_issues && module.total_issues - ? module.total_issues === 0 - ? "0 Issue" - : module.total_issues === module.completed_issues - ? module.total_issues > 1 - ? `${module.total_issues} Issues` - : `${module.total_issues} Issue` - : `${module.completed_issues}/${module.total_issues} Issues` - : "0 Issue"; + moduleTotalIssues === 0 + ? "0 Issue" + : moduleTotalIssues === module.completed_issues + ? moduleTotalIssues > 1 + ? `${moduleTotalIssues} Issues` + : `${moduleTotalIssues} Issue` + : `${module.completed_issues}/${moduleTotalIssues} Issues`; const handleAddToFavorites = (e: React.MouseEvent) => { e.stopPropagation(); @@ -158,7 +163,7 @@ export const ModuleCardItem: React.FC = observer((props) => {
- {issueCount} + {issueCount ?? "0 Issue"}
{module.members_detail.length > 0 && (