Fix issue regarding link auto deletion on workspace load affecting #393

datagov-cz · Mar 2, 2022 · 0239956 · 0239956
1 parent 55113a8
commit 0239956
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/src/components/modals/CreationModals.tsx b/src/components/modals/CreationModals.tsx
@@ -82,7 +82,7 @@ export const CreationModals: React.FC<Props> = (props) => {
                   props.linkConfiguration.targetID,
                 ]
               ),
-              updateProjectLink(false, ...initConnections())
+              updateProjectLink(false, ...initConnections().add)
             );
             setRepresentation(Representation.COMPACT);
             AppSettings.selectedElements = [];

diff --git a/src/function/FunctionElem.ts b/src/function/FunctionElem.ts
@@ -283,7 +283,7 @@ export async function putElementsOnCanvas(
       );
       const newIDs = initElements(true);
       queries.push(updateProjectElement(false, ...newIDs));
-      queries.push(updateProjectLink(false, ...initConnections()));
+      queries.push(updateProjectLink(false, ...initConnections().add));
       ids.push(...newIDs);
       addToFlexSearch(...ids);
     }

diff --git a/src/function/FunctionGraph.ts b/src/function/FunctionGraph.ts
@@ -98,7 +98,7 @@ export async function spreadConnections(
     );
     const newIDs = initElements();
     queries.push(updateProjectElement(false, ...newIDs));
-    queries.push(updateProjectLink(false, ...initConnections()));
+    queries.push(updateProjectLink(false, ...initConnections().add));
     ids.push(...newIDs);
   }
   const elem = graph.getElements().find((elem) => elem.id === id);

diff --git a/src/function/FunctionRestriction.ts b/src/function/FunctionRestriction.ts
@@ -21,7 +21,7 @@ export function createRestriction(
   restrictions.push(restriction);
 }
 
-export function initConnections(removeOutdated: boolean = false): string[] {
+export function initConnections(): { add: string[]; del: string[] } {
   const linksToPush = [];
   const linksToDelete: string[] = Object.keys(WorkspaceLinks);
   const restrictions = _.flatten(
@@ -99,6 +99,5 @@ export function initConnections(removeOutdated: boolean = false): string[] {
       }
     }
   }
-  if (removeOutdated) return linksToPush.concat(linksToDelete);
-  return linksToPush;
+  return { add: linksToPush, del: linksToDelete };
 }
diff --git a/src/interface/ContextInterface.ts b/src/interface/ContextInterface.ts
@@ -220,14 +220,8 @@ export async function retrieveContextData(): Promise<boolean> {
   )
     return false;
   addToFlexSearch(...Object.keys(WorkspaceElements));
-  const connections = initConnections(true);
-  const connectionsToDelete = connections.filter(
-    (link) => link in WorkspaceLinks
-  );
-  const connectionsToInitialize = connections.filter(
-    (link) => !(link in WorkspaceLinks)
-  );
-  for (const id of connectionsToDelete) {
+  const connections = initConnections();
+  for (const id of connections.del) {
     // This is expected behaviour e.g. for imported diagrams,
     // if they have references to links that no longer exist in the data.
     console.warn(
@@ -238,8 +232,8 @@ export async function retrieveContextData(): Promise<boolean> {
   return await processTransaction(
     AppSettings.contextEndpoint,
     qb.constructQuery(
-      updateProjectLink(false, ...connectionsToInitialize),
-      updateDeleteProjectLink(true, ...connectionsToDelete)
+      updateProjectLink(false, ...connections.add),
+      updateDeleteProjectLink(true, ...connections.del)
     )
   );
 }