Skip to content

Commit 4f8c39e

Browse files
Merge pull request #254 from eccenca/feature/coloredWorkbenchTags-CMEM-6091
Update colored tags (CMEM-6091)
2 parents 6d64c33 + 4936cc0 commit 4f8c39e

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
4040
### Fixed
4141

4242
- `<CodeAutocompleteField />`:
43-
- Code editor resets to initial value on every code editor instance re-init
43+
- Code editor resets to initial value on every code editor instance re-init
4444
- `<OverviewItemActions />`
4545
- `hiddenInteractions` stay visible if they contain focused elements or opened overlays (e.g. context menus)
46+
- `<TagList />`
47+
- do not create empty list items
4648

4749
### Changed
4850

src/cmem/react-flow/configuration/_colors-workflow.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
$reactflow-color-project-node: #A5356E !default; // Cannot be part of a workflow but we have no other place atm to configure it
12
$reactflow-color-dataset-node: #3a7896 !default;
23
$reactflow-color-linking-node: #0097a7 !default;
34
$reactflow-color-transform-node: #40a691 !default;
@@ -10,12 +11,14 @@ $reactflow-color-replaceable-input: #faa854 !default;
1011
}
1112

1213
.#{eccgui}-configuration--colors__react-flow-workflow {
14+
--projectNode: #{$reactflow-color-project-node};
1315
--datasetNode: #{$reactflow-color-dataset-node};
1416
--linkingNode: #{$reactflow-color-linking-node};
1517
--transformNode: #{$reactflow-color-transform-node};
1618
--taskNode: #{$reactflow-color-task-node};
1719
--workflowNode: #{$reactflow-color-workflow-node};
1820
--replaceableInput: #{$reactflow-color-replaceable-input};
21+
--projectNodeBright: #{bright($reactflow-color-project-node)};
1922
--datasetNodeBright: #{bright($reactflow-color-dataset-node)};
2023
--linkingNodeBright: #{bright($reactflow-color-linking-node)};
2124
--transformNodeBright: #{bright($reactflow-color-transform-node)};

src/components/Tag/TagList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ function TagList({ children, className = "", label = "", ...otherProps }: TagLis
1010
const tagList = (
1111
<ul className={`${eccgui}-tag__list` + (className && !label ? " " + className : "")} {...otherProps}>
1212
{React.Children.map(children, (child, i) => {
13-
return (
13+
return child ? (
1414
<li className={`${eccgui}-tag__list-item`} key={"tagitem_" + i}>
1515
{child}
1616
</li>
17-
);
17+
) : null;
1818
})}
1919
</ul>
2020
);

0 commit comments

Comments
 (0)