Merge branch 'release' into user-login-messages-fix

Author: ApekshaBhosale

.github/ISSUE_TEMPLATE/--project-estimation.yaml

@@ -0,0 +1,191 @@
+name: 📊 Project Estimation
+description: A comprehensive checklist for estimating project scope and requirements
+title: "[Estimation]: "
+labels: [Project Planning, Needs Review]
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to create this project estimation! Please fill out all relevant sections to ensure comprehensive planning.
+- type: textarea
+  attributes:
+    label: Project Overview
+    description: Brief description of the project and its goals
+    placeholder: |
+      Provide a high-level overview of the project, its objectives, and expected outcomes.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Dependencies
+    description: List all internal and external dependencies
+    placeholder: |
+      ## Internal Dependencies
+      - Teams/systems your work depends on
+      - Cross-functional needs
+      
+      ## External Dependencies
+      - Third-party services
+      - License approvals needed
+      
+      ## Documentation Dependencies
+      - Required documentation with owners and timelines
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Scope & Requirements
+    description: Document clear requirements and acceptance criteria
+    placeholder: |
+      ## Requirements
+      - List key requirements
+      - Acceptance criteria
+      
+      ## Known Assumptions
+      - List assumptions
+      - Impact of assumptions
+      
+      ## Stakeholder Alignment
+      - Key stakeholders
+      - Priority alignment
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Technical Considerations
+    description: Document technical architecture and considerations
+    placeholder: |
+      ## Architecture
+      - Design approach
+      - Tech stack details
+      
+      ## Technical Requirements
+      - Scalability needs
+      - Security considerations
+      - Performance requirements
+      
+      ## Testing Strategy
+      - Unit testing approach
+      - Integration testing
+      - E2E testing
+      - Test automation coverage
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: CI/CD Pipeline
+    description: Document CI/CD requirements and considerations
+    placeholder: |
+      ## Pipeline Requirements
+      - Build process
+      - Deployment strategy
+      - Rollback procedures
+      
+      ## Monitoring
+      - Required metrics
+      - Alerting setup
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Reviews & Approvals
+    description: Document required reviews and approvals
+    placeholder: |
+      ## Required Reviews
+      - Code review process
+      - Design review requirements
+      - Security review needs
+      - Compliance requirements
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Testing Requirements
+    description: Document testing requirements and approach
+    placeholder: |
+      ## Testing Scope
+      - Test data requirements
+      - Environment needs
+      - Test case management
+      - Performance testing requirements
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Release & Deployment
+    description: Document release and deployment strategy
+    placeholder: |
+      ## Release Strategy
+      - Phased rollout plan
+      - Deployment steps
+      - Monitoring plan
+      - Rollback procedures
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Documentation Requirements
+    description: Document required documentation
+    placeholder: |
+      ## Required Documentation
+      - Technical documentation
+      - User documentation
+      - Knowledge transfer needs
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Resource Allocation
+    description: Document resource requirements
+    placeholder: |
+      ## Team Resources
+      - Required team members
+      - Skill requirements
+      - Training needs
+      
+      ## External Resources
+      - Contractor needs
+      - Tooling requirements
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Risk Management
+    description: Document risks and mitigation strategies
+    placeholder: |
+      ## Identified Risks
+      - Technical risks
+      - Timeline risks
+      - External dependencies
+      
+      ## Mitigation Strategies
+      - Risk mitigation plans
+      - Contingency buffers
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Project Management
+    description: Document project management approach
+    placeholder: |
+      ## Work Breakdown
+      - Task breakdown
+      - Effort estimation
+      - Timeline estimates
+      
+      ## Tracking
+      - Progress tracking method
+      - Buffer allocation
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Post-Release
+    description: Document post-release requirements
+    placeholder: |
+      ## Post-Release Activities
+      - Monitoring requirements
+      - Feedback collection
+      - Retrospective planning
+  validations:
+    required: true 

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_4_spec.ts

@@ -78,5 +78,30 @@ describe(
         );
       });
     });
