chore: updated module updated handler in all-properties and spreadshe…

…et column
makeplane · Feb 21, 2024 · f4873ce · f4873ce
1 parent 749d862
commit f4873ce
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/web/components/issues/issue-layouts/properties/all-properties.tsx b/web/components/issues/issue-layouts/properties/all-properties.tsx
@@ -2,6 +2,7 @@ import { useCallback, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { useRouter } from "next/router";
 import { CalendarCheck2, CalendarClock, Layers, Link, Paperclip } from "lucide-react";
+import xor from "lodash/xor";
 // hooks
 import { useEventTracker, useEstimate, useLabel, useIssues } from "hooks/store";
 // components
@@ -133,14 +134,14 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
     (moduleIds: string[] | null) => {
       if (!issue || !issue.module_ids || !moduleIds) return;
 
-      if (moduleIds.length === 0) issueOperations.removeModulesFromIssue(issue.module_ids);
-      else if (moduleIds.length > issue.module_ids.length) {
-        const newModuleIds = moduleIds.filter((m) => !issue.module_ids?.includes(m));
-        issueOperations.addModulesToIssue(newModuleIds);
-      } else if (moduleIds.length < issue.module_ids.length) {
-        const removedModuleIds = issue.module_ids.filter((m) => !moduleIds.includes(m));
-        issueOperations.removeModulesFromIssue(removedModuleIds);
-      }
+      const updatedModuleIds = xor(issue.module_ids, moduleIds);
+      const modulesToAdd: string[] = [];
+      const modulesToRemove: string[] = [];
+      for (const moduleId of updatedModuleIds)
+        if (issue.module_ids.includes(moduleId)) modulesToRemove.push(moduleId);
+        else modulesToAdd.push(moduleId);
+      if (modulesToAdd.length > 0) issueOperations.addModulesToIssue(modulesToAdd);
+      if (modulesToRemove.length > 0) issueOperations.removeModulesFromIssue(modulesToRemove);
 
       captureIssueEvent({
         eventName: ISSUE_UPDATED,

diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/module-column.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback } from "react";
 import { useRouter } from "next/router";
 import { observer } from "mobx-react-lite";
+import xor from "lodash/xor";
 // hooks
 import { useEventTracker, useIssues } from "hooks/store";
 // components
@@ -32,15 +33,16 @@ export const SpreadsheetModuleColumn: React.FC<Props> = observer((props) => {
     async (moduleIds: string[] | null) => {
       if (!workspaceSlug || !issue || !issue.module_ids || !moduleIds) return;
 
-      if (moduleIds.length === 0)
-        removeModulesFromIssue(workspaceSlug.toString(), issue.project_id, issue.id, issue.module_ids);
-      else if (moduleIds.length > issue.module_ids.length) {
-        const newModuleIds = moduleIds.filter((m) => !issue.module_ids?.includes(m));
-        addModulesToIssue(workspaceSlug.toString(), issue.project_id, issue.id, newModuleIds);
-      } else if (moduleIds.length < issue.module_ids.length) {
-        const removedModuleIds = issue.module_ids.filter((m) => !moduleIds.includes(m));
-        removeModulesFromIssue(workspaceSlug.toString(), issue.project_id, issue.id, removedModuleIds);
-      }
+      const updatedModuleIds = xor(issue.module_ids, moduleIds);
+      const modulesToAdd: string[] = [];
+      const modulesToRemove: string[] = [];
+      for (const moduleId of updatedModuleIds)
+        if (issue.module_ids.includes(moduleId)) modulesToRemove.push(moduleId);
+        else modulesToAdd.push(moduleId);
+      if (modulesToAdd.length > 0)
+        addModulesToIssue(workspaceSlug.toString(), issue.project_id, issue.id, modulesToAdd);
+      if (modulesToRemove.length > 0)
+        removeModulesFromIssue(workspaceSlug.toString(), issue.project_id, issue.id, modulesToRemove);
 
       captureIssueEvent({
         eventName: "Issue updated",