feat(collaboration): integrate new shared goal creation function

src/components/GoalsComponents/DisplayChangesModal/AcceptBtn.tsx

@@ -34,6 +34,7 @@ const AcceptBtn = ({ typeAtPriority, acceptChanges }: AcceptBtnProps) => {
       {typeAtPriority === "restored" && "Restore for me too"}
       {typeAtPriority === "deleted" && "Delete for me too"}
       {typeAtPriority === "subgoals" && "Add all checked"}
+      {typeAtPriority === "newGoalMoved" && "Move for me too"}
       {typeAtPriority === "modifiedGoals" && "Make all checked changes"}
       {typeAtPriority === "moved" && "Move for me too"}
     </button>

src/components/GoalsComponents/DisplayChangesModal/DisplayChangesModal.tsx

@@ -155,7 +155,7 @@ const DisplayChangesModal = ({ currentMainGoal }: { currentMainGoal: GoalItem })
       return;
     }
     const removeChanges =
-      currentDisplay === "subgoals"
+      currentDisplay === "subgoals" || currentDisplay === "newGoalMoved"
         ? newGoals.map(({ goal }) => goal.id)
         : currentDisplay === "moved"
           ? [goalUnderReview.id, ...(await getAllDescendants(goalUnderReview.id)).map((goal: GoalItem) => goal.id)]
@@ -199,7 +199,7 @@ const DisplayChangesModal = ({ currentMainGoal }: { currentMainGoal: GoalItem })
     if (currentDisplay === "moved") {
       await handleMoveChanges();
     }
