Remove old search UI

Remove the `search_panel` feature flag tests and old search UI.
hypothesis · Jan 25, 2024 · e4427ce · e4427ce
1 parent aa8995d
commit e4427ce
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 1,347 deletions.
diff --git a/src/sidebar/components/HypothesisApp.tsx b/src/sidebar/components/HypothesisApp.tsx
@@ -66,8 +66,6 @@ function HypothesisApp({
 
   const isThirdParty = isThirdPartyService(settings);
 
-  const searchPanelEnabled = store.isFeatureEnabled('search_panel');
-
   const login = async () => {
     if (serviceConfig(settings)) {
       // Let the host page handle the login request
@@ -166,7 +164,7 @@ function HypothesisApp({
       <div className="container">
         <ToastMessages />
         <HelpPanel />
-        {searchPanelEnabled && <SearchPanel />}
+        <SearchPanel />
         <ShareDialog shareTab={!isThirdParty} />
 
         {route && (

diff --git a/src/sidebar/components/SidebarView.tsx b/src/sidebar/components/SidebarView.tsx
@@ -12,7 +12,6 @@ import SelectionTabs from './SelectionTabs';
 import SidebarContentError from './SidebarContentError';
 import ThreadList from './ThreadList';
 import { useRootThread } from './hooks/use-root-thread';
-import FilterStatus from './old-search/FilterStatus';
 import FilterControls from './search/FilterControls';
 
 export type SidebarViewProps = {
@@ -40,8 +39,6 @@ function SidebarView({
   // Store state values
   const store = useSidebarStore();
   const focusedGroupId = store.focusedGroupId();
-  const hasSelection = store.hasSelectedAnnotations();
-  const hasAppliedFilter = store.hasAppliedFilter() || hasSelection;
   const isLoading = store.isLoading();
   const isLoggedIn = store.isLoggedIn();
 
@@ -67,19 +64,13 @@ function SidebarView({
   const hasContentError =
     hasDirectLinkedAnnotationError || hasDirectLinkedGroupError;
 
-  const searchPanelEnabled = store.isFeatureEnabled('search_panel');
-  const showTabs =
-    !hasContentError && (searchPanelEnabled || !hasAppliedFilter);
-
-  // Whether to render the old filter status UI. If no filter is active, this
-  // will render nothing.
-  const showFilterStatus = !hasContentError && !searchPanelEnabled;
+  const showTabs = !hasContentError;
 
   // Whether to render the new filter UI. Note that when the search panel is
   // open, filter controls are integrated into it. The UI may render nothing
   // if no filters are configured or selection is active.
   const isSearchPanelOpen = store.isSidebarPanelOpen('searchAnnotations');
-  const showFilterControls = searchPanelEnabled && !isSearchPanelOpen;
+  const showFilterControls = !hasContentError && !isSearchPanelOpen;
 
   // Show a CTA to log in if successfully viewing a direct-linked annotation
   // and not logged in
@@ -143,7 +134,6 @@ function SidebarView({
   return (
     <div>
       <h2 className="sr-only">Annotations</h2>
-      {showFilterStatus && <FilterStatus />}
       {showFilterControls && <FilterControls withCardContainer />}
       <LoginPromptPanel onLogin={onLogin} onSignUp={onSignUp} />
       {hasDirectLinkedAnnotationError && (

diff --git a/src/sidebar/components/TopBar.tsx b/src/sidebar/components/TopBar.tsx
@@ -13,7 +13,6 @@ import PendingUpdatesButton from './PendingUpdatesButton';
 import PressableIconButton from './PressableIconButton';
 import SortMenu from './SortMenu';
 import UserMenu from './UserMenu';
-import SearchInput from './old-search/SearchInput';
 import SearchIconButton from './search/SearchIconButton';
 import StreamSearchInput from './search/StreamSearchInput';
 
@@ -70,10 +69,8 @@ function TopBar({
   const loginLinkStyle = applyTheme(['accentColor'], settings);
 
   const store = useSidebarStore();
-  const filterQuery = store.filterQuery();
   const isLoggedIn = store.isLoggedIn();
   const hasFetchedProfile = store.hasFetchedProfile();
-  const searchPanelEnabled = store.isFeatureEnabled('search_panel');
 
   const toggleSharePanel = () => {
     store.toggleSidebarPanel('shareGroupAnnotations');
@@ -118,13 +115,7 @@ function TopBar({
           {isSidebar && (
             <>
               <PendingUpdatesButton />
-              {!searchPanelEnabled && (
-                <SearchInput
-                  query={filterQuery || null}
-                  onSearch={store.setFilterQuery}
-                />
-              )}
-              {searchPanelEnabled && <SearchIconButton />}
+              <SearchIconButton />
               <SortMenu />
               <TopBarToggleButton
                 icon={ShareIcon}

diff --git a/src/sidebar/components/hooks/test/use-root-thread-test.js b/src/sidebar/components/hooks/test/use-root-thread-test.js
@@ -64,42 +64,4 @@ describe('sidebar/components/hooks/use-root-thread', () => {
       assert.equal(threadState.showTabs, showTabs);
     });
   });
-
-  [
-    // When using search UI, always filter by tab.
-    { newSearchUI: true, hasFilter: true, hasSelection: false, showTabs: true },
-
-    // When using old search UI, only filter by tab if no selection or filter
-    // is active.
-    {
-      newSearchUI: false,
-      hasFilter: true,
-      hasSelection: false,
-      showTabs: false,
-    },
-    {
-      newSearchUI: false,
-      hasFilter: false,
-      hasSelection: true,
-      showTabs: false,
-    },
-    {
-      newSearchUI: false,
-      hasFilter: false,
-      hasSelection: false,
-      showTabs: true,
-    },
-  ].forEach(({ newSearchUI, hasFilter, hasSelection, showTabs }) => {
-    it('if `search_panel` is disabled, does not filter by tab if there is a filter active', () => {
-      fakeStore.route.returns('sidebar');
-      fakeStore.isFeatureEnabled.withArgs('search_panel').returns(newSearchUI);
-      fakeStore.hasAppliedFilter.returns(hasFilter);
-      fakeStore.hasSelectedAnnotations.returns(hasSelection);
-
-      mount(<DummyComponent />);
-      const threadState = fakeThreadAnnotations.getCall(0).args[0];
-
-      assert.equal(threadState.showTabs, showTabs);
-    });
-  });
 });
diff --git a/src/sidebar/components/hooks/use-root-thread.ts b/src/sidebar/components/hooks/use-root-thread.ts
@@ -18,14 +18,7 @@ export function useRootThread(): ThreadAnnotationsResult {
   const route = store.route();
   const selectionState = store.selectionState();
   const filters = store.getFilterValues();
-
-  // This logic mirrors code in `SidebarView`. It can be simplified once
-  // the "search_panel" feature is turned on everywhere.
-  const searchPanelEnabled = store.isFeatureEnabled('search_panel');
-  const hasAppliedFilter =
-    store.hasAppliedFilter() || store.hasSelectedAnnotations();
-  const showTabs =
-    route === 'sidebar' && (searchPanelEnabled || !hasAppliedFilter);
+  const showTabs = route === 'sidebar';
 
   const threadState = useMemo((): ThreadState => {
     const selection = { ...selectionState, filterQuery: query, filters };