CSCKAN-323 feat: Update vias and destination changes

MetaCell · Oct 16, 2024 · 9a05404 · 9a05404
1 parent caf19d8
commit 9a05404
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/frontend/src/components/Forms/StatementForm.tsx b/frontend/src/components/Forms/StatementForm.tsx
@@ -295,6 +295,7 @@ const StatementForm = (props: any) => {
           },
           onUpdate: async (selectedOptions: Option[], formId: any) => {
             await updateEntity({
+              statementId: statement.id,
               selected: selectedOptions,
               entityId: getConnectionId(formId, statement.vias),
               entityType: "via",
@@ -336,6 +337,7 @@ const StatementForm = (props: any) => {
           },
           onUpdate: async (selectedOptions: Option[], formId: any) => {
             await updateEntity({
+              statementId: statement.id,
               selected: selectedOptions,
               entityId: getConnectionId(formId, statement.vias),
               entityType: "via",
@@ -468,6 +470,7 @@ const StatementForm = (props: any) => {
           },
           onUpdate: async (selectedOptions: Option[], formId: string) => {
             await updateEntity({
+              statementId: statement.id,
               selected: selectedOptions,
               entityId: getConnectionId(formId, statement?.destinations),
               entityType: "destination",
@@ -512,6 +515,7 @@ const StatementForm = (props: any) => {
           },
           onUpdate: async (selectedOptions: Option[], formId: string) => {
             await updateEntity({
+              statementId: statement.id,
               selected: selectedOptions,
               entityId: getConnectionId(formId, statement?.destinations),
               entityType: "destination",

diff --git a/frontend/src/services/CustomDropdownService.ts b/frontend/src/services/CustomDropdownService.ts
@@ -65,6 +65,7 @@ export async function updateOrigins(selected: Option[], statementId: number,
 }
 
 export type UpdateEntityParams = {
+  statementId: number
   selected: Option[];
   entityId: number | null;
   entityType: "via" | "destination";
@@ -79,6 +80,7 @@ const apiFunctionMap = {
 };
 
 export async function updateEntity({
+  statementId,
   selected,
   entityId,
   entityType,
@@ -93,9 +95,22 @@ export async function updateEntity({
   const patchObject = { [propertyToUpdate]: entityIds };
 
   try {
+    // Get the API function from the map
     const updateFunction = apiFunctionMap[entityType];
     if (updateFunction) {
-      await updateFunction(entityId, patchObject);
+      // Attempt to update, using checkOwnership in case of ownership error
+      try {
+        await updateFunction(entityId, patchObject);
+      } catch (error) {
+        // Ownership error occurred, trigger ownership check
+        checkOwnership(
+          statementId,
+          () => updateFunction(entityId, patchObject), // Re-attempt the update if ownership is reassigned
+          (fetchedEntity) => console.log(`Ownership assigned, updated entity:`, fetchedEntity), // Optional: handle post-assignment logic
+          (owner) =>
+            `This entity is currently assigned to ${owner.first_name}. You are in read-only mode. Would you like to assign this entity to yourself and gain edit access?`
+        );
+      }
     } else {
       console.error(`No update function found for entity type: ${entityType}`);
     }