@looker/api-explorer 0.9.33-alpha.1522 → 0.9.33

package/e2e/diffScene.spec.ts

@@ -0,0 +1,260 @@
+/*
+
+ MIT License
+
+ Copyright (c) 2021 Looker Data Sciences, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+ */
+import '@testing-library/jest-dom'
+
+import { goToPage, BASE_URL } from './helpers'
+
+// https://github.com/smooth-code/jest-puppeteer/tree/master/packages/expect-puppeteer
+// https://github.com/puppeteer/puppeteer/blob/main/docs/api.md
+
+jest.setTimeout(120000)
+
+const resultCardsSelector =
+  'section#top div[class*=SpaceVertical] div[class*=Card]'
+const baseInputSelector = 'input#listbox-input-base'
+const compInputSelector = 'input#listbox-input-compare'
+const globalOptionsSelector = '#modal-root [role=option] span'
+const switchButtonSelector = '.switch-button'
+
+describe('Diff Scene', () => {
+  beforeEach(async () => {
+    await jestPuppeteer.resetBrowser()
+    await page.setDefaultNavigationTimeout(120000)
+  })
+  it('loads the default scene (/diff/3.1)', async () => {
+    await goToPage(`${BASE_URL}/diff/3.1`)
+    const body = await page.$('body')
+
+    // "Base" input element
+    {
+      await body.click()
+      const baseInputElement = await page.$(baseInputSelector)
+      expect(baseInputElement).not.toBeNull()
+      const baseInputValue = await page.evaluate(
+        (e) => e.value,
+        baseInputElement
+      )
+      expect(baseInputValue).toMatch('3.1')
+
+      const baseOptionsOnLoad = await page.$(globalOptionsSelector)
+      expect(baseOptionsOnLoad).toBeNull()
+
+      await baseInputElement.click()
+      const baseOptionsOnClick = await page.$$(globalOptionsSelector)
+      expect(baseOptionsOnClick).not.toHaveLength(0)
+
+      await body.click()
+      const baseOptionsOnClose = await page.$(globalOptionsSelector)
+      expect(baseOptionsOnClose).toBeNull()
+    }
+
+    // "Comparison" input element
+    {
+      await body.click()
+      const compInputElement = await page.$(compInputSelector)
+      expect(compInputElement).not.toBeNull()
+      const compInputValue = await page.evaluate(
+        (e) => e.value,
+        compInputElement
+      )
+      expect(compInputValue).toEqual('')
+
+      const compOptionsOnLoad = await page.$(globalOptionsSelector)
+      expect(compOptionsOnLoad).toBeNull()
+
+      await compInputElement.click()
+      const compOptionsOnClick = await page.$$(globalOptionsSelector)
+      expect(compOptionsOnClick).not.toHaveLength(0)
+
+      await body.click()
+      const compOptionsOnClose = await page.$(globalOptionsSelector)
+      expect(compOptionsOnClose).toBeNull()
+    }
+
+    // Switch button (disabled)
+    {
+      const switchButtonElement = await page.$(switchButtonSelector)
+      expect(switchButtonElement).not.toBeNull()
+      const switchButtonDisabled = await page.evaluate(
+        (e) => e.disabled,
+        switchButtonElement
+      )
+      expect(switchButtonDisabled).toEqual(true)
+    }
+  })
+
+  it('loads a comparison scene (/diff/3.1/4.0) and navigates from it', async () => {
+    await goToPage(`${BASE_URL}/diff/3.1/4.0`)
+
+    // "Base" input element
+    {
+      const baseInputElement = await page.$(baseInputSelector)
+      expect(baseInputElement).not.toBeNull()
+      const baseInputValue = await page.evaluate(
+        (e) => e.value,
+        baseInputElement
+      )
+      expect(baseInputValue).toMatch('3.1')
+    }
+
+    // "Comparison" input element
+    {
+      const compInputElement = await page.$(compInputSelector)
+      expect(compInputElement).not.toBeNull()
+      const compInputValue = await page.evaluate(
+        (e) => e.value,
+        compInputElement
+      )
+      expect(compInputValue).toMatch('4.0')
+    }
+
+    // Switch button
+    {
+      const switchButtonElement = await page.$(switchButtonSelector)
+      expect(switchButtonElement).not.toBeNull()
+      const switchButtonDisabled = await page.evaluate(
+        (e) => e.disabled,
+        switchButtonElement
+      )
+      expect(switchButtonDisabled).toEqual(false)
+    }
+
+    // Diff results
+    {
+      const diffResultCards = await page.$$(resultCardsSelector)
+      expect(diffResultCards).not.toHaveLength(0)
+      const page1Methods = await Promise.all(
+        diffResultCards.map((resultCard) =>
+          page.evaluate((el) => el.innerText.match(/^[a-z_]*/)[0], resultCard)
+        )
+      )
+      expect(page1Methods).toHaveLength(15)
+      expect(page1Methods).toContain('delete_board_item')
+    }
+
+    // Expand a result
+    {
+      const expandedSelector =
+        resultCardsSelector + `>div[class*=Accordion2]>div[aria-expanded=true]`
+
+      // Initially not expanded
+      const expandedCardBefore = await page.$(expandedSelector)
+      expect(expandedCardBefore).toBeNull()
+
+      // Click a card
+      const firstResultCard = (await page.$$(resultCardsSelector))[0]
+      await firstResultCard.click()
+
+      // Expanded
+      const expandedCardAfter = await page.$(expandedSelector)
+      expect(expandedCardAfter).not.toBeNull()
+
+      // Find and validate method link
+      const methodLink = await page.$(`${resultCardsSelector} a[role=link]`)
+      expect(methodLink).not.toBeNull()
+      const methodText = await page.evaluate((e) => e.innerText, methodLink)
+      expect(methodText).toMatch(`delete_board_item for 4.0`)
+
+      // Click and validate destination
+      await methodLink.click()
+      await page.waitForSelector(`div[class*=MethodBadge]`, { timeout: 5000 })
+      const compUrl = page.url()
+      expect(compUrl).toEqual(`${BASE_URL}/4.0/methods/Board/delete_board_item`)
+    }
+  })
+
+  it('updates when a comparison is chosen or switched', async () => {
+    await goToPage(`${BASE_URL}/diff/3.1`)
+
+    // "Base" input element
+    const baseInputElement = await page.$(baseInputSelector)
+    expect(baseInputElement).not.toBeNull()
+
+    // "Comparison" input element
+    const compInputElement = await page.$(compInputSelector)
+    expect(compInputElement).not.toBeNull()
+
+    // Click comparison input
+    await compInputElement.click()
+    const compOptionsOnClick = await page.$$(globalOptionsSelector)
+    expect(compOptionsOnClick).not.toHaveLength(0)
+    expect(compOptionsOnClick).not.toHaveLength(1)
+
+    // Find an option containing the text 4.0
+    const option40Index = await page.$$eval(globalOptionsSelector, (els) =>
+      els.findIndex((el) => el.textContent.match(/4\.0/))
+    )
+    const option40 = compOptionsOnClick[option40Index]
+    expect(option40).not.toBeUndefined()
+
+    // Click that option
+    await option40.click()
+    await page.waitForSelector(resultCardsSelector, { timeout: 5000 })
+
+    // Check the URL
+    // Would like to do this earlier, but not sure what to wait on
+    const compUrl = page.url()
+    expect(compUrl).toEqual(`${BASE_URL}/diff/3.1/4.0`)
+
+    // Check the results
+    const diffResultCards = await page.$$(resultCardsSelector)
+    expect(diffResultCards).not.toHaveLength(0)
+    const diff31to40Page1Methods = await Promise.all(
+      diffResultCards.map((resultCard) =>
+        page.evaluate((el) => el.innerText.match(/^[a-z_]*/)[0], resultCard)
+      )
+    )
+
+    expect(diff31to40Page1Methods).toHaveLength(15)
+    expect(diff31to40Page1Methods).toContain('delete_board_item')
+
+    // Click the switch button
+    const switchButtonElement = await page.$(switchButtonSelector)
+    expect(switchButtonElement).not.toBeNull()
+    const switchButtonDisabled = await page.evaluate(
+      (e) => e.disabled,
+      switchButtonElement
+    )
+    expect(switchButtonDisabled).toEqual(false)
+    await switchButtonElement.click()
+
+    // A more precise timing mechanism would be better: https://github.com/puppeteer/puppeteer/issues/5328
+    await page.waitForTimeout(150)
+
+    const switchUrl = page.url()
+    expect(switchUrl).toEqual(`${BASE_URL}/diff/4.0/3.1`)
+
+    // Check the results again, even though they should be the same
+    const diff40to31Page1Methods = await Promise.all(
+      diffResultCards.map((resultCard) =>
+        page.evaluate((el) => el.innerText.match(/^[a-z_]*/)[0], resultCard)
+      )
+    )
+
+    expect(diff40to31Page1Methods).toHaveLength(15)
+    expect(diff40to31Page1Methods).toContain('delete_board_item')
+  })
+})

