Merge branch 'feat/async-select-recent-option' of github.com:devtron-labs/devtron-fe-common-lib into feat/async-select-recent-option

Author: shivani170

src/Shared/Hooks/useUserPreferences/types.ts

@@ -99,7 +99,6 @@ export type UserPreferenceResourceProps = UserPathValueMapType & {
 export interface UserPreferenceRecentlyVisitedAppsTypes {
     appId: number
     appName: string
-    isInvalidAppId?: boolean
 }
 
 export interface UserPreferenceFilteredListTypes extends UserPreferenceRecentlyVisitedAppsTypes {

src/Shared/Hooks/useUserPreferences/useUserPrefrences.tsx

@@ -33,14 +33,15 @@ export const useUserPreferences = ({ migrateUserPreferences }: UseUserPreference
 
     const { handleThemeSwitcherDialogVisibilityChange, handleThemePreferenceChange } = useTheme()
 
-    const fetchRecentlyVisitedParsedApps = async ({
-        appId,
-        appName,
-        isInvalidAppId = false,
-    }: UserPreferenceRecentlyVisitedAppsTypes) => {
+    const fetchRecentlyVisitedParsedApps = async ({ appId, appName }: UserPreferenceRecentlyVisitedAppsTypes) => {
         const userPreferencesResponse = await getUserPreferences()
 
-        const uniqueFilteredApps = getFilteredUniqueAppList({ userPreferencesResponse, appId, appName, isInvalidAppId })
+        const uniqueFilteredApps = getFilteredUniqueAppList({
+            userPreferencesResponse,
+            appId,
+            appName,
+        })
+
         setUserPreferences((prev) => ({
             ...prev,
             resources: {

src/Shared/Hooks/useUserPreferences/utils.tsx

@@ -14,19 +14,30 @@ export const getFilteredUniqueAppList = ({
     userPreferencesResponse,
     appId,
     appName,
-    isInvalidAppId,
 }: UserPreferenceFilteredListTypes) => {
     const _recentApps =
         userPreferencesResponse?.resources?.[ResourceKindType.devtronApplication]?.[
             UserPreferenceResourceActions.RECENTLY_VISITED
         ] || []
 
-    const validApps = _recentApps.filter((app) => app?.appId && app?.appName)
+    const isInvalidApp = appId && !appName
+
+    const validApps = _recentApps.filter((app) => {
+        if (!app?.appId || !app?.appName) {
+            return false
+        }
+
+        if (isInvalidApp) {
+            return app.appId !== appId
+        }
+
+        return true
+    })
 
     // Convert to a Map for uniqueness while maintaining stacking order
     const uniqueApps = (
         appId && appName ? [{ appId, appName }, ...validApps.filter((app) => app.appId !== appId)] : validApps
     ).slice(0, 6) // Limit to 6 items
 
-    return isInvalidAppId ? uniqueApps.filter((app) => app.appId !== Number(appId)) : uniqueApps
+    return uniqueApps
 }