Skip to content

Commit

Permalink
web: remove dead code (#5408)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicks committed Jan 26, 2022
1 parent d2c5572 commit 921873a
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 189 deletions.
32 changes: 16 additions & 16 deletions web/src/LogPaneLine.scss → web/src/LogLine.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// We're using CSS here because thousands of `LogPaneLine` in a view can really slow rendering.
// We're using CSS here because thousands of `LogLine` in a view can really slow rendering.
// (styled-components wraps each React component with another, adding non-trivial overhead.)
@import "constants";

Expand All @@ -10,7 +10,7 @@
--log-font-scale: 100%;
}

.LogPaneLine {
.LogLine {
display: flex;
position: relative;
font-size: var(--log-font-scale);
Expand Down Expand Up @@ -40,28 +40,28 @@
}
}

.LogPaneLine:not(.is-buildEvent) + .LogPaneLine.is-buildEvent,
.LogPaneLine.is-buildEvent + .LogPaneLine:not(.is-buildEvent) {
.LogLine:not(.is-buildEvent) + .LogLine.is-buildEvent,
.LogLine.is-buildEvent + .LogLine:not(.is-buildEvent) {
margin-top: 8px;
}

// Make spacing around "header" text more generous for legibility
// We avoid padding on the parent .LogPaneLine, lest we squish .logLinePrefix
.LogPaneLine.is-buildEvent-init .LogPaneLine-content {
// We avoid padding on the parent .LogLine, lest we squish .logLinePrefix
.LogLine.is-buildEvent-init .LogLine-content {
padding-top: 4px;
padding-bottom: 4px;
}
.LogPaneLine:not(.is-buildEvent-fallback) + .LogPaneLine.is-buildEvent-fallback .LogPaneLine-content {
.LogLine:not(.is-buildEvent-fallback) + .LogLine.is-buildEvent-fallback .LogLine-content {
padding-top: 8px;
}
.LogPaneLine.is-buildEvent-fallback .LogPaneLine-content {
.LogLine.is-buildEvent-fallback .LogLine-content {
padding-bottom: 8px;
}
.LogPaneLine.is-buildEvent-fallback + .LogPaneLine.is-buildEvent-fallback .LogPaneLine-content {
.LogLine.is-buildEvent-fallback + .LogLine.is-buildEvent-fallback .LogLine-content {
margin-top: -8px;
}

.LogPaneLine-alertNav {
.LogLine-alertNav {
position: absolute;
display: block;
color: $color-gray-lightest;
Expand Down Expand Up @@ -97,18 +97,18 @@
overflow: hidden;
white-space: nowrap;

.LogPaneLine.is-contextChange > & {
.LogLine.is-contextChange > & {
// Border shouldn't add height:
margin-top: -$logLine-separator-height;
border-top: $logLine-separator-height solid $color-gray;
}
.LogPaneLine.is-buildEvent-init > & {
.LogLine.is-buildEvent-init > & {
visibility: hidden;
}
}


.LogPaneLine-content {
.LogLine-content {
white-space: pre-wrap;
padding-left: $spacing-unit * 0.6;
flex: 1;
Expand All @@ -117,13 +117,13 @@

// A left border draws your eye to notable log lines
// Placed right of the prefix, so it's always just next to the log text
.LogPaneLine.is-warning & {
.LogLine.is-warning & {
border-left: $logLine-gutter-width solid $color-yellow;
}
.LogPaneLine.is-error & {
.LogLine.is-error & {
border-left: $logLine-gutter-width solid $color-red;
}
.LogPaneLine.is-buildEvent-fallback & {
.LogLine.is-buildEvent-fallback & {
border-left: $logLine-gutter-width solid $color-blue-dark;
}
}
76 changes: 0 additions & 76 deletions web/src/LogPaneLine.stories.tsx

This file was deleted.

78 changes: 0 additions & 78 deletions web/src/LogPaneLine.tsx

This file was deleted.

30 changes: 15 additions & 15 deletions web/src/OverviewLogPane.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ let logPaneMount = (pane: any) => {
it("renders 3 lines in resource view", () => {
let root = logPaneMount(<ThreeLines />)
let el = root.getDOMNode()
expect(el.querySelectorAll(".LogPaneLine")).toHaveLength(3)
expect(el.querySelectorAll(".LogLine")).toHaveLength(3)
})

it("renders 3 lines in all log view", () => {
let root = logPaneMount(<ThreeLinesAllLog />)
let el = root.getDOMNode()
expect(el.querySelectorAll(".LogPaneLine")).toHaveLength(3)
expect(el.querySelectorAll(".LogLine")).toHaveLength(3)
})

it("escapes html and linkifies", () => {
let root = logPaneMount(<StyledLines />)
let el = root.getDOMNode()
expect(el.querySelectorAll(".LogPaneLine a")).toHaveLength(2)
expect(el.querySelectorAll(".LogPaneLine button")).toHaveLength(0)
expect(el.querySelectorAll(".LogLine a")).toHaveLength(2)
expect(el.querySelectorAll(".LogLine button")).toHaveLength(0)
})

it("filters by source", () => {
let root = logPaneMount(<BuildLogAndRunLog />)
let el = root.getDOMNode()
expect(el.querySelectorAll(".LogPaneLine")).toHaveLength(40)
expect(el.querySelectorAll(".LogLine")).toHaveLength(40)

let root2 = logPaneMount(
<BuildLogAndRunLog
Expand All @@ -62,7 +62,7 @@ it("filters by source", () => {
/>
)
let el2 = root2.getDOMNode()
expect(el2.querySelectorAll(".LogPaneLine")).toHaveLength(20)
expect(el2.querySelectorAll(".LogLine")).toHaveLength(20)
expect(el2.innerHTML).toEqual(expect.stringContaining("Vigoda pod line"))
expect(el2.innerHTML).toEqual(
expect.not.stringContaining("Vigoda build line")
Expand All @@ -76,7 +76,7 @@ it("filters by source", () => {
/>
)
let el3 = root3.getDOMNode()
expect(el3.querySelectorAll(".LogPaneLine")).toHaveLength(20)
expect(el3.querySelectorAll(".LogLine")).toHaveLength(20)
expect(el3.innerHTML).toEqual(expect.not.stringContaining("Vigoda pod line"))
expect(el3.innerHTML).toEqual(expect.stringContaining("Vigoda build line"))
})
Expand All @@ -86,7 +86,7 @@ it("filters by level", () => {
<BuildLogAndRunLog source="" level="" term={EMPTY_FILTER_TERM} />
)
let el = root.getDOMNode()
expect(el.querySelectorAll(".LogPaneLine")).toHaveLength(40)
expect(el.querySelectorAll(".LogLine")).toHaveLength(40)

let root2 = logPaneMount(
<BuildLogAndRunLog
Expand All @@ -96,7 +96,7 @@ it("filters by level", () => {
/>
)
let el2 = root2.getDOMNode()
expect(el2.querySelectorAll(".LogPaneLine")).toHaveLength(
expect(el2.querySelectorAll(".LogLine")).toHaveLength(
2 * (1 + PROLOGUE_LENGTH)
)

Expand All @@ -120,7 +120,7 @@ it("filters by level", () => {
/>
)
let el3 = root3.getDOMNode()
expect(el3.querySelectorAll(".LogPaneLine")).toHaveLength(
expect(el3.querySelectorAll(".LogLine")).toHaveLength(
2 * (1 + PROLOGUE_LENGTH)
)

Expand All @@ -142,15 +142,15 @@ it("filters by term", () => {
<BuildLogAndRunLog source="" level="" term={EMPTY_FILTER_TERM} />
)
const noTermEl = noFilterRoot.getDOMNode()
expect(noTermEl.querySelectorAll(".LogPaneLine")).toHaveLength(40)
expect(noTermEl.querySelectorAll(".LogLine")).toHaveLength(40)

const termWithResults = createFilterTermState("line 5")
const filterWithResults = logPaneMount(
<BuildLogAndRunLog source="" level="" term={termWithResults} />
)
const elWithResults = filterWithResults.getDOMNode()

expect(elWithResults.querySelectorAll(".LogPaneLine")).toHaveLength(2)
expect(elWithResults.querySelectorAll(".LogLine")).toHaveLength(2)
expect(elWithResults.innerHTML).toEqual(expect.stringContaining("line 5"))
expect(elWithResults.innerHTML).toEqual(
expect.not.stringContaining("line 15")
Expand All @@ -162,7 +162,7 @@ it("filters by term", () => {
)
const elWithNoResults = filterWithNoResults.getDOMNode()

expect(elWithNoResults.querySelectorAll(".LogPaneLine")).toHaveLength(0)
expect(elWithNoResults.querySelectorAll(".LogLine")).toHaveLength(0)
expect(elWithNoResults.innerHTML).toEqual(
expect.not.stringContaining("Vigoda")
)
Expand Down Expand Up @@ -208,7 +208,7 @@ it("renders bottom logs first", () => {

// Make sure no logs have been rendered yet.
let rootEl = root.getDOMNode()
let lineEls = () => rootEl.querySelectorAll(".LogPaneLine")
let lineEls = () => rootEl.querySelectorAll(".LogLine")
let component = root
.find(OverviewLogComponent)
.instance() as OverviewLogComponent
Expand Down Expand Up @@ -248,7 +248,7 @@ it("renders new logs first", () => {
)

let rootEl = root.getDOMNode()
let lineEls = () => rootEl.querySelectorAll(".LogPaneLine")
let lineEls = () => rootEl.querySelectorAll(".LogLine")
let component = root
.find(OverviewLogComponent)
.instance() as OverviewLogComponent
Expand Down

0 comments on commit 921873a

Please sign in to comment.