From 2472106020a20bb5e737a247a662f7972f8e4e4b Mon Sep 17 00:00:00 2001
From: Joseph Axisa <jax@looker.com>
Date: Fri, 9 Apr 2021 14:58:54 +0000
Subject: [PATCH 1/2] fix: remove search criteria and auto expand results

---
 .../src/components/SideNav/SideNav.tsx            |  8 +++++---
 .../src/components/SideNav/SideNavMethods.tsx     | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/api-explorer/src/components/SideNav/SideNav.tsx b/packages/api-explorer/src/components/SideNav/SideNav.tsx
index 708fa12b7..2a379a85d 100644
--- a/packages/api-explorer/src/components/SideNav/SideNav.tsx
+++ b/packages/api-explorer/src/components/SideNav/SideNav.tsx
@@ -44,7 +44,6 @@ import { HEADER_REM } from '../Header'
 import { SideNavTags } from './SideNavTags'
 import { SideNavTypes } from './SideNavTypes'
 import { useDebounce, countMethods, countTypes } from './searchUtils'
-import { SearchCriteriaSelector } from './SearchCriteriaSelector'
 import { SearchMessage } from './SearchMessage'
 
 interface SideNavProps {
@@ -108,7 +107,6 @@ export const SideNav: FC<SideNavProps> = ({ api, specKey }) => {
   return (
     <nav>
       <Flex alignItems="center" pl="large" pr="large" pb="large">
-        <SearchCriteriaSelector />
         <InputSearch
           onChange={handleInputChange}
           placeholder="Search"
@@ -125,7 +123,11 @@ export const SideNav: FC<SideNavProps> = ({ api, specKey }) => {
       </TabList>
       <TabPanels {...tabs} pt="xsmall" height={`${menuH}px`} overflow="auto">
         <TabPanel>
-          <SideNavTags tags={tags} specKey={specKey} />
+          <SideNavTags
+            tags={tags}
+            specKey={specKey}
+            defaultOpen={!!searchResults}
+          />
         </TabPanel>
         <TabPanel>
           <SideNavTypes types={types} specKey={specKey} />
diff --git a/packages/api-explorer/src/components/SideNav/SideNavMethods.tsx b/packages/api-explorer/src/components/SideNav/SideNavMethods.tsx
index 1ba1454e2..267d962c9 100644
--- a/packages/api-explorer/src/components/SideNav/SideNavMethods.tsx
+++ b/packages/api-explorer/src/components/SideNav/SideNavMethods.tsx
@@ -24,7 +24,7 @@
 
  */
 
-import React, { FC, useContext, useState } from 'react'
+import React, { FC, useContext, useEffect, useState } from 'react'
 import styled from 'styled-components'
 import {
   Accordion,
@@ -48,7 +48,7 @@ interface MethodsProps {
 
 const SideNavMethodsLayout: FC<MethodsProps> = ({
   className,
-  defaultOpen,
+  defaultOpen = false,
   methods,
   tag,
   specKey,
@@ -59,9 +59,7 @@ const SideNavMethodsLayout: FC<MethodsProps> = ({
   const match = useRouteMatch<{ methodTag: string }>(
     `/:specKey/methods/:methodTag/:methodName?`
   )
-  const [isOpen, setIsOpen] = useState(
-    match ? defaultOpen || match.params.methodTag === tag : defaultOpen
-  )
+  const [isOpen, setIsOpen] = useState(defaultOpen)
   const history = useHistory()
 
   const handleOpen = () => {
@@ -70,6 +68,13 @@ const SideNavMethodsLayout: FC<MethodsProps> = ({
     if (_isOpen) history.push(`/${specKey}/methods/${tag}`)
   }
 
+  useEffect(() => {
+    const status = match
+      ? defaultOpen || match.params.methodTag === tag
+      : defaultOpen
+    setIsOpen(status)
+  }, [defaultOpen])
+
   return (
     <Accordion
       defaultOpen={defaultOpen}

From 86393669d652488969d40c0ae1685c19ac3fbc88 Mon Sep 17 00:00:00 2001
From: Joseph Axisa <jax@looker.com>
Date: Tue, 13 Apr 2021 10:42:01 +0000
Subject: [PATCH 2/2] test: search

---
 .../src/components/SideNav/SideNav.spec.tsx   | 46 +++++++++++++++++--
 .../src/components/SideNav/SideNav.tsx        |  1 +
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/api-explorer/src/components/SideNav/SideNav.spec.tsx b/packages/api-explorer/src/components/SideNav/SideNav.spec.tsx
index eec22779a..7c121d4bb 100644
--- a/packages/api-explorer/src/components/SideNav/SideNav.spec.tsx
+++ b/packages/api-explorer/src/components/SideNav/SideNav.spec.tsx
@@ -24,14 +24,16 @@
 
  */
 import React from 'react'
-import { ApiModel } from '@looker/sdk-codegen'
+import { ApiModel, CriteriaToSet } from '@looker/sdk-codegen'
 import { pick } from 'lodash'
 import userEvent from '@testing-library/user-event'
-import { screen } from '@testing-library/react'
+import { act, screen, waitFor } from '@testing-library/react'
 
 import { api } from '../../test-data'
-import { renderWithRouter } from '../../test-utils'
+import { renderWithRouter, renderWithSearchAndRouter } from '../../test-utils'
+import { defaultSearchState } from '../../reducers'
 import { SideNav } from './SideNav'
+import { countMethods } from './searchUtils'
 
 describe('SideNav', () => {
   const testApi = ({
@@ -41,12 +43,16 @@ describe('SideNav', () => {
   const allTagsPattern = /^(Auth|ApiAuth)$/
   const allTypesPattern = /^(WriteDashboard|WriteQuery)$/
 
-  test('it renders all tabs', () => {
+  test('it renders search, methods tab and types tab', () => {
     renderWithRouter(<SideNav api={testApi} specKey={'3.1'} />)
+    const search = screen.getByLabelText('Search')
+    expect(search).toHaveProperty('placeholder', 'Search')
     const tabs = screen.getAllByRole('tab', {
       name: /^Methods \(\d+\)|Types \(\d+\)$/,
     })
     expect(tabs).toHaveLength(2)
+    expect(tabs[0]).toHaveTextContent(`Methods (${countMethods(testApi.tags)})`)
+    expect(tabs[1]).toHaveTextContent('Types (2)')
   })
 
   test('Methods tab is the default active tab', () => {
@@ -74,3 +80,35 @@ describe('SideNav', () => {
     )
   })
 })
+
+describe('Search', () => {
+  test('it filters methods and types on input', async () => {
+    renderWithSearchAndRouter(<SideNav api={api} specKey="3.1" />)
+    const searchPattern = 'embedsso'
+    const input = screen.getByLabelText('Search')
+    jest.spyOn(api, 'search')
+    await act(async () => {
+      /** Pasting to avoid triggering search multiple times */
+      await userEvent.paste(input, searchPattern)
+      await waitFor(() => {
+        expect(api.search).toHaveBeenCalledWith(
+          searchPattern,
+          CriteriaToSet(defaultSearchState.criteria)
+        )
+        const methods = screen.getByRole('tab', { name: 'Methods (1)' })
+        const types = screen.getByRole('tab', { name: 'Types (1)' })
+        userEvent.click(methods)
+        expect(
+          screen.getByRole('heading', {
+            name: api.tags.Auth.create_sso_embed_url.summary,
+          })
+        ).toBeInTheDocument()
+
+        userEvent.click(types)
+        expect(
+          screen.getByRole('heading', { name: api.types.EmbedSsoParams.name })
+        ).toBeInTheDocument()
+      })
+    })
+  })
+})
diff --git a/packages/api-explorer/src/components/SideNav/SideNav.tsx b/packages/api-explorer/src/components/SideNav/SideNav.tsx
index 2a379a85d..475370cbc 100644
--- a/packages/api-explorer/src/components/SideNav/SideNav.tsx
+++ b/packages/api-explorer/src/components/SideNav/SideNav.tsx
@@ -108,6 +108,7 @@ export const SideNav: FC<SideNavProps> = ({ api, specKey }) => {
     <nav>
       <Flex alignItems="center" pl="large" pr="large" pb="large">
         <InputSearch
+          aria-label="Search"
           onChange={handleInputChange}
           placeholder="Search"
           value={pattern}