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

enhancement #269 - Updates for alert manager risk rules #270

Merged
merged 1 commit into from
Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dassana-io/web-components",
"version": "0.10.5",
"version": "0.10.6",
"publishConfig": {
"registry": "https://npm.pkg.github.com/dassana-io"
},
Expand Down
3 changes: 3 additions & 0 deletions src/components/Input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const useStyles = createUseStyles({
export interface InputProps extends BaseFormElementProps<HTMLInputElement> {
addonAfter?: string
addonBefore?: string
defaultValue?: string
inputRef?: RefObject<AntDInput>
focused?: boolean
onFocus?: () => void
Expand All @@ -53,6 +54,7 @@ export const Input: FC<InputProps> = (props: InputProps) => {
addonBefore,
classes = [],
dataTag,
defaultValue,
disabled = false,
focused = false,
inputRef,
Expand Down Expand Up @@ -97,6 +99,7 @@ export const Input: FC<InputProps> = (props: InputProps) => {
addonBefore={addonBefore}
autoFocus={focused}
className={cn(componentClasses.container, inputClasses)}
defaultValue={defaultValue}
disabled={disabled}
onBlur={onBlur}
onFocus={onFocus}
Expand Down
10 changes: 9 additions & 1 deletion src/components/Select/BaseSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type BaseSelectProps = CommonBaseSelectProps &
export const BaseSelect: FC<BaseSelectProps> = (props: BaseSelectProps) => {
const {
classes = [],
containerClasses = [],
dataTag,
defaultOpen = false,
disabled = false,
Expand All @@ -56,6 +57,7 @@ export const BaseSelect: FC<BaseSelectProps> = (props: BaseSelectProps) => {
placeholder = '',
popupContainerSelector,
showSearch = false,
size,
useStyles
} = props

Expand Down Expand Up @@ -122,7 +124,12 @@ export const BaseSelect: FC<BaseSelectProps> = (props: BaseSelectProps) => {
return loading ? (
<SelectSkeleton {...props} />
) : (
<div className={componentClasses.container}>
<div
className={cn(
{ [componentClasses.container]: true },
containerClasses
)}
>
<AntDSelect
autoFocus={focused}
className={inputClasses}
Expand All @@ -134,6 +141,7 @@ export const BaseSelect: FC<BaseSelectProps> = (props: BaseSelectProps) => {
placeholder={placeholder}
showArrow
showSearch={showSearch}
size={size}
{...getPopupContainerProps(popupContainerSelector)}
{...multiSelectProps}
{...singleSelectProps}
Expand Down
6 changes: 6 additions & 0 deletions src/components/Select/SingleSelect/Select.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ export default {
argTypes: {
onChange: { defaultValue: action('onChange') },
popupContainerSelector: { control: { disable: true } },
size: {
control: {
options: ['small', 'medium', 'large'],
type: 'inline-radio'
}
},
value: { control: { disable: true } }
},
component: Select,
Expand Down
10 changes: 6 additions & 4 deletions src/components/Select/SingleSelect/SelectSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BaseFormElementProps } from '../../types'
import cn from 'classnames'
import { createUseStyles } from 'react-jss'
import { defaultFieldWidth } from '../../assets/styles/styleguide'
import { SelectProps } from './types'
import { Skeleton } from '../../Skeleton'
import React, { FC } from 'react'

Expand All @@ -11,17 +12,18 @@ const useStyles = createUseStyles({
})

export type SelectSkeletonProps = Pick<
BaseFormElementProps<HTMLSelectElement>,
'fullWidth'
SelectProps,
'containerClasses' | 'fullWidth'
>

export const SelectSkeleton: FC<SelectSkeletonProps> = (
props: SelectSkeletonProps
) => {
const { containerClasses = [] } = props
const classes = useStyles(props)

return (
<div className={classes.container}>
<div className={cn({ [classes.container]: true }, containerClasses)}>
<Skeleton height={30} />
</div>
)
Expand Down
15 changes: 13 additions & 2 deletions src/components/Select/SingleSelect/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BaseFormElementProps } from '../../types'
import { CSSProperties } from 'react'
import { IconName } from '../../Icon'
import { SizeType } from 'antd/lib/config-provider/SizeContext'

export interface SelectOption {
iconKey?: IconName
Expand All @@ -16,14 +17,19 @@ export interface SelectOptionsConfig {

export interface SelectProps extends BaseFormElementProps<HTMLSelectElement> {
/**
* Default value for select component. Without this, the select dropdown will be blank until an option is selected
* Array of classes to pass to element's container
* @default []
*/
defaultValue?: string
containerClasses?: string[]
/**
* Whether or not to menu is open by default
* @default false
*/
defaultOpen?: boolean
/**
* Default value for select component. Without this, the select dropdown will be blank until an option is selected
*/
defaultValue?: string
focused?: boolean
/**
* Sets the width of the select to be same as the selected content width. Can be false or a number which will be used as the minimum width
Expand All @@ -48,6 +54,11 @@ export interface SelectProps extends BaseFormElementProps<HTMLSelectElement> {
* @default false
*/
showSearch?: boolean
/**
* Select size — small, medium, large
* @default undefined
*/
size?: SizeType
/**
* Input content value for controlled inputs. Requires an onChange to be passed
*/
Expand Down
10 changes: 8 additions & 2 deletions src/components/TableDrawer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ export const TableDrawer = <DataType extends DataId>({
data,
loading,
renderDrawerCmp,
renderTableControls
renderTableControls,
tableContainerClasses
}: TableDrawerProps<DataType>) => {
const [rowData, setRowData] = useState({} as DataType)
const resetRowData = () => setRowData({} as DataType)
Expand All @@ -80,7 +81,12 @@ export const TableDrawer = <DataType extends DataId>({

return (
<div className={classes.container}>
<div className={classes.tableContainer}>
<div
className={cn(
{ [classes.tableContainer]: true },
tableContainerClasses
)}
>
{renderTableControls && renderTableControls()}
<Table<DataType>
activeRowKey={rowData.id}
Expand Down