Merge pull request #4688 from makeplane/preview

release: v0.21-dev

admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.20.0"
+  "version": "0.21.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [

packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/constants",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "main": "./src/index.ts",
   "exports": {

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/document-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/document-editor",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Package that powers Plane's Pages Editor",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",

packages/editor/extensions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-extensions",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Package that powers Plane's Editor with extensions",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/lite-text-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/lite-text-editor",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Package that powers Plane's Comment Editor",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/rich-text-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/rich-text-editor",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Rich Text Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

packages/eslint-config-custom/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-custom",
   "private": true,
-  "version": "0.20.0",
+  "version": "0.21.0",
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {},

packages/tailwind-config-custom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-config-custom",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "common tailwind configuration across monorepo",
   "main": "index.js",
   "private": true,

packages/tsconfig/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsconfig",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "files": [
     "base.json",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/types",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "main": "./src/index.d.ts"
 }

packages/ui/package.json

@@ -2,7 +2,7 @@
   "name": "@plane/ui",
   "description": "UI components shared across multiple apps internally",
   "private": true,
-  "version": "0.20.0",
+  "version": "0.21.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

space/package.json

@@ -1,6 +1,6 @@
 {
   "name": "space",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

web/components/headers/modules-list.tsx

@@ -8,7 +8,7 @@ import { ModuleViewHeader } from "@/components/modules";
 // constants
 import { EUserProjectRoles } from "@/constants/project";
 // hooks
-import { useCommandPalette, useEventTracker, useProject, useUser, } from "@/hooks/store";
+import { useCommandPalette, useEventTracker, useProject, useUser } from "@/hooks/store";
 
 export const ModulesListHeader: React.FC = observer(() => {
   // router
@@ -16,7 +16,7 @@ export const ModulesListHeader: React.FC = observer(() => {
   const { workspaceSlug } = router.query;
   // store hooks
   const { toggleCreateModuleModal } = useCommandPalette();
-  const { setTrackElement, captureEvent } = useEventTracker();
+  const { setTrackElement } = useEventTracker();
   const {
     membership: { currentProjectRole },
   } = useUser();

web/components/modules/archived-modules/modal.tsx

@@ -3,10 +3,8 @@ import { useRouter } from "next/router";
 import { Dialog, Transition } from "@headlessui/react";
 // ui
 import { Button, TOAST_TYPE, setToast } from "@plane/ui";
-// constants
-import { MODULE_ARCHIVED } from "@/constants/event-tracker";
 // hooks
-import { useEventTracker, useModule } from "@/hooks/store";
+import { useModule } from "@/hooks/store";
 
 type Props = {
   workspaceSlug: string;
@@ -25,7 +23,6 @@ export const ArchiveModuleModal: React.FC<Props> = (props) => {
   const [isArchiving, setIsArchiving] = useState(false);
   // store hooks
   const { getModuleNameById, archiveModule } = useModule();
-  const { captureEvent } = useEventTracker();
 
   const moduleName = getModuleNameById(moduleId);
 
@@ -45,9 +42,6 @@ export const ArchiveModuleModal: React.FC<Props> = (props) => {
         });
         onClose();
         router.push(`/${workspaceSlug}/projects/${projectId}/modules`);
-        captureEvent(MODULE_ARCHIVED, {
-          module_id: moduleId,
-        });
       })
       .catch(() =>
         setToast({

web/components/modules/archived-modules/root.tsx

@@ -10,11 +10,10 @@ import { ArchivedModulesView, ModuleAppliedFiltersList } from "@/components/modu
 import { CycleModuleListLayout } from "@/components/ui";
 // constants
 import { EmptyStateType } from "@/constants/empty-state";
-import { MODULES_FILTER_REMOVED } from "@/constants/event-tracker";
 // helpers
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
-import { useModule, useModuleFilter, useEventTracker } from "@/hooks/store";
+import { useModule, useModuleFilter } from "@/hooks/store";
 
 export const ArchivedModuleLayoutRoot: React.FC = observer(() => {
   // router
@@ -22,7 +21,6 @@ export const ArchivedModuleLayoutRoot: React.FC = observer(() => {
   const { workspaceSlug, projectId } = router.query;
   // hooks
   const { fetchArchivedModules, projectArchivedModuleIds, loader } = useModule();
-  const { captureEvent } = useEventTracker();
   // module filters hook
   const { clearAllFilters, currentProjectArchivedFilters, updateFilters } = useModuleFilter();
   // derived values
@@ -46,12 +44,6 @@ export const ArchivedModuleLayoutRoot: React.FC = observer(() => {
       if (!value) newValues = [];
       else newValues = newValues.filter((val) => val !== value);
 
-      captureEvent(MODULES_FILTER_REMOVED, {
-        filter_type: key,
-        filter_property: value,
-        current_filters: currentProjectArchivedFilters,
-      });
-
       updateFilters(projectId.toString(), { [key]: newValues }, "archived");
     },
     [currentProjectArchivedFilters, projectId, updateFilters]

web/components/modules/dropdowns/order-by.tsx

@@ -9,7 +9,7 @@ import { cn } from "@/helpers/common.helper";
 // constants
 
 type Props = {
-  onChange: (property: "order_by" | "sort_by", value: TModuleOrderByOptions) => void;
+  onChange: (value: TModuleOrderByOptions) => void;
   value: TModuleOrderByOptions | undefined;
 };
 
@@ -39,8 +39,8 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
           key={option.key}
           className="flex items-center justify-between gap-2"
           onClick={() => {
-            if (isDescending && !isManual) onChange("order_by", `-${option.key}` as TModuleOrderByOptions);
-            else onChange("order_by", option.key);
+            if (isDescending && !isManual) onChange(`-${option.key}` as TModuleOrderByOptions);
+            else onChange(option.key);
           }}
         >
           {option.label}
@@ -53,7 +53,7 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
           <CustomMenu.MenuItem
             className="flex items-center justify-between gap-2"
             onClick={() => {
-              if (isDescending) onChange("sort_by", value.slice(1) as TModuleOrderByOptions);
+              if (isDescending) onChange(value.slice(1) as TModuleOrderByOptions);
             }}
           >
             Ascending
@@ -62,7 +62,7 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
           <CustomMenu.MenuItem
             className="flex items-center justify-between gap-2"
             onClick={() => {
-              if (!isDescending) onChange("sort_by", `-${value}` as TModuleOrderByOptions);
+              if (!isDescending) onChange(`-${value}` as TModuleOrderByOptions);
             }}
           >
             Descending

web/components/modules/module-list-item-action.tsx

@@ -11,7 +11,7 @@ import { Tooltip, setPromiseToast } from "@plane/ui";
 import { FavoriteStar } from "@/components/core";
 import { ModuleQuickActions } from "@/components/modules";
 // constants
-import { E_LIST_LAYOUT, MODULE_FAVORITED, MODULE_UNFAVORITED } from "@/constants/event-tracker";
+import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "@/constants/event-tracker";
 import { MODULE_STATUS } from "@/constants/module";
 import { EUserProjectRoles } from "@/constants/project";
 // helpers
@@ -59,7 +59,7 @@ export const ModuleListItemAction: FC<Props> = observer((props) => {
       () => {
         captureEvent(MODULE_FAVORITED, {
           module_id: moduleId,
-          element: E_LIST_LAYOUT,
+          element: "Grid layout",
           state: "SUCCESS",
         });
       }
@@ -90,7 +90,7 @@ export const ModuleListItemAction: FC<Props> = observer((props) => {
     ).then(() => {
       captureEvent(MODULE_UNFAVORITED, {
         module_id: moduleId,
-        element: E_LIST_LAYOUT,
+        element: "Grid layout",
         state: "SUCCESS",
       });
     });

web/components/modules/module-view-header.tsx

@@ -13,18 +13,11 @@ import { Tooltip } from "@plane/ui";
 import { FiltersDropdown } from "@/components/issues";
 import { ModuleFiltersSelection, ModuleOrderByDropdown } from "@/components/modules/dropdowns";
 // constants
-import {
-  E_MODULES,
-  MODULES_FILTER_APPLIED,
-  MODULES_FILTER_REMOVED,
-  MODULES_LAYOUT_CHANGED,
-  MODULES_SORT_UPDATED,
-} from "@/constants/event-tracker";
 import { MODULE_VIEW_LAYOUTS } from "@/constants/module";
 // helpers
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
-import { useEventTracker, useMember, useModuleFilter } from "@/hooks/store";
+import { useMember, useModuleFilter } from "@/hooks/store";
 import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
@@ -51,7 +44,6 @@ export const ModuleViewHeader: FC = observer(() => {
     updateFilters,
     updateSearchQuery,
   } = useModuleFilter();
-  const { captureEvent } = useEventTracker();
 
   // states
   const [isSearchOpen, setIsSearchOpen] = useState(searchQuery !== "" ? true : false);
@@ -72,15 +64,9 @@ export const ModuleViewHeader: FC = observer(() => {
         else newValues.push(value);
       }
 
-      captureEvent((filters?.[key] ?? []).length > newValues.length ? MODULES_FILTER_REMOVED : MODULES_FILTER_APPLIED, {
-        filter_type: key,
-        filter_property: value,
-        current_filters: filters,
-      });
-
       updateFilters(projectId.toString(), { [key]: newValues });
     },
-    [filters, projectId, updateFilters, captureEvent]
+    [filters, projectId, updateFilters]
   );
 
   const handleInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
@@ -149,19 +135,11 @@ export const ModuleViewHeader: FC = observer(() => {
 
       <ModuleOrderByDropdown
         value={displayFilters?.order_by}
-        onChange={(property, val) => {
+        onChange={(val) => {
           if (!projectId || val === displayFilters?.order_by) return;
           updateDisplayFilters(projectId.toString(), {
             order_by: val,
           });
-          captureEvent(MODULES_SORT_UPDATED, {
-            changed_property: property,
-            change_details: val.replaceAll("-", ""),
-            current_sort: {
-              order_by: displayFilters?.order_by?.replaceAll("-", ""),
-              sort_by: displayFilters?.order_by?.startsWith("-") ? "desc" : "asc",
-            },
-          });
         }}
       />
       <FiltersDropdown
@@ -176,11 +154,6 @@ export const ModuleViewHeader: FC = observer(() => {
           handleDisplayFiltersUpdate={(val) => {
             if (!projectId) return;
             updateDisplayFilters(projectId.toString(), val);
-            captureEvent(!val.favorites ? MODULES_FILTER_REMOVED : MODULES_FILTER_APPLIED, {
-              filter_type: "favorites",
-              filter_property: val.favorites,
-              current_filters: filters,
-            });
           }}
           handleFiltersUpdate={handleFilters}
           memberIds={workspaceMemberIds ?? undefined}
@@ -200,9 +173,6 @@ export const ModuleViewHeader: FC = observer(() => {
               onClick={() => {
                 if (!projectId) return;
                 updateDisplayFilters(projectId.toString(), { layout: layout.key });
-                captureEvent(MODULES_LAYOUT_CHANGED, {
-                  layout: layout.key,
-                });
               }}
             >
               <layout.icon

web/components/modules/quick-actions.tsx

@@ -8,7 +8,6 @@ import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, set
 // components
 import { ArchiveModuleModal, CreateUpdateModuleModal, DeleteModuleModal } from "@/components/modules";
 // constants
-import { E_MODULES, MODULE_ARCHIVED, MODULE_RESTORED } from "@/constants/event-tracker";
 import { EUserProjectRoles } from "@/constants/project";
 // helpers
 import { cn } from "@/helpers/common.helper";
@@ -32,7 +31,7 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {
   const [archiveModuleModal, setArchiveModuleModal] = useState(false);
   const [deleteModal, setDeleteModal] = useState(false);
   // store hooks
-  const { setTrackElement, captureEvent } = useEventTracker();
+  const { setTrackElement } = useEventTracker();
   const {
     membership: { currentWorkspaceAllProjectsRole },
   } = useUser();
@@ -59,7 +58,7 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {
   const handleOpenInNewTab = () => window.open(`/${moduleLink}`, "_blank");
 
   const handleEditModule = () => {
-    setTrackElement(E_MODULES);
+    setTrackElement("Modules page list layout");
     setEditModal(true);
   };
 
@@ -74,9 +73,6 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {
           message: "Your module can be found in project modules.",
         });
         router.push(`/${workspaceSlug}/projects/${projectId}/archives/modules`);
-        captureEvent(MODULE_RESTORED, {
-          module_id: moduleId,
-        });
       })
       .catch(() =>
         setToast({
@@ -87,7 +83,7 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {
       );
 
   const handleDeleteModule = () => {
-    setTrackElement(E_MODULES);
+    setTrackElement("Modules page list layout");
     setDeleteModal(true);
   };
 

web/constants/event-tracker.ts

@@ -163,12 +163,6 @@ export const MODULE_UNFAVORITED = "Module unfavorited";
 export const MODULE_LINK_CREATED = "Module link created";
 export const MODULE_LINK_UPDATED = "Module link updated";
 export const MODULE_LINK_DELETED = "Module link deleted";
-export const MODULES_LAYOUT_CHANGED = "Modules layout changed";
-export const MODULES_SORT_UPDATED = "Modules sort updated";
-export const MODULES_FILTER_APPLIED = "Modules filter applied";
-export const MODULES_FILTER_REMOVED = "Modules filter removed";
-export const MODULE_ARCHIVED = "Module archived";
-export const MODULE_RESTORED = "Module restored";
 // Issue Events
 export const ISSUE_CREATED = "Issue created";
 export const ISSUE_UPDATED = "Issue updated";
@@ -228,8 +222,3 @@ export const SNOOZED_NOTIFICATIONS = "Snoozed notifications viewed";
 export const ARCHIVED_NOTIFICATIONS = "Archived notifications viewed";
 // Groups
 export const GROUP_WORKSPACE = "Workspace_metrics";
-
-// Elements
-export const E_MODULES = "Modules Page";
-export const E_GRID_LAYOUT = "Grid Layout";
-export const E_LIST_LAYOUT = "List Layout";

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx

@@ -11,11 +11,10 @@ import { ModuleAppliedFiltersList, ModulesListView } from "@/components/modules"
 import ModulesListMobileHeader from "@/components/modules/moduels-list-mobile-header";
 // constants
 import { EmptyStateType } from "@/constants/empty-state";
-import { MODULES_FILTER_REMOVED } from "@/constants/event-tracker";
 // helpers
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
-import { useModuleFilter, useProject, useEventTracker } from "@/hooks/store";
+import { useModuleFilter, useProject } from "@/hooks/store";
 // layouts
 import { AppLayout } from "@/layouts/app-layout";
 // types
@@ -28,7 +27,6 @@ const ProjectModulesPage: NextPageWithLayout = observer(() => {
   const { getProjectById, currentProjectDetails } = useProject();
   const { currentProjectFilters, currentProjectDisplayFilters, clearAllFilters, updateFilters, updateDisplayFilters } =
     useModuleFilter();
-    const { captureEvent } = useEventTracker();
   // derived values
   const project = projectId ? getProjectById(projectId.toString()) : undefined;
   const pageTitle = project?.name ? `${project?.name} - Modules` : undefined;
@@ -41,12 +39,6 @@ const ProjectModulesPage: NextPageWithLayout = observer(() => {
       if (!value) newValues = [];
       else newValues = newValues.filter((val) => val !== value);
 
-      captureEvent(MODULES_FILTER_REMOVED, {
-        filter_type: key,
-        filter_property: value,
-        current_filters: currentProjectFilters,
-      });
-
       updateFilters(projectId.toString(), { [key]: newValues });
     },
     [currentProjectFilters, projectId, updateFilters]

web/store/inbox/project-inbox.store.ts

@@ -212,16 +212,15 @@ export class ProjectInboxStore implements IProjectInboxStore {
   createOrUpdateInboxIssue = (inboxIssues: TInboxIssue[], workspaceSlug: string, projectId: string) => {
     if (inboxIssues && inboxIssues.length > 0) {
       inboxIssues.forEach((inbox: TInboxIssue) => {
-        const inboxIssueDetail = this.getIssueInboxByIssueId(inbox?.issue?.id);
-        if (inboxIssueDetail)
-          update(this.inboxIssues, [inbox?.issue?.id], (existingInboxIssue) => ({
-            ...existingInboxIssue,
+        const existingInboxIssueDetail = this.getIssueInboxByIssueId(inbox?.issue?.id);
+        if (existingInboxIssueDetail)
+          Object.assign(existingInboxIssueDetail, {
             ...inbox,
             issue: {
-              ...existingInboxIssue?.issue,
-              ...inbox?.issue,
+              ...existingInboxIssueDetail.issue,
+              ...inbox.issue,
             },
-          }));
+          });
         else
           set(this.inboxIssues, [inbox?.issue?.id], new InboxIssueStore(workspaceSlug, projectId, inbox, this.store));
       });

web/store/issue/cycle/issue.store.ts

@@ -148,20 +148,20 @@ export class CycleIssues extends IssueHelperStore implements ICycleIssues {
     const cycleIssueIds = this.issues[cycleId];
     if (!cycleIssueIds) return;
 
-    const _issues = this.rootIssueStore.issues.getIssuesByIds(cycleIssueIds, "un-archived");
-    if (!_issues) return [];
+    const currentIssues = this.rootIssueStore.issues.getIssuesByIds(cycleIssueIds, "un-archived");
+    if (!currentIssues) return [];
 
     let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
-      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
-      else issues = this.unGroupedIssues(orderBy, _issues);
+      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+      else issues = this.unGroupedIssues(orderBy, currentIssues);
     } else if (layout === "kanban" && groupBy && orderBy) {
-      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, _issues);
-      else issues = this.groupedIssues(groupBy, orderBy, _issues);
-    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", _issues, true);
-    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", _issues);
-    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", _issues);
+      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, currentIssues);
+      else issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", currentIssues, true);
+    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", currentIssues);
+    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", currentIssues);
 
     return issues;
   }
@@ -301,14 +301,17 @@ export class CycleIssues extends IssueHelperStore implements ICycleIssues {
         });
       }
 
-      if (data.module_ids && data.module_ids.length > 0) {
+      const currentModuleIds =
+        data.module_ids && data.module_ids.length > 0 ? data.module_ids.filter((moduleId) => moduleId != "None") : [];
+
+      if (currentModuleIds.length > 0) {
         await this.rootStore.moduleIssues.changeModulesInIssue(
           workspaceSlug,
           projectId,
           response.id,
-          data.module_ids,
+          currentModuleIds,
           []
-        )
+        );
       }
 
       this.rootIssueStore.rootStore.cycle.fetchCycleDetails(workspaceSlug, projectId, cycleId);

web/store/issue/module/issue.store.ts

@@ -1,6 +1,5 @@
 import concat from "lodash/concat";
 import pull from "lodash/pull";
-import isEmpty from "lodash/isEmpty";
 import set from "lodash/set";
 import uniq from "lodash/uniq";
 import update from "lodash/update";
@@ -148,20 +147,20 @@ export class ModuleIssues extends IssueHelperStore implements IModuleIssues {
     const moduleIssueIds = this.issues[moduleId];
     if (!moduleIssueIds) return;
 
-    const _issues = this.rootIssueStore.issues.getIssuesByIds(moduleIssueIds, "un-archived");
-    if (!_issues) return [];
+    const currentIssues = this.rootIssueStore.issues.getIssuesByIds(moduleIssueIds, "un-archived");
+    if (!currentIssues) return [];
 
     let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
-      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
-      else issues = this.unGroupedIssues(orderBy, _issues);
+      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+      else issues = this.unGroupedIssues(orderBy, currentIssues);
     } else if (layout === "kanban" && groupBy && orderBy) {
-      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, _issues);
-      else issues = this.groupedIssues(groupBy, orderBy, _issues);
-    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", _issues, true);
-    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", _issues);
-    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", _issues);
+      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, currentIssues);
+      else issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", currentIssues, true);
+    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", currentIssues);
+    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", currentIssues);
 
     return issues;
   }
@@ -302,8 +301,9 @@ export class ModuleIssues extends IssueHelperStore implements IModuleIssues {
         });
       }
 
-      if (data.cycle_id && data.cycle_id !== "") {
-        await this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, data.cycle_id, response.id)
+      const currentCycleId = data.cycle_id !== "" && data.cycle_id === "None" ? undefined : data.cycle_id;
+      if (currentCycleId) {
+        await this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, currentCycleId, response.id);
       }
 
       this.rootIssueStore.rootStore.module.fetchModuleDetails(workspaceSlug, projectId, moduleId);

web/store/issue/project-views/issue.store.ts

@@ -1,9 +1,9 @@
 import pull from "lodash/pull";
 import set from "lodash/set";
 import { action, observable, makeObservable, computed, runInAction } from "mobx";
+import { TIssue, TLoader, TGroupedIssues, TSubGroupedIssues, TUnGroupedIssues, ViewFlags } from "@plane/types";
 // base class
 import { IssueService } from "@/services/issue/issue.service";
-import { TIssue, TLoader, TGroupedIssues, TSubGroupedIssues, TUnGroupedIssues, ViewFlags } from "@plane/types";
 import { IssueHelperStore } from "../helpers/issue-helper.store";
 // services
 // types
@@ -97,20 +97,20 @@ export class ProjectViewIssues extends IssueHelperStore implements IProjectViewI
     const viewIssueIds = this.issues[viewId];
     if (!viewIssueIds) return;
 
-    const _issues = this.rootStore.issues.getIssuesByIds(viewIssueIds, "un-archived");
-    if (!_issues) return [];
+    const currentIssues = this.rootStore.issues.getIssuesByIds(viewIssueIds, "un-archived");
+    if (!currentIssues) return [];
 
     let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
-      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
-      else issues = this.unGroupedIssues(orderBy, _issues);
+      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+      else issues = this.unGroupedIssues(orderBy, currentIssues);
     } else if (layout === "kanban" && groupBy && orderBy) {
-      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, _issues);
-      else issues = this.groupedIssues(groupBy, orderBy, _issues);
-    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", _issues, true);
-    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", _issues);
-    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", _issues);
+      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, currentIssues);
+      else issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", currentIssues, true);
+    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", currentIssues);
+    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", currentIssues);
 
     return issues;
   }
@@ -247,18 +247,25 @@ export class ProjectViewIssues extends IssueHelperStore implements IProjectViewI
         });
       }
 
-      if (data.cycle_id && data.cycle_id !== "") {
-        await this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, data.cycle_id, response.id)
+      const currentCycleId = data.cycle_id !== "" && data.cycle_id === "None" ? undefined : data.cycle_id;
+      const currentModuleIds =
+        data.module_ids && data.module_ids.length > 0 ? data.module_ids.filter((moduleId) => moduleId != "None") : [];
+
+      const multipleIssuePromises = [];
+      if (currentCycleId) {
+        multipleIssuePromises.push(
+          this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, currentCycleId, response.id)
+        );
       }
 
-      if (data.module_ids && data.module_ids.length > 0) {
-        await this.rootStore.moduleIssues.changeModulesInIssue(
-          workspaceSlug,
-          projectId,
-          response.id,
-          data.module_ids,
-          []
-        )
+      if (currentModuleIds.length > 0) {
+        multipleIssuePromises.push(
+          this.rootStore.moduleIssues.changeModulesInIssue(workspaceSlug, projectId, response.id, currentModuleIds, [])
+        );
+      }
+
+      if (multipleIssuePromises && multipleIssuePromises.length > 0) {
+        await Promise.all(multipleIssuePromises);
       }
 
       return response;

web/store/issue/project/issue.store.ts

@@ -103,20 +103,20 @@ export class ProjectIssues extends IssueHelperStore implements IProjectIssues {
     const projectIssueIds = this.issues[projectId];
     if (!projectIssueIds) return;
 
-    const _issues = this.rootStore.issues.getIssuesByIds(projectIssueIds, "un-archived");
-    if (!_issues) return [];
+    const currentIssues = this.rootStore.issues.getIssuesByIds(projectIssueIds, "un-archived");
+    if (!currentIssues) return [];
 
     let issues: TGroupedIssues | TSubGroupedIssues | TUnGroupedIssues = [];
 
     if (layout === "list" && orderBy) {
-      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, _issues);
-      else issues = this.unGroupedIssues(orderBy, _issues);
+      if (groupBy) issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+      else issues = this.unGroupedIssues(orderBy, currentIssues);
     } else if (layout === "kanban" && groupBy && orderBy) {
-      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, _issues);
-      else issues = this.groupedIssues(groupBy, orderBy, _issues);
-    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", _issues, true);
-    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", _issues);
-    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", _issues);
+      if (subGroupBy) issues = this.subGroupedIssues(subGroupBy, groupBy, orderBy, currentIssues);
+      else issues = this.groupedIssues(groupBy, orderBy, currentIssues);
+    } else if (layout === "calendar") issues = this.groupedIssues("target_date", "target_date", currentIssues, true);
+    else if (layout === "spreadsheet") issues = this.unGroupedIssues(orderBy ?? "-created_at", currentIssues);
+    else if (layout === "gantt_chart") issues = this.unGroupedIssues(orderBy ?? "sort_order", currentIssues);
 
     return issues;
   }
@@ -244,7 +244,7 @@ export class ProjectIssues extends IssueHelperStore implements IProjectIssues {
       const response = await this.createIssue(workspaceSlug, projectId, data);
 
       const quickAddIssueIndex = this.issues[projectId].findIndex((_issueId) => _issueId === data.id);
-      
+
       if (quickAddIssueIndex >= 0) {
         runInAction(() => {
           this.issues[projectId].splice(quickAddIssueIndex, 1);
@@ -252,20 +252,27 @@ export class ProjectIssues extends IssueHelperStore implements IProjectIssues {
         });
       }
 
-      //TODO: error handling needs to be improved for rare cases
-      if (data.cycle_id && data.cycle_id !== "") {
-        await this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, data.cycle_id, response.id)
+      const currentCycleId = data.cycle_id !== "" && data.cycle_id === "None" ? undefined : data.cycle_id;
+      const currentModuleIds =
+        data.module_ids && data.module_ids.length > 0 ? data.module_ids.filter((moduleId) => moduleId != "None") : [];
+
+      const multipleIssuePromises = [];
+      if (currentCycleId) {
+        multipleIssuePromises.push(
+          this.rootStore.cycleIssues.addCycleToIssue(workspaceSlug, projectId, currentCycleId, response.id)
+        );
       }
 
-      if (data.module_ids && data.module_ids.length > 0) {
-        await this.rootStore.moduleIssues.changeModulesInIssue(
-          workspaceSlug,
-          projectId,
-          response.id,
-          data.module_ids,
-          []
-        )
+      if (currentModuleIds.length > 0) {
+        multipleIssuePromises.push(
+          this.rootStore.moduleIssues.changeModulesInIssue(workspaceSlug, projectId, response.id, currentModuleIds, [])
+        );
       }
+
+      if (multipleIssuePromises && multipleIssuePromises.length > 0) {
+        await Promise.all(multipleIssuePromises);
+      }
+
       return response;
     } catch (error) {
       this.fetchIssues(workspaceSlug, projectId, "mutation");