From 633b090d88914e36ff701eec236e8b869b3c9f2d Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Tue, 13 Sep 2022 11:23:35 +0200
Subject: [PATCH] refactor(search-react): sort context import and states
 definitions

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 .../src/context/SearchContext.tsx             | 25 +++++++++++--------
 plugins/search-react/src/context/index.tsx    |  1 +
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/plugins/search-react/src/context/SearchContext.tsx b/plugins/search-react/src/context/SearchContext.tsx
index b4b5f00919..7faa743c9d 100644
--- a/plugins/search-react/src/context/SearchContext.tsx
+++ b/plugins/search-react/src/context/SearchContext.tsx
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/types';
-import { useApi, AnalyticsContext } from '@backstage/core-plugin-api';
-import { SearchResultSet } from '@backstage/plugin-search-common';
-import {
-  createVersionedContext,
-  createVersionedValueMap,
-} from '@backstage/version-bridge';
 import React, {
   PropsWithChildren,
   useCallback,
@@ -30,6 +23,15 @@ import React, {
 } from 'react';
 import useAsync, { AsyncState } from 'react-use/lib/useAsync';
 import usePrevious from 'react-use/lib/usePrevious';
+
+import {
+  createVersionedContext,
+  createVersionedValueMap,
+} from '@backstage/version-bridge';
+import { JsonObject } from '@backstage/types';
+import { AnalyticsContext, useApi } from '@backstage/core-plugin-api';
+import { SearchResultSet } from '@backstage/plugin-search-common';
+
 import { searchApiRef } from '../api';
 
 /**
@@ -104,12 +106,13 @@ const useSearchContextValue = (
   initialValue: SearchContextState = searchInitialState,
 ) => {
   const searchApi = useApi(searchApiRef);
+
+  const [term, setTerm] = useState<string>(initialValue.term);
+  const [types, setTypes] = useState<string[]>(initialValue.types);
+  const [filters, setFilters] = useState<JsonObject>(initialValue.filters);
   const [pageCursor, setPageCursor] = useState<string | undefined>(
     initialValue.pageCursor,
   );
-  const [filters, setFilters] = useState<JsonObject>(initialValue.filters);
-  const [term, setTerm] = useState<string>(initialValue.term);
-  const [types, setTypes] = useState<string[]>(initialValue.types);
 
   const prevTerm = usePrevious(term);
 
@@ -121,7 +124,7 @@ const useSearchContextValue = (
         pageCursor,
         types,
       }),
-    [term, filters, types, pageCursor],
+    [term, types, filters, pageCursor],
   );
 
   const hasNextPage =
diff --git a/plugins/search-react/src/context/index.tsx b/plugins/search-react/src/context/index.tsx
index 304f762943..720af8a949 100644
--- a/plugins/search-react/src/context/index.tsx
+++ b/plugins/search-react/src/context/index.tsx
@@ -19,6 +19,7 @@ export {
   useSearch,
   useSearchContextCheck,
 } from './SearchContext';
+
 export type {
   SearchContextProviderProps,
   SearchContextState,