Skip to content

Commit 3a9f61c

Browse files
authored
Merge pull request Ferlab-Ste-Justine#603 from Ferlab-Ste-Justine/feat/SJIP-1334
feat(querytool): SJIP-1334 always display compare button
2 parents 5862dbf + be16c28 commit 3a9f61c

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

packages/ui/Release.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 10.23.1 2025-04-17
2+
- feat: SJIP-1334 always display compare button
3+
14
### 10.23.1 2025-04-17
25
- fix: SKFP-1504 manage somatic in venn diagram
36

packages/ui/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ferlab/ui",
3-
"version": "10.23.1",
3+
"version": "10.24.0",
44
"description": "Core components for scientific research data portals",
55
"publishConfig": {
66
"access": "public"

packages/ui/src/components/QueryBuilder/QueryTools.tsx

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,28 @@ const QueryTools = ({
8181
>
8282
{dictionary.actions?.combine || 'Combine'}
8383
</Dropdown.Button>
84-
{enableCompare && handleCompare && (
85-
<Tooltip title={isCompareBtnDisabled ? dictionary.actions?.compareTooltips : undefined}>
86-
<Button
87-
className={cx(styles.button, styles.compare)}
88-
disabled={isCompareBtnDisabled}
89-
icon={
90-
<AndOrIcon
91-
className={cx(styles.andOrIcon, {
92-
[styles.disabled]: isCompareBtnDisabled,
93-
})}
94-
/>
95-
}
96-
onClick={handleCompare}
97-
size="small"
98-
>
99-
{dictionary.actions?.compare || 'Compare'}
100-
</Button>
101-
</Tooltip>
102-
)}
10384
</>
10485
)}
86+
87+
{enableCompare && handleCompare && (
88+
<Tooltip title={isCompareBtnDisabled ? dictionary.actions?.compareTooltips : undefined}>
89+
<Button
90+
className={cx(styles.button, styles.compare)}
91+
disabled={isCompareBtnDisabled}
92+
icon={
93+
<AndOrIcon
94+
className={cx(styles.andOrIcon, {
95+
[styles.disabled]: isCompareBtnDisabled,
96+
})}
97+
/>
98+
}
99+
onClick={handleCompare}
100+
size="small"
101+
>
102+
{dictionary.actions?.compare || 'Compare'}
103+
</Button>
104+
</Tooltip>
105+
)}
105106
{enableShowHideLabels && !canCombine && (
106107
<span className={`${styles.switch} ${styles.withLabel}`}>
107108
<Switch checked={showLabels} onChange={(checked) => setShowLabels(checked)} size="small" />

0 commit comments

Comments
 (0)