Merge pull request #41319 from appsmithorg/release

27/10 Daily Promotion

Author: btsgh

app/client/src/ce/pages/Applications/index.tsx

@@ -929,7 +929,7 @@ export function ApplicationsSection(props: any) {
             <ResourceListLoader isMobile={isMobile} resources={applications} />
           ) : (
             <>
-              {!isAiAgentInstanceEnabled && (
+              {(!isAiAgentInstanceEnabled || !isAiAgentFlowEnabled) && (
                 <ApplicationCardList
                   applications={nonAnvilApplications}
                   canInviteToWorkspace={canInviteToWorkspace}
@@ -946,7 +946,7 @@ export function ApplicationsSection(props: any) {
                   workspaceId={activeWorkspace.id}
                 />
               )}
-              {isAiAgentFlowEnabled && (
+              {isAiAgentFlowEnabled && isAiAgentInstanceEnabled && (
                 <ApplicationCardList
                   applications={anvilApplications}
                   canInviteToWorkspace={canInviteToWorkspace}

app/client/src/pages/AppIDE/layouts/components/Header/index.tsx

@@ -142,7 +142,7 @@ const Header = () => {
   );
 
   const deployLink = useHref(viewerURL, {
-    basePageId: currentPage?.basePageId,
+    basePageId: currentPage?.basePageId || null,
   });
 
   const updateApplicationDispatch = (

app/client/src/pages/Editor/utils.tsx

@@ -300,7 +300,15 @@ export function useHref<T extends URLBuilderParams>(
   const pageId = useSelector(getCurrentPageId);
 
   useEffect(() => {
-    if (pageId) setHref(urlBuilderFn(params));
+    if (pageId) {
+      try {
+        setHref(urlBuilderFn(params));
+      } catch (error) {
+        // If basePageId is not available yet, keep href as empty string
+        // This can happen during initial page load or navigation
+        setHref("");
+      }
+    }
   }, [params, urlBuilderFn, pageId]);
 
   return href;