From fe925dba7e3a541bb2ceba010769558e8ae0a4a6 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Fri, 23 Jun 2023 11:33:17 +0200
Subject: [PATCH] SSDM-13579: Added more standard icon support for Button.
---
ui-admin/src/js/components/common/form/Button.jsx | 6 +++++-
.../js/components/database/data-browser/DataBrowser.jsx | 3 ++-
.../src/js/components/database/data-browser/Toolbar.jsx | 8 ++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ui-admin/src/js/components/common/form/Button.jsx b/ui-admin/src/js/components/common/form/Button.jsx
index affbf1e309b..64d08c40105 100644
--- a/ui-admin/src/js/components/common/form/Button.jsx
+++ b/ui-admin/src/js/components/common/form/Button.jsx
@@ -33,7 +33,9 @@ class FormButton extends React.Component {
href,
styles,
classes,
- onClick
+ onClick,
+ startIcon,
+ endIcon,
} = this.props
let theColor = null
@@ -67,6 +69,8 @@ class FormButton extends React.Component {
onClick={onClick}
disabled={disabled}
size='small'
+ startIcon={startIcon}
+ endIcon={endIcon}
>
{label}
</Button>
diff --git a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
index 556ce4dacfd..4a7e73bc405 100644
--- a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+++ b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
@@ -118,7 +118,8 @@ class DataBrowser extends React.Component {
}
],
selectedFile: null,
- multiselectedFiles: new Set([])
+ multiselectedFiles: new Set([]),
+ showInfo: false
}
}
diff --git a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
index a7cdd4ccedc..314eb292250 100644
--- a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
@@ -34,13 +34,13 @@ class Toolbar extends React.Component {
const { viewType, onViewTypeChange, classes } = this.props
return (
<>
- <Button styles={{ root: classes.button }} label={<><CreateNewFolderIcon /> New folder</>} />
- <Button styles={{ root: classes.button }} label={<InfoIcon />} />
- <Button styles={{ root: classes.button }} label={<><SearchIcon /> Search</>} />
+ <Button styles={{ root: classes.button }} label='New folder' startIcon={<CreateNewFolderIcon />} />
+ <Button styles={{ root: classes.button }} startIcon={<InfoIcon />} />
+ <Button styles={{ root: classes.button }} label='Search' startIcon={<SearchIcon />} />
{viewType === 'list' && <Button styles={{ root: classes.button }} label={<ViewComfyIcon />} onClick={() => onViewTypeChange('grid')} />}
{viewType === 'grid' && <Button styles={{ root: classes.button }} label={<ViewListIcon />} onClick={() => onViewTypeChange('list')} />}
<Button styles={{ root: classes.button }} label={<SettingsIcon />} />
- <Button styles={{ root: classes.button }} label={<><PublishIcon /> {messages.get(messages.UPLOAD)}</>} />
+ <Button styles={{ root: classes.button }} label={messages.get(messages.UPLOAD)} startIcon={<PublishIcon />} />
</>
)
}
--
GitLab