-    if (currentDisplay === "subgoals") {
+    if (currentDisplay === "subgoals" || currentDisplay === "newGoalMoved") {
       const goalsToBeSelected = newGoals
         .filter(({ goal }) => !unselectedChanges.includes(goal.id))
         .map(({ goal }) => goal);
@@ -266,7 +266,7 @@ const DisplayChangesModal = ({ currentMainGoal }: { currentMainGoal: GoalItem })
         if (changedGoal) {
           setGoalUnderReview({ ...changedGoal });
           // TODO: remove the newGoalsMoved and try handle in subgoal only
-          if (typeAtPriority === "subgoals") {
+          if (typeAtPriority === "subgoals" || typeAtPriority === "newGoalMoved") {
             setNewGoals(goals || []);
           } else if (typeAtPriority === "modifiedGoals") {
             setUpdatesIntent(goals[0].intent);
@@ -370,7 +370,7 @@ const DisplayChangesModal = ({ currentMainGoal }: { currentMainGoal: GoalItem })
           )}
           {["deleted", "archived", "restored"].includes(currentDisplay) && <div />}
           {currentDisplay === "modifiedGoals" && getEditChangesList()}
-          {currentDisplay === "subgoals" && getSubgoalsList()}
+          {(currentDisplay === "subgoals" || currentDisplay === "newGoalMoved") && getSubgoalsList()}
           {currentDisplay === "moved" && getMovedSubgoalsList(goalUnderReview, oldParentTitle, newParentTitle)}
 
           <div className="d-flex justify-fe gap-20">

src/components/GoalsComponents/DisplayChangesModal/Header.tsx

@@ -18,6 +18,12 @@ const Header = ({
           {contactName} added to {title}.    Add as well ?
         </>
       );
+    case "newGoalMoved":
+      return (
+        <>
+          {contactName} moved {title} to {title}.&nbsp; &nbsp; Move as well ?
+        </>
+      );
     case "modifiedGoals":
       return (
         <>

src/helpers/GoalController.ts

@@ -284,12 +284,20 @@ export const getGoalHistoryToRoot = async (goalId: string): Promise<{ goalID: st
 export const moveGoalHierarchy = async (goalId: string, newParentGoalId: string) => {
   const goalToMove = await getGoal(goalId);
   const newParentGoal = await getGoal(newParentGoalId);
-  if (!goalToMove) return;
+
+  if (!goalToMove) {
+    return;
+  }
 
   const oldParentId = goalToMove.parentGoalId;
   const ancestors = await getGoalHistoryToRoot(goalId);
   const ancestorGoalIds = ancestors.map((ele) => ele.goalID);
 
+  const ancestorGoalsIdsOfNewParent = await getGoalHistoryToRoot(newParentGoalId);
+  const ancestorGoalIdsOfNewParent = ancestorGoalsIdsOfNewParent.map((ele) => ele.goalID);
+
+  await createSharedGoal(goalToMove, newParentGoalId, ancestorGoalIdsOfNewParent);
+
   await Promise.all([
     updateGoal(goalToMove.id, { parentGoalId: newParentGoalId }),
     removeGoalFromParentSublist(goalToMove.id, oldParentId),
@@ -298,6 +306,7 @@ export const moveGoalHierarchy = async (goalId: string, newParentGoalId: string)
   ]);
 
   const subscribers = await getParticipantsOfGoals(ancestorGoalIds);
+
   subscribers.forEach(async ({ sub, rootGoalId }) => {
     await sendUpdatesToSubscriber(sub, rootGoalId, "moved", [
       {
@@ -312,6 +321,7 @@ export const moveGoalHierarchy = async (goalId: string, newParentGoalId: string)
   });
 
   const descendants = await getAllDescendants(goalId);
+
   if (descendants.length > 0) {
     subscribers.forEach(async ({ sub, rootGoalId }) => {
       await sendUpdatesToSubscriber(

src/helpers/GoalProcessor.ts

@@ -114,6 +114,8 @@ export const getTypeAtPriority = (goalChanges: IChangesInGoal) => {
     typeAtPriority = "restored";
   } else if (goalChanges.moved.length > 0) {
     typeAtPriority = "moved";
+  } else if (goalChanges.newGoalMoved.length > 0) {
+    typeAtPriority = "newGoalMoved";
   }
   return { typeAtPriority };
 };
@@ -131,15 +133,15 @@ export const jumpToLowestChanges = async (id: string, relId: string) => {
       const parentId =
         "id" in goalAtPriority
           ? goalAtPriority.id
-          : typeAtPriority === "subgoals"
+          : typeAtPriority === "subgoals" || typeAtPriority === "newGoalMoved"
             ? goalAtPriority.goal.parentGoalId
             : goalAtPriority.goal.id;
 
       if (typeAtPriority === "archived" || typeAtPriority === "deleted") {
         const result = { typeAtPriority, parentId, goals: [await getGoal(parentId)] };
         return result;
       }
-      if (typeAtPriority === "subgoals") {
+      if (typeAtPriority === "subgoals" || typeAtPriority === "newGoalMoved") {
         goalChanges[typeAtPriority].forEach(({ intent, goal }) => {
           if (goal.parentGoalId === parentId) goals.push({ intent, goal });
         });

src/helpers/InboxProcessor.ts

@@ -58,7 +58,7 @@ export const handleIncomingChanges = async (payload: Payload, relId: string) =>
       console.log("Changes ignored");
       return;
     }
-    if (payload.changeType === "subgoals") {
+    if (payload.changeType === "subgoals" || payload.changeType === "newGoalMoved") {
       const changes = [
         ...payload.changes.map((ele: changesInGoal) => ({ ...ele, goal: fixDateVlauesInGoalObject(ele.goal) })),
       ];
@@ -95,7 +95,7 @@ export const handleIncomingChanges = async (payload: Payload, relId: string) =>
     }
   } else if (["sharer", "suggestion"].includes(payload.type)) {
     const { changes, changeType, rootGoalId } = payload;
-    if (changeType === "subgoals") {
+    if (changeType === "subgoals" || changeType === "newGoalMoved") {
       const rootGoal = await getGoal(rootGoalId);
       if (!rootGoal || !rootGoal.participants.find((p) => p.relId === relId && p.following)) {
         return;

src/helpers/PartnerController.ts

@@ -8,7 +8,7 @@ import { createGoalObjectFromTags } from "./GoalProcessor";
 const sendUpdate = (
   subscribers: IParticipant[],
   rootGoalId: string,
-  type: "subgoals" | "modifiedGoals",
+  type: "subgoals" | "modifiedGoals" | "newGoalMoved",
   obj: {
     level: number;
     goal: GoalItem;

src/models/InboxItem.ts

@@ -1,6 +1,13 @@
 import { GoalItem } from "./GoalItem";
 
-export type typeOfChange = "subgoals" | "modifiedGoals" | "archived" | "deleted" | "restored" | "moved";
+export type typeOfChange =
+  | "subgoals"
+  | "modifiedGoals"
+  | "archived"
+  | "deleted"
+  | "restored"
+  | "moved"
+  | "newGoalMoved";
 
 export type typeOfIntent = "suggestion" | "shared";
 export type changesInId = { level: number; id: string; intent: typeOfIntent };
@@ -13,7 +20,7 @@ export interface IChangesInGoal {
   deleted: changesInId[];
   restored: changesInId[];
   moved: changesInId[];
-  // newGoalMoved: changesInGoal[];
+  newGoalMoved: changesInGoal[];
 }
 
 export interface InboxItem {

src/utils/defaultGenerators.ts

@@ -30,5 +30,6 @@ export function getDefaultValueOfGoalChanges() {
     deleted: [] as changesInId[],
     restored: [] as changesInId[],
     moved: [] as changesInId[],
+    newGoalMoved: [] as changesInGoal[],
   };
 }