+
+    it("3. should logout user successfully using global logoutUser function and should redirect to the url provided with multiple query params", () => {
+      let applicationUrl = "";
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      propPane.EnterJSContext(
+        "onClick",
+        "{{logoutUser('/abc/def?test1=123&test2=456')}}",
+        true,
+        false,
+      );
+      cy.location().then((loc) => {
+        propPane.ToggleJSMode("onClick", false);
+        propPane.UpdatePropertyFieldValue("Label", "");
+        propPane.TypeTextIntoField("Label", "LOGOUT GLOBAL");
+        agHelper.ClickButton("LOGOUT GLOBAL");
+        cy.location().should((loc) => {
+          expect(loc.pathname).to.eq("/user/login");
+          expect(loc.search).to.eq(
+            "?redirectUrl=" +
+              encodeURIComponent("/abc/def?test1=123&test2=456"),
+          );
+        });
+      });
+    });
   },
 );

app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.ts

@@ -68,15 +68,21 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.wait("@getEnvVariables");
       agHelper.GetNClick(adminsSettings.generalTab);
       agHelper.AssertURL(adminSettingsHelper.routes.GENERAL);
-      agHelper.GetNClick(adminsSettings.advancedTab);
-      agHelper.AssertURL(adminSettingsHelper.routes.ADVANCED);
-      agHelper.GetNClick(adminsSettings.authenticationTab);
-      agHelper.AssertURL(adminSettingsHelper.routes.AUTHENTICATION);
       agHelper.GetNClick(adminsSettings.emailTab);
       agHelper.AssertURL(adminSettingsHelper.routes.EMAIL);
-      agHelper.AssertElementAbsence(adminsSettings.developerSettingsTab);
+      agHelper.GetNClick(adminsSettings.authenticationTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.AUTHENTICATION);
+      agHelper.GetNClick(adminsSettings.instanceSettingsTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.INSTANCE_SETTINGS);
+      agHelper.AssertElementAbsence(adminSettingsHelper._googleMapsAPIField);
+      agHelper.GetNClick(adminsSettings.configurationTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.CONFIGURATION);
       agHelper.GetNClick(adminsSettings.versionTab);
       agHelper.AssertURL(adminSettingsHelper.routes.VERSION);
+      agHelper.GetNClick(adminsSettings.userSettingsTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.USER_SETTINGS);
+      agHelper.GetNClick(adminsSettings.branding);
+      agHelper.AssertURL(adminSettingsHelper.routes.BRANDING);
     },
   );
 
