File tree Expand file tree Collapse file tree 3 files changed +9
-7
lines changed
Clients/src/presentation/pages
Assessment/1.0AssessmentTracker Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -42,10 +42,10 @@ const AssessmentTracker = ({
4242 const currentProjectFramework = project . framework . filter (
4343 ( p ) => p . framework_id === 1
4444 ) [ 0 ] ?. project_framework_id ;
45- const [ activeTab , setActiveTab ] = useState < number > ( 0 ) ;
46- const [ runAssessmentTour , setRunAssessmentTour ] = useState ( false ) ;
4745 const [ searchParams , setSearchParams ] = useSearchParams ( ) ;
4846 const topicId = searchParams . get ( "topicId" ) ;
47+ const [ activeTab , setActiveTab ] = useState < number > ( Number ( topicId ) || 0 ) ;
48+ const [ runAssessmentTour , setRunAssessmentTour ] = useState ( false ) ;
4949
5050 const { assessmentProgress, loading : loadingAssessmentProgress } =
5151 useAssessmentProgress ( {
@@ -81,7 +81,7 @@ const AssessmentTracker = ({
8181 if ( topicId && assessmentTopics && assessmentTopics . length > 0 ) {
8282 const topicIndex = assessmentTopics . findIndex (
8383 ( topic ) => topic . id === parseInt ( topicId )
84- ) ;
84+ ) || 0 ;
8585 if ( topicIndex >= 0 ) {
8686 setActiveTab ( topicIndex ) ;
8787 }
Original file line number Diff line number Diff line change @@ -143,10 +143,10 @@ const ProjectFrameworks = ({
143143 ] ) ;
144144
145145 const handleFrameworkChange = ( frameworkId : number ) => {
146- if ( searchParams . get ( "framework" ) ) {
147- searchParams . delete ( "framework " ) ;
148- setSearchParams ( searchParams ) ;
149- }
146+ searchParams . delete ( "framework" ) ;
147+ searchParams . delete ( "topicId " ) ;
148+ searchParams . delete ( "questionId" ) ;
149+ setSearchParams ( searchParams ) ;
150150 setSelectedFrameworkId ( frameworkId ) ;
151151 setTracker (
152152 frameworkId === FRAMEWORK_IDS . ISO_42001 ? "clauses" : "compliance"
Original file line number Diff line number Diff line change @@ -47,6 +47,8 @@ const VWProjectView = () => {
4747 if ( tabParam ) {
4848 searchParams . delete ( "tab" ) ;
4949 searchParams . delete ( "framework" ) ;
50+ searchParams . delete ( "topicId" ) ;
51+ searchParams . delete ( "questionId" ) ;
5052 setSearchParams ( searchParams ) ;
5153 }
5254 setValue ( newValue ) ;
You can’t perform that action at this time.
0 commit comments