package/e2e/e2e.spec.ts

@@ -25,42 +25,44 @@
  */
 import '@testing-library/jest-dom'
 
-import { goToPage, pageReload } from './helpers'
+import { goToPage, pageReload, BASE_URL } from './helpers'
 
 // https://github.com/smooth-code/jest-puppeteer/tree/master/packages/expect-puppeteer
 // https://github.com/puppeteer/puppeteer/blob/main/docs/api.md
 
 jest.setTimeout(120000)
 
-const BASE_URL = 'https://localhost:8080'
-const v31 = `${BASE_URL}/3.1`
 const v40 = `${BASE_URL}/4.0`
 
 describe('API Explorer', () => {
   beforeEach(async () => {
     await jestPuppeteer.resetBrowser()
+    await page.setDefaultNavigationTimeout(120000)
   })
 
   describe('general', () => {
     beforeEach(async () => {
-      await goToPage(v31)
+      await goToPage(v40)
     })
 
     it('renders a method page', async () => {
-      await expect(page).toClick('h4', { text: 'Dashboard' })
       await Promise.all([
         page.waitForNavigation(),
-        expect(page).toClick('a', { text: 'Get All Dashboards' }),
+        expect(page).toClick('h4', { text: 'Dashboard' }),
+      ])
+      await Promise.all([
+        page.waitForNavigation(),
+        expect(page).toClick('h3', { text: 'Get All Dashboards' }),
       ])
       await expect(page.url()).toEqual(
-        `${v31}/methods/Dashboard/all_dashboards`
+        `${v40}/methods/Dashboard/all_dashboards`
       )
 
       // title
       await expect(page).toMatchElement('h2', { text: 'Get All Dashboards' })
 
       // markdown
-      await expect(page).toMatchElement('div', {
+      await expect(page).toMatchElement('h3', {
         text: 'Get information about all active dashboards',
       })
 
@@ -115,7 +117,7 @@ describe('API Explorer', () => {
       await expect(page).toMatchElement('h2', {
         text: 'ApiAuth: API Authentication',
       })
-      await expect(page.url()).toMatch(`${v31}/methods/ApiAuth`)
+      await expect(page.url()).toMatch(`${v40}/methods/ApiAuth`)
 
       await expect(page).toMatchElement(
         'button[value="ALL"][aria-pressed=true]'
@@ -164,31 +166,35 @@ describe('API Explorer', () => {
       await expect(page).toMatchElement('h3', { text: 'Kotlin Declaration' })
     })
 
-    it('changes specs', async () => {
-      await expect(page).toMatchElement('h2', {
-        text: 'Looker API 3.1 Reference',
-      })
-      await expect(page).toClick('input[value="3.1"]')
-      await expect(page).toClick(
-        'ul[aria-label="spec selector"] > li:last-child'
-      )
-      await expect(page).toMatchElement('h2', {
-        text: 'Looker API 4.0 (Beta) Reference',
-      })
-    })
+    // This test was broken during the 4.0 GA spec changes, and needs to be fixed
+    // it('changes specs', async () => {
+    //   await expect(page).toMatchElement('h2', {
+    //     text: 'Looker API 4.0 Reference',
+    //   })
+    //   await expect(page).toClick('input[value="4.0"]')
+    //   await Promise.all([
+    //     page.waitForNavigation(),
+    //     expect(page).toClick(
+    //       'ul[aria-label="spec selector"]>li:nth-of-type(2)'
+    //     )
+    //   ])
+    //   //Because waitForNavigation doesn't seem to be doing what we need
+    //   await page.waitForTimeout(150)
+    //   await expect(page.url()).toEqual(v31)
+    // })
   })
 
   describe('navigation', () => {
     it('should be able to navigate directly to a spec home', async () => {
-      await goToPage(v31)
+      await goToPage(v40)
       await expect(page).toMatchElement('h2', {
-        text: 'Looker API 3.1 Reference',
+        text: 'Looker API 4.0 Reference',
       })
-      await expect(page).toMatchElement('input[value="3.1"]')
+      await expect(page).toMatchElement('input[value="4.0"]')
     })
 
     it('should be able to navigate directly to a tag scene', async () => {
-      await goToPage(`${v31}/methods/Dashboard`)
+      await goToPage(`${v40}/methods/Dashboard`)
       await expect(page).toMatchElement('h2', {
         text: 'Dashboard: Manage Dashboards',
       })
@@ -203,15 +209,40 @@ describe('API Explorer', () => {
     })
 
     it('should be able to navigate directly to a type', async () => {
-      await goToPage(`${v31}/types/Query/Query`)
+      await goToPage(`${v40}/types/Query/Query`)
       await expect(page).toMatchElement('h2', { text: 'Query' })
       await expect(page).toMatchElement('button', { text: 'Query' })
     })
   })
 
+  describe('outbound navigation', () => {
+    it('should be able to navigate from a method to Github', async () => {
+      await goToPage(`${v40}/methods/Dashboard/all_dashboards`)
+      const exampleLink = await page.$(
+        'table[aria-label="SDK Examples"] a[class*=Link][target=_blank'
+      )
+      expect(exampleLink).not.toBeNull()
+
+      // Suggested/intuitive method of waiting for navigation does not seem to be working and just waits indefinitely on the target page
+      // await Promise.all([
+      //   page.waitForNavigation({timeout:5000}),
+      //   exampleLink.click()
+      //   ])
+      await exampleLink.click()
+      await page.waitForTimeout(150)
+
+      const body = await page.$('body')
+      const codeMatch = await page.evaluate(
+        (e) => e.innerText.match('all_dashboards\\('),
+        body
+      )
+      expect(codeMatch).not.toBeNull()
+    })
+  })
+
   describe('search', () => {
     beforeEach(async () => {
-      await goToPage(v31)
+      await goToPage(v40)
     })
 
     it('searches methods', async () => {
@@ -224,7 +255,7 @@ describe('API Explorer', () => {
       await expect(page).toMatchElement('button', { text: 'Types (0)' })
       await expect(page).toClick('a', { text: 'Get Workspace' })
       await expect(page).toMatchElement('h2', { text: 'Get Workspace' })
-      await expect(page.url()).toEqual(`${v31}/methods/Workspace/workspace`)
+      await expect(page.url()).toEqual(`${v40}/methods/Workspace/workspace`)
     })
 
     it('searches types', async () => {
@@ -236,7 +267,7 @@ describe('API Explorer', () => {
       await expect(page).toClick('button', { text: 'Types (1)' })
       await expect(page).toClick('a', { text: 'WriteTheme' })
       await expect(page).toMatchElement('h2', { text: 'WriteTheme' })
-      await expect(page.url()).toEqual(`${v31}/types/Theme/WriteTheme`)
+      await expect(page.url()).toEqual(`${v40}/types/Theme/WriteTheme`)
     })
   })
 })

package/e2e/helpers.ts

@@ -23,6 +23,14 @@
  SOFTWARE.
 
  */
+
+/**
+ * Constants
+ */
+export const BASE_URL = 'https://localhost:8080'
+export const v31Url = `${BASE_URL}/3.1`
+export const v40Url = `${BASE_URL}/4.0`
+
 /**
  * Reloads the page, waiting for for the DomContentLoaded event before resolving
  */
@@ -37,7 +45,7 @@ export const pageReload = async (): Promise<void> => {
 export const goToPage = async (url: string): Promise<void> => {
   await page.goto(url, {
     waitUntil: ['domcontentloaded', 'networkidle0'],
-    timeout: 60000,
+    timeout: 120000,
   })
 }
 

package/jest-puppeteer.config.js

@@ -23,9 +23,19 @@
  SOFTWARE.
 
  */
+
+const base = require('../../jest.config')
 module.exports = {
+  ...base,
+  rootDir: '../..',
+  preset: 'jest-puppeteer',
+  setupFilesAfterEnv: ['expect-puppeteer'],
   launch: {
+    // `headless:false` and `slowMo:250` can be useful for "test-watch" usage
     headless: true,
+    // slowMo: 250,
+
+    // Other launch settings constant for both dev and testing usage
     args: ['--ignore-certificate-errors'],
     product: 'chrome',
     devtools: true,

package/jest.config.js

@@ -1,25 +1,27 @@
 /*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Looker Data Sciences, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+
+ MIT License
+
+ Copyright (c) 2022 Looker Data Sciences, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
  */
 const base = require('../../jest.config')
 const packageName = require('./package.json').name.split('/')[1]
@@ -29,7 +31,7 @@ module.exports = {
   displayName: packageName,
   name: packageName,
   rootDir: '../..',
-  preset: 'jest-puppeteer',
-  setupFilesAfterEnv: ['expect-puppeteer'],
+  setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
   testMatch: [`<rootDir>/packages/${packageName}/**/*.(spec|test).(ts|js)?(x)`],
+  testEnvironment: 'jsdom',
 }

package/lib/components/DocSource/DocSource.js

@@ -33,7 +33,7 @@ var DocSource = _ref => {
     ({
       declaration,
       link: sourceLink
-    } = (0, _sdkCodegen.findDeclaration)(declarations, method === null || method === void 0 ? void 0 : method.id, type === null || type === void 0 ? void 0 : type.name));
+    } = (0, _sdkCodegen.findDeclaration)(declarations, method === null || method === void 0 ? void 0 : method.id, type === null || type === void 0 ? void 0 : type.name, _sdkCodegen.codeSearchLink));
   }
 
   return _react.default.createElement(_react.default.Fragment, null, sourceLink && declaration && _react.default.createElement(_components.Tooltip, {

package/lib/components/DocSource/DocSource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/DocSource/DocSource.tsx"],"names":["DocSource","method","type","declarations","selectDeclarationsLode","sourceLink","declaration","link","id","name","sourceFile","line"],"mappings":";;;;;;;AA0BA;;AAEA;;AACA;;AACA;;AACA;;AAEA;;;;AAOO,IAAMA,SAA6B,GAAG,QAAsB;AAAA,MAArB;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAqB;AACjE,MAAMC,YAAY,GAAG,6BAAYC,6BAAZ,CAArB;AACA,MAAIC,UAAJ;AACA,MAAIC,WAAJ;;AACA,MAAIH,YAAJ,EAAkB;AAChB;AAAC,KAAC;AAAEG,MAAAA,WAAF;AAAeC,MAAAA,IAAI,EAAEF;AAArB,QAAoC,iCACpCF,YADoC,EAEpCF,MAFoC,aAEpCA,MAFoC,uBAEpCA,MAAM,CAAEO,EAF4B,EAGpCN,IAHoC,aAGpCA,IAHoC,uBAGpCA,IAAI,CAAEO,IAH8B,CAArC;AAKF;;AAED,SACE,4DACGJ,UAAU,IAAIC,WAAd,IACC,6BAAC,mBAAD;AACE,IAAA,OAAO,YAAKA,WAAW,CAACI,UAAjB,eAAgCJ,WAAW,CAACK,IAA5C,CADT;AAEE,IAAA,KAAK,EAAC;AAFR,KAIE,6BAAC,gBAAD;AAAM,IAAA,IAAI,EAAEN,UAAZ;AAAwB,IAAA,MAAM,EAAC;AAA/B,KACE,6BAAC,gBAAD;AAAM,IAAA,IAAI,EAAE,6BAAC,sBAAD;AAAZ,IADF,CAJF,CAFJ,CADF;AAcD,CA1BM","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\nimport type { FC } from 'react'\nimport React from 'react'\nimport type { IMethod, IType } from '@looker/sdk-codegen'\nimport { findDeclaration } from '@looker/sdk-codegen'\nimport { Icon, Link, Tooltip } from '@looker/components'\nimport { IdeFileDocument } from '@looker/icons'\nimport { useSelector } from 'react-redux'\n\nimport { selectDeclarationsLode } from '../../state'\n\ninterface DocSourceProps {\n  method?: IMethod\n  type?: IType\n}\n\nexport const DocSource: FC<DocSourceProps> = ({ method, type }) => {\n  const declarations = useSelector(selectDeclarationsLode)\n  let sourceLink\n  let declaration\n  if (declarations) {\n    ;({ declaration, link: sourceLink } = findDeclaration(\n      declarations,\n      method?.id,\n      type?.name\n    ))\n  }\n\n  return (\n    <>\n      {sourceLink && declaration && (\n        <Tooltip\n          content={`${declaration.sourceFile}#L${declaration.line}`}\n          width=\"none\"\n        >\n          <Link href={sourceLink} target=\"_blank\">\n            <Icon icon={<IdeFileDocument />} />\n          </Link>\n        </Tooltip>\n      )}\n    </>\n  )\n}\n"],"file":"DocSource.js"}
+{"version":3,"sources":["../../../src/components/DocSource/DocSource.tsx"],"names":["DocSource","method","type","declarations","selectDeclarationsLode","sourceLink","declaration","link","id","name","codeSearchLink","sourceFile","line"],"mappings":";;;;;;;AA0BA;;AAEA;;AACA;;AACA;;AACA;;AAEA;;;;AAOO,IAAMA,SAA6B,GAAG,QAAsB;AAAA,MAArB;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAqB;AACjE,MAAMC,YAAY,GAAG,6BAAYC,6BAAZ,CAArB;AACA,MAAIC,UAAJ;AACA,MAAIC,WAAJ;;AACA,MAAIH,YAAJ,EAAkB;AAChB;AAAC,KAAC;AAAEG,MAAAA,WAAF;AAAeC,MAAAA,IAAI,EAAEF;AAArB,QAAoC,iCACpCF,YADoC,EAEpCF,MAFoC,aAEpCA,MAFoC,uBAEpCA,MAAM,CAAEO,EAF4B,EAGpCN,IAHoC,aAGpCA,IAHoC,uBAGpCA,IAAI,CAAEO,IAH8B,EAIpCC,0BAJoC,CAArC;AAMF;;AAED,SACE,4DACGL,UAAU,IAAIC,WAAd,IACC,6BAAC,mBAAD;AACE,IAAA,OAAO,YAAKA,WAAW,CAACK,UAAjB,eAAgCL,WAAW,CAACM,IAA5C,CADT;AAEE,IAAA,KAAK,EAAC;AAFR,KAIE,6BAAC,gBAAD;AAAM,IAAA,IAAI,EAAEP,UAAZ;AAAwB,IAAA,MAAM,EAAC;AAA/B,KACE,6BAAC,gBAAD;AAAM,IAAA,IAAI,EAAE,6BAAC,sBAAD;AAAZ,IADF,CAJF,CAFJ,CADF;AAcD,CA3BM","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\nimport type { FC } from 'react'\nimport React from 'react'\nimport type { IMethod, IType } from '@looker/sdk-codegen'\nimport { codeSearchLink, findDeclaration } from '@looker/sdk-codegen'\nimport { Icon, Link, Tooltip } from '@looker/components'\nimport { IdeFileDocument } from '@looker/icons'\nimport { useSelector } from 'react-redux'\n\nimport { selectDeclarationsLode } from '../../state'\n\ninterface DocSourceProps {\n  method?: IMethod\n  type?: IType\n}\n\nexport const DocSource: FC<DocSourceProps> = ({ method, type }) => {\n  const declarations = useSelector(selectDeclarationsLode)\n  let sourceLink\n  let declaration\n  if (declarations) {\n    ;({ declaration, link: sourceLink } = findDeclaration(\n      declarations,\n      method?.id,\n      type?.name,\n      codeSearchLink\n    ))\n  }\n\n  return (\n    <>\n      {sourceLink && declaration && (\n        <Tooltip\n          content={`${declaration.sourceFile}#L${declaration.line}`}\n          width=\"none\"\n        >\n          <Link href={sourceLink} target=\"_blank\">\n            <Icon icon={<IdeFileDocument />} />\n          </Link>\n        </Tooltip>\n      )}\n    </>\n  )\n}\n"],"file":"DocSource.js"}

package/lib/components/SideNav/SideNavMethods.js

@@ -44,13 +44,18 @@ var SideNavMethods = (0, _styledComponents.default)(_ref => {
     var _isOpen = !isOpen;
 
     setIsOpen(_isOpen);
-    if (_isOpen) history.push("/".concat(specKey, "/methods/").concat(tag));
+
+    if (_isOpen) {
+      history.push("/".concat(specKey, "/methods/").concat(tag));
+    } else {
+      history.push("/".concat(specKey, "/methods"));
+    }
   };
 
   (0, _react.useEffect)(() => {
     var status = match ? defaultOpen || match.params.methodTag === tag : defaultOpen;
     setIsOpen(status);
-  }, [defaultOpen, match, tag]);
+  }, [defaultOpen]);
   return _react.default.createElement(_components.Accordion2, {
     isOpen: isOpen,
     toggleOpen: handleOpen,

package/lib/components/SideNav/SideNavMethods.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/SideNav/SideNavMethods.tsx"],"names":["SideNavMethods","className","methods","tag","specKey","defaultOpen","searchPattern","selectSearchPattern","match","isOpen","setIsOpen","history","handleOpen","_isOpen","push","status","params","methodTag","Object","values","map","method","name","summary","theme","fonts","brand","colors","key","fontWeights","semiBold","ui2","space","xxsmall","ui1","Link","radii","medium","xsmall"],"mappings":"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","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\n\nimport React, { useEffect, useState } from 'react'\nimport styled from 'styled-components'\nimport { Accordion2, Heading } from '@looker/components'\nimport type { MethodList } from '@looker/sdk-codegen'\nimport { useSelector } from 'react-redux'\nimport { useHistory, useRouteMatch } from 'react-router-dom'\n\nimport { Link } from '../Link'\nimport { buildMethodPath, highlightHTML } from '../../utils'\nimport { selectSearchPattern } from '../../state'\n\ninterface MethodsProps {\n  methods: MethodList\n  tag: string\n  specKey: string\n  className?: string\n  defaultOpen?: boolean\n}\n\nexport const SideNavMethods = styled(\n  ({ className, methods, tag, specKey, defaultOpen = false }: MethodsProps) => {\n    const searchPattern = useSelector(selectSearchPattern)\n    const match = useRouteMatch<{ methodTag: string }>(\n      `/:specKey/methods/:methodTag/:methodName?`\n    )\n    const [isOpen, setIsOpen] = useState(defaultOpen)\n    const history = useHistory()\n\n    const handleOpen = () => {\n      const _isOpen = !isOpen\n      setIsOpen(_isOpen)\n      if (_isOpen) history.push(`/${specKey}/methods/${tag}`)\n    }\n\n    useEffect(() => {\n      const status = match\n        ? defaultOpen || match.params.methodTag === tag\n        : defaultOpen\n      setIsOpen(status)\n    }, [defaultOpen, match, tag])\n\n    /* TODO: Fix highlighting. It is applied but it is somehow being overridden */\n    return (\n      <Accordion2\n        isOpen={isOpen}\n        toggleOpen={handleOpen}\n        className={className}\n        label={\n          <Heading as=\"h4\" fontSize=\"small\" py=\"xsmall\">\n            {highlightHTML(searchPattern, tag)}\n          </Heading>\n        }\n      >\n        <ul>\n          {Object.values(methods).map((method) => (\n            <li key={method.name}>\n              <Link to={`${buildMethodPath(specKey, tag, method.name)}`}>\n                {highlightHTML(searchPattern, method.summary)}\n              </Link>\n            </li>\n          ))}\n        </ul>\n      </Accordion2>\n    )\n  }\n)`\n  font-family: ${({ theme }) => theme.fonts.brand};\n\n  [aria-controls]:hover,\n  [aria-expanded='true'] {\n    h4,\n    svg {\n      color: ${({ theme }) => theme.colors.key};\n    }\n  }\n\n  [aria-expanded='true'] h4 {\n    font-weight: ${({ theme }) => theme.fontWeights.semiBold};\n  }\n\n  ul {\n    border-left: dashed 1px ${({ theme }) => theme.colors.ui2};\n    list-style: none;\n    margin: 0;\n    padding: 0;\n    padding-left: ${({ theme }) => theme.space.xxsmall};\n    padding-top: ${({ theme }) => theme.space.xxsmall};\n  }\n\n  [aria-current] {\n    background: ${({ theme }) => theme.colors.ui1};\n    font-weight: ${({ theme }) => theme.fontWeights.semiBold};\n  }\n\n  ${Link} {\n    border-radius: ${({ theme }) => theme.radii.medium};\n    display: block;\n    overflow: hidden;\n    padding: ${({ theme }) => theme.space.xsmall};\n    text-overflow: ellipsis;\n    white-space: nowrap;\n\n    &:hover,\n    &:focus,\n    &.active {\n      background: ${({ theme }) => theme.colors.ui1};\n    }\n  }\n`\n"],"file":"SideNavMethods.js"}
+{"version":3,"sources":["../../../src/components/SideNav/SideNavMethods.tsx"],"names":["SideNavMethods","className","methods","tag","specKey","defaultOpen","searchPattern","selectSearchPattern","match","isOpen","setIsOpen","history","handleOpen","_isOpen","push","status","params","methodTag","Object","values","map","method","name","summary","theme","fonts","brand","colors","key","fontWeights","semiBold","ui2","space","xxsmall","ui1","Link","radii","medium","xsmall"],"mappings":"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","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\n\nimport React, { useEffect, useState } from 'react'\nimport styled from 'styled-components'\nimport { Accordion2, Heading } from '@looker/components'\nimport type { MethodList } from '@looker/sdk-codegen'\nimport { useSelector } from 'react-redux'\nimport { useHistory, useRouteMatch } from 'react-router-dom'\n\nimport { Link } from '../Link'\nimport { buildMethodPath, highlightHTML } from '../../utils'\nimport { selectSearchPattern } from '../../state'\n\ninterface MethodsProps {\n  methods: MethodList\n  tag: string\n  specKey: string\n  className?: string\n  defaultOpen?: boolean\n}\n\nexport const SideNavMethods = styled(\n  ({ className, methods, tag, specKey, defaultOpen = false }: MethodsProps) => {\n    const searchPattern = useSelector(selectSearchPattern)\n    const match = useRouteMatch<{ methodTag: string }>(\n      `/:specKey/methods/:methodTag/:methodName?`\n    )\n    const [isOpen, setIsOpen] = useState(defaultOpen)\n    const history = useHistory()\n\n    const handleOpen = () => {\n      const _isOpen = !isOpen\n      setIsOpen(_isOpen)\n      if (_isOpen) {\n        history.push(`/${specKey}/methods/${tag}`)\n      } else {\n        history.push(`/${specKey}/methods`)\n      }\n    }\n\n    useEffect(() => {\n      const status = match\n        ? defaultOpen || match.params.methodTag === tag\n        : defaultOpen\n      setIsOpen(status)\n    }, [defaultOpen])\n\n    /* TODO: Fix highlighting. It is applied but it is somehow being overridden */\n    return (\n      <Accordion2\n        isOpen={isOpen}\n        toggleOpen={handleOpen}\n        className={className}\n        label={\n          <Heading as=\"h4\" fontSize=\"small\" py=\"xsmall\">\n            {highlightHTML(searchPattern, tag)}\n          </Heading>\n        }\n      >\n        <ul>\n          {Object.values(methods).map((method) => (\n            <li key={method.name}>\n              <Link to={`${buildMethodPath(specKey, tag, method.name)}`}>\n                {highlightHTML(searchPattern, method.summary)}\n              </Link>\n            </li>\n          ))}\n        </ul>\n      </Accordion2>\n    )\n  }\n)`\n  font-family: ${({ theme }) => theme.fonts.brand};\n\n  [aria-controls]:hover,\n  [aria-expanded='true'] {\n    h4,\n    svg {\n      color: ${({ theme }) => theme.colors.key};\n    }\n  }\n\n  [aria-expanded='true'] h4 {\n    font-weight: ${({ theme }) => theme.fontWeights.semiBold};\n  }\n\n  ul {\n    border-left: dashed 1px ${({ theme }) => theme.colors.ui2};\n    list-style: none;\n    margin: 0;\n    padding: 0;\n    padding-left: ${({ theme }) => theme.space.xxsmall};\n    padding-top: ${({ theme }) => theme.space.xxsmall};\n  }\n\n  [aria-current] {\n    background: ${({ theme }) => theme.colors.ui1};\n    font-weight: ${({ theme }) => theme.fontWeights.semiBold};\n  }\n\n  ${Link} {\n    border-radius: ${({ theme }) => theme.radii.medium};\n    display: block;\n    overflow: hidden;\n    padding: ${({ theme }) => theme.space.xsmall};\n    text-overflow: ellipsis;\n    white-space: nowrap;\n\n    &:hover,\n    &:focus,\n    &.active {\n      background: ${({ theme }) => theme.colors.ui1};\n    }\n  }\n`\n"],"file":"SideNavMethods.js"}

package/lib/components/SideNav/SideNavTypes.js

@@ -44,7 +44,12 @@ var SideNavTypes = (0, _styledComponents.default)(_ref => {
     var _isOpen = !isOpen;
 
     setIsOpen(_isOpen);
-    if (_isOpen) history.push("/".concat(specKey, "/types/").concat(tag));
+
+    if (_isOpen) {
+      history.push("/".concat(specKey, "/types/").concat(tag));
+    } else {
+      history.push("/".concat(specKey, "/types"));
+    }
   };
 
   (0, _react.useEffect)(() => {