diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js index bc01dfe680..37d5ae4c5c 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js @@ -108,7 +108,7 @@ describe("Import, Export and Fork application and validate data binding", functi cy.writeFile("cypress/fixtures/exportedApp.json", body, "utf-8"); cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((createWorkspaceInterception) => { newWorkspaceName = diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js index b1631c3fd7..46b961c8da 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js @@ -11,7 +11,7 @@ describe("Reconnect Datasource Modal validation while importing application", fu // import application cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((createWorkspaceInterception) => { newWorkspaceName = createWorkspaceInterception.response.body.data.name; diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js index 34e51c825b..505008152d 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js @@ -47,7 +47,7 @@ describe("Export application as a JSON file", function() { cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; @@ -97,7 +97,7 @@ describe("Export application as a JSON file", function() { cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; @@ -147,7 +147,7 @@ describe("Export application as a JSON file", function() { cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js index e86c81a605..c990a29404 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js @@ -10,7 +10,7 @@ describe("Create workspace and a new app / delete and recreate app", function() cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js index 919f7d4991..74ea1120fd 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js @@ -10,7 +10,7 @@ describe("Create app same name in different workspace", function() { cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); // stub the response and // find app name diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/DeleteWorkspace_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/DeleteWorkspace_spec.js index aad2a58ba6..a978dd4c21 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/DeleteWorkspace_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/DeleteWorkspace_spec.js @@ -12,7 +12,7 @@ describe("Delete workspace test spec", function() { newWorkspaceName = interception.response.body.data.name; cy.visit("/applications"); cy.openWorkspaceOptionsPopup(newWorkspaceName); - cy.contains("Delete Organization").click(); + cy.contains("Delete Workspace").click(); cy.contains("Are you sure").click(); cy.wait("@deleteWorkspaceApiCall").then((httpResponse) => { expect(httpResponse.status).to.equal(200); @@ -29,7 +29,7 @@ describe("Delete workspace test spec", function() { newWorkspaceName = interception.response.body.data.name; cy.visit("/applications"); cy.openWorkspaceOptionsPopup(newWorkspaceName); - cy.contains("Delete Organization"); + cy.contains("Delete Workspace"); cy.inviteUserForWorkspace( newWorkspaceName, Cypress.env("TESTUSERNAME1"), @@ -40,7 +40,7 @@ describe("Delete workspace test spec", function() { cy.visit("/applications"); cy.openWorkspaceOptionsPopup(newWorkspaceName); cy.get(homePage.workspaceNamePopoverContent) - .contains("Delete Organization") + .contains("Delete Workspace") .should("not.exist"); cy.LogOut(); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/LeaveWorkspaceTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/LeaveWorkspaceTest_spec.js index 12a6e810cb..b590c3c603 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/LeaveWorkspaceTest_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/LeaveWorkspaceTest_spec.js @@ -14,7 +14,7 @@ describe("Leave workspace test spec", function() { newWorkspaceId = interception.response.body.data.name; cy.visit("/applications"); cy.openWorkspaceOptionsPopup(newWorkspaceName); - cy.contains("Leave Organization"); + cy.contains("Leave Workspace"); }); }); @@ -26,7 +26,7 @@ describe("Leave workspace test spec", function() { newWorkspaceId = interception.response.body.data.name; cy.visit("/applications"); cy.openWorkspaceOptionsPopup(newWorkspaceName); - cy.contains("Leave Organization").click(); + cy.contains("Leave Workspace").click(); cy.contains("Are you sure").click(); cy.wait("@leaveWorkspaceApiCall").then((httpResponse) => { expect(httpResponse.status).to.equal(400); @@ -56,7 +56,7 @@ describe("Leave workspace test spec", function() { .find("a") .should("have.length", 1) .first() - .contains("Leave Organization"); + .contains("Leave Workspace"); }); }); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/MemberRoles_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/MemberRoles_Spec.ts index 77f68a70cb..c093e28270 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/MemberRoles_Spec.ts +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/MemberRoles_Spec.ts @@ -11,7 +11,7 @@ describe("Create new workspace and invite user & validate all roles", () => { cy.get("@guid").then((uid) => { workspaceId = uid; appid = uid; - //localStorage.setItem("OrgName", workspaceId); + //localStorage.setItem("WorkspaceName", workspaceId); homePage.CreateNewWorkspace(workspaceId); homePage.CheckWorkspaceShareUsersCount(workspaceId, 1); homePage.InviteUserToWorkspace( @@ -95,7 +95,11 @@ describe("Create new workspace and invite user & validate all roles", () => { cy.get(homePage._applicationCard) .first() .trigger("mouseover"); - homePage.InviteUserToWorkspace(workspaceId, Cypress.env("TESTUSERNAME2"), "App Viewer"); + homePage.InviteUserToWorkspace( + workspaceId, + Cypress.env("TESTUSERNAME2"), + "App Viewer", + ); homePage.LogOutviaAPI(); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/ShareAppTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/ShareAppTests_spec.js index 392d2a18f6..61e3fcecc5 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/ShareAppTests_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/ShareAppTests_spec.js @@ -14,7 +14,7 @@ describe("Create new workspace and share with a user", function() { cy.generateUUID().then((uid) => { workspaceId = uid; appid = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js index 087e669f75..c48d17b96e 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js @@ -8,7 +8,7 @@ describe("Update Workspace", function() { cy.NavigateToHome(); cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; @@ -18,7 +18,7 @@ describe("Update Workspace", function() { }); cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.get(homePage.workspaceNameInput).click({ force: true }); cy.get(homePage.workspaceNameInput).clear(); cy.get(homePage.workspaceNameInput).type(workspaceId); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js index 5e317c50da..11c95830d6 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js @@ -38,7 +38,7 @@ describe("Workspace Import Application", function() { cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((createWorkspaceInterception) => { newWorkspaceName = diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js index a5a7d61a60..27cb4f2d03 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js @@ -12,7 +12,7 @@ describe("Workspace Settings validation spec", function() { workspaceId = "kadjhfkjadsjkfakjdscajdsnckjadsnckadsjcnanakdjsnckjdscnakjdscnnadjkncakjdsnckjadsnckajsdfkjadshfkjsdhfjkasdhfkjasdhfjkasdhjfasdjkfhjhdsfjhdsfjhadasdfasdfadsasdf" + uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); // create workspace with long name cy.createWorkspace(); // stub the response and diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceUserIconTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceUserIconTest_spec.js index e5e9afa11a..9f3af76059 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceUserIconTest_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceUserIconTest_spec.js @@ -10,7 +10,7 @@ describe("Check if workspace has user icons on homepage", function() { cy.NavigateToHome(); cy.generateUUID().then((uid) => { workspaceId = uid; - localStorage.setItem("OrgName", workspaceId); + localStorage.setItem("WorkspaceName", workspaceId); cy.createWorkspace(); cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/Workspacename_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/Workspacename_validation_spec.js index a321d81c3d..64b00c163a 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/Workspacename_validation_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/Workspacename_validation_spec.js @@ -11,7 +11,8 @@ describe("Workspace name validation spec", function() { cy.wait("@createWorkspace").then((interception) => { newWorkspaceName = interception.response.body.data.name; cy.NavigateToHome(); - cy.contains(newWorkspaceName) + cy.get(".t--applications-container") + .contains(newWorkspaceName) .closest(homePage.workspaceCompleteSection) .find(homePage.workspaceNamePopover) .find(homePage.optionsIcon) diff --git a/app/client/cypress/locators/HomePage.js b/app/client/cypress/locators/HomePage.js index 4609932dcd..8753b0d2f1 100644 --- a/app/client/cypress/locators/HomePage.js +++ b/app/client/cypress/locators/HomePage.js @@ -21,13 +21,13 @@ export default { homeIcon: ".t--appsmith-logo", inputAppName: "input[name=applicationName]", createNew: ".createnew", - createWorkspace: "span:contains('New Organization')", + createWorkspace: "span:contains('New Workspace')", inputWorkspaceName: "//input[@name='name']", submitBtn: "//span[text()='Submit']", - workspaceMenu: "//span[text()='TestShareOrg']", + workspaceMenu: "//span[text()='TestShareWorkspace']", members: "//span[contains(text(),'Members')]", share: "//span[contains(text(),'Share')]", - WorkspaceSettings: "//span[contains(text(),'Organization Settings')]", + WorkspaceSettings: "//span[contains(text(),'Workspace Settings')]", MemberSettings: "//span[contains(text(),'Members')]", inviteUser: "//span[text()='Invite Users']", inviteUserMembersPage: "[data-cy=t--invite-users]", diff --git a/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js b/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js index e80c6dff3d..f373f0a1dd 100644 --- a/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js +++ b/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js @@ -37,24 +37,24 @@ describe("Checking for error message on Workspace Name ", function() { }); it("User must not be able to add empty workspace name", function() { // Navigate to home Page - // Click on the "Create Organisation" button - // Ensure "Organisation Name" field is empty + // Click on the "Create Workspace" button + // Ensure "Workspace Name" field is empty // Ensure "Submit" is inactive }); it("Cancel creating an Workspace when the Workspace name is empty", function() { // Navigate to home Page - // Click on the "Create Organisation" button - // Ensure "Organisation Name" field is empty + // Click on the "Create Workspace" button + // Ensure "Workspace Name" field is empty // Click on "Cancel" option - // Observe the organisation is not created + // Observe the workspace is not created }); it("Cancel creating an Workspace when the Workspace name is dually filled", function() { // Navigate to home Page - // Click on the "Create Organisation" button - // Ensure "Organisation Name" field is enterd respectively + // Click on the "Create Workspace" button + // Ensure "Workspace Name" field is enterd respectively // Click on "Cancel" option - // Observe the organisation is not created + // Observe the workspace is not created }); }); diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts index 15e0e33d15..17acd374e0 100644 --- a/app/client/cypress/support/Pages/HomePage.ts +++ b/app/client/cypress/support/Pages/HomePage.ts @@ -72,7 +72,7 @@ export class HomePage { public CreateNewWorkspace(workspaceNewName: string) { let oldName: string = ""; - cy.xpath(this._visibleTextSpan("New Organization")) + cy.xpath(this._visibleTextSpan("New Workspace")) .should("be.visible") .first() .click({ force: true }); @@ -88,7 +88,8 @@ export class HomePage { } public RenameWorkspace(workspaceName: string, newWorkspaceName: string) { - cy.contains(workspaceName) + cy.get(this._appContainer) + .contains(workspaceName) .closest(this._workspaceCompleteSection) .find(this._workspaceName) .find(this._optionsIcon) diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js index 9e79437216..777ddd5c86 100644 --- a/app/client/cypress/support/WorkspaceCommands.js +++ b/app/client/cypress/support/WorkspaceCommands.js @@ -22,7 +22,8 @@ Cypress.Commands.add("createWorkspace", () => { }); Cypress.Commands.add("renameWorkspace", (workspaceName, newWorkspaceName) => { - cy.contains(workspaceName) + cy.get(".t--applications-container") + .contains(workspaceName) .closest(homePage.workspaceCompleteSection) .find(homePage.workspaceNamePopover) .find(homePage.optionsIcon) diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index a23a5afe58..532def0d2a 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -190,7 +190,7 @@ export const SIGN_IN = () => `Sign in`; export const CREATE_NEW_APPLICATION = () => `Create new`; export const SEARCH_APPS = () => `Search for apps...`; export const GETTING_STARTED = () => `GETTING STARTED`; -export const WORKSPACES_HEADING = () => `ORGANIZATIONS`; +export const WORKSPACES_HEADING = () => `WORKSPACES`; export const WELCOME_TOUR = () => `Welcome Tour`; export const NO_APPS_FOUND = () => `Whale! Whale! This name doesn't ring a bell!`; @@ -511,7 +511,7 @@ export const SELECT_A_METHOD_TO_ADD_CREDENTIALS = () => "Select a method to add credentials"; export const DELETE_CONFIRMATION_MODAL_TITLE = () => `Are you sure?`; export const DELETE_CONFIRMATION_MODAL_SUBTITLE = (name?: string | null) => - `You want to remove ${name} from this organization`; + `You want to remove ${name} from this workspace`; export const PARSING_ERROR = () => "Syntax Error: Unable to parse code, please check error logs to debug"; export const PARSING_WARNING = () => @@ -1089,7 +1089,7 @@ export const GENERATE_APPLICATION_TITLE = () => "Generate Page"; export const GENERATE_APPLICATION_DESCRIPTION = () => "Quickly generate a page to perform CRUD operations on your database tables"; export const DELETE_WORKSPACE_SUCCESSFUL = () => - "Organization deleted successfully"; + "Workspace deleted successfully"; // theming export const CHANGE_APP_THEME = (name: string) => `Theme ${name} Applied`; export const SAVE_APP_THEME = (name: string) => `Theme ${name} Saved`; @@ -1202,7 +1202,7 @@ export const EMPTY_DATASOURCE_BUTTON_TEXT = () => "NEW DATASOURCE"; export const MORE = () => "MORE"; export const SHOW_LESS = () => "SHOW LESS"; export const CHOOSE_WHERE_TO_FORK = () => "Choose where to fork the template"; -export const SELECT_WORKSPACE = () => "Select Organization"; +export const SELECT_WORKSPACE = () => "Select Workspace"; export const FORK_TEMPLATE = () => "FORK TEMPLATE"; export const TEMPLATES = () => "TEMPLATES"; export const FORK_THIS_TEMPLATE = () => "Fork this template"; @@ -1235,9 +1235,9 @@ export const ENTITY_ID_TOOLTIP = () => "This URL will be used while configuring your Identity Provider's Entity ID URL"; export const FORK_APP_MODAL_LOADING_TITLE = () => - "Fetching organisations to fork to..."; + "Fetching workspaces to fork to..."; export const FORK_APP_MODAL_EMPTY_TITLE = () => - "No organisation available to fork to"; + "No workspace available to fork to"; export const FORK_APP_MODAL_SUCCESS_TITLE = () => "Choose where to fork the app"; export const FORK = () => `FORK`; diff --git a/app/client/src/ce/pages/AdminSettings/config/authentication/index.tsx b/app/client/src/ce/pages/AdminSettings/config/authentication/index.tsx index bd4796774b..b506fbc9c7 100644 --- a/app/client/src/ce/pages/AdminSettings/config/authentication/index.tsx +++ b/app/client/src/ce/pages/AdminSettings/config/authentication/index.tsx @@ -29,7 +29,7 @@ const FormAuth: AdminConfigType = { type: SettingCategories.FORM_AUTH, controlType: SettingTypes.GROUP, title: "Form Login", - subText: "Enable your organization to sign in with Appsmith Form.", + subText: "Enable your workspace to sign in with Appsmith Form.", canSave: true, isConnected: false, settings: [ @@ -69,7 +69,7 @@ const GoogleAuth: AdminConfigType = { type: SettingCategories.GOOGLE_AUTH, controlType: SettingTypes.GROUP, title: "Google Authentication", - subText: "Enable your organization to sign in with Google (OAuth).", + subText: "Enable your workspace to sign in with Google (OAuth).", canSave: true, isConnected: enableGoogleOAuth, settings: [ @@ -116,7 +116,7 @@ const GithubAuth: AdminConfigType = { controlType: SettingTypes.GROUP, title: "Github Authentication", subText: - "Enable your organization to sign in with Github SAML single sign-on (SSO).", + "Enable your workspace to sign in with Github SAML single sign-on (SSO).", canSave: true, isConnected: enableGithubOAuth, settings: [ @@ -153,7 +153,7 @@ export const FormAuthCallout: AuthMethodType = { id: "APPSMITH_FORM_LOGIN_AUTH", category: SettingCategories.FORM_AUTH, label: "Form Login", - subText: "Enable your organization to sign in with Appsmith Form.", + subText: "Enable your workspace to sign in with Appsmith Form.", image: Lock, type: "LINK", isConnected: !disableLoginForm, @@ -164,7 +164,7 @@ export const GoogleAuthCallout: AuthMethodType = { category: SettingCategories.GOOGLE_AUTH, label: "Google", subText: - "Enable your organization to sign in with Google (OAuth 2.0) single sign-on (SSO).", + "Enable your workspace to sign in with Google (OAuth 2.0) single sign-on (SSO).", image: Google, type: "LINK", isConnected: enableGoogleOAuth, @@ -175,7 +175,7 @@ export const GithubAuthCallout: AuthMethodType = { category: SettingCategories.GITHUB_AUTH, label: "Github", subText: - "Enable your organization to sign in with Github (OAuth 2.0) single sign-on (SSO).", + "Enable your workspace to sign in with Github (OAuth 2.0) single sign-on (SSO).", image: Github, type: "LINK", isConnected: enableGithubOAuth, @@ -185,7 +185,7 @@ export const SamlAuthCallout: AuthMethodType = { id: "APPSMITH_SAML_AUTH", category: "saml", label: "SAML 2.0", - subText: `Enable your organization to sign in with your preferred SAML2 compliant provider.`, + subText: `Enable your workspace to sign in with your preferred SAML2 compliant provider.`, image: SamlSso, needsUpgrade: true, type: "OTHER", @@ -195,7 +195,7 @@ export const OidcAuthCallout: AuthMethodType = { id: "APPSMITH_OIDC_AUTH", category: "oidc", label: "OIDC", - subText: `Enable your organization to sign in with Open ID Connect.`, + subText: `Enable your workspace to sign in with Open ID Connect.`, image: OIDC, needsUpgrade: true, type: "OTHER", diff --git a/app/client/src/constants/forms.ts b/app/client/src/constants/forms.ts index 10b7c3232b..5e1149ae02 100644 --- a/app/client/src/constants/forms.ts +++ b/app/client/src/constants/forms.ts @@ -12,7 +12,7 @@ export const FORGOT_PASSWORD_FORM_NAME = "ForgotPasswordForm"; export const RESET_PASSWORD_FORM_NAME = "ResetPasswordForm"; export const CREATE_PASSWORD_FORM_NAME = "CreatePasswordForm"; -export const CREATE_WORKSPACE_FORM_NAME = "New Organization"; +export const CREATE_WORKSPACE_FORM_NAME = "New Workspace"; export const CURL_IMPORT_FORM = "CurlImportForm"; export const QUERY_EDITOR_FORM_NAME = "QueryEditorForm"; diff --git a/app/client/src/entities/DataTree/dataTreeJSAction.test.ts b/app/client/src/entities/DataTree/dataTreeJSAction.test.ts index 5627882634..a38d40da84 100644 --- a/app/client/src/entities/DataTree/dataTreeJSAction.test.ts +++ b/app/client/src/entities/DataTree/dataTreeJSAction.test.ts @@ -9,7 +9,7 @@ describe("generateDataTreeJSAction", () => { config: { id: "1234", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", name: "JSObject2", pageId: "page123", pluginId: "plugin123", @@ -20,7 +20,7 @@ describe("generateDataTreeJSAction", () => { { id: "abcd", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", pluginType: PluginType.JS, pluginId: "plugin123", name: "myFun2", @@ -29,7 +29,7 @@ describe("generateDataTreeJSAction", () => { userPermissions: [], name: "UNUSED_DATASOURCE", pluginId: "plugin123", - workspaceId: "org123", + workspaceId: "workspace123", messages: [], isValid: true, new: true, @@ -68,7 +68,7 @@ describe("generateDataTreeJSAction", () => { { id: "623973054d9aea1b062af87b", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", pluginType: "JS", pluginId: "plugin123", name: "myFun1", @@ -77,7 +77,7 @@ describe("generateDataTreeJSAction", () => { userPermissions: [], name: "UNUSED_DATASOURCE", pluginId: "plugin123", - workspaceId: "org123", + workspaceId: "workspace123", messages: [], isValid: true, new: true, @@ -207,7 +207,7 @@ describe("generateDataTreeJSAction", () => { config: { id: "1234", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", name: "JSObject2", pageId: "page123", pluginId: "plugin123", @@ -218,7 +218,7 @@ describe("generateDataTreeJSAction", () => { { id: "abcd", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", pluginType: PluginType.JS, pluginId: "plugin123", name: "myFun2", @@ -227,7 +227,7 @@ describe("generateDataTreeJSAction", () => { userPermissions: [], name: "UNUSED_DATASOURCE", pluginId: "plugin123", - workspaceId: "org123", + workspaceId: "workspace123", messages: [], isValid: true, new: true, @@ -266,7 +266,7 @@ describe("generateDataTreeJSAction", () => { { id: "623973054d9aea1b062af87b", applicationId: "app123", - workspaceId: "org123", + workspaceId: "workspace123", pluginType: "JS", pluginId: "plugin123", name: "myFun1", @@ -275,7 +275,7 @@ describe("generateDataTreeJSAction", () => { userPermissions: [], name: "UNUSED_DATASOURCE", pluginId: "plugin123", - workspaceId: "org123", + workspaceId: "workspace123", messages: [], isValid: true, new: true, diff --git a/app/client/src/mockResponses/ApplicationsNewMockResponse.json b/app/client/src/mockResponses/ApplicationsNewMockResponse.json index 79f13e422d..3527285330 100644 --- a/app/client/src/mockResponses/ApplicationsNewMockResponse.json +++ b/app/client/src/mockResponses/ApplicationsNewMockResponse.json @@ -174,7 +174,7 @@ "publish:workspaceApplications", "read:workspaceApplications" ], - "name":"new org", + "name":"new workspace", "email":"b1@appsmith.com", "plugins":[ { @@ -274,7 +274,7 @@ "new":true } ], - "slug":"new-org5", + "slug":"new-workspace5", "logoUrl":"/api/v1/assets/null", "new":false }, diff --git a/app/client/src/mockResponses/CreateWorkspaceMockResponse.json b/app/client/src/mockResponses/CreateWorkspaceMockResponse.json index e0d5077d0e..5389697ced 100644 --- a/app/client/src/mockResponses/CreateWorkspaceMockResponse.json +++ b/app/client/src/mockResponses/CreateWorkspaceMockResponse.json @@ -8,7 +8,7 @@ "userPermissions":[ ], - "name":"new org", + "name":"new workspace", "email":"b1@appsmith.com", "plugins":[ { @@ -108,7 +108,7 @@ "new":true } ], - "slug":"new-org5", + "slug":"new-workspace5", "logoUrl":"/api/v1/assets/null", "new":false } diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx index c483eca0b8..7b926a4d26 100644 --- a/app/client/src/pages/Applications/index.tsx +++ b/app/client/src/pages/Applications/index.tsx @@ -408,7 +408,7 @@ function LeftPane() { submitCreateWorkspaceForm( { name: getNextEntityName( - "Untitled organization ", + "Untitled workspace ", fetchedUserWorkspaces.map((el: any) => el.workspace.name), ), }, @@ -853,7 +853,7 @@ function ApplicationsSection(props: any) { }} text={ !warnLeavingWorkspace - ? "Leave Organization" + ? "Leave Workspace" : "Are you sure?" } type={!warnLeavingWorkspace ? undefined : "warning"} @@ -870,7 +870,7 @@ function ApplicationsSection(props: any) { }} text={ !warnDeleteWorkspace - ? "Delete Organization" + ? "Delete Workspace" : "Are you sure?" } type={ @@ -902,7 +902,7 @@ function ApplicationsSection(props: any) { {applications.length === 0 && ( - There’s nothing inside this organization + There’s nothing inside this workspace {/* below component is duplicate. This is because of cypress test were failing */} {!isMobile && (