Avoid adding empty pending decisions

RISDEV-2979
digitalservicebund · Dec 18, 2023 · a5f6a8e · a5f6a8e
1 parent 8b2614f
commit a5f6a8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/frontend/src/components/ComboboxInput.vue b/frontend/src/components/ComboboxInput.vue
@@ -65,7 +65,7 @@ const toggleDropdown = async () => {
     if (inputText.value) {
       filter.value = inputText.value
     }
-    await updateCurrentItems(filter.value)
+    await updateCurrentItems()
     inputFieldRef.value?.focus()
   }
 }
@@ -76,7 +76,7 @@ const showUpdatedDropdown = async () => {
   if (inputText.value) {
     filter.value = inputText.value
   }
-  await updateCurrentItems(filter.value)
+  await updateCurrentItems()
 }
 
 const clearDropdown = async () => {
@@ -87,7 +87,7 @@ const clearDropdown = async () => {
   inputText.value = ""
   focusedItemIndex.value = 0
   if (showDropdown.value) {
-    await updateCurrentItems("")
+    await updateCurrentItems()
   }
   inputFieldRef.value?.focus()
 }
@@ -145,7 +145,7 @@ const updateFocusedItem = () => {
   if (item && item.innerText !== NO_MATCHING_ENTRY) item.focus()
 }
 
-const updateCurrentItems = async (searchStr?: string) => {
+const updateCurrentItems = async () => {
   hasToUpdate.value = true
   if (isUpdating.value && hasToUpdate.value) {
     return
@@ -180,10 +180,12 @@ const updateCurrentItems = async (searchStr?: string) => {
     noCurrentlyDisplayeditems.value ||
     //no exact match found when add manual entry option set
     (props.manualEntry &&
-      searchStr &&
-      !currentlyDisplayedItems.value.find((item) => item.label === searchStr))
+      filter.value &&
+      !currentlyDisplayedItems.value.find(
+        (item) => item.label === filter.value,
+      ))
   ) {
-    handleNoSearchResults(searchStr)
+    handleNoSearchResults(filter.value)
   } else {
     createNewItem.value = undefined
     candidateForSelection.value = currentlyDisplayedItems.value[0]

diff --git a/frontend/src/domain/ensuingDecision.ts b/frontend/src/domain/ensuingDecision.ts
@@ -68,12 +68,8 @@ export default class EnsuingDecision
     fieldName: keyof EnsuingDecision,
     value: EnsuingDecision[(typeof EnsuingDecision.fields)[number]],
   ) {
-    if (fieldName === "pending" && value === true) {
-      return false
-    }
-
-    if (fieldName === "decisionDate" && this.pending === true) {
-      return false
+    if (fieldName === "pending") {
+      return true
     }
     if (value === undefined || !value || value === null) {
       return true