Skip to content
Open
Show file tree
Hide file tree
Changes from 6 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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux';
import { updateRunnerConfiguration } from 'providers/ReduxStore/slices/collections/actions';
import StyledWrapper from './StyledWrapper';
import { isItemARequest, isItemAFolder } from 'utils/collections';
import { sortByNameThenSequence } from 'utils/common/index';
import { sortByNameThenSequence } from 'utils/common';
import path from 'utils/common/path';
import { cloneDeep, get } from 'lodash';
import Button from 'ui/Button/index';
Expand Down Expand Up @@ -152,7 +152,11 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop, isDi
<IconGripVertical size={16} strokeWidth={1.5} />
</div>

<div className="checkbox-container" onClick={() => !isDisabled && onSelect(item)}>
<div
className="checkbox-container"
data-testid="runner-request-item-checkbox"
onClick={() => !isDisabled && onSelect(item)}
>
<div className="checkbox">
{isSelected && !isDisabled && <IconCheck className="checkbox-icon" size={12} strokeWidth={3} />}
</div>
Expand All @@ -163,7 +167,7 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop, isDi
</div>

<div className="request-name">
<span>{item.name}</span>
<span data-testid="runner-request-item-name">{item.name}</span>
{item.folderPath && (
<span className="folder-path">{item.folderPath}</span>
)}
Expand All @@ -172,7 +176,7 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop, isDi
);
};

const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, tags }) => {
const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, tags, persistConfiguration = true }) => {
const dispatch = useDispatch();
const [flattenedRequests, setFlattenedRequests] = useState([]);
const [originalRequests, setOriginalRequests] = useState([]);
Expand All @@ -182,6 +186,14 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
// Track items that were auto-deselected due to tag filters, so we can re-select them when tags change back
const pendingReselectRef = useRef(new Set());

const persistRunnerConfiguration = useCallback((selectedRequestUids, requestItemsOrder) => {
if (!persistConfiguration) {
return;
}

dispatch(updateRunnerConfiguration(collection.uid, selectedRequestUids, requestItemsOrder));
}, [collection.uid, dispatch, persistConfiguration]);

const flattenRequests = useCallback((collection) => {
const result = [];

Expand Down Expand Up @@ -292,9 +304,9 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
.map((r) => r.uid);
setSelectedItems(ordered);
const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
dispatch(updateRunnerConfiguration(collection.uid, ordered, allRequestUidsOrder));
persistRunnerConfiguration(ordered, allRequestUidsOrder);
}
}, [tags, flattenedRequests]);
}, [tags, flattenedRequests, selectedItems, setSelectedItems, persistRunnerConfiguration]);

const enabledRequests = flattenedRequests.filter((item) => !isRequestDisabled(item, tags));
const enabledCount = enabledRequests.length;
Expand Down Expand Up @@ -326,11 +338,11 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
const allRequestUidsOrder = currentRequests.map((item) => item.uid);

setSelectedItems(newOrderedSelectedUids);
dispatch(updateRunnerConfiguration(collection.uid, newOrderedSelectedUids, allRequestUidsOrder));
persistRunnerConfiguration(newOrderedSelectedUids, allRequestUidsOrder);

return currentRequests;
});
}, [selectedItems, collection.uid, dispatch, setSelectedItems]);
}, [selectedItems, setSelectedItems, persistRunnerConfiguration]);

const handleRequestSelect = useCallback((item) => {
if (isRequestDisabled(item, tags)) return;
Expand All @@ -341,7 +353,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
setSelectedItems(newSelectedUids);

const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
dispatch(updateRunnerConfiguration(collection.uid, newSelectedUids, allRequestUidsOrder));
persistRunnerConfiguration(newSelectedUids, allRequestUidsOrder);
} else {
const newSelectedUids = [...selectedItems, item.uid];

Expand All @@ -352,12 +364,12 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
setSelectedItems(orderedSelectedUids);

const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
dispatch(updateRunnerConfiguration(collection.uid, orderedSelectedUids, allRequestUidsOrder));
persistRunnerConfiguration(orderedSelectedUids, allRequestUidsOrder);
}
} catch (error) {
console.error('Error selecting item:', error);
}
}, [selectedItems, setSelectedItems, flattenedRequests, dispatch, collection.uid, tags]);
}, [selectedItems, setSelectedItems, flattenedRequests, persistRunnerConfiguration, tags]);

