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

…o add-tabs-ui
appsmithorg · May 14, 2024 · ea658d0 · ea658d0
2 parents 6eb7205 + b3ea6e2
commit ea658d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
@@ -13,9 +13,10 @@ import { EntityItems } from "../../../../support/Pages/AssertHelper";
 import {
   createMessage,
   STARTER_TEMPLATE_PAGE_LAYOUTS,
+  EMPTY_CANVAS_HINTS,
 } from "../../../../../src/ce/constants/messages";
 
-describe("Page Load tests", { tags: ["@tag.IDE", "@tag.Templates"] }, () => {
+describe("Page Load tests", { tags: ["@tag.IDE"] }, () => {
   afterEach(() => {
     agHelper.SaveLocalStorageCache();
   });
@@ -27,9 +28,15 @@ describe("Page Load tests", { tags: ["@tag.IDE", "@tag.Templates"] }, () => {
   before(() => {
     agHelper.AddDsl("PageLoadDsl");
     PageList.AddNewPage();
-    cy.get("span").contains(
-      createMessage(STARTER_TEMPLATE_PAGE_LAYOUTS.header),
-    );
+    if (Cypress.env("AIRGAPPED")) {
+      cy.get("h2").contains(
+        createMessage(EMPTY_CANVAS_HINTS.DRAG_DROP_WIDGET_HINT),
+      );
+    } else {
+      cy.get("span").contains(
+        createMessage(STARTER_TEMPLATE_PAGE_LAYOUTS.header),
+      );
+    }
   });
 
   it("1. Published page loads correctly", () => {

diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
@@ -273,7 +273,7 @@ export function isSaaSAction(action: Action): action is SaaSAction {
   return action.pluginType === PluginType.SAAS;
 }
 
-export function isAIAction(action: Action): action is SaaSAction {
+export function isAIAction(action: Action): action is AIAction {
   return action.pluginType === PluginType.AI;
 }
 

diff --git a/...er/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/AppsmithBeanUtils.java b/...er/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/AppsmithBeanUtils.java
@@ -38,21 +38,6 @@ public static void copyNewFieldValuesIntoOldObject(Object src, Object target) {
         BeanUtils.copyProperties(src, target, getNullPropertyNames(src));
     }
 
-    public static int countOfNonNullFields(Object source) {
-        int count = 0;
-        final BeanWrapper src = new BeanWrapperImpl(source);
-        java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors();
-
-        for (java.beans.PropertyDescriptor pd : pds) {
-            Object srcValue = src.getPropertyValue(pd.getName());
-            if (srcValue != null) {
-                count++;
-            }
-        }
-
-        return count++;
-    }
-
     public static void copyNestedNonNullProperties(Object source, Object target) {
         if (source == null || target == null) {
             return;