Merge pull request #317 from devtron-labs/fix/create-app-redirect

arunjaindev · web-flow · commit 600429e4f12d · 2024-09-23T14:11:11.000+05:30
fix: redirection on create app modal close
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.3.10",
+    "version": "0.3.11",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
@@ -46,11 +46,7 @@ export const HeaderWithCreateButton = ({ headerName }: HeaderWithCreateButtonPro
     }
 
     const openCreateDevtronAppModel = () => {
-        const canOpenModalWithDevtronApps = params.appType
-            ? params.appType === AppListConstants.AppType.DEVTRON_APPS
-            : serverMode === SERVER_MODE.FULL
-        const _appType = canOpenModalWithDevtronApps ? AppListConstants.AppType.DEVTRON_APPS : URLS.APP_LIST_HELM
-        const _urlPrefix = `${URLS.APP}/${URLS.APP_LIST}/${_appType}`
+        const _urlPrefix = `${URLS.APP}/${URLS.APP_LIST}/${params.appType ?? AppListConstants.AppType.DEVTRON_APPS}`
         history.push(`${_urlPrefix}/${AppListConstants.CREATE_DEVTRON_APP_URL}${location.search}`)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "0.3.10",`
	`3`	`+ "version": "0.3.11",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,7 @@ export const HeaderWithCreateButton = ({ headerName }: HeaderWithCreateButtonPro`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`const openCreateDevtronAppModel = () => {`
`49`		`- const canOpenModalWithDevtronApps = params.appType`
`50`		`- ? params.appType === AppListConstants.AppType.DEVTRON_APPS`
`51`		`- : serverMode === SERVER_MODE.FULL`
`52`		`- const _appType = canOpenModalWithDevtronApps ? AppListConstants.AppType.DEVTRON_APPS : URLS.APP_LIST_HELM`
`53`		- const _urlPrefix = `${URLS.APP}/${URLS.APP_LIST}/${_appType}`
	`49`	+ const _urlPrefix = `${URLS.APP}/${URLS.APP_LIST}/${params.appType ?? AppListConstants.AppType.DEVTRON_APPS}`
`54`	`50`	history.push(`${_urlPrefix}/${AppListConstants.CREATE_DEVTRON_APP_URL}${location.search}`)
`55`	`51`	`}`
`56`	`52`