const handleSelectAll = useCallback(() => {
try {
Expand All @@ -367,15 +379,15 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
if (selectedItems.length === enabledCount) {
pendingReselectRef.current.clear();
setSelectedItems([]);
dispatch(updateRunnerConfiguration(collection.uid, [], allRequestUidsOrder));
persistRunnerConfiguration([], allRequestUidsOrder);
} else {
setSelectedItems(enabledUids);
dispatch(updateRunnerConfiguration(collection.uid, enabledUids, allRequestUidsOrder));
persistRunnerConfiguration(enabledUids, allRequestUidsOrder);
}
} catch (error) {
console.error('Error selecting/deselecting all items:', error);
}
}, [flattenedRequests, enabledRequests, enabledCount, selectedItems, setSelectedItems, dispatch, collection.uid]);
}, [flattenedRequests, enabledRequests, enabledCount, selectedItems, setSelectedItems, persistRunnerConfiguration]);

const handleReset = useCallback(() => {
try {
Expand All @@ -387,11 +399,11 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems, ta
.map((item) => item.uid);
setSelectedItems(enabledUids);
const allUidsOrder = resetRequests.map((item) => item.uid);
dispatch(updateRunnerConfiguration(collection.uid, enabledUids, allUidsOrder));
persistRunnerConfiguration(enabledUids, allUidsOrder);
} catch (error) {
console.error('Error resetting configuration:', error);
}
}, [originalRequests, setSelectedItems, collection.uid, dispatch, tags]);
}, [originalRequests, setSelectedItems, tags, persistRunnerConfiguration]);

return (
<StyledWrapper data-testid="runner-config-panel">
Expand Down
24 changes: 19 additions & 5 deletions packages/bruno-app/src/components/RunnerResults/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ const getTestStatus = (results) => {
return failed.length ? 'fail' : 'pass';
};

export const getSelectedRequestItemsForRunAgain = ({ runnerInfo, items, savedConfiguration }) => {
if (runnerInfo?.folderUid) {
return items.map((item) => item.uid);
}

return savedConfiguration?.selectedRequestItems || [];
};

const allTestsPassed = (item) => {
return item.status !== 'error'
&& item.testStatus === 'pass'
Expand Down Expand Up @@ -193,18 +201,23 @@ export default function RunnerResults({ collection }) {
const runAgain = () => {
ensureCollectionIsMounted();
isReRunningRef.current = true;
// Get the saved configuration to determine what to run

const savedConfiguration = get(collection, 'runnerConfiguration', null);
const savedSelectedItems = savedConfiguration?.selectedRequestItems || [];
const savedDelay = savedConfiguration?.delay !== undefined ? savedConfiguration.delay : delay;
const selectedItemsForRunAgain = getSelectedRequestItemsForRunAgain({
runnerInfo,
items,
savedConfiguration
});

dispatch(
runCollectionFolder(
collection.uid,
runnerInfo.folderUid,
true,
Number(savedDelay),
tags,
savedSelectedItems
selectedItemsForRunAgain
)
);
};
Expand Down Expand Up @@ -406,7 +419,8 @@ export default function RunnerResults({ collection }) {
: null}
</span>
<span
className={`mr-1 ml-2 ${item.status == 'skipped' ? 'skipped-request' : anyTestFailed(item) ? 'danger' : ''}`}
data-testid="runner-result-item-name"
className={`mr-1 ml-2 ${item.status === 'skipped' ? 'skipped-request' : anyTestFailed(item) ? 'danger' : ''}`}
>
{item.displayName}
</span>
Expand All @@ -429,7 +443,7 @@ export default function RunnerResults({ collection }) {
Tags: {item.tags.filter((t) => tags.include.includes(t)).join(', ')}
</div>
)}
{item.status == 'error' ? <div className="error-message pl-8 pt-2 text-xs">{item.error}</div> : null}
{item.status === 'error' ? <div className="error-message pl-8 pt-2 text-xs">{item.error}</div> : null}

<ul className="pl-8">
{item.preRequestTestResults
Expand Down
Loading