Skip to content

fix:clear request selection when closing details pane #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aasifa1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix:clear request selection when closing details pane #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions ...terceptTraffic/WebTraffic/TrafficTableV2/NetworkInspector/NetworkTable/VirtualTableV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@ interface Props {
renderLogRow: any;
selectedRowData: RQNetworkLog | null;
onReplayRequest: () => void;
selectedRowId?: string | null;
}

const VirtualTableV2: React.FC<Props> = ({ logs = [], header, renderLogRow, selectedRowData, onReplayRequest }) => {
const [selected, setSelected] = useState<string | null>(null);
const VirtualTableV2: React.FC<Props> = ({
logs = [],
header,
renderLogRow,
selectedRowData,
onReplayRequest,
selectedRowId,
}) => {
const [lastKnownBottomIndex, setLastKnownBottomIndex] = useState<number | null>(null);
const [isScrollToBottomEnabled, setIsScrollToBottomEnabled] = useState(true);
const [headerHeight, setHeaderHeight] = useState(0);
Expand Down Expand Up @@ -147,12 +154,11 @@ const VirtualTableV2: React.FC<Props> = ({ logs = [], header, renderLogRow, sele
"--virtualPaddingBottom": paddingBottom + "px",
} as React.CSSProperties
}
selected={selected ?? undefined}
onSelected={(id: string) => {
setSelected(id);
selected={selectedRowId ?? undefined}
onSelected={(_id: string) => {
setIsScrollToBottomEnabled(false); // Disable autoscroll when row is selected
}}
onContextMenu={(e: any) => setSelected(e.target?.parentElement.id)}
onContextMenu={(_e: any) => {}}
>
{header}
<ContextMenu log={selectedRowData ?? ({} as RQNetworkLog)} onReplayRequest={onReplayRequest}>
Expand Down
3 changes: 3 additions & 0 deletions ...esktop/InterceptTraffic/WebTraffic/TrafficTableV2/NetworkInspector/NetworkTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface Props {
setSelectedMockRequests: Function;
showMockRequestSelector: boolean;
selectedMockRequests: Record<string, any>;
selectedRowId?: string | null;
}

const NetworkTable: React.FC<Props> = ({
Expand All @@ -36,6 +37,7 @@ const NetworkTable: React.FC<Props> = ({
setSelectedMockRequests,
showMockRequestSelector,
selectedMockRequests,
selectedRowId,
}) => {
const [selectedRowData, setSelectedRowData] = useState<RQNetworkLog | null>(null);
const [isReplayRequestModalOpen, setIsReplayRequestModalOpen] = useState(false);
Expand Down Expand Up @@ -271,6 +273,7 @@ const NetworkTable: React.FC<Props> = ({
logs={logs}
selectedRowData={selectedRowData}
onReplayRequest={onReplayRequest}
selectedRowId={selectedRowId}
/>
</div>
{isReplayRequestModalOpen ? (
Expand Down
2 changes: 2 additions & 0 deletions ...de-specific/desktop/InterceptTraffic/WebTraffic/TrafficTableV2/NetworkInspector/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface Props {
setSelectedMockRequests: Function;
showMockRequestSelector: boolean;
selectedMockRequests: Record<string, any>;
selectedRowId?: string | null;
}

const NetworkInspector: React.FC<Props> = (props) => {
Expand All @@ -22,6 +23,7 @@ const NetworkInspector: React.FC<Props> = (props) => {
setSelectedMockRequests={props.setSelectedMockRequests}
showMockRequestSelector={props.showMockRequestSelector}
selectedMockRequests={props.selectedMockRequests}
selectedRowId={props.selectedRowId}
/>
</AutoThemeProvider>
);
Expand Down
2 changes: 2 additions & 0 deletions ...s/mode-specific/desktop/InterceptTraffic/WebTraffic/TrafficTableV2/Tables/GroupByNone.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const GroupByNone = ({
showMockRequestSelector,
selectedMockRequests,
showMockFilters,
selectedRowId,
}) => {
const renderNoTrafficCTA = () => {
if (emptyCtaAction && emptyCtaText) {
Expand All @@ -39,6 +40,7 @@ const GroupByNone = ({
<NetworkInspector
isStaticPreview={isStaticPreview}
logs={requestsLog}
selectedRowId={selectedRowId}
onRow={(record) => {
const { actions } = record;
return {
Expand Down
5 changes: 5 additions & 0 deletions ...src/components/mode-specific/desktop/InterceptTraffic/WebTraffic/TrafficTableV2/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ const CurrentTrafficTable = ({

const handleClosePane = () => {
handlePreviewVisibility(false);
setSelectedRequestData({});
};

// const printLogsToConsole = useCallback(
Expand All @@ -156,6 +157,7 @@ const CurrentTrafficTable = ({
dispatch(desktopTrafficTableActions.logsClearAll());
setDomainList(new Set([...trafficTableFilters.domain]));
setAppList(new Set([...trafficTableFilters.app]));
setSelectedRequestData({});
setIsPreviewOpen(false);
trackTrafficTableLogsCleared(getConnectedAppsCount(Object.values(desktopSpecificDetails.appsList)) > 0);
trackRQDesktopLastActivity(TRAFFIC_TABLE.TRAFFIC_TABLE_LOGS_CLEARED);
Expand Down Expand Up @@ -452,6 +454,7 @@ const CurrentTrafficTable = ({
return (
<GroupByNone
requestsLog={logsToRender}
selectedRowId={isPreviewOpen ? selectedRequestData?.id : null}
handleRowClick={handleRowClick}
emptyCtaText={emptyCtaText}
emptyCtaAction={emptyCtaAction}
Expand All @@ -467,6 +470,8 @@ const CurrentTrafficTable = ({
[
getFilteredLogs,
requestLogs,
isPreviewOpen,
selectedRequestData?.id,
handleRowClick,
emptyCtaText,
emptyCtaAction,
Expand Down