Merge pull request #28300 from appsmithorg/hotfix/v1.9.41

fix: Hotfix for release v1.9.41
appsmithorg · Oct 24, 2023 · e964afc · e964afc
2 parents 34dde30 + 1c2e791
commit e964afc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_NestedList_spec.ts
@@ -1,3 +1,4 @@
+import { WIDGET } from "../../../../../locators/WidgetLocators";
 import {
  agHelper,
  entityExplorer,
@@ -13,6 +14,14 @@ describe("Nested List widget V2 ", () => {
  });
 
  it("1. Verify only 3 levels of nesting is allowed", () => {
+ agHelper.AssertContains(
+ "Oops, Something went wrong.",
+ "not.exist",
+ locators._widgetInCanvas(WIDGET.LIST_V2),
+ );
+ agHelper
+ .GetElement(locators._widgetInCanvas(WIDGET.LIST_V2))
+ .should("have.length", 5);
  entityExplorer.SelectEntityByName("List1", "Widgets");
  entityExplorer.SelectEntityByName("Container1", "List1");
  entityExplorer.SelectEntityByName("List2", "Container1");

diff --git a/app/client/cypress/fixtures/listV2NestedDsl.json b/app/client/cypress/fixtures/listV2NestedDsl.json
@@ -1238,7 +1238,7 @@
  }
  ],
  "displayName": "List",
- "bottomRow": 48,
+ "bottomRow": 88,
  "parentRowSpace": 10,
  "hideCard": false,
  "templateBottomRow": 16,

diff --git a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx
@@ -3,6 +3,10 @@ import type { DropTargetComponentProps } from "layoutSystems/common/dropTarget/D
 import type { ReactNode } from "react";
 import { memo } from "react";
 import React from "react";
+import { useSelector } from "react-redux";
+import { getWidget } from "sagas/selectors";
+import type { AppState } from "@appsmith/reducers";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
 
 interface DropTargetComponentWrapperProps {
  dropTargetProps: DropTargetComponentProps;
@@ -22,7 +26,11 @@ export const DropTargetComponentWrapper = memo(
  dropDisabled,
  dropTargetProps,
  }: DropTargetComponentWrapperProps) => {
- if (dropDisabled) {
+ // This code block is added exclusively to handle List Widget Meta Canvas Widget which is generated via template.
+ const widget = useSelector((state: AppState) =>
+ getWidget(state, dropTargetProps.parentId || MAIN_CONTAINER_WIDGET_ID),
+ );
+ if ((dropTargetProps.parentId && !widget) || dropDisabled) {
  //eslint-disable-next-line
  return <>{children}</>;
  }

diff --git a/deploy/docker/fs/opt/appsmith/healthcheck.sh b/deploy/docker/fs/opt/appsmith/healthcheck.sh
@@ -20,11 +20,6 @@ while read -r line
  echo 'ERROR: Server is down';
  healthy=false
  fi
- elif [[ "$process" == "rts" ]]; then
- if [[ $(curl -s -w "%{http_code}\n" http://localhost:8091/ -o /dev/null) -ne 302 ]]; then
- echo 'ERROR: RTS is down';
- healthy=false
- fi
  elif [[ "$process" == "mongo" ]]; then
  if [[ $(mongo --eval 'db.runCommand("ping").ok') -ne 1 ]]; then
  echo 'ERROR: Mongo is down';