Skip to content

Commit 1a8b855

Browse files
committed
Merge branch 'feat/dynamic-data-table' of github.com:devtron-labs/devtron-fe-common-lib into feat/runtime-params
2 parents c808687 + 4640df0 commit 1a8b855

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Shared/Components/DynamicDataTable/DynamicDataTableRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export const DynamicDataTableRow = <K extends string, CustomStateType = Record<s
297297
return hasRows ? (
298298
<div className="bcn-2 px-1 pb-1 dc__bottom-radius-4">
299299
<div
300-
className={`dynamic-data-table w-100 bcn-1 dc__bottom-radius-4 ${!readOnly ? 'row-colun' : 'header-column'}`}
300+
className={`dynamic-data-table w-100 bcn-1 dc__bottom-radius-4 ${!readOnly ? 'row-column' : 'header-column'}`}
301301
style={{
302302
gridTemplateColumns: rowGridTemplateColumn,
303303
}}

src/Shared/Components/SelectPicker/type.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ type SelectProps<OptionValue, IsMulti extends boolean> = ReactSelectProps<
5252
GroupBase<SelectPickerOptionType<OptionValue>>
5353
>
5454

55-
export enum SelectPickerVariantType {
56-
DEFAULT = 'default',
57-
BORDER_LESS = 'border-less',
58-
}
59-
6055
declare module 'react-select/base' {
6156
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6257
export interface Props<Option, IsMulti extends boolean, Group extends GroupBase<Option>> {
@@ -92,6 +87,11 @@ declare module 'react-select/base' {
9287
}
9388
}
9489

90+
export enum SelectPickerVariantType {
91+
DEFAULT = 'default',
92+
BORDER_LESS = 'border-less',
93+
}
94+
9595
export type SelectPickerProps<OptionValue = number | string, IsMulti extends boolean = false> = Pick<
9696
SelectProps<OptionValue, IsMulti>,
9797
| 'name'

0 commit comments

Comments
 (0)