From 06bcb6ee516ed828ed740523602410581d755dc7 Mon Sep 17 00:00:00 2001
From: Primakov Alexandr <primakovpro@gmail.com>
Date: Wed, 10 Dec 2025 00:36:05 +0300
Subject: [PATCH] Update navigation in SubmissionDetailsPage to include userId
 in URL if available; initialize selectedUserId in SubmissionsPage from search
 parameters for improved user experience.

---
 src/pages/submissions/SubmissionDetailsPage.tsx | 6 +++++-
 src/pages/submissions/SubmissionsPage.tsx       | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/submissions/SubmissionDetailsPage.tsx b/src/pages/submissions/SubmissionDetailsPage.tsx
index d3b80ee..55fdb87 100644
--- a/src/pages/submissions/SubmissionDetailsPage.tsx
+++ b/src/pages/submissions/SubmissionDetailsPage.tsx
@@ -24,7 +24,11 @@ export const SubmissionDetailsPage: React.FC = () => {
   const submission = submissions?.find((s) => s.id === submissionId)
 
   const handleBack = () => {
-    navigate(URLs.submissions)
+    if (userId) {
+      navigate(`${URLs.submissions}?userId=${encodeURIComponent(userId)}`)
+    } else {
+      navigate(URLs.submissions)
+    }
   }
 
   if (isLoading) {
diff --git a/src/pages/submissions/SubmissionsPage.tsx b/src/pages/submissions/SubmissionsPage.tsx
index 27b1014..8c499e5 100644
--- a/src/pages/submissions/SubmissionsPage.tsx
+++ b/src/pages/submissions/SubmissionsPage.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 import {
   Box,
   Heading,
@@ -32,12 +32,14 @@ import type {
 export const SubmissionsPage: React.FC = () => {
   const { t } = useTranslation()
   const navigate = useNavigate()
+  const [searchParams] = useSearchParams()
+  const initialUserId = searchParams.get('userId')
   const { data: stats, isLoading: isStatsLoading, error: statsError, refetch: refetchStats } =
     useGetSystemStatsV2Query(undefined)
 
   const [searchQuery, setSearchQuery] = useState('')
   const [statusFilter, setStatusFilter] = useState<SubmissionStatus | 'all'>('all')
-  const [selectedUserId, setSelectedUserId] = useState<string | null>(null)
+  const [selectedUserId, setSelectedUserId] = useState<string | null>(initialUserId)
 
   const {
     data: submissions,