2f738ed360
## Description - Make edit launch buttons as links for better user experience - Add upgrade ramps for session timeout setting Fixes [#29829](https://github.com/appsmithorg/appsmith/issues/29829) [#31724](https://github.com/appsmithorg/appsmith/issues/31724) ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!IMPORTANT] > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/8370510386> > Commit: `b45ae17a5f28fe4706a69cc0dd141e5bb5e8b225` > Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=8370510386&attempt=2" target="_blank">Click here!</a> > All cypress tests have passed 🎉🎉🎉 <!-- end of auto-generated comment: Cypress test results --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a session timeout setting for user sessions, enhancing security and compliance. - Improved admin settings interface with additional configuration options for session management. - **Enhancements** - Streamlined navigation within the application by removing reliance on default page IDs. - Enhanced input fields in admin settings with support for default values and custom formats. - **Style Updates** - Updated styling for labels, icons, and text inputs in the admin settings for better user experience. - **Tests** - Expanded Cypress test coverage for admin settings, including checks for business and enterprise settings, authentication, branding, and navigation. - **Refactor** - Simplified code by renaming constants and updating component properties for clarity and maintainability. - **Chores** - Updated Cypress configuration and support files for improved test automation practices. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
93 lines
3.5 KiB
JavaScript
93 lines
3.5 KiB
JavaScript
/* eslint-disable cypress/no-unnecessary-waiting */
|
|
/* eslint-disable cypress/no-assigning-return-values */
|
|
|
|
require("cy-verify-downloads").addCustomCommand();
|
|
require("cypress-file-upload");
|
|
|
|
const googleForm = require("../locators/GoogleForm.json");
|
|
const googleData = require("../fixtures/googleSource.json");
|
|
const githubForm = require("../locators/GithubForm.json");
|
|
import adminSettings from "../locators/AdminsSettings";
|
|
import { ObjectsRegistry } from "./Objects/Registry";
|
|
|
|
let agHelper = ObjectsRegistry.AggregateHelper;
|
|
let adminSettingsHelper = ObjectsRegistry.AdminSettings;
|
|
const BASE_URL = Cypress.config().baseUrl;
|
|
|
|
Cypress.Commands.add("fillGoogleFormPartly", () => {
|
|
cy.get(googleForm.googleClientId).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GOOGLE_CLIENT_ID"),
|
|
);
|
|
cy.get(googleForm.googleAllowedDomains).type(googleData.googleAllowedDomains);
|
|
cy.get(googleForm.saveBtn).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("fillGoogleForm", () => {
|
|
const baseUrl = BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL;
|
|
cy.get(googleForm.googleJSOriginUrl).should("have.value", `${baseUrl}`);
|
|
cy.get(googleForm.googleRedirectUrl).should(
|
|
"have.value",
|
|
`${baseUrl}/login/oauth2/code/google`,
|
|
);
|
|
cy.get(googleForm.googleClientId).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GOOGLE_CLIENT_ID"),
|
|
);
|
|
cy.get(googleForm.googleClientSecret).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET"),
|
|
);
|
|
cy.get(googleForm.googleAllowedDomains).type(googleData.googleAllowedDomains);
|
|
cy.get(googleForm.saveBtn).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("fillGithubFormPartly", () => {
|
|
cy.get(githubForm.githubClientId).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GITHUB_CLIENT_ID"),
|
|
);
|
|
cy.get(githubForm.saveBtn).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("fillGithubForm", () => {
|
|
const baseUrl = BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL;
|
|
cy.get(githubForm.githubHomepageUrl).should("have.value", `${baseUrl}`);
|
|
cy.get(githubForm.githubCallbackUrl).should(
|
|
"have.value",
|
|
`${baseUrl}/login/oauth2/code/github`,
|
|
);
|
|
cy.get(githubForm.githubClientId).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GITHUB_CLIENT_ID"),
|
|
);
|
|
cy.get(githubForm.githubClientSecret).type(
|
|
Cypress.env("APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET"),
|
|
);
|
|
cy.get(githubForm.saveBtn).click({ force: true });
|
|
});
|
|
|
|
// open authentication page
|
|
Cypress.Commands.add("openAuthentication", () => {
|
|
cy.get(".admin-settings-menu-option").should("be.visible");
|
|
cy.get(".admin-settings-menu-option").click();
|
|
cy.url().should("contain", adminSettingsHelper.routes.GENERAL);
|
|
// click authentication tab
|
|
cy.get(adminSettings.authenticationTab).click();
|
|
cy.url().should("contain", adminSettingsHelper.routes.AUTHENTICATION);
|
|
});
|
|
|
|
Cypress.Commands.add("waitForServerRestart", () => {
|
|
cy.get(adminSettings.restartNotice).should("be.visible");
|
|
// Wait for restart notice to not be visible with a timeout
|
|
// Cannot use cy.get as mentioned in https://github.com/NoriSte/cypress-wait-until/issues/75#issuecomment-572685623
|
|
// cy.waitUntil(() => !Cypress.$(adminSettings.restartNotice).length, {
|
|
// timeout: 180000,
|
|
// });
|
|
cy.get(adminSettings.restartNotice, { timeout: 300000 }).should("not.exist");
|
|
cy.get(adminSettings.appsmithStarting, { timeout: 300000 }).should(
|
|
"not.exist",
|
|
);
|
|
|
|
cy.window().then((win) => {
|
|
win.location.reload();
|
|
});
|
|
agHelper.AssertElementVisibility(adminSettings.saveButton, true, 0, 30000);
|
|
agHelper.AssertElementAbsence(adminSettings.restartNotice, 30000);
|
|
});
|