Skip to content

Commit

Permalink
web: rename TabNav to ResourceNav and cut all the tab stuff (#4425)
Browse files Browse the repository at this point in the history
  • Loading branch information
landism committed Apr 15, 2021
1 parent 85ae858 commit 341e923
Show file tree
Hide file tree
Showing 15 changed files with 198 additions and 709 deletions.
8 changes: 4 additions & 4 deletions web/src/HUD.tsx
Expand Up @@ -19,11 +19,11 @@ import LogStore, { LogStoreProvider } from "./LogStore"
import OverviewPane from "./OverviewPane"
import OverviewResourcePane from "./OverviewResourcePane"
import PathBuilder, { PathBuilderProvider } from "./PathBuilder"
import { ResourceNavProvider } from "./ResourceNav"
import ShareSnapshotModal from "./ShareSnapshotModal"
import { SidebarPinContextProvider } from "./SidebarPin"
import { SnapshotActionProvider } from "./snapshot"
import SocketBar from "./SocketBar"
import { OverviewNavProvider } from "./TabNav"
import {
ShowErrorModal,
ShowFatalErrorModal,
Expand Down Expand Up @@ -261,13 +261,13 @@ export default class HUD extends Component<HudProps, HudState> {
hudClasses.push("is-snapshot")
}

let validateTab = (name: string) =>
let validateResource = (name: string) =>
resources.some((res) => res.name === name)
return (
<tiltfileKeyContext.Provider value={view.tiltfileKey}>
<SidebarPinContextProvider>
<ReactOutlineManager>
<OverviewNavProvider validateTab={validateTab}>
<ResourceNavProvider validateResource={validateResource}>
<div className={hudClasses.join(" ")}>
<AnalyticsNudge needsNudge={needsNudge} />
<SocketBar state={this.state.socketState} />
Expand All @@ -277,7 +277,7 @@ export default class HUD extends Component<HudProps, HudState> {

{this.renderOverviewSwitch()}
</div>
</OverviewNavProvider>
</ResourceNavProvider>
</ReactOutlineManager>
</SidebarPinContextProvider>
</tiltfileKeyContext.Provider>
Expand Down
9 changes: 5 additions & 4 deletions web/src/OverviewResourcePane.stories.tsx
Expand Up @@ -2,8 +2,8 @@ import React from "react"
import { MemoryRouter } from "react-router"
import LogStore, { LogStoreProvider } from "./LogStore"
import OverviewResourcePane from "./OverviewResourcePane"
import { ResourceNavProvider } from "./ResourceNav"
import { SidebarPinMemoryProvider } from "./SidebarPin"
import { OverviewNavProvider } from "./TabNav"
import { nResourceView, tenResourceView, twoResourceView } from "./testdata"

type Resource = Proto.webviewResource
Expand All @@ -30,12 +30,13 @@ function OverviewResourcePaneHarness(props: {
let { name, view } = props
let entry = name ? `/r/${props.name}/overview` : `/overview`
let resources = view?.resources || []
let validateTab = (name: string) => resources.some((res) => res.name == name)
let validateResource = (name: string) =>
resources.some((res) => res.name == name)
return (
<MemoryRouter initialEntries={[entry]}>
<OverviewNavProvider validateTab={validateTab}>
<ResourceNavProvider validateResource={validateResource}>
<OverviewResourcePane view={view} />
</OverviewNavProvider>
</ResourceNavProvider>
</MemoryRouter>
)
}
Expand Down
6 changes: 3 additions & 3 deletions web/src/OverviewResourcePane.test.tsx
Expand Up @@ -6,7 +6,7 @@ import { ButtonLeftPill, FilterRadioButton } from "./OverviewActionBar"
import OverviewResourcePane from "./OverviewResourcePane"
import { NotFound } from "./OverviewResourcePane.stories"
import OverviewResourceSidebar from "./OverviewResourceSidebar"
import { OverviewNavProvider } from "./TabNav"
import { ResourceNavProvider } from "./ResourceNav"
import { oneResourceView } from "./testdata"
import { appendLinesForManifestAndSpan } from "./testlogs"

Expand Down Expand Up @@ -38,9 +38,9 @@ describe("alert filtering", () => {
let root = mount(
<MemoryRouter initialEntries={["/"]}>
<LogStoreProvider value={logStore}>
<OverviewNavProvider validateTab={() => true}>
<ResourceNavProvider validateResource={() => true}>
<OverviewResourcePane view={view} />
</OverviewNavProvider>
</ResourceNavProvider>
</LogStoreProvider>
</MemoryRouter>
)
Expand Down
6 changes: 3 additions & 3 deletions web/src/OverviewResourcePane.tsx
Expand Up @@ -5,11 +5,11 @@ import HeaderBar from "./HeaderBar"
import { LogUpdateAction, LogUpdateEvent, useLogStore } from "./LogStore"
import OverviewResourceDetails from "./OverviewResourceDetails"
import OverviewResourceSidebar from "./OverviewResourceSidebar"
import { useResourceNav } from "./ResourceNav"
import StarredResourceBar, {
starredResourcePropsFromView,
} from "./StarredResourceBar"
import { Color } from "./style-helpers"
import { useTabNav } from "./TabNav"
import { ResourceName } from "./types"

type OverviewResourcePaneProps = {
Expand All @@ -34,10 +34,10 @@ let Main = styled.div`
`

export default function OverviewResourcePane(props: OverviewResourcePaneProps) {
let nav = useTabNav()
let nav = useResourceNav()
const logStore = useLogStore()
let resources = props.view?.resources || []
let name = nav.invalidTab || nav.selectedTab || ""
let name = nav.invalidResource || nav.selectedResource || ""
let r: Proto.webviewResource | undefined
let all = name === "" || name === ResourceName.all
if (!all) {
Expand Down
63 changes: 0 additions & 63 deletions web/src/OverviewTabBar.stories.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions web/src/OverviewTabBar.test.tsx

This file was deleted.

153 changes: 0 additions & 153 deletions web/src/OverviewTabBar.tsx

This file was deleted.

0 comments on commit 341e923

Please sign in to comment.