Merge remote-tracking branch 'refs/remotes/upstream/staging' into NU-…

…1560-pan-zoom # Conflicts: # designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Process initially clean should import JSON and save #1.png
TouK · Apr 19, 2024 · eec61e8 · eec61e8
2 parents f27f2bc + fb46f5d
commit eec61e8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/...ots__/electron/Linux/Process initially clean should import JSON and save #0.png b/...ots__/electron/Linux/Process initially clean should import JSON and save #0.png
diff --git a/...s__/electron/Linux/Process with data should have counts button and modal #0.png b/...s__/electron/Linux/Process with data should have counts button and modal #0.png
diff --git a/designer/client/src/components/toolbarComponents/toolbarButtons/ToolbarButton.tsx b/designer/client/src/components/toolbarComponents/toolbarButtons/ToolbarButton.tsx
@@ -2,7 +2,7 @@ import { css, cx } from "@emotion/css";
 import { Typography, useTheme } from "@mui/material";
 import React, { useContext } from "react";
 import Dropzone from "react-dropzone";
-import { PANEL_BUTTON_FONT_SIZE, PANEL_BUTTON_SIZE, PANEL_BUTTON_SMALL_SIZE } from "../../../stylesheets/variables";
+import { PANEL_BUTTON_SIZE, PANEL_BUTTON_SMALL_SIZE } from "../../../stylesheets/variables";
 import { NodeInput } from "../../withFocus";
 import { ButtonsVariant, ToolbarButtonProps, ToolbarButtonsContext } from "./index";
 import { Icon } from "./ToolbarButtonStyled";
@@ -30,9 +30,8 @@ export const ToolbarButton = React.forwardRef<HTMLDivElement & HTMLButtonElement
         userSelect: "none",
         opacity: disabled ? 0.3 : 1,
         cursor: disabled ? "not-allowed" : "pointer",
-        fontSize: PANEL_BUTTON_FONT_SIZE,
         width,
-        height: width,
+        height: "fit-content",
         outline: "none",
 
         borderColor: hasError ? colors.error : "transparent",
@@ -55,7 +54,7 @@ export const ToolbarButton = React.forwardRef<HTMLDivElement & HTMLButtonElement
         children: (
             <>
                 <Icon title={title}>{icon}</Icon>
-                <Typography variant={"caption"} display={variant === ButtonsVariant.small ? "none" : "unset"}>
+                <Typography variant={"overline"} display={variant === ButtonsVariant.small ? "none" : "unset"}>
                     {name}
                 </Typography>
             </>

diff --git a/designer/client/src/stylesheets/variables.ts b/designer/client/src/stylesheets/variables.ts
@@ -3,7 +3,6 @@ const SCROLL_THUMB_SIZE = 8;
 export const SIDEBAR_WIDTH = 288;
 export const PANEL_WIDTH = SIDEBAR_WIDTH + SCROLL_THUMB_SIZE;
 export const PANEL_BUTTON_SIZE = SIDEBAR_WIDTH / 4;
-export const PANEL_BUTTON_FONT_SIZE = "11px";
 export const PANEL_BUTTON_SMALL_SIZE = SIDEBAR_WIDTH / 6;
 
 export const MODAL_HEADER_HEIGHT = 30;
diff --git a/designer/server/src/main/resources/defaultDesignerConfig.conf b/designer/server/src/main/resources/defaultDesignerConfig.conf
@@ -176,9 +176,9 @@ processToolbarConfig {
         buttons: [
           { type: "generate-and-test", disabled: { archived: true }, hidden: { fragment: true } }
           { type: "test-with-form", disabled: { archived: true } }
+          { type: "test-counts" }
           { type: "test-from-file", disabled: { archived: true }, hidden: { fragment: true } }
           { type: "test-generate", disabled: { archived: true }, hidden: { fragment: true } }
-          { type: "test-counts" }
           { type: "test-hide" }
         ]
       }

diff --git a/designer/submodules/packages/components/src/scenarios/list/itemsList.tsx b/designer/submodules/packages/components/src/scenarios/list/itemsList.tsx
@@ -24,7 +24,11 @@ const ListRowContent = React.memo(function ListRowContent({ row }: { row: RowTyp
             <ListItemAvatar sx={{ minWidth: "46px" }}>
                 <ScenarioAvatar scenario={row} />
             </ListItemAvatar>
-            <ListItemText primary={<FirstLine row={row} />} secondary={<SecondLine row={row} />} />
+            <ListItemText
+                primary={<FirstLine row={row} />}
+                secondary={<SecondLine row={row} />}
+                secondaryTypographyProps={{ component: "span" }}
+            />
         </ListItemButton>
     );
 });

diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -17,6 +17,7 @@
 * [#5873](https://github.com/TouK/nussknacker/pull/5873) Handle list of the anonymous statistic URLs, and send them in the interval
 * [#5889](https://github.com/TouK/nussknacker/pull/5889) Decision Table component parameters validation improvement
 * [#5898](https://github.com/TouK/nussknacker/pull/5898) fixed Nu runtime memory leak
+* [#5887](https://github.com/TouK/nussknacker/pull/5887) Fix toolbar icon styles when multiline text
 
 1.14.0 (21 Mar 2024)
 -------------------------

diff --git a/docs/MigrationGuide.md b/docs/MigrationGuide.md
@@ -57,6 +57,7 @@ To see the biggest differences please consult the [changelog](Changelog.md).
     * If you previously specified base component jar explicitly in `modelConfig.classPath`
       as `components/flink/flinkBase.jar` and want to retain the unbounded specific components you need to add
       `components/flink/flinkBaseUnbounded.jar` explicitly.
+    * [#5887](https://github.com/TouK/nussknacker/pull/5887) When using a custom DesignerConfig, ensure that long text elements like 'generate file' are positioned in the last row to prevent excessive spacing between elements.
 
 ### Other changes