Merge pull request #39172 from appsmithorg/release

11/02 Daily Promotion

.github/workflows/test-build-docker-image.yml

@@ -240,7 +240,7 @@ jobs:
 
       # This step triggers an external workflow for automated analysis of Cypress test runs.
       - name: Invoke Automated analysis workflow
-        if: ( always() && github.ref == 'refs/heads/release' && github.run_attempt <= 2)
+        if: (always() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/master') && github.run_attempt <= 2)
         run: |
           curl --location --request POST ${{secrets.CYPRESS_WORKFLOW_API}}    \
           --header 'x-appsmith-key: ${{ secrets.CYPRESS_WORKFLOW_KEY }}'      \

app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/HTMLCell_spec.ts

@@ -12,9 +12,6 @@ describe(
   { tags: ["@tag.Widget", "@tag.Table"] },
   function () {
     before(() => {
-      featureFlagIntercept({
-        release_table_html_column_type_enabled: true,
-      });
       entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
       propPane.EnterJSContext("Table data", JSON.stringify(htmlTableData));
     });

app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts

@@ -53,7 +53,7 @@ describe(
       agHelper.GetNClickByContains(dataSources._dropdownOption, "friends");
 
       GenerateCRUDNValidateDeployPage(
-        "<p>Monica's old friend Rachel moves in with her after leaving her fiancé.</p>",
+        "Monica's old friend Rachel moves in with her after leaving her fiancé.",
         `1994-09-22T00:00:00+00:00`,
         "http://www.tvmaze.com/episodes/40646/friends-1x01-the-one-where-it-all-began",
         11,

app/client/cypress/limited-tests.txt

@@ -4,4 +4,4 @@
 #cypress/e2e/**/**/*
 cypress/e2e/Regression/ClientSide/Anvil/Widgets/*
 
-#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.
+#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.

app/client/src/ce/entities/FeatureFlag.ts

@@ -39,8 +39,6 @@ export const FEATURE_FLAG = {
   release_custom_widget_ai_builder: "release_custom_widget_ai_builder",
   ab_request_new_integration_enabled: "ab_request_new_integration_enabled",
   release_evaluation_scope_cache: "release_evaluation_scope_cache",
-  release_table_html_column_type_enabled:
-    "release_table_html_column_type_enabled",
   release_gs_all_sheets_options_enabled:
     "release_gs_all_sheets_options_enabled",
   release_git_modularisation_enabled: "release_git_modularisation_enabled",
@@ -89,7 +87,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   release_custom_widget_ai_builder: false,
   ab_request_new_integration_enabled: false,
   release_evaluation_scope_cache: false,
-  release_table_html_column_type_enabled: false,
   release_gs_all_sheets_options_enabled: false,
   release_git_modularisation_enabled: false,
   release_git_api_contracts_enabled: false,

app/client/src/ce/pages/Editor/IDE/constants/SidebarButtons.ts

@@ -23,4 +23,4 @@ export const BottomButtons = (datasourcesExist: boolean) => [
   LibrariesButton("libraries"),
   SettingsButton("settings"),
 ];
-export const TopButtons = [EditorButton("editor")];
+export const TopButtons = [EditorButton("")];

app/client/src/ce/workers/common/DependencyMap/utils/getEntityDependenciesByType.ts

@@ -57,15 +57,12 @@ export function getWidgetDependencies(
   widgetEntity: WidgetEntity,
   widgetConfig: WidgetEntityConfig,
 ): Record<string, string[]> {
-  let dependencies: Record<string, string[]> = {};
   const widgetName = widgetEntity.widgetName;
-  const widgetInternalDependencies = addWidgetPropertyDependencies({
+  const dependencies: Record<string, string[]> = addWidgetPropertyDependencies({
     widgetConfig,
     widgetName,
   });
 
-  dependencies = { ...widgetInternalDependencies };
-
   const dependencyMap = widgetConfig.dependencyMap;
 
   for (const source in dependencyMap) {
@@ -97,7 +94,7 @@ export function getWidgetDependencies(
     const existingDeps = dependencies[fullPropertyPath] || [];
     const newDeps = union(existingDeps, dynamicPathDependencies);
 
-    dependencies = { ...dependencies, [fullPropertyPath]: newDeps };
+    dependencies[fullPropertyPath] = newDeps;
   }
 
   return dependencies;

app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx

@@ -12,6 +12,7 @@ import {
   COMMITTING_AND_PUSHING_CHANGES,
   createMessage,
   DISCARD_CHANGES,
+  DISCARD_SUCCESS,
   DISCARDING_AND_PULLING_CHANGES,
   GIT_NO_UPDATED_TOOLTIP,
   PULL_CHANGES,
@@ -75,7 +76,7 @@ interface TabDeployViewProps {
   commit: (commitMessage: string) => void;
   commitError: GitApiError | null;
   currentBranch: string | null;
-  discard: () => void;
+  discard: (successMessage: string) => void;
   discardError: GitApiError | null;
   isCommitLoading: boolean;
   isDiscardLoading: boolean;
@@ -239,7 +240,7 @@ function TabDeployView({
     AnalyticsUtil.logEvent("GIT_DISCARD", {
       source: "GIT_DISCARD_BUTTON_PRESS_2",
     });
-    discard();
+    discard(createMessage(DISCARD_SUCCESS));
     setShowDiscardWarning(false);
     setShouldDiscard(true);
     setIsDiscarding(true);

app/client/src/git/components/QuickActions/QuickActionsView.tsx

@@ -5,6 +5,7 @@ import {
   AUTOCOMMIT_IN_PROGRESS_MESSAGE,
   COMMIT_CHANGES,
   createMessage,
+  DISCARD_AND_PULL_SUCCESS,
   GIT_SETTINGS,
   MERGE,
 } from "ee/constants/messages";
@@ -27,7 +28,7 @@ const Container = styled.div`
 
 interface QuickActionsViewProps {
   currentBranch: string | null;
-  discard: () => void;
+  discard: (successMessage: string) => void;
   isAutocommitEnabled: boolean;
   isAutocommitPolling: boolean;
   isBranchPopupOpen: boolean;
@@ -105,7 +106,7 @@ function QuickActionsView({
       });
 
       if (isProtectedMode) {
-        discard();
+        discard(createMessage(DISCARD_AND_PULL_SUCCESS));
       } else {
         pull();
       }

app/client/src/git/hooks/useDiscard.ts

@@ -12,11 +12,20 @@ export default function useDiscard() {
 
   const discardState = useArtifactSelector(selectDiscardState);
 
-  const discard = useCallback(() => {
-    if (artifactDef && artifactId) {
-      dispatch(gitArtifactActions.discardInit({ artifactDef, artifactId }));
-    }
-  }, [artifactDef, artifactId, dispatch]);
+  const discard = useCallback(
+    (successMessage: string) => {
+      if (artifactDef && artifactId) {
+        dispatch(
+          gitArtifactActions.discardInit({
+            artifactDef,
+            artifactId,
+            successMessage,
+          }),
+        );
+      }
+    },
+    [artifactDef, artifactId, dispatch],
+  );
 
   const clearDiscardError = useCallback(() => {
     if (artifactDef) {

app/client/src/git/sagas/discardSaga.ts

@@ -1,7 +1,6 @@
 import { toast } from "@appsmith/ads";
 import { captureException } from "@sentry/react";
 import { builderURL } from "ee/RouteBuilder";
-import { createMessage, DISCARD_SUCCESS } from "ee/constants/messages";
 import discardRequest from "git/requests/discardRequest";
 import type { DiscardResponse } from "git/requests/discardRequest.types";
 import type { DiscardInitPayload } from "git/store/actions/discardActions";
@@ -15,7 +14,7 @@ import { validateResponse } from "sagas/ErrorSagas";
 export default function* discardSaga(
   action: GitArtifactPayloadAction<DiscardInitPayload>,
 ) {
-  const { artifactDef, artifactId } = action.payload;
+  const { artifactDef, artifactId, successMessage } = action.payload;
 
   let response: DiscardResponse | undefined;
 
@@ -34,9 +33,11 @@ export default function* discardSaga(
 
     if (response && isValidResponse) {
       yield put(gitArtifactActions.discardSuccess({ artifactDef }));
-      toast.show(createMessage(DISCARD_SUCCESS), {
-        kind: "success",
-      });
+
+      if (successMessage) {
+        toast.show(successMessage, { kind: "success" });
+      }
+
       // adding delay to show toast animation before reloading
       yield delay(500);
       const basePageId: string =

app/client/src/git/sagas/pullSaga.ts

@@ -14,6 +14,8 @@ import { APP_MODE } from "entities/App";
 import log from "loglevel";
 import { captureException } from "@sentry/react";
 import { selectGitApiContractsEnabled } from "git/store/selectors/gitFeatureFlagSelectors";
+import { toast } from "@appsmith/ads";
+import { createMessage, DISCARD_AND_PULL_SUCCESS } from "ee/constants/messages";
 
 export default function* pullSaga(
   action: GitArtifactPayloadAction<PullInitPayload>,
@@ -50,6 +52,10 @@ export default function* pullSaga(
           mode: APP_MODE.EDIT,
         }),
       );
+
+      toast.show(createMessage(DISCARD_AND_PULL_SUCCESS), {
+        kind: "success",
+      });
     }
   } catch (e) {
     if (response && response.responseMeta.error) {

app/client/src/git/sagas/updateProtectedBranchesSaga.ts

@@ -1,4 +1,6 @@
+import { toast } from "@appsmith/ads";
 import { captureException } from "@sentry/react";
+import { createMessage, PROTECT_BRANCH_SUCCESS } from "ee/constants/messages";
 import updateProtectedBranchesRequest from "git/requests/updateProtectedBranchesRequest";
 import type {
   UpdateProtectedBranchesRequestParams,
@@ -41,6 +43,10 @@ export default function* updateProtectedBranchesSaga(
         gitArtifactActions.updateProtectedBranchesSuccess({ artifactDef }),
       );
       yield put(gitArtifactActions.fetchProtectedBranchesInit({ artifactDef }));
+
+      toast.show(createMessage(PROTECT_BRANCH_SUCCESS), {
+        kind: "success",
+      });
     }
   } catch (e) {
     if (response && response.responseMeta.error) {

app/client/src/git/store/actions/discardActions.ts

@@ -6,6 +6,7 @@ import type {
 
 export interface DiscardInitPayload extends GitArtifactBasePayload {
   artifactId: string;
+  successMessage?: string;
 }
 
 export const discardInitAction = createArtifactAction<DiscardInitPayload>(

app/client/src/widgets/TableWidgetV2/constants.ts

@@ -243,6 +243,3 @@ export const DEFAULT_COLUMN_NAME = "Table Column";
 
 export const ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING =
   FEATURE_FLAG["release_table_serverside_filtering_enabled"];
-
-export const HTML_COLUMN_TYPE_ENABLED =
-  FEATURE_FLAG["release_table_html_column_type_enabled"];