From a4abf6517f5ec4eabeddcb8cb32e558e335d08e0 Mon Sep 17 00:00:00 2001
From: Julien Pinsonneau <jpinsonn@redhat.com>
Date: Fri, 29 Aug 2025 08:46:39 +0200
Subject: [PATCH 1/2] add missing ids for tests

---
 web/src/components/forms/editor-toggle.tsx    | 32 ++++++++++++++++---
 .../components/forms/flowCollector-status.tsx |  8 ++++-
 web/src/components/forms/resource-form.tsx    | 16 ++++++++--
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/web/src/components/forms/editor-toggle.tsx b/web/src/components/forms/editor-toggle.tsx
index 50b52c5ad..293e836bf 100644
--- a/web/src/components/forms/editor-toggle.tsx
+++ b/web/src/components/forms/editor-toggle.tsx
@@ -55,6 +55,7 @@ export const EditorToggle: FC<EditorToggleProps> = ({
             {t('Configure via:')}
           </label>
           <Radio
+            data-test={`${EditorType.CUSTOM}-view-input`}
             id={EditorType.CUSTOM}
             isChecked={type === EditorType.CUSTOM}
             label={t('Form view')}
@@ -84,19 +85,42 @@ export const EditorToggle: FC<EditorToggleProps> = ({
             </Alert>
           )}
           <ActionGroup className="pf-v5-c-form">
-            <Button type="submit" onClick={onSubmit} variant="primary">
+            <Button
+              id={isUpdate ? 'update-resource-button' : 'create-resource-button'}
+              data-test-id={isUpdate ? 'update-resource-button' : 'create-resource-button'}
+              type="submit"
+              onClick={onSubmit}
+              variant="primary"
+            >
               {isUpdate ? t('Update') : t('Create')}
             </Button>
             {updated && (
-              <Button type="submit" onClick={onReload} variant="secondary">
+              <Button
+                id="reload-resource-button"
+                data-test-id="reload-resource-button"
+                type="submit"
+                onClick={onReload}
+                variant="secondary"
+              >
                 {t('Reload')}
               </Button>
             )}
-            <Button onClick={onCancel} variant="secondary">
+            <Button
+              id="cancel-resource-button"
+              data-test-id="cancel-resource-button"
+              onClick={onCancel}
+              variant="secondary"
+            >
               {t('Cancel')}
             </Button>
             {isUpdate && (
-              <Button type="submit" onClick={onDelete} variant="danger">
+              <Button
+                id="delete-resource-button"
+                data-test-id="delete-resource-button"
+                type="submit"
+                onClick={onDelete}
+                variant="danger"
+              >
                 {t('Delete')}
               </Button>
             )}
diff --git a/web/src/components/forms/flowCollector-status.tsx b/web/src/components/forms/flowCollector-status.tsx
index 1eba46300..85ee4fe63 100644
--- a/web/src/components/forms/flowCollector-status.tsx
+++ b/web/src/components/forms/flowCollector-status.tsx
@@ -47,6 +47,7 @@ export const FlowCollectorStatus: FC<FlowCollectorStatusProps> = () => {
                         <FlexItem>
                           <Button
                             id="edit-flow-collector"
+                            data-test-id="edit-flow-collector"
                             variant="primary"
                             onClick={() => navigate(flowCollectorEditPath)}
                           >
@@ -54,7 +55,12 @@ export const FlowCollectorStatus: FC<FlowCollectorStatusProps> = () => {
                           </Button>
                         </FlexItem>
                         <FlexItem>
-                          <Button id="open-network-traffic" variant="link" onClick={() => navigate(netflowTrafficPath)}>
+                          <Button
+                            id="open-network-traffic"
+                            data-test-id="open-network-traffic"
+                            variant="link"
+                            onClick={() => navigate(netflowTrafficPath)}
+                          >
                             {t('Open Network Traffic page')}
                           </Button>
                         </FlexItem>
diff --git a/web/src/components/forms/resource-form.tsx b/web/src/components/forms/resource-form.tsx
index f43440674..9b38b4d7e 100644
--- a/web/src/components/forms/resource-form.tsx
+++ b/web/src/components/forms/resource-form.tsx
@@ -105,10 +105,22 @@ export const ResourceForm: FC<ResourceFormProps> = ({ uiSchema }) => {
               onClose={() => setOpen(false)}
               footer={
                 <div className="footer">
-                  <Button data-test="time-range-cancel" key="cancel" variant="link" onClick={() => setOpen(false)}>
+                  <Button
+                    id="cancel-delete-popup-button"
+                    data-test-id="cancel-delete-popup-button"
+                    key="cancel"
+                    variant="link"
+                    onClick={() => setOpen(false)}
+                  >
                     {t('Cancel')}
                   </Button>
-                  <Button key="confirm" variant="danger" onClick={() => ctx.onSubmit(data, true)}>
+                  <Button
+                    id="confirm-delete-popup-button"
+                    data-test-id="confirm-delete-popup-button"
+                    key="confirm"
+                    variant="danger"
+                    onClick={() => ctx.onSubmit(data, true)}
+                  >
                     {t('Delete')}
                   </Button>
                 </div>

From a8c06a488451723aa9a65be6919a288e0cb48830 Mon Sep 17 00:00:00 2001
From: Julien Pinsonneau <jpinsonn@redhat.com>
Date: Fri, 29 Aug 2025 08:55:32 +0200
Subject: [PATCH 2/2] checkbox array data-test-id

---
 web/src/components/forms/dynamic-form/widgets.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/components/forms/dynamic-form/widgets.tsx b/web/src/components/forms/dynamic-form/widgets.tsx
index e3ec03b76..2024a22a3 100644
--- a/web/src/components/forms/dynamic-form/widgets.tsx
+++ b/web/src/components/forms/dynamic-form/widgets.tsx
@@ -197,6 +197,7 @@ export const ArrayCheckboxesWidget: React.FC<WidgetProps> = props => {
           <FlexItem key={`${id}-${index}`}>
             <Checkbox
               id={`${id}-${index}`}
+              data-test-id={`${id}-${option}`}
               label={option}
               isChecked={_.isNil(value) ? false : value.includes(option)}
               onClick={() =>