Merge pull request #2203 from makeplane/sync/ce-ee

Sync: Community Changes

web/ce/components/cycles/end-cycle/modal.tsx

@@ -7,6 +7,7 @@ interface Props {
   projectId: string;
   workspaceSlug: string;
   transferrableIssuesCount: number;
+  cycleName: string;
 }
 
 export const EndCycleModal: React.FC<Props> = () => <></>;

web/ce/store/cycle/index.ts

@@ -0,0 +1 @@
+export type { ICycleStore } from "@/store/cycle.store";

web/core/components/cycles/list/cycle-list-item-action.tsx

@@ -82,10 +82,10 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
 
   // derived values
   const cycleStatus = cycleDetails.status ? (cycleDetails.status.toLocaleLowerCase() as TCycleGroups) : "draft";
-  
+
   const showIssueCount = useMemo(() => cycleStatus === "draft" || cycleStatus === "upcoming", [cycleStatus]);
 
-  const showTransferIssues = cycleDetails.pending_issues > 0 && cycleStatus === "completed";
+  const showTransferIssues = routerProjectId && cycleDetails.pending_issues > 0 && cycleStatus === "completed";
 
   const isEditingAllowed = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],

web/core/components/cycles/quick-actions.tsx

@@ -177,6 +177,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
               projectId={projectId}
               workspaceSlug={workspaceSlug}
               transferrableIssuesCount={cycleDetails.pending_issues}
+              cycleName={cycleDetails.name}
             />
           )}
         </div>

web/core/hooks/store/use-cycle.ts

@@ -2,7 +2,7 @@ import { useContext } from "react";
 // mobx store
 import { StoreContext } from "@/lib/store-context";
 // types
-import { ICycleStore } from "@/store/cycle.store";
+import { ICycleStore } from "@/plane-web/store/cycle";
 
 export const useCycle = (): ICycleStore => {
   const context = useContext(StoreContext);

web/ee/store/cycle/index.ts

@@ -0,0 +1 @@
+export * from "@/store/cycle.store";