@@ -122,7 +128,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
 
   it("7. Should test save and clear buttons disabled state", () => {
     agHelper.VisitNAssert(
-      adminSettingsHelper.routes.GENERAL,
+      adminSettingsHelper.routes.INSTANCE_SETTINGS,
       "getEnvVariables",
     );
     const assertVisibilityAndDisabledState = () => {
@@ -144,7 +150,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
 
   it("8. Should test saving a setting value", () => {
     agHelper.VisitNAssert(
-      adminSettingsHelper.routes.GENERAL,
+      adminSettingsHelper.routes.INSTANCE_SETTINGS,
       "getEnvVariables",
     );
 
@@ -169,7 +175,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
 
   it("9.Should test saving settings value from different tabs", () => {
     agHelper.VisitNAssert(
-      adminSettingsHelper.routes.GENERAL,
+      adminSettingsHelper.routes.INSTANCE_SETTINGS,
       "getEnvVariables",
     );
     agHelper.AssertElementAbsence(adminsSettings.restartNotice);
@@ -213,6 +219,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
     agHelper.WaitUntilEleAppear(adminSettingsHelper._adminSettingsBtn);
     agHelper.GetNClick(adminSettingsHelper._adminSettingsBtn);
     agHelper.AssertURL(adminSettingsHelper.routes.GENERAL);
+    agHelper.GetNClick(adminsSettings.instanceSettingsTab);
     cy.wait("@getEnvVariables");
     agHelper
       .GetText(adminSettingsHelper._instanceName, "val")
@@ -233,14 +240,16 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.wait("@getEnvVariables");
       agHelper.GetNClick(adminsSettings.generalTab);
       agHelper.AssertURL(adminSettingsHelper.routes.GENERAL);
-      agHelper.GetNClick(adminsSettings.advancedTab);
-      agHelper.AssertURL(adminSettingsHelper.routes.ADVANCED);
-      agHelper.GetNClick(adminsSettings.authenticationTab);
-      agHelper.AssertURL(adminSettingsHelper.routes.AUTHENTICATION);
       agHelper.GetNClick(adminsSettings.emailTab);
       agHelper.AssertURL(adminSettingsHelper.routes.EMAIL);
-      agHelper.GetNClick(adminsSettings.developerSettingsTab);
-      agHelper.AssertURL(adminSettingsHelper.routes.DEVELOPER_SETTINGS);
+      agHelper.GetNClick(adminsSettings.authenticationTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.AUTHENTICATION);
+      agHelper.GetNClick(adminsSettings.instanceSettingsTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.INSTANCE_SETTINGS);
+      agHelper.GetNClick(adminsSettings.configurationTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.CONFIGURATION);
+      agHelper.GetNClick(adminsSettings.userSettingsTab);
+      agHelper.AssertURL(adminSettingsHelper.routes.USER_SETTINGS);
       agHelper.GetNClick(adminsSettings.versionTab);
       agHelper.AssertURL(adminSettingsHelper.routes.VERSION);
       agHelper.GetNClick(adminsSettings.branding);

app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Email_settings_Spec.ts

@@ -44,6 +44,8 @@ describe(
       cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       adminSettings.NavigateToAdminSettings();
       agHelper.AssertElementVisibility(AdminsSettings.LeftPaneBrandingLink);
+      agHelper.GetNClick(AdminsSettings.instanceSettingsTab);
+
       cy.get(AdminsSettings.addEmailGhostInput)
         .click({ force: true })
         .type(fromEmail);

app/client/cypress/e2e/Regression/ClientSide/AdminSettings/General_settings_Spec.ts

@@ -13,6 +13,7 @@ describe(
     it("1. TC# 2439 Verify 'Page title' changes upon changing Instance name", () => {
       featureFlagIntercept({ license_branding_enabled: true });
       adminSettings.NavigateToAdminSettings();
+      agHelper.GetNClick(AdminsSettings.instanceSettingsTab);
       agHelper.WaitUntilEleAppear(adminSettings._instanceName);
       agHelper.ClearNType(adminSettings._instanceName, "Testing Instance name");
       agHelper.ClickOutside();
@@ -26,11 +27,12 @@ describe(
     it("2. TC# 2439 Verify 'Page title' does not change upon changing Instance name in free plan", () => {
       featureFlagIntercept({ license_branding_enabled: false });
       adminSettings.NavigateToAdminSettings();
+      agHelper.GetNClick(AdminsSettings.instanceSettingsTab);
       agHelper.ClearNType(
         adminSettings._instanceName,
         "Testing Instance name 2",
       );
-      agHelper.ClickButton("Save");
+      agHelper.GetNClick(AdminsSettings.saveButton, 0, true);
       agHelper.ValidateToastMessage("Successfully saved");
       cy.title().should("eq", "Appsmith");
     });

app/client/cypress/e2e/Regression/ClientSide/Anvil/AppTheming/AnvilAppThemingSnapshot_spec.ts

@@ -60,7 +60,7 @@ describe(
     });
 
     it("5. Corners", () => {
-      ["0px", "6px", "20px"].forEach((corner) => {
+      ["0px", "8px", "20px"].forEach((corner) => {
         anvilSnapshot.setCorners(corner);
 
         anvilSnapshot.matchSnapshotForCanvasMode(`AppThemingCorner${corner}`);

app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js

@@ -76,6 +76,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () {
 
   it("1. Limit embedding then Allow embedding everywhere then Disable everywhere", function () {
     cy.get(".admin-settings-menu-option").click();
+    _.agHelper.GetNClick(adminSettings.configurationTab);
     cy.get(".t--admin-settings-APPSMITH_ALLOWED_FRAME_ANCESTORS").within(() => {
       cy.get("input").eq(1).click();
       cy.get(".bp3-input-ghost").type(window.location.origin).blur();
@@ -92,6 +93,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () {
     // it("2. Allow embedding everywhere", function () {
     _.homePage.NavigateToHome();
     cy.get(".admin-settings-menu-option").click();
+    _.agHelper.GetNClick(adminSettings.configurationTab);
     cy.get(".t--admin-settings-APPSMITH_ALLOWED_FRAME_ANCESTORS").within(() => {
       cy.get("input").eq(0).click();
     });
@@ -106,6 +108,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () {
     // it("3. Disable everywhere", function () {
     _.homePage.NavigateToHome();
     cy.get(".admin-settings-menu-option").click();
+    _.agHelper.GetNClick(adminSettings.configurationTab);
     cy.get(".t--admin-settings-APPSMITH_ALLOWED_FRAME_ANCESTORS").within(() => {
       cy.get("input").last().click();
     });