Merge branch 'develop' into fix/rollout-release-css

Author: AbhishekA1509

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

@@ -729,20 +729,16 @@ export const InstallationWrapper = ({
     }, [releaseNotes])
 
     const fetchPreRequisiteListFromReleaseNotes = () => {
-        const _preRequisiteList = []
-        for (let index = 0; index < releaseNotes.length; index++) {
-            const element = releaseNotes[index]
-            if (element.releaseName === serverInfo?.currentVersion) {
-                break
-            }
-            if (element.prerequisite && element.prerequisiteMessage) {
-                _preRequisiteList.push({
-                    version: element.releaseName,
-                    prerequisiteMessage: element.prerequisiteMessage,
-                    tagLink: element.tagLink,
-                })
-            }
-        }
+        const _preRequisiteList = releaseNotes
+            .filter(
+                ({ releaseName, prerequisite, prerequisiteMessage }) =>
+                    releaseName !== serverInfo?.currentVersion && prerequisite && prerequisiteMessage,
+            )
+            .map(({ releaseName, prerequisiteMessage, tagLink }) => ({
+                version: releaseName,
+                prerequisiteMessage,
+                tagLink,
+            }))
         setPreRequisiteList(_preRequisiteList.reverse())
     }
 
@@ -761,6 +757,7 @@ export const InstallationWrapper = ({
                 updateActionTrigger,
                 history,
                 location,
+                serverInfo.currentVersion,
                 moduleDetails && (moduleDetails.moduleType ? moduleDetails.moduleType : undefined),
             )
         } else {
@@ -790,7 +787,7 @@ export const InstallationWrapper = ({
                         </div>
                         <CloseIcon className="pointer mt-2" onClick={hidePrerequisiteConfirmationModal} />
                     </div>
-                    <div className="p-20">
+                    <div className="p-20 mxh-600 dc__overflow-auto">
                         <div className="fw-6 fs-13 cn-9 mb-12">
                             Please ensure you follow below pre-requisites steps in order.
                         </div>

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

@@ -137,6 +137,7 @@ export const getModuleInfo = async (moduleName: string, forceReload?: boolean):
 
 export const executeModuleEnableAction = (moduleName: string, toolVersion: string): Promise<ModuleActionResponse> =>
     post(`${Routes.MODULE_INFO_API}/enable?name=${moduleName}`, { version: toolVersion })
+
 export const executeModuleAction = (
     moduleName: string,
     moduleActionRequest: ModuleActionRequest,
@@ -180,9 +181,11 @@ export const getAllModules = (): Promise<AllModuleInfoResponse> =>
         res.json(),
     )
 
-export const getReleasesNotes = async (installationType: InstallationType): Promise<ReleaseNotesResponse> => {
+export const getReleasesNotes = async (installationType: InstallationType, serverVersion: string): Promise<ReleaseNotesResponse> => {
     const url = getUrlWithSearchParams(`${window._env_.CENTRAL_API_ENDPOINT}/${Routes.RELEASE_NOTES_API}`, {
         repo: INSTALLATION_TYPE_TO_REPO_MAP[installationType],
+        serverVersion,
+
     })
     const response = await fetch(url)
     return response.json()

src/components/v2/devtronStackManager/DevtronStackManager.tsx

@@ -347,7 +347,7 @@ export default function DevtronStackManager({
         })
 
         // 1. Execute all APIs - get all modules, get logPodName & releaseNotes
-        Promise.allSettled([getAllModules(), getLogPodName(), getReleasesNotes(serverInfo.installationType)])
+        Promise.allSettled([getAllModules(), getLogPodName(), getReleasesNotes(serverInfo.installationType, serverInfo.currentVersion)])
             .then((responses: { status: string; value?: any; reason?: any }[]) => {
                 const allModulesRes: AllModuleInfoResponse = responses[0].value
                 const allModulesErrorRes = responses[0].reason

src/components/v2/devtronStackManager/DevtronStackManager.utils.ts

@@ -76,12 +76,13 @@ export const handleAction = async (
     updateActionTrigger: (isActionTriggered: boolean) => void,
     history: RouteComponentProps['history'],
     location: RouteComponentProps['location'],
+    currentVersion: string,
     moduleType?: string,
 ) => {
     try {
         const actionRequest: ModuleActionRequest = {
             action: isUpgradeView ? ModuleActions.UPGRADE : ModuleActions.INSTALL,
-            version: upgradeVersion,
+            version: isUpgradeView ? upgradeVersion : currentVersion,
             moduleType,
         }
 

src/components/v2/devtronStackManager/devtronStackManager.component.scss

@@ -118,28 +118,6 @@
 }
 
 .module-details__install-wrapper {
-    .module-details__install-button {
-        width: 100%;
-        height: 36px;
-
-        &.cta {
-            text-transform: none;
-        }
-
-        .module-details__install-icon {
-            transform: rotate(90deg);
-        }
-
-        .module-details__retry-install-icon {
-            path {
-                fill: none;
-            }
-        }
-        &.disabled-state {
-            opacity: 0.5;
-            cursor: not-allowed;
-        }
-    }
     .module-details__installtion-status {
         width: 100%;
         border: 1px solid var(--N200);