Skip to content

fix: separate prefix and suffix from tickPrefix and tickSuffix #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2021
Merged

fix: separate prefix and suffix from tickPrefix and tickSuffix #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7696bba
fix: separate prefix and suffix from tickPrefix and tickSuffix
TCL735 Jul 15, 2021
27fafae
test: update e2e tests for gauge
TCL735 Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 132 additions & 38 deletions cypress/e2e/shared/explorer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,45 +201,139 @@ describe('DataExplorer', () => {
})
})

describe('optional suffix and prefix in gauge', () => {
beforeEach(() => {
cy.getByTestID('view-type--dropdown').click()
cy.getByTestID(`view-type--gauge`).click()
cy.getByTestID('cog-cell--button').click()
})
it('can add prefix and suffix values', () => {
cy.get('.view-options').within(() => {
cy.getByTestID('prefix-input')
.click()
.type('mph')
.invoke('val')
.should('equal', 'mph')
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('suffix-input')
.click()
.type('mph')
.invoke('val')
.should('equal', 'mph')
.getByTestID('input-field--error')
.should('have.length', 0)
})
describe('optional prefix and suffix in gauge', () => {
const prefix = 'speed: '
const suffix = ' mph'
it('can add prefix and suffix labels when using Giraffe gauge', () => {
cy.setFeatureFlags({useGiraffeGraphs: true})
cy.writeData(lines(10))
cy.get<string>('@defaultBucketListSelector').then(
(defaultBucketListSelector: string) => {
cy.getByTestID('view-type--dropdown').click()
cy.getByTestID(`view-type--gauge`).click()

cy.getByTestID('query-builder').should('exist')
cy.getByTestID('selector-list _monitoring').should('be.visible')
cy.getByTestID('selector-list _monitoring').click()

cy.getByTestID(defaultBucketListSelector).should('be.visible')
cy.getByTestID(defaultBucketListSelector).click()

cy.getByTestID('selector-list m').should('be.visible')
cy.getByTestID('selector-list m').clickAttached()

cy.getByTestID('selector-list v').should('be.visible')
cy.getByTestID('selector-list v').clickAttached()

cy.getByTestID('selector-list tv1').clickAttached()

cy.getByTestID('selector-list mean')
.scrollIntoView()
.should('be.visible')
.click({force: true})

cy.getByTestID('time-machine-submit-button').click()
cy.get('canvas.giraffe-gauge').should('be.visible')

cy.getByTestID('cog-cell--button').click()
cy.get('.view-options').within(() => {
cy.getByTestID('prefix-input')
.click()
.type(`${prefix}`)
.invoke('val')
.should('equal', prefix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('suffix-input')
.click()
.type(`${suffix}`)
.invoke('val')
.should('equal', suffix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('tick-prefix-input')
.click()
.type(`${prefix}`)
.invoke('val')
.should('equal', prefix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('tick-suffix-input')
.click()
.type(`${suffix}`)
.invoke('val')
.should('equal', suffix)
.getByTestID('input-field--error')
.should('have.length', 0)
})
}
)
})
it('can add and remove tick values', () => {
cy.get('.view-options').within(() => {
cy.getByTestID('tickprefix-input')
.click()
.invoke('val')
.should('equal', '')
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('ticksuffix-input')
.click()
.invoke('val')
.should('equal', '')
.getByTestID('input-field--error')
.should('have.length', 0)
})

it('can add prefix and suffix labels when using original built-in gauge', () => {
cy.setFeatureFlags({useGiraffeGraphs: false})
cy.writeData(lines(10))
cy.get<string>('@defaultBucketListSelector').then(
(defaultBucketListSelector: string) => {
cy.getByTestID('view-type--dropdown').click()
cy.getByTestID(`view-type--gauge`).click()

cy.getByTestID('query-builder').should('exist')
cy.getByTestID('selector-list _monitoring').should('be.visible')
cy.getByTestID('selector-list _monitoring').click()

cy.getByTestID(defaultBucketListSelector).should('be.visible')
cy.getByTestID(defaultBucketListSelector).click()

cy.getByTestID('selector-list m').should('be.visible')
cy.getByTestID('selector-list m').clickAttached()

cy.getByTestID('selector-list v').should('be.visible')
cy.getByTestID('selector-list v').clickAttached()

cy.getByTestID('selector-list tv1').clickAttached()

cy.getByTestID('selector-list mean')
.scrollIntoView()
.should('be.visible')
.click({force: true})

cy.getByTestID('time-machine-submit-button').click()
cy.get('canvas.gauge').should('be.visible')

cy.getByTestID('cog-cell--button').click()
cy.get('.view-options').within(() => {
cy.getByTestID('prefix-input')
.click()
.type(`${prefix}`)
.invoke('val')
.should('equal', prefix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('suffix-input')
.click()
.type(`${suffix}`)
.invoke('val')
.should('equal', suffix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('tick-prefix-input')
.click()
.type(`${prefix}`)
.invoke('val')
.should('equal', prefix)
.getByTestID('input-field--error')
.should('have.length', 0)
cy.getByTestID('tick-suffix-input')
.click()
.type(`${suffix}`)
.invoke('val')
.should('equal', suffix)
.getByTestID('input-field--error')
.should('have.length', 0)
})
}
)
})
})

Expand Down
15 changes: 5 additions & 10 deletions src/visualization/types/Gauge/Gauge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ class Gauge extends Component<Props> {
maxValue
) => {
const {tickPrefix, tickSuffix, decimalPlaces} = this.props
let {prefix, suffix} = this.props
const {degree, lineCount, labelColor, labelFontSize} = this.props.theme

const tickSplit = Math.abs(maxValue - minValue) / lineCount
Expand All @@ -289,16 +288,12 @@ class Gauge extends Component<Props> {
maxValue,
]

if (tickPrefix === 'true') {
prefix = ''
}

if (tickSuffix === 'true') {
suffix = ''
}

const labels = tickValues.map(tick =>
formatStatValue(tick, {decimalPlaces, prefix, suffix})
formatStatValue(tick, {
decimalPlaces,
prefix: tickPrefix,
suffix: tickSuffix,
})
)

const startDegree = degree * 135
Expand Down
57 changes: 17 additions & 40 deletions src/visualization/types/Gauge/options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@ import {
Grid,
Columns,
Form,
Toggle,
AutoInput,
AutoInputMode,
Input,
InputType,
InputToggleType,
InputLabel,
FlexBox,
AlignItems,
ComponentSize,
} from '@influxdata/clockface'

import ThresholdsSettings from 'src/visualization/components/internal/ThresholdsSettings'
Expand Down Expand Up @@ -46,13 +40,14 @@ const GaugeOptions: FC<Props> = ({properties, update}) => {
setDigits(2)
}
}

return (
<Grid>
<Grid.Row>
<Grid.Column>
<Grid.Row>
<Grid.Column widthXS={Columns.Six}>
<Form.Element label="Prefix">
<Form.Element label="Value Prefix">
<Input
testID="prefix-input"
value={properties.prefix}
Expand All @@ -64,7 +59,7 @@ const GaugeOptions: FC<Props> = ({properties, update}) => {
</Form.Element>
</Grid.Column>
<Grid.Column widthXS={Columns.Six}>
<Form.Element label="Suffix">
<Form.Element label="Value Suffix">
<Input
testID="suffix-input"
value={properties.suffix}
Expand All @@ -78,46 +73,28 @@ const GaugeOptions: FC<Props> = ({properties, update}) => {
</Grid.Row>
<Grid.Row>
<Grid.Column widthXS={Columns.Six}>
<FlexBox
alignItems={AlignItems.Center}
margin={ComponentSize.Small}
className="view-options--checkbox"
>
<Toggle
id="prefixoptional"
testID="tickprefix-input"
type={InputToggleType.Checkbox}
<Form.Element label="Axis Prefix">
<Input
testID="tick-prefix-input"
value={properties.tickPrefix}
onChange={val => {
update({tickPrefix: val === 'false' || !!!val})
onChange={evt => {
update({tickPrefix: evt.target.value})
}}
size={ComponentSize.ExtraSmall}
placeholder="%, MPH, etc."
/>
<InputLabel active={!!properties.tickPrefix}>
Optional Prefix
</InputLabel>
</FlexBox>
</Form.Element>
</Grid.Column>
<Grid.Column widthXS={Columns.Six}>
<FlexBox
alignItems={AlignItems.Center}
margin={ComponentSize.Small}
className="view-options--checkbox"
>
<Toggle
id="suffixoptional"
testID="ticksuffix-input"
type={InputToggleType.Checkbox}
<Form.Element label="Axis Suffix">
<Input
testID="tick-suffix-input"
value={properties.tickSuffix}
onChange={val => {
update({tickSuffix: val === 'false' || !!!val})
onChange={evt => {
update({tickSuffix: evt.target.value})
}}
size={ComponentSize.ExtraSmall}
placeholder="%, MPH, etc."
/>
<InputLabel active={!!properties.tickSuffix}>
Optional Suffix
</InputLabel>
</FlexBox>
</Form.Element>
</Grid.Column>
</Grid.Row>
{properties.decimalPlaces && (
Expand Down