From 71ccfd7f15378f54a84f1ef4a32b393c917344b3 Mon Sep 17 00:00:00 2001
From: Mariia Kovsharova <mariia.kovsharova@eccenca.com>
Date: Tue, 5 Aug 2025 09:41:28 +0200
Subject: [PATCH 1/5] Remove errors in explore (CMEM-6724)

---
 .../ActivityControl/ActivityControlWidget.tsx | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityControlWidget.tsx b/src/cmem/ActivityControl/ActivityControlWidget.tsx
index e59ef64ca..dc66d4888 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.tsx
@@ -52,7 +52,7 @@ export interface ActivityControlWidgetProps extends TestableComponent {
     /**
      * The action buttons
      */
-    activityActions?: ActivityControlWidgetAction[];
+    activityActions?: (ActivityControlWidgetAction | React.ReactElement)[];
     /**
      * Context menu items
      */
@@ -90,6 +90,12 @@ interface IActivityContextMenu extends TestableComponent {
     menuItems: IActivityMenuAction[];
 }
 
+const isActivityControlWidgetAction = (
+    value: ActivityControlWidgetAction | React.ReactElement
+): value is ActivityControlWidgetAction => {
+    return !!((value as ActivityControlWidgetAction).action && (value as ActivityControlWidgetAction).icon);
+};
+
 export interface ActivityControlWidgetAction extends TestableComponent {
     // The action that should be triggered
     action: () => void;
@@ -178,21 +184,25 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
             <OverviewItemActions>
                 {activityActions &&
                     activityActions.map((action, idx) => {
-                        return (
-                            <IconButton
-                                key={typeof action.icon === "string" ? action.icon : action["data-test-id"] ?? idx}
-                                data-test-id={action["data-test-id"]}
-                                name={action.icon}
-                                text={action.tooltip}
-                                onClick={action.action}
-                                disabled={action.disabled}
-                                hasStateWarning={action.hasStateWarning}
-                                tooltipProps={{
-                                    hoverOpenDelay: 200,
-                                    placement: "bottom",
-                                }}
-                            />
-                        );
+                        if (isActivityControlWidgetAction(action)) {
+                            return (
+                                <IconButton
+                                    key={typeof action.icon === "string" ? action.icon : action["data-test-id"] ?? idx}
+                                    data-test-id={action["data-test-id"]}
+                                    name={action.icon}
+                                    text={action.tooltip}
+                                    onClick={action.action}
+                                    disabled={action.disabled}
+                                    intent={action.hasStateWarning ? "warning" : undefined}
+                                    tooltipProps={{
+                                        hoverOpenDelay: 200,
+                                        placement: "bottom",
+                                    }}
+                                />
+                            );
+                        }
+
+                        return action;
                     })}
                 {activityContextMenu && activityContextMenu.menuItems.length > 0 && (
                     <ContextMenu

From 3580f3f7905e82d92c414cdd4273837bc0896fbb Mon Sep 17 00:00:00 2001
From: Mariia Kovsharova <mariia.kovsharova@eccenca.com>
Date: Tue, 5 Aug 2025 10:56:24 +0200
Subject: [PATCH 2/5] Revert "Remove errors in explore (CMEM-6724)"

This reverts commit 71ccfd7f15378f54a84f1ef4a32b393c917344b3.
---
 .../ActivityControl/ActivityControlWidget.tsx | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityControlWidget.tsx b/src/cmem/ActivityControl/ActivityControlWidget.tsx
index dc66d4888..e59ef64ca 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.tsx
@@ -52,7 +52,7 @@ export interface ActivityControlWidgetProps extends TestableComponent {
     /**
      * The action buttons
      */
-    activityActions?: (ActivityControlWidgetAction | React.ReactElement)[];
+    activityActions?: ActivityControlWidgetAction[];
     /**
      * Context menu items
      */
@@ -90,12 +90,6 @@ interface IActivityContextMenu extends TestableComponent {
     menuItems: IActivityMenuAction[];
 }
 
-const isActivityControlWidgetAction = (
-    value: ActivityControlWidgetAction | React.ReactElement
-): value is ActivityControlWidgetAction => {
-    return !!((value as ActivityControlWidgetAction).action && (value as ActivityControlWidgetAction).icon);
-};
-
 export interface ActivityControlWidgetAction extends TestableComponent {
     // The action that should be triggered
     action: () => void;
@@ -184,25 +178,21 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
             <OverviewItemActions>
                 {activityActions &&
                     activityActions.map((action, idx) => {
-                        if (isActivityControlWidgetAction(action)) {
-                            return (
-                                <IconButton
-                                    key={typeof action.icon === "string" ? action.icon : action["data-test-id"] ?? idx}
-                                    data-test-id={action["data-test-id"]}
-                                    name={action.icon}
-                                    text={action.tooltip}
-                                    onClick={action.action}
-                                    disabled={action.disabled}
-                                    intent={action.hasStateWarning ? "warning" : undefined}
-                                    tooltipProps={{
-                                        hoverOpenDelay: 200,
-                                        placement: "bottom",
-                                    }}
-                                />
-                            );
-                        }
-
-                        return action;
+                        return (
+                            <IconButton
+                                key={typeof action.icon === "string" ? action.icon : action["data-test-id"] ?? idx}
+                                data-test-id={action["data-test-id"]}
+                                name={action.icon}
+                                text={action.tooltip}
+                                onClick={action.action}
+                                disabled={action.disabled}
+                                hasStateWarning={action.hasStateWarning}
+                                tooltipProps={{
+                                    hoverOpenDelay: 200,
+                                    placement: "bottom",
+                                }}
+                            />
+                        );
                     })}
                 {activityContextMenu && activityContextMenu.menuItems.length > 0 && (
                     <ContextMenu

From 9e7f048407a7264d1c229a8c898059c149de2a06 Mon Sep 17 00:00:00 2001
From: Mariia Kovsharova <mariia.kovsharova@eccenca.com>
Date: Tue, 5 Aug 2025 11:52:29 +0200
Subject: [PATCH 3/5] Added additional actions to ActivityControlWidget

---
 CHANGELOG.md                                       | 1 +
 src/cmem/ActivityControl/ActivityControlWidget.tsx | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0d096ae..942330234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Added
 
 -   Extended existing height and readOnly props from `CodeEditorProps` to `AutoSuggestionProps` & `ExtendedCodeEditorProps` to be configurable from `<CodeAutocompleteField />`
+-   Added additional actions to `<ActivityControlWidget />`
 
 ## [24.3.0] - 2025-06-05
 
diff --git a/src/cmem/ActivityControl/ActivityControlWidget.tsx b/src/cmem/ActivityControl/ActivityControlWidget.tsx
index e59ef64ca..47f89529d 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.tsx
@@ -81,6 +81,10 @@ export interface ActivityControlWidgetProps extends TestableComponent {
      * execution timer messages for waiting and running times.
      */
     timerExecutionMsg?: JSX.Element | null;
+    /**
+     * additional actions that can serve as a complex component, positioned between the default actions and the context menu
+     */
+    additionalActions?: React.ReactElement<unknown>[];
 }
 
 interface IActivityContextMenu extends TestableComponent {
@@ -115,6 +119,7 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
         progressSpinner,
         activityActions,
         activityContextMenu,
+        additionalActions,
         small,
         border,
         hasSpacing,
@@ -194,6 +199,7 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
                             />
                         );
                     })}
+                {additionalActions}
                 {activityContextMenu && activityContextMenu.menuItems.length > 0 && (
                     <ContextMenu
                         data-test-id={activityContextMenu["data-test-id"]}

From d2f70334a49ff47a29d65c950b7cf92962ce02f3 Mon Sep 17 00:00:00 2001
From: Mariia Kovsharova <mariia.kovsharova@eccenca.com>
Date: Tue, 5 Aug 2025 15:04:08 +0200
Subject: [PATCH 4/5] Added a story, added tests

---
 .../ActivityControlWidget.stories.tsx         | 48 ++++++++-
 .../ActivityControl/ActivityControlWidget.tsx | 47 +++++++--
 .../tests/ActivityControlWidget.test.tsx      | 99 +++++++++++++++++++
 3 files changed, 180 insertions(+), 14 deletions(-)
 create mode 100644 src/cmem/ActivityControl/tests/ActivityControlWidget.test.tsx

diff --git a/src/cmem/ActivityControl/ActivityControlWidget.stories.tsx b/src/cmem/ActivityControl/ActivityControlWidget.stories.tsx
index 21c1bd13c..952955b33 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.stories.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.stories.tsx
@@ -1,9 +1,17 @@
-import React from "react";
+import React, { useMemo, useState } from "react";
 import { loremIpsum } from "react-lorem-ipsum";
+import { OverlaysProvider } from "@blueprintjs/core";
 import { Meta, StoryFn } from "@storybook/react";
 
 import { helpersArgTypes } from "../../../.storybook/helpers";
-import { ActivityControlWidget, Tag, TagList } from "../../../index";
+import {
+    ActivityControlWidget,
+    ActivityControlWidgetAction,
+    IconButton,
+    SimpleDialog,
+    Tag,
+    TagList,
+} from "../../../index";
 
 export default {
     title: "Cmem/ActivityControlWidget",
@@ -19,7 +27,7 @@ const Template: StoryFn<typeof ActivityControlWidget> = (args) => <ActivityContr
 
 export const FullExample = Template.bind({});
 
-const actions = [
+const actions: ActivityControlWidgetAction[] = [
     {
         "data-test-id": "activity-reload-activity",
         icon: "item-reload",
@@ -57,8 +65,8 @@ const commonWidgetArgs = {
     progressSpinner: {
         intent: "none",
         value: 0.5,
-    },
-};
+    } as const,
+} as const;
 
 FullExample.args = {
     ...commonWidgetArgs,
@@ -80,3 +88,33 @@ WidgetWithTags.args = {
     ...commonWidgetArgs,
     tags: widgetTags,
 };
+
+export const WidgetWithAdditionalActions: StoryFn<typeof ActivityControlWidget> = (args) => {
+    const [isOpen, setIsOpen] = useState(false);
+
+    const params = useMemo(
+        () => ({
+            ...commonWidgetArgs,
+            ...args,
+            additionalActions: args.additionalActions ?? [
+                <IconButton name="application-explore" onClick={() => setIsOpen(true)} />,
+            ],
+        }),
+        []
+    );
+
+    return (
+        <OverlaysProvider>
+            <ActivityControlWidget {...params} />
+            <SimpleDialog
+                title="Additional actions dialog"
+                isOpen={isOpen}
+                onClose={() => setIsOpen(false)}
+                canOutsideClickClose
+                canEscapeKeyClose
+            >
+                Modal content
+            </SimpleDialog>
+        </OverlaysProvider>
+    );
+};
diff --git a/src/cmem/ActivityControl/ActivityControlWidget.tsx b/src/cmem/ActivityControl/ActivityControlWidget.tsx
index 47f89529d..8fec8194c 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.tsx
@@ -114,7 +114,8 @@ interface IActivityMenuAction extends ActivityControlWidgetAction {
 /** Shows the status of activities and supports actions on these activities. */
 export function ActivityControlWidget(props: ActivityControlWidgetProps) {
     const {
-        "data-test-id": dataTestId,
+        "data-test-id": dataTestIdLegacy,
+        "data-testid": dataTestId,
         progressBar,
         progressSpinner,
         activityActions,
@@ -131,10 +132,19 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
     } = props;
     const spinnerClassNames = (progressSpinner?.className ?? "") + ` ${eccgui}-spinner--permanent`;
     const widget = (
-        <OverviewItem data-test-id={dataTestId} hasSpacing={border || hasSpacing} densityHigh={small}>
+        <OverviewItem
+            data-test-id={dataTestIdLegacy}
+            data-testid={dataTestId}
+            hasSpacing={border || hasSpacing}
+            densityHigh={small}
+        >
             {progressBar && <ProgressBar {...progressBar} />}
             {(progressSpinner || progressSpinnerFinishedIcon) && (
-                <OverviewItemDepiction keepColors>
+                <OverviewItemDepiction
+                    data-testid={`${dataTestId}-progress-spinner`}
+                    data-test-id={`${dataTestIdLegacy}-progress-spinner`}
+                    keepColors
+                >
                     {progressSpinnerFinishedIcon ? (
                         React.cloneElement(progressSpinnerFinishedIcon as JSX.Element, { small, large: !small })
                     ) : (
@@ -150,13 +160,21 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
             )}
             <OverviewItemDescription>
                 {props.label && (
-                    <OverviewItemLine small={small}>
+                    <OverviewItemLine
+                        data-testid={`${dataTestId}-label`}
+                        data-test-id={`${dataTestIdLegacy}-label`}
+                        small={small}
+                    >
                         {React.cloneElement(labelWrapper, {}, props.label)}
                         {timerExecutionMsg && (props.statusMessage || tags) && <>&nbsp;({timerExecutionMsg})</>}
                     </OverviewItemLine>
                 )}
                 {(props.statusMessage || tags) && (
-                    <OverviewItemLine small>
+                    <OverviewItemLine
+                        data-testid={`${dataTestId}-status-message`}
+                        data-test-id={`${dataTestIdLegacy}-status-message`}
+                        small
+                    >
                         {tags}
                         {props.statusMessage && (
                             <OverflowText passDown>
@@ -177,21 +195,32 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
                     </OverviewItemLine>
                 )}
                 {timerExecutionMsg && !(props.statusMessage || tags) && (
-                    <OverviewItemLine small>{timerExecutionMsg}</OverviewItemLine>
+                    <OverviewItemLine
+                        data-testid={`${dataTestId}-status-message`}
+                        data-test-id={`${dataTestIdLegacy}-status-message`}
+                        small
+                    >
+                        {timerExecutionMsg}
+                    </OverviewItemLine>
                 )}
             </OverviewItemDescription>
-            <OverviewItemActions>
+            <OverviewItemActions data-testid={`${dataTestId}-actions`} data-test-id={`${dataTestIdLegacy}-actions`}>
                 {activityActions &&
                     activityActions.map((action, idx) => {
                         return (
                             <IconButton
-                                key={typeof action.icon === "string" ? action.icon : action["data-test-id"] ?? idx}
+                                key={
+                                    typeof action.icon === "string"
+                                        ? action.icon
+                                        : action["data-test-id"] ?? action["data-testid"] ?? idx
+                                }
                                 data-test-id={action["data-test-id"]}
+                                data-testid={action["data-testid"]}
                                 name={action.icon}
                                 text={action.tooltip}
                                 onClick={action.action}
                                 disabled={action.disabled}
-                                hasStateWarning={action.hasStateWarning}
+                                intent={action.hasStateWarning ? "warning" : undefined}
                                 tooltipProps={{
                                     hoverOpenDelay: 200,
                                     placement: "bottom",
diff --git a/src/cmem/ActivityControl/tests/ActivityControlWidget.test.tsx b/src/cmem/ActivityControl/tests/ActivityControlWidget.test.tsx
new file mode 100644
index 000000000..77eca813d
--- /dev/null
+++ b/src/cmem/ActivityControl/tests/ActivityControlWidget.test.tsx
@@ -0,0 +1,99 @@
+import React from "react";
+import { fireEvent, render, screen } from "@testing-library/react";
+
+import "@testing-library/jest-dom";
+
+import { IconButton, Tag, TagList } from "../../../index";
+import { ActivityControlWidget, ActivityControlWidgetAction } from "../ActivityControlWidget";
+
+describe("ActivityControlWidget", () => {
+    it("Renders basic widget with actions and handles clicks", () => {
+        const mockAction1 = jest.fn();
+        const mockAction2 = jest.fn();
+        const actions: ActivityControlWidgetAction[] = [
+            {
+                "data-testid": "action-1",
+                icon: "item-reload",
+                action: mockAction1,
+                tooltip: "Action 1",
+            },
+            {
+                "data-testid": "action-2",
+                icon: "item-start",
+                action: mockAction2,
+                tooltip: "Action 2",
+            },
+        ];
+
+        render(
+            <ActivityControlWidget
+                label="Basic widget"
+                data-testid="basic-widget"
+                activityActions={actions}
+                statusMessage="Status message"
+            />
+        );
+
+        const button1 = screen.getByTestId("action-1");
+        const button2 = screen.getByTestId("action-2");
+
+        const label = screen.getByTestId("basic-widget-label");
+        const statusMessage = screen.getByTestId("basic-widget-status-message");
+        const actionsContainer = screen.getByTestId("basic-widget-actions");
+
+        expect(label).toBeInTheDocument();
+        expect(statusMessage).toBeInTheDocument();
+        expect(actionsContainer).toBeInTheDocument();
+
+        expect(label).toHaveTextContent("Basic widget");
+        expect(statusMessage).toHaveTextContent("Status message");
+
+        expect(button1).toBeInTheDocument();
+        expect(button2).toBeInTheDocument();
+
+        fireEvent.click(button1);
+        expect(mockAction1).toHaveBeenCalledTimes(1);
+
+        fireEvent.click(button2);
+        expect(mockAction2).toHaveBeenCalledTimes(1);
+    });
+
+    it("Renders widget with tags", () => {
+        const tags = (
+            <TagList>
+                <Tag>Tag one</Tag>
+                <Tag>Other tag</Tag>
+            </TagList>
+        );
+        render(<ActivityControlWidget label="Widget with tags" tags={tags} data-testid="widget-with-tags" />);
+
+        const label = screen.getByTestId("widget-with-tags-label");
+        const statusMessage = screen.getByTestId("widget-with-tags-status-message");
+
+        expect(label).toBeInTheDocument();
+        expect(statusMessage).toBeInTheDocument();
+
+        expect(label).toHaveTextContent("Widget with tags");
+        expect(statusMessage).toHaveTextContent("Tag one");
+        expect(statusMessage).toHaveTextContent("Other tag");
+    });
+
+    it("Renders widget with additional actions and handles click", () => {
+        const mockAction = jest.fn();
+        const additionalActions = [
+            <IconButton
+                key="add-btn"
+                name="application-explore"
+                onClick={mockAction}
+                data-testid="additional-action"
+            />,
+        ];
+        render(<ActivityControlWidget additionalActions={additionalActions} />);
+
+        const customButton = screen.getByTestId("additional-action");
+        expect(customButton).toBeInTheDocument();
+
+        fireEvent.click(customButton);
+        expect(mockAction).toHaveBeenCalledTimes(1);
+    });
+});

From 86ea778b26fa468d9cd88ba4bfc3ca6b1dc8cf62 Mon Sep 17 00:00:00 2001
From: Mariia Kovsharova <mariia.kovsharova@eccenca.com>
Date: Wed, 6 Aug 2025 14:33:27 +0200
Subject: [PATCH 5/5] Check data-test-id before usage

---
 .../ActivityControl/ActivityControlWidget.tsx | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/cmem/ActivityControl/ActivityControlWidget.tsx b/src/cmem/ActivityControl/ActivityControlWidget.tsx
index 8fec8194c..efda5060f 100644
--- a/src/cmem/ActivityControl/ActivityControlWidget.tsx
+++ b/src/cmem/ActivityControl/ActivityControlWidget.tsx
@@ -141,8 +141,8 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
             {progressBar && <ProgressBar {...progressBar} />}
             {(progressSpinner || progressSpinnerFinishedIcon) && (
                 <OverviewItemDepiction
-                    data-testid={`${dataTestId}-progress-spinner`}
-                    data-test-id={`${dataTestIdLegacy}-progress-spinner`}
+                    data-testid={dataTestId ? `${dataTestId}-progress-spinner` : undefined}
+                    data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-progress-spinner` : undefined}
                     keepColors
                 >
                     {progressSpinnerFinishedIcon ? (
@@ -161,8 +161,8 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
             <OverviewItemDescription>
                 {props.label && (
                     <OverviewItemLine
-                        data-testid={`${dataTestId}-label`}
-                        data-test-id={`${dataTestIdLegacy}-label`}
+                        data-testid={dataTestId ? `${dataTestId}-label` : undefined}
+                        data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-label` : undefined}
                         small={small}
                     >
                         {React.cloneElement(labelWrapper, {}, props.label)}
@@ -171,8 +171,8 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
                 )}
                 {(props.statusMessage || tags) && (
                     <OverviewItemLine
-                        data-testid={`${dataTestId}-status-message`}
-                        data-test-id={`${dataTestIdLegacy}-status-message`}
+                        data-testid={dataTestId ? `${dataTestId}-status-message` : undefined}
+                        data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-status-message` : undefined}
                         small
                     >
                         {tags}
@@ -196,15 +196,18 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
                 )}
                 {timerExecutionMsg && !(props.statusMessage || tags) && (
                     <OverviewItemLine
-                        data-testid={`${dataTestId}-status-message`}
-                        data-test-id={`${dataTestIdLegacy}-status-message`}
+                        data-testid={dataTestId ? `${dataTestId}-status-message` : undefined}
+                        data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-status-message` : undefined}
                         small
                     >
                         {timerExecutionMsg}
                     </OverviewItemLine>
                 )}
             </OverviewItemDescription>
-            <OverviewItemActions data-testid={`${dataTestId}-actions`} data-test-id={`${dataTestIdLegacy}-actions`}>
+            <OverviewItemActions
+                data-testid={dataTestId ? `${dataTestId}-actions` : undefined}
+                data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-actions` : undefined}
+            >
                 {activityActions &&
                     activityActions.map((action, idx) => {
                         return (