refactor(ui): use locally generated BucketRetentionRules type

Connect #14482
pull/15111/head
Christopher Henn 2019-09-10 10:02:44 -07:00
parent 01a0efa16d
commit 060dfe8609
2 changed files with 7 additions and 9 deletions

View File

@ -12,13 +12,14 @@ import {
secondsToDuration,
} from 'src/utils/formatting'
import {BucketRetentionRules} from '@influxdata/influx'
// Types
import {BucketRetentionRules} from 'src/types'
interface Props {
retentionSeconds: number
type: 'expire'
onChangeRetentionRule: (seconds: number) => void
onChangeRuleType: (type: BucketRetentionRules.TypeEnum) => void
onChangeRuleType: (type: BucketRetentionRules) => void
}
export const DEFAULT_SECONDS = 0
@ -42,9 +43,9 @@ export default class Retention extends PureComponent<Props> {
</Radio.Button>
<Radio.Button
id="intervals"
active={type === BucketRetentionRules.TypeEnum.Expire}
active={type === 'expire'}
onClick={this.handleRadioClick}
value={BucketRetentionRules.TypeEnum.Expire}
value={'expire'}
testID="retention-intervals--button"
titleText="Compress data at regular intervals"
>
@ -60,7 +61,7 @@ export default class Retention extends PureComponent<Props> {
)
}
private handleRadioClick = (type: BucketRetentionRules.TypeEnum) => {
private handleRadioClick = (type: BucketRetentionRules) => {
this.props.onChangeRetentionRule(DEFAULT_SECONDS)
this.props.onChangeRuleType(type)
}

View File

@ -1,6 +1,5 @@
import {Bucket} from 'src/types'
import {BucketRetentionRules} from '@influxdata/influx'
import {PrettyBucket} from 'src/buckets/components/BucketCard'
// Utils
@ -8,9 +7,7 @@ import {ruleToString} from 'src/utils/formatting'
export const prettyBuckets = (buckets: Bucket[]): PrettyBucket[] => {
return buckets.map(b => {
const expire = b.retentionRules.find(
rule => rule.type === BucketRetentionRules.TypeEnum.Expire
)
const expire = b.retentionRules.find(rule => rule.type === 'expire')
if (!expire) {
return {