🐛 Fix references/acknowledgments state management

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Fix multi-row operations in affects table (`OSIDB-4381`)
 * Affect's CVSS changes not saved/commited (`OSIDB-4431`)
 * Fix history section becoming hidden after saving flaw changes (`OSIDB-4491`)
+* Fix references and acknowledgements remaining in edit state after saving (`OSIDB-4484`)
 
 ### Changed
 * Implement AffectsV2 (`OSIDB-4459`)

src/components/FlawForm/FlawForm.vue

@@ -166,6 +166,16 @@ const hiddenSources = computed(() => {
 const referencesComp = ref<InstanceType<typeof IssueFieldReferences> | null>(null);
 const acknowledgmentsComp = ref<InstanceType<typeof IssueFieldAcknowledgments> | null>(null);
 
+const handleReferencesSaved = async (references: any[]) => {
+  await saveReferences(references);
+  referencesComp.value?.editableListComp?.onSaveComplete();
+};
+
+const handleAcknowledgmentsSaved = async (acknowledgments: any[]) => {
+  await saveAcknowledgments(acknowledgments);
+  acknowledgmentsComp.value?.editableListComp?.onSaveComplete();
+};
+
 const expandFocusedComponent = (parent_uuid: string) => {
   // Expand Flaw References section
   const reference = flawReferences.value.find(refer => refer.uuid === parent_uuid);
@@ -421,7 +431,7 @@ const aegisContext: AegisSuggestionContextRefs = aegisSuggestionRequestBody(flaw
           class="col-6"
           :mode="mode"
           :error="errors.references"
-          @reference:update="saveReferences"
+          @reference:update="handleReferencesSaved"
           @reference:new="addBlankReference(flaw.embargoed)"
           @reference:cancel-new="cancelAddReference"
           @reference:delete="deleteReference"
@@ -432,7 +442,7 @@ const aegisContext: AegisSuggestionContextRefs = aegisSuggestionRequestBody(flaw
           class="col-6"
           :mode="mode"
           :error="errors.acknowledgments"
-          @acknowledgment:update="saveAcknowledgments"
+          @acknowledgment:update="handleAcknowledgmentsSaved"
           @acknowledgment:new="addBlankAcknowledgment(flaw.embargoed)"
           @acknowledgment:cancel-new="cancelAddAcknowledgment"
           @acknowledgment:delete="deleteAcknowledgment"

src/composables/useFlawAttributionsModel.ts

@@ -34,8 +34,16 @@ export function useFlawAttributionsModel(flaw: Ref<ZodFlawType>, isSaving: Ref<b
 
   async function createReference(reference: ZodFlawReferenceType) {
     isSaving.value = true;
-    await postFlawReference(flaw.value.uuid, reference)
+    const response = await postFlawReference(flaw.value.uuid, reference)
       .finally(() => isSaving.value = false);
+
+    // Update the local reference with the UUID from the server response
+    if (response?.data?.uuid) {
+      const index = flawReferences.value.findIndex(ref => ref === reference);
+      if (index !== -1) {
+        flawReferences.value[index] = { ...reference, ...response.data };
+      }
+    }
   }
 
   async function deleteReference(referenceId: string) {
@@ -58,6 +66,7 @@ export function useFlawAttributionsModel(flaw: Ref<ZodFlawType>, isSaving: Ref<b
         await createReference(reference);
       }
     }
+    isSaving.value = false;
     afterSaveSuccess();
   }
 
@@ -75,8 +84,16 @@ export function useFlawAttributionsModel(flaw: Ref<ZodFlawType>, isSaving: Ref<b
 
   async function createAcknowledgment(acknowlegdment: any) {
     isSaving.value = true;
-    await postFlawAcknowledgment(flaw.value.uuid, acknowlegdment)
+    const response = await postFlawAcknowledgment(flaw.value.uuid, acknowlegdment)
       .finally(() => isSaving.value = false);
+
+    // Update the local acknowledgment with the UUID from the server response
+    if (response?.data?.uuid) {
+      const index = flawAcknowledgments.value.findIndex(ack => ack === acknowlegdment);
+      if (index !== -1) {
+        flawAcknowledgments.value[index] = { ...acknowlegdment, ...response.data };
+      }
+    }
   }
 
   async function deleteAcknowledgment(acknowledgmentId: string) {
@@ -93,13 +110,15 @@ export function useFlawAttributionsModel(flaw: Ref<ZodFlawType>, isSaving: Ref<b
   }
 
   async function saveAcknowledgments(acknowledgments: ZodFlawAcknowledgmentType[]) {
+    isSaving.value = true;
     for (const acknowledgment of acknowledgments) {
       if (acknowledgment.uuid) {
         await updateAcknowledgment(acknowledgment);
       } else {
         await createAcknowledgment(acknowledgment);
       }
     }
+    isSaving.value = false;
     afterSaveSuccess();
   }
 

src/widgets/EditableList/EditableList.vue

@@ -19,6 +19,7 @@ const emit = defineEmits<{
   'item:delete': [value: string];
   'item:new': [];
   'item:save': [value: any[]];
+  'save:complete': [];
 }>();
 
 const modals = computed(() => Object.fromEntries(items.value.map(item => [item.uuid, useModal()])));
@@ -66,6 +67,14 @@ function saveItems() {
   emit('item:save', itemsToSave.value);
 }
 
+function onSaveComplete() {
+  // Reset the saved state after successful save
+  savedValues.value = deepCopyFromRaw(items.value);
+  priorValues.value = deepCopyFromRaw(items.value);
+  indexBeingEdited.value = null;
+  emit('save:complete');
+}
+
 function cancelEdit(index: number) {
   items.value[index] = deepCopyFromRaw(priorValues.value[index]);
   indexBeingEdited.value = null;
@@ -80,7 +89,7 @@ function commitEdit() {
   indexBeingEdited.value = null;
 }
 
-defineExpose({ isExpanded });
+defineExpose({ isExpanded, onSaveComplete });
 </script>
 
 <template>