From 42452f005dccd3bf6530ac90d168c5dbf3d98df9 Mon Sep 17 00:00:00 2001
From: headphonejames <generalfuzz@gmail.com>
Date: Thu, 23 Mar 2023 19:14:28 -0700
Subject: [PATCH] Enable selecting items in the autocomplete picker component
 when a values in the query string are already provided in the URL.

Fixes https://github.com/backstage/backstage/issues/17021

Signed-off-by: headphonejames <generalfuzz@gmail.com>
---
 .../EntityAutocompletePicker/EntityAutocompletePicker.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
index b81d681e6d..20294fa7f1 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
@@ -28,7 +28,6 @@ import {
   useEntityList,
 } from '../../hooks/useEntityListProvider';
 import { EntityFilter } from '../../types';
-import _ from 'lodash';
 
 type KeysMatchingCondition<T, V, K> = T extends V ? K : never;
 type KeysMatching<T, V> = {
@@ -97,13 +96,10 @@ export function EntityAutocompletePicker<
   // Set selected options on query parameter updates; this happens at initial page load and from
   // external updates to the page location
   useEffect(() => {
-    if (
-      queryParameters.length &&
-      !_.isEqual(selectedOptions, queryParameters)
-    ) {
+    if (queryParameters.length) {
       setSelectedOptions(queryParameters);
     }
-  }, [selectedOptions, queryParameters]);
+  }, [queryParameters]);
 
   const availableOptions = Object.keys(availableValues ?? {});
   const shouldAddFilter = selectedOptions.length && availableOptions.length;