04/07 Daily Promotion

app/client/src/actions/pageActions.tsx

@@ -31,6 +31,7 @@ import type { ApiResponse } from "api/ApiResponses";
 import type { EvaluationReduxAction } from "./EvaluationReduxActionTypes";
 import { appsmithTelemetry } from "instrumentation";
 import type { NavigateToAnotherPagePayload } from "sagas/ActionExecution/NavigateActionSaga/types";
+import type { Path } from "history";
 
 export interface FetchPageListPayload {
   applicationId: string;
@@ -699,7 +700,7 @@ export const setupPublishedPage = (
 });
 
 export const navigateToAnotherPage = (
-  payload: NavigateToAnotherPagePayload,
+  payload: NavigateToAnotherPagePayload | Path,
 ) => ({
   type: ReduxActionTypes.NAVIGATE_TO_ANOTHER_PAGE,
   payload,

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

@@ -175,6 +175,8 @@ const CreateNewAppsOption = ({
         })),
       );
 
+      urlBuilder.setCurrentBasePageId(application.pages[0].baseId);
+
       startWithData();
     }
   }, [application]);

app/client/src/pages/AppIDE/components/PageList/PageEntity.tsx

@@ -15,15 +15,15 @@ import {
 import { PERMISSION_TYPE, isPermitted } from "ee/utils/permissionHelpers";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import type { DefaultRootState } from "react-redux";
-import { updatePageAction } from "actions/pageActions";
+import { navigateToAnotherPage, updatePageAction } from "actions/pageActions";
 import { useGetPageFocusUrl } from "./hooks/useGetPageFocusUrl";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions";
-import history, { NavigationMethod } from "utils/history";
 import { EntityItem } from "@appsmith/ads";
 import { useNameEditorState } from "IDE/hooks/useNameEditorState";
 import { useValidateEntityName } from "IDE";
 import { noop } from "lodash";
+import { NavigationMethod } from "utils/history";
 
 export const PageEntity = ({
   onClick,
@@ -90,9 +90,14 @@ export const PageEntity = ({
       toUrl: navigateToUrl,
     });
     dispatch(toggleInOnboardingWidgetSelection(true));
-    history.push(navigateToUrl, {
-      invokedBy: NavigationMethod.EntityExplorer,
-    });
+    dispatch(
+      navigateToAnotherPage({
+        pageURL: navigateToUrl,
+        state: {
+          invokedBy: NavigationMethod.EntityExplorer,
+        },
+      }),
+    );
 
     if (onClick) {
       onClick();

app/client/src/sagas/ActionExecution/NavigateActionSaga/index.ts

@@ -114,6 +114,24 @@ export function* navigateToAnyPageInApplication(
   yield call(pushToHistory, action.payload);
 }
 
+/**
+ * Pushes navigation state to browser history after executing page unload actions.
+ *
+ * This function handles three different variants of history.push() calls to maintain
+ * backward compatibility with existing code patterns:
+ *
+ * 1. String payload: Direct path navigation without query or state
+ *    - Uses: history.push(path)
+ *
+ * 2. Payload with state but no query: Navigation with state object
+ *    - Uses: history.push(pageURL, state)
+ *
+ * 3. Payload with query and/or state: Full navigation with all parameters
+ *    - Uses: history.push({ pathname, search, state })
+ *
+ * These variants exist to conform to how the code was working previously and
+ * ensure consistent behavior across different navigation scenarios.
+ */
 export function* pushToHistory(payload: NavigateToAnotherPagePayload | Path) {
   yield put({
     type: ReduxActionTypes.EXECUTE_PAGE_UNLOAD_ACTIONS,
@@ -130,6 +148,12 @@ export function* pushToHistory(payload: NavigateToAnotherPagePayload | Path) {
     return;
   }
 
+  if (!payload.query && payload.state) {
+    history.push(payload.pageURL, payload.state);
+
+    return;
+  }
+
   const historyState: LocationDescriptor<AppsmithLocationState> = {
     pathname: payload.pageURL,
     search: payload.query,

app/client/src/sagas/ActionExecution/NavigateActionSaga/types.ts

@@ -2,6 +2,6 @@ import type { AppsmithLocationState } from "utils/history";
 
 export interface NavigateToAnotherPagePayload {
   pageURL: string;
-  query: string;
-  state: AppsmithLocationState;
+  query?: string;
+  state?: AppsmithLocationState;
 }

app/client/src/sagas/ActionExecution/PluginActionSaga.ts

@@ -1702,14 +1702,18 @@ export function* executePageUnloadActionsSaga() {
   const span = startRootSpan("executePageUnloadActionsSaga");
 
   try {
-    const pageActions: Action[] = yield select(getLayoutOnUnloadActions);
-    const actionCount = pageActions.length;
+    const pageOnUnloadActions: Action[] = yield select(
+      getLayoutOnUnloadActions,
+    );
+    const actionCount = pageOnUnloadActions.length;
 
     setAttributesToSpan(span, { numActions: actionCount });
 
     // Execute unload actions in parallel batches
     yield all(
-      pageActions.map((action) => call(executeOnPageUnloadJSAction, action)),
+      pageOnUnloadActions.map((action) =>
+        call(executeOnPageUnloadJSAction, action),
+      ),
     );
 
     // Publish success event after all actions are executed

app/client/src/selectors/__tests__/editorSelectors/pluginActionSelectors.test.ts

@@ -0,0 +1,71 @@
+import type { DefaultRootState } from "react-redux";
+import { getLayoutOnUnloadActions } from "selectors/editorSelectors";
+
+describe("getLayoutOnUnloadActions", () => {
+  it("should filter actions by current page ID", () => {
+    const state = {
+      entities: {
+        pageList: { currentPageId: "page1" },
+        jsActions: [
+          {
+            isLoading: false,
+            config: {
+              id: "collection1",
+              pageId: "page1",
+              actions: [
+                {
+                  id: "action1",
+                  pageId: "page1",
+                  runBehaviour: "ON_PAGE_UNLOAD",
+                  name: "myFun1",
+                  fullyQualifiedName: "JSObject1.myFun1",
+                  collectionId: "collection1",
+                },
+                {
+                  id: "action3",
+                  pageId: "page1",
+                  runBehaviour: "ON_PAGE_LOAD",
+                  name: "myFun2",
+                  fullyQualifiedName: "JSObject1.myFun2",
+                  collectionId: "collection1",
+                },
+              ],
+            },
+          },
+          {
+            isLoading: false,
+            config: {
+              id: "collection2",
+              pageId: "page2",
+              actions: [
+                {
+                  id: "action2",
+                  pageId: "page2",
+                  runBehaviour: "ON_PAGE_UNLOAD",
+                  name: "myFun1",
+                  fullyQualifiedName: "JSObject2.myFun1",
+                  collectionId: "collection2",
+                },
+              ],
+            },
+          },
+        ],
+      },
+    };
+
+    const result = getLayoutOnUnloadActions(
+      state as unknown as DefaultRootState,
+    );
+
+    expect(result).toEqual([
+      {
+        id: "action1",
+        pageId: "page1",
+        runBehaviour: "ON_PAGE_UNLOAD",
+        name: "myFun1",
+        fullyQualifiedName: "JSObject1.myFun1",
+        collectionId: "collection1",
+      },
+    ]);
+  });
+});

app/client/src/selectors/editorSelectors.tsx

@@ -125,16 +125,21 @@ export const getPageSavingError = (state: DefaultRootState) => {
   return state.ui.editor.loadingStates.savingError;
 };
 
+export const getCurrentPageId = (state: DefaultRootState) =>
+  state.entities.pageList.currentPageId;
+
 export const getLayoutOnLoadActions = (state: DefaultRootState) =>
   state.ui.editor.pageActions || [];
 
 export const getLayoutOnUnloadActions = createSelector(
+  getCurrentPageId,
   getAllJSCollectionActions,
-  (jsActions) => {
-    return jsActions.filter((action) => {
-      return action.runBehaviour === ActionRunBehaviour.ON_PAGE_UNLOAD;
-    });
-  },
+  (currentPageId, jsActions) =>
+    jsActions.filter(
+      (action) =>
+        action.runBehaviour === ActionRunBehaviour.ON_PAGE_UNLOAD &&
+        action.pageId === currentPageId,
+    ),
 );
 
 export const getLayoutOnLoadIssues = (state: DefaultRootState) => {
@@ -167,9 +172,6 @@ export const getPageByBaseId = (basePageId: string) =>
     pages.find((page) => page.basePageId === basePageId),
   );
 
-export const getCurrentPageId = (state: DefaultRootState) =>
-  state.entities.pageList.currentPageId;
-
 export const getCurrentBasePageId = (state: DefaultRootState) =>
   state.entities.pageList.currentBasePageId;
 

deploy/docker/fs/opt/appsmith/entrypoint.sh

@@ -359,14 +359,17 @@ setup-custom-ca-certificates() (
   local stacks_ca_certs_path="$stacks_path/ca-certs"
   local store="$TMP/cacerts"
   local opts_file="$TMP/java-cacerts-opts"
+  local temp_cert_dir="$TMP/ca-certs-temp"
 
   rm -f "$store" "$opts_file"
+  rm -rf "$temp_cert_dir"
+  mkdir -p "$temp_cert_dir"
 
   if [[ -n "$(ls "$stacks_ca_certs_path"/*.pem 2>/dev/null)" ]]; then
     tlog "Looks like you have some '.pem' files in your 'ca-certs' folder. Please rename them to '.crt' to be picked up automatically.".
   fi
 
-  if ! [[ -d "$stacks_ca_certs_path" && "$(find "$stacks_ca_certs_path" -maxdepth 1 -type f -name '*.crt' | wc -l)" -gt 0 ]]; then
+  if ! [[ -d "$stacks_ca_certs_path" && "$(find "$stacks_ca_certs_path" -maxdepth 1 \( -type f -name '*.crt' -o -type l -name '*.crt' \) | wc -l)" -gt 0 ]]; then
     tlog "No custom CA certificates found."
     return
   fi
@@ -378,15 +381,31 @@ setup-custom-ca-certificates() (
     -srcstorepass changeit \
     -deststorepass changeit
 
-  # Add the custom CA certificates to the store.
-  find -L "$stacks_ca_certs_path" -maxdepth 1 -type f -name '*.crt' \
-    -print \
-    -exec keytool -import -alias '{}' -noprompt -keystore "$store" -file '{}' -storepass changeit ';'
+  # Split every .crt file (bundle or single) into individual certs
+  cert_index=0
+  while read -r cert_file; do
+    awk -v prefix="$temp_cert_dir/cert" -v ext=".crt" -v idx="$cert_index" '
+      BEGIN {n=0}
+      /-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/ {
+        print > (prefix idx "_" n ext)
+        if (/-----END CERTIFICATE-----/) n++
+      }
+    ' "$cert_file"
+    cert_index=$((cert_index + 1))
+  done < <(find -L "$stacks_ca_certs_path" -maxdepth 1 -type f -o -type l -name '*.crt')
+
+  # Import all certificates from the temp directory
+  find "$temp_cert_dir" -type f -name '*.crt' | while read -r cert_file; do
+    keytool -import -alias "$(basename "$cert_file")" -noprompt -keystore "$store" -file "$cert_file" -storepass changeit
+  done
 
   {
     echo "-Djavax.net.ssl.trustStore=$store"
     echo "-Djavax.net.ssl.trustStorePassword=changeit"
   } > "$opts_file"
+
+  # Cleanup
+  rm -rf "$temp_cert_dir"
 )
 
 configure_supervisord() {