Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o create-module-btn-ui-fix
appsmithorg · May 6, 2024 · ad38d66 · ad38d66
2 parents c28f169 + 022d457
commit ad38d66
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 4 deletions.
diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -29,6 +29,7 @@ import {
   createMessage,
   EXPLORER_BETA_ENTITY,
 } from "@appsmith/constants/messages";
+import classNames from "classnames";
 
 export enum EntityClassNames {
   CONTEXT_MENU = "entity-context-menu",
@@ -361,9 +362,12 @@ export const Entity = forwardRef(
         <EntityItem
           active={!!props.active}
           alwaysShowRightIcon={props.alwaysShowRightIcon}
-          className={`${props.highlight ? "highlighted" : ""} ${
-            props.active ? "active" : ""
-          } t--entity-item`}
+          className={classNames({
+            highlighted: props.highlight,
+            active: props.active,
+            editable: canEditEntityName,
+            "t--entity-item": true,
+          })}
           data-guided-tour-id={`explorer-entity-${props.name}`}
           data-guided-tour-iid={props.name}
           data-testid={`t--entity-item-${props.name}`}

diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
@@ -92,7 +92,9 @@ export const ExplorerJSCollectionEntity = memo(
       <Entity
         action={navigateToJSCollection}
         active={props.isActive}
-        canEditEntityName={canManageJSAction}
+        canEditEntityName={
+          canManageJSAction && !Boolean(jsAction?.isMainJSCollection)
+        }
         className="t--jsaction"
         contextMenu={contextMenu}
         entityId={jsAction.id}

diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
@@ -306,5 +306,56 @@ describe("IDE Render: JS", () => {
       // Close button is rendered
       getByRole("button", { name: "Close pane" });
     });
+
+    it("Prevents edit of main JS object", () => {
+      const page = PageFactory.build();
+      const Main_JS = JSObjectFactory.build({
+        id: "js_id",
+        name: "Main",
+        pageId: page.pageId,
+      });
+      Main_JS.isMainJSCollection = true;
+
+      const Normal_JS = JSObjectFactory.build({
+        id: "js_id2",
+        name: "Normal",
+        pageId: page.pageId,
+      });
+
+      const state = getIDETestState({
+        pages: [page],
+        js: [Main_JS, Normal_JS],
+        tabs: {
+          [EditorEntityTab.QUERIES]: [],
+          [EditorEntityTab.JS]: ["js_id"],
+        },
+      });
+
+      const { getByTestId } = render(
+        <Route path={BUILDER_PATH}>
+          <IDE />
+        </Route>,
+        {
+          url: "/app/applicationSlug/pageSlug-page_id/edit/jsObjects/js_id",
+          initialState: state,
+          featureFlags: FeatureFlags,
+        },
+      );
+
+      // Normal JS object should be editable
+      const normalJsObjectEntity = getByTestId("t--entity-item-Normal");
+      expect(normalJsObjectEntity.classList.contains("editable")).toBe(true);
+
+      // should have `t--context-menu` as a child of the normalJsObjectEntity
+      expect(
+        normalJsObjectEntity.querySelector(".t--context-menu"),
+      ).not.toBeNull();
+
+      // Main JS object should not be editable
+      const mainJsObjectEntity = getByTestId("t--entity-item-Main");
+      expect(mainJsObjectEntity.classList.contains("editable")).toBe(false);
+      // should not have `t--context-menu` as a child of the mainJsObjectEntity
+      expect(mainJsObjectEntity.querySelector(".t--context-menu")).toBeNull();
+    });
   });
 });