Skip to content

Commit 0938a0c

Browse files
authored
fix(6482): remove show-graph-subquery button (#6525)
1 parent ca6b640 commit 0938a0c

File tree

3 files changed

+2
-57
lines changed

3 files changed

+2
-57
lines changed

src/dataExplorer/components/Results.tsx

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ import {
66
FlexBox,
77
FlexDirection,
88
IconFont,
9-
Overlay,
109
SelectGroup,
1110
SpinnerContainer,
1211
TechnoSpinner,
13-
TextArea,
1412
} from '@influxdata/clockface'
1513

1614
// Components
@@ -39,7 +37,6 @@ import {RemoteDataState, SimpleTableViewProperties} from 'src/types'
3937

4038
// Utils
4139
import {bytesFormatter} from 'src/shared/copy/notifications'
42-
import {sqlAsFlux} from 'src/shared/contexts/query/preprocessing'
4340

4441
import './Results.scss'
4542
import {LanguageType} from './resources'
@@ -161,22 +158,6 @@ const TableResults: FC<{search: string}> = ({search}) => {
161158
)
162159
}
163160

164-
const GraphSubQueryOverlay: FC<{text: string; onClose: () => void}> = ({
165-
text,
166-
onClose,
167-
}) => (
168-
<Overlay.Container maxWidth={600}>
169-
<Overlay.Header title="Subquery for graph data:" onDismiss={onClose} />
170-
<Overlay.Body>
171-
<TextArea
172-
testID="data-explorer-results--graph-subquery"
173-
value={text}
174-
readOnly
175-
/>
176-
</Overlay.Body>
177-
</Overlay.Container>
178-
)
179-
180161
const GraphResults: FC = () => {
181162
const {view} = useContext(ResultsViewContext)
182163
const {result, status} = useContext(ChildResultsContext)
@@ -198,19 +179,12 @@ const GraphResults: FC = () => {
198179
}
199180

200181
const WrappedOptions: FC = () => {
201-
const [showOverlay, setShowOverlay] = useState(false)
202-
const {result, queryModifers} = useContext(ChildResultsContext)
182+
const {result} = useContext(ChildResultsContext)
203183
const {view, setView, selectViewOptions, viewOptions, selectedViewOptions} =
204184
useContext(ResultsViewContext)
205-
const {resource, query: text, selection} = useContext(PersistanceContext)
185+
const {resource} = useContext(PersistanceContext)
206186
const dataExists = !!result?.parsed
207187

208-
const subquery = useMemo(
209-
() => sqlAsFlux(text, selection?.bucket, queryModifers),
210-
[text, selection?.bucket, queryModifers]
211-
)
212-
const seeGraphSubquery = () => setShowOverlay(true)
213-
214188
const updateChildResults = update => {
215189
setView({
216190
...view,
@@ -232,18 +206,11 @@ const WrappedOptions: FC = () => {
232206
selectViewOptions={selectViewOptions}
233207
allViewOptions={viewOptions}
234208
selectedViewOptions={selectedViewOptions}
235-
seeSubquery={selection?.bucket ? seeGraphSubquery : null}
236209
/>
237210
) : null
238211

239212
return (
240213
<>
241-
<Overlay visible={showOverlay}>
242-
<GraphSubQueryOverlay
243-
text={subquery}
244-
onClose={() => setShowOverlay(false)}
245-
/>
246-
</Overlay>
247214
{subQueryOptions}
248215
<ViewOptions
249216
properties={view.properties}

src/dataExplorer/components/SqlViewOptions.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@
1414
height: $cf-form-lg-height;
1515
justify-content: space-between;
1616
}
17-
.sql-view-options--see-query {
18-
padding-top: $cf-form-xs-height;
19-
display: flex;
20-
justify-content: center;
21-
overflow: hidden;
22-
}
2317
}

src/dataExplorer/components/SqlViewOptions.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import React, {FC} from 'react'
22
import {
3-
Button,
43
Columns,
5-
ComponentStatus,
64
FlexBox,
75
Grid,
86
RangeSlider,
@@ -20,14 +18,12 @@ interface SqlViewOptionsT {
2018
selectViewOptions: (_: RecursivePartial<ViewOptions>) => void
2119
allViewOptions: ViewOptions
2220
selectedViewOptions: ViewOptions
23-
seeSubquery: () => void
2421
}
2522

2623
export const SqlViewOptions: FC<SqlViewOptionsT> = ({
2724
selectViewOptions,
2825
allViewOptions,
2926
selectedViewOptions,
30-
seeSubquery,
3127
}) => {
3228
const handleSelectedListItem = (propKey, value) => {
3329
if ((selectedViewOptions[propKey] ?? []).includes(value)) {
@@ -141,18 +137,6 @@ export const SqlViewOptions: FC<SqlViewOptionsT> = ({
141137
labelPrefix="retained "
142138
labelSuffix="%"
143139
/>
144-
<div className="sql-view-options--see-query">
145-
<Button
146-
testID="sql-view-options--see-query"
147-
text="View graph subquery"
148-
status={
149-
!seeSubquery
150-
? ComponentStatus.Disabled
151-
: ComponentStatus.Valid
152-
}
153-
onClick={seeSubquery}
154-
/>
155-
</div>
156140
</Grid.Column>
157141
</Grid.Row>
158142
</Grid>

0 commit comments

Comments
 (0)