Skip to content
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.

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

feat(ui): Enhance resource creation experience when limits are reached #19103

Merged
merged 7 commits into from
Jul 30, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
feat(ui): add reusable AssetLimitButton
  • Loading branch information
mavarius committed Jul 30, 2020
commit b88e429b9d4565e43f6e174136e4a1ddab3142fd
16 changes: 7 additions & 9 deletions ui/src/buckets/components/CreateBucketButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {connect, ConnectedProps, useDispatch} from 'react-redux'

// Components
import {Button, IconFont, ComponentColor} from '@influxdata/clockface'
import AssetLimitButton from 'src/cloud/components/AssetLimitButton'

// Actions
import {checkBucketLimits, LimitStatus} from 'src/cloud/actions/limits'
Expand All @@ -19,9 +20,8 @@ import {AppState} from 'src/types'
import {CLOUD} from 'src/shared/constants'

type ReduxProps = ConnectedProps<typeof connector>
type Props = ReduxProps

const CreateBucketButton: FC<Props> = ({
const CreateBucketButton: FC<ReduxProps> = ({
limitStatus,
onShowOverlay,
onDismissOverlay,
Expand All @@ -32,14 +32,12 @@ const CreateBucketButton: FC<Props> = ({
dispatch(checkBucketLimits())
}, [dispatch])

const limitExceeded = limitStatus === LimitStatus.EXCEEDED

const handleItemClick = (): void => {
if (CLOUD && limitExceeded) {
onShowOverlay('asset-limit', {asset: 'Buckets'}, onDismissOverlay)
} else {
onShowOverlay('create-bucket', null, onDismissOverlay)
}
onShowOverlay('create-bucket', null, onDismissOverlay)
}

if (CLOUD && limitStatus === LimitStatus.EXCEEDED) {
return <AssetLimitButton resourceName="Bucket" />
}

return (
Expand Down
48 changes: 48 additions & 0 deletions ui/src/cloud/components/AssetLimitButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Libraries
import React, {FC} from 'react'
import {connect, ConnectedProps} from 'react-redux'

// Components
import {Button, ComponentColor, IconFont} from '@influxdata/clockface'

// Actions
import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'

interface OwnProps {
color?: ComponentColor
resourceName?: string
mavarius marked this conversation as resolved.
Show resolved Hide resolved
buttonText?: string
}

type ReduxProps = ConnectedProps<typeof connector>

const AssetLimitButton: FC<OwnProps & ReduxProps> = ({
color = ComponentColor.Primary,
buttonText,
resourceName,
onShowOverlay,
onDismissOverlay,
}) => {
const handleClick = () => {
onShowOverlay('asset-limit', {asset: `${resourceName}s`}, onDismissOverlay)
}
return (
<Button
icon={IconFont.Plus}
text={buttonText || `Create ${resourceName}`}
color={color}
titleText={`Click to create ${resourceName}`}
onClick={handleClick}
testID={`create-${resourceName.toLowerCase()}`}
/>
)
}

const mdtp = {
onShowOverlay: showOverlay,
onDismissOverlay: dismissOverlay,
}

const connector = connect(null, mdtp)

export default connector(AssetLimitButton)