Skip to content

Commit 831ce96

Browse files
arunjaindevarunjaindev
authored
Merge pull request #3116 from devtron-labs/fix/stack-manager-routes
chore: fix routing structure in DevtronStackManager
2 parents 5ebc6db + 9a15ed1 commit 831ce96

1 file changed

Lines changed: 119 additions & 101 deletions

File tree

‎src/components/v2/devtronStackManager/DevtronStackManager.tsx‎

Lines changed: 119 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ export default function DevtronStackManager({
406406

407407
navigate({
408408
pathname: fromDiscoverModules
409-
? ROUTER_URLS.STACK_MANAGER.DISCOVER_MODULES_DETAILS
410-
: ROUTER_URLS.STACK_MANAGER.INSTALLED_MODULES_DETAILS,
411-
search: `?${queryParams.toString()}`,
409+
? ROUTER_URLS.STACK_MANAGER.DISCOVER_MODULES_DETAILS
410+
: ROUTER_URLS.STACK_MANAGER.INSTALLED_MODULES_DETAILS,
411+
search: `?${queryParams.toString()}`,
412412
})
413413
}
414414

@@ -437,104 +437,122 @@ export default function DevtronStackManager({
437437
const Body = () => {
438438
return (
439439
<Routes>
440-
<Route path={BASE_ROUTES.STACK_MANAGER.DISCOVER_MODULES_DETAILS}>
441-
<ModuleDetailsView
442-
modulesList={stackDetails.discoverModulesList}
443-
moduleDetails={selectedModule}
444-
setDetailsMode={setDetailsMode}
445-
serverInfo={serverInfo}
446-
upgradeVersion={stackDetails.releaseNotes[0]?.releaseName}
447-
logPodName={logPodName}
448-
fromDiscoverModules
449-
isActionTriggered={actionTriggered[`moduleAction-${selectedModule?.name?.toLowerCase()}`]}
450-
handleActionTrigger={handleActionTrigger}
451-
setShowResourceStatusModal={setShowResourceStatusModal}
452-
isSuperAdmin={isSuperAdmin}
453-
setSelectedModule={setSelectedModule}
454-
setStackDetails={setStackDetails}
455-
stackDetails={stackDetails}
456-
dialog={dialog}
457-
setDialog={setDialog}
458-
retryState={retryState}
459-
setRetryState={setRetryState}
460-
successState={successState}
461-
setSuccessState={setSuccessState}
462-
setToggled={setToggled}
463-
toggled={toggled}
464-
/>
465-
</Route>
466-
<Route path={BASE_ROUTES.STACK_MANAGER.INSTALLED_MODULES_DETAILS}>
467-
<ModuleDetailsView
468-
modulesList={stackDetails.installedModulesList}
469-
moduleDetails={selectedModule}
470-
setDetailsMode={setDetailsMode}
471-
serverInfo={serverInfo}
472-
upgradeVersion={stackDetails.releaseNotes[0]?.releaseName}
473-
logPodName={logPodName}
474-
isActionTriggered={actionTriggered[`moduleAction-${selectedModule?.name?.toLowerCase()}`]}
475-
handleActionTrigger={handleActionTrigger}
476-
setShowResourceStatusModal={setShowResourceStatusModal}
477-
setSelectedModule={setSelectedModule}
478-
isSuperAdmin={isSuperAdmin}
479-
setStackDetails={setStackDetails}
480-
stackDetails={stackDetails}
481-
dialog={dialog}
482-
setDialog={setDialog}
483-
retryState={retryState}
484-
setRetryState={setRetryState}
485-
successState={successState}
486-
setSuccessState={setSuccessState}
487-
setToggled={setToggled}
488-
toggled={toggled}
489-
/>
490-
</Route>
491-
<Route path={BASE_ROUTES.STACK_MANAGER.DISCOVER_MODULES}>
492-
<ModulesListingView
493-
modulesList={stackDetails.discoverModulesList}
494-
isDiscoverModulesView
495-
handleModuleCardClick={handleModuleSelection}
496-
/>
497-
</Route>
498-
<Route path={BASE_ROUTES.STACK_MANAGER.INSTALLED_MODULES}>
499-
<ModulesListingView
500-
modulesList={stackDetails.installedModulesList}
501-
handleModuleCardClick={handleModuleSelection}
502-
/>
503-
</Route>
504-
<Route path={BASE_ROUTES.STACK_MANAGER.ABOUT}>
505-
<AboutDevtronView
506-
parentRef={stackManagerRef}
507-
releaseNotes={stackDetails.releaseNotes}
508-
serverInfo={serverInfo}
509-
canViewLogs={serverMode === SERVER_MODE.FULL}
510-
logPodName={logPodName}
511-
selectedTabIndex={selectedTabIndex}
512-
handleTabChange={handleTabChange}
513-
isActionTriggered={actionTriggered.serverAction}
514-
handleActionTrigger={handleActionTrigger}
515-
showPreRequisiteConfirmationModal={showPreRequisiteConfirmationModal}
516-
setShowPreRequisiteConfirmationModal={setShowPreRequisiteConfirmationModal}
517-
preRequisiteChecked={preRequisiteChecked}
518-
setPreRequisiteChecked={setPreRequisiteChecked}
519-
/>
520-
</Route>
521-
<Route path={BASE_ROUTES.STACK_MANAGER.ABOUT_RELEASES}>
522-
<AboutDevtronView
523-
parentRef={stackManagerRef}
524-
releaseNotes={stackDetails.releaseNotes}
525-
serverInfo={serverInfo}
526-
canViewLogs={serverMode === SERVER_MODE.FULL}
527-
logPodName={logPodName}
528-
selectedTabIndex={selectedTabIndex}
529-
handleTabChange={handleTabChange}
530-
isActionTriggered={actionTriggered.serverAction}
531-
handleActionTrigger={handleActionTrigger}
532-
showPreRequisiteConfirmationModal={showPreRequisiteConfirmationModal}
533-
setShowPreRequisiteConfirmationModal={setShowPreRequisiteConfirmationModal}
534-
preRequisiteChecked={preRequisiteChecked}
535-
setPreRequisiteChecked={setPreRequisiteChecked}
536-
/>
537-
</Route>
440+
<Route
441+
path={BASE_ROUTES.STACK_MANAGER.DISCOVER_MODULES_DETAILS}
442+
element={
443+
<ModuleDetailsView
444+
modulesList={stackDetails.discoverModulesList}
445+
moduleDetails={selectedModule}
446+
setDetailsMode={setDetailsMode}
447+
serverInfo={serverInfo}
448+
upgradeVersion={stackDetails.releaseNotes[0]?.releaseName}
449+
logPodName={logPodName}
450+
fromDiscoverModules
451+
isActionTriggered={actionTriggered[`moduleAction-${selectedModule?.name?.toLowerCase()}`]}
452+
handleActionTrigger={handleActionTrigger}
453+
setShowResourceStatusModal={setShowResourceStatusModal}
454+
isSuperAdmin={isSuperAdmin}
455+
setSelectedModule={setSelectedModule}
456+
setStackDetails={setStackDetails}
457+
stackDetails={stackDetails}
458+
dialog={dialog}
459+
setDialog={setDialog}
460+
retryState={retryState}
461+
setRetryState={setRetryState}
462+
successState={successState}
463+
setSuccessState={setSuccessState}
464+
setToggled={setToggled}
465+
toggled={toggled}
466+
/>
467+
}
468+
/>
469+
<Route
470+
path={BASE_ROUTES.STACK_MANAGER.INSTALLED_MODULES_DETAILS}
471+
element={
472+
<ModuleDetailsView
473+
modulesList={stackDetails.installedModulesList}
474+
moduleDetails={selectedModule}
475+
setDetailsMode={setDetailsMode}
476+
serverInfo={serverInfo}
477+
upgradeVersion={stackDetails.releaseNotes[0]?.releaseName}
478+
logPodName={logPodName}
479+
isActionTriggered={actionTriggered[`moduleAction-${selectedModule?.name?.toLowerCase()}`]}
480+
handleActionTrigger={handleActionTrigger}
481+
setShowResourceStatusModal={setShowResourceStatusModal}
482+
setSelectedModule={setSelectedModule}
483+
isSuperAdmin={isSuperAdmin}
484+
setStackDetails={setStackDetails}
485+
stackDetails={stackDetails}
486+
dialog={dialog}
487+
setDialog={setDialog}
488+
retryState={retryState}
489+
setRetryState={setRetryState}
490+
successState={successState}
491+
setSuccessState={setSuccessState}
492+
setToggled={setToggled}
493+
toggled={toggled}
494+
/>
495+
}
496+
/>
497+
<Route
498+
path={BASE_ROUTES.STACK_MANAGER.DISCOVER_MODULES}
499+
element={
500+
<ModulesListingView
501+
modulesList={stackDetails.discoverModulesList}
502+
isDiscoverModulesView
503+
handleModuleCardClick={handleModuleSelection}
504+
/>
505+
}
506+
/>
507+
<Route
508+
path={BASE_ROUTES.STACK_MANAGER.INSTALLED_MODULES}
509+
element={
510+
<ModulesListingView
511+
modulesList={stackDetails.installedModulesList}
512+
handleModuleCardClick={handleModuleSelection}
513+
/>
514+
}
515+
/>
516+
<Route
517+
path={BASE_ROUTES.STACK_MANAGER.ABOUT}
518+
element={
519+
<AboutDevtronView
520+
parentRef={stackManagerRef}
521+
releaseNotes={stackDetails.releaseNotes}
522+
serverInfo={serverInfo}
523+
canViewLogs={serverMode === SERVER_MODE.FULL}
524+
logPodName={logPodName}
525+
selectedTabIndex={selectedTabIndex}
526+
handleTabChange={handleTabChange}
527+
isActionTriggered={actionTriggered.serverAction}
528+
handleActionTrigger={handleActionTrigger}
529+
showPreRequisiteConfirmationModal={showPreRequisiteConfirmationModal}
530+
setShowPreRequisiteConfirmationModal={setShowPreRequisiteConfirmationModal}
531+
preRequisiteChecked={preRequisiteChecked}
532+
setPreRequisiteChecked={setPreRequisiteChecked}
533+
/>
534+
}
535+
/>
536+
<Route
537+
path={BASE_ROUTES.STACK_MANAGER.ABOUT_RELEASES}
538+
element={
539+
<AboutDevtronView
540+
parentRef={stackManagerRef}
541+
releaseNotes={stackDetails.releaseNotes}
542+
serverInfo={serverInfo}
543+
canViewLogs={serverMode === SERVER_MODE.FULL}
544+
logPodName={logPodName}
545+
selectedTabIndex={selectedTabIndex}
546+
handleTabChange={handleTabChange}
547+
isActionTriggered={actionTriggered.serverAction}
548+
handleActionTrigger={handleActionTrigger}
549+
showPreRequisiteConfirmationModal={showPreRequisiteConfirmationModal}
550+
setShowPreRequisiteConfirmationModal={setShowPreRequisiteConfirmationModal}
551+
preRequisiteChecked={preRequisiteChecked}
552+
setPreRequisiteChecked={setPreRequisiteChecked}
553+
/>
554+
}
555+
/>
538556
<Route path="*" element={<Navigate to={BASE_ROUTES.STACK_MANAGER.DISCOVER_MODULES} />} />
539557
</Routes>
540558
)

0 commit comments

Comments
 (0)