Merge branch 'develop' into feat/app-details-filters

Author: arunjaindev

src/App.tsx

@@ -98,6 +98,8 @@ export default function App() {
             }
         } else {
             didMountRef.current = true
+            // Removing any toast explicitly due to race condition of offline toast for some users
+            ToastManager.dismissToast(onlineToastRef.current)
         }
     }, [isOnline])
 

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

@@ -204,16 +204,19 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
         setAppGroupListData(result)
         setDescription(result.description)
         if (result.apps?.length) {
-            setAppListOptions(
-                result.apps
-                    .map((app): OptionType => {
-                        return {
-                            value: `${app.appId}`,
-                            label: app.appName,
-                        }
-                    })
-                    .sort(sortOptionsByLabel),
-            )
+            const _appListOptions = result.apps
+                .map((app): OptionType => {
+                    return {
+                        value: `${app.appId}`,
+                        label: app.appName,
+                    }
+                })
+                .sort(sortOptionsByLabel)
+
+            setAppListOptions(_appListOptions)
+            if (selectedGroupFilter.length) {
+                setSelectedAppList(_appListOptions.filter((app) => selectedGroupFilter[0].appIds.includes(+app.value)))
+            }
         }
         setAppListLoading(false)
     }

src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx

@@ -293,7 +293,7 @@ export default function CiWebhookModal({
                             className="mr-20 dc__transparent dc__align-right"
                             onClick={() => onEditShowEditableCiModal(ciPipelineId, workflowId)}
                         >
-                            // Here the CI model requires the CiPipelineId not the CiPipelineMaterialId
+                            {/* Here the CI model requires the CiPipelineId not the CiPipelineMaterialId */}
                             <Edit className=" icon-dim-24" />
                         </button>
                     </div>