Skip to content

Commit

Permalink
Merge pull request #542 from Ferlab-Ste-Justine/feat/SJIP-1049
Browse files Browse the repository at this point in the history
feat(uploads): SJIP-1049 add buttons props
  • Loading branch information
lflangis authored Oct 28, 2024
2 parents 8aaa5a5 + 724a723 commit e7a078d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions packages/ui/Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 10.11.0 2024-10-28
- feat: SJIP-1049 Add buttonprops props for uploadIds

### 10.10.8 2024-10-17
- fix: SJIP-959 Range should not show a button dropdown in quickfilter

Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ferlab/ui",
"version": "10.10.9",
"version": "10.11.0",
"description": "Core components for scientific research data portals",
"publishConfig": {
"access": "public"
Expand Down
5 changes: 4 additions & 1 deletion packages/ui/src/components/UploadIds/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { ReactElement } from 'react';
import { useState } from 'react';
import { UploadOutlined } from '@ant-design/icons';
import { Button, PopoverProps } from 'antd';
import { Button, ButtonProps, PopoverProps } from 'antd';
import cx from 'classnames';

import { TFetchMatchFunc, TOnUpload, UploadIdDictionary } from './types';
Expand All @@ -11,6 +11,7 @@ import styles from './index.module.css';

export interface UploadIdsProps {
className?: string;
buttonProps?: ButtonProps;
fetchMatch: TFetchMatchFunc;
popoverProps?: PopoverProps;
dictionary: UploadIdDictionary;
Expand All @@ -22,6 +23,7 @@ export interface UploadIdsProps {
}

const UploadIds = ({
buttonProps,
className = '',
dictionary,
fetchMatch,
Expand All @@ -41,6 +43,7 @@ const UploadIds = ({
icon={<UploadOutlined />}
onClick={() => setModalVisible(true)}
type="primary"
{...buttonProps}
>
{dictionary.uploadBtnText}
</Button>
Expand Down

0 comments on commit e7a078d

Please sign in to comment.