From 299422cec25006658f3c709e7d493a4d9fd87250 Mon Sep 17 00:00:00 2001 From: Joseph Axisa Date: Tue, 19 Oct 2021 08:50:14 +0000 Subject: [PATCH] avoid deep imports --- packages/api-explorer/src/ApiExplorer.tsx | 16 +++++++++++----- .../src/components/Header/Header.tsx | 4 ++-- .../api-explorer/src/components/Header/index.ts | 2 +- packages/api-explorer/src/components/index.ts | 3 ++- .../test-utils/{envAdaptor.tsx => envAdaptor.ts} | 0 5 files changed, 16 insertions(+), 9 deletions(-) rename packages/api-explorer/src/test-utils/{envAdaptor.tsx => envAdaptor.ts} (100%) diff --git a/packages/api-explorer/src/ApiExplorer.tsx b/packages/api-explorer/src/ApiExplorer.tsx index e4873aa3b..da51b2de8 100644 --- a/packages/api-explorer/src/ApiExplorer.tsx +++ b/packages/api-explorer/src/ApiExplorer.tsx @@ -43,6 +43,7 @@ import type { RunItSetter } from '@looker/run-it' import { funFetch, fallbackFetch, OAuthScene } from '@looker/run-it' import { FirstPage } from '@styled-icons/material/FirstPage' import { LastPage } from '@styled-icons/material/LastPage' + import { SearchContext, LodeContext, defaultLodeContextValue } from './context' import type { IApixEnvAdaptor } from './utils' import { @@ -52,7 +53,14 @@ import { registerEnvAdaptor, unregisterEnvAdaptor, } from './utils' -import { Header, SideNav, ErrorBoundary, Loader } from './components' +import { + Header, + SideNav, + ErrorBoundary, + Loader, + SelectorContainer, + HEADER_TOGGLE_LABEL, +} from './components' import { specReducer, initDefaultSpecState, @@ -63,8 +71,6 @@ import { import { AppRouter } from './routes' import { apixFilesHost } from './utils/lodeUtils' import { useActions } from './hooks' -import { TOGGLE_LABEL } from './components/Header' -import { SelectorContainer } from './components/SelectorContainer' export interface ApiExplorerProps { specs: SpecList @@ -83,7 +89,7 @@ const ApiExplorer: FC = ({ setVersionsUrl, exampleLodeUrl = 'https://raw.githubusercontent.com/looker-open-source/sdk-codegen/main/examplesIndex.json', declarationsLodeUrl = `${apixFilesHost}/declarationsIndex.json`, - headless = true, + headless = false, }) => { const [initializing, setInitializing] = useState(true) const location = useLocation() @@ -222,7 +228,7 @@ const ApiExplorer: FC = ({ icon={ hasNavigation ? : } - label={TOGGLE_LABEL} + label={HEADER_TOGGLE_LABEL} onClick={() => toggleNavigation()} /> diff --git a/packages/api-explorer/src/components/Header/Header.tsx b/packages/api-explorer/src/components/Header/Header.tsx index 752cf94f4..4056e5d0d 100644 --- a/packages/api-explorer/src/components/Header/Header.tsx +++ b/packages/api-explorer/src/components/Header/Header.tsx @@ -56,7 +56,7 @@ interface HeaderProps { export const HEADER_REM = 4 -export const TOGGLE_LABEL = 'Toggle Navigation' +export const HEADER_TOGGLE_LABEL = 'Toggle Navigation' /** * Renders the API Explorer header @@ -80,7 +80,7 @@ export const HeaderLayout: FC = ({ onClick={() => toggleNavigation()} icon={} aria-label="nav toggle" - label={TOGGLE_LABEL} + label={HEADER_TOGGLE_LABEL} /> diff --git a/packages/api-explorer/src/components/Header/index.ts b/packages/api-explorer/src/components/Header/index.ts index 1adacb39a..180788bd1 100644 --- a/packages/api-explorer/src/components/Header/index.ts +++ b/packages/api-explorer/src/components/Header/index.ts @@ -23,4 +23,4 @@ SOFTWARE. */ -export { Header, HEADER_REM, TOGGLE_LABEL } from './Header' +export { Header, HEADER_REM, HEADER_TOGGLE_LABEL } from './Header' diff --git a/packages/api-explorer/src/components/index.ts b/packages/api-explorer/src/components/index.ts index bc50e3e61..56dc3d0c4 100644 --- a/packages/api-explorer/src/components/index.ts +++ b/packages/api-explorer/src/components/index.ts @@ -37,10 +37,11 @@ export { DocSdkUsage } from './DocSdkUsage' export { DocSource } from './DocSource' export { DocStatus } from './DocStatus' export { DocTitle } from './DocTitle' -export { Header } from './Header' +export { Header, HEADER_TOGGLE_LABEL } from './Header' export { SideNav } from './SideNav' export { ExploreType, ExploreProperty } from './ExploreType' export { DocSchema } from './DocSchema' export { DocTypeSummary } from './DocTypeSummary' export { Link } from './Link' export { ErrorBoundary } from './ErrorBoundary' +export { SelectorContainer } from './SelectorContainer' diff --git a/packages/api-explorer/src/test-utils/envAdaptor.tsx b/packages/api-explorer/src/test-utils/envAdaptor.ts similarity index 100% rename from packages/api-explorer/src/test-utils/envAdaptor.tsx rename to packages/api-explorer/src/test-utils/envAdaptor.ts