Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/src/components/forms/dynamic-form/widgets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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={() =>
Expand Down
32 changes: 28 additions & 4 deletions web/src/components/forms/editor-toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
Expand Down Expand Up @@ -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>
)}
Expand Down
8 changes: 7 additions & 1 deletion web/src/components/forms/flowCollector-status.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,20 @@ export const FlowCollectorStatus: FC<FlowCollectorStatusProps> = () => {
<FlexItem>
<Button
id="edit-flow-collector"
data-test-id="edit-flow-collector"
variant="primary"
onClick={() => navigate(flowCollectorEditPath)}
>
{t('Edit FlowCollector')}
</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>
Expand Down
16 changes: 14 additions & 2 deletions web/src/components/forms/resource-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down