hash
stringlengths 40
40
| date
stringdate 2020-04-14 18:04:14
2025-03-25 16:48:49
| author
stringclasses 154
values | commit_message
stringlengths 15
172
| is_merge
bool 1
class | masked_commit_message
stringlengths 11
165
| type
stringclasses 7
values | git_diff
stringlengths 32
8.56M
|
|---|---|---|---|---|---|---|---|
c69d7a2f3872dc2993901df7bcc61941b5ff80fd
|
2024-12-23 09:12:27
|
Sagar Khalasi
|
chore: reverted changes (#38300)
| false
|
reverted changes (#38300)
|
chore
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts
index d24951a04e13..87e1c2a6b4e7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts
@@ -5,7 +5,7 @@ import {
} from "../../../../../support/Objects/ObjectsCore";
// TODO: Enable when issue(github.com/appsmithorg/appsmith/issues/36419) is solved.
-describe(
+describe.skip(
`${ANVIL_EDITOR_TEST}: Anvil tests for Table Widget`,
{ tags: ["@tag.Anvil", "@tag.Visual"] },
() => {
|
583320bea67b769dd57240ca4f7cf1543ab57105
|
2022-08-16 14:18:47
|
akash-codemonk
|
fix: hide explorer menu on scroll (#15537)
| false
|
hide explorer menu on scroll (#15537)
|
fix
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Menu_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Menu_spec.js
new file mode 100644
index 000000000000..13b07291f5ae
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Menu_spec.js
@@ -0,0 +1,25 @@
+const explorer = require("../../../../locators/explorerlocators.json");
+const globalSearch = require("../../../../locators/GlobalSearch.json");
+const queryLocators = require("../../../../locators/QueryEditor.json");
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+let ee = ObjectsRegistry.EntityExplorer;
+
+describe("Entity explorer context menu", function() {
+ it("Entity explorer menu must close on scroll", function() {
+ // Setup to make the explorer scrollable
+ ee.ExpandCollapseEntity("DATASOURCES");
+ ee.ExpandCollapseEntity("QUERIES/JS");
+ ee.ExpandCollapseEntity("WIDGETS");
+ cy.contains("DEPENDENCIES").click();
+ cy.get(explorer.addDBQueryEntity).click();
+ cy.contains("[data-cy='t--tab-MOCK_DATABASE']", "Sample Databases").click();
+ cy.contains(".t--mock-datasource", "Users").click();
+ cy.contains(".t--datasource", "Users").within(() => {
+ cy.get(queryLocators.createQuery).click({ force: true });
+ });
+ ee.ExpandCollapseEntity("public.users");
+
+ cy.get(globalSearch.createNew).click();
+ cy.get(".t--entity-explorer-wrapper").scrollTo("top");
+ });
+});
diff --git a/app/client/src/components/editorComponents/Sidebar.tsx b/app/client/src/components/editorComponents/Sidebar.tsx
index 0c8b0fbab9d1..44ebad7ae9e1 100644
--- a/app/client/src/components/editorComponents/Sidebar.tsx
+++ b/app/client/src/components/editorComponents/Sidebar.tsx
@@ -31,6 +31,7 @@ import OnboardingStatusbar from "pages/Editor/FirstTimeUserOnboarding/Statusbar"
import Pages from "pages/Editor/Explorer/Pages";
import { EntityProperties } from "pages/Editor/Explorer/Entity/EntityProperties";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { SIDEBAR_ID } from "constants/Explorer";
type Props = {
width: number;
@@ -152,6 +153,7 @@ export const EntityExplorerSidebar = memo((props: Props) => {
"shadow-xl": !pinned,
fixed: !pinned || isPreviewMode,
})}
+ id={SIDEBAR_ID}
>
{/* SIDEBAR */}
<div
diff --git a/app/client/src/constants/Explorer.ts b/app/client/src/constants/Explorer.ts
index 3fa4f47fa34b..0b22edbe25d2 100644
--- a/app/client/src/constants/Explorer.ts
+++ b/app/client/src/constants/Explorer.ts
@@ -1,3 +1,4 @@
export const ENTITY_EXPLORER_SEARCH_ID = "entity-explorer-search";
export const WIDGETS_SEARCH_ID = "#widgets-search";
export const SEARCH_ENTITY = "search-entity";
+export const SIDEBAR_ID = "sidebar";
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
index d14fa56e1cae..2b122a70b4e8 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
@@ -10,6 +10,8 @@ import QueryTemplates from "./QueryTemplates";
import DatasourceField from "./DatasourceField";
import { DatasourceTable } from "entities/Datasource";
import { Colors } from "constants/Colors";
+import { useCloseMenuOnScroll } from "../hooks";
+import { SIDEBAR_ID } from "constants/Explorer";
const Wrapper = styled(EntityTogglesWrapper)`
&&&& {
@@ -47,6 +49,7 @@ export function DatasourceStructure(props: DatasourceStructureProps) {
};
let templateMenu = null;
const [active, setActive] = useState(false);
+ useCloseMenuOnScroll(SIDEBAR_ID, active, () => setActive(false));
const lightningMenu = (
<Wrapper
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index 706434a47c8a..88895b98501f 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -113,7 +113,9 @@ function EntityExplorer({ isActive }: { isActive: boolean }) {
return (
<Wrapper
- className={`relative overflow-y-auto ${isActive ? "" : "hidden"}`}
+ className={`t--entity-explorer-wrapper relative overflow-y-auto ${
+ isActive ? "" : "hidden"
+ }`}
ref={explorerRef}
>
{/* SEARCH */}
diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
index 7f67b8ae823f..561930f2539f 100644
--- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
@@ -23,6 +23,8 @@ import { TOOLTIP_HOVER_ON_DELAY } from "constants/AppConstants";
import { EntityClassNames } from "../Entity";
import { TooltipComponent } from "design-system";
import { ADD_QUERY_JS_BUTTON, createMessage } from "ce/constants/messages";
+import { useCloseMenuOnScroll } from "../hooks";
+import { SIDEBAR_ID } from "constants/Explorer";
const SubMenuContainer = styled.div`
width: 250px;
@@ -71,8 +73,8 @@ export default function ExplorerSubMenu({
});
const pluginGroups = useMemo(() => keyBy(plugins, "id"), [plugins]);
const [activeItemIdx, setActiveItemIdx] = useState(0);
-
useEffect(() => setShow(openMenu), [openMenu]);
+ useCloseMenuOnScroll(SIDEBAR_ID, show, () => setShow(false));
useEffect(() => {
setQuery("");
diff --git a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
index 86ad078c8f3f..a09b924a6711 100644
--- a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
+++ b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
@@ -17,6 +17,8 @@ import { IconNames } from "@blueprintjs/icons";
import styled from "constants/DefaultTheme";
import { Colors } from "constants/Colors";
import { entityTooltipCSS } from "./Entity";
+import { useCloseMenuOnScroll } from "./hooks";
+import { SIDEBAR_ID } from "constants/Explorer";
export type TreeDropdownOption = DropdownOption & {
onSelect?: (value: TreeDropdownOption, setter?: Setter) => void;
@@ -129,6 +131,7 @@ export default function TreeDropdown(props: TreeDropdownProps) {
);
const [isOpen, setIsOpen] = useState<boolean>(false);
+ useCloseMenuOnScroll(SIDEBAR_ID, isOpen, () => setIsOpen(false));
const handleSelect = (option: TreeDropdownOption) => {
if (option.onSelect) {
diff --git a/app/client/src/pages/Editor/Explorer/hooks.ts b/app/client/src/pages/Editor/Explorer/hooks.ts
index c3b0aa72cb2f..323fc4c4189d 100644
--- a/app/client/src/pages/Editor/Explorer/hooks.ts
+++ b/app/client/src/pages/Editor/Explorer/hooks.ts
@@ -396,3 +396,21 @@ export function useActiveAction() {
return saasMatch.params.apiId;
}
}
+
+export const useCloseMenuOnScroll = (
+ id: string,
+ open: boolean,
+ onClose: () => void,
+) => {
+ const scrollContainer = document.getElementById(id);
+
+ useEffect(() => {
+ if (open) {
+ scrollContainer?.addEventListener("scroll", onClose, true);
+ }
+
+ return () => {
+ scrollContainer?.removeEventListener("scroll", onClose);
+ };
+ }, [open]);
+};
|
90dfa002fa2494eb6ab521a76fa6183fa2c15196
|
2022-03-23 11:55:20
|
Tolulope Adetula
|
fix: build issue
| false
|
build issue
|
fix
|
diff --git a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
index 3dc079333be2..977e98c427aa 100644
--- a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
@@ -106,6 +106,12 @@ export function defaultOptionValueValidation(
message =
"value should match: Array<string | number> | Array<{label: string, value: string | number}>";
}
+
+ return {
+ isValid,
+ parsed,
+ messages: [message],
+ };
}
/*
@@ -129,6 +135,14 @@ export function defaultOptionValueValidation(
isValid = true;
parsed = [value];
message = "";
+ } else {
+ /*
+ * When value is undefined, null, {} etc.
+ */
+ isValid = false;
+ parsed = [];
+ message =
+ "value should match: Array<string | number> | Array<{label: string, value: string | number}>";
}
return {
|
754d3efcf114d7ad7e63435f6a1ecd046e52e946
|
2025-01-29 14:10:51
|
Hetu Nandu
|
fix: Avoid canvas tooltip unmount (#38887)
| false
|
Avoid canvas tooltip unmount (#38887)
|
fix
|
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
index 406e957eb828..c39b9b648343 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
@@ -1,5 +1,5 @@
import { Tooltip } from "@appsmith/ads";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
import { modText } from "utils/helpers";
import { useSelector } from "react-redux";
import { getWidgetSelectionBlock } from "selectors/ui";
@@ -19,26 +19,33 @@ const CodeModeTooltip = (props: { children: React.ReactElement }) => {
const editorState = useCurrentAppState();
const [shouldShow, setShouldShow] = useState<boolean>(false);
- useEffect(() => {
- retrieveCodeWidgetNavigationUsed()
- .then((timesUsed) => {
- if (timesUsed < 2) {
+ useEffect(
+ function handleMaxTimesTooltipShown() {
+ retrieveCodeWidgetNavigationUsed()
+ .then((timesUsed) => {
+ if (timesUsed < 2) {
+ setShouldShow(true);
+ }
+ })
+ .catch(() => {
setShouldShow(true);
- }
- })
- .catch(() => {
- setShouldShow(true);
- });
- }, [isWidgetSelectionBlock]);
-
- if (!isWidgetSelectionBlock) return props.children;
+ });
+ },
+ [isWidgetSelectionBlock],
+ );
- if (editorState !== EditorState.EDITOR) return props.children;
+ const isDisabled = useMemo(() => {
+ return (
+ !shouldShow ||
+ !isWidgetSelectionBlock ||
+ editorState !== EditorState.EDITOR
+ );
+ }, [editorState, isWidgetSelectionBlock, shouldShow]);
return (
<Tooltip
content={createMessage(CANVAS_VIEW_MODE_TOOLTIP, `${modText()}`)}
- isDisabled={!shouldShow}
+ isDisabled={isDisabled}
placement={"bottom"}
showArrow={false}
trigger={"hover"}
|
f8aaa2179f5e47687b956fcdd4a2f688467f1012
|
2022-03-31 08:32:57
|
ashit-rath
|
fix: JSONForm date field tooltip visibility (#12299)
| false
|
JSONForm date field tooltip visibility (#12299)
|
fix
|
diff --git a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
index def3308c5874..8f088548dccc 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
@@ -219,6 +219,7 @@ function DateField({
labelTextColor={schemaItem.labelTextColor}
labelTextSize={schemaItem.labelTextSize}
name={name}
+ tooltip={schemaItem.tooltip}
>
{fieldComponent}
</Field>
|
13faf4829cd90b1f76d8680029d42bde0c44a6d1
|
2025-03-12 17:26:46
|
vadim
|
chore: Remove AI avatar from Icons package (#39687)
| false
|
Remove AI avatar from Icons package (#39687)
|
chore
|
diff --git a/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx b/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx
deleted file mode 100644
index 2c11db8ee939..000000000000
--- a/app/client/packages/icons/src/components/CustomIcons/AIAvatarCustomIcon.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as React from "react";
-import type { SVGProps } from "react";
-const AIAvatarCustomIcon = (props: SVGProps<SVGSVGElement>) => <svg xmlns="http://www.w3.org/2000/svg" width={24} height={24} fill="none" {...props}><rect width={23} height={23} x={0.5} y={0.5} fill="#FFF7F4" rx={1.5} /><rect width={23} height={23} x={0.5} y={0.5} stroke="#FFE9E0" rx={1.5} /><path fill="#FF6D2D" d="M4.5 11a2 2 0 1 0 0 4v-4M19.5 11a2 2 0 1 1 0 4v-4" /><rect width={15} height={10} x={4.5} y={8} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.149} rx={3} /><rect width={12} height={7} x={6} y={9.5} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.5} rx={1.5} /><circle cx={9} cy={12} r={1} fill="#000" /><circle cx={15} cy={12} r={1} fill="#000" /><path fill="#000" d="M11.5 5.5h1V8h-1z" /><circle cx={12} cy={4.5} r={1.5} fill="#fff" stroke="#000" strokeMiterlimit={10} strokeWidth={0.149} /><path stroke="#000" strokeLinecap="round" strokeWidth={0.5} d="m10 14 .209.232A2.426 2.426 0 0 0 14 14v0" /></svg>;
-export { AIAvatarCustomIcon };
\ No newline at end of file
diff --git a/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg b/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg
deleted file mode 100644
index 9f1b244b608c..000000000000
--- a/app/client/packages/icons/src/icons/CustomIcons/AIAvatar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><rect width="23" height="23" x=".5" y=".5" fill="#FFF7F4" rx="1.5"/><rect width="23" height="23" x=".5" y=".5" stroke="#FFE9E0" rx="1.5"/><path fill="#FF6D2D" d="M4.5 11a2 2 0 1 0 0 4v-4M19.5 11a2 2 0 1 1 0 4v-4"/><rect width="15" height="10" x="4.5" y="8" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".149" rx="3"/><rect width="12" height="7" x="6" y="9.5" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".5" rx="1.5"/><circle cx="9" cy="12" r="1" fill="#000"/><circle cx="15" cy="12" r="1" fill="#000"/><path fill="#000" d="M11.5 5.5h1V8h-1z"/><circle cx="12" cy="4.5" r="1.5" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".149"/><path stroke="#000" stroke-linecap="round" stroke-width=".5" d="m10 14 .209.232A2.426 2.426 0 0 0 14 14v0"/></svg>
\ No newline at end of file
diff --git a/app/client/packages/icons/src/index.ts b/app/client/packages/icons/src/index.ts
index 601ca261d886..50d84de82cb4 100644
--- a/app/client/packages/icons/src/index.ts
+++ b/app/client/packages/icons/src/index.ts
@@ -28,7 +28,6 @@ export { SwitchThumbnail } from "./components/Thumbnails/SwitchThumbnail";
export { TableThumbnail } from "./components/Thumbnails/TableThumbnail";
export { ToolbarButtonsThumbnail } from "./components/Thumbnails/ToolbarButtonsThumbnail";
export { ZoneThumbnail } from "./components/Thumbnails/ZoneThumbnail";
-export { AIAvatarCustomIcon } from "./components/CustomIcons/AIAvatarCustomIcon";
export { EmptyStateIllustrationCustomIcon } from "./components/CustomIcons/EmptyStateIllustrationCustomIcon";
export { AIChatIcon } from "./components/Icons/AIChatIcon";
export { AudioIcon } from "./components/Icons/AudioIcon";
diff --git a/app/client/packages/icons/src/stories/CustomIcons.mdx b/app/client/packages/icons/src/stories/CustomIcons.mdx
index 8d72abbe1b1c..850c985a7792 100644
--- a/app/client/packages/icons/src/stories/CustomIcons.mdx
+++ b/app/client/packages/icons/src/stories/CustomIcons.mdx
@@ -1,6 +1,5 @@
import { Meta } from "@storybook/addon-docs";
import { Flex } from "@appsmith/wds";
-import { AIAvatarCustomIcon } from "../components/CustomIcons/AIAvatarCustomIcon";
import { EmptyStateIllustrationCustomIcon } from "../components/CustomIcons/EmptyStateIllustrationCustomIcon";
<Meta title="Appsmith Icons/CustomIcons" />
@@ -12,7 +11,6 @@ Set of custom icons.
export const Icons = () => {
return (
<Flex gap="spacing-4" wrap="wrap">
- <AIAvatarCustomIcon />
<EmptyStateIllustrationCustomIcon />
</Flex>
);
|
297fdfddf477fc5b9376c1658e217459a24173ec
|
2024-01-31 19:01:33
|
vadim
|
chore: Update WDS default seed to be distinct from Appsmith branding (#30505)
| false
|
Update WDS default seed to be distinct from Appsmith branding (#30505)
|
chore
|
diff --git a/app/client/packages/design-system/theming/src/token/src/defaultTokens.json b/app/client/packages/design-system/theming/src/token/src/defaultTokens.json
index 0ef7472a424a..3ccf6e3e748b 100644
--- a/app/client/packages/design-system/theming/src/token/src/defaultTokens.json
+++ b/app/client/packages/design-system/theming/src/token/src/defaultTokens.json
@@ -1,5 +1,5 @@
{
- "seedColor": "#553de9",
+ "seedColor": "#0080ff",
"fluid": {
"minVw": 360,
"maxVw": 1920,
diff --git a/app/client/src/constants/AppConstants.ts b/app/client/src/constants/AppConstants.ts
index bf208128af3e..8a03588b17a9 100644
--- a/app/client/src/constants/AppConstants.ts
+++ b/app/client/src/constants/AppConstants.ts
@@ -132,7 +132,7 @@ export const defaultNavigationSetting = {
export const defaultThemeSetting: ThemeSetting = {
fontFamily: "System Default",
- accentColor: "#553DE9",
+ accentColor: "#0080ff",
colorMode: "LIGHT",
borderRadius: "6px",
density: 1,
|
e356fd039fa7a57bc7a04cce2cd25d7befd733f1
|
2022-02-03 17:17:57
|
Abhijeet
|
chore: Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication (#10776)
| false
|
Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication (#10776)
|
chore
|
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/GitDirectories.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/GitDirectories.java
index 948e3e18cb97..095dbe4c0941 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/GitDirectories.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/GitDirectories.java
@@ -2,7 +2,7 @@
public interface GitDirectories {
String PAGE_DIRECTORY = "pages";
- String ACTION_DIRECTORY = "actions";
- String ACTION_COLLECTION_DIRECTORY = "action_collections";
+ String ACTION_DIRECTORY = "queries";
+ String ACTION_COLLECTION_DIRECTORY = "jsobjects";
String DATASOURCE_DIRECTORY = "datasources";
}
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
index 623b94e3884a..16b5baf560bb 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
@@ -237,10 +237,10 @@ private void deleteFile(Path filePath, boolean isDirectory) {
* @param branchName for which the application needs to be rehydrate
* @return application reference from which entire application can be rehydrated
*/
- public Mono<ApplicationGitReference> reconstructApplicationFromGitRepo(String organisationId,
- String defaultApplicationId,
- String repoName,
- String branchName) {
+ public Mono<ApplicationGitReference> reconstructApplicationReferenceFromGitRepo(String organisationId,
+ String defaultApplicationId,
+ String repoName,
+ String branchName) {
Path baseRepoSuffix = Paths.get(organisationId, defaultApplicationId, repoName);
ApplicationGitReference applicationGitReference = new ApplicationGitReference();
@@ -266,6 +266,9 @@ public Mono<ApplicationGitReference> reconstructApplicationFromGitRepo(String or
// Extract actions
applicationGitReference.setActions(readFiles(baseRepoPath.resolve(ACTION_DIRECTORY), gson));
+ // Extract actionCollections
+ applicationGitReference.setActionsCollections(readFiles(baseRepoPath.resolve(ACTION_COLLECTION_DIRECTORY), gson));
+
// Extract pages
applicationGitReference.setPages(readFiles(baseRepoPath.resolve(PAGE_DIRECTORY), gson));
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
index 8ac7d417f51f..fb4c54d43136 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
@@ -41,10 +41,10 @@ Mono<Path> saveApplicationToGitRepo(Path baseRepoSuffix,
* @param repoName git repo name to access file system
* @return application reference from which entire application can be rehydrated
*/
- Mono<ApplicationGitReference> reconstructApplicationFromGitRepo(String organisationId,
- String defaultApplicationId,
- String repoName,
- String branchName);
+ Mono<ApplicationGitReference> reconstructApplicationReferenceFromGitRepo(String organisationId,
+ String defaultApplicationId,
+ String repoName,
+ String branchName);
/**
* Once the user connects the existing application to a remote repo, we will initialize the repo with Readme.md -
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
index ecee1fb9efe4..5d1d5be34405 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
@@ -104,6 +104,7 @@ public class FieldName {
public static final String DATASOURCE_LIST = "datasourceList";
public static final String PAGE_LIST = "pageList";
public static final String ACTION_LIST = "actionList";
+ public static final String ACTION_COLLECTION_LIST = "actionCollectionList";
public static final String DECRYPTED_FIELDS = "decryptedFields";
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
index 5f1d06358e3b..30d4d769fbec 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
@@ -1,7 +1,6 @@
package com.appsmith.server.helpers;
import com.appsmith.external.git.FileInterface;
-import com.appsmith.external.helpers.BeanCopyUtils;
import com.appsmith.external.models.ApplicationGitReference;
import com.appsmith.external.models.Datasource;
import com.appsmith.git.helpers.FileUtilsImpl;
@@ -38,7 +37,9 @@
import java.util.Set;
import java.util.stream.Collectors;
+import static com.appsmith.external.helpers.BeanCopyUtils.copyNestedNonNullProperties;
import static com.appsmith.external.helpers.BeanCopyUtils.copyProperties;
+import static com.appsmith.server.constants.FieldName.ACTION_COLLECTION_LIST;
import static com.appsmith.server.constants.FieldName.ACTION_LIST;
import static com.appsmith.server.constants.FieldName.DATASOURCE_LIST;
import static com.appsmith.server.constants.FieldName.DECRYPTED_FIELDS;
@@ -55,7 +56,7 @@ public class GitFileUtils {
// Only include the application helper fields in metadata object
private static final Set<String> blockedMetadataFields
- = Set.of(EXPORTED_APPLICATION, DATASOURCE_LIST, PAGE_LIST, ACTION_LIST, DECRYPTED_FIELDS);
+ = Set.of(EXPORTED_APPLICATION, DATASOURCE_LIST, PAGE_LIST, ACTION_LIST, ACTION_COLLECTION_LIST, DECRYPTED_FIELDS);
/**
* This method will save the complete application in the local repo directory.
@@ -157,13 +158,13 @@ public Mono<Path> saveApplicationToLocalRepo(Path baseRepoSuffix,
* @param branchName for which branch the application needs to rehydrate
* @return application reference from which entire application can be rehydrated
*/
- public Mono<ApplicationJson> reconstructApplicationFromGitRepo(String organisationId,
- String defaultApplicationId,
- String repoName,
- String branchName) {
+ public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepo(String organisationId,
+ String defaultApplicationId,
+ String repoName,
+ String branchName) {
- return fileUtils.reconstructApplicationFromGitRepo(organisationId, defaultApplicationId, repoName, branchName)
+ return fileUtils.reconstructApplicationReferenceFromGitRepo(organisationId, defaultApplicationId, repoName, branchName)
.map(applicationReference -> {
// Extract application metadata from the json
@@ -173,7 +174,7 @@ public Mono<ApplicationJson> reconstructApplicationFromGitRepo(String organisati
migrateToLatestVersion(applicationReference);
}
ApplicationJson applicationJson = getApplicationJsonFromGitReference(applicationReference);
- BeanCopyUtils.copyNestedNonNullProperties(metadata, applicationJson);
+ copyNestedNonNullProperties(metadata, applicationJson);
return applicationJson;
});
@@ -182,13 +183,18 @@ public Mono<ApplicationJson> reconstructApplicationFromGitRepo(String organisati
private <T> List<T> getApplicationResource(Map<String, Object> resources, Type type) {
List<T> deserializedResources = new ArrayList<>();
- for (Map.Entry<String, Object> resource : resources.entrySet()) {
- deserializedResources.add(getApplicationResource(resource.getValue(), type));
+ if (!CollectionUtils.isNullOrEmpty(resources)) {
+ for (Map.Entry<String, Object> resource : resources.entrySet()) {
+ deserializedResources.add(getApplicationResource(resource.getValue(), type));
+ }
}
return deserializedResources;
}
private <T> T getApplicationResource(Object resource, Type type) {
+ if (resource == null) {
+ return null;
+ }
Gson gson = new Gson();
return gson.fromJson(gson.toJson(resource), type);
}
@@ -230,23 +236,22 @@ private void removeUnwantedFieldsFromPage(NewPage page) {
page.setDefaultResources(null);
page.setCreatedAt(null);
page.setUpdatedAt(null);
+ // As we are publishing the app and then committing to git we expect the published and unpublished PageDTO will
+ // be same, so we only commit unpublished PageDTO.
+ page.setPublishedPage(null);
+ page.setUserPermissions(null);
PageDTO unpublishedPage = page.getUnpublishedPage();
- PageDTO publishedPage = page.getPublishedPage();
if (unpublishedPage != null) {
unpublishedPage
.getLayouts()
.forEach(this::removeUnwantedFieldsFromLayout);
}
- if (publishedPage != null) {
- publishedPage
- .getLayouts()
- .forEach(this::removeUnwantedFieldsFromLayout);
- }
}
private void removeUnwantedFieldsFromApplication(Application application) {
// Don't commit application name as while importing we are using the repoName as application name
application.setName(null);
+ application.setPublishedPages(null);
}
private void removeUnwantedFieldsFromDatasource(Datasource datasource) {
@@ -254,41 +259,41 @@ private void removeUnwantedFieldsFromDatasource(Datasource datasource) {
datasource.setStructure(null);
datasource.setUpdatedAt(null);
datasource.setCreatedAt(null);
+ datasource.setUserPermissions(null);
}
private void removeUnwantedFieldFromAction(NewAction action) {
action.setDefaultResources(null);
action.setCreatedAt(null);
action.setUpdatedAt(null);
+ // As we are publishing the app and then committing to git we expect the published and unpublished ActionDTO will
+ // be same, so we only commit unpublished ActionDTO.
+ action.setPublishedAction(null);
+ action.setUserPermissions(null);
ActionDTO unpublishedAction = action.getUnpublishedAction();
- ActionDTO publishedAction = action.getPublishedAction();
if (unpublishedAction != null) {
unpublishedAction.setDefaultResources(null);
if (unpublishedAction.getDatasource() != null) {
unpublishedAction.getDatasource().setCreatedAt(null);
}
}
- if (publishedAction != null) {
- publishedAction.setDefaultResources(null);
- if (publishedAction.getDatasource() != null) {
- publishedAction.getDatasource().setCreatedAt(null);
- }
- }
}
private void removeUnwantedFieldFromActionCollection(ActionCollection actionCollection) {
actionCollection.setDefaultResources(null);
actionCollection.setCreatedAt(null);
actionCollection.setUpdatedAt(null);
+ // As we are publishing the app and then committing to git we expect the published and unpublished
+ // ActionCollectionDTO will be same, so we only commit unpublished ActionCollectionDTO.
+ actionCollection.setPublishedCollection(null);
+ actionCollection.setUserPermissions(null);
ActionCollectionDTO unpublishedCollection = actionCollection.getUnpublishedCollection();
- ActionCollectionDTO publishedCollection = actionCollection.getPublishedCollection();
if (unpublishedCollection != null) {
unpublishedCollection.setDefaultResources(null);
unpublishedCollection.setDefaultToBranchedActionIdsMap(null);
- }
- if (publishedCollection != null) {
- publishedCollection.setDefaultResources(null);
- publishedCollection.setDefaultToBranchedActionIdsMap(null);
+ unpublishedCollection.setDefaultToBranchedArchivedActionIdsMap(null);
+ unpublishedCollection.setActionIds(null);
+ unpublishedCollection.setArchivedActionIds(null);
}
}
@@ -309,11 +314,43 @@ private ApplicationJson getApplicationJsonFromGitReference(ApplicationGitReferen
// Extract application data from the json
applicationJson.setExportedApplication(getApplicationResource(applicationReference.getApplication(), Application.class));
+ Gson gson = new Gson();
+ // Extract pages
+ List<NewPage> pages = getApplicationResource(applicationReference.getPages(), NewPage.class);
+ pages.forEach(newPage -> {
+ // As we are publishing the app and then committing to git we expect the published and unpublished PageDTO
+ // will be same, so we create a deep copy for the published version for page from the unpublishedPageDTO
+ newPage.setPublishedPage(gson.fromJson(gson.toJson(newPage.getUnpublishedPage()), PageDTO.class));
+ });
+ applicationJson.setPageList(pages);
+
// Extract actions
- applicationJson.setActionList(getApplicationResource(applicationReference.getActions(), NewAction.class));
+ if (CollectionUtils.isNullOrEmpty(applicationReference.getActions())) {
+ applicationJson.setActionList(new ArrayList<>());
+ } else {
+ List<NewAction> actions = getApplicationResource(applicationReference.getActions(), NewAction.class);
+ actions.forEach(newAction -> {
+ // As we are publishing the app and then committing to git we expect the published and unpublished
+ // actionDTO will be same, so we create a deep copy for the published version for action from
+ // unpublishedActionDTO
+ newAction.setPublishedAction(gson.fromJson(gson.toJson(newAction.getUnpublishedAction()), ActionDTO.class));
+ });
+ applicationJson.setActionList(actions);
+ }
- // Extract pages
- applicationJson.setPageList(getApplicationResource(applicationReference.getPages(), NewPage.class));
+ // Extract actionCollection
+ if (CollectionUtils.isNullOrEmpty(applicationReference.getActionsCollections())) {
+ applicationJson.setActionCollectionList(new ArrayList<>());
+ } else {
+ List<ActionCollection> actionCollections = getApplicationResource(applicationReference.getActionsCollections(), ActionCollection.class);
+ actionCollections.forEach(actionCollection -> {
+ // As we are publishing the app and then committing to git we expect the published and unpublished
+ // actionCollectionDTO will be same, so we create a deep copy for the published version for
+ // actionCollection from unpublishedActionCollectionDTO
+ actionCollection.setPublishedCollection(gson.fromJson(gson.toJson(actionCollection.getUnpublishedCollection()), ActionCollectionDTO.class));
+ });
+ applicationJson.setActionCollectionList(actionCollections);
+ }
// Extract datasources
applicationJson.setDatasourceList(getApplicationResource(applicationReference.getDatasources(), Datasource.class));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
index 6c846680bf07..3a59a4ab326f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
@@ -483,7 +483,7 @@ public Mono<Application> findByBranchNameAndDefaultApplicationId(String branchNa
}
return repository.getApplicationByGitBranchAndDefaultApplicationId(defaultApplicationId, branchName, aclPermission)
.switchIfEmpty(Mono.error(
- new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, defaultApplicationId))
+ new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, defaultApplicationId + "," + branchName))
);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
index b709b4ef28e6..c97af12cd8dc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
@@ -1249,7 +1249,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
return applicationService.save(srcApplication)
.flatMap(application1 ->
- fileUtils.reconstructApplicationFromGitRepo(srcApplication.getOrganizationId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
+ fileUtils.reconstructApplicationJsonFromGitRepo(srcApplication.getOrganizationId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
.zipWith(Mono.just(application1))
);
})
@@ -1384,7 +1384,7 @@ else if (error.getMessage().contains("Nothing to fetch")) {
//3. Hydrate from file system to db
Application branchedApplication = objects.getT2();
MergeStatusDTO pullStatus = objects.getT1();
- Mono<ApplicationJson> applicationJson = fileUtils.reconstructApplicationFromGitRepo(
+ Mono<ApplicationJson> applicationJson = fileUtils.reconstructApplicationJsonFromGitRepo(
branchedApplication.getOrganizationId(),
branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
branchedApplication.getGitApplicationMetadata().getRepoName(),
@@ -1707,7 +1707,7 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
String mergeStatus = mergeStatusTuple.getT1();
//3. rehydrate from file system to db
- Mono<ApplicationJson> applicationJson = fileUtils.reconstructApplicationFromGitRepo(
+ Mono<ApplicationJson> applicationJson = fileUtils.reconstructApplicationJsonFromGitRepo(
defaultApplication.getOrganizationId(),
defaultApplication.getGitApplicationMetadata().getDefaultApplicationId(),
defaultApplication.getGitApplicationMetadata().getRepoName(),
@@ -1998,7 +1998,7 @@ public Mono<GitImportDTO> importApplicationFromGit(String organizationId, GitCon
Mono<List<Datasource>> datasourceMono = datasourceService.findAllByOrganizationId(organizationId, MANAGE_DATASOURCES).collectList();
Mono<List<Plugin>> pluginMono = pluginService.getDefaultPlugins().collectList();
Mono<ApplicationJson> applicationJsonMono = fileUtils
- .reconstructApplicationFromGitRepo(organizationId, application.getId(), gitApplicationMetadata.getRepoName(), defaultBranch)
+ .reconstructApplicationJsonFromGitRepo(organizationId, application.getId(), gitApplicationMetadata.getRepoName(), defaultBranch)
.onErrorResume(error -> {
log.error("Error while constructing application from git repo", error);
return deleteApplicationCreatedFromGitImport(application.getId(), application.getOrganizationId(), gitApplicationMetadata.getRepoName())
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitFileUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitFileUtilsTest.java
new file mode 100644
index 000000000000..d42268ae6ffb
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitFileUtilsTest.java
@@ -0,0 +1,178 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.external.git.FileInterface;
+import com.appsmith.external.models.ApplicationGitReference;
+import com.appsmith.server.domains.ApplicationJson;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import lombok.SneakyThrows;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.lang.reflect.Type;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class GitFileUtilsTest {
+
+ @MockBean
+ FileInterface fileInterface;
+
+ @Autowired
+ GitFileUtils gitFileUtils;
+
+ private static String filePath = "test_assets/ImportExportServiceTest/valid-application.json";
+ private static final Path localRepoPath = Path.of("localRepoPath");
+
+ private Mono<ApplicationJson> createAppJson(String filePath) {
+ FilePart filePart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+ Flux<DataBuffer> dataBufferFlux = DataBufferUtils
+ .read(
+ new ClassPathResource(filePath),
+ new DefaultDataBufferFactory(),
+ 4096)
+ .cache();
+
+ Mockito.when(filePart.content()).thenReturn(dataBufferFlux);
+ Mockito.when(filePart.headers().getContentType()).thenReturn(MediaType.APPLICATION_JSON);
+
+ Mono<String> stringifiedFile = DataBufferUtils.join(filePart.content())
+ .map(dataBuffer -> {
+ byte[] data = new byte[dataBuffer.readableByteCount()];
+ dataBuffer.read(data);
+ DataBufferUtils.release(dataBuffer);
+ return new String(data);
+ });
+
+ return stringifiedFile
+ .map(data -> {
+ Gson gson = new Gson();
+ Type fileType = new TypeToken<ApplicationJson>() {
+ }.getType();
+ return gson.fromJson(data, fileType);
+ });
+ }
+
+ @SneakyThrows
+ @Test
+ public void saveApplicationToLocalRepo_allResourcesArePresent_removePublishedResources() {
+ ApplicationJson validAppJson = createAppJson(filePath).block();
+
+ Mockito.when(fileInterface.saveApplicationToGitRepo(Mockito.any(), Mockito.any(), Mockito.any()))
+ .thenReturn(Mono.just(localRepoPath));
+
+ Mono<Path> resultMono = gitFileUtils.saveApplicationToLocalRepo(Path.of(""), validAppJson, "gitFileTest");
+
+ StepVerifier
+ .create(resultMono)
+ .assertNext(path -> {
+ validAppJson.getPageList().forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage()).isNotNull();
+ assertThat(newPage.getPublishedPage()).isNull();
+ });
+ validAppJson.getActionList().forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction()).isNotNull();
+ assertThat(newAction.getPublishedAction()).isNull();
+ });
+ validAppJson.getActionCollectionList().forEach(actionCollection -> {
+ assertThat(actionCollection.getUnpublishedCollection()).isNotNull();
+ assertThat(actionCollection.getPublishedCollection()).isNull();
+ });
+ })
+ .verifyComplete();
+ }
+
+ @SneakyThrows
+ @Test
+ public void reconstructApplicationFromLocalRepo_allResourcesArePresent_getClonedPublishedResources() {
+ ApplicationJson applicationJson = createAppJson(filePath).block();
+ // Prepare the JSON without published resources
+ Map<String, Object> pageRef = new HashMap<>();
+ Map<String, Object> actionRef = new HashMap<>();
+ Map<String, Object> actionCollectionRef = new HashMap<>();
+ applicationJson.getPageList().forEach(newPage -> {
+ newPage.setPublishedPage(null);
+ pageRef.put(newPage.getUnpublishedPage().getName(), newPage);
+ });
+ applicationJson.getActionList().forEach(newAction -> {
+ newAction.setPublishedAction(null);
+ actionRef.put(newAction.getUnpublishedAction().getName(), newAction);
+ });
+ applicationJson.getActionCollectionList().forEach(actionCollection -> {
+ actionCollection.setPublishedCollection(null);
+ actionCollectionRef.put(actionCollection.getUnpublishedCollection().getName(), actionCollection);
+ });
+
+ ApplicationGitReference applicationReference = new ApplicationGitReference();
+ applicationReference.setPages(pageRef);
+ applicationReference.setActions(actionRef);
+ applicationReference.setActionsCollections(actionCollectionRef);
+
+ Mockito.when(fileInterface.reconstructApplicationReferenceFromGitRepo(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
+ .thenReturn(Mono.just(applicationReference));
+
+ Mono<ApplicationJson> resultMono = gitFileUtils.reconstructApplicationJsonFromGitRepo(
+ "orgId", "appId", "repoName", "branch"
+ )
+ .cache();
+
+ StepVerifier
+ .create(resultMono)
+ .assertNext(applicationJson1 -> {
+ applicationJson1.getPageList().forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage()).isNotNull();
+ // Both DTOs will not be equal as we are creating a deep copy for the published version from
+ // unpublished version
+ assertThat(newPage.getPublishedPage()).isNotEqualTo(newPage.getUnpublishedPage());
+
+ // Check if the published versions are deep copy of the unpublished version and updating any
+ // will not affect the other
+ final String unpublishedName = newPage.getUnpublishedPage().getName();
+ newPage.getUnpublishedPage().setName("updatedName");
+
+ assertThat(newPage.getPublishedPage().getName()).isEqualTo(unpublishedName);
+ assertThat(newPage.getUnpublishedPage().getName()).isNotEqualTo(unpublishedName);
+ });
+ applicationJson1.getActionList().forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction()).isNotNull();
+ assertThat(newAction.getPublishedAction()).isNotEqualTo(newAction.getUnpublishedAction());
+
+ final String unpublishedName = newAction.getUnpublishedAction().getName();
+ newAction.getUnpublishedAction().setName("updatedName");
+ assertThat(newAction.getPublishedAction().getName()).isEqualTo(unpublishedName);
+ assertThat(newAction.getUnpublishedAction().getName()).isNotEqualTo(unpublishedName);
+ });
+ applicationJson1.getActionCollectionList().forEach(actionCollection -> {
+ assertThat(actionCollection.getUnpublishedCollection()).isNotNull();
+ assertThat(actionCollection.getPublishedCollection()).isNotEqualTo(actionCollection.getUnpublishedCollection());
+
+ final String unpublishedName = actionCollection.getUnpublishedCollection().getName();
+ actionCollection.getUnpublishedCollection().setName("updatedName");
+ assertThat(actionCollection.getPublishedCollection().getName()).isEqualTo(unpublishedName);
+ assertThat(actionCollection.getUnpublishedCollection().getName()).isNotEqualTo(unpublishedName);
+ });
+ })
+ .verifyComplete();
+
+ }
+
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
index 70e02d2b0a1c..2b6baf15121c 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
@@ -362,7 +362,7 @@ public void getApplicationByDefaultIdAndBranchName_invalidBranchName_throwExcept
Mono<Application> applicationMono = applicationService.findByBranchNameAndDefaultApplicationId("randomBranch", gitConnectedApp.getId(), READ_APPLICATIONS);
StepVerifier.create(applicationMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
- throwable.getMessage().equals(AppsmithError.ACL_NO_RESOURCE_FOUND.getMessage(FieldName.APPLICATION, gitConnectedApp.getId())))
+ throwable.getMessage().equals(AppsmithError.ACL_NO_RESOURCE_FOUND.getMessage(FieldName.APPLICATION, gitConnectedApp.getId() + "," + "randomBranch")))
.verify();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
index 79f105b2c609..0267c09e1cee 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
@@ -1241,7 +1241,7 @@ public void pullChanges_upstreamChangesAvailable_pullSuccess() throws IOExceptio
Mockito.when(gitFileUtils.saveApplicationToLocalRepo(Mockito.any(Path.class), Mockito.any(ApplicationJson.class), Mockito.anyString()))
.thenReturn(Mono.just(Paths.get("path")));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(validAppJson));
Mockito.when(gitExecutor.pullApplication(
Mockito.any(Path.class),Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
@@ -1273,7 +1273,7 @@ public void pullChanges_FileSystemAccessError_throwError() throws IOException, G
Mockito.when(gitFileUtils.saveApplicationToLocalRepo(Mockito.any(Path.class), Mockito.any(ApplicationJson.class), Mockito.anyString()))
.thenThrow(new IOException("Error accessing the file System"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(new ApplicationJson()));
Mockito.when(gitExecutor.pullApplication(
Mockito.any(Path.class),Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
@@ -1301,7 +1301,7 @@ public void pullChanges_noUpstreamChanges_nothingToPullMessage() throws IOExcept
Mockito.when(gitFileUtils.saveApplicationToLocalRepo(Mockito.any(Path.class), Mockito.any(ApplicationJson.class), Mockito.anyString()))
.thenReturn(Mono.just(Paths.get("")));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.justOrEmpty(applicationJson));
Mockito.when(gitExecutor.getStatus(Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(new GitStatusDTO()));
@@ -1483,7 +1483,7 @@ public void checkoutRemoteBranch_notPresentInLocal_newApplicationCreated() throw
.thenReturn(Mono.just("fetchResult"));
Mockito.when(gitExecutor.checkoutRemoteBranch(Mockito.any(Path.class), Mockito.anyString()))
.thenReturn(Mono.just("testBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitExecutor.listBranches(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(branchList));
@@ -2180,7 +2180,7 @@ public void importApplicationFromGit_validRequest_Success() throws GitAPIExcepti
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just("defaultBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mono<GitImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
@@ -2218,7 +2218,7 @@ public void importApplicationFromGit_validRequestWithDuplicateApplicationName_Su
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just("defaultBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mono<GitImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
@@ -2264,7 +2264,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just("defaultBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitFileUtils.detachRemote(Mockito.any(Path.class))).thenReturn(Mono.just(true));
@@ -2311,7 +2311,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just("defaultBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitFileUtils.detachRemote(Mockito.any(Path.class))).thenReturn(Mono.just(true));
@@ -2367,7 +2367,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfDiffer
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just("defaultBranch"));
- Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitFileUtils.detachRemote(Mockito.any(Path.class)))
.thenReturn(Mono.just(true));
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
index efe335b47d65..eb5210359f90 100644
--- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
@@ -602,6 +602,21 @@
}
]
},
+ "publishedCollection": {
+ "name": "JSObject1_Published",
+ "pageId": "Page1",
+ "pluginId": "js-plugin",
+ "pluginType": "JS",
+ "actions": [],
+ "archivedActions": [],
+ "body": "export default {\n\tresults: [],\n\trunMethod: () => {\n\t\t//write code here\n\t\treturn \"Hi\"\n\t}\n}",
+ "variables": [
+ {
+ "name": "results",
+ "value": []
+ }
+ ]
+ },
"new": false
},
{
|
d0de9c2fbed4283334c032a5ce72c7b8ded6d5e7
|
2023-12-15 18:28:26
|
sharanya-appsmith
|
test: Cypress - added tags - @tag.Git, @tag.JS, @tag.Binding, @tag.Datasource, @tag.ImportExport (#29516)
| false
|
Cypress - added tags - @tag.Git, @tag.JS, @tag.Binding, @tag.Datasource, @tag.ImportExport (#29516)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js b/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
index 562acb3da965..13a5a2784bf2 100644
--- a/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js
@@ -9,7 +9,7 @@ import {
describe(
"Import, Export and Fork application and validate data binding",
- { tags: ["@tag.Migrate"] },
+ { tags: ["@tag.ImportExport"] },
function () {
let workspaceId;
let newWorkspaceName;
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
index d1455518865e..651fe9889948 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
@@ -46,6 +46,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
});
it(
+ "excludeForAirgap",
"4. Should test that settings page tab redirects",
{ tags: ["@tag.excludeForAirgap"] },
() => {
@@ -68,6 +69,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
);
it(
+ "airgap",
"4. Should test that settings page tab redirects and developer settings doesn't exist - airgap",
{ tags: ["@tag.airgap"] },
() => {
@@ -91,6 +93,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
);
it(
+ "excludeForAirgap",
"5. Should test that authentication page redirects",
{ tags: ["@tag.excludeForAirgap"] },
() => {
@@ -111,6 +114,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
);
it(
+ "airgap",
"5. Should test that authentication page redirects and google and github auth doesn't exist - airgap",
{ tags: ["@tag.airgap"] },
() => {
@@ -125,6 +129,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
);
it(
+ "excludeForAirgap",
"6. Should test that configure link redirects to google signup setup doc",
{ tags: ["@tag.excludeForAirgap"] },
() => {
@@ -144,6 +149,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
);
it(
+ "excludeForAirgap",
"7. Should test that configure link redirects to github signup setup doc",
{ tags: ["@tag.excludeForAirgap"] },
() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
index fea844e78dd6..2c26b540de0e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
@@ -91,8 +91,8 @@ describe("Autocomplete bug fixes", { tags: ["@tag.JS"] }, function () {
});
it(
+ "excludeForAirgap",
"7. Installed library should show up in autocomplete",
- { tags: ["@tag.excludeForAirgap"] },
function () {
AppSidebar.navigate(AppSidebarButton.Libraries);
installer.OpenInstaller();
@@ -106,8 +106,8 @@ describe("Autocomplete bug fixes", { tags: ["@tag.JS"] }, function () {
);
it(
+ "excludeForAirgap",
"8. No autocomplete for Removed libraries",
- { tags: ["@tag.excludeForAirgap"] },
function () {
entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT");
AppSidebar.navigate(AppSidebarButton.Libraries);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Button_Text_WithRecaptcha_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/Button_Text_WithRecaptcha_spec.js
index 533a3240eaeb..3ee4e5c09b7f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Button_Text_WithRecaptcha_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Button_Text_WithRecaptcha_spec.js
@@ -6,6 +6,7 @@ const testdata = require("../../../../fixtures/testdata.json");
import * as _ from "../../../../support/Objects/ObjectsCore";
describe(
+ "excludeForAirgap",
"Binding the Button widget with Text widget using Recpatcha v3",
{ tags: ["@tag.excludeForAirgap", "@tag.Binding"] },
function () {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
index e2ec9dd6a59d..b4d4ef157394 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
@@ -26,7 +26,7 @@ const locators = {
AdminSettingsColorInputShades: ".t--color-input-shades",
};
-describe("Branding", () => {
+describe("Branding", { tags: ["@tag.Settings"] }, () => {
it("1. Super user can access branding page", () => {
cy.LogOut();
cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
index 4fb38b0c7803..de931926ddac 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
@@ -14,7 +14,7 @@ const largeResponseApiUrl = "https://api.github.com/emojis";
//"https://api.publicapis.org/entries";
//"https://jsonplaceholder.typicode.com/photos";//Commenting since this is faster sometimes & case is failing
-describe("Abort Action Execution", function () {
+describe("Abort Action Execution", { tags: ["@tag.Datasource"] }, function () {
it("1. Bug #14006, #16093 - Cancel request button should abort API action execution", function () {
apiPage.CreateAndFillApi(largeResponseApiUrl, "AbortApi", 0);
apiPage.RunAPI(false, 0);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
index d95e517dc7f8..0945e34aea53 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/AllWidgets_Reset_Spec.ts
@@ -412,50 +412,57 @@ function filePickerWidgetAndReset() {
}
Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig]) => {
- describe(`${testConfig.widgetName} widget test for validating reset assertWidgetReset`, () => {
- beforeEach(() => {
- _.agHelper.RestoreLocalStorageCache();
- });
+ describe(
+ `${testConfig.widgetName} widget test for validating reset assertWidgetReset`,
+ { tags: ["@tag.Widget"] },
+ () => {
+ beforeEach(() => {
+ _.agHelper.RestoreLocalStorageCache();
+ });
- afterEach(() => {
- _.agHelper.SaveLocalStorageCache();
- });
+ afterEach(() => {
+ _.agHelper.SaveLocalStorageCache();
+ });
- it(`1. DragDrop Widget ${testConfig.widgetName}`, () => {
- _.agHelper.AddDsl("defaultMetaDsl");
- _.entityExplorer.DragDropWidgetNVerify(widgetSelector, 300, 100);
+ it(`1. DragDrop Widget ${testConfig.widgetName}`, () => {
+ _.agHelper.AddDsl("defaultMetaDsl");
+ _.entityExplorer.DragDropWidgetNVerify(widgetSelector, 300, 100);
- if (testConfig.setupWidget) {
- testConfig.setupWidget();
- }
- });
+ if (testConfig.setupWidget) {
+ testConfig.setupWidget();
+ }
+ });
- it("2. Bind Button on click and Text widget content", () => {
- // Set onClick assertWidgetReset, storing value
- EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
- _.propPane.EnterJSContext(
- "onClick",
- `{{resetWidget("${testConfig.widgetPrefixName}",true).then(() => showAlert("Reset Success!"))}}`,
- );
- // Bind to stored value above
- EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
- _.propPane.UpdatePropertyFieldValue("Text", testConfig.textBindingValue);
- });
+ it("2. Bind Button on click and Text widget content", () => {
+ // Set onClick assertWidgetReset, storing value
+ EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+ _.propPane.EnterJSContext(
+ "onClick",
+ `{{resetWidget("${testConfig.widgetPrefixName}",true).then(() => showAlert("Reset Success!"))}}`,
+ );
+ // Bind to stored value above
+ EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+ _.propPane.UpdatePropertyFieldValue(
+ "Text",
+ testConfig.textBindingValue,
+ );
+ });
- it(`3. Publish the app and check the reset of ${testConfig.widgetName}`, () => {
- // Set onClick assertWidgetReset, storing value
- _.deployMode.DeployApp(_.locators._widgetInDeployed(widgetSelector));
- testConfig.assertWidgetReset();
- _.agHelper.ValidateToastMessage("Reset Success!");
- });
+ it(`3. Publish the app and check the reset of ${testConfig.widgetName}`, () => {
+ // Set onClick assertWidgetReset, storing value
+ _.deployMode.DeployApp(_.locators._widgetInDeployed(widgetSelector));
+ testConfig.assertWidgetReset();
+ _.agHelper.ValidateToastMessage("Reset Success!");
+ });
- it(`4. Delete ${testConfig.widgetName} widget from canvas`, () => {
- _.deployMode.NavigateBacktoEditor();
- EditorNavigation.SelectEntityByName(
- `${testConfig.widgetPrefixName}`,
- EntityType.Widget,
- );
- _.agHelper.PressDelete();
- });
- });
+ it(`4. Delete ${testConfig.widgetName} widget from canvas`, () => {
+ _.deployMode.NavigateBacktoEditor();
+ EditorNavigation.SelectEntityByName(
+ `${testConfig.widgetPrefixName}`,
+ EntityType.Widget,
+ );
+ _.agHelper.PressDelete();
+ });
+ },
+ );
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts
new file mode 100644
index 000000000000..3df84846bcad
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBug6732_Spec.ts
@@ -0,0 +1,26 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+const { apiPage } = _;
+
+describe(
+ "Bug 6732 - this.params in IIFE function in API editor",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ it("1. this.params should be available in IIFE function in API editor", () => {
+ apiPage.CreateApi("Api1", "GET");
+
+ apiPage.SelectPaneTab("Params");
+ apiPage.EnterParams(
+ "page",
+ "{{(function () { return this.params.key; })()}}",
+ 0,
+ false,
+ );
+
+ cy.get(apiPage._paramValue(0)).should(
+ "not.have.class",
+ "t--codemirror-has-error",
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
index 9265f251b240..000e57b7f3b4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts
@@ -22,7 +22,7 @@ import {
AppSidebarButton,
} from "../../../../support/Pages/EditorNavigation";
-describe("API Bugs", function () {
+describe("API Bugs", { tags: ["@tag.Datasource"] }, function () {
before(() => {
agHelper.RefreshPage();
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts
new file mode 100644
index 000000000000..d5d4c62b71a0
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts
@@ -0,0 +1,50 @@
+import {
+ agHelper,
+ dataSources,
+ draggableWidgets,
+ entityExplorer,
+ propPane,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+ EntityType,
+} from "../../../../support/Pages/EditorNavigation";
+
+let dsName: any;
+let queryName: string;
+
+describe(
+ "Bug 28287: Binding query to widget, check query response in query editor on page load",
+ { tags: ["@tag.Binding", "@tag.Widget"] },
+ function () {
+ before("Drag drop a text widget", () => {
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT);
+ });
+
+ it("1. Check query response in query editor on page load", () => {
+ agHelper.GenerateUUID();
+ cy.get("@guid").then((uuid) => {
+ dataSources.CreateDataSource("Postgres");
+ cy.get("@dsName").then(($dsName) => {
+ dsName = $dsName;
+ });
+ queryName = `Query_${uuid}`;
+ dataSources.CreateQueryAfterDSSaved(
+ "SELECT * FROM users LIMIT 10",
+ queryName,
+ );
+ dataSources.ToggleUsePreparedStatement(false);
+
+ EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+ propPane.TypeTextIntoField("Text", `{{${queryName}.data}}`);
+
+ agHelper.RefreshPage();
+
+ agHelper.Sleep(1000);
+
+ EditorNavigation.SelectEntityByName(queryName, EntityType.Query);
+
+ agHelper.AssertElementVisibility(dataSources._queryResponse("TABLE"));
+ });
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts
new file mode 100644
index 000000000000..af48b665baf5
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28731_Spec.ts
@@ -0,0 +1,45 @@
+import OneClickBindingLocator from "../../../../locators/OneClickBindingLocator";
+import {
+ agHelper,
+ entityExplorer,
+ apiPage,
+ dataManager,
+ draggableWidgets,
+ propPane,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe(
+ "transformed one-click binding",
+ { tags: ["@tag.JS", "@tag.Binding"] },
+ function () {
+ it("Transforms API data to match widget exppected type ", function () {
+ // Create anAPI that mreturns object response
+ apiPage.CreateAndFillApi(
+ dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
+ );
+ apiPage.RunAPI();
+
+ // Table
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 300);
+
+ agHelper.GetNClick(OneClickBindingLocator.datasourceDropdownSelector);
+ agHelper.GetNClick(
+ OneClickBindingLocator.datasourceQuerySelector("Api1"),
+ );
+ propPane.ToggleJSMode("Table Data", true);
+ agHelper.AssertContains("{{Api1.data.users}}");
+
+ // Select widget
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT, 100, 100);
+
+ agHelper.GetNClick(OneClickBindingLocator.datasourceDropdownSelector);
+ agHelper.GetNClick(
+ OneClickBindingLocator.datasourceQuerySelector("Api1"),
+ );
+ propPane.ToggleJSMode("Source Data", true);
+ agHelper.AssertContains(
+ "{{Api1.data.users.map( (obj) =>{ return {'label': obj.address, 'value': obj.avatar } })}}",
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14002_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14002_Spec.ts
deleted file mode 100644
index 3795557804dd..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14002_Spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-describe("Invalid JSObject export statement", function () {
- it("1. Shows error toast for invalid js object export statement", function () {
- const JSObjectWithInvalidExport = `{
- myFun1: ()=>{
- return (name)=>name
- },
- myFun2: async ()=>{
- return this.myFun1()("John Doe")
- }
- }`;
-
- const INVALID_START_STATEMENT = "Start object with export default";
-
- _.jsEditor.CreateJSObject(JSObjectWithInvalidExport, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- });
-
- // Assert toast message
- _.agHelper.ValidateToastMessage(INVALID_START_STATEMENT);
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
index 64c239849ff0..4d73e1c3f2c0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
@@ -5,53 +5,57 @@ import {
entityItems,
} from "../../../../support/Objects/ObjectsCore";
-describe("Verify setting tab form controls not to have tooltip and tooltip (underline) styles", function () {
- let guid, datasourceName;
+describe(
+ "Verify setting tab form controls not to have tooltip and tooltip (underline) styles",
+ { tags: ["@tag.Datasource", "@tag.Settings"] },
+ function () {
+ let guid, datasourceName;
- before("Creates a new Mongo datasource", () => {
- dataSources.CreateDataSource("Mongo");
- cy.get("@dsName").then(($dsName) => {
- datasourceName = $dsName;
+ before("Creates a new Mongo datasource", () => {
+ dataSources.CreateDataSource("Mongo");
+ cy.get("@dsName").then(($dsName) => {
+ datasourceName = $dsName;
+ });
});
- });
- it("1. We make sure the label in the settings tab does not have any underline styles", function () {
- dataSources.CreateQueryForDS(datasourceName);
+ it("1. We make sure the label in the settings tab does not have any underline styles", function () {
+ dataSources.CreateQueryForDS(datasourceName);
- cy.xpath(queryLocators.querySettingsTab).click();
+ cy.xpath(queryLocators.querySettingsTab).click();
- cy.get(".label-icon-wrapper")
- .contains("Run query on page load")
- .parent()
- .then(($el) => {
- cy.window().then((win) => {
- cy.log($el, win);
- const after = win.getComputedStyle($el[0], "::after");
- cy.log($el, win, after);
- const afterBorderBottom = after.getPropertyValue("borderBottom");
- // we expect the border bottom of the element to be an empty string as opposed to "1px dashed"
- expect(afterBorderBottom).to.equal("");
+ cy.get(".label-icon-wrapper")
+ .contains("Run query on page load")
+ .parent()
+ .then(($el) => {
+ cy.window().then((win) => {
+ cy.log($el, win);
+ const after = win.getComputedStyle($el[0], "::after");
+ cy.log($el, win, after);
+ const afterBorderBottom = after.getPropertyValue("borderBottom");
+ // we expect the border bottom of the element to be an empty string as opposed to "1px dashed"
+ expect(afterBorderBottom).to.equal("");
+ });
});
- });
- cy.get(".label-icon-wrapper")
- .contains("Request confirmation before running query")
- .parent()
- .then(($el) => {
- cy.window().then((win) => {
- cy.log($el, win);
- const after = win.getComputedStyle($el[0], "::after");
- cy.log($el, win, after);
- const afterBorderBottom = after.getPropertyValue("borderBottom");
- // we expect the border bottom of the element to be an empty string as opposed to "1px dashed"
- expect(afterBorderBottom).to.equal("");
+ cy.get(".label-icon-wrapper")
+ .contains("Request confirmation before running query")
+ .parent()
+ .then(($el) => {
+ cy.window().then((win) => {
+ cy.log($el, win);
+ const after = win.getComputedStyle($el[0], "::after");
+ cy.log($el, win, after);
+ const afterBorderBottom = after.getPropertyValue("borderBottom");
+ // we expect the border bottom of the element to be an empty string as opposed to "1px dashed"
+ expect(afterBorderBottom).to.equal("");
+ });
});
- });
- agHelper.ActionContextMenuWithInPane({
- action: "Delete",
- entityType: entityItems.Query,
+ agHelper.ActionContextMenuWithInPane({
+ action: "Delete",
+ entityType: entityItems.Query,
+ });
+ dataSources.DeleteDatasourceFromWithinDS(datasourceName, 200);
});
- dataSources.DeleteDatasourceFromWithinDS(datasourceName, 200);
- });
-});
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug16702_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug16702_Spec.ts
deleted file mode 100644
index f9c74bed219d..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug16702_Spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-const GRAPHQL_LIMIT_QUERY = `
- query {
- launchesPast(limit:
- "__limit__"
- ,offset:
- "__offset__"
- ) {
- mission_name
- rocket {
- rocket_name
-`;
-
-const GRAPHQL_RESPONSE = {
- mission_name: "Sentinel-6 Michael Freilich",
-};
-
-describe("Binding Expressions should not be truncated in Url and path extraction", function () {
- it.skip("Bug 16702, Moustache+Quotes formatting goes wrong in graphql body resulting in autocomplete failure", function () {
- const jsObjectBody = `export default {
- limitValue: 1,
- offsetValue: 1,
- }`;
-
- _.jsEditor.CreateJSObject(jsObjectBody, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- });
-
- _.apiPage.CreateAndFillGraphqlApi(
- _.dataManager.dsValues[_.dataManager.defaultEnviorment].GraphqlApiUrl_TED,
- );
- _.dataSources.UpdateGraphqlQueryAndVariable({
- query: GRAPHQL_LIMIT_QUERY,
- });
-
- cy.get(".t--graphql-query-editor pre.CodeMirror-line span")
- .contains("__offset__")
- // .should($el => {
- // expect(Cypress.dom.isDetached($el)).to.false;
- // })
- //.trigger("mouseover")
- .dblclick()
- .dblclick()
- .type("{{JSObject1.");
- _.agHelper.GetNAssertElementText(
- _.locators._hints,
- "offsetValue",
- "have.text",
- 1,
- );
- _.agHelper.Sleep();
- _.agHelper.TypeText(_.locators._codeMirrorTextArea, "offsetValue", 1);
- _.agHelper.Sleep(2000);
-
- /* Start: Block of code to remove error of detached node of codemirror for cypress reference */
-
- _.apiPage.SelectPaneTab("Params");
- _.apiPage.SelectPaneTab("Body");
- /* End: Block of code to remove error of detached node of codemirror for cypress reference */
-
- cy.get(".t--graphql-query-editor pre.CodeMirror-line span")
- .contains("__limit__")
- //.trigger("mouseover")
- .dblclick()
- .type("{{JSObject1.");
- _.agHelper.GetNClickByContains(_.locators._hints, "limitValue");
- _.agHelper.Sleep(2000);
- //Commenting this since - many runs means - API response is 'You are doing too many launches'
- // _.apiPage.RunAPI(false, 20, {
- // expectedPath: "response.body.data.body.data.launchesPast[0].mission_name",
- // expectedRes: GRAPHQL_RESPONSE.mission_name,
- // });
- _.apiPage.RunAPI();
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19893_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19893_spec.ts
deleted file mode 100644
index 7c454f5a5325..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19893_spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-let dsName: any;
-
-describe("Bug 19893: Authenticated API DS in case of OAuth2, should have save and authorise button enabled all the times", function () {
- it("1. Create Auth API DS, save i, now edit again and check the save and authorise button state", function () {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- dsName = "AuthAPI " + uid;
- _.dataSources.CreatePlugIn("Authenticated API");
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillAuthAPIUrl();
- _.dataSources.AssertCursorPositionForTextInput(
- _.dataSources._urlInputControl,
- "{moveToStart}",
- "localhost",
- 9,
- );
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19982_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19982_Spec.ts
deleted file mode 100644
index 3eb917f58869..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug19982_Spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ObjectsRegistry } from "../../../../support/Objects/Registry";
-
-const jsEditor = ObjectsRegistry.JSEditor,
- agHelper = ObjectsRegistry.AggregateHelper;
-
-describe("JS Execution of Higher-order-functions", function () {
- it("1. Completes execution properly", function () {
- const JSObjectWithHigherOrderFunction = `export default{
- myFun1: ()=>{
- return (name)=>name
- },
- myFun2: async ()=>{
- return this.myFun1()("John Doe")
- }
- }`;
-
- jsEditor.CreateJSObject(JSObjectWithHigherOrderFunction, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- });
-
- // Select And Run myFun2
- jsEditor.SelectFunctionDropdown("myFun2");
- jsEditor.RunJSObj();
-
- agHelper.Sleep(3000);
- //Expect to see Response
- agHelper.AssertContains("John Doe");
-
- // Select And Run myFun1
- jsEditor.SelectFunctionDropdown("myFun1");
- jsEditor.RunJSObj();
-
- // Expect to see jsfunction execution error
- jsEditor.AssertParseError(true);
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js
index e5e56460329c..45d072a8b392 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js
@@ -11,34 +11,40 @@ const jsEditor = ObjectsRegistry.JSEditor,
ee = ObjectsRegistry.EntityExplorer,
propPane = ObjectsRegistry.PropertyPane;
-describe("Testing if user.email is avaible on page load", function () {
- it("1. Bug: 20275: {{appsmith.user.email}} is not available on page load", function () {
- const JS_OBJECT_BODY = `export default{
+describe(
+ "Testing if user.email is avaible on page load",
+ { tags: ["@tag.Binding"] },
+ function () {
+ it("1. Bug: 20275: {{appsmith.user.email}} is not available on page load", function () {
+ const JS_OBJECT_BODY = `export default{
myFun1: ()=>{
showAlert(appsmith.user.email)
},
}`;
- jsEditor.CreateJSObject(JS_OBJECT_BODY, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- });
+ jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ });
- jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false);
+ jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false);
- ee.DragDropWidgetNVerify(WIDGET.TEXT, 200, 600);
- EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
- propPane.TypeTextIntoField("Text", "{{appsmith.user.email}}");
+ ee.DragDropWidgetNVerify(WIDGET.TEXT, 200, 600);
+ EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+ propPane.TypeTextIntoField("Text", "{{appsmith.user.email}}");
- deployMode.DeployApp();
+ deployMode.DeployApp();
- agHelper.ValidateToastMessage(Cypress.env("USERNAME"));
+ agHelper.ValidateToastMessage(Cypress.env("USERNAME"));
- agHelper
- .GetText(locator._textWidgetInDeployed)
- .then(($userEmail) => expect($userEmail).to.eq(Cypress.env("USERNAME")));
- });
-});
+ agHelper
+ .GetText(locator._textWidgetInDeployed)
+ .then(($userEmail) =>
+ expect($userEmail).to.eq(Cypress.env("USERNAME")),
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20841_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20841_Spec.ts
deleted file mode 100644
index ffbbbc26e26c..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20841_Spec.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
- EntityType,
-} from "../../../../support/Pages/EditorNavigation";
-import PageList from "../../../../support/Pages/PageList";
-
-describe("Evaluations causing error when page is cloned", function () {
- it("1. Bug: 20841: JSObjects | Sync methods | Not run consistently when Page is cloned", function () {
- const JS_OBJECT_BODY = `export default{
- myFun1: ()=>{
- return "Default text";
- },
- }`;
- _.entityExplorer.DragDropWidgetNVerify(
- _.draggableWidgets.INPUT_V2,
- 200,
- 600,
- );
- _.jsEditor.CreateJSObject(JS_OBJECT_BODY, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- });
- EditorNavigation.SelectEntityByName("Input1", EntityType.Widget);
- _.propPane.UpdatePropertyFieldValue(
- "Default value",
- "{{JSObject1.myFun1()}}",
- );
-
- _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
-
- PageList.ClonePage("Page1");
- _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
-
- PageList.ClonePage("Page1");
- _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
-
- PageList.ClonePage("Page1 Copy");
- _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts
deleted file mode 100644
index 266462e74580..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { ObjectsRegistry } from "../../../../support/Objects/Registry";
-import EditorNavigation, {
- EntityType,
- AppSidebarButton,
- AppSidebar,
-} from "../../../../support/Pages/EditorNavigation";
-import PageList from "../../../../support/Pages/PageList";
-
-const dataSources = ObjectsRegistry.DataSources,
- agHelper = ObjectsRegistry.AggregateHelper;
-
-describe("Bug 21734: On exiting from the Datasources page without saving changes, an error is thrown and the app becomes unresponsive.", function () {
- it("1. Navigating from intermediary datasource to new page", function () {
- dataSources.NavigateToDSCreateNew();
- dataSources.CreatePlugIn("Mongo");
- // Have to fill form since modal won't show for empty ds
- dataSources.FillMongoDSForm();
-
- agHelper.GetNClick(dataSources._addNewDataSource, 0, true);
-
- agHelper.AssertContains(
- "Don't save",
- "exist",
- dataSources._datasourceModalDoNotSave,
- );
- cy.get(dataSources._datasourceModalDoNotSave).click({ force: true });
-
- PageList.AddNewPage();
-
- EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
- agHelper.AssertURL("page1");
-
- EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
- agHelper.AssertURL("page2");
- });
- it("2. Navigating from intermediary datasource to an existing page", function () {
- dataSources.NavigateToDSCreateNew();
- dataSources.CreatePlugIn("PostgreSQL");
- // Have to fill form since modal won't show for empty ds
- dataSources.FillPostgresDSForm();
-
- AppSidebar.navigate(AppSidebarButton.Editor, true);
- agHelper.AssertContains(
- "Don't save",
- "exist",
- dataSources._datasourceModalDoNotSave,
- );
- cy.get(dataSources._datasourceModalDoNotSave).click();
- EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
- agHelper.AssertURL("page1");
-
- EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
- agHelper.AssertURL("page2");
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug22281_WelcomeTour_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug22281_WelcomeTour_spec.ts
index ccfe675b75b5..5b7c3a554f6c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug22281_WelcomeTour_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug22281_WelcomeTour_spec.ts
@@ -1,38 +1,43 @@
import * as _ from "../../../../support/Objects/ObjectsCore";
-describe("excludeForAirgap", "Welcome tour spec", function () {
- it("1. Bug: 22275: Debugger should not render in preview mode", function () {
- //Open debugger
- _.agHelper.GetNClick(_.debuggerHelper.locators._debuggerIcon);
- //Enter preview mode
- _.agHelper.GetNClick(_.locators._enterPreviewMode);
- //verify debugger is not present
- _.agHelper.AssertElementAbsence(_.locators._errorTab);
- //Exit preview mode
- _.agHelper.GetNClick(_.locators._exitPreviewMode);
- //verify debugger is present
- _.agHelper.GetNAssertContains(_.locators._errorTab, "Errors");
- });
- it("2. Bug: 22281: Debugger should not open by default in welcome tour", function () {
- //Get back to application page
- _.homePage.NavigateToHome();
- _.agHelper.WaitUntilEleAppear(_.homePage._homePageAppCreateBtn);
-
- // Temporary workaround until https://github.com/appsmithorg/appsmith/issues/24665 is fixed
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- _.homePage.CreateNewWorkspace("GuidedtourWorkspace" + uid);
- _.homePage.CreateAppInWorkspace(
- "GuidedtourWorkspace" + uid,
- `GuidedtourApp${uid}`,
- );
- _.homePage.NavigateToHome();
+describe(
+ "excludeForAirgap",
+ "Welcome tour spec",
+ { tags: ["@tag.excludeForAirgap"] },
+ function () {
+ it("1. Bug: 22275: Debugger should not render in preview mode", function () {
+ //Open debugger
+ _.agHelper.GetNClick(_.debuggerHelper.locators._debuggerIcon);
+ //Enter preview mode
+ _.agHelper.GetNClick(_.locators._enterPreviewMode);
+ //verify debugger is not present
+ _.agHelper.AssertElementAbsence(_.locators._errorTab);
+ //Exit preview mode
+ _.agHelper.GetNClick(_.locators._exitPreviewMode);
+ //verify debugger is present
+ _.agHelper.GetNAssertContains(_.locators._errorTab, "Errors");
});
+ it("2. Bug: 22281: Debugger should not open by default in welcome tour", function () {
+ //Get back to application page
+ _.homePage.NavigateToHome();
+ _.agHelper.WaitUntilEleAppear(_.homePage._homePageAppCreateBtn);
- //Start welcome tour
- _.agHelper.GetNClick(_.homePage._welcomeTour);
- _.agHelper.WaitUntilEleAppear(_.homePage._welcomeTourBuildingButton);
- //Verify debugger is not present
- _.agHelper.AssertElementAbsence(_.locators._errorTab);
- });
-});
+ // Temporary workaround until https://github.com/appsmithorg/appsmith/issues/24665 is fixed
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ _.homePage.CreateNewWorkspace("GuidedtourWorkspace" + uid);
+ _.homePage.CreateAppInWorkspace(
+ "GuidedtourWorkspace" + uid,
+ `GuidedtourApp${uid}`,
+ );
+ _.homePage.NavigateToHome();
+ });
+
+ //Start welcome tour
+ _.agHelper.GetNClick(_.homePage._welcomeTour);
+ _.agHelper.WaitUntilEleAppear(_.homePage._welcomeTourBuildingButton);
+ //Verify debugger is not present
+ _.agHelper.AssertElementAbsence(_.locators._errorTab);
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25148_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25148_Spec.ts
deleted file mode 100644
index 7fdbeffd6930..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25148_Spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-const { agHelper, apiPage, dataSources } = _;
-let dsName: any;
-
-describe("Bug 25148 - Edit Datasource button was disabled on Authentication tab of Api action", () => {
- it("1. Checking if the Edit datasource button is enabled or not", () => {
- dataSources.NavigateToDSCreateNew();
- agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- dsName = "AuthAPI " + uid;
- dataSources.CreatePlugIn("Authenticated API");
- agHelper.RenameWithInPane(dsName, false);
- dataSources.FillAuthAPIUrl();
- dataSources.SaveDatasource();
- apiPage.CreateApi("API" + uid, "GET", true);
- apiPage.SelectPaneTab("Authentication");
- agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 0, false);
- // Last one if present on the authentication tab.
- agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 1, false);
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts
deleted file mode 100644
index e41b2c9ecc71..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {
- entityExplorer,
- propPane,
- draggableWidgets,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
- EntityType,
-} from "../../../../support/Pages/EditorNavigation";
-
-describe("Bug 25894 - Moustache brackets should be highlighted", () => {
- it("1. should show {{ }} in bold", () => {
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
- EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
- propPane.EnterJSContext(
- "onClick",
- `{{ Api1.run({
- "key": Button1.text
- }).then(() => {
- storeValue('my-secret-key', Button3.text);
- Query1.run();
- }).catch(() => {});const a = { a: "key"} }}`,
- );
- agHelper
- .GetElement("span")
- .filter((index, element) => {
- const text = Cypress.$(element).text();
- return text.includes("{{") || text.includes("{");
- })
- .should("have.class", "cm-binding-brackets");
-
- agHelper
- .GetElement("span")
- .filter((index, element) => {
- const text = Cypress.$(element).text();
- return text.includes("}}") || text.includes("}");
- })
- .should("have.class", "cm-binding-brackets"); // Check the class of filtered elements
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26126_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26126_spec.ts
deleted file mode 100644
index 4b5ba6c8834b..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26126_spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {
- dataSources,
- entityExplorer,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Bug 26126: Fix DS button disability", function () {
- it("ensures save button is correctly updated when DS required fields change", function () {
- dataSources.NavigateToDSCreateNew();
- dataSources.CreatePlugIn("S3");
- dataSources.FillS3DSForm();
- dataSources.AssertSaveDSButtonDisability(false);
- dataSources.ValidateNSelectDropdown(
- "S3 service provider",
- "Amazon S3",
- "Upcloud",
- );
- dataSources.AssertSaveDSButtonDisability(true);
- dataSources.ValidateNSelectDropdown(
- "S3 service provider",
- "Upcloud",
- "Amazon S3",
- );
-
- dataSources.AssertSaveDSButtonDisability(false);
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26941_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26941_Spec.ts
deleted file mode 100644
index a92a69d0d7ad..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26941_Spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
- agHelper,
- apiPage,
- dataManager,
- debuggerHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Inconsistent Api error after the invalid chars are removed from header key", function () {
- it("1. Checking whether the appropriate error is displayed even after the removal of invalid chars in header key.", function () {
- const randomApi = `${
- dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl
- }123`;
- apiPage.CreateAndFillApi(randomApi);
- apiPage.RunAPI(false, 20, {
- expectedPath: "response.body.data.body.data.isExecutionSuccess",
- expectedRes: false,
- });
-
- agHelper.AssertElementAbsence(
- debuggerHelper.locators._debuggerDownStreamErrMsg,
- );
-
- apiPage.EnterHeader(">", "");
- apiPage.RunAPI(false, 20, {
- expectedPath: "response.body.data.body.data.isExecutionSuccess",
- expectedRes: false,
- });
-
- cy.get("@postExecute").then((interception: any) => {
- debuggerHelper.AssertDownStreamLogError(
- interception.response.body.data.pluginErrorDetails
- .downstreamErrorMessage,
- );
- });
-
- apiPage.EnterHeader("", "");
- apiPage.RunAPI(false, 20, {
- expectedPath: "response.body.data.body.data.isExecutionSuccess",
- expectedRes: false,
- });
- agHelper.AssertElementAbsence(
- debuggerHelper.locators._debuggerDownStreamErrMsg,
- );
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27817_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27817_Spec.ts
deleted file mode 100644
index deb6dd0f3569..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27817_Spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
- agHelper,
- assertHelper,
- dataSources,
-} from "../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
-
-describe("Datasource structure schema preview data", () => {
- before(() => {
- featureFlagIntercept({ ab_gsheet_schema_enabled: true });
- dataSources.CreateDataSource("Postgres");
- });
-
- it("1. Table selection should be enabled and add template button absent", () => {
- dataSources.selectTabOnDatasourcePage("View data");
- agHelper.TypeText(dataSources._datasourceStructureSearchInput, "users");
- agHelper.GetNClick(
- dataSources._dsPageTabContainerTableName("public.users"),
- );
- assertHelper.AssertNetworkExecutionSuccess("@schemaPreview");
- agHelper.AssertElementAbsence(
- dataSources._dsPageTableTriggermenuTarget("public.users"),
- );
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts
deleted file mode 100644
index 3a68df1dcea3..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {
- agHelper,
- dataSources,
- draggableWidgets,
- entityExplorer,
- propPane,
-} from "../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
- EntityType,
-} from "../../../../support/Pages/EditorNavigation";
-
-let dsName: any;
-let queryName: string;
-
-describe("Bug 28287: Binding query to widget, check query response in query editor on page load", function () {
- before("Drag drop a text widget", () => {
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT);
- });
-
- it("1. Check query response in query editor on page load", () => {
- agHelper.GenerateUUID();
- cy.get("@guid").then((uuid) => {
- dataSources.CreateDataSource("Postgres");
- cy.get("@dsName").then(($dsName) => {
- dsName = $dsName;
- });
- queryName = `Query_${uuid}`;
- dataSources.CreateQueryAfterDSSaved(
- "SELECT * FROM users LIMIT 10",
- queryName,
- );
- dataSources.ToggleUsePreparedStatement(false);
-
- EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
- propPane.TypeTextIntoField("Text", `{{${queryName}.data}}`);
-
- agHelper.RefreshPage();
-
- agHelper.Sleep(1000);
-
- EditorNavigation.SelectEntityByName(queryName, EntityType.Query);
-
- agHelper.AssertElementVisibility(dataSources._queryResponse("TABLE"));
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28731_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28731_Spec.ts
deleted file mode 100644
index 2519409d5a23..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28731_Spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import OneClickBindingLocator from "../../../../locators/OneClickBindingLocator";
-import {
- agHelper,
- entityExplorer,
- apiPage,
- dataManager,
- draggableWidgets,
- propPane,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("transformed one-click binding", function () {
- it("Transforms API data to match widget exppected type ", function () {
- // Create anAPI that mreturns object response
- apiPage.CreateAndFillApi(
- dataManager.dsValues[dataManager.defaultEnviorment].mockApiObjectUrl,
- );
- apiPage.RunAPI();
-
- // Table
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 300);
-
- agHelper.GetNClick(OneClickBindingLocator.datasourceDropdownSelector);
- agHelper.GetNClick(OneClickBindingLocator.datasourceQuerySelector("Api1"));
- propPane.ToggleJSMode("Table Data", true);
- agHelper.AssertContains("{{Api1.data.users}}");
-
- // Select widget
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT, 100, 100);
-
- agHelper.GetNClick(OneClickBindingLocator.datasourceDropdownSelector);
- agHelper.GetNClick(OneClickBindingLocator.datasourceQuerySelector("Api1"));
- propPane.ToggleJSMode("Source Data", true);
- agHelper.AssertContains(
- "{{Api1.data.users.map( (obj) =>{ return {'label': obj.address, 'value': obj.avatar } })}}",
- );
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28750_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28750_Spec.ts
deleted file mode 100644
index 971849a204f9..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28750_Spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { agHelper, dataSources } from "../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
-
-describe("Datasource structure schema preview data", () => {
- before(() => {
- featureFlagIntercept({ ab_gsheet_schema_enabled: true });
- dataSources.CreateMockDB("Users");
- });
-
- it(
- "excludeForAirgap",
- "1. Verify if the schema table accordions is collapsed in case of search",
- () => {
- agHelper.TypeText(
- dataSources._datasourceStructureSearchInput,
- "public.us",
- );
- agHelper.Sleep(1000);
- agHelper.AssertElementAbsence(
- `${dataSources._dsStructurePreviewMode} ${dataSources._datasourceSchemaColumn}`,
- );
- },
- );
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts
deleted file mode 100644
index fd7f75d8108f..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
- EntityType,
-} from "../../../../support/Pages/EditorNavigation";
-
-describe("Api execution results test cases", () => {
- it("1. Check to see if API execution results are preserved after it is renamed", () => {
- const {
- agHelper,
- apiPage,
- dataManager,
- entityExplorer,
- jsEditor,
- propPane,
- } = _;
- // Drag and drop a button widget
- entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200);
- entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 400, 400);
-
- // Create a new API
- apiPage.CreateAndFillApi(
- dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
- );
-
- apiPage.RunAPI();
-
- jsEditor.CreateJSObject(
- `export default {
- async func() {
- return Api1.data
- }
- }`,
- {
- paste: true,
- completeReplace: true,
- toRun: true,
- shouldCreateNewJSObj: true,
- prettify: true,
- },
- );
-
- EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
- // Set the label to the button
- propPane.TypeTextIntoField(
- "label",
- "{{Api1.data ? 'Success 1' : 'Failed 1'}}",
- );
-
- propPane.ToggleJSMode("onClick", true);
-
- propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
-
- agHelper.ClickButton("Success 1");
-
- agHelper.ValidateToastMessage("Successful");
-
- entityExplorer.RenameEntityFromExplorer("Api1", "Api123");
-
- EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
-
- agHelper.ClickButton("Success 1");
-
- agHelper.ValidateToastMessage("Successful");
-
- EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-
- // Set the label to the button
- propPane.TypeTextIntoField(
- "label",
- "{{JSObject1.func.data ? 'Success 2' : 'Failed 2'}}",
- );
-
- propPane.ToggleJSMode("onClick", true);
-
- propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
-
- agHelper.ClickButton("Success 2");
-
- agHelper.ValidateToastMessage("Successful");
-
- entityExplorer.RenameEntityFromExplorer("JSObject1", "JSObject123");
-
- EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
-
- agHelper.ClickButton("Success 2");
-
- agHelper.ValidateToastMessage("Successful");
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug6732_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug6732_Spec.ts
deleted file mode 100644
index 3a661315aff4..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug6732_Spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-const { apiPage } = _;
-
-describe("Bug 6732 - this.params in IIFE function in API editor", () => {
- it("1. this.params should be available in IIFE function in API editor", () => {
- apiPage.CreateApi("Api1", "GET");
-
- apiPage.SelectPaneTab("Params");
- apiPage.EnterParams(
- "page",
- "{{(function () { return this.params.key; })()}}",
- 0,
- false,
- );
-
- cy.get(apiPage._paramValue(0)).should(
- "not.have.class",
- "t--codemirror-has-error",
- );
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts
deleted file mode 100644
index eca95733a4e9..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import {
- agHelper,
- appSettings,
- assertHelper,
- dataSources,
- locators,
- table,
-} from "../../../../support/Objects/ObjectsCore";
-import EditorNavigation, {
- EntityType,
- AppSidebarButton,
- AppSidebar,
-} from "../../../../support/Pages/EditorNavigation";
-import PageList from "../../../../support/Pages/PageList";
-
-let dsName: any;
-
-describe("Bug 9334: The Select widget value is sent as null when user switches between the pages", function () {
- before("Change Theme & Create Postgress DS", () => {
- appSettings.OpenPaneAndChangeTheme("Pampas");
- dataSources.CreateDataSource("Postgres");
- cy.get("@dsName").then(($dsName) => {
- dsName = $dsName;
- });
- AppSidebar.navigate(AppSidebarButton.Editor);
- });
-
- it("1. Create dummy pages for navigating", () => {
- //CRUD page 2
- PageList.AddNewPage();
- PageList.AddNewPage("Generate page with data");
- agHelper.GetNClick(dataSources._selectDatasourceDropdown);
- agHelper.GetNClickByContains(dataSources._dropdownOption, dsName);
-
- assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
- agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
- agHelper.GetNClickByContains(dataSources._dropdownOption, "astronauts");
- agHelper.GetNClick(dataSources._generatePageBtn);
- assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
- agHelper.AssertContains("Successfully generated a page");
- //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes
- assertHelper.AssertNetworkStatus("@postExecute", 200);
- agHelper.ClickButton("Got it");
- assertHelper.AssertNetworkStatus("@updateLayout", 200);
- table.WaitUntilTableLoad();
-
- //CRUD page 3
- PageList.AddNewPage();
- PageList.AddNewPage("Generate page with data");
- agHelper.GetNClick(dataSources._selectDatasourceDropdown);
- agHelper.GetNClickByContains(dataSources._dropdownOption, dsName);
-
- assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
- agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
- agHelper.GetNClickByContains(dataSources._dropdownOption, "country");
- agHelper.GetNClick(dataSources._generatePageBtn);
- assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
- agHelper.AssertContains("Successfully generated a page");
- //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes
- assertHelper.AssertNetworkStatus("@postExecute", 200);
- agHelper.ClickButton("Got it");
- assertHelper.AssertNetworkStatus("@updateLayout", 200);
- table.WaitUntilTableLoad();
- });
-
- it("2. Navigate & Assert toast", () => {
- //Navigating between CRUD (Page3) & EmptyPage (Page2):
- EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
- agHelper.Sleep(2000);
- EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
- agHelper.AssertElementAbsence(
- locators._specificToast('The action "SelectQuery" has failed.'),
- );
-
- //Navigating between CRUD (Page3) & CRUD (Page4):
- EditorNavigation.SelectEntityByName("Page3", EntityType.Page);
- agHelper.Sleep(2000);
- EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
- agHelper.AssertElementAbsence(
- locators._specificToast('The action "SelectQuery" has failed.'),
- );
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
index e968be5cfb3b..2b912acca439 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/CatchBlock_Spec.ts
@@ -10,35 +10,39 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("Bug #15372 Catch block was not triggering in Safari/firefox", () => {
- it("1. Triggers the catch block when the API hits a 404", () => {
- apiPage.CreateAndFillApi(
- dataManager.dsValues[dataManager.defaultEnviorment].mockHttpCodeUrl +
- "404",
- );
- jsEditor.CreateJSObject(
- `export default {
+describe(
+ "Bug #15372 Catch block was not triggering in Safari/firefox",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ it("1. Triggers the catch block when the API hits a 404", () => {
+ apiPage.CreateAndFillApi(
+ dataManager.dsValues[dataManager.defaultEnviorment].mockHttpCodeUrl +
+ "404",
+ );
+ jsEditor.CreateJSObject(
+ `export default {
fun: async () => {
return await Api1.run().catch((e) => showAlert("404 hit : " + e.message));
}
}`,
- {
- paste: true,
- completeReplace: true,
- toRun: true,
- shouldCreateNewJSObj: true,
- },
- );
- agHelper.AssertContains("404 hit : Api1 failed to execute");
- agHelper.ActionContextMenuWithInPane({
- action: "Delete",
- entityType: entityItems.JSObject,
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: true,
+ shouldCreateNewJSObj: true,
+ },
+ );
+ agHelper.AssertContains("404 hit : Api1 failed to execute");
+ agHelper.ActionContextMenuWithInPane({
+ action: "Delete",
+ entityType: entityItems.JSObject,
+ });
+ EditorNavigation.SelectEntityByName("Api1", EntityType.Api);
+ entityExplorer.ActionContextMenuByEntityName({
+ entityNameinLeftSidebar: "Api1",
+ action: "Delete",
+ entityType: entityItems.Api,
+ });
});
- EditorNavigation.SelectEntityByName("Api1", EntityType.Api);
- entityExplorer.ActionContextMenuByEntityName({
- entityNameinLeftSidebar: "Api1",
- action: "Delete",
- entityType: entityItems.Api,
- });
- });
-});
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
index afed8f9d04dc..5cac03945bb3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
@@ -7,168 +7,172 @@ let dsName: any;
const testString = "test";
-describe("datasource unsaved changes popup shows even without changes", function () {
- // In case of postgres and other plugins, host address and port key values are initialized by default making form dirty
- it("1. Bug 18664: Create postgres datasource, save it and edit it and go back, now unsaved changes popup should not be shown", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("PostgreSQL");
- dsName = "Postgres" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
- _.dataSources.EditDatasource();
- _.dataSources.cancelDSEditAndAssertModalPopUp(false);
- _.agHelper.AssertElementVisibility(_.dataSources._activeDS);
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+describe(
+ "datasource unsaved changes popup shows even without changes",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ // In case of postgres and other plugins, host address and port key values are initialized by default making form dirty
+ it("1. Bug 18664: Create postgres datasource, save it and edit it and go back, now unsaved changes popup should not be shown", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("PostgreSQL");
+ dsName = "Postgres" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+ _.dataSources.EditDatasource();
+ _.dataSources.cancelDSEditAndAssertModalPopUp(false);
+ _.agHelper.AssertElementVisibility(_.dataSources._activeDS);
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
});
- });
- // In case of Auth DS, headers, query parameters and custom query parameters are being initialized, which makes form dirty
- it("2. Bug 18962: Create REST API datasource, save it and edit it and go back, now unsaved changes popup should not be shown", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("Authenticated API");
- dsName = "AuthDS" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillAuthAPIUrl();
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
-
- // Edit DS for the first time, we shouldnt see discard popup on back button
- // Even if headers, and query parameters are being initialized, we shouldnt see the popup
- // as those are not initialized by user
- _.dataSources.EditDatasource();
- _.dataSources.cancelDSEditAndAssertModalPopUp(false);
- _.agHelper.AssertElementVisibility(_.dataSources._activeDS);
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ // In case of Auth DS, headers, query parameters and custom query parameters are being initialized, which makes form dirty
+ it("2. Bug 18962: Create REST API datasource, save it and edit it and go back, now unsaved changes popup should not be shown", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("Authenticated API");
+ dsName = "AuthDS" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillAuthAPIUrl();
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+
+ // Edit DS for the first time, we shouldnt see discard popup on back button
+ // Even if headers, and query parameters are being initialized, we shouldnt see the popup
+ // as those are not initialized by user
+ _.dataSources.EditDatasource();
+ _.dataSources.cancelDSEditAndAssertModalPopUp(false);
+ _.agHelper.AssertElementVisibility(_.dataSources._activeDS);
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
});
- });
- it("3. Bug 18998: Create mongoDB datasource, save it and edit it and change connection URI param, discard popup should be shown as user has made valid change", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("MongoDB");
- dsName = "Mongo" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillMongoDSForm();
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
-
- // Edit datasource, change connection string uri param and click on back button
- _.dataSources.EditDatasource();
- _.dataSources.FillMongoDatasourceFormWithURI();
-
- // Assert that popup is visible
- _.dataSources.SaveDSFromDialog(false);
-
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ it("3. Bug 18998: Create mongoDB datasource, save it and edit it and change connection URI param, discard popup should be shown as user has made valid change", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("MongoDB");
+ dsName = "Mongo" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillMongoDSForm();
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+
+ // Edit datasource, change connection string uri param and click on back button
+ _.dataSources.EditDatasource();
+ _.dataSources.FillMongoDatasourceFormWithURI();
+
+ // Assert that popup is visible
+ _.dataSources.SaveDSFromDialog(false);
+
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
});
- });
- it("4. Validate that the DS modal shows up when cancel button is pressed after change", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("MongoDB");
- dsName = "Mongo" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillMongoDSForm();
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
-
- // Edit datasource, change connection string uri param and click on back button
- _.dataSources.EditDatasource();
- _.dataSources.FillMongoDatasourceFormWithURI();
-
- // Assert that popup is visible
- _.dataSources.cancelDSEditAndAssertModalPopUp(true, false);
-
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ it("4. Validate that the DS modal shows up when cancel button is pressed after change", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("MongoDB");
+ dsName = "Mongo" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillMongoDSForm();
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+
+ // Edit datasource, change connection string uri param and click on back button
+ _.dataSources.EditDatasource();
+ _.dataSources.FillMongoDatasourceFormWithURI();
+
+ // Assert that popup is visible
+ _.dataSources.cancelDSEditAndAssertModalPopUp(true, false);
+
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
});
- });
-
- it("5. Validate that the DS modal does not show up when cancel button is pressed without any changes being made", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("MongoDB");
- dsName = "Mongo" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillMongoDSForm();
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
-
- // Edit datasource, change connection string uri param and click on back button
- _.dataSources.EditDatasource();
- // Assert that popup is visible
- _.dataSources.cancelDSEditAndAssertModalPopUp(false, false);
+ it("5. Validate that the DS modal does not show up when cancel button is pressed without any changes being made", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("MongoDB");
+ dsName = "Mongo" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillMongoDSForm();
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+
+ // Edit datasource, change connection string uri param and click on back button
+ _.dataSources.EditDatasource();
+
+ // Assert that popup is visible
+ _.dataSources.cancelDSEditAndAssertModalPopUp(false, false);
+
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
+ });
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ it("6. Validate that changes made to the form are not persisted after cancellation", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ // using CreatePlugIn function instead of CreateDatasource,
+ // because I do not need to fill the datasource form and use the same default data
+ _.dataSources.CreatePlugIn("MongoDB");
+ dsName = "Mongo" + uid;
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillMongoDSForm();
+ _.dataSources.SaveDatasource();
+ _.agHelper.Sleep();
+
+ // Edit datasource, change connection string uri param and click on back button
+ _.dataSources.EditDatasource();
+
+ _.agHelper.UpdateInputValue(_.dataSources._host(), "jargons");
+
+ // Assert that popup is visible
+ _.dataSources.cancelDSEditAndAssertModalPopUp(true, false);
+
+ // try to edit again
+ _.dataSources.EditDatasource();
+
+ // validate the input field value still remains as the saved value
+ _.agHelper.ValidateFieldInputValue(
+ _.dataSources._host(),
+ _.dataManager.dsValues.Staging.mongo_host,
+ );
+ _.agHelper.GetNClick(
+ _.dataSources._cancelEditDatasourceButton,
+ 0,
+ true,
+ 200,
+ );
+
+ _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ });
});
- });
- it("6. Validate that changes made to the form are not persisted after cancellation", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
+ it("7. Bug 19801: Create new Auth DS, refresh the page without saving, we should not see discard popup", () => {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
// using CreatePlugIn function instead of CreateDatasource,
// because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("MongoDB");
- dsName = "Mongo" + uid;
- _.agHelper.RenameWithInPane(dsName, false);
- _.dataSources.FillMongoDSForm();
- _.dataSources.SaveDatasource();
- _.agHelper.Sleep();
-
- // Edit datasource, change connection string uri param and click on back button
- _.dataSources.EditDatasource();
-
- _.agHelper.UpdateInputValue(_.dataSources._host(), "jargons");
-
- // Assert that popup is visible
- _.dataSources.cancelDSEditAndAssertModalPopUp(true, false);
-
- // try to edit again
- _.dataSources.EditDatasource();
-
- // validate the input field value still remains as the saved value
- _.agHelper.ValidateFieldInputValue(
- _.dataSources._host(),
- _.dataManager.dsValues.Staging.mongo_host,
- );
- _.agHelper.GetNClick(
- _.dataSources._cancelEditDatasourceButton,
- 0,
- true,
- 200,
- );
-
- _.dataSources.DeleteDatasourceFromWithinDS(dsName);
+ _.dataSources.CreatePlugIn("Authenticated API");
+ _.agHelper.RefreshPage();
+ _.agHelper.AssertElementAbsence(_.dataSources._datasourceModalSave);
});
- });
-
- it("7. Bug 19801: Create new Auth DS, refresh the page without saving, we should not see discard popup", () => {
- _.dataSources.NavigateToDSCreateNew();
- _.agHelper.GenerateUUID();
- // using CreatePlugIn function instead of CreateDatasource,
- // because I do not need to fill the datasource form and use the same default data
- _.dataSources.CreatePlugIn("Authenticated API");
- _.agHelper.RefreshPage();
- _.agHelper.AssertElementAbsence(_.dataSources._datasourceModalSave);
- });
-});
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
similarity index 98%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
index 451aa813536e..cc3008bd4840 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug18035_Spec.ts
@@ -10,6 +10,7 @@ const dataSources = ObjectsRegistry.DataSources,
describe(
"excludeForAirgap",
"Bug 18035: Updates save button text on datasource discard popup",
+ { tags: ["@tag.Datasource"] },
function () {
it("1. Create gsheet datasource, click on back button, discard popup should contain save and authorize", function () {
dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
new file mode 100644
index 000000000000..e309a25afc01
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
@@ -0,0 +1,26 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+let dsName: any;
+
+describe(
+ "Bug 19893: Authenticated API DS in case of OAuth2, should have save and authorise button enabled all the times",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ it("1. Create Auth API DS, save i, now edit again and check the save and authorise button state", function () {
+ _.dataSources.NavigateToDSCreateNew();
+ _.agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ dsName = "AuthAPI " + uid;
+ _.dataSources.CreatePlugIn("Authenticated API");
+ _.agHelper.RenameWithInPane(dsName, false);
+ _.dataSources.FillAuthAPIUrl();
+ _.dataSources.AssertCursorPositionForTextInput(
+ _.dataSources._urlInputControl,
+ "{moveToStart}",
+ "localhost",
+ 9,
+ );
+ });
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts
new file mode 100644
index 000000000000..3ec5cd9906c8
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug21734_Spec.ts
@@ -0,0 +1,59 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+import EditorNavigation, {
+ EntityType,
+ AppSidebarButton,
+ AppSidebar,
+} from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
+
+const dataSources = ObjectsRegistry.DataSources,
+ agHelper = ObjectsRegistry.AggregateHelper;
+
+describe(
+ "Bug 21734: On exiting from the Datasources page without saving changes, an error is thrown and the app becomes unresponsive.",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ it("1. Navigating from intermediary datasource to new page", function () {
+ dataSources.NavigateToDSCreateNew();
+ dataSources.CreatePlugIn("Mongo");
+ // Have to fill form since modal won't show for empty ds
+ dataSources.FillMongoDSForm();
+
+ agHelper.GetNClick(dataSources._addNewDataSource, 0, true);
+
+ agHelper.AssertContains(
+ "Don't save",
+ "exist",
+ dataSources._datasourceModalDoNotSave,
+ );
+ cy.get(dataSources._datasourceModalDoNotSave).click({ force: true });
+
+ PageList.AddNewPage();
+
+ EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+ agHelper.AssertURL("page1");
+
+ EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
+ agHelper.AssertURL("page2");
+ });
+ it("2. Navigating from intermediary datasource to an existing page", function () {
+ dataSources.NavigateToDSCreateNew();
+ dataSources.CreatePlugIn("PostgreSQL");
+ // Have to fill form since modal won't show for empty ds
+ dataSources.FillPostgresDSForm();
+
+ AppSidebar.navigate(AppSidebarButton.Editor, true);
+ agHelper.AssertContains(
+ "Don't save",
+ "exist",
+ dataSources._datasourceModalDoNotSave,
+ );
+ cy.get(dataSources._datasourceModalDoNotSave).click();
+ EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+ agHelper.AssertURL("page1");
+
+ EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
+ agHelper.AssertURL("page2");
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
new file mode 100644
index 000000000000..96c6aaf84c61
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
@@ -0,0 +1,27 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+const { agHelper, apiPage, dataSources } = _;
+let dsName: any;
+
+describe(
+ "Bug 25148 - Edit Datasource button was disabled on Authentication tab of Api action",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ it("1. Checking if the Edit datasource button is enabled or not", () => {
+ dataSources.NavigateToDSCreateNew();
+ agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ dsName = "AuthAPI " + uid;
+ dataSources.CreatePlugIn("Authenticated API");
+ agHelper.RenameWithInPane(dsName, false);
+ dataSources.FillAuthAPIUrl();
+ dataSources.SaveDatasource();
+ apiPage.CreateApi("API" + uid, "GET", true);
+ apiPage.SelectPaneTab("Authentication");
+ agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 0, false);
+ // Last one if present on the authentication tab.
+ agHelper.AssertElementEnabledDisabled(apiPage._saveAsDS, 1, false);
+ });
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25982_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
similarity index 93%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25982_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
index 9e6dea2cfb46..249ef785a0f2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25982_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25982_Spec.ts
@@ -3,7 +3,7 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("Fix UQI query switching", function () {
+describe("Fix UQI query switching", { tags: ["@tag.Datasource"] }, function () {
it("1. The command of the query must be preserved and should not default to initial value after changed.", function () {
dataSources.NavigateToDSCreateNew();
dataSources.CreateDataSource("Mongo", false, false);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts
new file mode 100644
index 000000000000..0d87bb6561a0
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26126_spec.ts
@@ -0,0 +1,30 @@
+import {
+ dataSources,
+ entityExplorer,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe(
+ "Bug 26126: Fix DS button disability",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ it("ensures save button is correctly updated when DS required fields change", function () {
+ dataSources.NavigateToDSCreateNew();
+ dataSources.CreatePlugIn("S3");
+ dataSources.FillS3DSForm();
+ dataSources.AssertSaveDSButtonDisability(false);
+ dataSources.ValidateNSelectDropdown(
+ "S3 service provider",
+ "Amazon S3",
+ "Upcloud",
+ );
+ dataSources.AssertSaveDSButtonDisability(true);
+ dataSources.ValidateNSelectDropdown(
+ "S3 service provider",
+ "Upcloud",
+ "Amazon S3",
+ );
+
+ dataSources.AssertSaveDSButtonDisability(false);
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
similarity index 98%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
index 93513a1e190a..bd74bae51103 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26716_Spec.ts
@@ -11,6 +11,7 @@ let dsName: any, userMock: string, movieMock: string;
describe(
"excludeForAirgap",
"Bug 26716: Datasource selected from entity explorer should be correctly highlighted",
+ { tags: ["@tag.Datasource"] },
function () {
it("1. Create users and movies mock datasources and switch between them through entity explorer, check the active state", function () {
dataSources.CreateMockDB("Users").then((mockDBName) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts
new file mode 100644
index 000000000000..1293b4c16f02
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts
@@ -0,0 +1,49 @@
+import {
+ agHelper,
+ apiPage,
+ dataManager,
+ debuggerHelper,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe(
+ "Inconsistent Api error after the invalid chars are removed from header key",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ it("1. Checking whether the appropriate error is displayed even after the removal of invalid chars in header key.", function () {
+ const randomApi = `${
+ dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl
+ }123`;
+ apiPage.CreateAndFillApi(randomApi);
+ apiPage.RunAPI(false, 20, {
+ expectedPath: "response.body.data.body.data.isExecutionSuccess",
+ expectedRes: false,
+ });
+
+ agHelper.AssertElementAbsence(
+ debuggerHelper.locators._debuggerDownStreamErrMsg,
+ );
+
+ apiPage.EnterHeader(">", "");
+ apiPage.RunAPI(false, 20, {
+ expectedPath: "response.body.data.body.data.isExecutionSuccess",
+ expectedRes: false,
+ });
+
+ cy.get("@postExecute").then((interception: any) => {
+ debuggerHelper.AssertDownStreamLogError(
+ interception.response.body.data.pluginErrorDetails
+ .downstreamErrorMessage,
+ );
+ });
+
+ apiPage.EnterHeader("", "");
+ apiPage.RunAPI(false, 20, {
+ expectedPath: "response.body.data.body.data.isExecutionSuccess",
+ expectedRes: false,
+ });
+ agHelper.AssertElementAbsence(
+ debuggerHelper.locators._debuggerDownStreamErrMsg,
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts
new file mode 100644
index 000000000000..fca2f69ee07d
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug27817_Spec.ts
@@ -0,0 +1,29 @@
+import {
+ agHelper,
+ assertHelper,
+ dataSources,
+} from "../../../../support/Objects/ObjectsCore";
+import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
+
+describe(
+ "Datasource structure schema preview data",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ before(() => {
+ featureFlagIntercept({ ab_gsheet_schema_enabled: true });
+ dataSources.CreateDataSource("Postgres");
+ });
+
+ it("1. Table selection should be enabled and add template button absent", () => {
+ dataSources.selectTabOnDatasourcePage("View data");
+ agHelper.TypeText(dataSources._datasourceStructureSearchInput, "users");
+ agHelper.GetNClick(
+ dataSources._dsPageTabContainerTableName("public.users"),
+ );
+ assertHelper.AssertNetworkExecutionSuccess("@schemaPreview");
+ agHelper.AssertElementAbsence(
+ dataSources._dsPageTableTriggermenuTarget("public.users"),
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts
new file mode 100644
index 000000000000..eef1a01523f8
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28750_Spec.ts
@@ -0,0 +1,28 @@
+import { agHelper, dataSources } from "../../../../support/Objects/ObjectsCore";
+import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
+
+describe(
+ "Datasource structure schema preview data",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ before(() => {
+ featureFlagIntercept({ ab_gsheet_schema_enabled: true });
+ dataSources.CreateMockDB("Users");
+ });
+
+ it(
+ "excludeForAirgap",
+ "1. Verify if the schema table accordions is collapsed in case of search",
+ () => {
+ agHelper.TypeText(
+ dataSources._datasourceStructureSearchInput,
+ "public.us",
+ );
+ agHelper.Sleep(1000);
+ agHelper.AssertElementAbsence(
+ `${dataSources._dsStructurePreviewMode} ${dataSources._datasourceSchemaColumn}`,
+ );
+ },
+ );
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts
new file mode 100644
index 000000000000..7108a1ef7afe
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug28985_spec.ts
@@ -0,0 +1,94 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+ EntityType,
+} from "../../../../support/Pages/EditorNavigation";
+
+describe(
+ "Api execution results test cases",
+ { tags: ["@tag.Datasource"] },
+ () => {
+ it("1. Check to see if API execution results are preserved after it is renamed", () => {
+ const {
+ agHelper,
+ apiPage,
+ dataManager,
+ entityExplorer,
+ jsEditor,
+ propPane,
+ } = _;
+ // Drag and drop a button widget
+ entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200);
+ entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 400, 400);
+
+ // Create a new API
+ apiPage.CreateAndFillApi(
+ dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+ );
+
+ apiPage.RunAPI();
+
+ jsEditor.CreateJSObject(
+ `export default {
+ async func() {
+ return Api1.data
+ }
+ }`,
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: true,
+ shouldCreateNewJSObj: true,
+ prettify: true,
+ },
+ );
+
+ EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+ // Set the label to the button
+ propPane.TypeTextIntoField(
+ "label",
+ "{{Api1.data ? 'Success 1' : 'Failed 1'}}",
+ );
+
+ propPane.ToggleJSMode("onClick", true);
+
+ propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
+
+ agHelper.ClickButton("Success 1");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ entityExplorer.RenameEntityFromExplorer("Api1", "Api123");
+
+ EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+ agHelper.ClickButton("Success 1");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+
+ // Set the label to the button
+ propPane.TypeTextIntoField(
+ "label",
+ "{{JSObject1.func.data ? 'Success 2' : 'Failed 2'}}",
+ );
+
+ propPane.ToggleJSMode("onClick", true);
+
+ propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
+
+ agHelper.ClickButton("Success 2");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ entityExplorer.RenameEntityFromExplorer("JSObject1", "JSObject123");
+
+ EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
+
+ agHelper.ClickButton("Success 2");
+
+ agHelper.ValidateToastMessage("Successful");
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bugs26410_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
similarity index 79%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bugs26410_spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
index 508d2ef3721d..c384024d1292 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bugs26410_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bugs26410_spec.ts
@@ -3,11 +3,12 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("Fix UQI query switching", function () {
- it(
- "excludeForAirgap",
- "1. The command of the Mongo query must be preserved and should not default to initial value after changed.",
- function () {
+describe(
+ "excludeForAirgap",
+ "Fix UQI query switching",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ it("1. The command of the Mongo query must be preserved and should not default to initial value after changed.", function () {
dataSources.NavigateToDSCreateNew();
dataSources.CreateDataSource("Mongo", false, false);
dataSources.CreateQueryAfterDSSaved("", "MongoQuery");
@@ -25,6 +26,6 @@ describe("Fix UQI query switching", function () {
EditorNavigation.SelectEntityByName("TwilioQuery", EntityType.Query);
dataSources.ValidateNSelectDropdown("Commands", "Schedule message");
- },
- );
-});
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
index 474af859d336..0e7b7631fbec 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
@@ -14,100 +14,107 @@ import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
let guid;
let dataSourceName: string;
-describe("Datasource form related tests", function () {
- before(() => {
- featureFlagIntercept({
- ab_gsheet_schema_enabled: true,
- ab_mock_mongo_schema_enabled: true,
+describe(
+ "Datasource form related tests",
+ { tags: ["@tag.Datasource"] },
+ function () {
+ before(() => {
+ featureFlagIntercept({
+ ab_gsheet_schema_enabled: true,
+ ab_mock_mongo_schema_enabled: true,
+ });
+ homePage.CreateNewWorkspace("FetchSchemaOnce", true);
+ homePage.CreateAppInWorkspace("FetchSchemaOnce");
});
- homePage.CreateNewWorkspace("FetchSchemaOnce", true);
- homePage.CreateAppInWorkspace("FetchSchemaOnce");
- });
- it("1. Bug - 17238 Verify datasource structure refresh on save - invalid datasource", () => {
- agHelper.GenerateUUID();
- cy.get("@guid").then((uid) => {
- guid = uid;
- dataSourceName = "Postgres " + guid;
- dataSources.NavigateToDSCreateNew();
- dataSources.CreatePlugIn("PostgreSQL");
- agHelper.RenameWithInPane(dataSourceName, false);
- dataSources.FillPostgresDSForm(
- "Production",
- false,
- "docker",
- "wrongPassword",
- );
- dataSources.VerifySchema(
+ it("1. Bug - 17238 Verify datasource structure refresh on save - invalid datasource", () => {
+ agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ guid = uid;
+ dataSourceName = "Postgres " + guid;
+ dataSources.NavigateToDSCreateNew();
+ dataSources.CreatePlugIn("PostgreSQL");
+ agHelper.RenameWithInPane(dataSourceName, false);
+ dataSources.FillPostgresDSForm(
+ "Production",
+ false,
+ "docker",
+ "wrongPassword",
+ );
+ dataSources.VerifySchema(
+ dataSourceName,
+ "An exception occurred while creating connection pool.",
+ );
+ agHelper.GetNClick(dataSources._editButton);
+ dataSources.UpdatePassword("docker");
+ dataSources.VerifySchema(dataSourceName, "public.", true);
+ dataSources.CreateQueryAfterDSSaved(dataSourceName);
+ });
+ });
+
+ it("2. Verify if schema was fetched once #18448", () => {
+ agHelper.RefreshPage();
+ EditorNavigation.SelectEntityByName(
dataSourceName,
- "An exception occurred while creating connection pool.",
+ EntityType.Datasource,
);
- agHelper.GetNClick(dataSources._editButton);
- dataSources.UpdatePassword("docker");
- dataSources.VerifySchema(dataSourceName, "public.", true);
- dataSources.CreateQueryAfterDSSaved(dataSourceName);
+ agHelper.Sleep(1500);
+ agHelper.VerifyCallCount(`@getDatasourceStructure`, 1);
+ AppSidebar.navigate(AppSidebarButton.Editor);
+ EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
+ agHelper.ActionContextMenuWithInPane({
+ action: "Delete",
+ entityType: entityItems.Query,
+ });
+ dataSources.DeleteDatasourceFromWithinDS(dataSourceName);
});
- });
- it("2. Verify if schema was fetched once #18448", () => {
- agHelper.RefreshPage();
- EditorNavigation.SelectEntityByName(dataSourceName, EntityType.Datasource);
- agHelper.Sleep(1500);
- agHelper.VerifyCallCount(`@getDatasourceStructure`, 1);
- AppSidebar.navigate(AppSidebarButton.Editor);
- EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
- agHelper.ActionContextMenuWithInPane({
- action: "Delete",
- entityType: entityItems.Query,
- });
- dataSources.DeleteDatasourceFromWithinDS(dataSourceName);
- });
+ it(
+ "excludeForAirgap",
+ "3. Verify if schema (table and column) exist in query editor and searching works",
+ () => {
+ agHelper.RefreshPage();
+ dataSources.CreateMockDB("Users");
+ dataSources.CreateQueryAfterDSSaved();
+ dataSources.VerifyTableSchemaOnQueryEditor("public.users");
+ PageLeftPane.expandCollapseItem("public.users");
+ dataSources.VerifyColumnSchemaOnQueryEditor("id");
+ dataSources.FilterAndVerifyDatasourceSchemaBySearch(
+ "public.us",
+ "public.users",
+ );
+ },
+ );
+
+ it(
+ "excludeForAirgap",
+ "4. Verify if collapsible opens when refresh button is opened.",
+ () => {
+ agHelper.RefreshPage();
+ dataSources.CreateMockDB("Users");
+ dataSources.CreateQueryAfterDSSaved();
+ // close the schema
+ agHelper.GetNClick(dataSources._queryEditorCollapsibleIcon);
+ // then refresh
+ dataSources.RefreshDatasourceSchema();
+ // assert the schema is open.
+ dataSources.VerifySchemaCollapsibleOpenState(true);
+ },
+ );
- it(
- "excludeForAirgap",
- "3. Verify if schema (table and column) exist in query editor and searching works",
- () => {
+ // the full list for schema-less plugins can be found here. https://www.notion.so/appsmith/Don-t-show-schema-section-for-plugins-that-don-t-support-it-78f82b6abf7948c5a7d596ae583ed8a4?pvs=4#3862343ca2564f7e83a2c8279965ca61
+ it("5. Verify schema does not show up in schema-less plugins", () => {
agHelper.RefreshPage();
- dataSources.CreateMockDB("Users");
+ dataSources.CreateDataSource("Redis", true, false);
dataSources.CreateQueryAfterDSSaved();
- dataSources.VerifyTableSchemaOnQueryEditor("public.users");
- PageLeftPane.expandCollapseItem("public.users");
- dataSources.VerifyColumnSchemaOnQueryEditor("id");
- dataSources.FilterAndVerifyDatasourceSchemaBySearch(
- "public.us",
- "public.users",
- );
- },
- );
+ dataSources.VerifySchemaAbsenceInQueryEditor();
+ });
- it(
- "excludeForAirgap",
- "4. Verify if collapsible opens when refresh button is opened.",
- () => {
+ it("6. Verify schema searching works for datasources with empty columns for example S3.", () => {
agHelper.RefreshPage();
- dataSources.CreateMockDB("Users");
+ dataSources.CreateDataSource("S3", true, false);
dataSources.CreateQueryAfterDSSaved();
- // close the schema
- agHelper.GetNClick(dataSources._queryEditorCollapsibleIcon);
- // then refresh
- dataSources.RefreshDatasourceSchema();
- // assert the schema is open.
- dataSources.VerifySchemaCollapsibleOpenState(true);
- },
- );
-
- // the full list for schema-less plugins can be found here. https://www.notion.so/appsmith/Don-t-show-schema-section-for-plugins-that-don-t-support-it-78f82b6abf7948c5a7d596ae583ed8a4?pvs=4#3862343ca2564f7e83a2c8279965ca61
- it("5. Verify schema does not show up in schema-less plugins", () => {
- agHelper.RefreshPage();
- dataSources.CreateDataSource("Redis", true, false);
- dataSources.CreateQueryAfterDSSaved();
- dataSources.VerifySchemaAbsenceInQueryEditor();
- });
-
- it("6. Verify schema searching works for datasources with empty columns for example S3.", () => {
- agHelper.RefreshPage();
- dataSources.CreateDataSource("S3", true, false);
- dataSources.CreateQueryAfterDSSaved();
- dataSources.FilterAndVerifyDatasourceSchemaBySearch("appsmith-hris");
- });
-});
+ dataSources.FilterAndVerifyDatasourceSchemaBySearch("appsmith-hris");
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
index cb4158a903a5..1f7ddb12ba2e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
@@ -13,7 +13,7 @@ let tempBranch1: any;
let tempBranch2: any;
let tempBranch3: any;
-describe("Git Bugs", function () {
+describe("Git Bugs", { tags: ["@tag.Git"] }, function () {
before(() => {
_.agHelper.GenerateUUID();
cy.get("@guid").then((uid) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts
new file mode 100644
index 000000000000..a5b6ff2f9b40
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GraphQL_Binding_Bug16702_Spec.ts
@@ -0,0 +1,84 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+const GRAPHQL_LIMIT_QUERY = `
+ query {
+ launchesPast(limit:
+ "__limit__"
+ ,offset:
+ "__offset__"
+ ) {
+ mission_name
+ rocket {
+ rocket_name
+`;
+
+const GRAPHQL_RESPONSE = {
+ mission_name: "Sentinel-6 Michael Freilich",
+};
+
+describe(
+ "Binding Expressions should not be truncated in Url and path extraction",
+ { tags: ["@tag.Datasource", "@tag.Binding"] },
+ function () {
+ it.skip("Bug 16702, Moustache+Quotes formatting goes wrong in graphql body resulting in autocomplete failure", function () {
+ const jsObjectBody = `export default {
+ limitValue: 1,
+ offsetValue: 1,
+ }`;
+
+ _.jsEditor.CreateJSObject(jsObjectBody, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ });
+
+ _.apiPage.CreateAndFillGraphqlApi(
+ _.dataManager.dsValues[_.dataManager.defaultEnviorment]
+ .GraphqlApiUrl_TED,
+ );
+ _.dataSources.UpdateGraphqlQueryAndVariable({
+ query: GRAPHQL_LIMIT_QUERY,
+ });
+
+ cy.get(".t--graphql-query-editor pre.CodeMirror-line span")
+ .contains("__offset__")
+ // .should($el => {
+ // expect(Cypress.dom.isDetached($el)).to.false;
+ // })
+ //.trigger("mouseover")
+ .dblclick()
+ .dblclick()
+ .type("{{JSObject1.");
+ _.agHelper.GetNAssertElementText(
+ _.locators._hints,
+ "offsetValue",
+ "have.text",
+ 1,
+ );
+ _.agHelper.Sleep();
+ _.agHelper.TypeText(_.locators._codeMirrorTextArea, "offsetValue", 1);
+ _.agHelper.Sleep(2000);
+
+ /* Start: Block of code to remove error of detached node of codemirror for cypress reference */
+
+ _.apiPage.SelectPaneTab("Params");
+ _.apiPage.SelectPaneTab("Body");
+ /* End: Block of code to remove error of detached node of codemirror for cypress reference */
+
+ cy.get(".t--graphql-query-editor pre.CodeMirror-line span")
+ .contains("__limit__")
+ //.trigger("mouseover")
+ .dblclick()
+ .type("{{JSObject1.");
+ _.agHelper.GetNClickByContains(_.locators._hints, "limitValue");
+ _.agHelper.Sleep(2000);
+ //Commenting this since - many runs means - API response is 'You are doing too many launches'
+ // _.apiPage.RunAPI(false, 20, {
+ // expectedPath: "response.body.data.body.data.launchesPast[0].mission_name",
+ // expectedRes: GRAPHQL_RESPONSE.mission_name,
+ // });
+ _.apiPage.RunAPI();
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug24486_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ImportExport_Bug24486_Spec.ts
similarity index 100%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug24486_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/ImportExport_Bug24486_Spec.ts
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
index 74bce101b37c..df67f114d67a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts
@@ -88,101 +88,105 @@ function configureApi() {
}
Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig], index) => {
- describe(`${testConfig.widgetName} widget test for storeValue save, Api Call params`, () => {
- it(`1. DragDrop widget & Label/Text widgets`, () => {
- if (index === 0) {
- configureApi();
- }
- entityExplorer.DragDropWidgetNVerify(widgetSelector, 300, 200);
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 400, 400);
- //entityExplorer.SelectEntityByName(draggableWidgets.BUTTONNAME("1"));
- // Set onClick action, storing value
- propPane.EnterJSContext(
- PROPERTY_SELECTOR.onClickFieldName,
- `{{storeValue('textPayloadOnSubmit',${testConfig.widgetPrefixName}1.text); FirstAPI.run({ value: ${testConfig.widgetPrefixName}1.text })}}`,
- );
+ describe(
+ `${testConfig.widgetName} widget test for storeValue save, Api Call params`,
+ { tags: ["@tag.Widget", "@tag.Binding"] },
+ () => {
+ it(`1. DragDrop widget & Label/Text widgets`, () => {
+ if (index === 0) {
+ configureApi();
+ }
+ entityExplorer.DragDropWidgetNVerify(widgetSelector, 300, 200);
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 400, 400);
+ //entityExplorer.SelectEntityByName(draggableWidgets.BUTTONNAME("1"));
+ // Set onClick action, storing value
+ propPane.EnterJSContext(
+ PROPERTY_SELECTOR.onClickFieldName,
+ `{{storeValue('textPayloadOnSubmit',${testConfig.widgetPrefixName}1.text); FirstAPI.run({ value: ${testConfig.widgetPrefixName}1.text })}}`,
+ );
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 300);
- //entityExplorer.SelectEntityByName(draggableWidgets.TEXTNAME("1"));
- // Display the bound store value
- propPane.UpdatePropertyFieldValue(
- PROPERTY_SELECTOR.TextFieldName,
- `{{appsmith.store.textPayloadOnSubmit}}`,
- );
- });
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 300);
+ //entityExplorer.SelectEntityByName(draggableWidgets.TEXTNAME("1"));
+ // Display the bound store value
+ propPane.UpdatePropertyFieldValue(
+ PROPERTY_SELECTOR.TextFieldName,
+ `{{appsmith.store.textPayloadOnSubmit}}`,
+ );
+ });
- it("2. StoreValue should have complete input value", () => {
- // if default input widget type is changed from text to any other type then uncomment below code.
- // if (widgetSelector === draggableWidgets.INPUT_V2) {
- // cy.openPropertyPane(widgetSelector);
- // cy.selectDropdownValue(".t--property-control-datatype", "Text");
- // cy.get(".t--property-control-required label")
- // .last()
- // .click({ force: true });
- // cy.closePropertyPane();
- // }
+ it("2. StoreValue should have complete input value", () => {
+ // if default input widget type is changed from text to any other type then uncomment below code.
+ // if (widgetSelector === draggableWidgets.INPUT_V2) {
+ // cy.openPropertyPane(widgetSelector);
+ // cy.selectDropdownValue(".t--property-control-datatype", "Text");
+ // cy.get(".t--property-control-required label")
+ // .last()
+ // .click({ force: true });
+ // cy.closePropertyPane();
+ // }
- const inputs = testConfig.testCases;
- agHelper.ClearInputText("Label");
+ const inputs = testConfig.testCases;
+ agHelper.ClearInputText("Label");
- inputs.forEach(({ charToClear, input }) => {
- // Input text and hit enter key
- // if (charToClear > 0) {
- // cy.get(getWidgetInputSelector(widgetSelector))
- // .clear()
- // .type(`${input}`);
- // } else {
- // cy.get(getWidgetInputSelector(widgetSelector)).type(`${input}`);
- // }
+ inputs.forEach(({ charToClear, input }) => {
+ // Input text and hit enter key
+ // if (charToClear > 0) {
+ // cy.get(getWidgetInputSelector(widgetSelector))
+ // .clear()
+ // .type(`${input}`);
+ // } else {
+ // cy.get(getWidgetInputSelector(widgetSelector)).type(`${input}`);
+ // }
- agHelper.RemoveCharsNType(
- locators._widgetInputSelector(widgetSelector),
- charToClear,
- input,
- );
- agHelper.GetNClick(getWidgetSelector(draggableWidgets.BUTTON));
+ agHelper.RemoveCharsNType(
+ locators._widgetInputSelector(widgetSelector),
+ charToClear,
+ input,
+ );
+ agHelper.GetNClick(getWidgetSelector(draggableWidgets.BUTTON));
- agHelper
- .GetText(locators._widgetInputSelector(widgetSelector), "val")
- .then(($expected: any) => {
- // Assert if the Currency widget has random number with trailing zero, then
- // if (widgetSelector === draggableWidgets.CURRENCY_INPUT) {
- // cy.get(getWidgetSelector(draggableWidgets.TEXT)).should(
- // "have.text",
- // expected == null
- // ? input
- // .replace(/^0+/, "") //to remove initial 0
- // .replace(/.{3}/g, "$&,")//to add comma after every 3 chars
- // .replace(/(^,)|(,$)/g, "")//to remove start & end comma's if any
- // : expected,
- // );
- agHelper.Sleep(500); //Adding time for CI flakyness in reading Label value
- agHelper
- .GetText(getWidgetSelector(draggableWidgets.TEXT))
- .then(($label) => {
- expect($label).to.eq($expected);
- });
+ agHelper
+ .GetText(locators._widgetInputSelector(widgetSelector), "val")
+ .then(($expected: any) => {
+ // Assert if the Currency widget has random number with trailing zero, then
+ // if (widgetSelector === draggableWidgets.CURRENCY_INPUT) {
+ // cy.get(getWidgetSelector(draggableWidgets.TEXT)).should(
+ // "have.text",
+ // expected == null
+ // ? input
+ // .replace(/^0+/, "") //to remove initial 0
+ // .replace(/.{3}/g, "$&,")//to add comma after every 3 chars
+ // .replace(/(^,)|(,$)/g, "")//to remove start & end comma's if any
+ // : expected,
+ // );
+ agHelper.Sleep(500); //Adding time for CI flakyness in reading Label value
+ agHelper
+ .GetText(getWidgetSelector(draggableWidgets.TEXT))
+ .then(($label) => {
+ expect($label).to.eq($expected);
+ });
- cy.wait("@postExecute").then((interception: any) => {
- expect(
- interception.response.body.data.request.headers.value,
- ).to.deep.equal([$expected]);
+ cy.wait("@postExecute").then((interception: any) => {
+ expect(
+ interception.response.body.data.request.headers.value,
+ ).to.deep.equal([$expected]);
+ });
+ //}
});
- //}
- });
+ });
});
- });
- it("3. Delete all the widgets on canvas", () => {
- agHelper.GetNClick(locators._widgetInputSelector(widgetSelector));
- agHelper.PressDelete();
+ it("3. Delete all the widgets on canvas", () => {
+ agHelper.GetNClick(locators._widgetInputSelector(widgetSelector));
+ agHelper.PressDelete();
- agHelper.GetNClick(getWidgetSelector(draggableWidgets.BUTTON));
- agHelper.AssertContains("is not defined"); //Since widget is removed & Button is still holding its reference
- agHelper.PressDelete();
+ agHelper.GetNClick(getWidgetSelector(draggableWidgets.BUTTON));
+ agHelper.AssertContains("is not defined"); //Since widget is removed & Button is still holding its reference
+ agHelper.PressDelete();
- agHelper.GetNClick(getWidgetSelector(draggableWidgets.TEXT)).click();
- agHelper.GetNClick(propPane._deleteWidget);
- });
- });
+ agHelper.GetNClick(getWidgetSelector(draggableWidgets.TEXT)).click();
+ agHelper.GetNClick(propPane._deleteWidget);
+ });
+ },
+ );
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
index 1c11adc42adc..eb68c3904507 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InvalidURL_Spec.ts
@@ -3,7 +3,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry";
const jsEditor = ObjectsRegistry.JSEditor,
agHelper = ObjectsRegistry.AggregateHelper;
-describe("Invalid page routing", () => {
+describe("Invalid page routing", { tags: ["@tag.JS"] }, () => {
it("1. Bug #16047 - Shows Invalid URL UI for invalid JS Object page url", () => {
const JS_OBJECT_BODY = `export default {
myVar1: [],
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
index 19318bcf699b..674e9b33457e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JSParse_Spec.ts
@@ -27,12 +27,15 @@ const assertLintErrorAndOutput = (
}
};
-describe("Bug #15283 - Correctly parses JS Function", () => {
- before(() => {
- ee.DragDropWidgetNVerify("singleselecttreewidget", 300, 500);
- });
- it("1. Preserves parenthesis in user's code", () => {
- const JS_OBJECT_BODY = `export default{
+describe(
+ "Bug #15283 - Correctly parses JS Function",
+ { tags: ["@tag.JS"] },
+ () => {
+ before(() => {
+ ee.DragDropWidgetNVerify("singleselecttreewidget", 300, 500);
+ });
+ it("1. Preserves parenthesis in user's code", () => {
+ const JS_OBJECT_BODY = `export default{
labels: {
filterText: "Expected result"
},
@@ -42,67 +45,80 @@ describe("Bug #15283 - Correctly parses JS Function", () => {
}
}
`;
- jsEditor.CreateJSObject(JS_OBJECT_BODY, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- });
+ jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ });
- // confirm there is no parse error
- jsEditor.AssertParseError(false);
- // Wait for parsing to be complete
- agHelper.Sleep();
- // run
- jsEditor.RunJSObj();
- // confirm there is no function execution error
- jsEditor.AssertParseError(false);
+ // confirm there is no parse error
+ jsEditor.AssertParseError(false);
+ // Wait for parsing to be complete
+ agHelper.Sleep();
+ // run
+ jsEditor.RunJSObj();
+ // confirm there is no function execution error
+ jsEditor.AssertParseError(false);
- agHelper.AssertContains("Expected results", "exist");
- });
+ agHelper.AssertContains("Expected results", "exist");
+ });
- it("2. TC 1970 - Outputs expected result", () => {
- const getJSObjectBody = (expression: string) => `export default{
+ it("2. TC 1970 - Outputs expected result", () => {
+ const getJSObjectBody = (expression: string) => `export default{
myFun1: ()=>{
const result = ${expression};
return result;
}
}
`;
- const expression1 = `null ?? (TreeSelect1.selectedOptionLabel || undefined)`;
- const expression2 = `null ?? (TreeSelect1.selectedOptionLabel && undefined)`;
- const expression3 = `!null ?? (!TreeSelect1.selectedOptionLabel || !undefined)`;
- const expression4 = `null ?? (TreeSelect1.selectedOptionLabel.unknown || undefined)`;
- const expression5 = `null ?? (null || TreeSelect1.selectedOptionLabel + " hi")`;
- const expression6 = `null ?? (TreeSelect1.selectedOptionLabel || "hi")`;
- const expression7 = `null ?? (!TreeSelect1.selectedOptionLabel + " that" || "hi")`;
- const expression8 = `null ?? (TreeSelect1.selectedOptionLabel && "hi")`;
- const expression9 = `null ?? (TreeSelect1.selectedOptionLabel && undefined)`;
- const expression10 = `null ?? (!TreeSelect1.selectedOptionLabel && "hi")`;
- const expression11 = `(null || !TreeSelect1.selectedOptionLabel) ?? TreeSelect1.selectedOptionLabel.unknown`;
- const expression12 = `(null && !TreeSelect1.selectedOptionLabel) ?? "hi"`;
- const expression13 = `(true || "universe") ?? "hi"`;
- const expression14 = `null ?? TreeSelect1.selectedOptionLabel || undefined`;
- const expression15 = `null ?? TreeSelect1.selectedOptionLabel && undefined`;
- const expression16 = `!null ?? !TreeSelect1.selectedOptionLabel || !undefined`;
- const expression17 = `null ?? TreeSelect1.selectedOptionLabel || undefined`;
+ const expression1 = `null ?? (TreeSelect1.selectedOptionLabel || undefined)`;
+ const expression2 = `null ?? (TreeSelect1.selectedOptionLabel && undefined)`;
+ const expression3 = `!null ?? (!TreeSelect1.selectedOptionLabel || !undefined)`;
+ const expression4 = `null ?? (TreeSelect1.selectedOptionLabel.unknown || undefined)`;
+ const expression5 = `null ?? (null || TreeSelect1.selectedOptionLabel + " hi")`;
+ const expression6 = `null ?? (TreeSelect1.selectedOptionLabel || "hi")`;
+ const expression7 = `null ?? (!TreeSelect1.selectedOptionLabel + " that" || "hi")`;
+ const expression8 = `null ?? (TreeSelect1.selectedOptionLabel && "hi")`;
+ const expression9 = `null ?? (TreeSelect1.selectedOptionLabel && undefined)`;
+ const expression10 = `null ?? (!TreeSelect1.selectedOptionLabel && "hi")`;
+ const expression11 = `(null || !TreeSelect1.selectedOptionLabel) ?? TreeSelect1.selectedOptionLabel.unknown`;
+ const expression12 = `(null && !TreeSelect1.selectedOptionLabel) ?? "hi"`;
+ const expression13 = `(true || "universe") ?? "hi"`;
+ const expression14 = `null ?? TreeSelect1.selectedOptionLabel || undefined`;
+ const expression15 = `null ?? TreeSelect1.selectedOptionLabel && undefined`;
+ const expression16 = `!null ?? !TreeSelect1.selectedOptionLabel || !undefined`;
+ const expression17 = `null ?? TreeSelect1.selectedOptionLabel || undefined`;
- assertLintErrorAndOutput(getJSObjectBody(expression1), false, "Blue");
- assertLintErrorAndOutput(getJSObjectBody(expression2), false, "undefined");
- assertLintErrorAndOutput(getJSObjectBody(expression3), false, "true");
- assertLintErrorAndOutput(getJSObjectBody(expression4), false, "undefined");
- assertLintErrorAndOutput(getJSObjectBody(expression5), false, "Blue hi");
- assertLintErrorAndOutput(getJSObjectBody(expression6), false, "hi");
- assertLintErrorAndOutput(getJSObjectBody(expression7), false, "false that");
- assertLintErrorAndOutput(getJSObjectBody(expression8), false, "hi");
- assertLintErrorAndOutput(getJSObjectBody(expression9), false, "hi");
- assertLintErrorAndOutput(getJSObjectBody(expression10), false, "hi");
- assertLintErrorAndOutput(getJSObjectBody(expression11), false, "false");
- assertLintErrorAndOutput(getJSObjectBody(expression12), false, "hi");
- assertLintErrorAndOutput(getJSObjectBody(expression13), false, "true");
- assertLintErrorAndOutput(getJSObjectBody(expression14), true, undefined);
- assertLintErrorAndOutput(getJSObjectBody(expression15), true, undefined);
- assertLintErrorAndOutput(getJSObjectBody(expression16), true, undefined);
- assertLintErrorAndOutput(getJSObjectBody(expression17), true, undefined);
- });
-});
+ assertLintErrorAndOutput(getJSObjectBody(expression1), false, "Blue");
+ assertLintErrorAndOutput(
+ getJSObjectBody(expression2),
+ false,
+ "undefined",
+ );
+ assertLintErrorAndOutput(getJSObjectBody(expression3), false, "true");
+ assertLintErrorAndOutput(
+ getJSObjectBody(expression4),
+ false,
+ "undefined",
+ );
+ assertLintErrorAndOutput(getJSObjectBody(expression5), false, "Blue hi");
+ assertLintErrorAndOutput(getJSObjectBody(expression6), false, "hi");
+ assertLintErrorAndOutput(
+ getJSObjectBody(expression7),
+ false,
+ "false that",
+ );
+ assertLintErrorAndOutput(getJSObjectBody(expression8), false, "hi");
+ assertLintErrorAndOutput(getJSObjectBody(expression9), false, "hi");
+ assertLintErrorAndOutput(getJSObjectBody(expression10), false, "hi");
+ assertLintErrorAndOutput(getJSObjectBody(expression11), false, "false");
+ assertLintErrorAndOutput(getJSObjectBody(expression12), false, "hi");
+ assertLintErrorAndOutput(getJSObjectBody(expression13), false, "true");
+ assertLintErrorAndOutput(getJSObjectBody(expression14), true, undefined);
+ assertLintErrorAndOutput(getJSObjectBody(expression15), true, undefined);
+ assertLintErrorAndOutput(getJSObjectBody(expression16), true, undefined);
+ assertLintErrorAndOutput(getJSObjectBody(expression17), true, undefined);
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts
new file mode 100644
index 000000000000..58fb3672aa90
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug14002_Spec.ts
@@ -0,0 +1,31 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+describe(
+ "Invalid JSObject export statement",
+ { tags: ["@tag.JS"] },
+ function () {
+ it("1. Shows error toast for invalid js object export statement", function () {
+ const JSObjectWithInvalidExport = `{
+ myFun1: ()=>{
+ return (name)=>name
+ },
+ myFun2: async ()=>{
+ return this.myFun1()("John Doe")
+ }
+ }`;
+
+ const INVALID_START_STATEMENT = "Start object with export default";
+
+ _.jsEditor.CreateJSObject(JSObjectWithInvalidExport, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ });
+
+ // Assert toast message
+ _.agHelper.ValidateToastMessage(INVALID_START_STATEMENT);
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15056_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
similarity index 93%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15056_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
index d3e0fa3c62f0..8b2bd104cab2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15056_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15056_Spec.ts
@@ -9,7 +9,7 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("JS data update on button click", function () {
+describe("JS data update on button click", { tags: ["@tag.JS"] }, function () {
before(() => {
agHelper.AddDsl("jsFunctionTriggerDsl");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15909_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
similarity index 92%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15909_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
index bc52454dc921..ba4be8142893 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug15909_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug15909_Spec.ts
@@ -3,7 +3,7 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("JS Function Execution", function () {
+describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
before(() => {
_.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200);
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18369_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
similarity index 89%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18369_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
index 46f24f086b5e..f09e1c097a02 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18369_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug18369_Spec.ts
@@ -6,7 +6,7 @@ import EditorNavigation, {
const locator = ObjectsRegistry.CommonLocators,
agHelper = ObjectsRegistry.AggregateHelper;
-describe("JS Function Execution", function () {
+describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
before(() => {
agHelper.AddDsl("formWithtabdsl");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts
new file mode 100644
index 000000000000..a63330f66859
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug19982_Spec.ts
@@ -0,0 +1,44 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+
+const jsEditor = ObjectsRegistry.JSEditor,
+ agHelper = ObjectsRegistry.AggregateHelper;
+
+describe(
+ "JS Execution of Higher-order-functions",
+ { tags: ["@tag.JS"] },
+ function () {
+ it("1. Completes execution properly", function () {
+ const JSObjectWithHigherOrderFunction = `export default{
+ myFun1: ()=>{
+ return (name)=>name
+ },
+ myFun2: async ()=>{
+ return this.myFun1()("John Doe")
+ }
+ }`;
+
+ jsEditor.CreateJSObject(JSObjectWithHigherOrderFunction, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ });
+
+ // Select And Run myFun2
+ jsEditor.SelectFunctionDropdown("myFun2");
+ jsEditor.RunJSObj();
+
+ agHelper.Sleep(3000);
+ //Expect to see Response
+ agHelper.AssertContains("John Doe");
+
+ // Select And Run myFun1
+ jsEditor.SelectFunctionDropdown("myFun1");
+ jsEditor.RunJSObj();
+
+ // Expect to see jsfunction execution error
+ jsEditor.AssertParseError(true);
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts
new file mode 100644
index 000000000000..105ea013df46
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug20841_Spec.ts
@@ -0,0 +1,47 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+ EntityType,
+} from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
+
+describe(
+ "Evaluations causing error when page is cloned",
+ { tags: ["@tag.JS"] },
+ function () {
+ it("1. Bug: 20841: JSObjects | Sync methods | Not run consistently when Page is cloned", function () {
+ const JS_OBJECT_BODY = `export default{
+ myFun1: ()=>{
+ return "Default text";
+ },
+ }`;
+ _.entityExplorer.DragDropWidgetNVerify(
+ _.draggableWidgets.INPUT_V2,
+ 200,
+ 600,
+ );
+ _.jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ });
+ EditorNavigation.SelectEntityByName("Input1", EntityType.Widget);
+ _.propPane.UpdatePropertyFieldValue(
+ "Default value",
+ "{{JSObject1.myFun1()}}",
+ );
+
+ _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
+
+ PageList.ClonePage("Page1");
+ _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
+
+ PageList.ClonePage("Page1");
+ _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
+
+ PageList.ClonePage("Page1 Copy");
+ _.agHelper.AssertText(_.locators._inputWidget, "val", "Default text");
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug24194_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
similarity index 94%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug24194_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
index 830bd44e9e3e..5c9be26ffae6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug24194_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug24194_Spec.ts
@@ -9,7 +9,7 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("Responsiveness of linting", () => {
+describe("Responsiveness of linting", { tags: ["@tag.JS"] }, () => {
before(() => {
entityExplorer.DragDropWidgetNVerify("buttonwidget", 300, 300);
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts
new file mode 100644
index 000000000000..c45dd898b845
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug25894_spec.ts
@@ -0,0 +1,45 @@
+import {
+ entityExplorer,
+ propPane,
+ draggableWidgets,
+ agHelper,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+ EntityType,
+} from "../../../../support/Pages/EditorNavigation";
+
+describe(
+ "Bug 25894 - Moustache brackets should be highlighted",
+ { tags: ["@tag.JS"] },
+ () => {
+ it("1. should show {{ }} in bold", () => {
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);
+ EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+
+ propPane.EnterJSContext(
+ "onClick",
+ `{{ Api1.run({
+ "key": Button1.text
+ }).then(() => {
+ storeValue('my-secret-key', Button3.text);
+ Query1.run();
+ }).catch(() => {});const a = { a: "key"} }}`,
+ );
+ agHelper
+ .GetElement("span")
+ .filter((index, element) => {
+ const text = Cypress.$(element).text();
+ return text.includes("{{") || text.includes("{");
+ })
+ .should("have.class", "cm-binding-brackets");
+
+ agHelper
+ .GetElement("span")
+ .filter((index, element) => {
+ const text = Cypress.$(element).text();
+ return text.includes("}}") || text.includes("}");
+ })
+ .should("have.class", "cm-binding-brackets"); // Check the class of filtered elements
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28764_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
similarity index 96%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28764_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
index 06b52fec309d..3083962c588c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28764_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug28764_Spec.ts
@@ -7,7 +7,7 @@ import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
-describe("JS Function Execution", function () {
+describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
it("Retains lint errors after navigation", function () {
// JS Object 1
jsEditor.CreateJSObject(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29131_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
similarity index 94%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29131_spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
index 8207feac80c8..0f424f4845d5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug29131_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/JS_Bug29131_spec.ts
@@ -13,7 +13,7 @@ const jsObjectBody = `export default {
}
}`;
-describe("Verifies JS object rename bug", () => {
+describe("Verifies JS object rename bug", { tags: ["@tag.JS"] }, () => {
it("Verify that a JS Object name is up for taking after it is deleted", () => {
jsEditor.CreateJSObject(jsObjectBody, {
paste: true,
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
index a6031a4b3f1a..079cb0933ed7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
@@ -17,115 +17,119 @@ import EditorNavigation, {
let dsName: any, query: string;
-describe("Bug #14299 - The data from the query does not show up on the widget", function () {
- before("Create Postgress DS & set theme", () => {
- agHelper.AddDsl("Bugs/14299dsl");
- appSettings.OpenPaneAndChangeThemeColors(13, 22);
- dataSources.CreateDataSource("Postgres");
- cy.get("@dsName").then(($dsName) => {
- dsName = $dsName;
+describe(
+ "Bug #14299 - The data from the query does not show up on the widget",
+ { tags: ["@tag.Widget", "@tag.Datasource"] },
+ function () {
+ before("Create Postgress DS & set theme", () => {
+ agHelper.AddDsl("Bugs/14299dsl");
+ appSettings.OpenPaneAndChangeThemeColors(13, 22);
+ dataSources.CreateDataSource("Postgres");
+ cy.get("@dsName").then(($dsName) => {
+ dsName = $dsName;
+ });
});
- });
- it("1. Creating query & JSObject", () => {
- query = `SELECT id, name, date_of_birth, date_of_death, nationality FROM public."astronauts" LIMIT 20;`;
- dataSources.CreateQueryAfterDSSaved(query, "getAstronauts");
- jsEditor.CreateJSObject(
- `export default {
+ it("1. Creating query & JSObject", () => {
+ query = `SELECT id, name, date_of_birth, date_of_death, nationality FROM public."astronauts" LIMIT 20;`;
+ dataSources.CreateQueryAfterDSSaved(query, "getAstronauts");
+ jsEditor.CreateJSObject(
+ `export default {
runAstros: () => {
return getAstronauts.run();
}
}`,
- {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- },
- );
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ },
+ );
- EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
- propPane.UpdatePropertyFieldValue(
- "Table data",
- `{{JSObject1.runAstros.data}}`,
- );
+ EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
+ propPane.UpdatePropertyFieldValue(
+ "Table data",
+ `{{JSObject1.runAstros.data}}`,
+ );
- EditorNavigation.SelectEntityByName("DatePicker1", EntityType.Widget);
- propPane.UpdatePropertyFieldValue(
- "Default Date",
- `{{moment(Table1.selectedRow.date_of_death)}}`,
- );
+ EditorNavigation.SelectEntityByName("DatePicker1", EntityType.Widget);
+ propPane.UpdatePropertyFieldValue(
+ "Default Date",
+ `{{moment(Table1.selectedRow.date_of_death)}}`,
+ );
- EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
- propPane.UpdatePropertyFieldValue(
- "Text",
- `Date: {{moment(Table1.selectedRow.date_of_death).toString()}}`,
- );
- });
+ EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+ propPane.UpdatePropertyFieldValue(
+ "Text",
+ `Date: {{moment(Table1.selectedRow.date_of_death).toString()}}`,
+ );
+ });
- it("2. Deploy & Verify table is populated even when moment returns Null", () => {
- deployMode.DeployApp();
- table.WaitUntilTableLoad();
- table.AssertSelectedRow(0);
- agHelper
- .GetText(locators._datePickerValue, "val")
- .then(($date) => expect($date).to.eq(""));
- agHelper
- .GetText(locators._textWidgetInDeployed)
- .then(($date) => expect($date).to.eq("Date: Invalid date"));
+ it("2. Deploy & Verify table is populated even when moment returns Null", () => {
+ deployMode.DeployApp();
+ table.WaitUntilTableLoad();
+ table.AssertSelectedRow(0);
+ agHelper
+ .GetText(locators._datePickerValue, "val")
+ .then(($date) => expect($date).to.eq(""));
+ agHelper
+ .GetText(locators._textWidgetInDeployed)
+ .then(($date) => expect($date).to.eq("Date: Invalid date"));
- table.SelectTableRow(2); //Asserting here table is available for selection
- table.ReadTableRowColumnData(2, 0, "v1", 200).then(($cellData) => {
- expect($cellData).to.eq("213");
- });
- agHelper
- .GetText(locators._datePickerValue, "val")
- .then(($date) => expect($date).to.not.eq(""));
- agHelper
- .GetText(locators._textWidgetInDeployed)
- .then(($date) => expect($date).to.not.eq("Date: Invalid date"));
+ table.SelectTableRow(2); //Asserting here table is available for selection
+ table.ReadTableRowColumnData(2, 0, "v1", 200).then(($cellData) => {
+ expect($cellData).to.eq("213");
+ });
+ agHelper
+ .GetText(locators._datePickerValue, "val")
+ .then(($date) => expect($date).to.not.eq(""));
+ agHelper
+ .GetText(locators._textWidgetInDeployed)
+ .then(($date) => expect($date).to.not.eq("Date: Invalid date"));
- table.SelectTableRow(4); //Asserting here table is available for selection
- table.ReadTableRowColumnData(4, 0, "v1", 200).then(($cellData) => {
- expect($cellData).to.eq("713");
- });
- agHelper
- .GetText(locators._datePickerValue, "val")
- .then(($date) => expect($date).to.eq(""));
- agHelper
- .GetText(locators._textWidgetInDeployed)
- .then(($date) => expect($date).to.eq("Date: Invalid date"));
+ table.SelectTableRow(4); //Asserting here table is available for selection
+ table.ReadTableRowColumnData(4, 0, "v1", 200).then(($cellData) => {
+ expect($cellData).to.eq("713");
+ });
+ agHelper
+ .GetText(locators._datePickerValue, "val")
+ .then(($date) => expect($date).to.eq(""));
+ agHelper
+ .GetText(locators._textWidgetInDeployed)
+ .then(($date) => expect($date).to.eq("Date: Invalid date"));
- table.NavigateToNextPage(false, "v1");
- table.WaitUntilTableLoad();
- table.SelectTableRow(1); //Asserting here table is available for selection
- table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
- expect($cellData).to.eq("286");
+ table.NavigateToNextPage(false, "v1");
+ table.WaitUntilTableLoad();
+ table.SelectTableRow(1); //Asserting here table is available for selection
+ table.ReadTableRowColumnData(1, 0, "v1", 200).then(($cellData) => {
+ expect($cellData).to.eq("286");
+ });
+ agHelper
+ .GetText(locators._datePickerValue, "val")
+ .then(($date) => expect($date).to.eq(""));
+ agHelper
+ .GetText(locators._textWidgetInDeployed)
+ .then(($date) => expect($date).to.eq("Date: Invalid date"));
});
- agHelper
- .GetText(locators._datePickerValue, "val")
- .then(($date) => expect($date).to.eq(""));
- agHelper
- .GetText(locators._textWidgetInDeployed)
- .then(($date) => expect($date).to.eq("Date: Invalid date"));
- });
- after(
- "Verify Deletion of the datasource after all created queries are deleted",
- () => {
- deployMode.NavigateBacktoEditor("ran successfully"); //runAstros triggered on PageLaoad of Edit page!
- PageLeftPane.expandCollapseItem("Queries/JS");
- entityExplorer.ActionContextMenuByEntityName({
- entityNameinLeftSidebar: "JSObject1",
- action: "Delete",
- entityType: entityItems.JSObject,
- });
- entityExplorer.DeleteAllQueriesForDB(dsName);
- agHelper.WaitUntilAllToastsDisappear();
- deployMode.DeployApp(locators._widgetInDeployed("tablewidget"), false);
- deployMode.NavigateBacktoEditor();
- dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
- },
- );
-});
+ after(
+ "Verify Deletion of the datasource after all created queries are deleted",
+ () => {
+ deployMode.NavigateBacktoEditor("ran successfully"); //runAstros triggered on PageLaoad of Edit page!
+ PageLeftPane.expandCollapseItem("Queries/JS");
+ entityExplorer.ActionContextMenuByEntityName({
+ entityNameinLeftSidebar: "JSObject1",
+ action: "Delete",
+ entityType: entityItems.JSObject,
+ });
+ entityExplorer.DeleteAllQueriesForDB(dsName);
+ agHelper.WaitUntilAllToastsDisappear();
+ deployMode.DeployApp(locators._widgetInDeployed("tablewidget"), false);
+ deployMode.NavigateBacktoEditor();
+ dataSources.DeleteDatasourceFromWithinDS(dsName, 200);
+ },
+ );
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/MultipleOnPageLoadConfirmation_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/MultipleOnPageLoadConfirmation_Spec.ts
index e41407b7819c..b5bd9e838b41 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/MultipleOnPageLoadConfirmation_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/MultipleOnPageLoadConfirmation_Spec.ts
@@ -5,36 +5,39 @@ const jsEditor = ObjectsRegistry.JSEditor,
ee = ObjectsRegistry.EntityExplorer,
deployMode = ObjectsRegistry.DeployMode;
-describe("Multiple rejection of confirmation for onPageLoad function execution", function () {
- before(() => {
- ee.DragDropWidgetNVerify("buttonwidget", 300, 300);
- });
- it("1. Works properly", function () {
- const FUNCTIONS_SETTINGS_DEFAULT_DATA = [
- {
- name: "myFun1",
- onPageLoad: true,
- confirmBeforeExecute: true,
- },
- {
- name: "myFun2",
- onPageLoad: true,
- confirmBeforeExecute: true,
- },
- {
- name: "myFun3",
- onPageLoad: true,
- confirmBeforeExecute: true,
- },
- ];
+describe(
+ "Multiple rejection of confirmation for onPageLoad function execution",
+ { tags: ["@tag.JS"] },
+ function () {
+ before(() => {
+ ee.DragDropWidgetNVerify("buttonwidget", 300, 300);
+ });
+ it("1. Works properly", function () {
+ const FUNCTIONS_SETTINGS_DEFAULT_DATA = [
+ {
+ name: "myFun1",
+ onPageLoad: true,
+ confirmBeforeExecute: true,
+ },
+ {
+ name: "myFun2",
+ onPageLoad: true,
+ confirmBeforeExecute: true,
+ },
+ {
+ name: "myFun3",
+ onPageLoad: true,
+ confirmBeforeExecute: true,
+ },
+ ];
- const numOfOnLoadAndConfirmExecutionActions =
- FUNCTIONS_SETTINGS_DEFAULT_DATA.filter(
- (setting) => setting.confirmBeforeExecute && setting.onPageLoad,
- ).length;
+ const numOfOnLoadAndConfirmExecutionActions =
+ FUNCTIONS_SETTINGS_DEFAULT_DATA.filter(
+ (setting) => setting.confirmBeforeExecute && setting.onPageLoad,
+ ).length;
- jsEditor.CreateJSObject(
- `export default {
+ jsEditor.CreateJSObject(
+ `export default {
${FUNCTIONS_SETTINGS_DEFAULT_DATA[0].name}: async ()=>{
return 1
},
@@ -45,42 +48,43 @@ describe("Multiple rejection of confirmation for onPageLoad function execution",
return 1
}
}`,
- {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- prettify: false,
- },
- );
-
- // Switch to settings tab
- agHelper.GetNClick(jsEditor._settingsTab);
- // Add settings for each function (according to data)
- Object.values(FUNCTIONS_SETTINGS_DEFAULT_DATA).forEach(
- (functionSetting) => {
- jsEditor.EnableDisableAsyncFuncSettings(
- functionSetting.name,
- functionSetting.onPageLoad,
- functionSetting.confirmBeforeExecute,
- );
- agHelper.Sleep(2000);
- },
- );
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: false,
+ },
+ );
- deployMode.DeployApp();
- // For as many as the number of actions set to run on page load and should confirm before running,
- // Expect to see confirmation dialogs.
- for (let i = 0; i < numOfOnLoadAndConfirmExecutionActions; i++) {
- cy.get("[data-testid='t--query-run-confirmation-modal']").should(
- "be.visible",
+ // Switch to settings tab
+ agHelper.GetNClick(jsEditor._settingsTab);
+ // Add settings for each function (according to data)
+ Object.values(FUNCTIONS_SETTINGS_DEFAULT_DATA).forEach(
+ (functionSetting) => {
+ jsEditor.EnableDisableAsyncFuncSettings(
+ functionSetting.name,
+ functionSetting.onPageLoad,
+ functionSetting.confirmBeforeExecute,
+ );
+ agHelper.Sleep(2000);
+ },
);
- cy.get(
- "[data-testid='t--query-run-confirmation-modal'] .ads-v2-button__content-children:contains('No')",
- )
- .last()
- .click();
- cy.wait(3000);
- }
- });
-});
+
+ deployMode.DeployApp();
+ // For as many as the number of actions set to run on page load and should confirm before running,
+ // Expect to see confirmation dialogs.
+ for (let i = 0; i < numOfOnLoadAndConfirmExecutionActions; i++) {
+ cy.get("[data-testid='t--query-run-confirmation-modal']").should(
+ "be.visible",
+ );
+ cy.get(
+ "[data-testid='t--query-run-confirmation-modal'] .ads-v2-button__content-children:contains('No')",
+ )
+ .last()
+ .click();
+ cy.wait(3000);
+ }
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts
new file mode 100644
index 000000000000..61ce5db547b6
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/SelectWidget_Bug9334_Spec.ts
@@ -0,0 +1,87 @@
+import {
+ agHelper,
+ appSettings,
+ assertHelper,
+ dataSources,
+ locators,
+ table,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+ EntityType,
+ AppSidebarButton,
+ AppSidebar,
+} from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
+
+let dsName: any;
+
+describe(
+ "Bug 9334: The Select widget value is sent as null when user switches between the pages",
+ { tags: ["@tag.Widget"] },
+ function () {
+ before("Change Theme & Create Postgress DS", () => {
+ appSettings.OpenPaneAndChangeTheme("Pampas");
+ dataSources.CreateDataSource("Postgres");
+ cy.get("@dsName").then(($dsName) => {
+ dsName = $dsName;
+ });
+ AppSidebar.navigate(AppSidebarButton.Editor);
+ });
+
+ it("1. Create dummy pages for navigating", () => {
+ //CRUD page 2
+ PageList.AddNewPage();
+ PageList.AddNewPage("Generate page with data");
+ agHelper.GetNClick(dataSources._selectDatasourceDropdown);
+ agHelper.GetNClickByContains(dataSources._dropdownOption, dsName);
+
+ assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
+ agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
+ agHelper.GetNClickByContains(dataSources._dropdownOption, "astronauts");
+ agHelper.GetNClick(dataSources._generatePageBtn);
+ assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
+ agHelper.AssertContains("Successfully generated a page");
+ //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes
+ assertHelper.AssertNetworkStatus("@postExecute", 200);
+ agHelper.ClickButton("Got it");
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ table.WaitUntilTableLoad();
+
+ //CRUD page 3
+ PageList.AddNewPage();
+ PageList.AddNewPage("Generate page with data");
+ agHelper.GetNClick(dataSources._selectDatasourceDropdown);
+ agHelper.GetNClickByContains(dataSources._dropdownOption, dsName);
+
+ assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
+ agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
+ agHelper.GetNClickByContains(dataSources._dropdownOption, "country");
+ agHelper.GetNClick(dataSources._generatePageBtn);
+ assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
+ agHelper.AssertContains("Successfully generated a page");
+ //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes
+ assertHelper.AssertNetworkStatus("@postExecute", 200);
+ agHelper.ClickButton("Got it");
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ table.WaitUntilTableLoad();
+ });
+
+ it("2. Navigate & Assert toast", () => {
+ //Navigating between CRUD (Page3) & EmptyPage (Page2):
+ EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+ agHelper.Sleep(2000);
+ EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
+ agHelper.AssertElementAbsence(
+ locators._specificToast('The action "SelectQuery" has failed.'),
+ );
+
+ //Navigating between CRUD (Page3) & CRUD (Page4):
+ EditorNavigation.SelectEntityByName("Page3", EntityType.Page);
+ agHelper.Sleep(2000);
+ EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
+ agHelper.AssertElementAbsence(
+ locators._specificToast('The action "SelectQuery" has failed.'),
+ );
+ });
+ },
+);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27119_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
similarity index 97%
rename from app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27119_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
index ed2067b4d3d0..e9aa3e6cb90d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug27119_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Widget_Bug27119_Spec.ts
@@ -8,7 +8,7 @@ import {
jsEditor,
} from "../../../../support/Objects/ObjectsCore";
-describe("Reset widget action", () => {
+describe("Reset widget action", { tags: ["@tag.Widget"] }, () => {
it("Reset widget to default after setValue has been applied", () => {
entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2);
propPane.UpdatePropertyFieldValue("Default value", "John");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
index a5de418de6b5..0a6e6665b9ac 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/defaultFilterTextValue_Spec.ts
@@ -2,7 +2,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry";
const agHelper = ObjectsRegistry.AggregateHelper;
-describe("Select widget filterText", () => {
+describe("Select widget filterText", { tags: ["@tag.Widget"] }, () => {
before(() => {
agHelper.AddDsl("defaultFilterText");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
index 90d81f99affb..46dca4c26246 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/formHasChanged_Spec.ts
@@ -7,7 +7,7 @@ const ee = ObjectsRegistry.EntityExplorer,
locator = ObjectsRegistry.CommonLocators,
agHelper = ObjectsRegistry.AggregateHelper;
-describe("JS Function Execution", function () {
+describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
before(() => {
agHelper.AddDsl("formChangeDSL");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
index 0dd28e560b30..7ccf899196a9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/invalidLintError_Spec.ts
@@ -5,7 +5,7 @@ const jsEditor = ObjectsRegistry.JSEditor,
ee = ObjectsRegistry.EntityExplorer,
agHelper = ObjectsRegistry.AggregateHelper;
-describe("Linting", () => {
+describe("Linting", { tags: ["@tag.JS"] }, () => {
before(() => {
ee.DragDropWidgetNVerify("buttonwidget", 300, 300);
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/FormLogin/EnableFormLogin_spec.js b/app/client/cypress/e2e/Regression/ClientSide/FormLogin/EnableFormLogin_spec.js
index 68abe6cf2cb6..aad92c6e6d55 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/FormLogin/EnableFormLogin_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/FormLogin/EnableFormLogin_spec.js
@@ -64,6 +64,7 @@ describe("Form Login test functionality", function () {
it(
"excludeForAirgap",
"2. Go to admin settings and disable Form Login",
+ { tags: ["@tag.excludeForAirgap"] },
function () {
cy.LogOut(false);
cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
diff --git a/app/client/cypress/tags.js b/app/client/cypress/tags.js
index 0224164e924c..f413a64dcc4e 100644
--- a/app/client/cypress/tags.js
+++ b/app/client/cypress/tags.js
@@ -21,6 +21,7 @@ module.exports = {
"@tag.Table",
"@tag.Image",
"@tag.Tab",
+ "@tag.GSheet",
"@tag.JSONForm",
"@tag.Binding",
"@tag.IDE",
@@ -29,6 +30,7 @@ module.exports = {
"@tag.GenerateCRUD",
"@tag.MobileResponsive",
"@tag.Theme",
- "@tag.Random",
+ "@tag.Settings",
+ "@tag.ImportExport",
],
};
|
53b8bc87551ddfc313bce07e1846357f7345bcbf
|
2025-02-10 19:41:52
|
Sagar Khalasi
|
fix: fix for js visual spec snapshots (#39154)
| false
|
fix for js visual spec snapshots (#39154)
|
fix
|
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index 00e32a4629d0..8b8460be7ddb 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -4,4 +4,4 @@
#cypress/e2e/**/**/*
cypress/e2e/Regression/ClientSide/Anvil/Widgets/*
-#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.
+#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.
\ No newline at end of file
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png
index e4ef6ce440a3..0fd137f37a43 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png
index b61d94f1abc6..8ffb1273a1b4 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png
index cf865f7a8d8c..d2267e78c443 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png
index c06b341e72b0..d7aa39137c1a 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png
index 96646373b7ca..631d01ffcc02 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png
index 56f388391ef8..ab2c99c97b2e 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png
index a0b3f910d326..9d627f45bdb7 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png
index aafb4bf0a0c8..31a56622b387 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png
index 12de03a73003..c7518420ebc2 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png
index b285d83bde4d..ab2c99c97b2e 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png
index b5f081faff31..0d2934013170 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png
index 2f7abdbb42b4..110e14b2062a 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png
index 9c74b5d4d479..63325c6c9431 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png differ
diff --git a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png
index 2f7abdbb42b4..110e14b2062a 100644
Binary files a/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png and b/app/client/cypress/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png differ
|
a97c41ac435924539de8fc76d6d015c60468cdff
|
2024-02-26 15:40:00
|
Shrikant Sharat Kandula
|
chore: Add `updateFirstAndFind` to Fluent repo API (#31165)
| false
|
Add `updateFirstAndFind` to Fluent repo API (#31165)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
index 8d05c07ef54f..25d6493c3b95 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
@@ -35,6 +35,7 @@
import java.time.Instant;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -153,18 +154,7 @@ public Mono<T> findById(String id, Optional<AclPermission> permission) {
return findById(id, permission.orElse(null));
}
- @Deprecated
- public Mono<T> updateById(String id, T resource, AclPermission permission) {
- if (id == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
- }
- if (resource == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
- }
- return updateById(id, resource, Optional.ofNullable(permission));
- }
-
- public Mono<T> updateById(String id, T resource, Optional<AclPermission> permission) {
+ public Mono<T> updateById(@NonNull String id, @NonNull T resource, AclPermission permission) {
// Set policies to null in the update object
resource.setPolicies(null);
resource.setUpdatedAt(Instant.now());
@@ -173,19 +163,7 @@ public Mono<T> updateById(String id, T resource, Optional<AclPermission> permiss
Update updateObj = new Update();
update.keySet().forEach(entry -> updateObj.set(entry, update.get(entry)));
- return ReactiveSecurityContextHolder.getContext()
- .map(ctx -> (User) ctx.getAuthentication().getPrincipal())
- .flatMap(user -> {
- resource.setModifiedBy(user.getUsername());
- return (permission.isPresent() ? getAllPermissionGroupsForUser(user) : Mono.just(Set.<String>of()))
- .flatMap(permissionGroups -> queryBuilder()
- .byId(id)
- .permissionGroups(permissionGroups)
- .permission(permission.orElse(null))
- .updateFirst(updateObj)
- .then(findById(id, permission))
- .flatMap(obj -> setUserPermissionsInObject(obj, permissionGroups)));
- });
+ return queryBuilder().byId(id).permission(permission).updateFirstAndFind(updateObj);
}
public Mono<Integer> updateFieldByDefaultIdAndBranchName(
@@ -265,9 +243,9 @@ public QueryAllParams<T> queryBuilder() {
}
public Flux<T> queryAllExecute(QueryAllParams<T> params) {
- return tryGetPermissionGroups(params).flatMapMany(permissionGroups -> {
+ return ensurePermissionGroupsInParams(params).thenMany(Flux.defer(() -> {
final Query query = createQueryWithPermission(
- params.getCriteria(), params.getFields(), permissionGroups, params.getPermission());
+ params.getCriteria(), params.getFields(), params.getPermissionGroups(), params.getPermission());
if (params.getSkip() > NO_SKIP) {
query.skip(params.getSkip());
@@ -285,37 +263,41 @@ public Flux<T> queryAllExecute(QueryAllParams<T> params) {
.query(this.genericDomain)
.matching(query.cursorBatchSize(10_000))
.all()
- .flatMap(obj -> setUserPermissionsInObject(obj, permissionGroups));
- });
+ .flatMap(obj -> setUserPermissionsInObject(obj, params.getPermissionGroups()));
+ }));
}
public Mono<T> queryOneExecute(QueryAllParams<T> params) {
- return tryGetPermissionGroups(params).flatMap(permissionGroups -> mongoOperations
+ return ensurePermissionGroupsInParams(params).then(Mono.defer(() -> mongoOperations
.query(this.genericDomain)
.matching(createQueryWithPermission(
- params.getCriteria(), params.getFields(), permissionGroups, params.getPermission())
+ params.getCriteria(),
+ params.getFields(),
+ params.getPermissionGroups(),
+ params.getPermission())
.cursorBatchSize(10_000))
.one()
- .flatMap(obj -> setUserPermissionsInObject(obj, permissionGroups)));
+ .flatMap(obj -> setUserPermissionsInObject(obj, params.getPermissionGroups()))));
}
public Mono<T> queryFirstExecute(QueryAllParams<T> params) {
- return tryGetPermissionGroups(params).flatMap(permissionGroups -> mongoOperations
+ return ensurePermissionGroupsInParams(params).then(Mono.defer(() -> mongoOperations
.query(this.genericDomain)
.matching(createQueryWithPermission(
- params.getCriteria(), params.getFields(), permissionGroups, params.getPermission()))
+ params.getCriteria(), params.getFields(), params.getPermissionGroups(), params.getPermission()))
.first()
- .flatMap(obj -> setUserPermissionsInObject(obj, permissionGroups)));
+ .flatMap(obj -> setUserPermissionsInObject(obj, params.getPermissionGroups()))));
}
public Mono<Long> countExecute(QueryAllParams<T> params) {
- return tryGetPermissionGroups(params)
- .flatMap(permissionGroups -> mongoOperations.count(
- createQueryWithPermission(params.getCriteria(), permissionGroups, params.getPermission()),
- this.genericDomain));
+ return ensurePermissionGroupsInParams(params)
+ .then(Mono.defer(() -> mongoOperations.count(
+ createQueryWithPermission(
+ params.getCriteria(), params.getPermissionGroups(), params.getPermission()),
+ this.genericDomain)));
}
- public Mono<Integer> updateAllExecute(@NonNull QueryAllParams<T> params, @NonNull UpdateDefinition update) {
+ public Mono<Integer> updateExecute(@NonNull QueryAllParams<T> params, @NonNull UpdateDefinition update) {
Objects.requireNonNull(params.getCriteria());
if (!isEmpty(params.getFields())) {
@@ -323,10 +305,10 @@ public Mono<Integer> updateAllExecute(@NonNull QueryAllParams<T> params, @NonNul
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "fields"));
}
- return tryGetPermissionGroups(params)
- .flatMap(permissionGroups -> {
+ return ensurePermissionGroupsInParams(params)
+ .then(Mono.defer(() -> {
final Query query = createQueryWithPermission(
- params.getCriteria(), null, permissionGroups, params.getPermission());
+ params.getCriteria(), null, params.getPermissionGroups(), params.getPermission());
if (QueryAllParams.Scope.ALL.equals(params.getScope())) {
return mongoOperations.updateMulti(query, update, genericDomain);
} else if (QueryAllParams.Scope.FIRST.equals(params.getScope())) {
@@ -334,14 +316,40 @@ public Mono<Integer> updateAllExecute(@NonNull QueryAllParams<T> params, @NonNul
} else {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "scope"));
}
- })
+ }))
.map(updateResult -> Math.toIntExact(updateResult.getModifiedCount()));
}
- private Mono<Set<String>> tryGetPermissionGroups(QueryAllParams<T> params) {
- return Mono.justOrEmpty(params.getPermissionGroups())
- .switchIfEmpty(Mono.defer(() -> getCurrentUserPermissionGroupsIfRequired(
- Optional.ofNullable(params.getPermission()), params.isIncludeAnonymousUserPermissions())));
+ public Mono<T> updateExecuteAndFind(@NonNull QueryAllParams<T> params, @NonNull UpdateDefinition update) {
+ if (QueryAllParams.Scope.ALL.equals(params.getScope())) {
+ // Not implemented yet, since not needed yet.
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "scope"));
+
+ } else if (QueryAllParams.Scope.FIRST.equals(params.getScope())) {
+ return updateExecute(params, update).then(Mono.defer(() -> queryOneExecute(params)));
+
+ } else {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "scope"));
+ }
+ }
+
+ /**
+ * This method will try to ensure that permission groups are present in the params. If they're already there, don't
+ * do anything. If not, and if a `permission` is available, then get the permission groups for the current user and
+ * permission and fill that into the `params` object.
+ * @param params that may have permission groups already, and a permission that can be used to get permission groups otherwise.
+ * @return the same `params` object, but with permission groups filled in.
+ */
+ private Mono<Void> ensurePermissionGroupsInParams(QueryAllParams<T> params) {
+ if (params.getPermissionGroups() != null) {
+ return Mono.empty();
+ }
+
+ return getCurrentUserPermissionGroupsIfRequired(
+ Optional.ofNullable(params.getPermission()), params.isIncludeAnonymousUserPermissions())
+ .defaultIfEmpty(Collections.emptySet())
+ .map(params::permissionGroups)
+ .then();
}
public Mono<T> setUserPermissionsInObject(T obj) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java
index 6c971225c4f3..258f902f2bf2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java
@@ -62,12 +62,17 @@ public Mono<Long> count() {
public Mono<Integer> updateAll(@NonNull UpdateDefinition update) {
scope = Scope.ALL;
- return repo.updateAllExecute(this, update);
+ return repo.updateExecute(this, update);
}
public Mono<Integer> updateFirst(@NonNull UpdateDefinition update) {
scope = Scope.FIRST;
- return repo.updateAllExecute(this, update);
+ return repo.updateExecute(this, update);
+ }
+
+ public Mono<T> updateFirstAndFind(@NonNull UpdateDefinition update) {
+ scope = Scope.FIRST;
+ return repo.updateExecuteAndFind(this, update);
}
public QueryAllParams<T> criteria(Criteria... criteria) {
|
33b073dd30db4eec9fc923ab9c202312ad2f70ee
|
2023-12-21 14:57:05
|
yatinappsmith
|
ci: Added Cache for Server Build (#29775)
| false
|
Added Cache for Server Build (#29775)
|
ci
|
diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
index 273a67de2186..47d3b367067a 100644
--- a/.github/workflows/server-build.yml
+++ b/.github/workflows/server-build.yml
@@ -228,5 +228,31 @@ jobs:
name: server-build
path: app/server/dist/
+ - name: Put release build in cache
+ if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+ env:
+ cachetoken: ${{ secrets.CACHETOKEN }}
+ reponame: ${{ github.event.repository.name }}
+ gituser: ${{ secrets.CACHE_GIT_USER }}
+ gituseremail: ${{ secrets.CACHE_GIT_EMAIL }}
+ run: |
+ pwd
+ tar -czvf server.jar dist/
+ mkdir cacherepo
+ cd ./cacherepo
+ git config --global user.email $gituseremail
+ git config --global user.name $gituser
+ git clone https://[email protected]/appsmithorg/cibuildcache.git
+ git lfs install
+ cd testcacherepo/
+ if [ "$reponame" = "appsmith" ]; then export repodir="CE"; fi
+ if [ "$reponame" = "appsmith-ee" ]; then export repodir="EE"; fi
+ cd $repodir/release/server
+ cp ../../../../../server.jar ./
+ git lfs track "server.jar"
+ git add server.jar
+ git commit -m "Update Latest Server.jar"
+ git push
+
- name: Save the status of the run
run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
|
fa76a9a6e9f17b527e993f0fb0ddcc5439ea8e3e
|
2021-07-23 14:42:51
|
Tolulope Adetula
|
fix: File picker disabled state (#5972)
| false
|
File picker disabled state (#5972)
|
fix
|
diff --git a/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx b/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx
index 834ef89be830..c7732b0ff03d 100644
--- a/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/FilePickerComponent.tsx
@@ -17,7 +17,9 @@ class FilePickerComponent extends React.Component<
}
openModal = () => {
- this.props.uppy.getPlugin("Dashboard").openModal();
+ if (!this.props.isDisabled) {
+ this.props.uppy.getPlugin("Dashboard").openModal();
+ }
};
render() {
|
f6f5fc6071358cd0dbf28b358a1f09082e3cb343
|
2020-05-05 13:49:33
|
Sunil K S
|
fix: provider image in search container
| false
|
provider image in search container
|
fix
|
diff --git a/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx b/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx
index 75cf57e69fee..87de8f8fc56e 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx
@@ -158,6 +158,7 @@ const StyledContainer = styled.div`
.providerSearchResultImage {
height: 50px;
width: 60px;
+ object-fit: contain;
}
.providerSearchResultName {
display: flex;
|
ff2e239f4798dd9f3e4e0fabeb6a06c43146b789
|
2024-05-02 10:10:13
|
Aman Agarwal
|
fix: cypress flakiness due to focus cypress function (#33106)
| false
|
cypress flakiness due to focus cypress function (#33106)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/UpdateApplication_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/UpdateApplication_spec.js
index 0fa71f02dde3..706334ea084d 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/UpdateApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/UpdateApplication_spec.js
@@ -15,11 +15,13 @@ describe("Update Application", () => {
appname = localStorage.getItem("appName");
cy.get(homePage.searchInput).clear();
- cy.get(homePage.searchInput).type(workspaceName);
+ cy.get(homePage.searchInput).click().type(workspaceName);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
cy.get(homePage.appMoreIcon).first().click({ force: true });
- cy.get(homePage.applicationName).type(`${appname} updated` + "{enter}");
+ cy.get(homePage.applicationName)
+ .click()
+ .type(`${appname} updated` + "{enter}");
cy.wait("@updateApplication").should(
"have.nested.property",
"response.body.responseMeta.status",
@@ -45,7 +47,7 @@ describe("Update Application", () => {
it("3. Check for errors in updating application name", () => {
cy.get(commonlocators.homeIcon).click({ force: true });
cy.get(homePage.searchInput).clear();
- cy.get(homePage.searchInput).type(workspaceName);
+ cy.get(homePage.searchInput).click().type(workspaceName);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
cy.get(homePage.applicationCard).first().trigger("mouseover");
@@ -55,14 +57,16 @@ describe("Update Application", () => {
cy.wait(2000);
cy.AppSetupForRename();
- cy.get(homePage.applicationName).type(" ");
+ cy.get(homePage.applicationName).click().type(" ");
cy.get(homePage.toastMessage).should(
"contain",
"Application name can't be empty",
);
cy.AppSetupForRename();
- cy.get(homePage.applicationName).type(" " + "{enter}");
+ cy.get(homePage.applicationName)
+ .click()
+ .type(" " + "{enter}");
cy.wait("@updateApplication").should(
"have.nested.property",
"response.body.data.name",
@@ -76,7 +80,9 @@ describe("Update Application", () => {
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
cy.get(homePage.appMoreIcon).first().click({ force: true });
- cy.get(homePage.applicationName).type(veryLongAppName + "{enter}");
+ cy.get(homePage.applicationName)
+ .click()
+ .type(veryLongAppName + "{enter}");
agHelper.GetNClick(homePage.workspaceCompleteSection, 0, true);
cy.wait("@updateApplication").should(
"have.nested.property",
@@ -85,7 +91,7 @@ describe("Update Application", () => {
);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
- cy.get(homePage.searchInput).type(veryLongAppName);
+ cy.get(homePage.searchInput).click().type(veryLongAppName);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
cy.get(homePage.applicationCard)
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
index 87a07bc11390..71e8bf1e95c4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker3_spec.ts
@@ -92,11 +92,8 @@ describe(
deployMode.DeployApp();
agHelper.GetNClick(datePickerlocators.input);
agHelper.ClearNType(datePickerlocators.inputHour, "12", 0, true);
- agHelper.Sleep(500); // wait for the input to be updated for CI runs
agHelper.ClearNType(datePickerlocators.inputMinute, "58", 0, true);
- agHelper.Sleep(500); // wait for the input to be updated for CI runs
agHelper.ClearNType(datePickerlocators.inputSecond, "59", 0, true);
- agHelper.Sleep(500); // wait for the input to be updated for CI runs
agHelper.PressEnter();
agHelper
.GetAttribute(datePickerlocators.input, "value")
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 820c57c5de6e..911e7c2e666b 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -885,7 +885,11 @@ export class AggregateHelper {
}
public ClearTextField(selector: string, force = false, index = 0) {
- this.GetElement(selector).eq(index).focus().clear({ force });
+ this.GetElement(selector)
+ .eq(index)
+ .scrollIntoView({ easing: "linear" })
+ .click()
+ .clear({ force });
this.Sleep(500); //for text to clear for CI runs
}
@@ -934,6 +938,8 @@ export class AggregateHelper {
element.focus();
}
+ if (value === "") return element;
+
return element.wait(100).type(value, {
parseSpecialCharSequences: parseSpecialCharSeq,
delay: delay,
|
7713482003fb9eb73536066507ea4ed21b8c41a7
|
2024-09-11 11:05:15
|
Manish Kumar
|
chore: Migration for missing datasource configuration on default rest datasources for git connected app. (#36203)
| false
|
Migration for missing datasource configuration on default rest datasources for git connected app. (#36203)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
index 39a87d72fac6..99333df7b92c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
@@ -362,7 +362,8 @@ public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromFilesInRepo
getApplicationResource(applicationReference.getMetadata(), ApplicationJson.class);
ApplicationJson applicationJson = getApplicationJsonFromGitReference(applicationReference);
copyNestedNonNullProperties(metadata, applicationJson);
- return jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+ return jsonSchemaMigration.migrateApplicationJsonToLatestSchema(
+ applicationJson, baseArtifactId, branchName);
});
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
index 047c037e6c4f..03d543dd3d05 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java
@@ -6,35 +6,27 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.CollectionUtils;
+import com.appsmith.server.migrations.utils.JsonSchemaMigrationHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
+import java.util.Map;
+
@Slf4j
@Component
@RequiredArgsConstructor
public class JsonSchemaMigration {
private final JsonSchemaVersions jsonSchemaVersions;
+ private final JsonSchemaMigrationHelper jsonSchemaMigrationHelper;
private boolean isCompatible(ApplicationJson applicationJson) {
return (applicationJson.getClientSchemaVersion() <= jsonSchemaVersions.getClientVersion())
&& (applicationJson.getServerSchemaVersion() <= jsonSchemaVersions.getServerVersion());
}
- /**
- * This is a temporary check which is being placed for the compatibility of server versions in scenarios
- * where user is moving a json from an instance which has
- * release_autocommit_feature_enabled true to an instance which has the flag as false. In that case the server
- * version number of json would be 8 and in new instance it would be not compatible.
- * @param applicationJson
- * @return
- */
- private boolean isAutocommitVersionBump(ApplicationJson applicationJson) {
- return jsonSchemaVersions.getServerVersion() == 7 && applicationJson.getServerSchemaVersion() == 8;
- }
-
private void setSchemaVersions(ApplicationJson applicationJson) {
applicationJson.setServerSchemaVersion(getCorrectSchemaVersion(applicationJson.getServerSchemaVersion()));
applicationJson.setClientSchemaVersion(getCorrectSchemaVersion(applicationJson.getClientSchemaVersion()));
@@ -53,24 +45,53 @@ public Mono<? extends ArtifactExchangeJson> migrateArtifactExchangeJsonToLatestS
ArtifactExchangeJson artifactExchangeJson) {
if (ArtifactType.APPLICATION.equals(artifactExchangeJson.getArtifactJsonType())) {
- return migrateApplicationJsonToLatestSchema((ApplicationJson) artifactExchangeJson);
+ return migrateApplicationJsonToLatestSchema((ApplicationJson) artifactExchangeJson, null, null);
}
return Mono.fromCallable(() -> artifactExchangeJson);
}
- public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(ApplicationJson applicationJson) {
+ public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(
+ ApplicationJson applicationJson, String baseApplicationId, String branchName) {
return Mono.fromCallable(() -> {
setSchemaVersions(applicationJson);
- if (isCompatible(applicationJson)) {
- return migrateServerSchema(applicationJson);
- }
-
- if (isAutocommitVersionBump(applicationJson)) {
- return migrateServerSchema(applicationJson);
+ return applicationJson;
+ })
+ .flatMap(appJson -> {
+ if (!isCompatible(appJson)) {
+ return Mono.empty();
}
- return null;
+ // Taking a tech debt over here for import of file application.
+ // All migration above version 9 is reactive
+ // TODO: make import flow migration reactive
+ return Mono.just(migrateServerSchema(appJson))
+ .flatMap(migratedApplicationJson -> {
+ if (migratedApplicationJson.getServerSchemaVersion() == 9
+ && Boolean.TRUE.equals(MigrationHelperMethods.doesRestApiRequireMigration(
+ migratedApplicationJson))) {
+ return jsonSchemaMigrationHelper
+ .addDatasourceConfigurationToDefaultRestApiActions(
+ baseApplicationId, branchName, migratedApplicationJson)
+ .map(applicationJsonWithMigration10 -> {
+ applicationJsonWithMigration10.setServerSchemaVersion(10);
+ return applicationJsonWithMigration10;
+ });
+ }
+
+ migratedApplicationJson.setServerSchemaVersion(10);
+ return Mono.just(migratedApplicationJson);
+ })
+ .map(migratedAppJson -> {
+ if (applicationJson
+ .getServerSchemaVersion()
+ .equals(jsonSchemaVersions.getServerVersion())) {
+ return applicationJson;
+ }
+
+ applicationJson.setServerSchemaVersion(jsonSchemaVersions.getServerVersion());
+ return applicationJson;
+ });
})
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON)));
}
@@ -81,7 +102,7 @@ public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(ApplicationJso
* @param artifactExchangeJson : the json to be imported
* @return transformed artifact exchange json
*/
- @Deprecated
+ @Deprecated(forRemoval = true, since = "Use migrateArtifactJsonToLatestSchema")
public ArtifactExchangeJson migrateArtifactToLatestSchema(ArtifactExchangeJson artifactExchangeJson) {
if (!ArtifactType.APPLICATION.equals(artifactExchangeJson.getArtifactJsonType())) {
@@ -91,11 +112,11 @@ public ArtifactExchangeJson migrateArtifactToLatestSchema(ArtifactExchangeJson a
ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
setSchemaVersions(applicationJson);
if (!isCompatible(applicationJson)) {
- if (!isAutocommitVersionBump(applicationJson)) {
- throw new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON);
- }
+ throw new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON);
}
- return migrateServerSchema(applicationJson);
+
+ applicationJson = migrateServerSchema(applicationJson);
+ return nonReactiveServerMigrationForImport(applicationJson);
}
/**
@@ -145,11 +166,37 @@ private ApplicationJson migrateServerSchema(ApplicationJson applicationJson) {
MigrationHelperMethods.ensureXmlParserPresenceInCustomJsLibList(applicationJson);
applicationJson.setServerSchemaVersion(7);
case 7:
+ applicationJson.setServerSchemaVersion(8);
case 8:
MigrationHelperMethods.migrateThemeSettingsForAnvil(applicationJson);
applicationJson.setServerSchemaVersion(9);
+
+ // This is not supposed to have anymore additions to the schema.
default:
// Unable to detect the serverSchema
+
+ }
+
+ return applicationJson;
+ }
+
+ /**
+ * This method is an alternative to reactive way of adding migrations to application json.
+ * this is getting used by flows which haven't implemented the reactive way yet.
+ * @param applicationJson : application json for which migration has to be done.
+ * @return return application json after migration
+ */
+ private ApplicationJson nonReactiveServerMigrationForImport(ApplicationJson applicationJson) {
+ if (jsonSchemaVersions.getServerVersion().equals(applicationJson.getServerSchemaVersion())) {
+ return applicationJson;
+ }
+
+ switch (applicationJson.getServerSchemaVersion()) {
+ case 9:
+ // this if for cases where we have empty datasource configs
+ MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, Map.of());
+ applicationJson.setServerSchemaVersion(10);
+ default:
}
if (applicationJson.getServerSchemaVersion().equals(jsonSchemaVersions.getServerVersion())) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
index 63b6c7e7d4e3..06518c18b4e1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java
@@ -4,7 +4,7 @@
@Component
public class JsonSchemaVersionsFallback {
- private static final Integer serverVersion = 9;
+ private static final Integer serverVersion = 10;
public static final Integer clientVersion = 1;
public Integer getServerVersion() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
index cf18759a867a..87e3d93e6ff6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
@@ -1,8 +1,11 @@
package com.appsmith.server.migrations;
+import com.appsmith.external.constants.PluginConstants;
import com.appsmith.external.helpers.MustacheHelper;
import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.BaseDomain;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.InvisibleActionFields;
import com.appsmith.external.models.Property;
import com.appsmith.server.constants.ApplicationConstants;
@@ -1231,4 +1234,106 @@ public static void setThemeSettings(Application.ThemeSetting themeSetting) {
themeSetting.setSizing(1);
}
}
+
+ private static boolean conditionForDefaultRestDatasourceMigration(NewAction action) {
+ Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+
+ // condition to check if the action is default rest datasource.
+ // it has no datasource id and name is equal to DEFAULT_REST_DATASOURCE
+ boolean isActionDefaultRestDatasource = !org.springframework.util.StringUtils.hasText(actionDatasource.getId())
+ && PluginConstants.DEFAULT_REST_DATASOURCE.equals(actionDatasource.getName());
+
+ // condition to check if the action has missing url or has no config at all
+ boolean isDatasourceConfigurationOrUrlMissing = actionDatasource.getDatasourceConfiguration() == null
+ || !org.springframework.util.StringUtils.hasText(
+ actionDatasource.getDatasourceConfiguration().getUrl());
+
+ return isActionDefaultRestDatasource && isDatasourceConfigurationOrUrlMissing;
+ }
+
+ /**
+ * Adds datasource configuration and relevant url to the embedded datasource actions.
+ * @param applicationJson: ApplicationJson for which the migration has to be performed
+ * @param defaultDatasourceActionMap: gitSyncId to actions with default rest datasource map
+ */
+ public static void migrateApplicationJsonToVersionTen(
+ ApplicationJson applicationJson, Map<String, NewAction> defaultDatasourceActionMap) {
+ List<NewAction> actionList = applicationJson.getActionList();
+ if (CollectionUtils.isNullOrEmpty(actionList)) {
+ return;
+ }
+
+ for (NewAction action : actionList) {
+ if (action.getUnpublishedAction() == null
+ || action.getUnpublishedAction().getDatasource() == null) {
+ continue;
+ }
+
+ Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+ if (conditionForDefaultRestDatasourceMigration(action)) {
+ // Idea is to add datasourceConfiguration to existing DEFAULT_REST_DATASOURCE apis,
+ // for which the datasource configuration is missing
+ // the url would be set to empty string as right url is not present over here.
+ setDatasourceConfigDetailsInDefaultRestDatasourceForActions(action, defaultDatasourceActionMap);
+ }
+ }
+ }
+
+ /**
+ * Finds if the applicationJson has any default rest datasource which has a null datasource configuration
+ * or an unset url.
+ * @param applicationJson : Application Json for which requirement is to be checked.
+ * @return true if the application has a rest api which doesn't have a valid datasource configuration.
+ */
+ public static Boolean doesRestApiRequireMigration(ApplicationJson applicationJson) {
+ List<NewAction> actionList = applicationJson.getActionList();
+ if (CollectionUtils.isNullOrEmpty(actionList)) {
+ return Boolean.FALSE;
+ }
+
+ for (NewAction action : actionList) {
+ if (action.getUnpublishedAction() == null
+ || action.getUnpublishedAction().getDatasource() == null) {
+ continue;
+ }
+
+ Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
+ if (conditionForDefaultRestDatasourceMigration(action)) {
+ return Boolean.TRUE;
+ }
+ }
+
+ return Boolean.FALSE;
+ }
+
+ /**
+ * Adds the relevant url in the default rest datasource for the given action from an action in the db
+ * otherwise sets the url to empty
+ * it's established that action doesn't have the datasource.
+ * @param action : default rest datasource actions which doesn't have valid datasource configuration.
+ * @param defaultDatasourceActionMap : gitSyncId to actions with default rest datasource map
+ */
+ public static void setDatasourceConfigDetailsInDefaultRestDatasourceForActions(
+ NewAction action, Map<String, NewAction> defaultDatasourceActionMap) {
+
+ ActionDTO actionDTO = action.getUnpublishedAction();
+ Datasource actionDatasource = actionDTO.getDatasource();
+ DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+
+ if (defaultDatasourceActionMap.containsKey(action.getGitSyncId())) {
+ NewAction actionFromMap = defaultDatasourceActionMap.get(action.getGitSyncId());
+ DatasourceConfiguration datasourceConfigurationFromDBAction =
+ actionFromMap.getUnpublishedAction().getDatasource().getDatasourceConfiguration();
+
+ if (datasourceConfigurationFromDBAction != null) {
+ datasourceConfiguration.setUrl(datasourceConfigurationFromDBAction.getUrl());
+ }
+ }
+
+ if (!org.springframework.util.StringUtils.hasText(datasourceConfiguration.getUrl())) {
+ datasourceConfiguration.setUrl("");
+ }
+
+ actionDatasource.setDatasourceConfiguration(datasourceConfiguration);
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java
new file mode 100644
index 000000000000..934bf79c6ed5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java
@@ -0,0 +1,75 @@
+package com.appsmith.server.migrations.utils;
+
+import com.appsmith.external.constants.PluginConstants;
+import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.migrations.MigrationHelperMethods;
+import com.appsmith.server.newactions.base.NewActionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class JsonSchemaMigrationHelper {
+
+ private final ApplicationService applicationService;
+ private final NewActionService newActionService;
+
+ public Mono<ApplicationJson> addDatasourceConfigurationToDefaultRestApiActions(
+ String baseApplicationId, String branchName, ApplicationJson applicationJson) {
+
+ Mono<ApplicationJson> contingencyMigrationJson = Mono.defer(() -> Mono.fromCallable(() -> {
+ MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, Map.of());
+ return applicationJson;
+ }));
+
+ if (!StringUtils.hasText(baseApplicationId) || !StringUtils.hasText(branchName)) {
+ return contingencyMigrationJson;
+ }
+
+ Mono<Application> applicationMono = applicationService
+ .findByBranchNameAndBaseApplicationId(branchName, baseApplicationId, null)
+ .cache();
+
+ return applicationMono
+ .flatMap(branchedApplication -> {
+ return newActionService
+ .findAllByApplicationIdAndViewMode(
+ branchedApplication.getId(), Boolean.FALSE, Optional.empty(), Optional.empty())
+ .filter(action -> {
+ if (action.getUnpublishedAction() == null
+ || action.getUnpublishedAction().getDatasource() == null) {
+ return false;
+ }
+
+ boolean reverseFlag = StringUtils.hasText(action.getUnpublishedAction()
+ .getDatasource()
+ .getId())
+ || !PluginConstants.DEFAULT_REST_DATASOURCE.equals(action.getUnpublishedAction()
+ .getDatasource()
+ .getName());
+
+ return !reverseFlag;
+ })
+ .collectMap(NewAction::getGitSyncId);
+ })
+ .map(newActionMap -> {
+ MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, newActionMap);
+ return applicationJson;
+ })
+ .switchIfEmpty(contingencyMigrationJson)
+ .onErrorResume(error -> {
+ log.error("Error occurred while migrating actions of application json. {}", error.getMessage());
+ return contingencyMigrationJson;
+ });
+ }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
index bf49502f0596..29265607ffd1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
@@ -442,7 +442,8 @@ public void autoCommitServerMigration_WhenServerHasNoChanges_NoCommitMade() thro
doReturn(Mono.just(applicationJson1))
.when(jsonSchemaMigration)
- .migrateApplicationJsonToLatestSchema(applicationJson);
+ .migrateApplicationJsonToLatestSchema(
+ Mockito.eq(applicationJson), Mockito.anyString(), Mockito.anyString());
doReturn(Mono.just("success"))
.when(gitExecutor)
@@ -574,7 +575,9 @@ public void autocommitServerMigration_WhenJsonSchemaMigrationPresent_CommitSucce
AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(applicationJson, applicationJson1);
applicationJson1.setServerSchemaVersion(jsonSchemaVersions.getServerVersion() + 1);
- doReturn(Mono.just(applicationJson1)).when(jsonSchemaMigration).migrateApplicationJsonToLatestSchema(any());
+ doReturn(Mono.just(applicationJson1))
+ .when(jsonSchemaMigration)
+ .migrateApplicationJsonToLatestSchema(any(), Mockito.anyString(), Mockito.anyString());
gitFileSystemTestHelper.setupGitRepository(autoCommitEvent, applicationJson);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
index 1c53aa243bb9..e18f8e66fe9b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
@@ -284,7 +284,8 @@ public void testAutoCommit_whenOnlyServerIsEligibleForMigration_commitSuccess()
doReturn(Mono.just(applicationJson1))
.when(jsonSchemaMigration)
- .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+ .migrateApplicationJsonToLatestSchema(
+ any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
gitFileSystemTestHelper.setupGitRepository(
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
@@ -571,7 +572,8 @@ public void testAutoCommit_whenAutoCommitEligibleButPrerequisiteNotComplete_retu
doReturn(Mono.just(applicationJson1))
.when(jsonSchemaMigration)
- .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+ .migrateApplicationJsonToLatestSchema(
+ any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
gitFileSystemTestHelper.setupGitRepository(
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
@@ -644,7 +646,8 @@ public void testAutoCommit_whenServerIsRunningMigrationCallsAutocommitAgainOnDif
doReturn(Mono.just(applicationJson1))
.when(jsonSchemaMigration)
- .migrateApplicationJsonToLatestSchema(any(ApplicationJson.class));
+ .migrateApplicationJsonToLatestSchema(
+ any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString());
gitFileSystemTestHelper.setupGitRepository(
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
index d31c18fcdcbd..9fbbfbe61200 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/migrations/JsonSchemaMigrationTest.java
@@ -97,7 +97,7 @@ public void migrateApplicationJsonToLatestSchema_whenFeatureFlagIsOn_returnsIncr
gitFileSystemTestHelper.getApplicationJson(this.getClass().getResource("application.json"));
Mono<ApplicationJson> applicationJsonMono =
- jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+ jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson, null, null);
StepVerifier.create(applicationJsonMono)
.assertNext(appJson -> {
assertThat(appJson.getServerSchemaVersion()).isEqualTo(jsonSchemaVersions.getServerVersion());
@@ -121,7 +121,7 @@ public void migrateApplicationJsonToLatestSchema_whenFeatureFlagIsOff_returnsFal
gitFileSystemTestHelper.getApplicationJson(this.getClass().getResource("application.json"));
Mono<ApplicationJson> applicationJsonMono =
- jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson);
+ jsonSchemaMigration.migrateApplicationJsonToLatestSchema(applicationJson, null, null);
StepVerifier.create(applicationJsonMono)
.assertNext(appJson -> {
assertThat(appJson.getClientSchemaVersion()).isEqualTo(jsonSchemaVersions.getClientVersion());
|
1c061c1a1434b485937010d23d6790c82bb03b29
|
2025-03-04 14:12:11
|
subratadeypappu
|
chore: Add code-split for post import hook (#39525)
| false
|
Add code-split for post import hook (#39525)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java
index 696aa38b0ef2..c0794040dd11 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java
@@ -543,8 +543,11 @@ private Mono<Artifact> importArtifactInWorkspace(
.as(transactionalOperator::transactional);
return importMono
- .flatMap(importableArtifact -> sendImportedContextAnalyticsEvent(
- artifactBasedImportService, importableArtifact, AnalyticsEvents.IMPORT))
+ .flatMap(importableArtifact -> {
+ return postImportHook(importableArtifact)
+ .then(sendImportedContextAnalyticsEvent(
+ artifactBasedImportService, importableArtifact, AnalyticsEvents.IMPORT));
+ })
.zipWith(currUserMono)
.flatMap(tuple -> {
Artifact importableArtifact = tuple.getT1();
@@ -565,6 +568,10 @@ private Mono<Artifact> importArtifactInWorkspace(
return Mono.create(sink -> resultMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
}
+ protected Mono<Void> postImportHook(Artifact artifact) {
+ return Mono.empty();
+ }
+
/**
* validates whether an artifactExchangeJson contains the required fields or not.
*
|
2f37edea8eb88ca597ce865b137cf9d503f719bd
|
2024-05-04 12:50:50
|
Shrikant Sharat Kandula
|
chore: Remove more unused methods in BaseService & ApplicationServiceCE (#33172)
| false
|
Remove more unused methods in BaseService & ApplicationServiceCE (#33172)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCE.java
index fb2716622495..729c75a4b213 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCE.java
@@ -7,7 +7,6 @@
import com.appsmith.server.dtos.GitAuthDTO;
import com.appsmith.server.services.CrudService;
import org.springframework.http.codec.multipart.Part;
-import org.springframework.util.MultiValueMap;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -17,8 +16,6 @@
public interface ApplicationServiceCE extends CrudService<Application, String> {
- Flux<Application> get(MultiValueMap<String, String> params);
-
Mono<Application> findByIdAndBranchName(String id, List<String> projectionFieldNames, String branchName);
Mono<Application> findById(String id);
@@ -29,8 +26,6 @@ public interface ApplicationServiceCE extends CrudService<Application, String> {
Flux<Application> findByWorkspaceIdAndDefaultApplicationsInRecentlyUsedOrder(String workspaceId);
- Mono<Application> findByName(String name, AclPermission permission);
-
Mono<Application> save(Application application);
Mono<Application> update(String defaultApplicationId, Application application, String branchName);
@@ -72,17 +67,12 @@ Mono<Application> findByBranchNameAndDefaultApplicationId(
List<String> projectionFieldNames,
AclPermission aclPermission);
- Mono<Application> findByBranchNameAndDefaultApplicationIdAndFieldName(
- String branchName, String defaultApplicationId, String fieldName, AclPermission aclPermission);
-
Mono<String> findBranchedApplicationId(String branchName, String defaultApplicationId, AclPermission permission);
Flux<Application> findAllApplicationsByDefaultApplicationId(String defaultApplicationId, AclPermission permission);
Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(String workspaceId);
- Flux<Application> getGitConnectedApplicationsByWorkspaceId(String workspaceId);
-
String getRandomAppCardColor();
Mono<Integer> setAppTheme(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
index f1b8ca8534ac..1f5f74f27404 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
@@ -50,7 +50,6 @@
import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.codec.multipart.Part;
import org.springframework.stereotype.Service;
-import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -122,18 +121,6 @@ public ApplicationServiceCEImpl(
this.workspacePermission = workspacePermission;
}
- @Override
- public Flux<Application> get(MultiValueMap<String, String> params) {
- if (!StringUtils.isEmpty(params.getFirst(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME))) {
- params.add(
- "gitApplicationMetadata.branchName",
- params.getFirst(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME));
- params.remove(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME);
- }
- return setTransientFields(super.getWithPermission(params, applicationPermission.getReadPermission()))
- .map(responseUtils::updateApplicationWithDefaultResources);
- }
-
@Override
public Mono<Application> getById(String id) {
if (id == null) {
@@ -225,11 +212,6 @@ public Flux<Application> findByWorkspaceIdAndDefaultApplicationsInRecentlyUsedOr
.map(responseUtils::updateApplicationWithDefaultResources)));
}
- @Override
- public Mono<Application> findByName(String name, AclPermission permission) {
- return repository.findByName(name, permission).flatMap(this::setTransientFields);
- }
-
@Override
public Mono<Application> save(Application application) {
if (!StringUtils.isEmpty(application.getName())) {
@@ -859,24 +841,6 @@ public Mono<Application> findByBranchNameAndDefaultApplicationId(
defaultApplicationId + "," + branchName)));
}
- @Override
- public Mono<Application> findByBranchNameAndDefaultApplicationIdAndFieldName(
- String branchName, String defaultApplicationId, String fieldName, AclPermission aclPermission) {
- if (StringUtils.isEmpty(branchName)) {
- return repository
- .findById(defaultApplicationId, aclPermission)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, defaultApplicationId)));
- }
-
- return repository
- .getApplicationByGitBranchAndDefaultApplicationId(defaultApplicationId, branchName, aclPermission)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.NO_RESOURCE_FOUND,
- FieldName.APPLICATION,
- defaultApplicationId + "," + branchName)));
- }
-
/**
* Sets the updatedAt and modifiedBy fields of the Application
*
@@ -961,11 +925,6 @@ public Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(S
return repository.getGitConnectedApplicationWithPrivateRepoCount(workspaceId);
}
- @Override
- public Flux<Application> getGitConnectedApplicationsByWorkspaceId(String workspaceId) {
- return repository.getGitConnectedApplicationByWorkspaceId(workspaceId);
- }
-
public String getRandomAppCardColor() {
int randomColorIndex = (int) (System.currentTimeMillis() % ApplicationConstants.APP_CARD_COLORS.length);
return ApplicationConstants.APP_CARD_COLORS[randomColorIndex];
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
index 08b380052802..b2d23d65a63a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
@@ -50,8 +50,6 @@ Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(
Layout createDefaultLayout();
- Mono<ApplicationPagesDTO> findNamesByApplicationNameAndViewMode(String applicationName, Boolean view);
-
Mono<PageDTO> findByNameAndApplicationIdAndViewMode(
String name, String applicationId, AclPermission permission, Boolean view);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
index 4e8a0242c5c8..d07923171050 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
@@ -401,63 +401,6 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewModeAndB
.map(responseUtils::updateApplicationPagesDTOWithDefaultResources);
}
- @Override
- public Mono<ApplicationPagesDTO> findNamesByApplicationNameAndViewMode(String applicationName, Boolean view) {
-
- AclPermission permission;
- if (view) {
- permission = applicationPermission.getReadPermission();
- } else {
- permission = applicationPermission.getEditPermission();
- }
-
- Mono<Application> applicationMono = applicationService
- .findByName(applicationName, permission)
- .switchIfEmpty(Mono.error(
- new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.NAME, applicationName)))
- .cache();
-
- Mono<List<PageNameIdDTO>> pagesListMono = applicationMono
- .flatMapMany(application -> findNamesByApplication(application, view))
- .collectList();
-
- return Mono.zip(applicationMono, pagesListMono).map(tuple -> {
- Application application = tuple.getT1();
- List<PageNameIdDTO> nameIdDTOList = tuple.getT2();
- ApplicationPagesDTO applicationPagesDTO = new ApplicationPagesDTO();
- applicationPagesDTO.setWorkspaceId(application.getWorkspaceId());
- applicationPagesDTO.setPages(nameIdDTOList);
- return applicationPagesDTO;
- });
- }
-
- private Flux<PageNameIdDTO> findNamesByApplication(Application application, Boolean viewMode) {
- List<ApplicationPage> pages;
-
- if (Boolean.TRUE.equals(viewMode)) {
- pages = application.getPublishedPages();
- } else {
- pages = application.getPages();
- }
-
- return findByApplicationId(application.getId(), pagePermission.getReadPermission(), viewMode)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.ACL_NO_RESOURCE_FOUND,
- FieldName.PAGE + " by application id",
- application.getId())))
- .map(page -> {
- PageNameIdDTO pageNameIdDTO = new PageNameIdDTO();
- pageNameIdDTO.setId(page.getId());
- pageNameIdDTO.setName(page.getName());
- for (ApplicationPage applicationPage : pages) {
- if (applicationPage.getId().equals(page.getId())) {
- pageNameIdDTO.setIsDefault(applicationPage.getIsDefault());
- }
- }
- return pageNameIdDTO;
- });
- }
-
@Override
public Mono<PageDTO> findByNameAndApplicationIdAndViewMode(
String name, String applicationId, AclPermission permission, Boolean view) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
index 957f5b599dca..3b97bd500175 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
@@ -9,13 +9,11 @@
import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
import com.appsmith.server.repositories.AppsmithRepository;
import com.appsmith.server.repositories.BaseRepository;
-import com.appsmith.server.repositories.ce.params.QueryAllParams;
import jakarta.validation.Validator;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
-import org.springframework.util.MultiValueMap;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -63,20 +61,6 @@ public Mono<T> update(ID id, T resource, String key) {
analyticsService.sendUpdateEvent(savedResource, getAnalyticsProperties(savedResource)));
}
- protected Flux<T> getWithPermission(MultiValueMap<String, String> params, AclPermission aclPermission) {
- final QueryAllParams<T> builder = repository.queryBuilder();
-
- if (params != null && !params.isEmpty()) {
- final BridgeQuery<BaseDomain> query = Bridge.query();
- for (String key : params.keySet()) {
- query.in(key, params.get(key));
- }
- builder.criteria(query);
- }
-
- return builder.permission(aclPermission).all();
- }
-
@Override
public Mono<T> getById(ID id) {
if (id == null) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
index 942320eab6d6..25c150113543 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
@@ -30,8 +30,6 @@ Mono<PageDTO> getPageAndMigrateDslByBranchAndDefaultPageId(
Mono<Application> createApplication(Application application, String workspaceId);
- Mono<PageDTO> getPageByName(String applicationName, String pageName, boolean viewMode);
-
Mono<Application> makePageDefault(PageDTO page);
Mono<Application> makePageDefault(String applicationId, String pageId);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
index 5cdb345ed343..c5e68b488078 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
@@ -360,29 +360,6 @@ private Mono<PageDTO> migrateAndUpdatePageDsl(NewPage newPage, PageDTO page, boo
});
}
- @Override
- public Mono<PageDTO> getPageByName(String applicationName, String pageName, boolean viewMode) {
- AclPermission appPermission;
- AclPermission pagePermission1;
- if (viewMode) {
- // If view is set, then this user is trying to view the application
- appPermission = applicationPermission.getReadPermission();
- pagePermission1 = pagePermission.getReadPermission();
- } else {
- appPermission = applicationPermission.getEditPermission();
- pagePermission1 = pagePermission.getEditPermission();
- }
-
- return applicationService
- .findByName(applicationName, appPermission)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by application name", applicationName)))
- .flatMap(application -> newPageService.findByNameAndApplicationIdAndViewMode(
- pageName, application.getId(), pagePermission1, viewMode))
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by page name", pageName)));
- }
-
@Override
public Mono<Application> makePageDefault(PageDTO page) {
return makePageDefault(page.getApplicationId(), page.getId());
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
index 0d179eb2a710..46eb37809edd 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
@@ -1045,7 +1045,10 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
Application application = new Application();
application.setName("User Management Admin Test Application");
- Mono<Application> applicationMono = applicationPageService.createApplication(application, workspace1.getId());
+ Mono<Application> applicationMono = applicationPageService
+ .createApplication(application, workspace1.getId())
+ .cache();
+ final String applicationId = applicationMono.block().getId();
// Create datasource for this workspace
Mono<Datasource> datasourceMono = workspaceService
@@ -1078,7 +1081,7 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
.flatMap(tuple -> workspaceService.findById(workspace1.getId(), READ_WORKSPACES));
Mono<Application> readApplicationByNameMono = applicationService
- .findByName("User Management Admin Test Application", READ_APPLICATIONS)
+ .getById(applicationId)
.switchIfEmpty(
Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
@@ -1202,11 +1205,14 @@ public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
.single();
// Create an application for this workspace
- Mono<Application> applicationMono = workspaceMono.flatMap(workspace1 -> {
- Application application = new Application();
- application.setName("User Management Viewer Test Application");
- return applicationPageService.createApplication(application, workspace1.getId());
- });
+ Mono<Application> applicationMono = workspaceMono
+ .flatMap(workspace1 -> {
+ Application application = new Application();
+ application.setName("User Management Viewer Test Application");
+ return applicationPageService.createApplication(application, workspace1.getId());
+ })
+ .cache();
+ final String applicationId = applicationMono.block().getId();
Mono<Workspace> userAddedToWorkspaceMono = Mono.zip(workspaceMono, viewerPermissionGroupMono)
.flatMap(tuple -> {
@@ -1229,7 +1235,7 @@ public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
});
Mono<Application> readApplicationByNameMono = applicationService
- .findByName("User Management Viewer Test Application", READ_APPLICATIONS)
+ .getById(applicationId)
.switchIfEmpty(
Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
index d8fbda96071f..57a3a5e966c3 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java
@@ -109,8 +109,6 @@
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -658,27 +656,6 @@ public void validGetApplicationById() {
.verifyComplete();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void validGetApplicationsByName() {
- Application application = new Application();
- application.setName("validGetApplicationByName-Test");
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set(FieldName.NAME, application.getName());
-
- Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
-
- Flux<Application> getApplication = createApplication.flatMapMany(t -> applicationService.get(params));
- StepVerifier.create(getApplication)
- .assertNext(t -> {
- assertThat(t).isNotNull();
- assertThat(t.isAppIsExample()).isFalse();
- assertThat(t.getId()).isNotNull();
- assertThat(t.getName()).isEqualTo("validGetApplicationByName-Test");
- })
- .verifyComplete();
- }
-
@Test
@WithUserDetails(value = "api_user")
public void getApplicationByDefaultIdAndBranchName_emptyBranchName_success() {
@@ -721,12 +698,9 @@ public void getApplicationByDefaultIdAndBranchName_validBranchName_success() {
@Test
@WithUserDetails(value = "api_user")
public void getApplicationsByBranchName_validBranchName_success() {
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set(
- FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME,
+ Mono<Application> getApplication = applicationService.findByIdAndBranchName(
+ gitConnectedApp.getId(),
gitConnectedApp.getGitApplicationMetadata().getBranchName());
-
- Flux<Application> getApplication = applicationService.get(params);
StepVerifier.create(getApplication)
.assertNext(t -> {
assertThat(t).isNotNull();
@@ -777,7 +751,7 @@ public void validGetApplications() {
Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
List<Application> applicationList = createApplication
- .flatMapMany(t -> applicationService.get(new LinkedMultiValueMap<>()))
+ .flatMapMany(app -> applicationService.findById(app.getId()))
.collectList()
.block();
@@ -2673,8 +2647,9 @@ public void basicPublishApplicationTest() {
Mono<Application> applicationMono = applicationPageService
.createApplication(testApplication, workspaceId)
- .flatMap(application -> applicationPageService.publish(application.getId(), true))
- .then(applicationService.findByName(appName, MANAGE_APPLICATIONS))
+ .flatMap(application -> applicationPageService
+ .publish(application.getId(), true)
+ .then(applicationService.findById(application.getId(), MANAGE_APPLICATIONS)))
.cache();
Mono<List<NewPage>> applicationPagesMono = applicationMono
@@ -2977,10 +2952,11 @@ public void deleteUnpublishedPageFromApplication() {
List<Layout> layouts = new ArrayList<>();
layouts.add(defaultLayout);
page.setLayouts(layouts);
- return applicationPageService.createPage(page);
+ return applicationPageService
+ .createPage(page)
+ .flatMap(page1 -> applicationPageService.publish(page1.getApplicationId(), true))
+ .then(applicationService.findById(application.getId(), MANAGE_APPLICATIONS));
})
- .flatMap(page -> applicationPageService.publish(page.getApplicationId(), true))
- .then(applicationService.findByName(appName, MANAGE_APPLICATIONS))
.cache();
PageDTO newPage = applicationMono
@@ -3068,10 +3044,11 @@ public void changeDefaultPageForAPublishedApplication() {
List<Layout> layouts = new ArrayList<>();
layouts.add(defaultLayout);
page.setLayouts(layouts);
- return applicationPageService.createPage(page);
+ return applicationPageService
+ .createPage(page)
+ .flatMap(page1 -> applicationPageService.publish(page1.getApplicationId(), true))
+ .then(applicationService.findById(application.getId(), MANAGE_APPLICATIONS));
})
- .flatMap(page -> applicationPageService.publish(page.getApplicationId(), true))
- .then(applicationService.findByName(appName, MANAGE_APPLICATIONS))
.cache();
PageDTO newPage = applicationMono
@@ -3145,10 +3122,11 @@ public void getApplicationInViewMode() {
List<Layout> layouts = new ArrayList<>();
layouts.add(defaultLayout);
page.setLayouts(layouts);
- return applicationPageService.createPage(page);
+ return applicationPageService
+ .createPage(page)
+ .flatMap(page1 -> applicationPageService.publish(page1.getApplicationId(), true))
+ .then(applicationService.findById(application.getId(), MANAGE_APPLICATIONS));
})
- .flatMap(page -> applicationPageService.publish(page.getApplicationId(), true))
- .then(applicationService.findByName(appName, MANAGE_APPLICATIONS))
.cache();
PageDTO newPage = applicationMono
|
578b82080f67b61e2a652844b590e81ac2a42c35
|
2023-07-03 20:43:04
|
Anagh Hegde
|
feat: granular widgets for canvas (#24764)
| false
|
granular widgets for canvas (#24764)
|
feat
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
index d366eef31682..841b78bd963b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts
@@ -105,8 +105,9 @@ describe("Git Bugs", function () {
_.agHelper.GetNClick(_.locators._dialogCloseButton);
});
});
-
- it("5. Bug 24206 : Open repository button is not functional in git sync modal", function () {
+ // skipping this test for now, will update test logic and create new PR for it
+ // TODO Parthvi
+ it.skip("5. Bug 24206 : Open repository button is not functional in git sync modal", function () {
_.gitSync.SwitchGitBranch("master");
_.entityExplorer.DragDropWidgetNVerify("modalwidget", 50, 50);
_.gitSync.CommitAndPush();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
index b09b77d86252..535a540b8484 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js
@@ -139,9 +139,9 @@ describe("Git import flow ", function () {
it("3. Verfiy imported app should have all the data binding visible in view and edit mode", () => {
// verify postgres data binded to table
- cy.get(".tbody").first().should("contain.text", "Test user 7");
+ cy.get(".tbody").should("contain.text", "Test user 7");
//verify MySQL data binded to table
- cy.get(".tbody").last().should("contain.text", "New Config");
+ cy.get(".tbody").should("contain.text", "New Config");
// verify api response binded to input widget
cy.xpath("//input[@value='this is a test']").should("be.visible");
// verify js object binded to input widget
@@ -155,9 +155,9 @@ describe("Git import flow ", function () {
newBranch = branName;
cy.log("newBranch is " + newBranch);
});
- cy.get(".tbody").first().should("contain.text", "Test user 7");
+ cy.get(".tbody").should("contain.text", "Test user 7");
// verify MySQL data binded to table
- cy.get(".tbody").last().should("contain.text", "New Config");
+ cy.get(".tbody").should("contain.text", "New Config");
// verify api response binded to input widget
cy.xpath("//input[@value='this is a test']");
// verify js object binded to input widget
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
index 41a9c3463c93..dfe84f50cf15 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
@@ -72,7 +72,7 @@ import DiscardFailedWarning from "../components/DiscardChangesError";
const Section = styled.div`
margin-top: 0;
- margin-bottom: ${(props) => props.theme.spaces[11]}px;
+ margin-bottom: ${(props) => props.theme.spaces[7]}px;
`;
const Row = styled.div`
@@ -337,7 +337,7 @@ function Deploy() {
{isFetchingGitStatus && (
<StatusLoader loaderMsg={createMessage(FETCH_GIT_STATUS)} />
)}
- <Space size={11} />
+ {/* <Space size={11} /> */}
{pullRequired && !isConflicting && (
<>
<Callout
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
index f240ea91ec58..3b62b82006a5 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
@@ -15,7 +15,7 @@ import {
} from "@appsmith/constants/messages";
import { getCurrentApplication } from "selectors/editorSelectors";
import { changeInfoSinceLastCommit } from "../utils";
-import { Icon, Text } from "design-system";
+import { Callout, Icon, Text } from "design-system";
const DummyChange = styled.div`
width: 50%;
@@ -36,9 +36,13 @@ const Wrapper = styled.div`
gap: 6px;
`;
+const CalloutContainer = styled.div`
+ margin-top: ${(props) => props.theme.spaces[7]}px;
+`;
+
const Changes = styled.div`
margin-top: ${(props) => props.theme.spaces[7]}px;
- margin-bottom: ${(props) => props.theme.spaces[11]}px;
+ margin-bottom: ${(props) => props.theme.spaces[7]}px;
`;
export enum Kind {
@@ -216,6 +220,13 @@ export default function GitChangesList() {
return loading ? (
<DummyChange data-testid={"t--git-change-loading-dummy"} />
) : changes.length ? (
- <Changes data-testid={"t--git-change-statuses"}>{changes}</Changes>
+ <Changes data-testid={"t--git-change-statuses"}>
+ {changes}
+ {status?.migrationMessage ? (
+ <CalloutContainer>
+ <Callout kind="info">{status.migrationMessage}</Callout>
+ </CalloutContainer>
+ ) : null}
+ </Changes>
) : null;
}
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index 57cdd091dd48..ae88dba6c9d5 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -552,6 +552,7 @@ export type GitStatusData = {
modifiedDatasources: number;
modifiedJSLibs: number;
discardDocUrl?: string;
+ migrationMessage?: string;
};
type GitErrorPayloadType = {
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/CommonConstants.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/CommonConstants.java
index d34c596d65d3..cf32e6253e09 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/CommonConstants.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/constants/CommonConstants.java
@@ -2,13 +2,26 @@
public class CommonConstants {
// This field will be useful when we migrate fields within JSON files (currently this will be useful for Git feature)
- public static Integer fileFormatVersion = 4;
+ public static Integer fileFormatVersion = 5;
public static String FILE_FORMAT_VERSION = "fileFormatVersion";
+
public static final String CANVAS = "canvas";
+
public static final String APPLICATION = "application";
public static final String THEME = "theme";
public static final String METADATA = "metadata";
public static final String JSON_EXTENSION = ".json";
public static final String JS_EXTENSION = ".js";
public static final String TEXT_FILE_EXTENSION = ".txt";
+ public static final String WIDGETS = "widgets";
+ public static final String WIDGET_NAME = "widgetName";
+ public static final String WIDGET_TYPE = "type";
+ public static final String CHILDREN = "children";
+
+ public static final String CANVAS_WIDGET = "CANVAS_WIDGET";
+ public static final String MAIN_CONTAINER = "MainContainer";
+ public static final String DELIMITER_POINT = ".";
+ public static final String DELIMITER_PATH = "/";
+ public static final String EMPTY_STRING = "";
+ public static final String FILE_MIGRATION_MESSAGE = "Some of the changes above are due to an improved file structure designed to reduce merge conflicts. You can safely commit them to your repository.";
}
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/DSLTransformerHelper.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/DSLTransformerHelper.java
new file mode 100644
index 000000000000..09c159bc5160
--- /dev/null
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/DSLTransformerHelper.java
@@ -0,0 +1,180 @@
+package com.appsmith.git.helpers;
+
+import com.appsmith.git.constants.CommonConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class DSLTransformerHelper {
+
+ public static Map<String, JSONObject> flatten(JSONObject jsonObject) {
+ Map<String, JSONObject> flattenedMap = new HashMap<>();
+ flattenObject(jsonObject, CommonConstants.EMPTY_STRING, flattenedMap);
+ return new TreeMap<>(flattenedMap);
+ }
+
+ private static void flattenObject(JSONObject jsonObject, String prefix, Map<String, JSONObject> flattenedMap) {
+ String widgetName = jsonObject.optString(CommonConstants.WIDGET_NAME);
+ if (widgetName.isEmpty()) {
+ return;
+ }
+
+ JSONArray children = jsonObject.optJSONArray(CommonConstants.CHILDREN);
+ if (children != null) {
+ // Check if the children object has type=CANVAS_WIDGET
+ removeChildrenIfNotCanvasWidget(jsonObject);
+ if (!isCanvasWidget(jsonObject)) {
+ flattenedMap.put(prefix + widgetName, jsonObject);
+ }
+
+ for (int i = 0; i < children.length(); i++) {
+ JSONObject childObject = children.getJSONObject(i);
+ String childPrefix = prefix + widgetName + CommonConstants.DELIMITER_POINT;
+ flattenObject(childObject, childPrefix, flattenedMap);
+ }
+ } else {
+ if (!isCanvasWidget(jsonObject)) {
+ flattenedMap.put(prefix + widgetName, jsonObject);
+ }
+ }
+ }
+
+ private static JSONObject removeChildrenIfNotCanvasWidget(JSONObject jsonObject) {
+ JSONArray children = jsonObject.optJSONArray(CommonConstants.CHILDREN);
+ if (children.length() == 1) {
+ JSONObject child = children.getJSONObject(0);
+ if (!CommonConstants.CANVAS_WIDGET.equals(child.optString(CommonConstants.WIDGET_TYPE))) {
+ jsonObject.remove(CommonConstants.CHILDREN);
+ } else {
+ JSONObject childCopy = new JSONObject(child.toString());
+ childCopy.remove(CommonConstants.CHILDREN);
+ JSONArray jsonArray = new JSONArray();
+ jsonArray.put(childCopy);
+ jsonObject.put(CommonConstants.CHILDREN, jsonArray);
+ }
+ } else {
+ jsonObject.remove(CommonConstants.CHILDREN);
+ }
+ return jsonObject;
+ }
+
+ public static boolean hasChildren(JSONObject jsonObject) {
+ JSONArray children = jsonObject.optJSONArray(CommonConstants.CHILDREN);
+ return children != null && children.length() > 0;
+ }
+
+ public static boolean isCanvasWidget(JSONObject jsonObject) {
+ return jsonObject.optString(CommonConstants.WIDGET_TYPE).startsWith(CommonConstants.CANVAS_WIDGET);
+ }
+
+ public static Map<String, List<String>> calculateParentDirectories(List<String> paths) {
+ Map<String, List<String>> parentDirectories = new HashMap<>();
+
+ paths = paths.stream().map(currentPath -> currentPath.replace(CommonConstants.JSON_EXTENSION, CommonConstants.EMPTY_STRING)).collect(Collectors.toList());
+ for (String path : paths) {
+ String[] directories = path.split(CommonConstants.DELIMITER_PATH);
+ int lastDirectoryIndex = directories.length - 1;
+
+ if (lastDirectoryIndex > 0 && directories[lastDirectoryIndex].equals(directories[lastDirectoryIndex - 1])) {
+ if (lastDirectoryIndex - 2 >= 0) {
+ String parentDirectory = directories[lastDirectoryIndex - 2];
+ List<String> pathsList = parentDirectories.getOrDefault(parentDirectory, new ArrayList<>());
+ pathsList.add(path);
+ parentDirectories.put(parentDirectory, pathsList);
+ }
+ } else {
+ String parentDirectory = directories[lastDirectoryIndex - 1];
+ List<String> pathsList = parentDirectories.getOrDefault(parentDirectory, new ArrayList<>());
+ pathsList.add(path);
+ parentDirectories.put(parentDirectory, pathsList);
+ }
+ }
+
+ return parentDirectories;
+ }
+
+ /*
+ * /Form1/Button1.json,
+ * /List1/List1.json,
+ * /List1/Container1/Text2.json,
+ * /List1/Container1/Image1.json,
+ * /Form1/Button2.json,
+ * /List1/Container1/Text1.json,
+ * /Form1/Text3.json,
+ * /Form1/Form1.json,
+ * /List1/Container1/Container1.json,
+ * /MainContainer.json
+ */
+ public static JSONObject getNestedDSL(Map<String, JSONObject> jsonMap, Map<String, List<String>> pathMapping, JSONObject mainContainer) {
+ // start from the root
+ // Empty page with no widgets
+ if (!pathMapping.containsKey(CommonConstants.MAIN_CONTAINER)) {
+ return mainContainer;
+ }
+ for (String path : pathMapping.get(CommonConstants.MAIN_CONTAINER)) {
+ JSONObject child = getChildren(path, jsonMap, pathMapping);
+ JSONArray children = mainContainer.optJSONArray(CommonConstants.CHILDREN);
+ if (children == null) {
+ children = new JSONArray();
+ children.put(child);
+ mainContainer.put(CommonConstants.CHILDREN, children);
+ } else {
+ children.put(child);
+ }
+ }
+ return mainContainer;
+ }
+
+ public static JSONObject getChildren(String pathToWidget, Map<String, JSONObject> jsonMap, Map<String, List<String>> pathMapping) {
+ // Recursively get the children
+ List<String> children = pathMapping.get(getWidgetName(pathToWidget));
+ JSONObject parentObject = jsonMap.get(pathToWidget + CommonConstants.JSON_EXTENSION);
+ if (children != null) {
+ JSONArray childArray = new JSONArray();
+ for (String childWidget : children) {
+ childArray.put(getChildren(childWidget, jsonMap, pathMapping));
+ }
+ // Check if the parent object has type=CANVAS_WIDGET as children
+ // If yes, then add the children array to the CANVAS_WIDGET's children
+ appendChildren(parentObject, childArray);
+ }
+
+ return parentObject;
+ }
+
+ public static String getWidgetName(String path) {
+ String[] directories = path.split(CommonConstants.DELIMITER_PATH);
+ return directories[directories.length - 1];
+ }
+
+ public static JSONObject appendChildren(JSONObject parent, JSONArray childWidgets) {
+ JSONArray children = parent.optJSONArray(CommonConstants.CHILDREN);
+ if (children == null) {
+ parent.put(CommonConstants.CHILDREN, childWidgets);
+ } else {
+ // Is the children CANVAS_WIDGET
+ if (children.length() == 1) {
+ JSONObject childObject = children.getJSONObject(0);
+ if (CommonConstants.CANVAS_WIDGET.equals(childObject.optString(CommonConstants.WIDGET_TYPE))) {
+ childObject.put(CommonConstants.CHILDREN, childWidgets);
+ }
+ } else {
+ parent.put(CommonConstants.CHILDREN, childWidgets);
+ }
+ }
+ return parent;
+ }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
index fecc3a1f971d..156db0ce663b 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
@@ -12,24 +12,34 @@
import com.appsmith.git.constants.CommonConstants;
import com.appsmith.git.converters.GsonDoubleToLongConverter;
import com.appsmith.git.converters.GsonUnorderedToOrderedConverter;
+import com.appsmith.util.WebClientUtils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.stream.JsonReader;
+import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
+import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.eclipse.jgit.api.errors.GitAPIException;
+import org.json.JSONArray;
+import org.json.JSONObject;
import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.util.FileSystemUtils;
import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;
+import reactor.netty.resources.ConnectionProvider;
import java.io.BufferedWriter;
import java.io.File;
@@ -42,10 +52,13 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.time.Duration;
import java.time.Instant;
import java.util.Arrays;
+import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -83,6 +96,8 @@ public class FileUtilsImpl implements FileInterface {
private final Scheduler scheduler = Schedulers.boundedElastic();
+ private static final String CANVAS_WIDGET = "(Canvas)[0-9]*.";
+
/**
Application will be stored in the following structure:
@@ -227,11 +242,38 @@ public Mono<Path> saveApplicationToGitRepo(Path baseRepoSuffix,
Set<String> validPages = new HashSet<>();
for (Map.Entry<String, Object> pageResource : pageEntries) {
+ Map<String, String> validWidgetToParentMap = new HashMap<>();
final String pageName = pageResource.getKey();
Path pageSpecificDirectory = pageDirectory.resolve(pageName);
Boolean isResourceUpdated = updatedResources.get(PAGE_LIST).contains(pageName);
if(Boolean.TRUE.equals(isResourceUpdated)) {
- saveResource(pageResource.getValue(), pageSpecificDirectory.resolve(CommonConstants.CANVAS + CommonConstants.JSON_EXTENSION), gson);
+ // Save page metadata
+ saveResource(pageResource.getValue(), pageSpecificDirectory.resolve(pageName + CommonConstants.JSON_EXTENSION), gson);
+ Map<String, JSONObject> result = DSLTransformerHelper.flatten(new JSONObject(applicationGitReference.getPageDsl().get(pageName)));
+ result.forEach((key, jsonObject) -> {
+ // get path with splitting the name via key
+ String widgetName = key.substring(key.lastIndexOf(CommonConstants.DELIMITER_POINT ) + 1 );
+ String childPath = key.replace(CommonConstants.MAIN_CONTAINER, CommonConstants.EMPTY_STRING)
+ .replace(CommonConstants.DELIMITER_POINT, CommonConstants.DELIMITER_PATH);
+ // Replace the canvas Widget as a child and add it to the same level as parent
+ childPath = childPath.replaceAll(CANVAS_WIDGET, CommonConstants.EMPTY_STRING);
+ if (!DSLTransformerHelper.hasChildren(jsonObject)) {
+ // Save the widget as a directory or Save the widget as a file
+ childPath = childPath.replace(widgetName, CommonConstants.EMPTY_STRING);
+ }
+ Path path = Paths.get(String.valueOf(pageSpecificDirectory.resolve(CommonConstants.WIDGETS)), childPath);
+ validWidgetToParentMap.put(widgetName, path.toFile().toString());
+ saveWidgets(
+ jsonObject,
+ widgetName,
+ path
+ );
+ });
+ // Remove deleted widgets from the file system
+ deleteWidgets(pageSpecificDirectory.resolve(CommonConstants.WIDGETS).toFile(), validWidgetToParentMap);
+
+ // Remove the canvas.json from the file system since the value is stored in the page.json
+ deleteFile(pageSpecificDirectory.resolve(CommonConstants.CANVAS + CommonConstants.JSON_EXTENSION));
}
validPages.add(pageName);
}
@@ -371,6 +413,15 @@ private boolean saveResource(Object sourceEntity, Path path, Gson gson) {
return false;
}
+ private void saveWidgets(JSONObject sourceEntity, String resourceName, Path path) {
+ try {
+ Files.createDirectories(path);
+ writeStringToFile(sourceEntity.toString(4), path.resolve(resourceName + CommonConstants.JSON_EXTENSION));
+ } catch (IOException e) {
+ log.debug("Error while writings widgets data to file, {}", e.getMessage());
+ }
+ }
+
/**
* This method is used to write actionCollection specific resource to file system. We write the data in two steps
* 1. Actual js code
@@ -453,8 +504,10 @@ public void scanAndDeleteFileForDeletedResources(Set<String> validResources, Pat
// unwanted file : corresponding resource from DB has been deleted
if(resourceDirectory.toFile().exists()) {
try (Stream<Path> paths = Files.walk(resourceDirectory)) {
- paths
- .filter(path -> Files.isRegularFile(path) && !validResources.contains(path.getFileName().toString()))
+ paths.filter(pathLocal ->
+ Files.isRegularFile(pathLocal) &&
+ !validResources.contains(pathLocal.getFileName().toString())
+ )
.forEach(this::deleteFile);
} catch (IOException e) {
log.debug("Error while scanning directory: {}, with error {}", resourceDirectory, e);
@@ -491,7 +544,7 @@ private void deleteDirectory(Path directory){
try {
FileUtils.deleteDirectory(directory.toFile());
} catch (IOException e){
- log.debug("Unable to delete directory for path {} with message {}", directory, e.getMessage());
+ log.error("Unable to delete directory for path {} with message {}", directory, e.getMessage());
}
}
}
@@ -507,11 +560,11 @@ private void deleteFile(Path filePath) {
}
catch(DirectoryNotEmptyException e)
{
- log.debug("Unable to delete non-empty directory at {}", filePath);
+ log.error("Unable to delete non-empty directory at {}", filePath);
}
catch(IOException e)
{
- log.debug("Unable to delete file, {}", e.getMessage());
+ log.error("Unable to delete file, {}", e.getMessage());
}
}
@@ -650,7 +703,7 @@ private Map<String, Object> readFiles(Path directoryPath, Gson gson, String keyS
* @return content of the file in the path
*/
private String readFileAsString(Path filePath) {
- String data = "";
+ String data = CommonConstants.EMPTY_STRING;
try {
data = FileUtils.readFileToString(filePath.toFile(), "UTF-8");
} catch (IOException e) {
@@ -672,7 +725,7 @@ private Map<String, Object> readActionCollection(Path directoryPath, Gson gson,
for (File dirFile : Objects.requireNonNull(directory.listFiles())) {
String resourceName = dirFile.getName();
Path resourcePath = directoryPath.resolve(resourceName).resolve( resourceName + CommonConstants.JS_EXTENSION);
- String body = "";
+ String body = CommonConstants.EMPTY_STRING;
if (resourcePath.toFile().exists()) {
body = readFileAsString(resourcePath);
}
@@ -697,7 +750,7 @@ private Map<String, Object> readAction(Path directoryPath, Gson gson, String key
if (directory.isDirectory()) {
for (File dirFile : Objects.requireNonNull(directory.listFiles())) {
String resourceName = dirFile.getName();
- String body = "";
+ String body = CommonConstants.EMPTY_STRING;
Path queryPath = directoryPath.resolve(resourceName).resolve( resourceName + CommonConstants.TEXT_FILE_EXTENSION);
if (queryPath.toFile().exists()) {
body = readFileAsString(queryPath);
@@ -710,6 +763,10 @@ private Map<String, Object> readAction(Path directoryPath, Gson gson, String key
return resource;
}
+ private Object readPageMetadata(Path directoryPath, Gson gson) {
+ return readFile(directoryPath.resolve(directoryPath.toFile().getName() + CommonConstants.JSON_EXTENSION), gson);
+ }
+
private ApplicationGitReference fetchApplicationReference(Path baseRepoPath, Gson gson) {
ApplicationGitReference applicationGitReference = new ApplicationGitReference();
// Extract application metadata from the json
@@ -727,13 +784,13 @@ private ApplicationGitReference fetchApplicationReference(Path baseRepoPath, Gso
switch (fileFormatVersion) {
case 1 :
// Extract actions
- applicationGitReference.setActions(readFiles(baseRepoPath.resolve(ACTION_DIRECTORY), gson, ""));
+ applicationGitReference.setActions(readFiles(baseRepoPath.resolve(ACTION_DIRECTORY), gson, CommonConstants.EMPTY_STRING));
// Extract actionCollections
- applicationGitReference.setActionCollections(readFiles(baseRepoPath.resolve(ACTION_COLLECTION_DIRECTORY), gson, ""));
+ applicationGitReference.setActionCollections(readFiles(baseRepoPath.resolve(ACTION_COLLECTION_DIRECTORY), gson, CommonConstants.EMPTY_STRING));
// Extract pages
- applicationGitReference.setPages(readFiles(pageDirectory, gson, ""));
+ applicationGitReference.setPages(readFiles(pageDirectory, gson, CommonConstants.EMPTY_STRING));
// Extract datasources
- applicationGitReference.setDatasources(readFiles(baseRepoPath.resolve(DATASOURCE_DIRECTORY), gson, ""));
+ applicationGitReference.setDatasources(readFiles(baseRepoPath.resolve(DATASOURCE_DIRECTORY), gson, CommonConstants.EMPTY_STRING));
break;
case 2:
@@ -742,18 +799,23 @@ private ApplicationGitReference fetchApplicationReference(Path baseRepoPath, Gso
updateGitApplicationReference(baseRepoPath, gson, applicationGitReference, pageDirectory, fileFormatVersion);
break;
+ case 5:
+ updateGitApplicationReferenceV2(baseRepoPath, gson, applicationGitReference, pageDirectory, fileFormatVersion);
+ break;
+
default:
}
applicationGitReference.setMetadata(metadata);
Path jsLibDirectory = baseRepoPath.resolve(JS_LIB_DIRECTORY);
- Map<String, Object> jsLibrariesMap = readFiles(jsLibDirectory, gson, "");
+ Map<String, Object> jsLibrariesMap = readFiles(jsLibDirectory, gson, CommonConstants.EMPTY_STRING);
applicationGitReference.setJsLibraries(jsLibrariesMap);
return applicationGitReference;
}
- private void updateGitApplicationReference(Path baseRepoPath, Gson gson, ApplicationGitReference applicationGitReference, Path pageDirectory, int fileFormatVersion) {
+ @Deprecated
+ private void updateGitApplicationReference(Path baseRepoPath, Gson gson, ApplicationGitReference applicationGitReference, Path pageDirectory, int fileFormatVersion) {
// Extract pages and nested actions and actionCollections
File directory = pageDirectory.toFile();
Map<String, Object> pageMap = new HashMap<>();
@@ -761,7 +823,6 @@ private void updateGitApplicationReference(Path baseRepoPath, Gson gson, Applica
Map<String, String> actionBodyMap = new HashMap<>();
Map<String, Object> actionCollectionMap = new HashMap<>();
Map<String, String> actionCollectionBodyMap = new HashMap<>();
- // TODO same approach should be followed for modules(app level actions, actionCollections, widgets etc)
if (directory.isDirectory()) {
// Loop through all the directories and nested directories inside the pages directory to extract
// pages, actions and actionCollections from the JSON files
@@ -787,7 +848,7 @@ private void updateGitApplicationReference(Path baseRepoPath, Gson gson, Applica
applicationGitReference.setActionCollectionBody(actionCollectionBodyMap);
applicationGitReference.setPages(pageMap);
// Extract datasources
- applicationGitReference.setDatasources(readFiles(baseRepoPath.resolve(DATASOURCE_DIRECTORY), gson, ""));
+ applicationGitReference.setDatasources(readFiles(baseRepoPath.resolve(DATASOURCE_DIRECTORY), gson, CommonConstants.EMPTY_STRING));
}
private Integer getFileFormatVersion(Object metadata) {
@@ -803,4 +864,121 @@ private Integer getFileFormatVersion(Object metadata) {
private boolean isFileFormatCompatible(int savedFileFormat) {
return savedFileFormat <= CommonConstants.fileFormatVersion;
}
+
+ private void updateGitApplicationReferenceV2(Path baseRepoPath, Gson gson, ApplicationGitReference applicationGitReference, Path pageDirectory, int fileFormatVersion) {
+ // Extract pages and nested actions and actionCollections
+ File directory = pageDirectory.toFile();
+ Map<String, Object> pageMap = new HashMap<>();
+ Map<String, String> pageDsl = new HashMap<>();
+ Map<String, Object> actionMap = new HashMap<>();
+ Map<String, String> actionBodyMap = new HashMap<>();
+ Map<String, Object> actionCollectionMap = new HashMap<>();
+ Map<String, String> actionCollectionBodyMap = new HashMap<>();
+ if (directory.isDirectory()) {
+ // Loop through all the directories and nested directories inside the pages directory to extract
+ // pages, actions and actionCollections from the JSON files
+ for (File page : Objects.requireNonNull(directory.listFiles())) {
+ pageMap.put(page.getName(), readPageMetadata(page.toPath(), gson));
+
+ JSONObject mainContainer = getMainContainer(pageMap.get(page.getName()), gson);
+
+ // Read widgets data recursively from the widgets directory
+ Map<String, JSONObject> widgetsData = readWidgetsData(page.toPath().resolve(CommonConstants.WIDGETS).toString());
+ // Construct the nested DSL from the widgets data
+ Map<String, List<String>> parentDirectories = DSLTransformerHelper.calculateParentDirectories(widgetsData.keySet().stream().toList());
+ JSONObject nestedDSL = DSLTransformerHelper.getNestedDSL(widgetsData, parentDirectories, mainContainer);
+ pageDsl.put(page.getName(), nestedDSL.toString());
+ actionMap.putAll(readAction(page.toPath().resolve(ACTION_DIRECTORY), gson, page.getName(), actionBodyMap));
+ actionCollectionMap.putAll(readActionCollection(page.toPath().resolve(ACTION_COLLECTION_DIRECTORY), gson, page.getName(), actionCollectionBodyMap));
+ }
+ }
+ applicationGitReference.setActions(actionMap);
+ applicationGitReference.setActionBody(actionBodyMap);
+ applicationGitReference.setActionCollections(actionCollectionMap);
+ applicationGitReference.setActionCollectionBody(actionCollectionBodyMap);
+ applicationGitReference.setPages(pageMap);
+ applicationGitReference.setPageDsl(pageDsl);
+ // Extract datasources
+ applicationGitReference.setDatasources(readFiles(baseRepoPath.resolve(DATASOURCE_DIRECTORY), gson, CommonConstants.EMPTY_STRING));
+ }
+
+ private Map<String, JSONObject> readWidgetsData(String directoryPath) {
+ Map<String, JSONObject> jsonMap = new HashMap<>();
+ File directory = new File(directoryPath);
+
+ if (!directory.isDirectory()) {
+ log.error("Error reading directory: {}", directoryPath);
+ return jsonMap;
+ }
+
+ try {
+ readFilesRecursively(directory, jsonMap, directoryPath);
+ } catch (IOException exception) {
+ log.error("Error reading directory: {}, error message {}", directoryPath, exception.getMessage());
+ }
+
+ return jsonMap;
+ }
+
+ private void readFilesRecursively(File directory, Map<String, JSONObject> jsonMap, String rootPath) throws IOException {
+ File[] files = directory.listFiles();
+ if (files == null) {
+ return;
+ }
+
+ for (File file : files) {
+ if (file.isFile()) {
+ String filePath = file.getAbsolutePath();
+ String relativePath = filePath.replace(rootPath, CommonConstants.EMPTY_STRING);
+ relativePath = CommonConstants.DELIMITER_PATH + CommonConstants.MAIN_CONTAINER + relativePath.substring(relativePath.indexOf("//") + 1);
+ try {
+ String fileContent = new String(Files.readAllBytes(file.toPath()));
+ JSONObject jsonObject = new JSONObject(fileContent);
+ jsonMap.put(relativePath, jsonObject);
+ } catch (IOException exception) {
+ log.error("Error reading file: {}, error message {}", filePath, exception.getMessage());
+ }
+ } else if (file.isDirectory()) {
+ readFilesRecursively(file, jsonMap, rootPath);
+ }
+ }
+ }
+
+ private void deleteWidgets(File directory, Map<String, String> validWidgetToParentMap) {
+ File[] files = directory.listFiles();
+ if (files == null) {
+ return;
+ }
+
+ for (File file : files) {
+ if (file.isDirectory()) {
+ deleteWidgets(file, validWidgetToParentMap);
+ }
+
+ String name = file.getName().replace(CommonConstants.JSON_EXTENSION, CommonConstants.EMPTY_STRING);
+ // If input widget was inside a container before, but the user moved it out of the container
+ // then we need to delete the widget from the container directory
+ // The check here is to validate if the parent is correct or not
+ if ( !validWidgetToParentMap.containsKey(name)) {
+ if (file.isDirectory()) {
+ deleteDirectory(file.toPath());
+ } else {
+ deleteFile(file.toPath());
+ }
+ } else if(!file.getParentFile().getPath().toString().equals(validWidgetToParentMap.get(name))
+ && !file.getPath().toString().equals(validWidgetToParentMap.get(name))) {
+ if (file.isDirectory()) {
+ deleteDirectory(file.toPath());
+ } else {
+ deleteFile(file.toPath());
+ }
+ }
+ }
+ }
+
+ private JSONObject getMainContainer(Object pageJson, Gson gson) {
+ JSONObject pageJSON = new JSONObject(gson.toJson(pageJson));
+ JSONArray layouts = pageJSON.getJSONObject("unpublishedPage").getJSONArray("layouts");
+ return layouts.getJSONObject(0).getJSONObject("dsl");
+ }
}
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/GitExecutorImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/GitExecutorImpl.java
index 45cfcb5cf428..1db371d58a00 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/GitExecutorImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/GitExecutorImpl.java
@@ -2,6 +2,7 @@
import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.constants.ErrorReferenceDocUrl;
+import com.appsmith.external.constants.GitConstants;
import com.appsmith.external.dtos.GitBranchDTO;
import com.appsmith.external.dtos.GitLogDTO;
import com.appsmith.external.dtos.GitStatusDTO;
@@ -488,36 +489,51 @@ public Mono<GitStatusDTO> getStatus(Path repoPath, String branchName) {
Set<String> queriesModified = new HashSet<>();
Set<String> jsObjectsModified = new HashSet<>();
+ Set<String> pagesModified = new HashSet<>();
int modifiedPages = 0;
int modifiedQueries = 0;
int modifiedJSObjects = 0;
int modifiedDatasources = 0;
int modifiedJSLibs = 0;
for (String x : modifiedAssets) {
- if (x.contains(CommonConstants.CANVAS)) {
- modifiedPages++;
- } else if (x.contains(GitDirectories.ACTION_DIRECTORY + "/")) {
- String queryName = x.split(GitDirectories.ACTION_DIRECTORY + "/")[1];
- int position = queryName.indexOf("/");
+ // begins with pages and filename and parent name should be same or contains widgets
+ if (x.contains(CommonConstants.WIDGETS)) {
+ if (!pagesModified.contains(getPageName(x))) {
+ pagesModified.add(getPageName(x));
+ modifiedPages++;
+ }
+ } else if (!x.contains(CommonConstants.WIDGETS)
+ && x.startsWith(GitDirectories.PAGE_DIRECTORY)
+ && !x.contains(GitDirectories.ACTION_DIRECTORY)
+ && !x.contains(GitDirectories.ACTION_COLLECTION_DIRECTORY)) {
+ if (!pagesModified.contains(getPageName(x))) {
+ pagesModified.add(getPageName(x));
+ modifiedPages++;
+ }
+ } else if (x.contains(GitDirectories.ACTION_DIRECTORY + CommonConstants.DELIMITER_PATH)) {
+ String queryName = x.split(GitDirectories.ACTION_DIRECTORY + CommonConstants.DELIMITER_PATH)[1];
+ int position = queryName.indexOf(CommonConstants.DELIMITER_PATH);
if(position != -1) {
queryName = queryName.substring(0, position);
- String pageName = x.split("/")[1];
+ String pageName = x.split(CommonConstants.DELIMITER_PATH)[1];
if (!queriesModified.contains(pageName + queryName)) {
queriesModified.add(pageName + queryName);
modifiedQueries++;
}
}
- } else if (x.contains(GitDirectories.ACTION_COLLECTION_DIRECTORY + "/") && !x.endsWith(".json")) {
- String queryName = x.substring(x.lastIndexOf("/") + 1);
- String pageName = x.split("/")[1];
+ } else if (x.contains(GitDirectories.ACTION_COLLECTION_DIRECTORY + CommonConstants.DELIMITER_PATH) && !x.endsWith(CommonConstants.JSON_EXTENSION)) {
+ String queryName = x.substring(x.lastIndexOf(CommonConstants.DELIMITER_PATH) + 1);
+ String pageName = x.split(CommonConstants.DELIMITER_PATH)[1];
if (!jsObjectsModified.contains(pageName + queryName)) {
jsObjectsModified.add(pageName + queryName);
modifiedJSObjects++;
}
- } else if (x.contains(GitDirectories.DATASOURCE_DIRECTORY + "/")) {
+ } else if (x.contains(GitDirectories.DATASOURCE_DIRECTORY + CommonConstants.DELIMITER_PATH)) {
modifiedDatasources++;
- } else if (x.contains(GitDirectories.JS_LIB_DIRECTORY + "/")) {
+ } else if (x.contains(GitDirectories.JS_LIB_DIRECTORY + CommonConstants.DELIMITER_PATH)) {
modifiedJSLibs++;
+ } else if (x.equals(CommonConstants.METADATA + CommonConstants.JSON_EXTENSION)) {
+ response.setMigrationMessage(CommonConstants.FILE_MIGRATION_MESSAGE);
}
}
response.setModified(modifiedAssets);
@@ -558,6 +574,11 @@ public Mono<GitStatusDTO> getStatus(Path repoPath, String branchName) {
.subscribeOn(scheduler);
}
+ private String getPageName(String path) {
+ String[] pathArray = path.split(CommonConstants.DELIMITER_PATH);
+ return pathArray[1];
+ }
+
@Override
public Mono<String> mergeBranch(Path repoSuffix, String sourceBranch, String destinationBranch) {
return Mono.fromCallable(() -> {
diff --git a/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/DSLTransformHelperTest.java b/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/DSLTransformHelperTest.java
new file mode 100644
index 000000000000..e6ffc14175ab
--- /dev/null
+++ b/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/DSLTransformHelperTest.java
@@ -0,0 +1,255 @@
+package com.appsmith.git.helpers;
+
+import com.appsmith.git.constants.CommonConstants;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@ExtendWith(SpringExtension.class)
+public class DSLTransformHelperTest {
+
+ private Map<String, JSONObject> jsonMap;
+ private Map<String, List<String>> pathMapping;
+
+ @BeforeEach
+ public void setup() {
+ // Initialize the JSON map and path mapping for each test
+ jsonMap = new HashMap<>();
+ pathMapping = new HashMap<>();
+ }
+
+ @Test
+ public void testHasChildren_WithChildren() {
+ JSONObject jsonObject = new JSONObject();
+ JSONArray children = new JSONArray();
+ children.put(new JSONObject());
+ jsonObject.put(CommonConstants.CHILDREN, children);
+
+ boolean result = DSLTransformerHelper.hasChildren(jsonObject);
+
+ Assertions.assertTrue(result);
+ }
+
+ @Test
+ public void testHasChildren_WithoutChildren() {
+ JSONObject jsonObject = new JSONObject();
+
+ boolean result = DSLTransformerHelper.hasChildren(jsonObject);
+
+ Assertions.assertFalse(result);
+ }
+
+ @Test
+ public void testIsCanvasWidget_WithCanvasWidget() {
+ JSONObject widgetObject = new JSONObject();
+ widgetObject.put(CommonConstants.WIDGET_TYPE, "CANVAS_WIDGET_1");
+ boolean result = DSLTransformerHelper.isCanvasWidget(widgetObject);
+ Assertions.assertTrue(result);
+ }
+
+ @Test
+ public void testIsCanvasWidget_WithNonCanvasWidget() {
+ JSONObject widgetObject = new JSONObject();
+ widgetObject.put("widgetType", "BUTTON_WIDGET");
+
+ boolean result = DSLTransformerHelper.isCanvasWidget(widgetObject);
+
+ Assertions.assertFalse(result);
+ }
+
+ @Test
+ public void testIsCanvasWidget_WithMissingWidgetType() {
+ JSONObject widgetObject = new JSONObject();
+
+ boolean result = DSLTransformerHelper.isCanvasWidget(widgetObject);
+
+ Assertions.assertFalse(result);
+ }
+
+ /*@Test
+ public void testCalculateParentDirectories() {
+ // Test Case 1: Simple paths
+ List<String> paths1 = Arrays.asList(
+ "/root/dir1/file1",
+ "/root/dir1/file2",
+ "/root/dir2/file3",
+ "/root/dir3/file4"
+ );
+ Map<String, List<String>> result1 = DSLTransformerHelper.calculateParentDirectories(paths1);
+ Map<String, List<String>> expected1 = new HashMap<>();
+ expected1.put("root", Arrays.asList("/root/dir1/file1", "/root/dir1/file2", "/root/dir2/file3", "/root/dir3/file4"));
+ expected1.put("dir1", Arrays.asList("/root/dir1/file1", "/root/dir1/file2"));
+ expected1.put("dir2", Arrays.asList("/root/dir2/file3"));
+ expected1.put("dir3", Arrays.asList("/root/dir3/file4"));
+ Assertions.assertEquals(expected1, result1);
+
+ // Test Case 2: Paths with duplicate directories
+ List<String> paths2 = Arrays.asList(
+ "/root/dir1/file1",
+ "/root/dir1/file2",
+ "/root/dir2/file3",
+ "/root/dir1/file4"
+ );
+ Map<String, List<String>> result2 = DSLTransformerHelper.calculateParentDirectories(paths2);
+ Map<String, List<String>> expected2 = new HashMap<>();
+ expected2.put("root", Arrays.asList("/root/dir1/file1", "/root/dir1/file2", "/root/dir2/file3", "/root/dir1/file4"));
+ expected2.put("dir1", Arrays.asList("/root/dir1/file1", "/root/dir1/file2", "/root/dir1/file4"));
+ expected2.put("dir2", Arrays.asList("/root/dir2/file3"));
+ Assertions.assertEquals(expected2, result2);
+
+ // Test Case 3: Paths with empty list
+ List<String> paths3 = Collections.emptyList();
+ Map<String, List<String>> result3 = DSLTransformerHelper.calculateParentDirectories(paths3);
+ Map<String, List<String>> expected3 = Collections.emptyMap();
+ Assertions.assertEquals(expected3, result3);
+
+ // Test Case 4: Paths with single-level directories
+ List<String> paths4 = Arrays.asList(
+ "/dir1/file1",
+ "/dir2/file2",
+ "/dir3/file3"
+ );
+ Map<String, List<String>> result4 = DSLTransformerHelper.calculateParentDirectories(paths4);
+ Map<String, List<String>> expected4 = new HashMap<>();
+ expected4.put("dir1", Arrays.asList("/dir1/file1"));
+ expected4.put("dir2", Arrays.asList("/dir2/file2"));
+ expected4.put("dir3", Arrays.asList("/dir3/file3"));
+ Assertions.assertEquals(expected4, result4);
+ }*/
+
+ // Test case for nested JSON object construction --------------------------------------------------------------------
+ @Test
+ public void testGetNestedDSL_EmptyPageWithNoWidgets() {
+ JSONObject mainContainer = new JSONObject();
+
+ JSONObject result = DSLTransformerHelper.getNestedDSL(jsonMap, pathMapping, mainContainer);
+
+ Assertions.assertEquals(mainContainer, result);
+ }
+
+ @Test
+ public void testGetChildren_WithNoChildren() {
+ JSONObject widgetObject = new JSONObject();
+ widgetObject.put("type", "CANVAS_WIDGET");
+ widgetObject.put("id", "widget1");
+ jsonMap.put("widget1.json", widgetObject);
+
+ List<String> pathList = new ArrayList<>();
+ pathMapping.put("widget1", pathList);
+
+ JSONObject result = DSLTransformerHelper.getChildren("widget1", jsonMap, pathMapping);
+
+ Assertions.assertEquals(widgetObject, result);
+ }
+
+ @Test
+ public void testGetChildren_WithNestedChildren() {
+ JSONObject widgetObject = new JSONObject();
+ widgetObject.put(CommonConstants.WIDGET_TYPE, "CANVAS_WIDGET");
+ widgetObject.put("id", "widget1");
+ jsonMap.put("widget1.json", widgetObject);
+
+ JSONObject childObject = new JSONObject();
+ childObject.put(CommonConstants.WIDGET_TYPE, "BUTTON_WIDGET");
+ childObject.put("id", "widget2");
+ jsonMap.put("widget2.json", childObject);
+
+ List<String> pathList = new ArrayList<>();
+ pathList.add("widget2");
+ pathMapping.put("widget1", pathList);
+
+ JSONObject result = DSLTransformerHelper.getChildren("widget1", jsonMap, pathMapping);
+
+ Assertions.assertEquals(widgetObject, result);
+ JSONArray children = result.optJSONArray(CommonConstants.CHILDREN);
+ Assertions.assertNotNull(children);
+ Assertions.assertEquals(1, children.length());
+ JSONObject child = children.getJSONObject(0);
+ Assertions.assertEquals(childObject, child);
+ JSONArray childChildren = child.optJSONArray(CommonConstants.CHILDREN);
+ Assertions.assertNull(childChildren);
+ }
+
+ @Test
+ public void testGetWidgetName_WithSingleDirectory() {
+ String path = "widgets/parent/child";
+
+ String result = DSLTransformerHelper.getWidgetName(path);
+
+ Assertions.assertEquals("child", result);
+ }
+
+ @Test
+ public void testGetWidgetName_WithMultipleDirectories() {
+ String path = "widgets/parent/child/grandchild";
+
+ String result = DSLTransformerHelper.getWidgetName(path);
+
+ Assertions.assertEquals("grandchild", result);
+ }
+
+ @Test
+ public void testGetWidgetName_WithEmptyPath() {
+ String path = "";
+
+ String result = DSLTransformerHelper.getWidgetName(path);
+
+ Assertions.assertEquals("", result);
+ }
+
+ @Test
+ public void testGetWidgetName_WithRootDirectory() {
+ String path = "widgets";
+
+ String result = DSLTransformerHelper.getWidgetName(path);
+
+ Assertions.assertEquals("widgets", result);
+ }
+
+ @Test
+ public void testAppendChildren_WithNoExistingChildren() {
+ JSONObject parent = new JSONObject();
+ JSONArray childWidgets = new JSONArray()
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child1"))
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child2"));
+
+ JSONObject result = DSLTransformerHelper.appendChildren(parent, childWidgets);
+
+ JSONArray expectedChildren = new JSONArray()
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child1"))
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child2"));
+
+ Assertions.assertEquals(expectedChildren.toString(), result.optJSONArray(CommonConstants.CHILDREN).toString());
+ }
+
+ @Test
+ public void testAppendChildren_WithExistingMultipleChildren() {
+ JSONObject parent = new JSONObject();
+ JSONArray existingChildren = new JSONArray()
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "ExistingChild1"))
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "ExistingChild2"));
+ parent.put(CommonConstants.CHILDREN, existingChildren);
+ JSONArray childWidgets = new JSONArray()
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child1"))
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child2"));
+
+ JSONObject result = DSLTransformerHelper.appendChildren(parent, childWidgets);
+
+ JSONArray expectedChildren = new JSONArray()
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child1"))
+ .put(new JSONObject().put(CommonConstants.WIDGET_NAME, "Child2"));
+
+ Assertions.assertEquals(expectedChildren.toString(), result.optJSONArray(CommonConstants.CHILDREN).toString());
+ }
+}
diff --git a/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/FileUtilsImplTest.java b/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/FileUtilsImplTest.java
index d952ad1d81ee..06ff39ea3223 100644
--- a/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/FileUtilsImplTest.java
+++ b/app/server/appsmith-git/src/test/java/com/appsmith/git/helpers/FileUtilsImplTest.java
@@ -11,6 +11,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import reactor.core.publisher.Mono;
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/GitStatusDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/GitStatusDTO.java
index 13b61efa1b13..166f67317afd 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/GitStatusDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/GitStatusDTO.java
@@ -51,4 +51,7 @@ public class GitStatusDTO {
// Documentation url for discard and pull functionality
String discardDocUrl = Assets.GIT_DISCARD_DOC_URL;
+
+ // File Format migration
+ String migrationMessage = "";
}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApplicationGitReference.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApplicationGitReference.java
index 8297485740b8..b7a8fde4f201 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApplicationGitReference.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApplicationGitReference.java
@@ -22,6 +22,7 @@ public class ApplicationGitReference {
Map<String, Object> actionCollections;
Map<String, String> actionCollectionBody;
Map<String, Object> pages;
+ Map<String, String> pageDsl;
Map<String, Object> datasources;
Map<String, Object> jsLibraries;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
index 04780b6a237f..eaf4421b402c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
@@ -26,6 +26,9 @@
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
import org.apache.commons.collections.PredicateUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.api.errors.GitAPIException;
@@ -156,6 +159,7 @@ public ApplicationGitReference createApplicationReference(ApplicationJson applic
// Insert only active pages which will then be committed to repo as individual file
Map<String, Object> resourceMap = new HashMap<>();
Map<String, String> resourceMapBody = new HashMap<>();
+ Map<String, String> dslBody = new HashMap<>();
applicationJson
.getPageList()
.stream()
@@ -168,12 +172,20 @@ public ApplicationGitReference createApplicationReference(ApplicationJson applic
? newPage.getUnpublishedPage().getName()
: newPage.getPublishedPage().getName();
removeUnwantedFieldsFromPage(newPage);
+ JSONObject dsl = newPage.getUnpublishedPage().getLayouts().get(0).getDsl();
+ // Get MainContainer widget data, remove the children and club with Canvas.json file
+ JSONObject mainContainer = new JSONObject(dsl);
+ mainContainer.remove("children");
+ newPage.getUnpublishedPage().getLayouts().get(0).setDsl(mainContainer);
// pageName will be used for naming the json file
+ dslBody.put(pageName, dsl.toString());
resourceMap.put(pageName, newPage);
});
applicationReference.setPages(new HashMap<>(resourceMap));
+ applicationReference.setPageDsl(new HashMap<>(dslBody));
resourceMap.clear();
+ resourceMapBody.clear();
// Insert active actions and also assign the keys which later will be used for saving the resource in actual filepath
// For actions, we are referring to validNames to maintain unique file names as just name
@@ -403,6 +415,19 @@ private ApplicationJson getApplicationJsonFromGitReference(ApplicationGitReferen
List<NewPage> pages = getApplicationResource(applicationReference.getPages(), NewPage.class);
// Remove null values
org.apache.commons.collections.CollectionUtils.filter(pages, PredicateUtils.notNullPredicate());
+ // Set the DSL to page object before saving
+ Map<String, String> pageDsl = applicationReference.getPageDsl();
+ pages.forEach(page -> {
+ JSONParser jsonParser = new JSONParser();
+ try {
+ if (pageDsl != null && pageDsl.get(page.getUnpublishedPage().getName()) != null) {
+ page.getUnpublishedPage().getLayouts().get(0).setDsl( (JSONObject) jsonParser.parse(pageDsl.get(page.getUnpublishedPage().getName())) );
+ }
+ } catch (ParseException e) {
+ log.error("Error parsing the page dsl for page: {}", page.getUnpublishedPage().getName(), e);
+ throw new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, page.getUnpublishedPage().getName());
+ }
+ });
pages.forEach(newPage -> {
// As we are publishing the app and then committing to git we expect the published and unpublished PageDTO
// will be same, so we create a deep copy for the published version for page from the unpublishedPageDTO
@@ -426,7 +451,7 @@ private ApplicationJson getApplicationJsonFromGitReference(ApplicationGitReferen
// For REMOTE plugin like Twilio the user actions are stored in key value pairs and hence they need to be
// deserialized separately unlike the body which is stored as string in the db.
if (newAction.getPluginType().toString().equals("REMOTE")) {
- Map<String, Object> formData = new Gson().fromJson(actionBody.get(keyName), Map.class);
+ Map<String, Object> formData = gson.fromJson(actionBody.get(keyName), Map.class);
newAction.getUnpublishedAction().getActionConfiguration().setFormData(formData);
} else {
newAction.getUnpublishedAction().getActionConfiguration().setBody(actionBody.get(keyName));
|
8d32ee8f229a7f21e4054e3c8f94cda9f8de5194
|
2024-11-28 13:40:32
|
sneha122
|
chore: Google sheet shared drive support added behind a flag (#37776)
| false
|
Google sheet shared drive support added behind a flag (#37776)
|
chore
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/enums/FeatureFlagEnum.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/enums/FeatureFlagEnum.java
index e3e96745784a..9849422cd531 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/enums/FeatureFlagEnum.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/enums/FeatureFlagEnum.java
@@ -14,6 +14,7 @@ public enum FeatureFlagEnum {
APP_NAVIGATION_LOGO_UPLOAD,
release_embed_hide_share_settings_enabled,
rollout_datasource_test_rate_limit_enabled,
+ release_google_sheets_shared_drive_support_enabled,
// Deprecated CE flags over here
release_git_autocommit_feature_enabled,
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/PluginExecutor.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/PluginExecutor.java
index d912594f4a5a..a95a7c2988ac 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/PluginExecutor.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/plugins/PluginExecutor.java
@@ -247,6 +247,50 @@ default Mono<ActionExecutionResult> executeParameterizedWithMetrics(
.tap(Micrometer.observation(observationRegistry));
}
+ // TODO: Following methods of executeParameterizedWithFlags, executeParameterizedWithMetricsAndFlags,
+ // triggerWithFlags are
+ // added
+ // to support feature flags in the plugin modules. Current implementation of featureFlagService is only available in
+ // server module
+ // and not available in any of the plugin modules due to dependencies on SessionUserService, TenantService etc.
+ // Hence, these methods are added to support feature flags in the plugin modules.
+ // Ideal solution would be to move featureFlagService and its dependencies to the shared interface module
+ // But this is a bigger change and will be done in future. Current change of passing flags was done to resolve
+ // release blocker
+ // https://github.com/appsmithorg/appsmith/issues/37714
+ // Once thorogh testing of shared drive support is done, we can remove this tech debt of passing feature flags like
+ // this.
+ default Mono<ActionExecutionResult> executeParameterizedWithFlags(
+ C connection,
+ ExecuteActionDTO executeActionDTO,
+ DatasourceConfiguration datasourceConfiguration,
+ ActionConfiguration actionConfiguration,
+ Map<String, Boolean> featureFlagMap) {
+ return this.executeParameterized(connection, executeActionDTO, datasourceConfiguration, actionConfiguration);
+ }
+
+ default Mono<ActionExecutionResult> executeParameterizedWithMetricsAndFlags(
+ C connection,
+ ExecuteActionDTO executeActionDTO,
+ DatasourceConfiguration datasourceConfiguration,
+ ActionConfiguration actionConfiguration,
+ ObservationRegistry observationRegistry,
+ Map<String, Boolean> featureFlagMap) {
+ return this.executeParameterizedWithFlags(
+ connection, executeActionDTO, datasourceConfiguration, actionConfiguration, featureFlagMap)
+ .tag("plugin", this.getClass().getName())
+ .name(ACTION_EXECUTION_PLUGIN_EXECUTION)
+ .tap(Micrometer.observation(observationRegistry));
+ }
+
+ default Mono<TriggerResultDTO> triggerWithFlags(
+ C connection,
+ DatasourceConfiguration datasourceConfiguration,
+ TriggerRequestDTO request,
+ Map<String, Boolean> featureFlagMap) {
+ return this.trigger(connection, datasourceConfiguration, request);
+ }
+
/**
* This function is responsible for preparing the action and datasource configurations to be ready for execution.
*
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ExecutionMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ExecutionMethod.java
index ae6bef0a7c94..552f61f9323d 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ExecutionMethod.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ExecutionMethod.java
@@ -77,7 +77,9 @@ default Mono<Object> executePrerequisites(MethodConfig methodConfig, OAuth2 oaut
return Mono.just(true);
}
- WebClient.RequestHeadersSpec<?> getExecutionClient(WebClient webClient, MethodConfig methodConfig);
+ default WebClient.RequestHeadersSpec<?> getExecutionClient(WebClient webClient, MethodConfig methodConfig) {
+ return null;
+ }
default JsonNode transformExecutionResponse(
JsonNode response, MethodConfig methodConfig, Set<String> userAuthorizedSheetIds) {
@@ -102,4 +104,9 @@ default Map<DataType, DataType> getDataTypeConversionMap() {
conversionMap.put(DataType.FLOAT, DataType.DOUBLE);
return conversionMap;
}
+
+ default WebClient.RequestHeadersSpec<?> getExecutionClientWithFlags(
+ WebClient webClient, MethodConfig methodConfig, Map<String, Boolean> featureFlagMap) {
+ return getExecutionClient(webClient, methodConfig);
+ }
}
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/FileListMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/FileListMethod.java
index 2d6b3aea8e17..4e092ee38022 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/FileListMethod.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/FileListMethod.java
@@ -1,5 +1,6 @@
package com.external.config;
+import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
import com.external.constants.ErrorMessages;
import com.external.enums.GoogleSheetMethodEnum;
@@ -24,8 +25,9 @@
* API reference: https://developers.google.com/sheets/api/guides/migration#list_spreadsheets_for_the_authenticated_user
*/
public class FileListMethod implements ExecutionMethod, TriggerMethod {
-
ObjectMapper objectMapper;
+ private final String SHARED_DRIVE_PARAMS =
+ "&includeItemsFromAllDrives=true&supportsAllDrives=true&corpora=allDrives";
public FileListMethod(ObjectMapper objectMapper) {
this.objectMapper = objectMapper;
@@ -37,10 +39,16 @@ public boolean validateExecutionMethodRequest(MethodConfig methodConfig) {
}
@Override
- public WebClient.RequestHeadersSpec<?> getExecutionClient(WebClient webClient, MethodConfig methodConfig) {
+ public WebClient.RequestHeadersSpec<?> getExecutionClientWithFlags(
+ WebClient webClient, MethodConfig methodConfig, Map<String, Boolean> featureFlagMap) {
+ // TODO: Flags are needed here for google sheets integration to support shared drive behind a flag
+ // Once thoroughly tested, this flag can be removed
+ Boolean isSharedDriveSupportEnabled = featureFlagMap.getOrDefault(
+ FeatureFlagEnum.release_google_sheets_shared_drive_support_enabled.name(), Boolean.FALSE);
UriComponentsBuilder uriBuilder = getBaseUriBuilder(
this.BASE_DRIVE_API_URL,
- "?includeItemsFromAllDrives=true&supportsAllDrives=true&orderBy=name&q=mimeType%3D'application%2Fvnd.google-apps.spreadsheet'%20and%20trashed%3Dfalse",
+ "?orderBy=name&q=mimeType%3D'application%2Fvnd.google-apps.spreadsheet'%20and%20trashed%3Dfalse"
+ + (isSharedDriveSupportEnabled.equals(Boolean.TRUE) ? SHARED_DRIVE_PARAMS : ""),
true);
return webClient
@@ -74,8 +82,9 @@ public boolean validateTriggerMethodRequest(MethodConfig methodConfig) {
}
@Override
- public WebClient.RequestHeadersSpec<?> getTriggerClient(WebClient webClient, MethodConfig methodConfig) {
- return this.getExecutionClient(webClient, methodConfig);
+ public WebClient.RequestHeadersSpec<?> getTriggerClientWithFlags(
+ WebClient webClient, MethodConfig methodConfig, Map<String, Boolean> featureFlagMap) {
+ return this.getExecutionClientWithFlags(webClient, methodConfig, featureFlagMap);
}
@Override
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/TriggerMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/TriggerMethod.java
index 3528aea5db6b..0a385e64e770 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/TriggerMethod.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/TriggerMethod.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.web.reactive.function.client.WebClient;
+import java.util.Map;
import java.util.Set;
/**
@@ -21,7 +22,17 @@ public interface TriggerMethod {
/**
* Returns with the specification required to hit that particular trigger request
*/
- WebClient.RequestHeadersSpec<?> getTriggerClient(WebClient webClient, MethodConfig methodConfig);
+ default WebClient.RequestHeadersSpec<?> getTriggerClient(WebClient webClient, MethodConfig methodConfig) {
+ return null;
+ }
+
+ /**
+ * Returns with the specification required to hit that particular trigger request
+ */
+ default WebClient.RequestHeadersSpec<?> getTriggerClientWithFlags(
+ WebClient webClient, MethodConfig methodConfig, Map<String, Boolean> featureFlagMap) {
+ return getTriggerClient(webClient, methodConfig);
+ }
/**
* Transforms the response from the end point into an Appsmith friendly structure
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
index f336d54b8fc2..f006c050dd36 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/plugins/GoogleSheetsPlugin.java
@@ -81,6 +81,23 @@ public Mono<ActionExecutionResult> executeParameterized(
ExecuteActionDTO executeActionDTO,
DatasourceConfiguration datasourceConfiguration,
ActionConfiguration actionConfiguration) {
+ return executeParameterizedWithFlags(
+ connection, executeActionDTO, datasourceConfiguration, actionConfiguration, null);
+ }
+
+ @Override
+ public Mono<TriggerResultDTO> trigger(
+ Void connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+ return triggerWithFlags(connection, datasourceConfiguration, request, null);
+ }
+
+ @Override
+ public Mono<ActionExecutionResult> executeParameterizedWithFlags(
+ Void connection,
+ ExecuteActionDTO executeActionDTO,
+ DatasourceConfiguration datasourceConfiguration,
+ ActionConfiguration actionConfiguration,
+ Map<String, Boolean> featureFlagMap) {
log.debug(Thread.currentThread().getName() + ": executeParameterized() called for GoogleSheets plugin.");
boolean smartJsonSubstitution;
@@ -133,13 +150,14 @@ public Mono<ActionExecutionResult> executeParameterized(
prepareConfigurationsForExecution(executeActionDTO, actionConfiguration, datasourceConfiguration);
- return this.executeCommon(connection, datasourceConfiguration, actionConfiguration);
+ return this.executeCommon(connection, datasourceConfiguration, actionConfiguration, featureFlagMap);
}
public Mono<ActionExecutionResult> executeCommon(
Void connection,
DatasourceConfiguration datasourceConfiguration,
- ActionConfiguration actionConfiguration) {
+ ActionConfiguration actionConfiguration,
+ Map<String, Boolean> featureFlagMap) {
log.debug(Thread.currentThread().getName() + ": executeCommon() called for GoogleSheets plugin.");
// Initializing object for error condition
@@ -185,7 +203,7 @@ public Mono<ActionExecutionResult> executeCommon(
// method
.flatMap(res -> {
return executionMethod
- .getExecutionClient(client, methodConfig)
+ .getExecutionClientWithFlags(client, methodConfig, featureFlagMap)
.headers(headers -> headers.set(
"Authorization",
"Bearer "
@@ -319,8 +337,11 @@ public Object substituteValueInInput(
}
@Override
- public Mono<TriggerResultDTO> trigger(
- Void connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
+ public Mono<TriggerResultDTO> triggerWithFlags(
+ Void connection,
+ DatasourceConfiguration datasourceConfiguration,
+ TriggerRequestDTO request,
+ Map<String, Boolean> featureFlagMap) {
log.debug(Thread.currentThread().getName() + ": trigger() called for GoogleSheets plugin.");
final TriggerMethod triggerMethod = GoogleSheetsMethodStrategy.getTriggerMethod(request, objectMapper);
MethodConfig methodConfig = new MethodConfig(request);
@@ -343,7 +364,7 @@ public Mono<TriggerResultDTO> trigger(
validateAndGetUserAuthorizedSheetIds(datasourceConfiguration, methodConfig);
return triggerMethod
- .getTriggerClient(client, methodConfig)
+ .getTriggerClientWithFlags(client, methodConfig, featureFlagMap)
.headers(headers -> headers.set(
"Authorization",
"Bearer " + oauth2.getAuthenticationResponse().getToken()))
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
index ace596c38c93..a983e279d1eb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
@@ -9,6 +9,7 @@
import com.appsmith.server.helpers.PluginExecutorHelper;
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.services.ConfigService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.DatasourceTriggerSolution;
import org.apache.commons.lang3.StringUtils;
@@ -28,18 +29,21 @@ public class PluginTriggerSolutionCEImpl implements PluginTriggerSolutionCE {
private final PluginRepository pluginRepository;
private final ConfigService configService;
private final TenantService tenantService;
+ private final FeatureFlagService featureFlagService;
public PluginTriggerSolutionCEImpl(
DatasourceTriggerSolution datasourceTriggerSolution,
PluginExecutorHelper pluginExecutorHelper,
PluginRepository pluginRepository,
ConfigService configService,
- TenantService tenantService) {
+ TenantService tenantService,
+ FeatureFlagService featureFlagService) {
this.datasourceTriggerSolution = datasourceTriggerSolution;
this.pluginExecutorHelper = pluginExecutorHelper;
this.pluginRepository = pluginRepository;
this.configService = configService;
this.tenantService = tenantService;
+ this.featureFlagService = featureFlagService;
}
/**
@@ -74,6 +78,11 @@ public Mono<TriggerResultDTO> trigger(
Mono<PluginExecutor> pluginExecutorMono =
pluginMono.flatMap(plugin -> pluginExecutorHelper.getPluginExecutor(Mono.just(plugin)));
+ // TODO: Flags are needed here for google sheets integration to support shared drive behind a flag
+ // Once thoroughly tested, this flag can be removed
+ Map<String, Boolean> featureFlagMap =
+ featureFlagService.getCachedTenantFeatureFlags().getFeatures();
+
/*
* Since there is no datasource provided, we are passing the Datasource Context connection and datasourceConfiguration as null.
* We will leave the execution to respective plugin executor.
@@ -83,8 +92,8 @@ public Mono<TriggerResultDTO> trigger(
PluginExecutor pluginExecutor = pair.getT2();
setHeadersToTriggerRequest(plugin, httpHeaders, triggerRequestDTO);
return setTenantAndInstanceId(triggerRequestDTO)
- .flatMap(updatedTriggerRequestDTO ->
- ((PluginExecutor<Object>) pluginExecutor).trigger(null, null, updatedTriggerRequestDTO));
+ .flatMap(updatedTriggerRequestDTO -> ((PluginExecutor<Object>) pluginExecutor)
+ .triggerWithFlags(null, null, updatedTriggerRequestDTO, featureFlagMap));
});
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionImpl.java
index f40ff60094d9..373235b5e09d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionImpl.java
@@ -3,6 +3,7 @@
import com.appsmith.server.helpers.PluginExecutorHelper;
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.services.ConfigService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.DatasourceTriggerSolution;
import org.springframework.stereotype.Component;
@@ -14,7 +15,14 @@ public PluginTriggerSolutionImpl(
PluginExecutorHelper pluginExecutorHelper,
PluginRepository pluginRepository,
ConfigService configService,
- TenantService tenantService) {
- super(datasourceTriggerSolution, pluginExecutorHelper, pluginRepository, configService, tenantService);
+ TenantService tenantService,
+ FeatureFlagService featureFlagService) {
+ super(
+ datasourceTriggerSolution,
+ pluginExecutorHelper,
+ pluginRepository,
+ configService,
+ tenantService,
+ featureFlagService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
index 1412bd1b6e70..6f3413f55d94 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
@@ -13,6 +13,7 @@
import com.appsmith.server.services.AuthenticationValidator;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.ce.ActionExecutionSolutionCEImpl;
@@ -42,7 +43,8 @@ public ActionExecutionSolutionImpl(
ConfigService configService,
TenantService tenantService,
CommonConfig commonConfig,
- ActionExecutionSolutionHelper actionExecutionSolutionHelper) {
+ ActionExecutionSolutionHelper actionExecutionSolutionHelper,
+ FeatureFlagService featureFlagService) {
super(
newActionService,
actionPermission,
@@ -63,6 +65,7 @@ public ActionExecutionSolutionImpl(
configService,
tenantService,
commonConfig,
- actionExecutionSolutionHelper);
+ actionExecutionSolutionHelper,
+ featureFlagService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
index 3993270da9db..a892502e7ffb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
@@ -7,6 +7,7 @@
import com.appsmith.server.services.AuthenticationValidator;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.ce.DatasourceTriggerSolutionCEImpl;
import lombok.extern.slf4j.Slf4j;
@@ -28,7 +29,8 @@ public DatasourceTriggerSolutionImpl(
DatasourcePermission datasourcePermission,
EnvironmentPermission environmentPermission,
ConfigService configService,
- TenantService tenantService) {
+ TenantService tenantService,
+ FeatureFlagService featureFlagService) {
super(
datasourceService,
datasourceStorageService,
@@ -40,6 +42,7 @@ public DatasourceTriggerSolutionImpl(
datasourcePermission,
environmentPermission,
configService,
- tenantService);
+ tenantService,
+ featureFlagService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
index 794d24af0b98..3ced1a0a3978 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
@@ -45,6 +45,7 @@
import com.appsmith.server.services.AuthenticationValidator;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.ActionPermission;
@@ -73,6 +74,7 @@
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -122,6 +124,7 @@ public class ActionExecutionSolutionCEImpl implements ActionExecutionSolutionCE
private final TenantService tenantService;
private final ActionExecutionSolutionHelper actionExecutionSolutionHelper;
private final CommonConfig commonConfig;
+ private final FeatureFlagService featureFlagService;
static final String PARAM_KEY_REGEX = "^k\\d+$";
static final String BLOB_KEY_REGEX =
@@ -150,7 +153,8 @@ public ActionExecutionSolutionCEImpl(
ConfigService configService,
TenantService tenantService,
CommonConfig commonConfig,
- ActionExecutionSolutionHelper actionExecutionSolutionHelper) {
+ ActionExecutionSolutionHelper actionExecutionSolutionHelper,
+ FeatureFlagService featureFlagService) {
this.newActionService = newActionService;
this.actionPermission = actionPermission;
this.observationRegistry = observationRegistry;
@@ -171,6 +175,7 @@ public ActionExecutionSolutionCEImpl(
this.tenantService = tenantService;
this.commonConfig = commonConfig;
this.actionExecutionSolutionHelper = actionExecutionSolutionHelper;
+ this.featureFlagService = featureFlagService;
this.patternList.add(Pattern.compile(PARAM_KEY_REGEX));
this.patternList.add(Pattern.compile(BLOB_KEY_REGEX));
@@ -726,13 +731,20 @@ protected Mono<ActionExecutionResult> verifyDatasourceAndMakeRequest(
// Now that we have the context (connection details), execute the action.
Instant requestedAt = Instant.now();
+ Map<String, Boolean> features = featureFlagService.getCachedTenantFeatureFlags() != null
+ ? featureFlagService.getCachedTenantFeatureFlags().getFeatures()
+ : Collections.emptyMap();
+
+ // TODO: Flags are needed here for google sheets integration to support shared drive behind a flag
+ // Once thoroughly tested, this flag can be removed
return ((PluginExecutor<Object>) pluginExecutor)
- .executeParameterizedWithMetrics(
+ .executeParameterizedWithMetricsAndFlags(
resourceContext.getConnection(),
executeActionDTO,
datasourceStorage1.getDatasourceConfiguration(),
actionDTO.getActionConfiguration(),
- observationRegistry)
+ observationRegistry,
+ features)
.map(actionExecutionResult -> {
ActionExecutionRequest actionExecutionRequest = actionExecutionResult.getRequest();
if (actionExecutionRequest == null) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
index 374264fdaf8d..c4a571037d27 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceTriggerSolutionCEImpl.java
@@ -17,6 +17,7 @@
import com.appsmith.server.services.AuthenticationValidator;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.DatasourceStructureSolution;
@@ -27,6 +28,7 @@
import reactor.util.function.Tuple2;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -53,6 +55,7 @@ public class DatasourceTriggerSolutionCEImpl implements DatasourceTriggerSolutio
private final EnvironmentPermission environmentPermission;
private final ConfigService configService;
private final TenantService tenantService;
+ private final FeatureFlagService featureFlagService;
public Mono<TriggerResultDTO> trigger(
String datasourceId, String environmentId, TriggerRequestDTO triggerRequestDTO) {
@@ -104,6 +107,12 @@ public Mono<TriggerResultDTO> trigger(
final Plugin plugin = tuple.getT2();
final PluginExecutor pluginExecutor = tuple.getT3();
+ // TODO: Flags are needed here for google sheets integration to support shared drive behind a flag
+ // Once thoroughly tested, this flag can be removed
+ Map<String, Boolean> featureFlagMap = featureFlagService.getCachedTenantFeatureFlags() != null
+ ? featureFlagService.getCachedTenantFeatureFlags().getFeatures()
+ : Collections.emptyMap();
+
return datasourceContextService
.getDatasourceContext(datasourceStorage, plugin)
// Now that we have the context (connection details), execute the action.
@@ -111,10 +120,11 @@ public Mono<TriggerResultDTO> trigger(
// However the context comes from evaluated datasource.
.flatMap(resourceContext -> setTenantAndInstanceId(triggerRequestDTO)
.flatMap(updatedTriggerRequestDTO -> ((PluginExecutor<Object>) pluginExecutor)
- .trigger(
+ .triggerWithFlags(
resourceContext.getConnection(),
datasourceStorage.getDatasourceConfiguration(),
- updatedTriggerRequestDTO)));
+ updatedTriggerRequestDTO,
+ featureFlagMap)));
});
// If the plugin hasn't implemented the trigger function, go for the default implementation
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
index 603142af9435..ff664b5ee37c 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
@@ -24,6 +24,7 @@
import com.appsmith.server.services.AuthenticationValidator;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
+import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.services.TenantService;
import com.appsmith.server.solutions.ActionPermission;
@@ -136,6 +137,9 @@ class ActionExecutionSolutionCEImplTest {
@SpyBean
ActionExecutionSolutionHelper actionExecutionSolutionHelper;
+ @SpyBean
+ FeatureFlagService featureFlagService;
+
@Autowired
EnvironmentPermission environmentPermission;
@@ -167,7 +171,8 @@ public void beforeEach() {
configService,
tenantService,
commonConfig,
- actionExecutionSolutionHelper);
+ actionExecutionSolutionHelper,
+ featureFlagService);
ObservationRegistry.ObservationConfig mockObservationConfig =
Mockito.mock(ObservationRegistry.ObservationConfig.class);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
index cd2fe3a498aa..306012b752bc 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
@@ -327,6 +327,8 @@ private Mono<ActionExecutionResult> executeAction(
Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(pluginExecutor));
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
.thenReturn(Mono.just(mockResult));
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenReturn(Mono.just(mockResult));
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.doReturn(Mono.just(false))
.when(spyDatasourceService)
@@ -527,6 +529,8 @@ public void testActionExecuteErrorResponse() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(pluginExecutor));
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
.thenReturn(Mono.error(pluginException));
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenReturn(Mono.error(pluginException));
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.doReturn(Mono.just(false))
.when(spyDatasourceService)
@@ -584,6 +588,8 @@ public void testActionExecuteNullPaginationParameters() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(pluginExecutor));
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
.thenReturn(Mono.error(pluginException));
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenReturn(Mono.error(pluginException));
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.doReturn(Mono.just(false))
.when(spyDatasourceService)
@@ -635,6 +641,9 @@ public void testActionExecuteSecondaryStaleConnection() {
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
.thenReturn(Mono.error(new StaleConnectionException()))
.thenReturn(Mono.error(new StaleConnectionException()));
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenReturn(Mono.error(new StaleConnectionException()))
+ .thenReturn(Mono.error(new StaleConnectionException()));
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.doReturn(Mono.just(false))
.when(spyDatasourceService)
@@ -686,6 +695,8 @@ public void testActionExecuteTimeout() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(pluginExecutor));
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
.thenAnswer(x -> Mono.delay(Duration.ofMillis(1000)).ofType(ActionExecutionResult.class));
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenAnswer(x -> Mono.delay(Duration.ofMillis(1000)).ofType(ActionExecutionResult.class));
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.doReturn(Mono.just(false))
.when(spyDatasourceService)
@@ -716,8 +727,9 @@ public void checkRecoveryFromStaleConnections() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(pluginExecutor));
Mockito.when(pluginExecutor.executeParameterizedWithMetrics(any(), any(), any(), any(), any()))
- .thenThrow(new StaleConnectionException())
- .thenReturn(Mono.just(mockResult));
+ .thenThrow(new StaleConnectionException());
+ Mockito.when(pluginExecutor.executeParameterizedWithMetricsAndFlags(any(), any(), any(), any(), any(), any()))
+ .thenThrow(new StaleConnectionException());
Mockito.when(pluginExecutor.datasourceCreate(any())).thenReturn(Mono.empty());
Mockito.when(pluginExecutor.getHintMessages(any(), any()))
.thenReturn(Mono.zip(Mono.just(new HashSet<>()), Mono.just(new HashSet<>())));
|
f7690b45be46e28bb2e0742d8a2acb9cd535f87d
|
2023-07-19 17:28:45
|
Saroj
|
ci: Remove cypress env values for custom script run (#25475)
| false
|
Remove cypress env values for custom script run (#25475)
|
ci
|
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index 1ea31d51df25..5823f4df90e6 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -184,7 +184,6 @@ jobs:
env:
APPSMITH_SSL_CERTIFICATE: ${{ secrets.APPSMITH_SSL_CERTIFICATE }}
APPSMITH_SSL_KEY: ${{ secrets.APPSMITH_SSL_KEY }}
- CYPRESS_URL: ${{ secrets.CYPRESS_URL }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
@@ -284,8 +283,6 @@ jobs:
uses: cypress-io/github-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
@@ -363,8 +360,6 @@ jobs:
uses: cypress-io/github-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png
new file mode 100644
index 000000000000..fb7dfd96f029
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png
new file mode 100644
index 000000000000..74450c7b6417
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png
new file mode 100644
index 000000000000..a89a2381be97
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png
new file mode 100644
index 000000000000..a89a2381be97
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png
new file mode 100644
index 000000000000..03ae033804da
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png
new file mode 100644
index 000000000000..f2a43963e2f9
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png
new file mode 100644
index 000000000000..fa434d76b6e8
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png
new file mode 100644
index 000000000000..f32fcbd8f754
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png
new file mode 100644
index 000000000000..5b42068fdd51
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png
new file mode 100644
index 000000000000..2cf487d9ce9e
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png
new file mode 100644
index 000000000000..102b2c2dee4f
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png
new file mode 100644
index 000000000000..13cb914d494d
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png
new file mode 100644
index 000000000000..86442585dbe3
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png
new file mode 100644
index 000000000000..86387284dc55
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png
new file mode 100644
index 000000000000..33c951769497
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png
new file mode 100644
index 000000000000..0bcb4637917c
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png
new file mode 100644
index 000000000000..152bcb603f96
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png
new file mode 100644
index 000000000000..cccfd3888200
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png
new file mode 100644
index 000000000000..798a3ac90c45
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png
new file mode 100644
index 000000000000..5006f39b4d68
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png
new file mode 100644
index 000000000000..2cd8e9c5cffa
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png
new file mode 100644
index 000000000000..8bfc5894ea30
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png
new file mode 100644
index 000000000000..5006f39b4d68
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png
new file mode 100644
index 000000000000..4c786d88aac1
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png
new file mode 100644
index 000000000000..38474320c91c
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png differ
|
c711e39849942cd1e82597926fb988e40d072434
|
2022-01-10 09:51:43
|
Aishwarya-U-R
|
test: Automated tests for JSObjects in Typescript (#10223)
| false
|
Automated tests for JSObjects in Typescript (#10223)
|
test
|
diff --git a/app/client/cypress/index.ts b/app/client/cypress/index.ts
index 970ba8144456..28696d4f7d83 100644
--- a/app/client/cypress/index.ts
+++ b/app/client/cypress/index.ts
@@ -1 +1,6 @@
-import "cypress-xpath";
\ No newline at end of file
+import "cypress-xpath";
+
+// data: string;
+// cy.fixture("example").then(function (data) {
+// this.data = data;
+// });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_List_Widget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_List_Widget_spec.js
deleted file mode 100644
index 86eee5093a95..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_JSObject_List_Widget_spec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// const commonlocators = require("../../../../locators/commonlocators.json");
-// const dsl = require("../../../../fixtures/listwidgetdsl.json");
-// const pages = require("../../../../locators/Pages.json");
-// const apiPage = require("../../../../locators/ApiEditor.json");
-// const publishPage = require("../../../../locators/publishWidgetspage.json");
-
-// describe("Test Create Api and Bind to Table widget via JSObject", function() {
-// let apiData;
-// let valueToTest;
-// before(() => {
-// cy.addDsl(dsl);
-// });
-
-// it("Test_Add users api and bind to JSObject", function() {
-// cy.createAndFillApi(this.data.userApi, "/users");
-// cy.RunAPI();
-// cy.get(apiPage.responseBody)
-// .contains("name")
-// .siblings("span")
-// .invoke("text")
-// .then((text) => {
-// valueToTest = `${text
-// .match(/"(.*)"/)[0]
-// .split('"')
-// .join("")}`;
-// cy.log(valueToTest);
-// apiData = valueToTest;
-// cy.log("val1:" + valueToTest);
-// });
-// cy.createJSObject("return Api1.data.users;");
-// });
-
-// it("Test_Validate the Api data is updated on List widget", function() {
-// cy.SearchEntityandOpen("List1");
-// cy.testJsontext("items", "{{JSObject1.myFun1()}}");
-// cy.get(commonlocators.editPropCrossButton).click({ force: true });
-// cy.get(".t--draggable-textwidget span").should("have.length", 8);
-
-// cy.get(".t--draggable-textwidget span")
-// .first()
-// .invoke("text")
-// .then((text) => {
-// expect(text).to.equal(valueToTest);
-// });
-// cy.PublishtheApp();
-// cy.get(".t--widget-textwidget span").should("have.length", 8);
-// cy.get(".t--widget-textwidget span")
-// .first()
-// .invoke("text")
-// .then((text) => {
-// expect(text).to.equal(valueToTest);
-// });
-// });
-
-// it("Test_Validate the list widget ", function() {
-// cy.get(publishPage.backToEditor).click({ force: true });
-// cy.SearchEntityandOpen("List1");
-// cy.testJsontext("itemspacing\\(px\\)", "50");
-// cy.get(commonlocators.editPropCrossButton).click({ force: true });
-// cy.get(".t--draggable-textwidget span").should("have.length", 6);
-// cy.get(".t--draggable-textwidget span")
-// .first()
-// .invoke("text")
-// .then((text) => {
-// expect(text).to.equal(valueToTest);
-// });
-// cy.PublishtheApp();
-// cy.get(".t--widget-textwidget span").should("have.length", 6);
-// cy.get(".t--widget-textwidget span")
-// .first()
-// .invoke("text")
-// .then((text) => {
-// expect(text).to.equal(valueToTest);
-// });
-// });
-
-// afterEach(() => {
-// // put your clean up code if any
-// });
-// });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_JSEditor_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_JSEditor_spec.js
deleted file mode 100644
index 05e93ff7c447..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_JSEditor_spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const explorer = require("../../../../locators/explorerlocators.json");
-const jsEditorLocators = require("../../../../locators/JSEditor.json");
-const commonlocators = require("../../../../locators/commonlocators.json");
-
-const pageid = "Page1";
-
-describe("Entity explorer JSEditor structure", function() {
- beforeEach(() => {
- cy.ClearSearch();
- });
-
- it("Create and Run JSObject", function() {
- cy.createJSObject('return "Hello World";');
- cy.get(jsEditorLocators.outputConsole).contains("Hello World");
- cy.get(`.t--entity.t--jsaction:contains(JSObject1)`).should(
- "have.length",
- 1,
- );
- cy.get(`.t--entity.t--jsaction:contains(JSObject1)`)
- .find(explorer.collapse)
- .click({ multiple: true });
- // cy.get(jsEditorLocators.propertyList).then(function($lis) {
- // expect($lis).to.have.length(4);
- // expect($lis.eq(0)).to.contain("{{JSObject1.myFun2()}}");
- // expect($lis.eq(0)).to.contain("{{JSObject1.myFun1()}}");
- // expect($lis.eq(1)).to.contain("{{JSObject1.myVar1}}");
- // expect($lis.eq(1)).to.contain("{{JSObject1.myVar2}}");
- // });
- });
-
- // it("Rename JSObject", function() {
- // cy.get(jsEditorLocators.jsObjectName).click();
- // cy.get(jsEditorLocators.editNameField)
- // .clear()
- // .type("NewNameJSObj");
- // cy.get(jsEditorLocators.jsPage).click();
- // cy.get(jsEditorLocators.jsObjectName).contains("NewNameJSObj");
- // });
-
- // it("Copy JSObject", function() {
- // cy.xpath(jsEditorLocators.popover)
- // .last()
- // .should("be.hidden")
- // .invoke("show")
- // .click({ force: true });
-
- // cy.copyJSObjectToPage(pageid);
- // });
-
- // it("Delete JSObject", function() {
- // cy.deleteJSObject("NewNameJSObj");
- // });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Typescript/Binding/JSObject_To_ListWidgetSpec.ts b/app/client/cypress/integration/Smoke_TestSuite/Typescript/Binding/JSObject_To_ListWidgetSpec.ts
new file mode 100644
index 000000000000..e4f12f87726c
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/Typescript/Binding/JSObject_To_ListWidgetSpec.ts
@@ -0,0 +1,78 @@
+import { ApiPage } from "../../../../support/Pages/ApiPage";
+import { AggregateHelper } from "../../../../support/Pages/AggregateHelper";
+import { JSEditor } from "../../../../support/Pages/JSEditor";
+import { CommonLocators } from "../../../../support/Objects/CommonLocators";
+
+const apiPage = new ApiPage();
+const agHelper = new AggregateHelper();
+const jsEditor = new JSEditor();
+const locator = new CommonLocators();
+
+let dataSet: any, valueToTest: any;
+
+describe("Validate Create Api and Bind to Table widget via JSObject", () => {
+ before(() => {
+ cy.fixture('listwidgetdsl').then((val: any) => {
+ agHelper.AddDsl(val)
+ });
+
+ cy.fixture("example").then(function (data: any) {
+ dataSet = data;
+ });
+ });
+
+ it("1. Add users api and bind to JSObject", () => {
+ apiPage.CreateAndFillApi(dataSet.userApi + "/users")
+ apiPage.RunAPI()
+ apiPage.ReadApiResponsebyKey("name");
+ cy.get("@apiResp").then((value) => {
+ valueToTest = value;
+ cy.log("valueToTest to test returned is :" + valueToTest)
+ //cy.log("value to test returned is :" + value)
+ })
+ jsEditor.CreateJSObject("return Api1.data.users;");
+ });
+
+ it("2. Validate the Api data is updated on List widget", function () {
+ agHelper.SelectEntityByName("Widgets")//to expand widgets
+ agHelper.SelectEntityByName("List1");
+ jsEditor.EnterJSContext("items", "{{JSObject1.myFun1()}}")
+ cy.get(locator._textWidget).should("have.length", 8);
+ cy.get(locator._textWidget)
+ .first()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal((valueToTest as string).trimEnd());
+ });
+ agHelper.DeployApp();
+ cy.get(locator._textWidgetInDeployed).should("have.length", 8);
+ cy.get(locator._textWidgetInDeployed)
+ .first()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal((valueToTest as string).trimEnd());
+ });
+ });
+
+ it("3. Validate the List widget ", function () {
+ cy.get(locator._backToEditor).click({ force: true });
+ agHelper.SelectEntityByName("Widgets")//to expand widgets
+ agHelper.SelectEntityByName("List1");
+ jsEditor.EnterJSContext("itemspacing\\(px\\)", "50")
+ cy.get(locator._textWidget).should("have.length", 6);
+ cy.get(locator._textWidget)
+ .first()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal((valueToTest as string).trimEnd());
+ });
+ agHelper.DeployApp();
+ cy.get(locator._textWidgetInDeployed).should("have.length", 6);
+ cy.get(locator._textWidgetInDeployed).first()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal((valueToTest as string).trimEnd());
+ });
+ });
+
+});
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Typescript/JSEditor/ContextMenuSpec.ts b/app/client/cypress/integration/Smoke_TestSuite/Typescript/JSEditor/ContextMenuSpec.ts
new file mode 100644
index 000000000000..9136f935d11f
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/Typescript/JSEditor/ContextMenuSpec.ts
@@ -0,0 +1,57 @@
+import { AggregateHelper } from "../../../../support/Pages/AggregateHelper";
+import { JSEditor } from "../../../../support/Pages/JSEditor";
+
+const agHelper = new AggregateHelper();
+const jsEditor = new JSEditor();
+
+describe("Validate basic operations on Entity explorer JSEditor structure", () => {
+
+ let pageId = "Page1"
+
+ it("1. Validate JSObject creation & Run", () => {
+ jsEditor.CreateJSObject('return "Hello World";');
+ agHelper.ValidateEntityPresenceInExplorer("JSObject1")
+ agHelper.expandCollapseEntity("JSObject1")
+ jsEditor.validateDefaultJSObjProperties("JSObject1")
+ });
+
+ it("2. Validate Rename JSObject from Form Header", function() {
+ jsEditor.RenameJSObjFromForm("RenamedJSObject")
+ agHelper.ValidateEntityPresenceInExplorer("RenamedJSObject");
+ jsEditor.validateDefaultJSObjProperties("RenamedJSObject")
+ });
+
+ it("3. Validate Copy JSObject", function() {
+ agHelper.ActionContextMenuByEntityName("RenamedJSObject", "Copy to page", pageId)
+ cy.wait("@createNewJSCollection").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 201,
+ );
+ agHelper.ValidateEntityPresenceInExplorer("RenamedJSObjectCopy")
+ agHelper.expandCollapseEntity("RenamedJSObjectCopy")
+ jsEditor.validateDefaultJSObjProperties("RenamedJSObjectCopy")
+ });
+
+ it("4. Validate Rename JSObject from Entity Explorer", function() {
+ jsEditor.RenameJSObjFromExplorer("RenamedJSObject", "ExplorerRenamed")
+ agHelper.ValidateEntityPresenceInExplorer("ExplorerRenamed");
+ jsEditor.validateDefaultJSObjProperties("ExplorerRenamed")
+ });
+
+ it("5. Validate Move JSObject", function() {
+ pageId = 'Page2'
+ agHelper.AddNewPage();
+ agHelper.ValidateEntityPresenceInExplorer(pageId);
+ agHelper.ActionContextMenuByEntityName("RenamedJSObjectCopy", "Move to page", pageId)
+ agHelper.ValidateEntityPresenceInExplorer("RenamedJSObjectCopy")
+ agHelper.expandCollapseEntity("RenamedJSObjectCopy")
+ jsEditor.validateDefaultJSObjProperties("RenamedJSObjectCopy")
+ });
+
+ it("6. Validate Deletion of JSObject", function() {
+ agHelper.ActionContextMenuByEntityName("RenamedJSObjectCopy", "Delete")
+ agHelper.ActionContextMenuByEntityName("ExplorerRenamed", "Delete")
+ });
+
+});
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Typescript/LayoutOnLoadActions/OnLoadActionsSpec.ts b/app/client/cypress/integration/Smoke_TestSuite/Typescript/LayoutOnLoadActions/OnLoadActionsSpec.ts
index f6f246340c72..f6028950bbbf 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Typescript/LayoutOnLoadActions/OnLoadActionsSpec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/Typescript/LayoutOnLoadActions/OnLoadActionsSpec.ts
@@ -1,11 +1,10 @@
-import { ApiPage } from "../../../../support/pageObjects/ApiPage";
-import { AggregateHelper } from "../../../../support/pageObjects/AggregateHelper";
+import { ApiPage } from "../../../../support/Pages/ApiPage";
+import { AggregateHelper } from "../../../../support/Pages/AggregateHelper";
const apiPage = new ApiPage();
const agHelper = new AggregateHelper();
describe("Layout OnLoad Actions tests", function () {
-
let dsl: any;
before(() => {
cy.fixture('onPageLoadActionsDsl').then((val: any) => {
@@ -33,37 +32,22 @@ describe("Layout OnLoad Actions tests", function () {
it("2. Bug 8595: OnPageLoad execution - when Query Parmas added via Params tab", function () {
agHelper.AddDsl(dsl)
- agHelper.NavigateToCreateNewTabPage()
- apiPage.CreateAPI("RandomFlora")
- apiPage.EnterURL("https://source.unsplash.com/collection/1599413")
- apiPage.SetAPITimeout(30000)
+ apiPage.CreateAndFillApi("https://source.unsplash.com/collection/1599413", "RandomFlora")
apiPage.RunAPI()
- agHelper.NavigateToCreateNewTabPage()
- apiPage.CreateAPI("RandomUser")
- apiPage.EnterURL("https://randomuser.me/api/")
- apiPage.SetAPITimeout(30000)
+ apiPage.CreateAndFillApi("https://randomuser.me/api/", "RandomUser")
apiPage.RunAPI()
- agHelper.NavigateToCreateNewTabPage()
- apiPage.CreateAPI("InspiringQuotes")
- apiPage.EnterURL("https://favqs.com/api/qotd")
+ apiPage.CreateAndFillApi("https://favqs.com/api/qotd", "InspiringQuotes")
apiPage.EnterHeader('dependency', '{{RandomUser.data}}')
- apiPage.SetAPITimeout(30000)
apiPage.RunAPI()
- agHelper.NavigateToCreateNewTabPage()
- apiPage.CreateAPI("Suggestions")
- apiPage.EnterURL("https://www.boredapi.com/api/activity")
+ apiPage.CreateAndFillApi("https://www.boredapi.com/api/activity", "Suggestions")
apiPage.EnterHeader('dependency', '{{InspiringQuotes.data}}')
- apiPage.SetAPITimeout(30000)
apiPage.RunAPI()
- agHelper.NavigateToCreateNewTabPage()
- apiPage.CreateAPI("Genderize")
- apiPage.EnterURL("https://api.genderize.io")
+ apiPage.CreateAndFillApi("https://api.genderize.io", "Genderize")
apiPage.EnterParams('name', '{{RandomUser.data.results[0].name.first}}')
- apiPage.SetAPITimeout(30000)
apiPage.RunAPI()
agHelper.SelectEntityByName('Page1')
@@ -97,72 +81,57 @@ describe("Layout OnLoad Actions tests", function () {
});
});
- // it("3. Bug 10049, 10055: Dependency not executed in expected order in layoutOnLoadActions when dependency added via URL", function () {
- // agHelper.NavigateToHome()
- // agHelper.CreateNewApplication()
-
- // agHelper.AddDsl(dsl)
- // agHelper.NavigateToCreateNewTabPage()
- // apiPage.CreateAPI("RandomFlora")
- // apiPage.EnterURL("https://source.unsplash.com/collection/1599413")
- // apiPage.SetAPITimeout(30000)
- // apiPage.RunAPI()
-
- // agHelper.NavigateToCreateNewTabPage()
- // apiPage.CreateAPI("RandomUser")
- // apiPage.EnterURL("https://randomuser.me/api/")
- // apiPage.SetAPITimeout(30000)
- // apiPage.RunAPI()
-
- // agHelper.NavigateToCreateNewTabPage()
- // apiPage.CreateAPI("InspiringQuotes")
- // apiPage.EnterURL("https://favqs.com/api/qotd")
- // apiPage.EnterHeader('dependency', '{{RandomUser.data}}')
- // apiPage.SetAPITimeout(30000)
- // apiPage.RunAPI()
-
- // agHelper.NavigateToCreateNewTabPage()
- // apiPage.CreateAPI("Suggestions")
- // apiPage.EnterURL("https://www.boredapi.com/api/activity")
- // apiPage.EnterHeader('dependency', '{{InspiringQuotes.data}}')
- // apiPage.SetAPITimeout(30000)
- // apiPage.RunAPI()
-
- // agHelper.NavigateToCreateNewTabPage()
- // apiPage.CreateAPI("Genderize")
- // apiPage.EnterURL("https://api.genderize.io?name={{RandomUser.data.results[0].name.first}}")
- // apiPage.ValidateQueryParams({ key: "name", value: "{{RandomUser.data.results[0].name.first}}" }); // verifies Bug 10055
- // apiPage.SetAPITimeout(30000)
- // apiPage.RunAPI()
-
- // agHelper.SelectEntityByName('Page1')
-
- // cy.url().then((url) => {
- // let currentURL = url;
- // const myRegexp = /pages(.*)/;
- // const match = myRegexp.exec(currentURL);
- // let pageid = match![1].split("/")[1];
- // cy.log(pageid + "page id");
- // cy.server()
- // cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
- // const respBody = JSON.stringify(response.body);
-
- // let _randomFlora = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[0];
- // let _randomUser = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[1];
- // let _genderize = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[2];
- // let _suggestions = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[3];
- // // cy.log("_randomFlora is: " + JSON.stringify(_randomFlora))
- // // cy.log("_randomUser is: " + JSON.stringify(_randomUser))
- // // cy.log("_genderize is: " + JSON.stringify(_genderize))
- // // cy.log("_suggestions is: " + JSON.stringify(_suggestions))
-
- // expect(JSON.parse(JSON.stringify(_randomFlora))[0]['name']).to.eq('RandomFlora')
- // expect(JSON.parse(JSON.stringify(_randomUser))[0]['name']).to.eq('RandomUser')
- // expect(JSON.parse(JSON.stringify(_genderize))[0]['name']).to.be.oneOf(['Genderize', 'InspiringQuotes'])
- // expect(JSON.parse(JSON.stringify(_genderize))[1]['name']).to.be.oneOf(['Genderize', 'InspiringQuotes'])
- // expect(JSON.parse(JSON.stringify(_suggestions))[0]['name']).to.eq('Suggestions')
-
- // });
- // });
- // });
+ it("3. Bug 10049, 10055: Dependency not executed in expected order in layoutOnLoadActions when dependency added via URL", function () {
+ agHelper.NavigateToHome()
+ agHelper.CreateNewApplication()
+ agHelper.AddDsl(dsl)
+
+ apiPage.CreateAndFillApi("https://source.unsplash.com/collection/1599413", "RandomFlora")
+ apiPage.RunAPI()
+
+ apiPage.CreateAndFillApi("https://randomuser.me/api/", "RandomUser")
+ apiPage.RunAPI()
+
+ apiPage.CreateAndFillApi("https://favqs.com/api/qotd", "InspiringQuotes")
+ apiPage.EnterHeader('dependency', '{{RandomUser.data}}')
+ apiPage.RunAPI()
+
+ apiPage.CreateAndFillApi("https://www.boredapi.com/api/activity", "Suggestions")
+ apiPage.EnterHeader('dependency', '{{InspiringQuotes.data}}')
+ apiPage.RunAPI()
+
+ apiPage.CreateAndFillApi("https://api.genderize.io?name={{RandomUser.data.results[0].name.first}}", "Genderize")
+ apiPage.ValidateQueryParams({ key: "name", value: "{{RandomUser.data.results[0].name.first}}" }); // verifies Bug 10055
+ apiPage.RunAPI()
+
+ agHelper.SelectEntityByName('Page1')
+
+ cy.url().then((url) => {
+ let currentURL = url;
+ const myRegexp = /pages(.*)/;
+ const match = myRegexp.exec(currentURL);
+ let pageid = match![1].split("/")[1];
+ cy.log(pageid + "page id");
+ cy.server()
+ cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
+ const respBody = JSON.stringify(response.body);
+
+ let _randomFlora = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[0];
+ let _randomUser = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[1];
+ let _genderize = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[2];
+ let _suggestions = JSON.parse(respBody).data.layouts[0].layoutOnLoadActions[3];
+ // cy.log("_randomFlora is: " + JSON.stringify(_randomFlora))
+ // cy.log("_randomUser is: " + JSON.stringify(_randomUser))
+ // cy.log("_genderize is: " + JSON.stringify(_genderize))
+ // cy.log("_suggestions is: " + JSON.stringify(_suggestions))
+
+ expect(JSON.parse(JSON.stringify(_randomFlora))[0]['name']).to.eq('RandomFlora')
+ expect(JSON.parse(JSON.stringify(_randomUser))[0]['name']).to.eq('RandomUser')
+ expect(JSON.parse(JSON.stringify(_genderize))[0]['name']).to.be.oneOf(['Genderize', 'InspiringQuotes'])
+ expect(JSON.parse(JSON.stringify(_genderize))[1]['name']).to.be.oneOf(['Genderize', 'InspiringQuotes'])
+ expect(JSON.parse(JSON.stringify(_suggestions))[0]['name']).to.eq('Suggestions')
+
+ });
+ });
+ });
});
\ No newline at end of file
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
new file mode 100644
index 000000000000..a817d4ace5ba
--- /dev/null
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -0,0 +1,25 @@
+export class CommonLocators {
+
+ _addEntityAPI = ".datasources .t--entity-add-btn"
+ _integrationCreateNew = "[data-cy=t--tab-CREATE_NEW]"
+ _loading = "#loading"
+ _actionName = ".t--action-name-edit-field span"
+ _actionTxt = ".t--action-name-edit-field input"
+ _entityNameInExplorer = (entityNameinLeftSidebar: string) => "//div[contains(@class, 't--entity-name')][text()='" + entityNameinLeftSidebar + "']"
+ _homeIcon = ".t--appsmith-logo"
+ _homePageAppCreateBtn = ".t--applications-container .createnew"
+ _saveStatusSuccess = ".t--save-status-success"
+ _codeMirrorTextArea = ".CodeMirror textarea"
+ _entityExplorersearch = "#entity-explorer-search"
+ _propertyControl = ".t--property-control-"
+ _textWidget = ".t--draggable-textwidget span"
+ _publishButton = ".t--application-publish-btn"
+ _textWidgetInDeployed = ".t--widget-textwidget span"
+ _backToEditor = ".t--back-to-editor"
+ _expandCollapseArrow = (entityNameinLeftSidebar: string) => "//div[text()='" + entityNameinLeftSidebar + "']/ancestor::div/preceding-sibling::a[contains(@class, 't--entity-collapse-toggle')]"
+ _entityProperties = (entityNameinLeftSidebar: string) => "//div[text()='" + entityNameinLeftSidebar + "']/ancestor::div[contains(@class, 't--entity-item')]/following-sibling::div//div[contains(@class, 't--entity-property')]//code"
+ _contextMenu = (entityNameinLeftSidebar: string) => "//div[text()='" + entityNameinLeftSidebar + "']/ancestor::div[contains(@class, 't--entity')]//span[contains(@class, 'entity-context-menu')]//div"
+ _contextMenuItem = (item: string) => "//div[text()='" + item + "']/parent::a[contains(@class, 'single-select')]"
+ _newPage = ".pages .t--entity-add-btn"
+ _entityNameEditing = (entityNameinLeftSidebar: string) => "//span[text()='" + entityNameinLeftSidebar + "']/parent::div[contains(@class, 't--entity-name editing')]/input"
+}
\ No newline at end of file
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
new file mode 100644
index 000000000000..a2734962cdc5
--- /dev/null
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -0,0 +1,149 @@
+import { CommonLocators } from "../Objects/CommonLocators";
+
+const locator = new CommonLocators();
+export class AggregateHelper {
+
+ public AddDsl(dsl: string) {
+ let currentURL;
+ let pageid: string;
+ let layoutId;
+ cy.url().then((url) => {
+ currentURL = url;
+ const myRegexp = /pages(.*)/;
+ const match = myRegexp.exec(currentURL);
+ pageid = match![1].split("/")[1];
+ cy.log(pageid + "page id");
+ //Fetch the layout id
+ cy.server()
+ cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
+ const respBody = JSON.stringify(response.body);
+ layoutId = JSON.parse(respBody).data.layouts[0].id;
+ // Dumping the DSL to the created page
+ cy.request(
+ "PUT",
+ "api/v1/layouts/" + layoutId + "/pages/" + pageid,
+ dsl,
+ ).then((response) => {
+ //cy.log("Pages resposne is : " + response.body);
+ expect(response.status).equal(200);
+ cy.reload();
+ });
+ });
+ });
+ }
+
+ public NavigateToCreateNewTabPage() {
+ cy.get(locator._addEntityAPI).last()
+ .should("be.visible")
+ .click({ force: true });
+ cy.get(locator._integrationCreateNew)
+ .should("be.visible")
+ .click({ force: true });
+ cy.get(locator._loading).should("not.exist");
+ }
+
+ public StartServerAndRoutes() {
+ cy.intercept("POST", "/api/v1/actions").as("createNewApi");
+ cy.intercept("PUT", "/api/v1/actions/*").as("saveAction");
+ }
+
+ public RenameWithInPane(renameVal: string) {
+ cy.get(locator._actionName).click({ force: true });
+ cy.get(locator._actionTxt)
+ .clear()
+ .type(renameVal, { force: true })
+ .should("have.value", renameVal)
+ .blur();
+ }
+
+ public WaitAutoSave() {
+ // wait for save query to trigger & n/w call to finish occuring
+ cy.get(locator._saveStatusSuccess, { timeout: 40000 }).should("exist");
+ }
+
+ public SelectEntityByName(entityNameinLeftSidebar: string) {
+ cy.xpath(locator._entityNameInExplorer(entityNameinLeftSidebar))
+ .last()
+ .click({ force: true })
+ this.Sleep(2000)
+ }
+
+ public ValidateEntityPresenceInExplorer(entityNameinLeftSidebar: string) {
+ cy.xpath(locator._entityNameInExplorer(entityNameinLeftSidebar))
+ .should("have.length", 1);
+ }
+
+ public NavigateToHome() {
+ cy.get(locator._homeIcon).click({ force: true });
+ this.Sleep(3000)
+ cy.wait("@applications");
+ cy.get(locator._homePageAppCreateBtn).should("be.visible").should("be.enabled");
+ //cy.get(this._homePageAppCreateBtn);
+ }
+
+ public CreateNewApplication() {
+ cy.get(locator._homePageAppCreateBtn).click({ force: true })
+ cy.wait("@createNewApplication").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 201,
+ );
+ }
+
+ public ValidateCodeEditorContent(selector: string, contentToValidate: any) {
+ cy.get(selector).within(() => {
+ cy.get(".CodeMirror-code").should("have.text", contentToValidate);
+ });
+ }
+
+ public DeployApp() {
+ cy.server();
+ cy.route("POST", "/api/v1/applications/publish/*").as("publishApp");
+ // Wait before publish
+ this.Sleep(2000)
+ this.WaitAutoSave()
+ // Stubbing window.open to open in the same tab
+ cy.window().then((window) => {
+ cy.stub(window, "open").callsFake((url) => {
+ window.location.href = Cypress.config().baseUrl + url.substring(1);
+ });
+ });
+ cy.get(locator._publishButton).click();
+ cy.wait("@publishApp");
+ cy.url().should("include", "/pages");
+ cy.log("Pagename: " + localStorage.getItem("PageName"));
+ }
+
+ public expandCollapseEntity(entityName: string) {
+ cy.xpath(locator._expandCollapseArrow(entityName))
+ .click({ multiple: true }).wait(500);
+ }
+
+ public ActionContextMenuByEntityName(entityNameinLeftSidebar: string, action = "Delete", subAction = "") {
+ this.Sleep()
+ cy.xpath(locator._contextMenu(entityNameinLeftSidebar)).first().click({ force: true });
+ cy.xpath(locator._contextMenuItem(action)).click({ force: true }).wait(500);
+ if (subAction)
+ cy.xpath(locator._contextMenuItem(subAction)).click({ force: true }).wait(500);
+
+ if (action == "Delete")
+ cy.xpath("//div[text()='" + entityNameinLeftSidebar + "']").should(
+ "not.exist");
+ }
+
+ public AddNewPage() {
+ cy.get(locator._newPage)
+ .first()
+ .click();
+ cy.wait("@createPage").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 201,
+ );
+ }
+
+ public Sleep(timeout = 1000) {
+ cy.wait(timeout)
+ }
+}
+
diff --git a/app/client/cypress/support/pageObjects/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts
similarity index 63%
rename from app/client/cypress/support/pageObjects/ApiPage.ts
rename to app/client/cypress/support/Pages/ApiPage.ts
index 53a123dcd9ac..82695c2c5907 100644
--- a/app/client/cypress/support/pageObjects/ApiPage.ts
+++ b/app/client/cypress/support/Pages/ApiPage.ts
@@ -13,16 +13,37 @@ export class ApiPage {
private _apiRunBtn = ".t--apiFormRunBtn"
private _queryTimeout = "//input[@name='actionConfiguration.timeoutInMillisecond']"
private _apiTab = (tabValue: string) => "span:contains('" + tabValue + "')"
+ _responseBody = ".CodeMirror-code span.cm-string.cm-property"
- CreateAPI(apiname: string) {
+
+ CreateAndFillApi(url: string, apiname: string = "", queryTimeout = 30000) {
+ agHelper.NavigateToCreateNewTabPage()
cy.get(this._createapi).click({ force: true });
- cy.wait("@createNewApi");
+ cy.wait("@createNewApi").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 201,
+ );
+ // cy.get("@createNewApi").then((response: any) => {
+ // expect(response.response.body.responseMeta.success).to.eq(true);
+ // cy.get(agHelper._actionName)
+ // .click()
+ // .invoke("text")
+ // .then((text) => {
+ // const someText = text;
+ // expect(someText).to.equal(response.response.body.data.name);
+ // });
+ // }); // to check if Api1 = Api1 when Create Api invoked
+ if (apiname)
+ agHelper.RenameWithInPane(apiname)
cy.get(this._resourceUrl).should("be.visible");
- agHelper.RenameWithInPane(apiname)
+ this.EnterURL(url)
agHelper.WaitAutoSave()
// Added because api name edit takes some time to
// reflect in api sidebar after the call passes.
- cy.wait(2000);
+ agHelper.Sleep(2000);
+ cy.get(this._apiRunBtn).should("not.be.disabled");
+ this.SetAPITimeout(queryTimeout)
}
EnterURL(url: string) {
@@ -34,6 +55,7 @@ export class ApiPage {
}
EnterHeader(hKey: string, hValue: string) {
+ cy.get(this._apiTab('Header')).should('be.visible').click();
cy.get(this._headerKey(0))
.first()
.click({ force: true })
@@ -83,7 +105,20 @@ export class ApiPage {
.should("be.visible")
.click({ force: true });
- agHelper.validateCodeEditorContent(this._paramKey(0), param.key)
- agHelper.validateCodeEditorContent(this._paramValue(0), param.value)
+ agHelper.ValidateCodeEditorContent(this._paramKey(0), param.key)
+ agHelper.ValidateCodeEditorContent(this._paramValue(0), param.value)
+ }
+
+ ReadApiResponsebyKey(key: string) {
+ let apiResp: string = "";
+ cy.get(this._responseBody)
+ .contains(key)
+ .siblings("span")
+ .invoke("text")
+ .then((text) => {
+ apiResp = `${text.match(/"(.*)"/)![0].split('"').join("") } `;
+ cy.log("Key value in api response is :" + apiResp);
+ cy.wrap(apiResp).as("apiResp")
+ });
}
}
diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts
new file mode 100644
index 000000000000..fc4679fc07d3
--- /dev/null
+++ b/app/client/cypress/support/Pages/JSEditor.ts
@@ -0,0 +1,100 @@
+import { AggregateHelper } from "./AggregateHelper";
+import { CommonLocators } from "../Objects/CommonLocators";
+
+const agHelper = new AggregateHelper();
+const locator = new CommonLocators()
+
+export class JSEditor {
+
+ private _addEntityJSEditor = ".js_actions .t--entity-add-btn"
+ private _runButton = ".run-button"
+ private _outputConsole = ".CodeEditorTarget"
+ private _jsObjName = ".t--js-action-name-edit-field span"
+ private _jsObjTxt = ".t--js-action-name-edit-field input"
+
+ public NavigateToJSEditor() {
+ cy.get(this._addEntityJSEditor)
+ .last()
+ .click({ force: true });
+ }
+
+ public CreateJSObject(JSCode: string) {
+ this.NavigateToJSEditor();
+ agHelper.Sleep()
+ cy.get(locator._codeMirrorTextArea)
+ .first()
+ .focus()
+ .type("{downarrow}{downarrow}{downarrow}{downarrow} ")
+ .type(JSCode);
+ cy.get(this._outputConsole).contains(JSCode);
+ agHelper.Sleep();
+ cy.get(this._runButton)
+ .first()
+ .click();
+ }
+
+ public EnterJSContext(endp: string, value: string, paste = true) {
+ cy.get(locator._propertyControl + endp + " " + locator._codeMirrorTextArea)
+ .first()
+ .focus()
+ .type("{uparrow}", { force: true })
+ .type("{ctrl}{shift}{downarrow}", { force: true });
+ cy.focused().then(($cm: any) => {
+ if ($cm.contents != "") {
+ cy.log("The field is not empty");
+ cy.get(".t--property-control-" + endp + " .CodeMirror textarea")
+ .first()
+ .click({ force: true })
+ .focused()
+ .clear({
+ force: true,
+ });
+ }
+ // eslint-disable-next-line cypress/no-unnecessary-waiting
+ agHelper.Sleep()
+ cy.get(locator._propertyControl + endp + " " + locator._codeMirrorTextArea)
+ .first()
+ .then((el: any) => {
+ const input = cy.get(el);
+ if (paste) {
+ input.invoke("val", value);
+ } else {
+ input.type(value, {
+ force: true,
+ parseSpecialCharSequences: false,
+ });
+ }
+ });
+ });
+ agHelper.Sleep(2500);//Allowing time for Evaluate value to capture value
+ }
+
+ public RenameJSObjFromForm(renameVal: string) {
+ cy.get(this._jsObjName).click({ force: true });
+ cy.get(this._jsObjTxt)
+ .clear()
+ .type(renameVal, { force: true })
+ .should("have.value", renameVal)
+ .blur()
+ agHelper.Sleep();//allowing time for name change to reflect in EntityExplorer
+ }
+
+ public RenameJSObjFromExplorer(entityName: string, renameVal: string) {
+ agHelper.ActionContextMenuByEntityName("RenamedJSObject", "Edit Name")
+ cy.xpath(locator._entityNameEditing(entityName))
+ .type(renameVal + "{enter}")
+ agHelper.ValidateEntityPresenceInExplorer(renameVal)
+ agHelper.Sleep();//allowing time for name change to reflect in EntityExplorer
+ }
+
+ public validateDefaultJSObjProperties(jsObjName: string) {
+ cy.xpath(locator._entityProperties(jsObjName)).then(function ($lis) {
+ expect($lis).to.have.length(4);
+ expect($lis.eq(0).text()).to.be.oneOf(["{{" + jsObjName + ".myFun2()}}", "{{" + jsObjName + ".myFun1()}}"]);
+ expect($lis.eq(1).text()).to.be.oneOf(["{{" + jsObjName + ".myFun2()}}", "{{" + jsObjName + ".myFun1()}}"]);
+ expect($lis.eq(2).text()).to.contain("{{" + jsObjName + ".myVar1}}");
+ expect($lis.eq(3).text()).to.contain("{{" + jsObjName + ".myVar2}}");
+ });
+ }
+}
+
diff --git a/app/client/cypress/support/pageObjects/AggregateHelper.ts b/app/client/cypress/support/pageObjects/AggregateHelper.ts
deleted file mode 100644
index 553ccb926b0e..000000000000
--- a/app/client/cypress/support/pageObjects/AggregateHelper.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-export class AggregateHelper {
-
- private _addEntityAPI = ".datasources .t--entity-add-btn"
- private _integrationCreateNew = "[data-cy=t--tab-CREATE_NEW]"
- _loading = "#loading"
- private _actionName = ".t--action-name-edit-field span"
- private _actionTxt = ".t--action-name-edit-field input"
- private _entityNameInExplorer = (entityNameinLeftSidebar: string) => "//div[contains(@class, 't--entity-name')][text()='" + entityNameinLeftSidebar + "']"
- private _homeIcon = ".t--appsmith-logo"
- private _homePageAppCreateBtn = ".t--applications-container .createnew"
-
- public AddDsl(dsl: string) {
- let currentURL;
- let pageid: string;
- let layoutId;
- cy.url().then((url) => {
- currentURL = url;
- const myRegexp = /pages(.*)/;
- const match = myRegexp.exec(currentURL);
- pageid = match![1].split("/")[1];
- cy.log(pageid + "page id");
- //Fetch the layout id
- cy.server()
- cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
- const respBody = JSON.stringify(response.body);
- layoutId = JSON.parse(respBody).data.layouts[0].id;
- // Dumping the DSL to the created page
- cy.request(
- "PUT",
- "api/v1/layouts/" + layoutId + "/pages/" + pageid,
- dsl,
- ).then((response) => {
- //cy.log("Pages resposne is : " + response.body);
- expect(response.status).equal(200);
- cy.reload();
- });
- });
- });
- }
-
- public NavigateToCreateNewTabPage() {
- cy.get(this._addEntityAPI).last()
- .should("be.visible")
- .click({ force: true });
- cy.get(this._integrationCreateNew)
- .should("be.visible")
- .click({ force: true });
- cy.get(this._loading).should("not.exist");
- }
-
- public StartServerAndRoutes() {
- cy.intercept("POST", "/api/v1/actions").as("createNewApi");
- cy.intercept("PUT", "/api/v1/actions/*").as("saveAction");
- }
-
- public RenameWithInPane(renameVal: string) {
- cy.get(this._actionName).click({ force: true });
- cy.get(this._actionTxt)
- .clear()
- .type(renameVal, { force: true })
- .should("have.value", renameVal)
- .blur();
- }
-
- public WaitAutoSave() {
- // wait for save query to trigger & n/w call to finish occuring
- cy.wait("@saveAction", { timeout: 8000 });
- }
-
- public SelectEntityByName(entityNameinLeftSidebar: string) {
- cy.xpath(this._entityNameInExplorer(entityNameinLeftSidebar))
- .last()
- .click({ force: true })
- .wait(2000);
- }
-
- public NavigateToHome() {
- cy.get(this._homeIcon).click({ force: true });
- cy.wait(3000);
- cy.wait("@applications");
- cy.get(this._homePageAppCreateBtn).should("be.visible").should("be.enabled");
- //cy.get(this._homePageAppCreateBtn);
- }
-
- public CreateNewApplication() {
- cy.get(this._homePageAppCreateBtn).click({ force: true })
- cy.wait("@createNewApplication").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 201,
- );
- }
-
- public validateCodeEditorContent(selector: string, contentToValidate: any) {
- cy.get(selector).within(() => {
- cy.get(".CodeMirror-code").should("have.text", contentToValidate);
- });
- }
-}
-
|
1d176ec08686907c8861ac4ae29ef4379da66b1b
|
2022-10-15 10:04:21
|
Arpit Mohan
|
feat: Add configuration API to save some configurations in tenantConfiguration (#17407)
| false
|
Add configuration API to save some configurations in tenantConfiguration (#17407)
|
feat
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
index dbc07446a481..2cfdc15e7437 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
@@ -9,6 +9,7 @@
import com.appsmith.server.domains.Config;
import com.appsmith.server.domains.Page;
import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.Tenant;
import com.appsmith.server.domains.Theme;
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.Workspace;
@@ -117,6 +118,8 @@ public enum AclPermission {
ASSIGN_PERMISSION_GROUPS("assign:permissionGroups", PermissionGroup.class),
UNASSIGN_PERMISSION_GROUPS("unassign:permissionGroups", PermissionGroup.class),
+ // Manage tenant permissions
+ MANAGE_TENANT("manage:tenants", Tenant.class),
;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
index e95b382fa76f..238acee135ed 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
@@ -6,22 +6,23 @@
import java.util.List;
import java.util.Set;
+import static com.appsmith.server.acl.AclPermission.DELETE_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_TENANT;
import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_PUBLISH_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_CREATE_APPLICATION;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_CREATE_DATASOURCE;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_DELETE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_DELETE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.DELETE_WORKSPACES;
-import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_DELETE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXECUTE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_DATASOURCES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_PUBLISH_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
import static com.appsmith.server.constants.FieldName.ADMINISTRATOR;
import static com.appsmith.server.constants.FieldName.DEVELOPER;
import static com.appsmith.server.constants.FieldName.VIEWER;
@@ -32,19 +33,20 @@
@Getter
public enum AppsmithRole {
APPLICATION_ADMIN("Application Administrator", "", Set.of(MANAGE_APPLICATIONS)),
- APPLICATION_VIEWER("Application Viewer", "", Set.of(READ_APPLICATIONS)),
+ APPLICATION_VIEWER("Application Viewer", "", Set.of(READ_APPLICATIONS)),
ORGANIZATION_ADMIN(ADMINISTRATOR, WORKSPACE_ADMINISTRATOR_DESCRIPTION,
- Set.of(MANAGE_WORKSPACES, WORKSPACE_INVITE_USERS, WORKSPACE_EXPORT_APPLICATIONS, WORKSPACE_CREATE_APPLICATION, WORKSPACE_CREATE_DATASOURCE,
- WORKSPACE_DELETE_DATASOURCES, WORKSPACE_DELETE_APPLICATIONS, DELETE_WORKSPACES)),
+ Set.of(MANAGE_WORKSPACES, WORKSPACE_INVITE_USERS, WORKSPACE_EXPORT_APPLICATIONS, WORKSPACE_CREATE_APPLICATION, WORKSPACE_CREATE_DATASOURCE,
+ WORKSPACE_DELETE_DATASOURCES, WORKSPACE_DELETE_APPLICATIONS, DELETE_WORKSPACES)),
ORGANIZATION_DEVELOPER(DEVELOPER, WORKSPACE_DEVELOPER_DESCRIPTION,
- Set.of(READ_WORKSPACES, WORKSPACE_MANAGE_APPLICATIONS, WORKSPACE_MANAGE_DATASOURCES, WORKSPACE_READ_APPLICATIONS,
- WORKSPACE_PUBLISH_APPLICATIONS, WORKSPACE_INVITE_USERS, WORKSPACE_CREATE_APPLICATION, WORKSPACE_CREATE_DATASOURCE,
- WORKSPACE_DELETE_DATASOURCES, WORKSPACE_DELETE_APPLICATIONS)),
+ Set.of(READ_WORKSPACES, WORKSPACE_MANAGE_APPLICATIONS, WORKSPACE_MANAGE_DATASOURCES, WORKSPACE_READ_APPLICATIONS,
+ WORKSPACE_PUBLISH_APPLICATIONS, WORKSPACE_INVITE_USERS, WORKSPACE_CREATE_APPLICATION, WORKSPACE_CREATE_DATASOURCE,
+ WORKSPACE_DELETE_DATASOURCES, WORKSPACE_DELETE_APPLICATIONS)),
ORGANIZATION_VIEWER(
VIEWER,
WORKSPACE_VIEWER_DESCRIPTION,
Set.of(READ_WORKSPACES, WORKSPACE_READ_APPLICATIONS, WORKSPACE_INVITE_USERS, WORKSPACE_EXECUTE_DATASOURCES)
),
+ TENANT_ADMIN("", "", Set.of(MANAGE_TENANT)),
;
private Set<AclPermission> permissions;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
index c6c5d8137085..d66d97bc0829 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
@@ -38,6 +38,7 @@
import static com.appsmith.server.constants.Url.ACTION_URL;
import static com.appsmith.server.constants.Url.APPLICATION_URL;
import static com.appsmith.server.constants.Url.PAGE_URL;
+import static com.appsmith.server.constants.Url.TENANT_URL;
import static com.appsmith.server.constants.Url.THEME_URL;
import static com.appsmith.server.constants.Url.USER_URL;
import static java.time.temporal.ChronoUnit.DAYS;
@@ -110,12 +111,10 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
// This returns 401 unauthorized for all requests that are not authenticated but authentication is required
// The client will redirect to the login page if we return 401 as Http status response
.exceptionHandling()
- .authenticationEntryPoint(authenticationEntryPoint)
- .accessDeniedHandler(accessDeniedHandler)
+ .authenticationEntryPoint(authenticationEntryPoint)
+ .accessDeniedHandler(accessDeniedHandler)
.and()
.authorizeExchange()
- // All public URLs that should be served to anonymous users should also be defined in acl.rego file
- // This is because the flow enters AclFilter as well and needs to be whitelisted there
.matchers(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, Url.LOGIN_URL),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, USER_URL),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, USER_URL + "/super"),
@@ -131,7 +130,8 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, PAGE_URL + "/**"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/**"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, THEME_URL + "/**"),
- ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, ACTION_URL + "/execute")
+ ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, ACTION_URL + "/execute"),
+ ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, TENANT_URL + "/current")
)
.permitAll()
.pathMatchers("/public/**", "/oauth2/**").permitAll()
@@ -160,6 +160,7 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
/**
* This bean configures the parameters that need to be set when a Cookie is created for a logged in user
+ *
* @return
*/
@Bean
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ConfigNames.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ConfigNames.java
index 88cb2d52ddf9..b48bc0216c4c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ConfigNames.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ConfigNames.java
@@ -6,6 +6,6 @@
public class ConfigNames {
// Disallow instantiation of this class.
- private ConfigNames() {}
-
+ private ConfigNames() {
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
index 954c6637f265..c6a79b74e44c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
@@ -5,22 +5,17 @@ public interface Url {
String VERSION = "/v1";
String LOGIN_URL = BASE_URL + VERSION + "/login";
String LOGOUT_URL = BASE_URL + VERSION + "/logout";
- String WIDGET_URL = BASE_URL + VERSION + "/widgets";
String WORKSPACE_URL = BASE_URL + VERSION + "/workspaces";
String LAYOUT_URL = BASE_URL + VERSION + "/layouts";
String PLUGIN_URL = BASE_URL + VERSION + "/plugins";
- String SETTING_URL = BASE_URL + VERSION + "/settings";
String DATASOURCE_URL = BASE_URL + VERSION + "/datasources";
String SAAS_URL = BASE_URL + VERSION + "/saas";
String ACTION_URL = BASE_URL + VERSION + "/actions";
String USER_URL = BASE_URL + VERSION + "/users";
String APPLICATION_URL = BASE_URL + VERSION + "/" + Entity.APPLICATIONS;
String PAGE_URL = BASE_URL + VERSION + "/" + Entity.PAGES;
- String PROPERTY_URL = BASE_URL + VERSION + "/properties";
String CONFIG_URL = BASE_URL + VERSION + "/configs";
- String TEAM_URL = BASE_URL + VERSION + "/teams";
String GROUP_URL = BASE_URL + VERSION + "/groups";
- String PERMISSION_URL = BASE_URL + VERSION + "/permissions";
String COLLECTION_URL = BASE_URL + VERSION + "/collections";
String ACTION_COLLECTION_URL = COLLECTION_URL + "/actions";
String IMPORT_URL = BASE_URL + VERSION + "/import";
@@ -36,4 +31,5 @@ public interface Url {
String THEME_URL = BASE_URL + VERSION + "/themes";
String APP_TEMPLATE_URL = BASE_URL + VERSION + "/app-templates";
String USAGE_PULSE_URL = BASE_URL + VERSION + "/usage-pulse";
+ String TENANT_URL = BASE_URL + VERSION + "/tenants";
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/TenantController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/TenantController.java
new file mode 100644
index 000000000000..77c7d4c8c64e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/TenantController.java
@@ -0,0 +1,19 @@
+package com.appsmith.server.controllers;
+
+import com.appsmith.server.constants.Url;
+import com.appsmith.server.controllers.ce.TenantControllerCE;
+import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.dtos.ResponseDTO;
+import com.appsmith.server.services.TenantService;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import reactor.core.publisher.Mono;
+
+@RequestMapping(Url.TENANT_URL)
+public class TenantController extends TenantControllerCE {
+
+ public TenantController(TenantService service) {
+ super(service);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
new file mode 100644
index 000000000000..91b3ed2b849b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
@@ -0,0 +1,38 @@
+package com.appsmith.server.controllers.ce;
+
+import com.appsmith.server.constants.Url;
+import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.dtos.ResponseDTO;
+import com.appsmith.server.services.TenantService;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+@RequestMapping(Url.TENANT_URL)
+public class TenantControllerCE {
+
+ private final TenantService service;
+
+ public TenantControllerCE(TenantService service) {
+ this.service = service;
+ }
+
+ /**
+ * This API returns the tenant configuration for any user (anonymous or logged in). The configurations are set
+ * in {@link com.appsmith.server.controllers.ce.InstanceAdminControllerCE#saveEnvChanges(Map<String,String>)}
+ * <p>
+ * The update and retrieval are in different controllers because it would have been weird to fetch the configurations
+ * from the InstanceAdminController
+ *
+ * @return
+ */
+ @GetMapping("/current")
+ public Mono<ResponseDTO<TenantConfiguration>> getTenantConfig() {
+ return service.getTenantConfiguration()
+ .map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
+ }
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
index 74a551c12236..988483e1e0ff 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
@@ -1,6 +1,7 @@
package com.appsmith.server.domains;
import com.appsmith.external.models.BaseDomain;
+import com.appsmith.server.constants.ConfigNames;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -8,6 +9,8 @@
import org.checkerframework.common.aliasing.qual.Unique;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.util.Map;
+
@Getter
@Setter
@ToString
@@ -22,5 +25,7 @@ public class Tenant extends BaseDomain {
PricingPlan pricingPlan;
+ TenantConfiguration tenantConfiguration;
+
// TODO add SSO and other configurations here after migrating from environment variables to database configuration
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java
new file mode 100644
index 000000000000..12b9f54e6996
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java
@@ -0,0 +1,9 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.server.domains.ce.TenantConfigurationCE;
+import lombok.Data;
+
+@Data
+public class TenantConfiguration extends TenantConfigurationCE {
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
new file mode 100644
index 000000000000..4572552143fe
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
@@ -0,0 +1,4 @@
+package com.appsmith.server.domains.ce;
+
+public class TenantConfigurationCE {
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
index 03eaaf8e181a..4481a5e2b27b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
@@ -111,6 +111,7 @@
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
import static com.appsmith.server.acl.AclPermission.READ_USERS;
import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS;
+import static com.appsmith.server.acl.AppsmithRole.TENANT_ADMIN;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_ADMIN_EMAILS;
import static com.appsmith.server.constants.FieldName.DEFAULT_PERMISSION_GROUP;
import static com.appsmith.server.constants.FieldName.PERMISSION_GROUP_ID;
@@ -2614,6 +2615,47 @@ public void deleteRapidApiPluginRelatedItems(MongockTemplate mongockTemplate) {
softDeletePlugin(mongockTemplate, rapidApiPlugin);
}
+ @ChangeSet(order = "035", id = "add-tenant-admin-permissions-instance-admin", author = "")
+ public void addTenantAdminPermissionsToInstanceAdmin(MongockTemplate mongockTemplate, @NonLockGuarded PolicyUtils policyUtils) {
+ Query tenantQuery = new Query();
+ tenantQuery.addCriteria(where(fieldName(QTenant.tenant.slug)).is("default"));
+ Tenant defaultTenant = mongockTemplate.findOne(tenantQuery, Tenant.class);
+
+ Query instanceConfigurationQuery = new Query();
+ instanceConfigurationQuery.addCriteria(where(fieldName(QConfig.config1.name)).is(FieldName.INSTANCE_CONFIG));
+ Config instanceAdminConfiguration = mongockTemplate.findOne(instanceConfigurationQuery, Config.class);
+
+ String instanceAdminPermissionGroupId = (String) instanceAdminConfiguration.getConfig().get(DEFAULT_PERMISSION_GROUP);
+
+ Query permissionGroupQuery = new Query();
+ permissionGroupQuery.addCriteria(where(fieldName(QPermissionGroup.permissionGroup.id)).is(instanceAdminPermissionGroupId));
+
+ PermissionGroup instanceAdminPGBeforeChanges = mongockTemplate.findOne(permissionGroupQuery, PermissionGroup.class);
+
+ // Give read permission to instanceAdminPg to all the users who have been assigned this permission group
+ Map<String, Policy> readPermissionGroupPolicyMap = Map.of(
+ READ_PERMISSION_GROUPS.getValue(),
+ Policy.builder()
+ .permission(READ_PERMISSION_GROUPS.getValue())
+ .permissionGroups(Set.of(instanceAdminPGBeforeChanges.getId()))
+ .build()
+ );
+ PermissionGroup instanceAdminPG = policyUtils.addPoliciesToExistingObject(readPermissionGroupPolicyMap, instanceAdminPGBeforeChanges);
+
+ // Now add admin permissions to the tenant
+ Set<Permission> tenantPermissions = TENANT_ADMIN.getPermissions().stream()
+ .map(permission -> new Permission(defaultTenant.getId(), permission))
+ .collect(Collectors.toSet());
+ HashSet<Permission> permissions = new HashSet<>(instanceAdminPG.getPermissions());
+ permissions.addAll(tenantPermissions);
+ instanceAdminPG.setPermissions(permissions);
+ mongockTemplate.save(instanceAdminPG);
+
+ Map<String, Policy> tenantPolicy = policyUtils.generatePolicyFromPermissionGroupForObject(instanceAdminPG, defaultTenant.getId());
+ Tenant updatedTenant = policyUtils.addPoliciesToExistingObject(tenantPolicy, defaultTenant);
+ mongockTemplate.save(updatedTenant);
+ }
+
private void softDeletePluginFromAllWorkspaces(Plugin plugin, MongockTemplate mongockTemplate) {
Query queryToGetNonDeletedWorkspaces = new Query();
queryToGetNonDeletedWorkspaces.fields().include(fieldName(QWorkspace.workspace.id));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepository.java
new file mode 100644
index 000000000000..066149705425
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepository.java
@@ -0,0 +1,6 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.repositories.ce.CustomTenantRepositoryCE;
+
+public interface CustomTenantRepository extends CustomTenantRepositoryCE {
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepositoryImpl.java
new file mode 100644
index 000000000000..6f7539b345e8
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomTenantRepositoryImpl.java
@@ -0,0 +1,15 @@
+package com.appsmith.server.repositories;
+
+import com.appsmith.server.repositories.ce.CustomTenantRepositoryCEImpl;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+
+public class CustomTenantRepositoryImpl extends CustomTenantRepositoryCEImpl implements CustomTenantRepository {
+
+ public CustomTenantRepositoryImpl(ReactiveMongoOperations mongoOperations,
+ MongoConverter mongoConverter,
+ CacheableRepositoryHelper cacheableRepositoryHelper) {
+
+ super(mongoOperations, mongoConverter, cacheableRepositoryHelper);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/TenantRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/TenantRepository.java
index 1f26763ebfd9..be31843358b0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/TenantRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/TenantRepository.java
@@ -4,5 +4,5 @@
import org.springframework.stereotype.Repository;
@Repository
-public interface TenantRepository extends TenantRepositoryCE {
+public interface TenantRepository extends TenantRepositoryCE, CustomTenantRepository {
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCE.java
new file mode 100644
index 000000000000..d6b7af32903c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCE.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.repositories.ce;
+
+import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.repositories.AppsmithRepository;
+
+public interface CustomTenantRepositoryCE extends AppsmithRepository<Tenant> {
+
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCEImpl.java
new file mode 100644
index 000000000000..aab12c7ae1d7
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomTenantRepositoryCEImpl.java
@@ -0,0 +1,18 @@
+package com.appsmith.server.repositories.ce;
+
+import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+
+@Slf4j
+public class CustomTenantRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Tenant> implements CustomTenantRepositoryCE {
+
+ public CustomTenantRepositoryCEImpl(ReactiveMongoOperations mongoOperations,
+ MongoConverter mongoConverter,
+ CacheableRepositoryHelper cacheableRepositoryHelper) {
+ super(mongoOperations, mongoConverter, cacheableRepositoryHelper);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/TenantRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/TenantRepositoryCE.java
index cc321a3df85b..700ab3c1332c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/TenantRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/TenantRepositoryCE.java
@@ -1,10 +1,11 @@
package com.appsmith.server.repositories.ce;
import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.domains.TenantConfiguration;
import com.appsmith.server.repositories.BaseRepository;
import reactor.core.publisher.Mono;
-public interface TenantRepositoryCE extends BaseRepository<Tenant, String> {
+public interface TenantRepositoryCE extends BaseRepository<Tenant, String>, CustomTenantRepositoryCE {
Mono<Tenant> findBySlug(String slug);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java
index 80377d6db27a..ce6e9966bf72 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java
@@ -2,12 +2,22 @@
import com.appsmith.server.repositories.TenantRepository;
import com.appsmith.server.services.ce.TenantServiceCEImpl;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.stereotype.Service;
+import reactor.core.scheduler.Scheduler;
+
+import javax.validation.Validator;
@Service
-public class TenantServiceImpl extends TenantServiceCEImpl implements TenantService{
-
- public TenantServiceImpl(TenantRepository tenantRepository) {
- super(tenantRepository);
+public class TenantServiceImpl extends TenantServiceCEImpl implements TenantService {
+
+ public TenantServiceImpl(Scheduler scheduler,
+ Validator validator,
+ MongoConverter mongoConverter,
+ ReactiveMongoTemplate reactiveMongoTemplate,
+ TenantRepository repository,
+ AnalyticsService analyticsService) {
+ super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
index c353fdd594f3..f95cdb7e4efc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
@@ -48,7 +48,7 @@ public Mono<Config> getByName(String name) {
return repository.findByName(name)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.CONFIG, name)));
}
-
+
@Override
public Mono<Config> updateByName(Config config) {
final String name = config.getName();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCE.java
index f5f7ba900662..3ad0c45ff5bc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCE.java
@@ -1,9 +1,22 @@
package com.appsmith.server.services.ce;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.services.CrudService;
import reactor.core.publisher.Mono;
-public interface TenantServiceCE {
+public interface TenantServiceCE extends CrudService<Tenant, String> {
Mono<String> getDefaultTenantId();
+ Mono<Tenant> updateTenantConfiguration(String tenantId, TenantConfiguration tenantConfiguration);
+
+ Mono<Tenant> findById(String tenantId, AclPermission permission);
+
+ /*
+ * For now, returning an empty tenantConfiguration object in this class. Will enhance this function once we
+ * start saving other pertinent environment variables in the tenant collection
+ */
+ Mono<TenantConfiguration> getTenantConfiguration();
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
index fd29208f19b7..db2152f650c0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java
@@ -1,19 +1,37 @@
package com.appsmith.server.services.ce;
+import com.appsmith.external.helpers.AppsmithBeanUtils;
+import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.repositories.TenantRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.BaseService;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.util.StringUtils;
import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
-public class TenantServiceCEImpl implements TenantServiceCE {
+import javax.validation.Validator;
- private final TenantRepository tenantRepository;
+import static com.appsmith.server.acl.AclPermission.MANAGE_TENANT;
+
+public class TenantServiceCEImpl extends BaseService<TenantRepository, Tenant, String> implements TenantServiceCE {
private String tenantId = null;
- public TenantServiceCEImpl(TenantRepository tenantRepository) {
- this.tenantRepository = tenantRepository;
+ public TenantServiceCEImpl(Scheduler scheduler,
+ Validator validator,
+ MongoConverter mongoConverter,
+ ReactiveMongoTemplate reactiveMongoTemplate,
+ TenantRepository repository,
+ AnalyticsService analyticsService) {
+
+ super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
}
@Override
@@ -24,7 +42,7 @@ public Mono<String> getDefaultTenantId() {
return Mono.just(tenantId);
}
- return tenantRepository.findBySlug(FieldName.DEFAULT)
+ return repository.findBySlug(FieldName.DEFAULT)
.map(Tenant::getId)
.map(tenantId -> {
// Set the cache value before returning.
@@ -33,4 +51,32 @@ public Mono<String> getDefaultTenantId() {
});
}
+ @Override
+ public Mono<Tenant> updateTenantConfiguration(String tenantId, TenantConfiguration tenantConfiguration) {
+ return repository.findById(tenantId, MANAGE_TENANT)
+ .flatMap(tenant -> {
+ TenantConfiguration oldtenantConfiguration = tenant.getTenantConfiguration();
+ if (oldtenantConfiguration == null) {
+ oldtenantConfiguration = new TenantConfiguration();
+ }
+ AppsmithBeanUtils.copyNestedNonNullProperties(tenantConfiguration, oldtenantConfiguration);
+ tenant.setTenantConfiguration(oldtenantConfiguration);
+ return repository.updateById(tenantId, tenant, MANAGE_TENANT);
+ });
+ }
+
+ @Override
+ public Mono<Tenant> findById(String tenantId, AclPermission permission) {
+ return repository.findById(tenantId, permission)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "tenantId", tenantId)));
+ }
+
+ /*
+ * For now, returning an empty tenantConfiguration object in this class. Will enhance this function once we
+ * start saving other pertinent environment variables in the tenant collection
+ */
+ @Override
+ public Mono<TenantConfiguration> getTenantConfiguration() {
+ return Mono.just(new TenantConfiguration());
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
index c8c2cf014ccb..2f55785296f8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
@@ -77,6 +77,7 @@
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MAX_LENGTH;
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MIN_LENGTH;
import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
+import static java.lang.Boolean.TRUE;
@Slf4j
public class UserServiceCEImpl extends BaseService<UserRepository, User, String> implements UserServiceCE {
@@ -256,13 +257,16 @@ public Mono<Boolean> forgotPasswordTokenGenerate(ResetUserPasswordDTO resetUserP
log.debug("Password reset url for email: {}: {}", passwordResetToken.getEmail(), resetUrl);
- Map<String, String> params = Map.of("resetUrl", resetUrl);
- return emailSender.sendMail(
- email,
- "Appsmith Password Reset",
- FORGOT_PASSWORD_EMAIL_TEMPLATE,
- params
- );
+ Map<String, String> params = new HashMap<>();
+ params.put("resetUrl", resetUrl);
+
+ return updateTenantLogoInParams(params)
+ .then(emailSender.sendMail(
+ email,
+ "Appsmith Password Reset",
+ FORGOT_PASSWORD_EMAIL_TEMPLATE,
+ params
+ ));
})
.thenReturn(true);
}
@@ -320,7 +324,7 @@ public Mono<Boolean> verifyPasswordResetToken(String encryptedToken) {
* This function can only be called via the forgot password route.
*
* @param encryptedToken The one-time token provided to the user for resetting the password
- * @param user The user object that contains the email & password fields in order to save the new password for the user
+ * @param user The user object that contains the email & password fields in order to save the new password for the user
* @return
*/
@Override
@@ -560,9 +564,8 @@ public Mono<User> sendWelcomeEmail(User user, String originHeader) {
Map<String, String> params = new HashMap<>();
params.put("firstName", user.getName());
params.put("inviteUrl", originHeader);
- return emailSender
+ Mono<User> emailMono = emailSender
.sendMail(user.getEmail(), "Welcome to Appsmith", WELCOME_USER_EMAIL_TEMPLATE, params)
- .thenReturn(user)
.onErrorResume(error -> {
// Swallowing this exception because we don't want this to affect the rest of the flow.
log.error(
@@ -570,8 +573,12 @@ public Mono<User> sendWelcomeEmail(User user, String originHeader) {
user.getEmail(),
Exceptions.unwrap(error)
);
- return Mono.just(user);
- });
+ return Mono.just(TRUE);
+ })
+ .thenReturn(user);
+
+ return updateTenantLogoInParams(params)
+ .then(Mono.defer(() -> emailMono));
}
@Override
@@ -662,7 +669,8 @@ public Mono<List<User>> inviteUsers(InviteUsersDTO inviteUsersDTO, String origin
"Appsmith: You have been added to a new workspace",
USER_ADDED_TO_WORKSPACE_EMAIL_TEMPLATE, params);
- return emailMono
+ return updateTenantLogoInParams(params)
+ .then(Mono.defer(() -> emailMono))
.thenReturn(existingUser);
})
.switchIfEmpty(createNewUserAndSendInviteEmail(username, originHeader, workspace, currentUser, permissionGroup.getName()));
@@ -724,7 +732,8 @@ private Mono<? extends User> createNewUserAndSendInviteEmail(String email, Strin
Mono<Boolean> emailMono = emailSender.sendMail(createdUser.getEmail(), "Invite for Appsmith", INVITE_USER_EMAIL_TEMPLATE, params);
// We have sent out the emails. Just send back the saved user.
- return emailMono
+ return updateTenantLogoInParams(params)
+ .then(Mono.defer(() -> emailMono))
.thenReturn(createdUser);
});
}
@@ -864,4 +873,8 @@ private EmailTokenDTO parseValueFromEncryptedToken(String encryptedToken) {
public Flux<User> getAllByEmails(Set<String> emails, AclPermission permission) {
return repository.findAllByEmails(emails);
}
+
+ protected Mono<Map<String, String>> updateTenantLogoInParams(Map<String, String> params) {
+ return Mono.just(params);
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EnvManagerImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EnvManagerImpl.java
index 176f92f6e7f0..0736a29e3cfd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EnvManagerImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EnvManagerImpl.java
@@ -7,13 +7,16 @@
import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.helpers.UserUtils;
import com.appsmith.server.notifications.EmailSender;
+import com.appsmith.server.repositories.TenantRepository;
import com.appsmith.server.repositories.UserRepository;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.PermissionGroupService;
import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.TenantService;
import com.appsmith.server.services.UserService;
import com.appsmith.server.solutions.ce.EnvManagerCEImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.stereotype.Component;
@@ -35,10 +38,11 @@ public EnvManagerImpl(SessionUserService sessionUserService,
FileUtils fileUtils,
PermissionGroupService permissionGroupService,
ConfigService configService,
- UserUtils userUtils) {
+ UserUtils userUtils,
+ TenantService tenantService) {
- super(sessionUserService, userService, analyticsService, userRepository, policyUtils, emailSender, commonConfig,
- emailConfig, javaMailSender, googleRecaptchaConfig, fileUtils, permissionGroupService, configService,
- userUtils);
+ super(sessionUserService, userService, analyticsService, userRepository, policyUtils, emailSender, commonConfig,
+ emailConfig, javaMailSender, googleRecaptchaConfig, fileUtils, permissionGroupService, configService,
+ userUtils, tenantService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
index cb693e666969..1d5554739abf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java
@@ -27,4 +27,5 @@ public interface EnvManagerCE {
Mono<Boolean> sendTestEmail(TestEmailConfigRequestDTO requestDTO);
Mono<Void> download(ServerWebExchange exchange);
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
index aa8b85963862..7f0787af93b0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
@@ -6,11 +6,14 @@
import com.appsmith.server.configurations.GoogleRecaptchaConfig;
import com.appsmith.server.constants.EnvVariables;
import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.domains.TenantConfiguration;
import com.appsmith.server.domains.User;
import com.appsmith.server.dtos.EnvChangesResponseDTO;
import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.FileUtils;
import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.helpers.TextUtils;
@@ -22,7 +25,12 @@
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.PermissionGroupService;
import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.TenantService;
import com.appsmith.server.services.UserService;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ClassPathResource;
@@ -44,10 +52,12 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -59,6 +69,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static com.appsmith.server.acl.AclPermission.MANAGE_TENANT;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_ADMIN_EMAILS;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_DISABLE_TELEMETRY;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_INSTANCE_NAME;
@@ -101,6 +112,10 @@ public class EnvManagerCEImpl implements EnvManagerCE {
private final UserUtils userUtils;
+ private final TenantService tenantService;
+
+ private final ObjectMapper objectMapper;
+
/**
* This regex pattern matches environment variable declarations like `VAR_NAME=value` or `VAR_NAME="value"` or just
* `VAR_NAME=`. It also defines two named capture groups, `name` and `value`, for the variable's name and value
@@ -127,7 +142,8 @@ public EnvManagerCEImpl(SessionUserService sessionUserService,
FileUtils fileUtils,
PermissionGroupService permissionGroupService,
ConfigService configService,
- UserUtils userUtils) {
+ UserUtils userUtils,
+ TenantService tenantService) {
this.sessionUserService = sessionUserService;
this.userService = userService;
@@ -143,6 +159,9 @@ public EnvManagerCEImpl(SessionUserService sessionUserService,
this.permissionGroupService = permissionGroupService;
this.configService = configService;
this.userUtils = userUtils;
+ this.tenantService = tenantService;
+ this.objectMapper = new ObjectMapper();
+ this.objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
}
/**
@@ -157,7 +176,12 @@ public EnvManagerCEImpl(SessionUserService sessionUserService,
@Override
public List<String> transformEnvContent(String envContent, Map<String, String> changes) {
final Set<String> variablesNotInWhitelist = new HashSet<>(changes.keySet());
+ final Set<String> tenantConfigWhitelist = allowedTenantConfiguration();
+
+ // We remove all the variables that aren't defined in our env variable whitelist or in the TenantConfiguration
+ // class. This is because the configuration can be saved either in the .env file or the tenant collection
variablesNotInWhitelist.removeAll(VARIABLE_WHITELIST);
+ variablesNotInWhitelist.removeAll(tenantConfigWhitelist);
if (!variablesNotInWhitelist.isEmpty()) {
throw new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS);
@@ -264,10 +288,64 @@ private Mono<Void> validateChanges(User user, Map<String, String> changes) {
return Mono.empty();
}
+ /**
+ * This function returns a set of String based on the JsonProperty annotations in the TenantConfiguration class
+ *
+ * @return
+ */
+ private Set<String> allowedTenantConfiguration() {
+ Field[] fields = TenantConfiguration.class.getDeclaredFields();
+ return Arrays.stream(fields)
+ .map(field -> {
+ JsonProperty jsonProperty = field.getDeclaredAnnotation(JsonProperty.class);
+ return jsonProperty.value();
+ }).collect(Collectors.toSet());
+ }
+
+ /**
+ * This function sets the value in the TenantConfiguration object based on the JsonProperty annotation of the field
+ * The key must be exactly equal to the json annotation
+ *
+ * @param tenantConfiguration
+ * @param key
+ * @param value
+ */
+ private void setConfigurationByKey(TenantConfiguration tenantConfiguration, String key, String value) {
+ Field[] fields = tenantConfiguration.getClass().getDeclaredFields();
+ for (Field field : fields) {
+ JsonProperty jsonProperty = field.getDeclaredAnnotation(JsonProperty.class);
+ if (jsonProperty != null && jsonProperty.value().equals(key)) {
+ try {
+ field.setAccessible(true);
+ field.set(tenantConfiguration, value);
+ } catch (IllegalAccessException e) {
+ // Catch the error, log it and then do nothing.
+ log.error("Got error while parsing the JSON annotations from TenantConfiguration class. Cause: ", e);
+ }
+ }
+ }
+ }
+
+
+ private Mono<Tenant> updateTenantConfiguration(String tenantId, Map<String, String> changes) {
+ TenantConfiguration tenantConfiguration = new TenantConfiguration();
+ // Write the changes to the tenant collection in configuration field
+ return Flux.fromStream(changes.entrySet().stream())
+ .map(map -> {
+ String key = map.getKey();
+ String value = map.getValue();
+ setConfigurationByKey(tenantConfiguration, key, value);
+ return map;
+ })
+ .then(Mono.just(tenantConfiguration))
+ .flatMap(updatedTenantConfig -> tenantService.updateTenantConfiguration(tenantId, tenantConfiguration));
+ }
+
@Override
public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
- return verifyCurrentUserIsSuper()
- .flatMap(user -> validateChanges(user, changes).thenReturn(user))
+ // This flow is pertinent for any variables that need to change in the .env file or be saved in the tenant configuration
+ return verifyCurrentUserIsSuper().
+ flatMap(user -> validateChanges(user, changes).thenReturn(user))
.flatMap(user -> {
// Write the changes to the env file.
final String originalContent;
@@ -289,7 +367,12 @@ public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
return Mono.error(e);
}
- return sendAnalyticsEvent(user, originalVariables, changes).thenReturn(originalVariables);
+ // For configuration variables, save the variables to the config collection instead of .env file
+ // We ideally want to migrate all variables from .env file to the config collection for better scalability
+ // Write the changes to the tenant collection in configuration field
+ return updateTenantConfiguration(user.getTenantId(), changes)
+ .then(sendAnalyticsEvent(user, originalVariables, changes))
+ .thenReturn(originalVariables);
})
.flatMap(originalValues -> {
Mono<Void> dependentTasks = Mono.empty();
@@ -499,12 +582,28 @@ public Mono<Map<String, String>> getAll() {
// set the default values to response
Map<String, String> envKeyValueMap = parseToMap(originalContent);
+
if (!envKeyValueMap.containsKey(APPSMITH_INSTANCE_NAME.name())) {
// no APPSMITH_INSTANCE_NAME set in env file, set the default value
envKeyValueMap.put(APPSMITH_INSTANCE_NAME.name(), commonConfig.getInstanceName());
}
- return Mono.justOrEmpty(envKeyValueMap);
+ // Add the variables from the tenant configuration to be returned to the client
+ Mono<Tenant> tenantMono = tenantService.findById(user.getTenantId(), MANAGE_TENANT);
+
+ return Mono.zip(Mono.justOrEmpty(envKeyValueMap), tenantMono)
+ .map(tuple -> {
+ Map<String, String> envFileMap = tuple.getT1();
+ Tenant tenant = tuple.getT2();
+ Map<String, String> configMap = objectMapper.convertValue(tenant.getTenantConfiguration(), new TypeReference<>() {
+ });
+ Map<String, String> envMap = new HashMap<>();
+ envMap.putAll(envFileMap);
+ if (!CollectionUtils.isNullOrEmpty(configMap)) {
+ envMap.putAll(configMap);
+ }
+ return envMap;
+ });
});
}
@@ -513,7 +612,7 @@ public Mono<User> verifyCurrentUserIsSuper() {
return userUtils.isCurrentUserSuperUser()
.flatMap(isSuperUser -> {
- if(isSuperUser) {
+ if (isSuperUser) {
return sessionUserService.getCurrentUser();
} else {
return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS));
diff --git a/app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html b/app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html
index e1a6f7d0ea58..b62a7f7cbefd 100644
--- a/app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html
+++ b/app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html
@@ -33,6 +33,7 @@
img {
-ms-interpolation-mode: bicubic;
}
+
</style>
<![endif]-->
<style type="text/css">
@@ -130,6 +131,7 @@
margin-right: 0 !important;
}
}
+
</style>
<!--user entered Head Start--><!--End Head user entered-->
</head>
@@ -189,7 +191,7 @@
width="150" alt=""
data-proportionally-constrained="true"
data-responsive="true"
- src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+ src="https://assets.appsmith.com/appsmith-logo-full.png"></a>
</td>
</tr>
</tbody>
diff --git a/app/server/appsmith-server/src/main/resources/email/inviteExistingUserToWorkspaceTemplate.html b/app/server/appsmith-server/src/main/resources/email/inviteExistingUserToWorkspaceTemplate.html
index a891943fd787..acde9c0443fa 100644
--- a/app/server/appsmith-server/src/main/resources/email/inviteExistingUserToWorkspaceTemplate.html
+++ b/app/server/appsmith-server/src/main/resources/email/inviteExistingUserToWorkspaceTemplate.html
@@ -33,6 +33,7 @@
img {
-ms-interpolation-mode: bicubic;
}
+
</style>
<![endif]-->
<style type="text/css">
@@ -130,6 +131,7 @@
margin-right: 0 !important;
}
}
+
</style>
<!--user entered Head Start--><!--End Head user entered-->
</head>
@@ -189,7 +191,7 @@
width="150" alt=""
data-proportionally-constrained="true"
data-responsive="true"
- src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+ src="https://assets.appsmith.com/appsmith-logo-full.png"></a>
</td>
</tr>
</tbody>
diff --git a/app/server/appsmith-server/src/main/resources/email/inviteUserCreatorTemplate.html b/app/server/appsmith-server/src/main/resources/email/inviteUserCreatorTemplate.html
index 55935f993119..a82be6dd72a0 100644
--- a/app/server/appsmith-server/src/main/resources/email/inviteUserCreatorTemplate.html
+++ b/app/server/appsmith-server/src/main/resources/email/inviteUserCreatorTemplate.html
@@ -33,6 +33,7 @@
img {
-ms-interpolation-mode: bicubic;
}
+
</style>
<![endif]-->
<style type="text/css">
@@ -130,6 +131,7 @@
margin-right: 0 !important;
}
}
+
</style>
<!--user entered Head Start--><!--End Head user entered-->
</head>
@@ -189,7 +191,7 @@
width="150" alt=""
data-proportionally-constrained="true"
data-responsive="true"
- src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+ src="https://assets.appsmith.com/appsmith-logo-full.png"></a>
</td>
</tr>
</tbody>
diff --git a/app/server/appsmith-server/src/main/resources/email/updateRoleExistingUserTemplate.html b/app/server/appsmith-server/src/main/resources/email/updateRoleExistingUserTemplate.html
index 04756c61f14f..cd3974faaa94 100644
--- a/app/server/appsmith-server/src/main/resources/email/updateRoleExistingUserTemplate.html
+++ b/app/server/appsmith-server/src/main/resources/email/updateRoleExistingUserTemplate.html
@@ -33,6 +33,7 @@
img {
-ms-interpolation-mode: bicubic;
}
+
</style>
<![endif]-->
<style type="text/css">
@@ -130,6 +131,7 @@
margin-right: 0 !important;
}
}
+
</style>
<!--user entered Head Start--><!--End Head user entered-->
</head>
@@ -189,7 +191,7 @@
width="150" alt=""
data-proportionally-constrained="true"
data-responsive="true"
- src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+ src="https://assets.appsmith.com/appsmith-logo-full.png"></a>
</td>
</tr>
</tbody>
diff --git a/app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html b/app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html
index 4ae1d91eaaa0..fc932d5ed833 100644
--- a/app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html
+++ b/app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html
@@ -1,25 +1,25 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html data-editor-version="2" class="sg-campaigns"
- xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
- <!--[if !mso]>
- <!-->
- <meta http-equiv="X-UA-Compatible" content="IE=Edge">
- <!--
-
- <![endif]-->
- <!--[if (gte mso 9)|(IE)]>
- <xml>
- <o:OfficeDocumentSettings>
- <o:AllowPNG/>
- <o:PixelsPerInch>96</o:PixelsPerInch>
- </o:OfficeDocumentSettings>
- </xml>
- <![endif]-->
- <!--[if (gte mso 9)|(IE)]>
- <style type="text/css">
+ xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
+ <!--[if !mso]>
+ <!-->
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+ <!--
+
+ <![endif]-->
+ <!--[if (gte mso 9)|(IE)]>
+ <xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+ </xml>
+ <![endif]-->
+ <!--[if (gte mso 9)|(IE)]>
+ <style type="text/css">
body {
width: 600px;
margin: 0 auto;
@@ -34,9 +34,10 @@
img {
-ms-interpolation-mode: bicubic;
}
- </style>
- <![endif]-->
- <style type="text/css">
+
+ </style>
+ <![endif]-->
+ <style type="text/css">
body, p, div {
font-family: arial, helvetica, sans-serif;
font-size: 14px;
@@ -115,28 +116,29 @@
margin-right: 0 !important;
}
}
- </style>
- <!--user entered Head Start-->
- <!--End Head user entered-->
- </head>
- <body>
- <p> </p>
- <p> </p>
- <!-- [if !mso]>
- <!-->
- <!--
-
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <xml>
- <o:OfficeDocumentSettings>
- <o:AllowPNG/>
- <o:PixelsPerInch>96</o:PixelsPerInch>
- </o:OfficeDocumentSettings>
- </xml>
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <style type="text/css">
+
+ </style>
+ <!--user entered Head Start-->
+ <!--End Head user entered-->
+</head>
+<body>
+<p> </p>
+<p> </p>
+<!-- [if !mso]>
+<!-->
+<!--
+
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+</xml>
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<style type="text/css">
body {
width: 600px;
margin: 0 auto;
@@ -151,25 +153,26 @@
img {
-ms-interpolation-mode: bicubic;
}
- </style>
- <![endif]-->
- <!--user entered Head Start-->
- <!--End Head user entered-->
- <!-- [if !mso]>
- <!-->
- <!--
-
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <xml>
- <o:OfficeDocumentSettings>
- <o:AllowPNG/>
- <o:PixelsPerInch>96</o:PixelsPerInch>
- </o:OfficeDocumentSettings>
- </xml>
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <style type="text/css">
+
+</style>
+<![endif]-->
+<!--user entered Head Start-->
+<!--End Head user entered-->
+<!-- [if !mso]>
+<!-->
+<!--
+
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+</xml>
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<style type="text/css">
body {
width: 600px;
margin: 0 auto;
@@ -184,25 +187,26 @@
img {
-ms-interpolation-mode: bicubic;
}
- </style>
- <![endif]-->
- <!--user entered Head Start-->
- <!--End Head user entered-->
- <!-- [if !mso]>
- <!-->
- <!--
-
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <xml>
- <o:OfficeDocumentSettings>
- <o:AllowPNG/>
- <o:PixelsPerInch>96</o:PixelsPerInch>
- </o:OfficeDocumentSettings>
- </xml>
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <style type="text/css">
+
+</style>
+<![endif]-->
+<!--user entered Head Start-->
+<!--End Head user entered-->
+<!-- [if !mso]>
+<!-->
+<!--
+
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+</xml>
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<style type="text/css">
body {
width: 600px;
margin: 0 auto;
@@ -220,26 +224,27 @@
img {
-ms-interpolation-mode: bicubic;
}
- </style>
- <![endif]-->
- <!--user entered Head Start-->
- <!--End Head user entered-->
- <!-- [if !mso]>
- <!-->
- <!--
-
- <![endif]-->
- <!-- [if (gte mso 9)|(IE)]>
- <xml>
- <o:OfficeDocumentSettings>
- <o:AllowPNG/>
- <o:PixelsPerInch>96</o:PixelsPerInch>
- </o:OfficeDocumentSettings>
- </xml>
- <![endif]-->
- <p> </p>
- <!-- [if (gte mso 9)|(IE)]>
- <style type="text/css">
+
+</style>
+<![endif]-->
+<!--user entered Head Start-->
+<!--End Head user entered-->
+<!-- [if !mso]>
+<!-->
+<!--
+
+<![endif]-->
+<!-- [if (gte mso 9)|(IE)]>
+<xml>
+ <o:OfficeDocumentSettings>
+ <o:AllowPNG/>
+ <o:PixelsPerInch>96</o:PixelsPerInch>
+ </o:OfficeDocumentSettings>
+</xml>
+<![endif]-->
+<p> </p>
+<!-- [if (gte mso 9)|(IE)]>
+<style type="text/css">
body {
width: 600px;
margin: 0 auto;
@@ -257,65 +262,91 @@
img {
-ms-interpolation-mode: bicubic;
}
- </style>
- <![endif]-->
- <!--user entered Head Start-->
- <!--End Head user entered-->
- <center class="wrapper" data-link-color="#1188E6" data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
- <div class="webkit">
- <table class="wrapper" border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
- <tbody>
- <tr>
- <td valign="top" bgcolor="#FFFFFF" width="100%">
- <table class="outer" role="content-container" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
- <tbody>
- <tr>
- <td width="100%">
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tbody>
- <tr>
- <td>
- <!-- [if mso]>
- <center>
- <table>
- <tr>
- <td width="600">
- <![endif]-->
- <table style="width: 100%; max-width: 600px;" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
- <tbody>
- <tr>
- <td style="padding: 0; color: #000000; text-align: left;" role="modules-container" align="left" bgcolor="#ffffff" width="100%">
- <table class="module preheader preheader-hide" style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;" role="module" border="0" width="100%" cellspacing="0" cellpadding="0" data-type="preheader">
- <tbody>
- <tr>
- <td role="module-content"> </td>
- </tr>
- </tbody>
- </table>
- <table class="wrapper" style="table-layout: fixed;" role="module" border="0" width="100%" cellspacing="0" cellpadding="0" data-type="image" data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
- <tbody>
- <tr>
- <td style="font-size: 6px; line-height: 10px; padding: 0;" align="center" valign="top">
- <a href="https://www.appsmith.com/">
- <img class="max-width" style="display: block; color: #000000; text-decoration: none; font-family: Helvetica, arial, sans-serif; font-size: 16px; max-width: 25% !important; width: 25%; height: auto !important;" src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png" alt="" width="150" border="0" data-proportionally-constrained="true" data-responsive="true" />
- </a>
- </td>
- </tr>
- </tbody>
- </table>
- <table class="module" style="table-layout: fixed;" role="module" border="0" width="100%" cellspacing="0" cellpadding="0" data-type="text" data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a" data-mc-module-version="2019-10-22">
- <tbody>
- <tr>
- <td style="padding: 0 0 18px; line-height: 22px; text-align: inherit; background-color: #ffffff;" role="module-content" valign="top" bgcolor="#ffffff" height="100%">
- <div>
- <div style="font-family: inherit; text-align: inherit; margin-left: 0;">
- <span style="font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959; margin: 0;">👋 Hi</span>
- </div>
- <div style="font-family: inherit; text-align: start;"> </div>
- </div>
- <div>
- <div>
- <div style="font-family: inherit; text-align: start;">
+
+</style>
+<![endif]-->
+<!--user entered Head Start-->
+<!--End Head user entered-->
+<center class="wrapper" data-link-color="#1188E6"
+ data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
+ <div class="webkit">
+ <table class="wrapper" border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
+ <tbody>
+ <tr>
+ <td valign="top" bgcolor="#FFFFFF" width="100%">
+ <table class="outer" role="content-container" border="0" width="100%" cellspacing="0"
+ cellpadding="0" align="center">
+ <tbody>
+ <tr>
+ <td width="100%">
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr>
+ <td>
+ <!-- [if mso]>
+ <center>
+ <table>
+ <tr>
+ <td width="600">
+ <![endif]-->
+ <table style="width: 100%; max-width: 600px;" border="0" width="100%"
+ cellspacing="0" cellpadding="0" align="center">
+ <tbody>
+ <tr>
+ <td style="padding: 0; color: #000000; text-align: left;"
+ role="modules-container" align="left" bgcolor="#ffffff"
+ width="100%">
+ <table class="module preheader preheader-hide"
+ style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;"
+ role="module" border="0" width="100%" cellspacing="0"
+ cellpadding="0" data-type="preheader">
+ <tbody>
+ <tr>
+ <td role="module-content"> </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="wrapper" style="table-layout: fixed;"
+ role="module" border="0" width="100%" cellspacing="0"
+ cellpadding="0" data-type="image"
+ data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
+ <tbody>
+ <tr>
+ <td style="font-size: 6px; line-height: 10px; padding: 0;"
+ align="center" valign="top">
+ <a href="https://www.appsmith.com/">
+ <img class="max-width"
+ style="display: block; color: #000000; text-decoration: none; font-family: Helvetica, arial, sans-serif; font-size: 16px; max-width: 25% !important; width: 25%; height: auto !important;"
+ src="https://assets.appsmith.com/appsmith-logo-full.png"
+ alt="" width="150" border="0"
+ data-proportionally-constrained="true"
+ data-responsive="true"/>
+ </a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="module" style="table-layout: fixed;" role="module"
+ border="0" width="100%" cellspacing="0" cellpadding="0"
+ data-type="text"
+ data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a"
+ data-mc-module-version="2019-10-22">
+ <tbody>
+ <tr>
+ <td style="padding: 0 0 18px; line-height: 22px; text-align: inherit; background-color: #ffffff;"
+ role="module-content" valign="top" bgcolor="#ffffff"
+ height="100%">
+ <div>
+ <div style="font-family: inherit; text-align: inherit; margin-left: 0;">
+ <span style="font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959; margin: 0;">👋 Hi</span>
+ </div>
+ <div style="font-family: inherit; text-align: start;">
+
+ </div>
+ </div>
+ <div>
+ <div>
+ <div style="font-family: inherit; text-align: start;">
<span style="font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959; margin: 0;">Welcome to appsmith! You're now part of a developer community using appsmith to save
<strong>
@@ -323,109 +354,129 @@
</strong> building internal tools!
</span>
- <span style="color: #5c5959; font-family: 'lucida sans unicode', 'lucida grande', sans-serif;">🎉</span>
- </div>
- </div>
- </div>
- <div>
- <div>
- <div>
- <div style="font-family: inherit; text-align: inherit;"> </div>
- <div style="font-family: inherit; text-align: left;">
+ <span style="color: #5c5959; font-family: 'lucida sans unicode', 'lucida grande', sans-serif;">🎉</span>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div>
+ <div>
+ <div style="font-family: inherit; text-align: inherit;">
+
+ </div>
+ <div style="font-family: inherit; text-align: left;">
<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959;">If you'd like some help getting started, I'd be happy to get on a call & walk you through building your first app!
<a href="http://bit.ly/appsmith-live-demo">Schedule a Call</a>
</span>
-
- <span style="font-family: inherit;">📅 </span>
- </div>
- </div>
- </div>
- </div>
- <div>
- <div>
- <div style="font-family: inherit; text-align: left;">
- <br />
- <p> </p>
- </div>
- </div>
- </div>
- <div>
- <div style="font-family: inherit; text-align: left;">
- <p>
- <span class="emoji">🤪</span>
- <span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959;">We're a fun, active group of developers and we'd love for you to join us on
+
+ <span style="font-family: inherit;">📅 </span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div>
+ <div style="font-family: inherit; text-align: left;">
+ <br/>
+ <p> </p>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div style="font-family: inherit; text-align: left;">
+ <p>
+ <span class="emoji">🤪</span>
+ <span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #5c5959;">We're a fun, active group of developers and we'd love for you to join us on
<a href="http://bit.ly/appsmith-discord">Discord</a>
</span>
- </p>
- </div>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- <table class="module" style="table-layout: fixed;" role="module" border="0" width="100%" cellspacing="0" cellpadding="0" data-role="module-button" data-type="button" data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
- <tbody>
- <tr>
- <td class="outer-td" style="padding: 0;" align="center" bgcolor="">
- <table class="wrapper-mobile" style="text-align: center;" border="0" cellspacing="0" cellpadding="0">
- <tbody>
- <tr>
- <td class="inner-td" style="border-radius: 6px; font-size: 16px; text-align: center; background-color: inherit;" align="center" bgcolor="#ff6d2d">
- <a style="background-color: #ff6d2d; border: 1px solid #ff6d2d; border-radius: 6px; color: #ffffff; display: inline-block; font-weight: 400; letter-spacing: 0; line-height: 6px; padding: 12px 18px; text-align: center; text-decoration: none; font-family: tahoma,geneva,sans-serif; font-size: 16px;" href="{{inviteUrl}}" target="_blank" rel="noopener">Go to Appsmith</a>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- <table class="module" style="table-layout: fixed;" role="module" border="0" width="100%" cellspacing="0" cellpadding="0" data-type="text" data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208" data-mc-module-version="2019-10-22">
- <tbody>
- <tr>
- <td style="padding: 0; line-height: 22px; text-align: inherit;" role="module-content" valign="top" bgcolor="" height="100%">
- <div>
- <div style="font-family: inherit; text-align: start;">
- <span style="box-sizing: border-box; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; vertical-align: baseline; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0; -webkit-text-stroke-width: 0; background-color: #ffffff; text-decoration-style: initial; text-decoration-color: initial; font-size: 14px; padding: 0; margin: 0; border: 0 initial initial;">Cheers</span>
- </div>
- <div style="font-family: inherit; text-align: start;">
- <span style="box-sizing: border-box; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; vertical-align: baseline; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0; -webkit-text-stroke-width: 0; background-color: #ffffff; text-decoration-style: initial; text-decoration-color: initial; font-size: 14px; padding: 0; margin: 0; border: 0 initial initial;">Arpit Mohan</span>
- </div>
- <div style="font-family: inherit; text-align: start;"> </div>
- <!-- <div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: "lucida sans unicode", "lucida grande", sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">P.S:</span><span style="font-size: 14px"></span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: "lucida sans unicode", "lucida grande", sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px">I'll send you a few more emails in the coming days to help you make the most of Appsmith. If you don't want to receive these, hit unsubscribe.</span></div> -->
- <div> </div>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- <!-- <div data-role="module-unsubscribe" class="module" role="module" data-type="unsubscribe" style="color:#444444; font-size:10px; line-height:20px; padding:0px 16px 0px 16px; text-align:center;" data-muid="1c219d7b-fb60-4317-8a55-f9d8bbd8592d"><div class="Unsubscribe--addressLine"></div><p style="font-family:tahoma,geneva,sans-serif; font-size:10px; line-height:20px;"><a class="Unsubscribe--unsubscribeLink" href="{{{unsubscribe}}}" target="_blank" style="">Unsubscribe</a> - <a href="{{{unsubscribe_preferences}}}" target="_blank" class="Unsubscribe--unsubscribePreferences" style="">Unsubscribe Preferences</a></p></div> -->
- </td>
- </tr>
- </tbody>
- </table>
- <!-- [if mso]>
- </td>
- </tr>
- </table>
- </center>
- <![endif]-->
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </center>
- </body>
- </html>
+ </p>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="module" style="table-layout: fixed;" role="module"
+ border="0" width="100%" cellspacing="0" cellpadding="0"
+ data-role="module-button" data-type="button"
+ data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
+ <tbody>
+ <tr>
+ <td class="outer-td" style="padding: 0;" align="center"
+ bgcolor="">
+ <table class="wrapper-mobile"
+ style="text-align: center;" border="0"
+ cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr>
+ <td class="inner-td"
+ style="border-radius: 6px; font-size: 16px; text-align: center; background-color: inherit;"
+ align="center" bgcolor="#ff6d2d">
+ <a style="background-color: #ff6d2d; border: 1px solid #ff6d2d; border-radius: 6px; color: #ffffff; display: inline-block; font-weight: 400; letter-spacing: 0; line-height: 6px; padding: 12px 18px; text-align: center; text-decoration: none; font-family: tahoma,geneva,sans-serif; font-size: 16px;"
+ href="{{inviteUrl}}" target="_blank"
+ rel="noopener">Go to Appsmith</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="module" style="table-layout: fixed;" role="module"
+ border="0" width="100%" cellspacing="0" cellpadding="0"
+ data-type="text"
+ data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208"
+ data-mc-module-version="2019-10-22">
+ <tbody>
+ <tr>
+ <td style="padding: 0; line-height: 22px; text-align: inherit;"
+ role="module-content" valign="top" bgcolor=""
+ height="100%">
+ <div>
+ <div style="font-family: inherit; text-align: start;">
+ <span style="box-sizing: border-box; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; vertical-align: baseline; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0; -webkit-text-stroke-width: 0; background-color: #ffffff; text-decoration-style: initial; text-decoration-color: initial; font-size: 14px; padding: 0; margin: 0; border: 0 initial initial;">Cheers</span>
+ </div>
+ <div style="font-family: inherit; text-align: start;">
+ <span style="box-sizing: border-box; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; vertical-align: baseline; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0; -webkit-text-stroke-width: 0; background-color: #ffffff; text-decoration-style: initial; text-decoration-color: initial; font-size: 14px; padding: 0; margin: 0; border: 0 initial initial;">Arpit Mohan</span>
+ </div>
+ <div style="font-family: inherit; text-align: start;">
+
+ </div>
+ <!-- <div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: "lucida sans unicode", "lucida grande", sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">P.S:</span><span style="font-size: 14px"></span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: "lucida sans unicode", "lucida grande", sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px">I'll send you a few more emails in the coming days to help you make the most of Appsmith. If you don't want to receive these, hit unsubscribe.</span></div> -->
+ <div> </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- <div data-role="module-unsubscribe" class="module" role="module" data-type="unsubscribe" style="color:#444444; font-size:10px; line-height:20px; padding:0px 16px 0px 16px; text-align:center;" data-muid="1c219d7b-fb60-4317-8a55-f9d8bbd8592d"><div class="Unsubscribe--addressLine"></div><p style="font-family:tahoma,geneva,sans-serif; font-size:10px; line-height:20px;"><a class="Unsubscribe--unsubscribeLink" href="{{{unsubscribe}}}" target="_blank" style="">Unsubscribe</a> - <a href="{{{unsubscribe_preferences}}}" target="_blank" class="Unsubscribe--unsubscribePreferences" style="">Unsubscribe Preferences</a></p></div> -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- [if mso]>
+ </td>
+ </tr>
+ </table>
+ </center>
+ <![endif]-->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</center>
+</body>
+</html>
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java
index 47dcac303248..774591199b97 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java
@@ -15,7 +15,9 @@
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.PermissionGroupService;
import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.TenantService;
import com.appsmith.server.services.UserService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -71,6 +73,9 @@ public class EnvManagerTest {
@MockBean
private UserUtils userUtils;
+ @MockBean
+ private TenantService tenantService;
+
EnvManager envManager;
@BeforeEach
@@ -88,7 +93,8 @@ public void setup() {
fileUtils,
permissionGroupService,
configService,
- userUtils);
+ userUtils,
+ tenantService);
}
@Test
|
89154c56cd9620b74cb9c46589ad324d04145841
|
2024-09-11 14:06:28
|
Hetu Nandu
|
fix: RBAC errors not showing toasts (#36244)
| false
|
RBAC errors not showing toasts (#36244)
|
fix
|
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index a5f88ef14e0d..94f7cfe44d63 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -795,13 +795,19 @@ function* copyActionSaga(
// @ts-expect-error: type mismatch Action vs ActionCreateUpdateResponse
yield put(copyActionSuccess(payload));
- } catch (e) {
+ } catch (e: unknown) {
const actionName = actionObject ? actionObject.name : "";
+ const errorMessage =
+ e instanceof Error
+ ? e.message
+ : createMessage(ERROR_ACTION_COPY_FAIL, actionName);
yield put(
copyActionError({
...action.payload,
show: true,
- error: { message: createMessage(ERROR_ACTION_COPY_FAIL, actionName) },
+ error: {
+ message: errorMessage,
+ },
}),
);
}
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index 3a690ce17ebe..559c0b9d6e9b 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -112,7 +112,16 @@ export function* validateResponse(
}
if (!response.responseMeta && response.status) {
- throw Error(getErrorMessage(response.status, response.resourceType));
+ yield put({
+ type: ReduxActionErrorTypes.API_ERROR,
+ payload: {
+ error: new Error(
+ getErrorMessage(response.status, response.resourceType),
+ ),
+ logToSentry,
+ show,
+ },
+ });
}
if (response.responseMeta.success) {
@@ -218,22 +227,20 @@ export interface ErrorActionPayload {
export function* errorSaga(errorAction: ReduxAction<ErrorActionPayload>) {
const effects = [ErrorEffectTypes.LOG_TO_CONSOLE];
const { payload, type } = errorAction;
- const {
- error,
- logToDebugger,
- logToSentry,
- show = true,
- sourceEntity,
- } = payload || {};
+ const { error, logToDebugger, logToSentry, show, sourceEntity } =
+ payload || {};
const appMode: APP_MODE = yield select(getAppMode);
// "show" means show a toast. We check if the error has been asked to not been shown
- // By making the default behaviour "true" we are ensuring undefined actions still pass through this check
- if (show) {
+ // By checking undefined, undecided actions still pass through this check
+ if (show === undefined) {
// We want to show toasts for certain actions only so we avoid issues or if it is outside edit mode
if (shouldShowToast(type) || appMode !== APP_MODE.EDIT) {
effects.push(ErrorEffectTypes.SHOW_ALERT);
}
+ // If true is passed, show the error no matter what
+ } else if (show) {
+ effects.push(ErrorEffectTypes.SHOW_ALERT);
}
if (logToDebugger) {
|
458715f0acbd5f0e9f8b4abd883ab1b4e20b88d5
|
2022-07-15 12:45:08
|
Ayush Pahwa
|
fix: added default value for switch view type (#15215)
| false
|
added default value for switch view type (#15215)
|
fix
|
diff --git a/app/client/src/components/formControls/utils.test.ts b/app/client/src/components/formControls/utils.test.ts
index d324a1419941..932d16ef935c 100644
--- a/app/client/src/components/formControls/utils.test.ts
+++ b/app/client/src/components/formControls/utils.test.ts
@@ -388,6 +388,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -403,6 +406,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -422,6 +428,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -437,6 +446,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -452,6 +464,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -467,6 +482,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -494,6 +512,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
};
@@ -514,6 +535,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -533,6 +557,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -553,6 +580,9 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -569,6 +599,9 @@ describe("json/form viewTypes test", () => {
componentData: "value2",
jsonData: "value1",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
},
},
},
@@ -588,6 +621,32 @@ describe("json/form viewTypes test", () => {
viewType: ViewTypes.JSON,
componentData: "value2",
},
+ node6: {
+ viewType: ViewTypes.COMPONENT,
+ },
+ },
+ },
+ },
+ {
+ actionConfiguration: {
+ formData: {
+ node1: { data: "value1" },
+ node2: { data: "value1", viewType: ViewTypes.JSON },
+ node3: { data: "value1" },
+ node4: {
+ data: "value1",
+ viewType: ViewTypes.COMPONENT,
+ },
+ node5: {
+ data: "value1",
+ viewType: ViewTypes.JSON,
+ componentData: "value2",
+ },
+ node6: {
+ viewType: ViewTypes.JSON,
+ data: "",
+ componentData: "",
+ },
},
},
},
@@ -613,6 +672,10 @@ describe("json/form viewTypes test", () => {
path: "actionConfiguration.formData.node3.data",
viewType: ViewTypes.JSON,
},
+ {
+ path: "actionConfiguration.formData.node6.data",
+ viewType: ViewTypes.COMPONENT,
+ },
];
testCases.forEach((testCase, index) => {
const formName = `testForm-${index}`;
diff --git a/app/client/src/components/formControls/utils.ts b/app/client/src/components/formControls/utils.ts
index 24f5cc1d4508..4d6be0cc1870 100644
--- a/app/client/src/components/formControls/utils.ts
+++ b/app/client/src/components/formControls/utils.ts
@@ -148,7 +148,7 @@ export const switchViewType = (
);
const jsonData = get(values, pathForJsonData);
const componentData = get(values, pathForComponentData);
- const currentData = get(values, configProperty);
+ const currentData = get(values, configProperty, "");
const stringifiedCurrentData = JSON.stringify(currentData, null, "\t");
if (newViewType === ViewTypes.JSON) {
|
34b7d93a7c1be0faf7f0ef0932831970b98e4bac
|
2023-05-29 10:06:19
|
Aswath K
|
fix: List widget issues in Auto Layout (#23252)
| false
|
List widget issues in Auto Layout (#23252)
|
fix
|
diff --git a/app/client/src/components/designSystems/appsmith/autoLayout/FlexComponent.tsx b/app/client/src/components/designSystems/appsmith/autoLayout/FlexComponent.tsx
index 1da4accef3ea..cc571ec1f14c 100644
--- a/app/client/src/components/designSystems/appsmith/autoLayout/FlexComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/autoLayout/FlexComponent.tsx
@@ -32,6 +32,7 @@ export type AutoLayoutProps = {
parentId?: string;
responsiveBehavior?: ResponsiveBehavior;
selected?: boolean;
+ isResizeDisabled?: boolean;
widgetId: string;
widgetName: string;
widgetType: WidgetType;
@@ -96,14 +97,18 @@ export function FlexComponent(props: AutoLayoutProps) {
}${WIDGET_PADDING}px, ${WIDGET_PADDING}px, 0px)`,
};
const widgetDimensionsEditCss = {
- width: isResizing
- ? "auto"
- : `${props.componentWidth - WIDGET_PADDING * 2 + RESIZE_BORDER_BUFFER}px`,
- height: isResizing
- ? "auto"
- : `${
- props.componentHeight - WIDGET_PADDING * 2 + RESIZE_BORDER_BUFFER
- }px`,
+ width:
+ isResizing && !props.isResizeDisabled
+ ? "auto"
+ : `${
+ props.componentWidth - WIDGET_PADDING * 2 + RESIZE_BORDER_BUFFER
+ }px`,
+ height:
+ isResizing && !props.isResizeDisabled
+ ? "auto"
+ : `${
+ props.componentHeight - WIDGET_PADDING * 2 + RESIZE_BORDER_BUFFER
+ }px`,
margin: WIDGET_PADDING / 2 + "px",
};
const flexComponentStyle: CSSProperties = useMemo(() => {
diff --git a/app/client/src/components/editorComponents/DropTargetComponent.tsx b/app/client/src/components/editorComponents/DropTargetComponent.tsx
index 8743b320df1a..003faaab09f1 100644
--- a/app/client/src/components/editorComponents/DropTargetComponent.tsx
+++ b/app/client/src/components/editorComponents/DropTargetComponent.tsx
@@ -50,6 +50,7 @@ type DropTargetComponentProps = PropsWithChildren<{
useAutoLayout?: boolean;
isMobile?: boolean;
mobileBottomRow?: number;
+ isListWidgetCanvas?: boolean;
}>;
const StyledDropTarget = styled.div`
@@ -105,6 +106,7 @@ function useUpdateRows(
mobileBottomRow?: number,
isMobile?: boolean,
isAutoLayoutActive?: boolean,
+ isListWidgetCanvas?: boolean,
) {
// This gives us the number of rows
const snapRows = getCanvasSnapRows(
@@ -173,7 +175,9 @@ function useUpdateRows(
// in the previous if clause, because, there could be more "dropTargets" updating
// and this information can only be computed using auto height
- updateHeight(dropTargetRef, rowRef.current);
+ if (!isAutoLayoutActive || !isListWidgetCanvas) {
+ updateHeight(dropTargetRef, rowRef.current);
+ }
}
return newRows;
}
@@ -207,6 +211,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
props.mobileBottomRow,
props.isMobile,
isAutoLayoutActive,
+ props.isListWidgetCanvas,
);
// Are we currently resizing?
@@ -253,7 +258,9 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
// If the current ref is not set to the new snaprows we've received (based on bottomRow)
if (rowRef.current !== snapRows && !isDragging && !isResizing) {
rowRef.current = snapRows;
- updateHeight(dropTargetRef, snapRows);
+ if (!isAutoLayoutActive || !props.isListWidgetCanvas) {
+ updateHeight(dropTargetRef, snapRows);
+ }
// If we're done dragging, and the parent has auto height enabled
// It is possible that the auto height has not triggered yet
@@ -270,6 +277,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
props.mobileBottomRow,
props.isMobile,
props.parentId,
+ props.isListWidgetCanvas,
isDragging,
isResizing,
]);
@@ -302,7 +310,7 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
const height = `${rowRef.current * GridDefaults.DEFAULT_GRID_ROW_HEIGHT}px`;
const dropTargetStyles = {
- height,
+ height: props.isListWidgetCanvas ? "auto" : height,
};
const shouldOnboard =
diff --git a/app/client/src/sagas/WidgetBlueprintSagas.test.ts b/app/client/src/sagas/WidgetBlueprintSagas.test.ts
index dc9050158a32..2728b7ab16e4 100644
--- a/app/client/src/sagas/WidgetBlueprintSagas.test.ts
+++ b/app/client/src/sagas/WidgetBlueprintSagas.test.ts
@@ -44,6 +44,7 @@ describe("WidgetBlueprintSagas", () => {
"parentId",
);
+ generator.next();
expect(generator.next().value).toStrictEqual({});
});
});
diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts
index 0d63f46778ee..edb835f1bb93 100644
--- a/app/client/src/sagas/WidgetBlueprintSagas.ts
+++ b/app/client/src/sagas/WidgetBlueprintSagas.ts
@@ -75,6 +75,7 @@ export type BlueprintOperationChildOperationsFn = (
widgetPropertyMaps: {
defaultPropertyMap: Record<string, string>;
},
+ isAutoLayout?: boolean,
) => ChildOperationFnResponse;
export type BlueprintBeforeOperationsFn = (
@@ -156,6 +157,7 @@ export function* executeWidgetBlueprintChildOperations(
let widgets = canvasWidgets,
message;
+ const isAutoLayout: boolean = yield select(getIsAutoLayout);
for (const widgetId of widgetIds) {
// Get the default properties map of the current widget
@@ -171,7 +173,7 @@ export function* executeWidgetBlueprintChildOperations(
({ message: currMessage, widgets } = (
operation.fn as BlueprintOperationChildOperationsFn
- )(widgets, widgetId, parentId, widgetPropertyMaps));
+ )(widgets, widgetId, parentId, widgetPropertyMaps, isAutoLayout));
//set message if one of the widget has any message to show
if (currMessage) message = currMessage;
}
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index 3420cf7342d2..57aaad76dc97 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -577,6 +577,7 @@ abstract class BaseWidget<
}
focused={this.props.focused}
isMobile={this.props.isMobile || false}
+ isResizeDisabled={this.props.resizeDisabled}
parentColumnSpace={this.props.parentColumnSpace}
parentId={this.props.parentId}
renderMode={this.props.renderMode}
diff --git a/app/client/src/widgets/CanvasWidget.tsx b/app/client/src/widgets/CanvasWidget.tsx
index c808fa2613c2..e8d1cce4fd7b 100644
--- a/app/client/src/widgets/CanvasWidget.tsx
+++ b/app/client/src/widgets/CanvasWidget.tsx
@@ -52,6 +52,7 @@ class CanvasWidget extends ContainerWidget {
return (
<DropTargetComponent
bottomRow={this.props.bottomRow}
+ isListWidgetCanvas={this.props.isListWidgetCanvas}
isMobile={this.props.isMobile}
minHeight={this.props.minHeight || CANVAS_DEFAULT_MIN_HEIGHT_PX}
mobileBottomRow={this.props.mobileBottomRow}
diff --git a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
index afa830439d5a..03f1f7991707 100644
--- a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
+++ b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import styled, { css } from "styled-components";
+import styled from "styled-components";
import type { Alignment } from "@blueprintjs/core";
import { Classes } from "@blueprintjs/core";
@@ -28,7 +28,6 @@ export interface InputContainerProps {
valid?: boolean;
optionAlignment?: string;
isDynamicHeightEnabled?: boolean;
- isAutoLayout: boolean;
}
const InputContainer = styled.div<ThemeProp & InputContainerProps>`
@@ -51,11 +50,9 @@ const InputContainer = styled.div<ThemeProp & InputContainerProps>`
height: 100%;
border: 1px solid transparent;
- ${({ isAutoLayout }) =>
- isAutoLayout &&
- css`
- min-width: 232px;
- `}
+ .auto-layout & {
+ min-width: 232px;
+ }
.${Classes.CONTROL} {
display: flex;
@@ -152,14 +149,12 @@ export interface CheckboxGroupComponentProps extends ComponentProps {
labelTooltip?: string;
accentColor: string;
borderRadius: string;
- isAutoLayout: boolean;
}
function CheckboxGroupComponent(props: CheckboxGroupComponentProps) {
const {
accentColor,
borderRadius,
compactMode,
- isAutoLayout,
isDisabled,
isDynamicHeightEnabled,
isInline,
@@ -222,7 +217,6 @@ function CheckboxGroupComponent(props: CheckboxGroupComponentProps) {
<InputContainer
data-testid="checkbox-group-container"
inline={isInline}
- isAutoLayout={isAutoLayout}
isDynamicHeightEnabled={isDynamicHeightEnabled}
optionAlignment={optionAlignment}
optionCount={options.length}
diff --git a/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
index 6fd4287007c1..db680b804230 100644
--- a/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
@@ -25,7 +25,6 @@ import type { OptionProps, SelectAllState } from "../constants";
import { SelectAllStates } from "../constants";
import type { AutocompletionDefinitions } from "widgets/constants";
import { isAutoLayout } from "utils/autoLayout/flexWidgetUtils";
-import { AppPositioningTypes } from "reducers/entityReducers/pageListReducer";
export function defaultSelectedValuesValidation(
value: unknown,
@@ -542,9 +541,6 @@ class CheckboxGroupWidget extends BaseWidget<
1
)
}
- isAutoLayout={
- this.props.appPositioningType === AppPositioningTypes.AUTO
- }
isDisabled={this.props.isDisabled}
isDynamicHeightEnabled={isAutoHeightEnabledForWidget(this.props)}
isInline={this.props.isInline}
diff --git a/app/client/src/widgets/ListWidgetV2/index.ts b/app/client/src/widgets/ListWidgetV2/index.ts
index 78bd83e3cb9f..95286a91e751 100644
--- a/app/client/src/widgets/ListWidgetV2/index.ts
+++ b/app/client/src/widgets/ListWidgetV2/index.ts
@@ -4,7 +4,7 @@ import IconSVG from "./icon.svg";
import Widget from "./widget";
import type { FlattenedWidgetProps } from "widgets/constants";
import { BlueprintOperationTypes } from "widgets/constants";
-import { RegisteredWidgetFeatures } from "utils/WidgetFeatures";
+import { DynamicHeight, RegisteredWidgetFeatures } from "utils/WidgetFeatures";
import type { WidgetProps } from "widgets/BaseWidget";
import {
getNumberOfChildListWidget,
@@ -348,6 +348,7 @@ export const CONFIG = {
[containerId]: {
positioning: Positioning.Vertical,
isFlexChild: true,
+ bottomRow: 13,
},
[canvasWidget.widgetId]: {
flexLayers,
@@ -359,12 +360,14 @@ export const CONFIG = {
alignment: FlexLayerAlignment.Start,
leftColumn: 0,
rightColumn: GridDefaults.DEFAULT_GRID_COLUMNS - 16,
+ dynamicHeight: DynamicHeight.AUTO_HEIGHT,
},
[textWidgets[1].widgetId]: {
responsiveBehavior: ResponsiveBehavior.Fill,
alignment: FlexLayerAlignment.Start,
leftColumn: 0,
rightColumn: GridDefaults.DEFAULT_GRID_COLUMNS,
+ dynamicHeight: DynamicHeight.AUTO_HEIGHT,
},
[imageWidget.widgetId]: {
responsiveBehavior: ResponsiveBehavior.Hug,
@@ -384,11 +387,17 @@ export const CONFIG = {
widgets: { [widgetId: string]: FlattenedWidgetProps },
widgetId: string,
parentId: string,
+ widgetPropertyMaps: { defaultPropertyMap: Record<string, string> },
+ isAutoLayout: boolean,
) => {
if (!parentId) return { widgets };
const widget = { ...widgets[widgetId] };
- widget.dynamicHeight = "FIXED";
+ widget.dynamicHeight = DynamicHeight.FIXED;
+
+ if (isAutoLayout) {
+ widget.dynamicHeight = DynamicHeight.AUTO_HEIGHT;
+ }
widgets[widgetId] = widget;
return { widgets };
diff --git a/app/client/src/widgets/ListWidgetV2/widget/index.tsx b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
index ef3db0dbe597..c7ffdbba63aa 100644
--- a/app/client/src/widgets/ListWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
@@ -1126,6 +1126,12 @@ class ListWidget extends BaseWidget<
const focused =
this.props.renderMode === RenderModes.CANVAS && rowIndex === 0;
const key = this.metaWidgetGenerator.getPrimaryKey(rowIndex);
+ if (
+ this.props.appPositioningType === AppPositioningTypes.AUTO &&
+ container.children?.[0]
+ ) {
+ container.children[0].isListWidgetCanvas = true;
+ }
return {
...container,
focused,
diff --git a/app/client/src/widgets/TextWidget/index.ts b/app/client/src/widgets/TextWidget/index.ts
index 26f37b3af284..d9b83cd87bf6 100644
--- a/app/client/src/widgets/TextWidget/index.ts
+++ b/app/client/src/widgets/TextWidget/index.ts
@@ -5,6 +5,7 @@ import { OverflowTypes } from "./constants";
import IconSVG from "./icon.svg";
import Widget from "./widget";
+import { DynamicHeight } from "utils/WidgetFeatures";
export const CONFIG = {
features: {
@@ -47,6 +48,10 @@ export const CONFIG = {
autoDimension: {
height: true,
},
+ disabledPropsDefaults: {
+ overflow: OverflowTypes.NONE,
+ dynamicHeight: DynamicHeight.AUTO_HEIGHT,
+ },
defaults: {
columns: 4,
},
diff --git a/app/client/src/widgets/constants.ts b/app/client/src/widgets/constants.ts
index 58ab97f8e2bb..12187077c9fb 100644
--- a/app/client/src/widgets/constants.ts
+++ b/app/client/src/widgets/constants.ts
@@ -121,6 +121,7 @@ export type CanvasWidgetStructure = Pick<
children?: CanvasWidgetStructure[];
selected?: boolean;
onClickCapture?: (event: React.MouseEvent<HTMLElement>) => void;
+ isListWidgetCanvas?: boolean;
};
export enum FileDataTypes {
|
71acf31fef886114c962017471f609d959d6ce35
|
2022-02-25 20:26:09
|
Parthvi12
|
test: commenting git sync tests until fixed (#11450)
| false
|
commenting git sync tests until fixed (#11450)
|
test
|
diff --git a/app/client/cypress.json b/app/client/cypress.json
index 6198f8cc3b6e..f71656952848 100644
--- a/app/client/cypress.json
+++ b/app/client/cypress.json
@@ -20,7 +20,8 @@
"**/Smoke_TestSuite/ServerSideTests/LayoutOnLoadActions/OnLoadActionsSpec*.ts",
"**/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec*.js",
"**/Smoke_TestSuite/ServerSideTests/QueryPane/Postgres_Spec*.js",
- "**/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js"
+ "**/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js",
+ "**/Smoke_TestSuite/ClientSideTests/GitSync/*"
],
"chromeWebSecurity": false,
"viewportHeight": 900,
diff --git a/app/client/cypress/locators/DatasourcesEditor.json b/app/client/cypress/locators/DatasourcesEditor.json
index d098db303f1a..2ef278f06986 100644
--- a/app/client/cypress/locators/DatasourcesEditor.json
+++ b/app/client/cypress/locators/DatasourcesEditor.json
@@ -10,7 +10,7 @@
"MongoDB": ".t--plugin-name:contains('MongoDB')",
"RESTAPI": ".t--plugin-name:contains('REST API')",
"PostgreSQL": ".t--plugin-name:contains('PostgreSQL')",
- "MySQL": ".t--plugin-name:contains('Mysql')",
+ "MySQL": ".t--plugin-name:contains('MySQL')",
"sectionAuthentication": "[data-cy=section-Authentication]",
"PostgresEntity": ".t--entity-name:contains(PostgreSQL)",
"MySQLEntity": ".t--entity-name:contains(Mysql)",
@@ -32,7 +32,7 @@
"ElasticSearch": ".t--plugin-name:contains('ElasticSearch')",
"DynamoDB": ".t--plugin-name:contains('DynamoDB')",
"Redis": ".t--plugin-name:contains('Redis')",
- "MsSQL": ".t--plugin-name:contains('MsSQL')",
+ "MsSQL": ".t--plugin-name:contains('Microsoft SQL Server')",
"ArangoDB": ".t--plugin-name:contains('ArangoDB')",
"Firestore": ".t--plugin-name:contains('Firestore')",
"Redshift": ".t--plugin-name:contains('Redshift')",
|
207681bd186ca3a20b4bb49cfed58d44bb892687
|
2023-08-25 17:27:17
|
Sumesh Pradhan
|
ci: cypress on doc db (#26660)
| false
|
cypress on doc db (#26660)
|
ci
|
diff --git a/.github/workflows/ci-test-with-documentdb.yml b/.github/workflows/ci-test-with-documentdb.yml
index 48529c7dab6d..55c75bdea0fe 100644
--- a/.github/workflows/ci-test-with-documentdb.yml
+++ b/.github/workflows/ci-test-with-documentdb.yml
@@ -36,6 +36,11 @@ jobs:
# Opens tcp port 6379 on the host and service container
- 6379:6379
+ mongo:
+ image: mongo
+ ports:
+ - 27017:27017
+
steps:
- name: Set up Depot CLI
uses: depot/setup-action@v1
@@ -230,6 +235,10 @@ jobs:
working-directory: app/client
run: |
yarn install --immutable
+
+ - name: Wait until appsmith server is healthy
+ run: |
+ bash scripts/health_check.sh
- name: Setting up the cypress tests
if: steps.run_result.outputs.run_result != 'success'
@@ -330,10 +339,6 @@ jobs:
else
echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
fi
-
- - name: Wait until appsmith server is healthy
- run: |
- bash scripts/health_check.sh
- name: Run the cypress test
if: steps.run_result.outputs.run_result != 'success' && steps.run_result.outputs.run_result != 'failedtest'
|
33940ea34803015804f169bb53e826e13ee331a8
|
2023-02-20 13:21:02
|
Anagh Hegde
|
chore: Add missing log statements (#20766)
| false
|
Add missing log statements (#20766)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
index 5d51b71d3ff0..069db8ad611a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
@@ -575,6 +575,7 @@ public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspace
}
if (contentType == null || !ALLOWED_CONTENT_TYPES.contains(contentType)) {
+ log.error("Invalid content type, {}", contentType);
return Mono.error(new AppsmithException(AppsmithError.VALIDATION_FAILURE, INVALID_JSON_FILE));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImplV2.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImplV2.java
index 02895291a023..2c08595e54b3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImplV2.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImplV2.java
@@ -604,6 +604,7 @@ public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspace
}
if (contentType == null || !ALLOWED_CONTENT_TYPES.contains(contentType)) {
+ log.error("Invalid content type, {}", contentType);
return Mono.error(new AppsmithException(AppsmithError.VALIDATION_FAILURE, INVALID_JSON_FILE));
}
|
0640b5ed93dd8a0b11ed985355f45c01f9e975e2
|
2024-02-28 14:25:22
|
albinAppsmith
|
fix: Run button hiding issue (#31323)
| false
|
Run button hiding issue (#31323)
|
fix
|
diff --git a/app/client/src/components/editorComponents/ActionNameEditor.tsx b/app/client/src/components/editorComponents/ActionNameEditor.tsx
index b2106b4966a7..6301f9980f39 100644
--- a/app/client/src/components/editorComponents/ActionNameEditor.tsx
+++ b/app/client/src/components/editorComponents/ActionNameEditor.tsx
@@ -9,7 +9,7 @@ import { removeSpecialChars } from "utils/helpers";
import type { AppState } from "@appsmith/reducers";
import { saveActionName } from "actions/pluginActionActions";
-import { Spinner } from "design-system";
+import { Flex, Spinner } from "design-system";
import { getAction, getPlugin } from "@appsmith/selectors/entitiesSelector";
import NameEditorComponent, {
IconBox,
@@ -86,11 +86,11 @@ function ActionNameEditor(props: ActionNameEditorProps) {
saveStatus: { isSaving: boolean; error: boolean };
}) => (
<NameWrapper enableFontStyling={props.enableFontStyling}>
- <div
- style={{
- display: "flex",
- alignItems: "center",
- }}
+ <Flex
+ alignItems="center"
+ gap="spaces-3"
+ overflow="hidden"
+ width="100%"
>
{currentPlugin && (
<IconBox>
@@ -117,7 +117,7 @@ function ActionNameEditor(props: ActionNameEditorProps) {
valueTransform={removeSpecialChars}
/>
{saveStatus.isSaving && <Spinner size="md" />}
- </div>
+ </Flex>
</NameWrapper>
)}
</NameEditorComponent>
diff --git a/app/client/src/components/utils/NameEditorComponent.tsx b/app/client/src/components/utils/NameEditorComponent.tsx
index 763bfc927cce..9156cef65dd5 100644
--- a/app/client/src/components/utils/NameEditorComponent.tsx
+++ b/app/client/src/components/utils/NameEditorComponent.tsx
@@ -33,6 +33,22 @@ export const NameWrapper = styled.div<{ enableFontStyling?: boolean }>`
font-weight: ${props.theme.typography.h3.fontWeight};
}`
: null}
+
+ & .t--action-name-edit-field, & .t--js-action-name-edit-field {
+ width: 100%;
+
+ & > span {
+ display: inline-block;
+ }
+ }
+
+ & > div > div:nth-child(2) {
+ width: calc(100% - 42px); // 32px icon width and 8px gap of flex
+ }
+
+ & > div > div:nth-child(2) > :first-child {
+ width: 100%;
+ }
`;
export const IconWrapper = styled.img`
@@ -46,7 +62,6 @@ export const IconBox = styled.div`
display: flex;
align-items: center;
justify-content: center;
- margin-right: 8px;
flex-shrink: 0;
`;
diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
index 7867b911e75f..372fbafbd219 100644
--- a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
@@ -16,7 +16,7 @@ import {
import EditableText, {
EditInteractionKind,
} from "components/editorComponents/EditableText";
-import { Spinner } from "design-system";
+import { Flex, Spinner } from "design-system";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
import NameEditorComponent, {
IconBox,
@@ -81,11 +81,11 @@ export function JSObjectNameEditor(props: JSObjectNameEditorProps) {
saveStatus: { isSaving: boolean; error: boolean };
}) => (
<NameWrapper enableFontStyling>
- <div
- style={{
- display: "flex",
- alignItems: "center",
- }}
+ <Flex
+ alignItems="center"
+ gap="spaces-3"
+ overflow="hidden"
+ width="100%"
>
{currentPlugin && (
<IconBox>
@@ -114,7 +114,7 @@ export function JSObjectNameEditor(props: JSObjectNameEditorProps) {
valueTransform={removeSpecialChars}
/>
{saveStatus.isSaving && <Spinner size="md" />}
- </div>
+ </Flex>
</NameWrapper>
)}
</NameEditorComponent>
diff --git a/app/client/src/pages/Editor/JSEditor/styledComponents.ts b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
index 95f518054a13..3f67bcc65ee1 100644
--- a/app/client/src/pages/Editor/JSEditor/styledComponents.ts
+++ b/app/client/src/pages/Editor/JSEditor/styledComponents.ts
@@ -61,6 +61,9 @@ export const NameWrapper = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
+ width: 50%;
+ overflow: hidden;
+
input {
margin: 0;
box-sizing: border-box;
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
index 09c751c33986..46444dc38637 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
@@ -26,6 +26,7 @@ const NameWrapper = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
+ width: 50%;
input {
margin: 0;
box-sizing: border-box;
@@ -38,6 +39,7 @@ const ActionsWrapper = styled.div`
flex: 1 1 50%;
justify-content: flex-end;
gap: var(--ads-v2-spaces-3);
+ width: 50%;
`;
interface Props {
|
df7521e93a7ff0a284a1736dffbed3ca3b920643
|
2024-11-13 12:45:26
|
Hetu Nandu
|
chore: Update ADS button min width (#37338)
| false
|
Update ADS button min width (#37338)
|
chore
|
diff --git a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
index b5e58e42b28d..1fd71a2ca84f 100644
--- a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
+++ b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
@@ -29,6 +29,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
? "var(--ads-v2-spaces-2)"
: "var(--ads-v2-spaces-2) var(--ads-v2-spaces-3)"};
--button-gap: var(--ads-v2-spaces-2);
+ --button-min-width: 60px;
`,
md: css`
--button-font-weight: 600;
@@ -37,6 +38,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
? "var(--ads-v2-spaces-3)"
: "var(--ads-v2-spaces-3) var(--ads-v2-spaces-4)"};
--button-gap: var(--ads-v2-spaces-3);
+ --button-min-width: 80px;
`,
};
@@ -175,6 +177,8 @@ export const ButtonContent = styled.div<{
box-sizing: border-box;
padding: var(--button-padding);
border-radius: inherit;
+ min-width: ${({ isIconButton }) =>
+ isIconButton ? "unset" : "var(--button-min-width)"};
& > .${ButtonContentChildrenClassName} {
display: flex;
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index df8d6176a5d1..5c3e54af7fbd 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -318,6 +318,7 @@ export function LeftPaneSection(props: {
<Button
data-testid="t--workspace-new-workspace-auto-create"
isDisabled={props.isFetchingWorkspaces}
+ isIconButton
kind="tertiary"
onClick={createNewWorkspace}
startIcon="add-line"
|
2cfcae3fe47c84a7d3fe80c498ac8eea5aed9db5
|
2023-04-21 18:06:35
|
Sumesh Pradhan
|
fix: Supervisord event listener health check exception Handling (#22587)
| false
|
Supervisord event listener health check exception Handling (#22587)
|
fix
|
diff --git a/deploy/docker/scripts/supervisor_event_listener.py b/deploy/docker/scripts/supervisor_event_listener.py
index 5b659dddc1e0..9fca775bfdcd 100644
--- a/deploy/docker/scripts/supervisor_event_listener.py
+++ b/deploy/docker/scripts/supervisor_event_listener.py
@@ -1,3 +1,4 @@
+from requests.exceptions import ConnectionError
import os
import requests
import sys
@@ -6,7 +7,7 @@
LOADING_TEMPLATE_PAGE = r'/opt/appsmith/templates/appsmith_starting.html'
LOADING_PAGE_EDITOR = r'/opt/appsmith/editor/loading.html'
-BACKEND_HEALTH_ENDPOINT = "http://localhost/api/v1/health"
+BACKEND_HEALTH_ENDPOINT = "http://localhost:8080/api/v1/health"
def write_stdout(s):
# only eventlistener protocol messages may be sent to stdout
@@ -21,16 +22,21 @@ def wait_until_backend_healthy():
sleep_sec = 3
timeout_sec = 120
for _ in range(timeout_sec//sleep_sec):
- if requests.get(BACKEND_HEALTH_ENDPOINT).ok:
- write_stderr('\nBackend is healthy\n')
+ try:
+ if requests.get(BACKEND_HEALTH_ENDPOINT).ok:
+ write_stderr('\nBackend is healthy\n')
+ break
+ except ConnectionError:
+ pass # retry after sleep_sec
+ except Exception as ex:
+ write_stderr(ex)
break
- time.sleep(sleep_sec)
-
+ finally:
+ time.sleep(sleep_sec)
else:
- write_stderr('\nBackend health check timed out\n')
-
+ write_stderr('\nError: Backend health check timeout.\n')
remove_loading_page()
-
+
def remove_loading_page():
if os.path.exists(LOADING_PAGE_EDITOR):
os.remove(LOADING_PAGE_EDITOR)
|
60079faa58b2780102da4aa76e4ded2045af97eb
|
2022-03-10 14:57:54
|
Leo Thomas
|
fix: GSheet incorrect error message fixed (#11699)
| false
|
GSheet incorrect error message fixed (#11699)
|
fix
|
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ClearMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ClearMethod.java
index 2494fc2585ee..c01a5906f03d 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ClearMethod.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/ClearMethod.java
@@ -28,7 +28,7 @@ public boolean validateMethodRequest(MethodConfig methodConfig) {
throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Missing required field Spreadsheet Url");
}
if (methodConfig.getSpreadsheetRange() == null || methodConfig.getSpreadsheetRange().isBlank()) {
- throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Missing required field Data Range");
+ throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Missing required field 'Cell Range'");
}
return true;
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/GetValuesMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/GetValuesMethod.java
index 54b94b047bfd..ec8fbdc0ea4d 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/GetValuesMethod.java
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/GetValuesMethod.java
@@ -99,7 +99,7 @@ public boolean validateMethodRequest(MethodConfig methodConfig) {
}
} else if ("RANGE".equalsIgnoreCase(methodConfig.getQueryFormat())) {
if (methodConfig.getSpreadsheetRange() == null || methodConfig.getSpreadsheetRange().isBlank()) {
- throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Missing required field Data Range");
+ throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, "Missing required field 'Cell Range'");
}
} else {
throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, "Invalid query format");
|
aa8b153303c30bd89bea81704322e85d8580cbe0
|
2024-11-15 17:23:37
|
Pawan Kumar
|
chore: add sheet + sidebar (#37408)
| false
|
add sheet + sidebar (#37408)
|
chore
|
diff --git a/app/client/packages/design-system/widgets/package.json b/app/client/packages/design-system/widgets/package.json
index 799d1e31679e..126c104ff3d7 100644
--- a/app/client/packages/design-system/widgets/package.json
+++ b/app/client/packages/design-system/widgets/package.json
@@ -29,11 +29,13 @@
"react-aria-components": "^1.2.1",
"react-markdown": "^9.0.1",
"react-syntax-highlighter": "^15.5.0",
+ "react-transition-group": "^4.4.5",
"remark-gfm": "^4.0.0"
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"@types/react-syntax-highlighter": "^15.5.13",
+ "@types/react-transition-group": "^4.4.11",
"eslint-plugin-storybook": "^0.6.10"
},
"peerDependencies": {
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/index.ts b/app/client/packages/design-system/widgets/src/components/Sheet/index.ts
new file mode 100644
index 000000000000..3bd16e178a03
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx
new file mode 100644
index 000000000000..3b5261f223a8
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/Sheet.tsx
@@ -0,0 +1,62 @@
+import clsx from "clsx";
+import React, { forwardRef, type Ref, useRef } from "react";
+import {
+ Modal as HeadlessModal,
+ Dialog as HeadlessDialog,
+ ModalOverlay as HeadlessModalOverlay,
+} from "react-aria-components";
+import { CSSTransition } from "react-transition-group";
+
+import styles from "./styles.module.css";
+import type { SheetProps } from "./types";
+
+export function _Sheet(props: SheetProps, ref: Ref<HTMLDivElement>) {
+ const {
+ children,
+ className,
+ isOpen,
+ onEntered,
+ onExited,
+ onOpenChange,
+ position = "start",
+ ...rest
+ } = props;
+ const root = document.body.querySelector(
+ "[data-theme-provider]",
+ ) as HTMLButtonElement;
+
+ const overlayRef = useRef<HTMLDivElement>();
+
+ return (
+ <CSSTransition
+ in={isOpen}
+ nodeRef={overlayRef}
+ onEntered={onEntered}
+ onExited={onExited}
+ timeout={300}
+ unmountOnExit
+ >
+ <HeadlessModalOverlay
+ UNSTABLE_portalContainer={root}
+ className={clsx(styles.overlay, className)}
+ isDismissable
+ isOpen={isOpen}
+ onOpenChange={onOpenChange}
+ // @ts-expect-error TS is unable to infer the correct type for the render prop
+ ref={overlayRef}
+ >
+ <HeadlessModal
+ className={clsx(styles.sheet, styles[position])}
+ ref={ref}
+ {...rest}
+ >
+ <HeadlessDialog aria-label="Sheet" className={styles.dialog}>
+ {children}
+ </HeadlessDialog>
+ </HeadlessModal>
+ </HeadlessModalOverlay>
+ </CSSTransition>
+ );
+}
+
+export const Sheet = forwardRef(_Sheet);
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts b/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts
new file mode 100644
index 000000000000..c415d8b0d501
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/index.ts
@@ -0,0 +1,2 @@
+export { Sheet } from "./Sheet";
+export { DialogTrigger as SheetTrigger } from "react-aria-components";
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css
new file mode 100644
index 000000000000..27dfe571139d
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/styles.module.css
@@ -0,0 +1,117 @@
+.sheet {
+ position: fixed;
+ background: var(--color-bg-elevation-3);
+ width: 80%;
+}
+
+.overlay {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: var(--color-bg-neutral-opacity);
+ z-index: var(--z-index-99);
+ contain: strict;
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+}
+
+.dialog {
+ height: 100%;
+}
+
+.overlay[data-entering] {
+ animation: fade-in 0.3s ease-in-out;
+}
+
+.overlay[data-exiting] {
+ animation: fade-out 0.3s ease-in-out;
+}
+
+@keyframes fade-in {
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
+}
+
+@keyframes fade-out {
+ from {
+ opacity: 1;
+ }
+ to {
+ opacity: 0;
+ }
+}
+
+.start {
+ top: 0;
+ left: 0;
+ bottom: 0;
+ max-width: 90%;
+ height: 100%;
+}
+
+.start[data-entering] {
+ animation: slide-in-start 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.start[data-exiting] {
+ animation: slide-out-start 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.end {
+ top: 0;
+ right: 0;
+ bottom: 0;
+ max-width: 90%;
+ height: 100%;
+}
+
+.end[data-entering] {
+ animation: slide-in-end 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.end[data-exiting] {
+ animation: slide-out-end 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes slide-in-start {
+ from {
+ transform: translateX(-100%);
+ }
+ to {
+ transform: translateX(0);
+ }
+}
+
+@keyframes slide-out-start {
+ from {
+ transform: translateX(0);
+ }
+ to {
+ transform: translateX(-100%);
+ }
+}
+
+@keyframes slide-in-end {
+ from {
+ transform: translateX(100%);
+ }
+ to {
+ transform: translateX(0);
+ }
+}
+
+@keyframes slide-out-end {
+ from {
+ transform: translateX(0);
+ }
+ to {
+ transform: translateX(100%);
+ }
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts b/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts
new file mode 100644
index 000000000000..d66e9d5a8906
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/src/types.ts
@@ -0,0 +1,12 @@
+import type { ModalOverlayProps as HeadlessModalOverlayProps } from "react-aria-components";
+
+export interface SheetProps
+ extends Omit<HeadlessModalOverlayProps, "position"> {
+ /**
+ * The position from which the sheet slides in
+ * @default 'start'
+ */
+ position?: "start" | "end";
+ onEntered?: () => void;
+ onExited?: () => void;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx
new file mode 100644
index 000000000000..ab336257e155
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/stories/Sheet.stories.tsx
@@ -0,0 +1,27 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Sheet } from "../index";
+import { SimpleSheet } from "./SimpleSheet";
+
+const meta: Meta<typeof Sheet> = {
+ title: "WDS/Widgets/Sheet",
+ component: Sheet,
+ render: (args) => <SimpleSheet {...args} />,
+};
+
+export default meta;
+type Story = StoryObj<typeof Sheet>;
+
+// Default story with left position (start)
+export const Default: Story = {
+ args: {
+ position: "start",
+ },
+};
+
+// Right position (end)
+export const RightPositioned: Story = {
+ args: {
+ position: "end",
+ },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx b/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx
new file mode 100644
index 000000000000..200e37d00841
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sheet/stories/SimpleSheet.tsx
@@ -0,0 +1,20 @@
+import React, { useState } from "react";
+import { Button } from "../../Button";
+import { Sheet } from "../index";
+import type { SheetProps } from "../src/types";
+
+export const SimpleSheet = (props: Omit<SheetProps, "children">) => {
+ const [isOpen, setIsOpen] = useState(props.isOpen);
+
+ return (
+ <>
+ <Button onPress={() => setIsOpen(!Boolean(isOpen))}>Sheet trigger</Button>
+ <Sheet {...props} isOpen={isOpen} onOpenChange={setIsOpen}>
+ <div style={{ padding: "1rem" } as React.CSSProperties}>
+ <h3>Sheet Content</h3>
+ <p>This is an example of sheet content.</p>
+ </div>
+ </Sheet>
+ </>
+ );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts
new file mode 100644
index 000000000000..3bd16e178a03
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx
new file mode 100644
index 000000000000..c8b231cef3cb
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx
@@ -0,0 +1,72 @@
+import clsx from "clsx";
+import * as React from "react";
+import { type Ref, useRef } from "react";
+import { Sheet } from "../../Sheet";
+import { useSidebar } from "./use-sidebar";
+import styles from "./styles.module.css";
+import type { SidebarProps } from "./types";
+import { CSSTransition } from "react-transition-group";
+
+const _Sidebar = (props: SidebarProps, ref: Ref<HTMLDivElement>) => {
+ const {
+ children,
+ className,
+ collapsible = "offcanvas",
+ onEntered,
+ onExited,
+ side = "start",
+ variant = "sidebar",
+ ...rest
+ } = props;
+ const { isMobile, setOpen, state } = useSidebar();
+ const sidebarRef = useRef<HTMLDivElement>();
+
+ if (collapsible === "none") {
+ return (
+ <div className={clsx(className)} ref={ref} {...props}>
+ {children}
+ </div>
+ );
+ }
+
+ if (Boolean(isMobile)) {
+ return (
+ <Sheet
+ isOpen={state === "expanded"}
+ onEntered={onEntered}
+ onExited={onExited}
+ onOpenChange={setOpen}
+ position={side}
+ >
+ {children}
+ </Sheet>
+ );
+ }
+
+ return (
+ <CSSTransition
+ in={state === "expanded"}
+ nodeRef={sidebarRef}
+ onEntered={onEntered}
+ onExited={onExited}
+ timeout={300}
+ >
+ <div
+ className={clsx(styles.mainSidebar)}
+ data-collapsible={state === "collapsed" ? collapsible : ""}
+ data-side={side}
+ data-state={state}
+ data-variant={variant}
+ // @ts-expect-error TS is unable to infer the correct type for the render prop
+ ref={sidebarRef}
+ >
+ <div className={styles.fakeSidebar} />
+ <div className={clsx(styles.sidebar, className)} ref={ref} {...rest}>
+ <div className={styles.sidebarContainer}>{children}</div>
+ </div>
+ </div>
+ </CSSTransition>
+ );
+};
+
+export const Sidebar = React.forwardRef(_Sidebar);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
new file mode 100644
index 000000000000..bb90417a91b1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
@@ -0,0 +1,22 @@
+import clsx from "clsx";
+import React, { type ComponentProps, type Ref } from "react";
+
+import styles from "./styles.module.css";
+
+const _SidebarContent = (
+ props: ComponentProps<"div">,
+ ref: Ref<HTMLDivElement>,
+) => {
+ const { className, ...rest } = props;
+
+ return (
+ <div
+ className={clsx(styles.sidebarContent, className)}
+ data-sidebar="content"
+ ref={ref}
+ {...rest}
+ />
+ );
+};
+
+export const SidebarContent = React.forwardRef(_SidebarContent);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx
new file mode 100644
index 000000000000..f6c3a1d0bc57
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx
@@ -0,0 +1,22 @@
+import clsx from "clsx";
+import * as React from "react";
+import type { ComponentProps, Ref } from "react";
+
+import styles from "./styles.module.css";
+
+export const _SidebarInset = (
+ props: ComponentProps<"main">,
+ ref: Ref<HTMLDivElement>,
+) => {
+ const { className, ...rest } = props;
+
+ return (
+ <main
+ className={clsx(styles.sidebarInset, className)}
+ ref={ref}
+ {...rest}
+ />
+ );
+};
+
+export const SidebarInset = React.forwardRef(_SidebarInset);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx
new file mode 100644
index 000000000000..35d688f23837
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx
@@ -0,0 +1,96 @@
+import clsx from "clsx";
+import React, { type Ref, useCallback, useState } from "react";
+
+import styles from "./styles.module.css";
+import { SidebarContext } from "./context";
+import { useIsMobile } from "./use-mobile";
+import { SIDEBAR_CONSTANTS } from "./constants";
+import type { SidebarContextType, SidebarProviderProps } from "./types";
+
+export const _SidebarProvider = (
+ props: SidebarProviderProps,
+ ref: Ref<HTMLDivElement>,
+) => {
+ const {
+ children,
+ className,
+ defaultOpen = true,
+ isOpen: openProp,
+ onOpen: setOpenProp,
+ style,
+ ...rest
+ } = props;
+ const isMobile = useIsMobile();
+
+ const [_open, _setOpen] = useState(defaultOpen);
+ const open = openProp ?? _open;
+ const setOpen = useCallback(
+ (value: boolean | ((value: boolean) => boolean)) => {
+ const openState = typeof value === "function" ? value(open) : value;
+
+ if (setOpenProp) {
+ setOpenProp(openState);
+ } else {
+ _setOpen(openState);
+ }
+ },
+ [setOpenProp, open],
+ );
+
+ const toggleSidebar = React.useCallback(() => {
+ return isMobile ? setOpen((open) => !open) : setOpen((open) => !open);
+ }, [isMobile, setOpen]);
+
+ React.useEffect(
+ function handleKeyboardShortcuts() {
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (
+ event.key === SIDEBAR_CONSTANTS.KEYBOARD_SHORTCUT &&
+ (event.metaKey || event.ctrlKey)
+ ) {
+ event.preventDefault();
+ toggleSidebar();
+ }
+ };
+
+ window.addEventListener("keydown", handleKeyDown);
+
+ return () => window.removeEventListener("keydown", handleKeyDown);
+ },
+ [toggleSidebar, isMobile],
+ );
+
+ const state = open ? "expanded" : "collapsed";
+
+ const contextValue = React.useMemo<SidebarContextType>(
+ () => ({
+ state,
+ open,
+ setOpen,
+ isMobile,
+ toggleSidebar,
+ }),
+ [state, open, setOpen, isMobile, toggleSidebar],
+ );
+
+ return (
+ <SidebarContext.Provider value={contextValue}>
+ <div
+ className={clsx(styles.sidebarWrapper, className)}
+ ref={ref}
+ style={
+ {
+ "--sidebar-width": SIDEBAR_CONSTANTS.WIDTH.DESKTOP,
+ "--sidebar-width-icon": SIDEBAR_CONSTANTS.WIDTH.ICON,
+ ...style,
+ } as React.CSSProperties
+ }
+ {...rest}
+ >
+ {children}
+ </div>
+ </SidebarContext.Provider>
+ );
+};
+
+export const SidebarProvider = React.forwardRef(_SidebarProvider);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx
new file mode 100644
index 000000000000..4649d3ae877c
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx
@@ -0,0 +1,29 @@
+import * as React from "react";
+import { Button } from "@appsmith/wds";
+
+import { useSidebar } from "./use-sidebar";
+
+interface SidebarTriggerProps {
+ onPress?: () => void;
+}
+
+export const SidebarTrigger = (props: SidebarTriggerProps) => {
+ const { onPress } = props;
+ const { state, toggleSidebar } = useSidebar();
+
+ return (
+ <Button
+ color="neutral"
+ icon={
+ state === "expanded"
+ ? "layout-sidebar-right-collapse"
+ : "layout-sidebar-left-collapse"
+ }
+ onPress={() => {
+ onPress?.();
+ toggleSidebar();
+ }}
+ variant="ghost"
+ />
+ );
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts
new file mode 100644
index 000000000000..9633b7ebf41a
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/constants.ts
@@ -0,0 +1,8 @@
+export const SIDEBAR_CONSTANTS = {
+ WIDTH: {
+ DESKTOP: "16rem",
+ ICON: "var(--sizing-14)",
+ },
+ KEYBOARD_SHORTCUT: "b",
+ MOBILE_BREAKPOINT: 768,
+} as const;
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx
new file mode 100644
index 000000000000..aba1700f141e
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/context.tsx
@@ -0,0 +1,6 @@
+import * as React from "react";
+import type { SidebarContextType } from "./types";
+
+export const SidebarContext = React.createContext<SidebarContextType | null>(
+ null,
+);
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts
new file mode 100644
index 000000000000..7a7b66a4ebe1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts
@@ -0,0 +1,9 @@
+export { Sidebar } from "./Sidebar";
+export { SidebarProvider } from "./SidebarProvider";
+export { SidebarInset } from "./SidebarInset";
+export { SidebarTrigger } from "./SidebarTrigger";
+export { SidebarContent } from "./SidebarContent";
+export { useSidebar } from "./use-sidebar";
+export { useIsMobile } from "./use-mobile";
+
+export type * from "./types";
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
new file mode 100644
index 000000000000..e3fe71fce134
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
@@ -0,0 +1,203 @@
+.sidebarWrapper {
+ display: flex;
+ min-height: 100%;
+ width: 100%;
+ position: relative;
+ contain: strict;
+ container-type: inline-size;
+}
+
+/**
+ *-----------------------------------------------------
+ * MAIN SIDEBAR
+ *-----------------------------------------------------
+ */
+.mainSidebar {
+ display: none;
+ color: var(--color-fg);
+}
+
+@container (min-width: 768px) {
+ .mainSidebar {
+ display: block;
+ }
+}
+
+.mainSidebar[data-collapsible="icon"] {
+ overflow: hidden;
+}
+
+/**
+ *-----------------------------------------------------
+ * FAKE SIDEBAR
+ *-----------------------------------------------------
+ */
+.fakeSidebar {
+ position: relative;
+ height: 100%;
+ width: var(--sidebar-width);
+ background-color: transparent;
+ transition: width 300ms linear;
+}
+
+.mainSidebar[data-side="right"] .fakeSidebar {
+ transform: rotate(180deg);
+}
+
+/* Handle collapsible states for fakeSidebar */
+[data-collapsible="offcanvas"] .fakeSidebar {
+ width: 0;
+}
+
+[data-side="right"] .fakeSidebar {
+ transform: rotate(180deg);
+}
+
+[data-collapsible="icon"] .fakeSidebar {
+ width: var(--sidebar-width-icon);
+}
+
+.mainSidebar[data-variant="floating"][data-collapsible="icon"] .fakeSidebar,
+.mainSidebar[data-variant="inset"][data-collapsible="icon"] .fakeSidebar {
+ width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2));
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR
+ *-----------------------------------------------------
+ */
+.sidebar {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ z-index: 10;
+ display: none;
+ height: 100%;
+ width: var(--sidebar-width);
+ transition:
+ left 300ms linear,
+ right 300ms linear,
+ width 300ms linear;
+}
+
+@container (min-width: 768px) {
+ .sidebar {
+ display: flex;
+ }
+}
+
+.mainSidebar[data-side="start"] .sidebar {
+ left: 0;
+}
+
+.mainSidebar[data-side="end"] .sidebar {
+ right: 0;
+}
+
+.mainSidebar[data-collapsible="offcanvas"][data-side="start"] .sidebar {
+ left: calc(var(--sidebar-width) * -1);
+}
+
+.mainSidebar[data-collapsible="offcanvas"][data-side="end"] .sidebar {
+ right: calc(var(--sidebar-width) * -1);
+}
+
+.mainSidebar[data-variant="floating"] .sidebar,
+.mainSidebar[data-variant="inset"] .sidebar {
+ padding: var(--inner-spacing-2);
+}
+
+.mainSidebar[data-collapsible="icon"] .sidebar {
+ width: calc(var(--sidebar-width-icon));
+}
+
+.mainSidebar[data-variant="floating"][data-collapsible="icon"] .sidebar,
+.mainSidebar[data-variant="inset"][data-collapsible="icon"] .sidebar {
+ width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2) + 2px);
+}
+
+.mainSidebar[data-side="start"]:not([data-variant="floating"]):not(
+ [data-variant="inset"]
+ )
+ .sidebar {
+ border-inline-end: var(--border-width-1) solid var(--color-bd-elevation-1);
+}
+
+.mainSidebar[data-side="end"]:not([data-variant="floating"]):not(
+ [data-variant="inset"]
+ )
+ .sidebar {
+ border-inline-start: var(--border-width-1) solid var(--color-bd-elevation-1);
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR CONTAINER
+ *-----------------------------------------------------
+ */
+.sidebarContainer {
+ display: flex;
+ height: 100%;
+ width: 100%;
+ flex-direction: column;
+}
+
+[data-side="end"] .sidebarContainer {
+ border-inline-start: var(--border-width-1) solid var(--color-bd-subtle);
+}
+
+[data-side="start"] .sidebarContainer {
+ border-inline-end: var(--border-width-1) solid var(--color-bd-subtle);
+}
+
+.mainSidebar[data-variant="floating"] .sidebarContainer {
+ border-radius: var(--border-radius-elevation-3);
+ border: var(--border-width-1) solid var(--color-bd);
+ box-shadow: var(--box-shadow-1);
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR CONTENT
+ *-----------------------------------------------------
+ */
+.sidebarContent {
+ height: 100%;
+}
+
+/**
+ *-----------------------------------------------------
+ * SIDEBAR INSET
+ *-----------------------------------------------------
+ */
+.sidebarInset {
+ position: relative;
+ display: flex;
+ min-height: 100%;
+ flex: 1;
+ flex-direction: column;
+ background-color: var(--background);
+}
+
+[data-variant="inset"] ~ .sidebarInset {
+ min-height: calc(100% - var(--inner-spacing-2) * 2);
+}
+
+@container (min-width: 768px) {
+ [data-variant="inset"] ~ .sidebarInset {
+ margin: var(--inner-spacing-2);
+ border-radius: var(--border-radius-elevation-3);
+ box-shadow: var(--box-shadow-1);
+ border: var(--border-width-1) solid var(--color-bd);
+ }
+
+ /* Handle margin when sidebar is collapsed */
+ [data-state="collapsed"][data-variant="inset"] ~ .sidebarInset {
+ margin-left: var(--inner-spacing-2);
+ }
+
+ [data-variant="inset"] ~ .sidebarInset {
+ margin-left: 0;
+ }
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts
new file mode 100644
index 000000000000..1d4e130126e5
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts
@@ -0,0 +1,28 @@
+import type { ReactNode } from "react";
+
+export interface SidebarContextType {
+ state: "expanded" | "collapsed";
+ open: boolean;
+ setOpen: (open: boolean) => void;
+ isMobile: boolean;
+ toggleSidebar: () => void;
+}
+
+export interface SidebarProviderProps {
+ defaultOpen?: boolean;
+ isOpen?: boolean;
+ onOpen?: (open: boolean) => void;
+ children: ReactNode;
+ className?: string;
+ style?: React.CSSProperties;
+}
+
+export interface SidebarProps {
+ side?: "start" | "end";
+ variant?: "sidebar" | "floating" | "inset";
+ collapsible?: "offcanvas" | "icon" | "none";
+ onEntered?: () => void;
+ onExited?: () => void;
+ children: ReactNode;
+ className?: string;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx
new file mode 100644
index 000000000000..067e22a5cd49
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-mobile.tsx
@@ -0,0 +1,27 @@
+import { useEffect, useState } from "react";
+
+import { SIDEBAR_CONSTANTS } from "./constants";
+
+export function useIsMobile() {
+ const [isMobile, setIsMobile] = useState<boolean | undefined>(undefined);
+
+ useEffect(() => {
+ const root = document.body.querySelector(
+ "[data-theme-provider]",
+ ) as HTMLButtonElement;
+
+ if (!Boolean(root)) return;
+
+ const resizeObserver = new ResizeObserver(([entry]) => {
+ setIsMobile(
+ entry.contentRect.width < SIDEBAR_CONSTANTS.MOBILE_BREAKPOINT,
+ );
+ });
+
+ resizeObserver.observe(root);
+
+ return () => resizeObserver.disconnect();
+ }, [isMobile]);
+
+ return Boolean(isMobile);
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts
new file mode 100644
index 000000000000..6cb583ef3ef8
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/src/use-sidebar.ts
@@ -0,0 +1,12 @@
+import * as React from "react";
+import { SidebarContext } from "./context";
+
+export function useSidebar() {
+ const context = React.useContext(SidebarContext);
+
+ if (!context) {
+ throw new Error("useSidebar must be used within a SidebarProvider.");
+ }
+
+ return context;
+}
diff --git a/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx b/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx
new file mode 100644
index 000000000000..0aa33cfc529e
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Sidebar/stories/Sidebar.stories.tsx
@@ -0,0 +1,125 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+ Sidebar,
+ SidebarContent,
+ SidebarTrigger,
+ SidebarProvider,
+ SidebarInset,
+} from "../src/index";
+import { Flex } from "../../Flex";
+import { Text, Icon } from "@appsmith/wds";
+
+const meta: Meta<typeof Sidebar> = {
+ component: Sidebar,
+ title: "WDS/Widgets/Sidebar",
+ parameters: {
+ layout: "fullscreen",
+ docs: {
+ description: {
+ component:
+ "A responsive sidebar component that supports different positions, variants, and collapse behaviors.",
+ },
+ },
+ },
+ args: {
+ side: "start",
+ variant: "sidebar",
+ },
+ render: (args) => (
+ <SidebarProvider
+ style={{
+ height: "50vh",
+ border: "1px solid var(--color-bd-elevation-1)",
+ }}
+ >
+ <Sidebar {...args}>
+ <SidebarContent>
+ <DemoContent />
+ </SidebarContent>
+ </Sidebar>
+ <Flex alignItems="start" margin="spacing-4" width="100%">
+ <SidebarTrigger />
+ </Flex>
+ </SidebarProvider>
+ ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Sidebar>;
+
+const DemoContent = () => (
+ <Flex direction="column" gap="spacing-2" padding="spacing-4">
+ <Text color="neutral-subtle" size="caption">
+ Applications
+ </Text>
+ <Flex direction="column" gap="spacing-3" marginTop="spacing-2">
+ <Flex alignItems="center" gap="spacing-2">
+ <Icon name="home" />
+ <Text size="body">Home</Text>
+ </Flex>
+ <Flex alignItems="center" gap="spacing-2">
+ <Icon name="inbox" />
+ <Text size="body">Inbox</Text>
+ </Flex>
+ <Flex alignItems="center" gap="spacing-2">
+ <Icon name="calendar" />
+ <Text size="body">Calendar</Text>
+ </Flex>
+ </Flex>
+ </Flex>
+);
+
+export const Default: Story = {
+ args: {},
+};
+
+export const SideRight: Story = {
+ args: {
+ side: "end",
+ },
+ render: (args) => (
+ <SidebarProvider
+ style={{
+ height: "50vh",
+ border: "1px solid var(--color-bd-elevation-1)",
+ }}
+ >
+ <Flex alignItems="start" margin="spacing-4" width="100%">
+ <SidebarTrigger />
+ </Flex>
+ <Sidebar {...args}>
+ <DemoContent />
+ </Sidebar>
+ </SidebarProvider>
+ ),
+};
+
+export const VariantFloating: Story = {
+ args: {
+ variant: "floating",
+ },
+};
+
+export const VariantInset: Story = {
+ args: {
+ variant: "inset",
+ },
+ render: (args) => (
+ <SidebarProvider
+ style={{
+ height: "50vh",
+ border: "1px solid var(--color-bd-elevation-1)",
+ }}
+ >
+ <Sidebar {...args}>
+ <DemoContent />
+ </Sidebar>
+ <SidebarInset>
+ <Flex alignItems="start" margin="spacing-4" width="100%">
+ <SidebarTrigger />
+ </Flex>
+ </SidebarInset>
+ </SidebarProvider>
+ ),
+};
diff --git a/app/client/packages/design-system/widgets/src/index.ts b/app/client/packages/design-system/widgets/src/index.ts
index 277f078a90cb..b0236e3a62dd 100644
--- a/app/client/packages/design-system/widgets/src/index.ts
+++ b/app/client/packages/design-system/widgets/src/index.ts
@@ -30,6 +30,8 @@ export * from "./components/ListBox";
export * from "./components/ListBoxItem";
export * from "./components/MenuItem";
export * from "./components/Markdown";
+export * from "./components/Sidebar";
+export * from "./components/Sheet";
export * from "./utils";
export * from "./hooks";
diff --git a/app/client/packages/storybook/package.json b/app/client/packages/storybook/package.json
index 7fa338b6eb27..dcc41c52e723 100644
--- a/app/client/packages/storybook/package.json
+++ b/app/client/packages/storybook/package.json
@@ -23,6 +23,7 @@
"@storybook/addon-viewport": "^8.2.7",
"@storybook/blocks": "^8.2.7",
"@storybook/components": "^8.2.7",
+ "@storybook/core-events": "^8.3.2",
"@storybook/manager-api": "^8.2.7",
"@storybook/preset-create-react-app": "^8.2.7",
"@storybook/react-vite": "^8.2.7",
@@ -37,7 +38,6 @@
"dependencies": {
"@appsmith/wds": "workspace:^",
"@appsmith/wds-theming": "workspace:^",
- "@storybook/core-events": "^8.3.2",
"glob": "^11.0.0"
}
}
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index b0977ec08747..17dd19532035 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -251,12 +251,14 @@ __metadata:
"@tabler/icons-react": ^3.10.0
"@types/fs-extra": ^11.0.4
"@types/react-syntax-highlighter": ^15.5.13
+ "@types/react-transition-group": ^4.4.11
clsx: ^2.0.0
eslint-plugin-storybook: ^0.6.10
lodash: "*"
react-aria-components: ^1.2.1
react-markdown: ^9.0.1
react-syntax-highlighter: ^15.5.0
+ react-transition-group: ^4.4.5
remark-gfm: ^4.0.0
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
@@ -2628,12 +2630,12 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.0, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
- version: 7.25.6
- resolution: "@babel/runtime@npm:7.25.6"
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.0, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+ version: 7.26.0
+ resolution: "@babel/runtime@npm:7.26.0"
dependencies:
regenerator-runtime: ^0.14.0
- checksum: ee1a69d3ac7802803f5ee6a96e652b78b8addc28c6a38c725a4ad7d61a059d9e6cb9f6550ed2f63cce67a1bd82e0b1ef66a1079d895be6bfb536a5cfbd9ccc32
+ checksum: c8e2c0504ab271b3467a261a8f119bf2603eb857a0d71e37791f4e3fae00f681365073cc79f141ddaa90c6077c60ba56448004ad5429d07ac73532be9f7cf28a
languageName: node
linkType: hard
@@ -11165,6 +11167,15 @@ __metadata:
languageName: node
linkType: hard
+"@types/react-transition-group@npm:^4.4.11":
+ version: 4.4.11
+ resolution: "@types/react-transition-group@npm:4.4.11"
+ dependencies:
+ "@types/react": "*"
+ checksum: a6e3b2e4363cb019e256ae4f19dadf9d7eb199da1a5e4109bbbf6a132821884044d332e9c74b520b1e5321a7f545502443fd1ce0b18649c8b510fa4220b0e5c2
+ languageName: node
+ linkType: hard
+
"@types/react-window@npm:^1.8.2":
version: 1.8.2
resolution: "@types/react-window@npm:1.8.2"
@@ -17115,6 +17126,16 @@ __metadata:
languageName: node
linkType: hard
+"dom-helpers@npm:^5.0.1":
+ version: 5.2.1
+ resolution: "dom-helpers@npm:5.2.1"
+ dependencies:
+ "@babel/runtime": ^7.8.7
+ csstype: ^3.0.2
+ checksum: 863ba9e086f7093df3376b43e74ce4422571d404fc9828bf2c56140963d5edf0e56160f9b2f3bb61b282c07f8fc8134f023c98fd684bddcb12daf7b0f14d951c
+ languageName: node
+ linkType: hard
+
"dom-serializer@npm:0":
version: 0.2.2
resolution: "dom-serializer@npm:0.2.2"
@@ -29338,6 +29359,21 @@ __metadata:
languageName: node
linkType: hard
+"react-transition-group@npm:^4.4.5":
+ version: 4.4.5
+ resolution: "react-transition-group@npm:4.4.5"
+ dependencies:
+ "@babel/runtime": ^7.5.5
+ dom-helpers: ^5.0.1
+ loose-envify: ^1.4.0
+ prop-types: ^15.6.2
+ peerDependencies:
+ react: ">=16.6.0"
+ react-dom: ">=16.6.0"
+ checksum: 75602840106aa9c6545149d6d7ae1502fb7b7abadcce70a6954c4b64a438ff1cd16fc77a0a1e5197cdd72da398f39eb929ea06f9005c45b132ed34e056ebdeb1
+ languageName: node
+ linkType: hard
+
"react-use-gesture@npm:^7.0.4":
version: 7.0.16
resolution: "react-use-gesture@npm:7.0.16"
|
ab3e3b5f34900f509ed829ff7ad7823b032d132b
|
2023-12-06 20:01:41
|
Aman Agarwal
|
fix: default values for fields in rest api ds form (#29393)
| false
|
default values for fields in rest api ds form (#29393)
|
fix
|
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index b77b333cfffa..03f197237f09 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -595,6 +595,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
"",
false,
"",
+ true,
)}
</FormInputContainer>
{_.get(formData.authentication, "isTokenHeader") && (
@@ -678,6 +679,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
"",
false,
"",
+ false,
)}
</FormInputContainer>
</>
@@ -719,6 +721,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
"",
false,
"",
+ false,
)}
</FormInputContainer>
)}
|
8677240da6190223476eaf0062e79b9bd1275823
|
2024-02-26 20:18:24
|
Shrikant Sharat Kandula
|
ci: Don't print curl command output in server-build
| false
|
Don't print curl command output in server-build
|
ci
|
diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
index 891bfd8a1b4a..67fc66fbbbd6 100644
--- a/.github/workflows/server-build.yml
+++ b/.github/workflows/server-build.yml
@@ -190,9 +190,11 @@ jobs:
)"
echo "$content" >> "$GITHUB_STEP_SUMMARY"
# Add a comment to the PR with the list of failed tests.
- curl --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+ curl --silent --show-error \
+ --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
--data "$(jq -n --arg body "$content" '$ARGS.named')" \
- "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments"
+ "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments" \
+ > /dev/null
fi
exit 1
fi
|
0288f79b70ef06aede09bbee7bd60542796ea320
|
2022-02-08 21:46:16
|
haojin111
|
fix: added missed analytic events for git sync (#10953)
| false
|
added missed analytic events for git sync (#10953)
|
fix
|
diff --git a/app/client/src/components/ads/TextInput.tsx b/app/client/src/components/ads/TextInput.tsx
index a9a85a83a488..d7417c7c78cd 100644
--- a/app/client/src/components/ads/TextInput.tsx
+++ b/app/client/src/components/ads/TextInput.tsx
@@ -72,6 +72,8 @@ export type TextInputProps = CommonComponentProps & {
onFocus?: EventHandler<FocusEvent<any>>;
errorMsg?: string;
trimValue?: boolean;
+ $padding?: string;
+ useTextArea?: boolean;
};
type boxReturnType = {
@@ -146,8 +148,11 @@ const StyledInput = styled((props) => {
"noCaret",
"fill",
"errorMsg",
+ "useTextArea",
];
+ const HtmlTag = props.useTextArea ? "textarea" : "input";
+
return props.asyncControl ? (
<AsyncControllableInput
{..._.omit(inputProps, omitProps)}
@@ -155,7 +160,7 @@ const StyledInput = styled((props) => {
inputRef={inputRef}
/>
) : (
- <input ref={inputRef} {..._.omit(inputProps, omitProps)} />
+ <HtmlTag ref={inputRef} {..._.omit(inputProps, omitProps)} />
);
})<
TextInputProps & {
@@ -178,6 +183,7 @@ const StyledInput = styled((props) => {
box-shadow: none;
border: none;
padding: 0px ${(props) => props.theme.spaces[6]}px;
+ ${(props) => (props.$padding ? `padding: ${props.$padding}` : "")};
padding-right: ${(props) =>
props.rightSideComponentWidth + props.theme.spaces[6]}px;
background-color: transparent;
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 4d2c5b874e6e..99e4b7b70e64 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -418,7 +418,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
const appNameWrapperRef = useRef<HTMLDivElement>(null);
const applicationId = props.application?.id;
- const showGitBadge = props.application?.gitApplicationMetadata;
+ const showGitBadge = props.application?.gitApplicationMetadata?.branchName;
useEffect(() => {
let colorCode;
diff --git a/app/client/src/pages/Editor/BottomBar/index.tsx b/app/client/src/pages/Editor/BottomBar/index.tsx
index 03e7252e3b62..d572a2aa3673 100644
--- a/app/client/src/pages/Editor/BottomBar/index.tsx
+++ b/app/client/src/pages/Editor/BottomBar/index.tsx
@@ -6,7 +6,6 @@ import { DebuggerTrigger } from "components/editorComponents/Debugger";
import { Colors } from "constants/Colors";
const Container = styled.div`
- position: relative;
width: 100%;
height: ${(props) => props.theme.bottomBarHeight};
display: flex;
@@ -16,9 +15,9 @@ const Container = styled.div`
border-top: solid 1px ${Colors.MERCURY};
`;
-export default function BottomBar() {
+export default function BottomBar(props: { className?: string }) {
return (
- <Container>
+ <Container className={props.className ?? ""}>
<QuickGitActions />
<DebuggerTrigger />
</Container>
diff --git a/app/client/src/pages/Editor/MainContainer.tsx b/app/client/src/pages/Editor/MainContainer.tsx
index 7bb414013119..f74ce8fb7d53 100644
--- a/app/client/src/pages/Editor/MainContainer.tsx
+++ b/app/client/src/pages/Editor/MainContainer.tsx
@@ -1,6 +1,6 @@
import styled from "styled-components";
import * as Sentry from "@sentry/react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
import React, { useState, useCallback } from "react";
import { Route, Switch } from "react-router";
@@ -12,6 +12,8 @@ import { updateExplorerWidthAction } from "actions/explorerActions";
import { BUILDER_CHECKLIST_URL, BUILDER_URL } from "constants/routes";
import OnboardingChecklist from "./FirstTimeUserOnboarding/Checklist";
import EntityExplorerSidebar from "components/editorComponents/Sidebar";
+import classNames from "classnames";
+import { previewModeSelector } from "selectors/editorSelectors";
const SentryRoute = Sentry.withSentryRouting(Route);
@@ -47,6 +49,8 @@ function MainContainer() {
dispatch(updateExplorerWidthAction(sidebarWidth));
}, [sidebarWidth]);
+ const isPreviewMode = useSelector(previewModeSelector);
+
return (
<>
<Container className="w-full overflow-x-hidden">
@@ -70,7 +74,13 @@ function MainContainer() {
</Switch>
</div>
</Container>
- <BottomBar />
+ <BottomBar
+ className={classNames({
+ "translate-y-full fixed bottom-0": isPreviewMode,
+ "translate-y-0 relative opacity-100": !isPreviewMode,
+ "transition-all transform duration-400": true,
+ })}
+ />
</>
);
}
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
index a1ea38c9bc01..c329e655c720 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
@@ -15,6 +15,7 @@ import Tooltip from "components/ads/Tooltip";
import { Position } from "@blueprintjs/core";
import { isEllipsisActive } from "utils/helpers";
import { getGitStatus } from "selectors/gitSyncSelectors";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const ButtonContainer = styled.div`
display: flex;
@@ -61,6 +62,11 @@ function BranchButton() {
modifiers={{ offset: { enabled: true, options: { offset: [7, 10] } } }}
onInteraction={(nextState: boolean) => {
setIsOpen(nextState);
+ if (nextState) {
+ AnalyticsUtil.logEvent("GS_OPEN_BRANCH_LIST_POPUP", {
+ source: "BOTTOM_BAR_ACTIVE_BRANCH_NAME",
+ });
+ }
}}
placement="top-start"
>
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
index 270af56e4b46..914ddf44b135 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
@@ -303,7 +303,7 @@ export default function QuickGitActions() {
tab: GitSyncModalTab.GIT_CONNECTION,
}),
);
- AnalyticsUtil.logEvent("GS_CONNECT_GIT_CLICK", {
+ AnalyticsUtil.logEvent("GS_SETTING_CLICK", {
source: "BOTTOM_BAR_GIT_SETTING_BUTTON",
});
},
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
index 6b0378a4b88d..547a1c95ad4e 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
@@ -58,6 +58,7 @@ import { isMac } from "utils/helpers";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { getApplicationLastDeployedAt } from "selectors/editorSelectors";
import GIT_ERROR_CODES from "constants/GitErrorCodes";
+import useAutoGrow from "utils/hooks/useAutoGrow";
const Section = styled.div`
margin-bottom: ${(props) => props.theme.spaces[11]}px;
@@ -129,6 +130,9 @@ function Deploy() {
const dispatch = useDispatch();
const handleCommit = (doPush: boolean) => {
+ AnalyticsUtil.logEvent("GS_COMMIT_AND_PUSH_BUTTON_CLICK", {
+ source: "GIT_DEPLOY_MODAL",
+ });
if (currentBranch) {
dispatch(
commitToRepoInit({
@@ -140,6 +144,9 @@ function Deploy() {
};
const handlePull = () => {
+ AnalyticsUtil.logEvent("GS_PULL_GIT_CLICK", {
+ source: "GIT_DEPLOY_MODAL",
+ });
if (currentBranch) {
dispatch(gitPullInit());
}
@@ -184,6 +191,8 @@ function Deploy() {
const gitConflictDocumentUrl = useSelector(getConflictFoundDocUrlDeploy);
+ const autogrowHeight = useAutoGrow(commitMessageDisplay, 37);
+
return (
<Container>
<Title>{createMessage(DEPLOY_YOUR_APPLICATION)}</Title>
@@ -202,12 +211,15 @@ function Deploy() {
}}
>
<TextInput
+ $padding="8px 14px"
autoFocus
disabled={commitInputDisabled}
fill
+ height={`${Math.min(autogrowHeight, 80)}px`}
onChange={setCommitMessage}
ref={commitInputRef}
trimValue={false}
+ useTextArea
value={commitMessageDisplay}
/>
</SubmitWrapper>
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
index 87b19f213003..c574bf027826 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
@@ -53,6 +53,7 @@ import { Colors } from "constants/Colors";
import { useTheme } from "styled-components";
import { Theme } from "constants/DefaultTheme";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const Row = styled.div`
display: flex;
@@ -160,6 +161,9 @@ export default function Merge() {
};
const mergeHandler = useCallback(() => {
+ AnalyticsUtil.logEvent("GS_MERGE_CHANGES_BUTTON_CLICK", {
+ source: "GIT_MERGE_MODAL",
+ });
if (currentBranch && selectedBranchOption.value) {
dispatch(
mergeBranchInit({
diff --git a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
index 4527b8f8c6a7..1a52c88c8ca1 100644
--- a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
@@ -45,6 +45,7 @@ import { getIsStartingWithRemoteBranches } from "pages/Editor/gitSync/utils";
import SegmentHeader from "components/ads/ListSegmentHeader";
import BetaTag from "./BetaTag";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const ListContainer = styled.div`
flex: 1;
@@ -380,8 +381,12 @@ export default function BranchList(props: {
setIsPopupOpen?: (flag: boolean) => void;
}) {
const dispatch = useDispatch();
- const pruneAndFetchBranches = () =>
+ const pruneAndFetchBranches = () => {
+ AnalyticsUtil.logEvent("GS_SYNC_BRANCHES", {
+ source: "BRANCH_LIST_POPUP_FROM_BOTTOM_BAR",
+ });
dispatch(fetchBranchesInit({ pruneBranches: true }));
+ };
const branches = useSelector(getGitBranches);
const branchNames = useSelector(getGitBranchNames);
@@ -416,6 +421,9 @@ export default function BranchList(props: {
const handleCreateNewBranch = () => {
if (isCreatingNewBranch) return;
+ AnalyticsUtil.logEvent("GS_CREATE_NEW_BRANCH", {
+ source: "BRANCH_LIST_POPUP_FROM_BOTTOM_BAR",
+ });
const branch = searchText;
setIsCreatingNewBranch(true);
dispatch(
diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
index 18c263787f24..5afca96f50a8 100644
--- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
@@ -21,6 +21,7 @@ import { Colors } from "constants/Colors";
import SuccessTick from "pages/common/SuccessTick";
import { howMuchTimeBeforeText } from "utils/helpers";
import { getApplicationLastDeployedAt } from "selectors/editorSelectors";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const Container = styled.div`
display: flex;
@@ -67,6 +68,9 @@ export default function DeployPreview(props: { showSuccess: boolean }) {
const lastDeployedAt = useSelector(getApplicationLastDeployedAt);
const showDeployPreview = () => {
+ AnalyticsUtil.logEvent("GS_LAST_DEPLOYED_PREVIEW_LINK_CLICK", {
+ source: "GIT_DEPLOY_MODAL",
+ });
const path = getApplicationViewerPageURL({ applicationId, pageId });
window.open(path, "_blank");
};
diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/utils/AnalyticsUtil.tsx
index 1b6c55127aed..c0583957d630 100644
--- a/app/client/src/utils/AnalyticsUtil.tsx
+++ b/app/client/src/utils/AnalyticsUtil.tsx
@@ -168,14 +168,21 @@ export type EventName =
| "SIGNPOSTING_PUBLISH_CLICK"
| "SIGNPOSTING_BUILD_APP_CLICK"
| "SIGNPOSTING_WELCOME_TOUR_CLICK"
+ | "GS_OPEN_BRANCH_LIST_POPUP"
+ | "GS_CREATE_NEW_BRANCH"
+ | "GS_SYNC_BRANCHES"
| "GS_CONNECT_GIT_CLICK"
+ | "GS_SETTING_CLICK"
| "GS_DISCONNECT_GIT_CLICK"
+ | "GS_COMMIT_AND_PUSH_BUTTON_CLICK"
+ | "GS_LAST_DEPLOYED_PREVIEW_LINK_CLICK"
| "GS_PULL_GIT_CLICK"
| "GS_DEPLOY_GIT_CLICK"
| "GS_DEPLOY_GIT_MODAL_TRIGGERED"
| "GS_MERGE_GIT_MODAL_TRIGGERED"
| "GS_REPO_LIMIT_ERROR_MODAL_TRIGGERED"
| "GS_GIT_DOCUMENTATION_LINK_CLICK"
+ | "GS_MERGE_CHANGES_BUTTON_CLICK"
| "GS_REPO_URL_EDIT"
| "GS_MATCHING_REPO_NAME_ON_GIT_DISCONNECT_MODAL"
| "GS_GENERATE_KEY_BUTTON_CLICK"
diff --git a/app/client/src/utils/hooks/useAutoGrow.tsx b/app/client/src/utils/hooks/useAutoGrow.tsx
index 992df4072c15..6696b3f14703 100644
--- a/app/client/src/utils/hooks/useAutoGrow.tsx
+++ b/app/client/src/utils/hooks/useAutoGrow.tsx
@@ -1,30 +1,21 @@
-import { useEffect } from "react";
-import { useSpring } from "react-spring";
+import { useEffect, useState } from "react";
-const useAutoGrow = (ref: HTMLInputElement | HTMLTextAreaElement | null) => {
- const [springHeight, setHeight] = useSpring(() => ({ height: 24 }));
- const handleKeyDown = () => {
- // TODO move to a separate hook
+const useAutoGrow = (value: string, defaultHeight?: number) => {
+ const [height, setHeight] = useState(defaultHeight || 24);
+ const handleValueChange = () => {
setTimeout(() => {
- if (ref) {
- // need to reset the height so that
- // the input shrinks as well on removing lines
- setHeight({ height: 0 });
- setHeight({
- height: ref?.scrollHeight || 0,
- });
- }
+ const numberOfLineBreaks = (value.match(/\n/g) || []).length;
+ // defaultHeight + lines x line-height
+ const newHeight = (defaultHeight || 24) + numberOfLineBreaks * 20;
+ setHeight(newHeight);
});
};
useEffect(() => {
- ref?.addEventListener("keydown", handleKeyDown);
- return () => {
- ref?.removeEventListener("keydown", handleKeyDown);
- };
- }, [ref]);
+ handleValueChange();
+ }, [value]);
- return springHeight.height;
+ return height;
};
export default useAutoGrow;
|
be5a66328b99d234d59bc4b276ed7ec1c7760214
|
2023-11-23 11:30:02
|
Aishwarya-U-R
|
test: Cypress | Skip test to unblock CI (#29052)
| false
|
Cypress | Skip test to unblock CI (#29052)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
index c27fe53dd7a4..2090ced6a6ef 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
@@ -255,7 +255,7 @@ describe("Import and validate older app (app created in older versions of Appsmi
agHelper.Sleep(2000);
});
- it("4. Edit JSObject & Check Updated Data ", () => {
+ it.skip("4. Edit JSObject & Check Updated Data ", () => {
deployMode.NavigateBacktoEditor();
//Edit existing JS object
entityExplorer.SelectEntityByName("users", "Queries/JS");
|
7199a329a9dddd4b4afd4f1f31197b9f07ed7c1b
|
2022-05-11 11:43:28
|
NandanAnantharamu
|
test: Theme related tests (#12740)
| false
|
Theme related tests (#12740)
|
test
|
diff --git a/app/client/cypress/fixtures/ThemeAppdsl.json b/app/client/cypress/fixtures/ThemeAppdsl.json
new file mode 100644
index 000000000000..7131871a00c8
--- /dev/null
+++ b/app/client/cypress/fixtures/ThemeAppdsl.json
@@ -0,0 +1,1099 @@
+{
+ "dsl": {
+ "widgetName": "MainContainer",
+ "backgroundColor": "none",
+ "rightColumn": 4896,
+ "snapColumns": 64,
+ "detachFromLayout": true,
+ "widgetId": "0",
+ "topRow": 0,
+ "bottomRow": 5120,
+ "containerStyle": "none",
+ "snapRows": 128,
+ "parentRowSpace": 1,
+ "type": "CANVAS_WIDGET",
+ "canExtend": true,
+ "version": 58,
+ "minHeight": 1292,
+ "parentColumnSpace": 1,
+ "dynamicBindingPathList": [],
+ "leftColumn": 0,
+ "children": [
+ {
+ "widgetName": "Form1",
+ "backgroundColor": "white",
+ "rightColumn": 32,
+ "widgetId": "wbo3g8llkl",
+ "topRow": 0,
+ "bottomRow": 52,
+ "parentRowSpace": 40,
+ "isVisible": true,
+ "type": "FORM_WIDGET",
+ "parentId": "0",
+ "blueprint": {
+ "view": [
+ {
+ "type": "CANVAS_WIDGET",
+ "position": {
+ "top": 0,
+ "left": 0
+ },
+ "props": {
+ "containerStyle": "none",
+ "canExtend": false,
+ "detachFromLayout": true,
+ "children": [],
+ "blueprint": {
+ "view": [
+ {
+ "type": "TEXT_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 12
+ },
+ "position": {
+ "top": 0,
+ "left": 0
+ },
+ "props": {
+ "text": "Form",
+ "textStyle": "HEADING"
+ }
+ },
+ {
+ "type": "FORM_BUTTON_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 4
+ },
+ "position": {
+ "top": 11,
+ "left": 12
+ },
+ "props": {
+ "text": "Submit",
+ "buttonStyle": "PRIMARY_BUTTON",
+ "disabledWhenInvalid": true,
+ "resetFormOnClick": true
+ }
+ },
+ {
+ "type": "FORM_BUTTON_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 4
+ },
+ "position": {
+ "top": 11,
+ "left": 8
+ },
+ "props": {
+ "text": "Reset",
+ "buttonStyle": "SECONDARY_BUTTON",
+ "disabledWhenInvalid": false,
+ "resetFormOnClick": true
+ }
+ }
+ ]
+ }
+ }
+ }
+ ]
+ },
+ "isLoading": false,
+ "parentColumnSpace": 74,
+ "leftColumn": 4,
+ "children": [
+ {
+ "widgetName": "Canvas1",
+ "rightColumn": 2072,
+ "detachFromLayout": true,
+ "widgetId": "4lvpg75cy5",
+ "containerStyle": "none",
+ "topRow": 0,
+ "bottomRow": 2080,
+ "parentRowSpace": 1,
+ "isVisible": true,
+ "canExtend": false,
+ "type": "CANVAS_WIDGET",
+ "parentId": "wbo3g8llkl",
+ "blueprint": {
+ "view": [
+ {
+ "type": "TEXT_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 12
+ },
+ "position": {
+ "top": 0,
+ "left": 0
+ },
+ "props": {
+ "text": "Form",
+ "textStyle": "HEADING"
+ }
+ },
+ {
+ "type": "FORM_BUTTON_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 4
+ },
+ "position": {
+ "top": 11,
+ "left": 12
+ },
+ "props": {
+ "text": "Submit",
+ "buttonStyle": "PRIMARY_BUTTON",
+ "disabledWhenInvalid": true,
+ "resetFormOnClick": true
+ }
+ },
+ {
+ "type": "FORM_BUTTON_WIDGET",
+ "size": {
+ "rows": 1,
+ "cols": 4
+ },
+ "position": {
+ "top": 11,
+ "left": 8
+ },
+ "props": {
+ "text": "Reset",
+ "buttonStyle": "SECONDARY_BUTTON",
+ "disabledWhenInvalid": false,
+ "resetFormOnClick": true
+ }
+ }
+ ]
+ },
+ "minHeight": 520,
+ "isLoading": false,
+ "parentColumnSpace": 1,
+ "leftColumn": 0,
+ "children": [
+ {
+ "widgetName": "Text1",
+ "rightColumn": 48,
+ "textAlign": "LEFT",
+ "widgetId": "9td4cv935h",
+ "topRow": 0,
+ "bottomRow": 4,
+ "isVisible": true,
+ "type": "TEXT_WIDGET",
+ "parentId": "4lvpg75cy5",
+ "isLoading": false,
+ "leftColumn": 0,
+ "text": "Form",
+ "version": 1,
+ "dynamicBindingPathList": [],
+ "fontSize": "1.5rem",
+ "fontStyle": "BOLD",
+ "textColor": "#231F20",
+ "overflow": "NONE",
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "dynamicPropertyPathList": [
+ {
+ "key": "fontSize"
+ }
+ ],
+ "labelTextSize": "0.875rem"
+ },
+ {
+ "resetFormOnClick": true,
+ "widgetName": "FormButton1",
+ "rightColumn": 64,
+ "isDefaultClickDisabled": true,
+ "widgetId": "d520h86aol",
+ "topRow": 44,
+ "bottomRow": 48,
+ "isVisible": true,
+ "type": "FORM_BUTTON_WIDGET",
+ "parentId": "4lvpg75cy5",
+ "isLoading": false,
+ "disabledWhenInvalid": true,
+ "leftColumn": 48,
+ "text": "Submit",
+ "version": 1,
+ "dynamicBindingPathList": [],
+ "buttonColor": "#03B365",
+ "buttonVariant": "PRIMARY",
+ "recaptchaType": "V3",
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem"
+ },
+ {
+ "resetFormOnClick": true,
+ "widgetName": "FormButton2",
+ "rightColumn": 48,
+ "isDefaultClickDisabled": true,
+ "widgetId": "2vqmk6ca6e",
+ "topRow": 44,
+ "bottomRow": 48,
+ "isVisible": true,
+ "type": "FORM_BUTTON_WIDGET",
+ "parentId": "4lvpg75cy5",
+ "isLoading": false,
+ "disabledWhenInvalid": false,
+ "leftColumn": 32,
+ "text": "Reset",
+ "version": 1,
+ "dynamicBindingPathList": [],
+ "buttonColor": "#03B365",
+ "buttonVariant": "PRIMARY",
+ "recaptchaType": "V3",
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem"
+ },
+ {
+ "widgetName": "Input1",
+ "rightColumn": 24,
+ "widgetId": "a7hpuqqo8r",
+ "topRow": 4,
+ "bottomRow": 8,
+ "parentRowSpace": 40,
+ "isVisible": true,
+ "label": "",
+ "type": "INPUT_WIDGET_V2",
+ "parentId": "4lvpg75cy5",
+ "isLoading": false,
+ "parentColumnSpace": 29.875,
+ "leftColumn": 4,
+ "dynamicBindingPathList": [
+ {
+ "key": "accentColor"
+ },
+ {
+ "key": "defaultText"
+ }
+ ],
+ "inputType": "TEXT",
+ "defaultText": "{{Table1.selectedRow.id}}",
+ "version": 1,
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "dynamicTriggerPathList": []
+ },
+ {
+ "widgetName": "Input2",
+ "rightColumn": 24,
+ "widgetId": "vwe9oyg9x1",
+ "topRow": 12,
+ "bottomRow": 16,
+ "parentRowSpace": 40,
+ "isVisible": true,
+ "label": "",
+ "type": "INPUT_WIDGET_V2",
+ "parentId": "4lvpg75cy5",
+ "isLoading": false,
+ "parentColumnSpace": 29.875,
+ "leftColumn": 4,
+ "dynamicBindingPathList": [
+ {
+ "key": "defaultText"
+ },
+ {
+ "key": "accentColor"
+ }
+ ],
+ "inputType": "TEXT",
+ "defaultText": "{{Input1.text}}",
+ "version": 1,
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}"
+ }
+ ],
+ "version": 1,
+ "dynamicBindingPathList": [],
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem"
+ }
+ ],
+ "version": 1,
+ "dynamicBindingPathList": [],
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem"
+ },
+ {
+ "widgetName": "Table1",
+ "rightColumn": 64,
+ "widgetId": "tmkhgmgtzp",
+ "topRow": 12,
+ "bottomRow": 40,
+ "parentRowSpace": 10,
+ "tableData": "{{[\n {\n \"id\": 2381224,\n \"email\": \"[email protected]\",\n \"userName\": \"Michael Lawson\",\n \"productName\": \"Chicken Sandwich\",\n \"orderAmount\": 4.99\n },\n {\n \"id\": 2736212,\n \"email\": \"[email protected]\",\n \"userName\": \"Lindsay Ferguson\",\n \"productName\": \"Tuna Salad\",\n \"orderAmount\": 9.99\n },\n {\n \"id\": 6788734,\n \"email\": \"[email protected]\",\n \"userName\": \"Tobias Funke\",\n \"productName\": \"Beef steak\",\n \"orderAmount\": 19.99\n }\n]}}",
+ "isVisible": true,
+ "label": "Data",
+ "searchKey": "",
+ "type": "TABLE_WIDGET",
+ "parentId": "0",
+ "isLoading": false,
+ "parentColumnSpace": 74,
+ "leftColumn": 32,
+ "dynamicBindingPathList": [
+ {
+ "key": "tableData"
+ },
+ {
+ "key": "accentColor"
+ },
+ {
+ "key": "primaryColumns.id.computedValue"
+ },
+ {
+ "key": "primaryColumns.email.computedValue"
+ },
+ {
+ "key": "primaryColumns.userName.computedValue"
+ },
+ {
+ "key": "primaryColumns.productName.computedValue"
+ },
+ {
+ "key": "primaryColumns.orderAmount.computedValue"
+ }
+ ],
+ "migrated": true,
+ "primaryColumns": {
+ "id": {
+ "index": 0,
+ "width": 150,
+ "id": "id",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "REGULAR",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "id",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.id))}}",
+ "cellBackground": ""
+ },
+ "email": {
+ "index": 1,
+ "width": 150,
+ "id": "email",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "REGULAR",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "email",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.email))}}",
+ "cellBackground": ""
+ },
+ "userName": {
+ "index": 2,
+ "width": 150,
+ "id": "userName",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "REGULAR",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "userName",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.userName))}}",
+ "cellBackground": ""
+ },
+ "productName": {
+ "index": 3,
+ "width": 150,
+ "id": "productName",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "REGULAR",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "productName",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.productName))}}",
+ "cellBackground": ""
+ },
+ "orderAmount": {
+ "index": 4,
+ "width": 150,
+ "id": "orderAmount",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "REGULAR",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "orderAmount",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.orderAmount))}}",
+ "cellBackground": ""
+ }
+ },
+ "dynamicTriggerPathList": [],
+ "textSize": "0.875rem",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "fontStyle": "REGULAR",
+ "derivedColumns": {},
+ "version": 3,
+ "isVisibleSearch": true,
+ "isVisibleFilters": true,
+ "isVisibleDownload": true,
+ "isVisiblePagination": true,
+ "delimiter": ",",
+ "columnOrder": [
+ "id",
+ "email",
+ "userName",
+ "productName",
+ "orderAmount"
+ ],
+ "isSortable": true,
+ "borderRadius": "0px",
+ "boxShadow": "none",
+ "labelTextSize": "0.875rem",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "childStylesheet": {
+ "button": {
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none"
+ },
+ "menuButton": {
+ "menuColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none"
+ },
+ "iconButton": {
+ "menuColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none"
+ }
+ }
+ },
+ {
+ "isVisible": true,
+ "backgroundColor": "transparent",
+ "itemBackgroundColor": "#FFFFFF",
+ "animateLoading": true,
+ "gridType": "vertical",
+ "template": {
+ "Image1": {
+ "isVisible": true,
+ "defaultImage": "https://assets.appsmith.com/widgets/default.png",
+ "imageShape": "RECTANGLE",
+ "maxZoomLevel": 1,
+ "enableRotation": false,
+ "enableDownload": false,
+ "objectFit": "cover",
+ "image": "{{List1.listData.map((currentItem) => currentItem.img)}}",
+ "widgetName": "Image1",
+ "version": 1,
+ "animateLoading": true,
+ "type": "IMAGE_WIDGET",
+ "hideCard": false,
+ "displayName": "Image",
+ "key": "hhsksa1xfd",
+ "iconSVG": "/static/media/icon.52d8fb96.svg",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "image"
+ },
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "fontFamily"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "wvqnxtv64v",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+ "isLoading": false,
+ "leftColumn": 0,
+ "rightColumn": 16,
+ "topRow": 0,
+ "bottomRow": 8,
+ "parentId": "dc5k61m9ju"
+ },
+ "Text2": {
+ "isVisible": true,
+ "text": "{{List1.listData.map((currentItem) => currentItem.name)}}",
+ "fontSize": "1rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text2",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "displayName": "Text",
+ "key": "3w4tjd913f",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "textStyle": "HEADING",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "text"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "egjawkzn9v",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 16,
+ "rightColumn": 28,
+ "topRow": 0,
+ "bottomRow": 4,
+ "parentId": "dc5k61m9ju"
+ },
+ "Text3": {
+ "isVisible": true,
+ "text": "{{List1.listData.map((currentItem) => currentItem.id)}}",
+ "fontSize": "1rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text3",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "displayName": "Text",
+ "key": "3w4tjd913f",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "textStyle": "BODY",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "text"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "nga5glnz0u",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 16,
+ "rightColumn": 24,
+ "topRow": 4,
+ "bottomRow": 8,
+ "parentId": "dc5k61m9ju"
+ }
+ },
+ "enhancements": true,
+ "gridGap": 0,
+ "listData": [
+ {
+ "id": "001",
+ "name": "Blue",
+ "img": "https://assets.appsmith.com/widgets/default.png"
+ },
+ {
+ "id": "002",
+ "name": "Green",
+ "img": "https://assets.appsmith.com/widgets/default.png"
+ },
+ {
+ "id": "003",
+ "name": "Red",
+ "img": "https://assets.appsmith.com/widgets/default.png"
+ }
+ ],
+ "widgetName": "List1",
+ "children": [
+ {
+ "isVisible": true,
+ "widgetName": "Canvas2",
+ "version": 1,
+ "detachFromLayout": true,
+ "type": "CANVAS_WIDGET",
+ "hideCard": true,
+ "displayName": "Canvas",
+ "key": "sljjzahlk7",
+ "containerStyle": "none",
+ "canExtend": false,
+ "dropDisabled": true,
+ "openParentPropertyPane": true,
+ "noPad": true,
+ "children": [
+ {
+ "isVisible": true,
+ "backgroundColor": "white",
+ "widgetName": "Container1",
+ "containerStyle": "card",
+ "borderColor": "transparent",
+ "borderWidth": "0",
+ "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
+ "animateLoading": true,
+ "children": [
+ {
+ "isVisible": true,
+ "widgetName": "Canvas3",
+ "version": 1,
+ "detachFromLayout": true,
+ "type": "CANVAS_WIDGET",
+ "hideCard": true,
+ "displayName": "Canvas",
+ "key": "sljjzahlk7",
+ "containerStyle": "none",
+ "canExtend": false,
+ "children": [
+ {
+ "isVisible": true,
+ "defaultImage": "https://assets.appsmith.com/widgets/default.png",
+ "imageShape": "RECTANGLE",
+ "maxZoomLevel": 1,
+ "enableRotation": false,
+ "enableDownload": false,
+ "objectFit": "cover",
+ "image": "{{currentItem.img}}",
+ "widgetName": "Image1",
+ "version": 1,
+ "animateLoading": true,
+ "type": "IMAGE_WIDGET",
+ "hideCard": false,
+ "displayName": "Image",
+ "key": "hhsksa1xfd",
+ "iconSVG": "/static/media/icon.52d8fb96.svg",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "image"
+ },
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "fontFamily"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "wvqnxtv64v",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+ "isLoading": false,
+ "leftColumn": 0,
+ "rightColumn": 16,
+ "topRow": 0,
+ "bottomRow": 8,
+ "parentId": "dc5k61m9ju",
+ "logBlackList": {
+ "isVisible": true,
+ "defaultImage": true,
+ "imageShape": true,
+ "maxZoomLevel": true,
+ "enableRotation": true,
+ "enableDownload": true,
+ "objectFit": true,
+ "image": true,
+ "widgetName": true,
+ "version": true,
+ "animateLoading": true,
+ "type": true,
+ "hideCard": true,
+ "displayName": true,
+ "key": true,
+ "iconSVG": true,
+ "isCanvas": true,
+ "boxShadow": true,
+ "dynamicBindingPathList": true,
+ "dynamicTriggerPathList": true,
+ "minHeight": true,
+ "widgetId": true,
+ "renderMode": true,
+ "borderRadius": true,
+ "fontFamily": true,
+ "isLoading": true,
+ "parentColumnSpace": true,
+ "parentRowSpace": true,
+ "leftColumn": true,
+ "rightColumn": true,
+ "topRow": true,
+ "bottomRow": true,
+ "parentId": true
+ }
+ },
+ {
+ "isVisible": true,
+ "text": "{{currentItem.name}}",
+ "fontSize": "1rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text2",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "displayName": "Text",
+ "key": "3w4tjd913f",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "textStyle": "HEADING",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "text"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "egjawkzn9v",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 16,
+ "rightColumn": 28,
+ "topRow": 0,
+ "bottomRow": 4,
+ "parentId": "dc5k61m9ju",
+ "logBlackList": {
+ "isVisible": true,
+ "text": true,
+ "fontSize": true,
+ "fontStyle": true,
+ "textAlign": true,
+ "textColor": true,
+ "truncateButtonColor": true,
+ "widgetName": true,
+ "shouldTruncate": true,
+ "overflow": true,
+ "version": true,
+ "animateLoading": true,
+ "type": true,
+ "hideCard": true,
+ "displayName": true,
+ "key": true,
+ "iconSVG": true,
+ "isCanvas": true,
+ "textStyle": true,
+ "boxShadow": true,
+ "dynamicBindingPathList": true,
+ "dynamicTriggerPathList": true,
+ "minHeight": true,
+ "widgetId": true,
+ "renderMode": true,
+ "borderRadius": true,
+ "isLoading": true,
+ "parentColumnSpace": true,
+ "parentRowSpace": true,
+ "leftColumn": true,
+ "rightColumn": true,
+ "topRow": true,
+ "bottomRow": true,
+ "parentId": true
+ }
+ },
+ {
+ "isVisible": true,
+ "text": "{{currentItem.id}}",
+ "fontSize": "1rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text3",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "displayName": "Text",
+ "key": "3w4tjd913f",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "textStyle": "BODY",
+ "boxShadow": "none",
+ "dynamicBindingPathList": [
+ {
+ "key": "text"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "dynamicTriggerPathList": [],
+ "widgetId": "nga5glnz0u",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 16,
+ "rightColumn": 24,
+ "topRow": 4,
+ "bottomRow": 8,
+ "parentId": "dc5k61m9ju",
+ "logBlackList": {
+ "isVisible": true,
+ "text": true,
+ "fontSize": true,
+ "fontStyle": true,
+ "textAlign": true,
+ "textColor": true,
+ "truncateButtonColor": true,
+ "widgetName": true,
+ "shouldTruncate": true,
+ "overflow": true,
+ "version": true,
+ "animateLoading": true,
+ "type": true,
+ "hideCard": true,
+ "displayName": true,
+ "key": true,
+ "iconSVG": true,
+ "isCanvas": true,
+ "textStyle": true,
+ "boxShadow": true,
+ "dynamicBindingPathList": true,
+ "dynamicTriggerPathList": true,
+ "minHeight": true,
+ "widgetId": true,
+ "renderMode": true,
+ "borderRadius": true,
+ "isLoading": true,
+ "parentColumnSpace": true,
+ "parentRowSpace": true,
+ "leftColumn": true,
+ "rightColumn": true,
+ "topRow": true,
+ "bottomRow": true,
+ "parentId": true
+ }
+ }
+ ],
+ "minHeight": null,
+ "widgetId": "dc5k61m9ju",
+ "renderMode": "CANVAS",
+ "boxShadow": "none",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "isLoading": false,
+ "parentColumnSpace": 1,
+ "parentRowSpace": 1,
+ "leftColumn": 0,
+ "rightColumn": null,
+ "topRow": 0,
+ "bottomRow": null,
+ "parentId": "jarbabtyl3",
+ "dynamicBindingPathList": [
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "accentColor"
+ }
+ ]
+ }
+ ],
+ "version": 1,
+ "type": "CONTAINER_WIDGET",
+ "hideCard": false,
+ "displayName": "Container",
+ "key": "d2mn2fri94",
+ "iconSVG": "/static/media/icon.1977dca3.svg",
+ "isCanvas": true,
+ "dragDisabled": true,
+ "isDeletable": false,
+ "disallowCopy": true,
+ "disablePropertyPane": true,
+ "openParentPropertyPane": true,
+ "widgetId": "jarbabtyl3",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 0,
+ "rightColumn": 64,
+ "topRow": 0,
+ "bottomRow": 12,
+ "parentId": "hxdm31vfo8",
+ "dynamicBindingPathList": [
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "boxShadow"
+ }
+ ]
+ }
+ ],
+ "minHeight": 400,
+ "widgetId": "hxdm31vfo8",
+ "renderMode": "CANVAS",
+ "boxShadow": "none",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "isLoading": false,
+ "parentColumnSpace": 1,
+ "parentRowSpace": 1,
+ "leftColumn": 0,
+ "rightColumn": 286.5,
+ "topRow": 0,
+ "bottomRow": 400,
+ "parentId": "g2pkscp895",
+ "dynamicBindingPathList": [
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "accentColor"
+ }
+ ]
+ }
+ ],
+ "type": "LIST_WIDGET",
+ "hideCard": false,
+ "displayName": "List",
+ "key": "9uwg26hg8f",
+ "iconSVG": "/static/media/icon.9925ee17.svg",
+ "isCanvas": true,
+ "widgetId": "g2pkscp895",
+ "renderMode": "CANVAS",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
+ "isLoading": false,
+ "parentColumnSpace": 11.9375,
+ "parentRowSpace": 10,
+ "leftColumn": 5,
+ "rightColumn": 29,
+ "topRow": 55,
+ "bottomRow": 95,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "accentColor"
+ },
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "boxShadow"
+ },
+ {
+ "key": "template.Image1.image"
+ },
+ {
+ "key": "template.Text2.text"
+ },
+ {
+ "key": "template.Text3.text"
+ }
+ ],
+ "privateWidgets": {
+ "Image1": true,
+ "Text2": true,
+ "Text3": true
+ },
+ "dynamicTriggerPathList": []
+ },
+ {
+ "isVisible": true,
+ "animateLoading": true,
+ "label": "Label",
+ "labelPosition": "Left",
+ "labelAlignment": "left",
+ "labelWidth": 5,
+ "options": [
+ {
+ "label": "Yes",
+ "value": "Y"
+ },
+ {
+ "label": "No",
+ "value": "N"
+ }
+ ],
+ "defaultOptionValue": "Y",
+ "isRequired": false,
+ "isDisabled": false,
+ "isInline": true,
+ "alignment": "left",
+ "widgetName": "RadioGroup1",
+ "version": 1,
+ "type": "RADIO_GROUP_WIDGET",
+ "hideCard": false,
+ "displayName": "Radio Group",
+ "key": "ysmkt4litb",
+ "iconSVG": "/static/media/icon.ba2b2ee0.svg",
+ "widgetId": "e31lpxhpg3",
+ "renderMode": "CANVAS",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "boxShadow": "none",
+ "isLoading": false,
+ "parentColumnSpace": 11.9375,
+ "parentRowSpace": 10,
+ "leftColumn": 39,
+ "rightColumn": 59,
+ "topRow": 2,
+ "bottomRow": 10,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "accentColor"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/fontData.json b/app/client/cypress/fixtures/fontData.json
new file mode 100644
index 000000000000..b8f7ade2bd2c
--- /dev/null
+++ b/app/client/cypress/fixtures/fontData.json
@@ -0,0 +1,15 @@
+{
+ "dropdownValues": [
+ "System Default",
+ "System Default",
+ "Nunito Sans",
+ "Poppins",
+ "Inter",
+ "Montserrat",
+ "Noto Sans",
+ "Open Sans",
+ "Roboto",
+ "Rubik",
+ "Ubuntu"
+ ]
+}
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_Default_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_Default_spec.js
new file mode 100644
index 000000000000..f9b4e8cc9a33
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_Default_spec.js
@@ -0,0 +1,121 @@
+const testdata = require("../../../../fixtures/testdata.json");
+const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+const explorer = require("../../../../locators/explorerlocators.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+const formWidgetsPage = require("../../../../locators/FormWidgets.json");
+const publish = require("../../../../locators/publishWidgetspage.json");
+const themelocator = require("../../../../locators/ThemeLocators.json");
+
+let themeBackgroudColor;
+let themeFont;
+
+describe("Theme validation for default data", function() {
+ it("Drag and drop form widget and validate Default color/font/shadow/border and list of font validation", function() {
+ cy.log("Login Successful");
+ cy.reload(); // To remove the rename tooltip
+ cy.get(explorer.addWidget).click();
+ cy.get(commonlocators.entityExplorersearch).should("be.visible");
+ cy.get(commonlocators.entityExplorersearch)
+ .clear()
+ .type("form");
+ cy.dragAndDropToCanvas("formwidget", { x: 300, y: 80 });
+ cy.wait("@updateLayout").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(3000);
+ cy.get(themelocator.canvas).click({ force: true });
+ cy.wait(2000);
+
+ //Border validation
+ //cy.contains("Border").click({ force: true });
+ cy.get(themelocator.border).should("have.length", "3");
+ cy.borderMouseover(0, "none");
+ cy.borderMouseover(1, "md");
+ cy.borderMouseover(2, "lg");
+ cy.contains("Border").click({ force: true });
+
+ //Shadow validation
+ //cy.contains("Shadow").click({ force: true });
+ cy.wait(2000);
+ cy.shadowMouseover(0, "none");
+ cy.shadowMouseover(1, "sm");
+ cy.shadowMouseover(2, "md");
+ cy.shadowMouseover(3, "lg");
+ cy.contains("Shadow").click({ force: true });
+
+ //Font
+ //cy.contains("Font").click({ force: true });
+ cy.get("span[name='expand-more']").then(($elem) => {
+ cy.get($elem).click({ force: true });
+ cy.wait(250);
+
+ cy.get(themelocator.fontsSelected)
+ .eq(0)
+ .should("have.text", "System Default");
+ });
+ cy.contains("Font").click({ force: true });
+
+ //Color
+ //cy.contains("Color").click({ force: true });
+ cy.wait(2000);
+ cy.colorMouseover(0, "Primary Color");
+ cy.validateColor(0, "#16a34a");
+ cy.colorMouseover(1, "Background Color");
+ cy.validateColor(1, "#F6F6F6");
+ });
+
+ it("Validate Default Theme change across application", function() {
+ cy.get(formWidgetsPage.formD).click();
+ cy.widgetText(
+ "FormTest",
+ formWidgetsPage.formWidget,
+ formWidgetsPage.formInner,
+ );
+ cy.get(widgetsPage.backgroundcolorPickerNew)
+ .first()
+ .click({ force: true });
+ cy.get("[style='background-color: rgb(21, 128, 61);']")
+ .last()
+ .click();
+ cy.wait(2000);
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(21, 128, 61)");
+ cy.get("#canvas-selection-0").click({ force: true });
+ //Change the Theme
+ cy.get(commonlocators.changeThemeBtn)
+ .should("be.visible")
+ .click({ force: true });
+ cy.get(".cursor-pointer:contains('Current Theme')").click({ force: true });
+ cy.get(".t--theme-card main > main")
+ .first()
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Submit')")
+ .last()
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ themeBackgroudColor = CurrentBackgroudColor;
+ });
+ });
+ });
+
+ it("Publish the App and validate Default Theme across the app", function() {
+ cy.PublishtheApp();
+ cy.get(".bp3-button:contains('Submit')")
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Edit App')")
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ expect(CurrentBackgroudColor).to.equal(themeBackgroudColor);
+ expect(selectedBackgroudColor).to.equal(themeBackgroudColor);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_MultiSelectWidget_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_MultiSelectWidget_spec.js
new file mode 100644
index 000000000000..22c66e0d7a35
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_MultiSelectWidget_spec.js
@@ -0,0 +1,181 @@
+const commonlocators = require("../../../../locators/commonlocators.json");
+const dsl = require("../../../../fixtures/ThemeAppdsl.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+const testdata = require("../../../../fixtures/testdata.json");
+const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const explorer = require("../../../../locators/explorerlocators.json");
+const formWidgetsPage = require("../../../../locators/FormWidgets.json");
+const publish = require("../../../../locators/publishWidgetspage.json");
+const themelocator = require("../../../../locators/ThemeLocators.json");
+
+let themeBackgroudColor;
+let themeFont;
+let themeColour;
+
+describe("Theme validation usecase for multi-select widget", function() {
+ it("Drag and drop multi-select widget and validate Default font and list of font validation", function() {
+ cy.log("Login Successful");
+ cy.reload(); // To remove the rename tooltip
+ cy.get(explorer.addWidget).click();
+ cy.get(commonlocators.entityExplorersearch).should("be.visible");
+ cy.get(commonlocators.entityExplorersearch)
+ .clear()
+ .type("multiselect");
+ cy.dragAndDropToCanvas("multiselectwidgetv2", { x: 300, y: 80 });
+ cy.wait("@updateLayout").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(3000);
+ cy.get(themelocator.canvas).click({ force: true });
+ cy.wait(2000);
+
+ //Border validation
+ //cy.contains("Border").click({ force: true });
+ cy.get(themelocator.border).should("have.length", "3");
+ cy.borderMouseover(0, "none");
+ cy.borderMouseover(1, "md");
+ cy.borderMouseover(2, "lg");
+ cy.get(themelocator.border)
+ .eq(1)
+ .click({ force: true });
+ cy.wait("@updateTheme").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(5000);
+ cy.contains("Border").click({ force: true });
+
+ //Shadow validation
+ //cy.contains("Shadow").click({ force: true });
+ cy.wait(2000);
+ cy.shadowMouseover(0, "none");
+ cy.shadowMouseover(1, "sm");
+ cy.shadowMouseover(2, "md");
+ cy.shadowMouseover(3, "lg");
+ cy.xpath(themelocator.shadow)
+ .eq(3)
+ .click({ force: true });
+ cy.wait("@updateTheme").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(5000);
+ cy.contains("Shadow").click({ force: true });
+
+ //Font
+ cy.get("span[name='expand-more']").then(($elem) => {
+ cy.get($elem).click({ force: true });
+ cy.wait(250);
+ cy.fixture("fontData").then(function(testdata) {
+ this.testdata = testdata;
+ });
+
+ cy.get(themelocator.fontsSelected)
+ .eq(0)
+ .should("have.text", "System Default");
+
+ cy.get(themelocator.fontsSelected).each(($ele, i) => {
+ //cy.log($ele);
+ expect($ele).to.have.text(this.testdata.dropdownValues[i]);
+ });
+ cy.get(".ads-dropdown-options-wrapper div")
+ .children()
+ .eq(2)
+ .then(($childElem) => {
+ cy.get($childElem).click({ force: true });
+ cy.get(".t--draggable-multiselectwidgetv2:contains('more')").should(
+ "have.css",
+ "font-family",
+ $childElem
+ .children()
+ .last()
+ .text(),
+ );
+ themeFont = $childElem
+ .children()
+ .last()
+ .text();
+ });
+ });
+ cy.contains("Font").click({ force: true });
+
+ //Color
+ cy.wait(3000);
+ cy.get(themelocator.color)
+ .eq(0)
+ .click({ force: true });
+ cy.get(themelocator.inputColor).clear();
+ cy.get(themelocator.inputColor).type("purple");
+ cy.get(themelocator.inputColor).should("have.value", "purple");
+ cy.get(themelocator.color)
+ .eq(1)
+ .click({ force: true });
+ cy.get(themelocator.inputColor).clear();
+ cy.get(themelocator.inputColor).type("brown");
+ cy.get(themelocator.inputColor).should("have.value", "brown");
+ cy.wait(2000);
+ cy.contains("Color").click({ force: true });
+ });
+
+ it("Publish the App and validate Font across the app", function() {
+ cy.PublishtheApp();
+ cy.get(".rc-select-selection-item > .rc-select-selection-item-content")
+ .first()
+ .should("have.css", "font-family", themeFont);
+ cy.get(".rc-select-selection-item > .rc-select-selection-item-content")
+ .last()
+ .should("have.css", "font-family", themeFont);
+ cy.get(".bp3-button:contains('Edit App')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ cy.get(".bp3-button:contains('Share')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ });
+
+ it("Validate Default Theme change across application", function() {
+ cy.goToEditFromPublish();
+ cy.get("#canvas-selection-0").click({ force: true });
+ //Change the Theme
+ cy.get(commonlocators.changeThemeBtn)
+ .should("be.visible")
+ .click({ force: true });
+ cy.get(themelocator.currentTheme).click({ force: true });
+ cy.get(".t--theme-card main > main")
+ .first()
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".t--draggable-multiselectwidgetv2:contains('more')")
+ .last()
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect("rgba(0, 0, 0, 0)").to.equal(selectedBackgroudColor);
+ themeBackgroudColor = CurrentBackgroudColor;
+ themeColour = selectedBackgroudColor;
+ });
+ });
+ });
+
+ it("Publish the App and validate Default Theme across the app", function() {
+ cy.PublishtheApp();
+ cy.get(".rc-select-selection-item > .rc-select-selection-item-content")
+ .first()
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Edit App')")
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(themeColour);
+ expect(selectedBackgroudColor).to.equal(themeBackgroudColor);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_spec.js
new file mode 100644
index 000000000000..3ee63dcd09b8
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/Application_Theme_spec.js
@@ -0,0 +1,335 @@
+const testdata = require("../../../../fixtures/testdata.json");
+const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+const explorer = require("../../../../locators/explorerlocators.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+const formWidgetsPage = require("../../../../locators/FormWidgets.json");
+const publish = require("../../../../locators/publishWidgetspage.json");
+const themelocator = require("../../../../locators/ThemeLocators.json");
+
+let themeBackgroudColor;
+let themeFont;
+
+describe("Theme validation usecases", function() {
+ it("Drag and drop form widget and validate Default font and list of font validation", function() {
+ cy.log("Login Successful");
+ cy.reload(); // To remove the rename tooltip
+ cy.get(explorer.addWidget).click();
+ cy.get(commonlocators.entityExplorersearch).should("be.visible");
+ cy.get(commonlocators.entityExplorersearch)
+ .clear()
+ .type("form");
+ cy.dragAndDropToCanvas("formwidget", { x: 300, y: 80 });
+ cy.wait("@updateLayout").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(3000);
+ cy.get(themelocator.canvas).click({ force: true });
+ cy.wait(2000);
+
+ //Border validation
+ //cy.contains("Border").click({ force: true });
+ cy.get(themelocator.border).should("have.length", "3");
+ cy.borderMouseover(0, "none");
+ cy.borderMouseover(1, "md");
+ cy.borderMouseover(2, "lg");
+ cy.get(themelocator.border)
+ .eq(2)
+ .click({ force: true });
+ cy.wait("@updateTheme").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(5000);
+ cy.contains("Border").click({ force: true });
+
+ //Shadow validation
+ //cy.contains("Shadow").click({ force: true });
+ cy.shadowMouseover(0, "none");
+ cy.shadowMouseover(1, "sm");
+ cy.shadowMouseover(2, "md");
+ cy.shadowMouseover(3, "lg");
+ cy.xpath(themelocator.shadow)
+ .eq(3)
+ .click({ force: true });
+ cy.wait("@updateTheme").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.wait(5000);
+ cy.contains("Shadow").click({ force: true });
+
+ //Font
+ cy.get("span[name='expand-more']").then(($elem) => {
+ cy.get($elem).click({ force: true });
+ cy.wait(250);
+ cy.fixture("fontData").then(function(testdata) {
+ this.testdata = testdata;
+ });
+
+ cy.get(themelocator.fontsSelected)
+ .eq(0)
+ .should("have.text", "System Default");
+
+ cy.get(themelocator.fontsSelected).each(($ele, i) => {
+ //cy.log($ele);
+ expect($ele).to.have.text(this.testdata.dropdownValues[i]);
+ });
+ cy.get(".ads-dropdown-options-wrapper div")
+ .children()
+ .eq(2)
+ .then(($childElem) => {
+ cy.get($childElem).click({ force: true });
+ cy.get(
+ ".t--draggable-formbuttonwidget button :contains('Submit')",
+ ).should(
+ "have.css",
+ "font-family",
+ $childElem
+ .children()
+ .last()
+ .text(),
+ );
+ themeFont = $childElem
+ .children()
+ .last()
+ .text();
+ });
+ });
+ cy.contains("Font").click({ force: true });
+
+ //Color
+ //cy.contains("Color").click({ force: true });
+ cy.wait(2000);
+ cy.colorMouseover(0, "Primary Color");
+ cy.validateColor(0, "#16a34a");
+ cy.colorMouseover(1, "Background Color");
+ cy.validateColor(1, "#F6F6F6");
+
+ cy.get(themelocator.inputColor).click({ force: true });
+ cy.chooseColor(0, themelocator.greenColor);
+
+ cy.get(themelocator.inputColor).should("have.value", "#15803d");
+ cy.get(themelocator.inputColor).clear({ force: true });
+ cy.wait(2000);
+ cy.get(themelocator.inputColor).type("red");
+ cy.get(themelocator.inputColor).should("have.value", "red");
+ cy.wait(2000);
+
+ cy.get(themelocator.inputColor)
+ .eq(0)
+ .click({ force: true });
+ cy.get(themelocator.inputColor).click({ force: true });
+ cy.get('[data-testid="color-picker"]')
+ .first()
+ .click({ force: true });
+ cy.get("[style='background-color: rgb(21, 128, 61);']")
+ .last()
+ .click();
+ cy.wait(2000);
+ cy.get(themelocator.inputColor).should("have.value", "#15803d");
+ cy.get(themelocator.inputColor).clear({ force: true });
+ cy.wait(2000);
+ cy.get(themelocator.inputColor).type("Black");
+ cy.get(themelocator.inputColor).should("have.value", "Black");
+ cy.wait(2000);
+ cy.contains("Color").click({ force: true });
+ });
+
+ it("Publish the App and validate Font across the app", function() {
+ cy.PublishtheApp();
+ cy.get(".bp3-button:contains('Submit')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ cy.get(".bp3-button:contains('Edit App')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ cy.get(".bp3-button:contains('Share')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ cy.get(".bp3-button:contains('Reset')").should(
+ "have.css",
+ "font-family",
+ themeFont,
+ );
+ });
+
+ it("Validate Default Theme change across application", function() {
+ cy.goToEditFromPublish();
+ cy.get(formWidgetsPage.formD).click();
+ cy.widgetText(
+ "FormTest",
+ formWidgetsPage.formWidget,
+ formWidgetsPage.formInner,
+ );
+ cy.get(widgetsPage.backgroundcolorPickerNew)
+ .first()
+ .click({ force: true });
+ cy.get("[style='background-color: rgb(21, 128, 61);']")
+ .last()
+ .click();
+ cy.wait(2000);
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(21, 128, 61)");
+ cy.get("#canvas-selection-0").click({ force: true });
+ //Change the Theme
+ cy.get(commonlocators.changeThemeBtn)
+ .should("be.visible")
+ .click({ force: true });
+ cy.get(themelocator.currentTheme).click({ force: true });
+ cy.get(".t--theme-card main > main")
+ .first()
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Submit')")
+ .last()
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ themeBackgroudColor = CurrentBackgroudColor;
+ });
+ });
+ });
+
+ it("Publish the App and validate Default Theme across the app", function() {
+ cy.PublishtheApp();
+ /* Bug Form backgroud colour reset in Publish mode
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(21, 128, 61)");
+ */
+ cy.get(".bp3-button:contains('Submit')")
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Edit App')")
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ expect(CurrentBackgroudColor).to.equal(themeBackgroudColor);
+ expect(selectedBackgroudColor).to.equal(themeBackgroudColor);
+ });
+ });
+ });
+
+ it("Validate Theme change across application", function() {
+ cy.goToEditFromPublish();
+ cy.get(formWidgetsPage.formD).click();
+ cy.widgetText(
+ "FormTest",
+ formWidgetsPage.formWidget,
+ formWidgetsPage.formInner,
+ );
+ cy.get(widgetsPage.backgroundcolorPickerNew)
+ .first()
+ .click({ force: true });
+ cy.get("[style='background-color: rgb(21, 128, 61);']")
+ .last()
+ .click();
+ cy.wait(2000);
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(21, 128, 61)");
+
+ cy.get("#canvas-selection-0").click({ force: true });
+
+ //Change the Theme
+ cy.get(commonlocators.changeThemeBtn)
+ .should("be.visible")
+ .click({ force: true });
+ // select a theme
+ cy.get(commonlocators.themeCard)
+ .last()
+ .click({ force: true });
+
+ // check for alert
+ cy.get(`${commonlocators.themeCard}`)
+ .last()
+ .siblings("div")
+ .first()
+ .invoke("text")
+ .then((text) => {
+ cy.get(commonlocators.toastmsg).contains(`Theme ${text} Applied`);
+ });
+ cy.get(`${commonlocators.themeCard} > main`)
+ .last()
+ .invoke("css", "background-color")
+ .then((backgroudColor) => {
+ cy.get(commonlocators.canvas).should(
+ "have.css",
+ "background-color",
+ backgroudColor,
+ );
+ });
+ cy.get(themelocator.currentTheme).click({ force: true });
+ cy.get(".t--theme-card > main")
+ .first()
+ .invoke("css", "background-color")
+ .then((backgroudColor) => {
+ cy.get(commonlocators.canvas).should(
+ "have.css",
+ "background-color",
+ backgroudColor,
+ );
+ });
+ cy.get(".t--theme-card main > main")
+ .first()
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".t--theme-card main > main")
+ .last()
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ themeBackgroudColor = CurrentBackgroudColor;
+ });
+ });
+ cy.get(formWidgetsPage.formD).click();
+ cy.widgetText(
+ "FormTest",
+ formWidgetsPage.formWidget,
+ formWidgetsPage.formInner,
+ );
+ cy.get(widgetsPage.backgroundcolorPickerNew)
+ .first()
+ .click({ force: true });
+ cy.get("[style='background-color: rgb(255, 193, 61);']")
+ .last()
+ .click();
+ cy.wait(2000);
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(255, 193, 61)");
+ });
+
+ it("Publish the App and validate Theme across the app", function() {
+ cy.PublishtheApp();
+ //Bug Form backgroud colour reset in Publish mode
+ /*
+ cy.get(formWidgetsPage.formD)
+ .should("have.css", "background-color")
+ .and("eq", "rgb(255, 193, 61)");
+ */
+ cy.get(".bp3-button:contains('Submit')")
+ .invoke("css", "background-color")
+ .then((CurrentBackgroudColor) => {
+ cy.get(".bp3-button:contains('Edit App')")
+ .invoke("css", "background-color")
+ .then((selectedBackgroudColor) => {
+ expect(CurrentBackgroudColor).to.equal(selectedBackgroudColor);
+ expect(CurrentBackgroudColor).to.equal(themeBackgroudColor);
+ expect(selectedBackgroudColor).to.equal(themeBackgroudColor);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/locators/ThemeLocators.json b/app/client/cypress/locators/ThemeLocators.json
new file mode 100644
index 000000000000..a0dca21fb35d
--- /dev/null
+++ b/app/client/cypress/locators/ThemeLocators.json
@@ -0,0 +1,13 @@
+{
+ "canvas": "#canvas-selection-0",
+ "border": ".t--theme-appBorderRadius",
+ "popover": ".bp3-popover-content",
+ "shadow": "//h3[contains(text(),'Shadow')]/following-sibling::div//button",
+ "color": ".t--property-pane-sidebar .bp3-popover-target .cursor-pointer",
+ "inputColor": ".t--colorpicker-v2-popover input",
+ "colorPicker": "[data-testid='color-picker']",
+ "greenColor": "[style='background-color: rgb(21, 128, 61);']",
+ "fontsSelected": ".leading-normal",
+ "currentTheme": ".cursor-pointer:contains('Current Theme')",
+ "purpleColor": "[style='background-color: rgb(107,114,128);']"
+}
\ No newline at end of file
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 5356427ca93c..1c6e433b5a29 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -36,6 +36,7 @@ import commentsLocators from "../locators/CommentsLocators";
const queryLocators = require("../locators/QueryEditor.json");
const welcomePage = require("../locators/welcomePage.json");
const publishWidgetspage = require("../locators/publishWidgetspage.json");
+const themelocator = require("../locators/ThemeLocators.json");
import gitSyncLocators from "../locators/gitSyncLocators";
let pageidcopy = " ";
@@ -865,6 +866,7 @@ Cypress.Commands.add("startRoutesForDatasource", () => {
Cypress.Commands.add("startServerAndRoutes", () => {
//To update route with intercept after working on alias wrt wait and alias
cy.server();
+ cy.route("PUT", "/api/v1/themes/applications/*").as("updateTheme");
cy.route("POST", "/api/v1/datasources/test").as("testDatasource");
cy.route("PUT", "/api/v1/datasources/*").as("saveDatasource");
cy.route("GET", "/api/v1/applications/new").as("applications");
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index e8f0024268ce..3d04e8847506 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -28,6 +28,7 @@ import { initLocalstorageRegistry } from "./Objects/Registry";
import "./OrgCommands";
import "./queryCommands";
import "./widgetCommands";
+import "./themeCommands";
import "./AdminSettingsCommands";
/// <reference types="cypress-xpath" />
diff --git a/app/client/cypress/support/themeCommands.js b/app/client/cypress/support/themeCommands.js
new file mode 100644
index 000000000000..649a83bd48b6
--- /dev/null
+++ b/app/client/cypress/support/themeCommands.js
@@ -0,0 +1,50 @@
+/* eslint-disable cypress/no-unnecessary-waiting */
+/* eslint-disable cypress/no-assigning-return-values */
+/* Contains all methods related to Organisation features*/
+
+require("cy-verify-downloads").addCustomCommand();
+require("cypress-file-upload");
+const themelocator = require("../locators/ThemeLocators.json");
+
+Cypress.Commands.add("borderMouseover", (index, text) => {
+ cy.get(themelocator.border)
+ .eq(index)
+ .trigger("mouseover");
+ cy.wait(2000);
+ cy.get(themelocator.popover).contains(text);
+});
+
+Cypress.Commands.add("shadowMouseover", (index, text) => {
+ cy.xpath(themelocator.shadow)
+ .eq(index)
+ .trigger("mouseover");
+ cy.wait(2000);
+ cy.get(themelocator.popover).contains(text);
+});
+
+Cypress.Commands.add("colorMouseover", (index, text) => {
+ cy.get(themelocator.color)
+ .eq(index)
+ .trigger("mouseover");
+ cy.wait(2000);
+ cy.get(themelocator.popover).contains(text);
+});
+
+Cypress.Commands.add("validateColor", (index, text) => {
+ cy.get(themelocator.color)
+ .eq(index)
+ .click({ force: true });
+ cy.wait(1000);
+ cy.get(themelocator.inputColor).should("have.value", text);
+ cy.wait(1000);
+});
+
+Cypress.Commands.add("chooseColor", (index, color) => {
+ cy.get(themelocator.colorPicker)
+ .eq(index)
+ .click({ force: true });
+ cy.get(color)
+ .last()
+ .click();
+ cy.wait(2000);
+});
|
41e51c4703c7b155dd1829e65dd81073bbe8e789
|
2024-01-26 11:24:40
|
Anagh Hegde
|
feat: preserve datasource non sensitive config values while forking (#30597)
| false
|
preserve datasource non sensitive config values while forking (#30597)
|
feat
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/fork/DatasourceStorageForkableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/fork/DatasourceStorageForkableServiceCEImpl.java
index b017216b5004..91a4a86a1c36 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/fork/DatasourceStorageForkableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/fork/DatasourceStorageForkableServiceCEImpl.java
@@ -48,8 +48,8 @@ public DatasourceStorage initializeFork(DatasourceStorage originalEntity, Forkin
initialAuth = newDatasourceStorage.getDatasourceConfiguration().getAuthentication();
}
- if (!Boolean.TRUE.equals(targetMeta.getForkWithConfiguration())) {
- newDatasourceStorage.setDatasourceConfiguration(null);
+ if (Boolean.FALSE.equals(targetMeta.getForkWithConfiguration())) {
+ removeSensitiveFields(newDatasourceStorage);
}
/*
@@ -81,4 +81,13 @@ public DatasourceStorage initializeFork(DatasourceStorage originalEntity, Forkin
return newDatasourceStorage;
}
+
+ private void removeSensitiveFields(DatasourceStorage datasourceStorage) {
+ if (datasourceStorage.getDatasourceConfiguration() != null) {
+ datasourceStorage.getDatasourceConfiguration().setAuthentication(null);
+ datasourceStorage.getDatasourceConfiguration().setSshProxy(null);
+ datasourceStorage.getDatasourceConfiguration().setSshProxyEnabled(null);
+ datasourceStorage.getDatasourceConfiguration().setProperties(null);
+ }
+ }
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
index a3e80c1bd5ce..ca576664ced7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
@@ -1849,14 +1849,18 @@ public void cloneApplicationForkWithConfigurationFalseWithActionsThrice() {
.findFirst()
.get();
DatasourceStorageDTO storage1 = ds1.getDatasourceStorages().get(data.defaultEnvironmentId);
- assertThat(storage1.getDatasourceConfiguration()).isNull();
+ assertThat(storage1.getDatasourceConfiguration()).isNotNull();
+ assertThat(storage1.getDatasourceConfiguration().getConnection())
+ .isNotNull();
+ assertThat(storage1.getDatasourceConfiguration().getEndpoints())
+ .isNotNull();
final Datasource ds2 = data.datasources.stream()
.filter(ds -> ds.getName().equals("datasource 2"))
.findFirst()
.get();
DatasourceStorageDTO storage2 = ds2.getDatasourceStorages().get(data.defaultEnvironmentId);
- assertThat(storage2.getDatasourceConfiguration()).isNull();
+ assertThat(storage2.getDatasourceConfiguration()).isNotNull();
assertThat(getUnpublishedActionName(data.actions))
.containsExactlyInAnyOrder(
|
56cfd980aaf5f52e86afac842241d9c41c597256
|
2024-06-10 19:09:31
|
Nirmal Sarswat
|
chore: writing changes for bringing fixes in PG branch while keeping release intact (#34100)
| false
|
writing changes for bringing fixes in PG branch while keeping release intact (#34100)
|
chore
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java
index 3563b51bdde8..de4666a68610 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BearerTokenAuth.java
@@ -4,6 +4,7 @@
import com.appsmith.external.annotations.encryption.Encrypted;
import com.appsmith.external.constants.Authentication;
import com.appsmith.external.views.FromRequest;
+import com.appsmith.external.views.Views;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -18,6 +19,6 @@
@AllArgsConstructor
@DocumentType(Authentication.BEARER_TOKEN)
public class BearerTokenAuth extends AuthenticationDTO {
- @Encrypted @JsonView(FromRequest.class)
+ @Encrypted @JsonView({Views.Internal.class, FromRequest.class})
String bearerToken;
}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
index f339d9605dc8..4688a985a2df 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java
@@ -1,8 +1,8 @@
package com.appsmith.external.models;
import com.appsmith.external.annotations.encryption.Encrypted;
+import com.appsmith.external.views.FromRequest;
import com.appsmith.external.views.Views;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -26,8 +26,7 @@ public class UploadedFile implements AppsmithDomain {
@JsonView(Views.Public.class)
String name;
- @Encrypted @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
- @JsonView(Views.Public.class)
+ @Encrypted @JsonView({Views.Internal.class, FromRequest.class})
String base64Content;
@JsonView(Views.Internal.class)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java
index d2a55752eb02..229ef9831f13 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/exports/internal/ExportServiceTests.java
@@ -1812,8 +1812,14 @@ public void exportApplication_WithPageIcon_ValidPageIcon() {
.assertNext(applicationJson -> {
List<NewPage> pages = applicationJson.getPageList();
assertThat(pages).hasSize(2);
- assertThat(pages.get(1).getUnpublishedPage().getName()).isEqualTo("page_" + randomId);
- assertThat(pages.get(1).getUnpublishedPage().getIcon()).isEqualTo("flight");
+ NewPage page = pages.stream()
+ .filter(page1 ->
+ page1.getUnpublishedPage().getName().equals("page_" + randomId))
+ .findFirst()
+ .orElse(null);
+ assertThat(page).isNotNull();
+ assertThat(page.getUnpublishedPage().getName()).isEqualTo("page_" + randomId);
+ assertThat(page.getUnpublishedPage().getIcon()).isEqualTo("flight");
})
.verifyComplete();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
index 4e8a98f6947b..e8c8cc365546 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
@@ -4592,8 +4592,14 @@ public void exportApplication_WithPageIcon_ValidPageIcon() {
.assertNext(applicationJson -> {
List<NewPage> pages = applicationJson.getPageList();
assertThat(pages).hasSize(2);
- assertThat(pages.get(1).getUnpublishedPage().getName()).isEqualTo("page_" + randomId);
- assertThat(pages.get(1).getUnpublishedPage().getIcon()).isEqualTo("flight");
+ NewPage page = pages.stream()
+ .filter(page1 ->
+ page1.getUnpublishedPage().getName().equals("page_" + randomId))
+ .findFirst()
+ .orElse(null);
+ assertThat(page).isNotNull();
+ assertThat(page.getUnpublishedPage().getName()).isEqualTo("page_" + randomId);
+ assertThat(page.getUnpublishedPage().getIcon()).isEqualTo("flight");
})
.verifyComplete();
}
|
e07dc1b5168dfbcbe2a634832b8ec3076fd0e838
|
2023-02-01 06:19:22
|
Nikhil Nandagopal
|
chore: Changed Id of analytics to instance id from ip (#20266)
| false
|
Changed Id of analytics to instance id from ip (#20266)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
index 10a73fc4963f..dbb3abff31ac 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
@@ -89,7 +89,7 @@ private Mono<String> doPing(String instanceId, String ipAddress) {
.headers(headers -> headers.setBasicAuth(ceKey, ""))
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(Map.of(
- "userId", ipAddress,
+ "userId", instanceId,
"context", Map.of("ip", ipAddress),
"properties", Map.of("instanceId", instanceId),
"event", "Instance Active"
@@ -130,7 +130,7 @@ public void pingStats() {
.headers(headers -> headers.setBasicAuth(ceKey, ""))
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(Map.of(
- "userId", ipAddress,
+ "userId", statsData.getT1(),
"context", Map.of("ip", ipAddress),
"properties", Map.of(
"instanceId", statsData.getT1(),
|
e9c3034c1cf000e7f46d44e8fac163469d1bf332
|
2023-10-27 11:54:26
|
Preet Sidhu
|
chore: add mousemove listener to konva and bug fixes. (#28381)
| false
|
add mousemove listener to konva and bug fixes. (#28381)
|
chore
|
diff --git a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/utils.ts b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/utils.ts
index 5d1dd3fe83ea..8bc20b62286e 100644
--- a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/utils.ts
+++ b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/utils.ts
@@ -17,15 +17,22 @@ export const getClosestHighlight = (
*/
let filteredHighlights: AnvilHighlightInfo[] = [];
filteredHighlights = getViableDropPositions(highlights, pos);
- if (!filteredHighlights || !filteredHighlights?.length) return;
+ /**
+ * Defensive coding:
+ * If filtered highlights are empty,
+ * use all highlights for proximity calculation.
+ *
+ * This is less performant, but improves experience.
+ */
+ if (!filteredHighlights || !filteredHighlights?.length) {
+ filteredHighlights = highlights;
+ }
// Sort filtered highlights in ascending order of distance from mouse position.
const arr = [...filteredHighlights]?.sort((a, b) => {
return calculateDistance(a, pos) - calculateDistance(b, pos);
});
- // console.log("#### arr", arr, highlights);
-
// Return the closest highlight.
return arr[0];
};
@@ -36,42 +43,88 @@ function getViableDropPositions(
): AnvilHighlightInfo[] {
if (!arr) return arr || [];
const DEFAULT_DROP_RANGE = 10;
+
+ // Filter out vertical highlights.
const verticalHighlights = arr.filter(
(highlight: AnvilHighlightInfo) => highlight.isVertical,
);
+
+ // Filter out vertical highlights.
const horizontalHighlights = arr.filter(
(highlight: AnvilHighlightInfo) => !highlight.isVertical,
);
+
const selection: AnvilHighlightInfo[] = [];
+
+ /**
+ * Each vertical highlight has a drop zone on the left and right.
+ *
+ * <-- left --> | <-- right -->
+ *
+ * If the mouse is within the drop zone, the highlight is a viable drop position.
+ */
verticalHighlights.forEach((highlight: AnvilHighlightInfo) => {
if (pos.y >= highlight.posY && pos.y <= highlight.posY + highlight.height)
if (
(pos.x >= highlight.posX &&
pos.x <=
highlight.posX +
- (highlight.dropZone.right || DEFAULT_DROP_RANGE)) ||
+ Math.max(
+ highlight.dropZone.right || DEFAULT_DROP_RANGE,
+ DEFAULT_DROP_RANGE,
+ )) ||
(pos.x < highlight.posX &&
pos.x >=
- highlight.posX - (highlight.dropZone.left || DEFAULT_DROP_RANGE))
+ highlight.posX -
+ Math.max(
+ highlight.dropZone.left || DEFAULT_DROP_RANGE,
+ DEFAULT_DROP_RANGE,
+ ))
)
selection.push(highlight);
});
const hasVerticalSelection = selection.length > 0;
+
+ /**
+ * Each horizontal highlight has a drop zone on the top and bottom.
+ *
+ * ^
+ * |
+ * top
+ * |
+ * ---- <- highlight
+ * |
+ * bottom
+ * |
+ * ^
+ *
+ *
+ * If the mouse is within the drop zone, the highlight is a viable drop position.
+ *
+ * If there are also some contending vertical highlights sharing a drop zone,
+ * then vertical highlights get priority and the a fraction of the drop zone of horizontal highlights is considered.
+ */
horizontalHighlights.forEach((highlight: AnvilHighlightInfo) => {
if (pos.x >= highlight.posX && pos.x <= highlight.posX + highlight.width)
if (
(pos.y >= highlight.posY &&
pos.y <=
highlight.posY +
- (highlight.dropZone.bottom !== undefined
- ? highlight.dropZone.bottom * (hasVerticalSelection ? 0.2 : 1)
- : DEFAULT_DROP_RANGE)) ||
+ Math.max(
+ highlight.dropZone.bottom !== undefined
+ ? highlight.dropZone.bottom * (hasVerticalSelection ? 0.2 : 1)
+ : DEFAULT_DROP_RANGE,
+ DEFAULT_DROP_RANGE,
+ )) ||
(pos.y < highlight.posY &&
pos.y >=
highlight.posY -
- (highlight.dropZone.top !== undefined
- ? highlight.dropZone.top * (hasVerticalSelection ? 0.3 : 1)
- : DEFAULT_DROP_RANGE))
+ Math.max(
+ highlight.dropZone.top !== undefined
+ ? highlight.dropZone.top * (hasVerticalSelection ? 0.2 : 1)
+ : DEFAULT_DROP_RANGE,
+ DEFAULT_DROP_RANGE,
+ ))
)
selection.push(highlight);
});
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
index 3d9d4c8db8aa..b6219c26c89f 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
@@ -6,6 +6,7 @@ export interface AnvilReduxAction<T> {
export enum AnvilReduxActionTypes {
READ_LAYOUT_ELEMENT_POSITIONS = "READ_LAYOUT_ELEMENT_POSITIONS",
UPDATE_LAYOUT_ELEMENT_POSITIONS = "UPDATE_LAYOUT_ELEMENT_POSITIONS",
+ REMOVE_LAYOUT_ELEMENT_POSITIONS = "REMOVE_LAYOUT_ELEMENT_POSITIONS",
ANVIL_ADD_NEW_WIDGET = "ANVIL_ADD_NEW_WIDGET",
ANVIL_MOVE_WIDGET = "ANVIL_MOVE_WIDGET",
}
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/index.ts b/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
index 87343371d4d9..8f670367f60b 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
@@ -5,3 +5,10 @@ export const readLayoutElementPositions = () => {
type: AnvilReduxActionTypes.READ_LAYOUT_ELEMENT_POSITIONS,
};
};
+
+export const deleteLayoutElementPositions = (elements: string[]) => {
+ return {
+ type: AnvilReduxActionTypes.REMOVE_LAYOUT_ELEMENT_POSITIONS,
+ payload: elements,
+ };
+};
diff --git a/app/client/src/layoutSystems/anvil/integrations/reducers/layoutElementPositionsReducer.ts b/app/client/src/layoutSystems/anvil/integrations/reducers/layoutElementPositionsReducer.ts
index 5bc75bdaaf12..4779f6583f30 100644
--- a/app/client/src/layoutSystems/anvil/integrations/reducers/layoutElementPositionsReducer.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/reducers/layoutElementPositionsReducer.ts
@@ -40,6 +40,17 @@ const widgetPositionsReducer = createImmerReducer(initialState, {
state[widgetId].top = newPosition.top;
}
},
+ [AnvilReduxActionTypes.REMOVE_LAYOUT_ELEMENT_POSITIONS]: (
+ state: LayoutElementPositions,
+ action: AnvilReduxAction<string[]>,
+ ) => {
+ const elements = action.payload;
+ for (const each of elements) {
+ if (state[each]) {
+ delete state[each];
+ }
+ }
+ },
});
export default widgetPositionsReducer;
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset.tsx
index 625f65badff2..a94efebd5d6c 100644
--- a/app/client/src/layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset.tsx
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset.tsx
@@ -14,6 +14,7 @@ export function generateDefaultLayoutPreset(
layout: [],
layoutId: generateReactKey(),
layoutStyle: {
+ border: "none",
minHeight: "40px",
height: "100%",
},
diff --git a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
index 306bbb0afec4..b3a1ee18a0bf 100644
--- a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
+++ b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
@@ -23,7 +23,7 @@ export function anvilDSLTransformer(dsl: DSLWidget) {
border: "none",
height: "100%",
minHeight: "70vh",
- paddingBlockEnd: "5rem",
+ padding: "4px 4px 5rem",
},
isDropTarget: true,
isPermanent: true,
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.test.ts b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.test.ts
index 813b8d32c8b2..3b395d566cd4 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.test.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.test.ts
@@ -78,7 +78,9 @@ describe("AlignedRow highlights", () => {
expect(res[0].posX).toEqual(startPosition.left + HIGHLIGHT_SIZE / 2);
expect(res[0].posY).toEqual(startPosition.top);
expect(res[0].height).toEqual(startPosition.height);
- expect(res[0].dropZone.left).toEqual(res[0].posX);
+ expect(res[0].dropZone.left).toEqual(
+ Math.max(res[0].posX, HIGHLIGHT_SIZE),
+ );
expect(res[1].alignment).toEqual(FlexLayerAlignment.Center);
expect(res[1].posX).toEqual(
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.ts b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.ts
index e672f1b00c9c..25114fc20cdf 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/alignedRowHighlights.ts
@@ -13,7 +13,7 @@ import {
HIGHLIGHT_SIZE,
HORIZONTAL_DROP_ZONE_MULTIPLIER,
} from "../../constants";
-import { getStartPosition } from "./highlightUtils";
+import { getNonDraggedWidgets, getStartPosition } from "./highlightUtils";
import {
type RowMetaData,
type RowMetaInformation,
@@ -183,6 +183,16 @@ export function getHighlightsForWidgets(
return highlights;
}
+ /**
+ * Check if layout has widgets that are not being dragged.
+ */
+ const nonDraggedWidgets: WidgetLayoutProps[] = getNonDraggedWidgets(
+ layout,
+ draggedWidgets,
+ );
+
+ if (!nonDraggedWidgets.length && !layoutProps.isDropTarget) return [];
+
/**
* Collect all information on alignments
*/
@@ -321,17 +331,20 @@ function generateHighlight(
...baseHighlight,
alignment,
dropZone: {
- left: prevHighlight
- ? (posX - prevHighlight.posX) * multiplier
- : (posX - layoutDimension.left) *
- (alignment === FlexLayerAlignment.Start ? 1 : multiplier),
- right: isFinalHighlight
- ? Math.max(
- (layoutDimension.left + layoutDimension.width - posX) *
- (alignment === FlexLayerAlignment.End ? 1 : multiplier),
- HIGHLIGHT_SIZE,
- )
- : HIGHLIGHT_SIZE,
+ left: Math.max(
+ prevHighlight
+ ? (posX - prevHighlight.posX) * multiplier
+ : (posX - layoutDimension.left) *
+ (alignment === FlexLayerAlignment.Start ? 1 : multiplier),
+ HIGHLIGHT_SIZE,
+ ),
+ right: Math.max(
+ isFinalHighlight
+ ? (layoutDimension.left + layoutDimension.width - posX) *
+ (alignment === FlexLayerAlignment.End ? 1 : multiplier)
+ : HIGHLIGHT_SIZE,
+ HIGHLIGHT_SIZE,
+ ),
},
height: tallestWidget?.height ?? layoutDimension.height,
posX,
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/highlightUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/highlightUtils.ts
index 101b60654a47..cb8c2f27d211 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/highlightUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/highlightUtils.ts
@@ -7,6 +7,7 @@ import type {
GetLayoutHighlights,
GetWidgetHighlights,
LayoutProps,
+ WidgetLayoutProps,
} from "../../anvilTypes";
import { FlexLayerAlignment } from "layoutSystems/common/utils/constants";
import { HIGHLIGHT_SIZE } from "../../constants";
@@ -110,3 +111,16 @@ export function getStartPosition(
return HIGHLIGHT_SIZE / 2;
}
}
+
+export function getNonDraggedWidgets(
+ layout: WidgetLayoutProps[],
+ draggedWidgets: DraggedWidget[],
+): WidgetLayoutProps[] {
+ const draggedWidgetIds: string[] = draggedWidgets.map(
+ (each: DraggedWidget) => each.widgetId,
+ );
+
+ return layout.filter(
+ (each: WidgetLayoutProps) => !draggedWidgetIds.includes(each.widgetId),
+ );
+}
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/rowHighlights.ts b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/rowHighlights.ts
index 486c63f62d15..0cdb78891841 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/highlights/rowHighlights.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/highlights/rowHighlights.ts
@@ -18,7 +18,7 @@ import type {
LayoutElementPositions,
} from "layoutSystems/common/types";
import { getRelativeDimensions } from "./dimensionUtils";
-import { getStartPosition } from "./highlightUtils";
+import { getNonDraggedWidgets, getStartPosition } from "./highlightUtils";
import type { DropZone } from "layoutSystems/common/utils/types";
export interface RowMetaInformation {
@@ -145,12 +145,9 @@ export function getHighlightsForWidgetsRow(
getDimensions,
);
- const draggedWidgetIds: string[] = draggedWidgets.map(
- (each: DraggedWidget) => each.widgetId,
- );
-
- const nonDraggedWidgets: WidgetLayoutProps[] = layout.filter(
- (each: WidgetLayoutProps) => !draggedWidgetIds.includes(each.widgetId),
+ const nonDraggedWidgets: WidgetLayoutProps[] = getNonDraggedWidgets(
+ layout,
+ draggedWidgets,
);
if (!nonDraggedWidgets.length && !layoutProps.isDropTarget) return [];
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts b/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
index 877dd5181e64..a0c2a0b867cb 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
@@ -93,14 +93,14 @@ export function getMouseOverDetails(
isMouseOver: boolean;
cursor?: string;
widgetNameData?: WidgetNameData;
- } = { isMouseOver: false };
+ } = { isMouseOver: false, cursor: "default" };
//for selected and focused widget names check the widget name positions with respect to mouse positions
for (const widgetNamePosition of widgetNamePositionsArray) {
if (widgetNamePosition) {
const { height, left, top, widgetNameData, width } = widgetNamePosition;
if (x > left && x < left + width && y > top && y < top + height) {
- result = { isMouseOver: true, cursor: "grab", widgetNameData };
+ result = { isMouseOver: true, cursor: "pointer", widgetNameData };
break;
}
}
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx b/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
index 61b660d02e00..81969c2dcde4 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
@@ -122,8 +122,9 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
useEffect(() => {
const scrollParent: HTMLDivElement | null =
getMainContainerAnvilCanvasDOMElement();
+ const wrapper: HTMLDivElement | null = wrapperRef?.current;
- if (!wrapperRef?.current || !scrollParent) return;
+ if (!wrapper || !scrollParent) return;
const reset = resetCanvas.bind(this, widgetNamePositions, stageRef);
@@ -149,11 +150,13 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
scrollParent.addEventListener("mousemove", mouseMoveHandler);
scrollParent.addEventListener("scroll", scrollHandler);
scrollParent.addEventListener("scrollend", scrollEndHandler);
+ wrapper.addEventListener("mousemove", mouseMoveHandler);
return () => {
scrollParent.removeEventListener("mousemove", mouseMoveHandler);
scrollParent.removeEventListener("scroll", scrollHandler);
scrollParent.removeEventListener("scrollend", scrollEndHandler);
+ wrapper.removeEventListener("mousemove", mouseMoveHandler);
};
}, [wrapperRef?.current, stageRef?.current]);
diff --git a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
index cca6a00f297d..288e47602837 100644
--- a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
+++ b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
@@ -3,11 +3,16 @@ import type { RefObject } from "react";
import {
ANVIL_WIDGET,
LAYOUT,
+ extractLayoutIdFromLayoutDOMId,
+ extractWidgetIdFromAnvilWidgetDOMId,
getAnvilLayoutDOMId,
getAnvilWidgetDOMId,
} from "./utils";
import store from "store";
-import { readLayoutElementPositions } from "layoutSystems/anvil/integrations/actions";
+import {
+ deleteLayoutElementPositions,
+ readLayoutElementPositions,
+} from "layoutSystems/anvil/integrations/actions";
import ResizeObserver from "resize-observer-polyfill";
// Note: We have a singleton observer in `utils/resizeObserver.ts`. I noticed this too late and the API is not easy to adapt in this file.
// Adding this to the list of things to fix in the future.
@@ -89,6 +94,11 @@ class LayoutElementPositionObserver {
}
delete this.registeredWidgets[widgetDOMId];
+ store.dispatch(
+ deleteLayoutElementPositions([
+ extractWidgetIdFromAnvilWidgetDOMId(widgetDOMId),
+ ]),
+ );
}
//Method to register layouts for resize observer changes
@@ -122,6 +132,11 @@ class LayoutElementPositionObserver {
}
delete this.registeredLayouts[layoutDOMId];
+ store.dispatch(
+ deleteLayoutElementPositions([
+ extractLayoutIdFromLayoutDOMId(layoutDOMId),
+ ]),
+ );
}
//This method is triggered from the resize observer to add widgets to queue
diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts
index 187e0af60e0a..390d3c7cd721 100644
--- a/app/client/src/sagas/WidgetAdditionSagas.ts
+++ b/app/client/src/sagas/WidgetAdditionSagas.ts
@@ -49,9 +49,6 @@ import {
} from "selectors/editorSelectors";
import { getWidgetMinMaxDimensionsInPixel } from "layoutSystems/autolayout/utils/flexWidgetUtils";
import { isFunction } from "lodash";
-import type { LayoutComponentProps } from "layoutSystems/anvil/utils/anvilTypes";
-import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
-import { LayoutSystemTypes } from "layoutSystems/types";
const WidgetTypes = WidgetFactory.widgetTypes;
@@ -76,7 +73,7 @@ function* getChildWidgetProps(
widgets: { [widgetId: string]: FlattenedWidgetProps },
) {
const { leftColumn, newWidgetId, topRow, type } = params;
- const layoutSystemType: LayoutSystemTypes = yield select(getLayoutSystemType);
+
let { columns, parentColumnSpace, parentRowSpace, props, rows, widgetName } =
params;
let minHeight = undefined;
@@ -112,21 +109,6 @@ function* getChildWidgetProps(
draft.children = [];
}
});
- if (
- layoutSystemType === LayoutSystemTypes.ANVIL &&
- props.layout &&
- props.layout.length
- ) {
- props = {
- ...props,
- layout: props.layout.map((each: LayoutComponentProps) => {
- return {
- ...each,
- layoutId: generateReactKey(),
- };
- }),
- };
- }
}
}
diff --git a/app/client/src/widgets/ContainerWidget/widget/index.tsx b/app/client/src/widgets/ContainerWidget/widget/index.tsx
index 92aea3a70090..9411636cad1e 100644
--- a/app/client/src/widgets/ContainerWidget/widget/index.tsx
+++ b/app/client/src/widgets/ContainerWidget/widget/index.tsx
@@ -6,7 +6,7 @@ import ContainerComponent from "../component";
import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
import BaseWidget from "widgets/BaseWidget";
import { ValidationTypes } from "constants/WidgetValidation";
-import { compact, map, sortBy } from "lodash";
+import { compact, get, map, sortBy } from "lodash";
import WidgetsMultiSelectBox from "layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
import { getSnappedGrid } from "sagas/WidgetOperationUtils";
@@ -16,12 +16,14 @@ import {
DefaultAutocompleteDefinitions,
isAutoHeightEnabledForWidgetWithLimits,
} from "widgets/WidgetUtils";
-import type {
- AnvilConfig,
- AutocompletionDefinitions,
- AutoLayoutConfig,
- WidgetBaseConfiguration,
- WidgetDefaultProps,
+import {
+ BlueprintOperationTypes,
+ type AnvilConfig,
+ type AutocompletionDefinitions,
+ type AutoLayoutConfig,
+ type WidgetBaseConfiguration,
+ type WidgetDefaultProps,
+ type FlattenedWidgetProps,
} from "WidgetProvider/constants";
import { WIDGET_TAGS } from "constants/WidgetConstants";
import IconSVG from "../icon.svg";
@@ -36,6 +38,10 @@ import {
} from "layoutSystems/common/utils/constants";
import { renderAppsmithCanvas } from "layoutSystems/CanvasFactory";
import { generateDefaultLayoutPreset } from "layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset";
+import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import { LayoutSystemTypes } from "layoutSystems/types";
+import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes";
+import { getWidgetBluePrintUpdates } from "utils/WidgetBlueprintUtils";
export class ContainerWidget extends BaseWidget<
ContainerWidgetProps<WidgetProps>,
@@ -105,7 +111,35 @@ export class ContainerWidget extends BaseWidget<
canExtend: false,
detachFromLayout: true,
children: [],
- layout: generateDefaultLayoutPreset(),
+ },
+ },
+ ],
+ operations: [
+ {
+ type: BlueprintOperationTypes.MODIFY_PROPS,
+ fn: (
+ widget: FlattenedWidgetProps,
+ widgets: CanvasWidgetsReduxState,
+ parent: FlattenedWidgetProps,
+ layoutSystemType: LayoutSystemTypes,
+ ) => {
+ if (layoutSystemType !== LayoutSystemTypes.ANVIL) {
+ return [];
+ }
+
+ //get Canvas Widget
+ const canvasWidget: FlattenedWidgetProps = get(
+ widget,
+ "children.0",
+ );
+
+ const layout: LayoutProps[] = generateDefaultLayoutPreset();
+
+ return getWidgetBluePrintUpdates({
+ [canvasWidget.widgetId]: {
+ layout,
+ },
+ });
},
},
],
|
f100b5918dbf1d8c3a98694277ba55864eb47f05
|
2022-01-14 19:20:54
|
Ayush Pahwa
|
fix: Where clause UI fixes (10406) (#10411)
| false
|
Where clause UI fixes (10406) (#10411)
|
fix
|
diff --git a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
index 3664c26c9f2a..4a3882076828 100644
--- a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
+++ b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
@@ -90,7 +90,7 @@ const StyledFormLabel = styled.label<{ config?: ControlProps }>`
props.config?.controlType === "SWITCH" ||
props.config?.controlType === "CHECKBOX"
? "auto;"
- : "50vh;"}
+ : "20vw;"}
margin-left: ${(props) =>
// margin required for CHECKBOX
props.config?.controlType === "CHECKBOX" ? "0px;" : "16px;"}
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index 9c1e1a922e6d..2e2afd56430d 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -13,14 +13,18 @@ import { DynamicValues } from "reducers/evaluationReducers/formEvaluationReducer
const DropdownSelect = styled.div`
font-size: 14px;
- width: 50vh;
+ width: 20vw;
`;
class DropDownControl extends BaseControl<DropDownControlProps> {
render() {
- let width = "50vh";
- if (this.props.customStyles && this.props?.customStyles?.width) {
- width = this.props?.customStyles?.width;
+ let width = "20vw";
+ if (
+ "customStyles" in this.props &&
+ !!this.props.customStyles &&
+ "width" in this.props.customStyles
+ ) {
+ width = this.props.customStyles.width;
}
// Options will be set dynamically if the config has fetchOptionsConditionally set to true
@@ -54,7 +58,8 @@ class DropDownControl extends BaseControl<DropDownControlProps> {
function renderDropdown(props: {
input?: WrappedFieldInputProps;
meta?: WrappedFieldMetaProps;
- props: DropDownControlProps & { width?: string };
+ props: DropDownControlProps;
+ width: string;
formName: string;
isLoading?: boolean;
options: DropdownOption[];
@@ -80,12 +85,12 @@ function renderDropdown(props: {
isLoading={props.isLoading}
isMultiSelect={props?.props?.isMultiSelect}
onSelect={props.input?.onChange}
- optionWidth="50vh"
+ optionWidth={props.width}
options={props.options}
placeholder={props.props?.placeholderText}
selected={selectedOption}
showLabelOnly
- width={props?.props?.width ? props?.props?.width : "50vh"}
+ width={props.width}
/>
);
}
diff --git a/app/client/src/components/formControls/DynamicInputTextControl.tsx b/app/client/src/components/formControls/DynamicInputTextControl.tsx
index 4be46afbbd7f..94a0e2770123 100644
--- a/app/client/src/components/formControls/DynamicInputTextControl.tsx
+++ b/app/client/src/components/formControls/DynamicInputTextControl.tsx
@@ -57,14 +57,14 @@ export function InputText(props: {
};
}
- let customStyle = { width: "50vh", minHeight: "38px" };
+ let customStyle = { width: "20vw", minHeight: "38px" };
if (!!props.customStyles && _.isEmpty(props.customStyles) === false) {
customStyle = { ...props.customStyles };
- if (props.customStyles?.width) {
- customStyle.width = "50vh";
+ if ("width" in props.customStyles) {
+ customStyle.width = props.customStyles.width;
}
- if (props.customStyles?.minHeight) {
- customStyle.minHeight = "34px";
+ if ("minHeight" in props.customStyles) {
+ customStyle.minHeight = props.customStyles.minHeight;
}
}
return (
diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx
index a21b8ad11cbb..db2b044a450b 100644
--- a/app/client/src/components/formControls/FilePickerControl.tsx
+++ b/app/client/src/components/formControls/FilePickerControl.tsx
@@ -105,7 +105,7 @@ function RenderFilePicker(props: RenderFilePickerProps) {
<>
<div
className={replayHighlightClass}
- style={{ flexDirection: "row", display: "flex", width: "50vh" }}
+ style={{ flexDirection: "row", display: "flex", width: "20vw" }}
>
<StyledDiv>{props?.input?.value?.name}</StyledDiv>
<SelectButton
diff --git a/app/client/src/components/formControls/FixedKeyInputControl.tsx b/app/client/src/components/formControls/FixedKeyInputControl.tsx
index efb3405b1466..a2b9946bab97 100644
--- a/app/client/src/components/formControls/FixedKeyInputControl.tsx
+++ b/app/client/src/components/formControls/FixedKeyInputControl.tsx
@@ -6,7 +6,7 @@ import TextField from "components/editorComponents/form/fields/TextField";
import styled from "styled-components";
const Wrapper = styled.div`
- width: 50vh;
+ width: 20vw;
`;
class FixKeyInputControl extends BaseControl<FixedKeyInputControlProps> {
diff --git a/app/client/src/components/formControls/InputTextControl.tsx b/app/client/src/components/formControls/InputTextControl.tsx
index d17204edc658..782fe9d096da 100644
--- a/app/client/src/components/formControls/InputTextControl.tsx
+++ b/app/client/src/components/formControls/InputTextControl.tsx
@@ -35,7 +35,7 @@ export function InputText(props: {
const { dataType, disabled, name, placeholder } = props;
return (
- <div data-cy={name} style={{ width: "50vh" }}>
+ <div data-cy={name} style={{ width: "20vw" }}>
<Field
component={renderComponent}
datatype={dataType}
diff --git a/app/client/src/components/formControls/KeyValueArrayControl.tsx b/app/client/src/components/formControls/KeyValueArrayControl.tsx
index 434dc52b2ab3..344528adb961 100644
--- a/app/client/src/components/formControls/KeyValueArrayControl.tsx
+++ b/app/client/src/components/formControls/KeyValueArrayControl.tsx
@@ -111,7 +111,7 @@ function KeyValueRow(
>
<div
data-replay-id={btoa(keyTextFieldName)}
- style={{ width: "50vh" }}
+ style={{ width: "20vw" }}
>
<Field
component={renderTextInput}
@@ -129,7 +129,7 @@ function KeyValueRow(
/>
</div>
{!props.actionConfig && (
- <div style={{ marginLeft: "16px", width: "50vh" }}>
+ <div style={{ marginLeft: "16px", width: "20vw" }}>
<div
data-replay-id={valueTextFieldName}
style={{ display: "flex", flexDirection: "row" }}
diff --git a/app/client/src/components/formControls/KeyValueInputControl.tsx b/app/client/src/components/formControls/KeyValueInputControl.tsx
index c485fad51a5a..a7fadb1cb9e1 100644
--- a/app/client/src/components/formControls/KeyValueInputControl.tsx
+++ b/app/client/src/components/formControls/KeyValueInputControl.tsx
@@ -55,7 +55,7 @@ function KeyValueRow(props: KeyValueRowProps & WrappedFieldArrayProps) {
<FormRowWithLabel key={index} style={{ marginTop: index ? 13 : 0 }}>
<div
data-replay-id={btoa(`${field}.key`)}
- style={{ width: "50vh" }}
+ style={{ width: "20vw" }}
>
<TextField name={`${field}.key`} placeholder="Key" />
</div>
@@ -64,7 +64,7 @@ function KeyValueRow(props: KeyValueRowProps & WrappedFieldArrayProps) {
<div style={{ display: "flex", flexDirection: "row" }}>
<div
data-replay-id={btoa(`${field}.value`)}
- style={{ marginRight: 14, width: "50vh" }}
+ style={{ marginRight: 14, width: "20vw" }}
>
<TextField name={`${field}.value`} placeholder="Value" />
</div>
diff --git a/app/client/src/components/formControls/PaginationControl.tsx b/app/client/src/components/formControls/PaginationControl.tsx
index 0ef73c48b082..d46b8b33e01f 100644
--- a/app/client/src/components/formControls/PaginationControl.tsx
+++ b/app/client/src/components/formControls/PaginationControl.tsx
@@ -52,7 +52,7 @@ export function Pagination(props: {
const { configProperty, customStyles, formName, name } = props;
return (
- <div data-cy={name} style={{ width: "50vh" }}>
+ <div data-cy={name} style={{ width: "20vw" }}>
{/* form control for Limit field */}
<FormControlContainer>
<FormControl
diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx
index e7ae67075646..d5872f9a6b09 100644
--- a/app/client/src/components/formControls/WhereClauseControl.tsx
+++ b/app/client/src/components/formControls/WhereClauseControl.tsx
@@ -46,14 +46,18 @@ const logicalFieldConfig: any = {
controlType: "DROP_DOWN",
initialValue: "EQ",
options: [],
- customStyles: { width: "10vh", height: "30px" },
+ customStyles: { width: "5vw" },
};
// Component for the delete Icon
-const CenteredIcon = styled(Icon)`
+const CenteredIcon = styled(Icon)<{
+ alignSelf?: string;
+ marginBottom?: string;
+}>`
margin-left: 5px;
- align-self: end;
- margin-bottom: 10px;
+ align-self: ${(props) => (props.alignSelf ? props.alignSelf : "end")};
+ margin-bottom: ${(props) =>
+ props.marginBottom ? props.marginBottom : "10px"};
&.hide {
opacity: 0;
pointer-events: none;
@@ -112,11 +116,9 @@ const AddMoreAction = styled.div`
// Component to display single line of condition, includes 2 inputs and 1 dropdown
function ConditionComponent(props: any, index: number) {
// Custom styles have to be passed as props, otherwise the UI will be disproportional
- const customStyles = {
- // 15 is subtracted because the width of the operator dropdown is 15px
- width: `${(props.maxWidth - 15) / 3}vh`,
- height: "30px",
- };
+
+ // 5 is subtracted because the width of the operator dropdown is 5vw
+ const unitWidth = (props.maxWidth - 5) / 5;
// Labels are only displayed if the condition is the first one
let keyLabel = "";
@@ -134,7 +136,7 @@ function ConditionComponent(props: any, index: number) {
config={{
...keyFieldConfig,
label: keyLabel,
- customStyles,
+ customStyles: { width: `${unitWidth * 2}vw` },
configProperty: `${props.field}.key`,
}}
formName={props.formName}
@@ -144,7 +146,7 @@ function ConditionComponent(props: any, index: number) {
config={{
...conditionFieldConfig,
label: conditionLabel,
- customStyles,
+ customStyles: { width: `${unitWidth * 1}vw` },
configProperty: `${props.field}.condition`,
options: props.comparisonTypes,
initialValue: props.comparisonTypes[0].value,
@@ -156,7 +158,7 @@ function ConditionComponent(props: any, index: number) {
config={{
...valueFieldConfig,
label: valueLabel,
- customStyles,
+ customStyles: { width: `${unitWidth * 2}vw` },
configProperty: `${props.field}.value`,
}}
formName={props.formName}
@@ -235,6 +237,7 @@ function ConditionBlock(props: any) {
const fieldValue: whereClauseValueType = props.fields.get(index);
if (!!fieldValue && "children" in fieldValue) {
// If the value contains children in it, that means it is a ConditionBlock
+ const maxWidth = props.maxWidth - 7.5;
return (
<ConditionBox>
<FieldArray
@@ -242,7 +245,7 @@ function ConditionBlock(props: any) {
key={`${field}.children`}
name={`${field}.children`}
props={{
- maxWidth: props.maxWidth - 15,
+ maxWidth,
configProperty: `${field}`,
formName: props.formName,
logicalTypes: props.logicalTypes,
@@ -255,6 +258,8 @@ function ConditionBlock(props: any) {
rerenderOnEveryChange={false}
/>
<CenteredIcon
+ alignSelf={"center"}
+ marginBottom={"-5px"}
name="cross"
onClick={(e) => {
e.stopPropagation();
@@ -322,7 +327,7 @@ export default function WhereClauseControl(props: WhereClauseControlProps) {
} = props;
// Max width is designed in a way that the proportion stays same even after nesting
- const maxWidth = 105;
+ const maxWidth = 55;
return (
<FieldArray
component={ConditionBlock}
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index cf0b8287fd2b..089d1d0360fe 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -772,7 +772,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
)}
</FormInputContainer>
<FormInputContainer>
- <div style={{ width: "50vh" }}>
+ <div style={{ width: "20vw" }}>
<FormLabel>
Redirect URL
<br />
|
e67f6a8f89960099470cf1d063802815bac6fd54
|
2024-01-26 09:30:57
|
Abhinav Jha
|
feat: WDS - Anvil compatible Modal Widget (#30351)
| false
|
WDS - Anvil compatible Modal Widget (#30351)
|
feat
|
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalBody.tsx b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalBody.tsx
index 4dee9a48417b..7647c6236421 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalBody.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalBody.tsx
@@ -2,9 +2,14 @@ import React from "react";
import styles from "./styles.module.css";
import type { ModalBodyProps } from "./types";
+import clsx from "clsx";
export const ModalBody = (props: ModalBodyProps) => {
- const { children } = props;
+ const { children, className, style } = props;
- return <div className={styles.body}>{children}</div>;
+ return (
+ <div className={clsx(className, styles.body)} style={style}>
+ {children}
+ </div>
+ );
};
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalFooter.tsx b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalFooter.tsx
index 020c0df2d240..55d0f4530451 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalFooter.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalFooter.tsx
@@ -7,7 +7,7 @@ import type { ModalFooterProps } from "./types";
export const ModalFooter = (props: ModalFooterProps) => {
const { closeText = "Close", onSubmit, submitText = "Submit" } = props;
- const { setOpen } = usePopoverContext();
+ const { onClose, setOpen } = usePopoverContext();
const [isLoading, setIsLoading] = useState(false);
const handleSubmit = async () => {
@@ -19,9 +19,14 @@ export const ModalFooter = (props: ModalFooterProps) => {
}
};
+ const closeHandler = () => {
+ onClose && onClose();
+ setOpen(false);
+ };
+
return (
<Flex alignItems="center" gap="spacing-4" justifyContent="end">
- <Button onPress={() => setOpen(false)} variant="ghost">
+ <Button onPress={closeHandler} variant="ghost">
{closeText}
</Button>
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalHeader.tsx b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalHeader.tsx
index 0560a3c5107d..7f9071493b09 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/ModalHeader.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/ModalHeader.tsx
@@ -10,7 +10,7 @@ import type { ModalHeaderProps } from "./types";
export const ModalHeader = (props: ModalHeaderProps) => {
const { title } = props;
- const { setLabelId, setOpen } = usePopoverContext();
+ const { onClose, setLabelId, setOpen } = usePopoverContext();
const id = useId();
// Only sets `aria-labelledby` on the Dialog root element
@@ -20,12 +20,17 @@ export const ModalHeader = (props: ModalHeaderProps) => {
return () => setLabelId(undefined);
}, [id, setLabelId]);
+ const closeHandler = () => {
+ onClose && onClose();
+ setOpen(false);
+ };
+
return (
<Flex alignItems="center" gap="spacing-4" justifyContent="space-between">
<Text id={id} lineClamp={1} title={title} variant="caption">
{title}
</Text>
- <IconButton icon="cross" onPress={() => setOpen(false)} variant="ghost" />
+ <IconButton icon="x" onPress={closeHandler} variant="ghost" />
</Flex>
);
};
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Modal/src/styles.module.css
index cf47fa88a06e..2f1ea60afd0a 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/styles.module.css
@@ -1,4 +1,6 @@
.overlay {
+ /* Redefining the overlay positioning so that the dialog is centered relative to the provider, not the viewport */
+ position: absolute !important;
background: var(--color-bg-neutral-opacity);
display: grid;
place-items: center;
@@ -21,7 +23,7 @@
.body {
overflow: auto;
max-height: 100%;
- padding-inline: var(--outer-spacing-4);
+ padding-inline: var(--outer-spacing-1);
margin-inline: calc(var(--outer-spacing-4) * -1);
flex: 1;
}
@@ -36,7 +38,7 @@
}
[data-size="large"] .content {
- width: 100%;
+ width: calc(var(--provider-width) - var(--outer-spacing-6));
height: 100%;
}
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts b/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
index 07bdb0e2f313..18c129743b11 100644
--- a/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
+++ b/app/client/packages/design-system/widgets/src/components/Modal/src/types.ts
@@ -45,4 +45,6 @@ export interface ModalFooterProps {
export interface ModalBodyProps {
children: ReactNode;
+ style?: React.CSSProperties;
+ className?: string;
}
diff --git a/app/client/src/components/editorComponents/EditorContextProvider.test.tsx b/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
index 0171e5b6b0c0..a48dd53474ca 100644
--- a/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
+++ b/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
@@ -44,6 +44,7 @@ describe("EditorContextProvider", () => {
"checkContainersForAutoHeight",
"updatePositionsOnTabChange",
"updateOneClickBindingOptionsVisibility",
+ "unfocusWidget",
].sort();
const testRenderer = TestRenderer.create(
@@ -79,6 +80,7 @@ describe("EditorContextProvider", () => {
"updateWidgetDimension",
"checkContainersForAutoHeight",
"updatePositionsOnTabChange",
+ "unfocusWidget",
].sort();
const testRenderer = TestRenderer.create(
diff --git a/app/client/src/components/editorComponents/EditorContextProvider.tsx b/app/client/src/components/editorComponents/EditorContextProvider.tsx
index 35d946f629c1..c2579d4df767 100644
--- a/app/client/src/components/editorComponents/EditorContextProvider.tsx
+++ b/app/client/src/components/editorComponents/EditorContextProvider.tsx
@@ -6,7 +6,11 @@ import { get, set } from "lodash";
import type { WidgetOperation } from "widgets/BaseWidget";
import { updateWidget } from "actions/pageActions";
-import { executeTrigger, disableDragAction } from "actions/widgetActions";
+import {
+ executeTrigger,
+ disableDragAction,
+ focusWidget,
+} from "actions/widgetActions";
import type { BatchPropertyUpdatePayload } from "actions/controlActions";
import {
updateWidgetPropertyRequest,
@@ -99,6 +103,7 @@ export interface EditorContextType<TCache = unknown> {
selectWidgetRequest?: WidgetSelectionRequest;
updatePositionsOnTabChange?: (widgetId: string, selectedTab: string) => void;
updateOneClickBindingOptionsVisibility?: (visibility: boolean) => void;
+ unfocusWidget?: () => void;
}
export const EditorContext: Context<EditorContextType> = createContext({});
@@ -126,6 +131,7 @@ const COMMON_API_METHODS: EditorContextTypeKey[] = [
"checkContainersForAutoHeight",
"selectWidgetRequest",
"updatePositionsOnTabChange",
+ "unfocusWidget",
];
const PAGE_MODE_API_METHODS: EditorContextTypeKey[] = [...COMMON_API_METHODS];
@@ -233,6 +239,7 @@ const mapDispatchToProps = {
updatePositionsOnTabChange: updatePositionsOnTabChange,
updateOneClickBindingOptionsVisibility:
updateOneClickBindingOptionsVisibility,
+ unfocusWidget: focusWidget,
};
export default connect(null, mapDispatchToProps)(EditorContextProvider);
diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
index e0c8897ef55c..c126f19dfb03 100644
--- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
+++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
@@ -71,6 +71,7 @@ export enum EventType {
ON_TOGGLE = "ON_TOGGLE",
ON_LOAD = "ON_LOAD",
ON_MODAL_CLOSE = "ON_MODAL_CLOSE",
+ ON_MODAL_SUBMIT = "ON_MODAL_SUBMIT",
ON_TEXT_CHANGE = "ON_TEXT_CHANGE",
ON_SUBMIT = "ON_SUBMIT",
ON_CHECK_CHANGE = "ON_CHECK_CHANGE",
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index ccd0a5c6dd69..2d548f4edaf6 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -112,6 +112,7 @@ export interface PropertyPaneControlConfig {
* will depend on the control type and its individual requirements.
*/
controlConfig?: Record<string, unknown>;
+ defaultValue?: unknown;
}
interface ValidationConfigParams {
diff --git a/app/client/src/index.css b/app/client/src/index.css
index 0ea4ab6d3722..3cacc42551ad 100755
--- a/app/client/src/index.css
+++ b/app/client/src/index.css
@@ -12,6 +12,12 @@
:root {
/* TODO: This needs to be fixed! This override is to maintain branding changes. */
--ads-color-background-secondary: var(--ads-v2-color-bg-subtle);
+ /* All on canvas ui need to be above other editor elements
+ This includes the Modal overlay.
+ The maximum value of z-index in the theme is 9999.
+ This value makes sure that on-canvas ui is always above editor elements
+ */
+ --on-canvas-ui-z-index: 999999;
}
body {
diff --git a/app/client/src/layoutSystems/anvil/canvas/AnvilCanvas.tsx b/app/client/src/layoutSystems/anvil/canvas/AnvilCanvas.tsx
index 3cf264ade28b..c4a982d8e1f0 100644
--- a/app/client/src/layoutSystems/anvil/canvas/AnvilCanvas.tsx
+++ b/app/client/src/layoutSystems/anvil/canvas/AnvilCanvas.tsx
@@ -4,6 +4,7 @@ import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
import { getAnvilCanvasId } from "./utils";
import { LayoutProvider } from "../layoutComponents/LayoutProvider";
import { useClickToClearSelections } from "./useClickToClearSelections";
+import { useRenderDetachedChildren } from "../common/hooks/detachedWidgetHooks";
export const AnvilCanvas = (props: BaseWidgetProps) => {
const className: string = useMemo(
@@ -19,13 +20,21 @@ export const AnvilCanvas = (props: BaseWidgetProps) => {
[clickToClearSelections],
);
+ const renderDetachedChildren = useRenderDetachedChildren(
+ props.widgetId,
+ props.children,
+ );
+
return (
- <div
- className={className}
- id={getAnvilCanvasId(props.widgetId)}
- onClick={handleOnClickCapture}
- >
- <LayoutProvider {...props} />
- </div>
+ <>
+ {renderDetachedChildren}
+ <div
+ className={className}
+ id={getAnvilCanvasId(props.widgetId)}
+ onClick={handleOnClickCapture}
+ >
+ <LayoutProvider {...props} />
+ </div>
+ </>
);
};
diff --git a/app/client/src/layoutSystems/anvil/canvas/AnvilMainCanvas.tsx b/app/client/src/layoutSystems/anvil/canvas/AnvilMainCanvas.tsx
index fc0ec15c4173..0fdced3352ce 100644
--- a/app/client/src/layoutSystems/anvil/canvas/AnvilMainCanvas.tsx
+++ b/app/client/src/layoutSystems/anvil/canvas/AnvilMainCanvas.tsx
@@ -3,9 +3,12 @@ import { AnvilCanvas } from "./AnvilCanvas";
import React from "react";
import { useCanvasActivationStates } from "../canvasArenas/hooks/mainCanvas/useCanvasActivationStates";
import { useCanvasActivation } from "../canvasArenas/hooks/mainCanvas/useCanvasActivation";
+import { useSelectWidgetListener } from "../common/hooks/useSelectWidgetListener";
export const AnvilMainCanvas = (props: BaseWidgetProps) => {
const anvilCanvasActivationStates = useCanvasActivationStates();
useCanvasActivation(anvilCanvasActivationStates);
+
+ useSelectWidgetListener();
return <AnvilCanvas {...props} />;
};
diff --git a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilDnDStates.ts b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilDnDStates.ts
index 0666a961711b..75321677506d 100644
--- a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilDnDStates.ts
+++ b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilDnDStates.ts
@@ -16,7 +16,6 @@ import type { LayoutElementPositions } from "layoutSystems/common/types";
import { areWidgetsWhitelisted } from "layoutSystems/anvil/utils/layouts/whitelistUtils";
import { AnvilDropTargetTypesEnum, type AnvilDragMeta } from "../types";
import { getDraggedBlocks, getDraggedWidgetTypes } from "./utils";
-import ModalWidget from "widgets/ModalWidget/widget";
interface AnvilDnDStatesProps {
allowedWidgetTypes: string[];
@@ -38,8 +37,6 @@ export interface AnvilDnDStates {
mainCanvasLayoutId: string;
}
-const AnvilOverlayWidgetTypes = [ModalWidget.type];
-
/**
* function to validate if the widget(s) being dragged is supported by the canvas.
* ex: In a From widget the header will not accept widgets like Table/List.
@@ -127,7 +124,7 @@ export const useAnvilDnDStates = ({
* boolean that indicates if the widget being dragged in an overlay widget like the Modal widget.
*/
const activateOverlayWidgetDrop =
- isNewWidget && AnvilOverlayWidgetTypes.includes(newWidget.type);
+ isNewWidget && newWidget.detachFromLayout === true;
const isMainCanvas: boolean = layoutId === mainCanvasLayoutId;
const isSection: boolean = layoutType === LayoutComponentTypes.SECTION;
const draggedWidgetTypes = useMemo(
diff --git a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilWidgetDrop.ts b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilWidgetDrop.ts
index d1e861c8a5bd..abfab45c3d23 100644
--- a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilWidgetDrop.ts
+++ b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useAnvilWidgetDrop.ts
@@ -25,6 +25,7 @@ export const useAnvilWidgetDrop = (
newWidgetId: newWidget.widgetId,
parentId: canvasId,
type: isSectionWidget ? anvilWidgets.ZONE_WIDGET : newWidget.type,
+ detachFromLayout: !!newWidget.detachFromLayout,
};
}, [dragDetails]);
return (renderedBlock: AnvilHighlightInfo) => {
diff --git a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useCanvasDragging.ts b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useCanvasDragging.ts
index 0493c6601817..b18e1a05370a 100644
--- a/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useCanvasDragging.ts
+++ b/app/client/src/layoutSystems/anvil/canvasArenas/hooks/useCanvasDragging.ts
@@ -40,10 +40,13 @@ const renderDisallowOnCanvas = (slidingArena: HTMLDivElement) => {
* and also there would be no highlights for AnvilOverlayWidgetTypes widgets
*/
const renderOverlayWidgetDropLayer = (slidingArena: HTMLDivElement) => {
- slidingArena.style.backgroundColor = "blue";
- slidingArena.style.opacity = "50%";
+ slidingArena.style.backgroundColor = Colors.HIGHLIGHT_FILL;
+ slidingArena.style.opacity = "70%";
slidingArena.style.color = "white";
- slidingArena.innerText = "Pls drop the widget anywhere on the canvas";
+ slidingArena.innerText = "Please drop the widget here";
+ slidingArena.style.display = "flex";
+ slidingArena.style.alignItems = "center";
+ slidingArena.style.justifyContent = "center";
};
/**
diff --git a/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx b/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx
index 9106b1d5c9f4..028e6b56a89e 100644
--- a/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx
+++ b/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx
@@ -1,10 +1,9 @@
import React, { useCallback, useEffect, useMemo, useState } from "react";
-import type { CSSProperties, MouseEvent } from "react";
+import type { CSSProperties, MouseEventHandler } from "react";
import { Flex } from "@design-system/widgets";
import { useSelector } from "react-redux";
import { snipingModeSelector } from "selectors/editorSelectors";
-import { useClickToSelectWidget } from "utils/hooks/useClickToSelectWidget";
import { usePositionedContainerZIndex } from "utils/hooks/usePositionedContainerZIndex";
import {
isCurrentWidgetFocused,
@@ -25,6 +24,7 @@ import { usePositionObserver } from "layoutSystems/common/utils/LayoutElementPos
import { useWidgetBorderStyles } from "./hooks/useWidgetBorderStyles";
import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
import type { AppState } from "@appsmith/reducers";
+import { SELECT_ANVIL_WIDGET_CUSTOM_EVENT } from "../utils/constants";
/**
* Adds following functionalities to the widget:
@@ -63,15 +63,22 @@ export function AnvilFlexComponent(props: AnvilFlexComponentProps) {
const [verticalAlignment, setVerticalAlignment] =
useState<FlexVerticalAlignment>(FlexVerticalAlignment.Top);
- const clickToSelectWidget = useClickToSelectWidget(props.widgetId);
const onClickFn = useCallback(
- (e) => {
- clickToSelectWidget(e);
+ function () {
+ if (ref.current && isFocused) {
+ ref.current.dispatchEvent(
+ new CustomEvent(SELECT_ANVIL_WIDGET_CUSTOM_EVENT, {
+ bubbles: true,
+ cancelable: true,
+ detail: { widgetId: props.widgetId },
+ }),
+ );
+ }
},
- [props.widgetId, clickToSelectWidget],
+ [props.widgetId, isFocused],
);
- const stopEventPropagation = (e: MouseEvent<HTMLElement>) => {
+ const stopEventPropagation: MouseEventHandler<HTMLDivElement> = (e) => {
!isSnipingMode && e.stopPropagation();
};
@@ -160,7 +167,7 @@ export function AnvilFlexComponent(props: AnvilFlexComponentProps) {
ref={ref}
style={styleProps}
>
- {props.children}
+ <div className="h-full w-full">{props.children}</div>
</Flex>
);
}
diff --git a/app/client/src/layoutSystems/anvil/common/hooks/detachedWidgetHooks.ts b/app/client/src/layoutSystems/anvil/common/hooks/detachedWidgetHooks.ts
new file mode 100644
index 000000000000..682b20e0f74c
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/common/hooks/detachedWidgetHooks.ts
@@ -0,0 +1,167 @@
+import { useWidgetBorderStyles } from "./useWidgetBorderStyles";
+import { useDispatch, useSelector } from "react-redux";
+import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
+import { combinedPreviewModeSelector } from "selectors/editorSelectors";
+import { SELECT_ANVIL_WIDGET_CUSTOM_EVENT } from "layoutSystems/anvil/utils/constants";
+import type { RenderModes } from "constants/WidgetConstants";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+import { renderChildWidget } from "layoutSystems/common/utils/canvasUtils";
+import type { WidgetProps } from "widgets/BaseWidget";
+import { getRenderMode } from "selectors/editorSelectors";
+import { denormalize } from "utils/canvasStructureHelpers";
+import type { CanvasWidgetStructure } from "WidgetProvider/constants";
+import { getWidgets } from "sagas/selectors";
+import log from "loglevel";
+import { useEffect, useMemo } from "react";
+import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
+
+/**
+ * This hook is used to select and focus on a detached widget
+ * As detached widgets are outside of the layout flow, we need to access the correct element in the DOM
+ * @param widgetId The widget ID which needs to be selected
+ * @returns
+ */
+export function useHandleDetachedWidgetSelect(widgetId: string) {
+ const dispatch = useDispatch();
+ const isPreviewMode = useSelector(combinedPreviewModeSelector);
+
+ const className = getAnvilWidgetDOMId(widgetId);
+ const element = document.querySelector(`.${className}`);
+ const { focusWidget } = useWidgetSelection();
+
+ useEffect(() => {
+ // The select handler sends a custom event that is handled at a singular place in the AnvilMainCanvas
+ // The event listener is actually attached to the body and not the AnvilMainCanvas. This can be changed in the future if necessary.
+ const handleWidgetSelect = (e: any) => {
+ // EventPhase 2 is the Target phase.
+ // This signifies that the event has reached the target element.
+ // And since the target element is the detached widget, we can
+ // be sure that the click happened on the modal widget and not
+ // on any of the children. It is now save to select the detached widget
+ if (e.eventPhase === 2) {
+ element?.dispatchEvent(
+ new CustomEvent(SELECT_ANVIL_WIDGET_CUSTOM_EVENT, {
+ bubbles: true,
+ detail: { widgetId: widgetId },
+ }),
+ );
+ }
+ e.stopPropagation();
+ };
+
+ // The handler for focusing on a detached widget
+ // It makes sure to check if the app mode is preview or not
+ const handleWidgetFocus = (e: any) => {
+ if (e.eventPhase === 2) {
+ !isPreviewMode && dispatch(focusWidget(widgetId));
+ }
+ };
+
+ // Registering and unregistering listeners
+ if (element) {
+ element.addEventListener("click", handleWidgetSelect, {
+ passive: false,
+ capture: false,
+ });
+ element.addEventListener("mouseover", handleWidgetFocus);
+ }
+ return () => {
+ if (element) {
+ element.removeEventListener("click", handleWidgetSelect);
+ element.removeEventListener("mouseover", handleWidgetFocus);
+ }
+ };
+ }, [element, focusWidget, isPreviewMode, widgetId]);
+}
+
+/**
+ * A hook to add borders to detached widgets
+ * As detached widgets are outside of the layout flow, we need to access the correct element in the DOM
+ * and apply the styles to it
+ *
+ * This creates a dependency where the correct element in the detached widget needs to have the same class name
+ * Using a common function to generate the class name, this uses the widgetId as the seed and reliably generates the same classname
+ * for the same widgetId
+ * @param widgetId The widget ID which needs to be styled
+ */
+export function useAddBordersToDetachedWidgets(widgetId: string) {
+ // Get the styles to be applied
+ const borderStyled = useWidgetBorderStyles(widgetId);
+
+ // Get the element from the DOM
+ const className = getAnvilWidgetDOMId(widgetId);
+ const element: HTMLDivElement | null = document.querySelector(
+ `.${className}`,
+ );
+
+ // Apply the styles to the element
+ // If the style is not present, set it to none
+ if (element) {
+ if (borderStyled.border) element.style.border = borderStyled.border;
+ else element.style.border = "none";
+ if (borderStyled.outline) element.style.outline = borderStyled.outline;
+ else element.style.outline = "none";
+ if (borderStyled.outlineOffset)
+ element.style.outlineOffset = borderStyled.outlineOffset;
+ else element.style.outlineOffset = "none";
+ if (borderStyled.boxShadow)
+ element.style.boxShadow = borderStyled.boxShadow;
+ else element.style.boxShadow = "none";
+ if (borderStyled.borderRadius)
+ element.style.borderRadius = borderStyled.borderRadius;
+ else element.style.borderRadius = "none";
+ }
+}
+
+/**
+ * This hook computes the list of detached children to render on the Canvas
+ * As the detached widgets are not going to be within any layout, they need to be rendered as siblings to the main container
+ *
+ * The hook takes care of generating the "DSL" format for the detached children, which is used by the layout system to render
+ * @param children
+ * @returns
+ */
+function useDetachedChildren(children: CanvasWidgetStructure[]) {
+ const start = performance.now();
+ // Get all widgets
+ const widgets = useSelector(getWidgets);
+ // Filter out the detached children and denormalise each of the detached widgets to generate
+ // a DSL like hierarchy
+ const detachedChildren = useMemo(() => {
+ return children
+ .map((child) => widgets[child.widgetId])
+ .filter((child) => child.detachFromLayout === true)
+ .map((child) => {
+ return denormalize(child.widgetId, widgets);
+ });
+ }, [children, widgets]);
+ const end = performance.now();
+ log.debug("### Computing detached children took:", end - start, "ms");
+ return detachedChildren;
+}
+
+export function useRenderDetachedChildren(
+ widgetId: string,
+ children: CanvasWidgetStructure[],
+) {
+ const renderMode: RenderModes = useSelector(getRenderMode);
+
+ // Get the detached children to render on the canvas
+ const detachedChildren = useDetachedChildren(children);
+ let renderDetachedChildren = null;
+ if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
+ renderDetachedChildren = detachedChildren.map((child) =>
+ renderChildWidget({
+ childWidgetData: child as WidgetProps,
+ defaultWidgetProps: {},
+ noPad: false,
+ // Adding these properties as the type insists on providing this
+ // while it is not required for detached children
+ layoutSystemProps: { parentColumnSpace: 1, parentRowSpace: 1 },
+ renderMode: renderMode,
+ widgetId: MAIN_CONTAINER_WIDGET_ID,
+ }),
+ );
+ }
+ return renderDetachedChildren;
+}
diff --git a/app/client/src/layoutSystems/anvil/common/hooks/useSelectWidgetListener.ts b/app/client/src/layoutSystems/anvil/common/hooks/useSelectWidgetListener.ts
new file mode 100644
index 000000000000..90037a806003
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/common/hooks/useSelectWidgetListener.ts
@@ -0,0 +1,41 @@
+import { selectAnvilWidget } from "layoutSystems/anvil/integrations/actions";
+import { SELECT_ANVIL_WIDGET_CUSTOM_EVENT } from "layoutSystems/anvil/utils/constants";
+import { useCallback, useEffect } from "react";
+import { useDispatch } from "react-redux";
+
+/**
+ * This hook is used to select a widget in the Anvil Layout System
+ * A custom event is dispatched by all widgets on click
+ * This hook listens to that event and dispatches the select action
+ *
+ * We throttle (and use trailing) the listener to prevent multiple dispatches, as well as to pick the latest event
+ * The latest event is going to be the most deeply nested child that has triggered this event
+ *
+ * The maxWait value and wait values for throttle are variable, they can be adjusted according to the need
+ * For now, 100ms seems like a good middle ground.
+ */
+export function useSelectWidgetListener() {
+ const dispatch = useDispatch();
+
+ const handleClick = useCallback(
+ function (e: any) {
+ dispatch(selectAnvilWidget(e.detail.widgetId, e));
+ },
+ [selectAnvilWidget],
+ );
+
+ // Register and unregister the listeners on the document.body
+ useEffect(() => {
+ document.body.addEventListener(
+ SELECT_ANVIL_WIDGET_CUSTOM_EVENT,
+ handleClick,
+ true,
+ );
+ return () => {
+ document.body.removeEventListener(
+ SELECT_ANVIL_WIDGET_CUSTOM_EVENT,
+ handleClick,
+ );
+ };
+ }, [handleClick]);
+}
diff --git a/app/client/src/layoutSystems/anvil/editor/AnvilEditorDetachedWidgetOnion.tsx b/app/client/src/layoutSystems/anvil/editor/AnvilEditorDetachedWidgetOnion.tsx
new file mode 100644
index 000000000000..b6a2e75084ee
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/editor/AnvilEditorDetachedWidgetOnion.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
+import { AnvilWidgetComponent } from "../common/widgetComponent/AnvilWidgetComponent";
+import { useObserveDetachedWidget } from "layoutSystems/common/utils/LayoutElementPositionsObserver/usePositionObserver";
+import {
+ useAddBordersToDetachedWidgets,
+ useHandleDetachedWidgetSelect,
+} from "layoutSystems/anvil/common/hooks/detachedWidgetHooks";
+
+/**
+ * AnvilEditorDetachedWidgetOnion
+ *
+ * Component that wraps the BaseWidget implementation of a Detached Widget with Editor specific wrappers
+ * needed in Anvil.
+ *
+ * Editor specific wrappers are wrappers added to perform actions in the editor.
+ * - AnvilWidgetComponent: provides layer to auto update dimensions based on content/ add skeleton widget on loading state
+ *
+ * @returns Enhanced Widget
+ */
+export const AnvilEditorDetachedWidgetOnion = (
+ props: BaseWidgetProps,
+): JSX.Element => {
+ useObserveDetachedWidget(props.widgetId);
+ useHandleDetachedWidgetSelect(props.widgetId);
+ useAddBordersToDetachedWidgets(props.widgetId);
+
+ return (
+ <AnvilWidgetComponent {...props}>{props.children}</AnvilWidgetComponent>
+ );
+};
diff --git a/app/client/src/layoutSystems/anvil/editor/AnvilEditorModalOnion.tsx b/app/client/src/layoutSystems/anvil/editor/AnvilEditorModalOnion.tsx
deleted file mode 100644
index d436470f18bb..000000000000
--- a/app/client/src/layoutSystems/anvil/editor/AnvilEditorModalOnion.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from "react";
-import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
-import { AnvilWidgetComponent } from "../common/widgetComponent/AnvilWidgetComponent";
-import { ModalOverlayLayer } from "layoutSystems/common/modalOverlay/ModalOverlayLayer";
-import { Classes } from "@blueprintjs/core";
-
-/**
- * AnvilEditorModalOnion
- *
- * Component that wraps the BaseWidget implementation of a Modal Widget with Editor specific wrappers
- * needed in Anvil.
- *
- * Editor specific wrappers are wrappers added to perform actions in the editor.
- * - AnvilWidgetComponent: provides layer to auto update dimensions based on content/ add skeleton widget on loading state
- * - ModalOverlayLayer: provides blueprint library overlay for the modal widget to be rendered.
- * - ModalResizableLayer: provides the resize handles required to set dimension for a modal widget.
- * - ClickContentToOpenPropPane: provides a way to open property pane on clicking on a modal widget content.
- *
- * @returns Enhanced Widget
- */
-export const AnvilEditorModalOnion = (props: BaseWidgetProps): JSX.Element => {
- return (
- <AnvilWidgetComponent {...props}>
- <ModalOverlayLayer {...props} isEditMode>
- <div className={Classes.OVERLAY_CONTENT}>{props.children}</div>
- </ModalOverlayLayer>
- </AnvilWidgetComponent>
- );
-};
diff --git a/app/client/src/layoutSystems/anvil/editor/AnvilEditorWrapper.tsx b/app/client/src/layoutSystems/anvil/editor/AnvilEditorWrapper.tsx
index 9c4bf1ad5624..d1a414a3bf5a 100644
--- a/app/client/src/layoutSystems/anvil/editor/AnvilEditorWrapper.tsx
+++ b/app/client/src/layoutSystems/anvil/editor/AnvilEditorWrapper.tsx
@@ -1,13 +1,13 @@
import React, { useMemo } from "react";
import type { WidgetProps } from "widgets/BaseWidget";
-import { AnvilEditorModalOnion } from "./AnvilEditorModalOnion";
+import { AnvilEditorDetachedWidgetOnion } from "./AnvilEditorDetachedWidgetOnion";
import { AnvilEditorWidgetOnion } from "./AnvilEditorWidgetOnion";
/**
* AnvilEditorWrapper
*
* Component that wraps a BaseWidget implementation of a widget with editor specific layers of Anvil.
- * check out AnvilEditorWidgetOnion and AnvilEditorModalOnion to further understand what they implement under the hood.
+ * check out AnvilEditorWidgetOnion and AnvilEditorDetachedWidgetOnion to further understand what they implement under the hood.
*
* @param props | WidgetProps
* @returns Enhanced BaseWidget with Editor specific Layers.
@@ -15,8 +15,8 @@ import { AnvilEditorWidgetOnion } from "./AnvilEditorWidgetOnion";
export const AnvilEditorWrapper = (props: WidgetProps) => {
//Widget Onion
const WidgetOnion = useMemo(() => {
- return props.type === "MODAL_WIDGET"
- ? AnvilEditorModalOnion
+ return props.detachFromLayout
+ ? AnvilEditorDetachedWidgetOnion
: AnvilEditorWidgetOnion;
}, [props.type]);
diff --git a/app/client/src/layoutSystems/anvil/index.ts b/app/client/src/layoutSystems/anvil/index.ts
index 1cf8bfe5a0db..ab4b4d243b4c 100644
--- a/app/client/src/layoutSystems/anvil/index.ts
+++ b/app/client/src/layoutSystems/anvil/index.ts
@@ -5,6 +5,7 @@ import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
import type { LayoutSystem } from "layoutSystems/types";
import { AnvilMainCanvas } from "./canvas/AnvilMainCanvas";
import { AnvilCanvas } from "./canvas/AnvilCanvas";
+import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
/**
* getAnvilSystemPropsEnhancer
@@ -13,6 +14,12 @@ import { AnvilCanvas } from "./canvas/AnvilCanvas";
*
*/
const getAnvilSystemPropsEnhancer = (props: BaseWidgetProps) => {
+ const _props = { ...props };
+ if (props.detachFromLayout) {
+ // Add className to detached widgets
+ _props.className = getAnvilWidgetDOMId(props.widgetId);
+ return _props;
+ }
return props;
};
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
index 576916efa341..cecbaaf28b4c 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
@@ -23,6 +23,7 @@ export interface AnvilNewWidgetsPayload {
height: number;
newWidgetId: string;
type: string;
+ detachFromLayout: boolean;
};
}
@@ -38,4 +39,5 @@ export enum AnvilReduxActionTypes {
ANVIL_SPACE_DISTRIBUTION_UPDATE = "ANVIL_SPACE_DISTRIBUTION_UPDATE",
ANVIL_SPACE_DISTRIBUTION_STOP = "ANVIL_SPACE_DISTRIBUTION_STOP",
ANVIL_SET_HIGHLIGHT_SHOWN = "ANVIL_SET_HIGHLIGHT_SHOWN",
+ ANVIL_WIDGET_SELECTION_CLICK = "ANVIL_WIDGET_SELECTION_CLICK",
}
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/draggingActions.ts b/app/client/src/layoutSystems/anvil/integrations/actions/draggingActions.ts
index 2fea2780c37d..036034c8a5c3 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/draggingActions.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/draggingActions.ts
@@ -16,6 +16,7 @@ export const addNewAnvilWidgetAction = (
height: number;
newWidgetId: string;
type: string;
+ detachFromLayout: boolean;
},
highlight: AnvilHighlightInfo,
dragMeta: AnvilDragMeta,
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/index.ts b/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
index 8f670367f60b..8481ad5285bf 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/index.ts
@@ -12,3 +12,13 @@ export const deleteLayoutElementPositions = (elements: string[]) => {
payload: elements,
};
};
+
+export const selectAnvilWidget = (widgetId: string, evt: CustomEvent) => {
+ return {
+ type: AnvilReduxActionTypes.ANVIL_WIDGET_SELECTION_CLICK,
+ payload: {
+ widgetId: widgetId,
+ e: evt,
+ },
+ };
+};
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/LayoutElementPositionsSaga.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/LayoutElementPositionsSaga.ts
index 81c5a9489e54..013a67270304 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/LayoutElementPositionsSaga.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/LayoutElementPositionsSaga.ts
@@ -133,8 +133,11 @@ function* readAndUpdateLayoutElementPositions() {
for (const anvilWidgetDOMId of Object.keys(registeredWidgets)) {
const { layoutId } = registeredWidgets[anvilWidgetDOMId];
const parentDropTargetPositions = positions[layoutId];
- const element: HTMLElement | null =
- document.getElementById(anvilWidgetDOMId);
+ let element: HTMLElement | null = document.getElementById(anvilWidgetDOMId);
+ if (!element) {
+ const elements = document.getElementsByClassName(anvilWidgetDOMId);
+ element = elements[0] as HTMLDivElement;
+ }
const widgetId = extractWidgetIdFromAnvilWidgetDOMId(anvilWidgetDOMId);
if (element) {
const rect: DOMRect = element.getBoundingClientRect();
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas.ts
index 4fdee42c5199..579c60789176 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas.ts
@@ -21,6 +21,7 @@ import { generateDefaultLayoutPreset } from "layoutSystems/anvil/layoutComponent
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
import { SelectionRequestType } from "sagas/WidgetSelectUtils";
import {
+ addDetachedWidgetToMainCanvas,
addWidgetsToMainCanvasLayout,
moveWidgetsToMainCanvas,
} from "layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils";
@@ -78,6 +79,7 @@ function* addSuggestedWidgetsAnvilSaga(
rows?: number;
columns?: number;
props: WidgetProps;
+ detachFromLayout: boolean;
};
}>,
) {
@@ -100,6 +102,7 @@ function* addSuggestedWidgetsAnvilSaga(
newWidgetId: newWidget.newWidgetId,
parentId: MAIN_CONTAINER_WIDGET_ID,
type: wdsType,
+ detachFromLayout: newWidget.detachFromLayout,
};
// Get highlighting information for the last row in the main canvas
@@ -142,12 +145,15 @@ export function* addNewChildToDSL(
height: number;
newWidgetId: string;
type: string;
+ detachFromLayout: boolean;
},
isMainCanvas: boolean, // Indicates if the drop zone is the main canvas
isSection: boolean, // Indicates if the drop zone is a section
) {
const { alignment, canvasId } = highlight;
const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+
+ const parentWidgetWithLayout = allWidgets[canvasId];
let updatedWidgets: CanvasWidgetsReduxState = { ...allWidgets };
const draggedWidgets: WidgetLayoutProps[] = [
@@ -158,31 +164,38 @@ export function* addNewChildToDSL(
},
];
- // Handle different scenarios based on the drop zone type (main canvas, section, or generic layout)
- if (!!isMainCanvas) {
- updatedWidgets = yield call(
- addWidgetsToMainCanvasLayout,
- updatedWidgets,
- draggedWidgets,
- highlight,
- );
- } else if (!!isSection) {
- const res: { canvasWidgets: CanvasWidgetsReduxState } = yield call(
- addWidgetsToSection,
- updatedWidgets,
- draggedWidgets,
- highlight,
- updatedWidgets[canvasId],
- );
- updatedWidgets = res.canvasWidgets;
+ if (newWidget.detachFromLayout) {
+ updatedWidgets = yield call(addDetachedWidgetToMainCanvas, updatedWidgets, {
+ widgetId: newWidget.newWidgetId,
+ type: newWidget.type,
+ });
} else {
- updatedWidgets = yield call(
- addWidgetToGenericLayout,
- updatedWidgets,
- draggedWidgets,
- highlight,
- newWidget,
- );
+ // Handle different scenarios based on the drop zone type (main canvas, section, or generic layout)
+ if (!!isMainCanvas || parentWidgetWithLayout.detachFromLayout) {
+ updatedWidgets = yield call(
+ addWidgetsToMainCanvasLayout,
+ updatedWidgets,
+ draggedWidgets,
+ highlight,
+ );
+ } else if (!!isSection) {
+ const res: { canvasWidgets: CanvasWidgetsReduxState } = yield call(
+ addWidgetsToSection,
+ updatedWidgets,
+ draggedWidgets,
+ highlight,
+ updatedWidgets[canvasId],
+ );
+ updatedWidgets = res.canvasWidgets;
+ } else {
+ updatedWidgets = yield call(
+ addWidgetToGenericLayout,
+ updatedWidgets,
+ draggedWidgets,
+ highlight,
+ newWidget,
+ );
+ }
}
return updatedWidgets;
}
@@ -290,11 +303,16 @@ function* moveWidgetsSaga(actionPayload: ReduxAction<AnvilMoveWidgetsPayload>) {
highlight,
movedWidgets,
} = actionPayload.payload;
- const isMainCanvas = draggedOn === "MAIN_CANVAS";
+ const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+ const parentWidgetWithLayout = allWidgets[highlight.canvasId];
+ const isMainCanvas =
+ draggedOn === "MAIN_CANVAS" || !!parentWidgetWithLayout.detachFromLayout;
const isSection = draggedOn === "SECTION";
const movedWidgetIds = movedWidgets.map((each) => each.widgetId);
- const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
- const updatedWidgets: CanvasWidgetsReduxState = yield call(
+
+ const updatedWidgets: CanvasWidgetsReduxState = yield call<
+ typeof handleWidgetMovement
+ >(
handleWidgetMovement,
allWidgets,
movedWidgetIds,
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetSelectionSaga.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetSelectionSaga.ts
new file mode 100644
index 000000000000..8a854b2fb26a
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetSelectionSaga.ts
@@ -0,0 +1,83 @@
+import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
+import { focusWidget } from "actions/widgetActions";
+import { selectWidgetInitAction } from "actions/widgetSelectionActions";
+import type { LayoutSystemTypes } from "layoutSystems/types";
+import log from "loglevel";
+import { put, select, takeLatest } from "redux-saga/effects";
+import { SelectionRequestType } from "sagas/WidgetSelectUtils";
+import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
+import { getIsPropertyPaneVisible } from "selectors/propertyPaneSelectors";
+import {
+ getFocusedParentToOpen,
+ isWidgetSelected,
+ shouldWidgetIgnoreClicksSelector,
+} from "selectors/widgetSelectors";
+import { NavigationMethod } from "utils/history";
+import type { WidgetProps } from "widgets/BaseWidget";
+
+/**
+ * This saga selects widgets in the Anvil Layout system
+ * It is triggered by a custom event dispatched by all widgets on click
+ * @param action The widgetId and the event object for the click that resulted in the call to this saga
+ * @returns
+ */
+export function* selectAnvilWidget(
+ action: ReduxAction<{ widgetId: string; e: PointerEvent }>,
+) {
+ const start = performance.now();
+ const { e, widgetId } = action.payload;
+
+ const isPropPaneVisible: boolean = yield select(getIsPropertyPaneVisible);
+ const isWidgetAlreadySelected: boolean = yield select(
+ isWidgetSelected(widgetId),
+ );
+ const parentWidgetToOpen: WidgetProps = yield select(getFocusedParentToOpen);
+ const shouldIgnoreClicks: boolean = yield select(
+ shouldWidgetIgnoreClicksSelector(widgetId),
+ );
+
+ const layoutSystemType: LayoutSystemTypes = yield select(getLayoutSystemType);
+
+ // The following code has been copied from `useWidgetSelection` hook.
+ // In the event of any changes to the hook, this code needs to be updated as well.
+ // TODO(#30582): Refactor this code to a common function and use it in both places.
+ if (shouldIgnoreClicks) return;
+ if (
+ (!isPropPaneVisible && isWidgetAlreadySelected) ||
+ !isWidgetAlreadySelected
+ ) {
+ let type: SelectionRequestType = SelectionRequestType.One;
+ if (e.metaKey || e.ctrlKey || (layoutSystemType && e.shiftKey)) {
+ type = SelectionRequestType.PushPop;
+ } else if (e.shiftKey) {
+ type = SelectionRequestType.ShiftSelect;
+ }
+
+ if (parentWidgetToOpen) {
+ yield put(
+ selectWidgetInitAction(
+ type,
+ [parentWidgetToOpen.widgetId],
+ NavigationMethod.CanvasClick,
+ ),
+ );
+ } else {
+ yield put(
+ selectWidgetInitAction(type, [widgetId], NavigationMethod.CanvasClick),
+ );
+ yield put(focusWidget(widgetId));
+ }
+
+ if (
+ type === SelectionRequestType.PushPop ||
+ type === SelectionRequestType.ShiftSelect
+ ) {
+ e.stopPropagation();
+ }
+ }
+ log.debug("Time taken to select widget", performance.now() - start, "ms");
+}
+
+export default function* selectAnvilWidgetSaga() {
+ yield takeLatest("ANVIL_WIDGET_SELECTION_CLICK", selectAnvilWidget);
+}
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/index.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/index.ts
index f19ecfe289c3..69337fd560eb 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/index.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/index.ts
@@ -3,6 +3,7 @@ import anvilDraggingSagas from "./anvilDraggingSagas";
import LayoutElementPositionsSaga from "./LayoutElementPositionsSaga";
import anvilSectionSagas from "./sectionSagas";
import anvilSpaceDistributionSagas from "./anvilSpaceDistributionSagas";
+import anvilWidgetSelectionSaga from "./anvilWidgetSelectionSaga";
import pasteSagas from "./pasteSagas";
export default function* anvilSagas() {
@@ -10,5 +11,6 @@ export default function* anvilSagas() {
yield fork(anvilDraggingSagas);
yield fork(anvilSectionSagas);
yield fork(anvilSpaceDistributionSagas);
+ yield fork(anvilWidgetSelectionSaga);
yield fork(pasteSagas);
}
diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas.ts
index 48f351d4dd67..84e310867478 100644
--- a/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/sagas/pasteSagas.ts
@@ -41,6 +41,8 @@ function* pasteWidgetSagas() {
const selectedWidget: FlattenedWidgetProps =
yield getSelectedWidgetWhenPasting();
+ if (!selectedWidget) return;
+
let allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
const destinationInfo: PasteDestinationInfo = yield call(
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/presets/ModalPreset.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/presets/ModalPreset.tsx
index 282526759919..d4a095f3dcb3 100644
--- a/app/client/src/layoutSystems/anvil/layoutComponents/presets/ModalPreset.tsx
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/presets/ModalPreset.tsx
@@ -2,103 +2,31 @@ import {
LayoutComponentTypes,
type LayoutProps,
} from "layoutSystems/anvil/utils/anvilTypes";
-import { FlexLayerAlignment } from "layoutSystems/common/utils/constants";
import { generateReactKey } from "utils/generators";
-import ButtonWidget from "widgets/ButtonWidget/widget";
-import IconButtonWidget from "widgets/IconButtonWidget/widget";
-import TextWidget from "widgets/TextWidget/widget";
-export const modalPreset = (
- title: string,
- icon: string,
- button1: string,
- button2: string,
-): LayoutProps[] => {
+export const modalPreset = (): LayoutProps[] => {
return [
{
- isPermanent: true,
layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.LAYOUT_COLUMN,
- layout: [
- {
- isPermanent: true,
- layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.LAYOUT_ROW,
- layout: [
- {
- allowedWidgetTypes: ["TEXT_WIDGET"],
- isDropTarget: true,
- isPermanent: true,
- layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.WIDGET_ROW,
- layout: [
- {
- widgetId: title,
- alignment: FlexLayerAlignment.Start,
- widgetType: TextWidget.type,
- },
- ],
- layoutStyle: {
- flexGrow: 1,
- minHeight: "40px",
- },
- },
- {
- allowedWidgetTypes: ["ICON_BUTTON_WIDGET"],
- isDropTarget: true,
- isPermanent: true,
- layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.WIDGET_ROW,
- layout: [
- {
- widgetId: icon,
- alignment: FlexLayerAlignment.Start,
- widgetType: IconButtonWidget.type,
- },
- ],
- layoutStyle: {
- minWidth: "30px",
- minHeight: "40px",
- },
- },
- ],
- layoutStyle: {
- minHeight: "40px",
- },
- },
- {
- isDropTarget: true,
- isPermanent: true,
- layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN,
- layout: [],
- layoutStyle: {
- minHeight: "40px",
- width: "100%",
- },
- },
- {
- isDropTarget: true,
- isPermanent: true,
- layoutId: generateReactKey(),
- layoutType: LayoutComponentTypes.ALIGNED_WIDGET_ROW,
- layout: [
- {
- widgetId: button2,
- alignment: FlexLayerAlignment.End,
- widgetType: ButtonWidget.type,
- },
- {
- widgetId: button1,
- alignment: FlexLayerAlignment.End,
- widgetType: ButtonWidget.type,
- },
- ],
- layoutStyle: {
- minHeight: "40px",
- },
- },
- ],
+ layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN,
+ layout: [],
+ layoutStyle: {
+ border: "none",
+ height: "100%",
+ minHeight: "sizing-16",
+ padding: "spacing-1",
+ },
+ isDropTarget: true,
+ isPermanent: true,
+ childTemplate: {
+ insertChild: true,
+ isDropTarget: false,
+ isPermanent: false,
+ layout: [],
+ layoutId: "",
+ layoutType: LayoutComponentTypes.WIDGET_ROW,
+ maxChildLimit: 1,
+ },
},
];
};
diff --git a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
index 052a8d52ee24..64585681cbd7 100644
--- a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
+++ b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
@@ -22,7 +22,7 @@ export function anvilDSLTransformer(dsl: DSLWidget) {
layoutStyle: {
border: "none",
height: "100%",
- minHeight: "70vh",
+ minHeight: "var(--canvas-height)",
padding: "spacing-1",
},
isDropTarget: true,
diff --git a/app/client/src/layoutSystems/anvil/utils/constants.ts b/app/client/src/layoutSystems/anvil/utils/constants.ts
index b4ad1e15a93f..4e4e0b3953a8 100644
--- a/app/client/src/layoutSystems/anvil/utils/constants.ts
+++ b/app/client/src/layoutSystems/anvil/utils/constants.ts
@@ -28,9 +28,13 @@ export const defaultHighlightRenderInfo: HighlightRenderInfo = {
export const MIN_ZONE_COUNT = 1;
export const MAX_ZONE_COUNT = 4;
+export const SELECT_ANVIL_WIDGET_CUSTOM_EVENT =
+ "SELECT_ANVIL_WIDGET_CUSTOM_EVENT";
+
export const widgetHierarchy: Record<string, number> = {
MAIN_CANVAS: 0,
- [anvilWidgets.SECTION_WIDGET]: 1,
- [anvilWidgets.ZONE_WIDGET]: 2,
- OTHER: 3,
+ WDS_MODAL_WIDGET: 1,
+ [anvilWidgets.SECTION_WIDGET]: 2,
+ [anvilWidgets.ZONE_WIDGET]: 3,
+ OTHER: 4,
};
diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts
index dd29657f46c9..5465a6cfaf03 100644
--- a/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts
@@ -12,6 +12,35 @@ import { call } from "redux-saga/effects";
import { severTiesFromParents, transformMovedWidgets } from "./moveUtils";
import { anvilWidgets } from "widgets/anvil/constants";
+import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
+import {
+ addNewWidgetToDsl,
+ getCreateWidgetPayload,
+} from "../../widgetAdditionUtils";
+
+/**
+ * This function adds a detached widget to the main canvas.
+ * This is a different saga because we don't need to generate sections, zones, etc
+ * As well as the fact that all detached widgets are children of the MainContainer.
+ * @param allWidgets | CanvasWidgetsReduxState : All widgets in the canvas.
+ * @param draggedWidget | { widgetId: string; type: string } : Widget to be added.
+ * @returns CanvasWidgetsReduxState : Updated widgets.
+ */
+export function* addDetachedWidgetToMainCanvas(
+ allWidgets: CanvasWidgetsReduxState,
+ draggedWidget: { widgetId: string; type: string },
+) {
+ const updatedWidgets: CanvasWidgetsReduxState = yield call(
+ addNewWidgetToDsl,
+ allWidgets,
+ getCreateWidgetPayload(
+ draggedWidget.widgetId,
+ draggedWidget.type,
+ MAIN_CONTAINER_WIDGET_ID,
+ ),
+ );
+ return updatedWidgets;
+}
export function* addWidgetsToMainCanvasLayout(
allWidgets: CanvasWidgetsReduxState,
@@ -23,6 +52,7 @@ export function* addWidgetsToMainCanvasLayout(
* Step 1: Get layout for MainCanvas.
*/
let mainCanvasWidget: WidgetProps = allWidgets[highlight.canvasId];
+
let mainCanvasPreset: LayoutProps[] = mainCanvasWidget.layout;
let mainCanvasLayout: LayoutProps | undefined = getAffectedLayout(
mainCanvasPreset,
diff --git a/app/client/src/layoutSystems/anvil/utils/paste/destinationUtils.ts b/app/client/src/layoutSystems/anvil/utils/paste/destinationUtils.ts
index 2e3568046096..ce787a5d5614 100644
--- a/app/client/src/layoutSystems/anvil/utils/paste/destinationUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/paste/destinationUtils.ts
@@ -35,7 +35,7 @@ export function* getDestinedParent(
/**
* Traverse up the parent - child tree,
* tracking all parentIds, until we reach a hierarchy where the copied widgets can be added.
- * MainCanvas > Section > Zone > Widgets.
+ * MainCanvas > Modal > Section > Zone > Widgets.
*/
const parent: FlattenedWidgetProps = allWidgets[currentWidget?.parentId];
index = getWidgetHierarchy(parent.type, parent.widgetId);
diff --git a/app/client/src/layoutSystems/anvil/utils/paste/mainCanvasPasteUtils.ts b/app/client/src/layoutSystems/anvil/utils/paste/mainCanvasPasteUtils.ts
index 346368481510..4223b9d5cdeb 100644
--- a/app/client/src/layoutSystems/anvil/utils/paste/mainCanvasPasteUtils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/paste/mainCanvasPasteUtils.ts
@@ -52,22 +52,28 @@ export function* pasteWidgetsIntoMainCanvas(
const targetLayout: LayoutProps = layoutOrder[layoutIndex];
const targetRowIndex = layoutOrder.length > 1 ? 1 : 0;
- widgets = yield call(
- handleWidgetMovement,
- widgets,
- copiedWidgets.map((each: CopiedWidgetData) => map[each.widgetId]),
- {
- ...defaultHighlightRenderInfo,
- alignment,
- canvasId: parent.widgetId,
- layoutId: targetLayout.layoutId,
- layoutOrder: layoutOrder
- .slice(0, layoutIndex + 1)
- .map((each: LayoutProps) => each.layoutId),
- rowIndex: rowIndex[targetRowIndex],
- },
- true,
- false,
+ const nonDetachedWidgets: CopiedWidgetData[] = copiedWidgets.filter(
+ (each: CopiedWidgetData) => !each.list[0].detachFromLayout,
);
+
+ if (nonDetachedWidgets.length) {
+ widgets = yield call(
+ handleWidgetMovement,
+ widgets,
+ nonDetachedWidgets.map((each: CopiedWidgetData) => map[each.widgetId]),
+ {
+ ...defaultHighlightRenderInfo,
+ alignment,
+ canvasId: parent.widgetId,
+ layoutId: targetLayout.layoutId,
+ layoutOrder: layoutOrder
+ .slice(0, layoutIndex + 1)
+ .map((each: LayoutProps) => each.layoutId),
+ rowIndex: rowIndex[targetRowIndex],
+ },
+ true,
+ false,
+ );
+ }
return { widgets, widgetIdMap: map, reverseWidgetIdMap: reverseMap };
}
diff --git a/app/client/src/layoutSystems/anvil/viewer/AnvilViewerDetachedWidgetOnion.tsx b/app/client/src/layoutSystems/anvil/viewer/AnvilViewerDetachedWidgetOnion.tsx
new file mode 100644
index 000000000000..6affdb94af03
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/viewer/AnvilViewerDetachedWidgetOnion.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+
+import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
+import { AnvilWidgetComponent } from "../common/widgetComponent/AnvilWidgetComponent";
+
+/**
+ * AnvilViewerDetachedWidgetOnion
+ *
+ * Component that wraps the BaseWidget implementation of a Detached Widget with Viewer(Deployed Application Viewer) specific wrappers
+ * needed in Anvil.
+ *
+ * Viewer specific wrappers are wrappers added to perform actions in the viewer.
+ * - AnvilWidgetComponent: provides layer to auto update dimensions based on content/ add skeleton widget on loading state
+ *
+ * @returns Enhanced Widget
+ */
+export const AnvilViewerDetachedWidgetOnion = (props: BaseWidgetProps) => {
+ return (
+ <AnvilWidgetComponent {...props}>{props.children}</AnvilWidgetComponent>
+ );
+};
diff --git a/app/client/src/layoutSystems/anvil/viewer/AnvilViewerModalOnion.tsx b/app/client/src/layoutSystems/anvil/viewer/AnvilViewerModalOnion.tsx
deleted file mode 100644
index 93047f3102d3..000000000000
--- a/app/client/src/layoutSystems/anvil/viewer/AnvilViewerModalOnion.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from "react";
-import { Classes } from "@blueprintjs/core";
-
-import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
-import { AnvilWidgetComponent } from "../common/widgetComponent/AnvilWidgetComponent";
-import { ModalOverlayLayer } from "layoutSystems/common/modalOverlay/ModalOverlayLayer";
-
-/**
- * AnvilViewerModalOnion
- *
- * Component that wraps the BaseWidget implementation of a Modal Widget with Viewer(Deployed Application Viewer) specific wrappers
- * needed in Anvil.
- *
- * Viewer specific wrappers are wrappers added to perform actions in the viewer.
- * - AnvilWidgetComponent: provides layer to auto update dimensions based on content/ add skeleton widget on loading state
- * - ModalOverlayLayer: provides blueprint library overlay for the modal widget to be rendered.
- *
- * @returns Enhanced Widget
- */
-export const AnvilViewerModalOnion = (props: BaseWidgetProps) => {
- return (
- <AnvilWidgetComponent {...props}>
- <ModalOverlayLayer {...props} isEditMode={false}>
- <div className={Classes.OVERLAY_CONTENT}>{props.children}</div>
- </ModalOverlayLayer>
- </AnvilWidgetComponent>
- );
-};
diff --git a/app/client/src/layoutSystems/anvil/viewer/AnvilViewerWrapper.tsx b/app/client/src/layoutSystems/anvil/viewer/AnvilViewerWrapper.tsx
index d8c952dba035..6532a0056de7 100644
--- a/app/client/src/layoutSystems/anvil/viewer/AnvilViewerWrapper.tsx
+++ b/app/client/src/layoutSystems/anvil/viewer/AnvilViewerWrapper.tsx
@@ -1,6 +1,6 @@
import React, { useMemo } from "react";
import type { WidgetProps } from "widgets/BaseWidget";
-import { AnvilViewerModalOnion } from "./AnvilViewerModalOnion";
+import { AnvilViewerDetachedWidgetOnion } from "./AnvilViewerDetachedWidgetOnion";
import { AnvilViewerWidgetOnion } from "./AnvilViewerWidgetOnion";
/**
@@ -14,8 +14,8 @@ import { AnvilViewerWidgetOnion } from "./AnvilViewerWidgetOnion";
*/
export const AnvilViewerWrapper = (props: WidgetProps) => {
const WidgetOnion = useMemo(() => {
- return props.type === "MODAL_WIDGET"
- ? AnvilViewerModalOnion
+ return props.detachFromLayout === true
+ ? AnvilViewerDetachedWidgetOnion
: AnvilViewerWidgetOnion;
}, [props.type]);
diff --git a/app/client/src/layoutSystems/autolayout/layoutComponents/presets/ModalPreset.ts b/app/client/src/layoutSystems/autolayout/layoutComponents/presets/ModalPreset.ts
new file mode 100644
index 000000000000..282526759919
--- /dev/null
+++ b/app/client/src/layoutSystems/autolayout/layoutComponents/presets/ModalPreset.ts
@@ -0,0 +1,104 @@
+import {
+ LayoutComponentTypes,
+ type LayoutProps,
+} from "layoutSystems/anvil/utils/anvilTypes";
+import { FlexLayerAlignment } from "layoutSystems/common/utils/constants";
+import { generateReactKey } from "utils/generators";
+import ButtonWidget from "widgets/ButtonWidget/widget";
+import IconButtonWidget from "widgets/IconButtonWidget/widget";
+import TextWidget from "widgets/TextWidget/widget";
+
+export const modalPreset = (
+ title: string,
+ icon: string,
+ button1: string,
+ button2: string,
+): LayoutProps[] => {
+ return [
+ {
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.LAYOUT_COLUMN,
+ layout: [
+ {
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.LAYOUT_ROW,
+ layout: [
+ {
+ allowedWidgetTypes: ["TEXT_WIDGET"],
+ isDropTarget: true,
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.WIDGET_ROW,
+ layout: [
+ {
+ widgetId: title,
+ alignment: FlexLayerAlignment.Start,
+ widgetType: TextWidget.type,
+ },
+ ],
+ layoutStyle: {
+ flexGrow: 1,
+ minHeight: "40px",
+ },
+ },
+ {
+ allowedWidgetTypes: ["ICON_BUTTON_WIDGET"],
+ isDropTarget: true,
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.WIDGET_ROW,
+ layout: [
+ {
+ widgetId: icon,
+ alignment: FlexLayerAlignment.Start,
+ widgetType: IconButtonWidget.type,
+ },
+ ],
+ layoutStyle: {
+ minWidth: "30px",
+ minHeight: "40px",
+ },
+ },
+ ],
+ layoutStyle: {
+ minHeight: "40px",
+ },
+ },
+ {
+ isDropTarget: true,
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN,
+ layout: [],
+ layoutStyle: {
+ minHeight: "40px",
+ width: "100%",
+ },
+ },
+ {
+ isDropTarget: true,
+ isPermanent: true,
+ layoutId: generateReactKey(),
+ layoutType: LayoutComponentTypes.ALIGNED_WIDGET_ROW,
+ layout: [
+ {
+ widgetId: button2,
+ alignment: FlexLayerAlignment.End,
+ widgetType: ButtonWidget.type,
+ },
+ {
+ widgetId: button1,
+ alignment: FlexLayerAlignment.End,
+ widgetType: ButtonWidget.type,
+ },
+ ],
+ layoutStyle: {
+ minHeight: "40px",
+ },
+ },
+ ],
+ },
+ ];
+};
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameConstants.ts b/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameConstants.ts
index 37a9b1eac289..57d6e7fecbcf 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameConstants.ts
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameConstants.ts
@@ -43,7 +43,7 @@ export const widgetNameWrapperStyle: CSSProperties = {
position: "absolute",
top: 0,
left: 0,
- zIndex: 2,
+ zIndex: "var(--on-canvas-ui-z-index)",
pointerEvents: "none",
display: "flex",
flexDirection: "column",
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts b/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
index 932ecb597424..0011d2485c34 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/eventHandlers.ts
@@ -6,12 +6,11 @@ import type {
WidgetNamePositionType,
} from "./WidgetNameTypes";
import { throttle } from "lodash";
-import { getMainContainerAnvilCanvasDOMElement } from "./widgetNameRenderUtils";
import type { SetDraggingStateActionPayload } from "utils/hooks/dragResizeHooks";
import { WIDGET_NAME_COMPONENT_BUFFER } from "./WidgetNameConstants";
/**
- * This returns a callback for scroll event on the MainContainer
+ * This returns a callback for scroll event on the provided scrollparent
*
* This callback does the following:
* 1. Sets the scrolling state to 1 if it is not already set to 0.
@@ -31,10 +30,9 @@ export function getScrollHandler(
hasScroll: MutableRefObject<boolean>,
resetCanvas: () => void,
scrollTop: MutableRefObject<number>,
+ scrollParent: HTMLDivElement | null,
) {
return function handleScroll() {
- const scrollParent: HTMLDivElement | null =
- getMainContainerAnvilCanvasDOMElement();
if (!scrollParent) return;
if (isScrolling.current === 0) {
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx b/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
index c8fecf2f324b..0829f8d849a8 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/index.tsx
@@ -36,6 +36,7 @@ import {
getScrollEndHandler,
getScrollHandler,
} from "./eventHandlers";
+import { WDS_MODAL_WIDGET_CLASSNAME } from "widgets/wds/constants";
/**
* This Component contains logic to draw widget name on canvas
@@ -93,6 +94,10 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
canvasPositions,
});
+ const modalScrollParent: HTMLDivElement | null = document.querySelector(
+ `.${WDS_MODAL_WIDGET_CLASSNAME}`,
+ ) as HTMLDivElement;
+
// Used to set canvasPositions, which is used further to calculate the exact positions of widgets
useEffect(() => {
if (!stageRef?.current?.content || !wrapperRef?.current) return;
@@ -119,6 +124,15 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
* 2. Scroll: On the MainContainer, to check if the user is scrolling. This is so that we can hide the widget names
* Also, this tells us that we need to compute and store scroll offset values to correctly position the widget name components.
* 3. Scroll End: On the MainContainer, to check if the user has stopped scrolling. This is so that we can show the widget names again
+ *
+ *
+ * The logic for handling modal scroll is similar to the main container scroll
+ * The functions have been modified to be able to handle this for any scrollParent
+ *
+ * It is likely that the code below will need to be refactored for any new use cases
+ * However, the logic for handling scroll and scroll end will remain the same
+ *
+ *
*/
useEffect(() => {
const scrollParent: HTMLDivElement | null =
@@ -129,11 +143,34 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
const reset = resetCanvas.bind(this, widgetNamePositions, stageRef);
+ // As we're not in control of when a modal mounts or unmounts
+ // from this component, we need to create abort controllers
+ // to remotely abort the event listeners
+ const scrollController = new AbortController();
+ const scrollEndController = new AbortController();
+
+ const modalScrollHandler = getScrollHandler(
+ isScrolling,
+ hasScroll,
+ reset,
+ scrollTop,
+ modalScrollParent,
+ );
+
+ const modalScrollEndHandler = getScrollEndHandler(
+ isScrolling,
+ hasScroll,
+ updateFn,
+ );
+
+ // Since we're not handling scroll in a modal,
+ // we need to handle scroll for the main container
const scrollHandler = getScrollHandler(
isScrolling,
hasScroll,
reset,
scrollTop,
+ scrollParent,
);
const scrollEndHandler = getScrollEndHandler(
@@ -142,6 +179,35 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
updateFn,
);
+ // If we have a modal parent, we need to handle scroll for the modal
+ // While the modal is visible the scrollParent will be the modal
+ if (modalScrollParent) {
+ modalScrollParent.addEventListener("scroll", modalScrollHandler, {
+ signal: scrollController.signal,
+ // we need to let the browser handle scroll without waiting for the
+ // event listener to run
+ passive: true,
+ });
+ modalScrollParent.addEventListener("scrollend", modalScrollEndHandler, {
+ signal: scrollEndController.signal,
+ // we need to let the browser handle scroll end without waiting for the
+ // event listener to run
+ passive: true,
+ });
+ } else {
+ // Aborting the controllers here, because otherwise we may have memory leaks
+ // Tryout this code by removing the this code and then opening a modal
+ // The event listeners will be added to the main container, but they won't be removed
+ // The number of event listeners shoot up from ~1000 in the test app to ~9000
+ scrollController.abort();
+ scrollEndController.abort();
+
+ scrollParent.addEventListener("scroll", scrollHandler, { passive: true });
+ scrollParent.addEventListener("scrollend", scrollEndHandler, {
+ passive: true,
+ });
+ }
+
const mouseMoveHandler = getMouseMoveHandler(
wrapperRef,
canvasPositions,
@@ -157,8 +223,6 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
scrollParent.addEventListener("mouseover", mouseOverHandler);
scrollParent.addEventListener("mousemove", mouseMoveHandler);
- scrollParent.addEventListener("scroll", scrollHandler);
- scrollParent.addEventListener("scrollend", scrollEndHandler);
wrapper.addEventListener("mousemove", mouseMoveHandler);
return () => {
@@ -167,8 +231,20 @@ const OverlayCanvasContainer = (props: { canvasWidth: number }) => {
scrollParent.removeEventListener("scroll", scrollHandler);
scrollParent.removeEventListener("scrollend", scrollEndHandler);
wrapper.removeEventListener("mousemove", mouseMoveHandler);
+ if (modalScrollParent) {
+ // This piece of code is unlikely to be executed, because modalScrollParent
+ // could be unmounted but this component will still be mounted
+ modalScrollParent.removeEventListener("scroll", modalScrollHandler);
+ modalScrollParent.removeEventListener(
+ "scrollend",
+ modalScrollEndHandler,
+ );
+ }
+ // Aborting for good measure
+ scrollController.abort();
+ scrollEndController.abort();
};
- }, [wrapperRef?.current, stageRef?.current]);
+ }, [wrapperRef?.current, stageRef?.current, modalScrollParent]);
// Reset the canvas if no widgets are focused or selected
// Update the widget name positions if there are widgets focused or selected
diff --git a/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx b/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx
index 080bf1051e8c..4f2576015e22 100644
--- a/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx
+++ b/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx
@@ -14,6 +14,7 @@ const CanvasResizerIcon = importSvg(
const AutoLayoutCanvasResizer = styled.div`
position: sticky;
+ z-index: var(--on-canvas-ui-z-index);
cursor: col-resize;
user-select: none;
-webkit-user-select: none;
diff --git a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
index eb7602f8601c..6c304bc11c50 100644
--- a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
+++ b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/index.ts
@@ -32,6 +32,7 @@ class LayoutElementPositionObserver {
ref: RefObject<HTMLDivElement>;
id: string;
layoutId: string;
+ isDetached?: boolean;
};
} = {};
@@ -61,10 +62,22 @@ class LayoutElementPositionObserver {
private resizeObserver = new ResizeObserver(
(entries: ResizeObserverEntry[]) => {
for (const entry of entries) {
- if (entry?.target?.id) {
- const DOMId = entry?.target?.id;
- this.trackEntry(DOMId);
+ // If the entry's anvil_widget_ identifier is not present as an id
+ // Check if it exists as a className
+ // If it does, then use that as the identifier
+ let DOMIdentifier = entry?.target?.id;
+ if (!DOMIdentifier) {
+ const classList: DOMTokenList = entry?.target?.classList;
+ if (classList && classList.length > 0) {
+ for (let i = 0; i < classList.length; i++) {
+ if (classList[i].indexOf(ANVIL_WIDGET) > -1) {
+ DOMIdentifier = classList[i];
+ break;
+ }
+ }
+ }
}
+ if (DOMIdentifier) this.trackEntry(DOMIdentifier);
}
},
);
@@ -90,11 +103,18 @@ class LayoutElementPositionObserver {
widgetId: string,
layoutId: string,
ref: RefObject<HTMLDivElement>,
+ isDetached?: boolean,
) {
if (ref.current) {
if (!this.registeredWidgets.hasOwnProperty(widgetId)) {
const widgetDOMId = getAnvilWidgetDOMId(widgetId);
- this.registeredWidgets[widgetDOMId] = { ref, id: widgetId, layoutId };
+ this.registeredWidgets[widgetDOMId] = {
+ ref,
+ id: widgetId,
+ layoutId,
+ isDetached: !!isDetached,
+ };
+
this.resizeObserver.observe(ref.current);
this.mutationObserver.observe(ref.current, this.mutationOptions);
}
@@ -224,7 +244,10 @@ class LayoutElementPositionObserver {
}
private trackEntry(DOMId: string) {
- if (DOMId.indexOf(ANVIL_WIDGET) > -1) {
+ if (
+ DOMId.indexOf(ANVIL_WIDGET) > -1 ||
+ this.registeredWidgets[DOMId]?.isDetached
+ ) {
this.addWidgetToProcess(DOMId);
} else if (DOMId.indexOf(LAYOUT) > -1) {
this.addLayoutToProcess(DOMId);
diff --git a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/usePositionObserver.ts b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/usePositionObserver.ts
index 65e633b1cce9..96e86972d94f 100644
--- a/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/usePositionObserver.ts
+++ b/app/client/src/layoutSystems/common/utils/LayoutElementPositionsObserver/usePositionObserver.ts
@@ -9,6 +9,27 @@ import { getAnvilLayoutDOMId, getAnvilWidgetDOMId } from "./utils";
import { LayoutComponentTypes } from "layoutSystems/anvil/utils/anvilTypes";
export type ObservableElementType = "widget" | "layout";
+export function useObserveDetachedWidget(widgetId: string) {
+ // We don't need the observer in preview mode or the published app
+ // This is because the positions need to be observed only to enable
+ // editor features
+ const isPreviewMode = useSelector(combinedPreviewModeSelector);
+ const appMode = useSelector(getAppMode);
+ if (isPreviewMode || appMode === APP_MODE.PUBLISHED) {
+ return;
+ }
+ const className = getAnvilWidgetDOMId(widgetId);
+ const ref = {
+ current: document.querySelector(`.${className}`) as HTMLDivElement,
+ };
+ positionObserver.observeWidget(widgetId, "", ref, true);
+ return () => {
+ const element = document.querySelector(`.${className}`) as HTMLDivElement;
+ const domID = element.getAttribute("id");
+ if (domID) positionObserver.unObserveWidget(domID);
+ };
+}
+
/**
* A hook to register a widget or a layout with the position observer
* @param type Are we registering a widget or a layout
diff --git a/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx b/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx
index 48f0a30f1a70..05e7cf84670e 100644
--- a/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx
+++ b/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx
@@ -5,6 +5,7 @@ import { WidgetTypeFactories } from "test/factories/Widgets/WidgetTypeFactories"
import { render } from "test/testUtils";
import InputWidget from "widgets/InputWidgetV2/widget";
import { ModalWidget } from "widgets/ModalWidget/widget";
+import { WDSModalWidget } from "widgets/wds/WDSModalWidget/widget";
import { withLayoutSystemWidgetHOC } from "./withLayoutSystemWidgetHOC";
import { LayoutSystemTypes } from "./types";
import * as layoutSystemSelectors from "selectors/layoutSystemSelectors";
@@ -200,10 +201,12 @@ describe("Layout System HOC's Tests", () => {
expect(flexPositionedLayer).toBeTruthy();
});
it("should return Auto Modal Editor for ANVIL positioning and CANVAS render mode", () => {
- const widget = ModalWidget;
+ const widget = WDSModalWidget;
const HOC = withLayoutSystemWidgetHOC(widget);
const widgetProps = WidgetTypeFactories[ModalWidget.type].build({
isVisible: true,
+ detachFromLayout: true,
+ renderMode: RenderModes.CANVAS,
});
jest
.spyOn(editorSelectors, "getRenderMode")
@@ -215,16 +218,15 @@ describe("Layout System HOC's Tests", () => {
const flexPositionedLayer = component.container.getElementsByClassName(
"anvil-layout-child-" + widgetProps.widgetId,
)[0];
- const overlayLayer =
- component.container.getElementsByClassName("bp3-overlay")[0];
expect(flexPositionedLayer).toBeFalsy();
- expect(overlayLayer).toBeTruthy();
});
it("should return Auto Modal Viewer for ANVIL positioning and PAGE render mode", () => {
- const widget = ModalWidget;
+ const widget = WDSModalWidget;
const HOC = withLayoutSystemWidgetHOC(widget);
const widgetProps = WidgetTypeFactories[ModalWidget.type].build({
isVisible: true,
+ detachFromLayout: true,
+ renderMode: RenderModes.PAGE,
});
jest
.spyOn(editorSelectors, "getRenderMode")
@@ -236,10 +238,7 @@ describe("Layout System HOC's Tests", () => {
const flexPositionedLayer = component.container.getElementsByClassName(
"anvil-layout-child-" + widgetProps.widgetId,
)[0];
- const overlayLayer =
- component.container.getElementsByClassName("bp3-overlay")[0];
expect(flexPositionedLayer).toBeFalsy();
- expect(overlayLayer).toBeTruthy();
});
it("should return Anvil Viewer for ANVIL positioning and PAGE render mode", () => {
const widget = InputWidget;
diff --git a/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx b/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
index 460083a8d62b..89d76302da29 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
@@ -51,7 +51,10 @@ const Wrapper = styled.section<{
isPreviewingNavigation?: boolean;
isAppSettingsPaneWithNavigationTabOpen?: boolean;
navigationHeight?: number;
+ $heightWithTopMargin: string;
}>`
+ /* Create a custom variable that will allow us to measure the height of the canvas down the road */
+ --canvas-height: ${(props) => props.$heightWithTopMargin};
width: ${({ $enableMainCanvasResizer }) =>
$enableMainCanvasResizer
? `calc(100% - ${AUTOLAYOUT_RESIZER_WIDTH_BUFFER}px)`
@@ -202,6 +205,7 @@ function MainContainerWrapper(props: MainCanvasWrapperProps) {
<>
<Wrapper
$enableMainCanvasResizer={enableMainContainerResizer}
+ $heightWithTopMargin={heightWithTopMargin}
background={
isPreviewMode ||
isProtectedMode ||
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index b2f5dbc06a6b..540027f975cf 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -49,16 +49,23 @@ import {
FlexLayerAlignment,
LayoutDirection,
} from "layoutSystems/common/utils/constants";
+import { getModalWidgetType } from "selectors/widgetSelectors";
+import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
+import { LayoutSystemTypes } from "layoutSystems/types";
+import { AnvilReduxActionTypes } from "layoutSystems/anvil/integrations/actions/actionTypes";
const WidgetTypes = WidgetFactory.widgetTypes;
export function* createModalSaga(action: ReduxAction<{ modalName: string }>) {
try {
const modalWidgetId = generateReactKey();
const isAutoLayout: boolean = yield select(getIsAutoLayout);
+ const modalWidgetType: string = yield select(getModalWidgetType);
+ const layoutSystemType: LayoutSystemTypes =
+ yield select(getLayoutSystemType);
const newWidget: WidgetAddChild = {
widgetId: MAIN_CONTAINER_WIDGET_ID,
widgetName: action.payload.modalName,
- type: WidgetTypes.MODAL_WIDGET,
+ type: modalWidgetType,
newWidgetId: modalWidgetId,
parentRowSpace: 1,
parentColumnSpace: 1,
@@ -91,6 +98,19 @@ export function* createModalSaga(action: ReduxAction<{ modalName: string }>) {
addToBottom: true,
},
});
+ } else if (layoutSystemType === LayoutSystemTypes.ANVIL) {
+ //TODO(#30604): Refactor to separate this logic from the anvil layout system
+ yield put({
+ type: AnvilReduxActionTypes.ANVIL_ADD_NEW_WIDGET,
+ payload: {
+ highlight: { alignment: "none", canvasId: "0" },
+ newWidget: { ...newWidget, detachFromLayout: true },
+ dragMeta: {
+ draggedWidgetTypes: "WIDGETS",
+ draggedOn: "MAIN_CANVAS",
+ },
+ },
+ });
} else {
yield put({
type: WidgetReduxActionTypes.WIDGET_ADD_CHILD,
@@ -169,6 +189,7 @@ export function* closeModalSaga(
) {
try {
const { modalName } = action.payload;
+
let widgetIds: string[] = [];
// If modalName is provided, we just want to close this modal
if (modalName) {
@@ -187,6 +208,9 @@ export function* closeModalSaga(
const metaProps: Record<string, any> = yield select(getWidgetsMeta);
// Get widgetIds of all widgets of type MODAL_WIDGET
+ // Note: Not updating this code path for WDS_MODAL_WIDGET, as the functionality
+ // may require us to keep existing modals open.
+ // In this, the flow of switching back and forth between multiple modals is to be tested.
const modalWidgetIds: string[] = yield select(
getWidgetIdsByType,
WidgetTypes.MODAL_WIDGET,
diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts
index 715ee4a5f267..46b551a3ce1d 100644
--- a/app/client/src/sagas/WidgetSelectionSagas.ts
+++ b/app/client/src/sagas/WidgetSelectionSagas.ts
@@ -48,8 +48,12 @@ import history, { NavigationMethod } from "utils/history";
import {
getWidgetIdsByType,
getWidgetImmediateChildren,
+ getWidgetMetaProps,
getWidgets,
} from "./selectors";
+import { getModalWidgetType } from "selectors/widgetSelectors";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
+import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
// The following is computed to be used in the entity explorer
// Every time a widget is selected, we need to expand widget entities
@@ -250,10 +254,12 @@ function* openOrCloseModalSaga(action: ReduxAction<{ widgetIds: string[] }>) {
// Let's assume that the payload widgetId is a modal widget and we need to open the modal as it is selected
let modalWidgetToOpen: string = action.payload.widgetIds[0];
+ const modalWidgetType: string = yield select(getModalWidgetType);
+
// Get all modal widget ids
const modalWidgetIds: string[] = yield select(
getWidgetIdsByType,
- "MODAL_WIDGET",
+ modalWidgetType,
);
// Get all widgets
@@ -281,6 +287,22 @@ function* openOrCloseModalSaga(action: ReduxAction<{ widgetIds: string[] }>) {
modalWidgetToOpen = widgetAncestry[indexOfParentModalWidget];
}
}
+ const featureFlags: FeatureFlags = yield select(selectFeatureFlags);
+ if (featureFlags.ab_wds_enabled) {
+ // If widget is modal and modal is already open, skip opening it
+ const modalProps = allWidgets[modalWidgetToOpen];
+ const metaProps: Record<string, unknown> = yield select(
+ getWidgetMetaProps,
+ modalProps,
+ );
+
+ if (
+ (widgetIsModal || widgetIsChildOfModal) &&
+ metaProps?.isVisible === true
+ ) {
+ return;
+ }
+ }
if (widgetIsModal || widgetIsChildOfModal) {
yield put(showModal(modalWidgetToOpen));
diff --git a/app/client/src/selectors/widgetSelectors.ts b/app/client/src/selectors/widgetSelectors.ts
index f968cbea4a44..20e64217bb3f 100644
--- a/app/client/src/selectors/widgetSelectors.ts
+++ b/app/client/src/selectors/widgetSelectors.ts
@@ -21,6 +21,7 @@ import { getIsTableFilterPaneVisible } from "selectors/tableFilterSelectors";
import { getIsAutoHeightWithLimitsChanging } from "utils/hooks/autoHeightUIHooks";
import { getIsPropertyPaneVisible } from "./propertyPaneSelectors";
import { combinedPreviewModeSelector } from "./editorSelectors";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
export const getIsDraggingOrResizing = (state: AppState) =>
state.ui.widgetDragResize.isResizing || state.ui.widgetDragResize.isDragging;
@@ -29,13 +30,36 @@ export const getIsResizing = (state: AppState) =>
state.ui.widgetDragResize.isResizing;
const getCanvasWidgets = (state: AppState) => state.entities.canvasWidgets;
-export const getModalDropdownList = createSelector(
+
+// A selector that gets the modal widget type based on the feature flag
+// This will need to be updated once Anvil and WDS are generally available
+export const getModalWidgetType = createSelector(
+ selectFeatureFlags,
+ (flags) => {
+ let modalWidgetType = "MODAL_WIDGET";
+ if (flags.ab_wds_enabled) {
+ modalWidgetType = "WDS_MODAL_WIDGET";
+ }
+ return modalWidgetType;
+ },
+);
+
+export const getModalWidgets = createSelector(
getCanvasWidgets,
- (widgets) => {
+ getModalWidgetType,
+ (widgets, modalWidgetType) => {
const modalWidgets = Object.values(widgets).filter(
- (widget: FlattenedWidgetProps) => widget.type === "MODAL_WIDGET",
+ (widget: FlattenedWidgetProps) => widget.type === modalWidgetType,
);
if (modalWidgets.length === 0) return undefined;
+ return modalWidgets;
+ },
+);
+
+export const getModalDropdownList = createSelector(
+ getModalWidgets,
+ (modalWidgets) => {
+ if (!modalWidgets) return undefined;
return modalWidgets.map((widget: FlattenedWidgetProps) => ({
id: widget.widgetId,
@@ -47,9 +71,10 @@ export const getModalDropdownList = createSelector(
export const getNextModalName = createSelector(
getExistingWidgetNames,
- (names) => {
+ getModalWidgetType,
+ (names, modalWidgetType) => {
const prefix =
- WidgetFactory.widgetConfigMap.get("MODAL_WIDGET")?.widgetName || "";
+ WidgetFactory.widgetConfigMap.get(modalWidgetType)?.widgetName || "";
return getNextEntityName(prefix, names);
},
);
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index 4f72135d4fdc..5117286614f1 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -272,6 +272,13 @@ abstract class BaseWidget<
}
};
+ unfocusWidget = () => {
+ const { unfocusWidget } = this.context;
+ if (unfocusWidget) {
+ unfocusWidget();
+ }
+ };
+
/* eslint-disable @typescript-eslint/no-empty-function */
/* eslint-disable @typescript-eslint/no-unused-vars */
diff --git a/app/client/src/widgets/ModalWidget/widget/index.tsx b/app/client/src/widgets/ModalWidget/widget/index.tsx
index b9b89a09d77d..b030f0141da7 100644
--- a/app/client/src/widgets/ModalWidget/widget/index.tsx
+++ b/app/client/src/widgets/ModalWidget/widget/index.tsx
@@ -37,7 +37,7 @@ import { getWidgetBluePrintUpdates } from "utils/WidgetBlueprintUtils";
import { DynamicHeight } from "utils/WidgetFeatures";
import type { FlexLayer } from "layoutSystems/autolayout/utils/types";
import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes";
-import { modalPreset } from "layoutSystems/anvil/layoutComponents/presets/ModalPreset";
+import { modalPreset } from "layoutSystems/autolayout/layoutComponents/presets/ModalPreset";
import { LayoutSystemTypes } from "layoutSystems/types";
export class ModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts
index bb818b3cac83..3ad09b0f212e 100644
--- a/app/client/src/widgets/index.ts
+++ b/app/client/src/widgets/index.ts
@@ -77,8 +77,9 @@ import { SectionWidget } from "./anvil/SectionWidget";
import { ZoneWidget } from "./anvil/ZoneWidget";
import { WDSHeadingWidget } from "./wds/WDSHeadingWidget";
import { WDSParagraphWidget } from "./wds/WDSParagraphWidget";
+import { WDSModalWidget } from "./wds/WDSModalWidget";
-const Widgets = [
+const LegacyWidgets = [
CanvasWidget,
SkeletonWidget,
ContainerWidget,
@@ -129,6 +130,24 @@ const Widgets = [
CodeScannerWidget,
ListWidgetV2,
ExternalWidget,
+];
+
+const DeprecatedWidgets = [
+ //Deprecated Widgets
+ InputWidget,
+ DropdownWidget,
+ DatePickerWidget,
+ IconWidget,
+ FilePickerWidget,
+ MultiSelectWidget,
+ FormButtonWidget,
+ ProgressWidget,
+ CircularProgressWidget,
+ ListWidget,
+];
+
+const WDSWidgets = [
+ // WDS Widgets
WDSButtonWidget,
WDSInputWidget,
WDSCheckboxWidget,
@@ -147,18 +166,13 @@ const Widgets = [
ZoneWidget,
WDSParagraphWidget,
WDSHeadingWidget,
+ WDSModalWidget,
+];
- //Deprecated Widgets
- InputWidget,
- DropdownWidget,
- DatePickerWidget,
- IconWidget,
- FilePickerWidget,
- MultiSelectWidget,
- FormButtonWidget,
- ProgressWidget,
- CircularProgressWidget,
- ListWidget,
+const Widgets = [
+ ...WDSWidgets,
+ ...DeprecatedWidgets,
+ ...LegacyWidgets,
] as (typeof BaseWidget)[];
export default Widgets;
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/anvilConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/anvilConfig.ts
new file mode 100644
index 000000000000..29e26383be3c
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/anvilConfig.ts
@@ -0,0 +1,6 @@
+import type { AnvilConfig } from "WidgetProvider/constants";
+
+export const anvilConfig: AnvilConfig = {
+ isLargeWidget: false,
+ widgetSize: {},
+};
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts
new file mode 100644
index 000000000000..a1c38464d7b4
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts
@@ -0,0 +1,47 @@
+import type { WidgetDefaultProps } from "WidgetProvider/constants";
+import {
+ BlueprintOperationTypes,
+ type FlattenedWidgetProps,
+} from "WidgetProvider/constants";
+import { modalPreset } from "layoutSystems/anvil/layoutComponents/presets/ModalPreset";
+import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes";
+import { LayoutSystemTypes } from "layoutSystems/types";
+import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import { getWidgetBluePrintUpdates } from "utils/WidgetBlueprintUtils";
+
+export const defaultsConfig = {
+ detachFromLayout: true,
+ children: [],
+ widgetName: "Modal",
+ version: 1,
+ isVisible: false,
+ showFooter: true,
+ showHeader: true,
+ size: "medium",
+ title: "Modal",
+ showSubmitButton: true,
+ submitButtonText: "Submit",
+ cancelButtonText: "Cancel",
+ blueprint: {
+ operations: [
+ {
+ type: BlueprintOperationTypes.MODIFY_PROPS,
+ fn: (
+ widget: FlattenedWidgetProps,
+ widgets: CanvasWidgetsReduxState,
+ parent: FlattenedWidgetProps,
+ layoutSystemType: LayoutSystemTypes,
+ ) => {
+ if (layoutSystemType !== LayoutSystemTypes.ANVIL) return [];
+
+ const layout: LayoutProps[] = modalPreset();
+ return getWidgetBluePrintUpdates({
+ [widget.widgetId]: {
+ layout,
+ },
+ });
+ },
+ },
+ ],
+ },
+} as unknown as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/index.ts b/app/client/src/widgets/wds/WDSModalWidget/config/index.ts
new file mode 100644
index 000000000000..f83261a22a05
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/index.ts
@@ -0,0 +1,4 @@
+export * from "./propertyPaneConfig";
+export { defaultsConfig } from "./defaultsConfig";
+export { anvilConfig } from "./anvilConfig";
+export { metaConfig } from "./metaConfig";
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/metaConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/metaConfig.ts
new file mode 100644
index 000000000000..4ad62da7aa2a
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/metaConfig.ts
@@ -0,0 +1,10 @@
+import { WIDGET_TAGS } from "constants/WidgetConstants";
+import IconSVG from "../icon.svg";
+
+export const metaConfig = {
+ name: "Modal",
+ iconSVG: IconSVG,
+ tags: [WIDGET_TAGS.LAYOUT],
+ needsMeta: true,
+ searchTags: ["dialog", "popup", "notification"],
+};
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts
new file mode 100644
index 000000000000..ef84b3d10edb
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts
@@ -0,0 +1,126 @@
+import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
+import { ValidationTypes } from "constants/WidgetValidation";
+
+export const propertyPaneContentConfig: PropertyPaneConfig[] = [
+ {
+ sectionName: "General",
+ children: [
+ {
+ propertyName: "animateLoading",
+ label: "Animate loading",
+ controlType: "SWITCH",
+ helpText: "Controls the loading of the widget",
+ defaultValue: true,
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.BOOLEAN },
+ },
+ {
+ propertyName: "size",
+ label: "Size",
+ helpText: "Size of the modal",
+ controlType: "DROP_DOWN",
+ options: [
+ {
+ label: "Small",
+ value: "small",
+ },
+ { label: "Medium", value: "medium" },
+ { label: "Large", value: "large" },
+ ],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ ],
+ },
+ {
+ sectionName: "Header",
+ children: [
+ {
+ propertyName: "showHeader",
+ label: "Header",
+ helpText: "Show or hide the header",
+ controlType: "SWITCH",
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ {
+ propertyName: "title",
+ label: "Title",
+ helpText: "Title of the modal",
+ controlType: "INPUT_TEXT",
+ hidden: (props: any) => !props.showHeader,
+ dependencies: ["showHeader"],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ ],
+ },
+ {
+ sectionName: "Footer",
+ children: [
+ {
+ propertyName: "showFooter",
+ label: "Footer",
+ helpText: "Show or hide the footer",
+ controlType: "SWITCH",
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ {
+ propertyName: "showSubmitButton",
+ label: "Submit",
+ helpText: "Show or hide the submit button",
+ controlType: "SWITCH",
+ hidden: (props: any) => !props.showFooter,
+ dependencies: ["showFooter"],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ {
+ propertyName: "submitButtonText",
+ label: "Submit Button Text",
+ helpText: "Label for the Submit Button",
+ controlType: "INPUT_TEXT",
+ hidden: (props: any) => !props.showSubmitButton || !props.showFooter,
+ dependencies: ["showSubmitButton", "showFooter"],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ {
+ propertyName: "cancelButtonText",
+ label: "Cancel Button Text",
+ helpText: "Label for the Cancel Button",
+ controlType: "INPUT_TEXT",
+ hidden: (props: any) => !props.showFooter,
+ dependencies: ["showCancelButton", "showFooter"],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ },
+ ],
+ },
+ {
+ sectionName: "Events",
+ children: [
+ {
+ helpText: "Trigger an action when the modal is closed",
+ propertyName: "onClose",
+ label: "onClose",
+ controlType: "ACTION_SELECTOR",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: true,
+ },
+ {
+ helpText: "Trigger an action when the submit button is pressed",
+ propertyName: "onSubmit",
+ label: "onSubmit",
+ controlType: "ACTION_SELECTOR",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: true,
+ },
+ ],
+ },
+];
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/index.ts
new file mode 100644
index 000000000000..4273f741257f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/index.ts
@@ -0,0 +1,2 @@
+export { propertyPaneContentConfig } from "./contentConfig";
+export { propertyPaneStyleConfig } from "./styleConfig";
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts
new file mode 100644
index 000000000000..2bee8f2ddab5
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts
@@ -0,0 +1,3 @@
+import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
+
+export const propertyPaneStyleConfig: PropertyPaneConfig[] = [];
diff --git a/app/client/src/widgets/wds/WDSModalWidget/icon.svg b/app/client/src/widgets/wds/WDSModalWidget/icon.svg
new file mode 100644
index 000000000000..f805488be7fb
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/icon.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 23V1H23V23H1ZM3.2 20.8V3.2H20.8V20.8H3.2Z" fill="#4C5664"/>
+<path d="M18.545 11.3004L13.1002 5.85564L14.6559 4.3L20.1006 9.74475L18.545 11.3004Z" fill="#4C5664"/>
+<path d="M20.1006 5.85563L14.6559 11.3004L13.1002 9.74476L18.545 4.3L20.1006 5.85563Z" fill="#4C5664"/>
+</svg>
diff --git a/app/client/src/widgets/wds/WDSModalWidget/index.ts b/app/client/src/widgets/wds/WDSModalWidget/index.ts
new file mode 100644
index 000000000000..d04e99b98287
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/index.ts
@@ -0,0 +1,3 @@
+import { WDSModalWidget } from "./widget";
+
+export { WDSModalWidget };
diff --git a/app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx
new file mode 100644
index 000000000000..c99dedfdae91
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx
@@ -0,0 +1,145 @@
+import type { ModalWidgetProps } from "./types";
+import type { WidgetState } from "widgets/BaseWidget";
+import BaseWidget from "widgets/BaseWidget";
+import * as config from "./../config";
+import type { AnvilConfig } from "WidgetProvider/constants";
+import {
+ Modal,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+} from "@design-system/widgets";
+import React from "react";
+import { LayoutProvider } from "layoutSystems/anvil/layoutComponents/LayoutProvider";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+import { SelectionRequestType } from "sagas/WidgetSelectUtils";
+import { ModalBody } from "@design-system/widgets";
+import { WDS_MODAL_WIDGET_CLASSNAME } from "widgets/wds/constants";
+import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
+import type {
+ CopiedWidgetData,
+ PasteDestinationInfo,
+ PastePayload,
+} from "layoutSystems/anvil/utils/paste/types";
+import { call } from "redux-saga/effects";
+import { pasteWidgetsIntoMainCanvas } from "layoutSystems/anvil/utils/paste/mainCanvasPasteUtils";
+
+const modalBodyStyles: React.CSSProperties = {
+ minHeight: "var(--sizing-16)",
+ maxHeight:
+ "calc(var(--canvas-height) - var(--outer-spacing-4) - var(--outer-spacing-4) - var(--outer-spacing-4) - 100px)",
+};
+
+class WDSModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
+ static type = "WDS_MODAL_WIDGET";
+
+ static getConfig() {
+ return config.metaConfig;
+ }
+
+ static getDefaults() {
+ return config.defaultsConfig;
+ }
+
+ static getAnvilConfig(): AnvilConfig | null {
+ return config.anvilConfig;
+ }
+
+ static getPropertyPaneContentConfig() {
+ return config.propertyPaneContentConfig;
+ }
+
+ static getPropertyPaneStyleConfig() {
+ return config.propertyPaneStyleConfig;
+ }
+
+ static *performPasteOperation(
+ allWidgets: CanvasWidgetsReduxState,
+ copiedWidgets: CopiedWidgetData[],
+ destinationInfo: PasteDestinationInfo,
+ widgetIdMap: Record<string, string>,
+ reverseWidgetIdMap: Record<string, string>,
+ ) {
+ const res: PastePayload = yield call(
+ pasteWidgetsIntoMainCanvas,
+ allWidgets,
+ copiedWidgets,
+ destinationInfo,
+ widgetIdMap,
+ reverseWidgetIdMap,
+ );
+ return res;
+ }
+
+ onModalClose = () => {
+ if (this.props.onClose) {
+ super.executeAction({
+ triggerPropertyName: "onClose",
+ dynamicString: this.props.onClose,
+ event: {
+ type: EventType.ON_MODAL_CLOSE,
+ },
+ });
+ }
+ this.props.updateWidgetMetaProperty("isVisible", false);
+ this.selectWidgetRequest(SelectionRequestType.Empty);
+ this.unfocusWidget();
+ };
+
+ onSubmitClick = () => {
+ if (this.props.onSubmit) {
+ super.executeAction({
+ triggerPropertyName: "onSubmit",
+ dynamicString: this.props.onSubmit,
+ event: {
+ type: EventType.ON_MODAL_SUBMIT,
+ },
+ });
+ }
+ };
+
+ getModalVisibility = () => {
+ if (this.props.selectedWidgetAncestry) {
+ return (
+ this.props.selectedWidgetAncestry.includes(this.props.widgetId) ||
+ this.props.isVisible
+ );
+ }
+ return this.props.isVisible;
+ };
+
+ getWidgetView() {
+ const closeText = this.props.cancelButtonText || "Cancel";
+
+ const submitText = this.props.showSubmitButton
+ ? this.props.submitButtonText || "Submit"
+ : undefined;
+
+ return (
+ <Modal
+ isOpen={this.getModalVisibility()}
+ onClose={this.onModalClose}
+ size={this.props.size}
+ >
+ <ModalContent className={this.props.className}>
+ {this.props.showHeader && <ModalHeader title={this.props.title} />}
+ <ModalBody
+ className={WDS_MODAL_WIDGET_CLASSNAME}
+ style={modalBodyStyles}
+ >
+ <LayoutProvider {...this.props} />
+ </ModalBody>
+ {this.props.showFooter && (
+ <ModalFooter
+ closeText={closeText}
+ onSubmit={submitText ? this.onSubmitClick : undefined}
+ submitText={submitText}
+ />
+ )}
+ </ModalContent>
+ </Modal>
+ );
+ }
+}
+
+export { WDSModalWidget };
diff --git a/app/client/src/widgets/wds/WDSModalWidget/widget/types.ts b/app/client/src/widgets/wds/WDSModalWidget/widget/types.ts
new file mode 100644
index 000000000000..f93eca9d46fa
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSModalWidget/widget/types.ts
@@ -0,0 +1,11 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+
+export interface ModalWidgetProps extends WidgetProps {
+ showFooter: boolean;
+ showHeader: boolean;
+ size: "small" | "medium" | "large";
+ showSubmitButton: boolean;
+ submitButtonText: string;
+ cancelButtonText: string;
+ className: string;
+}
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/icon.svg b/app/client/src/widgets/wds/WDSParagraphWidget/icon.svg
index a4058c4d93f7..b5a536a08e99 100644
--- a/app/client/src/widgets/wds/WDSParagraphWidget/icon.svg
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/icon.svg
@@ -1,3 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.3334 19V5.66666H5.66667V8.33337H3V3H21.6667V8.33337H19V5.66666H14.3333V19H17V21.6667H7.66665V19H10.3334Z" fill="#4C5664"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/wds/constants.ts b/app/client/src/widgets/wds/constants.ts
index fe0acadc1c89..539bc3718c4e 100644
--- a/app/client/src/widgets/wds/constants.ts
+++ b/app/client/src/widgets/wds/constants.ts
@@ -17,7 +17,10 @@ export const WDS_V2_WIDGET_MAP = {
SWITCH_GROUP_WIDGET: "WDS_SWITCH_GROUP_WIDGET",
RADIO_GROUP_WIDGET: "WDS_RADIO_GROUP_WIDGET",
MENU_BUTTON_WIDGET: "WDS_MENU_BUTTON_WIDGET",
+ MODAL_WIDGET: "WDS_MODAL_WIDGET",
// Anvil layout widgets
ZONE_WIDGET: anvilWidgets.ZONE_WIDGET,
};
+
+export const WDS_MODAL_WIDGET_CLASSNAME = "appsmith-modal-body";
|
769f8634b58f96631c774ca8f5301e6f5a8adb59
|
2023-10-31 18:51:12
|
Goutham Pratapa
|
fix: update github-release.yml (#28521)
| false
|
update github-release.yml (#28521)
|
fix
|
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 63aba9ca4633..da1ada297794 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -272,6 +272,7 @@ jobs:
platforms: linux/arm64,linux/amd64
build-args: |
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
+ BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:nightly
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{needs.prelude.outputs.tag}}
|
b31fcb11da1b23f887173f0c8968343883434a91
|
2023-10-11 21:54:00
|
Manish Kumar
|
fix: for api-redirection (#27720)
| false
|
for api-redirection (#27720)
|
fix
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
index a4c5557dff9a..bd4e655adb82 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
@@ -24,6 +24,7 @@
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.http.client.reactive.ClientHttpRequest;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.reactive.function.BodyInserter;
import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.ExchangeStrategies;
@@ -36,7 +37,6 @@
import javax.crypto.SecretKey;
import java.io.IOException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
@@ -96,7 +96,12 @@ public Mono<ActionExecutionResult> triggerApiCall(
actionExecutionRequest, isBodySentWithApiRequest));
result.setStatusCode(statusCode.toString());
- result.setIsExecutionSuccess(statusCode.is2xxSuccessful());
+
+ // if something has moved permanently should we mark it as an execution failure?
+ // here marking a redirection as an execution success if the url has moved permanently without a
+ // forwarding Location
+ boolean isExecutionSuccess = statusCode.is2xxSuccessful() || statusCode.is3xxRedirection();
+ result.setIsExecutionSuccess(isExecutionSuccess);
// Convert the headers into json tree to store in the results
String headerInJsonString;
@@ -191,19 +196,18 @@ protected Mono<ClientResponse> httpCall(
.exchange()
.flatMap(response -> {
if (response.statusCode().is3xxRedirection()) {
+ // if there is no redirect location then we should just return the response
+ if (CollectionUtils.isEmpty(response.headers().header(HttpHeaders.LOCATION))) {
+ return Mono.just(response);
+ }
+
String redirectUrl =
response.headers().header("Location").get(0);
- /**
- * TODO
- * In case the redirected URL is not absolute (complete), create the new URL using the relative path
- * This particular scenario is seen in the URL : https://rickandmortyapi.com/api/character
- * It redirects to partial URI : /api/character/
- * In this scenario we should convert the partial URI to complete URI
- */
+
final URI redirectUri;
try {
- redirectUri = new URI(redirectUrl);
- } catch (URISyntaxException e) {
+ redirectUri = createRedirectUrl(redirectUrl, uri);
+ } catch (IllegalArgumentException e) {
return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, e));
}
@@ -213,6 +217,10 @@ protected Mono<ClientResponse> httpCall(
});
}
+ public URI createRedirectUrl(String redirectUrl, URI originalUrl) {
+ return originalUrl.resolve(redirectUrl);
+ }
+
public WebClient getWebClient(
WebClient.Builder webClientBuilder,
APIConnection apiConnection,
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
index 5df68082fe8f..2db27eec9f8f 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
@@ -1,5 +1,7 @@
package com.appsmith.util;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
import io.netty.resolver.AddressResolver;
import io.netty.resolver.AddressResolverGroup;
import io.netty.resolver.InetNameResolver;
@@ -9,6 +11,7 @@
import io.netty.util.internal.SocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.util.StringUtils;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
@@ -29,10 +32,15 @@ public class WebClientUtils {
public static final String HOST_NOT_ALLOWED = "Host not allowed.";
- public static final ExchangeFilterFunction IP_CHECK_FILTER = ExchangeFilterFunction.ofRequestProcessor(
- request -> DISALLOWED_HOSTS.contains(request.url().getHost())
- ? Mono.error(new UnknownHostException(HOST_NOT_ALLOWED))
- : Mono.just(request));
+ public static final ExchangeFilterFunction IP_CHECK_FILTER = ExchangeFilterFunction.ofRequestProcessor(request -> {
+ if (!StringUtils.hasText(request.url().getHost())) {
+ return Mono.error(new AppsmithPluginException(
+ AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR, "Requested url host is null or empty"));
+ }
+ return DISALLOWED_HOSTS.contains(request.url().getHost())
+ ? Mono.error(new UnknownHostException(HOST_NOT_ALLOWED))
+ : Mono.just(request);
+ });
private WebClientUtils() {}
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
index 51645d7705a3..f485d261896c 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
@@ -208,6 +208,11 @@ public Mono<ActionExecutionResult> executeCommon(
errorResult.setRequest(requestCaptureFilter.populateRequestFields(
actionExecutionRequest, isBodySentWithApiRequest));
errorResult.setIsExecutionSuccess(false);
+ log.debug(
+ "An error has occurred while trying to run the API query for url: {}, path : {}",
+ datasourceConfiguration.getUrl(),
+ actionConfiguration.getPath());
+ error.printStackTrace();
if (!(error instanceof AppsmithPluginException)) {
error = new AppsmithPluginException(
RestApiPluginError.API_EXECUTION_FAILED,
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
index 12d4d27e7dde..1a189d851b46 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
@@ -3,6 +3,7 @@
import com.appsmith.external.datatypes.ClientDataType;
import com.appsmith.external.dtos.ExecuteActionDTO;
import com.appsmith.external.dtos.ParamProperty;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
import com.appsmith.external.helpers.PluginUtils;
import com.appsmith.external.helpers.restApiUtils.connections.APIConnection;
import com.appsmith.external.helpers.restApiUtils.helpers.HintMessageUtils;
@@ -1919,4 +1920,178 @@ public void testGetApiWithoutBody() {
})
.verifyComplete();
}
+
+ @Test
+ public void testRedirectionSuccessWithLocationHeaderHavingPath() {
+ DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+ String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+ dsConfig.setUrl(baseUrl);
+
+ String initialPath = "/start";
+ String redirectPath = "/redirection";
+ String responseBody = "this is a successful response";
+
+ MockResponse initialResponse =
+ new MockResponse().setResponseCode(302).addHeader(HttpHeaders.LOCATION, redirectPath);
+ MockResponse redirectedResponse =
+ new MockResponse().setResponseCode(200).setBody(responseBody);
+
+ mockEndpoint.enqueue(initialResponse);
+ mockEndpoint.enqueue(redirectedResponse);
+
+ ActionConfiguration actionConfig = new ActionConfiguration();
+ actionConfig.setHttpMethod(HttpMethod.GET);
+ actionConfig.setPath(initialPath);
+
+ Mono<ActionExecutionResult> resultMono =
+ pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+ StepVerifier.create(resultMono)
+ .assertNext(result -> {
+ assertTrue(result.getIsExecutionSuccess());
+ assertNotNull(result.getBody());
+ final RecordedRequest initialRequest;
+ try {
+ initialRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assert initialRequest != null;
+ assertEquals(initialRequest.getPath(), initialPath);
+
+ // redirected Request
+ final RecordedRequest redirectedRequest;
+ try {
+ redirectedRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assert redirectedRequest != null;
+ assertEquals(redirectedRequest.getPath(), redirectPath);
+
+ final ActionExecutionRequest request = result.getRequest();
+ assertEquals(baseUrl + redirectPath, request.getUrl());
+ assertEquals(HttpMethod.GET, request.getHttpMethod());
+ assertEquals(result.getBody(), responseBody);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ public void testRedirectionSuccessWithAddingFullUrlExecution() {
+ DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+ String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+ dsConfig.setUrl(baseUrl);
+
+ String initialPath = "/start";
+ String redirectPath = "/redirection";
+ String responseBody = "this is a successful response";
+
+ MockResponse initialResponse =
+ new MockResponse().setResponseCode(302).addHeader(HttpHeaders.LOCATION, baseUrl + redirectPath);
+ MockResponse redirectedResponse =
+ new MockResponse().setResponseCode(200).setBody(responseBody);
+
+ mockEndpoint.enqueue(initialResponse);
+ mockEndpoint.enqueue(redirectedResponse);
+
+ ActionConfiguration actionConfig = new ActionConfiguration();
+ actionConfig.setHttpMethod(HttpMethod.GET);
+ actionConfig.setPath(initialPath);
+
+ Mono<ActionExecutionResult> resultMono =
+ pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+ StepVerifier.create(resultMono)
+ .assertNext(result -> {
+ assertTrue(result.getIsExecutionSuccess());
+ assertNotNull(result.getBody());
+ final RecordedRequest initialRequest;
+ try {
+ initialRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assert initialRequest != null;
+ assertEquals(initialRequest.getPath(), initialPath);
+
+ // redirected Request
+ final RecordedRequest redirectedRequest;
+ try {
+ redirectedRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assert redirectedRequest != null;
+ assertEquals(redirectedRequest.getPath(), redirectPath);
+
+ final ActionExecutionRequest request = result.getRequest();
+ assertEquals(baseUrl + redirectPath, request.getUrl());
+ assertEquals(HttpMethod.GET, request.getHttpMethod());
+ assertEquals(result.getBody(), responseBody);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ public void testExecutionSuccessWhenRedirectionEndsWithoutALocationHeader() {
+ DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+ String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+ dsConfig.setUrl(baseUrl);
+
+ String path = "/start";
+ String responseBody = "this is a successful response, even when it ends with a redirection";
+
+ MockResponse initialResponse = new MockResponse().setResponseCode(302).setBody(responseBody);
+
+ mockEndpoint.enqueue(initialResponse);
+
+ ActionConfiguration actionConfig = new ActionConfiguration();
+ actionConfig.setHttpMethod(HttpMethod.GET);
+ actionConfig.setPath(path);
+
+ Mono<ActionExecutionResult> resultMono =
+ pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+ StepVerifier.create(resultMono)
+ .assertNext(result -> {
+ assertTrue(result.getIsExecutionSuccess());
+ assertNotNull(result.getBody());
+ final RecordedRequest finalRequest;
+ try {
+ finalRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ assert finalRequest != null;
+ assertEquals(finalRequest.getPath(), path);
+ final ActionExecutionRequest request = result.getRequest();
+ assertEquals(baseUrl + path, request.getUrl());
+ assertEquals(HttpMethod.GET, request.getHttpMethod());
+ assertEquals(result.getBody(), responseBody);
+ assertTrue(result.getIsExecutionSuccess());
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ public void testEmptyHostErrorMessage() {
+ DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+ dsConfig.setUrl(" ");
+ String path = "/start";
+ ActionConfiguration actionConfig = new ActionConfiguration();
+ actionConfig.setHttpMethod(HttpMethod.GET);
+ actionConfig.setPath(path);
+
+ Mono<ActionExecutionResult> resultMono =
+ pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+ StepVerifier.create(resultMono)
+ .assertNext(actionExecutionResult -> {
+ assertFalse(actionExecutionResult.getIsExecutionSuccess());
+ assertEquals(
+ actionExecutionResult.getStatusCode(),
+ AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR.getAppErrorCode());
+ })
+ .verifyComplete();
+ }
}
|
f7f9fc314608d80f6aa562ba88299bda5c8b47d6
|
2024-11-20 10:40:02
|
Shrikant Sharat Kandula
|
fix: Rate limiting key should respect load balancers (#37409)
| false
|
Rate limiting key should respect load balancers (#37409)
|
fix
|
diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
index 87b7a42cb16f..252a8c6b0d0b 100644
--- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
+++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
@@ -168,7 +168,10 @@ ${
${isRateLimitingEnabled ? `rate_limit {
zone dynamic_zone {
- key {http.request.client_ip}
+ # This key is designed to work irrespective of any load balancers running on the Appsmith container.
+ # We use "+" as the separator here since we don't expect it in any of the placeholder values here, and has no
+ # significance in header value syntax.
+ key {header.Forwarded}+{header.X-Forwarded-For}+{remote_host}
events ${RATE_LIMIT}
window 1s
}
|
e5362c5d5fa3ac42b96917335d57c061ff1b2a67
|
2023-11-16 18:01:07
|
sneha122
|
feat: most popular section added on create new ds page (#28850)
| false
|
most popular section added on create new ds page (#28850)
|
feat
|
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 5d8fcd4da5b5..7620ce212410 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -372,6 +372,9 @@ export const ACTION_RUN_BUTTON_MESSAGE_FIRST_HALF = () => "🙌 Click on";
export const ACTION_RUN_BUTTON_MESSAGE_SECOND_HALF = () =>
"after adding your query";
export const CREATE_NEW_DATASOURCE = () => "Create new datasource";
+export const CREATE_NEW_DATASOURCE_DATABASE_HEADER = () => "Databases";
+export const CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER = () => "Most popular";
+export const CREATE_NEW_DATASOURCE_REST_API = () => "REST API";
export const ERROR_EVAL_ERROR_GENERIC = () =>
`Unexpected error occurred while evaluating the application`;
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index 233301ae01a2..eb16e3810901 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -12,6 +12,7 @@ import type {
} from "entities/Datasource";
import { isEmbeddedRestDatasource } from "entities/Datasource";
import type { Action } from "entities/Action";
+import { PluginPackageName } from "entities/Action";
import { isStoredDatasource } from "entities/Action";
import { PluginType } from "entities/Action";
import { find, get, sortBy } from "lodash";
@@ -390,6 +391,18 @@ export const getDBPlugins = createSelector(getPlugins, (plugins) =>
plugins.filter((plugin) => plugin.type === PluginType.DB),
);
+// Most popular datasources are hardcoded right now to include these 4 plugins and REST API
+// Going forward we may want to have separate list for each instance based on usage
+export const getMostPopularPlugins = createSelector(getPlugins, (plugins) =>
+ plugins.filter(
+ (plugin) =>
+ plugin.packageName === PluginPackageName.POSTGRES ||
+ plugin.packageName === PluginPackageName.MY_SQL ||
+ plugin.packageName === PluginPackageName.MONGO ||
+ plugin.packageName === PluginPackageName.GOOGLE_SHEETS,
+ ),
+);
+
export const getDBAndRemotePlugins = createSelector(getPlugins, (plugins) =>
plugins.filter(
(plugin) =>
diff --git a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
index 04c6d9922090..66d337d52d9a 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
@@ -27,6 +27,12 @@ import history from "utils/history";
import { showDebuggerFlag } from "../../../selectors/debuggerSelectors";
import classNames from "classnames";
import { getIsAppSidebarEnabled } from "../../../selectors/ideSelectors";
+import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import {
+ createMessage,
+ CREATE_NEW_DATASOURCE_DATABASE_HEADER,
+ CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER,
+} from "@appsmith/constants/messages";
const NewIntegrationsContainer = styled.div`
${thinScrollbar};
@@ -109,6 +115,7 @@ function CreateNewDatasource({
history,
isCreating,
pageId,
+ showMostPopularPlugins,
showUnsupportedPluginDialog,
}: any) {
const newDatasourceRef = useRef<HTMLDivElement>(null);
@@ -122,14 +129,20 @@ function CreateNewDatasource({
});
}
}, [active]);
+
return (
<div id="new-datasources" ref={newDatasourceRef}>
- <Text type={TextType.H2}>Databases</Text>
+ <Text type={TextType.H2}>
+ {showMostPopularPlugins
+ ? createMessage(CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER)
+ : createMessage(CREATE_NEW_DATASOURCE_DATABASE_HEADER)}
+ </Text>
<NewQueryScreen
history={history}
isCreating={isCreating}
location={location}
pageId={pageId}
+ showMostPopularPlugins={showMostPopularPlugins}
showUnsupportedPluginDialog={showUnsupportedPluginDialog}
/>
</div>
@@ -184,6 +197,7 @@ interface CreateNewDatasourceScreenProps {
showDebugger: boolean;
pageId: string;
isAppSidebarEnabled: boolean;
+ isEnabledForStartWithData: boolean;
}
interface CreateNewDatasourceScreenState {
@@ -215,6 +229,7 @@ class CreateNewDatasourceTab extends React.Component<
dataSources,
isAppSidebarEnabled,
isCreating,
+ isEnabledForStartWithData,
pageId,
} = this.props;
if (!canCreateDatasource) return null;
@@ -236,6 +251,17 @@ class CreateNewDatasourceTab extends React.Component<
{dataSources.length === 0 &&
this.props.mockDatasources.length > 0 &&
mockDataSection}
+ {isEnabledForStartWithData && (
+ <CreateNewDatasource
+ active={false}
+ history={history}
+ isCreating={isCreating}
+ location={location}
+ pageId={pageId}
+ showMostPopularPlugins
+ showUnsupportedPluginDialog={this.showUnsupportedPluginDialog}
+ />
+ )}
<CreateNewAPI
active={false}
history={history}
@@ -281,6 +307,11 @@ const mapStateToProps = (state: AppState) => {
isFeatureEnabled,
userWorkspacePermissions,
);
+
+ const isEnabledForStartWithData =
+ !!featureFlags[
+ FEATURE_FLAG.ab_onboarding_flow_start_with_data_dev_only_enabled
+ ];
const isAppSidebarEnabled = getIsAppSidebarEnabled(state);
return {
dataSources: getDatasources(state),
@@ -291,6 +322,7 @@ const mapStateToProps = (state: AppState) => {
showDebugger,
pageId,
isAppSidebarEnabled,
+ isEnabledForStartWithData,
};
};
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
index 5284043ccdcd..d63bb1f65a5d 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
@@ -5,6 +5,7 @@ import { initialize } from "redux-form";
import {
getDBPlugins,
getPluginImages,
+ getMostPopularPlugins,
} from "@appsmith/selectors/entitiesSelector";
import type { Plugin } from "api/PluginApi";
import { DATASOURCE_DB_FORM } from "@appsmith/constants/forms";
@@ -21,6 +22,16 @@ import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSel
import type { GenerateCRUDEnabledPluginMap } from "api/PluginApi";
import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
+import { ApiCard, API_ACTION, CardContentWrapper } from "./NewApi";
+import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+import { createNewApiAction } from "actions/apiPaneActions";
+import { PluginPackageName } from "entities/Action";
+import { Spinner } from "design-system";
+import PlusLogo from "assets/images/Plus-logo.svg";
+import {
+ createMessage,
+ CREATE_NEW_DATASOURCE_REST_API,
+} from "@appsmith/constants/messages";
// This function remove the given key from queryParams and return string
const removeQueryParams = (paramKeysToRemove: Array<string>) => {
@@ -112,6 +123,8 @@ interface DatasourceHomeScreenProps {
replace: (data: string) => void;
push: (data: string) => void;
};
+ showMostPopularPlugins?: boolean;
+ isCreating?: boolean;
showUnsupportedPluginDialog: (callback: any) => void;
}
@@ -119,6 +132,11 @@ interface ReduxDispatchProps {
initializeForm: (data: Record<string, any>) => void;
createDatasource: (data: any) => void;
createTempDatasource: (data: any) => void;
+ createNewApiAction: (
+ pageId: string,
+ from: EventLocation,
+ apiType?: string,
+ ) => void;
}
interface ReduxStateProps {
@@ -181,8 +199,27 @@ class DatasourceHomeScreen extends React.Component<Props> {
});
};
+ handleOnClick = () => {
+ AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
+ source: API_ACTION.CREATE_NEW_API,
+ });
+ if (this.props.pageId) {
+ this.props.createNewApiAction(
+ this.props.pageId,
+ "API_PANE",
+ PluginPackageName.REST_API,
+ );
+ }
+ };
+
render() {
- const { currentApplication, pluginImages, plugins } = this.props;
+ const {
+ currentApplication,
+ isCreating,
+ pluginImages,
+ plugins,
+ showMostPopularPlugins,
+ } = this.props;
return (
<DatasourceHomePage>
@@ -215,17 +252,40 @@ class DatasourceHomeScreen extends React.Component<Props> {
</DatasourceCard>
);
})}
+ {!!showMostPopularPlugins ? (
+ <ApiCard
+ className="t--createBlankApiCard create-new-api"
+ onClick={() => this.handleOnClick()}
+ >
+ <CardContentWrapper data-testid="newapi-datasource-content-wrapper">
+ <img
+ alt="New"
+ className="curlImage t--plusImage content-icon"
+ src={PlusLogo}
+ />
+ <p className="textBtn">
+ {createMessage(CREATE_NEW_DATASOURCE_REST_API)}
+ </p>
+ </CardContentWrapper>
+ {isCreating && <Spinner className="cta" size={25} />}
+ </ApiCard>
+ ) : null}
</DatasourceCardsContainer>
</DatasourceHomePage>
);
}
}
-const mapStateToProps = (state: AppState): ReduxStateProps => {
+const mapStateToProps = (
+ state: AppState,
+ props: { showMostPopularPlugins?: boolean },
+) => {
const { datasources } = state.entities;
return {
pluginImages: getPluginImages(state),
- plugins: getDBPlugins(state),
+ plugins: !!props?.showMostPopularPlugins
+ ? getMostPopularPlugins(state)
+ : getDBPlugins(state),
currentApplication: getCurrentApplication(state),
isSaving: datasources.loading,
generateCRUDSupportedPlugin: getGenerateCRUDEnabledPluginMap(state),
@@ -239,6 +299,11 @@ const mapDispatchToProps = (dispatch: any) => {
createDatasource: (data: any) => dispatch(createDatasourceFromForm(data)),
createTempDatasource: (data: any) =>
dispatch(createTempDatasourceFromForm(data)),
+ createNewApiAction: (
+ pageId: string,
+ from: EventLocation,
+ apiType?: string,
+ ) => dispatch(createNewApiAction(pageId, from, apiType)),
};
};
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
index 74267243d8b4..2c69eb32df1c 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
@@ -21,7 +21,7 @@ import { curlImportPageURL } from "@appsmith/RouteBuilder";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
import { Spinner } from "design-system";
-const StyledContainer = styled.div`
+export const StyledContainer = styled.div`
flex: 1;
margin-top: 8px;
.textBtn {
@@ -63,7 +63,7 @@ const StyledContainer = styled.div`
}
`;
-const ApiCardsContainer = styled.div`
+export const ApiCardsContainer = styled.div`
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 16px;
@@ -79,7 +79,7 @@ const ApiCardsContainer = styled.div`
}
`;
-const ApiCard = styled.div`
+export const ApiCard = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
@@ -110,7 +110,7 @@ const ApiCard = styled.div`
}
`;
-const CardContentWrapper = styled.div`
+export const CardContentWrapper = styled.div`
display: flex;
align-items: center;
gap: 13px;
@@ -141,7 +141,7 @@ interface ApiHomeScreenProps {
type Props = ApiHomeScreenProps;
-const API_ACTION = {
+export const API_ACTION = {
IMPORT_CURL: "IMPORT_CURL",
CREATE_NEW_API: "CREATE_NEW_API",
CREATE_NEW_GRAPHQL_API: "CREATE_NEW_GRAPHQL_API",
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
index 93aa7096338b..17969c97f9ef 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
@@ -23,20 +23,29 @@ interface QueryHomeScreenProps {
replace: (data: string) => void;
push: (data: string) => void;
};
+ showMostPopularPlugins?: boolean;
showUnsupportedPluginDialog: (callback: any) => void;
}
class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
render() {
- const { history, location, pageId, showUnsupportedPluginDialog } =
- this.props;
+ const {
+ history,
+ isCreating,
+ location,
+ pageId,
+ showMostPopularPlugins,
+ showUnsupportedPluginDialog,
+ } = this.props;
return (
<QueryHomePage>
<DataSourceHome
history={history}
+ isCreating={isCreating}
location={location}
pageId={pageId}
+ showMostPopularPlugins={showMostPopularPlugins}
showUnsupportedPluginDialog={showUnsupportedPluginDialog}
/>
</QueryHomePage>
|
f60989109e2f51b3858dcec7fd2285fe6b839df5
|
2023-01-13 13:38:39
|
Tanvi Bhakta
|
chore: add chore as a type of change (#19649)
| false
|
add chore as a type of change (#19649)
|
chore
|
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index c1cdaf246d0d..2afc59a5d27e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -25,6 +25,7 @@ Media
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- Chore (housekeeping or task changes that don't impact user perception)
- This change requires a documentation update
|
e2db190ed2cda12e573c9108d38766a93f74bb87
|
2022-07-11 21:22:25
|
Satish Gandham
|
ci: Stabilise the host before running perf tests (#15130)
| false
|
Stabilise the host before running perf tests (#15130)
|
ci
|
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml
index 3855f91aa5c5..dd8cba6f656e 100644
--- a/.github/workflows/integration-tests-command.yml
+++ b/.github/workflows/integration-tests-command.yml
@@ -1492,7 +1492,6 @@ jobs:
APPSMITH_DISABLE_TELEMETRY: true
POSTGRES_PASSWORD: postgres
NODE_TLS_REJECT_UNAUTHORIZED: "0"
- MACHINE: ${{matrix.machine}}
run: ./start-test.sh
# Restore the previous built bundle if present. If not push the newly built into the cache
diff --git a/app/client/perf/src/ci/supabase.js b/app/client/perf/src/ci/supabase.js
index b9c7adc64cee..d681a1251af8 100644
--- a/app/client/perf/src/ci/supabase.js
+++ b/app/client/perf/src/ci/supabase.js
@@ -79,7 +79,7 @@ const createRunMeta = async () => {
pull_request_id: prId || parsePullRequestId(process.env.GITHUB_REF),
runner_name: process.env?.RUNNER_NAME,
host_name: hostname,
- machine: process.env?.MACHINE || "",
+ machine: process.env?.MACHINE || "buildjet-4vcpu-ubuntu-2004", // Hardcoded temporarily. Should be removed
},
]);
if (data) {
diff --git a/app/client/perf/src/perf.js b/app/client/perf/src/perf.js
index 2ec1aa8b623b..f8bead5bd3e8 100644
--- a/app/client/perf/src/perf.js
+++ b/app/client/perf/src/perf.js
@@ -10,6 +10,12 @@ const {
login,
sortObjectKeys,
} = require("./utils/utils");
+
+const {
+ cleanTheHost,
+ setChromeProcessPriority,
+} = require("./utils/system-cleanup");
+
const selectors = {
appMoreIcon: "span.t--options-icon",
workspaceImportAppOption: '[data-cy*="t--workspace-import-app"]',
@@ -17,6 +23,7 @@ const selectors = {
importButton: '[data-cy*="t--workspace-import-app-button"]',
createNewApp: ".createnew",
};
+
module.exports = class Perf {
constructor(launchOptions = {}) {
this.launchOptions = {
@@ -62,9 +69,12 @@ module.exports = class Perf {
* Launches the browser and, gives you the page
*/
launch = async () => {
+ await cleanTheHost();
this.browser = await puppeteer.launch(this.launchOptions);
const pages_ = await this.browser.pages();
this.page = pages_[0];
+
+ await setChromeProcessPriority();
await this._login();
};
@@ -75,13 +85,20 @@ module.exports = class Perf {
startTrace = async (action = "foo") => {
if (this.currentTrace) {
- console.warn("Trace progress. You can run only one trace at a time");
+ console.warn(
+ "Trace already in progress. You can run only one trace at a time",
+ );
return;
}
this.currentTrace = action;
await delay(3000, `before starting trace ${action}`);
+ await this.page._client.send("HeapProfiler.enable");
+ await this.page._client.send("HeapProfiler.collectGarbage");
+ await delay(1000, `After clearing memory`);
+
const path = `${APP_ROOT}/traces/${action}-${getFormattedTime()}-chrome-profile.json`;
+
await this.page.tracing.start({
path: path,
screenshots: true,
@@ -109,7 +126,7 @@ module.exports = class Perf {
await this.page.waitForNavigation();
const currentUrl = this.page.url();
- const pageId = currentURL
+ const pageId = currentUrl
.split("/")[5]
?.split("-")
.pop();
diff --git a/app/client/perf/src/utils/system-cleanup.js b/app/client/perf/src/utils/system-cleanup.js
new file mode 100644
index 000000000000..9a29f27bef36
--- /dev/null
+++ b/app/client/perf/src/utils/system-cleanup.js
@@ -0,0 +1,53 @@
+const cp = require("child_process");
+
+exports.cleanTheHost = async () => {
+ await cp.exec("pidof chrome", (error, stdout, stderr) => {
+ if (error) {
+ console.log(`error: ${error.message}`);
+ return;
+ }
+ if (stderr) {
+ console.log(`stderr: ${stderr}`);
+ return;
+ }
+ console.log(`Killing chrome processes: ${stdout}`);
+ stdout.split(" ").forEach((PID) => {
+ cp.exec(`sudo kill -9 ${PID}`, (error, stdout, stder) => {
+ if (error) {
+ console.log(`Kill error: ${error.message}`);
+ return;
+ }
+ if (stderr) {
+ console.log(`Kill stderr: ${stderr}`);
+ return;
+ }
+ if (stdout) {
+ console.log(`Kill stdout: ${stdout}`);
+ return;
+ }
+ });
+ });
+ });
+
+ // Clear OS caches
+ await cp.exec("sync; echo 3 | sudo tee /proc/sys/vm/drop_caches");
+};
+
+exports.setChromeProcessPriority = async () => {
+ await cp.exec("pidof chrome", (error, stdout, stderr) => {
+ if (error) {
+ console.log(`error: ${error.message}`);
+ return;
+ }
+ if (stderr) {
+ console.log(`stderr: ${stderr}`);
+ return;
+ }
+ console.log(`stdout: setting priority: ${stdout}`);
+
+ // Set priority of chrome processes to maximum
+ stdout.split(" ").forEach((PID) => {
+ cp.execSync(`sudo renice -20 ${PID}`);
+ });
+ });
+};
|
282735cbf29918f1cc67aa4a019924524f662d8e
|
2024-06-07 18:30:12
|
Nirmal Sarswat
|
fix: fixing null check failure on pg branch (#34090)
| false
|
fixing null check failure on pg branch (#34090)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewPage.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewPage.java
index 5e890ae6e24b..5295bff2bad0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewPage.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewPage.java
@@ -50,8 +50,11 @@ public String getArtifactId() {
@JsonView(Views.Internal.class)
@Override
public Layout getLayout() {
+ if (this.getUnpublishedPage() == null || this.getUnpublishedPage().getLayouts() == null) {
+ return null;
+ }
List<Layout> layouts = this.getUnpublishedPage().getLayouts();
- return (layouts != null && !layouts.isEmpty()) ? layouts.get(0) : null;
+ return !layouts.isEmpty() ? layouts.get(0) : null;
}
public static class Fields extends BranchAwareDomain.Fields {
|
5cc9ae7a62c7508a47bc9ad1dc8fa725c078a779
|
2021-06-04 14:50:03
|
Confidence Okoghenun
|
chore: Adds live demo for 03-06-2021
| false
|
Adds live demo for 03-06-2021
|
chore
|
diff --git a/office_hours.md b/office_hours.md
index 4ee2e13ea72d..1a0dcc6dc70b 100644
--- a/office_hours.md
+++ b/office_hours.md
@@ -28,6 +28,16 @@ You can find the archives of the calls below with a brief summary of each sessio
## Archives
+<strong>Appsmith Live Demo #4, 3rd Jun 2021: Building a CMS with the Notion API</strong>
+
+<a href = "https://youtu.be/O8GyCI-nRLI">Video Link</a>
+
+#### Summary
+
+Akshay and Confidence show the community how we internally used the recently released Notion API to build a CMS with features not available natively in notion. This demo also shows how to work with APIs having complex responses.
+
+------------------
+
<strong>Appsmith Live Demo #3, 29th May 2021: Stitching APIs together to automate workflows</strong>
<a href = "https://youtu.be/_8qLbyWwXeA">Video Link</a>
|
d8297c661101ea81d0d3a6c0ab30708bf47917b5
|
2024-08-15 12:24:49
|
Anagh Hegde
|
test: disable flaky test of theme import service (#35593)
| false
|
disable flaky test of theme import service (#35593)
|
test
|
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ThemeImportableServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ThemeImportableServiceCETest.java
index a0fde7a5243d..63d8a7b58a61 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ThemeImportableServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ThemeImportableServiceCETest.java
@@ -22,10 +22,8 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.annotation.DirtiesContext;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -99,8 +97,7 @@ public void cleanup() {
workspaceService.archiveById(workspace.getId()).block();
}
- @WithUserDetails("api_user")
- @Test
+ @Disabled(" Flaky test to unblock TBP for the time")
public void importThemesToApplication_WhenBothImportedThemesAreCustom_NewThemesCreated() {
Application application = new Application();
application.setName("ThemeTest_" + UUID.randomUUID());
|
8798dcfb3143c04bac3d603ac835b7ec337753c2
|
2025-03-10 14:49:05
|
Hetu Nandu
|
fix: Rename Error effect in ADS (#39644)
| false
|
Rename Error effect in ADS (#39644)
|
fix
|
diff --git a/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts b/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
index a5cefd2c1165..fe34fb73fd5a 100644
--- a/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
+++ b/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
@@ -8,7 +8,6 @@ import {
type RefObject,
} from "react";
-import { usePrevious } from "@mantine/hooks";
import { useEventCallback, useEventListener } from "usehooks-ts";
import { normaliseName } from "./utils";
@@ -27,7 +26,6 @@ export function useEditableText(
(e: KeyboardEvent<HTMLInputElement>) => void,
(e: ChangeEvent<HTMLInputElement>) => void,
] {
- const previousName = usePrevious(name);
const [editableName, setEditableName] = useState(name);
const [validationError, setValidationError] = useState<string | null>(null);
const inputRef = useRef<HTMLInputElement>(null);
@@ -111,11 +109,11 @@ export function useEditableText(
useEffect(
function syncEditableTitle() {
- if (!isEditing && previousName !== name) {
+ if (!isEditing && editableName !== name) {
setEditableName(name);
}
},
- [name, previousName, isEditing],
+ [name, editableName, isEditing],
);
return [
|
12bce5f5552ec28253b75cc0b8523cdf5c29a9d9
|
2023-08-31 10:09:42
|
Abhijeet
|
feat: Update execution flow for git feature based on feature flag (#26665)
| false
|
Update execution flow for git feature based on feature flag (#26665)
|
feat
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelper.java
new file mode 100644
index 000000000000..1a51f1f37487
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelper.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.GitPrivateRepoHelperCE;
+
+public interface GitPrivateRepoHelper extends GitPrivateRepoHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelperImpl.java
new file mode 100644
index 000000000000..c42c847f255e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitPrivateRepoHelperImpl.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.GitPrivateRepoHelperCEImpl;
+import com.appsmith.server.services.ApplicationService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GitPrivateRepoHelperImpl extends GitPrivateRepoHelperCEImpl implements GitPrivateRepoHelper {
+ public GitPrivateRepoHelperImpl(
+ GitCloudServicesUtils gitCloudServicesUtils, ApplicationService applicationService) {
+ super(gitCloudServicesUtils, applicationService);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCE.java
new file mode 100644
index 000000000000..7e0865e4c9e1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCE.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.helpers.ce;
+
+import reactor.core.publisher.Mono;
+
+public interface GitPrivateRepoHelperCE {
+
+ Mono<Boolean> isRepoLimitReached(String workspaceId, Boolean isClearCache);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCEImpl.java
new file mode 100644
index 000000000000..51ecb5e063d5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/GitPrivateRepoHelperCEImpl.java
@@ -0,0 +1,43 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.server.helpers.GitCloudServicesUtils;
+import com.appsmith.server.services.ApplicationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+@Component
+@RequiredArgsConstructor
+public class GitPrivateRepoHelperCEImpl implements GitPrivateRepoHelperCE {
+
+ private final GitCloudServicesUtils gitCloudServicesUtils;
+
+ private final ApplicationService applicationService;
+
+ @Override
+ public Mono<Boolean> isRepoLimitReached(String workspaceId, Boolean isClearCache) {
+ return gitCloudServicesUtils
+ .getPrivateRepoLimitForOrg(workspaceId, isClearCache)
+ .flatMap(limit -> {
+ if (limit == -1) {
+ return Mono.just(Boolean.FALSE);
+ }
+ return applicationService
+ .getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(workspaceId)
+ .map(privateRepoCount -> {
+ // isClearCache is false for the commit flow
+ // isClearCache is true for the connect & import flow
+ if (!isClearCache) {
+ if (privateRepoCount <= limit) {
+ return Boolean.FALSE;
+ }
+ } else {
+ if (privateRepoCount < limit) {
+ return Boolean.FALSE;
+ }
+ }
+ return Boolean.TRUE;
+ });
+ });
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
index 1286b40febeb..1bfc6371c4f6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
@@ -3,8 +3,8 @@
import com.appsmith.external.git.GitExecutor;
import com.appsmith.git.service.GitExecutorImpl;
import com.appsmith.server.configurations.EmailConfig;
-import com.appsmith.server.helpers.GitCloudServicesUtils;
import com.appsmith.server.helpers.GitFileUtils;
+import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.repositories.GitDeployKeysRepository;
@@ -36,7 +36,6 @@ public GitServiceImpl(
ResponseUtils responseUtils,
EmailConfig emailConfig,
AnalyticsService analyticsService,
- GitCloudServicesUtils gitCloudServicesUtils,
GitDeployKeysRepository gitDeployKeysRepository,
DatasourceService datasourceService,
PluginService pluginService,
@@ -44,7 +43,8 @@ public GitServiceImpl(
ApplicationPermission applicationPermission,
WorkspaceService workspaceService,
RedisUtils redisUtils,
- ObservationRegistry observationRegistry) {
+ ObservationRegistry observationRegistry,
+ GitPrivateRepoHelper gitPrivateRepoHelper) {
super(
userService,
@@ -61,7 +61,6 @@ public GitServiceImpl(
responseUtils,
emailConfig,
analyticsService,
- gitCloudServicesUtils,
gitDeployKeysRepository,
datasourceService,
pluginService,
@@ -69,6 +68,7 @@ public GitServiceImpl(
applicationPermission,
workspaceService,
redisUtils,
- observationRegistry);
+ observationRegistry,
+ gitPrivateRepoHelper);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
index cabb1965fa5a..cb6046c0f4b8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
@@ -77,9 +77,5 @@ Mono<List<GitBranchDTO>> listBranchForApplication(
Mono<List<GitDocsDTO>> getGitDocUrls();
- Mono<Long> getApplicationCountWithPrivateRepo(String workspaceId);
-
- Mono<Boolean> isRepoLimitReached(String workspaceId, Boolean isClearCache);
-
Mono<BranchTrackingStatus> fetchRemoteChanges(String defaultApplicationId, String branchName, boolean isFileLock);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
index 6a7e6ff8cee2..6151a0b50a7b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
@@ -37,9 +37,9 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.CollectionUtils;
-import com.appsmith.server.helpers.GitCloudServicesUtils;
import com.appsmith.server.helpers.GitDeployKeyGenerator;
import com.appsmith.server.helpers.GitFileUtils;
+import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ResponseUtils;
@@ -74,6 +74,7 @@
import org.eclipse.jgit.util.StringUtils;
import org.springframework.context.annotation.Import;
import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
import reactor.core.Exceptions;
import reactor.core.observability.micrometer.Micrometer;
import reactor.core.publisher.Flux;
@@ -117,6 +118,7 @@
@Slf4j
@RequiredArgsConstructor
@Import({GitExecutorImpl.class})
+@Service
public class GitServiceCEImpl implements GitServiceCE {
private final UserService userService;
@@ -133,7 +135,6 @@ public class GitServiceCEImpl implements GitServiceCE {
private final ResponseUtils responseUtils;
private final EmailConfig emailConfig;
private final AnalyticsService analyticsService;
- private final GitCloudServicesUtils gitCloudServicesUtils;
private final GitDeployKeysRepository gitDeployKeysRepository;
private final DatasourceService datasourceService;
private final PluginService pluginService;
@@ -142,6 +143,7 @@ public class GitServiceCEImpl implements GitServiceCE {
private final WorkspaceService workspaceService;
private final RedisUtils redisUtils;
private final ObservationRegistry observationRegistry;
+ private final GitPrivateRepoHelper gitPrivateRepoCountHelper;
private static final Duration RETRY_DELAY = Duration.ofSeconds(1);
private static final Integer MAX_RETRIES = 20;
@@ -449,7 +451,8 @@ private Mono<String> commitApplication(
return applicationService
.save(defaultApplication)
// Check if the private repo count is less than the allowed repo count
- .flatMap(application -> isRepoLimitReached(workspaceId, false))
+ .flatMap(application ->
+ gitPrivateRepoCountHelper.isRepoLimitReached(workspaceId, false))
.flatMap(isRepoLimitReached -> {
if (Boolean.FALSE.equals(isRepoLimitReached)) {
return Mono.just(defaultApplication);
@@ -734,7 +737,8 @@ public Mono<Application> connectApplicationToGit(
return Mono.just(application);
}
// Check the limit for number of private repo
- return isRepoLimitReached(application.getWorkspaceId(), true)
+ return gitPrivateRepoCountHelper
+ .isRepoLimitReached(application.getWorkspaceId(), true)
.flatMap(isRepoLimitReached -> {
if (Boolean.FALSE.equals(isRepoLimitReached)) {
return Mono.just(application);
@@ -2396,19 +2400,21 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
if (!isRepoPrivate) {
return Mono.just(gitAuth).zipWith(applicationMono);
}
- return isRepoLimitReached(workspaceId, true).flatMap(isRepoLimitReached -> {
- if (Boolean.FALSE.equals(isRepoLimitReached)) {
- return Mono.just(gitAuth).zipWith(applicationMono);
- }
- return addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_IMPORT.getEventName(),
- newApplication,
- AppsmithError.GIT_APPLICATION_LIMIT_ERROR.getErrorType(),
- AppsmithError.GIT_APPLICATION_LIMIT_ERROR.getMessage(),
- true)
- .flatMap(user ->
- Mono.error(new AppsmithException(AppsmithError.GIT_APPLICATION_LIMIT_ERROR)));
- });
+ return gitPrivateRepoCountHelper
+ .isRepoLimitReached(workspaceId, true)
+ .flatMap(isRepoLimitReached -> {
+ if (Boolean.FALSE.equals(isRepoLimitReached)) {
+ return Mono.just(gitAuth).zipWith(applicationMono);
+ }
+ return addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_IMPORT.getEventName(),
+ newApplication,
+ AppsmithError.GIT_APPLICATION_LIMIT_ERROR.getErrorType(),
+ AppsmithError.GIT_APPLICATION_LIMIT_ERROR.getMessage(),
+ true)
+ .flatMap(user -> Mono.error(
+ new AppsmithException(AppsmithError.GIT_APPLICATION_LIMIT_ERROR)));
+ });
})
.flatMap(tuple -> {
GitAuth gitAuth = tuple.getT1();
@@ -2938,11 +2944,6 @@ public Mono<List<GitBranchDTO>> handleRepoNotFoundException(String defaultApplic
});
}
- @Override
- public Mono<Long> getApplicationCountWithPrivateRepo(String workspaceId) {
- return applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(workspaceId);
- }
-
/**
* Method to pull the files from remote repo and rehydrate the application
*
@@ -3134,29 +3135,4 @@ private Mono<Boolean> addFileLock(String defaultApplicationId) {
private Mono<Boolean> releaseFileLock(String defaultApplicationId) {
return redisUtils.releaseFileLock(defaultApplicationId);
}
-
- @Override
- public Mono<Boolean> isRepoLimitReached(String workspaceId, Boolean isClearCache) {
- return gitCloudServicesUtils
- .getPrivateRepoLimitForOrg(workspaceId, isClearCache)
- .flatMap(limit -> {
- if (limit == -1) {
- return Mono.just(Boolean.FALSE);
- }
- return this.getApplicationCountWithPrivateRepo(workspaceId).map(privateRepoCount -> {
- // isClearCache is false for the commit flow
- // isClearCache is true for the connect & import flow
- if (!isClearCache) {
- if (privateRepoCount <= limit) {
- return Boolean.FALSE;
- }
- } else {
- if (privateRepoCount < limit) {
- return Boolean.FALSE;
- }
- }
- return Boolean.TRUE;
- });
- });
- }
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/GitPrivateRepoCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/GitPrivateRepoCEImplTest.java
new file mode 100644
index 000000000000..53dd7eb17aa2
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/GitPrivateRepoCEImplTest.java
@@ -0,0 +1,78 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.server.helpers.GitCloudServicesUtils;
+import com.appsmith.server.helpers.GitPrivateRepoHelper;
+import com.appsmith.server.services.ApplicationService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+@Slf4j
+@DirtiesContext
+public class GitPrivateRepoCEImplTest {
+
+ @Autowired
+ GitPrivateRepoHelper gitPrivateRepoHelper;
+
+ @MockBean
+ GitCloudServicesUtils gitCloudServicesUtils;
+
+ @MockBean
+ ApplicationService applicationService;
+
+ @BeforeEach
+ void setup() {
+ Mockito.when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(anyString(), anyBoolean()))
+ .thenReturn(Mono.just(3));
+ }
+
+ @Test
+ public void isRepoLimitReached_connectedAppCountIsLessThanLimit_Success() {
+
+ Mockito.when(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(anyString()))
+ .thenReturn(Mono.just(1L));
+
+ StepVerifier.create(gitPrivateRepoHelper.isRepoLimitReached("workspaceId", false))
+ .assertNext(aBoolean -> assertEquals(false, aBoolean))
+ .verifyComplete();
+ }
+
+ @Test
+ public void isRepoLimitReached_connectedAppCountIsSameAsLimit_Success() {
+
+ Mockito.when(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(anyString()))
+ .thenReturn(Mono.just(3L));
+
+ StepVerifier.create(gitPrivateRepoHelper.isRepoLimitReached("workspaceId", true))
+ .assertNext(aBoolean -> assertEquals(true, aBoolean))
+ .verifyComplete();
+ }
+
+ // This test is to check if the limit is reached when the count of connected apps is more than the limit
+ // This happens when public visible git repo is synced with application and then the visibility is changed
+ @Test
+ public void isRepoLimitReached_connectedAppCountIsMoreThanLimit_Success() {
+
+ Mockito.when(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(anyString()))
+ .thenReturn(Mono.just(4L));
+
+ StepVerifier.create(gitPrivateRepoHelper.isRepoLimitReached("workspaceId", false))
+ .assertNext(aBoolean -> assertEquals(true, aBoolean))
+ .verifyComplete();
+ }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
index a1f727cff57a..ecaf9c229291 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
@@ -40,6 +40,7 @@
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.GitCloudServicesUtils;
import com.appsmith.server.helpers.GitFileUtils;
+import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.MockPluginExecutor;
import com.appsmith.server.helpers.PluginExecutorHelper;
import com.appsmith.server.migrations.JsonSchemaMigration;
@@ -68,6 +69,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
@@ -103,6 +105,7 @@
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static com.appsmith.server.constants.FieldName.DEFAULT_PAGE_LAYOUT;
+import static java.lang.Boolean.TRUE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
@@ -112,7 +115,6 @@
@DirtiesContext
public class GitServiceTest {
- private static final String DEFAULT_GIT_PROFILE = "default";
private static final String DEFAULT_BRANCH = "defaultBranchName";
private static final String EMPTY_COMMIT_ERROR_MESSAGE = "On current branch nothing to commit, working tree clean";
private static final String GIT_CONFIG_ERROR =
@@ -189,6 +191,9 @@ public class GitServiceTest {
@Autowired
EnvironmentPermission environmentPermission;
+ @SpyBean
+ GitPrivateRepoHelper gitPrivateRepoHelper;
+
@BeforeEach
public void setup() throws IOException, GitAPIException {
@@ -215,7 +220,7 @@ public void setup() throws IOException, GitAPIException {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
.thenReturn(Mono.just(new MockPluginExecutor()));
- if (Boolean.TRUE.equals(isSetupDone)) {
+ if (TRUE.equals(isSetupDone)) {
return;
}
@@ -843,9 +848,8 @@ public void connectApplicationToGit_moreThanThreePrivateRepos_throwException() t
String limitPrivateRepoTestWorkspaceId =
workspaceService.create(workspace).map(Workspace::getId).block();
- GitService gitService1 = Mockito.spy(gitService);
Mockito.doReturn(Mono.just(Boolean.TRUE))
- .when(gitService1)
+ .when(gitPrivateRepoHelper)
.isRepoLimitReached(Mockito.anyString(), Mockito.anyBoolean());
Mockito.when(gitExecutor.cloneApplication(
@@ -889,7 +893,7 @@ public void connectApplicationToGit_moreThanThreePrivateRepos_throwException() t
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
Mono<Application> applicationMono =
- gitService1.connectApplicationToGit(application.getId(), gitConnectDTO, "baseUrl");
+ gitService.connectApplicationToGit(application.getId(), gitConnectDTO, "baseUrl");
StepVerifier.create(applicationMono)
.expectErrorMatches(error -> error instanceof AppsmithException
@@ -1755,7 +1759,7 @@ public void isBranchMergeable_nonConflictingChanges_canBeMerged() throws IOExcep
Mockito.anyBoolean()))
.thenReturn(Mono.just("fetchResult"));
Mockito.when(gitExecutor.resetToLastCommit(Mockito.any(Path.class), Mockito.anyString()))
- .thenReturn(Mono.just(Boolean.TRUE));
+ .thenReturn(Mono.just(TRUE));
Mockito.when(gitFileUtils.saveApplicationToLocalRepo(
Mockito.any(Path.class), Mockito.any(ApplicationJson.class), Mockito.anyString()))
.thenReturn(Mono.just(Paths.get("")));
@@ -3438,7 +3442,7 @@ public void importApplicationFromGit_privateRepoLimitReached_ThrowApplicationLim
gitService.generateSSHKey(null).block();
GitService gitService1 = Mockito.spy(gitService);
Mockito.doReturn(Mono.just(Boolean.TRUE))
- .when(gitService1)
+ .when(gitPrivateRepoHelper)
.isRepoLimitReached(Mockito.anyString(), Mockito.anyBoolean());
Mono<ApplicationImportDTO> applicationMono = gitService1.importApplicationFromGit(workspaceId, gitConnectDTO);
@@ -4090,7 +4094,8 @@ public void getGitConnectedApps_privateRepositories_Success() throws GitAPIExcep
createApplicationConnectedToGit("private_repo_2", "master", localWorkspaceId);
createApplicationConnectedToGit("private_repo_3", "master", localWorkspaceId);
- StepVerifier.create(gitService.getApplicationCountWithPrivateRepo(localWorkspaceId))
+ StepVerifier.create(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(
+ localWorkspaceId))
.assertNext(limit -> assertThat(limit).isEqualTo(3))
.verifyComplete();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCEImplTest.java
deleted file mode 100644
index a4099b405e00..000000000000
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCEImplTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.appsmith.server.services.ce;
-
-import com.appsmith.external.git.GitExecutor;
-import com.appsmith.server.configurations.EmailConfig;
-import com.appsmith.server.helpers.GitCloudServicesUtils;
-import com.appsmith.server.helpers.GitFileUtils;
-import com.appsmith.server.helpers.RedisUtils;
-import com.appsmith.server.helpers.ResponseUtils;
-import com.appsmith.server.repositories.GitDeployKeysRepository;
-import com.appsmith.server.services.ActionCollectionService;
-import com.appsmith.server.services.AnalyticsService;
-import com.appsmith.server.services.ApplicationPageService;
-import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.DatasourceService;
-import com.appsmith.server.services.NewActionService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
-import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.UserDataService;
-import com.appsmith.server.services.UserService;
-import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.server.solutions.ActionPermission;
-import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.DatasourcePermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
-import com.appsmith.server.solutions.PagePermission;
-import io.micrometer.observation.ObservationRegistry;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-
-@ExtendWith(SpringExtension.class)
-@Slf4j
-public class GitServiceCEImplTest {
-
- GitServiceCE gitService;
-
- @MockBean
- AnalyticsService analyticsService;
-
- @MockBean
- DatasourceService datasourceService;
-
- @MockBean
- PluginService pluginService;
-
- @MockBean
- NewPageService newPageService;
-
- @MockBean
- ApplicationService applicationService;
-
- @MockBean
- SessionUserService sessionUserService;
-
- @MockBean
- ResponseUtils responseUtils;
-
- @MockBean
- UserService userService;
-
- @MockBean
- UserDataService userDataService;
-
- @MockBean
- ApplicationPageService applicationPageService;
-
- @MockBean
- NewActionService newActionService;
-
- @MockBean
- ActionCollectionService actionCollectionService;
-
- @MockBean
- GitFileUtils gitFileUtils;
-
- @MockBean
- ImportExportApplicationService importExportApplicationService;
-
- @MockBean
- GitExecutor gitExecutor;
-
- @MockBean
- EmailConfig emailConfig;
-
- @MockBean
- GitCloudServicesUtils gitCloudServicesUtils;
-
- @MockBean
- GitDeployKeysRepository gitDeployKeysRepository;
-
- @MockBean
- DatasourcePermission datasourcePermission;
-
- @MockBean
- ApplicationPermission applicationPermission;
-
- @MockBean
- PagePermission pagePermission;
-
- @MockBean
- ActionPermission actionPermission;
-
- @MockBean
- WorkspaceService workspaceService;
-
- @MockBean
- RedisUtils redisUtils;
-
- ObservationRegistry observationRegistry;
-
- @BeforeEach
- public void setup() {
- gitService = new GitServiceCEImpl(
- userService,
- userDataService,
- sessionUserService,
- applicationService,
- applicationPageService,
- newPageService,
- newActionService,
- actionCollectionService,
- gitFileUtils,
- importExportApplicationService,
- gitExecutor,
- responseUtils,
- emailConfig,
- analyticsService,
- gitCloudServicesUtils,
- gitDeployKeysRepository,
- datasourceService,
- pluginService,
- datasourcePermission,
- applicationPermission,
- workspaceService,
- redisUtils,
- observationRegistry);
- }
-
- @Test
- public void isRepoLimitReached_connectedAppCountIsLessThanLimit_Success() {
-
- doReturn(Mono.just(3))
- .when(gitCloudServicesUtils)
- .getPrivateRepoLimitForOrg(any(String.class), any(Boolean.class));
-
- GitServiceCE gitService1 = Mockito.spy(gitService);
- doReturn(Mono.just(1L)).when(gitService1).getApplicationCountWithPrivateRepo(any(String.class));
-
- StepVerifier.create(gitService1.isRepoLimitReached("workspaceId", false))
- .assertNext(aBoolean -> assertEquals(false, aBoolean))
- .verifyComplete();
- }
-
- @Test
- public void isRepoLimitReached_connectedAppCountIsSameAsLimit_Success() {
- doReturn(Mono.just(3))
- .when(gitCloudServicesUtils)
- .getPrivateRepoLimitForOrg(any(String.class), any(Boolean.class));
-
- GitServiceCE gitService1 = Mockito.spy(gitService);
- doReturn(Mono.just(3L)).when(gitService1).getApplicationCountWithPrivateRepo(any(String.class));
-
- StepVerifier.create(gitService1.isRepoLimitReached("workspaceId", true))
- .assertNext(aBoolean -> assertEquals(true, aBoolean))
- .verifyComplete();
- }
-
- // This test is to check if the limit is reached when the count of connected apps is more than the limit
- // This happens when public visible git repo is synced with application and then the visibility is changed
- @Test
- public void isRepoLimitReached_connectedAppCountIsMoreThanLimit_Success() {
- doReturn(Mono.just(3))
- .when(gitCloudServicesUtils)
- .getPrivateRepoLimitForOrg(any(String.class), any(Boolean.class));
-
- GitServiceCE gitService1 = Mockito.spy(gitService);
- doReturn(Mono.just(4L)).when(gitService1).getApplicationCountWithPrivateRepo(any(String.class));
-
- StepVerifier.create(gitService1.isRepoLimitReached("workspaceId", false))
- .assertNext(aBoolean -> assertEquals(true, aBoolean))
- .verifyComplete();
- }
-}
|
c29a7e171260fe888eabda0c8b0dcc84cb11b49a
|
2023-12-11 13:14:27
|
Rishabh Rathod
|
chore: CE changes for JSModule execution (#29489)
| false
|
CE changes for JSModule execution (#29489)
|
chore
|
diff --git a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
index d80551057c51..258ab304e3da 100644
--- a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
+++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
@@ -394,6 +394,14 @@ export function isJSAction(entity: DataTreeEntity): entity is JSActionEntity {
entity.ENTITY_TYPE === ENTITY_TYPE_VALUE.JSACTION
);
}
+/**
+ *
+ * isAnyJSAction checks if the entity is a JSAction ( or a JSModuleInstance on EE )
+ */
+export function isAnyJSAction(entity: DataTreeEntity) {
+ return isJSAction(entity);
+}
+
export function isJSActionConfig(
entity: DataTreeEntityConfig,
): entity is JSActionEntityConfig {
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index 062dc112db65..af664eaf4bed 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -59,6 +59,7 @@ import {
DataTreeDiffEvent,
resetValidationErrorsForEntityProperty,
isAPathDynamicBindingPath,
+ isAnyJSAction,
} from "@appsmith/workers/Evaluation/evaluationUtils";
import {
difference,
@@ -1395,7 +1396,7 @@ export default class DataTreeEvaluator {
const { errors: evalErrors, result } = this.evaluateDynamicBoundValue(
toBeSentForEval,
data,
- !!entity && isJSAction(entity),
+ !!entity && isAnyJSAction(entity),
contextData,
callBackData,
);
|
9b7944e7ee98cda66742c05a1c350549e9b99ade
|
2022-06-15 21:07:41
|
Ankita Kinger
|
feat: migrate organisation to workspace (#13863)
| false
|
migrate organisation to workspace (#13863)
|
feat
|
diff --git a/app/client/cypress/fixtures/mongo_GET_Actions.json b/app/client/cypress/fixtures/mongo_GET_Actions.json
index f039e2eda7d3..ec555c5db8b0 100644
--- a/app/client/cypress/fixtures/mongo_GET_Actions.json
+++ b/app/client/cypress/fixtures/mongo_GET_Actions.json
@@ -6,7 +6,7 @@
"data": [
{
"id": "616d7e429594b25adfa3e57e",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b848c7e12534da9c5985",
"name": "InsertQuery",
@@ -87,7 +87,7 @@
},
{
"id": "616d7e429594b25adfa3e57d",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b848c7e12534da9c5985",
"name": "DeleteQuery",
@@ -169,7 +169,7 @@
},
{
"id": "616d7e429594b25adfa3e580",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b848c7e12534da9c5985",
"name": "FindQuery",
@@ -266,7 +266,7 @@
},
{
"id": "616d7e429594b25adfa3e57f",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b848c7e12534da9c5985",
"name": "UpdateQuery",
diff --git a/app/client/cypress/fixtures/mySQL_GET_Actions.json b/app/client/cypress/fixtures/mySQL_GET_Actions.json
index c4aa5fde3bc9..c9086b9bf2ad 100644
--- a/app/client/cypress/fixtures/mySQL_GET_Actions.json
+++ b/app/client/cypress/fixtures/mySQL_GET_Actions.json
@@ -6,7 +6,7 @@
"data": [
{
"id": "616532b5b58fda6558e56bb9",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b849c7e12534da9c5998",
"name": "DeleteQuery",
@@ -47,7 +47,7 @@
},
{
"id": "616532b5b58fda6558e56bbc",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b849c7e12534da9c5998",
"name": "UpdateQuery",
@@ -96,7 +96,7 @@
},
{
"id": "616532b5b58fda6558e56bbb",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b849c7e12534da9c5998",
"name": "InsertQuery",
@@ -145,7 +145,7 @@
},
{
"id": "616532b5b58fda6558e56bba",
- "organizationId": "6156b8c6c7e12534da9c5a1d",
+ "workspaceId": "6156b8c6c7e12534da9c5a1d",
"pluginType": "DB",
"pluginId": "6156b849c7e12534da9c5998",
"name": "SelectQuery",
diff --git a/app/client/cypress/fixtures/postInviteStub.json b/app/client/cypress/fixtures/postInviteStub.json
index 607d02cb67ce..7fbaa92afd90 100644
--- a/app/client/cypress/fixtures/postInviteStub.json
+++ b/app/client/cypress/fixtures/postInviteStub.json
@@ -11,8 +11,8 @@
"email": "[email protected]",
"source": "FORM",
"isEnabled": true,
- "currentOrganizationId": "5f16f6ea5536dc1f0549e42e",
- "organizationIds": [
+ "currentWorkspaceId": "5f16f6ea5536dc1f0549e42e",
+ "workspaceIds": [
"5f0d4e14d3f75e0ed39f20be",
"5f0d4f38d3f75e0ed39f20c4",
"5f0d557dd3f75e0ed39f20ce",
@@ -132,7 +132,7 @@
"6057644469c2320b5c462471",
"6057653869c2320b5c462478"
],
- "examplesOrganizationId": "5f16f6ea5536dc1f0549e42e",
+ "examplesWorkspaceId": "5f16f6ea5536dc1f0549e42e",
"groupIds": [],
"permissions": [],
"isAnonymous": false,
diff --git a/app/client/cypress/fixtures/saveAction.json b/app/client/cypress/fixtures/saveAction.json
index e628717ae941..3cff419e9307 100644
--- a/app/client/cypress/fixtures/saveAction.json
+++ b/app/client/cypress/fixtures/saveAction.json
@@ -12,7 +12,7 @@
],
"name": "Untitled Datasource 5213",
"pluginId": "5e687c18fb01e64e6a3f873f",
- "organizationId": "5fd639aceb554e031ee61fef",
+ "workspaceId": "5fd639aceb554e031ee61fef",
"datasourceConfiguration": {
"connection": {
"mode": "READ_WRITE",
diff --git a/app/client/cypress/fixtures/user.json b/app/client/cypress/fixtures/user.json
index 83564398db59..887918945556 100644
--- a/app/client/cypress/fixtures/user.json
+++ b/app/client/cypress/fixtures/user.json
@@ -10,6 +10,6 @@
"isEnabled": true,
"isSuperUser": true,
"name": "test",
- "organizationIds": ["61a8a112ccc8b629d92a1aad"],
+ "workspaceIds": ["61a8a112ccc8b629d92a1aad"],
"username": "[email protected]"
}
\ No newline at end of file
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 1396d9686031..469923152ab5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Application/ImportExportForkApplication_spec.js
@@ -2,9 +2,9 @@ const homePage = require("../../../locators/HomePage");
const reconnectDatasourceModal = require("../../../locators/ReconnectLocators");
describe("Import, Export and Fork application and validate data binding", function() {
- let orgid;
+ let workspaceId;
let appid;
- let newOrganizationName;
+ let newWorkspaceName;
let appName;
it("Import application from json and validate data on pageload", function() {
// import application
@@ -12,8 +12,8 @@ describe("Import, Export and Fork application and validate data binding", functi
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("forkedApp.json");
cy.get(homePage.importAppProgressWrapper).should("be.visible");
cy.wait("@importNewApplication").then((interception) => {
@@ -65,7 +65,7 @@ describe("Import, Export and Fork application and validate data binding", functi
.first()
.click({ force: true });
cy.get(homePage.forkAppFromMenu).click({ force: true });
- cy.get(homePage.forkAppOrgButton).click({ force: true });
+ cy.get(homePage.forkAppWorkspaceButton).click({ force: true });
cy.wait(4000);
// validating data binding for the forked application
cy.xpath("//input[@value='Submit']").should("be.visible");
@@ -100,19 +100,20 @@ describe("Import, Export and Fork application and validate data binding", functi
);
cy.writeFile("cypress/fixtures/exportedApp.json", body, "utf-8");
cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((createOrgInterception) => {
- newOrganizationName = createOrgInterception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgImportAppOption).click({ force: true });
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((createWorkspaceInterception) => {
+ newWorkspaceName =
+ createWorkspaceInterception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
// cy.get(".t--import-json-card input").attachFile("exportedApp.json");
cy.xpath(homePage.uploadLogo).attachFile("exportedApp.json");
- // import exported application in new organization
- // cy.get(homePage.orgImportAppButton).click({ force: true });
+ // import exported application in new workspace
+ // cy.get(homePage.workspaceImportAppButton).click({ force: true });
cy.wait("@importNewApplication").then((interception) => {
const { isPartialImport } = interception.response.body.data;
if (isPartialImport) {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/PgAdmin_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Application/PgAdmin_spec.js
index 09db5d98e502..7c4ca572a5a4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Application/PgAdmin_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Application/PgAdmin_spec.js
@@ -6,8 +6,8 @@ const widgetsPage = require("../../../locators/Widgets.json");
const appPage = require("../../../locators/PgAdminlocators.json");
describe("PgAdmin Clone App", function() {
- let orgid;
- let newOrganizationName;
+ let workspaceId;
+ let newWorkspaceName;
let appname;
let datasourceName;
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 ebbd089f93bc..b1631c3fd7bd 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Application/ReconnectDatasource_spec.js
@@ -2,22 +2,22 @@ const homePage = require("../../../locators/HomePage");
const reconnectDatasourceModal = require("../../../locators/ReconnectLocators");
describe("Reconnect Datasource Modal validation while importing application", function() {
- let orgid;
+ let workspaceId;
let appid;
- let newOrganizationName;
+ let newWorkspaceName;
let appName;
it("Import application from json with one postgres and success modal", function() {
cy.NavigateToHome();
// import application
cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((createOrgInterception) => {
- newOrganizationName = createOrgInterception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((createWorkspaceInterception) => {
+ newWorkspaceName = createWorkspaceInterception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("one_postgres.json");
cy.wait("@importNewApplication").then((interception) => {
cy.wait(100);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js
index a89b547327cb..34e51c825bd7 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ExportApplication_spec.js
@@ -3,9 +3,9 @@ import homePage from "../../../../locators/HomePage";
const commonlocators = require("../../../../locators/commonlocators.json");
describe("Export application as a JSON file", function() {
- let orgid;
+ let workspaceId;
let appid;
- let newOrganizationName;
+ let newWorkspaceName;
let appname;
before(() => {
@@ -45,15 +45,15 @@ describe("Export application as a JSON file", function() {
it("User with admin access,should be able to export the app", function() {
cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
cy.generateUUID().then((uid) => {
- orgid = uid;
+ workspaceId = uid;
appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
});
- cy.CreateAppForOrg(orgid, appid);
+ cy.CreateAppForWorkspace(workspaceId, appid);
cy.wait("@getPagesForCreateApp").should(
"have.nested.property",
"response.body.responseMeta.status",
@@ -95,15 +95,15 @@ describe("Export application as a JSON file", function() {
it("User with developer access,should not be able to export the app", function() {
cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
cy.generateUUID().then((uid) => {
- orgid = uid;
+ workspaceId = uid;
appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
});
- cy.CreateAppForOrg(orgid, appid);
+ cy.CreateAppForWorkspace(workspaceId, appid);
cy.wait("@getPagesForCreateApp").should(
"have.nested.property",
"response.body.responseMeta.status",
@@ -145,15 +145,15 @@ describe("Export application as a JSON file", function() {
it("User with viewer access,should not be able to export the app", function() {
cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
cy.generateUUID().then((uid) => {
- orgid = uid;
+ workspaceId = uid;
appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
});
- cy.CreateAppForOrg(orgid, appid);
+ cy.CreateAppForWorkspace(workspaceId, appid);
cy.wait("@getPagesForCreateApp").should(
"have.nested.property",
"response.body.responseMeta.status",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
index a339a2899d92..5c63ece712c9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js
@@ -9,7 +9,7 @@ let forkedApplicationDsl;
let parentApplicationDsl;
let forkableAppUrl;
-describe("Fork application across orgs", function() {
+describe("Fork application across workspaces", function() {
before(() => {
cy.addDsl(dsl);
});
@@ -35,10 +35,10 @@ describe("Fork application across orgs", function() {
.first()
.click({ force: true });
cy.get(homePage.forkAppFromMenu).click({ force: true });
- cy.get(homePage.forkAppOrgButton).click({ force: true });
+ cy.get(homePage.forkAppWorkspaceButton).click({ force: true });
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(4000);
- cy.wait("@postForkAppOrg").then((httpResponse) => {
+ cy.wait("@postForkAppWorkspace").then((httpResponse) => {
expect(httpResponse.status).to.equal(200);
});
// check that forked application has same dsl
@@ -59,8 +59,8 @@ describe("Fork application across orgs", function() {
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("forkNonSignedInUser.json");
cy.wait("@importNewApplication").then((interception) => {
const { isPartialImport } = interception.response.body.data;
@@ -96,7 +96,7 @@ describe("Fork application across orgs", function() {
cy.get(applicationLocators.forkButton)
.first()
.click({ force: true });
- cy.get(homePage.forkAppOrgButton).should("be.visible");
+ cy.get(homePage.forkAppWorkspaceButton).should("be.visible");
});
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Auth/Analytics_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Auth/Analytics_spec.js
index f7331bbaa7f7..54b8fc1e7560 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Auth/Analytics_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Auth/Analytics_spec.js
@@ -24,7 +24,7 @@ describe("Checks for analytics initialization", function() {
});
cy.generateUUID().then((id) => {
appId = id;
- cy.CreateAppInFirstListedOrg(id);
+ cy.CreateAppInFirstListedWorkspace(id);
localStorage.setItem("AppName", appId);
});
cy.wait(3000);
@@ -48,7 +48,7 @@ describe("Checks for analytics initialization", function() {
});
cy.generateUUID().then((id) => {
appId = id;
- cy.CreateAppInFirstListedOrg(id);
+ cy.CreateAppInFirstListedWorkspace(id);
localStorage.setItem("AppName", appId);
});
cy.wait(3000);
@@ -72,7 +72,7 @@ describe("Checks for analytics initialization", function() {
});
cy.generateUUID().then((id) => {
appId = id;
- cy.CreateAppInFirstListedOrg(id);
+ cy.CreateAppInFirstListedWorkspace(id);
localStorage.setItem("AppName", appId);
});
cy.wait(3000);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/AddComments_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/AddComments_spec.js
index 1995c9ba5b21..bb997618e632 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/AddComments_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/AddComments_spec.js
@@ -6,7 +6,7 @@ const dsl = require("../../../../fixtures/basicDsl.json");
const newCommentText1 = "new comment text 1";
let commentThreadId;
let appName;
-let orgName;
+let workspaceName;
describe("Comments", function() {
before(() => {
@@ -15,13 +15,13 @@ describe("Comments", function() {
cy.generateUUID().then((uid) => {
appName = uid;
- orgName = uid;
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgName);
+ workspaceName = uid;
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceName);
});
- cy.CreateAppForOrg(orgName, appName);
+ cy.CreateAppForWorkspace(workspaceName, appName);
cy.addDsl(dsl);
});
});
@@ -43,13 +43,13 @@ describe("Comments", function() {
cy.generateUUID().then((uid) => {
appName = uid;
- orgName = uid;
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgName);
+ workspaceName = uid;
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceName);
});
- cy.CreateAppForOrg(orgName, appName);
+ cy.CreateAppForWorkspace(workspaceName, appName);
cy.addDsl(dsl);
});
cy.skipCommentsOnboarding();
@@ -75,13 +75,13 @@ describe("Comments", function() {
cy.generateUUID().then((uid) => {
appName = uid;
- orgName = uid;
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgName);
+ workspaceName = uid;
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceName);
});
- cy.CreateAppForOrg(orgName, appName);
+ cy.CreateAppForWorkspace(workspaceName, appName);
cy.addDsl(dsl);
});
cy.get(commonLocators.canvas);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
index 3e6167e20b61..cc8080df48f9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js
@@ -25,7 +25,7 @@ describe("Debugger logs", function() {
cy.testJsontext("visible", "Test");
cy.get(commonlocators.homeIcon).click({ force: true });
cy.generateUUID().then((id) => {
- cy.CreateAppInFirstListedOrg(id);
+ cy.CreateAppInFirstListedWorkspace(id);
cy.get(debuggerLocators.errorCount).should("not.exist");
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Migration_Spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Migration_Spec.js
index 5f9019235fcc..d533010f287b 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Migration_Spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Migration_Spec.js
@@ -10,15 +10,15 @@ describe("Migration Validate", function() {
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo)
.attachFile("TableMigrationAppExported.json")
.wait(500);
- // cy.get(homePage.orgImportAppButton)
+ // cy.get(homePage.workspaceImportAppButton)
// .trigger("click")
// .wait(500);
- cy.get(homePage.orgImportAppModal).should("not.exist");
+ cy.get(homePage.workspaceImportAppModal).should("not.exist");
cy.wait("@importNewApplication").then((interception) => {
// let appId = interception.response.body.data.id;
@@ -510,13 +510,13 @@ describe("Migration Validate", function() {
// cy.get(homePage.optionsIcon)
// .first()
// .click();
- // cy.get(homePage.orgImportAppOption).click({ force: true });
- // cy.get(homePage.orgImportAppModal).should("be.visible");
+ // cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ // cy.get(homePage.workspaceImportAppModal).should("be.visible");
// cy.xpath(homePage.uploadLogo).attachFile("TableMigrationAppExported.json").wait(500);
- // cy.get(homePage.orgImportAppButton)
+ // cy.get(homePage.workspaceImportAppButton)
// .trigger("click")
// .wait(500);
- // cy.get(homePage.orgImportAppModal).should("not.exist");
+ // cy.get(homePage.workspaceImportAppModal).should("not.exist");
// cy.wait("@importNewApplication").then((interception) => {
// let appId = interception.response.body.data.id;
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/GitImport_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/GitImport_spec.js
index df9524863390..f629d8320f26 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/GitImport_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/GitImport_spec.js
@@ -14,10 +14,10 @@ let repoName;
describe("Git import flow", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
});
it("Import an app from JSON with Postgres, MySQL, Mongo db", () => {
@@ -25,8 +25,8 @@ describe("Git import flow", function() {
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("gitImport.json");
cy.wait("@importNewApplication").then((interception) => {
cy.log(interception.response.body.data);
@@ -69,16 +69,16 @@ describe("Git import flow", function() {
});
it("Import an app from Git and reconnect Postgres, MySQL and Mongo db ", () => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, "gitImport");
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, "gitImport");
});
cy.get(homePage.homeIcon).click();
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
cy.get(".t--import-json-card")
.next()
.click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/ImportEmptyRepo_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/ImportEmptyRepo_spec.js
index a094a2c9c545..ad412a82dd62 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/ImportEmptyRepo_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitImport/ImportEmptyRepo_spec.js
@@ -12,7 +12,7 @@ describe("Git import empty repository", function() {
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
cy.get(".t--import-json-card")
.next()
.click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Comments_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Comments_spec.js
index 3c56d891a976..c76b5bb7da67 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Comments_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Comments_spec.js
@@ -20,10 +20,10 @@ describe("Git sync:", function() {
cy.Signup(`${uid}@appsmith.com`, uid);
});
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.connectToGitRepo(repoName);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Connection_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Connection_spec.js
index ce4143e38e63..7f9ccb7afb11 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Connection_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Connection_spec.js
@@ -17,10 +17,10 @@ const owner = Cypress.env("TEST_GITHUB_USER_NAME");
describe("Git sync modal: connect tab", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
repoName = uid;
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Deploy_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Deploy_spec.js
index a00ab5674ef2..2c925d991db3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Deploy_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Deploy_spec.js
@@ -6,10 +6,10 @@ let repoName;
describe("Git sync modal: deploy tab", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
repoName = uid;
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/DisconnectGit_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/DisconnectGit_spec.js
index fc7b5f7a74ea..e80991a80019 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/DisconnectGit_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/DisconnectGit_spec.js
@@ -5,10 +5,10 @@ let windowOpenSpy;
describe("Git disconnect modal:", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
repoName = uid;
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitBugs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitBugs_spec.js
index 626627d46099..ff17f67dbcc5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitBugs_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitBugs_spec.js
@@ -16,10 +16,10 @@ let repoName;
describe("Git sync Bug #10773", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
@@ -64,10 +64,10 @@ describe("Git sync Bug #10773", function() {
describe("Git Bug: Fix clone page issue where JSObject are not showing up in destination page when application is connected to git", function() {
it("Connect app to git, clone the Page ,verify JSobject duplication should not happen and validate data binding in deploy mode and edit mode", () => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
cy.addDsl(dsl);
});
// connect app to git
@@ -168,10 +168,10 @@ describe("Git Bug: Fix clone page issue where JSObject are not showing up in des
describe("Git synced app with JSObject", function() {
it("Create an app with JSObject, connect it to git and verify its data in edit and deploy mode", function() {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
cy.addDsl(dsl);
});
ee.expandCollapseEntity("QUERIES/JS", true);
@@ -270,10 +270,10 @@ describe("Git synced app with JSObject", function() {
describe("Git sync Bug #13385", function() {
it("Bug:13385 : Unable to see application in home page after the git connect flow is aborted in middle", () => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, `${newOrganizationName}app`);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, `${newWorkspaceName}app`);
cy.generateUUID().then((uid) => {
const owner = Cypress.env("TEST_GITHUB_USER_NAME");
@@ -306,7 +306,7 @@ describe("Git sync Bug #13385", function() {
cy.NavigateToHome();
cy.reload();
cy.wait(3000);
- cy.SearchApp(`${newOrganizationName}app`);
+ cy.SearchApp(`${newWorkspaceName}app`);
});
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js
index 309f315669c3..35adf29ea9f5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js
@@ -24,10 +24,10 @@ let repoName;
describe("Git sync apps", function() {
before(() => {
// cy.NavigateToHome();
- // cy.createOrg();
- // cy.wait("@createOrg").then((interception) => {
- // const newOrganizationName = interception.response.body.data.name;
- // cy.CreateAppForOrg(newOrganizationName, "gitSyncApp");
+ // cy.createWorkspace();
+ // cy.wait("@createWorkspace").then((interception) => {
+ // const newWorkspaceName = interception.response.body.data.name;
+ // cy.CreateAppForWorkspace(newWorkspaceName, "gitSyncApp");
});
it("1. Generate postgreSQL crud page , connect to git, clone the page, rename page with special character in it", () => {
cy.NavigateToHome();
@@ -503,7 +503,7 @@ describe("Git sync apps", function() {
cy.get(homePage.optionsIcon)
.first()
.click();
- cy.get(homePage.orgImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
cy.get(".t--import-json-card")
.next()
.click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Git_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Git_spec.js
index d8537245b57d..ffb982e3faae 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Git_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Git_spec.js
@@ -28,11 +28,11 @@ let repoName;
describe("Git sync:", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
cy.generateUUID().then((uid) => {
- cy.CreateAppForOrg(newOrganizationName, uid);
+ cy.CreateAppForWorkspace(newWorkspaceName, uid);
applicationName = uid;
cy.get("@currentApplicationId").then(
(currentAppId) => (applicationId = currentAppId),
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Merge_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Merge_spec.js
index d620f61b5762..04b01779fae6 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Merge_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/Merge_spec.js
@@ -7,10 +7,10 @@ let mainBranch = "master";
describe("Git sync modal: merge tab", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/PreconnectionAppNameDeployMenu_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/PreconnectionAppNameDeployMenu_spec.js
index 5609e8f58d28..46e58160c72d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/PreconnectionAppNameDeployMenu_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/PreconnectionAppNameDeployMenu_spec.js
@@ -7,10 +7,10 @@ describe("Pre git connection spec:", function() {
it("deploy menu at the application dropdown menu", () => {
// create new app
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.intercept("POST", "/api/v1/applications/publish/*").as("publishApp");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/SwitchBranches_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/SwitchBranches_spec.js
index 8b4b4a1bc523..972332a9cae0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/SwitchBranches_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/SwitchBranches_spec.js
@@ -13,10 +13,10 @@ let repoName;
describe("Git sync:", function() {
before(() => {
cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- const newOrganizationName = interception.response.body.data.name;
- cy.CreateAppForOrg(newOrganizationName, newOrganizationName);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ const newWorkspaceName = interception.response.body.data.name;
+ cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName);
});
cy.generateUUID().then((uid) => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/GuidedTour_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/GuidedTour_spec.js
index a74ec6a4a066..480c67de7b65 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/GuidedTour_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/GuidedTour_spec.js
@@ -73,7 +73,7 @@ describe("Guided Tour", function() {
cy.get(guidedTourLocators.successButton).click();
// Step 9: Deploy
cy.PublishtheApp();
- cy.wait("@getOrganisation");
+ cy.wait("@getWorkspace");
cy.get(guidedTourLocators.rating).should("be.visible");
cy.get(guidedTourLocators.rating)
.eq(4)
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/DeleteOrganization_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/DeleteOrganization_spec.js
deleted file mode 100644
index c985ff464099..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/DeleteOrganization_spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/// <reference types="Cypress" />
-
-import homePage from "../../../../locators/HomePage";
-
-describe("Delete organization test spec", function() {
- let newOrganizationName;
-
- it("should delete the organization", function() {
- cy.visit("/applications");
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.contains("Delete Organization").click();
- cy.contains("Are you sure").click();
- cy.wait("@deleteOrgApiCall").then((httpResponse) => {
- expect(httpResponse.status).to.equal(200);
- });
- cy.get(newOrganizationName).should("not.exist");
- });
- });
-
- it("should show option to delete organization for an admin user", function() {
- cy.visit("/applications");
- cy.wait(2000);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.contains("Delete Organization");
- cy.inviteUserForOrg(
- newOrganizationName,
- Cypress.env("TESTUSERNAME1"),
- homePage.viewerRole,
- );
- cy.LogOut();
- cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.get(homePage.orgNamePopoverContent)
- .contains("Delete Organization")
- .should("not.exist");
- cy.LogOut();
- });
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js
deleted file mode 100644
index 44ea0fab5a3d..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/LeaveOrganizationTest_spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/// <reference types="Cypress" />
-
-import homePage from "../../../../locators/HomePage";
-
-describe("Leave organization test spec", function() {
- let newOrgId;
- let newOrganizationName;
-
- it("leave organization menu is visible validation", function() {
- cy.visit("/applications");
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- newOrgId = interception.response.body.data.name;
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.contains("Leave Organization");
- });
- });
-
- it("Only admin user can not leave organization validation", function() {
- cy.visit("/applications");
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- newOrgId = interception.response.body.data.name;
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.contains("Leave Organization").click();
- cy.contains("Are you sure").click();
- cy.wait("@leaveOrgApiCall").then((httpResponse) => {
- expect(httpResponse.status).to.equal(400);
- });
- cy.contains(newOrganizationName);
- });
- });
-
- it("Non admin users can only access leave organization popup menu validation", function() {
- cy.visit("/applications");
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- newOrgId = interception.response.body.data.name;
- cy.visit("/applications");
- cy.inviteUserForOrg(
- newOrganizationName,
- Cypress.env("TESTUSERNAME1"),
- homePage.viewerRole,
- );
- cy.LogOut();
-
- cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
- cy.visit("/applications");
- cy.openOrgOptionsPopup(newOrganizationName);
- cy.get(homePage.orgNamePopoverContent)
- .find("a")
- .should("have.length", 1)
- .first()
- .contains("Leave Organization");
- });
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js
deleted file mode 100644
index 228c2a60f030..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgUserIconTest_spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/// <reference types="Cypress" />
-
-import homePage from "../../../../locators/HomePage";
-
-describe("Check if org has user icons on homepage", function() {
- let orgid;
- let newOrganizationName;
-
- it("create org and check if user icons exists in that org on homepage", function() {
- cy.NavigateToHome();
- cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgList.concat(orgid).concat(")"))
- .scrollIntoView()
- .should("be.visible")
- .within(() => {
- cy.get(homePage.shareUserIcons)
- .first()
- .should("be.visible");
- });
- });
- });
- cy.LogOut();
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js
deleted file mode 100644
index a4df8a60b721..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/Orgname_validation_spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/// <reference types="Cypress" />
-
-import homePage from "../../../../locators/HomePage";
-
-describe("Org name validation spec", function() {
- let orgid;
- let newOrganizationName;
- it("create org with leading space validation", function() {
- cy.NavigateToHome();
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.NavigateToHome();
- cy.contains(newOrganizationName)
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
- .find(homePage.optionsIcon)
- .click({ force: true });
- cy.get(homePage.renameOrgInput)
- .should("be.visible")
- .type(" ");
- cy.get(".error-message").should("be.visible");
- });
- });
- it("creates org and checks that orgname is editable", function() {
- cy.createOrg();
- cy.generateUUID().then((uid) => {
- orgid =
- "kadjhfkjadsjkfakjdscajdsnckjadsnckadsjcnanakdjsnckjdscnakjdscnnadjkncakjdsnckjadsnckajsdfkjadshfkjsdhfjkasdhfkjasdhfjkasdhjfasdjkfhjhdsfjhdsfjhadasdfasdfadsasdf" +
- uid;
- // create org with long name
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- });
- });
- });
- it("create org with special characters validation", function() {
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, "Test & Org");
- });
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PreviewMode/ExecuteAction_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PreviewMode/ExecuteAction_spec.js
index d922a826651f..d911eeeb4242 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PreviewMode/ExecuteAction_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/PreviewMode/ExecuteAction_spec.js
@@ -7,8 +7,8 @@ describe("Execute Action Functionality", function() {
.first()
.click();
// Importing the App from the sample application
- cy.get(homePage.orgImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("executeAction.json");
cy.get(homePage.importAppProgressWrapper).should("be.visible");
cy.wait(3000);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
index 0fcc08a697d8..5885887c9329 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Templates/Fork_Template_spec.js
@@ -1,8 +1,8 @@
const commonlocators = require("../../../../locators/commonlocators.json");
const templateLocators = require("../../../../locators/TemplatesLocators.json");
-describe("Fork a template to an organisation", () => {
- it("Fork a template to an organisation", () => {
+describe("Fork a template to an workspace", () => {
+ it("Fork a template to an workspace", () => {
cy.NavigateToHome();
cy.get(templateLocators.templatesTab).click();
cy.get(templateLocators.templateForkButton)
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
new file mode 100644
index 000000000000..aad2a58ba6f1
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/DeleteWorkspace_spec.js
@@ -0,0 +1,48 @@
+/// <reference types="Cypress" />
+
+import homePage from "../../../../locators/HomePage";
+
+describe("Delete workspace test spec", function() {
+ let newWorkspaceName;
+
+ it("should delete the workspace", function() {
+ cy.visit("/applications");
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.contains("Delete Organization").click();
+ cy.contains("Are you sure").click();
+ cy.wait("@deleteWorkspaceApiCall").then((httpResponse) => {
+ expect(httpResponse.status).to.equal(200);
+ });
+ cy.get(newWorkspaceName).should("not.exist");
+ });
+ });
+
+ it("should show option to delete workspace for an admin user", function() {
+ cy.visit("/applications");
+ cy.wait(2000);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.contains("Delete Organization");
+ cy.inviteUserForWorkspace(
+ newWorkspaceName,
+ Cypress.env("TESTUSERNAME1"),
+ homePage.viewerRole,
+ );
+ cy.LogOut();
+ cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.get(homePage.workspaceNamePopoverContent)
+ .contains("Delete Organization")
+ .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
new file mode 100644
index 000000000000..12a6e810cb4c
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/LeaveWorkspaceTest_spec.js
@@ -0,0 +1,62 @@
+/// <reference types="Cypress" />
+
+import homePage from "../../../../locators/HomePage";
+
+describe("Leave workspace test spec", function() {
+ let newWorkspaceId;
+ let newWorkspaceName;
+
+ it("leave workspace menu is visible validation", function() {
+ cy.visit("/applications");
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ newWorkspaceId = interception.response.body.data.name;
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.contains("Leave Organization");
+ });
+ });
+
+ it("Only admin user can not leave workspace validation", function() {
+ cy.visit("/applications");
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ newWorkspaceId = interception.response.body.data.name;
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.contains("Leave Organization").click();
+ cy.contains("Are you sure").click();
+ cy.wait("@leaveWorkspaceApiCall").then((httpResponse) => {
+ expect(httpResponse.status).to.equal(400);
+ });
+ cy.contains(newWorkspaceName);
+ });
+ });
+
+ it("Non admin users can only access leave workspace popup menu validation", function() {
+ cy.visit("/applications");
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ newWorkspaceId = interception.response.body.data.name;
+ cy.visit("/applications");
+ cy.inviteUserForWorkspace(
+ newWorkspaceName,
+ Cypress.env("TESTUSERNAME1"),
+ homePage.viewerRole,
+ );
+ cy.LogOut();
+
+ cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+ cy.visit("/applications");
+ cy.openWorkspaceOptionsPopup(newWorkspaceName);
+ cy.get(homePage.workspaceNamePopoverContent)
+ .find("a")
+ .should("have.length", 1)
+ .first()
+ .contains("Leave Organization");
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js
similarity index 78%
rename from app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js
rename to app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js
index 3319dbd0fee7..5e317c50da8d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgImportApplication_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceImportApplication_spec.js
@@ -1,9 +1,9 @@
import homePage from "../../../../locators/HomePage";
const dsl = require("../../../../fixtures/displayWidgetDsl.json");
-describe("Organization Import Application", function() {
- let orgid;
- let newOrganizationName;
+describe("Workspace Import Application", function() {
+ let workspaceId;
+ let newWorkspaceName;
let appname;
before(() => {
@@ -37,15 +37,16 @@ describe("Organization Import Application", function() {
cy.writeFile("cypress/fixtures/exported-app.json", body, "utf-8");
cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((createOrgInterception) => {
- newOrganizationName = createOrgInterception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgImportAppOption).click({ force: true });
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((createWorkspaceInterception) => {
+ newWorkspaceName =
+ createWorkspaceInterception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceImportAppOption).click({ force: true });
- cy.get(homePage.orgImportAppModal).should("be.visible");
+ cy.get(homePage.workspaceImportAppModal).should("be.visible");
cy.xpath(homePage.uploadLogo).attachFile("exported-app.json");
cy.wait("@importNewApplication").then((interception) => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js
similarity index 53%
rename from app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js
rename to app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js
index 1a94ea4629db..a5a7d61a6068 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OrganisationTests/OrgSettings_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceSettings_validation_spec.js
@@ -2,27 +2,27 @@
import homePage from "../../../../locators/HomePage";
-describe("Org Settings validation spec", function() {
- let orgid;
- let newOrganizationName;
+describe("Workspace Settings validation spec", function() {
+ let workspaceId;
+ let newWorkspaceName;
- it("create org with long name should use ellipsis validation", function() {
+ it("create workspace with long name should use ellipsis validation", function() {
cy.NavigateToHome();
cy.generateUUID().then((uid) => {
- orgid =
+ workspaceId =
"kadjhfkjadsjkfakjdscajdsnckjadsnckadsjcnanakdjsnckjdscnakjdscnnadjkncakjdsnckjadsnckajsdfkjadshfkjsdhfjkasdhfkjasdhfjkasdhjfasdjkfhjhdsfjhdsfjhadasdfasdfadsasdf" +
uid;
- localStorage.setItem("OrgName", orgid);
- // create org with long name
- cy.createOrg();
+ localStorage.setItem("OrgName", workspaceId);
+ // create workspace with long name
+ cy.createWorkspace();
// stub the response and
// find app name
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.navigateToOrgSettings(orgid);
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.navigateToWorkspaceSettings(workspaceId);
// checking parent's(<a></a>) since the child(<span>) inherits css from it
- cy.get(homePage.orgHeaderName)
+ cy.get(homePage.workspaceHeaderName)
.parent()
.then((elem) => {
assert.isBelow(elem[0].offsetWidth, elem[0].scrollWidth);
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
new file mode 100644
index 000000000000..e5e9afa11a83
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/WorkspaceUserIconTest_spec.js
@@ -0,0 +1,30 @@
+/// <reference types="Cypress" />
+
+import homePage from "../../../../locators/HomePage";
+
+describe("Check if workspace has user icons on homepage", function() {
+ let workspaceId;
+ let newWorkspaceName;
+
+ it("create workspace and check if user icons exists in that workspace on homepage", function() {
+ cy.NavigateToHome();
+ cy.generateUUID().then((uid) => {
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceList.concat(workspaceId).concat(")"))
+ .scrollIntoView()
+ .should("be.visible")
+ .within(() => {
+ cy.get(homePage.shareUserIcons)
+ .first()
+ .should("be.visible");
+ });
+ });
+ });
+ cy.LogOut();
+ });
+});
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
new file mode 100644
index 000000000000..a321d81c3d02
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WorkspaceTests/Workspacename_validation_spec.js
@@ -0,0 +1,46 @@
+/// <reference types="Cypress" />
+
+import homePage from "../../../../locators/HomePage";
+
+describe("Workspace name validation spec", function() {
+ let workspaceId;
+ let newWorkspaceName;
+ it("create workspace with leading space validation", function() {
+ cy.NavigateToHome();
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.NavigateToHome();
+ cy.contains(newWorkspaceName)
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
+ .find(homePage.optionsIcon)
+ .click({ force: true });
+ cy.get(homePage.renameWorkspaceInput)
+ .should("be.visible")
+ .type(" ");
+ cy.get(".error-message").should("be.visible");
+ });
+ });
+ it("creates workspace and checks that workspace name is editable", function() {
+ cy.createWorkspace();
+ cy.generateUUID().then((uid) => {
+ workspaceId =
+ "kadjhfkjadsjkfakjdscajdsnckjadsnckadsjcnanakdjsnckjdscnakjdscnnadjkncakjdsnckjadsnckajsdfkjadshfkjsdhfjkasdhfkjasdhfjkasdhjfasdjkfhjhdsfjhdsfjhadasdfasdfadsasdf" +
+ uid;
+ // create workspace with long name
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ });
+ });
+ });
+ it("create workspace with special characters validation", function() {
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, "Test & Workspace");
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js
deleted file mode 100644
index 32a444c4f0d4..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateAppWithSameNameInOrg_spec.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/// <reference types="Cypress" />
-
-describe("Create org and a new app / delete and recreate app", function() {
- let orgid;
- let appid;
- let newOrganizationName;
-
- it("create app within an org and delete and re-create another app with same name", function() {
- cy.NavigateToHome();
- cy.generateUUID().then((uid) => {
- orgid = uid;
- appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- });
- cy.CreateAppForOrg(orgid, appid);
- cy.DeleteAppByApi();
- cy.NavigateToHome();
- cy.CreateAppForOrg(orgid, appid);
- });
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js
deleted file mode 100644
index 318d304bc3e9..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/CreateSameAppInDiffOrg_spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/// <reference types="Cypress" />
-
-describe("Create app same name in different org", function() {
- let orgid;
- let appid;
- let newOrganizationName;
-
- it("create app within a new org", function() {
- cy.NavigateToHome();
- cy.generateUUID().then((uid) => {
- orgid = uid;
- appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- // stub the response and
- // find app name
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.CreateAppForOrg(orgid, appid);
- cy.NavigateToHome();
- cy.LogOut();
- });
- });
- });
-
- it("create app with same name in a different org", function() {
- cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
- cy.visit("/applications");
- cy.wait("@applications").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- const newOrgName = orgid + "1";
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- console.log("createOrganization response: ", interception);
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, newOrgName);
- cy.CreateAppForOrg(newOrgName, appid);
- });
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/MemberRoles_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/MemberRoles_Spec.ts
deleted file mode 100644
index f501c6845877..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/MemberRoles_Spec.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { ObjectsRegistry } from "../../../../support/Objects/Registry"
-
-let orgid: any, appid: any;
-let agHelper = ObjectsRegistry.AggregateHelper,
- homePage = ObjectsRegistry.HomePage;
-
-describe("Create new org and invite user & validate all roles", () => {
- it("1. Create new Organization, Share with a user from UI & verify", () => {
- homePage.NavigateToHome()
- agHelper.GenerateUUID()
- cy.get("@guid").then(uid => {
- orgid = uid;
- appid = uid;
- //localStorage.setItem("OrgName", orgid);
- homePage.CreateNewOrg(orgid)
- homePage.CheckOrgShareUsersCount(orgid, 1);
- homePage.InviteUserToOrg(orgid, Cypress.env("TESTUSERNAME1"), 'App Viewer');
- cy.xpath(homePage._visibleTextSpan('MANAGE USERS')).click({ force: true })
- homePage.NavigateToHome()
- homePage.CheckOrgShareUsersCount(orgid, 2);
- homePage.CreateAppInOrg(orgid, appid);
- })
- homePage.LogOutviaAPI()
- });
-
- it("2. Login as Invited user and validate Viewer role", function () {
- homePage.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), 'App Viewer')
- homePage.FilterApplication(appid, orgid)
- cy.get(homePage._applicationCard).first().trigger("mouseover");
- cy.get(homePage._appHoverIcon('edit')).should("not.exist");
- homePage.LaunchAppFromAppHover()
- homePage.LogOutviaAPI()
- });
-
- it("3. Login as Org owner and Update the Invited user role to Developer", function () {
- homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"))
- homePage.FilterApplication(appid, orgid)
- homePage.UpdateUserRoleInOrg(orgid, Cypress.env("TESTUSERNAME1"), 'App Viewer', 'Developer');
- homePage.LogOutviaAPI()
- });
-
- it("4. Login as Invited user and validate Developer role", function () {
- homePage.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), 'Developer')
- homePage.FilterApplication(appid, orgid)
- cy.get(homePage._applicationCard).first().trigger("mouseover");
- cy.get(homePage._appHoverIcon('edit')).first()
- .click({ force: true });
- cy.xpath(homePage._editPageLanding).should("exist");
- homePage.LogOutviaAPI()
- });
-
- it("5. Login as Org owner and Update the Invited user role to Administrator", function () {
- homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"))
- homePage.FilterApplication(appid, orgid)
- homePage.UpdateUserRoleInOrg(orgid, Cypress.env("TESTUSERNAME1"), 'Developer', 'Administrator');
- homePage.LogOutviaAPI()
- });
-
- it("6. Login as Invited user and validate Administrator role", function () {
- homePage.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"), 'Administrator')
- homePage.FilterApplication(appid, orgid)
- cy.get(homePage._applicationCard).first().trigger("mouseover");
- homePage.InviteUserToOrg(orgid, Cypress.env("TESTUSERNAME2"), 'App Viewer');
- homePage.LogOutviaAPI()
- });
-
- it("7. Login as Org owner and verify all 3 users are present", function () {
- homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"))
- homePage.FilterApplication(appid, orgid)
- homePage.OpenMembersPageForOrg(orgid)
- cy.get(homePage._usersEmailList).then(function ($list) {
- expect($list).to.have.length(3);
- expect($list.eq(0)).to.contain(Cypress.env("USERNAME"));
- expect($list.eq(1)).to.contain(Cypress.env("TESTUSERNAME1"));
- expect($list.eq(2)).to.contain(Cypress.env("TESTUSERNAME2"));
- });
- homePage.NavigateToHome()
- });
-
-});
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js
deleted file mode 100644
index 071a3e28259e..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/UpdateOrgTests_spec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import homePage from "../../../../locators/HomePage";
-
-describe("Update Organization", function() {
- let orgid;
- let newOrganizationName;
-
- it("Open the org general settings and update org name. The update should reflect in the org. It should also reflect in the org names on the left side and the org dropdown. ", function() {
- cy.NavigateToHome();
- cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgSettingOption).click({ force: true });
- });
- });
- cy.generateUUID().then((uid) => {
- orgid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.get(homePage.orgNameInput).click({ force: true });
- cy.get(homePage.orgNameInput).clear();
- cy.get(homePage.orgNameInput).type(orgid);
- // eslint-disable-next-line cypress/no-unnecessary-waiting
- cy.wait(2000);
- cy.get(homePage.orgHeaderName).should("have.text", orgid);
- });
- cy.NavigateToHome();
- cy.get(homePage.leftPanelContainer).within(() => {
- cy.get("span").should((item) => {
- expect(item).to.contain.text(orgid);
- });
- });
- });
-
- it("Open the org general settings and update org email. The update should reflect in the org.", function() {
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
- cy.get(homePage.orgSettingOption).click({ force: true });
- });
- cy.get(homePage.orgEmailInput).clear();
- cy.get(homePage.orgEmailInput).type(Cypress.env("TESTUSERNAME2"));
- cy.wait("@updateOrganization").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(homePage.orgEmailInput).should(
- "have.value",
- Cypress.env("TESTUSERNAME2"),
- );
- });
-
- it("Upload logo / delete logo and validate", function() {
- const fixturePath = "appsmithlogo.png";
- cy.xpath(homePage.uploadLogo).attachFile(fixturePath);
- cy.wait("@updateLogo").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.xpath(homePage.membersTab).click({ force: true });
- cy.xpath(homePage.generalTab).click({ force: true });
- cy.get(homePage.removeLogo)
- .last()
- .should("be.hidden")
- .invoke("show")
- .click({ force: true });
- cy.wait("@deleteLogo").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- });
-
- it("Open the org general settings and update org website. The update should reflect in the org.", function() {
- cy.get(homePage.orgWebsiteInput).clear();
- cy.get(homePage.orgWebsiteInput).type("demowebsite");
- cy.wait("@updateOrganization").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(homePage.orgWebsiteInput).should("have.value", "demowebsite");
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js
new file mode 100644
index 000000000000..e86c81a6057f
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateAppWithSameNameInWorkspace_spec.js
@@ -0,0 +1,25 @@
+/// <reference types="Cypress" />
+
+describe("Create workspace and a new app / delete and recreate app", function() {
+ let workspaceId;
+ let appid;
+ let newWorkspaceName;
+
+ it("create app within an workspace and delete and re-create another app with same name", function() {
+ cy.NavigateToHome();
+ cy.generateUUID().then((uid) => {
+ workspaceId = uid;
+ appid = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ });
+ cy.CreateAppForWorkspace(workspaceId, appid);
+ cy.DeleteAppByApi();
+ cy.NavigateToHome();
+ cy.CreateAppForWorkspace(workspaceId, appid);
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js
new file mode 100644
index 000000000000..919f7d49910e
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/CreateSameAppInDiffWorkspace_spec.js
@@ -0,0 +1,44 @@
+/// <reference types="Cypress" />
+
+describe("Create app same name in different workspace", function() {
+ let workspaceId;
+ let appid;
+ let newWorkspaceName;
+
+ it("create app within a new workspace", function() {
+ cy.NavigateToHome();
+ cy.generateUUID().then((uid) => {
+ workspaceId = uid;
+ appid = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ // stub the response and
+ // find app name
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.CreateAppForWorkspace(workspaceId, appid);
+ cy.NavigateToHome();
+ cy.LogOut();
+ });
+ });
+ });
+
+ it("create app with same name in a different workspace", function() {
+ cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+ cy.visit("/applications");
+ cy.wait("@applications").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ const newWSName = workspaceId + "1";
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ console.log("createWorkspace response: ", interception);
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, newWSName);
+ cy.CreateAppForWorkspace(newWSName, appid);
+ });
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/MemberRoles_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/MemberRoles_Spec.ts
new file mode 100644
index 000000000000..77f68a70cb11
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/MemberRoles_Spec.ts
@@ -0,0 +1,114 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+
+let workspaceId: any, appid: any;
+let agHelper = ObjectsRegistry.AggregateHelper,
+ homePage = ObjectsRegistry.HomePage;
+
+describe("Create new workspace and invite user & validate all roles", () => {
+ it("1. Create new Workspace, Share with a user from UI & verify", () => {
+ homePage.NavigateToHome();
+ agHelper.GenerateUUID();
+ cy.get("@guid").then((uid) => {
+ workspaceId = uid;
+ appid = uid;
+ //localStorage.setItem("OrgName", workspaceId);
+ homePage.CreateNewWorkspace(workspaceId);
+ homePage.CheckWorkspaceShareUsersCount(workspaceId, 1);
+ homePage.InviteUserToWorkspace(
+ workspaceId,
+ Cypress.env("TESTUSERNAME1"),
+ "App Viewer",
+ );
+ cy.xpath(homePage._visibleTextSpan("MANAGE USERS")).click({
+ force: true,
+ });
+ homePage.NavigateToHome();
+ homePage.CheckWorkspaceShareUsersCount(workspaceId, 2);
+ homePage.CreateAppInWorkspace(workspaceId, appid);
+ });
+ homePage.LogOutviaAPI();
+ });
+
+ it("2. Login as Invited user and validate Viewer role", function() {
+ homePage.LogintoApp(
+ Cypress.env("TESTUSERNAME1"),
+ Cypress.env("TESTPASSWORD1"),
+ "App Viewer",
+ );
+ homePage.FilterApplication(appid, workspaceId);
+ cy.get(homePage._applicationCard)
+ .first()
+ .trigger("mouseover");
+ cy.get(homePage._appHoverIcon("edit")).should("not.exist");
+ homePage.LaunchAppFromAppHover();
+ homePage.LogOutviaAPI();
+ });
+
+ it("3. Login as Workspace owner and Update the Invited user role to Developer", function() {
+ homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+ homePage.FilterApplication(appid, workspaceId);
+ homePage.UpdateUserRoleInWorkspace(
+ workspaceId,
+ Cypress.env("TESTUSERNAME1"),
+ "App Viewer",
+ "Developer",
+ );
+ homePage.LogOutviaAPI();
+ });
+
+ it("4. Login as Invited user and validate Developer role", function() {
+ homePage.LogintoApp(
+ Cypress.env("TESTUSERNAME1"),
+ Cypress.env("TESTPASSWORD1"),
+ "Developer",
+ );
+ homePage.FilterApplication(appid, workspaceId);
+ cy.get(homePage._applicationCard)
+ .first()
+ .trigger("mouseover");
+ cy.get(homePage._appHoverIcon("edit"))
+ .first()
+ .click({ force: true });
+ cy.xpath(homePage._editPageLanding).should("exist");
+ homePage.LogOutviaAPI();
+ });
+
+ it("5. Login as Workspace owner and Update the Invited user role to Administrator", function() {
+ homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+ homePage.FilterApplication(appid, workspaceId);
+ homePage.UpdateUserRoleInWorkspace(
+ workspaceId,
+ Cypress.env("TESTUSERNAME1"),
+ "Developer",
+ "Administrator",
+ );
+ homePage.LogOutviaAPI();
+ });
+
+ it("6. Login as Invited user and validate Administrator role", function() {
+ homePage.LogintoApp(
+ Cypress.env("TESTUSERNAME1"),
+ Cypress.env("TESTPASSWORD1"),
+ "Administrator",
+ );
+ homePage.FilterApplication(appid, workspaceId);
+ cy.get(homePage._applicationCard)
+ .first()
+ .trigger("mouseover");
+ homePage.InviteUserToWorkspace(workspaceId, Cypress.env("TESTUSERNAME2"), "App Viewer");
+ homePage.LogOutviaAPI();
+ });
+
+ it("7. Login as Workspace owner and verify all 3 users are present", function() {
+ homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+ homePage.FilterApplication(appid, workspaceId);
+ homePage.OpenMembersPageForWorkspace(workspaceId);
+ cy.get(homePage._usersEmailList).then(function($list) {
+ expect($list).to.have.length(3);
+ expect($list.eq(0)).to.contain(Cypress.env("USERNAME"));
+ expect($list.eq(1)).to.contain(Cypress.env("TESTUSERNAME1"));
+ expect($list.eq(2)).to.contain(Cypress.env("TESTUSERNAME2"));
+ });
+ homePage.NavigateToHome();
+ });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/ShareAppTests_spec.js
similarity index 88%
rename from app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js
rename to app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/ShareAppTests_spec.js
index a4f29834b435..392d2a18f6d1 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OrganisationTests/ShareAppTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/ShareAppTests_spec.js
@@ -3,24 +3,24 @@
import homePage from "../../../../locators/HomePage";
const publish = require("../../../../locators/publishWidgetspage.json");
-describe("Create new org and share with a user", function() {
- let orgid;
+describe("Create new workspace and share with a user", function() {
+ let workspaceId;
let appid;
let currentUrl;
- let newOrganizationName;
+ let newWorkspaceName;
- it("1. Create org and then share with a user from Application share option within application", function() {
+ it("1. Create workspace and then share with a user from Application share option within application", function() {
cy.NavigateToHome();
cy.generateUUID().then((uid) => {
- orgid = uid;
+ workspaceId = uid;
appid = uid;
- localStorage.setItem("OrgName", orgid);
- cy.createOrg();
- cy.wait("@createOrg").then((interception) => {
- newOrganizationName = interception.response.body.data.name;
- cy.renameOrg(newOrganizationName, orgid);
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
});
- cy.CreateAppForOrg(orgid, appid);
+ cy.CreateAppForWorkspace(workspaceId, appid);
cy.wait("@getPagesForCreateApp").should(
"have.nested.property",
"response.body.responseMeta.status",
@@ -38,7 +38,7 @@ describe("Create new org and share with a user", function() {
cy.get(homePage.searchInput).type(appid);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(2000);
- cy.get(homePage.appsContainer).contains(orgid);
+ cy.get(homePage.appsContainer).contains(workspaceId);
cy.xpath(homePage.ShareBtn)
.first()
.should("be.visible");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js
new file mode 100644
index 000000000000..087e669f75f8
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/WorkspaceTests/UpdateWorkspaceTests_spec.js
@@ -0,0 +1,89 @@
+import homePage from "../../../../locators/HomePage";
+
+describe("Update Workspace", function() {
+ let workspaceId;
+ let newWorkspaceName;
+
+ it("Open the workspace general settings and update workspace name. The update should reflect in the workspace. It should also reflect in the workspace names on the left side and the workspace dropdown. ", function() {
+ cy.NavigateToHome();
+ cy.generateUUID().then((uid) => {
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceSettingOption).click({ force: true });
+ });
+ });
+ cy.generateUUID().then((uid) => {
+ workspaceId = uid;
+ localStorage.setItem("OrgName", workspaceId);
+ cy.get(homePage.workspaceNameInput).click({ force: true });
+ cy.get(homePage.workspaceNameInput).clear();
+ cy.get(homePage.workspaceNameInput).type(workspaceId);
+ // eslint-disable-next-line cypress/no-unnecessary-waiting
+ cy.wait(2000);
+ cy.get(homePage.workspaceHeaderName).should("have.text", workspaceId);
+ });
+ cy.NavigateToHome();
+ cy.get(homePage.leftPanelContainer).within(() => {
+ cy.get("span").should((item) => {
+ expect(item).to.contain.text(workspaceId);
+ });
+ });
+ });
+
+ it("Open the workspace general settings and update workspace email. The update should reflect in the workspace.", function() {
+ cy.createWorkspace();
+ cy.wait("@createWorkspace").then((interception) => {
+ newWorkspaceName = interception.response.body.data.name;
+ cy.renameWorkspace(newWorkspaceName, workspaceId);
+ cy.get(homePage.workspaceSettingOption).click({ force: true });
+ });
+ cy.get(homePage.workspaceEmailInput).clear();
+ cy.get(homePage.workspaceEmailInput).type(Cypress.env("TESTUSERNAME2"));
+ cy.wait("@updateWorkspace").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.get(homePage.workspaceEmailInput).should(
+ "have.value",
+ Cypress.env("TESTUSERNAME2"),
+ );
+ });
+
+ it("Upload logo / delete logo and validate", function() {
+ const fixturePath = "appsmithlogo.png";
+ cy.xpath(homePage.uploadLogo).attachFile(fixturePath);
+ cy.wait("@updateLogo").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.xpath(homePage.membersTab).click({ force: true });
+ cy.xpath(homePage.generalTab).click({ force: true });
+ cy.get(homePage.removeLogo)
+ .last()
+ .should("be.hidden")
+ .invoke("show")
+ .click({ force: true });
+ cy.wait("@deleteLogo").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ });
+
+ it("Open the workspace general settings and update workspace website. The update should reflect in the workspace.", function() {
+ cy.get(homePage.workspaceWebsiteInput).clear();
+ cy.get(homePage.workspaceWebsiteInput).type("demowebsite");
+ cy.wait("@updateWorkspace").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.get(homePage.workspaceWebsiteInput).should("have.value", "demowebsite");
+ });
+});
diff --git a/app/client/cypress/locators/HomePage.js b/app/client/cypress/locators/HomePage.js
index 0fbff3a4f36a..4609932dcd6a 100644
--- a/app/client/cypress/locators/HomePage.js
+++ b/app/client/cypress/locators/HomePage.js
@@ -13,7 +13,7 @@ export default {
duplicateApp: "[data-cy=t--duplicate]",
forkAppFromMenu: "[data-cy=t--fork-app]",
exportAppFromMenu: "[data-cy=t--export-app]",
- forkAppOrgButton: ".t--fork-app-to-org-button",
+ forkAppWorkspaceButton: ".t--fork-app-to-workspace-button",
selectAction: "#Base",
deleteApp: "[data-cy=t--delete]",
createNewAppButton: ".t--new-button",
@@ -21,13 +21,13 @@ export default {
homeIcon: ".t--appsmith-logo",
inputAppName: "input[name=applicationName]",
createNew: ".createnew",
- createOrg: "span:contains('New Organization')",
- inputOrgName: "//input[@name='name']",
+ createWorkspace: "span:contains('New Organization')",
+ inputWorkspaceName: "//input[@name='name']",
submitBtn: "//span[text()='Submit']",
- orgMenu: "//span[text()='TestShareOrg']",
+ workspaceMenu: "//span[text()='TestShareOrg']",
members: "//span[contains(text(),'Members')]",
share: "//span[contains(text(),'Share')]",
- OrgSettings: "//span[contains(text(),'Organization Settings')]",
+ WorkspaceSettings: "//span[contains(text(),'Organization Settings')]",
MemberSettings: "//span[contains(text(),'Members')]",
inviteUser: "//span[text()='Invite Users']",
inviteUserMembersPage: "[data-cy=t--invite-users]",
@@ -49,11 +49,11 @@ export default {
appsContainer: ".t--applications-container",
appHome: "//a[@href='/applications']",
emailList: "[data-colindex='0']",
- orgList: ".t--org-section:contains(",
- orgSectionBtn: ".t--org-section .bp3-button",
- shareOrg: ") button:contains('Share')",
- orgSection: "a:contains(",
- createAppFrOrg: ") .t--new-button",
+ workspaceList: ".t--workspace-section:contains(",
+ workspaceSectionBtn: ".t--workspace-section .bp3-button",
+ shareWorkspace: ") button:contains('Share')",
+ workspaceSection: "a:contains(",
+ createAppFrWorkspace: ") .t--new-button",
shareApp: ".t--application-share-btn",
enablePublicAccess: ".t--share-public-toggle .slider",
closeBtn: ".bp3-dialog-close-button",
@@ -68,20 +68,20 @@ export default {
applicationIconSelector: ".t--icon-not-selected",
applicationColorSelector: ".t--color-not-selected",
applicationBackgroundColor: ".t--application-card-background",
- orgSettingOption: "[data-cy=t--org-setting]",
- orgImportAppOption: "[data-cy=t--org-import-app]",
- orgImportAppModal: ".t--import-application-modal",
- orgImportAppButton: "[data-cy=t--org-import-app-button]",
- leaveOrgConfirmModal: ".t--member-delete-confirmation-modal",
- leaveOrgConfirmButton: "[data-cy=t--org-leave-button]",
- orgNameInput: "[data-cy=t--org-name-input]",
- renameOrgInput: "[data-cy=t--org-rename-input]",
- orgEmailInput: "[data-cy=t--org-email-input]",
- orgWebsiteInput: "[data-cy=t--org-website-input]",
- orgHeaderName: ".t--organization-header",
+ workspaceSettingOption: "[data-cy=t--workspace-setting]",
+ workspaceImportAppOption: "[data-cy=t--workspace-import-app]",
+ workspaceImportAppModal: ".t--import-application-modal",
+ workspaceImportAppButton: "[data-cy=t--workspace-import-app-button]",
+ leaveWorkspaceConfirmModal: ".t--member-delete-confirmation-modal",
+ leaveWorkspaceConfirmButton: "[data-cy=t--workspace-leave-button]",
+ workspaceNameInput: "[data-cy=t--workspace-name-input]",
+ renameWorkspaceInput: "[data-cy=t--workspace-rename-input]",
+ workspaceEmailInput: "[data-cy=t--workspace-email-input]",
+ workspaceWebsiteInput: "[data-cy=t--workspace-website-input]",
+ workspaceHeaderName: ".t--workspace-header",
leftPanelContainer: "[data-cy=t--left-panel]",
themeText: "label div",
- shareUserIcons: ".org-share-user-icons",
+ shareUserIcons: ".workspace-share-user-icons",
toastMessage: ".t--toast-action",
uploadLogo: "//div/form/input",
removeLogo: ".remove-button a span",
@@ -89,10 +89,10 @@ export default {
membersTab: "//li//span[text()='Members']",
cancelBtn: "//span[text()='Cancel']",
submit: "button:contains('Submit')",
- orgNamePopover: ".t--org-name",
- orgNamePopoverContent: ".bp3-popover-content",
- orgCompleteSection: ".t--org-section",
- orgNameText: ".t--org-name-text",
+ workspaceNamePopover: ".t--workspace-name",
+ workspaceNamePopoverContent: ".bp3-popover-content",
+ workspaceCompleteSection: ".t--workspace-section",
+ workspaceNameText: ".t--workspace-name-text",
optionsIcon: ".t--options-icon",
reconnectDatasourceModal: ".reconnect-datasource-modal",
importAppProgressWrapper: ".t-import-app-progress-wrapper",
diff --git a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
index 45df24c373e8..094696e7b280 100644
--- a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
+++ b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
@@ -43,6 +43,6 @@ describe("Duplicate an application must duplicate every API ,Query widget and Da
// Ensure App is created with App name prefixed with Copy
// Click on Delete option of Duplicate Application
// Click on "Are You Sure?" option
- // Ensure only Duplicate Application is deleted and not the Orginal application
+ // Ensure only Duplicate Application is deleted and not the Workspace application
});
});
diff --git a/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js b/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
index c69327d2dfd6..648a8e2ac4bd 100644
--- a/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
+++ b/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
@@ -14,20 +14,20 @@ describe("adding role without Email Id", function() {
// Select the "Role"
// Ensure the "Invite" option is "Inactive" and error message is displayed to user
});
- it("Clicking on the organisation list the user must be lead to organisation Station ", function() {
+ it("Clicking on the workspace list the user must be lead to workspace Station ", function() {
// Navigate to Home Page
- // Navigate to Organisation list
- // Click on one of the organisation name
- // Ensure user is directed to the organisation
+ // Navigate to Workspace list
+ // Click on one of the workspace name
+ // Ensure user is directed to the workspace
});
it("Admin can only assign another Admin ", function() {
- // Navigate to Organisation Setting
+ // Navigate to Workspace Setting
// Navigate to Members
// Navigate to roles
// Ensure your also an "Admin"
// Change the role "Admin"
});
- it("Ensure the user can not delete or create an application in the organisation", function() {
+ it("Ensure the user can not delete or create an application in the workspace", function() {
// Navigate to Home page
// Navigate to Members
// Navigate to roles
diff --git a/app/client/cypress/manual_TestSuite/Org_Logo_Del.js b/app/client/cypress/manual_TestSuite/Org_Logo_Del.js
deleted file mode 100644
index da7582029443..000000000000
--- a/app/client/cypress/manual_TestSuite/Org_Logo_Del.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import homePage from "../../../locators/HomePage";
-
-describe("Deletion of organisational Logo ", function() {
- it(" org logo upload ", function() {
- //Click on the dropdown next to organisational Name
- // Navigate between tabs
- // Naviagte to General Tab
- // Add an Organisational Logo
- // Wait until it loads
- // Switch between Tabs
- // Click on the remove Icon
- //Ensure the organisational Logo is deleted
- });
-});
diff --git a/app/client/cypress/manual_TestSuite/Workspace_Logo_Del.js b/app/client/cypress/manual_TestSuite/Workspace_Logo_Del.js
new file mode 100644
index 000000000000..b4d7c63201bb
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Workspace_Logo_Del.js
@@ -0,0 +1,14 @@
+import homePage from "../../../locators/HomePage";
+
+describe("Deletion of workspace Logo ", function() {
+ it(" workspace logo upload ", function() {
+ //Click on the dropdown next to workspace Name
+ // Navigate between tabs
+ // Naviagte to General Tab
+ // Add an workspace Logo
+ // Wait until it loads
+ // Switch between Tabs
+ // Click on the remove Icon
+ //Ensure the workspace Logo is deleted
+ });
+});
diff --git a/app/client/cypress/manual_TestSuite/Org_Logo_Set.js b/app/client/cypress/manual_TestSuite/Workspace_Logo_Set.js
similarity index 59%
rename from app/client/cypress/manual_TestSuite/Org_Logo_Set.js
rename to app/client/cypress/manual_TestSuite/Workspace_Logo_Set.js
index 17d069301176..babcf3fa7488 100644
--- a/app/client/cypress/manual_TestSuite/Org_Logo_Set.js
+++ b/app/client/cypress/manual_TestSuite/Workspace_Logo_Set.js
@@ -1,11 +1,11 @@
import homePage from "../../../locators/HomePage";
-describe("insert organisational Logo ", function() {
- it(" org logo upload ", function() {
- //Click on the dropdown next to organisational Name
+describe("insert workspace Logo ", function() {
+ it(" workspace logo upload ", function() {
+ //Click on the dropdown next to workspace Name
// Navigate between tabs
// Naviagte to General Tab
- // Add an Organisational Logo
+ // Add an workspace Logo
//Wait until it loads
// Switch between Tabs
// Navigate to General Tab and ensure the logo exsits
diff --git a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js b/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js
similarity index 75%
rename from app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
rename to app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js
index 4b65a4c209ea..e80c6dff3d67 100644
--- a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
+++ b/app/client/cypress/manual_TestSuite/Workspace_Name_Spec.js
@@ -1,9 +1,9 @@
import homePage from "../../../locators/HomePage";
-describe("Checking for error message on Organisation Name ", function() {
+describe("Checking for error message on Workspace Name ", function() {
it("Ensure of Inactive Submit button ", function() {
// Navigate to home Page
- // Click on Create Organisation
+ // Click on Create workspace
// Type "Space" as first character
// Ensure "Submit" button does not get Active
// Now click on "X" (Close icon) ensure the pop up closes
@@ -14,35 +14,35 @@ describe("Checking for error message on Organisation Name ", function() {
// Add some widgets
// Navigate back to the application
// Delete the Application
- // Click on "Create New" option under same organisation
+ // Click on "Create New" option under same workspace
// Enter the name "XYZ"
// Ensure the application can be created with the same name
});
it("Adding Special Character ", function() {
// Navigate to home Page
- // Click on Create Organisation
+ // Click on Create workspace
// Add special as first character
// Ensure "Submit" get Active
// Now click outside and ensure the pop up closes
});
- it("Reuse the name of the deleted application name on the other organisation", function() {
+ it("Reuse the name of the deleted application name on the other workspace", function() {
// Navigate to home Page
// Create an Application by name "XYZ"
// Add some widgets
// Navigate back to the application
// Delete the Application
- // Click on "Create New" option under different organisation
+ // Click on "Create New" option under different workspace
// Enter the name "XYZ"
// Ensure the application can be created with the same name
});
- it("User must not be able to add empty organisation 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
// Ensure "Submit" is inactive
});
- it("Cancel creating an Organisation when the Organisation name is empty", function() {
+ 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
@@ -50,7 +50,7 @@ describe("Checking for error message on Organisation Name ", function() {
// Observe the organisation is not created
});
- it("Cancel creating an Organisation when the Organisation name is dually filled", function() {
+ 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
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 6bca4a7bf90a..7aa8ac6a0900 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -1,276 +1,343 @@
-import { ObjectsRegistry } from "../Objects/Registry"
+import { ObjectsRegistry } from "../Objects/Registry";
export class HomePage {
+ private agHelper = ObjectsRegistry.AggregateHelper;
+ private locator = ObjectsRegistry.CommonLocators;
- private agHelper = ObjectsRegistry.AggregateHelper;
- private locator = ObjectsRegistry.CommonLocators;
+ private _username = "input[name='username']";
+ private _password = "input[name='password']";
+ private _submitBtn = "button[type='submit']";
+ private _workspaceCompleteSection = ".t--workspace-section";
+ private _workspaceName = ".t--workspace-name";
+ private _optionsIcon = ".t--options-icon";
+ private _renameWorkspaceInput = "[data-cy=t--workspace-rename-input]";
+ private _workspaceList = (workspaceName: string) =>
+ ".t--workspace-section:contains(" + workspaceName + ")";
+ private _workspaceShareUsersIcon = (workspaceName: string) =>
+ ".t--workspace-section:contains(" +
+ workspaceName +
+ ") .workspace-share-user-icons";
+ private _shareWorkspace = (workspaceName: string) =>
+ ".t--workspace-section:contains(" +
+ workspaceName +
+ ") button:contains('Share')";
+ private _email = "//input[@type='email']";
+ _visibleTextSpan = (spanText: string) => "//span[text()='" + spanText + "']";
+ private _userRole = (role: string) =>
+ "//div[contains(@class, 'label-container')]//span[1][text()='" +
+ role +
+ "']";
+ private _manageUsers = ".manageUsers";
+ private _appHome = "//a[@href='/applications']";
+ _applicationCard = ".t--application-card";
+ private _homeIcon = ".t--appsmith-logo";
+ private _appContainer = ".t--applications-container";
+ private _homePageAppCreateBtn = this._appContainer + " .createnew";
+ private _newWorkspaceCreateNewApp = (newWorkspaceName: string) =>
+ "//span[text()='" +
+ newWorkspaceName +
+ "']/ancestor::div[contains(@class, 't--workspace-name-text')]/parent::div/following-sibling::div//button[contains(@class, 't--new-button')]";
+ private _existingWorkspaceCreateNewApp = (existingWorkspaceName: string) =>
+ "//span[text()='" +
+ existingWorkspaceName +
+ "']/ancestor::div[contains(@class, 't--workspace-name-text')]/following-sibling::div//button[contains(@class, 't--new-button')]";
+ private _applicationName = ".t--application-name";
+ private _editAppName = "bp3-editable-text-editing";
+ private _appMenu = ".t--editor-appname-menu-portal .bp3-menu-item";
+ private _buildFromScratchActionCard = ".t--BuildFromScratch";
+ _buildFromDataTableActionCard = ".t--GenerateCRUDPage";
+ private _selectRole = "//span[text()='Select a role']/ancestor::div";
+ private _searchInput = "input[type='text']";
+ _appHoverIcon = (action: string) => ".t--application-" + action + "-link";
+ private _deleteUser = (email: string) =>
+ "//td[text()='" +
+ email +
+ "']/following-sibling::td//span[contains(@class, 't--deleteUser')]";
+ private _userRoleDropDown = (email: string, role: string) =>
+ "//td[text()='" +
+ email +
+ "']/following-sibling::td//span[text()='" +
+ role +
+ "']";
+ //private _userRoleDropDown = (email: string) => "//td[text()='" + email + "']/following-sibling::td"
+ private _leaveWorkspaceConfirmModal = ".t--member-delete-confirmation-modal";
+ private _workspaceImportAppModal = ".t--import-application-modal";
+ private _leaveWorkspaceConfirmButton =
+ "[data - cy= t--workspace-leave - button]";
+ private _lastWorkspaceInHomePage =
+ "//div[contains(@class, 't--workspace-section')][last()]//span/span";
+ _editPageLanding = "//h2[text()='Drag and drop a widget here']";
+ _usersEmailList = "[data-colindex='1']";
+ private _workspaceImport = "[data-cy=t--workspace-import-app]";
+ private _uploadFile = "//div/form/input";
- private _username = "input[name='username']"
- private _password = "input[name='password']"
- private _submitBtn = "button[type='submit']"
- private _orgCompleteSection = ".t--org-section"
- private _orgName = ".t--org-name"
- private _optionsIcon = ".t--options-icon"
- private _renameOrgInput = "[data-cy=t--org-rename-input]"
- private _orgList = (orgName: string) => ".t--org-section:contains(" + orgName + ")"
- private _orgShareUsersIcon = (orgName: string) => ".t--org-section:contains(" + orgName + ") .org-share-user-icons"
- private _shareOrg = (orgName: string) => ".t--org-section:contains(" + orgName + ") button:contains('Share')"
- private _email = "//input[@type='email']"
- _visibleTextSpan = (spanText: string) => "//span[text()='" + spanText + "']"
- private _userRole = (role: string) => "//div[contains(@class, 'label-container')]//span[1][text()='" + role + "']"
- private _manageUsers = ".manageUsers"
- private _appHome = "//a[@href='/applications']"
- _applicationCard = ".t--application-card"
- private _homeIcon = ".t--appsmith-logo"
- private _appContainer = ".t--applications-container"
- private _homePageAppCreateBtn = this._appContainer + " .createnew"
- private _newOrganizationCreateNewApp = (newOrgName: string) => "//span[text()='" + newOrgName + "']/ancestor::div[contains(@class, 't--org-name-text')]/parent::div/following-sibling::div//button[contains(@class, 't--new-button')]"
- private _existingOrganizationCreateNewApp = (existingOrgName: string) => "//span[text()='" + existingOrgName + "']/ancestor::div[contains(@class, 't--org-name-text')]/following-sibling::div//button[contains(@class, 't--new-button')]"
- private _applicationName = ".t--application-name"
- private _editAppName = "bp3-editable-text-editing"
- private _appMenu = ".t--editor-appname-menu-portal .bp3-menu-item"
- private _buildFromScratchActionCard = ".t--BuildFromScratch"
- _buildFromDataTableActionCard = ".t--GenerateCRUDPage"
- private _selectRole = "//span[text()='Select a role']/ancestor::div"
- private _searchInput = "input[type='text']"
- _appHoverIcon = (action: string) => ".t--application-" + action + "-link"
- private _deleteUser = (email: string) => "//td[text()='" + email + "']/following-sibling::td//span[contains(@class, 't--deleteUser')]"
- private _userRoleDropDown = (email: string, role: string) => "//td[text()='" + email + "']/following-sibling::td//span[text()='" + role + "']"
- //private _userRoleDropDown = (email: string) => "//td[text()='" + email + "']/following-sibling::td"
- private _leaveOrgConfirmModal = ".t--member-delete-confirmation-modal"
- private _orgImportAppModal = ".t--import-application-modal"
- private _leaveOrgConfirmButton = "[data - cy= t--org-leave - button]"
- private _lastOrgInHomePage = "//div[contains(@class, 't--org-section')][last()]//span/span"
- _editPageLanding = "//h2[text()='Drag and drop a widget here']"
- _usersEmailList = "[data-colindex='1']"
- private _orgImport = "[data-cy=t--org-import-app]"
- private _uploadFile = "//div/form/input"
+ public CreateNewWorkspace(workspaceNewName: string) {
+ let oldName: string = "";
+ cy.xpath(this._visibleTextSpan("New Organization"))
+ .should("be.visible")
+ .first()
+ .click({ force: true });
+ cy.wait("@createWorkspace");
+ this.agHelper.Sleep(2000);
+ cy.xpath(this._lastWorkspaceInHomePage)
+ .first()
+ .then(($ele) => {
+ oldName = $ele.text();
+ cy.log("oldName is : " + oldName);
+ this.RenameWorkspace(oldName, workspaceNewName);
+ });
+ }
- public CreateNewOrg(orgNewName: string) {
- let oldName: string = ""
- cy.xpath(this._visibleTextSpan('New Organization'))
- .should("be.visible")
- .first()
- .click({ force: true });
- cy.wait("@createOrg")
- this.agHelper.Sleep(2000)
- cy.xpath(this._lastOrgInHomePage).first().then($ele => {
- oldName = $ele.text();
- cy.log("oldName is : " + oldName);
- this.RenameOrg(oldName, orgNewName);
- })
- }
+ public RenameWorkspace(workspaceName: string, newWorkspaceName: string) {
+ cy.contains(workspaceName)
+ .closest(this._workspaceCompleteSection)
+ .find(this._workspaceName)
+ .find(this._optionsIcon)
+ .click({ force: true });
+ cy.get(this._renameWorkspaceInput)
+ .should("be.visible")
+ .type(newWorkspaceName.concat("{enter}"));
+ this.agHelper.Sleep(2000);
+ cy.wait("@updateWorkspace").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.contains(newWorkspaceName);
+ }
- public RenameOrg(orgName: string, newOrgName: string) {
- cy.contains(orgName)
- .closest(this._orgCompleteSection)
- .find(this._orgName)
- .find(this._optionsIcon)
- .click({ force: true });
- cy.get(this._renameOrgInput)
- .should("be.visible")
- .type(newOrgName.concat("{enter}"));
- this.agHelper.Sleep(2000)
- cy.wait("@updateOrganization").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.contains(newOrgName);
- }
+ //Maps to CheckShareIcon in command.js
+ public CheckWorkspaceShareUsersCount(workspaceName: string, count: number) {
+ cy.get(this._workspaceList(workspaceName))
+ .scrollIntoView()
+ .should("be.visible");
+ cy.get(this._workspaceShareUsersIcon(workspaceName)).should(
+ "have.length",
+ count,
+ );
+ }
- //Maps to CheckShareIcon in command.js
- public CheckOrgShareUsersCount(orgName: string, count: number) {
- cy.get(this._orgList(orgName))
- .scrollIntoView()
- .should("be.visible");
- cy.get(this._orgShareUsersIcon(orgName)).should("have.length", count);
- }
+ //Maps to inviteUserForWorkspace in command.js
+ public InviteUserToWorkspace(
+ workspaceName: string,
+ email: string,
+ role: string,
+ ) {
+ const successMessage = "The user has been invited successfully";
+ this.stubPostHeaderReq();
+ cy.get(this._workspaceList(workspaceName))
+ .scrollIntoView()
+ .should("be.visible");
+ cy.get(this._shareWorkspace(workspaceName))
+ .first()
+ .should("be.visible")
+ .click({ force: true });
+ cy.xpath(this._email)
+ .click({ force: true })
+ .type(email);
+ cy.xpath(this._selectRole)
+ .first()
+ .click({ force: true });
+ this.agHelper.Sleep(500);
+ cy.xpath(this._userRole(role)).click({ force: true });
+ this.agHelper.ClickButton("Invite");
+ cy.wait("@mockPostInvite")
+ .its("request.headers")
+ .should("have.property", "origin", "Cypress");
+ cy.contains(email, { matchCase: false });
+ cy.contains(successMessage);
+ }
- //Maps to inviteUserForOrg in command.js
- public InviteUserToOrg(orgName: string, email: string, role: string) {
- const successMessage = "The user has been invited successfully";
- this.stubPostHeaderReq();
- cy.get(this._orgList(orgName))
- .scrollIntoView()
- .should("be.visible");
- cy.get(this._shareOrg(orgName))
- .first()
- .should("be.visible")
- .click({ force: true });
- cy.xpath(this._email)
- .click({ force: true })
- .type(email);
- cy.xpath(this._selectRole).first().click({ force: true });
- this.agHelper.Sleep(500)
- cy.xpath(this._userRole(role)).click({ force: true });
- this.agHelper.ClickButton('Invite')
- cy.wait("@mockPostInvite")
- .its("request.headers")
- .should("have.property", "origin", "Cypress");
- cy.contains(email, { matchCase: false });
- cy.contains(successMessage);
- }
+ public stubPostHeaderReq() {
+ cy.intercept("POST", "/api/v1/users/invite", (req) => {
+ req.headers["origin"] = "Cypress";
+ }).as("mockPostInvite");
+ }
- public stubPostHeaderReq() {
- cy.intercept("POST", "/api/v1/users/invite", (req) => { req.headers["origin"] = "Cypress"; }).as("mockPostInvite");
- }
+ public NavigateToHome() {
+ cy.get(this._homeIcon).click({ force: true });
+ this.agHelper.Sleep(3000);
+ //cy.wait("@applications"); this randomly fails & introduces flakyness hence commenting!
+ cy.get(this._homePageAppCreateBtn)
+ .should("be.visible")
+ .should("be.enabled");
+ }
- public NavigateToHome() {
- cy.get(this._homeIcon).click({ force: true });
- this.agHelper.Sleep(3000)
- //cy.wait("@applications"); this randomly fails & introduces flakyness hence commenting!
- cy.get(this._homePageAppCreateBtn).should("be.visible").should("be.enabled");
- }
+ public CreateNewApplication() {
+ cy.get(this._homePageAppCreateBtn)
+ .first()
+ .click({ force: true });
+ this.agHelper.ValidateNetworkStatus("@createNewApplication", 201);
+ cy.get(this.locator._loading).should("not.exist");
+ }
- public CreateNewApplication() {
- cy.get(this._homePageAppCreateBtn).first().click({ force: true })
- this.agHelper.ValidateNetworkStatus("@createNewApplication", 201)
- cy.get(this.locator._loading).should("not.exist");
- }
+ //Maps to CreateAppForWorkspace in command.js
+ public CreateAppInWorkspace(workspaceName: string, appname: string) {
+ cy.xpath(this._newWorkspaceCreateNewApp(workspaceName))
+ .scrollIntoView()
+ .should("be.visible")
+ .click({ force: true });
+ cy.wait("@createNewApplication").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 201,
+ );
+ cy.get(this.locator._loading).should("not.exist");
+ this.agHelper.Sleep(2000);
+ this.RenameApplication(appname);
+ cy.get(this._buildFromScratchActionCard).click();
+ cy.wait("@updateApplication").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ }
- //Maps to CreateAppForOrg in command.js
- public CreateAppInOrg(orgName: string, appname: string) {
- cy.xpath(this._newOrganizationCreateNewApp(orgName))
- .scrollIntoView()
- .should("be.visible")
- .click({ force: true });
- cy.wait("@createNewApplication").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 201,
- );
- cy.get(this.locator._loading).should("not.exist");
- this.agHelper.Sleep(2000)
- this.RenameApplication(appname)
- cy.get(this._buildFromScratchActionCard).click();
- cy.wait("@updateApplication").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- }
+ //Maps to AppSetupForRename in command.js
+ public RenameApplication(appName: string) {
+ cy.get(this._applicationName).then(($appName) => {
+ if (!$appName.hasClass(this._editAppName)) {
+ cy.get(this._applicationName).click();
+ cy.get(this._appMenu)
+ .contains("Edit Name", { matchCase: false })
+ .click();
+ }
+ });
+ cy.get(this._applicationName).type(appName + "{enter}");
+ }
- //Maps to AppSetupForRename in command.js
- public RenameApplication(appName: string) {
- cy.get(this._applicationName).then(($appName) => {
- if (!$appName.hasClass(this._editAppName)) {
- cy.get(this._applicationName).click();
- cy.get(this._appMenu)
- .contains("Edit Name", { matchCase: false })
- .click();
- }
- });
- cy.get(this._applicationName).type(appName + "{enter}");
- }
+ //Maps to LogOut in command.js
+ public LogOutviaAPI() {
+ cy.request("POST", "/api/v1/logout");
+ this.agHelper.Sleep(); //for logout to complete!
+ }
- //Maps to LogOut in command.js
- public LogOutviaAPI() {
- cy.request("POST", "/api/v1/logout");
- this.agHelper.Sleep()//for logout to complete!
- }
+ public LogintoApp(
+ uname: string,
+ pswd: string,
+ role: "App Viewer" | "Developer" | "Administrator" = "Administrator",
+ ) {
+ this.agHelper.Sleep(); //waiting for window to load
+ cy.window()
+ .its("store")
+ .invoke("dispatch", { type: "LOGOUT_USER_INIT" });
+ cy.wait("@postLogout");
+ cy.visit("/user/login");
+ cy.get(this._username)
+ .should("be.visible")
+ .type(uname);
+ cy.get(this._password).type(pswd, { log: false });
+ cy.get(this._submitBtn).click();
+ cy.wait("@getMe");
+ this.agHelper.Sleep(3000);
+ if (role != "App Viewer")
+ cy.get(this._homePageAppCreateBtn)
+ .should("be.visible")
+ .should("be.enabled");
+ }
- public LogintoApp(uname: string, pswd: string, role: 'App Viewer' | 'Developer' | 'Administrator' = 'Administrator') {
- this.agHelper.Sleep() //waiting for window to load
- cy.window().its("store").invoke("dispatch", { type: "LOGOUT_USER_INIT" });
- cy.wait("@postLogout");
- cy.visit("/user/login");
- cy.get(this._username).should("be.visible").type(uname)
- cy.get(this._password).type(pswd, {log: false});
- cy.get(this._submitBtn).click();
- cy.wait("@getMe");
- this.agHelper.Sleep(3000)
- if (role != 'App Viewer')
- cy.get(this._homePageAppCreateBtn).should("be.visible").should("be.enabled");
- }
+ public FilterApplication(appName: string, workspaceId: string) {
+ cy.get(this._searchInput).type(appName);
+ this.agHelper.Sleep(2000);
+ cy.get(this._appContainer).contains(workspaceId);
+ cy.xpath(this.locator._spanButton("Share"))
+ .first()
+ .should("be.visible");
+ }
- public FilterApplication(appName: string, orgId: string) {
- cy.get(this._searchInput).type(appName);
- this.agHelper.Sleep(2000)
- cy.get(this._appContainer).contains(orgId);
- cy.xpath(this.locator._spanButton('Share'))
- .first()
- .should("be.visible")
- }
+ //Maps to launchApp in command.js
+ public LaunchAppFromAppHover() {
+ cy.get(this._appHoverIcon("view"))
+ .should("be.visible")
+ .first()
+ .click();
+ cy.get(this.locator._loading).should("not.exist");
+ cy.wait("@getPagesForViewApp").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ }
- //Maps to launchApp in command.js
- public LaunchAppFromAppHover() {
- cy.get(this._appHoverIcon('view'))
- .should("be.visible")
- .first()
- .click();
- cy.get(this.locator._loading).should("not.exist");
- cy.wait("@getPagesForViewApp").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- }
+ //Maps to deleteUserFromWorkspace in command.js
+ public DeleteUserFromWorkspace(workspaceName: string, email: string) {
+ cy.get(this._workspaceList(workspaceName))
+ .scrollIntoView()
+ .should("be.visible");
+ cy.contains(workspaceName)
+ .closest(this._workspaceCompleteSection)
+ .find(this._workspaceName)
+ .find(this._optionsIcon)
+ .click({ force: true });
+ cy.xpath(this._visibleTextSpan("Members")).click({ force: true });
+ cy.wait("@getMembers").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.get(this._deleteUser(email))
+ .last()
+ .click({ force: true });
+ cy.get(this._leaveWorkspaceConfirmModal).should("be.visible");
+ cy.get(this._leaveWorkspaceConfirmButton).click({ force: true });
+ this.NavigateToHome();
+ }
- //Maps to deleteUserFromOrg in command.js
- public DeleteUserFromOrg(orgName: string, email: string) {
- cy.get(this._orgList(orgName))
- .scrollIntoView()
- .should("be.visible");
- cy.contains(orgName)
- .closest(this._orgCompleteSection)
- .find(this._orgName)
- .find(this._optionsIcon)
- .click({ force: true });
- cy.xpath(this._visibleTextSpan('Members')).click({ force: true });
- cy.wait("@getMembers").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(this._deleteUser(email))
- .last()
- .click({ force: true });
- cy.get(this._leaveOrgConfirmModal).should("be.visible");
- cy.get(this._leaveOrgConfirmButton).click({ force: true });
- this.NavigateToHome()
- }
+ public OpenMembersPageForWorkspace(workspaceName: string) {
+ cy.get(this._appContainer)
+ .contains(workspaceName)
+ .scrollIntoView()
+ .should("be.visible");
+ cy.get(this._appContainer)
+ .contains(workspaceName)
+ .closest(this._workspaceCompleteSection)
+ .find(this._workspaceName)
+ .find(this._optionsIcon)
+ .click({ force: true });
+ cy.xpath(this._visibleTextSpan("Members"))
+ .last()
+ .click({ force: true });
+ cy.wait("@getMembers").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ this.agHelper.Sleep(2500); //wait for members page to load!
+ }
- public OpenMembersPageForOrg(orgName: string) {
- cy.get(this._appContainer).contains(orgName)
- .scrollIntoView()
- .should("be.visible");
- cy.get(this._appContainer).contains(orgName)
- .closest(this._orgCompleteSection)
- .find(this._orgName)
- .find(this._optionsIcon)
- .click({ force: true });
- cy.xpath(this._visibleTextSpan('Members')).last().click({ force: true });
- cy.wait("@getMembers").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- this.agHelper.Sleep(2500)//wait for members page to load!
- }
+ public UpdateUserRoleInWorkspace(
+ workspaceName: string,
+ email: string,
+ currentRole: string,
+ newRole: string,
+ ) {
+ this.OpenMembersPageForWorkspace(workspaceName);
+ cy.xpath(this._userRoleDropDown(email, currentRole))
+ .first()
+ .trigger("click");
+ //cy.xpath(this._userRoleDropDown(email)).first().click({force: true});
+ cy.xpath(this._visibleTextSpan(newRole))
+ .last()
+ .click({ force: true });
+ this.agHelper.Sleep();
+ this.NavigateToHome();
+ }
- public UpdateUserRoleInOrg(orgName: string, email: string, currentRole: string, newRole: string) {
- this.OpenMembersPageForOrg(orgName)
- cy.xpath(this._userRoleDropDown(email, currentRole)).first().trigger('click');
- //cy.xpath(this._userRoleDropDown(email)).first().click({force: true});
- cy.xpath(this._visibleTextSpan(newRole)).last().click({ force: true });
- this.agHelper.Sleep()
- this.NavigateToHome()
- }
+ public ImportApp(fixtureJson: string) {
+ cy.get(this._homeIcon).click();
+ cy.get(this._optionsIcon)
+ .first()
+ .click();
+ cy.get(this._workspaceImport).click({ force: true });
+ cy.get(this._workspaceImportAppModal).should("be.visible");
+ cy.xpath(this._uploadFile)
+ .attachFile(fixtureJson)
+ .wait(500);
+ cy.get(this._workspaceImportAppModal).should("not.exist");
+ }
- public ImportApp(fixtureJson: string) {
- cy.get(this._homeIcon).click();
- cy.get(this._optionsIcon).first().click();
- cy.get(this._orgImport).click({ force: true });
- cy.get(this._orgImportAppModal).should("be.visible");
- cy.xpath(this._uploadFile).attachFile(fixtureJson).wait(500);
- cy.get(this._orgImportAppModal).should("not.exist");
- }
-
- public AssertImport() {
- this.agHelper.ValidateToastMessage("Application imported successfully")
- this.agHelper.Sleep(5000)//for imported app to settle!
- cy.get(this.locator._loading).should("not.exist");
- }
+ public AssertImport() {
+ this.agHelper.ValidateToastMessage("Application imported successfully");
+ this.agHelper.Sleep(5000); //for imported app to settle!
+ cy.get(this.locator._loading).should("not.exist");
+ }
}
-
-
diff --git a/app/client/cypress/support/OrgCommands.js b/app/client/cypress/support/WorkspaceCommands.js
similarity index 65%
rename from app/client/cypress/support/OrgCommands.js
rename to app/client/cypress/support/WorkspaceCommands.js
index 7052303bf01e..3f6807c2c93e 100644
--- a/app/client/cypress/support/OrgCommands.js
+++ b/app/client/cypress/support/WorkspaceCommands.js
@@ -1,6 +1,6 @@
/* eslint-disable cypress/no-unnecessary-waiting */
/* eslint-disable cypress/no-assigning-return-values */
-/* Contains all methods related to Organisation features*/
+/* Contains all methods related to Workspace features*/
require("cy-verify-downloads").addCustomCommand();
require("cypress-file-upload");
@@ -14,39 +14,39 @@ export const initLocalstorage = () => {
});
};
-Cypress.Commands.add("createOrg", () => {
- cy.get(homePage.createOrg)
+Cypress.Commands.add("createWorkspace", () => {
+ cy.get(homePage.createWorkspace)
.should("be.visible")
.first()
.click({ force: true });
});
-Cypress.Commands.add("renameOrg", (orgName, newOrgName) => {
- cy.contains(orgName)
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
+Cypress.Commands.add("renameWorkspace", (workspaceName, newWorkspaceName) => {
+ cy.contains(workspaceName)
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
.find(homePage.optionsIcon)
.click({ force: true });
- cy.get(homePage.renameOrgInput)
+ cy.get(homePage.renameWorkspaceInput)
.should("be.visible")
- .type(newOrgName.concat("{enter}"));
+ .type(newWorkspaceName.concat("{enter}"));
cy.wait(3000);
//cy.get(commonlocators.homeIcon).click({ force: true });
- cy.wait("@updateOrganization").should(
+ cy.wait("@updateWorkspace").should(
"have.nested.property",
"response.body.responseMeta.status",
200,
);
- cy.contains(newOrgName);
+ cy.contains(newWorkspaceName);
});
-Cypress.Commands.add("navigateToOrgSettings", (orgName) => {
- cy.get(homePage.orgList.concat(orgName).concat(")"))
+Cypress.Commands.add("navigateToWorkspaceSettings", (workspaceName) => {
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.scrollIntoView()
.should("be.visible");
- cy.get(homePage.orgList.concat(orgName).concat(")"))
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
.find(homePage.optionsIcon)
.click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true });
@@ -58,23 +58,27 @@ Cypress.Commands.add("navigateToOrgSettings", (orgName) => {
cy.get(homePage.inviteUserMembersPage).should("be.visible");
});
-Cypress.Commands.add("openOrgOptionsPopup", (orgName) => {
- cy.get(homePage.orgList.concat(orgName).concat(")"))
+Cypress.Commands.add("openWorkspaceOptionsPopup", (workspaceName) => {
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.scrollIntoView()
.should("be.visible");
- cy.get(homePage.orgList.concat(orgName).concat(")"))
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
.find(homePage.optionsIcon)
.click({ force: true });
});
-Cypress.Commands.add("inviteUserForOrg", (orgName, email, role) => {
+Cypress.Commands.add("inviteUserForWorkspace", (workspaceName, email, role) => {
cy.stubPostHeaderReq();
- cy.get(homePage.orgList.concat(orgName).concat(")"))
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.scrollIntoView()
.should("be.visible");
- cy.get(homePage.orgList.concat(orgName).concat(homePage.shareOrg))
+ cy.get(
+ homePage.workspaceList
+ .concat(workspaceName)
+ .concat(homePage.shareWorkspace),
+ )
.first()
.should("be.visible")
.click({ force: true });
@@ -91,12 +95,14 @@ Cypress.Commands.add("inviteUserForOrg", (orgName, email, role) => {
cy.contains(email, { matchCase: false });
});
-Cypress.Commands.add("CheckShareIcon", (orgName, count) => {
- cy.get(homePage.orgList.concat(orgName).concat(")"))
+Cypress.Commands.add("CheckShareIcon", (workspaceName, count) => {
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.scrollIntoView()
.should("be.visible");
cy.get(
- homePage.orgList.concat(orgName).concat(") .org-share-user-icons"),
+ homePage.workspaceList
+ .concat(workspaceName)
+ .concat(") .workspace-share-user-icons"),
).should("have.length", count);
});
@@ -145,13 +151,13 @@ Cypress.Commands.add("enablePublicAccess", () => {
.click({ force: true });
});
-Cypress.Commands.add("deleteUserFromOrg", (orgName) => {
- cy.get(homePage.orgList.concat(orgName).concat(")"))
+Cypress.Commands.add("deleteUserFromWorkspace", (workspaceName) => {
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.scrollIntoView()
.should("be.visible");
- cy.get(homePage.orgList.concat(orgName).concat(")"))
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
.find(homePage.optionsIcon)
.click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true });
@@ -163,8 +169,8 @@ Cypress.Commands.add("deleteUserFromOrg", (orgName) => {
cy.get(homePage.DeleteBtn)
.last()
.click({ force: true });
- cy.get(homePage.leaveOrgConfirmModal).should("be.visible");
- cy.get(homePage.leaveOrgConfirmButton).click({ force: true });
+ cy.get(homePage.leaveWorkspaceConfirmModal).should("be.visible");
+ cy.get(homePage.leaveWorkspaceConfirmButton).click({ force: true });
cy.xpath(homePage.appHome)
.first()
.should("be.visible")
@@ -176,44 +182,47 @@ Cypress.Commands.add("deleteUserFromOrg", (orgName) => {
);
});
-Cypress.Commands.add("updateUserRoleForOrg", (orgName, email, role) => {
- cy.stubPostHeaderReq();
- cy.get(homePage.orgList.concat(orgName).concat(")"))
- .scrollIntoView()
- .should("be.visible");
- cy.get(homePage.orgList.concat(orgName).concat(")"))
- .closest(homePage.orgCompleteSection)
- .find(homePage.orgNamePopover)
- .find(homePage.optionsIcon)
- .click({ force: true });
- cy.xpath(homePage.MemberSettings).click({ force: true });
- cy.wait("@getMembers").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(homePage.inviteUserMembersPage).click({ force: true });
- cy.xpath(homePage.email)
- .click({ force: true })
- .type(email);
- cy.xpath(homePage.selectRole).click({ force: true });
- cy.xpath(role).click({ force: true });
- cy.xpath(homePage.inviteBtn).click({ force: true });
- cy.wait("@mockPostInvite")
- .its("request.headers")
- .should("have.property", "origin", "Cypress");
- cy.contains(email, { matchCase: false });
- cy.get(".bp3-icon-small-cross").click({ force: true });
- cy.xpath(homePage.appHome)
- .first()
- .should("be.visible")
- .click();
- cy.wait("@applications").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
-});
+Cypress.Commands.add(
+ "updateUserRoleForWorkspace",
+ (workspaceName, email, role) => {
+ cy.stubPostHeaderReq();
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
+ .scrollIntoView()
+ .should("be.visible");
+ cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
+ .closest(homePage.workspaceCompleteSection)
+ .find(homePage.workspaceNamePopover)
+ .find(homePage.optionsIcon)
+ .click({ force: true });
+ cy.xpath(homePage.MemberSettings).click({ force: true });
+ cy.wait("@getMembers").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ cy.get(homePage.inviteUserMembersPage).click({ force: true });
+ cy.xpath(homePage.email)
+ .click({ force: true })
+ .type(email);
+ cy.xpath(homePage.selectRole).click({ force: true });
+ cy.xpath(role).click({ force: true });
+ cy.xpath(homePage.inviteBtn).click({ force: true });
+ cy.wait("@mockPostInvite")
+ .its("request.headers")
+ .should("have.property", "origin", "Cypress");
+ cy.contains(email, { matchCase: false });
+ cy.get(".bp3-icon-small-cross").click({ force: true });
+ cy.xpath(homePage.appHome)
+ .first()
+ .should("be.visible")
+ .click();
+ cy.wait("@applications").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ },
+);
Cypress.Commands.add("launchApp", () => {
cy.get(homePage.appView)
@@ -239,8 +248,12 @@ Cypress.Commands.add("AppSetupForRename", () => {
});
});
-Cypress.Commands.add("CreateAppForOrg", (orgName, appname) => {
- cy.get(homePage.orgList.concat(orgName).concat(homePage.createAppFrOrg))
+Cypress.Commands.add("CreateAppForWorkspace", (workspaceName, appname) => {
+ cy.get(
+ homePage.workspaceList
+ .concat(workspaceName)
+ .concat(homePage.createAppFrWorkspace),
+ )
.scrollIntoView()
.should("be.visible")
.click({ force: true });
@@ -267,7 +280,7 @@ Cypress.Commands.add("CreateAppForOrg", (orgName, appname) => {
);
});
-Cypress.Commands.add("CreateAppInFirstListedOrg", (appname) => {
+Cypress.Commands.add("CreateAppInFirstListedWorkspace", (appname) => {
let applicationId;
cy.get(homePage.createNew)
.first()
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 7e0d1ef11caa..c4b69d31d9f9 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -161,7 +161,7 @@ Cypress.Commands.add("DeleteApp", (appName) => {
"response.body.responseMeta.status",
200,
);
- cy.wait("@organizations").should(
+ cy.wait("@workspaces").should(
"have.nested.property",
"response.body.responseMeta.status",
200,
@@ -874,7 +874,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.route("GET", "/api/v1/plugins").as("getPlugins");
cy.route("POST", "/api/v1/logout").as("postLogout");
- cy.route("GET", "/api/v1/datasources?organizationId=*").as("getDataSources");
+ cy.route("GET", "/api/v1/datasources?workspaceId=*").as("getDataSources");
cy.route("GET", "/api/v1/pages?*mode=EDIT").as("getPagesForCreateApp");
cy.route("GET", "/api/v1/pages?*mode=PUBLISHED").as("getPagesForViewApp");
@@ -901,8 +901,8 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.route("PUT", "/api/v1/pages/crud-page/*").as("replaceLayoutWithCRUDPage");
cy.route("POST", "/api/v1/pages/crud-page").as("generateCRUDPage");
- cy.route("GET", "/api/v1/organizations").as("organizations");
- cy.route("GET", "/api/v1/organizations/*").as("getOrganisation");
+ cy.route("GET", "/api/v1/workspaces").as("workspaces");
+ cy.route("GET", "/api/v1/workspaces/*").as("getWorkspace");
cy.route("POST", "/api/v1/applications/publish/*").as("publishApp");
cy.route("PUT", "/api/v1/layouts/*/pages/*").as("updateLayout");
@@ -923,31 +923,31 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.route("GET", "/api/v1/plugins/*/form").as("getPluginForm");
cy.route("DELETE", "/api/v1/applications/*").as("deleteApplication");
- cy.route("POST", "/api/v1/applications?orgId=*").as("createNewApplication");
+ cy.route("POST", "/api/v1/applications?workspaceId=*").as(
+ "createNewApplication",
+ );
cy.route("PUT", "/api/v1/applications/*").as("updateApplication");
cy.route("PUT", "/api/v1/actions/*").as("saveAction");
cy.route("PUT", "/api/v1/actions/move").as("moveAction");
- cy.route("POST", "/api/v1/organizations").as("createOrg");
+ cy.route("POST", "/api/v1/workspaces").as("createWorkspace");
cy.route("POST", "api/v1/applications/import/*").as("importNewApplication");
cy.route("GET", "api/v1/applications/export/*").as("exportApplication");
- cy.route("GET", "/api/v1/organizations/roles?organizationId=*").as(
- "getRoles",
- );
+ cy.route("GET", "/api/v1/workspaces/roles?workspaceId=*").as("getRoles");
cy.route("GET", "/api/v1/users/me").as("getMe");
cy.route("POST", "/api/v1/pages").as("createPage");
cy.route("POST", "/api/v1/pages/clone/*").as("clonePage");
cy.route("POST", "/api/v1/applications/clone/*").as("cloneApp");
cy.route("PUT", "/api/v1/applications/*/changeAccess").as("changeAccess");
- cy.route("PUT", "/api/v1/organizations/*").as("updateOrganization");
+ cy.route("PUT", "/api/v1/workspaces/*").as("updateWorkspace");
cy.route("GET", "/api/v1/pages/view/application/*").as("viewApp");
cy.route("GET", "/api/v1/pages/*/view?*").as("viewPage");
- cy.route("POST", "/api/v1/organizations/*/logo").as("updateLogo");
- cy.route("DELETE", "/api/v1/organizations/*/logo").as("deleteLogo");
- cy.route("POST", "/api/v1/applications/*/fork/*").as("postForkAppOrg");
- cy.route("PUT", "/api/v1/users/leaveOrganization/*").as("leaveOrgApiCall");
- cy.route("DELETE", "api/v1/organizations/*").as("deleteOrgApiCall");
+ cy.route("POST", "/api/v1/workspaces/*/logo").as("updateLogo");
+ cy.route("DELETE", "/api/v1/workspaces/*/logo").as("deleteLogo");
+ cy.route("POST", "/api/v1/applications/*/fork/*").as("postForkAppWorkspace");
+ cy.route("PUT", "/api/v1/users/leaveWorkspace/*").as("leaveWorkspaceApiCall");
+ cy.route("DELETE", "api/v1/workspaces/*").as("deleteWorkspaceApiCall");
cy.route("POST", "/api/v1/comments/threads").as("createNewThread");
cy.route("POST", "/api/v1/comments?threadId=*").as("createNewComment");
@@ -968,7 +968,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.intercept("DELETE", "/api/v1/git/branch/*").as("deleteBranch");
cy.intercept("GET", "/api/v1/git/status/*").as("gitStatus");
cy.intercept("PUT", "/api/v1/layouts/refactor").as("updateWidgetName");
- cy.intercept("GET", "/api/v1/organizations/*/members").as("getMembers");
+ cy.intercept("GET", "/api/v1/workspaces/*/members").as("getMembers");
});
Cypress.Commands.add("startErrorRoutes", () => {
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index 3d04e8847506..2249ff8ca81f 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -25,7 +25,7 @@ import { initLocalstorage } from "./commands";
import "./dataSourceCommands";
import "./gitSync";
import { initLocalstorageRegistry } from "./Objects/Registry";
-import "./OrgCommands";
+import "./WorkspaceCommands";
import "./queryCommands";
import "./widgetCommands";
import "./themeCommands";
@@ -86,7 +86,7 @@ before(function() {
cy.get(".t--applications-container .createnew").should("be.visible");
cy.get(".t--applications-container .createnew").should("be.enabled");
cy.generateUUID().then((id) => {
- cy.CreateAppInFirstListedOrg(id);
+ cy.CreateAppInFirstListedWorkspace(id);
localStorage.setItem("AppName", id);
});
diff --git a/app/client/cypress/support/themeCommands.js b/app/client/cypress/support/themeCommands.js
index 649a83bd48b6..10cbd58a3096 100644
--- a/app/client/cypress/support/themeCommands.js
+++ b/app/client/cypress/support/themeCommands.js
@@ -1,6 +1,6 @@
/* eslint-disable cypress/no-unnecessary-waiting */
/* eslint-disable cypress/no-assigning-return-values */
-/* Contains all methods related to Organisation features*/
+/* Contains all methods related to Workspace features*/
require("cy-verify-downloads").addCustomCommand();
require("cypress-file-upload");
diff --git a/app/client/perf/src/perf.js b/app/client/perf/src/perf.js
index e41b8c0f82cb..2ec1aa8b623b 100644
--- a/app/client/perf/src/perf.js
+++ b/app/client/perf/src/perf.js
@@ -12,9 +12,9 @@ const {
} = require("./utils/utils");
const selectors = {
appMoreIcon: "span.t--options-icon",
- orgImportAppOption: '[data-cy*="t--org-import-app"]',
+ workspaceImportAppOption: '[data-cy*="t--workspace-import-app"]',
fileInput: "#fileInput",
- importButton: '[data-cy*="t--org-import-app-button"]',
+ importButton: '[data-cy*="t--workspace-import-app-button"]',
createNewApp: ".createnew",
};
module.exports = class Perf {
@@ -151,8 +151,8 @@ module.exports = class Perf {
importApplication = async (jsonPath) => {
await this.page.waitForSelector(selectors.appMoreIcon);
await this.page.click(selectors.appMoreIcon);
- await this.page.waitForSelector(selectors.orgImportAppOption);
- await this.page.click(selectors.orgImportAppOption);
+ await this.page.waitForSelector(selectors.workspaceImportAppOption);
+ await this.page.click(selectors.workspaceImportAppOption);
const elementHandle = await this.page.$(selectors.fileInput);
await elementHandle.uploadFile(jsonPath);
diff --git a/app/client/src/AppRouter.tsx b/app/client/src/AppRouter.tsx
index b62e5c5f4383..31b39153ed9b 100644
--- a/app/client/src/AppRouter.tsx
+++ b/app/client/src/AppRouter.tsx
@@ -9,7 +9,7 @@ import {
BASE_SIGNUP_URL,
BASE_URL,
BUILDER_PATH,
- ORG_URL,
+ WORKSPACE_URL,
SIGN_UP_URL,
SIGNUP_SUCCESS_URL,
USER_AUTH_URL,
@@ -27,7 +27,7 @@ import {
VIEWER_PATCH_PATH,
BUILDER_PATCH_PATH,
} from "constants/routes";
-import OrganizationLoader from "pages/organization/loader";
+import WorkspaceLoader from "pages/workspace/loader";
import ApplicationListLoader from "pages/Applications/loader";
import EditorLoader from "pages/Editor/loader";
import AppViewerLoader from "pages/AppViewer/loader";
@@ -119,7 +119,7 @@ function AppRouter(props: {
<SentryRoute component={LandingScreen} exact path={BASE_URL} />
<Redirect exact from={BASE_LOGIN_URL} to={AUTH_LOGIN_URL} />
<Redirect exact from={BASE_SIGNUP_URL} to={SIGN_UP_URL} />
- <SentryRoute component={OrganizationLoader} path={ORG_URL} />
+ <SentryRoute component={WorkspaceLoader} path={WORKSPACE_URL} />
<SentryRoute component={Users} exact path={USERS_URL} />
<SentryRoute component={UserAuth} path={USER_AUTH_URL} />
<SentryRoute component={WDSPage} path="/wds" />
diff --git a/app/client/src/actions/applicationActions.ts b/app/client/src/actions/applicationActions.ts
index 96e3c647f86d..1cf720d8b5d4 100644
--- a/app/client/src/actions/applicationActions.ts
+++ b/app/client/src/actions/applicationActions.ts
@@ -133,15 +133,15 @@ export const setIsReconnectingDatasourcesModalOpen = (payload: {
payload,
});
-export const setOrgIdForImport = (orgId?: string) => ({
- type: ReduxActionTypes.SET_ORG_ID_FOR_IMPORT,
- payload: orgId,
+export const setWorkspaceIdForImport = (workspaceId?: string) => ({
+ type: ReduxActionTypes.SET_WORKSPACE_ID_FOR_IMPORT,
+ payload: workspaceId,
});
export const showReconnectDatasourceModal = (payload: {
application: ApplicationResponsePayload;
unConfiguredDatasourceList: Array<Datasource>;
- orgId: string;
+ workspaceId: string;
}) => ({
type: ReduxActionTypes.SHOW_RECONNECT_DATASOURCE_MODAL,
payload,
diff --git a/app/client/src/actions/datasourceActions.ts b/app/client/src/actions/datasourceActions.ts
index 12def3295778..1b4210527fe2 100644
--- a/app/client/src/actions/datasourceActions.ts
+++ b/app/client/src/actions/datasourceActions.ts
@@ -145,7 +145,7 @@ export const setDatsourceEditorMode = (payload: {
};
};
-export const fetchDatasources = (payload?: { orgId?: string }) => {
+export const fetchDatasources = (payload?: { workspaceId?: string }) => {
return {
type: ReduxActionTypes.FETCH_DATASOURCES_INIT,
payload,
@@ -161,7 +161,7 @@ export const fetchMockDatasources = () => {
export interface addMockRequest
extends ReduxAction<{
name: string;
- organizationId: string;
+ workspaceId: string;
pluginId: string;
packageName: string;
isGeneratePageMode?: string;
@@ -169,16 +169,16 @@ export interface addMockRequest
extraParams?: any;
}
-export const addMockDatasourceToOrg = (
+export const addMockDatasourceToWorkspace = (
name: string,
- organizationId: string,
+ workspaceId: string,
pluginId: string,
packageName: string,
isGeneratePageMode?: string,
): addMockRequest => {
return {
type: ReduxActionTypes.ADD_MOCK_DATASOURCES_INIT,
- payload: { name, packageName, pluginId, organizationId },
+ payload: { name, packageName, pluginId, workspaceId },
extraParams: { isGeneratePageMode },
};
};
diff --git a/app/client/src/actions/orgActions.ts b/app/client/src/actions/orgActions.ts
deleted file mode 100644
index a838183814b9..000000000000
--- a/app/client/src/actions/orgActions.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import { SaveOrgLogo, SaveOrgRequest } from "api/OrgApi";
-
-export const fetchOrg = (orgId: string, skipValidation?: boolean) => {
- return {
- type: ReduxActionTypes.FETCH_CURRENT_ORG,
- payload: {
- orgId,
- skipValidation,
- },
- };
-};
-
-export const deleteOrg = (orgId: string) => {
- return {
- type: ReduxActionTypes.DELETE_ORG_INIT,
- payload: orgId,
- };
-};
-
-export const changeOrgUserRole = (
- orgId: string,
- role: string,
- username: string,
-) => {
- return {
- type: ReduxActionTypes.CHANGE_ORG_USER_ROLE_INIT,
- payload: {
- orgId,
- role,
- username,
- },
- };
-};
-
-export const deleteOrgUser = (orgId: string, username: string) => {
- return {
- type: ReduxActionTypes.DELETE_ORG_USER_INIT,
- payload: {
- orgId,
- username,
- },
- };
-};
-export const fetchUsersForOrg = (orgId: string) => {
- return {
- type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
- payload: {
- orgId,
- },
- };
-};
-export const fetchRolesForOrg = (orgId: string) => {
- return {
- type: ReduxActionTypes.FETCH_ALL_ROLES_INIT,
- payload: {
- orgId,
- },
- };
-};
-
-export const saveOrg = (orgSettings: SaveOrgRequest) => {
- return {
- type: ReduxActionTypes.SAVE_ORG_INIT,
- payload: orgSettings,
- };
-};
-
-export const uploadOrgLogo = (orgLogo: SaveOrgLogo) => {
- return {
- type: ReduxActionTypes.UPLOAD_ORG_LOGO,
- payload: orgLogo,
- };
-};
-
-export const deleteOrgLogo = (id: string) => {
- return {
- type: ReduxActionTypes.REMOVE_ORG_LOGO,
- payload: {
- id: id,
- },
- };
-};
diff --git a/app/client/src/actions/pluginActions.ts b/app/client/src/actions/pluginActions.ts
index a1c65aa24960..853871973de1 100644
--- a/app/client/src/actions/pluginActions.ts
+++ b/app/client/src/actions/pluginActions.ts
@@ -8,8 +8,8 @@ import { PluginFormPayload } from "api/PluginApi";
import { DependencyMap } from "utils/DynamicBindingUtils";
export const fetchPlugins = (payload?: {
- orgId?: string;
-}): ReduxAction<{ orgId?: string } | undefined> => ({
+ workspaceId?: string;
+}): ReduxAction<{ workspaceId?: string } | undefined> => ({
type: ReduxActionTypes.FETCH_PLUGINS_REQUEST,
payload,
});
diff --git a/app/client/src/actions/templateActions.ts b/app/client/src/actions/templateActions.ts
index f8ef1834b65c..6fd731ea8c6d 100644
--- a/app/client/src/actions/templateActions.ts
+++ b/app/client/src/actions/templateActions.ts
@@ -17,14 +17,14 @@ export const setTemplateSearchQuery = (query: string) => ({
payload: query,
});
-export const importTemplateToOrganisation = (
+export const importTemplateToWorkspace = (
templateId: string,
- organizationId: string,
+ workspaceId: string,
) => ({
- type: ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_INIT,
+ type: ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_INIT,
payload: {
templateId,
- organizationId,
+ workspaceId,
},
});
diff --git a/app/client/src/actions/userActions.ts b/app/client/src/actions/userActions.ts
index 86709a2ca27f..36b716a634cf 100644
--- a/app/client/src/actions/userActions.ts
+++ b/app/client/src/actions/userActions.ts
@@ -96,11 +96,11 @@ export const updatePhotoId = (payload: { photoId: string }) => ({
payload,
});
-export const leaveOrganization = (orgId: string) => {
+export const leaveWorkspace = (workspaceId: string) => {
return {
- type: ReduxActionTypes.LEAVE_ORG_INIT,
+ type: ReduxActionTypes.LEAVE_WORKSPACE_INIT,
payload: {
- orgId,
+ workspaceId,
},
};
};
diff --git a/app/client/src/actions/workspaceActions.ts b/app/client/src/actions/workspaceActions.ts
new file mode 100644
index 000000000000..5081d80cabb3
--- /dev/null
+++ b/app/client/src/actions/workspaceActions.ts
@@ -0,0 +1,86 @@
+import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { SaveWorkspaceLogo, SaveWorkspaceRequest } from "api/WorkspaceApi";
+
+export const fetchWorkspace = (
+ workspaceId: string,
+ skipValidation?: boolean,
+) => {
+ return {
+ type: ReduxActionTypes.FETCH_CURRENT_WORKSPACE,
+ payload: {
+ workspaceId,
+ skipValidation,
+ },
+ };
+};
+
+export const deleteWorkspace = (workspaceId: string) => {
+ return {
+ type: ReduxActionTypes.DELETE_WORKSPACE_INIT,
+ payload: workspaceId,
+ };
+};
+
+export const changeWorkspaceUserRole = (
+ workspaceId: string,
+ role: string,
+ username: string,
+) => {
+ return {
+ type: ReduxActionTypes.CHANGE_WORKSPACE_USER_ROLE_INIT,
+ payload: {
+ workspaceId,
+ role,
+ username,
+ },
+ };
+};
+
+export const deleteWorkspaceUser = (workspaceId: string, username: string) => {
+ return {
+ type: ReduxActionTypes.DELETE_WORKSPACE_USER_INIT,
+ payload: {
+ workspaceId,
+ username,
+ },
+ };
+};
+export const fetchUsersForWorkspace = (workspaceId: string) => {
+ return {
+ type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
+ payload: {
+ workspaceId,
+ },
+ };
+};
+export const fetchRolesForWorkspace = (workspaceId: string) => {
+ return {
+ type: ReduxActionTypes.FETCH_ALL_ROLES_INIT,
+ payload: {
+ workspaceId,
+ },
+ };
+};
+
+export const saveWorkspace = (workspaceSettings: SaveWorkspaceRequest) => {
+ return {
+ type: ReduxActionTypes.SAVE_WORKSPACE_INIT,
+ payload: workspaceSettings,
+ };
+};
+
+export const uploadWorkspaceLogo = (workspaceLogo: SaveWorkspaceLogo) => {
+ return {
+ type: ReduxActionTypes.UPLOAD_WORKSPACE_LOGO,
+ payload: workspaceLogo,
+ };
+};
+
+export const deleteWorkspaceLogo = (id: string) => {
+ return {
+ type: ReduxActionTypes.REMOVE_WORKSPACE_LOGO,
+ payload: {
+ id: id,
+ },
+ };
+};
diff --git a/app/client/src/api/ApiResponses.tsx b/app/client/src/api/ApiResponses.tsx
index 2184ee33b39f..dc3b1bbb0b9d 100644
--- a/app/client/src/api/ApiResponses.tsx
+++ b/app/client/src/api/ApiResponses.tsx
@@ -26,7 +26,7 @@ export type GenericApiResponse<T> = {
// MISSING_PLUGIN_ID, 4002, "Missing plugin id. Please input correct plugin id"
// MISSING_DATASOURCES_ID, 4003, "Missing datasource id. Please input correct datasource id"
// MISSING_PAGE_ID, 4004, "Missing page id. Pleaes input correct page id"
-// PAGE_DOES_NOT_EXIST_IN_ORG, 4006, "Page {0} does not belong to the current user {1} organization."
+// PAGE_DOES_NOT_EXIST_IN_WORKSPACE, 4006, "Page {0} does not belong to the current user {1} workspace."
// UNAUTHORIZED_DOMAIN, 4001, "Invalid email domain provided. Please sign in with a valid work email ID"
// INTERNAL_SERVER_ERROR, 5000, "Internal server error while processing request"
// REPOSITORY_SAVE_FAILED, 5001, "Repository save failed."
diff --git a/app/client/src/api/ApplicationApi.tsx b/app/client/src/api/ApplicationApi.tsx
index 4d99bd1f6152..ea7d4e7fbed3 100644
--- a/app/client/src/api/ApplicationApi.tsx
+++ b/app/client/src/api/ApplicationApi.tsx
@@ -45,7 +45,7 @@ export type GitApplicationMetadata =
export interface ApplicationResponsePayload {
id: string;
name: string;
- organizationId: string;
+ workspaceId: string;
evaluationVersion?: EvaluationVersion;
pages: ApplicationPagePayload[];
appIsExample: boolean;
@@ -65,7 +65,7 @@ export interface FetchApplicationPayload {
export interface FetchApplicationResponseData {
application: Omit<ApplicationResponsePayload, "pages">;
pages: ApplicationPagePayload[];
- organizationId: string;
+ workspaceId: string;
}
export type FetchApplicationResponse = ApiResponse<
@@ -79,7 +79,7 @@ export type FetchApplicationsResponse = ApiResponse<
export type CreateApplicationResponse = ApiResponse<ApplicationResponsePayload>;
export interface CreateApplicationRequest {
name: string;
- orgId: string;
+ workspaceId: string;
color?: AppColorCode;
icon?: AppIconName;
}
@@ -98,7 +98,7 @@ export interface DuplicateApplicationRequest {
}
export interface ForkApplicationRequest {
applicationId: string;
- organizationId: string;
+ workspaceId: string;
}
export type GetAllApplicationResponse = ApiResponse<ApplicationPagePayload[]>;
@@ -122,7 +122,7 @@ export interface ApplicationObject {
name: string;
icon?: string;
color?: string;
- organizationId: string;
+ workspaceId: string;
pages: ApplicationPagePayload[];
userPermissions: string[];
}
@@ -133,17 +133,17 @@ export interface UserRoles {
username: string;
}
-export interface OrganizationApplicationObject {
+export interface WorkspaceApplicationObject {
applications: Array<ApplicationObject>;
- organization: {
+ workspace: {
id: string;
name: string;
};
userRoles: Array<UserRoles>;
}
-export interface FetchUsersApplicationsOrgsResponse extends ApiResponse {
+export interface FetchUsersApplicationsWorkspacesResponse extends ApiResponse {
data: {
- organizationApplications: Array<OrganizationApplicationObject>;
+ workspaceApplications: Array<WorkspaceApplicationObject>;
user: string;
newReleasesCount: string;
releaseItems: Array<Record<string, any>>;
@@ -155,7 +155,7 @@ export interface FetchUnconfiguredDatasourceListResponse extends ApiResponse {
}
export interface ImportApplicationRequest {
- orgId: string;
+ workspaceId: string;
applicationFile?: File;
progress?: (progressEvent: ProgressEvent) => void;
onSuccessCallback?: () => void;
@@ -165,7 +165,8 @@ class ApplicationApi extends Api {
static baseURL = "v1/applications";
static publishURLPath = (applicationId: string) =>
`/publish/${applicationId}`;
- static createApplicationPath = (orgId: string) => `?orgId=${orgId}`;
+ static createApplicationPath = (workspaceId: string) =>
+ `?workspaceId=${workspaceId}`;
static changeAppViewAccessPath = (applicationId: string) =>
`/${applicationId}/changeAccess`;
static setDefaultPagePath = (request: SetDefaultPageRequest) =>
@@ -196,10 +197,10 @@ class ApplicationApi extends Api {
static fetchUnconfiguredDatasourceList(payload: {
applicationId: string;
- orgId: string;
+ workspaceId: string;
}): AxiosPromise<FetchUnconfiguredDatasourceListResponse> {
return Api.get(
- `${ApplicationApi.baseURL}/import/${payload.orgId}/datasources?defaultApplicationId=${payload.applicationId}`,
+ `${ApplicationApi.baseURL}/import/${payload.workspaceId}/datasources?defaultApplicationId=${payload.applicationId}`,
);
}
@@ -214,7 +215,7 @@ class ApplicationApi extends Api {
): AxiosPromise<PublishApplicationResponse> {
return Api.post(
ApplicationApi.baseURL +
- ApplicationApi.createApplicationPath(request.orgId),
+ ApplicationApi.createApplicationPath(request.workspaceId),
{ name: request.name, color: request.color, icon: request.icon },
);
}
@@ -262,11 +263,11 @@ class ApplicationApi extends Api {
"/" +
request.applicationId +
"/fork/" +
- request.organizationId,
+ request.workspaceId,
);
}
- static importApplicationToOrg(
+ static importApplicationToWorkspace(
request: ImportApplicationRequest,
): AxiosPromise<ApiResponse> {
const formData = new FormData();
@@ -274,7 +275,7 @@ class ApplicationApi extends Api {
formData.append("file", request.applicationFile);
}
return Api.post(
- ApplicationApi.baseURL + "/import/" + request.orgId,
+ ApplicationApi.baseURL + "/import/" + request.workspaceId,
formData,
null,
{
diff --git a/app/client/src/api/DatasourcesApi.ts b/app/client/src/api/DatasourcesApi.ts
index b36aaa2cc554..8bd6bfeff4bb 100644
--- a/app/client/src/api/DatasourcesApi.ts
+++ b/app/client/src/api/DatasourcesApi.ts
@@ -21,7 +21,7 @@ export interface EmbeddedRestDatasourceRequest {
invalids: Array<string>;
isValid: boolean;
name: string;
- organizationId: string;
+ workspaceId: string;
pluginId: string;
}
@@ -36,9 +36,9 @@ class DatasourcesApi extends API {
static url = "v1/datasources";
static fetchDatasources(
- orgId: string,
+ workspaceId: string,
): AxiosPromise<GenericApiResponse<Datasource[]>> {
- return API.get(DatasourcesApi.url + `?organizationId=${orgId}`);
+ return API.get(DatasourcesApi.url + `?workspaceId=${workspaceId}`);
}
static createDatasource(datasourceConfig: Partial<Datasource>): Promise<any> {
@@ -79,13 +79,13 @@ class DatasourcesApi extends API {
static addMockDbToDatasources(
name: string,
- organizationId: string,
+ workspaceId: string,
pluginId: string,
packageName: string,
): Promise<any> {
return API.post(DatasourcesApi.url + `/mocks`, {
name,
- organizationId,
+ workspaceId,
pluginId,
packageName,
});
diff --git a/app/client/src/api/GitSyncAPI.tsx b/app/client/src/api/GitSyncAPI.tsx
index 4c4a23c67956..802152bb55c5 100644
--- a/app/client/src/api/GitSyncAPI.tsx
+++ b/app/client/src/api/GitSyncAPI.tsx
@@ -132,8 +132,8 @@ class GitSyncAPI extends Api {
return Api.post(`${GitSyncAPI.baseURL}/disconnect/${applicationId}`);
}
- static importApp(payload: ConnectToGitPayload, orgId: string) {
- return Api.post(`${GitSyncAPI.baseURL}/import/${orgId}`, payload);
+ static importApp(payload: ConnectToGitPayload, workspaceId: string) {
+ return Api.post(`${GitSyncAPI.baseURL}/import/${workspaceId}`, payload);
}
static getSSHKeyPair(applicationId: string): AxiosPromise<ApiResponse> {
diff --git a/app/client/src/api/ImportApi.ts b/app/client/src/api/ImportApi.ts
index eac6e0ad7619..c724ce66537d 100644
--- a/app/client/src/api/ImportApi.ts
+++ b/app/client/src/api/ImportApi.ts
@@ -7,19 +7,19 @@ export interface CurlImportRequest {
pageId: string;
name: string;
curl: string;
- organizationId: string;
+ workspaceId: string;
}
class CurlImportApi extends Api {
static curlImportURL = `v1/import`;
static curlImport(request: CurlImportRequest): AxiosPromise<ApiResponse> {
- const { curl, name, organizationId, pageId } = request;
+ const { curl, name, pageId, workspaceId } = request;
return Api.post(CurlImportApi.curlImportURL, curl, {
type: "CURL",
pageId,
name,
- organizationId,
+ workspaceId,
});
}
}
diff --git a/app/client/src/api/JSActionAPI.tsx b/app/client/src/api/JSActionAPI.tsx
index bf2ee37e1360..971711791880 100644
--- a/app/client/src/api/JSActionAPI.tsx
+++ b/app/client/src/api/JSActionAPI.tsx
@@ -23,7 +23,7 @@ export interface UpdateJSObjectNameRequest {
export interface CreateJSCollectionRequest {
name: string;
pageId: string;
- organizationId: string;
+ workspaceId: string;
pluginId: string;
body: string;
variables: Array<Variable>;
diff --git a/app/client/src/api/OrgApi.ts b/app/client/src/api/OrgApi.ts
deleted file mode 100644
index 141839eeefeb..000000000000
--- a/app/client/src/api/OrgApi.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { AxiosPromise } from "axios";
-import Api from "api/Api";
-import { ApiResponse } from "./ApiResponses";
-import { OrgRole, Org } from "constants/orgConstants";
-
-export interface FetchOrgRolesResponse extends ApiResponse {
- data: OrgRole[];
-}
-
-export interface FetchOrgsResponse extends ApiResponse {
- data: Org[];
-}
-export interface FetchOrgResponse extends ApiResponse {
- data: Org;
-}
-
-export interface FetchAllUsersResponse extends ApiResponse {
- data: OrgRole[];
-}
-
-export interface FetchAllRolesResponse extends ApiResponse {
- data: Org[];
-}
-
-export interface FetchOrgRequest {
- orgId: string;
- skipValidation?: boolean;
-}
-
-export interface FetchAllUsersRequest {
- orgId: string;
-}
-
-export interface ChangeUserRoleRequest {
- orgId: string;
- role: string;
- username: string;
-}
-
-export interface DeleteOrgUserRequest {
- orgId: string;
- username: string;
-}
-
-export interface FetchAllRolesRequest {
- orgId: string;
-}
-
-export interface SaveOrgRequest {
- id: string;
- name?: string;
- website?: string;
- email?: string;
-}
-
-export interface SaveOrgLogo {
- id: string;
- logo: File;
- progress: (progressEvent: ProgressEvent) => void;
-}
-
-export interface CreateOrgRequest {
- name: string;
-}
-
-class OrgApi extends Api {
- static rolesURL = "v1/groups";
- static orgsURL = "v1/organizations";
- static fetchRoles(): AxiosPromise<FetchOrgRolesResponse> {
- return Api.get(OrgApi.rolesURL);
- }
- static fetchOrgs(): AxiosPromise<FetchOrgsResponse> {
- return Api.get(OrgApi.orgsURL);
- }
- static fetchOrg(request: FetchOrgRequest): AxiosPromise<FetchOrgResponse> {
- return Api.get(OrgApi.orgsURL + "/" + request.orgId);
- }
- static saveOrg(request: SaveOrgRequest): AxiosPromise<ApiResponse> {
- return Api.put(OrgApi.orgsURL + "/" + request.id, request);
- }
- static createOrg(request: CreateOrgRequest): AxiosPromise<ApiResponse> {
- return Api.post(OrgApi.orgsURL, request);
- }
- static fetchAllUsers(
- request: FetchAllUsersRequest,
- ): AxiosPromise<FetchAllUsersResponse> {
- return Api.get(OrgApi.orgsURL + "/" + request.orgId + "/members");
- }
- static fetchAllRoles(
- request: FetchAllRolesRequest,
- ): AxiosPromise<FetchAllRolesResponse> {
- return Api.get(OrgApi.orgsURL + `/roles?organizationId=${request.orgId}`);
- }
- static changeOrgUserRole(
- request: ChangeUserRoleRequest,
- ): AxiosPromise<ApiResponse> {
- return Api.put(OrgApi.orgsURL + "/" + request.orgId + "/role", {
- username: request.username,
- roleName: request.role,
- });
- }
- static deleteOrgUser(
- request: DeleteOrgUserRequest,
- ): AxiosPromise<ApiResponse> {
- return Api.put(OrgApi.orgsURL + "/" + request.orgId + "/role", {
- username: request.username,
- roleName: null,
- });
- }
- static saveOrgLogo(request: SaveOrgLogo): AxiosPromise<ApiResponse> {
- const formData = new FormData();
- if (request.logo) {
- formData.append("file", request.logo);
- }
-
- return Api.post(
- OrgApi.orgsURL + "/" + request.id + "/logo",
- formData,
- null,
- {
- headers: {
- "Content-Type": "multipart/form-data",
- },
- onUploadProgress: request.progress,
- },
- );
- }
- static deleteOrgLogo(request: { id: string }): AxiosPromise<ApiResponse> {
- return Api.delete(OrgApi.orgsURL + "/" + request.id + "/logo");
- }
- static deleteOrg(orgId: string): AxiosPromise<ApiResponse> {
- return Api.delete(`${OrgApi.orgsURL}/${orgId}`);
- }
-}
-export default OrgApi;
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index 0a3040d0ce87..a6bee60eae78 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -85,7 +85,7 @@ export type FetchPageListResponseData = {
layouts: Array<PageLayout>;
slug?: string;
}>;
- organizationId: string;
+ workspaceId: string;
};
export interface DeletePageRequest {
diff --git a/app/client/src/api/PluginApi.ts b/app/client/src/api/PluginApi.ts
index 95484bcf261a..8068c645c482 100644
--- a/app/client/src/api/PluginApi.ts
+++ b/app/client/src/api/PluginApi.ts
@@ -55,9 +55,9 @@ export interface DefaultPlugin {
class PluginsApi extends Api {
static url = "v1/plugins";
static fetchPlugins(
- orgId: string,
+ workspaceId: string,
): AxiosPromise<GenericApiResponse<Plugin[]>> {
- return Api.get(PluginsApi.url, { organizationId: orgId });
+ return Api.get(PluginsApi.url, { workspaceId: workspaceId });
}
static fetchFormConfig(
diff --git a/app/client/src/api/ProvidersApi.ts b/app/client/src/api/ProvidersApi.ts
index 993de9007035..2942617598fc 100644
--- a/app/client/src/api/ProvidersApi.ts
+++ b/app/client/src/api/ProvidersApi.ts
@@ -51,7 +51,7 @@ export interface AddApiToPageRequest {
name: string;
pageId: string;
marketplaceElement: any;
- organizationId?: string;
+ workspaceId?: string;
// Added for analytics
source?: string;
}
diff --git a/app/client/src/api/TemplatesApi.ts b/app/client/src/api/TemplatesApi.ts
index 683350b5933e..117545d8b7a4 100644
--- a/app/client/src/api/TemplatesApi.ts
+++ b/app/client/src/api/TemplatesApi.ts
@@ -52,11 +52,11 @@ class TemplatesAPI extends Api {
}
static importTemplate(
templateId: string,
- organizationId: string,
+ workspaceId: string,
): AxiosPromise<ImportTemplateResponse> {
return Api.post(
TemplatesAPI.baseUrl +
- `/app-templates/${templateId}/import/${organizationId}`,
+ `/app-templates/${templateId}/import/${workspaceId}`,
);
}
}
diff --git a/app/client/src/api/WorkspaceApi.ts b/app/client/src/api/WorkspaceApi.ts
new file mode 100644
index 000000000000..ebb1d4efc7c0
--- /dev/null
+++ b/app/client/src/api/WorkspaceApi.ts
@@ -0,0 +1,155 @@
+import { AxiosPromise } from "axios";
+import Api from "api/Api";
+import { ApiResponse } from "./ApiResponses";
+import { WorkspaceRole, Workspace } from "constants/workspaceConstants";
+
+export interface FetchWorkspaceRolesResponse extends ApiResponse {
+ data: WorkspaceRole[];
+}
+
+export interface FetchWorkspacesResponse extends ApiResponse {
+ data: Workspace[];
+}
+export interface FetchWorkspaceResponse extends ApiResponse {
+ data: Workspace;
+}
+
+export interface FetchAllUsersResponse extends ApiResponse {
+ data: WorkspaceRole[];
+}
+
+export interface FetchAllRolesResponse extends ApiResponse {
+ data: Workspace[];
+}
+
+export interface FetchWorkspaceRequest {
+ workspaceId: string;
+ skipValidation?: boolean;
+}
+
+export interface FetchAllUsersRequest {
+ workspaceId: string;
+}
+
+export interface ChangeUserRoleRequest {
+ workspaceId: string;
+ role: string;
+ username: string;
+}
+
+export interface DeleteWorkspaceUserRequest {
+ workspaceId: string;
+ username: string;
+}
+
+export interface FetchAllRolesRequest {
+ workspaceId: string;
+}
+
+export interface SaveWorkspaceRequest {
+ id: string;
+ name?: string;
+ website?: string;
+ email?: string;
+}
+
+export interface SaveWorkspaceLogo {
+ id: string;
+ logo: File;
+ progress: (progressEvent: ProgressEvent) => void;
+}
+
+export interface CreateWorkspaceRequest {
+ name: string;
+}
+
+class WorkspaceApi extends Api {
+ static rolesURL = "v1/groups";
+ static workspacesURL = "v1/workspaces";
+ static fetchRoles(): AxiosPromise<FetchWorkspaceRolesResponse> {
+ return Api.get(WorkspaceApi.rolesURL);
+ }
+ static fetchWorkspaces(): AxiosPromise<FetchWorkspacesResponse> {
+ return Api.get(WorkspaceApi.workspacesURL);
+ }
+ static fetchWorkspace(
+ request: FetchWorkspaceRequest,
+ ): AxiosPromise<FetchWorkspaceResponse> {
+ return Api.get(WorkspaceApi.workspacesURL + "/" + request.workspaceId);
+ }
+ static saveWorkspace(
+ request: SaveWorkspaceRequest,
+ ): AxiosPromise<ApiResponse> {
+ return Api.put(WorkspaceApi.workspacesURL + "/" + request.id, request);
+ }
+ static createWorkspace(
+ request: CreateWorkspaceRequest,
+ ): AxiosPromise<ApiResponse> {
+ return Api.post(WorkspaceApi.workspacesURL, request);
+ }
+ static fetchAllUsers(
+ request: FetchAllUsersRequest,
+ ): AxiosPromise<FetchAllUsersResponse> {
+ return Api.get(
+ WorkspaceApi.workspacesURL + "/" + request.workspaceId + "/members",
+ );
+ }
+ static fetchAllRoles(
+ request: FetchAllRolesRequest,
+ ): AxiosPromise<FetchAllRolesResponse> {
+ return Api.get(
+ WorkspaceApi.workspacesURL + `/roles?workspaceId=${request.workspaceId}`,
+ );
+ }
+ static changeWorkspaceUserRole(
+ request: ChangeUserRoleRequest,
+ ): AxiosPromise<ApiResponse> {
+ return Api.put(
+ WorkspaceApi.workspacesURL + "/" + request.workspaceId + "/role",
+ {
+ username: request.username,
+ roleName: request.role,
+ },
+ );
+ }
+ static deleteWorkspaceUser(
+ request: DeleteWorkspaceUserRequest,
+ ): AxiosPromise<ApiResponse> {
+ return Api.put(
+ WorkspaceApi.workspacesURL + "/" + request.workspaceId + "/role",
+ {
+ username: request.username,
+ roleName: null,
+ },
+ );
+ }
+ static saveWorkspaceLogo(
+ request: SaveWorkspaceLogo,
+ ): AxiosPromise<ApiResponse> {
+ const formData = new FormData();
+ if (request.logo) {
+ formData.append("file", request.logo);
+ }
+
+ return Api.post(
+ WorkspaceApi.workspacesURL + "/" + request.id + "/logo",
+ formData,
+ null,
+ {
+ headers: {
+ "Content-Type": "multipart/form-data",
+ },
+ onUploadProgress: request.progress,
+ },
+ );
+ }
+ static deleteWorkspaceLogo(request: {
+ id: string;
+ }): AxiosPromise<ApiResponse> {
+ return Api.delete(WorkspaceApi.workspacesURL + "/" + request.id + "/logo");
+ }
+ static deleteWorkspace(workspaceId: string): AxiosPromise<ApiResponse> {
+ return Api.delete(`${WorkspaceApi.workspacesURL}/${workspaceId}`);
+ }
+}
+export default WorkspaceApi;
diff --git a/app/client/src/assets/icons/ads/organizationIcon.svg b/app/client/src/assets/icons/ads/workspaceIcon.svg
similarity index 100%
rename from app/client/src/assets/icons/ads/organizationIcon.svg
rename to app/client/src/assets/icons/ads/workspaceIcon.svg
diff --git a/app/client/src/assets/icons/menu/org.svg b/app/client/src/assets/icons/menu/workspace.svg
similarity index 100%
rename from app/client/src/assets/icons/menu/org.svg
rename to app/client/src/assets/icons/menu/workspace.svg
diff --git a/app/client/src/ce/api/UserApi.tsx b/app/client/src/ce/api/UserApi.tsx
index 2cde6032fbf6..b890705af4eb 100644
--- a/app/client/src/ce/api/UserApi.tsx
+++ b/app/client/src/ce/api/UserApi.tsx
@@ -41,8 +41,8 @@ export interface FetchUserRequest {
id: string;
}
-export interface LeaveOrgRequest {
- orgId: string;
+export interface LeaveWorkspaceRequest {
+ workspaceId: string;
}
export interface InviteUserRequest {
@@ -91,8 +91,8 @@ export class UserApi extends Api {
static inviteUserURL = "v1/users/invite";
static verifyInviteTokenURL = `${UserApi.inviteUserURL}/verify`;
static confirmUserInviteURL = `${UserApi.inviteUserURL}/confirm`;
- static addOrgURL = `${UserApi.usersURL}/addOrganization`;
- static leaveOrgURL = `${UserApi.usersURL}/leaveOrganization`;
+ static addWorkspaceURL = `${UserApi.usersURL}/addWorkspace`;
+ static leaveWorkspaceURL = `${UserApi.usersURL}/leaveWorkspace`;
static logoutURL = "v1/logout";
static currentUserURL = "v1/users/me";
static photoURL = "v1/users/photo";
@@ -166,7 +166,7 @@ export class UserApi extends Api {
id: string;
new: boolean;
profilePhotoAssetId: string;
- recentlyUsedOrgIds: string[];
+ recentlyUsedWorkspaceIds: string[];
}> {
const formData = new FormData();
if (request.file) {
@@ -184,8 +184,10 @@ export class UserApi extends Api {
return Api.delete(UserApi.photoURL);
}
- static leaveOrg(request: LeaveOrgRequest): AxiosPromise<LeaveOrgRequest> {
- return Api.put(UserApi.leaveOrgURL + "/" + request.orgId);
+ static leaveWorkspace(
+ request: LeaveWorkspaceRequest,
+ ): AxiosPromise<LeaveWorkspaceRequest> {
+ return Api.put(UserApi.leaveWorkspaceURL + "/" + request.workspaceId);
}
static fetchFeatureFlags(): AxiosPromise<ApiResponse> {
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index f36ce8ff40b6..4b73dcc4c4b1 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -1,6 +1,6 @@
import { WidgetCardProps, WidgetProps } from "widgets/BaseWidget";
import { PageAction } from "constants/AppsmithActionConstants/ActionConstants";
-import { Org } from "constants/orgConstants";
+import { Workspace } from "constants/workspaceConstants";
import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
import { AppLayoutConfig } from "reducers/entityReducers/pageListReducer";
import {
@@ -26,7 +26,7 @@ export const ReduxActionTypes = {
RESET_DATASOURCE_CONFIG_FETCHED_FOR_IMPORT_FLAG:
"RESET_DATASOURCE_CONFIG_FETCHED_FOR_IMPORT_FLAG",
SET_UNCONFIGURED_DATASOURCES: "SET_UNCONFIGURED_DATASOURCES",
- SET_ORG_ID_FOR_IMPORT: "SET_ORG_ID_FOR_IMPORT",
+ SET_WORKSPACE_ID_FOR_IMPORT: "SET_WORKSPACE_ID_FOR_IMPORT",
RESET_SSH_KEY_PAIR: "RESET_SSH_KEY_PAIR",
GIT_INFO_INIT: "GIT_INFO_INIT",
IMPORT_APPLICATION_FROM_GIT_ERROR: "IMPORT_APPLICATION_FROM_GIT_ERROR",
@@ -340,7 +340,7 @@ export const ReduxActionTypes = {
INITIALIZE_PAGE_VIEWER_SUCCESS: "INITIALIZE_PAGE_VIEWER_SUCCESS",
FETCH_APPLICATION_INIT: "FETCH_APPLICATION_INIT",
FETCH_APPLICATION_SUCCESS: "FETCH_APPLICATION_SUCCESS",
- INVITED_USERS_TO_ORGANIZATION: "INVITED_USERS_TO_ORGANIZATION",
+ INVITED_USERS_TO_WORKSPACE: "INVITED_USERS_TO_WORKSPACE",
CREATE_APPLICATION_INIT: "CREATE_APPLICATION_INIT",
CREATE_APPLICATION_SUCCESS: "CREATE_APPLICATION_SUCCESS",
UPDATE_WIDGET_PROPERTY_VALIDATION: "UPDATE_WIDGET_PROPERTY_VALIDATION",
@@ -362,30 +362,30 @@ export const ReduxActionTypes = {
FETCH_PLUGIN_FORM_CONFIGS_REQUEST: "FETCH_PLUGIN_FORM_CONFIGS_REQUEST",
FETCH_PLUGIN_FORM_CONFIGS_SUCCESS: "FETCH_PLUGIN_FORM_CONFIGS_SUCCESS",
FETCH_PLUGIN_FORM_SUCCESS: "FETCH_PLUGIN_FORM_SUCCESS",
- INVITE_USERS_TO_ORG_INIT: "INVITE_USERS_TO_ORG_INIT",
- INVITE_USERS_TO_ORG_SUCCESS: "INVITE_USERS_TO_ORG_SUCCESS",
+ INVITE_USERS_TO_WORKSPACE_INIT: "INVITE_USERS_TO_WORKSPACE_INIT",
+ INVITE_USERS_TO_WORKSPACE_SUCCESS: "INVITE_USERS_TO_WORKSPACE_SUCCESS",
FORGOT_PASSWORD_INIT: "FORGOT_PASSWORD_INIT",
FORGOT_PASSWORD_SUCCESS: "FORGOT_PASSWORD_SUCCESS",
RESET_PASSWORD_VERIFY_TOKEN_SUCCESS: "RESET_PASSWORD_VERIFY_TOKEN_SUCCESS",
RESET_PASSWORD_VERIFY_TOKEN_INIT: "RESET_PASSWORD_VERIFY_TOKEN_INIT",
EXECUTE_PAGE_LOAD_ACTIONS: "EXECUTE_PAGE_LOAD_ACTIONS",
- SWITCH_ORGANIZATION_INIT: "SWITCH_ORGANIZATION_INIT",
- SWITCH_ORGANIZATION_SUCCESS: "SWITCH_ORGANIZATION_SUCCESS",
- FETCH_ORG_ROLES_INIT: "FETCH_ORG_ROLES_INIT",
- FETCH_ORG_ROLES_SUCCESS: "FETCH_ORG_ROLES_SUCCESS",
- FETCH_ORG_INIT: "FETCH_ORG_INIT",
- FETCH_ORG_SUCCESS: "FETCH_ORG_SUCCESS",
- FETCH_ORGS_SUCCESS: "FETCH_ORGS_SUCCES",
- FETCH_ORGS_INIT: "FETCH_ORGS_INIT",
- SAVE_ORG_INIT: "SAVE_ORG_INIT",
- SAVE_ORG_SUCCESS: "SAVE_ORG_SUCCESS",
- UPLOAD_ORG_LOGO: "UPLOAD_ORG_LOGO",
- REMOVE_ORG_LOGO: "REMOVE_ORG_LOGO",
- SAVING_ORG_INFO: "SAVING_ORG_INFO",
+ SWITCH_WORKSPACE_INIT: "SWITCH_WORKSPACE_INIT",
+ SWITCH_WORKSPACE_SUCCESS: "SWITCH_WORKSPACE_SUCCESS",
+ FETCH_WORKSPACE_ROLES_INIT: "FETCH_WORKSPACE_ROLES_INIT",
+ FETCH_WORKSPACE_ROLES_SUCCESS: "FETCH_WORKSPACE_ROLES_SUCCESS",
+ FETCH_WORKSPACE_INIT: "FETCH_WORKSPACE_INIT",
+ FETCH_WORKSPACE_SUCCESS: "FETCH_WORKSPACE_SUCCESS",
+ FETCH_WORKSPACES_SUCCESS: "FETCH_WORKSPACES_SUCCES",
+ FETCH_WORKSPACES_INIT: "FETCH_WORKSPACES_INIT",
+ SAVE_WORKSPACE_INIT: "SAVE_WORKSPACE_INIT",
+ SAVE_WORKSPACE_SUCCESS: "SAVE_WORKSPACE_SUCCESS",
+ UPLOAD_WORKSPACE_LOGO: "UPLOAD_WORKSPACE_LOGO",
+ REMOVE_WORKSPACE_LOGO: "REMOVE_WORKSPACE_LOGO",
+ SAVING_WORKSPACE_INFO: "SAVING_WORKSPACE_INFO",
SET_LAST_UPDATED_TIME: "SET_LAST_UPDATED_TIME",
- SET_CURRENT_ORG: "SET_CURRENT_ORG",
- SET_CURRENT_ORG_ID: "SET_CURRENT_ORG_ID",
- FETCH_CURRENT_ORG: "FETCH_CURRENT_ORG",
+ SET_CURRENT_WORKSPACE: "SET_CURRENT_WORKSPACE",
+ SET_CURRENT_WORKSPACE_ID: "SET_CURRENT_WORKSPACE_ID",
+ FETCH_CURRENT_WORKSPACE: "FETCH_CURRENT_WORKSPACE",
STORE_DATASOURCE_REFS: "STORE_DATASOURCE_REFS",
UPDATE_DATASOURCE_REFS: "UPDATE_DATASOURCE_REFS",
FETCH_USER_INIT: "FETCH_USER_INIT",
@@ -432,10 +432,10 @@ export const ReduxActionTypes = {
CLONE_PAGE_SUCCESS: "CLONE_PAGE_SUCCESS",
SET_DEFAULT_APPLICATION_PAGE_INIT: "SET_DEFAULT_APPLICATION_PAGE_INIT",
SET_DEFAULT_APPLICATION_PAGE_SUCCESS: "SET_DEFAULT_APPLICATION_PAGE_SUCCESS",
- CREATE_ORGANIZATION_INIT: "CREATE_ORGANIZATION_INIT",
- CREATE_ORGANIZATION_SUCCESS: "CREATE_ORGANIZATION_SUCCESS",
- ADD_USER_TO_ORG_INIT: "ADD_USER_TO_ORG_INIT",
- ADD_USER_TO_ORG_SUCCESS: "ADD_USER_TO_ORG_ERROR",
+ CREATE_WORKSPACE_INIT: "CREATE_WORKSPACE_INIT",
+ CREATE_WORKSPACE_SUCCESS: "CREATE_WORKSPACE_SUCCESS",
+ ADD_USER_TO_WORKSPACE_INIT: "ADD_USER_TO_WORKSPACE_INIT",
+ ADD_USER_TO_WORKSPACE_SUCCESS: "ADD_USER_TO_WORKSPACE_ERROR",
SET_META_PROP: "SET_META_PROP",
SET_META_PROP_AND_EVAL: "SET_META_PROP_AND_EVAL",
META_UPDATE_DEBOUNCED_EVAL: "META_UPDATE_DEBOUNCED_EVAL",
@@ -490,17 +490,18 @@ export const ReduxActionTypes = {
"FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_SUCCESS",
SET_PROVIDERS_LENGTH: "SET_PROVIDERS_LENGTH",
GET_ALL_APPLICATION_INIT: "GET_ALL_APPLICATION_INIT",
- FETCH_USER_APPLICATIONS_ORGS_SUCCESS: "FETCH_USER_APPLICATIONS_ORGS_SUCCESS",
+ FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS:
+ "FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS",
FETCH_USER_DETAILS_SUCCESS: "FETCH_USER_DETAILS_SUCCESS",
FETCH_ALL_USERS_SUCCESS: "FETCH_ALL_USERS_SUCCESS",
FETCH_ALL_USERS_INIT: "FETCH_ALL_USERS_INIT",
FETCH_ALL_ROLES_SUCCESS: "FETCH_ALL_ROLES_SUCCESS",
FETCH_ALL_ROLES_INIT: "FETCH_ALL_ROLES_INIT",
- DELETE_ORG_USER_INIT: "DELETE_ORG_USER_INIT",
- DELETE_ORG_USER_SUCCESS: "DELETE_ORG_USER_SUCCESS",
- LEAVE_ORG_INIT: "LEAVE_ORG_INIT",
- CHANGE_ORG_USER_ROLE_INIT: "CHANGE_ORG_USER_ROLE_INIT",
- CHANGE_ORG_USER_ROLE_SUCCESS: "CHANGE_ORG_USER_ROLE_SUCCESS",
+ DELETE_WORKSPACE_USER_INIT: "DELETE_WORKSPACE_USER_INIT",
+ DELETE_WORKSPACE_USER_SUCCESS: "DELETE_WORKSPACE_USER_SUCCESS",
+ LEAVE_WORKSPACE_INIT: "LEAVE_WORKSPACE_INIT",
+ CHANGE_WORKSPACE_USER_ROLE_INIT: "CHANGE_WORKSPACE_USER_ROLE_INIT",
+ CHANGE_WORKSPACE_USER_ROLE_SUCCESS: "CHANGE_WORKSPACE_USER_ROLE_SUCCESS",
UPDATE_USER_DETAILS_INIT: "UPDATE_USER_DETAILS_INIT",
UPDATE_USER_DETAILS_SUCCESS: "UPDATE_USER_DETAILS_SUCCESS",
SET_DEFAULT_REFINEMENT: "SET_DEFAULT_REFINEMENT",
@@ -680,8 +681,8 @@ export const ReduxActionTypes = {
FORCE_SHOW_CONTENT: "FORCE_SHOW_CONTENT",
UPDATE_BUTTON_WIDGET_TEXT: "UPDATE_BUTTON_WIDGET_TEXT",
UPDATE_REPLAY_ENTITY: "UPDATE_REPLAY_ENTITY",
- DELETE_ORG_INIT: "DELETE_ORG_INIT",
- DELETE_ORG_SUCCESS: "DELETE_ORG_SUCCESS",
+ DELETE_WORKSPACE_INIT: "DELETE_WORKSPACE_INIT",
+ DELETE_WORKSPACE_SUCCESS: "DELETE_WORKSPACE_SUCCESS",
SET_USER_CURRENT_GEO_LOCATION: "SET_USER_CURRENT_GEO_LOCATION",
SET_DISCONNECTING_GIT_APPLICATION: "SET_DISCONNECTING_GIT_APPLICATION",
SET_APP_THEMING_STACK: "SET_APP_THEMING_STACK",
@@ -704,9 +705,8 @@ export const ReduxActionTypes = {
GET_ALL_TEMPLATES_SUCCESS: "GET_ALL_TEMPLATES_SUCCESS",
UPDATE_TEMPLATE_FILTERS: "UPDATE_TEMPLATE_FILTERS",
SET_TEMPLATE_SEARCH_QUERY: "SET_TEMPLATE_SEARCH_QUERY",
- IMPORT_TEMPLATE_TO_ORGANISATION_INIT: "IMPORT_TEMPLATE_TO_ORGANISATION_INIT",
- IMPORT_TEMPLATE_TO_ORGANISATION_SUCCESS:
- "IMPORT_TEMPLATE_TO_ORGANISATION_SUCCESS",
+ IMPORT_TEMPLATE_TO_WORKSPACE_INIT: "IMPORT_TEMPLATE_TO_WORKSPACE_INIT",
+ IMPORT_TEMPLATE_TO_WORKSPACE_SUCCESS: "IMPORT_TEMPLATE_TO_WORKSPACE_SUCCESS",
SET_TEMPLATE_NOTIFICATION_SEEN: "SET_TEMPLATE_NOTIFICATION_SEEN",
GET_TEMPLATE_NOTIFICATION_SEEN: "GET_TEMPLATE_NOTIFICATION_SEEN",
GET_SIMILAR_TEMPLATES_INIT: "GET_SIMILAR_TEMPLATES_INIT",
@@ -813,20 +813,20 @@ export const ReduxActionErrorTypes = {
LOGIN_USER_ERROR: "LOGIN_USER_ERROR",
CREATE_USER_ERROR: "CREATE_USER_ERROR",
RESET_USER_PASSWORD_ERROR: "RESET_USER_PASSWORD_ERROR",
- CHANGE_ORG_USER_ROLE_ERROR: "CHANGE_ORG_USER_ROLE_ERROR",
+ CHANGE_WORKSPACE_USER_ROLE_ERROR: "CHANGE_WORKSPACE_USER_ROLE_ERROR",
SAVE_JS_EXECUTION_RECORD: "SAVE_JS_EXECUTION_RECORD",
FETCH_PLUGINS_ERROR: "FETCH_PLUGINS_ERROR",
FETCH_PLUGIN_FORM_CONFIGS_ERROR: "FETCH_PLUGIN_FORM_CONFIGS_ERROR",
- UPDATE_ORG_NAME_ERROR: "UPDATE_ORG_NAME_ERROR",
- SWITCH_ORGANIZATION_ERROR: "SWITCH_ORGANIZATION_ERROR",
+ UPDATE_WORKSPACE_NAME_ERROR: "UPDATE_WORKSPACE_NAME_ERROR",
+ SWITCH_WORKSPACE_ERROR: "SWITCH_WORKSPACE_ERROR",
TEST_DATASOURCE_ERROR: "TEST_DATASOURCE_ERROR",
FORGOT_PASSWORD_ERROR: "FORGOT_PASSWORD_ERROR",
RESET_PASSWORD_VERIFY_TOKEN_ERROR: "RESET_PASSWORD_VERIFY_TOKEN_ERROR",
- FETCH_ORG_ROLES_ERROR: "FETCH_ORG_ROLES_ERROR",
- INVITE_USERS_TO_ORG_ERROR: "INVITE_USERS_TO_ORG_ERROR",
- SAVE_ORG_ERROR: "SAVE_ORG_ERROR",
- FETCH_ORG_ERROR: "FETCH_ORG_ERROR",
- FETCH_ORGS_ERROR: "FETCH_ORGS_ERROR",
+ FETCH_WORKSPACE_ROLES_ERROR: "FETCH_WORKSPACE_ROLES_ERROR",
+ INVITE_USERS_TO_WORKSPACE_ERROR: "INVITE_USERS_TO_WORKSPACE_ERROR",
+ SAVE_WORKSPACE_ERROR: "SAVE_WORKSPACE_ERROR",
+ FETCH_WORKSPACE_ERROR: "FETCH_WORKSPACE_ERROR",
+ FETCH_WORKSPACES_ERROR: "FETCH_WORKSPACES_ERROR",
FETCH_USER_ERROR: "FETCH_USER_ERROR",
SET_CURRENT_USER_ERROR: "SET_CURRENT_USER_ERROR",
LOGOUT_USER_ERROR: "LOGOUT_USER_ERROR",
@@ -839,8 +839,8 @@ export const ReduxActionErrorTypes = {
DELETE_APPLICATION_ERROR: "DELETE_APPLICATION_ERROR",
DUPLICATE_APPLICATION_ERROR: "DUPLICATE_APPLICATION_ERROR",
SET_DEFAULT_APPLICATION_PAGE_ERROR: "SET_DEFAULT_APPLICATION_PAGE_ERROR",
- CREATE_ORGANIZATION_ERROR: "CREATE_ORGANIZATION_ERROR",
- ADD_USER_TO_ORG_ERROR: "ADD_USER_TO_ORG_ERROR",
+ CREATE_WORKSPACE_ERROR: "CREATE_WORKSPACE_ERROR",
+ ADD_USER_TO_WORKSPACE_ERROR: "ADD_USER_TO_WORKSPACE_ERROR",
UPDATE_WIDGET_NAME_ERROR: "UPDATE_WIDGET_NAME_ERROR",
FETCH_ACTIONS_FOR_PAGE_ERROR: "FETCH_ACTIONS_FOR_PAGE_ERROR",
FETCH_IMPORTED_COLLECTIONS_ERROR: "FETCH_IMPORTED_COLLECTIONS_ERROR",
@@ -854,7 +854,8 @@ export const ReduxActionErrorTypes = {
FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR:
"FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR",
SAVE_ACTION_NAME_ERROR: "SAVE_ACTION_NAME_ERROR",
- FETCH_USER_APPLICATIONS_ORGS_ERROR: "FETCH_USER_APPLICATIONS_ORGS_ERROR",
+ FETCH_USER_APPLICATIONS_WORKSPACES_ERROR:
+ "FETCH_USER_APPLICATIONS_WORKSPACES_ERROR",
FORK_APPLICATION_ERROR: "FORK_APPLICATION_ERROR",
IMPORT_APPLICATION_ERROR: "IMPORT_APPLICATION_ERROR",
FETCH_ALL_USERS_ERROR: "FETCH_ALL_USERS_ERROR",
@@ -872,7 +873,7 @@ export const ReduxActionErrorTypes = {
UPDATE_JS_ACTION_ERROR: "UPDATE_JS_ACTION_ERROR",
COPY_JS_ACTION_ERROR: "COPY_JS_ACTION_ERROR",
MOVE_JS_ACTION_ERROR: "MOVE_JS_ACTION_ERROR",
- DELETE_ORG_USER_ERROR: "DELETE_ORG_USER_ERROR",
+ DELETE_WORKSPACE_USER_ERROR: "DELETE_WORKSPACE_USER_ERROR",
CHANGE_APPVIEW_ACCESS_ERROR: "CHANGE_APPVIEW_ACCESS_ERROR",
SAVE_JS_COLLECTION_NAME_ERROR: "SAVE_JS_COLLECTION_NAME_ERROR",
FETCH_JS_ACTIONS_FOR_PAGE_ERROR: "FETCH_JS_ACTIONS_FOR_PAGE_ERROR",
@@ -892,14 +893,13 @@ export const ReduxActionErrorTypes = {
UPDATE_SELECTED_APP_THEME_ERROR: "UPDATE_SELECTED_APP_THEME_ERROR",
CHANGE_SELECTED_APP_THEME_ERROR: "CHANGE_SELECTED_APP_THEME_ERROR",
UPDATE_JS_FUNCTION_PROPERTY_ERROR: "UPDATE_JS_FUNCTION_PROPERTY_ERROR",
- DELETE_ORG_ERROR: "DELETE_ORG_ERROR",
+ DELETE_WORKSPACE_ERROR: "DELETE_WORKSPACE_ERROR",
REFLOW_BETA_FLAGS_INIT_ERROR: "REFLOW_BETA_FLAGS_INIT_ERROR",
SAVE_APP_THEME_ERROR: "SAVE_APP_THEME_ERROR",
DELETE_APP_THEME_ERROR: "DELETE_APP_THEME_ERROR",
GET_ALL_TEMPLATES_ERROR: "GET_ALL_TEMPLATES_ERROR",
GET_SIMILAR_TEMPLATES_ERROR: "GET_SIMILAR_TEMPLATES_ERROR",
- IMPORT_TEMPLATE_TO_ORGANISATION_ERROR:
- "IMPORT_TEMPLATE_TO_ORGANISATION_ERROR",
+ IMPORT_TEMPLATE_TO_WORKSPACE_ERROR: "IMPORT_TEMPLATE_TO_WORKSPACE_ERROR",
GET_DEFAULT_PLUGINS_ERROR: "GET_DEFAULT_PLUGINS_ERROR",
GET_TEMPLATE_ERROR: "GET_TEMPLATE_ERROR",
};
@@ -1013,7 +1013,7 @@ export interface ApplicationPayload {
name: string;
color?: string;
icon?: string;
- organizationId: string;
+ workspaceId: string;
defaultPageId: string;
isPublic?: boolean;
userPermissions?: string[];
@@ -1032,8 +1032,8 @@ export interface ApplicationPayload {
isManualUpdate?: boolean;
}
-export type OrganizationDetails = {
- organization: Org;
+export type WorkspaceDetails = {
+ workspace: Workspace;
applications: any[];
};
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 81efc9585655..f3205f3be91b 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -184,7 +184,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 ORGANIZATIONS_HEADING = () => `ORGANIZATIONS`;
+export const WORKSPACES_HEADING = () => `ORGANIZATIONS`;
export const WELCOME_TOUR = () => `Welcome Tour`;
export const NO_APPS_FOUND = () =>
`Whale! Whale! This name doesn't ring a bell!`;
@@ -704,8 +704,8 @@ export const DISCONNECT_EXISTING_REPOSITORIES = () =>
export const DISCONNECT_EXISTING_REPOSITORIES_INFO = () =>
"To make space for newer repositories you can remove existing repositories.";
export const CONTACT_SUPPORT = () => "Contact Support";
-export const CONTACT_SALES_MESSAGE_ON_INTERCOM = (orgName: string) =>
- `Hey there, Thanks for getting in touch! We understand that you’d like to extend the number of private repos for your ${orgName}. Could you tell us how many private repos you’d require and why? We'll get back to you in a short while.`;
+export const CONTACT_SALES_MESSAGE_ON_INTERCOM = (workspaceName: string) =>
+ `Hey there, Thanks for getting in touch! We understand that you’d like to extend the number of private repos for your ${workspaceName}. Could you tell us how many private repos you’d require and why? We'll get back to you in a short while.`;
export const REPOSITORY_LIMIT_REACHED = () => "Repository Limit Reached";
export const REPOSITORY_LIMIT_REACHED_INFO = () =>
"Adding and using upto 3 repositories is free. To add more repositories kindly upgrade.";
@@ -1061,7 +1061,8 @@ export const ADD_QUERY_JS_TOOLTIP = () => "Create New";
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_ORG_SUCCESSFUL = () => "Organization deleted successfully";
+export const DELETE_WORKSPACE_SUCCESSFUL = () =>
+ "Organization deleted successfully";
// theming
export const CHANGE_APP_THEME = (name: string) => `Theme ${name} Applied`;
export const SAVE_APP_THEME = (name: string) => `Theme ${name} Saved`;
@@ -1174,7 +1175,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_ORGANISATION = () => "Select Organization";
+export const SELECT_WORKSPACE = () => "Select Organization";
export const FORK_TEMPLATE = () => "FORK TEMPLATE";
export const TEMPLATES = () => "TEMPLATES";
export const FORK_THIS_TEMPLATE = () => "Fork this template";
diff --git a/app/client/src/ce/selectors/organizationSelectors.tsx b/app/client/src/ce/selectors/organizationSelectors.tsx
deleted file mode 100644
index ad953a849d72..000000000000
--- a/app/client/src/ce/selectors/organizationSelectors.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { createSelector } from "reselect";
-import { AppState } from "reducers";
-import { OrgRole } from "constants/orgConstants";
-
-export const getRolesFromState = (state: AppState) => {
- return state.ui.orgs.roles;
-};
-
-export const getOrgLoadingStates = (state: AppState) => {
- return {
- isFetchingOrg: state.ui.orgs.loadingStates.isFetchingOrg,
- isFetchingAllUsers: state.ui.orgs.loadingStates.isFetchAllUsers,
- isFetchingAllRoles: state.ui.orgs.loadingStates.isFetchAllRoles,
- deletingUserInfo: state.ui.orgs.orgUsers.filter((el) => el.isDeleting)[0],
- roleChangingUserInfo: state.ui.orgs.orgUsers.filter(
- (el) => el.isChangingRole,
- )[0],
- };
-};
-
-export const getCurrentOrgId = (state: AppState) => state.ui.orgs.currentOrg.id;
-export const getOrgs = (state: AppState) => {
- return state.ui.applications.userOrgs;
-};
-export const getCurrentOrg = (state: AppState) => {
- return state.ui.applications.userOrgs.map((el) => el.organization);
-};
-export const getCurrentAppOrg = (state: AppState) => {
- return state.ui.orgs.currentOrg;
-};
-export const getAllUsers = (state: AppState) => state.ui.orgs.orgUsers;
-export const getAllRoles = (state: AppState) => state.ui.orgs.orgRoles;
-
-export const getRoles = createSelector(getRolesFromState, (roles?: OrgRole[]):
- | OrgRole[]
- | undefined => {
- return roles?.map((role) => ({
- id: role.id,
- name: role.displayName || role.name,
- isDefault: role.isDefault,
- }));
-});
-
-export const getRolesForField = createSelector(getAllRoles, (roles?: any) => {
- return Object.entries(roles).map((role) => {
- return {
- id: role[0],
- name: role[0],
- description: role[1],
- };
- });
-});
-
-export const getDefaultRole = createSelector(getRoles, (roles?: OrgRole[]) => {
- return roles?.find((role) => role.isDefault);
-});
-export const getCurrentError = (state: AppState) => {
- return state.ui.errors.currentError;
-};
-
-export const getShowBrandingBadge = () => {
- return true;
-};
diff --git a/app/client/src/ce/selectors/workspaceSelectors.tsx b/app/client/src/ce/selectors/workspaceSelectors.tsx
new file mode 100644
index 000000000000..7c1000587ae9
--- /dev/null
+++ b/app/client/src/ce/selectors/workspaceSelectors.tsx
@@ -0,0 +1,72 @@
+import { createSelector } from "reselect";
+import { AppState } from "reducers";
+import { WorkspaceRole } from "constants/workspaceConstants";
+
+export const getRolesFromState = (state: AppState) => {
+ return state.ui.workspaces.roles;
+};
+
+export const getWorkspaceLoadingStates = (state: AppState) => {
+ return {
+ isFetchingWorkspace: state.ui.workspaces.loadingStates.isFetchingWorkspace,
+ isFetchingAllUsers: state.ui.workspaces.loadingStates.isFetchAllUsers,
+ isFetchingAllRoles: state.ui.workspaces.loadingStates.isFetchAllRoles,
+ deletingUserInfo: state.ui.workspaces.workspaceUsers.filter(
+ (el) => el.isDeleting,
+ )[0],
+ roleChangingUserInfo: state.ui.workspaces.workspaceUsers.filter(
+ (el) => el.isChangingRole,
+ )[0],
+ };
+};
+
+export const getCurrentWorkspaceId = (state: AppState) =>
+ state.ui.workspaces.currentWorkspace.id;
+export const getWorkspaces = (state: AppState) => {
+ return state.ui.applications.userWorkspaces;
+};
+export const getCurrentWorkspace = (state: AppState) => {
+ return state.ui.applications.userWorkspaces.map((el) => el.workspace);
+};
+export const getCurrentAppWorkspace = (state: AppState) => {
+ return state.ui.workspaces.currentWorkspace;
+};
+export const getAllUsers = (state: AppState) =>
+ state.ui.workspaces.workspaceUsers;
+export const getAllRoles = (state: AppState) =>
+ state.ui.workspaces.workspaceRoles;
+
+export const getRoles = createSelector(
+ getRolesFromState,
+ (roles?: WorkspaceRole[]): WorkspaceRole[] | undefined => {
+ return roles?.map((role) => ({
+ id: role.id,
+ name: role.displayName || role.name,
+ isDefault: role.isDefault,
+ }));
+ },
+);
+
+export const getRolesForField = createSelector(getAllRoles, (roles?: any) => {
+ return Object.entries(roles).map((role) => {
+ return {
+ id: role[0],
+ name: role[0],
+ description: role[1],
+ };
+ });
+});
+
+export const getDefaultRole = createSelector(
+ getRoles,
+ (roles?: WorkspaceRole[]) => {
+ return roles?.find((role) => role.isDefault);
+ },
+);
+export const getCurrentError = (state: AppState) => {
+ return state.ui.errors.currentError;
+};
+
+export const getShowBrandingBadge = () => {
+ return true;
+};
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
index ac39acfe0fc0..8ebb000dbbf2 100644
--- a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
+++ b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
@@ -26,8 +26,8 @@ import {
import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
-import { getCurrentAppOrg } from "@appsmith/selectors/organizationSelectors";
-import useOrg from "utils/hooks/useOrg";
+import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
+import useWorkspace from "utils/hooks/useWorkspace";
import { getCanCreateApplications } from "utils/helpers";
import stepOneThumbnail from "assets/images/comments-onboarding/thumbnails/step-1.jpg";
@@ -232,9 +232,9 @@ export default function CommentsShowcaseCarousel() {
dispatch(updateUserDetails({ name, email }));
};
- const { id } = useSelector(getCurrentAppOrg) || {};
- const currentOrg = useOrg(id);
- const canManage = getCanCreateApplications(currentOrg);
+ const { id } = useSelector(getCurrentAppWorkspace) || {};
+ const currentWorkspace = useWorkspace(id);
+ const canManage = getCanCreateApplications(currentWorkspace);
const [initialStep, finalStep] = getInitialAndFinalSteps(canManage);
diff --git a/app/client/src/comments/inlineComments/AddCommentInput.tsx b/app/client/src/comments/inlineComments/AddCommentInput.tsx
index 671250b1173a..4d2bfb973d31 100644
--- a/app/client/src/comments/inlineComments/AddCommentInput.tsx
+++ b/app/client/src/comments/inlineComments/AddCommentInput.tsx
@@ -15,8 +15,8 @@ import styled from "styled-components";
import { EditorState, convertToRaw, Modifier, SelectionState } from "draft-js";
import { MentionData } from "@draft-js-plugins/mention";
-import { OrgUser } from "constants/orgConstants";
-import useOrgUsers from "./useOrgUsers";
+import { WorkspaceUser } from "constants/workspaceConstants";
+import useWorkspaceUsers from "./useWorkspaceUsers";
import { RawDraftContentState } from "draft-js";
@@ -32,7 +32,7 @@ import { setShowAppInviteUsersDialog } from "actions/applicationActions";
import { useDispatch, useSelector } from "react-redux";
import { change } from "redux-form";
-import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
+import { INVITE_USERS_TO_WORKSPACE_FORM } from "constants/forms";
import { isEmail } from "utils/formhelpers";
import TourTooltipWrapper from "components/ads/tour/TourTooltipWrapper";
@@ -42,8 +42,8 @@ import {
commentsTourStepsEditModeTypes,
commentsTourStepsPublishedModeTypes,
} from "comments/tour/commentsTourSteps";
-import { getCurrentAppOrg } from "@appsmith/selectors/organizationSelectors";
-import useOrg from "utils/hooks/useOrg";
+import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
+import useWorkspace from "utils/hooks/useWorkspace";
import { getCanCreateApplications } from "utils/helpers";
import { getAppsmithConfigs } from "@appsmith/configs";
@@ -164,12 +164,12 @@ const sortMentionData = (filter = "") => (a: MentionData, b: MentionData) => {
};
const useUserSuggestions = (
- users: Array<OrgUser>,
+ users: Array<WorkspaceUser>,
setSuggestions: Dispatch<SetStateAction<Array<MentionData>>>,
) => {
- const { id } = useSelector(getCurrentAppOrg) || {};
- const currentOrg = useOrg(id);
- const canManage = getCanCreateApplications(currentOrg);
+ const { id } = useSelector(getCurrentAppWorkspace) || {};
+ const currentWorkspace = useWorkspace(id);
+ const canManage = getCanCreateApplications(currentWorkspace);
useEffect(() => {
const result: Array<MentionData> = users.map((user) => ({
@@ -206,7 +206,7 @@ function AddCommentInput({
});
const dispatch = useDispatch();
- const users = useOrgUsers();
+ const users = useWorkspaceUsers();
const [suggestions, setSuggestions] = useState<Array<MentionData>>([]);
const [trigger, setTrigger] = useState<Trigger>();
useUserSuggestions(users, setSuggestions);
@@ -296,7 +296,7 @@ function AddCommentInput({
) {
const email = mention.isSupport ? mention.user?.username : mention.name;
dispatch(setShowAppInviteUsersDialog(true));
- dispatch(change(INVITE_USERS_TO_ORG_FORM, "users", email));
+ dispatch(change(INVITE_USERS_TO_WORKSPACE_FORM, "users", email));
} else if (mention.isInviteTrigger && !isEmail(mention.name)) {
Toaster.show({
text: createMessage(INVALID_EMAIL),
diff --git a/app/client/src/comments/inlineComments/useOrgUsers.tsx b/app/client/src/comments/inlineComments/useOrgUsers.tsx
deleted file mode 100644
index 8c6e1a11398c..000000000000
--- a/app/client/src/comments/inlineComments/useOrgUsers.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import {
- isPermitted,
- PERMISSION_TYPE,
-} from "pages/Applications/permissionHelpers";
-import { useEffect } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import {
- getAllUsers,
- getCurrentAppOrg,
- getCurrentOrgId,
-} from "@appsmith/selectors/organizationSelectors";
-import useOrg from "utils/hooks/useOrg";
-
-const useOrgUsers = () => {
- const dispatch = useDispatch();
- const orgId = useSelector(getCurrentOrgId);
- const orgUsers = useSelector(getAllUsers);
- const { id } = useSelector(getCurrentAppOrg) || {};
- const currentOrg = useOrg(id);
-
- // to check if user is added to an org
- const canInviteToOrg = isPermitted(
- currentOrg?.userPermissions || [],
- PERMISSION_TYPE.INVITE_USER_TO_ORGANIZATION,
- );
-
- useEffect(() => {
- if ((!orgUsers || !orgUsers.length) && canInviteToOrg) {
- dispatch({
- type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
- payload: {
- orgId,
- },
- });
- }
- }, [orgId]);
- return orgUsers;
-};
-
-export default useOrgUsers;
diff --git a/app/client/src/comments/inlineComments/useWorkspaceUsers.tsx b/app/client/src/comments/inlineComments/useWorkspaceUsers.tsx
new file mode 100644
index 000000000000..25c54b2593f1
--- /dev/null
+++ b/app/client/src/comments/inlineComments/useWorkspaceUsers.tsx
@@ -0,0 +1,41 @@
+import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import {
+ isPermitted,
+ PERMISSION_TYPE,
+} from "pages/Applications/permissionHelpers";
+import { useEffect } from "react";
+import { useSelector, useDispatch } from "react-redux";
+import {
+ getAllUsers,
+ getCurrentAppWorkspace,
+ getCurrentWorkspaceId,
+} from "@appsmith/selectors/workspaceSelectors";
+import useWorkspace from "utils/hooks/useWorkspace";
+
+const useWorkspaceUsers = () => {
+ const dispatch = useDispatch();
+ const workspaceId = useSelector(getCurrentWorkspaceId);
+ const workspaceUsers = useSelector(getAllUsers);
+ const { id } = useSelector(getCurrentAppWorkspace) || {};
+ const currentWorkspace = useWorkspace(id);
+
+ // to check if user is added to a workspace
+ const canInviteToWorkspace = isPermitted(
+ currentWorkspace?.userPermissions || [],
+ PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE,
+ );
+
+ useEffect(() => {
+ if ((!workspaceUsers || !workspaceUsers.length) && canInviteToWorkspace) {
+ dispatch({
+ type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
+ payload: {
+ workspaceId,
+ },
+ });
+ }
+ }, [workspaceId]);
+ return workspaceUsers;
+};
+
+export default useWorkspaceUsers;
diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx
index 4415fe46423b..681e021a0ee8 100644
--- a/app/client/src/components/ads/Icon.tsx
+++ b/app/client/src/components/ads/Icon.tsx
@@ -66,7 +66,7 @@ import { ReactComponent as GearIcon } from "assets/icons/ads/gear.svg";
import { ReactComponent as UserV2Icon } from "assets/icons/ads/user-v2.svg";
import { ReactComponent as SupportIcon } from "assets/icons/ads/support.svg";
import { ReactComponent as Snippet } from "assets/icons/ads/snippet.svg";
-import { ReactComponent as WorkspaceIcon } from "assets/icons/ads/organizationIcon.svg";
+import { ReactComponent as WorkspaceIcon } from "assets/icons/ads/workspaceIcon.svg";
import { ReactComponent as SettingIcon } from "assets/icons/control/settings.svg";
import { ReactComponent as DropdownIcon } from "assets/icons/ads/dropdown.svg";
import { ReactComponent as ChatIcon } from "assets/icons/ads/app-icons/chat.svg";
diff --git a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
index b7e0e3f827cb..58c965038ce5 100644
--- a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
+++ b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
@@ -8,7 +8,7 @@ import { IconName } from "components/ads/Icon";
type FormDialogComponentProps = {
isOpen?: boolean;
canOutsideClickClose?: boolean;
- orgId?: string;
+ workspaceId?: string;
title: string;
Form: any;
trigger: ReactNode;
@@ -69,7 +69,7 @@ export function FormDialogComponent(props: FormDialogComponentProps) {
{...props.customProps}
applicationId={props.applicationId}
onCancel={() => setIsOpen(false)}
- orgId={props.orgId}
+ workspaceId={props.workspaceId}
/>
</Dialog>
);
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
index 92029a122686..cbc951e009e9 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
@@ -61,7 +61,7 @@ import {
import { datasourcesEditorIdURL } from "RouteBuilder";
type ReduxStateProps = {
- orgId: string;
+ workspaceId: string;
datasource: Datasource | EmbeddedRestDatasource;
datasourceList: Datasource[];
currentPageId?: string;
@@ -199,14 +199,14 @@ class EmbeddedDatasourcePathComponent extends React.Component<
}
handleDatasourceUrlUpdate = (datasourceUrl: string) => {
- const { datasource, orgId, pluginId } = this.props;
+ const { datasource, pluginId, workspaceId } = this.props;
const urlHasUpdated =
datasourceUrl !== datasource.datasourceConfiguration?.url;
if (urlHasUpdated) {
const isDatasourceRemoved =
datasourceUrl.indexOf(datasource.datasourceConfiguration?.url) === -1;
let newDatasource = isDatasourceRemoved
- ? { ...DEFAULT_DATASOURCE(pluginId, orgId) }
+ ? { ...DEFAULT_DATASOURCE(pluginId, workspaceId) }
: { ...datasource };
newDatasource = {
...newDatasource,
@@ -551,7 +551,7 @@ const mapStateToProps = (
}
return {
- orgId: state.ui.orgs.currentOrg.id,
+ workspaceId: state.ui.workspaces.currentWorkspace.id,
datasource: datasourceMerged,
datasourceList: getDatasourcesByPluginId(state, ownProps.pluginId),
currentPageId: state.entities.pageList.currentPageId,
diff --git a/app/client/src/components/editorComponents/utils.test.ts b/app/client/src/components/editorComponents/utils.test.ts
index c790fd7d422d..e6f8f9f822ce 100644
--- a/app/client/src/components/editorComponents/utils.test.ts
+++ b/app/client/src/components/editorComponents/utils.test.ts
@@ -5,7 +5,7 @@ const TEST_JS_FUNCTION_ID = "627ccff468e1fa5185b7f901";
const TEST_JS_FUNCTION = {
id: TEST_JS_FUNCTION_ID,
applicationId: "627aaf637e9e9b75e43ad2ff",
- organizationId: "61e52bb4847aa804d79fc7c1",
+ workspaceId: "61e52bb4847aa804d79fc7c1",
pluginType: "JS",
pluginId: "6138c786168857325f78ef3e",
name: "myFun234y",
@@ -14,7 +14,7 @@ const TEST_JS_FUNCTION = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "6138c786168857325f78ef3e",
- organizationId: "61e52bb4847aa804d79fc7c1",
+ workspaceId: "61e52bb4847aa804d79fc7c1",
messages: [],
isValid: true,
new: true,
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index eb8096e4d0cd..e52763c03e05 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -934,12 +934,12 @@ type ColorType = {
applications: {
bg: ShadeColor;
textColor: ShadeColor;
- orgColor: ShadeColor;
+ workspaceColor: ShadeColor;
iconColor: ShadeColor;
hover: {
bg: ShadeColor;
textColor: ShadeColor;
- orgColor: ShadeColor;
+ workspaceColor: ShadeColor;
};
cardMenuIcon: ShadeColor;
};
@@ -1947,12 +1947,12 @@ export const dark: ColorType = {
applications: {
bg: darkShades[4],
textColor: darkShades[7],
- orgColor: darkShades[7],
+ workspaceColor: darkShades[7],
iconColor: darkShades[7],
hover: {
bg: darkShades[5],
textColor: darkShades[8],
- orgColor: darkShades[9],
+ workspaceColor: darkShades[9],
},
cardMenuIcon: darkShades[7],
},
@@ -2587,12 +2587,12 @@ export const light: ColorType = {
applications: {
bg: lightShades[3],
textColor: lightShades[7],
- orgColor: lightShades[7],
+ workspaceColor: lightShades[7],
iconColor: lightShades[7],
hover: {
bg: lightShades[5],
textColor: lightShades[8],
- orgColor: lightShades[9],
+ workspaceColor: lightShades[9],
},
cardMenuIcon: lightShades[17],
},
diff --git a/app/client/src/constants/forms.ts b/app/client/src/constants/forms.ts
index 7f566699739b..10b7c3232b17 100644
--- a/app/client/src/constants/forms.ts
+++ b/app/client/src/constants/forms.ts
@@ -1,6 +1,6 @@
export const API_EDITOR_FORM_NAME = "ApiEditorForm";
export const CREATE_APPLICATION_FORM_NAME = "CreateApplicationForm";
-export const INVITE_USERS_TO_ORG_FORM = "InviteUsersToOrgForm";
+export const INVITE_USERS_TO_WORKSPACE_FORM = "InviteUsersToWorkspaceForm";
export const LOGIN_FORM_NAME = "LoginForm";
export const LOGIN_FORM_EMAIL_FIELD_NAME = "username";
@@ -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_ORGANIZATION_FORM_NAME = "New Organization";
+export const CREATE_WORKSPACE_FORM_NAME = "New Organization";
export const CURL_IMPORT_FORM = "CurlImportForm";
export const QUERY_EDITOR_FORM_NAME = "QueryEditorForm";
diff --git a/app/client/src/constants/routes.ts b/app/client/src/constants/routes.ts
index 441ed1c30d0d..44e11b59f2ce 100644
--- a/app/client/src/constants/routes.ts
+++ b/app/client/src/constants/routes.ts
@@ -7,7 +7,7 @@ export const PLACEHOLDER_APP_SLUG = "application";
export const PLACEHOLDER_PAGE_ID = "pageId";
export const PLACEHOLDER_PAGE_SLUG = "page";
export const BASE_URL = "/";
-export const ORG_URL = "/org";
+export const WORKSPACE_URL = "/workspace";
export const PAGE_NOT_FOUND_URL = "/404";
export const SERVER_ERROR_URL = "/500";
export const APPLICATIONS_URL = `/applications`;
@@ -28,8 +28,8 @@ export const SIGN_UP_URL = `${USER_AUTH_URL}/signup`;
export const BASE_LOGIN_URL = `/login`;
export const AUTH_LOGIN_URL = `${USER_AUTH_URL}/login`;
export const SIGNUP_SUCCESS_URL = `/signup-success`;
-export const ORG_INVITE_USERS_PAGE_URL = `${ORG_URL}/invite`;
-export const ORG_SETTINGS_PAGE_URL = `${ORG_URL}/settings`;
+export const WORKSPACE_INVITE_USERS_PAGE_URL = `${WORKSPACE_URL}/invite`;
+export const WORKSPACE_SETTINGS_PAGE_URL = `${WORKSPACE_URL}/settings`;
export const BUILDER_PATH_DEPRECATED = `/applications/:applicationId/(pages)?/:pageId?/edit`;
export const BUILDER_PATH = `/app/:applicationSlug/:pageSlug(.*\-):pageId/edit`;
export const VIEWER_PATH = `/app/:applicationSlug/:pageSlug(.*\-):pageId`;
diff --git a/app/client/src/constants/userConstants.ts b/app/client/src/constants/userConstants.ts
index ee02bfc18620..51d23132a8db 100644
--- a/app/client/src/constants/userConstants.ts
+++ b/app/client/src/constants/userConstants.ts
@@ -9,7 +9,7 @@ export enum CommentsOnboardingState {
export type User = {
email: string;
- organizationIds: string[];
+ workspaceIds: string[];
username: string;
name: string;
gender: Gender;
@@ -35,7 +35,7 @@ export const CurrentUserDetailsRequestPayload = {
export const DefaultCurrentUserDetails: User = {
name: ANONYMOUS_USERNAME,
email: ANONYMOUS_USERNAME,
- organizationIds: [],
+ workspaceIds: [],
username: ANONYMOUS_USERNAME,
gender: "MALE",
isSuperUser: false,
diff --git a/app/client/src/constants/orgConstants.ts b/app/client/src/constants/workspaceConstants.ts
similarity index 73%
rename from app/client/src/constants/orgConstants.ts
rename to app/client/src/constants/workspaceConstants.ts
index e200c3ff6c1f..c2fa78e6bdde 100644
--- a/app/client/src/constants/orgConstants.ts
+++ b/app/client/src/constants/workspaceConstants.ts
@@ -1,13 +1,13 @@
import { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
-export type OrgRole = {
+export type WorkspaceRole = {
id: string;
name: string;
displayName?: string;
isDefault?: boolean;
};
-export type Org = {
+export type Workspace = {
id: string;
name: string;
website?: string;
@@ -17,7 +17,7 @@ export type Org = {
userPermissions?: string[];
};
-export type OrgUser = {
+export type WorkspaceUser = {
username: string;
name: string;
roleName: string;
@@ -25,8 +25,8 @@ export type OrgUser = {
isChangingRole: boolean;
};
-export type Organization = {
+export type Workspaces = {
applications: ApplicationPayload[];
- organization: Org;
- userRoles: OrgUser[];
+ workspace: Workspace;
+ userRoles: WorkspaceUser[];
};
diff --git a/app/client/src/ee/selectors/organizationSelectors.tsx b/app/client/src/ee/selectors/organizationSelectors.tsx
deleted file mode 100644
index 49474f8ce5e3..000000000000
--- a/app/client/src/ee/selectors/organizationSelectors.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "ce/selectors/organizationSelectors";
diff --git a/app/client/src/ee/selectors/workspaceSelectors.tsx b/app/client/src/ee/selectors/workspaceSelectors.tsx
new file mode 100644
index 000000000000..305f985583cb
--- /dev/null
+++ b/app/client/src/ee/selectors/workspaceSelectors.tsx
@@ -0,0 +1 @@
+export * from "ce/selectors/workspaceSelectors";
diff --git a/app/client/src/entities/Action/actionProperties.test.ts b/app/client/src/entities/Action/actionProperties.test.ts
index 5e0898391f80..f22680dae343 100644
--- a/app/client/src/entities/Action/actionProperties.test.ts
+++ b/app/client/src/entities/Action/actionProperties.test.ts
@@ -15,7 +15,7 @@ const DEFAULT_ACTION: Action = {
isValid: false,
jsonPathKeys: [],
name: "",
- organizationId: "",
+ workspaceId: "",
pageId: "",
pluginId: "",
messages: [],
diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
index 749658413e77..7772d9c78622 100644
--- a/app/client/src/entities/Action/index.ts
+++ b/app/client/src/entities/Action/index.ts
@@ -79,7 +79,7 @@ export interface StoredDatasource {
export interface BaseAction {
id: string;
name: string;
- organizationId: string;
+ workspaceId: string;
pageId: string;
collectionId?: string;
pluginId: string;
diff --git a/app/client/src/entities/DataTree/dataTreeJSAction.test.ts b/app/client/src/entities/DataTree/dataTreeJSAction.test.ts
index d71020242923..7236cc08643e 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",
- organizationId: "org123",
+ workspaceId: "org123",
name: "JSObject2",
pageId: "page123",
pluginId: "plugin123",
@@ -20,7 +20,7 @@ describe("generateDataTreeJSAction", () => {
{
id: "abcd",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "org123",
pluginType: PluginType.JS,
pluginId: "plugin123",
name: "myFun2",
@@ -29,7 +29,7 @@ describe("generateDataTreeJSAction", () => {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "org123",
messages: [],
isValid: true,
new: true,
@@ -67,7 +67,7 @@ describe("generateDataTreeJSAction", () => {
{
id: "623973054d9aea1b062af87b",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "org123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -76,7 +76,7 @@ describe("generateDataTreeJSAction", () => {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "org123",
messages: [],
isValid: true,
new: true,
@@ -195,7 +195,7 @@ describe("generateDataTreeJSAction", () => {
config: {
id: "1234",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "org123",
name: "JSObject2",
pageId: "page123",
pluginId: "plugin123",
@@ -206,7 +206,7 @@ describe("generateDataTreeJSAction", () => {
{
id: "abcd",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "org123",
pluginType: PluginType.JS,
pluginId: "plugin123",
name: "myFun2",
@@ -215,7 +215,7 @@ describe("generateDataTreeJSAction", () => {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "org123",
messages: [],
isValid: true,
new: true,
@@ -253,7 +253,7 @@ describe("generateDataTreeJSAction", () => {
{
id: "623973054d9aea1b062af87b",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "org123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -262,7 +262,7 @@ describe("generateDataTreeJSAction", () => {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "org123",
messages: [],
isValid: true,
new: true,
diff --git a/app/client/src/entities/Datasource/RestAPIForm.ts b/app/client/src/entities/Datasource/RestAPIForm.ts
index 54812964135b..ee9e5679392b 100644
--- a/app/client/src/entities/Datasource/RestAPIForm.ts
+++ b/app/client/src/entities/Datasource/RestAPIForm.ts
@@ -47,7 +47,7 @@ export interface Certificate {
export interface ApiDatasourceForm {
datasourceId: string;
pluginId: string;
- organizationId: string;
+ workspaceId: string;
isValid: boolean;
url: string;
headers?: Property[];
diff --git a/app/client/src/entities/Datasource/index.ts b/app/client/src/entities/Datasource/index.ts
index 46989346e98a..881ea9016610 100644
--- a/app/client/src/entities/Datasource/index.ts
+++ b/app/client/src/entities/Datasource/index.ts
@@ -59,7 +59,7 @@ export interface DatasourceTable {
interface BaseDatasource {
pluginId: string;
name: string;
- organizationId: string;
+ workspaceId: string;
isValid: boolean;
isConfigured?: boolean;
}
@@ -111,7 +111,7 @@ export interface MockDatasource {
export const DEFAULT_DATASOURCE = (
pluginId: string,
- organizationId: string,
+ workspaceId: string,
): EmbeddedRestDatasource => ({
name: "DEFAULT_REST_DATASOURCE",
datasourceConfiguration: {
@@ -120,6 +120,6 @@ export const DEFAULT_DATASOURCE = (
invalids: [],
isValid: true,
pluginId,
- organizationId,
+ workspaceId,
messages: [],
});
diff --git a/app/client/src/entities/JSCollection/index.ts b/app/client/src/entities/JSCollection/index.ts
index a74975f206c7..04031eafecae 100644
--- a/app/client/src/entities/JSCollection/index.ts
+++ b/app/client/src/entities/JSCollection/index.ts
@@ -8,7 +8,7 @@ export type Variable = {
export interface JSCollection {
id: string;
applicationId: string;
- organizationId: string;
+ workspaceId: string;
name: string;
pageId: string;
pluginId: string;
diff --git a/app/client/src/icons/MenuIcons.tsx b/app/client/src/icons/MenuIcons.tsx
index 1d92b2fbc4ac..bc158d343442 100644
--- a/app/client/src/icons/MenuIcons.tsx
+++ b/app/client/src/icons/MenuIcons.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { IconProps, IconWrapper } from "constants/IconConstants";
import WidgetsIcon from "remixicon-react/FunctionLineIcon";
import { ReactComponent as ApisIcon } from "assets/icons/menu/api.svg";
-import { ReactComponent as OrgIcon } from "assets/icons/menu/org.svg";
+import { ReactComponent as WorkspaceIcon } from "assets/icons/menu/workspace.svg";
import PageIcon from "remixicon-react/PagesLineIcon";
import { ReactComponent as DataSourcesIcon } from "assets/icons/menu/data-sources.svg";
import { ReactComponent as QueriesIcon } from "assets/icons/menu/queries.svg";
@@ -80,9 +80,9 @@ export const MenuIcons: {
<ApisIcon />
</IconWrapper>
),
- ORG_ICON: (props: IconProps) => (
+ WORKSPACE_ICON: (props: IconProps) => (
<IconWrapper {...props}>
- <OrgIcon />
+ <WorkspaceIcon />
</IconWrapper>
),
PAGES_ICON: (props: IconProps) => (
diff --git a/app/client/src/mockResponses/ApplicationsNewMockResponse.json b/app/client/src/mockResponses/ApplicationsNewMockResponse.json
index f6064a675354..79f13e422d11 100644
--- a/app/client/src/mockResponses/ApplicationsNewMockResponse.json
+++ b/app/client/src/mockResponses/ApplicationsNewMockResponse.json
@@ -12,8 +12,8 @@
"email":"[email protected]",
"source":"FORM",
"isEnabled":true,
- "currentOrganizationId":"6065e4b7034ece74b1481819",
- "organizationIds":[
+ "currentWorkspaceId":"6065e4b7034ece74b1481819",
+ "workspaceIds":[
"6065e4a8034ece74b1481818",
"6065e4b7034ece74b1481819"
],
@@ -37,17 +37,17 @@
},
"new":false
},
- "organizationApplications":[
+ "workspaceApplications":[
{
- "organization":{
+ "workspace":{
"id":"6065e4a8034ece74b1481818",
"userPermissions":[
- "read:organizations",
- "manage:orgApplications",
- "manage:organizations",
- "inviteUsers:organization",
- "publish:orgApplications",
- "read:orgApplications"
+ "read:workspaces",
+ "manage:workspaceApplications",
+ "manage:workspaces",
+ "inviteUsers:workspaces",
+ "publish:workspaceApplications",
+ "read:workspaceApplications"
],
"name":"b1's apps",
"email":"[email protected]",
@@ -164,15 +164,15 @@
]
},
{
- "organization":{
+ "workspace":{
"id":"6065e4b7034ece74b1481819",
"userPermissions":[
- "read:organizations",
- "manage:orgApplications",
- "manage:organizations",
- "inviteUsers:organization",
- "publish:orgApplications",
- "read:orgApplications"
+ "read:workspaces",
+ "manage:workspaceApplications",
+ "manage:workspaces",
+ "inviteUsers:workspaces",
+ "publish:workspaceApplications",
+ "read:workspaceApplications"
],
"name":"new org",
"email":"[email protected]",
diff --git a/app/client/src/mockResponses/CommentApiMockResponse.tsx b/app/client/src/mockResponses/CommentApiMockResponse.tsx
index a8aaafae2f69..a9e459f2e552 100644
--- a/app/client/src/mockResponses/CommentApiMockResponse.tsx
+++ b/app/client/src/mockResponses/CommentApiMockResponse.tsx
@@ -370,7 +370,7 @@ export const fetchPagesMockResponse = {
success: true,
},
data: {
- organizationId: "605c433c91dea93f0eaf91b5",
+ workspaceId: "605c433c91dea93f0eaf91b5",
pages: [
{
id: "605c435a91dea93f0eaf91ba",
diff --git a/app/client/src/mockResponses/CreateOrganisationMockResponse.json b/app/client/src/mockResponses/CreateWorkspaceMockResponse.json
similarity index 100%
rename from app/client/src/mockResponses/CreateOrganisationMockResponse.json
rename to app/client/src/mockResponses/CreateWorkspaceMockResponse.json
diff --git a/app/client/src/notifications/NotificationListItem.tsx b/app/client/src/notifications/NotificationListItem.tsx
index e19008f3f9c4..7192612b38f2 100644
--- a/app/client/src/notifications/NotificationListItem.tsx
+++ b/app/client/src/notifications/NotificationListItem.tsx
@@ -18,7 +18,7 @@ import moment from "moment";
import styled from "styled-components";
import { APP_MODE } from "entities/App";
-import OrgApi from "api/OrgApi";
+import WorkspaceApi from "api/WorkspaceApi";
import {
isPermitted,
@@ -79,12 +79,14 @@ const UnreadIndicator = styled.div`
props.theme.colors.notifications.unreadIndicator};
`;
-const getModeFromUserRole = async (orgId: string) => {
+const getModeFromUserRole = async (workspaceId: string) => {
try {
- const response = (await OrgApi.fetchOrg({ orgId })) as any;
- const userOrgPermissions = response?.data?.userPermissions || [];
+ const response = (await WorkspaceApi.fetchWorkspace({
+ workspaceId,
+ })) as any;
+ const userWorkspacePermissions = response?.data?.userPermissions || [];
const canPublish = isPermitted(
- userOrgPermissions,
+ userWorkspacePermissions,
PERMISSION_TYPE.PUBLISH_APPLICATION,
);
@@ -119,10 +121,10 @@ function CommentNotification(props: { notification: AppsmithNotification }) {
authorUsername,
branchName,
mode: modeFromComment,
- orgId,
pageId,
- // resolvedState, TODO get from comment thread
threadId,
+ // resolvedState, TODO get from comment thread
+ workspaceId,
} = comment;
const _createdAt = createdAt || creationTime;
@@ -135,7 +137,7 @@ function CommentNotification(props: { notification: AppsmithNotification }) {
}
const handleClick = async () => {
- const modeFromRole = await getModeFromUserRole(orgId);
+ const modeFromRole = await getModeFromUserRole(workspaceId);
const mode = getModeFromRoleAndDomain(modeFromRole, modeFromComment);
const commentThreadUrl = getCommentThreadURL({
@@ -196,15 +198,15 @@ function CommentThreadNotification(props: {
branchName,
id,
mode: modeFromThread,
- orgId,
pageId,
resolvedState,
+ workspaceId,
} = commentThread;
const commentThreadId = _id || id;
const handleClick = async () => {
- const modeFromRole = await getModeFromUserRole(orgId);
+ const modeFromRole = await getModeFromUserRole(workspaceId);
const mode = getModeFromRoleAndDomain(modeFromRole, modeFromThread);
const commentThreadUrl = getCommentThreadURL({
diff --git a/app/client/src/pages/AppViewer/AppViewerHeader.tsx b/app/client/src/pages/AppViewer/AppViewerHeader.tsx
index 8d93f2214823..fcd992cb8871 100644
--- a/app/client/src/pages/AppViewer/AppViewerHeader.tsx
+++ b/app/client/src/pages/AppViewer/AppViewerHeader.tsx
@@ -12,8 +12,8 @@ import { AppState } from "reducers";
import { getEditorURL } from "selectors/appViewSelectors";
import { getViewModePageList } from "selectors/editorSelectors";
import { FormDialogComponent } from "components/editorComponents/form/FormDialogComponent";
-import AppInviteUsersForm from "pages/organization/AppInviteUsersForm";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { getCurrentUser } from "selectors/usersSelectors";
import { ANONYMOUS_USERNAME, User } from "constants/userConstants";
@@ -119,7 +119,7 @@ type AppViewerHeaderProps = {
url?: string;
currentApplicationDetails?: ApplicationPayload;
pages: PageListPayload;
- currentOrgId: string;
+ currentWorkspaceId: string;
currentUser?: User;
lightTheme: Theme;
};
@@ -128,7 +128,12 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
const selectedTheme = useSelector(getSelectedAppTheme);
const [isMenuOpen, setMenuOpen] = useState(false);
const headerRef = useRef<HTMLDivElement>(null);
- const { currentApplicationDetails, currentOrgId, currentUser, pages } = props;
+ const {
+ currentApplicationDetails,
+ currentUser,
+ currentWorkspaceId,
+ pages,
+ } = props;
const { search } = useLocation();
const queryParams = new URLSearchParams(search);
const isEmbed = queryParams.get("embed");
@@ -181,7 +186,6 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
bgColor: "transparent",
}}
isOpen={showAppInviteUsersDialog}
- orgId={currentOrgId}
title={currentApplicationDetails.name}
trigger={
<Button
@@ -197,6 +201,7 @@ export function AppViewerHeader(props: AppViewerHeaderProps) {
text="Share"
/>
}
+ workspaceId={currentWorkspaceId}
/>
<HeaderRightItemContainer>
@@ -244,7 +249,7 @@ const mapStateToProps = (state: AppState): AppViewerHeaderProps => ({
pages: getViewModePageList(state),
url: getEditorURL(state),
currentApplicationDetails: state.ui.applications.currentApplication,
- currentOrgId: getCurrentOrgId(state),
+ currentWorkspaceId: getCurrentWorkspaceId(state),
currentUser: getCurrentUser(state),
lightTheme: getThemeDetails(state, ThemeMode.LIGHT),
});
diff --git a/app/client/src/pages/AppViewer/PageMenu.tsx b/app/client/src/pages/AppViewer/PageMenu.tsx
index a41d9048c05c..ecb6ccc219ae 100644
--- a/app/client/src/pages/AppViewer/PageMenu.tsx
+++ b/app/client/src/pages/AppViewer/PageMenu.tsx
@@ -13,14 +13,14 @@ import { useSelector } from "react-redux";
import classNames from "classnames";
import PrimaryCTA from "./PrimaryCTA";
import Button from "./AppViewerButton";
-import AppInviteUsersForm from "pages/organization/AppInviteUsersForm";
+import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm";
import FormDialogComponent from "components/editorComponents/form/FormDialogComponent";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { getSelectedAppTheme } from "selectors/appThemingSelectors";
import BrandingBadge from "./BrandingBadgeMobile";
import { getAppViewHeaderHeight } from "selectors/appViewSelectors";
import { useOnClickOutside } from "utils/hooks/useOnClickOutside";
-import { getShowBrandingBadge } from "@appsmith/selectors/organizationSelectors";
+import { getShowBrandingBadge } from "@appsmith/selectors/workspaceSelectors";
type AppViewerHeaderProps = {
isOpen?: boolean;
@@ -36,7 +36,7 @@ export function PageMenu(props: AppViewerHeaderProps) {
const appMode = useSelector(getAppMode);
const menuRef = useRef<any>();
const selectedTheme = useSelector(getSelectedAppTheme);
- const organisationID = useSelector(getCurrentOrgId);
+ const workspaceID = useSelector(getCurrentWorkspaceId);
const showAppInviteUsersDialog = useSelector(
showAppInviteUsersDialogSelector,
);
@@ -122,7 +122,6 @@ export function PageMenu(props: AppViewerHeaderProps) {
bgColor: "transparent",
}}
isOpen={showAppInviteUsersDialog}
- orgId={organisationID}
title={application.name}
trigger={
<Button
@@ -136,6 +135,7 @@ export function PageMenu(props: AppViewerHeaderProps) {
text="Share"
/>
}
+ workspaceId={workspaceID}
/>
)}
<PrimaryCTA className="t--back-to-editor--mobile" url={props.url} />
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index 89a61d9e89e7..d908b647d6fe 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -40,12 +40,12 @@ import {
} from "actions/controlActions";
import { setAppViewHeaderHeight } from "actions/appViewActions";
import { showPostCompletionMessage } from "selectors/onboardingSelectors";
+import { getShowBrandingBadge } from "@appsmith/selectors/workspaceSelectors";
import { fetchPublishedPage } from "actions/pageActions";
import usePrevious from "utils/hooks/usePrevious";
import { getIsBranchUpdated } from "../utils";
import { APP_MODE } from "entities/App";
import { initAppViewer } from "actions/initActions";
-import { getShowBrandingBadge } from "@appsmith/selectors/organizationSelectors";
const AppViewerBody = styled.section<{
hasPages: boolean;
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 9d3e1c463396..6f0228460aa4 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -552,7 +552,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
};
const forkApplicationInitiate = () => {
// open fork application modal
- // on click on an organisation, create app and take to app
+ // on click on an workspace, create app and take to app
setForkApplicationModalOpen(true);
};
const deleteApp = () => {
diff --git a/app/client/src/pages/Applications/ApplicationLoaders.tsx b/app/client/src/pages/Applications/ApplicationLoaders.tsx
index bb0126816fa2..dfc214dee369 100644
--- a/app/client/src/pages/Applications/ApplicationLoaders.tsx
+++ b/app/client/src/pages/Applications/ApplicationLoaders.tsx
@@ -23,13 +23,13 @@ export const LoadingAnimation = createGlobalStyle<{ theme: Theme }>`
}
`;
-export const loadingUserOrgs = [
+export const loadingUserWorkspaces = [
{
- organization: {
- id: "loadingOrgId1",
- userPermissions: ["read:organizations", "read:orgApplications"],
- name: "loadingOrgName1",
- organizationSettings: [],
+ workspace: {
+ id: "loadingWorkspaceId1",
+ userPermissions: ["read:workspaces", "read:workspaceApplications"],
+ name: "loadingWorkspaceName1",
+ workspaceSettings: [],
plugins: [
{
userPermissions: [],
@@ -71,7 +71,7 @@ export const loadingUserOrgs = [
id: "loadingAppId1",
userPermissions: ["read:applications"],
name: "loadingAppName1",
- organizationId: "loadingOrgId1",
+ workspaceId: "loadingWorkspaceId1",
isPublic: false,
pages: [
{
@@ -88,7 +88,7 @@ export const loadingUserOrgs = [
id: "loadingAppId2",
userPermissions: ["read:applications"],
name: "loadingAppName2",
- organizationId: "loadingOrgId1",
+ workspaceId: "loadingWorkspaceId1",
isPublic: false,
pages: [
{
@@ -105,18 +105,18 @@ export const loadingUserOrgs = [
],
},
{
- organization: {
- id: "loadingOrgId2",
+ workspace: {
+ id: "loadingWorkspaceId2",
userPermissions: [
- "read:organizations",
- "manage:orgApplications",
- "inviteUsers:organization",
- "manage:organizations",
- "publish:orgApplications",
- "read:orgApplications",
+ "read:workspaces",
+ "manage:workspaceApplications",
+ "inviteUsers:workspace",
+ "manage:workspaces",
+ "publish:workspaceApplications",
+ "read:workspaceApplications",
],
- name: "loadingOrgName2",
- organizationSettings: [],
+ name: "loadingWorkspaceName2",
+ workspaceSettings: [],
plugins: [
{
userPermissions: [],
@@ -158,7 +158,7 @@ export const loadingUserOrgs = [
id: "loadingAppId3",
userPermissions: ["read:applications"],
name: "loadingAppName3",
- organizationId: "loadingOrgId2",
+ workspaceId: "loadingWorkspaceId2",
isPublic: false,
pages: [
{
@@ -175,7 +175,7 @@ export const loadingUserOrgs = [
id: "loadingAppId4",
userPermissions: ["read:applications"],
name: "loadingAppName4",
- organizationId: "loadingOrgId2",
+ workspaceId: "loadingWorkspaceId2",
isPublic: false,
pages: [
{
@@ -192,7 +192,7 @@ export const loadingUserOrgs = [
id: "loadingAppId5",
userPermissions: ["read:applications"],
name: "loadingAppName5",
- organizationId: "loadingOrgId2",
+ workspaceId: "loadingWorkspaceId2",
isPublic: false,
pages: [
{
diff --git a/app/client/src/pages/Applications/CreateApplicationForm.tsx b/app/client/src/pages/Applications/CreateApplicationForm.tsx
index 68fbeab07cee..019ed75338aa 100644
--- a/app/client/src/pages/Applications/CreateApplicationForm.tsx
+++ b/app/client/src/pages/Applications/CreateApplicationForm.tsx
@@ -22,12 +22,12 @@ type Props = InjectedFormProps<
CreateApplicationFormValues,
{
onCancel: () => void;
- orgId: string;
+ workspaceId: string;
initialValues: Record<string, unknown>;
}
> & {
onCancel: () => void;
- orgId: string;
+ workspaceId: string;
initialValues: Record<string, unknown>;
};
@@ -58,7 +58,7 @@ function CreateApplicationForm(props: Props) {
name={CREATE_APPLICATION_FORM_NAME_FIELD}
placeholder="Name"
/>
- <Field component="input" name="orgId" type="hidden" />
+ <Field component="input" name="workspaceId" type="hidden" />
</FormGroup>
<FormFooter
canSubmit={!invalid}
@@ -76,9 +76,9 @@ function CreateApplicationForm(props: Props) {
}
const mapStateToProps = (state: AppState, props: Props): any => {
- const orgId = props.orgId;
+ const workspaceId = props.workspaceId;
return {
- initialValues: { orgId },
+ initialValues: { workspaceId },
};
};
@@ -87,7 +87,7 @@ export default connect(mapStateToProps)(
CreateApplicationFormValues,
{
onCancel: () => void;
- orgId: string;
+ workspaceId: string;
initialValues: Record<string, unknown>;
}
>({
diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx
index fed4cab1d5c3..4a19c1ee0a20 100644
--- a/app/client/src/pages/Applications/ForkApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx
@@ -1,7 +1,7 @@
import React, { useState, useMemo, useEffect } from "react";
import { useDispatch } from "react-redux";
import { useSelector } from "store";
-import { getUserApplicationsOrgs } from "selectors/applicationSelectors";
+import { getUserApplicationsWorkspaces } from "selectors/applicationSelectors";
import { isPermitted, PERMISSION_TYPE } from "./permissionHelpers";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { AppState } from "reducers";
@@ -35,21 +35,21 @@ type ForkApplicationModalProps = {
function ForkApplicationModal(props: ForkApplicationModalProps) {
const { isModalOpen, setModalClose } = props;
- const [organization, selectOrganization] = useState<{
+ const [workspace, selectWorkspace] = useState<{
label: string;
value: string;
}>({ label: "", value: "" });
const dispatch = useDispatch();
- const userOrgs = useSelector(getUserApplicationsOrgs);
+ const userWorkspaces = useSelector(getUserApplicationsWorkspaces);
const forkingApplication = useSelector(
(state: AppState) => state.ui.applications.forkingApplication,
);
useEffect(() => {
- if (!userOrgs.length) {
+ if (!userWorkspaces.length) {
dispatch(getAllApplications());
}
- }, [userOrgs.length]);
+ }, [userWorkspaces.length]);
const isFetchingApplications = useSelector(getIsFetchingApplications);
const { pathname } = useLocation();
@@ -61,38 +61,38 @@ function ForkApplicationModal(props: ForkApplicationModalProps) {
type: ReduxActionTypes.FORK_APPLICATION_INIT,
payload: {
applicationId: props.applicationId,
- organizationId: organization?.value,
+ workspaceId: workspace?.value,
},
});
};
- const organizationList = useMemo(() => {
- const filteredUserOrgs = userOrgs.filter((item) => {
+ const workspaceList = useMemo(() => {
+ const filteredUserWorkspaces = userWorkspaces.filter((item) => {
const permitted = isPermitted(
- item.organization.userPermissions ?? [],
+ item.workspace.userPermissions ?? [],
PERMISSION_TYPE.CREATE_APPLICATION,
);
return permitted;
});
- if (filteredUserOrgs.length) {
- selectOrganization({
- label: filteredUserOrgs[0].organization.name,
- value: filteredUserOrgs[0].organization.id,
+ if (filteredUserWorkspaces.length) {
+ selectWorkspace({
+ label: filteredUserWorkspaces[0].workspace.name,
+ value: filteredUserWorkspaces[0].workspace.id,
});
}
- return filteredUserOrgs.map((org) => {
+ return filteredUserWorkspaces.map((workspace) => {
return {
- label: org.organization.name,
- value: org.organization.id,
+ label: workspace.workspace.name,
+ value: workspace.workspace.id,
};
});
- }, [userOrgs]);
+ }, [userWorkspaces]);
const modalHeading = isFetchingApplications
? createMessage(FORK_APP_MODAL_LOADING_TITLE)
- : !organizationList.length
+ : !workspaceList.length
? createMessage(FORK_APP_MODAL_EMPTY_TITLE)
: createMessage(FORK_APP_MODAL_SUCCESS_TITLE);
@@ -111,17 +111,15 @@ function ForkApplicationModal(props: ForkApplicationModalProps) {
<Spinner size={IconSize.XXXL} />
</SpinnerWrapper>
) : (
- !!organizationList.length && (
+ !!workspaceList.length && (
<>
<Dropdown
boundary="viewport"
dropdownMaxHeight={"200px"}
fillOptions
- onSelect={(_, dropdownOption) =>
- selectOrganization(dropdownOption)
- }
- options={organizationList}
- selected={organization}
+ onSelect={(_, dropdownOption) => selectWorkspace(dropdownOption)}
+ options={workspaceList}
+ selected={workspace}
showLabelOnly
width={"100%"}
/>
@@ -136,7 +134,7 @@ function ForkApplicationModal(props: ForkApplicationModalProps) {
text={createMessage(CANCEL)}
/>
<Button
- className="t--fork-app-to-org-button"
+ className="t--fork-app-to-workspace-button"
isLoading={forkingApplication}
onClick={forkApplication}
size={Size.large}
diff --git a/app/client/src/pages/Applications/ForkModalStyles.ts b/app/client/src/pages/Applications/ForkModalStyles.ts
index b217809c9b38..ca2a8a6721ba 100644
--- a/app/client/src/pages/Applications/ForkModalStyles.ts
+++ b/app/client/src/pages/Applications/ForkModalStyles.ts
@@ -29,7 +29,7 @@ const ForkButton = styled(Button)<{ disabled?: boolean }>`
pointer-events: ${(props) => (!!props.disabled ? "none" : "auto")};
`;
-const OrganizationList = styled.div`
+const WorkspaceList = styled.div`
overflow: auto;
max-height: 250px;
margin-bottom: 10px;
@@ -53,7 +53,7 @@ export {
StyledDialog,
StyledRadioComponent,
ForkButton,
- OrganizationList,
+ WorkspaceList,
ButtonWrapper,
SpinnerWrapper,
};
diff --git a/app/client/src/pages/Applications/ImportApplicationModal.tsx b/app/client/src/pages/Applications/ImportApplicationModal.tsx
index 08e1ac239e1a..21986110410e 100644
--- a/app/client/src/pages/Applications/ImportApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ImportApplicationModal.tsx
@@ -5,7 +5,7 @@ import { FileType, SetProgress } from "components/ads/FilePicker";
import { useDispatch } from "react-redux";
import {
importApplication,
- setOrgIdForImport,
+ setWorkspaceIdForImport,
} from "actions/applicationActions";
import {
createMessage,
@@ -228,13 +228,13 @@ function GitImportCard(props: { children?: ReactNode; handler?: () => void }) {
type ImportApplicationModalProps = {
// import?: (file: any) => void;
- organizationId?: string;
+ workspaceId?: string;
isModalOpen?: boolean;
onClose?: () => void;
};
function ImportApplicationModal(props: ImportApplicationModalProps) {
- const { isModalOpen, onClose, organizationId } = props;
+ const { isModalOpen, onClose, workspaceId } = props;
const [appFileToBeUploaded, setAppFileToBeUploaded] = useState<{
file: File;
setProgress: SetProgress;
@@ -246,7 +246,7 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
dispatch({
type: ReduxActionTypes.GIT_INFO_INIT,
});
- dispatch(setOrgIdForImport(organizationId));
+ dispatch(setWorkspaceIdForImport(workspaceId));
dispatch(
setIsGitSyncModalOpen({
@@ -269,7 +269,7 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
});
dispatch(
importApplication({
- orgId: organizationId as string,
+ workspaceId: workspaceId as string,
applicationFile: file,
}),
);
diff --git a/app/client/src/pages/Applications/ImportApplicationModalOld.tsx b/app/client/src/pages/Applications/ImportApplicationModalOld.tsx
index 59d815e1c8cc..6b9b16915111 100644
--- a/app/client/src/pages/Applications/ImportApplicationModalOld.tsx
+++ b/app/client/src/pages/Applications/ImportApplicationModalOld.tsx
@@ -33,13 +33,13 @@ const FilePickerWrapper = styled.div`
type ImportApplicationModalProps = {
// import?: (file: any) => void;
- organizationId?: string;
+ workspaceId?: string;
isModalOpen?: boolean;
onClose?: () => void;
};
function ImportApplicationModal(props: ImportApplicationModalProps) {
- const { isModalOpen, onClose, organizationId } = props;
+ const { isModalOpen, onClose, workspaceId } = props;
const [appFileToBeUploaded, setAppFileToBeUploaded] = useState<{
file: File;
setProgress: SetProgress;
@@ -74,11 +74,11 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
dispatch(
importApplication({
- orgId: organizationId as string,
+ workspaceId: workspaceId as string,
applicationFile: file,
}),
);
- }, [appFileToBeUploaded, organizationId]);
+ }, [appFileToBeUploaded, workspaceId]);
const onRemoveFile = useCallback(() => setAppFileToBeUploaded(null), []);
@@ -102,7 +102,7 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
<ButtonWrapper>
<ImportButton
// category={ButtonCategory.tertiary}
- cypressSelector={"t--org-import-app-button"}
+ cypressSelector={"t--workspace-import-app-button"}
disabled={!appFileToBeUploaded}
isLoading={importingApplication}
onClick={onImportApplication}
diff --git a/app/client/src/pages/Applications/helpers.ts b/app/client/src/pages/Applications/helpers.ts
index 0e1ea35795a4..03f214fbf435 100644
--- a/app/client/src/pages/Applications/helpers.ts
+++ b/app/client/src/pages/Applications/helpers.ts
@@ -4,7 +4,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { SubmissionError } from "redux-form";
export type CreateApplicationFormValues = {
applicationName: string;
- orgId: string;
+ workspaceId: string;
colorCode?: AppColorCode;
appName?: AppIconName;
};
@@ -15,7 +15,7 @@ export const createApplicationFormSubmitHandler = (
values: CreateApplicationFormValues,
dispatch: any,
): Promise<any> => {
- const { applicationName, orgId } = values;
+ const { applicationName, workspaceId } = values;
return new Promise((resolve, reject) => {
dispatch({
type: ReduxActionTypes.CREATE_APPLICATION_INIT,
@@ -23,7 +23,7 @@ export const createApplicationFormSubmitHandler = (
resolve,
reject,
applicationName,
- orgId,
+ workspaceId,
},
});
}).catch((error) => {
diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx
index eb655c34a407..33f539b18a13 100644
--- a/app/client/src/pages/Applications/index.tsx
+++ b/app/client/src/pages/Applications/index.tsx
@@ -24,9 +24,9 @@ import {
getIsDeletingApplication,
getIsDuplicatingApplication,
getIsFetchingApplications,
- getIsSavingOrgInfo,
- getUserApplicationsOrgs,
- getUserApplicationsOrgsList,
+ getIsSavingWorkspaceInfo,
+ getUserApplicationsWorkspaces,
+ getUserApplicationsWorkspacesList,
} from "selectors/applicationSelectors";
import {
ApplicationPayload,
@@ -35,13 +35,13 @@ import {
import PageWrapper from "pages/common/PageWrapper";
import SubHeader from "pages/common/SubHeader";
import ApplicationCard from "./ApplicationCard";
-import OrgInviteUsersForm from "pages/organization/OrgInviteUsersForm";
+import WorkspaceInviteUsersForm from "pages/workspace/WorkspaceInviteUsersForm";
import { isPermitted, PERMISSION_TYPE } from "./permissionHelpers";
import FormDialogComponent from "components/editorComponents/form/FormDialogComponent";
import Dialog from "components/ads/DialogComponent";
import { User } from "constants/userConstants";
import { getCurrentUser, selectFeatureFlags } from "selectors/usersSelectors";
-import { CREATE_ORGANIZATION_FORM_NAME } from "constants/forms";
+import { CREATE_WORKSPACE_FORM_NAME } from "constants/forms";
import {
DropdownOnSelectActions,
getOnSelectAction,
@@ -61,25 +61,25 @@ import { UpdateApplicationPayload } from "api/ApplicationApi";
import PerformanceTracker, {
PerformanceTransactionName,
} from "utils/PerformanceTracker";
-import { loadingUserOrgs } from "./ApplicationLoaders";
+import { loadingUserWorkspaces } from "./ApplicationLoaders";
import { creatingApplicationMap } from "reducers/uiReducers/applicationsReducer";
import EditableText, {
EditInteractionKind,
SavingState,
} from "components/ads/EditableText";
import { notEmptyValidator } from "components/ads/TextInput";
-import { deleteOrg, saveOrg } from "actions/orgActions";
-import { leaveOrganization } from "actions/userActions";
+import { deleteWorkspace, saveWorkspace } from "actions/workspaceActions";
+import { leaveWorkspace } from "actions/userActions";
import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
import NoSearchImage from "assets/images/NoSearchResult.svg";
import { getNextEntityName, getRandomPaletteColor } from "utils/AppsmithUtils";
import { AppIconCollection } from "components/ads/AppIcon";
-import { createOrganizationSubmitHandler } from "pages/organization/helpers";
+import { createWorkspaceSubmitHandler } from "pages/workspace/helpers";
import ImportApplicationModal from "./ImportApplicationModal";
import {
createMessage,
NO_APPS_FOUND,
- ORGANIZATIONS_HEADING,
+ WORKSPACES_HEADING,
SEARCH_APPS,
} from "@appsmith/constants/messages";
import { ReactComponent as NoAppsFoundIcon } from "assets/svg/no-apps-icon.svg";
@@ -97,7 +97,7 @@ import {
updateURLFactory,
} from "RouteBuilder";
-const OrgDropDown = styled.div<{ isMobile?: boolean }>`
+const WorkspaceDropDown = styled.div<{ isMobile?: boolean }>`
display: flex;
padding: ${(props) => (props.isMobile ? `10px 16px` : `10px 10px`)};
font-size: ${(props) => props.theme.fontSizes[1]}px;
@@ -121,7 +121,7 @@ const ApplicationCardsWrapper = styled.div<{ isMobile?: boolean }>`
padding: ${({ isMobile }) => (isMobile ? `10px 16px` : `10px`)};
`;
-const OrgSection = styled.div<{ isMobile?: boolean }>`
+const WorkspaceSection = styled.div<{ isMobile?: boolean }>`
margin-bottom: ${({ isMobile }) => (isMobile ? `8` : `40`)}px;
`;
@@ -228,7 +228,7 @@ const ItemWrapper = styled.div`
const StyledIcon = styled(Icon)`
margin-right: 11px;
`;
-const OrgShareUsers = styled.div`
+const WorkspaceShareUsers = styled.div`
display: flex;
align-items: center;
@@ -342,7 +342,11 @@ const textIconStyles = (props: { color: string; hover: string }) => {
`;
};
-function OrgMenuItem({ isFetchingApplications, org, selected }: any) {
+function WorkspaceMenuItem({
+ isFetchingApplications,
+ selected,
+ workspace,
+}: any) {
const menuRef = useRef<HTMLAnchorElement>(null);
useEffect(() => {
if (selected) {
@@ -357,32 +361,32 @@ function OrgMenuItem({ isFetchingApplications, org, selected }: any) {
isFetchingApplications ? BlueprintClasses.SKELETON : ""
}
ellipsize={20}
- href={`${window.location.pathname}#${org.organization.id}`}
+ href={`${window.location.pathname}#${workspace.workspace.id}`}
icon="workspace"
- key={org.organization.id}
+ key={workspace.workspace.id}
ref={menuRef}
selected={selected}
- text={org.organization.name}
+ text={workspace.workspace.name}
tooltipPos={Position.BOTTOM_LEFT}
/>
);
}
-const submitCreateOrganizationForm = async (data: any, dispatch: any) => {
- const result = await createOrganizationSubmitHandler(data, dispatch);
+const submitCreateWorkspaceForm = async (data: any, dispatch: any) => {
+ const result = await createWorkspaceSubmitHandler(data, dispatch);
return result;
};
function LeftPane() {
const dispatch = useDispatch();
- const fetchedUserOrgs = useSelector(getUserApplicationsOrgs);
+ const fetchedUserWorkspaces = useSelector(getUserApplicationsWorkspaces);
const isFetchingApplications = useSelector(getIsFetchingApplications);
const isMobile = useIsMobileDevice();
- let userOrgs;
+ let userWorkspaces;
if (!isFetchingApplications) {
- userOrgs = fetchedUserOrgs;
+ userWorkspaces = fetchedUserWorkspaces;
} else {
- userOrgs = loadingUserOrgs as any;
+ userWorkspaces = loadingUserWorkspaces as any;
}
const location = useLocation();
@@ -393,35 +397,35 @@ function LeftPane() {
return (
<LeftPaneWrapper>
<LeftPaneSection
- heading={createMessage(ORGANIZATIONS_HEADING)}
+ heading={createMessage(WORKSPACES_HEADING)}
isFetchingApplications={isFetchingApplications}
>
<WorkpsacesNavigator data-cy="t--left-panel">
- {!isFetchingApplications && fetchedUserOrgs && (
+ {!isFetchingApplications && fetchedUserWorkspaces && (
<MenuItem
- cypressSelector="t--org-new-organization-auto-create"
+ cypressSelector="t--workspace-new-workspace-auto-create"
icon="plus"
onSelect={() =>
- submitCreateOrganizationForm(
+ submitCreateWorkspaceForm(
{
name: getNextEntityName(
"Untitled organization ",
- fetchedUserOrgs.map((el: any) => el.organization.name),
+ fetchedUserWorkspaces.map((el: any) => el.workspace.name),
),
},
dispatch,
)
}
- text={CREATE_ORGANIZATION_FORM_NAME}
+ text={CREATE_WORKSPACE_FORM_NAME}
/>
)}
- {userOrgs &&
- userOrgs.map((org: any) => (
- <OrgMenuItem
+ {userWorkspaces &&
+ userWorkspaces.map((workspace: any) => (
+ <WorkspaceMenuItem
isFetchingApplications={isFetchingApplications}
- key={org.organization.id}
- org={org}
- selected={urlHash === org.organization.id}
+ key={workspace.workspace.id}
+ selected={urlHash === workspace.workspace.id}
+ workspace={workspace}
/>
))}
</WorkpsacesNavigator>
@@ -435,21 +439,21 @@ const CreateNewLabel = styled(Text)`
margin-top: 18px;
`;
-const OrgNameElement = styled(Text)<{ isMobile?: boolean }>`
+const WorkspaceNameElement = styled(Text)<{ isMobile?: boolean }>`
max-width: ${({ isMobile }) => (isMobile ? 220 : 500)}px;
${truncateTextUsingEllipsis}
`;
-const OrgNameHolder = styled(Text)`
+const WorkspaceNameHolder = styled(Text)`
display: flex;
align-items: center;
`;
-const OrgNameWrapper = styled.div<{ disabled?: boolean }>`
+const WorkspaceNameWrapper = styled.div<{ disabled?: boolean }>`
${(props) => {
const color = props.disabled
- ? props.theme.colors.applications.orgColor
- : props.theme.colors.applications.hover.orgColor[9];
+ ? props.theme.colors.applications.workspaceColor
+ : props.theme.colors.applications.hover.workspaceColor[9];
return `${textIconStyles({
color: color,
hover: color,
@@ -461,7 +465,7 @@ const OrgNameWrapper = styled.div<{ disabled?: boolean }>`
color: ${(props) => props.theme.colors.applications.iconColor};
}
`;
-const OrgRename = styled(EditableText)`
+const WorkspaceRename = styled(EditableText)`
padding: 0 2px;
`;
@@ -497,9 +501,9 @@ function ApplicationsSection(props: any) {
const enableImportExport = true;
const dispatch = useDispatch();
const theme = useContext(ThemeContext);
- const isSavingOrgInfo = useSelector(getIsSavingOrgInfo);
+ const isSavingWorkspaceInfo = useSelector(getIsSavingWorkspaceInfo);
const isFetchingApplications = useSelector(getIsFetchingApplications);
- const userOrgs = useSelector(getUserApplicationsOrgsList);
+ const userWorkspaces = useSelector(getUserApplicationsWorkspacesList);
const creatingApplicationMap = useSelector(getIsCreatingApplication);
const currentUser = useSelector(getCurrentUser);
const isMobile = useIsMobileDevice();
@@ -513,9 +517,11 @@ function ApplicationsSection(props: any) {
});
}
};
- const [warnLeavingOrganization, setWarnLeavingOrganization] = useState(false);
- const [warnDeleteOrg, setWarnDeleteOrg] = useState(false);
- const [orgToOpenMenu, setOrgToOpenMenu] = useState<string | null>(null);
+ const [warnLeavingWorkspace, setWarnLeavingWorkspace] = useState(false);
+ const [warnDeleteWorkspace, setWarnDeleteWorkspace] = useState(false);
+ const [workspaceToOpenMenu, setWorkspaceToOpenMenu] = useState<string | null>(
+ null,
+ );
const updateApplicationDispatch = (
id: string,
data: UpdateApplicationPayload,
@@ -533,64 +539,72 @@ function ApplicationsSection(props: any) {
dispatch(duplicateApplication(applicationId));
};
- const [selectedOrgId, setSelectedOrgId] = useState<string | undefined>();
+ const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<
+ string | undefined
+ >();
const [
- selectedOrgIdForImportApplication,
- setSelectedOrgIdForImportApplication,
+ selectedWorkspaceIdForImportApplication,
+ setSelectedWorkspaceIdForImportApplication,
] = useState<string | undefined>();
- const Form: any = OrgInviteUsersForm;
+ const Form: any = WorkspaceInviteUsersForm;
- const leaveOrg = (orgId: string) => {
- setWarnLeavingOrganization(false);
- setOrgToOpenMenu(null);
- dispatch(leaveOrganization(orgId));
+ const leaveWS = (workspaceId: string) => {
+ setWarnLeavingWorkspace(false);
+ setWorkspaceToOpenMenu(null);
+ dispatch(leaveWorkspace(workspaceId));
};
- const handleDeleteOrg = useCallback(
- (orgId: string) => {
- setWarnDeleteOrg(false);
- setOrgToOpenMenu(null);
- dispatch(deleteOrg(orgId));
+ const handleDeleteWorkspace = useCallback(
+ (workspaceId: string) => {
+ setWarnDeleteWorkspace(false);
+ setWorkspaceToOpenMenu(null);
+ dispatch(deleteWorkspace(workspaceId));
},
[dispatch],
);
- const OrgNameChange = (newName: string, orgId: string) => {
+ const WorkspaceNameChange = (newName: string, workspaceId: string) => {
dispatch(
- saveOrg({
- id: orgId as string,
+ saveWorkspace({
+ id: workspaceId as string,
name: newName,
}),
);
};
- function OrgMenuTarget(props: {
- orgName: string;
+ function WorkspaceMenuTarget(props: {
+ workspaceName: string;
disabled?: boolean;
- orgSlug: string;
+ workspaceSlug: string;
}) {
- const { disabled, orgName, orgSlug } = props;
+ const { disabled, workspaceName, workspaceSlug } = props;
return (
- <OrgNameWrapper className="t--org-name-text" disabled={disabled}>
- <StyledAnchor id={orgSlug} />
- <OrgNameHolder
+ <WorkspaceNameWrapper
+ className="t--workspace-name-text"
+ disabled={disabled}
+ >
+ <StyledAnchor id={workspaceSlug} />
+ <WorkspaceNameHolder
className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
type={TextType.H1}
>
- <OrgNameElement
+ <WorkspaceNameElement
className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
isMobile={isMobile}
type={TextType.H1}
>
- {orgName}
- </OrgNameElement>
- </OrgNameHolder>
- </OrgNameWrapper>
+ {workspaceName}
+ </WorkspaceNameElement>
+ </WorkspaceNameHolder>
+ </WorkspaceNameWrapper>
);
}
- const createNewApplication = (applicationName: string, orgId: string) => {
+ const createNewApplication = (
+ applicationName: string,
+ workspaceId: string,
+ ) => {
const color = getRandomPaletteColor(theme.colors.appCardColors);
const icon =
AppIconCollection[Math.floor(Math.random() * AppIconCollection.length)];
@@ -599,28 +613,28 @@ function ApplicationsSection(props: any) {
type: ReduxActionTypes.CREATE_APPLICATION_INIT,
payload: {
applicationName,
- orgId,
+ workspaceId,
icon,
color,
},
});
};
- let updatedOrgs;
+ let updatedWorkspaces;
if (!isFetchingApplications) {
- updatedOrgs = userOrgs;
+ updatedWorkspaces = userWorkspaces;
} else {
- updatedOrgs = loadingUserOrgs as any;
+ updatedWorkspaces = loadingUserWorkspaces as any;
}
- let organizationsListComponent;
+ let workspacesListComponent;
if (
!isFetchingApplications &&
props.searchKeyword &&
props.searchKeyword.trim().length > 0 &&
- updatedOrgs.length === 0
+ updatedWorkspaces.length === 0
) {
- organizationsListComponent = (
+ workspacesListComponent = (
<CenteredWrapper
style={{
flexDirection: "column",
@@ -634,58 +648,57 @@ function ApplicationsSection(props: any) {
</CenteredWrapper>
);
} else {
- organizationsListComponent = updatedOrgs.map(
- (organizationObject: any, index: number) => {
- const { applications, organization } = organizationObject;
- const hasManageOrgPermissions = isPermitted(
- organization.userPermissions,
- PERMISSION_TYPE.MANAGE_ORGANIZATION,
+ workspacesListComponent = updatedWorkspaces.map(
+ (workspaceObject: any, index: number) => {
+ const { applications, workspace } = workspaceObject;
+ const hasManageWorkspacePermissions = isPermitted(
+ workspace.userPermissions,
+ PERMISSION_TYPE.MANAGE_WORKSPACE,
);
return (
- <OrgSection
- className="t--org-section"
+ <WorkspaceSection
+ className="t--workspace-section"
isMobile={isMobile}
key={index}
>
- <OrgDropDown isMobile={isMobile}>
+ <WorkspaceDropDown isMobile={isMobile}>
{(currentUser || isFetchingApplications) &&
- OrgMenuTarget({
- orgName: organization.name,
- orgSlug: organization.id,
+ WorkspaceMenuTarget({
+ workspaceName: workspace.name,
+ workspaceSlug: workspace.id,
})}
- {hasManageOrgPermissions && (
+ {hasManageWorkspacePermissions && (
<Dialog
canEscapeKeyClose={false}
canOutsideClickClose
- isOpen={selectedOrgId === organization.id}
- onClose={() => setSelectedOrgId("")}
- title={`Invite Users to ${organization.name}`}
+ isOpen={selectedWorkspaceId === workspace.id}
+ onClose={() => setSelectedWorkspaceId("")}
+ title={`Invite Users to ${workspace.name}`}
>
- <Form orgId={organization.id} />
+ <Form workspaceId={workspace.id} />
</Dialog>
)}
- {selectedOrgIdForImportApplication && (
+ {selectedWorkspaceIdForImportApplication && (
<ImportApplicationModal
isModalOpen={
- selectedOrgIdForImportApplication === organization.id
+ selectedWorkspaceIdForImportApplication === workspace.id
}
- onClose={() => setSelectedOrgIdForImportApplication("")}
- organizationId={selectedOrgIdForImportApplication}
+ onClose={() => setSelectedWorkspaceIdForImportApplication("")}
+ workspaceId={selectedWorkspaceIdForImportApplication}
/>
)}
{isPermitted(
- organization.userPermissions,
- PERMISSION_TYPE.INVITE_USER_TO_ORGANIZATION,
+ workspace.userPermissions,
+ PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE,
) &&
!isFetchingApplications && (
- <OrgShareUsers>
- <SharedUserList orgId={organization.id} />
+ <WorkspaceShareUsers>
+ <SharedUserList workspaceId={workspace.id} />
{!isMobile && (
<FormDialogComponent
- Form={OrgInviteUsersForm}
+ Form={WorkspaceInviteUsersForm}
canOutsideClickClose
- orgId={organization.id}
- title={`Invite Users to ${organization.name}`}
+ title={`Invite Users to ${workspace.name}`}
trigger={
<Button
category={Category.tertiary}
@@ -695,10 +708,11 @@ function ApplicationsSection(props: any) {
text={"Share"}
/>
}
+ workspaceId={workspace.id}
/>
)}
{isPermitted(
- organization.userPermissions,
+ workspace.userPermissions,
PERMISSION_TYPE.CREATE_APPLICATION,
) &&
!isMobile &&
@@ -709,21 +723,21 @@ function ApplicationsSection(props: any) {
icon={"plus"}
isLoading={
creatingApplicationMap &&
- creatingApplicationMap[organization.id]
+ creatingApplicationMap[workspace.id]
}
onClick={() => {
if (
Object.entries(creatingApplicationMap).length ===
0 ||
(creatingApplicationMap &&
- !creatingApplicationMap[organization.id])
+ !creatingApplicationMap[workspace.id])
) {
createNewApplication(
getNextEntityName(
"Untitled application ",
applications.map((el: any) => el.name),
),
- organization.id,
+ workspace.id,
);
}
}}
@@ -734,17 +748,17 @@ function ApplicationsSection(props: any) {
)}
{(currentUser || isFetchingApplications) && !isMobile && (
<Menu
- className="t--org-name"
+ className="t--workspace-name"
closeOnItemClick
- cypressSelector="t--org-name"
+ cypressSelector="t--workspace-name"
disabled={isFetchingApplications}
- isOpen={organization.id === orgToOpenMenu}
+ isOpen={workspace.id === workspaceToOpenMenu}
onClose={() => {
- setOrgToOpenMenu(null);
+ setWorkspaceToOpenMenu(null);
}}
onClosing={() => {
- setWarnLeavingOrganization(false);
- setWarnDeleteOrg(false);
+ setWarnLeavingWorkspace(false);
+ setWarnDeleteWorkspace(false);
}}
position={Position.BOTTOM_RIGHT}
target={
@@ -752,18 +766,18 @@ function ApplicationsSection(props: any) {
className="t--options-icon"
name="context-menu"
onClick={() => {
- setOrgToOpenMenu(organization.id);
+ setWorkspaceToOpenMenu(workspace.id);
}}
size={IconSize.XXXL}
/>
}
>
- {hasManageOrgPermissions && (
+ {hasManageWorkspacePermissions && (
<>
<div className="px-3 py-2">
- <OrgRename
- cypressSelector="t--org-rename-input"
- defaultValue={organization.name}
+ <WorkspaceRename
+ cypressSelector="t--workspace-rename-input"
+ defaultValue={workspace.name}
editInteractionKind={EditInteractionKind.SINGLE}
fill
hideEditIcon={false}
@@ -772,11 +786,11 @@ function ApplicationsSection(props: any) {
return notEmptyValidator(value).message;
}}
onBlur={(value: string) => {
- OrgNameChange(value, organization.id);
+ WorkspaceNameChange(value, workspace.id);
}}
placeholder="Workspace name"
savingState={
- isSavingOrgInfo
+ isSavingWorkspaceInfo
? SavingState.STARTED
: SavingState.NOT_STARTED
}
@@ -784,13 +798,13 @@ function ApplicationsSection(props: any) {
/>
</div>
<MenuItem
- cypressSelector="t--org-setting"
+ cypressSelector="t--workspace-setting"
icon="settings-2-line"
onSelect={() =>
getOnSelectAction(
DropdownOnSelectActions.REDIRECT,
{
- path: `/org/${organization.id}/settings/general`,
+ path: `/workspace/${workspace.id}/settings/general`,
},
)
}
@@ -798,11 +812,11 @@ function ApplicationsSection(props: any) {
/>
{enableImportExport && (
<MenuItem
- cypressSelector="t--org-import-app"
+ cypressSelector="t--workspace-import-app"
icon="download"
onSelect={() =>
- setSelectedOrgIdForImportApplication(
- organization.id,
+ setSelectedWorkspaceIdForImportApplication(
+ workspace.id,
)
}
text="Import"
@@ -810,7 +824,9 @@ function ApplicationsSection(props: any) {
)}
<MenuItem
icon="share-line"
- onSelect={() => setSelectedOrgId(organization.id)}
+ onSelect={() =>
+ setSelectedWorkspaceId(workspace.id)
+ }
text="Share"
/>
<MenuItem
@@ -819,7 +835,7 @@ function ApplicationsSection(props: any) {
getOnSelectAction(
DropdownOnSelectActions.REDIRECT,
{
- path: `/org/${organization.id}/settings/members`,
+ path: `/workspace/${workspace.id}/settings/members`,
},
)
}
@@ -831,42 +847,43 @@ function ApplicationsSection(props: any) {
icon="logout"
onSelect={(e: React.MouseEvent) => {
e.stopPropagation();
- !warnLeavingOrganization
- ? setWarnLeavingOrganization(true)
- : leaveOrg(organization.id);
+ !warnLeavingWorkspace
+ ? setWarnLeavingWorkspace(true)
+ : leaveWS(workspace.id);
}}
text={
- !warnLeavingOrganization
+ !warnLeavingWorkspace
? "Leave Organization"
: "Are you sure?"
}
- type={
- !warnLeavingOrganization ? undefined : "warning"
- }
+ type={!warnLeavingWorkspace ? undefined : "warning"}
/>
- {applications.length === 0 && hasManageOrgPermissions && (
- <MenuItem
- icon="trash"
- onSelect={(e: React.MouseEvent) => {
- e.stopPropagation();
- warnDeleteOrg
- ? handleDeleteOrg(organization.id)
- : setWarnDeleteOrg(true);
- }}
- text={
- !warnDeleteOrg
- ? "Delete Organization"
- : "Are you sure?"
- }
- type={!warnDeleteOrg ? undefined : "warning"}
- />
- )}
+ {applications.length === 0 &&
+ hasManageWorkspacePermissions && (
+ <MenuItem
+ icon="trash"
+ onSelect={(e: React.MouseEvent) => {
+ e.stopPropagation();
+ warnDeleteWorkspace
+ ? handleDeleteWorkspace(workspace.id)
+ : setWarnDeleteWorkspace(true);
+ }}
+ text={
+ !warnDeleteWorkspace
+ ? "Delete Organization"
+ : "Are you sure?"
+ }
+ type={
+ !warnDeleteWorkspace ? undefined : "warning"
+ }
+ />
+ )}
</Menu>
)}
- </OrgShareUsers>
+ </WorkspaceShareUsers>
)}
- </OrgDropDown>
- <ApplicationCardsWrapper isMobile={isMobile} key={organization.id}>
+ </WorkspaceDropDown>
+ <ApplicationCardsWrapper isMobile={isMobile} key={workspace.id}>
{applications.map((application: any) => {
return (
<PaddingWrapper isMobile={isMobile} key={application.id}>
@@ -893,20 +910,20 @@ function ApplicationsSection(props: any) {
icon={"plus"}
isLoading={
creatingApplicationMap &&
- creatingApplicationMap[organization.id]
+ creatingApplicationMap[workspace.id]
}
onClick={() => {
if (
Object.entries(creatingApplicationMap).length === 0 ||
(creatingApplicationMap &&
- !creatingApplicationMap[organization.id])
+ !creatingApplicationMap[workspace.id])
) {
createNewApplication(
getNextEntityName(
"Untitled application ",
applications.map((el: any) => el.name),
),
- organization.id,
+ workspace.id,
);
}
}}
@@ -918,7 +935,7 @@ function ApplicationsSection(props: any) {
</NoAppsFound>
)}
</ApplicationCardsWrapper>
- </OrgSection>
+ </WorkspaceSection>
);
},
);
@@ -929,7 +946,7 @@ function ApplicationsSection(props: any) {
className="t--applications-container"
isMobile={isMobile}
>
- {organizationsListComponent}
+ {workspacesListComponent}
{featureFlags.GIT_IMPORT && <GitSyncModal isImport />}
<ReconnectDatasourceModal />
</ApplicationContainer>
@@ -946,7 +963,7 @@ type ApplicationProps = {
deletingApplication: boolean;
duplicatingApplication: boolean;
getAllApplication: () => void;
- userOrgs: any;
+ userWorkspaces: any;
currentUser?: User;
searchKeyword: string | undefined;
setHeaderMetaData: (
@@ -957,13 +974,13 @@ type ApplicationProps = {
class Applications extends Component<
ApplicationProps,
- { selectedOrgId: string; showOnboardingForm: boolean }
+ { selectedWorkspaceId: string; showOnboardingForm: boolean }
> {
constructor(props: ApplicationProps) {
super(props);
this.state = {
- selectedOrgId: "",
+ selectedWorkspaceId: "",
showOnboardingForm: false,
};
}
@@ -971,7 +988,7 @@ class Applications extends Component<
componentDidMount() {
PerformanceTracker.stopTracking(PerformanceTransactionName.LOGIN_CLICK);
PerformanceTracker.stopTracking(PerformanceTransactionName.SIGN_UP);
- if (!this.props.userOrgs.length) {
+ if (!this.props.userWorkspaces.length) {
this.props.getAllApplication();
}
this.props.setHeaderMetaData(true, true);
@@ -1011,7 +1028,7 @@ const mapStateToProps = (state: AppState) => ({
createApplicationError: getCreateApplicationError(state),
deletingApplication: getIsDeletingApplication(state),
duplicatingApplication: getIsDuplicatingApplication(state),
- userOrgs: getUserApplicationsOrgsList(state),
+ userWorkspaces: getUserApplicationsWorkspacesList(state),
currentUser: getCurrentUser(state),
searchKeyword: getApplicationSearchKeyword(state),
});
diff --git a/app/client/src/pages/Applications/permissionHelpers.tsx b/app/client/src/pages/Applications/permissionHelpers.tsx
index 7ad434a6fe38..66b06de66407 100644
--- a/app/client/src/pages/Applications/permissionHelpers.tsx
+++ b/app/client/src/pages/Applications/permissionHelpers.tsx
@@ -1,13 +1,13 @@
export enum PERMISSION_TYPE {
- MANAGE_ORGANIZATION = "manage:organizations",
- CREATE_APPLICATION = "manage:orgApplications",
+ MANAGE_WORKSPACE = "manage:workspaces",
+ CREATE_APPLICATION = "manage:workspaceApplications",
MANAGE_APPLICATION = "manage:applications",
EXPORT_APPLICATION = "export:applications",
READ_APPLICATION = "read:applications",
- READ_ORGANIZATION = "read:organizations",
- INVITE_USER_TO_ORGANIZATION = "inviteUsers:organization",
+ READ_WORKSPACE = "read:workspaces",
+ INVITE_USER_TO_WORKSPACE = "inviteUsers:workspace",
MAKE_PUBLIC_APPLICATION = "makePublic:applications",
- PUBLISH_APPLICATION = "publish:orgApplications",
+ PUBLISH_APPLICATION = "publish:workspaceApplications",
}
export const isPermitted = (permissions: string[], type: string) => {
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index df8eab162944..7b25ad36fd61 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -7,7 +7,7 @@ import {
ReduxActionTypes,
} from "@appsmith/constants/ReduxActionConstants";
import { APPLICATIONS_URL } from "constants/routes";
-import AppInviteUsersForm from "pages/organization/AppInviteUsersForm";
+import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { FormDialogComponent } from "components/editorComponents/form/FormDialogComponent";
import AppsmithLogo from "assets/images/appsmith_logo_square.png";
@@ -22,8 +22,8 @@ import {
} from "selectors/editorSelectors";
import {
getAllUsers,
- getCurrentOrgId,
-} from "@appsmith/selectors/organizationSelectors";
+ getCurrentWorkspaceId,
+} from "@appsmith/selectors/workspaceSelectors";
import { connect, useDispatch, useSelector } from "react-redux";
import DeployLinkButtonDialog from "components/designSystems/appsmith/header/DeployLinkButton";
import { EditInteractionKind, SavingState } from "components/ads/EditableText";
@@ -57,8 +57,8 @@ import RealtimeAppEditors from "./RealtimeAppEditors";
import { EditorSaveIndicator } from "./EditorSaveIndicator";
import { retryPromise } from "utils/AppsmithUtils";
-import { fetchUsersForOrg } from "actions/orgActions";
-import { OrgUser } from "constants/orgConstants";
+import { fetchUsersForWorkspace } from "actions/workspaceActions";
+import { WorkspaceUser } from "constants/workspaceConstants";
import { getIsGitConnected } from "selectors/gitSyncSelectors";
import TooltipComponent from "components/ads/Tooltip";
@@ -221,14 +221,14 @@ type EditorHeaderProps = {
pageId: string;
isPublishing: boolean;
publishedTime?: string;
- orgId: string;
+ workspaceId: string;
applicationId?: string;
currentApplication?: ApplicationPayload;
isSaving: boolean;
publishApplication: (appId: string) => void;
lastUpdatedTime?: number;
inOnboarding: boolean;
- sharedUserList: OrgUser[];
+ sharedUserList: WorkspaceUser[];
currentUser?: User;
};
@@ -250,9 +250,9 @@ export function EditorHeader(props: EditorHeaderProps) {
applicationId,
currentApplication,
isPublishing,
- orgId,
pageId,
publishApplication,
+ workspaceId,
} = props;
const location = useLocation();
const dispatch = useDispatch();
@@ -334,10 +334,10 @@ export function EditorHeader(props: EditorHeaderProps) {
//Fetch all users for the application to show the share button tooltip
useEffect(() => {
- if (orgId) {
- dispatch(fetchUsersForOrg(orgId));
+ if (workspaceId) {
+ dispatch(fetchUsersForWorkspace(workspaceId));
}
- }, [orgId]);
+ }, [workspaceId]);
const filteredSharedUserList = props.sharedUserList.filter(
(user) => user.username !== props.currentUser?.username,
);
@@ -470,7 +470,6 @@ export function EditorHeader(props: EditorHeaderProps) {
bgColor: Colors.GEYSER_LIGHT,
}}
isOpen={showAppInviteUsersDialog}
- orgId={orgId}
title={
currentApplication
? currentApplication.name
@@ -493,6 +492,7 @@ export function EditorHeader(props: EditorHeaderProps) {
<ShareButtonComponent />
</TooltipComponent>
}
+ workspaceId={workspaceId}
/>
<DeploySection>
<TooltipComponent
@@ -553,7 +553,7 @@ const theme = getTheme(ThemeMode.LIGHT);
const mapStateToProps = (state: AppState) => ({
pageName: state.ui.editor.currentPageName,
- orgId: getCurrentOrgId(state),
+ workspaceId: getCurrentWorkspaceId(state),
applicationId: getCurrentApplicationId(state),
currentApplication: state.ui.applications.currentApplication,
isPublishing: getIsPublishingApplication(state),
diff --git a/app/client/src/pages/Editor/Explorer/hooks.ts b/app/client/src/pages/Editor/Explorer/hooks.ts
index f651cce43a7a..c3b0aa72cb2f 100644
--- a/app/client/src/pages/Editor/Explorer/hooks.ts
+++ b/app/client/src/pages/Editor/Explorer/hooks.ts
@@ -97,7 +97,7 @@ export const useCurrentApplicationDatasource = () => {
);
};
-export const useOtherDatasourcesInOrganization = () => {
+export const useOtherDatasourcesInWorkspace = () => {
const actions = useSelector(getActions);
const allDatasources = useSelector(getDatasources);
const datasourceIdsUsedInCurrentApplication = actions.reduce(
@@ -119,13 +119,13 @@ export const useOtherDatasourcesInOrganization = () => {
export const useAppWideAndOtherDatasource = () => {
const datasourcesUsedInApplication = useCurrentApplicationDatasource();
- const otherDatasourceInOrg = useOtherDatasourcesInOrganization();
+ const otherDatasourceInWorkspace = useOtherDatasourcesInWorkspace();
return {
appWideDS: datasourcesUsedInApplication.sort((ds1, ds2) =>
ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
),
- otherDS: otherDatasourceInOrg.sort((ds1, ds2) =>
+ otherDS: otherDatasourceInWorkspace.sort((ds1, ds2) =>
ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
),
};
@@ -135,11 +135,11 @@ const MAX_DATASOURCE_SUGGESTIONS = 3;
export const useDatasourceSuggestions = () => {
const datasourcesUsedInApplication = useCurrentApplicationDatasource();
- const otherDatasourceInOrg = useOtherDatasourcesInOrganization();
+ const otherDatasourceInWorkspace = useOtherDatasourcesInWorkspace();
if (datasourcesUsedInApplication.length >= MAX_DATASOURCE_SUGGESTIONS)
return [];
- otherDatasourceInOrg.reverse();
- return otherDatasourceInOrg.slice(
+ otherDatasourceInWorkspace.reverse();
+ return otherDatasourceInWorkspace.slice(
0,
MAX_DATASOURCE_SUGGESTIONS - datasourcesUsedInApplication.length,
);
diff --git a/app/client/src/pages/Editor/Explorer/mockTestData.ts b/app/client/src/pages/Editor/Explorer/mockTestData.ts
index b540c2d45380..0f91c3fd3445 100644
--- a/app/client/src/pages/Editor/Explorer/mockTestData.ts
+++ b/app/client/src/pages/Editor/Explorer/mockTestData.ts
@@ -3,7 +3,7 @@ export const mockDatasources = [
id: "61e0f447cd5225210fa81dd8",
name: "09bd6b2f",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -36,7 +36,7 @@ export const mockDatasources = [
id: "61e0e47bcd5225210fa81d59",
name: "2dcc265f",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -62,7 +62,7 @@ export const mockDatasources = [
id: "61e0f171cd5225210fa81dad",
name: "f688c404",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -88,7 +88,7 @@ export const mockDatasources = [
id: "61e0e47bcd5225210fa81d59",
name: "2dcc265f",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -114,7 +114,7 @@ export const mockDatasources = [
id: "61e0f171cd5225210fa81dad",
name: "f688c404",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -140,7 +140,7 @@ export const mockDatasources = [
id: "61e0e47bcd5225210fa81d59",
name: "qwerty12",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
@@ -166,7 +166,7 @@ export const mockDatasources = [
id: "61e0f171cd5225210f121dad",
name: "poiuyt09",
pluginId: "5c9f512f96c1a50004819786",
- organizationId: "607d2c9c1a5f642a171ebd9b",
+ workspaceId: "607d2c9c1a5f642a171ebd9b",
datasourceConfiguration: {
connection: {
mode: "READ_WRITE",
diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
index 08d76ed96c08..1068f67e1c2a 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
@@ -4,8 +4,8 @@ import { useDispatch, useSelector } from "react-redux";
import { MockDatasource } from "entities/Datasource";
import { getPluginImages } from "selectors/entitiesSelector";
import { Colors } from "constants/Colors";
-import { addMockDatasourceToOrg } from "actions/datasourceActions";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { addMockDatasourceToWorkspace } from "actions/datasourceActions";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { getQueryParams } from "utils/AppsmithUtils";
import { AppState } from "reducers";
import AnalyticsUtil from "utils/AnalyticsUtil";
@@ -31,7 +31,7 @@ const Description = styled.div`
margin-top: 11px;
`;
function MockDataSources(props: { mockDatasources: MockDatasource[] }) {
- const orgId = useSelector(getCurrentOrgId);
+ const workspaceId = useSelector(getCurrentWorkspaceId);
return (
<MockDataSourceWrapper className="t--mock-datasource-list">
{props.mockDatasources.map((datasource: MockDatasource, idx) => {
@@ -39,7 +39,7 @@ function MockDataSources(props: { mockDatasources: MockDatasource[] }) {
<MockDatasourceCard
datasource={datasource}
key={`${datasource.name}_${datasource.packageName}_${idx}`}
- orgId={orgId}
+ workspaceId={workspaceId}
/>
);
})}
@@ -86,11 +86,11 @@ const DatasourceNameWrapper = styled.div`
type MockDatasourceCardProps = {
datasource: MockDatasource;
- orgId: string;
+ workspaceId: string;
};
function MockDatasourceCard(props: MockDatasourceCardProps) {
- const { datasource, orgId } = props;
+ const { datasource, workspaceId } = props;
const dispatch = useDispatch();
const pluginImages = useSelector(getPluginImages);
const plugins = useSelector((state: AppState) => {
@@ -106,7 +106,7 @@ function MockDatasourceCard(props: MockDatasourceCardProps) {
const addMockDataSource = () => {
AnalyticsUtil.logEvent("ADD_MOCK_DATASOURCE_CLICK", {
datasourceName: datasource.name,
- orgId,
+ workspaceId,
packageName: currentPlugin.packageName,
pluginName: currentPlugin.name,
});
@@ -117,9 +117,9 @@ function MockDatasourceCard(props: MockDatasourceCardProps) {
});
const queryParams = getQueryParams();
dispatch(
- addMockDatasourceToOrg(
+ addMockDatasourceToWorkspace(
datasource.name,
- orgId,
+ workspaceId,
currentPlugin.id,
currentPlugin.packageName,
queryParams.isGeneratePageMode,
diff --git a/app/client/src/pages/Editor/IntegrationEditor/mockData/index.ts b/app/client/src/pages/Editor/IntegrationEditor/mockData/index.ts
index 21ee845b6859..c22dd22076bc 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/mockData/index.ts
+++ b/app/client/src/pages/Editor/IntegrationEditor/mockData/index.ts
@@ -45,7 +45,7 @@ export const mockDatasources = [
gitSyncId: "623a80d613b3311bd5e77308_623ab2519b867130d3ed1c26",
name: "Mock Database",
pluginId: "623a809913b3311bd5e77228",
- organizationId: "623a80d613b3311bd5e77308",
+ workspaceId: "623a80d613b3311bd5e77308",
datasourceConfiguration: {
connection: { mode: "READ_WRITE", ssl: { authType: "DEFAULT" } },
endpoints: [
@@ -72,7 +72,7 @@ export const mockDatasources = [
gitSyncId: "623a80d613b3311bd5e77308_623abc8b9b867130d3ed1c42",
name: "Test",
pluginId: "623a809913b3311bd5e77229",
- organizationId: "623a80d613b3311bd5e77308",
+ workspaceId: "623a80d613b3311bd5e77308",
datasourceConfiguration: {
connection: { ssl: { authType: "DEFAULT" } },
sshProxyEnabled: false,
diff --git a/app/client/src/pages/Editor/JSEditor/utils.test.ts b/app/client/src/pages/Editor/JSEditor/utils.test.ts
index b1eb4660b394..4561e62f51e3 100644
--- a/app/client/src/pages/Editor/JSEditor/utils.test.ts
+++ b/app/client/src/pages/Editor/JSEditor/utils.test.ts
@@ -40,7 +40,7 @@ const BASE_JS_OBJECT_BODY_WITH_LITERALS = `export default {
const BASE_JS_ACTION = (useLiterals = false) => {
return {
- organizationId: "organization-id",
+ workspaceId: "workspace-id",
pageId: "page-id",
collectionId: "collection-id",
pluginId: "plugin-id",
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
index a7d592a3f8d6..d244b55b414a 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
@@ -5,7 +5,7 @@
"isLoading": false,
"config": {
"id": "6194d8e1abb49e2fd00812b2",
- "organizationId": "5e1c5b2014edee5e49efc06c",
+ "workspaceId": "5e1c5b2014edee5e49efc06c",
"pluginType": "SAAS",
"pluginId": "6080f9266b8cfd602957ba72",
"name": "Api1",
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
index cbac65ca3ccc..1b9a7da90d60 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
@@ -5,7 +5,7 @@
"isLoading": false,
"config": {
"id": "6194d8e1abb49e2fd00812b2",
- "organizationId": "5e1c5b2014edee5e49efc06c",
+ "workspaceId": "5e1c5b2014edee5e49efc06c",
"pluginType": "SAAS",
"pluginId": "6080f9266b8cfd602957ba72",
"name": "Api1",
diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal.tsx
index 63fb9ba4e1f9..1c75cd53e115 100644
--- a/app/client/src/pages/Editor/gitSync/GitSyncModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSyncModal.tsx
@@ -7,7 +7,7 @@ import {
} from "selectors/gitSyncSelectors";
import { useDispatch, useSelector } from "react-redux";
import { setIsGitSyncModalOpen } from "actions/gitSyncActions";
-import { setOrgIdForImport } from "actions/applicationActions";
+import { setWorkspaceIdForImport } from "actions/applicationActions";
import Menu from "./Menu";
import { Classes, MENU_HEIGHT, MENU_ITEM, MENU_ITEMS_MAP } from "./constants";
import Deploy from "./Tabs/Deploy";
@@ -75,7 +75,7 @@ function GitSyncModal(props: { isImport?: boolean }) {
const handleClose = useCallback(() => {
dispatch(setIsGitSyncModalOpen({ isOpen: false }));
- dispatch(setOrgIdForImport(""));
+ dispatch(setWorkspaceIdForImport(""));
}, [dispatch, setIsGitSyncModalOpen]);
const setActiveTabIndex = useCallback(
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index c5d57207d98b..05a85fe9b72f 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -4,8 +4,8 @@ import Dialog from "components/ads/DialogComponent";
import {
getImportedApplication,
getIsDatasourceConfigForImportFetched,
- getOrganizationIdForImport,
- getUserApplicationsOrgsList,
+ getWorkspaceIdForImport,
+ getUserApplicationsWorkspacesList,
} from "selectors/applicationSelectors";
import { useDispatch, useSelector } from "react-redux";
@@ -45,7 +45,7 @@ import {
initDatasourceConnectionDuringImportRequest,
resetDatasourceConfigForImportFetchedFlag,
setIsReconnectingDatasourcesModalOpen,
- setOrgIdForImport,
+ setWorkspaceIdForImport,
} from "actions/applicationActions";
import { AuthType, Datasource } from "entities/Datasource";
import TooltipComponent from "components/ads/Tooltip";
@@ -269,7 +269,7 @@ function ReconnectDatasourceModal() {
const theme = useTheme();
const dispatch = useDispatch();
const isModalOpen = useSelector(getIsReconnectingDatasourcesModalOpen);
- const organizationId = useSelector(getOrganizationIdForImport);
+ const workspaceId = useSelector(getWorkspaceIdForImport);
const datasources = useSelector(getUnconfiguredDatasources);
const pluginImages = useSelector(getPluginImages);
const pluginNames = useSelector(getPluginNames);
@@ -282,7 +282,7 @@ function ReconnectDatasourceModal() {
localStorage.getItem("importedAppPendingInfo") || "null",
);
// getting query from redirection url
- const userOrgs = useSelector(getUserApplicationsOrgsList);
+ const userWorkspaces = useSelector(getUserApplicationsWorkspacesList);
const queryParams = useQuery();
const queryAppId =
queryParams.get("appId") || (pendingApp ? pendingApp.appId : null);
@@ -329,15 +329,15 @@ function ReconnectDatasourceModal() {
// should open reconnect datasource modal
useEffect(() => {
- if (userOrgs && queryIsImport && queryDatasourceId) {
+ if (userWorkspaces && queryIsImport && queryDatasourceId) {
if (queryAppId) {
- for (const org of userOrgs) {
- const { applications, organization } = org;
+ for (const ws of userWorkspaces) {
+ const { applications, workspace } = ws;
const application = applications.find(
(app: any) => app.id === queryAppId,
);
if (application) {
- dispatch(setOrgIdForImport(organization.id));
+ dispatch(setWorkspaceIdForImport(workspace.id));
dispatch(setIsReconnectingDatasourcesModalOpen({ isOpen: true }));
const defaultPageId = getDefaultPageId(application.pages);
if (defaultPageId) {
@@ -348,7 +348,7 @@ function ReconnectDatasourceModal() {
type: ReduxActionTypes.FETCH_UNCONFIGURED_DATASOURCE_LIST,
payload: {
applicationId: appId,
- orgId: organization.id,
+ workspaceId: workspace.id,
},
});
}
@@ -357,18 +357,18 @@ function ReconnectDatasourceModal() {
}
}
}
- }, [userOrgs, queryIsImport]);
+ }, [userWorkspaces, queryIsImport]);
const isConfigFetched = useSelector(getIsDatasourceConfigForImportFetched);
// todo uncomment this to fetch datasource config
useEffect(() => {
- if (isModalOpen && organizationId) {
+ if (isModalOpen && workspaceId) {
dispatch(
- initDatasourceConnectionDuringImportRequest(organizationId as string),
+ initDatasourceConnectionDuringImportRequest(workspaceId as string),
);
}
- }, [organizationId, isModalOpen]);
+ }, [workspaceId, isModalOpen]);
useEffect(() => {
if (isModalOpen) {
@@ -386,7 +386,7 @@ function ReconnectDatasourceModal() {
const handleClose = useCallback(() => {
localStorage.setItem("importedAppPendingInfo", "null");
dispatch(setIsReconnectingDatasourcesModalOpen({ isOpen: false }));
- dispatch(setOrgIdForImport(""));
+ dispatch(setWorkspaceIdForImport(""));
dispatch(resetDatasourceConfigForImportFetchedFlag());
setSelectedDatasourceId("");
}, [dispatch, setIsReconnectingDatasourcesModalOpen, isModalOpen]);
diff --git a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
index a16599e3fbf2..59e0dd95fc6a 100644
--- a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
@@ -33,7 +33,7 @@ import { get } from "lodash";
import { Theme } from "constants/DefaultTheme";
import {
getCurrentApplication,
- getUserApplicationsOrgs,
+ getUserApplicationsWorkspaces,
} from "selectors/applicationSelectors";
import {
ApplicationPayload,
@@ -101,18 +101,18 @@ function RepoLimitExceededErrorModal() {
const isOpen = useSelector(getShowRepoLimitErrorModal);
const dispatch = useDispatch();
const application = useSelector(getCurrentApplication);
- const userOrgs = useSelector(getUserApplicationsOrgs);
+ const userWorkspaces = useSelector(getUserApplicationsWorkspaces);
const docURL = useSelector(getDisconnectDocUrl);
- const [orgName, setOrgName] = useState("");
+ const [workspaceName, setWorkspaceName] = useState("");
const applications = useMemo(() => {
- if (userOrgs) {
- const org: any = userOrgs.find((organizationObject: any) => {
- const { organization } = organizationObject;
- return organization.id === application?.organizationId;
+ if (userWorkspaces) {
+ const workspace: any = userWorkspaces.find((workspaceObject: any) => {
+ const { workspace } = workspaceObject;
+ return workspace.id === application?.workspaceId;
});
- setOrgName(org?.organization.name || "");
+ setWorkspaceName(workspace?.workspace.name || "");
return (
- org?.applications.filter((application: ApplicationPayload) => {
+ workspace?.applications.filter((application: ApplicationPayload) => {
const data = application.gitApplicationMetadata;
return (
data &&
@@ -126,7 +126,7 @@ function RepoLimitExceededErrorModal() {
} else {
return [];
}
- }, [userOrgs]);
+ }, [userWorkspaces]);
const onClose = () => dispatch(setShowRepoLimitErrorModal(false));
const openDisconnectGitModal = useCallback(
(applicationId: string, name: string) => {
@@ -156,7 +156,7 @@ function RepoLimitExceededErrorModal() {
if (window.Intercom) {
window.Intercom(
"showNewMessage",
- createMessage(CONTACT_SALES_MESSAGE_ON_INTERCOM, orgName),
+ createMessage(CONTACT_SALES_MESSAGE_ON_INTERCOM, workspaceName),
);
}
};
diff --git a/app/client/src/pages/Editor/gitSync/utils.test.ts b/app/client/src/pages/Editor/gitSync/utils.test.ts
index 027efef70ba8..bafee6d848a6 100644
--- a/app/client/src/pages/Editor/gitSync/utils.test.ts
+++ b/app/client/src/pages/Editor/gitSync/utils.test.ts
@@ -218,7 +218,7 @@ describe("gitSync utils", () => {
isAutoUpdate: false,
isManualUpdate: false,
name: "",
- organizationId: "",
+ workspaceId: "",
pages: [],
};
const actual = changeInfoSinceLastCommit(applicationData);
@@ -238,7 +238,7 @@ describe("gitSync utils", () => {
isAutoUpdate: true,
isManualUpdate: false,
name: "",
- organizationId: "",
+ workspaceId: "",
pages: [],
};
const actual = changeInfoSinceLastCommit(applicationData);
@@ -258,7 +258,7 @@ describe("gitSync utils", () => {
isAutoUpdate: true,
isManualUpdate: true,
name: "",
- organizationId: "",
+ workspaceId: "",
pages: [],
};
const actual = changeInfoSinceLastCommit(applicationData);
@@ -278,7 +278,7 @@ describe("gitSync utils", () => {
isAutoUpdate: false,
isManualUpdate: true,
name: "",
- organizationId: "",
+ workspaceId: "",
pages: [],
};
const actual = changeInfoSinceLastCommit(applicationData);
diff --git a/app/client/src/pages/Home/LeftPaneBottomSection.tsx b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
index c95c4b01f936..1923c33c68e8 100644
--- a/app/client/src/pages/Home/LeftPaneBottomSection.tsx
+++ b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
@@ -9,7 +9,7 @@ import {
WELCOME_TOUR,
} from "@appsmith/constants/messages";
import { getIsFetchingApplications } from "selectors/applicationSelectors";
-import { getOnboardingOrganisations } from "selectors/onboardingSelectors";
+import { getOnboardingWorkspaces } from "selectors/onboardingSelectors";
import { getAppsmithConfigs } from "@appsmith/configs";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { howMuchTimeBeforeText } from "utils/helpers";
@@ -47,7 +47,7 @@ const LeftPaneVersionData = styled.div`
function LeftPaneBottomSection() {
const dispatch = useDispatch();
- const onboardingOrgs = useSelector(getOnboardingOrganisations);
+ const onboardingWorkspaces = useSelector(getOnboardingWorkspaces);
const isFetchingApplications = useSelector(getIsFetchingApplications);
const { appVersion } = getAppsmithConfigs();
const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
@@ -72,7 +72,7 @@ function LeftPaneBottomSection() {
}}
text={createMessage(DOCUMENTATION)}
/>
- {!!onboardingOrgs.length && (
+ {!!onboardingWorkspaces.length && (
<MenuItem
containerClassName={
isFetchingApplications
diff --git a/app/client/src/pages/Templates/ForkTemplate.tsx b/app/client/src/pages/Templates/ForkTemplate.tsx
index 4f6758231635..214c9eacec68 100644
--- a/app/client/src/pages/Templates/ForkTemplate.tsx
+++ b/app/client/src/pages/Templates/ForkTemplate.tsx
@@ -5,17 +5,17 @@ import Button, { Category, Size } from "components/ads/Button";
import { useDispatch, useSelector } from "react-redux";
import { noop } from "lodash";
import {
- getForkableOrganizations,
+ getForkableWorkspaces,
isImportingTemplateSelector,
} from "selectors/templatesSelectors";
import styled from "styled-components";
-import { importTemplateToOrganisation } from "actions/templateActions";
+import { importTemplateToWorkspace } from "actions/templateActions";
import {
CANCEL,
CHOOSE_WHERE_TO_FORK,
createMessage,
FORK_TEMPLATE,
- SELECT_ORGANISATION,
+ SELECT_WORKSPACE,
} from "@appsmith/constants/messages";
import { Colors } from "constants/Colors";
import { Classes } from "@blueprintjs/core";
@@ -51,16 +51,12 @@ function ForkTemplate({
showForkModal,
templateId,
}: ForkTemplateProps) {
- const organizationList = useSelector(getForkableOrganizations);
- const [selectedOrganization, setSelectedOrganization] = useState(
- organizationList[0],
- );
+ const workspaceList = useSelector(getForkableWorkspaces);
+ const [selectedWorkspace, setSelectedWorkspace] = useState(workspaceList[0]);
const isImportingTemplate = useSelector(isImportingTemplateSelector);
const dispatch = useDispatch();
const onFork = () => {
- dispatch(
- importTemplateToOrganisation(templateId, selectedOrganization.value),
- );
+ dispatch(importTemplateToWorkspace(templateId, selectedWorkspace.value));
};
return (
@@ -77,11 +73,11 @@ function ForkTemplate({
dropdownMaxHeight={"200px"}
fillOptions
onSelect={(_value, dropdownOption) =>
- setSelectedOrganization(dropdownOption)
+ setSelectedWorkspace(dropdownOption)
}
- options={organizationList}
- placeholder={createMessage(SELECT_ORGANISATION)}
- selected={selectedOrganization}
+ options={workspaceList}
+ placeholder={createMessage(SELECT_WORKSPACE)}
+ selected={selectedWorkspace}
showLabelOnly
width={"100%"}
/>
diff --git a/app/client/src/pages/Templates/TemplatesTabItem.tsx b/app/client/src/pages/Templates/TemplatesTabItem.tsx
index 0944ec667f05..7403af94b064 100644
--- a/app/client/src/pages/Templates/TemplatesTabItem.tsx
+++ b/app/client/src/pages/Templates/TemplatesTabItem.tsx
@@ -15,7 +15,7 @@ import {
} from "@appsmith/constants/messages";
import {
getIsFetchingApplications,
- getUserApplicationsOrgsList,
+ getUserApplicationsWorkspacesList,
} from "selectors/applicationSelectors";
import { showTemplateNotificationSelector } from "selectors/templatesSelectors";
import styled from "styled-components";
@@ -79,8 +79,8 @@ interface TemplatesTabItemProps {
export function TemplatesTabItem(props: TemplatesTabItemProps) {
const hasSeenNotification = useSelector(showTemplateNotificationSelector);
const isFetchingApplications = useSelector(getIsFetchingApplications);
- const organizationListLength = useSelector(
- (state: AppState) => getUserApplicationsOrgsList(state).length,
+ const workspaceListLength = useSelector(
+ (state: AppState) => getUserApplicationsWorkspacesList(state).length,
);
const location = useLocation();
const dispatch = useDispatch();
@@ -89,7 +89,7 @@ export function TemplatesTabItem(props: TemplatesTabItemProps) {
!hasSeenNotification &&
!isFetchingApplications &&
!isNull(hasSeenNotification) &&
- organizationListLength;
+ workspaceListLength;
const setNotificationSeenFlag = () => {
dispatch(setTemplateNotificationSeenAction(true));
diff --git a/app/client/src/pages/Templates/index.tsx b/app/client/src/pages/Templates/index.tsx
index ad48af3bfde5..0dd5d959d193 100644
--- a/app/client/src/pages/Templates/index.tsx
+++ b/app/client/src/pages/Templates/index.tsx
@@ -25,7 +25,7 @@ import { editorInitializer } from "utils/EditorUtils";
import { AppState } from "reducers";
import {
getIsFetchingApplications,
- getUserApplicationsOrgsList,
+ getUserApplicationsWorkspacesList,
} from "selectors/applicationSelectors";
import { getAllApplications } from "actions/applicationActions";
import { getTypographyByKey } from "constants/DefaultTheme";
@@ -79,8 +79,8 @@ const SearchWrapper = styled.div`
function TemplateRoutes() {
const { path } = useRouteMatch();
const dispatch = useDispatch();
- const organizationListLength = useSelector(
- (state: AppState) => getUserApplicationsOrgsList(state).length,
+ const workspaceListLength = useSelector(
+ (state: AppState) => getUserApplicationsWorkspacesList(state).length,
);
const pluginListLength = useSelector(
(state: AppState) => state.entities.plugins.defaultPluginList.length,
@@ -102,10 +102,10 @@ function TemplateRoutes() {
}, [templatesCount]);
useEffect(() => {
- if (!organizationListLength) {
+ if (!workspaceListLength) {
dispatch(getAllApplications());
}
- }, [organizationListLength]);
+ }, [workspaceListLength]);
useEffect(() => {
if (!pluginListLength) {
diff --git a/app/client/src/pages/common/CustomizedDropdown/OrgDropdownData.tsx b/app/client/src/pages/common/CustomizedDropdown/WorkspaceDropdownData.tsx
similarity index 76%
rename from app/client/src/pages/common/CustomizedDropdown/OrgDropdownData.tsx
rename to app/client/src/pages/common/CustomizedDropdown/WorkspaceDropdownData.tsx
index ce8b55d01e96..7e3456f6a677 100644
--- a/app/client/src/pages/common/CustomizedDropdown/OrgDropdownData.tsx
+++ b/app/client/src/pages/common/CustomizedDropdown/WorkspaceDropdownData.tsx
@@ -8,8 +8,8 @@ import _ from "lodash";
export const options = (
user: User,
- orgName: string,
- orgId: string,
+ workspaceName: string,
+ workspaceId: string,
): CustomizedDropdownProps => {
return {
sections: [
@@ -17,7 +17,10 @@ export const options = (
options: [
{
content: (
- <Badge imageURL="https://via.placeholder.com/32" text={orgName} />
+ <Badge
+ imageURL="https://via.placeholder.com/32"
+ text={workspaceName}
+ />
),
disabled: true,
shouldCloseDropdown: false,
@@ -26,7 +29,7 @@ export const options = (
content: "Organization Settings",
onSelect: () =>
getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
- path: `/org/${orgId}/settings`,
+ path: `/workspace/${workspaceId}/settings`,
}),
},
{
@@ -37,15 +40,15 @@ export const options = (
content: "Members",
onSelect: () =>
getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
- path: `/org/${orgId}/settings`,
+ path: `/workspace/${workspaceId}/settings`,
}),
},
],
},
],
trigger: {
- icon: "ORG_ICON",
- text: orgName,
+ icon: "WORKSPACE_ICON",
+ text: workspaceName,
outline: false,
},
openDirection: Directions.DOWN,
diff --git a/app/client/src/pages/common/SharedUserList.tsx b/app/client/src/pages/common/SharedUserList.tsx
index 65c09307632c..96880a3ef2ec 100644
--- a/app/client/src/pages/common/SharedUserList.tsx
+++ b/app/client/src/pages/common/SharedUserList.tsx
@@ -6,15 +6,15 @@ import { useSelector } from "store";
import styled from "styled-components";
import ProfileImage from "./ProfileImage";
import ScrollIndicator from "components/ads/ScrollIndicator";
-import { OrgUser } from "constants/orgConstants";
-import { getUserApplicationsOrgsList } from "selectors/applicationSelectors";
+import { WorkspaceUser } from "constants/workspaceConstants";
+import { getUserApplicationsWorkspacesList } from "selectors/applicationSelectors";
import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
const UserImageContainer = styled.div<{ isMobile?: boolean }>`
display: flex;
margin-right: ${({ isMobile }) => (isMobile ? 0 : 24)}px;
- .org-share-user-icons {
+ .workspace-share-user-icons {
cursor: default;
margin-right: -6px;
width: 24px;
@@ -59,7 +59,7 @@ const ProfileImageListName = styled.span`
`;
const ProfileImageMore = styled(ProfileImage)`
- &.org-share-user-icons {
+ &.workspace-share-user-icons {
cursor: pointer;
}
`;
@@ -67,20 +67,20 @@ const ProfileImageMore = styled(ProfileImage)`
export default function SharedUserList(props: any) {
const currentUser = useSelector(getCurrentUser);
const scrollWrapperRef = React.createRef<HTMLUListElement>();
- const userOrgs = useSelector(getUserApplicationsOrgsList);
+ const userWorkspaces = useSelector(getUserApplicationsWorkspacesList);
const isMobile = useIsMobileDevice();
const allUsers = useMemo(() => {
- const org: any = userOrgs.find((organizationObject: any) => {
- const { organization } = organizationObject;
- return organization.id === props.orgId;
+ const workspace: any = userWorkspaces.find((workspaceObject: any) => {
+ const { workspace } = workspaceObject;
+ return workspace.id === props.workspaceId;
});
- const { userRoles } = org;
+ const { userRoles } = workspace;
return userRoles || [];
- }, [userOrgs]);
+ }, [userWorkspaces]);
return (
<UserImageContainer isMobile={isMobile}>
- {allUsers.slice(0, 5).map((el: OrgUser) => (
+ {allUsers.slice(0, 5).map((el: WorkspaceUser) => (
<Popover
boundary="viewport"
hoverCloseDelay={100}
@@ -91,7 +91,7 @@ export default function SharedUserList(props: any) {
usePortal={false}
>
<ProfileImage
- className="org-share-user-icons"
+ className="workspace-share-user-icons"
source={`/api/${UserApi.photoURL}/${el.username}`}
userName={el.name ? el.name : el.username}
/>
@@ -110,14 +110,14 @@ export default function SharedUserList(props: any) {
usePortal={false}
>
<ProfileImageMore
- className="org-share-user-icons"
+ className="workspace-share-user-icons"
commonName={`+${allUsers.length - 5}`}
/>
<ProfileImageListPopover ref={scrollWrapperRef}>
- {allUsers.slice(5).map((el: OrgUser) => (
+ {allUsers.slice(5).map((el: WorkspaceUser) => (
<ProfileImageListItem key={el.username}>
<ProfileImage
- className="org-share-user-icons"
+ className="workspace-share-user-icons"
source={`/api/${UserApi.photoURL}/${el.username}`}
userName={el.name ? el.name : el.username}
/>
diff --git a/app/client/src/pages/setup/SignupSuccess.tsx b/app/client/src/pages/setup/SignupSuccess.tsx
index a1552bc23baf..86965b8bab17 100644
--- a/app/client/src/pages/setup/SignupSuccess.tsx
+++ b/app/client/src/pages/setup/SignupSuccess.tsx
@@ -99,7 +99,7 @@ export function SignupSuccess() {
* For all local deployments
* For a super user, since we already collected role and useCase during signup
* For a normal user, who has filled in their role and useCase and try to visit signup-success url by entering manually.
- * For an invited user, we don't want to collect the data. we just want to redirect to the org they have been invited to.
+ * For an invited user, we don't want to collect the data. we just want to redirect to the workspace they have been invited to.
* We identify an invited user based on `enableFirstTimeUserExperience` flag in url.
*/
//TODO(Balaji): Factor in case, where user had closed the tab, while filling the form.And logs back in again.
diff --git a/app/client/src/pages/tests/mockData.ts b/app/client/src/pages/tests/mockData.ts
index ddc55d0c2da3..fb04a153119d 100644
--- a/app/client/src/pages/tests/mockData.ts
+++ b/app/client/src/pages/tests/mockData.ts
@@ -8,7 +8,7 @@ export const fetchPagesMockResponse = {
success: true,
},
data: {
- organizationId: "605c433c91dea93f0eaf91b5",
+ workspaceId: "605c433c91dea93f0eaf91b5",
pages: [
{
pageId: "605c435a91dea93f0eaf91ba",
@@ -30,7 +30,7 @@ export const fetchApplicationMockResponse: FetchApplicationResponse = {
id: "605c435a91dea93f0eaf91b8",
name: "My Application",
slug: "my-application",
- organizationId: "",
+ workspaceId: "",
evaluationVersion: 1,
appIsExample: false,
gitApplicationMetadata: undefined,
@@ -50,7 +50,7 @@ export const fetchApplicationMockResponse: FetchApplicationResponse = {
slug: "page-2",
},
],
- organizationId: "",
+ workspaceId: "",
},
};
@@ -78,7 +78,7 @@ export const updatedApplicationPayload = {
id: "605c435a91dea93f0eaf91b8",
name: "Renamed application",
slug: "renamed-application",
- organizationId: "",
+ workspaceId: "",
evaluationVersion: 1,
appIsExample: false,
gitApplicationMetadata: undefined,
diff --git a/app/client/src/pages/users/index.tsx b/app/client/src/pages/users/index.tsx
index d8078ff45ec7..886abd17b11a 100644
--- a/app/client/src/pages/users/index.tsx
+++ b/app/client/src/pages/users/index.tsx
@@ -1,11 +1,11 @@
import React from "react";
import { useHistory } from "react-router-dom";
-import { ORG_INVITE_USERS_PAGE_URL } from "constants/routes";
+import { WORKSPACE_INVITE_USERS_PAGE_URL } from "constants/routes";
import PageSectionHeader from "pages/common/PageSectionHeader";
import Button from "components/editorComponents/Button";
import PageWrapper from "pages/common/PageWrapper";
-export function OrgMembers() {
+export function WorkspaceMembers() {
const history = useHistory();
return (
@@ -17,7 +17,7 @@ export function OrgMembers() {
icon="plus"
iconAlignment="left"
intent="primary"
- onClick={() => history.push(ORG_INVITE_USERS_PAGE_URL)}
+ onClick={() => history.push(WORKSPACE_INVITE_USERS_PAGE_URL)}
text="Invite Users"
/>
</PageSectionHeader>
@@ -25,4 +25,4 @@ export function OrgMembers() {
);
}
-export default OrgMembers;
+export default WorkspaceMembers;
diff --git a/app/client/src/pages/organization/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
similarity index 79%
rename from app/client/src/pages/organization/AppInviteUsersForm.tsx
rename to app/client/src/pages/workspace/AppInviteUsersForm.tsx
index 52ffad68b0ca..fe9433cd8fea 100644
--- a/app/client/src/pages/organization/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
@@ -2,14 +2,16 @@ import React, { useEffect } from "react";
import styled, { css } from "styled-components";
import { connect, useSelector } from "react-redux";
import { AppState } from "reducers";
-import { getCurrentAppOrg } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import CopyToClipBoard from "components/ads/CopyToClipBoard";
import {
isPermitted,
PERMISSION_TYPE,
} from "../Applications/permissionHelpers";
-import OrgInviteUsersForm, { InviteButtonWidth } from "./OrgInviteUsersForm";
+import WorkspaceInviteUsersForm, {
+ InviteButtonWidth,
+} from "./WorkspaceInviteUsersForm";
import { getCurrentUser } from "selectors/usersSelectors";
import Text, { TextType } from "components/ads/Text";
import Toggle from "components/ads/Toggle";
@@ -57,17 +59,17 @@ function AppInviteUsersForm(props: any) {
currentApplicationDetails,
currentUser,
defaultPageId,
- fetchCurrentOrg,
+ fetchCurrentWorkspace,
isChangingViewAccess,
isFetchingApplication,
} = props;
- const currentOrg = useSelector(getCurrentAppOrg);
- const userOrgPermissions = currentOrg.userPermissions ?? [];
+ const currentWorkspace = useSelector(getCurrentAppWorkspace);
+ const userWorkspacePermissions = currentWorkspace.userPermissions ?? [];
const userAppPermissions = currentApplicationDetails?.userPermissions ?? [];
- const canInviteToOrg = isPermitted(
- userOrgPermissions,
- PERMISSION_TYPE.INVITE_USER_TO_ORGANIZATION,
+ const canInviteToWorkspace = isPermitted(
+ userWorkspacePermissions,
+ PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE,
);
const canShareWithPublic = isPermitted(
userAppPermissions,
@@ -82,10 +84,10 @@ function AppInviteUsersForm(props: any) {
}, [defaultPageId]);
useEffect(() => {
- if (currentUser?.name !== ANONYMOUS_USERNAME && canInviteToOrg) {
- fetchCurrentOrg(props.orgId);
+ if (currentUser?.name !== ANONYMOUS_USERNAME && canInviteToWorkspace) {
+ fetchCurrentWorkspace(props.workspaceId);
}
- }, [props.orgId, fetchCurrentOrg, currentUser?.name]);
+ }, [props.workspaceId, fetchCurrentWorkspace, currentUser?.name]);
return (
<>
@@ -117,8 +119,11 @@ function AppInviteUsersForm(props: any) {
copyText={appViewEndPoint}
/>
- {canInviteToOrg && (
- <OrgInviteUsersForm isApplicationInvite orgId={props.orgId} />
+ {canInviteToWorkspace && (
+ <WorkspaceInviteUsersForm
+ isApplicationInvite
+ workspaceId={props.workspaceId}
+ />
)}
</>
);
@@ -143,11 +148,11 @@ export default connect(
publicAccess,
},
}),
- fetchCurrentOrg: (orgId: string) =>
+ fetchCurrentWorkspace: (workspaceId: string) =>
dispatch({
- type: ReduxActionTypes.FETCH_CURRENT_ORG,
+ type: ReduxActionTypes.FETCH_CURRENT_WORKSPACE,
payload: {
- orgId,
+ workspaceId,
},
}),
}),
diff --git a/app/client/src/pages/organization/CreateOrganizationForm.tsx b/app/client/src/pages/workspace/CreateWorkspaceForm.tsx
similarity index 76%
rename from app/client/src/pages/organization/CreateOrganizationForm.tsx
rename to app/client/src/pages/workspace/CreateWorkspaceForm.tsx
index bd44cd533bf9..1ce03fc4947b 100644
--- a/app/client/src/pages/organization/CreateOrganizationForm.tsx
+++ b/app/client/src/pages/workspace/CreateWorkspaceForm.tsx
@@ -1,9 +1,9 @@
import React, { useCallback } from "react";
import { Form, reduxForm, InjectedFormProps } from "redux-form";
-import { CREATE_ORGANIZATION_FORM_NAME } from "constants/forms";
+import { CREATE_WORKSPACE_FORM_NAME } from "constants/forms";
import {
- CreateOrganizationFormValues,
- createOrganizationSubmitHandler,
+ CreateWorkspaceFormValues,
+ createWorkspaceSubmitHandler,
} from "./helpers";
import { noSpaces } from "utils/formhelpers";
import TextField from "components/editorComponents/form/fields/TextField";
@@ -14,7 +14,7 @@ import FormMessage from "components/editorComponents/form/FormMessage";
// TODO(abhinav): abstract onCancel out.
export function CreateApplicationForm(
props: InjectedFormProps<
- CreateOrganizationFormValues,
+ CreateWorkspaceFormValues,
{ onCancel: () => void }
> & {
onCancel: () => void;
@@ -30,7 +30,7 @@ export function CreateApplicationForm(
} = props;
const submitHandler = useCallback(
async (data, dispatch) => {
- const result = await createOrganizationSubmitHandler(data, dispatch);
+ const result = await createWorkspaceSubmitHandler(data, dispatch);
if (typeof onCancel === "function") onCancel(); // close after submit
return result;
},
@@ -39,14 +39,14 @@ export function CreateApplicationForm(
return (
<Form
- data-cy="create-organisation-form"
+ data-cy="create-workspace-form"
onSubmit={handleSubmit(submitHandler)}
>
{error && !pristine && <FormMessage intent="danger" message={error} />}
<FormGroup helperText={error} intent={error ? "danger" : "none"}>
<TextField
autoFocus
- data-cy="create-organisation-form__name"
+ data-cy="create-workspace-form__name"
name="name"
placeholder="Name"
validate={noSpaces}
@@ -54,7 +54,7 @@ export function CreateApplicationForm(
</FormGroup>
<FormFooter
canSubmit={!invalid}
- data-cy="t--create-org-submit"
+ data-cy="t--create-workspace-submit"
divider
onCancel={onCancel}
onSubmit={handleSubmit(submitHandler)}
@@ -67,9 +67,6 @@ export function CreateApplicationForm(
);
}
-export default reduxForm<
- CreateOrganizationFormValues,
- { onCancel: () => void }
->({
- form: CREATE_ORGANIZATION_FORM_NAME,
+export default reduxForm<CreateWorkspaceFormValues, { onCancel: () => void }>({
+ form: CREATE_WORKSPACE_FORM_NAME,
})(CreateApplicationForm);
diff --git a/app/client/src/pages/organization/DeleteConfirmationModal.tsx b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx
similarity index 97%
rename from app/client/src/pages/organization/DeleteConfirmationModal.tsx
rename to app/client/src/pages/workspace/DeleteConfirmationModal.tsx
index 1c6f79c80e52..0c83202c7cba 100644
--- a/app/client/src/pages/organization/DeleteConfirmationModal.tsx
+++ b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx
@@ -78,7 +78,7 @@ function DeleteConfirmationModal(props: DeleteConfirmationProps) {
/>
<ImportButton
className=".button-item"
- cypressSelector={"t--org-leave-button"}
+ cypressSelector={"t--workspace-leave-button"}
isLoading={isDeletingUser}
onClick={onConfirm}
size={Size.large}
diff --git a/app/client/src/pages/organization/General.tsx b/app/client/src/pages/workspace/General.tsx
similarity index 76%
rename from app/client/src/pages/organization/General.tsx
rename to app/client/src/pages/workspace/General.tsx
index f0ea723d0ac6..c474bab3265c 100644
--- a/app/client/src/pages/organization/General.tsx
+++ b/app/client/src/pages/workspace/General.tsx
@@ -1,7 +1,11 @@
import React from "react";
-import { deleteOrgLogo, saveOrg, uploadOrgLogo } from "actions/orgActions";
-import { SaveOrgRequest } from "api/OrgApi";
+import {
+ deleteWorkspaceLogo,
+ saveWorkspace,
+ uploadWorkspaceLogo,
+} from "actions/workspaceActions";
+import { SaveWorkspaceRequest } from "api/WorkspaceApi";
import { debounce } from "lodash";
import TextInput, {
emailValidator,
@@ -10,13 +14,13 @@ import TextInput, {
import { useSelector, useDispatch } from "react-redux";
import {
getCurrentError,
- getCurrentOrg,
-} from "@appsmith/selectors/organizationSelectors";
+ getCurrentWorkspace,
+ getWorkspaceLoadingStates,
+} from "@appsmith/selectors/workspaceSelectors";
import { useParams } from "react-router-dom";
import styled from "styled-components";
import Text, { TextType } from "components/ads/Text";
import { Classes } from "@blueprintjs/core";
-import { getOrgLoadingStates } from "@appsmith/selectors/organizationSelectors";
import {
SetProgress,
UploadCallback,
@@ -82,39 +86,39 @@ export const Col = styled.div`
`;
export function GeneralSettings() {
- const { orgId } = useParams<{ orgId: string }>();
+ const { workspaceId } = useParams<{ workspaceId: string }>();
const dispatch = useDispatch();
- const currentOrg = useSelector(getCurrentOrg).filter(
- (el) => el.id === orgId,
+ const currentWorkspace = useSelector(getCurrentWorkspace).filter(
+ (el) => el.id === workspaceId,
)[0];
- function saveChanges(settings: SaveOrgRequest) {
- dispatch(saveOrg(settings));
+ function saveChanges(settings: SaveWorkspaceRequest) {
+ dispatch(saveWorkspace(settings));
}
const timeout = 1000;
const onWorkspaceNameChange = debounce((newName: string) => {
saveChanges({
- id: orgId as string,
+ id: workspaceId as string,
name: newName,
});
}, timeout);
const onWebsiteChange = debounce((newWebsite: string) => {
saveChanges({
- id: orgId as string,
+ id: workspaceId as string,
website: newWebsite,
});
}, timeout);
const onEmailChange = debounce((newEmail: string) => {
saveChanges({
- id: orgId as string,
+ id: workspaceId as string,
email: newEmail,
});
}, timeout);
- const { isFetchingOrg } = useSelector(getOrgLoadingStates);
+ const { isFetchingWorkspace } = useSelector(getWorkspaceLoadingStates);
const logoUploadError = useSelector(getCurrentError);
const FileUploader = (
@@ -127,14 +131,14 @@ export function GeneralSettings() {
(progressEvent.loaded / progressEvent.total) * 100,
);
if (uploadPercentage === 100) {
- onUpload(currentOrg.logoUrl || "");
+ onUpload(currentWorkspace.logoUrl || "");
}
setProgress(uploadPercentage);
};
dispatch(
- uploadOrgLogo({
- id: orgId as string,
+ uploadWorkspaceLogo({
+ id: workspaceId as string,
logo: file,
progress: progress,
}),
@@ -142,7 +146,7 @@ export function GeneralSettings() {
};
const DeleteLogo = () => {
- dispatch(deleteOrgLogo(orgId));
+ dispatch(deleteWorkspaceLogo(workspaceId));
};
const isFetchingApplications = useSelector(getIsFetchingApplications);
@@ -167,8 +171,8 @@ export function GeneralSettings() {
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
{!isFetchingApplications && (
<TextInput
- cypressSelector="t--org-name-input"
- defaultValue={currentOrg && currentOrg.name}
+ cypressSelector="t--workspace-name-input"
+ defaultValue={currentWorkspace && currentWorkspace.name}
fill
onChange={onWorkspaceNameChange}
placeholder="Organization Name"
@@ -180,19 +184,21 @@ export function GeneralSettings() {
</SettingWrapper>
<SettingWrapper>
- <Row className="t--organization-settings-filepicker">
+ <Row className="t--workspace-settings-filepicker">
<Col>
<InputLabelWrapper>
<Text type={TextType.P1}>Upload Logo</Text>
</InputLabelWrapper>
- {isFetchingOrg && <FilePickerLoader className={Classes.SKELETON} />}
- {!isFetchingOrg && (
+ {isFetchingWorkspace && (
+ <FilePickerLoader className={Classes.SKELETON} />
+ )}
+ {!isFetchingWorkspace && (
<FilePickerV2
fileType={FileType.IMAGE}
fileUploader={FileUploader}
logoUploadError={logoUploadError.message}
onFileRemoved={DeleteLogo}
- url={currentOrg && currentOrg.logoUrl}
+ url={currentWorkspace && currentWorkspace.logoUrl}
/>
)}
</Col>
@@ -208,8 +214,10 @@ export function GeneralSettings() {
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
{!isFetchingApplications && (
<TextInput
- cypressSelector="t--org-website-input"
- defaultValue={(currentOrg && currentOrg.website) || ""}
+ cypressSelector="t--workspace-website-input"
+ defaultValue={
+ (currentWorkspace && currentWorkspace.website) || ""
+ }
fill
onChange={onWebsiteChange}
placeholder="Your website"
@@ -228,8 +236,10 @@ export function GeneralSettings() {
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
{!isFetchingApplications && (
<TextInput
- cypressSelector="t--org-email-input"
- defaultValue={(currentOrg && currentOrg.email) || ""}
+ cypressSelector="t--workspace-email-input"
+ defaultValue={
+ (currentWorkspace && currentWorkspace.email) || ""
+ }
fill
onChange={onEmailChange}
placeholder="Email"
diff --git a/app/client/src/pages/organization/ManageUsers.tsx b/app/client/src/pages/workspace/ManageUsers.tsx
similarity index 87%
rename from app/client/src/pages/organization/ManageUsers.tsx
rename to app/client/src/pages/workspace/ManageUsers.tsx
index 297f7f39eb3e..2d5270d871ae 100644
--- a/app/client/src/pages/organization/ManageUsers.tsx
+++ b/app/client/src/pages/workspace/ManageUsers.tsx
@@ -38,15 +38,15 @@ const StyledManageUsers = styled("a")`
}
`;
-function ManageUsers({ orgId }: { orgId: string }) {
+function ManageUsers({ workspaceId }: { workspaceId: string }) {
const currentPath = useLocation().pathname;
- const pathRegex = /(?:\/org\/)\w+(?:\/settings)/;
+ const pathRegex = /(?:\/workspace\/)\w+(?:\/settings)/;
return !pathRegex.test(currentPath) ? (
<StyledManageUsers
className="manageUsers"
onClick={() => {
- history.push(`/org/${orgId}/settings/members`);
+ history.push(`/workspace/${workspaceId}/settings/members`);
}}
>
<Text type={TextType.H6}>MANAGE USERS</Text>
diff --git a/app/client/src/pages/organization/Members.tsx b/app/client/src/pages/workspace/Members.tsx
similarity index 89%
rename from app/client/src/pages/organization/Members.tsx
rename to app/client/src/pages/workspace/Members.tsx
index 753b431aada6..23244da7ee97 100644
--- a/app/client/src/pages/organization/Members.tsx
+++ b/app/client/src/pages/workspace/Members.tsx
@@ -3,23 +3,23 @@ import { useDispatch, useSelector } from "react-redux";
import {
getAllUsers,
getAllRoles,
- getCurrentOrg,
- getOrgLoadingStates,
-} from "@appsmith/selectors/organizationSelectors";
+ getCurrentWorkspace,
+ getWorkspaceLoadingStates,
+} from "@appsmith/selectors/workspaceSelectors";
import PageSectionHeader from "pages/common/PageSectionHeader";
-import OrgInviteUsersForm from "pages/organization/OrgInviteUsersForm";
+import WorkspaceInviteUsersForm from "pages/workspace/WorkspaceInviteUsersForm";
import { RouteComponentProps } from "react-router";
import FormDialogComponent from "components/editorComponents/form/FormDialogComponent";
import { getCurrentUser } from "selectors/usersSelectors";
import Table from "components/ads/Table";
import Icon, { IconSize } from "components/ads/Icon";
import {
- fetchUsersForOrg,
- fetchRolesForOrg,
- fetchOrg,
- changeOrgUserRole,
- deleteOrgUser,
-} from "actions/orgActions";
+ fetchUsersForWorkspace,
+ fetchRolesForWorkspace,
+ fetchWorkspace,
+ changeWorkspaceUserRole,
+ deleteWorkspaceUser,
+} from "actions/workspaceActions";
import Button, { Size, Category } from "components/ads/Button";
import TableDropdown from "components/ads/TableDropdown";
import Dropdown from "components/ads/Dropdown";
@@ -37,7 +37,7 @@ import { USER_PHOTO_URL } from "constants/userConstants";
import { Colors } from "constants/Colors";
export type PageProps = RouteComponentProps<{
- orgId: string;
+ workspaceId: string;
}>;
const Loader = styled.div`
@@ -169,18 +169,18 @@ const DeleteIcon = styled(Icon)`
export default function MemberSettings(props: PageProps) {
const {
match: {
- params: { orgId },
+ params: { workspaceId },
},
- // deleteOrgUser,
- // changeOrgUserRole,
+ // deleteWorkspaceUser,
+ // changeWorkspaceUserRole,
} = props;
const dispatch = useDispatch();
useEffect(() => {
- dispatch(fetchUsersForOrg(orgId));
- dispatch(fetchRolesForOrg(orgId));
- dispatch(fetchOrg(orgId));
- }, [orgId]);
+ dispatch(fetchUsersForWorkspace(workspaceId));
+ dispatch(fetchRolesForWorkspace(workspaceId));
+ dispatch(fetchWorkspace(workspaceId));
+ }, [workspaceId]);
const [
showMemberDeletionConfirmation,
@@ -194,21 +194,26 @@ export default function MemberSettings(props: PageProps) {
const [userToBeDeleted, setUserToBeDeleted] = useState<{
name: string;
username: string;
- orgId: string;
+ workspaceId: string;
} | null>(null);
const onConfirmMemberDeletion = (
name: string,
username: string,
- orgId: string,
+ workspaceId: string,
) => {
- setUserToBeDeleted({ name, username, orgId });
+ setUserToBeDeleted({ name, username, workspaceId });
onOpenConfirmationModal();
};
const onDeleteMember = () => {
if (!userToBeDeleted) return null;
- dispatch(deleteOrgUser(userToBeDeleted.orgId, userToBeDeleted.username));
+ dispatch(
+ deleteWorkspaceUser(
+ userToBeDeleted.workspaceId,
+ userToBeDeleted.username,
+ ),
+ );
};
const {
@@ -216,12 +221,12 @@ export default function MemberSettings(props: PageProps) {
isFetchingAllRoles,
isFetchingAllUsers,
roleChangingUserInfo,
- } = useSelector(getOrgLoadingStates);
+ } = useSelector(getWorkspaceLoadingStates);
const allRoles = useSelector(getAllRoles);
const allUsers = useSelector(getAllUsers);
const currentUser = useSelector(getCurrentUser);
- const currentOrg = useSelector(getCurrentOrg).filter(
- (el) => el.id === orgId,
+ const currentWorkspace = useSelector(getCurrentWorkspace).filter(
+ (el) => el.id === workspaceId,
)[0];
useEffect(() => {
@@ -282,8 +287,8 @@ export default function MemberSettings(props: PageProps) {
}
onSelect={(option) => {
dispatch(
- changeOrgUserRole(
- orgId,
+ changeWorkspaceUserRole(
+ workspaceId,
option.name,
cellProps.cell.row.values.username,
),
@@ -320,7 +325,7 @@ export default function MemberSettings(props: PageProps) {
onConfirmMemberDeletion(
cellProps.cell.row.values.username,
cellProps.cell.row.values.username,
- orgId,
+ workspaceId,
);
}}
size={IconSize.LARGE}
@@ -329,7 +334,7 @@ export default function MemberSettings(props: PageProps) {
},
},
];
- const currentOrgName = currentOrg?.name ?? "";
+ const currentWorkspaceName = currentWorkspace?.name ?? "";
const isMobile: boolean = useMediaQuery({ maxWidth: 767 });
const roles = allRoles
? Object.keys(allRoles).map((role) => {
@@ -342,17 +347,16 @@ export default function MemberSettings(props: PageProps) {
: [];
const selectRole = (option: any, username: any) => {
- dispatch(changeOrgUserRole(orgId, option, username));
+ dispatch(changeWorkspaceUserRole(workspaceId, option, username));
};
return (
<MembersWrapper isMobile={isMobile}>
<PageSectionHeader>
<SettingsHeading type={TextType.H1}>Manage Users</SettingsHeading>
<FormDialogComponent
- Form={OrgInviteUsersForm}
+ Form={WorkspaceInviteUsersForm}
canOutsideClickClose
- orgId={orgId}
- title={`Invite Users to ${currentOrgName}`}
+ title={`Invite Users to ${currentWorkspaceName}`}
trigger={
<ButtonWrapper>
<Button
@@ -365,6 +369,7 @@ export default function MemberSettings(props: PageProps) {
/>
</ButtonWrapper>
}
+ workspaceId={workspaceId}
/>
</PageSectionHeader>
{isFetchingAllUsers && isFetchingAllRoles ? (
@@ -428,7 +433,7 @@ export default function MemberSettings(props: PageProps) {
onConfirmMemberDeletion(
user.username,
user.username,
- orgId,
+ workspaceId,
);
}}
size={IconSize.LARGE}
diff --git a/app/client/src/pages/organization/OrgInviteUsersForm.tsx b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx
similarity index 86%
rename from app/client/src/pages/organization/OrgInviteUsersForm.tsx
rename to app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx
index 9aab7d5b1811..fb06d3e886d2 100644
--- a/app/client/src/pages/organization/OrgInviteUsersForm.tsx
+++ b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx
@@ -8,12 +8,15 @@ import { AppState } from "reducers";
import {
getRolesForField,
getAllUsers,
- getCurrentAppOrg,
-} from "@appsmith/selectors/organizationSelectors";
+ getCurrentAppWorkspace,
+} from "@appsmith/selectors/workspaceSelectors";
import Spinner from "components/editorComponents/Spinner";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import { InviteUsersToOrgFormValues, inviteUsersToOrg } from "./helpers";
-import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
+import {
+ InviteUsersToWorkspaceFormValues,
+ inviteUsersToWorkspace,
+} from "./helpers";
+import { INVITE_USERS_TO_WORKSPACE_FORM } from "constants/forms";
import {
createMessage,
INVITE_USERS_SUBMIT_SUCCESS,
@@ -46,9 +49,9 @@ const CommonTitleTextStyle = css`
font-weight: normal;
`;
-const OrgInviteWrapper = styled.div``;
+const WorkspaceInviteWrapper = styled.div``;
-const OrgInviteTitle = styled.div`
+const WorkspaceInviteTitle = styled.div`
padding: 0 0 10px 0;
& > span[type="h5"] {
${CommonTitleTextStyle}
@@ -228,7 +231,7 @@ const { mailEnabled } = getAppsmithConfigs();
export const InviteButtonWidth = "88px";
-function OrgInviteUsersForm(props: any) {
+function WorkspaceInviteUsersForm(props: any) {
const [emailError, setEmailError] = useState("");
const userRef = React.createRef<HTMLDivElement>();
const {
@@ -236,7 +239,7 @@ function OrgInviteUsersForm(props: any) {
anyTouched,
error,
fetchAllRoles,
- fetchCurrentOrg,
+ fetchCurrentWorkspace,
fetchUser,
handleSubmit,
isApplicationInvite,
@@ -249,19 +252,19 @@ function OrgInviteUsersForm(props: any) {
// set state for checking number of users invited
const [numberOfUsersInvited, updateNumberOfUsersInvited] = useState(0);
- const currentOrg = useSelector(getCurrentAppOrg);
+ const currentWorkspace = useSelector(getCurrentAppWorkspace);
- const userOrgPermissions = currentOrg?.userPermissions ?? [];
+ const userWorkspacePermissions = currentWorkspace?.userPermissions ?? [];
const canManage = isPermitted(
- userOrgPermissions,
- PERMISSION_TYPE.MANAGE_ORGANIZATION,
+ userWorkspacePermissions,
+ PERMISSION_TYPE.MANAGE_WORKSPACE,
);
useEffect(() => {
- fetchUser(props.orgId);
- fetchAllRoles(props.orgId);
- fetchCurrentOrg(props.orgId);
- }, [props.orgId, fetchUser, fetchAllRoles, fetchCurrentOrg]);
+ fetchUser(props.workspaceId);
+ fetchAllRoles(props.workspaceId);
+ fetchCurrentWorkspace(props.workspaceId);
+ }, [props.workspaceId, fetchUser, fetchAllRoles, fetchCurrentWorkspace]);
const styledRoles = props.roles.map((role: any) => {
return {
@@ -291,11 +294,13 @@ function OrgInviteUsersForm(props: any) {
);
return (
- <OrgInviteWrapper>
+ <WorkspaceInviteWrapper>
{isApplicationInvite && (
- <OrgInviteTitle>
- <Text type={TextType.H5}>Invite users to {currentOrg?.name} </Text>
- </OrgInviteTitle>
+ <WorkspaceInviteTitle>
+ <Text type={TextType.H5}>
+ Invite users to {currentWorkspace?.name}{" "}
+ </Text>
+ </WorkspaceInviteTitle>
)}
<StyledForm
onSubmit={handleSubmit((values: any, dispatch: any) => {
@@ -304,7 +309,10 @@ function OrgInviteUsersForm(props: any) {
const usersAsStringsArray = values.users.split(",");
// update state to show success message correctly
updateNumberOfUsersInvited(usersAsStringsArray.length);
- return inviteUsersToOrg({ ...values, orgId: props.orgId }, dispatch);
+ return inviteUsersToWorkspace(
+ { ...values, workspaceId: props.workspaceId },
+ dispatch,
+ );
})}
>
<StyledInviteFieldGroup>
@@ -407,9 +415,9 @@ function OrgInviteUsersForm(props: any) {
<Callout fill text={error || emailError} variant={Variant.danger} />
)}
</ErrorBox>
- {canManage && <ManageUsers orgId={props.orgId} />}
+ {canManage && <ManageUsers workspaceId={props.workspaceId} />}
</StyledForm>
- </OrgInviteWrapper>
+ </WorkspaceInviteWrapper>
);
}
@@ -418,44 +426,44 @@ export default connect(
return {
roles: getRolesForField(state),
allUsers: getAllUsers(state),
- isLoading: state.ui.orgs.loadingStates.isFetchAllUsers,
+ isLoading: state.ui.workspaces.loadingStates.isFetchAllUsers,
};
},
(dispatch: any) => ({
- fetchAllRoles: (orgId: string) =>
+ fetchAllRoles: (workspaceId: string) =>
dispatch({
type: ReduxActionTypes.FETCH_ALL_ROLES_INIT,
payload: {
- orgId,
+ workspaceId,
},
}),
- fetchCurrentOrg: (orgId: string) =>
+ fetchCurrentWorkspace: (workspaceId: string) =>
dispatch({
- type: ReduxActionTypes.FETCH_CURRENT_ORG,
+ type: ReduxActionTypes.FETCH_CURRENT_WORKSPACE,
payload: {
- orgId,
+ workspaceId,
},
}),
- fetchUser: (orgId: string) =>
+ fetchUser: (workspaceId: string) =>
dispatch({
type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
payload: {
- orgId,
+ workspaceId,
},
}),
}),
)(
reduxForm<
- InviteUsersToOrgFormValues,
+ InviteUsersToWorkspaceFormValues,
{
- fetchAllRoles: (orgId: string) => void;
+ fetchAllRoles: (workspaceId: string) => void;
roles?: any;
applicationId?: string;
- orgId?: string;
+ workspaceId?: string;
isApplicationInvite?: boolean;
}
>({
validate,
- form: INVITE_USERS_TO_ORG_FORM,
- })(OrgInviteUsersForm),
+ form: INVITE_USERS_TO_WORKSPACE_FORM,
+ })(WorkspaceInviteUsersForm),
);
diff --git a/app/client/src/pages/organization/__tests__/OrganizationSettingsForm.test.tsx b/app/client/src/pages/workspace/__tests__/WorkspaceSettingsForm.test.tsx
similarity index 74%
rename from app/client/src/pages/organization/__tests__/OrganizationSettingsForm.test.tsx
rename to app/client/src/pages/workspace/__tests__/WorkspaceSettingsForm.test.tsx
index 3c7bbb03e851..8d1bcdfede9c 100644
--- a/app/client/src/pages/organization/__tests__/OrganizationSettingsForm.test.tsx
+++ b/app/client/src/pages/workspace/__tests__/WorkspaceSettingsForm.test.tsx
@@ -11,11 +11,11 @@ describe("Application Settings", () => {
container = document.createElement("div");
document.body.appendChild(container);
});
- it("checks that organization settings have correct styling", async (done) => {
+ it("checks that workspace settings have correct styling", async (done) => {
const { findByText } = render(<GeneralSettings />);
- const orgNameField = await findByText("Organization Name");
- expect(orgNameField.closest("div")).toHaveStyle({ width: "150px;" });
+ const workspaceNameField = await findByText("Organization Name");
+ expect(workspaceNameField.closest("div")).toHaveStyle({ width: "150px;" });
await done();
});
diff --git a/app/client/src/pages/organization/defaultOrgPage.tsx b/app/client/src/pages/workspace/defaultWorkspacePage.tsx
similarity index 71%
rename from app/client/src/pages/organization/defaultOrgPage.tsx
rename to app/client/src/pages/workspace/defaultWorkspacePage.tsx
index 5b8f0f4758b0..3c7624e0d7d7 100644
--- a/app/client/src/pages/organization/defaultOrgPage.tsx
+++ b/app/client/src/pages/workspace/defaultWorkspacePage.tsx
@@ -1,10 +1,10 @@
import React from "react";
import Centered from "components/designSystems/appsmith/CenteredWrapper";
-export function DefaultOrgPage() {
+export function DefaultWorkspacePage() {
return (
<Centered>
<p>This page is under construction</p>
</Centered>
);
}
-export default DefaultOrgPage;
+export default DefaultWorkspacePage;
diff --git a/app/client/src/pages/organization/helpers.ts b/app/client/src/pages/workspace/helpers.ts
similarity index 63%
rename from app/client/src/pages/organization/helpers.ts
rename to app/client/src/pages/workspace/helpers.ts
index 32851d9b1224..e5152aac54a3 100644
--- a/app/client/src/pages/organization/helpers.ts
+++ b/app/client/src/pages/workspace/helpers.ts
@@ -1,26 +1,26 @@
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { SubmissionError } from "redux-form";
-export type InviteUsersToOrgByRoleValues = {
+export type InviteUsersToWorkspaceByRoleValues = {
id: string;
users?: string;
role?: string;
roles?: any[];
};
-export type InviteUsersToOrgFormValues = {
- usersByRole: InviteUsersToOrgByRoleValues[];
+export type InviteUsersToWorkspaceFormValues = {
+ usersByRole: InviteUsersToWorkspaceByRoleValues[];
};
-export type CreateOrganizationFormValues = {
+export type CreateWorkspaceFormValues = {
name: string;
};
-export const createOrganizationSubmitHandler = (
- values: CreateOrganizationFormValues,
+export const createWorkspaceSubmitHandler = (
+ values: CreateWorkspaceFormValues,
dispatch: any,
): Promise<any> => {
return new Promise((resolve, reject) => {
dispatch({
- type: ReduxActionTypes.CREATE_ORGANIZATION_INIT,
+ type: ReduxActionTypes.CREATE_WORKSPACE_INIT,
payload: {
resolve,
reject,
@@ -32,8 +32,8 @@ export const createOrganizationSubmitHandler = (
});
};
-export const inviteUsersToOrgSubmitHandler = (
- values: InviteUsersToOrgFormValues,
+export const inviteUsersToWorkspaceSubmitHandler = (
+ values: InviteUsersToWorkspaceFormValues,
dispatch: any,
): Promise<any> => {
const data = values.usersByRole.map((value) => ({
@@ -42,7 +42,7 @@ export const inviteUsersToOrgSubmitHandler = (
}));
return new Promise((resolve, reject) => {
dispatch({
- type: ReduxActionTypes.INVITE_USERS_TO_ORG_INIT,
+ type: ReduxActionTypes.INVITE_USERS_TO_WORKSPACE_INIT,
payload: {
resolve,
reject,
@@ -54,15 +54,18 @@ export const inviteUsersToOrgSubmitHandler = (
});
};
-export const inviteUsersToOrg = (values: any, dispatch: any): Promise<any> => {
+export const inviteUsersToWorkspace = (
+ values: any,
+ dispatch: any,
+): Promise<any> => {
const data = {
roleName: values.role,
usernames: values.users ? values.users.split(",") : [],
- orgId: values.orgId,
+ workspaceId: values.workspaceId,
};
return new Promise((resolve, reject) => {
dispatch({
- type: ReduxActionTypes.INVITE_USERS_TO_ORG_INIT,
+ type: ReduxActionTypes.INVITE_USERS_TO_WORKSPACE_INIT,
payload: {
resolve,
reject,
diff --git a/app/client/src/pages/organization/index.tsx b/app/client/src/pages/workspace/index.tsx
similarity index 63%
rename from app/client/src/pages/organization/index.tsx
rename to app/client/src/pages/workspace/index.tsx
index 0efda6e35c0f..fa5d835893e1 100644
--- a/app/client/src/pages/organization/index.tsx
+++ b/app/client/src/pages/workspace/index.tsx
@@ -1,22 +1,25 @@
import React from "react";
import { Switch, useRouteMatch, useLocation, Route } from "react-router-dom";
import PageWrapper from "pages/common/PageWrapper";
-import DefaultOrgPage from "./defaultOrgPage";
+import DefaultWorkspacePage from "./defaultWorkspacePage";
import Settings from "./settings";
import * as Sentry from "@sentry/react";
const SentryRoute = Sentry.withSentryRouting(Route);
-export function Organization() {
+export function Workspace() {
const { path } = useRouteMatch();
const location = useLocation();
return (
<PageWrapper displayName="Organization Settings">
<Switch location={location}>
- <SentryRoute component={Settings} path={`${path}/:orgId/settings`} />
- <SentryRoute component={DefaultOrgPage} />
+ <SentryRoute
+ component={Settings}
+ path={`${path}/:workspaceId/settings`}
+ />
+ <SentryRoute component={DefaultWorkspacePage} />
</Switch>
</PageWrapper>
);
}
-export default Organization;
+export default Workspace;
diff --git a/app/client/src/pages/organization/loader.tsx b/app/client/src/pages/workspace/loader.tsx
similarity index 73%
rename from app/client/src/pages/organization/loader.tsx
rename to app/client/src/pages/workspace/loader.tsx
index 31dccb568912..55da916355c0 100644
--- a/app/client/src/pages/organization/loader.tsx
+++ b/app/client/src/pages/workspace/loader.tsx
@@ -2,7 +2,7 @@ import React from "react";
import PageLoadingBar from "pages/common/PageLoadingBar";
import { retryPromise } from "utils/AppsmithUtils";
-class OrganizationLoader extends React.PureComponent<any, { Page: any }> {
+class WorkspaceLoader extends React.PureComponent<any, { Page: any }> {
constructor(props: any) {
super(props);
@@ -13,7 +13,7 @@ class OrganizationLoader extends React.PureComponent<any, { Page: any }> {
componentDidMount() {
retryPromise(() =>
- import(/* webpackChunkName: "organization" */ "./index"),
+ import(/* webpackChunkName: "workspace" */ "./index"),
).then((module) => {
this.setState({ Page: module.default });
});
@@ -26,4 +26,4 @@ class OrganizationLoader extends React.PureComponent<any, { Page: any }> {
}
}
-export default OrganizationLoader;
+export default WorkspaceLoader;
diff --git a/app/client/src/pages/organization/settings.tsx b/app/client/src/pages/workspace/settings.tsx
similarity index 87%
rename from app/client/src/pages/organization/settings.tsx
rename to app/client/src/pages/workspace/settings.tsx
index 1ea392c18501..f6eab7175787 100644
--- a/app/client/src/pages/organization/settings.tsx
+++ b/app/client/src/pages/workspace/settings.tsx
@@ -6,7 +6,7 @@ import {
Link,
Route,
} from "react-router-dom";
-import { getCurrentOrg } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors";
import { useSelector, useDispatch } from "react-redux";
import { TabComponent, TabProp } from "components/ads/Tabs";
import Text, { TextType } from "components/ads/Text";
@@ -43,19 +43,19 @@ const SettingsWrapper = styled.div<{
margin: 0 auto;
`;
export default function Settings() {
- const { orgId } = useParams<{ orgId: string }>();
- const currentOrg = useSelector(getCurrentOrg).filter(
- (el) => el.id === orgId,
+ const { workspaceId } = useParams<{ workspaceId: string }>();
+ const currentWorkspace = useSelector(getCurrentWorkspace).filter(
+ (el) => el.id === workspaceId,
)[0];
const { path } = useRouteMatch();
const location = useLocation();
const dispatch = useDispatch();
useEffect(() => {
- if (!currentOrg) {
+ if (!currentWorkspace) {
dispatch(getAllApplications());
}
- }, [dispatch, currentOrg]);
+ }, [dispatch, currentWorkspace]);
const SettingsRenderer = (
<div>
@@ -94,8 +94,8 @@ export default function Settings() {
<SettingsWrapper isMobile={isMobile}>
<LinkToApplications to={"/applications"}>
<Icon color="#9F9F9F" icon="chevron-left" />
- <Text className="t--organization-header" type={TextType.H1}>
- {currentOrg && currentOrg.name}
+ <Text className="t--workspace-header" type={TextType.H1}>
+ {currentWorkspace && currentWorkspace.name}
</Text>
</LinkToApplications>
<TabComponent
diff --git a/app/client/src/pages/organization/users.tsx b/app/client/src/pages/workspace/users.tsx
similarity index 68%
rename from app/client/src/pages/organization/users.tsx
rename to app/client/src/pages/workspace/users.tsx
index b4988d94ae6f..9f060d4f6f6c 100644
--- a/app/client/src/pages/organization/users.tsx
+++ b/app/client/src/pages/workspace/users.tsx
@@ -1,10 +1,10 @@
import React from "react";
import { useHistory } from "react-router-dom";
-import { ORG_INVITE_USERS_PAGE_URL } from "constants/routes";
+import { WORKSPACE_INVITE_USERS_PAGE_URL } from "constants/routes";
import PageSectionHeader from "pages/common/PageSectionHeader";
import Button from "components/editorComponents/Button";
-export function OrgMembers() {
+export function WorkspaceMembers() {
const history = useHistory();
return (
@@ -15,11 +15,11 @@ export function OrgMembers() {
icon="plus"
iconAlignment="left"
intent="primary"
- onClick={() => history.push(ORG_INVITE_USERS_PAGE_URL)}
+ onClick={() => history.push(WORKSPACE_INVITE_USERS_PAGE_URL)}
text="Invite Users"
/>
</PageSectionHeader>
);
}
-export default OrgMembers;
+export default WorkspaceMembers;
diff --git a/app/client/src/reducers/index.tsx b/app/client/src/reducers/index.tsx
index 023b55fd0e19..6fa5ca373d04 100644
--- a/app/client/src/reducers/index.tsx
+++ b/app/client/src/reducers/index.tsx
@@ -19,7 +19,7 @@ import { ApiPaneReduxState } from "./uiReducers/apiPaneReducer";
import { QueryPaneReduxState } from "./uiReducers/queryPaneReducer";
import { PluginDataState } from "reducers/entityReducers/pluginsReducer";
import { AuthState } from "reducers/uiReducers/authReducer";
-import { OrgReduxState } from "reducers/uiReducers/orgReducer";
+import { WorkspaceReduxState } from "reducers/uiReducers/workspaceReducer";
import { UsersReduxState } from "reducers/uiReducers/usersReducer";
import { ThemeState } from "reducers/uiReducers/themeReducer";
import { WidgetDragResizeState } from "reducers/uiReducers/dragResizeReducer";
@@ -83,7 +83,7 @@ export interface AppState {
apiPane: ApiPaneReduxState;
auth: AuthState;
templates: TemplatesReduxState;
- orgs: OrgReduxState;
+ workspaces: WorkspaceReduxState;
users: UsersReduxState;
widgetDragResize: WidgetDragResizeState;
importedCollections: ImportedCollectionsReduxState;
diff --git a/app/client/src/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/reducers/uiReducers/applicationsReducer.tsx
index 292a0f07fbcb..4191f3c9a41b 100644
--- a/app/client/src/reducers/uiReducers/applicationsReducer.tsx
+++ b/app/client/src/reducers/uiReducers/applicationsReducer.tsx
@@ -5,7 +5,7 @@ import {
ReduxActionErrorTypes,
ApplicationPayload,
} from "@appsmith/constants/ReduxActionConstants";
-import { Organization, OrgUser } from "constants/orgConstants";
+import { Workspaces, WorkspaceUser } from "constants/workspaceConstants";
import {
createMessage,
ERROR_MESSAGE_CREATE_APPLICATION,
@@ -26,13 +26,13 @@ const initialState: ApplicationsReduxState = {
deletingApplication: false,
forkingApplication: false,
duplicatingApplication: false,
- userOrgs: [],
- isSavingOrgInfo: false,
+ userWorkspaces: [],
+ isSavingWorkspaceInfo: false,
importingApplication: false,
importedApplication: null,
showAppInviteUsersDialog: false,
isImportAppModalOpen: false,
- organizationIdForImport: null,
+ workspaceIdForImport: null,
};
const applicationsReducer = createReducer(initialState, {
@@ -45,9 +45,9 @@ const applicationsReducer = createReducer(initialState, {
state: ApplicationsReduxState,
action: ReduxAction<ApplicationPayload>,
) => {
- const _organizations = state.userOrgs.map((org: Organization) => {
- if (org.organization.id === action.payload.organizationId) {
- let applications = org.applications;
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ if (workspace.workspace.id === action.payload.workspaceId) {
+ let applications = workspace.applications;
applications = applications.filter(
(application: ApplicationPayload) => {
@@ -56,17 +56,17 @@ const applicationsReducer = createReducer(initialState, {
);
return {
- ...org,
+ ...workspace,
applications,
};
}
- return org;
+ return workspace;
});
return {
...state,
- userOrgs: _organizations,
+ userWorkspaces: _workspaces,
deletingApplication: false,
};
},
@@ -94,24 +94,24 @@ const applicationsReducer = createReducer(initialState, {
[ReduxActionTypes.GET_ALL_APPLICATION_INIT]: (
state: ApplicationsReduxState,
) => ({ ...state, isFetchingApplications: true }),
- [ReduxActionTypes.FETCH_USER_APPLICATIONS_ORGS_SUCCESS]: (
+ [ReduxActionTypes.FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS]: (
state: ApplicationsReduxState,
action: ReduxAction<{ applicationList: any }>,
) => {
return {
...state,
isFetchingApplications: false,
- userOrgs: action.payload,
+ userWorkspaces: action.payload,
};
},
- [ReduxActionTypes.DELETE_ORG_SUCCESS]: (
+ [ReduxActionTypes.DELETE_WORKSPACE_SUCCESS]: (
state: ApplicationsReduxState,
action: ReduxAction<string>,
) => {
return {
...state,
- userOrgs: state.userOrgs.filter(
- (org: Organization) => org.organization.id !== action.payload,
+ userWorkspaces: state.userWorkspaces.filter(
+ (workspace: Workspaces) => workspace.workspace.id !== action.payload,
),
};
},
@@ -152,7 +152,7 @@ const applicationsReducer = createReducer(initialState, {
action: ReduxAction<CreateApplicationFormValues>,
) => {
const updatedCreatingApplication = { ...state.creatingApplication };
- updatedCreatingApplication[action.payload.orgId] = true;
+ updatedCreatingApplication[action.payload.workspaceId] = true;
return {
...state,
@@ -161,56 +161,59 @@ const applicationsReducer = createReducer(initialState, {
},
[ReduxActionTypes.CREATE_APPLICATION_SUCCESS]: (
state: ApplicationsReduxState,
- action: ReduxAction<{ orgId: string; application: ApplicationPayload }>,
+ action: ReduxAction<{
+ workspaceId: string;
+ application: ApplicationPayload;
+ }>,
) => {
- const _organizations = state.userOrgs.map((org: Organization) => {
- if (org.organization.id === action.payload.orgId) {
- const applications = org.applications;
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ if (workspace.workspace.id === action.payload.workspaceId) {
+ const applications = workspace.applications;
applications.push(action.payload.application);
- org.applications = [...applications];
+ workspace.applications = [...applications];
return {
- ...org,
+ ...workspace,
};
}
- return org;
+ return workspace;
});
const updatedCreatingApplication = { ...state.creatingApplication };
- updatedCreatingApplication[action.payload.orgId] = false;
+ updatedCreatingApplication[action.payload.workspaceId] = false;
return {
...state,
creatingApplication: updatedCreatingApplication,
applicationList: [...state.applicationList, action.payload.application],
- userOrgs: _organizations,
+ userWorkspaces: _workspaces,
};
},
- [ReduxActionTypes.INVITED_USERS_TO_ORGANIZATION]: (
+ [ReduxActionTypes.INVITED_USERS_TO_WORKSPACE]: (
state: ApplicationsReduxState,
- action: ReduxAction<{ orgId: string; users: OrgUser[] }>,
+ action: ReduxAction<{ workspaceId: string; users: WorkspaceUser[] }>,
) => {
- const _organizations = state.userOrgs.map((org: Organization) => {
- if (org.organization.id === action.payload.orgId) {
- const userRoles = org.userRoles;
- org.userRoles = [...userRoles, ...action.payload.users];
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ if (workspace.workspace.id === action.payload.workspaceId) {
+ const userRoles = workspace.userRoles;
+ workspace.userRoles = [...userRoles, ...action.payload.users];
return {
- ...org,
+ ...workspace,
};
}
- return org;
+ return workspace;
});
return {
...state,
- userOrgs: _organizations,
+ userWorkspaces: _workspaces,
};
},
[ReduxActionErrorTypes.CREATE_APPLICATION_ERROR]: (
state: ApplicationsReduxState,
- action: ReduxAction<{ orgId: string }>,
+ action: ReduxAction<{ workspaceId: string }>,
) => {
const updatedCreatingApplication = { ...state.creatingApplication };
- updatedCreatingApplication[action.payload.orgId] = false;
+ updatedCreatingApplication[action.payload.workspaceId] = false;
return {
...state,
@@ -223,24 +226,27 @@ const applicationsReducer = createReducer(initialState, {
},
[ReduxActionTypes.FORK_APPLICATION_SUCCESS]: (
state: ApplicationsReduxState,
- action: ReduxAction<{ orgId: string; application: ApplicationPayload }>,
+ action: ReduxAction<{
+ workspaceId: string;
+ application: ApplicationPayload;
+ }>,
) => {
- const _organizations = state.userOrgs.map((org: Organization) => {
- if (org.organization.id === action.payload.orgId) {
- const applications = org.applications;
- org.applications = [...applications, action.payload.application];
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ if (workspace.workspace.id === action.payload.workspaceId) {
+ const applications = workspace.applications;
+ workspace.applications = [...applications, action.payload.application];
return {
- ...org,
+ ...workspace,
};
}
- return org;
+ return workspace;
});
return {
...state,
forkingApplication: false,
applicationList: [...state.applicationList, action.payload.application],
- userOrgs: _organizations,
+ userWorkspaces: _workspaces,
};
},
[ReduxActionErrorTypes.FORK_APPLICATION_ERROR]: (
@@ -276,13 +282,13 @@ const applicationsReducer = createReducer(initialState, {
importingApplication: false,
};
},
- [ReduxActionTypes.SAVING_ORG_INFO]: (state: ApplicationsReduxState) => {
+ [ReduxActionTypes.SAVING_WORKSPACE_INFO]: (state: ApplicationsReduxState) => {
return {
...state,
- isSavingOrgInfo: true,
+ isSavingWorkspaceInfo: true,
};
},
- [ReduxActionTypes.SAVE_ORG_SUCCESS]: (
+ [ReduxActionTypes.SAVE_WORKSPACE_SUCCESS]: (
state: ApplicationsReduxState,
action: ReduxAction<{
id: string;
@@ -292,27 +298,29 @@ const applicationsReducer = createReducer(initialState, {
logoUrl?: string;
}>,
) => {
- const _organizations = state.userOrgs.map((org: Organization) => {
- if (org.organization.id === action.payload.id) {
- org.organization = { ...org.organization, ...action.payload };
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ if (workspace.workspace.id === action.payload.id) {
+ workspace.workspace = { ...workspace.workspace, ...action.payload };
return {
- ...org,
+ ...workspace,
};
}
- return org;
+ return workspace;
});
return {
...state,
- userOrgs: _organizations,
- isSavingOrgInfo: false,
+ userWorkspaces: _workspaces,
+ isSavingWorkspaceInfo: false,
};
},
- [ReduxActionErrorTypes.SAVE_ORG_ERROR]: (state: ApplicationsReduxState) => {
+ [ReduxActionErrorTypes.SAVE_WORKSPACE_ERROR]: (
+ state: ApplicationsReduxState,
+ ) => {
return {
...state,
- isSavingOrgInfo: false,
+ isSavingWorkspaceInfo: false,
};
},
[ReduxActionTypes.SEARCH_APPLICATIONS]: (
@@ -362,24 +370,24 @@ const applicationsReducer = createReducer(initialState, {
state: ApplicationsReduxState,
action: ReduxAction<UpdateApplicationRequest>,
) => {
- // userOrgs data has to be saved to localStorage only if the action is successful
+ // userWorkspaces data has to be saved to localStorage only if the action is successful
// It introduces bug if we prematurely save it during init action.
const { id, ...rest } = action.payload;
- const _organizations = state.userOrgs.map((org: Organization) => {
- const appIndex = org.applications.findIndex((app) => app.id === id);
+ const _workspaces = state.userWorkspaces.map((workspace: Workspaces) => {
+ const appIndex = workspace.applications.findIndex((app) => app.id === id);
if (appIndex !== -1) {
- org.applications[appIndex] = {
- ...org.applications[appIndex],
+ workspace.applications[appIndex] = {
+ ...workspace.applications[appIndex],
...rest,
};
}
- return org;
+ return workspace;
});
return {
...state,
- userOrgs: _organizations,
+ userWorkspaces: _workspaces,
isSavingAppName: false,
isErrorSavingAppName: false,
};
@@ -455,7 +463,7 @@ const applicationsReducer = createReducer(initialState, {
...state,
isDatasourceConfigForImportFetched: false,
}),
- [ReduxActionTypes.SET_ORG_ID_FOR_IMPORT]: (
+ [ReduxActionTypes.SET_WORKSPACE_ID_FOR_IMPORT]: (
state: ApplicationsReduxState,
action: ReduxAction<string>,
) => {
@@ -467,10 +475,10 @@ const applicationsReducer = createReducer(initialState, {
return {
...state,
currentApplication,
- organizationIdForImport: action.payload,
+ workspaceIdForImport: action.payload,
};
},
- [ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_SUCCESS]: (
+ [ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_SUCCESS]: (
state: ApplicationsReduxState,
action: ReduxAction<ApplicationPayload>,
) => {
@@ -497,20 +505,20 @@ export interface ApplicationsReduxState {
forkingApplication: boolean;
duplicatingApplication: boolean;
currentApplication?: ApplicationPayload;
- userOrgs: Organization[];
- isSavingOrgInfo: boolean;
+ userWorkspaces: Workspaces[];
+ isSavingWorkspaceInfo: boolean;
importingApplication: boolean;
showAppInviteUsersDialog: boolean;
importedApplication: any;
isImportAppModalOpen: boolean;
- organizationIdForImport: any;
+ workspaceIdForImport: any;
isDatasourceConfigForImportFetched?: boolean;
}
export interface Application {
id: string;
name: string;
- organizationId: string;
+ workspaceId: string;
isPublic: boolean;
appIsExample: boolean;
new: boolean;
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index caddf8894765..2f547260774b 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -401,7 +401,9 @@ const gitSyncReducer = createReducer(initialState, {
deployKeyDocUrl: action.payload.docUrl,
};
},
- [ReduxActionTypes.SET_ORG_ID_FOR_IMPORT]: (state: GitSyncReducerState) => {
+ [ReduxActionTypes.SET_WORKSPACE_ID_FOR_IMPORT]: (
+ state: GitSyncReducerState,
+ ) => {
return {
...state,
SSHKeyPair: "",
diff --git a/app/client/src/reducers/uiReducers/index.tsx b/app/client/src/reducers/uiReducers/index.tsx
index 2def5faacbe7..ec3c59e489b7 100644
--- a/app/client/src/reducers/uiReducers/index.tsx
+++ b/app/client/src/reducers/uiReducers/index.tsx
@@ -7,7 +7,7 @@ import applicationsReducer from "./applicationsReducer";
import apiPaneReducer from "./apiPaneReducer";
import datasourcePaneReducer from "./datasourcePaneReducer";
import authReducer from "./authReducer";
-import orgReducer from "./orgReducer";
+import workspaceReducer from "./workspaceReducer";
import templateReducer from "./templateReducer";
import usersReducer from "./usersReducer";
import { widgetDraggingReducer } from "./dragResizeReducer";
@@ -52,7 +52,7 @@ const uiReducer = combineReducers({
apiPane: apiPaneReducer,
auth: authReducer,
templates: templateReducer,
- orgs: orgReducer,
+ workspaces: workspaceReducer,
users: usersReducer,
widgetDragResize: widgetDraggingReducer,
importedCollections: importedCollectionsReducer,
diff --git a/app/client/src/reducers/uiReducers/orgReducer.ts b/app/client/src/reducers/uiReducers/orgReducer.ts
deleted file mode 100644
index e373f05736e4..000000000000
--- a/app/client/src/reducers/uiReducers/orgReducer.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { createImmerReducer } from "utils/AppsmithUtils";
-import {
- ReduxAction,
- ReduxActionTypes,
- ReduxActionErrorTypes,
-} from "@appsmith/constants/ReduxActionConstants";
-import { OrgRole, Org, OrgUser } from "constants/orgConstants";
-
-const initialState: OrgReduxState = {
- loadingStates: {
- fetchingRoles: false,
- isFetchAllRoles: false,
- isFetchAllUsers: false,
- isFetchingOrg: false,
- },
- orgUsers: [],
- orgRoles: [],
- currentOrg: {
- id: "",
- name: "",
- },
-};
-
-const orgReducer = createImmerReducer(initialState, {
- [ReduxActionTypes.FETCH_ORG_ROLES_INIT]: (draftState: OrgReduxState) => {
- draftState.loadingStates.isFetchAllRoles = true;
- },
- [ReduxActionTypes.FETCH_ALL_ROLES_INIT]: (draftState: OrgReduxState) => {
- draftState.loadingStates.isFetchAllRoles = true;
- },
- [ReduxActionTypes.FETCH_ALL_USERS_INIT]: (draftState: OrgReduxState) => {
- draftState.loadingStates.isFetchAllUsers = true;
- },
- [ReduxActionTypes.FETCH_ORG_ROLES_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<OrgRole[]>,
- ) => {
- draftState.orgRoles = action.payload;
- draftState.loadingStates.fetchingRoles = false;
- },
- [ReduxActionErrorTypes.FETCH_ORG_ROLES_ERROR]: (
- draftState: OrgReduxState,
- ) => {
- draftState.loadingStates.fetchingRoles = false;
- },
- [ReduxActionTypes.FETCH_ALL_USERS_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<OrgUser[]>,
- ) => {
- draftState.orgUsers = action.payload;
- draftState.loadingStates.isFetchAllUsers = false;
- },
- [ReduxActionTypes.FETCH_ALL_ROLES_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<Org[]>,
- ) => {
- draftState.orgRoles = action.payload;
- draftState.loadingStates.isFetchAllRoles = false;
- },
- [ReduxActionTypes.CHANGE_ORG_USER_ROLE_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<{ username: string; roleName: string }>,
- ) => {
- draftState.orgUsers.forEach((user: OrgUser) => {
- if (user.username === action.payload.username) {
- user.roleName = action.payload.roleName;
- user.isChangingRole = false;
- }
- });
- },
- [ReduxActionTypes.CHANGE_ORG_USER_ROLE_INIT]: (
- draftState: OrgReduxState,
- action: ReduxAction<{ username: string }>,
- ) => {
- draftState.orgUsers.forEach((user: OrgUser) => {
- if (user.username === action.payload.username) {
- user.isChangingRole = true;
- }
- });
- },
- [ReduxActionErrorTypes.CHANGE_ORG_USER_ROLE_ERROR]: (
- draftState: OrgReduxState,
- ) => {
- draftState.orgUsers.forEach((user: OrgUser) => {
- //TODO: This will change the status to false even if one role change api fails.
- user.isChangingRole = false;
- });
- },
- [ReduxActionTypes.DELETE_ORG_USER_INIT]: (
- draftState: OrgReduxState,
- action: ReduxAction<{ username: string }>,
- ) => {
- draftState.orgUsers.forEach((user: OrgUser) => {
- if (user.username === action.payload.username) {
- user.isDeleting = true;
- }
- });
- },
- [ReduxActionTypes.DELETE_ORG_USER_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<{ username: string }>,
- ) => {
- draftState.orgUsers = draftState.orgUsers.filter(
- (user: OrgUser) => user.username !== action.payload.username,
- );
- },
- [ReduxActionErrorTypes.DELETE_ORG_USER_ERROR]: (
- draftState: OrgReduxState,
- ) => {
- draftState.orgUsers.forEach((user: OrgUser) => {
- //TODO: This will change the status to false even if one delete fails.
- user.isDeleting = false;
- });
- },
- [ReduxActionTypes.SET_CURRENT_ORG_ID]: (
- draftState: OrgReduxState,
- action: ReduxAction<{ orgId: string }>,
- ) => {
- draftState.currentOrg.id = action.payload.orgId;
- },
- [ReduxActionTypes.SET_CURRENT_ORG]: (
- draftState: OrgReduxState,
- action: ReduxAction<Org>,
- ) => {
- draftState.currentOrg = action.payload;
- },
- [ReduxActionTypes.FETCH_CURRENT_ORG]: (draftState: OrgReduxState) => {
- draftState.loadingStates.isFetchingOrg = true;
- },
- [ReduxActionTypes.FETCH_ORG_SUCCESS]: (
- draftState: OrgReduxState,
- action: ReduxAction<Org>,
- ) => {
- draftState.currentOrg = action.payload;
- draftState.loadingStates.isFetchingOrg = false;
- },
- [ReduxActionErrorTypes.FETCH_ORG_ERROR]: (draftState: OrgReduxState) => {
- draftState.loadingStates.isFetchingOrg = false;
- },
-});
-
-export interface OrgReduxState {
- list?: Org[];
- roles?: OrgRole[];
- loadingStates: {
- fetchingRoles: boolean;
- isFetchAllRoles: boolean;
- isFetchAllUsers: boolean;
- isFetchingOrg: boolean;
- };
- orgUsers: OrgUser[];
- orgRoles: any;
- currentOrg: Org;
-}
-
-export default orgReducer;
diff --git a/app/client/src/reducers/uiReducers/templateReducer.ts b/app/client/src/reducers/uiReducers/templateReducer.ts
index 14603e3234da..609bf265a4cd 100644
--- a/app/client/src/reducers/uiReducers/templateReducer.ts
+++ b/app/client/src/reducers/uiReducers/templateReducer.ts
@@ -72,7 +72,7 @@ const templateReducer = createReducer(initialState, {
templateSearchQuery: action.payload,
};
},
- [ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_INIT]: (
+ [ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_INIT]: (
state: TemplatesReduxState,
) => {
return {
@@ -80,7 +80,7 @@ const templateReducer = createReducer(initialState, {
isImportingTemplate: true,
};
},
- [ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_SUCCESS]: (
+ [ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_SUCCESS]: (
state: TemplatesReduxState,
) => {
return {
@@ -88,7 +88,7 @@ const templateReducer = createReducer(initialState, {
isImportingTemplate: false,
};
},
- [ReduxActionErrorTypes.IMPORT_TEMPLATE_TO_ORGANISATION_ERROR]: (
+ [ReduxActionErrorTypes.IMPORT_TEMPLATE_TO_WORKSPACE_ERROR]: (
state: TemplatesReduxState,
) => {
return {
diff --git a/app/client/src/reducers/uiReducers/workspaceReducer.ts b/app/client/src/reducers/uiReducers/workspaceReducer.ts
new file mode 100644
index 000000000000..0c973cc481d6
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/workspaceReducer.ts
@@ -0,0 +1,170 @@
+import { createImmerReducer } from "utils/AppsmithUtils";
+import {
+ ReduxAction,
+ ReduxActionTypes,
+ ReduxActionErrorTypes,
+} from "@appsmith/constants/ReduxActionConstants";
+import {
+ WorkspaceRole,
+ Workspace,
+ WorkspaceUser,
+} from "constants/workspaceConstants";
+
+const initialState: WorkspaceReduxState = {
+ loadingStates: {
+ fetchingRoles: false,
+ isFetchAllRoles: false,
+ isFetchAllUsers: false,
+ isFetchingWorkspace: false,
+ },
+ workspaceUsers: [],
+ workspaceRoles: [],
+ currentWorkspace: {
+ id: "",
+ name: "",
+ },
+};
+
+const workspaceReducer = createImmerReducer(initialState, {
+ [ReduxActionTypes.FETCH_WORKSPACE_ROLES_INIT]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.isFetchAllRoles = true;
+ },
+ [ReduxActionTypes.FETCH_ALL_ROLES_INIT]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.isFetchAllRoles = true;
+ },
+ [ReduxActionTypes.FETCH_ALL_USERS_INIT]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.isFetchAllUsers = true;
+ },
+ [ReduxActionTypes.FETCH_WORKSPACE_ROLES_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<WorkspaceRole[]>,
+ ) => {
+ draftState.workspaceRoles = action.payload;
+ draftState.loadingStates.fetchingRoles = false;
+ },
+ [ReduxActionErrorTypes.FETCH_WORKSPACE_ROLES_ERROR]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.fetchingRoles = false;
+ },
+ [ReduxActionTypes.FETCH_ALL_USERS_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<WorkspaceUser[]>,
+ ) => {
+ draftState.workspaceUsers = action.payload;
+ draftState.loadingStates.isFetchAllUsers = false;
+ },
+ [ReduxActionTypes.FETCH_ALL_ROLES_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<Workspace[]>,
+ ) => {
+ draftState.workspaceRoles = action.payload;
+ draftState.loadingStates.isFetchAllRoles = false;
+ },
+ [ReduxActionTypes.CHANGE_WORKSPACE_USER_ROLE_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<{ username: string; roleName: string }>,
+ ) => {
+ draftState.workspaceUsers.forEach((user: WorkspaceUser) => {
+ if (user.username === action.payload.username) {
+ user.roleName = action.payload.roleName;
+ user.isChangingRole = false;
+ }
+ });
+ },
+ [ReduxActionTypes.CHANGE_WORKSPACE_USER_ROLE_INIT]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<{ username: string }>,
+ ) => {
+ draftState.workspaceUsers.forEach((user: WorkspaceUser) => {
+ if (user.username === action.payload.username) {
+ user.isChangingRole = true;
+ }
+ });
+ },
+ [ReduxActionErrorTypes.CHANGE_WORKSPACE_USER_ROLE_ERROR]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.workspaceUsers.forEach((user: WorkspaceUser) => {
+ //TODO: This will change the status to false even if one role change api fails.
+ user.isChangingRole = false;
+ });
+ },
+ [ReduxActionTypes.DELETE_WORKSPACE_USER_INIT]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<{ username: string }>,
+ ) => {
+ draftState.workspaceUsers.forEach((user: WorkspaceUser) => {
+ if (user.username === action.payload.username) {
+ user.isDeleting = true;
+ }
+ });
+ },
+ [ReduxActionTypes.DELETE_WORKSPACE_USER_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<{ username: string }>,
+ ) => {
+ draftState.workspaceUsers = draftState.workspaceUsers.filter(
+ (user: WorkspaceUser) => user.username !== action.payload.username,
+ );
+ },
+ [ReduxActionErrorTypes.DELETE_WORKSPACE_USER_ERROR]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.workspaceUsers.forEach((user: WorkspaceUser) => {
+ //TODO: This will change the status to false even if one delete fails.
+ user.isDeleting = false;
+ });
+ },
+ [ReduxActionTypes.SET_CURRENT_WORKSPACE_ID]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<{ workspaceId: string }>,
+ ) => {
+ draftState.currentWorkspace.id = action.payload.workspaceId;
+ },
+ [ReduxActionTypes.SET_CURRENT_WORKSPACE]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<Workspace>,
+ ) => {
+ draftState.currentWorkspace = action.payload;
+ },
+ [ReduxActionTypes.FETCH_CURRENT_WORKSPACE]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.isFetchingWorkspace = true;
+ },
+ [ReduxActionTypes.FETCH_WORKSPACE_SUCCESS]: (
+ draftState: WorkspaceReduxState,
+ action: ReduxAction<Workspace>,
+ ) => {
+ draftState.currentWorkspace = action.payload;
+ draftState.loadingStates.isFetchingWorkspace = false;
+ },
+ [ReduxActionErrorTypes.FETCH_WORKSPACE_ERROR]: (
+ draftState: WorkspaceReduxState,
+ ) => {
+ draftState.loadingStates.isFetchingWorkspace = false;
+ },
+});
+
+export interface WorkspaceReduxState {
+ list?: Workspace[];
+ roles?: WorkspaceRole[];
+ loadingStates: {
+ fetchingRoles: boolean;
+ isFetchAllRoles: boolean;
+ isFetchAllUsers: boolean;
+ isFetchingWorkspace: boolean;
+ };
+ workspaceUsers: WorkspaceUser[];
+ workspaceRoles: any;
+ currentWorkspace: Workspace;
+}
+
+export default workspaceReducer;
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index fea7ca27c770..78cdd6cfa111 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -39,7 +39,7 @@ import {
} from "actions/pluginActionActions";
import { Datasource } from "entities/Datasource";
import { Action, ApiAction, PluginType } from "entities/Action";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import log from "loglevel";
import PerformanceTracker, {
PerformanceTransactionName,
@@ -554,7 +554,7 @@ function* handleDatasourceCreatedSaga(actionPayload: ReduxAction<Datasource>) {
function* handleCreateNewApiActionSaga(
action: ReduxAction<{ pageId: string; from: EventLocation }>,
) {
- const organizationId: string = yield select(getCurrentOrgId);
+ const workspaceId: string = yield select(getCurrentWorkspaceId);
const pluginId: string = yield select(
getPluginIdOfPackageName,
REST_PLUGIN_PACKAGE_NAME,
@@ -575,7 +575,7 @@ function* handleCreateNewApiActionSaga(
datasource: {
name: "DEFAULT_REST_DATASOURCE",
pluginId,
- organizationId,
+ workspaceId,
},
eventData: {
actionType: "API",
diff --git a/app/client/src/sagas/ApplicationSagas.tsx b/app/client/src/sagas/ApplicationSagas.tsx
index da7a84a54431..c7999463c6c3 100644
--- a/app/client/src/sagas/ApplicationSagas.tsx
+++ b/app/client/src/sagas/ApplicationSagas.tsx
@@ -16,10 +16,10 @@ import ApplicationApi, {
FetchApplicationPayload,
FetchApplicationResponse,
FetchUnconfiguredDatasourceListResponse,
- FetchUsersApplicationsOrgsResponse,
+ FetchUsersApplicationsWorkspacesResponse,
ForkApplicationRequest,
ImportApplicationRequest,
- OrganizationApplicationObject,
+ WorkspaceApplicationObject,
PublishApplicationRequest,
PublishApplicationResponse,
SetDefaultPageRequest,
@@ -28,7 +28,7 @@ import ApplicationApi, {
import { all, call, put, select, takeLatest } from "redux-saga/effects";
import { validateResponse } from "./ErrorSagas";
-import { getUserApplicationsOrgsList } from "selectors/applicationSelectors";
+import { getUserApplicationsWorkspacesList } from "selectors/applicationSelectors";
import { ApiResponse } from "api/ApiResponses";
import history from "utils/history";
import { PLACEHOLDER_APP_SLUG, PLACEHOLDER_PAGE_SLUG } from "constants/routes";
@@ -42,7 +42,7 @@ import {
resetCurrentApplication,
setDefaultApplicationPageSuccess,
setIsReconnectingDatasourcesModalOpen,
- setOrgIdForImport,
+ setWorkspaceIdForImport,
showReconnectDatasourceModal,
} from "actions/applicationActions";
import AnalyticsUtil from "utils/AnalyticsUtil";
@@ -54,7 +54,7 @@ import {
} from "@appsmith/constants/messages";
import { Toaster } from "components/ads/Toast";
import { APP_MODE } from "entities/App";
-import { Org, Organization } from "constants/orgConstants";
+import { Workspace, Workspaces } from "constants/workspaceConstants";
import { Variant } from "components/ads/common";
import { AppIconName } from "components/ads/AppIcon";
import { AppColorCode } from "constants/DefaultTheme";
@@ -72,7 +72,7 @@ import {
reconnectAppLevelWebsocket,
reconnectPageLevelWebsocket,
} from "actions/websocketActions";
-import { getCurrentOrg } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors";
import {
getCurrentStep,
@@ -172,29 +172,31 @@ export function* publishApplicationSaga(
export function* getAllApplicationSaga() {
try {
- const response: FetchUsersApplicationsOrgsResponse = yield call(
+ const response: FetchUsersApplicationsWorkspacesResponse = yield call(
ApplicationApi.getAllApplication,
);
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
- const organizationApplication: OrganizationApplicationObject[] = response.data.organizationApplications.map(
- (userOrgs: OrganizationApplicationObject) => ({
- organization: userOrgs.organization,
- userRoles: userOrgs.userRoles,
- applications: !userOrgs.applications
+ const workspaceApplication: WorkspaceApplicationObject[] = response.data.workspaceApplications.map(
+ (userWorkspaces: WorkspaceApplicationObject) => ({
+ workspace: userWorkspaces.workspace,
+ userRoles: userWorkspaces.userRoles,
+ applications: !userWorkspaces.applications
? []
- : userOrgs.applications.map((application: ApplicationObject) => {
- return {
- ...application,
- defaultPageId: getDefaultPageId(application.pages),
- };
- }),
+ : userWorkspaces.applications.map(
+ (application: ApplicationObject) => {
+ return {
+ ...application,
+ defaultPageId: getDefaultPageId(application.pages),
+ };
+ },
+ ),
}),
);
yield put({
- type: ReduxActionTypes.FETCH_USER_APPLICATIONS_ORGS_SUCCESS,
- payload: organizationApplication,
+ type: ReduxActionTypes.FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS,
+ payload: workspaceApplication,
});
const { newReleasesCount, releaseItems } = response.data || {};
yield put({
@@ -204,7 +206,7 @@ export function* getAllApplicationSaga() {
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.FETCH_USER_APPLICATIONS_ORGS_ERROR,
+ type: ReduxActionErrorTypes.FETCH_USER_APPLICATIONS_WORKSPACES_ERROR,
payload: {
error,
},
@@ -247,9 +249,9 @@ export function* fetchAppAndPagesSaga(
});
yield put({
- type: ReduxActionTypes.SET_CURRENT_ORG_ID,
+ type: ReduxActionTypes.SET_CURRENT_WORKSPACE_ID,
payload: {
- orgId: response.data.organizationId,
+ workspaceId: response.data.workspaceId,
},
});
@@ -484,19 +486,19 @@ export function* createApplicationSaga(
applicationName: string;
icon: AppIconName;
color: AppColorCode;
- orgId: string;
+ workspaceId: string;
resolve: any;
reject: any;
}>,
) {
- const { applicationName, color, icon, orgId, reject } = action.payload;
+ const { applicationName, color, icon, reject, workspaceId } = action.payload;
try {
- const userOrgs = yield select(getUserApplicationsOrgsList);
- const existingOrgs = userOrgs.filter(
- (org: Organization) => org.organization.id === orgId,
+ const userWorkspaces = yield select(getUserApplicationsWorkspacesList);
+ const existingWorkspaces = userWorkspaces.filter(
+ (workspace: Workspaces) => workspace.workspace.id === workspaceId,
)[0];
- const existingApplication = existingOrgs
- ? existingOrgs.applications.find(
+ const existingApplication = existingWorkspaces
+ ? existingWorkspaces.applications.find(
(application: ApplicationPayload) =>
application.name === applicationName,
)
@@ -519,7 +521,7 @@ export function* createApplicationSaga(
name: applicationName,
icon: icon,
color: color,
- orgId,
+ workspaceId,
};
const response: CreateApplicationResponse = yield call(
ApplicationApi.createApplication,
@@ -543,7 +545,7 @@ export function* createApplicationSaga(
yield put({
type: ReduxActionTypes.CREATE_APPLICATION_SUCCESS,
payload: {
- orgId,
+ workspaceId,
application,
},
});
@@ -595,7 +597,7 @@ export function* createApplicationSaga(
payload: {
error,
show: false,
- orgId,
+ workspaceId,
},
});
}
@@ -619,7 +621,7 @@ export function* forkApplicationSaga(
yield put({
type: ReduxActionTypes.FORK_APPLICATION_SUCCESS,
payload: {
- orgId: action.payload.organizationId,
+ workspaceId: action.payload.workspaceId,
application,
},
});
@@ -649,19 +651,23 @@ function* showReconnectDatasourcesModalSaga(
action: ReduxAction<{
application: ApplicationResponsePayload;
unConfiguredDatasourceList: Array<Datasource>;
- orgId: string;
+ workspaceId: string;
}>,
) {
- const { application, orgId, unConfiguredDatasourceList } = action.payload;
+ const {
+ application,
+ unConfiguredDatasourceList,
+ workspaceId,
+ } = action.payload;
yield put(getAllApplications());
yield put(importApplicationSuccess(application));
- yield put(fetchPlugins({ orgId }));
+ yield put(fetchPlugins({ workspaceId }));
yield put(
setUnconfiguredDatasourcesDuringImport(unConfiguredDatasourceList || []),
);
- yield put(setOrgIdForImport(orgId));
+ yield put(setWorkspaceIdForImport(workspaceId));
yield put(setIsReconnectingDatasourcesModalOpen({ isOpen: true }));
}
@@ -670,16 +676,16 @@ export function* importApplicationSaga(
) {
try {
const response: ApiResponse = yield call(
- ApplicationApi.importApplicationToOrg,
+ ApplicationApi.importApplicationToWorkspace,
action.payload,
);
const isValidResponse: boolean = yield validateResponse(response);
if (isValidResponse) {
- const allOrgs: Org[] = yield select(getCurrentOrg);
- const currentOrg = allOrgs.filter(
- (el: Org) => el.id === action.payload.orgId,
+ const allWorkspaces: Workspace[] = yield select(getCurrentWorkspace);
+ const currentWorkspace = allWorkspaces.filter(
+ (el: Workspace) => el.id === action.payload.workspaceId,
);
- if (currentOrg.length > 0) {
+ if (currentWorkspace.length > 0) {
const {
application: { applicationVersion, id, pages, slug: applicationSlug },
isPartialImport,
@@ -706,7 +712,7 @@ export function* importApplicationSaga(
application: response.data?.application,
unConfiguredDatasourceList:
response?.data.unConfiguredDatasourceList,
- orgId: action.payload.orgId,
+ workspaceId: action.payload.workspaceId,
}),
);
} else {
@@ -743,7 +749,7 @@ export function* importApplicationSaga(
function* fetchReleases() {
try {
- const response: FetchUsersApplicationsOrgsResponse = yield call(
+ const response: FetchUsersApplicationsWorkspacesResponse = yield call(
ApplicationApi.getAllApplication,
);
const isValidResponse = yield validateResponse(response);
@@ -767,7 +773,7 @@ function* fetchReleases() {
export function* fetchUnconfiguredDatasourceList(
action: ReduxAction<{
applicationId: string;
- orgId: string;
+ workspaceId: string;
}>,
) {
try {
@@ -811,10 +817,10 @@ export function* initializeDatasourceWithDefaultValues(datasource: Datasource) {
}
function* initDatasourceConnectionDuringImport(action: ReduxAction<string>) {
- const orgId = action.payload;
+ const workspaceId = action.payload;
const pluginsAndDatasourcesCalls: boolean = yield failFastApiCalls(
- [fetchPlugins({ orgId }), fetchDatasources({ orgId })],
+ [fetchPlugins({ workspaceId }), fetchDatasources({ workspaceId })],
[
ReduxActionTypes.FETCH_PLUGINS_SUCCESS,
ReduxActionTypes.FETCH_DATASOURCES_SUCCESS,
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index f66357d66856..165232903902 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -12,7 +12,7 @@ import {
createMessage,
CURL_IMPORT_SUCCESS,
} from "@appsmith/constants/messages";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import transformCurlImport from "transformers/CurlImportTransformer";
import history from "utils/history";
import { Toaster } from "components/ads/Toast";
@@ -25,13 +25,13 @@ export function* curlImportSaga(action: ReduxAction<CurlImportRequest>) {
let { curl } = action.payload;
try {
curl = transformCurlImport(curl);
- const organizationId: string = yield select(getCurrentOrgId);
+ const workspaceId: string = yield select(getCurrentWorkspaceId);
const request: CurlImportRequest = {
type,
pageId,
name,
curl,
- organizationId,
+ workspaceId,
};
const response: ApiResponse = yield CurlImportApi.curlImport(request);
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 700227d7e404..9a4680bbc37a 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -51,7 +51,7 @@ import {
import { validateResponse } from "./ErrorSagas";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { getFormData } from "selectors/formSelectors";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { Variant } from "components/ads/common";
import { Toaster } from "components/ads/Toast";
import { getConfigInitialValues } from "components/formControls/utils";
@@ -85,7 +85,7 @@ import { inGuidedTour } from "selectors/onboardingSelectors";
import { updateReplayEntity } from "actions/pageActions";
import OAuthApi from "api/OAuthApi";
import { AppState } from "reducers";
-import { getOrganizationIdForImport } from "selectors/applicationSelectors";
+import { getWorkspaceIdForImport } from "selectors/applicationSelectors";
import {
apiEditorIdURL,
datasourcesEditorIdURL,
@@ -95,14 +95,14 @@ import {
} from "RouteBuilder";
function* fetchDatasourcesSaga(
- action: ReduxAction<{ orgId?: string } | undefined>,
+ action: ReduxAction<{ workspaceId?: string } | undefined>,
) {
try {
- let orgId = yield select(getCurrentOrgId);
- if (action.payload?.orgId) orgId = action.payload?.orgId;
+ let workspaceId = yield select(getCurrentWorkspaceId);
+ if (action.payload?.workspaceId) workspaceId = action.payload?.workspaceId;
const response: GenericApiResponse<Datasource[]> = yield DatasourcesApi.fetchDatasources(
- orgId,
+ workspaceId,
);
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
@@ -139,7 +139,7 @@ interface addMockDb
extends ReduxActionWithCallbacks<
{
name: string;
- organizationId: string;
+ workspaceId: string;
pluginId: string;
packageName: string;
},
@@ -151,16 +151,11 @@ interface addMockDb
export function* addMockDbToDatasources(actionPayload: addMockDb) {
try {
- const {
- name,
- organizationId,
- packageName,
- pluginId,
- } = actionPayload.payload;
+ const { name, packageName, pluginId, workspaceId } = actionPayload.payload;
const { isGeneratePageMode } = actionPayload.extraParams;
const response: GenericApiResponse<any> = yield DatasourcesApi.addMockDbToDatasources(
name,
- organizationId,
+ workspaceId,
pluginId,
packageName,
);
@@ -383,7 +378,7 @@ function* redirectAuthorizationCodeSaga(
}>,
) {
const { datasourceId, pageId, pluginType } = actionPayload.payload;
- const isImport: string = yield select(getOrganizationIdForImport);
+ const isImport: string = yield select(getWorkspaceIdForImport);
if (pluginType === PluginType.API) {
window.location.href = `/api/v1/datasources/${datasourceId}/pages/${pageId}/code`;
@@ -488,11 +483,11 @@ function* handleDatasourceNameChangeFailureSaga(
}
function* testDatasourceSaga(actionPayload: ReduxAction<Datasource>) {
- let organizationId = yield select(getCurrentOrgId);
+ let workspaceId = yield select(getCurrentWorkspaceId);
// test button within the import modal
- if (!organizationId) {
- organizationId = yield select(getOrganizationIdForImport);
+ if (!workspaceId) {
+ workspaceId = yield select(getWorkspaceIdForImport);
}
const { initialValues, values } = yield select(
getFormData,
@@ -513,7 +508,7 @@ function* testDatasourceSaga(actionPayload: ReduxAction<Datasource>) {
const response: GenericApiResponse<Datasource> = yield DatasourcesApi.testDatasource(
{
...payload,
- organizationId,
+ workspaceId,
},
);
const isValidResponse = yield validateResponse(response);
@@ -602,7 +597,7 @@ function* createDatasourceFromFormSaga(
actionPayload: ReduxAction<CreateDatasourceConfig>,
) {
try {
- const organizationId = yield select(getCurrentOrgId);
+ const workspaceId = yield select(getCurrentWorkspaceId);
yield call(
checkAndGetPluginFormConfigsSaga,
actionPayload.payload.pluginId,
@@ -620,7 +615,7 @@ function* createDatasourceFromFormSaga(
const response: GenericApiResponse<Datasource> = yield DatasourcesApi.createDatasource(
{
...payload,
- organizationId,
+ workspaceId,
},
);
const isValidResponse = yield validateResponse(response);
diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts
index 722cbb570af5..9dbccf443d00 100644
--- a/app/client/src/sagas/GitSyncSagas.ts
+++ b/app/client/src/sagas/GitSyncSagas.ts
@@ -59,7 +59,7 @@ import { Variant } from "components/ads/common";
import {
getCurrentAppGitMetaData,
getCurrentApplication,
- getOrganizationIdForImport,
+ getWorkspaceIdForImport,
} from "selectors/applicationSelectors";
import {
createMessage,
@@ -79,8 +79,8 @@ import {
import { initEditor } from "actions/initActions";
import { fetchPage } from "actions/pageActions";
import { getLogToSentryFromResponse } from "utils/helpers";
-import { getCurrentOrg } from "@appsmith/selectors/organizationSelectors";
-import { Org } from "constants/orgConstants";
+import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors";
+import { Workspace } from "constants/workspaceConstants";
import { log } from "loglevel";
import GIT_ERROR_CODES from "constants/GitErrorCodes";
import { builderURL } from "RouteBuilder";
@@ -639,25 +639,20 @@ function* disconnectGitSaga() {
function* importAppFromGitSaga(action: ConnectToGitReduxAction) {
let response: ApiResponse | undefined;
try {
- const organizationIdForImport: string = yield select(
- getOrganizationIdForImport,
- );
+ const workspaceIdForImport: string = yield select(getWorkspaceIdForImport);
- response = yield GitSyncAPI.importApp(
- action.payload,
- organizationIdForImport,
- );
+ response = yield GitSyncAPI.importApp(action.payload, workspaceIdForImport);
const isValidResponse: boolean = yield validateResponse(
response,
false,
getLogToSentryFromResponse(response),
);
if (isValidResponse) {
- const allOrgs = yield select(getCurrentOrg);
- const currentOrg = allOrgs.filter(
- (el: Org) => el.id === organizationIdForImport,
+ const allWorkspaces = yield select(getCurrentWorkspace);
+ const currentWorkspace = allWorkspaces.filter(
+ (el: Workspace) => el.id === workspaceIdForImport,
);
- if (currentOrg.length > 0) {
+ if (currentWorkspace.length > 0) {
const {
application: app,
isPartialImport,
@@ -679,7 +674,7 @@ function* importAppFromGitSaga(action: ConnectToGitReduxAction) {
application: response?.data?.application,
unConfiguredDatasourceList:
response?.data.unConfiguredDatasourceList,
- orgId: organizationIdForImport,
+ workspaceId: workspaceIdForImport,
}),
);
} else {
@@ -760,7 +755,7 @@ export function* generateSSHKeyPairSaga(action: GenerateSSHKeyPairReduxAction) {
let response: ApiResponse | undefined;
try {
const applicationId: string = yield select(getCurrentApplicationId);
- const isImporting: string = yield select(getOrganizationIdForImport);
+ const isImporting: string = yield select(getWorkspaceIdForImport);
response = yield call(
GitSyncAPI.generateSSHKeyPair,
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index 3b0922355f93..cb04f96b09df 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -44,7 +44,7 @@ import {
updateJSFunction,
executeJSFunctionInit,
} from "actions/jsPaneActions";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { getPluginIdOfPackageName } from "sagas/selectors";
import { PluginType } from "entities/Action";
import { Toaster } from "components/ads/Toast";
@@ -77,7 +77,7 @@ import { APP_MODE } from "entities/App";
import { getAppMode } from "selectors/applicationSelectors";
function* handleCreateNewJsActionSaga(action: ReduxAction<{ pageId: string }>) {
- const organizationId: string = yield select(getCurrentOrgId);
+ const workspaceId: string = yield select(getCurrentWorkspaceId);
const applicationId = yield select(getCurrentApplicationId);
const { pageId } = action.payload;
const pluginId: string = yield select(
@@ -92,13 +92,13 @@ function* handleCreateNewJsActionSaga(action: ReduxAction<{ pageId: string }>) {
const newJSCollectionName = createNewJSFunctionName(pageJSActions, pageId);
const { actions, body } = createDummyJSCollectionActions(
pageId,
- organizationId,
+ workspaceId,
);
yield put(
createJSCollectionRequest({
name: newJSCollectionName,
pageId,
- organizationId,
+ workspaceId,
pluginId,
body: body,
variables: [
@@ -135,7 +135,7 @@ function* handleJSCollectionCreatedSaga(
function* handleEachUpdateJSCollection(update: JSUpdate) {
const jsActionId = update.id;
- const organizationId: string = yield select(getCurrentOrgId);
+ const workspaceId: string = yield select(getCurrentWorkspaceId);
if (jsActionId) {
const jsAction: JSCollection = yield select(getJSCollection, jsActionId);
const parsedBody = update.parsedBody;
@@ -173,7 +173,7 @@ function* handleEachUpdateJSCollection(update: JSUpdate) {
for (let i = 0; i < data.newActions.length; i++) {
jsActionTobeUpdated.actions.push({
...data.newActions[i],
- organizationId: organizationId,
+ workspaceId: workspaceId,
});
}
updateCollection = true;
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index fee0ff314f14..844722902248 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -25,13 +25,13 @@ import TourApp from "pages/Editor/GuidedTour/app.json";
import {
getFirstTimeUserOnboardingApplicationId,
getHadReachedStep,
- getOnboardingOrganisations,
+ getOnboardingWorkspaces,
getQueryAction,
getTableWidget,
} from "selectors/onboardingSelectors";
import { Toaster } from "components/ads/Toast";
import { Variant } from "components/ads/common";
-import { Organization } from "constants/orgConstants";
+import { Workspaces } from "constants/workspaceConstants";
import {
enableGuidedTour,
focusWidgetProperty,
@@ -74,38 +74,38 @@ import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/utils";
function* createApplication() {
// If we are starting onboarding from the editor wait for the editor to reset.
const isEditorInitialised = yield select(getIsEditorInitialized);
- let userOrgs: Organization[] = yield select(getOnboardingOrganisations);
+ let userWorkspaces: Workspaces[] = yield select(getOnboardingWorkspaces);
if (isEditorInitialised) {
yield take(ReduxActionTypes.RESET_EDITOR_SUCCESS);
- // If we haven't fetched the organisation list yet we wait for it to complete
- // as we need an organisation where we create an application
- if (!userOrgs.length) {
- yield take(ReduxActionTypes.FETCH_USER_APPLICATIONS_ORGS_SUCCESS);
+ // If we haven't fetched the workspace list yet we wait for it to complete
+ // as we need an workspace where we create an application
+ if (!userWorkspaces.length) {
+ yield take(ReduxActionTypes.FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS);
}
}
- userOrgs = yield select(getOnboardingOrganisations);
+ userWorkspaces = yield select(getOnboardingWorkspaces);
const currentUser = yield select(getCurrentUser);
- const currentOrganizationId = currentUser.currentOrganizationId;
- let organization;
- if (!currentOrganizationId) {
- organization = userOrgs[0];
+ const currentWorkspaceId = currentUser.currentWorkspaceId;
+ let workspace;
+ if (!currentWorkspaceId) {
+ workspace = userWorkspaces[0];
} else {
- const filteredOrganizations = userOrgs.filter(
- (org: any) => org.organization.id === currentOrganizationId,
+ const filteredWorkspaces = userWorkspaces.filter(
+ (workspace: any) => workspace.workspace.id === currentWorkspaceId,
);
- organization = filteredOrganizations[0];
+ workspace = filteredWorkspaces[0];
}
- if (organization) {
+ if (workspace) {
const appFileObject = new File([JSON.stringify(TourApp)], "app.json", {
type: "application/json",
});
yield put(enableGuidedTour(true));
yield put(
importApplication({
- orgId: organization.organization.id,
+ workspaceId: workspace.workspace.id,
applicationFile: appFileObject,
}),
);
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index d093efd39b83..c32e8cee6ea1 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -138,7 +138,7 @@ export function* fetchPageListSaga(
const response: FetchPageListResponse = yield call(apiCall, applicationId);
const isValidResponse: boolean = yield validateResponse(response);
if (isValidResponse) {
- const orgId = response.data.organizationId;
+ const workspaceId = response.data.workspaceId;
const pages: PageListPayload = response.data.pages.map((page) => ({
pageName: page.name,
pageId: page.id,
@@ -147,9 +147,9 @@ export function* fetchPageListSaga(
slug: page.slug,
}));
yield put({
- type: ReduxActionTypes.SET_CURRENT_ORG_ID,
+ type: ReduxActionTypes.SET_CURRENT_WORKSPACE_ID,
payload: {
- orgId,
+ workspaceId,
},
});
yield put({
diff --git a/app/client/src/sagas/PluginSagas.ts b/app/client/src/sagas/PluginSagas.ts
index e9976717b3b1..da701afbeeb0 100644
--- a/app/client/src/sagas/PluginSagas.ts
+++ b/app/client/src/sagas/PluginSagas.ts
@@ -6,7 +6,7 @@ import {
} from "@appsmith/constants/ReduxActionConstants";
import PluginsApi, { PluginFormPayload } from "api/PluginApi";
import { validateResponse } from "sagas/ErrorSagas";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import {
getDatasources,
getPlugin,
@@ -38,16 +38,16 @@ import {
} from "utils/DynamicBindingUtils";
function* fetchPluginsSaga(
- action: ReduxAction<{ orgId?: string } | undefined>,
+ action: ReduxAction<{ workspaceId?: string } | undefined>,
) {
try {
- let orgId = yield select(getCurrentOrgId);
- if (action.payload?.orgId) orgId = action.payload?.orgId;
+ let workspaceId = yield select(getCurrentWorkspaceId);
+ if (action.payload?.workspaceId) workspaceId = action.payload?.workspaceId;
- if (!orgId) {
+ if (!workspaceId) {
throw Error("Org id does not exist");
}
- const pluginsResponse = yield call(PluginsApi.fetchPlugins, orgId);
+ const pluginsResponse = yield call(PluginsApi.fetchPlugins, workspaceId);
const isValid = yield validateResponse(pluginsResponse);
if (isValid) {
yield put({
@@ -67,7 +67,7 @@ function* fetchPluginFormConfigsSaga() {
try {
const datasources: Datasource[] = yield select(getDatasources);
const plugins: Plugin[] = yield select(getPlugins);
- // Add plugins of all the datasources of their org
+ // Add plugins of all the datasources of their workspace
const pluginIdFormsToFetch = new Set(
datasources.map((datasource) => datasource.pluginId),
);
diff --git a/app/client/src/sagas/ProvidersSaga.ts b/app/client/src/sagas/ProvidersSaga.ts
index 5a67bc6f0d1d..b3346284d7a0 100644
--- a/app/client/src/sagas/ProvidersSaga.ts
+++ b/app/client/src/sagas/ProvidersSaga.ts
@@ -36,7 +36,7 @@ import {
createMessage,
} from "@appsmith/constants/messages";
import AnalyticsUtil from "utils/AnalyticsUtil";
-import { getCurrentOrgId } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
import { Toaster } from "components/ads/Toast";
import { Variant } from "components/ads/common";
@@ -72,10 +72,10 @@ export function* fetchProviderTemplatesSaga(
export function* addApiToPageSaga(
action: ReduxActionWithPromise<AddApiToPageRequest>,
) {
- const organizationId = yield select(getCurrentOrgId);
+ const workspaceId = yield select(getCurrentWorkspaceId);
const request: AddApiToPageRequest = {
...action.payload,
- organizationId,
+ workspaceId,
};
try {
const response: FetchProviderTemplateResponse = yield ProvidersApi.addApiToPage(
diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts
index 9668a3f6df93..4d5f9c74e056 100644
--- a/app/client/src/sagas/TemplatesSagas.ts
+++ b/app/client/src/sagas/TemplatesSagas.ts
@@ -37,14 +37,14 @@ function* getAllTemplatesSaga() {
}
}
-function* importTemplateToOrganisationSaga(
- action: ReduxAction<{ templateId: string; organizationId: string }>,
+function* importTemplateToWorkspaceSaga(
+ action: ReduxAction<{ templateId: string; workspaceId: string }>,
) {
try {
const response: ImportTemplateResponse = yield call(
TemplatesAPI.importTemplate,
action.payload.templateId,
- action.payload.organizationId,
+ action.payload.workspaceId,
);
const isValid: boolean = yield validateResponse(response);
if (isValid) {
@@ -62,14 +62,14 @@ function* importTemplateToOrganisationSaga(
pageId: application.defaultPageId,
});
yield put({
- type: ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_SUCCESS,
+ type: ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_SUCCESS,
payload: response.data,
});
history.push(pageURL);
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.IMPORT_TEMPLATE_TO_ORGANISATION_ERROR,
+ type: ReduxActionErrorTypes.IMPORT_TEMPLATE_TO_WORKSPACE_ERROR,
payload: {
error,
},
@@ -146,8 +146,8 @@ export default function* watchActionSagas() {
getSimilarTemplatesSaga,
),
takeEvery(
- ReduxActionTypes.IMPORT_TEMPLATE_TO_ORGANISATION_INIT,
- importTemplateToOrganisationSaga,
+ ReduxActionTypes.IMPORT_TEMPLATE_TO_WORKSPACE_INIT,
+ importTemplateToWorkspaceSaga,
),
takeEvery(
ReduxActionTypes.GET_TEMPLATE_NOTIFICATION_SEEN,
diff --git a/app/client/src/sagas/OrgSagas.ts b/app/client/src/sagas/WorkspaceSagas.ts
similarity index 55%
rename from app/client/src/sagas/OrgSagas.ts
rename to app/client/src/sagas/WorkspaceSagas.ts
index 0703be255a76..068eef076e5c 100644
--- a/app/client/src/sagas/OrgSagas.ts
+++ b/app/client/src/sagas/WorkspaceSagas.ts
@@ -10,49 +10,51 @@ import {
callAPI,
getResponseErrorMessage,
} from "sagas/ErrorSagas";
-import OrgApi, {
- FetchOrgRolesResponse,
- SaveOrgRequest,
- FetchOrgRequest,
- FetchOrgResponse,
- CreateOrgRequest,
+import WorkspaceApi, {
+ FetchWorkspaceRolesResponse,
+ SaveWorkspaceRequest,
+ FetchWorkspaceRequest,
+ FetchWorkspaceResponse,
+ CreateWorkspaceRequest,
FetchAllUsersResponse,
FetchAllUsersRequest,
FetchAllRolesResponse,
- DeleteOrgUserRequest,
+ DeleteWorkspaceUserRequest,
ChangeUserRoleRequest,
FetchAllRolesRequest,
- SaveOrgLogo,
-} from "api/OrgApi";
+ SaveWorkspaceLogo,
+} from "api/WorkspaceApi";
import { ApiResponse } from "api/ApiResponses";
import { Toaster } from "components/ads/Toast";
import { Variant } from "components/ads/common";
-import { getCurrentOrg } from "@appsmith/selectors/organizationSelectors";
+import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors";
import { getCurrentUser } from "selectors/usersSelectors";
-import { Org } from "constants/orgConstants";
+import { Workspace } from "constants/workspaceConstants";
import history from "utils/history";
import { APPLICATIONS_URL } from "constants/routes";
import { getAllApplications } from "actions/applicationActions";
import log from "loglevel";
import {
createMessage,
- DELETE_ORG_SUCCESSFUL,
+ DELETE_WORKSPACE_SUCCESSFUL,
} from "@appsmith/constants/messages";
export function* fetchRolesSaga() {
try {
- const response: FetchOrgRolesResponse = yield call(OrgApi.fetchRoles);
+ const response: FetchWorkspaceRolesResponse = yield call(
+ WorkspaceApi.fetchRoles,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
- type: ReduxActionTypes.FETCH_ORG_ROLES_SUCCESS,
+ type: ReduxActionTypes.FETCH_WORKSPACE_ROLES_SUCCESS,
payload: response.data,
});
}
} catch (error) {
log.error(error);
yield put({
- type: ReduxActionErrorTypes.FETCH_ORG_ROLES_ERROR,
+ type: ReduxActionErrorTypes.FETCH_WORKSPACE_ROLES_ERROR,
payload: {
error,
},
@@ -60,21 +62,26 @@ export function* fetchRolesSaga() {
}
}
-export function* fetchOrgSaga(action: ReduxAction<FetchOrgRequest>) {
+export function* fetchWorkspaceSaga(
+ action: ReduxAction<FetchWorkspaceRequest>,
+) {
try {
- const request: FetchOrgRequest = action.payload;
- const response: FetchOrgResponse = yield call(OrgApi.fetchOrg, request);
+ const request: FetchWorkspaceRequest = action.payload;
+ const response: FetchWorkspaceResponse = yield call(
+ WorkspaceApi.fetchWorkspace,
+ request,
+ );
const isValidResponse = yield request.skipValidation ||
validateResponse(response);
if (isValidResponse) {
yield put({
- type: ReduxActionTypes.FETCH_ORG_SUCCESS,
+ type: ReduxActionTypes.FETCH_WORKSPACE_SUCCESS,
payload: response.data || {},
});
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.FETCH_ORG_ERROR,
+ type: ReduxActionErrorTypes.FETCH_WORKSPACE_ERROR,
payload: {
error,
},
@@ -86,7 +93,7 @@ export function* fetchAllUsersSaga(action: ReduxAction<FetchAllUsersRequest>) {
try {
const request: FetchAllUsersRequest = action.payload;
const response: FetchAllUsersResponse = yield call(
- OrgApi.fetchAllUsers,
+ WorkspaceApi.fetchAllUsers,
request,
);
const isValidResponse = yield validateResponse(response);
@@ -111,22 +118,25 @@ export function* fetchAllUsersSaga(action: ReduxAction<FetchAllUsersRequest>) {
}
}
-export function* changeOrgUserRoleSaga(
+export function* changeWorkspaceUserRoleSaga(
action: ReduxAction<ChangeUserRoleRequest>,
) {
try {
const request: ChangeUserRoleRequest = action.payload;
- const response: ApiResponse = yield call(OrgApi.changeOrgUserRole, request);
+ const response: ApiResponse = yield call(
+ WorkspaceApi.changeWorkspaceUserRole,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
- type: ReduxActionTypes.CHANGE_ORG_USER_ROLE_SUCCESS,
+ type: ReduxActionTypes.CHANGE_WORKSPACE_USER_ROLE_SUCCESS,
payload: response.data,
});
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.CHANGE_ORG_USER_ROLE_ERROR,
+ type: ReduxActionErrorTypes.CHANGE_WORKSPACE_USER_ROLE_ERROR,
payload: {
error,
},
@@ -134,10 +144,15 @@ export function* changeOrgUserRoleSaga(
}
}
-export function* deleteOrgUserSaga(action: ReduxAction<DeleteOrgUserRequest>) {
+export function* deleteWorkspaceUserSaga(
+ action: ReduxAction<DeleteWorkspaceUserRequest>,
+) {
try {
- const request: DeleteOrgUserRequest = action.payload;
- const response: ApiResponse = yield call(OrgApi.deleteOrgUser, request);
+ const request: DeleteWorkspaceUserRequest = action.payload;
+ const response: ApiResponse = yield call(
+ WorkspaceApi.deleteWorkspaceUser,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
const currentUser = yield select(getCurrentUser);
@@ -145,7 +160,7 @@ export function* deleteOrgUserSaga(action: ReduxAction<DeleteOrgUserRequest>) {
history.replace(APPLICATIONS_URL);
} else {
yield put({
- type: ReduxActionTypes.DELETE_ORG_USER_SUCCESS,
+ type: ReduxActionTypes.DELETE_WORKSPACE_USER_SUCCESS,
payload: {
username: action.payload.username,
},
@@ -158,7 +173,7 @@ export function* deleteOrgUserSaga(action: ReduxAction<DeleteOrgUserRequest>) {
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.DELETE_ORG_USER_ERROR,
+ type: ReduxActionErrorTypes.DELETE_WORKSPACE_USER_ERROR,
payload: {
error,
},
@@ -170,7 +185,7 @@ export function* fetchAllRolesSaga(action: ReduxAction<FetchAllRolesRequest>) {
try {
const request: FetchAllRolesRequest = action.payload;
const response: FetchAllRolesResponse = yield call(
- OrgApi.fetchAllRoles,
+ WorkspaceApi.fetchAllRoles,
request,
);
const isValidResponse = yield validateResponse(response);
@@ -187,20 +202,23 @@ export function* fetchAllRolesSaga(action: ReduxAction<FetchAllRolesRequest>) {
}
}
-export function* saveOrgSaga(action: ReduxAction<SaveOrgRequest>) {
+export function* saveWorkspaceSaga(action: ReduxAction<SaveWorkspaceRequest>) {
try {
- const request: SaveOrgRequest = action.payload;
- const response: ApiResponse = yield call(OrgApi.saveOrg, request);
+ const request: SaveWorkspaceRequest = action.payload;
+ const response: ApiResponse = yield call(
+ WorkspaceApi.saveWorkspace,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
- type: ReduxActionTypes.SAVE_ORG_SUCCESS,
+ type: ReduxActionTypes.SAVE_WORKSPACE_SUCCESS,
payload: request,
});
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.SAVE_ORG_ERROR,
+ type: ReduxActionErrorTypes.SAVE_WORKSPACE_ERROR,
payload: {
error: error.message,
},
@@ -208,27 +226,30 @@ export function* saveOrgSaga(action: ReduxAction<SaveOrgRequest>) {
}
}
-export function* deleteOrgSaga(action: ReduxAction<string>) {
+export function* deleteWorkspaceSaga(action: ReduxAction<string>) {
try {
yield put({
- type: ReduxActionTypes.SAVING_ORG_INFO,
+ type: ReduxActionTypes.SAVING_WORKSPACE_INFO,
});
- const orgId: string = action.payload;
- const response: ApiResponse = yield call(OrgApi.deleteOrg, orgId);
+ const workspaceId: string = action.payload;
+ const response: ApiResponse = yield call(
+ WorkspaceApi.deleteWorkspace,
+ workspaceId,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
- type: ReduxActionTypes.DELETE_ORG_SUCCESS,
- payload: orgId,
+ type: ReduxActionTypes.DELETE_WORKSPACE_SUCCESS,
+ payload: workspaceId,
});
Toaster.show({
- text: createMessage(DELETE_ORG_SUCCESSFUL),
+ text: createMessage(DELETE_WORKSPACE_SUCCESSFUL),
variant: Variant.success,
});
}
} catch (error) {
yield put({
- type: ReduxActionErrorTypes.DELETE_ORG_ERROR,
+ type: ReduxActionErrorTypes.DELETE_WORKSPACE_ERROR,
payload: {
error: error.message,
},
@@ -236,20 +257,23 @@ export function* deleteOrgSaga(action: ReduxAction<string>) {
}
}
-export function* createOrgSaga(
- action: ReduxActionWithPromise<CreateOrgRequest>,
+export function* createWorkspaceSaga(
+ action: ReduxActionWithPromise<CreateWorkspaceRequest>,
) {
const { name, reject, resolve } = action.payload;
try {
- const request: CreateOrgRequest = { name };
- const response: ApiResponse = yield callAPI(OrgApi.createOrg, request);
+ const request: CreateWorkspaceRequest = { name };
+ const response: ApiResponse = yield callAPI(
+ WorkspaceApi.createWorkspace,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (!isValidResponse) {
const errorMessage = yield getResponseErrorMessage(response);
yield call(reject, { _error: errorMessage });
} else {
yield put({
- type: ReduxActionTypes.CREATE_ORGANIZATION_SUCCESS,
+ type: ReduxActionTypes.CREATE_WORKSPACE_SUCCESS,
payload: response.data,
});
@@ -257,13 +281,13 @@ export function* createOrgSaga(
yield call(resolve);
}
- // get created org in focus
- const orgId = response.data.id;
- history.push(`${window.location.pathname}#${orgId}`);
+ // get created worskpace in focus
+ const workspaceId = response.data.id;
+ history.push(`${window.location.pathname}#${workspaceId}`);
} catch (error) {
yield call(reject, { _error: error.message });
yield put({
- type: ReduxActionErrorTypes.CREATE_ORGANIZATION_ERROR,
+ type: ReduxActionErrorTypes.CREATE_WORKSPACE_ERROR,
payload: {
error,
},
@@ -271,19 +295,26 @@ export function* createOrgSaga(
}
}
-export function* uploadOrgLogoSaga(action: ReduxAction<SaveOrgLogo>) {
+export function* uploadWorkspaceLogoSaga(
+ action: ReduxAction<SaveWorkspaceLogo>,
+) {
try {
const request = action.payload;
- const response: ApiResponse = yield call(OrgApi.saveOrgLogo, request);
+ const response: ApiResponse = yield call(
+ WorkspaceApi.saveWorkspaceLogo,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
- const allOrgs = yield select(getCurrentOrg);
- const currentOrg = allOrgs.filter((el: Org) => el.id === request.id);
- if (currentOrg.length > 0) {
+ const allWorkspaces = yield select(getCurrentWorkspace);
+ const currentWorkspace = allWorkspaces.filter(
+ (el: Workspace) => el.id === request.id,
+ );
+ if (currentWorkspace.length > 0) {
yield put({
- type: ReduxActionTypes.SAVE_ORG_SUCCESS,
+ type: ReduxActionTypes.SAVE_WORKSPACE_SUCCESS,
payload: {
- id: currentOrg[0].id,
+ id: currentWorkspace[0].id,
logoUrl: response.data.logoUrl,
},
});
@@ -298,19 +329,24 @@ export function* uploadOrgLogoSaga(action: ReduxAction<SaveOrgLogo>) {
}
}
-export function* deleteOrgLogoSaga(action: ReduxAction<{ id: string }>) {
+export function* deleteWorkspaceLogoSaga(action: ReduxAction<{ id: string }>) {
try {
const request = action.payload;
- const response: ApiResponse = yield call(OrgApi.deleteOrgLogo, request);
+ const response: ApiResponse = yield call(
+ WorkspaceApi.deleteWorkspaceLogo,
+ request,
+ );
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
- const allOrgs = yield select(getCurrentOrg);
- const currentOrg = allOrgs.filter((el: Org) => el.id === request.id);
- if (currentOrg.length > 0) {
+ const allWorkspaces = yield select(getCurrentWorkspace);
+ const currentWorkspace = allWorkspaces.filter(
+ (el: Workspace) => el.id === request.id,
+ );
+ if (currentWorkspace.length > 0) {
yield put({
- type: ReduxActionTypes.SAVE_ORG_SUCCESS,
+ type: ReduxActionTypes.SAVE_WORKSPACE_SUCCESS,
payload: {
- id: currentOrg[0].id,
+ id: currentWorkspace[0].id,
logoUrl: response.data.logoUrl,
},
});
@@ -325,21 +361,24 @@ export function* deleteOrgLogoSaga(action: ReduxAction<{ id: string }>) {
}
}
-export default function* orgSagas() {
+export default function* workspaceSagas() {
yield all([
- takeLatest(ReduxActionTypes.FETCH_ORG_ROLES_INIT, fetchRolesSaga),
- takeLatest(ReduxActionTypes.FETCH_CURRENT_ORG, fetchOrgSaga),
- takeLatest(ReduxActionTypes.SAVE_ORG_INIT, saveOrgSaga),
- takeLatest(ReduxActionTypes.CREATE_ORGANIZATION_INIT, createOrgSaga),
+ takeLatest(ReduxActionTypes.FETCH_WORKSPACE_ROLES_INIT, fetchRolesSaga),
+ takeLatest(ReduxActionTypes.FETCH_CURRENT_WORKSPACE, fetchWorkspaceSaga),
+ takeLatest(ReduxActionTypes.SAVE_WORKSPACE_INIT, saveWorkspaceSaga),
+ takeLatest(ReduxActionTypes.CREATE_WORKSPACE_INIT, createWorkspaceSaga),
takeLatest(ReduxActionTypes.FETCH_ALL_USERS_INIT, fetchAllUsersSaga),
takeLatest(ReduxActionTypes.FETCH_ALL_ROLES_INIT, fetchAllRolesSaga),
- takeLatest(ReduxActionTypes.DELETE_ORG_USER_INIT, deleteOrgUserSaga),
takeLatest(
- ReduxActionTypes.CHANGE_ORG_USER_ROLE_INIT,
- changeOrgUserRoleSaga,
+ ReduxActionTypes.DELETE_WORKSPACE_USER_INIT,
+ deleteWorkspaceUserSaga,
+ ),
+ takeLatest(
+ ReduxActionTypes.CHANGE_WORKSPACE_USER_ROLE_INIT,
+ changeWorkspaceUserRoleSaga,
),
- takeLatest(ReduxActionTypes.DELETE_ORG_INIT, deleteOrgSaga),
- takeLatest(ReduxActionTypes.UPLOAD_ORG_LOGO, uploadOrgLogoSaga),
- takeLatest(ReduxActionTypes.REMOVE_ORG_LOGO, deleteOrgLogoSaga),
+ takeLatest(ReduxActionTypes.DELETE_WORKSPACE_INIT, deleteWorkspaceSaga),
+ takeLatest(ReduxActionTypes.UPLOAD_WORKSPACE_LOGO, uploadWorkspaceLogoSaga),
+ takeLatest(ReduxActionTypes.REMOVE_WORKSPACE_LOGO, deleteWorkspaceLogoSaga),
]);
}
diff --git a/app/client/src/sagas/index.tsx b/app/client/src/sagas/index.tsx
index 4bef0e0edc85..ffcb54c1e584 100644
--- a/app/client/src/sagas/index.tsx
+++ b/app/client/src/sagas/index.tsx
@@ -14,7 +14,7 @@ import apiPaneSagas from "./ApiPaneSagas";
import jsPaneSagas from "./JSPaneSagas";
import userSagas from "./userSagas";
import pluginSagas from "./PluginSagas";
-import orgSagas from "./OrgSagas";
+import workspaceSagas from "./WorkspaceSagas";
import importedCollectionsSagas from "./CollectionSagas";
import providersSagas from "./ProvidersSaga";
import curlImportSagas from "./CurlImportSagas";
@@ -62,7 +62,7 @@ const sagas = [
userSagas,
templateSagas,
pluginSagas,
- orgSagas,
+ workspaceSagas,
importedCollectionsSagas,
providersSagas,
curlImportSagas,
diff --git a/app/client/src/sagas/userSagas.tsx b/app/client/src/sagas/userSagas.tsx
index 49fba2b60f88..389e05133e39 100644
--- a/app/client/src/sagas/userSagas.tsx
+++ b/app/client/src/sagas/userSagas.tsx
@@ -13,7 +13,7 @@ import UserApi, {
VerifyTokenRequest,
TokenPasswordUpdateRequest,
UpdateUserRequest,
- LeaveOrgRequest,
+ LeaveWorkspaceRequest,
} from "@appsmith/api/UserApi";
import { AUTH_LOGIN_URL, SETUP } from "constants/routes";
import history from "utils/history";
@@ -34,7 +34,7 @@ import {
fetchFeatureFlagsError,
} from "actions/userActions";
import AnalyticsUtil from "utils/AnalyticsUtil";
-import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
+import { INVITE_USERS_TO_WORKSPACE_FORM } from "constants/forms";
import PerformanceTracker, {
PerformanceTransactionName,
} from "utils/PerformanceTracker";
@@ -242,7 +242,7 @@ export function* invitedUserSignupSaga(
type InviteUserPayload = {
email: string;
- orgId: string;
+ workspaceId: string;
roleName: string;
};
@@ -259,14 +259,14 @@ export function* inviteUser(payload: InviteUserPayload, reject: any) {
export function* inviteUsers(
action: ReduxActionWithPromise<{
- data: { usernames: string[]; orgId: string; roleName: string };
+ data: { usernames: string[]; workspaceId: string; roleName: string };
}>,
) {
const { data, reject, resolve } = action.payload;
try {
const response: ApiResponse = yield callAPI(UserApi.inviteUser, {
usernames: data.usernames,
- orgId: data.orgId,
+ workspaceId: data.workspaceId,
roleName: data.roleName,
});
const isValidResponse = yield validateResponse(response);
@@ -278,13 +278,13 @@ export function* inviteUsers(
yield put({
type: ReduxActionTypes.FETCH_ALL_USERS_INIT,
payload: {
- orgId: data.orgId,
+ workspaceId: data.workspaceId,
},
});
yield put({
- type: ReduxActionTypes.INVITED_USERS_TO_ORGANIZATION,
+ type: ReduxActionTypes.INVITED_USERS_TO_WORKSPACE,
payload: {
- orgId: data.orgId,
+ workspaceId: data.workspaceId,
users: data.usernames.map((name: string) => ({
username: name,
roleName: data.roleName,
@@ -292,11 +292,11 @@ export function* inviteUsers(
},
});
yield call(resolve);
- yield put(reset(INVITE_USERS_TO_ORG_FORM));
+ yield put(reset(INVITE_USERS_TO_WORKSPACE_FORM));
} catch (error) {
yield call(reject, { _error: error.message });
yield put({
- type: ReduxActionErrorTypes.INVITE_USERS_TO_ORG_ERROR,
+ type: ReduxActionErrorTypes.INVITE_USERS_TO_WORKSPACE_ERROR,
payload: {
error,
},
@@ -475,7 +475,7 @@ export default function* userSagas() {
ReduxActionTypes.RESET_PASSWORD_VERIFY_TOKEN_INIT,
verifyResetPasswordTokenSaga,
),
- takeLatest(ReduxActionTypes.INVITE_USERS_TO_ORG_INIT, inviteUsers),
+ takeLatest(ReduxActionTypes.INVITE_USERS_TO_WORKSPACE_INIT, inviteUsers),
takeLatest(ReduxActionTypes.LOGOUT_USER_INIT, logoutSaga),
takeLatest(ReduxActionTypes.VERIFY_INVITE_INIT, verifyUserInviteSaga),
takeLatest(
@@ -488,7 +488,7 @@ export default function* userSagas() {
),
takeLatest(ReduxActionTypes.REMOVE_PROFILE_PHOTO, removePhoto),
takeLatest(ReduxActionTypes.UPLOAD_PROFILE_PHOTO, updatePhoto),
- takeLatest(ReduxActionTypes.LEAVE_ORG_INIT, leaveOrgSaga),
+ takeLatest(ReduxActionTypes.LEAVE_WORKSPACE_INIT, leaveWorkspaceSaga),
takeLatest(ReduxActionTypes.FETCH_FEATURE_FLAGS_INIT, fetchFeatureFlags),
takeLatest(
ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
@@ -501,10 +501,12 @@ export default function* userSagas() {
]);
}
-export function* leaveOrgSaga(action: ReduxAction<LeaveOrgRequest>) {
+export function* leaveWorkspaceSaga(
+ action: ReduxAction<LeaveWorkspaceRequest>,
+) {
try {
- const request: LeaveOrgRequest = action.payload;
- const response: ApiResponse = yield call(UserApi.leaveOrg, request);
+ const request: LeaveWorkspaceRequest = action.payload;
+ const response: ApiResponse = yield call(UserApi.leaveWorkspace, request);
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
diff --git a/app/client/src/selectors/applicationSelectors.tsx b/app/client/src/selectors/applicationSelectors.tsx
index c0b81b6b8f2b..989d874199db 100644
--- a/app/client/src/selectors/applicationSelectors.tsx
+++ b/app/client/src/selectors/applicationSelectors.tsx
@@ -6,10 +6,10 @@ import {
} from "reducers/uiReducers/applicationsReducer";
import {
ApplicationPayload,
- OrganizationDetails,
+ WorkspaceDetails,
} from "@appsmith/constants/ReduxActionConstants";
import Fuse from "fuse.js";
-import { Organization } from "constants/orgConstants";
+import { Workspaces } from "constants/workspaceConstants";
import { GitApplicationMetadata } from "api/ApplicationApi";
import {
isPermitted,
@@ -17,7 +17,7 @@ import {
} from "pages/Applications/permissionHelpers";
const fuzzySearchOptions = {
- keys: ["applications.name", "organization.name"],
+ keys: ["applications.name", "workspace.name"],
shouldSort: true,
threshold: 0.5,
location: 0,
@@ -43,8 +43,8 @@ export const getIsSavingAppName = (state: AppState) =>
state.ui.applications.isSavingAppName;
export const getIsErroredSavingAppName = (state: AppState) =>
state.ui.applications.isErrorSavingAppName;
-export const getUserApplicationsOrgs = (state: AppState) => {
- return state.ui.applications.userOrgs;
+export const getUserApplicationsWorkspaces = (state: AppState) => {
+ return state.ui.applications.userWorkspaces;
};
export const getImportedCollections = (state: AppState) =>
@@ -83,40 +83,40 @@ export const getApplicationList = createSelector(
},
);
-export const getUserApplicationsOrgsList = createSelector(
- getUserApplicationsOrgs,
+export const getUserApplicationsWorkspacesList = createSelector(
+ getUserApplicationsWorkspaces,
getApplicationSearchKeyword,
(
- applicationsOrgs?: Organization[],
+ applicationsWorkspaces?: Workspaces[],
keyword?: string,
- ): OrganizationDetails[] => {
+ ): WorkspaceDetails[] => {
if (
- applicationsOrgs &&
- applicationsOrgs.length > 0 &&
+ applicationsWorkspaces &&
+ applicationsWorkspaces.length > 0 &&
keyword &&
keyword.trim().length > 0
) {
- const fuzzy = new Fuse(applicationsOrgs, fuzzySearchOptions);
- let organizationList = fuzzy.search(keyword) as OrganizationDetails[];
- organizationList = organizationList.map((org) => {
- const applicationFuzzy = new Fuse(org.applications, {
+ const fuzzy = new Fuse(applicationsWorkspaces, fuzzySearchOptions);
+ let workspaceList = fuzzy.search(keyword) as WorkspaceDetails[];
+ workspaceList = workspaceList.map((workspace) => {
+ const applicationFuzzy = new Fuse(workspace.applications, {
...fuzzySearchOptions,
keys: ["name"],
});
const applications = applicationFuzzy.search(keyword) as any[];
return {
- ...org,
+ ...workspace,
applications,
};
});
- return organizationList;
+ return workspaceList;
} else if (
- applicationsOrgs &&
+ applicationsWorkspaces &&
(keyword === undefined || keyword.trim().length === 0)
) {
- return applicationsOrgs;
+ return applicationsWorkspaces;
}
return [];
},
@@ -152,8 +152,8 @@ export const getCurrentAppGitMetaData = createSelector(
currentApplication?.gitApplicationMetadata,
);
-export const getIsSavingOrgInfo = (state: AppState) =>
- state.ui.applications.isSavingOrgInfo;
+export const getIsSavingWorkspaceInfo = (state: AppState) =>
+ state.ui.applications.isSavingWorkspaceInfo;
export const showAppInviteUsersDialogSelector = (state: AppState) =>
state.ui.applications.showAppInviteUsersDialog;
@@ -164,19 +164,19 @@ export const getIsDatasourceConfigForImportFetched = (state: AppState) =>
export const getIsImportingApplication = (state: AppState) =>
state.ui.applications.importingApplication;
-export const getOrganizationIdForImport = (state: AppState) =>
- state.ui.applications.organizationIdForImport;
+export const getWorkspaceIdForImport = (state: AppState) =>
+ state.ui.applications.workspaceIdForImport;
export const getImportedApplication = (state: AppState) =>
state.ui.applications.importedApplication;
-// Get organization list where user can create applications
-export const getOrganizationCreateApplication = createSelector(
- getUserApplicationsOrgs,
- (userOrgs) => {
- return userOrgs.filter((userOrg) =>
+// Get workspace list where user can create applications
+export const getWorkspaceCreateApplication = createSelector(
+ getUserApplicationsWorkspaces,
+ (userWorkspaces) => {
+ return userWorkspaces.filter((userWorkspace) =>
isPermitted(
- userOrg.organization.userPermissions || [],
+ userWorkspace.workspace.userPermissions || [],
PERMISSION_TYPE.CREATE_APPLICATION,
),
);
diff --git a/app/client/src/selectors/onboardingSelectors.tsx b/app/client/src/selectors/onboardingSelectors.tsx
index f04993394eec..05383c8b29a8 100644
--- a/app/client/src/selectors/onboardingSelectors.tsx
+++ b/app/client/src/selectors/onboardingSelectors.tsx
@@ -4,7 +4,7 @@ import {
} from "pages/Applications/permissionHelpers";
import { AppState } from "reducers";
import { createSelector } from "reselect";
-import { getUserApplicationsOrgs } from "./applicationSelectors";
+import { getUserApplicationsWorkspaces } from "./applicationSelectors";
import { getWidgets } from "sagas/selectors";
import { getActionResponses, getActions } from "./entitiesSelector";
import { getSelectedWidget } from "./ui";
@@ -310,14 +310,14 @@ export const showInfoMessageSelector = (state: AppState) =>
export const loading = (state: AppState) => state.ui.onBoarding.loading;
-// To find an organisation where the user has permission to create an
+// To find an workspace where the user has permission to create an
// application
-export const getOnboardingOrganisations = createSelector(
- getUserApplicationsOrgs,
- (userOrgs) => {
- return userOrgs.filter((userOrg) =>
+export const getOnboardingWorkspaces = createSelector(
+ getUserApplicationsWorkspaces,
+ (userWorkspaces) => {
+ return userWorkspaces.filter((userWorkspace) =>
isPermitted(
- userOrg.organization.userPermissions || [],
+ userWorkspace.workspace.userPermissions || [],
PERMISSION_TYPE.CREATE_APPLICATION,
),
);
diff --git a/app/client/src/selectors/templatesSelectors.tsx b/app/client/src/selectors/templatesSelectors.tsx
index 31cf42f8754e..f8df41f22754 100644
--- a/app/client/src/selectors/templatesSelectors.tsx
+++ b/app/client/src/selectors/templatesSelectors.tsx
@@ -2,7 +2,7 @@ import { FilterKeys, Template } from "api/TemplatesApi";
import Fuse from "fuse.js";
import { AppState } from "reducers";
import { createSelector } from "reselect";
-import { getOrganizationCreateApplication } from "./applicationSelectors";
+import { getWorkspaceCreateApplication } from "./applicationSelectors";
import { getWidgetCards } from "./editorSelectors";
import { getDefaultPlugins } from "./entitiesSelector";
import { Filter } from "pages/Templates/Filters";
@@ -22,11 +22,11 @@ export const isImportingTemplateSelector = (state: AppState) =>
export const showTemplateNotificationSelector = (state: AppState) =>
state.ui.templates.templateNotificationSeen;
-export const getOrganizationForTemplates = createSelector(
- getOrganizationCreateApplication,
- (organizationList) => {
- if (organizationList.length) {
- return organizationList[0];
+export const getWorkspaceForTemplates = createSelector(
+ getWorkspaceCreateApplication,
+ (workspaceList) => {
+ if (workspaceList.length) {
+ return workspaceList[0];
}
return null;
@@ -169,13 +169,13 @@ export const getFilterListSelector = createSelector(
},
);
-export const getForkableOrganizations = createSelector(
- getOrganizationCreateApplication,
- (organisations) => {
- return organisations.map((organization) => {
+export const getForkableWorkspaces = createSelector(
+ getWorkspaceCreateApplication,
+ (workspaces) => {
+ return workspaces.map((workspace) => {
return {
- label: organization.organization.name,
- value: organization.organization.id,
+ label: workspace.workspace.name,
+ value: workspace.workspace.id,
};
});
},
diff --git a/app/client/src/selectors/workspaceSelectors.tsx b/app/client/src/selectors/workspaceSelectors.tsx
new file mode 100644
index 000000000000..0ad3fdcb99f4
--- /dev/null
+++ b/app/client/src/selectors/workspaceSelectors.tsx
@@ -0,0 +1,68 @@
+import { createSelector } from "reselect";
+import { AppState } from "reducers";
+import { WorkspaceRole } from "constants/workspaceConstants";
+
+export const getRolesFromState = (state: AppState) => {
+ return state.ui.workspaces.roles;
+};
+
+export const getWorkspaceLoadingStates = (state: AppState) => {
+ return {
+ isFetchingWorkspace: state.ui.workspaces.loadingStates.isFetchingWorkspace,
+ isFetchingAllUsers: state.ui.workspaces.loadingStates.isFetchAllUsers,
+ isFetchingAllRoles: state.ui.workspaces.loadingStates.isFetchAllRoles,
+ deletingUserInfo: state.ui.workspaces.workspaceUsers.filter(
+ (el) => el.isDeleting,
+ )[0],
+ roleChangingUserInfo: state.ui.workspaces.workspaceUsers.filter(
+ (el) => el.isChangingRole,
+ )[0],
+ };
+};
+
+export const getCurrentWorkspaceId = (state: AppState) =>
+ state.ui.workspaces.currentWorkspace.id;
+export const getWorkspaces = (state: AppState) => {
+ return state.ui.applications.userWorkspaces;
+};
+export const getCurrentWorkspace = (state: AppState) => {
+ return state.ui.applications.userWorkspaces.map((el) => el.workspace);
+};
+export const getCurrentAppWorkspace = (state: AppState) => {
+ return state.ui.workspaces.currentWorkspace;
+};
+export const getAllUsers = (state: AppState) =>
+ state.ui.workspaces.workspaceUsers;
+export const getAllRoles = (state: AppState) =>
+ state.ui.workspaces.workspaceRoles;
+
+export const getRoles = createSelector(
+ getRolesFromState,
+ (roles?: WorkspaceRole[]): WorkspaceRole[] | undefined => {
+ return roles?.map((role) => ({
+ id: role.id,
+ name: role.displayName || role.name,
+ isDefault: role.isDefault,
+ }));
+ },
+);
+
+export const getRolesForField = createSelector(getAllRoles, (roles?: any) => {
+ return Object.entries(roles).map((role) => {
+ return {
+ id: role[0],
+ name: role[0],
+ description: role[1],
+ };
+ });
+});
+
+export const getDefaultRole = createSelector(
+ getRoles,
+ (roles?: WorkspaceRole[]) => {
+ return roles?.find((role) => role.isDefault);
+ },
+);
+export const getCurrentError = (state: AppState) => {
+ return state.ui.errors.currentError;
+};
diff --git a/app/client/src/serviceWorker.js b/app/client/src/serviceWorker.js
index ff3c789eca04..2f7e5312ac94 100644
--- a/app/client/src/serviceWorker.js
+++ b/app/client/src/serviceWorker.js
@@ -22,7 +22,7 @@ const regexMap = {
/(tiny.cloud|googleapis|gstatic|cloudfront).*.(js|css|woff2)/,
),
shims: new RegExp(/shims\/.*.js/),
- profile: new RegExp(/v1\/(users\/profile|organizations)/),
+ profile: new RegExp(/v1\/(users\/profile|workspaces)/),
providers: new RegExp(/v1\/marketplace\/(providers|templates)/),
};
diff --git a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
index 838f475bf460..c7d6ba9ee9c4 100644
--- a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
+++ b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
@@ -37,7 +37,7 @@ export const datasourceToFormValues = (
: "";
return {
datasourceId: datasource.id,
- organizationId: datasource.organizationId,
+ workspaceId: datasource.workspaceId,
pluginId: datasource.pluginId,
isValid: datasource.isValid,
url: datasource.datasourceConfiguration?.url,
diff --git a/app/client/src/transformers/RestActionTransformers.test.ts b/app/client/src/transformers/RestActionTransformers.test.ts
index 3ceb66652490..f712a0e7e89e 100644
--- a/app/client/src/transformers/RestActionTransformers.test.ts
+++ b/app/client/src/transformers/RestActionTransformers.test.ts
@@ -14,7 +14,7 @@ const BASE_ACTION: ApiAction = {
executeOnLoad: false,
invalids: [],
isValid: false,
- organizationId: "",
+ workspaceId: "",
pageId: "",
pluginId: "",
id: "testId",
diff --git a/app/client/src/utils/DynamicBindingUtils.test.ts b/app/client/src/utils/DynamicBindingUtils.test.ts
index e875eb1f0c85..c2b9670650ca 100644
--- a/app/client/src/utils/DynamicBindingUtils.test.ts
+++ b/app/client/src/utils/DynamicBindingUtils.test.ts
@@ -65,7 +65,7 @@ describe("DynamicBindingPathlist", () => {
const action: Action = {
cacheResponse: "",
id: "61810f59a0f5113e30ba72ac",
- organizationId: "61800c6bd504bf710747bf9a",
+ workspaceId: "61800c6bd504bf710747bf9a",
pluginType: PluginType.API,
pluginId: "5ca385dc81b37f0004b4db85",
name: "Api1",
@@ -73,7 +73,7 @@ describe("DynamicBindingPathlist", () => {
// userPermissions: [],
name: "DEFAULT_REST_DATASOURCE",
pluginId: "5ca385dc81b37f0004b4db85",
- organizationId: "61800c6bd504bf710747bf9a",
+ workspaceId: "61800c6bd504bf710747bf9a",
datasourceConfiguration: {
url: "https://thatcopy.pw",
},
diff --git a/app/client/src/utils/JSPaneUtils.test.ts b/app/client/src/utils/JSPaneUtils.test.ts
index b8da5c0bf70b..1c6435c25193 100644
--- a/app/client/src/utils/JSPaneUtils.test.ts
+++ b/app/client/src/utils/JSPaneUtils.test.ts
@@ -5,7 +5,7 @@ import { getDifferenceInJSCollection, ParsedBody } from "./JSPaneUtils";
const JSObject1: JSCollection = {
id: "1234",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
name: "JSObject2",
pageId: "page123",
pluginId: "plugin123",
@@ -16,7 +16,7 @@ const JSObject1: JSCollection = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -25,7 +25,7 @@ const JSObject1: JSCollection = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -58,7 +58,7 @@ const JSObject1: JSCollection = {
{
id: "fun1",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -67,7 +67,7 @@ const JSObject1: JSCollection = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -116,7 +116,7 @@ const JSObject1: JSCollection = {
const JSObject2: JSCollection = {
id: "1234",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
name: "JSObject2",
pageId: "page123",
pluginId: "plugin123",
@@ -127,7 +127,7 @@ const JSObject2: JSCollection = {
{
id: "fun1",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -136,7 +136,7 @@ const JSObject2: JSCollection = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -169,7 +169,7 @@ const JSObject2: JSCollection = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -178,7 +178,7 @@ const JSObject2: JSCollection = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -257,7 +257,7 @@ const resultRenamedActions = {
{
id: "fun1",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun11",
@@ -266,7 +266,7 @@ const resultRenamedActions = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -338,7 +338,7 @@ const resultDeletedActions = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -347,7 +347,7 @@ const resultDeletedActions = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -455,7 +455,7 @@ const resultChangedBody = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -464,7 +464,7 @@ const resultChangedBody = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -536,7 +536,7 @@ const resultChangedParameters = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -545,7 +545,7 @@ const resultChangedParameters = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -617,7 +617,7 @@ const resultRemovedAsync = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun2",
@@ -626,7 +626,7 @@ const resultRemovedAsync = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -695,7 +695,7 @@ const resultAddedAsync = {
{
id: "fun1",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -704,7 +704,7 @@ const resultAddedAsync = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -780,7 +780,7 @@ const resultAddedAction = {
executeOnLoad: false,
pageId: "page123",
collectionId: "1234",
- organizationId: "org123",
+ workspaceId: "workspace123",
actionConfiguration: {
body: "async () => {\n\t\t//use async-await or promises\n\t}",
isAsync: true,
diff --git a/app/client/src/utils/JSPaneUtils.tsx b/app/client/src/utils/JSPaneUtils.tsx
index f4eeb58e150e..1aeddab0adc9 100644
--- a/app/client/src/utils/JSPaneUtils.tsx
+++ b/app/client/src/utils/JSPaneUtils.tsx
@@ -111,7 +111,7 @@ export const getDifferenceInJSCollection = (
collectionId: jsAction.id,
executeOnLoad: false,
pageId: jsAction.pageId,
- organizationId: jsAction.organizationId,
+ workspaceId: jsAction.workspaceId,
actionConfiguration: {
body: action.body,
isAsync: action.isAsync,
@@ -184,7 +184,7 @@ export const pushLogsForObjectUpdate = (
export const createDummyJSCollectionActions = (
pageId: string,
- organizationId: string,
+ workspaceId: string,
) => {
const body =
"export default {\n\tmyVar1: [],\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t},\n\tmyFun2: async () => {\n\t\t//use async-await or promises\n\t}\n}";
@@ -193,7 +193,7 @@ export const createDummyJSCollectionActions = (
{
name: "myFun1",
pageId,
- organizationId,
+ workspaceId,
executeOnLoad: false,
actionConfiguration: {
body: "() => {\n\t\t//write code here\n\t}",
@@ -206,7 +206,7 @@ export const createDummyJSCollectionActions = (
{
name: "myFun2",
pageId,
- organizationId,
+ workspaceId,
executeOnLoad: false,
actionConfiguration: {
body: "async () => {\n\t\t//use async-await or promises\n\t}",
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts b/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
index 0bd95a8c6500..76655c8685ae 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.test.ts
@@ -61,7 +61,7 @@ const jsObject: JSCollectionData = {
config: {
id: "1234",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
name: "JSObject3",
pageId: "page123",
pluginId: "plugin123",
@@ -72,7 +72,7 @@ const jsObject: JSCollectionData = {
{
id: "fun1",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: "JS",
pluginId: "plugin123",
name: "myFun1",
@@ -81,7 +81,7 @@ const jsObject: JSCollectionData = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
@@ -114,7 +114,7 @@ const jsObject: JSCollectionData = {
{
id: "fun2",
applicationId: "app123",
- organizationId: "org123",
+ workspaceId: "workspace123",
pluginType: PluginType.JS,
pluginId: "plugin123",
name: "myFun2",
@@ -123,7 +123,7 @@ const jsObject: JSCollectionData = {
userPermissions: [],
name: "UNUSED_DATASOURCE",
pluginId: "plugin123",
- organizationId: "org123",
+ workspaceId: "workspace123",
messages: [],
isValid: true,
new: true,
diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx
index 1d95c7d3f0ed..f342e63d23ac 100644
--- a/app/client/src/utils/helpers.tsx
+++ b/app/client/src/utils/helpers.tsx
@@ -12,7 +12,7 @@ import {
} from "constants/WidgetValidation";
import { GLOBAL_FUNCTIONS } from "./autocomplete/EntityDefinitions";
import { get, set, isNil } from "lodash";
-import { Org } from "constants/orgConstants";
+import { Workspace } from "constants/workspaceConstants";
import {
isPermitted,
PERMISSION_TYPE,
@@ -469,11 +469,11 @@ export const renameKeyInObject = (object: any, key: string, newKey: string) => {
return object;
};
-// Can be used to check if the user has developer role access to org
-export const getCanCreateApplications = (currentOrg: Org) => {
- const userOrgPermissions = currentOrg.userPermissions || [];
+// Can be used to check if the user has developer role access to workspace
+export const getCanCreateApplications = (currentWorkspace: Workspace) => {
+ const userWorkspacePermissions = currentWorkspace.userPermissions || [];
const canManage = isPermitted(
- userOrgPermissions,
+ userWorkspacePermissions,
PERMISSION_TYPE.CREATE_APPLICATION,
);
return canManage;
diff --git a/app/client/src/utils/hooks/useOrg.tsx b/app/client/src/utils/hooks/useOrg.tsx
deleted file mode 100644
index af52899b7d2c..000000000000
--- a/app/client/src/utils/hooks/useOrg.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { fetchOrg } from "actions/orgActions";
-import { useEffect } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import { getCurrentUser } from "selectors/usersSelectors";
-
-import { getCurrentAppOrg } from "@appsmith/selectors/organizationSelectors";
-import { ANONYMOUS_USERNAME } from "constants/userConstants";
-
-const useOrg = (orgId: string) => {
- const dispatch = useDispatch();
- const org = useSelector(getCurrentAppOrg);
- const currentUser = useSelector(getCurrentUser);
-
- useEffect(() => {
- if (!currentUser || currentUser.username === ANONYMOUS_USERNAME) return;
-
- if ((!org || !org.userPermissions) && orgId) {
- dispatch(fetchOrg(orgId, true));
- }
- }, [orgId, currentUser && currentUser.username]);
-
- return org;
-};
-
-export default useOrg;
diff --git a/app/client/src/utils/hooks/useWorkspace.tsx b/app/client/src/utils/hooks/useWorkspace.tsx
new file mode 100644
index 000000000000..0b360d20069d
--- /dev/null
+++ b/app/client/src/utils/hooks/useWorkspace.tsx
@@ -0,0 +1,25 @@
+import { fetchWorkspace } from "actions/workspaceActions";
+import { useEffect } from "react";
+import { useSelector, useDispatch } from "react-redux";
+import { getCurrentUser } from "selectors/usersSelectors";
+
+import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
+import { ANONYMOUS_USERNAME } from "constants/userConstants";
+
+const useWorkspace = (workspaceId: string) => {
+ const dispatch = useDispatch();
+ const workspace = useSelector(getCurrentAppWorkspace);
+ const currentUser = useSelector(getCurrentUser);
+
+ useEffect(() => {
+ if (!currentUser || currentUser.username === ANONYMOUS_USERNAME) return;
+
+ if ((!workspace || !workspace.userPermissions) && workspaceId) {
+ dispatch(fetchWorkspace(workspaceId, true));
+ }
+ }, [workspaceId, currentUser && currentUser.username]);
+
+ return workspace;
+};
+
+export default useWorkspace;
diff --git a/app/client/src/workers/DataTreeEvaluator/test/mockData/mockUnEvalTree.ts b/app/client/src/workers/DataTreeEvaluator/test/mockData/mockUnEvalTree.ts
index 8307fbb57544..42e6c1fb4a55 100644
--- a/app/client/src/workers/DataTreeEvaluator/test/mockData/mockUnEvalTree.ts
+++ b/app/client/src/workers/DataTreeEvaluator/test/mockData/mockUnEvalTree.ts
@@ -255,7 +255,7 @@ export const unEvalTree = {
appsmith: {
user: {
email: "[email protected]",
- organizationIds: [
+ workspaceIds: [
"6218a61972ccd9145ec78c57",
"621913df0276eb01d22fec44",
"60caf8edb1e47a1315f0c48f",
@@ -517,7 +517,7 @@ export const asyncTagUnevalTree: DataTree = {
appsmith: ({
user: {
email: "[email protected]",
- organizationIds: [
+ workspaceIds: [
"61431979a67ce2289d3c7c6d",
"61431a95a67ce2289d3c7c74",
"5f7add8687af934ed846dd6a",
diff --git a/app/client/test/__mocks__/apiHandlers.ts b/app/client/test/__mocks__/apiHandlers.ts
index b58e7ff09158..39dbd14a314a 100644
--- a/app/client/test/__mocks__/apiHandlers.ts
+++ b/app/client/test/__mocks__/apiHandlers.ts
@@ -4,7 +4,7 @@ import {
fetchApplicationThreadsMockResponse,
createNewThreadMockResponse,
} from "mockResponses/CommentApiMockResponse";
-import CreateOrganisationMockResponse from "mockResponses/CreateOrganisationMockResponse.json";
+import CreateWorkspaceMockResponse from "mockResponses/CreateWorkspaceMockResponse.json";
import ApplicationsNewMockResponse from "mockResponses/ApplicationsNewMockResponse.json";
const mockSuccessRes = {
@@ -14,8 +14,8 @@ const mockSuccessRes = {
export const handlers = [
// mock apis here
- rest.post("/api/v1/organizations", (req, res, ctx) => {
- return res(ctx.status(200), ctx.json(CreateOrganisationMockResponse));
+ rest.post("/api/v1/workspaces", (req, res, ctx) => {
+ return res(ctx.status(200), ctx.json(CreateWorkspaceMockResponse));
}),
rest.get("/api/v1/applications/new", (req, res, ctx) => {
return res(ctx.status(200), ctx.json(ApplicationsNewMockResponse));
diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts
index a9189f3baa8e..65cb4cbf0bd6 100644
--- a/app/client/test/sagas.ts
+++ b/app/client/test/sagas.ts
@@ -3,7 +3,7 @@ import apiPaneSagas from "../src/sagas/ApiPaneSagas";
import jsPaneSagas from "../src/sagas/JSPaneSagas";
import userSagas from "../src/sagas/userSagas";
import pluginSagas from "../src/sagas/PluginSagas";
-import orgSagas from "../src/sagas/OrgSagas";
+import workspaceSagas from "../src/sagas/WorkspaceSagas";
import importedCollectionsSagas from "../src/sagas/CollectionSagas";
import providersSagas from "../src/sagas/ProvidersSaga";
import curlImportSagas from "../src/sagas/CurlImportSagas";
@@ -43,7 +43,7 @@ export const sagasToRunForTests = [
jsPaneSagas,
userSagas,
pluginSagas,
- orgSagas,
+ workspaceSagas,
importedCollectionsSagas,
providersSagas,
curlImportSagas,
diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts
index 1a5a2be6483d..dd7765cc67cb 100644
--- a/app/client/test/testCommon.ts
+++ b/app/client/test/testCommon.ts
@@ -100,7 +100,7 @@ export function MockApplication({ children }: any) {
const dispatch = useDispatch();
dispatch(initEditor({ pageId: "page_id", mode: APP_MODE.EDIT }));
const mockResp: any = {
- organizationId: "org_id",
+ workspaceId: "workspace_id",
pages: [{ id: "page_id", name: "Page1", isDefault: true }],
id: "app_id",
isDefault: true,
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
index dc6cc63200cb..26614f072003 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java
@@ -123,7 +123,7 @@ public class FileUtilsImpl implements FileInterface {
/**
* This method will save the complete application in the local repo directory.
- * Path to repo will be : ./container-volumes/git-repo/organizationId/defaultApplicationId/repoName/{application_data}
+ * Path to repo will be : ./container-volumes/git-repo/workspaceId/defaultApplicationId/repoName/{application_data}
* @param baseRepoSuffix path suffix used to create a repo path
* @param applicationGitReference application reference object from which entire application can be rehydrated
* @param branchName name of the branch for the current application
@@ -383,7 +383,7 @@ public Mono<Path> initializeReadme(Path baseRepoSuffix,
@Override
public Mono<Boolean> deleteLocalRepo(Path baseRepoSuffix) {
- // Remove the complete directory from path: baseRepo/organizationId/defaultApplicationId
+ // Remove the complete directory from path: baseRepo/workspaceId/defaultApplicationId
File file = Paths.get(gitServiceConfig.getGitRootPath()).resolve(baseRepoSuffix).getParent().toFile();
while (file.exists()) {
FileSystemUtils.deleteRecursively(file);
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
index 9214876d9d39..dc2c66be2f35 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java
@@ -10,7 +10,7 @@
public interface FileInterface {
/**
* This method is use to store the serialised application to git repo, directory path structure we are going to follow :
- * ./container-volumes/git-repo/organizationId/defaultApplicationId/repoName/{application_data}
+ * ./container-volumes/git-repo/workspaceId/defaultApplicationId/repoName/{application_data}
* @param baseRepoSuffix path suffix used to create a repo path
* @param applicationGitReference application reference object from which entire application can be rehydrated
* @return Path to where the application is stored
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
index e39c662143fe..b963ab6e21d9 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
@@ -32,9 +32,13 @@ public class Datasource extends BaseDomain {
// It'll be null if not set
@Transient
String pluginName;
-
+
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
String templateName;
DatasourceConfiguration datasourceConfiguration;
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index 25fbb8e2af21..19cc1673d0c8 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -120,6 +120,7 @@
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<scope>test</scope>
+ <version>3.4.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
index 43994838e416..d05051b0c48f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AclPermission.java
@@ -17,7 +17,7 @@ public enum AclPermission {
/**
* Notes :
* 1. Composite permissions are more often than not used in the generation of the hierarchical graphs.
- * For example, USER_MANAGE_ORGANIZATIONS, ORGANIZATION_MANAGE_APPLICATIONS, etc.
+ * For example, USER_MANAGE_WORKSPACES, WORKSPACE_MANAGE_APPLICATIONS, etc.
*/
// These are generic permissions created to make the transition to the new ACL format easy. They must be removed
@@ -27,38 +27,38 @@ public enum AclPermission {
UPDATE("update", null),
DELETE("delete", null),
- // Does the user have manage organization permission
- USER_MANAGE_ORGANIZATIONS("manage:userOrganization", User.class),
- //Does the user have read organization permissions
- USER_READ_ORGANIZATIONS("read:userOrganization", User.class),
+ // Does the user have manage workspace permission
+ USER_MANAGE_WORKSPACES("manage:userWorkspace", User.class),
+ //Does the user have read workspace permissions
+ USER_READ_WORKSPACES("read:userWorkspace", User.class),
// Does this user have permission to access Instance Config UI?
MANAGE_INSTANCE_ENV("manage:instanceEnv", User.class),
// TODO: Add these permissions to PolicyGenerator to assign them to the user when they sign up
- // The following should be applied to Organization and not User
+ // The following should be applied to Workspace and not User
READ_USERS("read:users", User.class),
MANAGE_USERS("manage:users", User.class),
RESET_PASSWORD_USERS("resetPassword:users", User.class),
- MANAGE_ORGANIZATIONS("manage:organizations", Workspace.class),
- READ_ORGANIZATIONS("read:organizations", Workspace.class),
+ MANAGE_WORKSPACES("manage:workspaces", Workspace.class),
+ READ_WORKSPACES("read:workspaces", Workspace.class),
- // Was the user assigned a global permission at the organization level to manage applications?
- ORGANIZATION_MANAGE_APPLICATIONS("manage:orgApplications", Workspace.class),
- ORGANIZATION_READ_APPLICATIONS("read:orgApplications", Workspace.class),
- ORGANIZATION_PUBLISH_APPLICATIONS("publish:orgApplications", Workspace.class),
- ORGANIZATION_EXPORT_APPLICATIONS("export:orgApplications", Workspace.class),
+ // Was the user assigned a global permission at the workspace level to manage applications?
+ WORKSPACE_MANAGE_APPLICATIONS("manage:workspaceApplications", Workspace.class),
+ WORKSPACE_READ_APPLICATIONS("read:workspaceApplications", Workspace.class),
+ WORKSPACE_PUBLISH_APPLICATIONS("publish:workspaceApplications", Workspace.class),
+ WORKSPACE_EXPORT_APPLICATIONS("export:workspaceApplications", Workspace.class),
// Invitation related permissions
- ORGANIZATION_INVITE_USERS("inviteUsers:organization", Workspace.class),
+ WORKSPACE_INVITE_USERS("inviteUsers:workspace", Workspace.class),
MANAGE_APPLICATIONS("manage:applications", Application.class),
READ_APPLICATIONS("read:applications", Application.class),
PUBLISH_APPLICATIONS("publish:applications", Application.class),
EXPORT_APPLICATIONS("export:applications", Application.class),
- // Making an application public permission at Organization level
+ // Making an application public permission at Workspace level
MAKE_PUBLIC_APPLICATIONS("makePublic:applications", Application.class),
// Can the user create a comment thread on a given application?
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
index 7138666b931f..25ee08253daa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/AppsmithRole.java
@@ -7,14 +7,14 @@
import java.util.Set;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_PUBLISH_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_PUBLISH_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
@Getter
public enum AppsmithRole {
@@ -22,15 +22,14 @@ public enum AppsmithRole {
APPLICATION_VIEWER("Application Viewer", "", Set.of(READ_APPLICATIONS)),
ORGANIZATION_ADMIN("Administrator", "Can modify all organization settings including editing applications, " +
"inviting other users to the organization and exporting applications from the organization",
- Set.of(MANAGE_ORGANIZATIONS, ORGANIZATION_INVITE_USERS, ORGANIZATION_EXPORT_APPLICATIONS)),
+ Set.of(MANAGE_WORKSPACES, WORKSPACE_INVITE_USERS, WORKSPACE_EXPORT_APPLICATIONS)),
ORGANIZATION_DEVELOPER("Developer", "Can edit and view applications along with inviting other users to the organization",
- Set.of(READ_ORGANIZATIONS, ORGANIZATION_MANAGE_APPLICATIONS, ORGANIZATION_READ_APPLICATIONS,
- ORGANIZATION_PUBLISH_APPLICATIONS, ORGANIZATION_INVITE_USERS)),
+ Set.of(READ_WORKSPACES, WORKSPACE_MANAGE_APPLICATIONS, WORKSPACE_READ_APPLICATIONS,
+ WORKSPACE_PUBLISH_APPLICATIONS, WORKSPACE_INVITE_USERS)),
ORGANIZATION_VIEWER(
- "App Viewer",
- "Can view applications and invite other users to view applications",
- Set.of(READ_ORGANIZATIONS, ORGANIZATION_READ_APPLICATIONS, ORGANIZATION_INVITE_USERS)
- ),
+ "App Viewer",
+ "Can view applications and invite other users to view applications",
+ Set.of(READ_WORKSPACES, WORKSPACE_READ_APPLICATIONS, WORKSPACE_INVITE_USERS)),
;
private Set<AclPermission> permissions;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java
index dfc1ee6ccdd3..2e809d0a9bb3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java
@@ -28,26 +28,26 @@
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
import static com.appsmith.server.acl.AclPermission.MANAGE_THEMES;
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_PUBLISH_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_PUBLISH_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.PUBLISH_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_COMMENTS;
import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
import static com.appsmith.server.acl.AclPermission.READ_THREADS;
import static com.appsmith.server.acl.AclPermission.READ_USERS;
-import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
-import static com.appsmith.server.acl.AclPermission.USER_READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.USER_MANAGE_WORKSPACES;
+import static com.appsmith.server.acl.AclPermission.USER_READ_WORKSPACES;
@Getter
@@ -77,7 +77,7 @@ public void createPolicyGraph() {
});
createUserPolicyGraph();
- createOrganizationPolicyGraph();
+ createWorkspacePolicyGraph();
createDatasourcePolicyGraph();
createApplicationPolicyGraph();
createPagePolicyGraph();
@@ -87,27 +87,27 @@ public void createPolicyGraph() {
}
/**
- * In this, we add permissions for a user to interact with organizations and other users inside the said organizations
+ * In this, we add permissions for a user to interact with workspaces and other users inside the said workspaces
*/
private void createUserPolicyGraph() {
- hierarchyGraph.addEdge(USER_MANAGE_ORGANIZATIONS, MANAGE_ORGANIZATIONS);
- hierarchyGraph.addEdge(USER_READ_ORGANIZATIONS, READ_ORGANIZATIONS);
+ hierarchyGraph.addEdge(USER_MANAGE_WORKSPACES, MANAGE_WORKSPACES);
+ hierarchyGraph.addEdge(USER_READ_WORKSPACES, READ_WORKSPACES);
- // If user is given manageOrg permission, they must also be able to read organizations
- lateralGraph.addEdge(USER_MANAGE_ORGANIZATIONS, USER_READ_ORGANIZATIONS);
+ // If user is given manageOrg permission, they must also be able to read workspaces
+ lateralGraph.addEdge(USER_MANAGE_WORKSPACES, USER_READ_WORKSPACES);
lateralGraph.addEdge(MANAGE_USERS, READ_USERS);
}
- private void createOrganizationPolicyGraph() {
- lateralGraph.addEdge(MANAGE_ORGANIZATIONS, READ_ORGANIZATIONS);
- lateralGraph.addEdge(MANAGE_ORGANIZATIONS, ORGANIZATION_MANAGE_APPLICATIONS);
- lateralGraph.addEdge(MANAGE_ORGANIZATIONS, ORGANIZATION_READ_APPLICATIONS);
- lateralGraph.addEdge(MANAGE_ORGANIZATIONS, ORGANIZATION_PUBLISH_APPLICATIONS);
+ private void createWorkspacePolicyGraph() {
+ lateralGraph.addEdge(MANAGE_WORKSPACES, READ_WORKSPACES);
+ lateralGraph.addEdge(MANAGE_WORKSPACES, WORKSPACE_MANAGE_APPLICATIONS);
+ lateralGraph.addEdge(MANAGE_WORKSPACES, WORKSPACE_READ_APPLICATIONS);
+ lateralGraph.addEdge(MANAGE_WORKSPACES, WORKSPACE_PUBLISH_APPLICATIONS);
}
private void createDatasourcePolicyGraph() {
- hierarchyGraph.addEdge(ORGANIZATION_MANAGE_APPLICATIONS, MANAGE_DATASOURCES);
- hierarchyGraph.addEdge(ORGANIZATION_READ_APPLICATIONS, READ_DATASOURCES);
+ hierarchyGraph.addEdge(WORKSPACE_MANAGE_APPLICATIONS, MANAGE_DATASOURCES);
+ hierarchyGraph.addEdge(WORKSPACE_READ_APPLICATIONS, READ_DATASOURCES);
lateralGraph.addEdge(MANAGE_DATASOURCES, READ_DATASOURCES);
lateralGraph.addEdge(MANAGE_DATASOURCES, EXECUTE_DATASOURCES);
@@ -115,11 +115,11 @@ private void createDatasourcePolicyGraph() {
}
private void createApplicationPolicyGraph() {
- hierarchyGraph.addEdge(ORGANIZATION_MANAGE_APPLICATIONS, MANAGE_APPLICATIONS);
- hierarchyGraph.addEdge(ORGANIZATION_READ_APPLICATIONS, READ_APPLICATIONS);
- hierarchyGraph.addEdge(ORGANIZATION_PUBLISH_APPLICATIONS, PUBLISH_APPLICATIONS);
- hierarchyGraph.addEdge(MANAGE_ORGANIZATIONS, MAKE_PUBLIC_APPLICATIONS);
- hierarchyGraph.addEdge(ORGANIZATION_EXPORT_APPLICATIONS, EXPORT_APPLICATIONS);
+ hierarchyGraph.addEdge(WORKSPACE_MANAGE_APPLICATIONS, MANAGE_APPLICATIONS);
+ hierarchyGraph.addEdge(WORKSPACE_READ_APPLICATIONS, READ_APPLICATIONS);
+ hierarchyGraph.addEdge(WORKSPACE_PUBLISH_APPLICATIONS, PUBLISH_APPLICATIONS);
+ hierarchyGraph.addEdge(MANAGE_WORKSPACES, MAKE_PUBLIC_APPLICATIONS);
+ hierarchyGraph.addEdge(WORKSPACE_EXPORT_APPLICATIONS, EXPORT_APPLICATIONS);
// If the user is being given MANAGE_APPLICATION permission, they must also be given READ_APPLICATION perm
lateralGraph.addEdge(MANAGE_APPLICATIONS, READ_APPLICATIONS);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
index e6c1ac6853be..7ffce1602aaa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
@@ -154,10 +154,10 @@ public Mono<Void> onAuthenticationSuccess(
private Mono<Application> createDefaultApplication(User user) {
// need to create default application
- String workspaceId = user.getOrganizationIds().iterator().next();
+ String workspaceId = user.getWorkspaceIds().iterator().next();
Application application = new Application();
- application.setOrganizationId(workspaceId);
+ application.setWorkspaceId(workspaceId);
application.setName("My first application");
return applicationPageService.createApplication(application);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
index 5eb92e7d9603..d571888a2279 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
@@ -173,8 +173,8 @@ private User createAnonymousUser() {
User user = new User();
user.setName(FieldName.ANONYMOUS_USER);
user.setEmail(FieldName.ANONYMOUS_USER);
- user.setCurrentOrganizationId("");
- user.setOrganizationIds(new HashSet<>());
+ user.setCurrentWorkspaceId("");
+ user.setWorkspaceIds(new HashSet<>());
user.setIsAnonymous(true);
return user;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
index e69772e890f9..4059f9504ebb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
@@ -3,7 +3,9 @@
public class FieldName {
public static final String EMAIL = "email";
public static final String PASSWORD = "password";
+ @Deprecated
public static final String ORGANIZATION_ID = "organizationId";
+ public static final String WORKSPACE_ID = "workspaceId";
public static final String DELETED = "deleted";
public static final String CREATED_AT = "createdAt";
public static final String DELETED_AT = "deletedAt";
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
index 7e9984090e8d..954c6637f265 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Url.java
@@ -6,7 +6,7 @@ public interface Url {
String LOGIN_URL = BASE_URL + VERSION + "/login";
String LOGOUT_URL = BASE_URL + VERSION + "/logout";
String WIDGET_URL = BASE_URL + VERSION + "/widgets";
- String ORGANIZATION_URL = BASE_URL + VERSION + "/organizations";
+ String WORKSPACE_URL = BASE_URL + VERSION + "/workspaces";
String LAYOUT_URL = BASE_URL + VERSION + "/layouts";
String PLUGIN_URL = BASE_URL + VERSION + "/plugins";
String SETTING_URL = BASE_URL + VERSION + "/settings";
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/WorkspaceController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/WorkspaceController.java
index 8e16f0b4ae42..b9574d395dee 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/WorkspaceController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/WorkspaceController.java
@@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.RestController;
@RestController
-@RequestMapping(Url.ORGANIZATION_URL)
+@RequestMapping(Url.WORKSPACE_URL)
public class WorkspaceController extends WorkspaceControllerCE {
public WorkspaceController(WorkspaceService workspaceService,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
index f0fef6103976..fd8835b8631c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
@@ -76,13 +76,13 @@ public ApplicationControllerCE(
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
public Mono<ResponseDTO<Application>> create(@Valid @RequestBody Application resource,
- @RequestParam String orgId,
+ @RequestParam String workspaceId,
ServerWebExchange exchange) {
- if (orgId == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "organization id"));
+ if (workspaceId == null) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "workspace id"));
}
- log.debug("Going to create application in org {}", orgId);
- return applicationPageService.createApplication(resource, orgId)
+ log.debug("Going to create application in workspace {}", workspaceId);
+ return applicationPageService.createApplication(resource, workspaceId)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
}
@@ -217,9 +217,9 @@ public Mono<ResponseDTO<Theme>> setCurrentTheme(@PathVariable String application
.map(theme -> new ResponseDTO<>(HttpStatus.OK.value(), theme, null));
}
- @GetMapping("/import/{orgId}/datasources")
- public Mono<ResponseDTO<List<Datasource>>> getUnConfiguredDatasource(@PathVariable String orgId, @RequestParam String defaultApplicationId) {
- return importExportApplicationService.findDatasourceByApplicationId(defaultApplicationId, orgId)
+ @GetMapping("/import/{workspaceId}/datasources")
+ public Mono<ResponseDTO<List<Datasource>>> getUnConfiguredDatasource(@PathVariable String workspaceId, @RequestParam String defaultApplicationId) {
+ return importExportApplicationService.findDatasourceByApplicationId(defaultApplicationId, workspaceId)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java
index 77ae5025cccc..ba37f7c6812d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java
@@ -44,7 +44,7 @@ public Mono<ResponseDTO<ActionDTO>> create(@RequestBody(required = false) Object
@RequestParam RestApiImporterType type,
@RequestParam String pageId,
@RequestParam String name,
- @RequestParam String organizationId,
+ @RequestParam String workspaceId,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName,
@RequestHeader(name = "Origin", required = false) String originHeader
) {
@@ -59,7 +59,7 @@ public Mono<ResponseDTO<ActionDTO>> create(@RequestBody(required = false) Object
throw new IllegalStateException("Unexpected value: " + type);
}
- return service.importAction(input, pageId, name, organizationId, branchName)
+ return service.importAction(input, pageId, name, workspaceId, branchName)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
index 486ba411406b..46671ba5b008 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
@@ -97,19 +97,19 @@ public Mono<ResponseDTO<User>> update(@RequestBody UserUpdateDTO updates, Server
.map(updatedUser -> new ResponseDTO<>(HttpStatus.OK.value(), updatedUser, null));
}
- @PutMapping("/switchOrganization/{workspaceId}")
- public Mono<ResponseDTO<User>> setCurrentOrganization(@PathVariable String workspaceId) {
+ @PutMapping("/switchWorkspace/{workspaceId}")
+ public Mono<ResponseDTO<User>> setCurrentWorkspace(@PathVariable String workspaceId) {
return service.switchCurrentWorkspace(workspaceId)
.map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
}
- @PutMapping("/addOrganization/{workspaceId}")
+ @PutMapping("/addWorkspace/{workspaceId}")
public Mono<ResponseDTO<User>> addUserToWorkspace(@PathVariable String workspaceId) {
return userWorkspaceService.addUserToWorkspace(workspaceId, null)
.map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
}
- @PutMapping("/leaveOrganization/{workspaceId}")
+ @PutMapping("/leaveWorkspace/{workspaceId}")
public Mono<ResponseDTO<User>> leaveWorkspace(@PathVariable String workspaceId) {
return userWorkspaceService.leaveWorkspace(workspaceId)
.map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java
index 66e5defab746..6d82da5f7fbb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java
@@ -25,7 +25,7 @@
import java.util.Map;
-@RequestMapping(Url.ORGANIZATION_URL)
+@RequestMapping(Url.WORKSPACE_URL)
public class WorkspaceControllerCE extends BaseController<WorkspaceService, Workspace, String> {
private final UserWorkspaceService userWorkspaceService;
@@ -41,8 +41,8 @@ public WorkspaceControllerCE(WorkspaceService workspaceService, UserWorkspaceSer
* @return
*/
@GetMapping("/roles")
- public Mono<ResponseDTO<Map<String, String>>> getUserRolesForWorkspace(@RequestParam String organizationId) {
- return service.getUserRolesForWorkspace(organizationId)
+ public Mono<ResponseDTO<Map<String, String>>> getUserRolesForWorkspace(@RequestParam String workspaceId) {
+ return service.getUserRolesForWorkspace(workspaceId)
.map(permissions -> new ResponseDTO<>(HttpStatus.OK.value(), permissions, null));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/AbstractCommentDomain.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/AbstractCommentDomain.java
index 50d01d7ed2e0..45836a506a01 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/AbstractCommentDomain.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/AbstractCommentDomain.java
@@ -18,8 +18,13 @@ public abstract class AbstractCommentDomain extends BaseDomain {
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
String authorUsername; // username i.e. email of the user, who authored this comment or thread.
+
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
String orgId;
+ String workspaceId;
+
/** Edit/Published Mode */
ApplicationMode mode;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java
index 14d2fe96054a..82cd30675ea0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java
@@ -28,8 +28,12 @@ public class Action extends BaseDomain {
Datasource datasource;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
String pageId;
String collectionId;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionCollection.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionCollection.java
index b60d561950ca..a195c77d4ae1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionCollection.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionCollection.java
@@ -23,8 +23,12 @@ public class ActionCollection extends BaseDomain {
String applicationId;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
ActionCollectionDTO unpublishedCollection;
ActionCollectionDTO publishedCollection;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
index 87e72843c229..f6c456220051 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
@@ -32,8 +32,12 @@ public class Application extends BaseDomain {
@NotNull
String name;
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
/*
TODO: remove default values from application.
*/
@@ -147,7 +151,7 @@ public String getLastDeployedAt() {
// initialized newly or is left up to the calling function to set.
public Application(Application application) {
super();
- this.organizationId = application.getOrganizationId();
+ this.workspaceId = application.getWorkspaceId();
this.pages = new ArrayList<>();
this.publishedPages = new ArrayList<>();
this.clonedFromApplicationId = application.getId();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Collection.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Collection.java
index deda3c443e11..790bcf1b2614 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Collection.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Collection.java
@@ -20,8 +20,12 @@ public class Collection extends BaseDomain {
String applicationId;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
Boolean shared;
//To save space, when creating/updating collection, only add Action's id field instead of the entire action.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitApplicationMetadata.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitApplicationMetadata.java
index e4a05891b429..656ee6b635a1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitApplicationMetadata.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitApplicationMetadata.java
@@ -29,7 +29,7 @@ public class GitApplicationMetadata implements AppsmithDomain {
String repoName;
// Default application id used for storing the application files in local volume :
- // container-volumes/git_repo/organizationId/defaultApplicationId/branchName/applicationDirectoryStructure...
+ // container-volumes/git_repo/workspaceId/defaultApplicationId/branchName/applicationDirectoryStructure...
String defaultApplicationId;
// Git credentials used to push changes to remote repo and will be stored with default application only to optimise
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Group.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Group.java
index 209d8a1f91bc..776512c83441 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Group.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Group.java
@@ -21,9 +21,14 @@ public class Group extends BaseDomain {
private String displayName;
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
@NotNull
private String organizationId;
+ @NotNull
+ String workspaceId;
+
/**
* This is a list of name of permissions. We will query with permission collection by name
* This is because permissions are global in nature. They are not specific to a particular org/team.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewAction.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewAction.java
index f41c8c24c34b..707292280951 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewAction.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/NewAction.java
@@ -18,8 +18,12 @@ public class NewAction extends BaseDomain {
// Fields in action that are not allowed to change between published and unpublished versions
String applicationId;
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
String organizationId;
+ String workspaceId;
+
PluginType pluginType;
String pluginId;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java
index f1d579e6b875..f136981f5743 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java
@@ -65,7 +65,7 @@ public enum ResponseType {
String generateCRUDPageComponent;
// Marking it as JsonIgnore because we don't want other users to be able to set this property. Only admins
- // must be able to mark a plugin for defaultInstall on all organization creations
+ // must be able to mark a plugin for defaultInstall on all workspace creations
@JsonIgnore
Boolean defaultInstall;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Theme.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Theme.java
index a93f7ba8d83d..413b72c09bd9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Theme.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Theme.java
@@ -26,7 +26,13 @@ public class Theme extends BaseDomain {
private String displayName;
private String applicationId;
+
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
private String organizationId;
+
+ String workspaceId;
+
private Object config;
private Object properties;
private Map<String, Object> stylesheet;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
index 6a08285d3e15..a48e976dad04 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
@@ -47,11 +47,23 @@ public class User extends BaseDomain implements UserDetails, OidcUser {
private Boolean isEnabled = true;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
private String currentOrganizationId;
+
+ private String currentWorkspaceId;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
private Set<String> organizationIds;
+
+ private Set<String> workspaceIds;
+ //Organizations migrated to workspaces, kept the field as depricated to support the old migration
+ @Deprecated
private String examplesOrganizationId;
+
+ private String examplesWorkspaceId;
// There is a many-to-many relationship with groups. If this value is modified, please also modify the list of
// users in that particular group document as well.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
index e9cfeb311118..77c4fd34fd6d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UserData.java
@@ -30,7 +30,7 @@ public class UserData extends BaseDomain {
@JsonIgnore
String userId;
- // Role of the user in their organization, example, Designer, Developer, Product Lead etc.
+ // Role of the user in their workspace, example, Designer, Developer, Product Lead etc.
private String role;
// The goal the user is trying to solve with Appsmith.
@@ -42,9 +42,13 @@ public class UserData extends BaseDomain {
// The version where this user has last viewed the release notes.
private String releaseNotesViewedVersion;
- // list of organisation ids that were recently accessed by the user
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
private List<String> recentlyUsedOrgIds;
+ // list of workspace ids that were recently accessed by the user
+ private List<String> recentlyUsedWorkspaceIds;
+
// list of application ids that were recently accessed by the user
private List<String> recentlyUsedAppIds;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
index 92e8047d8545..2194585fe6cc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
@@ -34,7 +34,11 @@ public class Workspace extends BaseDomain {
private String slug;
+ //Organizations migrated to workspaces, kept the field as deprecated to support the old migration
+ @Deprecated
private Boolean isAutoGeneratedOrganization;
+
+ private Boolean isAutoGeneratedWorkspace;
@JsonIgnore
private List<UserRole> userRoles;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionCollectionDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionCollectionDTO.java
index eef0da310735..d33e7bfeba9b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionCollectionDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionCollectionDTO.java
@@ -35,7 +35,7 @@ public class ActionCollectionDTO {
String applicationId;
@Transient
- String organizationId;
+ String workspaceId;
String name;
@@ -91,8 +91,8 @@ public class ActionCollectionDTO {
public Set<String> validate() {
Set<String> validationErrors = new HashSet<>();
- if (this.organizationId == null) {
- validationErrors.add(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.ORGANIZATION_ID));
+ if (this.workspaceId == null) {
+ validationErrors.add(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.WORKSPACE_ID));
}
if (this.applicationId == null) {
validationErrors.add(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.APPLICATION_ID));
@@ -112,7 +112,7 @@ public Set<String> validate() {
public void populateTransientFields(ActionCollection actionCollection) {
this.setId(actionCollection.getId());
this.setApplicationId(actionCollection.getApplicationId());
- this.setOrganizationId(actionCollection.getOrganizationId());
+ this.setWorkspaceId(actionCollection.getWorkspaceId());
copyNewFieldValuesIntoOldObject(actionCollection.getDefaultResources(), this.getDefaultResources());
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionDTO.java
index ef73f00f6ce9..d39691ddee15 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ActionDTO.java
@@ -35,7 +35,7 @@ public class ActionDTO {
String applicationId;
@Transient
- String organizationId;
+ String workspaceId;
@Transient
PluginType pluginType;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java
index ca13cea62a05..b7299d33a701 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java
@@ -10,6 +10,6 @@
public class AddItemToPageDTO {
String name;
String pageId;
- String organizationId;
+ String workspaceId;
ItemDTO marketplaceElement;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationPagesDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationPagesDTO.java
index 3fc8563612ab..58cd5bd40baf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationPagesDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationPagesDTO.java
@@ -10,7 +10,7 @@
@Setter
public class ApplicationPagesDTO {
- String organizationId;
+ String workspaceId;
Application application;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InstallPluginRedisDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InstallPluginRedisDTO.java
index 652a99042d5d..ccce06916c48 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InstallPluginRedisDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InstallPluginRedisDTO.java
@@ -6,6 +6,6 @@
@Getter
@Setter
public class InstallPluginRedisDTO {
- String organizationId;
- PluginWorkspaceDTO pluginOrgDTO;
+ String workspaceId;
+ PluginWorkspaceDTO pluginWorkspaceDTO;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InviteUsersDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InviteUsersDTO.java
index bf9467040e89..591f3f963565 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InviteUsersDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/InviteUsersDTO.java
@@ -17,5 +17,5 @@ public class InviteUsersDTO {
String roleName;
@NotNull
- String orgId;
+ String workspaceId;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java
index bba97c5ba4a8..d073cdcccda9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MockDataSource.java
@@ -9,7 +9,7 @@ public class MockDataSource {
String name;
- String organizationId;
+ String workspaceId;
String pluginId;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginWorkspaceDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginWorkspaceDTO.java
index 3654001bb064..15efc99bb4a5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginWorkspaceDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PluginWorkspaceDTO.java
@@ -9,7 +9,7 @@ public class PluginWorkspaceDTO {
String pluginId;
- String organizationId;
+ String workspaceId;
WorkspacePluginStatus status;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserHomepageDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserHomepageDTO.java
index b5aed72afdb9..4c4173937ad8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserHomepageDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserHomepageDTO.java
@@ -16,7 +16,7 @@ public class UserHomepageDTO {
User user;
- List<WorkspaceApplicationsDTO> organizationApplications;
+ List<WorkspaceApplicationsDTO> workspaceApplications;
// This is a string so that it can hold values like `10+` if there's more than 10 new versions, for example.
String newReleasesCount;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserProfileDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserProfileDTO.java
index 0d6fc83a97c5..77adcfab7eb0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserProfileDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserProfileDTO.java
@@ -13,7 +13,7 @@ public class UserProfileDTO {
String email;
- Set<String> organizationIds;
+ Set<String> workspaceIds;
String username;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupDTO.java
index 953ca92003ad..3f95f9f039d1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupDTO.java
@@ -6,5 +6,5 @@
@Data
public class UserSignupDTO {
private User user;
- private String defaultOrganizationId;
+ private String defaultWorkspaceId;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspaceApplicationsDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspaceApplicationsDTO.java
index 89d6905874b0..b26cc074d235 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspaceApplicationsDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/WorkspaceApplicationsDTO.java
@@ -15,7 +15,7 @@
@NoArgsConstructor
@ToString
public class WorkspaceApplicationsDTO {
- Workspace organization;
+ Workspace workspace;
List<Application> applications;
List<UserRole> userRoles;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java
index 431125dc2368..287a4ce11d45 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/AbstractCommentEvent.java
@@ -7,7 +7,7 @@
@Data
public abstract class AbstractCommentEvent {
private final String authorUserName;
- private final Workspace organization;
+ private final Workspace workspace;
private final Application application;
private final String originHeader;
private final String pageName;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java
index ac5ace892547..862a4f70f84e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentAddedEvent.java
@@ -12,9 +12,9 @@ public class CommentAddedEvent extends AbstractCommentEvent {
private final Comment comment;
private final Set<String> subscribers;
- public CommentAddedEvent(Workspace organization, Application application,
+ public CommentAddedEvent(Workspace workspace, Application application,
String originHeader, Comment comment, Set<String> subscribers, String pageName) {
- super(comment.getAuthorUsername(), organization, application, originHeader, pageName);
+ super(comment.getAuthorUsername(), workspace, application, originHeader, pageName);
this.comment = comment;
this.subscribers = subscribers;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java
index 058d5fc1717c..ae2e458d3e9b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/events/CommentThreadClosedEvent.java
@@ -9,8 +9,8 @@
public class CommentThreadClosedEvent extends AbstractCommentEvent {
private final CommentThread commentThread;
- public CommentThreadClosedEvent(String authorUserName, Workspace organization, Application application, String originHeader, CommentThread commentThread, String pagename) {
- super(authorUserName, organization, application, originHeader, pagename);
+ public CommentThreadClosedEvent(String authorUserName, Workspace workspace, Application application, String originHeader, CommentThread commentThread, String pagename) {
+ super(authorUserName, workspace, application, originHeader, pagename);
this.commentThread = commentThread;
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index 7d3a21025fff..c7c9c983505a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -86,7 +86,7 @@ public enum AppsmithError {
AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.BAD_REQUEST, null),
GIT_MERGE_FAILED_REMOTE_CHANGES(406, 4036, "Remote is ahead of local by {0} commits on branch {1}. Please pull remote changes first and try again.", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_ACTION_EXECUTION_ERROR, ErrorReferenceDocUrl.GIT_UPSTREAM_CHANGES),
GIT_MERGE_FAILED_LOCAL_CHANGES(406, 4037, "There are uncommitted changes present in your local branch {0}. Please commit them first and try again", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_ACTION_EXECUTION_ERROR, null),
- REMOVE_LAST_ORG_ADMIN_ERROR(400, 4038, "The last admin can not be removed from an organization", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
+ REMOVE_LAST_WORKSPACE_ADMIN_ERROR(400, 4038, "The last admin can not be removed from an organization", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
INVALID_CRUD_PAGE_REQUEST(400, 4039, "Unable to process page generation request, {0}", AppsmithErrorAction.DEFAULT, null, ErrorType.BAD_REQUEST, null),
UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH(400, 4040, "This operation is not supported for remote branch {0}. Please use local branches only to proceed", AppsmithErrorAction.DEFAULT, "Unsupported Operation!", ErrorType.BAD_REQUEST, null),
INTERNAL_SERVER_ERROR(500, 5000, "Internal server error while processing request", AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.INTERNAL_ERROR, null),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitCloudServicesUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitCloudServicesUtils.java
index 79bc14937402..6def85fefbe2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitCloudServicesUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitCloudServicesUtils.java
@@ -28,11 +28,11 @@ public class GitCloudServicesUtils {
private final static Map<String, GitConnectionLimitDTO> gitLimitCache = new HashMap<>();
- public Mono<Integer> getPrivateRepoLimitForOrg(String orgId, boolean isClearCache) {
+ public Mono<Integer> getPrivateRepoLimitForOrg(String workspaceId, boolean isClearCache) {
final String baseUrl = cloudServicesConfig.getBaseUrl();
return configService.getInstanceId().map(instanceId -> {
if (commonConfig.isCloudHosting()) {
- return instanceId + "_" + orgId;
+ return instanceId + "_" + workspaceId;
} else {
return instanceId;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
index 4f05212b2fa9..519cefbb21f3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java
@@ -72,7 +72,7 @@ public class GitFileUtils {
= Set.of(EXPORTED_APPLICATION, DATASOURCE_LIST, PAGE_LIST, ACTION_LIST, ACTION_COLLECTION_LIST, DECRYPTED_FIELDS, EDIT_MODE_THEME);
/**
* This method will save the complete application in the local repo directory.
- * Path to repo will be : ./container-volumes/git-repo/organizationId/defaultApplicationId/repoName/{application_data}
+ * Path to repo will be : ./container-volumes/git-repo/workspaceId/defaultApplicationId/repoName/{application_data}
* @param baseRepoSuffix path suffix used to create a local repo path
* @param applicationJson application reference object from which entire application can be rehydrated
* @param branchName name of the branch for the current application
@@ -96,7 +96,7 @@ public Mono<Path> saveApplicationToLocalRepo(Path baseRepoSuffix,
.map(tuple -> {
stopwatch.stopTimer();
Path repoPath = tuple.getT1();
- // Path to repo will be : ./container-volumes/git-repo/organizationId/defaultApplicationId/repoName/
+ // Path to repo will be : ./container-volumes/git-repo/workspaceId/defaultApplicationId/repoName/
final Map<String, Object> data = Map.of(
FieldName.APPLICATION_ID, repoPath.getParent().getFileName().toString(),
FieldName.ORGANIZATION_ID, repoPath.getParent().getParent().getFileName().toString(),
@@ -224,18 +224,18 @@ public ApplicationGitReference createApplicationReference(ApplicationJson applic
/**
* Method to reconstruct the application from the local git repo
*
- * @param organizationId To which organisation application needs to be rehydrated
+ * @param workspaceId To which workspace application needs to be rehydrated
* @param defaultApplicationId Root application for the current branched application
* @param branchName for which branch the application needs to rehydrate
* @return application reference from which entire application can be rehydrated
*/
- public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepo(String organizationId,
+ public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepo(String workspaceId,
String defaultApplicationId,
String repoName,
String branchName) {
Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.GIT_DESERIALIZE_APP_RESOURCES_FROM_FILE.getEventName());
Mono<ApplicationGitReference> appReferenceMono = fileUtils
- .reconstructApplicationReferenceFromGitRepo(organizationId, defaultApplicationId, repoName, branchName);
+ .reconstructApplicationReferenceFromGitRepo(workspaceId, defaultApplicationId, repoName, branchName);
return Mono.zip(appReferenceMono, sessionUserService.getCurrentUser())
.map(tuple -> {
ApplicationGitReference applicationReference = tuple.getT1();
@@ -246,7 +246,7 @@ public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepo(String organi
stopwatch.stopTimer();
final Map<String, Object> data = Map.of(
FieldName.APPLICATION_ID, defaultApplicationId,
- FieldName.ORGANIZATION_ID, organizationId,
+ FieldName.ORGANIZATION_ID, workspaceId,
FieldName.FLOW_NAME, stopwatch.getFlow(),
"executionTime", stopwatch.getExecutionTime()
);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
index f681a49818ba..7517c909d50c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PolicyUtils.java
@@ -162,7 +162,7 @@ public Flux<Datasource> updateWithNewPoliciesToDatasourcesByWorkspaceId(String w
return datasourceRepository
// fetch datasources with execute permissions so that app viewers can invite other app viewers
- .findAllByOrganizationId(workspaceId, AclPermission.EXECUTE_DATASOURCES)
+ .findAllByWorkspaceId(workspaceId, AclPermission.EXECUTE_DATASOURCES)
// In case we have come across a datasource for this workspace that the current user is not allowed to manage, move on.
.switchIfEmpty(Mono.empty())
.map(datasource -> {
@@ -200,7 +200,7 @@ public Flux<Application> updateWithNewPoliciesToApplicationsByWorkspaceId(String
return applicationRepository
// fetch applications with read permissions so that app viewers can invite other app viewers
- .findByOrganizationId(workspaceId, AclPermission.READ_APPLICATIONS)
+ .findByWorkspaceId(workspaceId, AclPermission.READ_APPLICATIONS)
// In case we have come across an application for this workspace that the current user is not allowed to manage, move on.
.switchIfEmpty(Mono.empty())
.map(application -> {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
index f9510074f265..33a755ff70f7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
@@ -133,8 +133,8 @@
import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.EXPORT_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MAKE_PUBLIC_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
import static com.appsmith.server.constants.FieldName.DEFAULT_RESOURCES;
@@ -729,13 +729,13 @@ public void giveInvitePermissionToOrganizationsAndPublicPermissionsToApplication
policies = new HashSet<>();
}
- Optional<Policy> inviteUsersOptional = policies.stream().filter(policy -> policy.getPermission().equals(ORGANIZATION_INVITE_USERS.getValue())).findFirst();
+ Optional<Policy> inviteUsersOptional = policies.stream().filter(policy -> policy.getPermission().equals(WORKSPACE_INVITE_USERS.getValue())).findFirst();
if (inviteUsersOptional.isPresent()) {
Policy inviteUserPolicy = inviteUsersOptional.get();
inviteUserPolicy.getUsers().addAll(invitePermissionUsernames);
} else {
// this policy doesnt exist. create and add this to the policy set
- Policy inviteUserPolicy = Policy.builder().permission(ORGANIZATION_INVITE_USERS.getValue())
+ Policy inviteUserPolicy = Policy.builder().permission(WORKSPACE_INVITE_USERS.getValue())
.users(invitePermissionUsernames).build();
organization.getPolicies().add(inviteUserPolicy);
}
@@ -1704,7 +1704,7 @@ public void addAppViewerInvitePolicy(MongockTemplate mongoTemplate) {
mongoTemplate.updateFirst(
query(new Criteria().andOperator(
where(fieldName(QOrganization.organization.id)).is(org.getId()),
- where(fieldName(QOrganization.organization.policies) + ".permission").is(ORGANIZATION_INVITE_USERS.getValue())
+ where(fieldName(QOrganization.organization.policies) + ".permission").is(WORKSPACE_INVITE_USERS.getValue())
)),
new Update().addToSet("policies.$.users").each(viewers.toArray()),
Organization.class
@@ -2468,14 +2468,14 @@ public void addApplicationExportPermissions(MongockTemplate mongoTemplate) {
}
Optional<Policy> exportAppOrgLevelOptional = policies.stream()
- .filter(policy -> policy.getPermission().equals(ORGANIZATION_EXPORT_APPLICATIONS.getValue())).findFirst();
+ .filter(policy -> policy.getPermission().equals(WORKSPACE_EXPORT_APPLICATIONS.getValue())).findFirst();
if (exportAppOrgLevelOptional.isPresent()) {
Policy exportApplicationPolicy = exportAppOrgLevelOptional.get();
exportApplicationPolicy.getUsers().addAll(exportApplicationPermissionUsernames);
} else {
// this policy doesnt exist. create and add this to the policy set
- Policy inviteUserPolicy = Policy.builder().permission(ORGANIZATION_EXPORT_APPLICATIONS.getValue())
+ Policy inviteUserPolicy = Policy.builder().permission(WORKSPACE_EXPORT_APPLICATIONS.getValue())
.users(exportApplicationPermissionUsernames).build();
organization.getPolicies().add(inviteUserPolicy);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
index 41522dce1480..7f79c78ede88 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
@@ -1,37 +1,89 @@
package com.appsmith.server.migrations;
+import com.appsmith.external.models.ApiTemplate;
+import com.appsmith.external.models.BaseDomain;
+import com.appsmith.external.models.Category;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.Property;
+import com.appsmith.external.models.Provider;
import com.appsmith.external.models.QBaseDomain;
import com.appsmith.external.models.QDatasource;
+import com.appsmith.server.acl.AppsmithRole;
import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Action;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.ApplicationPage;
+import com.appsmith.server.domains.Asset;
+import com.appsmith.server.domains.Collection;
+import com.appsmith.server.domains.Comment;
+import com.appsmith.server.domains.CommentNotification;
+import com.appsmith.server.domains.CommentThread;
+import com.appsmith.server.domains.CommentThreadNotification;
+import com.appsmith.server.domains.Config;
+import com.appsmith.server.domains.GitDeployKeys;
+import com.appsmith.server.domains.Group;
+import com.appsmith.server.domains.InviteUser;
+import com.appsmith.server.domains.Layout;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Notification;
import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.Page;
+import com.appsmith.server.domains.PasswordResetToken;
import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.QAction;
+import com.appsmith.server.domains.QActionCollection;
import com.appsmith.server.domains.PricingPlan;
import com.appsmith.server.domains.QApplication;
+import com.appsmith.server.domains.QCollection;
+import com.appsmith.server.domains.QComment;
+import com.appsmith.server.domains.QCommentThread;
+import com.appsmith.server.domains.QConfig;
+import com.appsmith.server.domains.QGroup;
+import com.appsmith.server.domains.QInviteUser;
import com.appsmith.server.domains.QNewAction;
import com.appsmith.server.domains.QNewPage;
import com.appsmith.server.domains.QOrganization;
import com.appsmith.server.domains.QPlugin;
+import com.appsmith.server.domains.QTheme;
+import com.appsmith.server.domains.QUser;
+import com.appsmith.server.domains.QUserData;
+import com.appsmith.server.domains.QWorkspace;
+import com.appsmith.server.domains.Role;
+import com.appsmith.server.domains.Sequence;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.domains.UsagePulse;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.UserData;
import com.appsmith.server.domains.QTenant;
import com.appsmith.server.domains.Sequence;
import com.appsmith.server.domains.Tenant;
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.domains.WorkspacePlugin;
import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.ApplicationTemplate;
+import com.appsmith.server.dtos.ResetUserPasswordDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.TextUtils;
+import com.appsmith.server.services.ce.ConfigServiceCE;
+import com.appsmith.server.services.ce.ConfigServiceCEImpl;
import com.github.cloudyrock.mongock.ChangeLog;
import com.github.cloudyrock.mongock.ChangeSet;
import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.decorator.impl.MongockTemplate;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Flux;
+
+import org.bson.BsonArray;
+import org.bson.Document;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.aggregation.Fields;
+import org.springframework.data.mongodb.core.aggregation.SetOperation;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.redis.core.ReactiveRedisOperations;
@@ -41,13 +93,14 @@
import reactor.core.publisher.Flux;
import java.time.Instant;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.HashSet;
+import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -789,12 +842,14 @@ public void updateOrganizationSlugs(MongockTemplate mongockTemplate) {
@ChangeSet(order = "009", id = "copy-organization-to-workspaces", author = "")
public void copyOrganizationToWorkspaces(MongockTemplate mongockTemplate) {
+ // Drop the workspace collection in case it has been partially run, otherwise it has no effect
+ mongockTemplate.dropCollection(Workspace.class);
Gson gson = new Gson();
//Memory optimization note:
//Call stream instead of findAll to avoid out of memory if the collection is big
//stream implementation lazy loads the data using underlying cursor open on the collection
- //the data is loaded as and when needed by the pipeline
- try(Stream<Organization> stream = mongockTemplate.stream(new Query(), Organization.class)
+ //the data is loaded as as and when needed by the pipeline
+ try(Stream<Organization> stream = mongockTemplate.stream(new Query().cursorBatchSize(10000), Organization.class)
.stream()) {
stream.forEach((organization) -> {
Workspace workspace = gson.fromJson(gson.toJson(organization), Workspace.class);
@@ -891,6 +946,126 @@ public void addTenantToUsersAndFlushRedis(MongockTemplate mongockTemplate, React
final Flux<Object> flushdb = reactiveRedisOperations.execute(RedisScript.of(script));
flushdb.subscribe();
+ }
+
+ @ChangeSet(order = "015", id = "migrate-organizationId-to-workspaceId-in-domain-objects", author = "")
+ public void migrateOrganizationIdToWorkspaceIdInDomainObjects(MongockTemplate mongockTemplate, ReactiveRedisOperations<String, String>reactiveRedisOperations) {
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QDatasource.datasource.workspaceId)).toValueOf(Fields.field(fieldName(QDatasource.datasource.organizationId))),
+ Datasource.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QActionCollection.actionCollection.workspaceId)).toValueOf(Fields.field(fieldName(QActionCollection.actionCollection.organizationId))),
+ ActionCollection.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QApplication.application.workspaceId)).toValueOf(Fields.field(fieldName(QApplication.application.organizationId))),
+ Application.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QNewAction.newAction.workspaceId)).toValueOf(Fields.field(fieldName(QNewAction.newAction.organizationId))),
+ NewAction.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QTheme.theme.workspaceId)).toValueOf(Fields.field(fieldName(QTheme.theme.organizationId))),
+ Theme.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QUserData.userData.recentlyUsedOrgIds)).toValueOf(Fields.field(fieldName(QUserData.userData.recentlyUsedWorkspaceIds))),
+ UserData.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QWorkspace.workspace.isAutoGeneratedWorkspace)).toValueOf(Fields.field(fieldName(QWorkspace.workspace.isAutoGeneratedOrganization))),
+ Workspace.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update()
+ .set(fieldName(QUser.user.workspaceIds)).toValueOf(Fields.field(fieldName(QUser.user.organizationIds)))
+ .set(fieldName(QUser.user.currentWorkspaceId)).toValueOf(Fields.field(fieldName(QUser.user.currentOrganizationId)))
+ .set(fieldName(QUser.user.examplesWorkspaceId)).toValueOf(Fields.field(fieldName(QUser.user.examplesOrganizationId))),
+ User.class);
+
+ // Now sign out all the existing users since this change impacts the user object.
+ final String script =
+ "for _,k in ipairs(redis.call('keys','spring:session:sessions:*'))" +
+ " do redis.call('del',k) " +
+ "end";
+ final Flux<Object> flushdb = reactiveRedisOperations.execute(RedisScript.of(script));
+
+ flushdb.subscribe();
+
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QComment.comment.workspaceId)).toValueOf(Fields.field(fieldName(QComment.comment.workspaceId))),
+ Comment.class);
+ mongockTemplate.updateMulti(new Query(),
+ AggregationUpdate.update().set(fieldName(QCommentThread.commentThread.workspaceId)).toValueOf(Fields.field(fieldName(QCommentThread.commentThread.workspaceId))),
+ CommentThread.class);
+ }
+
+ @ChangeSet(order = "016", id = "organization-to-workspace-indexes-recreate", author = "")
+ public void organizationToWorkspaceIndexesRecreate(MongockTemplate mongockTemplate) {
+ dropIndexIfExists(mongockTemplate, Application.class, "organization_application_deleted_gitApplicationMetadata_compound_index");
+ dropIndexIfExists(mongockTemplate, Datasource.class, "organization_datasource_deleted_compound_index");
+ //If this migration is re-run
+ dropIndexIfExists(mongockTemplate, Application.class, "workspace_application_deleted_gitApplicationMetadata_compound_index");
+ dropIndexIfExists(mongockTemplate, Datasource.class, "workspace_datasource_deleted_compound_index");
+
+ ensureIndexes(mongockTemplate, Application.class,
+ makeIndex(
+ fieldName(QApplication.application.workspaceId),
+ fieldName(QApplication.application.name),
+ fieldName(QApplication.application.deletedAt),
+ "gitApplicationMetadata.remoteUrl",
+ "gitApplicationMetadata.branchName")
+ .unique().named("workspace_application_deleted_gitApplicationMetadata_compound_index")
+ );
+ ensureIndexes(mongockTemplate, Datasource.class,
+ makeIndex(fieldName(QDatasource.datasource.workspaceId),
+ fieldName(QDatasource.datasource.name),
+ fieldName(QDatasource.datasource.deletedAt))
+ .unique().named("workspace_datasource_deleted_compound_index")
+ );
+ }
+
+ @ChangeSet(order = "017", id = "migrate-permission-in-user", author = "")
+ public void migratePermissionsInUser(MongockTemplate mongockTemplate) {
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("manage:userOrganization")),
+ new Update().set("policies.$.permission", "manage:userWorkspace"),
+ User.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("read:userOrganization")),
+ new Update().set("policies.$.permission", "read:userWorkspace"),
+ User.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("read:userOrganization")),
+ new Update().set("policies.$.permission", "read:userWorkspace"),
+ User.class);
+ }
+
+ @ChangeSet(order = "018", id = "migrate-permission-in-workspace", author = "")
+ public void migratePermissionsInWorkspace(MongockTemplate mongockTemplate) {
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("manage:organizations")),
+ new Update().set("policies.$.permission", "manage:workspaces"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("read:organizations")),
+ new Update().set("policies.$.permission", "read:workspaces"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("manage:orgApplications")),
+ new Update().set("policies.$.permission", "manage:workspaceApplications"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("read:orgApplications")),
+ new Update().set("policies.$.permission", "read:workspaceApplications"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("publish:orgApplications")),
+ new Update().set("policies.$.permission", "publish:workspaceApplications"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("export:orgApplications")),
+ new Update().set("policies.$.permission", "export:workspaceApplications"),
+ Workspace.class);
+ mongockTemplate.updateMulti(
+ new Query().addCriteria(where("policies.permission").is("inviteUsers:organization")),
+ new Update().set("policies.$.permission", "inviteUsers:workspace"),
+ Workspace.class);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionRepositoryCE.java
index 7d6be3b40418..ed2e0bd6acf4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionRepositoryCE.java
@@ -22,5 +22,5 @@ Flux<Action> findDistinctActionsByNameInAndPageIdAndExecuteOnLoadTrue(
Flux<Action> findByPageId(String pageId);
- Flux<Action> findByOrganizationId(String organizationId);
+ Flux<Action> findByWorkspaceId(String workspaceId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java
index d49b99c0960a..72184cd44ae0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java
@@ -14,7 +14,7 @@ public interface ApplicationRepositoryCE extends BaseRepository<Application, Str
Flux<Application> findByIdIn(List<String> ids);
- Flux<Application> findByOrganizationId(String organizationId);
+ Flux<Application> findByWorkspaceId(String workspaceId);
Flux<Application> findByClonedFromApplicationId(String clonedFromApplicationId);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java
index f0bc33cb1613..0185df73878a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java
@@ -14,13 +14,13 @@
public interface CustomApplicationRepositoryCE extends AppsmithRepository<Application> {
- Mono<Application> findByIdAndOrganizationId(String id, String orgId, AclPermission permission);
+ Mono<Application> findByIdAndWorkspaceId(String id, String workspaceId, AclPermission permission);
Mono<Application> findByName(String name, AclPermission permission);
- Flux<Application> findByOrganizationId(String orgId, AclPermission permission);
+ Flux<Application> findByWorkspaceId(String workspaceId, AclPermission permission);
- Flux<Application> findByMultipleOrganizationIds(Set<String> orgIds, AclPermission permission);
+ Flux<Application> findByMultipleWorkspaceIds(Set<String> workspaceIds, AclPermission permission);
Flux<Application> findByClonedFromApplicationId(String applicationId, AclPermission permission);
@@ -36,15 +36,15 @@ public interface CustomApplicationRepositoryCE extends AppsmithRepository<Applic
Flux<Application> getApplicationByGitDefaultApplicationId(String defaultApplicationId, AclPermission permission);
- Mono<List<String>> getAllApplicationId(String organizationId);
+ Mono<List<String>> getAllApplicationId(String workspaceId);
Mono<UpdateResult> setAppTheme(String applicationId, String editModeThemeId, String publishedModeThemeId, AclPermission aclPermission);
- Mono<Long> countByOrganizationId(String organizationId);
+ Mono<Long> countByWorkspaceId(String workspaceId);
- Mono<Long> getGitConnectedApplicationWithPrivateRepoCount(String organizationId);
+ Mono<Long> getGitConnectedApplicationWithPrivateRepoCount(String workspaceId);
- Flux<Application> getGitConnectedApplicationByOrganizationId(String organizationId);
+ Flux<Application> getGitConnectedApplicationByWorkspaceId(String workspaceId);
Mono<Application> getApplicationByDefaultApplicationIdAndDefaultBranch(String defaultApplicationId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
index 3b2552af136c..e8f7bf8832f9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
@@ -49,11 +49,11 @@ protected Criteria getIdCriteria(Object id) {
}
@Override
- public Mono<Application> findByIdAndOrganizationId(String id, String orgId, AclPermission permission) {
- Criteria orgIdCriteria = where(fieldName(QApplication.application.organizationId)).is(orgId);
+ public Mono<Application> findByIdAndWorkspaceId(String id, String workspaceId, AclPermission permission) {
+ Criteria workspaceIdCriteria = where(fieldName(QApplication.application.workspaceId)).is(workspaceId);
Criteria idCriteria = getIdCriteria(id);
- return queryOne(List.of(idCriteria, orgIdCriteria), permission);
+ return queryOne(List.of(idCriteria, workspaceIdCriteria), permission);
}
@Override
@@ -63,15 +63,15 @@ public Mono<Application> findByName(String name, AclPermission permission) {
}
@Override
- public Flux<Application> findByOrganizationId(String orgId, AclPermission permission) {
- Criteria orgIdCriteria = where(fieldName(QApplication.application.organizationId)).is(orgId);
- return queryAll(List.of(orgIdCriteria), permission);
+ public Flux<Application> findByWorkspaceId(String workspaceId, AclPermission permission) {
+ Criteria workspaceIdCriteria = where(fieldName(QApplication.application.workspaceId)).is(workspaceId);
+ return queryAll(List.of(workspaceIdCriteria), permission);
}
@Override
- public Flux<Application> findByMultipleOrganizationIds(Set<String> orgIds, AclPermission permission) {
- Criteria orgIdsCriteria = where(fieldName(QApplication.application.organizationId)).in(orgIds);
- return queryAll(List.of(orgIdsCriteria), permission);
+ public Flux<Application> findByMultipleWorkspaceIds(Set<String> workspaceIds, AclPermission permission) {
+ Criteria workspaceIdCriteria = where(fieldName(QApplication.application.workspaceId)).in(workspaceIds);
+ return queryAll(List.of(workspaceIdCriteria), permission);
}
@Override
@@ -162,7 +162,7 @@ public Flux<Application> getApplicationByGitDefaultApplicationId(String defaultA
@Override
public Mono<List<String>> getAllApplicationId(String workspaceId) {
Query query = new Query();
- query.addCriteria(where(fieldName(QApplication.application.organizationId)).is(workspaceId));
+ query.addCriteria(where(fieldName(QApplication.application.workspaceId)).is(workspaceId));
query.fields().include(fieldName(QApplication.application.id));
return mongoOperations.find(query, Application.class)
.map(BaseDomain::getId)
@@ -170,30 +170,30 @@ public Mono<List<String>> getAllApplicationId(String workspaceId) {
}
@Override
- public Mono<Long> countByOrganizationId(String organizationId) {
- Criteria orgIdCriteria = where(fieldName(QApplication.application.organizationId)).is(organizationId);
- return this.count(List.of(orgIdCriteria));
+ public Mono<Long> countByWorkspaceId(String workspaceId) {
+ Criteria workspaceIdCriteria = where(fieldName(QApplication.application.workspaceId)).is(workspaceId);
+ return this.count(List.of(workspaceIdCriteria));
}
@Override
- public Mono<Long> getGitConnectedApplicationWithPrivateRepoCount(String organizationId) {
+ public Mono<Long> getGitConnectedApplicationWithPrivateRepoCount(String workspaceId) {
String gitApplicationMetadata = fieldName(QApplication.application.gitApplicationMetadata);
Query query = new Query();
- query.addCriteria(where(fieldName(QApplication.application.organizationId)).is(organizationId));
+ query.addCriteria(where(fieldName(QApplication.application.workspaceId)).is(workspaceId));
query.addCriteria(where(gitApplicationMetadata + "." + fieldName(QApplication.application.gitApplicationMetadata.isRepoPrivate)).is(Boolean.TRUE));
query.addCriteria(notDeleted());
return mongoOperations.count(query, Application.class);
}
@Override
- public Flux<Application> getGitConnectedApplicationByOrganizationId(String organizationId) {
+ public Flux<Application> getGitConnectedApplicationByWorkspaceId(String workspaceId) {
String gitApplicationMetadata = fieldName(QApplication.application.gitApplicationMetadata);
// isRepoPrivate and gitAuth will be stored only with default application which ensures we will have only single
// application per repo
Criteria repoCriteria = where(gitApplicationMetadata + "." + fieldName(QApplication.application.gitApplicationMetadata.isRepoPrivate)).exists(Boolean.TRUE);
Criteria gitAuthCriteria = where(gitApplicationMetadata + "." + fieldName(QApplication.application.gitApplicationMetadata.gitAuth)).exists(Boolean.TRUE);
- Criteria organizationIdCriteria = where(fieldName(QApplication.application.organizationId)).is(organizationId);
- return queryAll(List.of(organizationIdCriteria, repoCriteria, gitAuthCriteria), AclPermission.MANAGE_APPLICATIONS);
+ Criteria workspaceIdCriteria = where(fieldName(QApplication.application.workspaceId)).is(workspaceId);
+ return queryAll(List.of(workspaceIdCriteria, repoCriteria, gitAuthCriteria), AclPermission.MANAGE_APPLICATIONS);
}
@Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
index 004919cad6ac..414601700edb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
@@ -12,9 +12,9 @@
public interface CustomDatasourceRepositoryCE extends AppsmithRepository<Datasource> {
- Flux<Datasource> findAllByOrganizationId(String organizationId, AclPermission permission);
+ Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission permission);
- Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission aclPermission);
+ Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission aclPermission);
Mono<Datasource> findById(String id, AclPermission aclPermission);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
index d3a3efd62fbc..60cf73bae155 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
@@ -27,16 +27,16 @@ public CustomDatasourceRepositoryCEImpl(ReactiveMongoOperations mongoOperations,
}
@Override
- public Flux<Datasource> findAllByOrganizationId(String organizationId, AclPermission permission) {
- Criteria orgIdCriteria = where(fieldName(QDatasource.datasource.organizationId)).is(organizationId);
- return queryAll(List.of(orgIdCriteria), permission, Sort.by(fieldName(QDatasource.datasource.name)));
+ public Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission permission) {
+ Criteria workspaceIdCriteria = where(fieldName(QDatasource.datasource.workspaceId)).is(workspaceId);
+ return queryAll(List.of(workspaceIdCriteria), permission, Sort.by(fieldName(QDatasource.datasource.name)));
}
@Override
- public Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission aclPermission) {
+ public Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission aclPermission) {
Criteria nameCriteria = where(fieldName(QDatasource.datasource.name)).is(name);
- Criteria orgIdCriteria = where(fieldName(QDatasource.datasource.organizationId)).is(organizationId);
- return queryOne(List.of(nameCriteria, orgIdCriteria), aclPermission);
+ Criteria workspaceIdCriteria = where(fieldName(QDatasource.datasource.workspaceId)).is(workspaceId);
+ return queryOne(List.of(nameCriteria, workspaceIdCriteria), aclPermission);
}
@Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCE.java
index ac10cbddad9e..70b0f32ee9a3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCE.java
@@ -5,5 +5,5 @@
import reactor.core.publisher.Flux;
public interface CustomGroupRepositoryCE extends AppsmithRepository<Group> {
- Flux<Group> getAllByOrganizationId(String organizationId);
+ Flux<Group> getAllByWorkspaceId(String workspaceId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCEImpl.java
index dc4118bb1487..d30399d804c5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomGroupRepositoryCEImpl.java
@@ -22,9 +22,9 @@ public CustomGroupRepositoryCEImpl(ReactiveMongoOperations mongoOperations, Mong
}
@Override
- public Flux<Group> getAllByOrganizationId(String organizationId) {
- Criteria orgIdCriteria = where(fieldName(QGroup.group.organizationId)).is(organizationId);
+ public Flux<Group> getAllByWorkspaceId(String workspaceId) {
+ Criteria workspaceIdCriteria = where(fieldName(QGroup.group.workspaceId)).is(workspaceId);
- return queryAll(List.of(orgIdCriteria), null);
+ return queryAll(List.of(workspaceIdCriteria), null);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCE.java
index 68caa0365bba..6c722b3f391f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCE.java
@@ -11,5 +11,5 @@ public interface CustomUserDataRepositoryCE extends AppsmithRepository<UserData>
Mono<UpdateResult> saveReleaseNotesViewedVersion(String userId, String version);
- Mono<UpdateResult> removeIdFromRecentlyUsedList(String userId, String organizationId, List<String> applicationIds);
+ Mono<UpdateResult> removeIdFromRecentlyUsedList(String userId, String workspaceId, List<String> applicationIds);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCEImpl.java
index 9808cf3d92a7..f6598b2687d0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserDataRepositoryCEImpl.java
@@ -34,8 +34,8 @@ public Mono<UpdateResult> saveReleaseNotesViewedVersion(String userId, String ve
}
@Override
- public Mono<UpdateResult> removeIdFromRecentlyUsedList(String userId, String organizationId, List<String> applicationIds) {
- Update update = new Update().pull(fieldName(QUserData.userData.recentlyUsedOrgIds), organizationId);
+ public Mono<UpdateResult> removeIdFromRecentlyUsedList(String userId, String workspaceId, List<String> applicationIds) {
+ Update update = new Update().pull(fieldName(QUserData.userData.recentlyUsedWorkspaceIds), workspaceId);
if(!CollectionUtils.isEmpty(applicationIds)) {
update = update.pullAll(fieldName(QUserData.userData.recentlyUsedAppIds), applicationIds.toArray());
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCE.java
index a859399a0bc9..9173b31132e2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCE.java
@@ -13,7 +13,7 @@ public interface CustomWorkspaceRepositoryCE extends AppsmithRepository<Workspac
Mono<Workspace> findByName(String name, AclPermission aclPermission);
- Flux<Workspace> findByIdsIn(Set<String> orgIds, String tenantId, AclPermission aclPermission, Sort sort);
+ Flux<Workspace> findByIdsIn(Set<String> workspaceIds, String tenantId, AclPermission aclPermission, Sort sort);
Mono<Void> updateUserRoleNames(String userId, String userName);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCEImpl.java
index be10dab978de..112b39b5902b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomWorkspaceRepositoryCEImpl.java
@@ -35,11 +35,11 @@ public Mono<Workspace> findByName(String name, AclPermission aclPermission) {
}
@Override
- public Flux<Workspace> findByIdsIn(Set<String> orgIds, String tenantId, AclPermission aclPermission, Sort sort) {
- Criteria orgIdsCriteria = where(fieldName(QWorkspace.workspace.id)).in(orgIds);
+ public Flux<Workspace> findByIdsIn(Set<String> workspaceIds, String tenantId, AclPermission aclPermission, Sort sort) {
+ Criteria workspaceIdCriteria = where(fieldName(QWorkspace.workspace.id)).in(workspaceIds);
Criteria tenantIdCriteria = where(fieldName(QWorkspace.workspace.tenantId)).is(tenantId);
- return queryAll(List.of(orgIdsCriteria, tenantIdCriteria), aclPermission, sort);
+ return queryAll(List.of(workspaceIdCriteria, tenantIdCriteria), aclPermission, sort);
}
@Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
index 57ccb57ef38b..5a7b4a6ee15c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
@@ -12,7 +12,7 @@ public interface DatasourceRepositoryCE extends BaseRepository<Datasource, Strin
Flux<Datasource> findByIdIn(List<String> ids);
- Flux<Datasource> findAllByOrganizationId(String organizationId);
+ Flux<Datasource> findAllByWorkspaceId(String workspaceId);
Mono<Long> countByDeletedAtNull();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/WorkspaceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/WorkspaceRepositoryCE.java
index b68f0016959a..0fa558846603 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/WorkspaceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/WorkspaceRepositoryCE.java
@@ -9,7 +9,7 @@ public interface WorkspaceRepositoryCE extends BaseRepository<Workspace, String>
Mono<Workspace> findBySlug(String slug);
- Mono<Workspace> findByIdAndPluginsPluginId(String organizationId, String pluginId);
+ Mono<Workspace> findByIdAndPluginsPluginId(String workspaceId, String pluginId);
Mono<Workspace> findByName(String name);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index 795144f0c687..c6e19a13a041 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -16,7 +16,7 @@ public class ApplicationPageServiceImpl extends ApplicationPageServiceCEImpl imp
public ApplicationPageServiceImpl(ApplicationService applicationService,
SessionUserService sessionUserService,
- WorkspaceRepository organizationRepository,
+ WorkspaceRepository workspaceRepository,
LayoutActionService layoutActionService,
AnalyticsService analyticsService,
PolicyGenerator policyGenerator,
@@ -29,7 +29,7 @@ public ApplicationPageServiceImpl(ApplicationService applicationService,
ThemeService themeService,
ResponseUtils responseUtils) {
- super(applicationService, sessionUserService, organizationRepository, layoutActionService, analyticsService,
+ super(applicationService, sessionUserService, workspaceRepository, layoutActionService, analyticsService,
policyGenerator, applicationRepository, newPageService, newActionService, actionCollectionService,
gitFileUtils, commentThreadRepository, themeService, responseUtils);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index 6631f043ca9c..8f35a73c4259 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -38,8 +38,8 @@ public UserServiceImpl(Scheduler scheduler,
EmailSender emailSender,
ApplicationRepository applicationRepository,
PolicyUtils policyUtils,
- WorkspaceRepository organizationRepository,
- UserWorkspaceService userOrganizationService,
+ WorkspaceRepository workspaceRepository,
+ UserWorkspaceService userWorkspaceService,
RoleGraph roleGraph,
ConfigService configService,
CommonConfig commonConfig,
@@ -52,7 +52,7 @@ public UserServiceImpl(Scheduler scheduler,
super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, workspaceService,
analyticsService, sessionUserService, passwordResetTokenRepository, passwordEncoder, emailSender,
- applicationRepository, policyUtils, organizationRepository, userOrganizationService, roleGraph,
+ applicationRepository, policyUtils, workspaceRepository, userWorkspaceService, roleGraph,
configService, commonConfig, emailConfig, userChangedHandler, encryptionService, applicationPageService,
userDataService, tenantService);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
index f2d04a89f9b9..52c715a519ab 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
@@ -27,7 +27,7 @@ public WorkspaceServiceImpl(Scheduler scheduler,
AnalyticsService analyticsService,
PluginRepository pluginRepository,
SessionUserService sessionUserService,
- UserWorkspaceService userOrganizationService,
+ UserWorkspaceService userWorkspaceService,
UserRepository userRepository,
RoleGraph roleGraph,
AssetRepository assetRepository,
@@ -35,7 +35,7 @@ public WorkspaceServiceImpl(Scheduler scheduler,
ApplicationRepository applicationRepository) {
super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService,
- pluginRepository, sessionUserService, userOrganizationService, userRepository, roleGraph,
+ pluginRepository, sessionUserService, userWorkspaceService, userRepository, roleGraph,
assetRepository, assetService, applicationRepository);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiImporterCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiImporterCE.java
index ff4d8f78641e..6e9f8ea9d0e0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiImporterCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiImporterCE.java
@@ -5,6 +5,6 @@
public interface ApiImporterCE {
- Mono<ActionDTO> importAction(Object input, String pageId, String name, String orgId, String branchName);
+ Mono<ActionDTO> importAction(Object input, String pageId, String name, String workspaceId, String branchName);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
index 14aac589af21..dfedd06ed073 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
@@ -21,7 +21,7 @@ public interface ApplicationPageServiceCE {
Mono<Application> createApplication(Application application);
- Mono<Application> createApplication(Application application, String orgId);
+ Mono<Application> createApplication(Application application, String workspaceId);
Mono<PageDTO> getPageByName(String applicationName, String pageName, boolean viewMode);
@@ -31,7 +31,7 @@ public interface ApplicationPageServiceCE {
Mono<Application> makePageDefault(String defaultApplicationId, String defaultPageId, String branchName);
- Mono<Application> setApplicationPolicies(Mono<User> userMono, String orgId, Application application);
+ Mono<Application> setApplicationPolicies(Mono<User> userMono, String workspaceId, Application application);
Mono<Application> deleteApplication(String id);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
index b72a794fc97f..00a955ff5cc1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
@@ -67,7 +67,7 @@
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static org.apache.commons.lang.ObjectUtils.defaultIfNull;
@@ -294,17 +294,17 @@ public Mono<Application> makePageDefault(String defaultApplicationId, String def
@Override
public Mono<Application> createApplication(Application application) {
- return createApplication(application, application.getOrganizationId());
+ return createApplication(application, application.getWorkspaceId());
}
@Override
- public Mono<Application> createApplication(Application application, String orgId) {
+ public Mono<Application> createApplication(Application application, String workspaceId) {
if (application.getName() == null || application.getName().trim().isEmpty()) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
}
- if (orgId == null || orgId.isEmpty()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ if (workspaceId == null || workspaceId.isEmpty()) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
application.setPublishedPages(new ArrayList<>());
@@ -314,7 +314,7 @@ public Mono<Application> createApplication(Application application, String orgId
application.setApplicationVersion(ApplicationVersion.LATEST_VERSION);
Mono<User> userMono = sessionUserService.getCurrentUser().cache();
- Mono<Application> applicationWithPoliciesMono = setApplicationPolicies(userMono, orgId, application);
+ Mono<Application> applicationWithPoliciesMono = setApplicationPolicies(userMono, workspaceId, application);
return applicationWithPoliciesMono
.zipWith(userMono)
@@ -359,11 +359,11 @@ public Mono<Application> createApplication(Application application, String orgId
public Mono<Application> setApplicationPolicies(Mono<User> userMono, String workspaceId, Application application) {
return userMono
.flatMap(user -> {
- Mono<Workspace> workspaceMono = workspaceRepository.findById(workspaceId, ORGANIZATION_MANAGE_APPLICATIONS)
+ Mono<Workspace> workspaceMono = workspaceRepository.findById(workspaceId, WORKSPACE_MANAGE_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)));
return workspaceMono.map(org -> {
- application.setOrganizationId(org.getId());
+ application.setWorkspaceId(org.getId());
Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(org.getPolicies(), Workspace.class, Application.class);
application.setPolicies(documentPolicies);
return application;
@@ -701,7 +701,7 @@ public Mono<Application> cloneApplication(String applicationId, String branchNam
// Find the name for the cloned application which wouldn't lead to duplicate key exception
Mono<String> newAppNameMono = applicationMono
- .flatMap(application -> applicationService.findAllApplicationsByOrganizationId(application.getOrganizationId())
+ .flatMap(application -> applicationService.findAllApplicationsByWorkspaceId(application.getWorkspaceId())
.map(Application::getName)
.collect(Collectors.toSet())
.map(appNames -> {
@@ -738,7 +738,7 @@ public Mono<Application> cloneApplication(String applicationId, String branchNam
Mono<User> userMono = sessionUserService.getCurrentUser().cache();
// First set the correct policies for the new cloned application
- return setApplicationPolicies(userMono, sourceApplication.getOrganizationId(), newApplication)
+ return setApplicationPolicies(userMono, sourceApplication.getWorkspaceId(), newApplication)
// Create the cloned application with the new name and policies before proceeding further.
.zipWith(userMono)
.flatMap(applicationUserTuple2 -> {
@@ -1022,7 +1022,7 @@ private Mono<Application> sendApplicationPublishedEvent(Mono<List<NewPage>> publ
extraProperties.put("actionCollectionCount", objects.getT3().size());
extraProperties.put("appId", defaultIfNull(application.getId(), ""));
extraProperties.put("appName", defaultIfNull(application.getName(), ""));
- extraProperties.put("orgId", defaultIfNull(application.getOrganizationId(), ""));
+ extraProperties.put("orgId", defaultIfNull(application.getWorkspaceId(), ""));
extraProperties.put("publishedAt", defaultIfNull(application.getLastDeployedAt(), ""));
return analyticsService.sendObjectEvent(AnalyticsEvents.PUBLISH_APPLICATION, application, extraProperties);
@@ -1086,7 +1086,7 @@ public Mono<Application> createOrUpdateSuffixedApplication(Application applicati
application.setName(actualName);
Mono<User> userMono = sessionUserService.getCurrentUser().cache();
- Mono<Application> applicationWithPoliciesMono = this.setApplicationPolicies(userMono, application.getOrganizationId(), application);
+ Mono<Application> applicationWithPoliciesMono = this.setApplicationPolicies(userMono, application.getWorkspaceId(), application);
return applicationWithPoliciesMono
.zipWith(userMono)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCE.java
index f6159ced677c..ce3384a426e0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCE.java
@@ -16,9 +16,9 @@ public interface ApplicationServiceCE extends CrudService<Application, String> {
Mono<Application> findById(String id, AclPermission aclPermission);
- Mono<Application> findByIdAndOrganizationId(String id, String organizationId, AclPermission permission);
+ Mono<Application> findByIdAndWorkspaceId(String id, String workspaceId, AclPermission permission);
- Flux<Application> findByOrganizationId(String organizationId, AclPermission permission);
+ Flux<Application> findByWorkspaceId(String workspaceId, AclPermission permission);
Flux<Application> findByClonedFromApplicationId(String applicationId, AclPermission permission);
@@ -36,7 +36,7 @@ public interface ApplicationServiceCE extends CrudService<Application, String> {
Mono<Application> changeViewAccess(String defaultApplicationId, String branchName, ApplicationAccessDTO applicationAccessDTO);
- Flux<Application> findAllApplicationsByOrganizationId(String organizationId);
+ Flux<Application> findAllApplicationsByWorkspaceId(String workspaceId);
Mono<Application> getApplicationInViewMode(String applicationId);
@@ -58,9 +58,9 @@ Mono<Application> findByBranchNameAndDefaultApplicationId(String branchName,
Flux<Application> findAllApplicationsByDefaultApplicationId(String defaultApplicationId, AclPermission permission);
- Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByOrgId(String organizationId);
+ Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(String workspaceId);
- Flux<Application> getGitConnectedApplicationsByOrganizationId(String organizationId);
+ Flux<Application> getGitConnectedApplicationsByWorkspaceId(String workspaceId);
String getRandomAppCardColor();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
index a8776f08dd26..0acea9227429 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
@@ -146,14 +146,14 @@ public Mono<Application> findById(String id, AclPermission aclPermission) {
}
@Override
- public Mono<Application> findByIdAndOrganizationId(String id, String organizationId, AclPermission permission) {
- return repository.findByIdAndOrganizationId(id, organizationId, permission)
+ public Mono<Application> findByIdAndWorkspaceId(String id, String workspaceId, AclPermission permission) {
+ return repository.findByIdAndWorkspaceId(id, workspaceId, permission)
.flatMap(this::setTransientFields);
}
@Override
- public Flux<Application> findByOrganizationId(String organizationId, AclPermission permission) {
- return setTransientFields(repository.findByOrganizationId(organizationId, permission));
+ public Flux<Application> findByWorkspaceId(String workspaceId, AclPermission permission) {
+ return setTransientFields(repository.findByWorkspaceId(workspaceId, permission));
}
@Override
@@ -232,9 +232,9 @@ public Mono<Application> update(String id, Application application) {
.onErrorResume(error -> {
if (error instanceof DuplicateKeyException) {
// Error message : E11000 duplicate key error collection: appsmith.application index:
- // organization_application_deleted_gitApplicationMetadata_compound_index dup key:
+ // workspace_application_deleted_gitApplicationMetadata_compound_index dup key:
// { organizationId: "******", name: "AppName", deletedAt: null }
- if (error.getCause().getMessage().contains("organization_application_deleted_gitApplicationMetadata_compound_index")) {
+ if (error.getCause().getMessage().contains("workspace_application_deleted_gitApplicationMetadata_compound_index")) {
return Mono.error(
new AppsmithException(AppsmithError.DUPLICATE_KEY_USER_ERROR, FieldName.APPLICATION, FieldName.NAME)
);
@@ -301,8 +301,8 @@ public Mono<Application> changeViewAccess(String defaultApplicationId,
}
@Override
- public Flux<Application> findAllApplicationsByOrganizationId(String organizationId) {
- return repository.findByOrganizationId(organizationId);
+ public Flux<Application> findAllApplicationsByWorkspaceId(String workspaceId) {
+ return repository.findByWorkspaceId(workspaceId);
}
@Override
@@ -472,7 +472,7 @@ public Mono<GitAuth> createOrUpdateSshKeyPair(String applicationId, String keyTy
assert application.getId() != null;
final Map<String, Object> data = Map.of(
"applicationId", application.getId(),
- "organizationId", application.getOrganizationId(),
+ "organizationId", application.getWorkspaceId(),
"isRegeneratedKey", gitAuth.isRegeneratedKey()
);
@@ -600,13 +600,13 @@ public Flux<Application> findAllApplicationsByDefaultApplicationId(String defaul
}
@Override
- public Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByOrgId(String organizationId) {
- return repository.getGitConnectedApplicationWithPrivateRepoCount(organizationId);
+ public Mono<Long> getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(String workspaceId) {
+ return repository.getGitConnectedApplicationWithPrivateRepoCount(workspaceId);
}
@Override
- public Flux<Application> getGitConnectedApplicationsByOrganizationId(String organizationId) {
- return repository.getGitConnectedApplicationByOrganizationId(organizationId);
+ public Flux<Application> getGitConnectedApplicationsByWorkspaceId(String workspaceId) {
+ return repository.getGitConnectedApplicationByWorkspaceId(workspaceId);
}
public String getRandomAppCardColor() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCE.java
index 91581bd5b757..ffacdc6f3f22 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCE.java
@@ -12,7 +12,7 @@ public interface ApplicationTemplateServiceCE {
Flux<ApplicationTemplate> getSimilarTemplates(String templateId);
Mono<List<ApplicationTemplate>> getRecentlyUsedTemplates();
Mono<ApplicationTemplate> getTemplateDetails(String templateId);
- Mono<Application> importApplicationFromTemplate(String templateId, String organizationId);
- Mono<Application> mergeTemplateWithApplication(String templateId, String applicationId, String organizationId, String branchName, List<String> pagesToImport);
+ Mono<Application> importApplicationFromTemplate(String templateId, String workspaceId);
+ Mono<Application> mergeTemplateWithApplication(String templateId, String applicationId, String workspaceId, String branchName, List<String> pagesToImport);
Mono<ApplicationTemplate> getFilters();
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/BaseApiImporterCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/BaseApiImporterCE.java
index 0243fa026a54..4bb5b848a4b2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/BaseApiImporterCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/BaseApiImporterCE.java
@@ -5,6 +5,6 @@
public abstract class BaseApiImporterCE implements ApiImporterCE {
- public abstract Mono<ActionDTO> importAction(Object input, String pageId, String name, String orgId, String branchName);
+ public abstract Mono<ActionDTO> importAction(Object input, String pageId, String name, String workspaceId, String branchName);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommentServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommentServiceCEImpl.java
index d290541af8d4..2b004a5fd299 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommentServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommentServiceCEImpl.java
@@ -253,7 +253,7 @@ private Mono<Comment> create(CommentThread commentThread, User user, Comment com
comment.setApplicationId(commentThread.getApplicationId());
comment.setPageId(commentThread.getPageId());
}
- comment.setOrgId(commentThread.getOrgId());
+ comment.setWorkspaceId(commentThread.getWorkspaceId());
comment.setApplicationName(commentThread.getApplicationName());
comment.setAuthorUsername(user.getUsername());
String authorName = user.getName() != null ? user.getName() : user.getUsername();
@@ -688,7 +688,7 @@ private Mono<CommentThread> saveCommentThread(CommentThread commentThread, Appli
initState.setAuthorName("");
initState.setAuthorUsername("");
- commentThread.setOrgId(application.getOrganizationId());
+ commentThread.setWorkspaceId(application.getWorkspaceId());
commentThread.setPinnedState(initState);
commentThread.setResolvedState(initState);
commentThread.setApplicationId(application.getId());
@@ -732,7 +732,7 @@ private Mono<Comment> createBotComment(CommentThread commentThread, User user, C
comment.setAuthorName(APPSMITH_BOT_NAME);
comment.setAuthorUsername(APPSMITH_BOT_USERNAME);
comment.setApplicationId(commentThread.getApplicationId());
- comment.setOrgId(commentThread.getOrgId());
+ comment.setWorkspaceId(commentThread.getWorkspaceId());
final Set<Policy> policies = policyGenerator.getAllChildPolicies(
commentThread.getPolicies(),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
index 74cfff3602a5..a327061b3c01 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java
@@ -23,7 +23,7 @@
@Slf4j
public class ConfigServiceCEImpl implements ConfigServiceCE {
- private static final String TEMPLATE_ORGANIZATION_CONFIG_NAME = "template-organization";
+ private static final String TEMPLATE_WORKSPACE_CONFIG_NAME = "template-workspace";
private final ApplicationRepository applicationRepository;
private final DatasourceRepository datasourceRepository;
@@ -88,15 +88,15 @@ public Mono<String> getInstanceId() {
@Override
public Mono<String> getTemplateWorkspaceId() {
- return repository.findByName(TEMPLATE_ORGANIZATION_CONFIG_NAME)
+ return repository.findByName(TEMPLATE_WORKSPACE_CONFIG_NAME)
.filter(config -> config.getConfig() != null)
- .flatMap(config -> Mono.justOrEmpty(config.getConfig().getAsString(FieldName.ORGANIZATION_ID)))
+ .flatMap(config -> Mono.justOrEmpty(config.getConfig().getAsString(FieldName.WORKSPACE_ID)))
.doOnError(error -> log.warn("Error getting template workspace ID", error));
}
@Override
public Flux<Application> getTemplateApplications() {
- return repository.findByName(TEMPLATE_ORGANIZATION_CONFIG_NAME)
+ return repository.findByName(TEMPLATE_WORKSPACE_CONFIG_NAME)
.filter(config -> config.getConfig() != null)
.map(config -> defaultIfNull(
config.getConfig().getOrDefault("applicationIds", null),
@@ -109,7 +109,7 @@ public Flux<Application> getTemplateApplications() {
@Override
public Flux<Datasource> getTemplateDatasources() {
- return repository.findByName(TEMPLATE_ORGANIZATION_CONFIG_NAME)
+ return repository.findByName(TEMPLATE_WORKSPACE_CONFIG_NAME)
.filter(config -> config.getConfig() != null)
.map(config -> defaultIfNull(
config.getConfig().getOrDefault("datasourceIds", null),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
index 8f44f3aa9840..4d38e94f29f9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
@@ -72,7 +72,7 @@ public CurlImporterServiceCEImpl(
}
@Override
- public Mono<ActionDTO> importAction(Object input, String pageId, String name, String orgId, String branchName) {
+ public Mono<ActionDTO> importAction(Object input, String pageId, String name, String workspaceId, String branchName) {
ActionDTO action;
try {
@@ -102,7 +102,7 @@ public Mono<ActionDTO> importAction(Object input, String pageId, String name, St
final DatasourceConfiguration datasourceConfiguration = datasource.getDatasourceConfiguration();
datasource.setName(datasourceConfiguration.getUrl());
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
// Set git related resource IDs
action1.setDefaultResources(newPage.getDefaultResources());
action1.setPageId(newPage.getId());
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCE.java
index 947aac05336c..7f1529564edd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCE.java
@@ -14,7 +14,7 @@ public interface DatasourceServiceCE extends CrudService<Datasource, String> {
Mono<DatasourceTestResult> testDatasource(Datasource datasource);
- Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission permission);
+ Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission permission);
Mono<Datasource> findById(String id, AclPermission aclPermission);
@@ -26,7 +26,7 @@ public interface DatasourceServiceCE extends CrudService<Datasource, String> {
Mono<Datasource> save(Datasource datasource);
- Flux<Datasource> findAllByOrganizationId(String organizationId, AclPermission readDatasources);
+ Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission readDatasources);
Flux<Datasource> saveAll(List<Datasource> datasourceList);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
index 063bc07d200a..f6e0556bcaa9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
@@ -7,6 +7,7 @@
import com.appsmith.external.models.DatasourceTestResult;
import com.appsmith.external.models.Endpoint;
import com.appsmith.external.models.Policy;
+import com.appsmith.external.models.QDatasource;
import com.appsmith.external.plugins.PluginExecutor;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.acl.PolicyGenerator;
@@ -53,8 +54,9 @@
import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
+import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
@Slf4j
public class DatasourceServiceCEImpl extends BaseService<DatasourceRepository, Datasource, String> implements DatasourceServiceCE {
@@ -95,15 +97,15 @@ public DatasourceServiceCEImpl(Scheduler scheduler,
@Override
public Mono<Datasource> create(@NotNull Datasource datasource) {
- String workspaceId = datasource.getOrganizationId();
+ String workspaceId = datasource.getWorkspaceId();
if (workspaceId == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
if (datasource.getId() != null) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
}
if (!StringUtils.hasLength(datasource.getGitSyncId())) {
- datasource.setGitSyncId(datasource.getOrganizationId() + "_" + new ObjectId());
+ datasource.setGitSyncId(datasource.getWorkspaceId() + "_" + new ObjectId());
}
Mono<Datasource> datasourceMono = Mono.just(datasource);
@@ -133,14 +135,14 @@ public Mono<Datasource> create(@NotNull Datasource datasource) {
private Mono<Datasource> generateAndSetDatasourcePolicies(Mono<User> userMono, Datasource datasource) {
return userMono
.flatMap(user -> {
- Mono<Workspace> orgMono = workspaceService.findById(datasource.getOrganizationId(), ORGANIZATION_MANAGE_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, datasource.getOrganizationId())));
+ Mono<Workspace> orgMono = workspaceService.findById(datasource.getWorkspaceId(), WORKSPACE_MANAGE_APPLICATIONS)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, datasource.getWorkspaceId())));
return orgMono.map(org -> {
Set<Policy> policySet = org.getPolicies().stream()
.filter(policy ->
- policy.getPermission().equals(ORGANIZATION_MANAGE_APPLICATIONS.getValue()) ||
- policy.getPermission().equals(ORGANIZATION_READ_APPLICATIONS.getValue())
+ policy.getPermission().equals(WORKSPACE_MANAGE_APPLICATIONS.getValue()) ||
+ policy.getPermission().equals(WORKSPACE_READ_APPLICATIONS.getValue())
).collect(Collectors.toSet());
Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(policySet, Workspace.class, Datasource.class);
@@ -229,13 +231,13 @@ public Mono<Datasource> validateDatasource(Datasource datasource) {
return Mono.just(datasource);
}
- if (datasource.getOrganizationId() == null) {
+ if (datasource.getWorkspaceId() == null) {
invalids.add(AppsmithError.WORKSPACE_ID_NOT_GIVEN.getMessage());
return Mono.just(datasource);
}
Mono<Workspace> checkPluginInstallationAndThenReturnWorkspaceMono = workspaceService
- .findByIdAndPluginsPluginId(datasource.getOrganizationId(), datasource.getPluginId())
+ .findByIdAndPluginsPluginId(datasource.getWorkspaceId(), datasource.getPluginId())
.switchIfEmpty(Mono.defer(() -> {
invalids.add(AppsmithError.PLUGIN_NOT_INSTALLED.getMessage(datasource.getPluginId()));
return Mono.just(new Workspace());
@@ -269,7 +271,7 @@ public Mono<Datasource> validateDatasource(Datasource datasource) {
@Override
public Mono<Datasource> save(Datasource datasource) {
if (datasource.getGitSyncId() == null) {
- datasource.setGitSyncId(datasource.getOrganizationId() + "_" + Instant.now().toString());
+ datasource.setGitSyncId(datasource.getWorkspaceId() + "_" + Instant.now().toString());
}
return repository.save(datasource);
}
@@ -356,8 +358,8 @@ private Mono<DatasourceTestResult> testDatasourceViaPlugin(Datasource datasource
}
@Override
- public Mono<Datasource> findByNameAndOrganizationId(String name, String organizationId, AclPermission permission) {
- return repository.findByNameAndOrganizationId(name, organizationId, permission);
+ public Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission permission) {
+ return repository.findByNameAndWorkspaceId(name, workspaceId, permission);
}
@Override
@@ -386,8 +388,8 @@ public Flux<Datasource> get(MultiValueMap<String, String> params) {
*/
// Remove branch name as datasources are not shared across branches
params.remove(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME);
- if (params.getFirst(FieldName.ORGANIZATION_ID) != null) {
- return findAllByOrganizationId(params.getFirst(FieldName.ORGANIZATION_ID), AclPermission.READ_DATASOURCES)
+ if (params.getFirst(fieldName(QDatasource.datasource.workspaceId)) != null) {
+ return findAllByWorkspaceId(params.getFirst(fieldName(QDatasource.datasource.workspaceId)), AclPermission.READ_DATASOURCES)
.collectList()
.map(datasourceList -> {
markRecentlyUsed(datasourceList, 3);
@@ -396,12 +398,12 @@ public Flux<Datasource> get(MultiValueMap<String, String> params) {
.flatMapMany(Flux::fromIterable);
}
- return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
@Override
- public Flux<Datasource> findAllByOrganizationId(String organizationId, AclPermission permission) {
- return repository.findAllByOrganizationId(organizationId, permission)
+ public Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission permission) {
+ return repository.findAllByWorkspaceId(workspaceId, permission)
.flatMap(this::populateHintMessages);
}
@@ -410,7 +412,7 @@ public Flux<Datasource> saveAll(List<Datasource> datasourceList) {
datasourceList
.stream()
.filter(datasource -> datasource.getGitSyncId() == null)
- .forEach(datasource -> datasource.setGitSyncId(datasource.getOrganizationId() + "_" + Instant.now().toString()));
+ .forEach(datasource -> datasource.setGitSyncId(datasource.getWorkspaceId() + "_" + Instant.now().toString()));
return repository.saveAll(datasourceList);
}
@@ -439,7 +441,7 @@ public Mono<Datasource> archiveByIdAndBranchName(String id, String branchName) {
private Map<String, Object> getAnalyticsProperties(Datasource datasource) {
Map<String, Object> analyticsProperties = new HashMap<>();
- analyticsProperties.put("orgId", datasource.getOrganizationId());
+ analyticsProperties.put("orgId", datasource.getWorkspaceId());
analyticsProperties.put("pluginName", datasource.getPluginName());
analyticsProperties.put("dsName", datasource.getName());
return analyticsProperties;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
index ee737e296506..81fb0c48aeb0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
@@ -418,14 +418,14 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
}
// Check if the private repo count is less than the allowed repo count
- final String orgId = defaultApplication.getOrganizationId();
+ final String workspaceId = defaultApplication.getWorkspaceId();
return applicationMono
- .then(gitCloudServicesUtils.getPrivateRepoLimitForOrg(orgId, false))
+ .then(gitCloudServicesUtils.getPrivateRepoLimitForOrg(workspaceId, false))
.flatMap(limit -> {
if (limit == -1) {
return Mono.just(defaultApplication);
}
- return this.getApplicationCountWithPrivateRepo(orgId)
+ return this.getApplicationCountWithPrivateRepo(workspaceId)
.map(privateRepoCount -> {
if (limit >= privateRepoCount) {
return defaultApplication;
@@ -464,7 +464,7 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
Application childApplication = tuple.getT2();
GitApplicationMetadata gitData = childApplication.getGitApplicationMetadata();
Path baseRepoSuffix =
- Paths.get(childApplication.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Paths.get(childApplication.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
Mono<Path> repoPathMono;
try {
@@ -605,7 +605,7 @@ public Mono<List<GitLogDTO>> getCommitHistory(String defaultApplicationId, Strin
GIT_CONFIG_ERROR
));
}
- Path baseRepoSuffix = Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Path baseRepoSuffix = Paths.get(application.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
// Checkout to branch
return Mono.zip(
gitExecutor.checkoutToBranch(baseRepoSuffix, gitData.getBranchName())
@@ -672,14 +672,14 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
return Mono.just(application);
}
//Check the limit for number of private repo
- return gitCloudServicesUtils.getPrivateRepoLimitForOrg(application.getOrganizationId(), true)
+ return gitCloudServicesUtils.getPrivateRepoLimitForOrg(application.getWorkspaceId(), true)
.flatMap(limitCount -> {
// CS will respond with count -1 for unlimited git repos
if (limitCount == -1) {
return Mono.just(application);
}
// get git connected apps count from db
- return this.getApplicationCountWithPrivateRepo(application.getOrganizationId())
+ return this.getApplicationCountWithPrivateRepo(application.getWorkspaceId())
.flatMap(count -> {
if (limitCount <= count) {
return addAnalyticsForGitOperation(
@@ -701,7 +701,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
} else {
String repoName = GitUtils.getRepoName(gitConnectDTO.getRemoteUrl());
- Path repoSuffix = Paths.get(application.getOrganizationId(), defaultApplicationId, repoName);
+ Path repoSuffix = Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName);
Mono<String> defaultBranchMono = gitExecutor.cloneApplication(
repoSuffix,
gitConnectDTO.getRemoteUrl(),
@@ -750,7 +750,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
String repoName = tuple.getT3();
Path repoPath = tuple.getT4();
final String applicationId = application.getId();
- final String orgId = application.getOrganizationId();
+ final String workspaceId = application.getWorkspaceId();
try {
return fileUtils.checkIfDirectoryIsEmpty(repoPath).zipWith(isPrivateRepoMono)
.flatMap(objects -> {
@@ -781,7 +781,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setGitApplicationMetadata(gitApplicationMetadata);
return importExportApplicationService
- .importApplicationInWorkspace(orgId, applicationJson, applicationId, defaultBranch);
+ .importApplicationInWorkspace(workspaceId, applicationJson, applicationId, defaultBranch);
});
}
})
@@ -814,7 +814,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
try {
return Mono.zip(
fileUtils.initializeReadme(
- Paths.get(application.getOrganizationId(), defaultApplicationId, repoName, "README.md"),
+ Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName, "README.md"),
originHeader + viewModeUrl,
originHeader + editModeUrl
).onErrorMap(throwable -> {
@@ -930,7 +930,7 @@ private Mono<String> pushApplication(String applicationId, boolean doPublish) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
}
Path baseRepoSuffix =
- Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Paths.get(application.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
GitAuth gitAuth = gitData.getGitAuth();
return gitExecutor.checkoutToBranch(baseRepoSuffix, application.getGitApplicationMetadata().getBranchName())
@@ -1014,7 +1014,7 @@ public Mono<Application> detachRemote(String defaultApplicationId) {
//Remove the git contents from file system
GitApplicationMetadata gitApplicationMetadata = defaultApplication.getGitApplicationMetadata();
String repoName = gitApplicationMetadata.getRepoName();
- Path repoSuffix = Paths.get(defaultApplication.getOrganizationId(), gitApplicationMetadata.getDefaultApplicationId(), repoName);
+ Path repoSuffix = Paths.get(defaultApplication.getWorkspaceId(), gitApplicationMetadata.getDefaultApplicationId(), repoName);
String defaultApplicationBranchName = gitApplicationMetadata.getBranchName();
String remoteUrl = gitApplicationMetadata.getRemoteUrl();
String privateKey = gitApplicationMetadata.getGitAuth().getPrivateKey();
@@ -1143,7 +1143,7 @@ public Mono<Application> createBranch(String defaultApplicationId, GitBranchDTO
"Unable to find the parent branch. Please create a branch from other available branches"
));
}
- Path repoSuffix = Paths.get(srcApplication.getOrganizationId(), srcBranchGitData.getDefaultApplicationId(), srcBranchGitData.getRepoName());
+ Path repoSuffix = Paths.get(srcApplication.getWorkspaceId(), srcBranchGitData.getDefaultApplicationId(), srcBranchGitData.getRepoName());
// Create a new branch from the parent checked out branch
return gitExecutor.checkoutToBranch(repoSuffix, srcBranch)
.onErrorResume(error -> Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout", "Unable to find " + srcBranch)))
@@ -1185,7 +1185,7 @@ public Mono<Application> createBranch(String defaultApplicationId, GitBranchDTO
.flatMap(tuple -> {
Application savedApplication = tuple.getT1();
return importExportApplicationService.importApplicationInWorkspace(
- savedApplication.getOrganizationId(),
+ savedApplication.getWorkspaceId(),
tuple.getT2(),
savedApplication.getId(),
branchDTO.getBranchName()
@@ -1259,7 +1259,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
.flatMap(application -> {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
String repoName = gitApplicationMetadata.getRepoName();
- Path repoPath = Paths.get(application.getOrganizationId(), defaultApplicationId, repoName);
+ Path repoPath = Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName);
return gitExecutor.fetchRemote(repoPath, gitApplicationMetadata.getGitAuth().getPublicKey(), gitApplicationMetadata.getGitAuth().getPrivateKey(), false)
.flatMap(fetchStatus -> gitExecutor.checkoutRemoteBranch(repoPath, branchName).zipWith(Mono.just(application))
@@ -1288,7 +1288,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
return applicationService.save(srcApplication)
.flatMap(application1 ->
- fileUtils.reconstructApplicationJsonFromGitRepo(srcApplication.getOrganizationId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
+ fileUtils.reconstructApplicationJsonFromGitRepo(srcApplication.getWorkspaceId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
.zipWith(Mono.just(application1))
)
// We need to handle the case specifically for default branch of Appsmith
@@ -1298,7 +1298,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
// So we just rehydrate from the file system to the existing resource on the db
.onErrorResume(throwable -> {
if (throwable instanceof DuplicateKeyException) {
- return fileUtils.reconstructApplicationJsonFromGitRepo(srcApplication.getOrganizationId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
+ return fileUtils.reconstructApplicationJsonFromGitRepo(srcApplication.getWorkspaceId(), defaultApplicationId, srcApplication.getGitApplicationMetadata().getRepoName(), branchName)
.zipWith(Mono.just(tuple.getT2()));
}
log.error(" Git checkout remote branch failed {}", throwable.getMessage());
@@ -1310,7 +1310,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
ApplicationJson applicationJson = tuple.getT1();
Application application = tuple.getT2();
return importExportApplicationService
- .importApplicationInWorkspace(application.getOrganizationId(), applicationJson, application.getId(), branchName)
+ .importApplicationInWorkspace(application.getWorkspaceId(), applicationJson, application.getId(), branchName)
.flatMap(application1 -> addAnalyticsForGitOperation(
AnalyticsEvents.GIT_CHECKOUT_REMOTE_BRANCH.getEventName(),
application1,
@@ -1388,7 +1388,7 @@ public Mono<List<GitBranchDTO>> listBranchForApplication(String defaultApplicati
if (gitApplicationMetadata == null || gitApplicationMetadata.getDefaultApplicationId() == null) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
}
- Path repoPath = Paths.get(application.getOrganizationId(),
+ Path repoPath = Paths.get(application.getWorkspaceId(),
gitApplicationMetadata.getDefaultApplicationId(),
gitApplicationMetadata.getRepoName());
@@ -1523,7 +1523,7 @@ public Mono<GitStatusDTO> getStatus(String defaultApplicationId, String branchNa
GitApplicationMetadata gitData = application.getGitApplicationMetadata();
gitData.setGitAuth(defaultApplicationMetadata.getGitAuth());
Path repoSuffix =
- Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Paths.get(application.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
try {
return Mono.zip(
@@ -1581,7 +1581,7 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
if (isInvalidDefaultApplicationGitMetadata(defaultApplication.getGitApplicationMetadata())) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
}
- Path repoSuffix = Paths.get(defaultApplication.getOrganizationId(),
+ Path repoSuffix = Paths.get(defaultApplication.getWorkspaceId(),
gitApplicationMetadata.getDefaultApplicationId(),
gitApplicationMetadata.getRepoName());
@@ -1647,7 +1647,7 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
//3. rehydrate from file system to db
Mono<ApplicationJson> applicationJson = fileUtils.reconstructApplicationJsonFromGitRepo(
- defaultApplication.getOrganizationId(),
+ defaultApplication.getWorkspaceId(),
defaultApplication.getGitApplicationMetadata().getDefaultApplicationId(),
defaultApplication.getGitApplicationMetadata().getRepoName(),
destinationBranch);
@@ -1667,7 +1667,7 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
//4. Get the latest application mono with all the changes
return importExportApplicationService
- .importApplicationInWorkspace(destApplication.getOrganizationId(), applicationJson, destApplication.getId(), destinationBranch.replaceFirst("origin/", ""))
+ .importApplicationInWorkspace(destApplication.getWorkspaceId(), applicationJson, destApplication.getId(), destinationBranch.replaceFirst("origin/", ""))
.flatMap(application1 -> {
GitCommitDTO commitDTO = new GitCommitDTO();
commitDTO.setDoPush(true);
@@ -1714,7 +1714,7 @@ public Mono<MergeStatusDTO> isBranchMergeable(String defaultApplicationId, GitMe
if (isInvalidDefaultApplicationGitMetadata(application.getGitApplicationMetadata())) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
}
- Path repoSuffix = Paths.get(application.getOrganizationId(),
+ Path repoSuffix = Paths.get(application.getWorkspaceId(),
gitApplicationMetadata.getDefaultApplicationId(),
gitApplicationMetadata.getRepoName());
@@ -1788,7 +1788,7 @@ public Mono<String> createConflictedBranch(String defaultApplicationId, String b
GitApplicationMetadata gitData = application.getGitApplicationMetadata();
gitData.setGitAuth(defaultApplicationMetadata.getGitAuth());
Path repoSuffix =
- Paths.get(application.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Paths.get(application.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
try {
return Mono.zip(
@@ -1845,7 +1845,7 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
// Check if the repo is public
Application newApplication = new Application();
newApplication.setName(repoName);
- newApplication.setOrganizationId(workspaceId);
+ newApplication.setWorkspaceId(workspaceId);
newApplication.setGitApplicationMetadata(new GitApplicationMetadata());
GitAuth gitAuth = tuple.getT1();
boolean isRepoPrivate = tuple.getT2();
@@ -1879,7 +1879,7 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
.flatMap(tuple -> {
GitAuth gitAuth = tuple.getT1();
Application application = tuple.getT2();
- Path repoSuffix = Paths.get(application.getOrganizationId(), application.getId(), repoName);
+ Path repoSuffix = Paths.get(application.getWorkspaceId(), application.getId(), repoName);
Mono<Map<String, GitProfile>> profileMono = updateOrCreateGitProfileForCurrentUser(gitConnectDTO.getGitProfile(), application.getId());
Mono<String> defaultBranchMono = gitExecutor.cloneApplication(
@@ -1936,13 +1936,13 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
String defaultBranch = gitApplicationMetadata.getDefaultBranchName();
- Mono<List<Datasource>> datasourceMono = datasourceService.findAllByOrganizationId(workspaceId, MANAGE_DATASOURCES).collectList();
+ Mono<List<Datasource>> datasourceMono = datasourceService.findAllByWorkspaceId(workspaceId, MANAGE_DATASOURCES).collectList();
Mono<List<Plugin>> pluginMono = pluginService.getDefaultPlugins().collectList();
Mono<ApplicationJson> applicationJsonMono = fileUtils
.reconstructApplicationJsonFromGitRepo(workspaceId, application.getId(), gitApplicationMetadata.getRepoName(), defaultBranch)
.onErrorResume(error -> {
log.error("Error while constructing application from git repo", error);
- return deleteApplicationCreatedFromGitImport(application.getId(), application.getOrganizationId(), gitApplicationMetadata.getRepoName())
+ return deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
.flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, error.getMessage())));
});
@@ -1954,13 +1954,13 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
if(Optional.ofNullable(applicationJson.getExportedApplication()).isEmpty()
|| applicationJson.getPageList().isEmpty()) {
- return deleteApplicationCreatedFromGitImport(application.getId(), application.getOrganizationId(), gitApplicationMetadata.getRepoName())
+ return deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
.then(Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "import", "Cannot import app from an empty repo")));
}
// If there is an existing datasource with the same name but a different type from that in the repo, the import api should fail
if(checkIsDatasourceNameConflict(datasourceList, applicationJson.getDatasourceList(), pluginList)) {
- return deleteApplicationCreatedFromGitImport(application.getId(), application.getOrganizationId(), gitApplicationMetadata.getRepoName())
+ return deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
.then(Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED,
"import",
"Datasource already exists with the same name"))
@@ -1971,13 +1971,13 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
return importExportApplicationService
.importApplicationInWorkspace(workspaceId, applicationJson, application.getId(), defaultBranch)
.onErrorResume(throwable ->
- deleteApplicationCreatedFromGitImport(application.getId(), application.getOrganizationId(), gitApplicationMetadata.getRepoName())
+ deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
.flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, throwable.getMessage())))
);
});
})
// Add un-configured datasource to the list to response
- .flatMap(application -> importExportApplicationService.findDatasourceByApplicationId(application.getId(), application.getOrganizationId())
+ .flatMap(application -> importExportApplicationService.findDatasourceByApplicationId(application.getId(), application.getWorkspaceId())
.map(datasources -> {
ApplicationImportDTO applicationImportDTO = new ApplicationImportDTO();
applicationImportDTO.setApplication(application);
@@ -2080,7 +2080,7 @@ public Mono<Application> deleteBranch(String defaultApplicationId, String branch
Mono<Application> deleteBranchMono = getApplicationById(defaultApplicationId)
.flatMap(application -> {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
- Path repoPath = Paths.get(application.getOrganizationId(), defaultApplicationId, gitApplicationMetadata.getRepoName());
+ Path repoPath = Paths.get(application.getWorkspaceId(), defaultApplicationId, gitApplicationMetadata.getRepoName());
if(branchName.equals(gitApplicationMetadata.getDefaultBranchName())) {
return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "delete branch", " Cannot delete default branch"));
}
@@ -2149,17 +2149,17 @@ public Mono<Application> discardChanges(String defaultApplicationId, String bran
if (gitData == null || StringUtils.isEmptyOrNull(gitData.getDefaultApplicationId())) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
}
- Path repoSuffix = Paths.get(branchedApplication.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Path repoSuffix = Paths.get(branchedApplication.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
return gitExecutor.checkoutToBranch(repoSuffix, branchName)
.then(fileUtils.reconstructApplicationJsonFromGitRepo(
- branchedApplication.getOrganizationId(),
+ branchedApplication.getWorkspaceId(),
branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
branchedApplication.getGitApplicationMetadata().getRepoName(),
branchName)
)
.flatMap(applicationJson ->
importExportApplicationService
- .importApplicationInWorkspace(branchedApplication.getOrganizationId(), applicationJson, branchedApplication.getId(), branchName)
+ .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
);
})
.flatMap(application -> this.addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCARD_CHANGES.getEventName(), application, null))
@@ -2171,8 +2171,8 @@ public Mono<Application> discardChanges(String defaultApplicationId, String bran
);
}
- private Mono<Application> deleteApplicationCreatedFromGitImport(String applicationId, String organizationId, String repoName) {
- Path repoSuffix = Paths.get(organizationId, applicationId, repoName);
+ private Mono<Application> deleteApplicationCreatedFromGitImport(String applicationId, String workspaceId, String repoName) {
+ Path repoSuffix = Paths.get(workspaceId, applicationId, repoName);
return fileUtils.deleteLocalRepo(repoSuffix)
.then(applicationPageService.deleteApplication(applicationId));
}
@@ -2258,7 +2258,7 @@ public Mono<List<GitBranchDTO>> handleRepoNotFoundException(String defaultApplic
return getApplicationById(defaultApplicationId)
.flatMap(application -> {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
- Path repoPath = Paths.get(application.getOrganizationId(), application.getId(), gitApplicationMetadata.getRepoName());
+ Path repoPath = Paths.get(application.getWorkspaceId(), application.getId(), gitApplicationMetadata.getRepoName());
GitAuth gitAuth = gitApplicationMetadata.getGitAuth();
return gitExecutor.cloneApplication(repoPath, gitApplicationMetadata.getRemoteUrl(), gitAuth.getPrivateKey(), gitAuth.getPublicKey())
.flatMap(defaultBranch -> gitExecutor.listBranches(
@@ -2293,8 +2293,8 @@ public Mono<List<GitBranchDTO>> handleRepoNotFoundException(String defaultApplic
});
}
- private Mono<Long> getApplicationCountWithPrivateRepo(String organizationId) {
- return applicationService.getGitConnectedApplicationsByOrganizationId(organizationId)
+ private Mono<Long> getApplicationCountWithPrivateRepo(String workspaceId) {
+ return applicationService.getGitConnectedApplicationsByWorkspaceId(workspaceId)
.flatMap(application -> {
GitApplicationMetadata gitData = application.getGitApplicationMetadata();
final Boolean isRepoPrivate = gitData.getIsRepoPrivate();
@@ -2307,7 +2307,7 @@ private Mono<Long> getApplicationCountWithPrivateRepo(String organizationId) {
return Mono.just(application);
});
})
- .then(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByOrgId(organizationId));
+ .then(applicationService.getGitConnectedApplicationsCountWithPrivateRepoByWorkspaceId(workspaceId));
}
/**
@@ -2330,7 +2330,7 @@ private Mono<GitPullDTO> pullAndRehydrateApplication(Application defaultApplicat
if (isInvalidDefaultApplicationGitMetadata(gitData)) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
}
- Path repoSuffix = Paths.get(defaultApplication.getOrganizationId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+ Path repoSuffix = Paths.get(defaultApplication.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
Mono<Application> branchedApplicationMono = applicationService
.findByBranchNameAndDefaultApplicationId(branchName, defaultApplication.getId(), MANAGE_APPLICATIONS);
@@ -2365,7 +2365,7 @@ else if (error.getMessage().contains("Nothing to fetch")) {
Mono<ApplicationJson> applicationJsonMono = pullStatusMono
.flatMap(status ->
fileUtils.reconstructApplicationJsonFromGitRepo(
- branchedApplication.getOrganizationId(),
+ branchedApplication.getWorkspaceId(),
branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
branchedApplication.getGitApplicationMetadata().getRepoName(),
branchName
@@ -2385,7 +2385,7 @@ else if (error.getMessage().contains("Nothing to fetch")) {
// Get the latest application with all the changes
// Commit and push changes to sync with remote
return importExportApplicationService
- .importApplicationInWorkspace(branchedApplication.getOrganizationId(), applicationJson, branchedApplication.getId(), branchName)
+ .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
.flatMap(application -> addAnalyticsForGitOperation(
AnalyticsEvents.GIT_PULL.getEventName(),
application,
@@ -2440,7 +2440,7 @@ private Mono<Application> addAnalyticsForGitOperation(String eventName,
analyticsProps.put("errorType", errorType);
}
analyticsProps.putAll(Map.of(
- FieldName.ORGANIZATION_ID, defaultIfNull(application.getOrganizationId(), ""),
+ FieldName.ORGANIZATION_ID, defaultIfNull(application.getWorkspaceId(), ""),
"branchApplicationId", defaultIfNull(application.getId(), ""),
"isRepoPrivate", defaultIfNull(isRepoPrivate, ""),
"isSystemGenerated", defaultIfNull(isSystemGenerated, "")
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCE.java
index a391ae05a3da..bd613cf552b2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCE.java
@@ -10,7 +10,7 @@ public interface GroupServiceCE extends CrudService<Group, String> {
Flux<Group> getAllById(Set<String> ids);
- Flux<Group> createDefaultGroupsForOrg(String organizationId);
+ Flux<Group> createDefaultGroupsForWorkspace(String workspaceId);
- Flux<Group> getByOrganizationId(String organizationId);
+ Flux<Group> getByWorkspaceId(String workspaceId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCEImpl.java
index c74087de7ab4..1e15fbef6369 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GroupServiceCEImpl.java
@@ -56,8 +56,8 @@ public Flux<Group> get(MultiValueMap<String, String> params) {
return sessionUserService.getCurrentUser()
.map(user -> {
// Filtering the groups by the user's current workspace
- String workspaceId = user.getCurrentOrganizationId();
- query.addCriteria(Criteria.where(FieldName.ORGANIZATION_ID).is(workspaceId));
+ String workspaceId = user.getCurrentWorkspaceId();
+ query.addCriteria(Criteria.where(FieldName.WORKSPACE_ID).is(workspaceId));
return query;
})
.flatMapMany(query1 -> {
@@ -86,15 +86,15 @@ public Flux<Group> getAllById(Set<String> ids) {
* @return Flux<Group>
*/
@Override
- public Flux<Group> createDefaultGroupsForOrg(String workspaceId) {
+ public Flux<Group> createDefaultGroupsForWorkspace(String workspaceId) {
log.debug("Going to create default groups for workspace: {}", workspaceId);
- return this.repository.getAllByOrganizationId(AclConstants.DEFAULT_ORG_ID)
+ return this.repository.getAllByWorkspaceId(AclConstants.DEFAULT_ORG_ID)
.flatMap(group -> {
Group newGroup = new Group();
newGroup.setName(group.getName());
newGroup.setDisplayName(group.getDisplayName());
- newGroup.setOrganizationId(workspaceId);
+ newGroup.setWorkspaceId(workspaceId);
newGroup.setPermissions(group.getPermissions());
newGroup.setIsDefault(group.getIsDefault());
log.debug("Creating group {} for org: {}", group.getName(), workspaceId);
@@ -103,8 +103,8 @@ public Flux<Group> createDefaultGroupsForOrg(String workspaceId) {
}
@Override
- public Flux<Group> getByOrganizationId(String organizationId) {
- return this.repository.getAllByOrganizationId(organizationId);
+ public Flux<Group> getByWorkspaceId(String workspaceId) {
+ return this.repository.getAllByWorkspaceId(workspaceId);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
index b06212babea6..0d8fd5e5d127 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
@@ -74,8 +74,8 @@ public Mono<ActionDTO> addItemToPage(AddItemToPageDTO addItemToPageDTO) {
return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
}
- if (addItemToPageDTO.getOrganizationId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ if (addItemToPageDTO.getWorkspaceId() == null) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
ApiTemplate apiTemplate = addItemToPageDTO.getMarketplaceElement().getItem();
@@ -111,7 +111,7 @@ public Mono<ActionDTO> addItemToPage(AddItemToPageDTO addItemToPageDTO) {
datasource.setDatasourceConfiguration(apiTemplate.getDatasourceConfiguration());
datasource.setName(apiTemplate.getDatasourceConfiguration().getUrl());
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(addItemToPageDTO.getOrganizationId());
+ datasource.setWorkspaceId(addItemToPageDTO.getWorkspaceId());
action.setDatasource(datasource);
action.setPluginType(plugin.getType());
return action;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
index 243a73f17ac9..e26a91f93141 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
@@ -1126,14 +1126,14 @@ public Mono<ActionDTO> createAction(ActionDTO action, AppsmithEventContext event
// Set the application id in the main domain
newAction.setApplicationId(page.getApplicationId());
- // If the datasource is embedded, check for organizationId and set it in action
+ // If the datasource is embedded, check for workspaceId and set it in action
if (action.getDatasource() != null &&
action.getDatasource().getId() == null) {
Datasource datasource = action.getDatasource();
- if (datasource.getOrganizationId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ if (datasource.getWorkspaceId() == null) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
- newAction.setOrganizationId(datasource.getOrganizationId());
+ newAction.setWorkspaceId(datasource.getWorkspaceId());
}
// New actions will never be set to auto-magical execution, unless it is triggered via a
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
index 93f425e090a2..4a90a16378a1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
@@ -112,7 +112,7 @@ public Mono<ActionCollectionDTO> createCollection(ActionCollectionDTO collection
if (action.getId() == null) {
// Make sure that the proper values are used for the new action
// Scope the actions' fully qualified names by collection name
- action.getDatasource().setOrganizationId(collection.getOrganizationId());
+ action.getDatasource().setWorkspaceId(collection.getWorkspaceId());
action.getDatasource().setPluginId(collection.getPluginId());
action.getDatasource().setName(FieldName.UNUSED_DATASOURCE);
action.setFullyQualifiedName(collection.getName() + "." + action.getName());
@@ -143,7 +143,7 @@ public Mono<ActionCollectionDTO> createCollection(ActionCollectionDTO collection
ActionCollection actionCollection = new ActionCollection();
actionCollection.setApplicationId(collection.getApplicationId());
- actionCollection.setOrganizationId(collection.getOrganizationId());
+ actionCollection.setWorkspaceId(collection.getWorkspaceId());
actionCollection.setUnpublishedCollection(collection);
actionCollection.setDefaultResources(collection.getDefaultResources());
actionCollectionService.generateAndSetPolicies(newPage, actionCollection);
@@ -466,7 +466,7 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
actionDTO.setApplicationId(branchedActionCollection.getApplicationId());
if (actionDTO.getId() == null) {
actionDTO.setCollectionId(branchedActionCollection.getId());
- actionDTO.getDatasource().setOrganizationId(actionCollectionDTO.getOrganizationId());
+ actionDTO.getDatasource().setWorkspaceId(actionCollectionDTO.getWorkspaceId());
actionDTO.getDatasource().setPluginId(actionCollectionDTO.getPluginId());
actionDTO.getDatasource().setName(FieldName.UNUSED_DATASOURCE);
actionDTO.setFullyQualifiedName(actionCollectionDTO.getName() + "." + actionDTO.getName());
@@ -501,7 +501,7 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
actionDTO.setDeletedAt(Instant.now());
actionDTO.setPageId(branchedActionCollection.getUnpublishedCollection().getPageId());
if (actionDTO.getId() == null) {
- actionDTO.getDatasource().setOrganizationId(actionCollectionDTO.getOrganizationId());
+ actionDTO.getDatasource().setWorkspaceId(actionCollectionDTO.getWorkspaceId());
actionDTO.getDatasource().setPluginId(actionCollectionDTO.getPluginId());
actionDTO.getDatasource().setName(FieldName.UNUSED_DATASOURCE);
actionDTO.setFullyQualifiedName(actionCollectionDTO.getName() + "." + actionDTO.getName());
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MockDataServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MockDataServiceCEImpl.java
index 436e8cd136c8..fdc683a023c2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MockDataServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MockDataServiceCEImpl.java
@@ -115,12 +115,12 @@ public Mono<Datasource> createMockDataSet(MockDataSource mockDataSource) {
" Couldn't find any mock datasource with the given name - " + mockDataSource.getName()));
}
Datasource datasource = new Datasource();
- datasource.setOrganizationId(mockDataSource.getOrganizationId());
+ datasource.setWorkspaceId(mockDataSource.getWorkspaceId());
datasource.setPluginId(mockDataSource.getPluginId());
datasource.setName(mockDataSource.getName());
datasource.setDatasourceConfiguration(datasourceConfiguration);
datasource.setIsConfigured(true);
- return addAnalyticsForMockDataCreation(name, mockDataSource.getOrganizationId())
+ return addAnalyticsForMockDataCreation(name, mockDataSource.getWorkspaceId())
.then(createSuffixedDatasource(datasource));
});
@@ -220,7 +220,7 @@ private Mono<Datasource> createSuffixedDatasource(Datasource datasource, String
return datasourceService.create(datasource)
.onErrorResume(DuplicateKeyException.class, error -> {
if (error.getMessage() != null
- && error.getMessage().contains("organization_datasource_deleted_compound_index")
+ && error.getMessage().contains("workspace_datasource_deleted_compound_index")
&& datasource.getDatasourceConfiguration().getAuthentication() instanceof DBAuth) {
((DBAuth) datasource.getDatasourceConfiguration().getAuthentication()).setPassword(finalPassword);
return createSuffixedDatasource(datasource, name, 1 + suffix);
@@ -229,7 +229,7 @@ private Mono<Datasource> createSuffixedDatasource(Datasource datasource, String
});
}
- private Mono<User> addAnalyticsForMockDataCreation(String name, String orgId) {
+ private Mono<User> addAnalyticsForMockDataCreation(String name, String workspaceId) {
if (!analyticsService.isActive()) {
return Mono.empty();
}
@@ -241,7 +241,7 @@ private Mono<User> addAnalyticsForMockDataCreation(String name, String orgId) {
user.getUsername(),
Map.of(
"MockDataSource", defaultIfNull(name, ""),
- "orgId", defaultIfNull(orgId, "")
+ "orgId", defaultIfNull(workspaceId, "")
)
);
return user;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java
index 4fc94f6cff29..ebb3c0cba9e4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java
@@ -188,7 +188,7 @@ public Boolean validateActionName(String name) {
private void setCommonFieldsFromNewActionIntoAction(NewAction newAction, ActionDTO action) {
// Set the fields from NewAction into Action
- action.setOrganizationId(newAction.getOrganizationId());
+ action.setWorkspaceId(newAction.getWorkspaceId());
action.setPluginType(newAction.getPluginType());
action.setPluginId(newAction.getPluginId());
action.setTemplateId(newAction.getTemplateId());
@@ -203,7 +203,7 @@ private void setCommonFieldsFromNewActionIntoAction(NewAction newAction, ActionD
@Override
public void setCommonFieldsFromActionDTOIntoNewAction(ActionDTO action, NewAction newAction) {
// Set the fields from NewAction into Action
- newAction.setOrganizationId(action.getOrganizationId());
+ newAction.setWorkspaceId(action.getWorkspaceId());
newAction.setPluginType(action.getPluginType());
newAction.setPluginId(action.getPluginId());
newAction.setTemplateId(action.getTemplateId());
@@ -348,7 +348,7 @@ public Mono<ActionDTO> validateAndSaveActionToRepository(NewAction newAction) {
}))
.map(datasource -> {
// datasource is found. Update the action.
- newAction.setOrganizationId(datasource.getOrganizationId());
+ newAction.setWorkspaceId(datasource.getWorkspaceId());
return datasource;
})
// If the action is publicly executable, update the datasource policy
@@ -404,7 +404,7 @@ public Mono<ActionDTO> validateAndSaveActionToRepository(NewAction newAction) {
analyticsProperties.put("pluginType", ObjectUtils.defaultIfNull(savedAction.getPluginType(), ""));
analyticsProperties.put("pluginName", ObjectUtils.defaultIfNull(unpublishedAction.getPluginName(), ""));
analyticsProperties.put("applicationId", ObjectUtils.defaultIfNull(savedAction.getApplicationId(), ""));
- analyticsProperties.put("orgId", ObjectUtils.defaultIfNull(savedAction.getOrganizationId(), ""));
+ analyticsProperties.put("orgId", ObjectUtils.defaultIfNull(savedAction.getWorkspaceId(), ""));
analyticsProperties.put("actionName", ObjectUtils.defaultIfNull(unpublishedAction.getValidName(), ""));
if (unpublishedAction.getDatasource() != null) {
analyticsProperties.put("dsName", ObjectUtils.defaultIfNull(unpublishedAction.getDatasource().getName(), ""));
@@ -1037,7 +1037,7 @@ private Mono<ActionExecutionRequest> sendExecuteAnalyticsEvent(
"datasource", Map.of(
"name", datasource.getName()
),
- "orgId", application.getOrganizationId(),
+ "orgId", application.getWorkspaceId(),
"appId", action.getApplicationId(),
"appMode", TRUE.equals(viewMode) ? "view" : "edit",
"appName", application.getName(),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java
index d9e8934586a5..ebfd966bfb46 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java
@@ -225,7 +225,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
}).flatMap(application -> {
if(markApplicationAsRecentlyAccessed) {
// add this application and workspace id to the recently used list in UserData
- return userDataService.updateLastUsedAppAndOrgList(application)
+ return userDataService.updateLastUsedAppAndWorkspaceList(application)
.thenReturn(application);
} else {
return Mono.just(application);
@@ -339,7 +339,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
application.setPublishedPages(null);
List<PageNameIdDTO> nameIdDTOList = tuple.getT2();
ApplicationPagesDTO applicationPagesDTO = new ApplicationPagesDTO();
- applicationPagesDTO.setOrganizationId(application.getOrganizationId());
+ applicationPagesDTO.setWorkspaceId(application.getWorkspaceId());
applicationPagesDTO.setPages(nameIdDTOList);
applicationPagesDTO.setApplication(application);
return applicationPagesDTO;
@@ -371,7 +371,7 @@ public Mono<ApplicationPagesDTO> findNamesByApplicationNameAndViewMode(String ap
Application application = tuple.getT1();
List<PageNameIdDTO> nameIdDTOList = tuple.getT2();
ApplicationPagesDTO applicationPagesDTO = new ApplicationPagesDTO();
- applicationPagesDTO.setOrganizationId(application.getOrganizationId());
+ applicationPagesDTO.setWorkspaceId(application.getWorkspaceId());
applicationPagesDTO.setPages(nameIdDTOList);
return applicationPagesDTO;
});
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
index d4258ca30be6..4fe248d94cf6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
@@ -114,13 +114,13 @@ public Flux<Plugin> get(MultiValueMap<String, String> params) {
// Remove branch name as plugins are not shared across branches
params.remove(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME);
- String organizationId = params.getFirst(FieldName.ORGANIZATION_ID);
- if (organizationId == null) {
- return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ String workspaceId = params.getFirst(FieldName.WORKSPACE_ID);
+ if (workspaceId == null) {
+ return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
// TODO : Think about the various scenarios where this plugin api is called and then decide on permissions.
- Mono<Workspace> workspaceMono = workspaceService.getById(organizationId);
+ Mono<Workspace> workspaceMono = workspaceService.getById(workspaceId);
return workspaceMono
.flatMapMany(org -> {
@@ -181,8 +181,8 @@ public Mono<Workspace> installPlugin(PluginWorkspaceDTO pluginOrgDTO) {
if (pluginOrgDTO.getPluginId() == null) {
return Mono.error(new AppsmithException(AppsmithError.PLUGIN_ID_NOT_GIVEN));
}
- if (pluginOrgDTO.getOrganizationId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ if (pluginOrgDTO.getWorkspaceId() == null) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
return storeWorkspacePlugin(pluginOrgDTO, pluginOrgDTO.getStatus())
@@ -215,12 +215,12 @@ public Mono<Workspace> uninstallPlugin(PluginWorkspaceDTO pluginDTO) {
if (pluginDTO.getPluginId() == null) {
return Mono.error(new AppsmithException(AppsmithError.PLUGIN_ID_NOT_GIVEN));
}
- if (pluginDTO.getOrganizationId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ if (pluginDTO.getWorkspaceId() == null) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
//Find the workspace using id and plugin id -> This is to find if the workspace has the plugin installed
- Mono<Workspace> workspaceMono = workspaceService.findByIdAndPluginsPluginId(pluginDTO.getOrganizationId(),
+ Mono<Workspace> workspaceMono = workspaceService.findByIdAndPluginsPluginId(pluginDTO.getWorkspaceId(),
pluginDTO.getPluginId());
return workspaceMono
@@ -239,7 +239,7 @@ public Mono<Workspace> uninstallPlugin(PluginWorkspaceDTO pluginDTO) {
private Mono<Workspace> storeWorkspacePlugin(PluginWorkspaceDTO pluginDTO, WorkspacePluginStatus status) {
Mono<Workspace> pluginInWorkspaceMono = workspaceService
- .findByIdAndPluginsPluginId(pluginDTO.getOrganizationId(), pluginDTO.getPluginId());
+ .findByIdAndPluginsPluginId(pluginDTO.getWorkspaceId(), pluginDTO.getPluginId());
//If plugin is already present for the workspace, just return the workspace, else install and return workspace
@@ -254,8 +254,8 @@ private Mono<Workspace> storeWorkspacePlugin(PluginWorkspaceDTO pluginDTO, Works
log.debug("Before publishing to the redis queue");
//Publish the event to the pub/sub queue
InstallPluginRedisDTO installPluginRedisDTO = new InstallPluginRedisDTO();
- installPluginRedisDTO.setOrganizationId(pluginDTO.getOrganizationId());
- installPluginRedisDTO.setPluginOrgDTO(pluginDTO);
+ installPluginRedisDTO.setWorkspaceId(pluginDTO.getWorkspaceId());
+ installPluginRedisDTO.setPluginWorkspaceDTO(pluginDTO);
String jsonString;
try {
jsonString = objectMapper.writeValueAsString(installPluginRedisDTO);
@@ -268,7 +268,7 @@ private Mono<Workspace> storeWorkspacePlugin(PluginWorkspaceDTO pluginDTO, Works
.subscribe();
})
//Now that the plugin jar has been successfully downloaded, go on and add the plugin to the workspace
- .then(workspaceService.getById(pluginDTO.getOrganizationId()))
+ .then(workspaceService.getById(pluginDTO.getWorkspaceId()))
.flatMap(workspace -> {
Set<WorkspacePlugin> workspacePluginList = workspace.getPlugins();
@@ -312,16 +312,16 @@ public Mono<String> getPluginName(Mono<Datasource> datasourceMono) {
@Override
public Plugin redisInstallPlugin(InstallPluginRedisDTO installPluginRedisDTO) {
- Mono<Plugin> pluginMono = repository.findById(installPluginRedisDTO.getPluginOrgDTO().getPluginId());
+ Mono<Plugin> pluginMono = repository.findById(installPluginRedisDTO.getPluginWorkspaceDTO().getPluginId());
return pluginMono
- .flatMap(plugin -> downloadAndStartPlugin(installPluginRedisDTO.getOrganizationId(), plugin))
+ .flatMap(plugin -> downloadAndStartPlugin(installPluginRedisDTO.getWorkspaceId(), plugin))
.switchIfEmpty(Mono.defer(() -> {
- log.debug("During redisInstallPlugin, no plugin with plugin id {} found. Returning without download and install", installPluginRedisDTO.getPluginOrgDTO().getPluginId());
+ log.debug("During redisInstallPlugin, no plugin with plugin id {} found. Returning without download and install", installPluginRedisDTO.getPluginWorkspaceDTO().getPluginId());
return Mono.just(new Plugin());
})).block();
}
- private Mono<Plugin> downloadAndStartPlugin(String organizationId, Plugin plugin) {
+ private Mono<Plugin> downloadAndStartPlugin(String workspaceId, Plugin plugin) {
if (plugin.getJarLocation() == null) {
// Plugin jar location not set. Must be local
/** TODO
@@ -332,7 +332,7 @@ private Mono<Plugin> downloadAndStartPlugin(String organizationId, Plugin plugin
}
String baseUrl = "../dist/plugins/";
- String pluginJar = plugin.getName() + "-" + organizationId + ".jar";
+ String pluginJar = plugin.getName() + "-" + workspaceId + ".jar";
log.debug("Going to download plugin jar with name : {}", baseUrl + pluginJar);
try {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
index 0aea9ae04a0a..5ebec8465f6c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
@@ -32,7 +32,7 @@ public PostmanImporterServiceCEImpl(NewPageService newPageService,
}
@Override
- public Mono<ActionDTO> importAction(Object input, String pageId, String name, String orgId, String branchName) {
+ public Mono<ActionDTO> importAction(Object input, String pageId, String name, String workspaceId, String branchName) {
ActionDTO action = new ActionDTO();
ActionConfiguration actionConfiguration = new ActionConfiguration();
Datasource datasource = new Datasource();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java
index 90dae873e236..951df25ce08c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java
@@ -129,7 +129,7 @@ public Mono<Theme> changeCurrentTheme(String newThemeId, String applicationId, S
// we'll create a copy of newTheme
newTheme.setId(null);
newTheme.setApplicationId(null);
- newTheme.setOrganizationId(null);
+ newTheme.setWorkspaceId(null);
newTheme.setPolicies(policyGenerator.getAllChildPolicies(
application.getPolicies(), Application.class, Theme.class
));
@@ -176,7 +176,7 @@ public Mono<Theme> cloneThemeToApplication(String srcThemeId, Application destAp
} else { // it's a customized theme, create a copy and return the copy
theme.setId(null); // setting id to null so that save method will create a new instance
theme.setApplicationId(null);
- theme.setOrganizationId(null);
+ theme.setWorkspaceId(null);
theme.setPolicies(policyGenerator.getAllChildPolicies(
destApplication.getPolicies(), Application.class, Theme.class
));
@@ -295,7 +295,7 @@ public Mono<Theme> persistCurrentTheme(String applicationId, String branchName,
theme.setId(null); // we'll create a copy so setting id to null
theme.setSystemTheme(false);
theme.setApplicationId(application.getId());
- theme.setOrganizationId(application.getOrganizationId());
+ theme.setWorkspaceId(application.getWorkspaceId());
theme.setPolicies(policyGenerator.getAllChildPolicies(
application.getPolicies(), Application.class, Theme.class
));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCE.java
index 23ddc6e34e06..70ca326f79d3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCE.java
@@ -41,7 +41,7 @@ public interface UserDataServiceCE {
Mono<Void> makeProfilePhotoResponse(ServerWebExchange exchange);
- Mono<UserData> updateLastUsedAppAndOrgList(Application application);
+ Mono<UserData> updateLastUsedAppAndWorkspaceList(Application application);
Mono<UserData> addTemplateIdToLastUsedList(String templateId);
@@ -49,6 +49,6 @@ public interface UserDataServiceCE {
Mono<UserData> setCommentState(CommentOnboardingState commentOnboardingState);
- Mono<UpdateResult> removeRecentOrgAndApps(String userId, String organizationId);
+ Mono<UpdateResult> removeRecentWorkspaceAndApps(String userId, String workspaceId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCEImpl.java
index 4673b8f35269..4d0567fe9d53 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserDataServiceCEImpl.java
@@ -244,17 +244,17 @@ private Mono<Void> makeProfilePhotoResponse(ServerWebExchange exchange, UserData
}
/**
- * The application.organizationId is prepended to the list {@link UserData#getRecentlyUsedOrgIds}.
+ * The application.workspaceId is prepended to the list {@link UserData#getRecentlyUsedWorkspaceIds}.
* The application.id is prepended to the list {@link UserData#getRecentlyUsedAppIds()}.
*
* @param application@return Updated {@link UserData}
*/
@Override
- public Mono<UserData> updateLastUsedAppAndOrgList(Application application) {
+ public Mono<UserData> updateLastUsedAppAndWorkspaceList(Application application) {
return this.getForCurrentUser().flatMap(userData -> {
// set recently used workspace ids
- userData.setRecentlyUsedOrgIds(
- addIdToRecentList(userData.getRecentlyUsedOrgIds(), application.getOrganizationId(), 10)
+ userData.setRecentlyUsedWorkspaceIds(
+ addIdToRecentList(userData.getRecentlyUsedWorkspaceIds(), application.getWorkspaceId(), 10)
);
// set recently used application ids
userData.setRecentlyUsedAppIds(
@@ -314,7 +314,7 @@ public Mono<UserData> setCommentState(CommentOnboardingState commentOnboardingSt
* @return update result obtained from DB
*/
@Override
- public Mono<UpdateResult> removeRecentOrgAndApps(String userId, String workspaceId) {
+ public Mono<UpdateResult> removeRecentWorkspaceAndApps(String userId, String workspaceId) {
return applicationRepository.getAllApplicationId(workspaceId).flatMap(appIdsList ->
repository.removeIdFromRecentlyUsedList(userId, workspaceId, appIdsList)
);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
index fd7d602b89b9..c0c17fc7a127 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
@@ -80,8 +80,8 @@
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_INSTANCE_ENV;
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
-import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.USER_MANAGE_WORKSPACES;
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MAX_LENGTH;
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MIN_LENGTH;
import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
@@ -166,39 +166,39 @@ public Mono<User> findByEmail(String email) {
* This function switches the user's currentWorkspace in the User collection in the DB. This means that on subsequent
* logins, the user will see applications for their last used workspace.
*
- * @param orgId
+ * @param workspaceId
* @return
*/
@Override
- public Mono<User> switchCurrentWorkspace(String orgId) {
- if (orgId == null || orgId.isEmpty()) {
+ public Mono<User> switchCurrentWorkspace(String workspaceId) {
+ if (workspaceId == null || workspaceId.isEmpty()) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "organizationId"));
}
return sessionUserService.getCurrentUser()
.flatMap(user -> repository.findByEmail(user.getUsername()))
.flatMap(user -> {
- log.debug("Going to set workspaceId: {} for user: {}", orgId, user.getId());
+ log.debug("Going to set workspaceId: {} for user: {}", workspaceId, user.getId());
- if (user.getCurrentOrganizationId().equals(orgId)) {
+ if (user.getCurrentWorkspaceId().equals(workspaceId)) {
return Mono.just(user);
}
- Set<String> workspaceIds = user.getOrganizationIds();
+ Set<String> workspaceIds = user.getWorkspaceIds();
if (workspaceIds == null || workspaceIds.isEmpty()) {
return Mono.error(new AppsmithException(AppsmithError.USER_DOESNT_BELONG_ANY_WORKSPACE, user.getId()));
}
- Optional<String> maybeOrgId = workspaceIds.stream()
- .filter(organizationId -> organizationId.equals(orgId))
+ Optional<String> maybeWorkspaceId = workspaceIds.stream()
+ .filter(workspaceId1 -> workspaceId1.equals(workspaceId))
.findFirst();
- if (maybeOrgId.isPresent()) {
- user.setCurrentOrganizationId(maybeOrgId.get());
+ if (maybeWorkspaceId.isPresent()) {
+ user.setCurrentWorkspaceId(maybeWorkspaceId.get());
return repository.save(user);
}
- // Throw an exception if the orgId is not part of the user's workspaces
- return Mono.error(new AppsmithException(AppsmithError.USER_DOESNT_BELONG_TO_WORKSPACE, user.getId(), orgId));
+ // Throw an exception if the workspaceId is not part of the user's workspaces
+ return Mono.error(new AppsmithException(AppsmithError.USER_DOESNT_BELONG_TO_WORKSPACE, user.getId(), workspaceId));
});
}
@@ -457,7 +457,7 @@ public Mono<User> create(User user) {
private Set<Policy> crudUserPolicy(User user) {
- Set<AclPermission> aclPermissions = Set.of(MANAGE_USERS, USER_MANAGE_ORGANIZATIONS);
+ Set<AclPermission> aclPermissions = Set.of(MANAGE_USERS, USER_MANAGE_WORKSPACES);
Map<String, Policy> userPolicies = policyUtils.generatePolicyFromPermission(aclPermissions, user);
@@ -563,8 +563,8 @@ public Mono<UserSignupDTO> createUserAndSendEmail(User user, String originHeader
log.debug("Creating blank default workspace for user '{}'.", savedUser.getEmail());
return workspaceService.createDefault(new Workspace(), savedUser)
- .map(org -> {
- userSignupDTO.setDefaultOrganizationId(org.getId());
+ .map(workspace -> {
+ userSignupDTO.setDefaultWorkspaceId(workspace.getId());
return userSignupDTO;
});
})
@@ -689,8 +689,8 @@ public Mono<List<User>> inviteUsers(InviteUsersDTO inviteUsersDTO, String origin
Mono<User> currentUserMono = sessionUserService.getCurrentUser().cache();
// Check if the current user has invite permissions
- Mono<Workspace> workspaceMono = workspaceRepository.findById(inviteUsersDTO.getOrgId(), ORGANIZATION_INVITE_USERS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, inviteUsersDTO.getOrgId())))
+ Mono<Workspace> workspaceMono = workspaceRepository.findById(inviteUsersDTO.getWorkspaceId(), WORKSPACE_INVITE_USERS)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, inviteUsersDTO.getWorkspaceId())))
.zipWith(currentUserMono)
.flatMap(tuple -> {
Workspace workspace = tuple.getT1();
@@ -744,20 +744,20 @@ public Mono<List<User>> inviteUsers(InviteUsersDTO inviteUsersDTO, String origin
});
// Add workspace id to each invited user
- Mono<List<User>> usersUpdatedWithOrgMono = inviteUsersFlux
+ Mono<List<User>> usersUpdatedWithWorkspaceMono = inviteUsersFlux
.flatMap(user -> Mono.zip(Mono.just(user), workspaceMono))
- // zipping with workspaceMono to ensure that the orgId is checked before updating the user object.
+ // zipping with workspaceMono to ensure that the workspaceId is checked before updating the user object.
.flatMap(tuple -> {
User invitedUser = tuple.getT1();
Workspace workspace = tuple.getT2();
- Set<String> organizationIds = invitedUser.getOrganizationIds();
- if (organizationIds == null) {
- organizationIds = new HashSet<>();
+ Set<String> workspaceIds = invitedUser.getWorkspaceIds();
+ if (workspaceIds == null) {
+ workspaceIds = new HashSet<>();
}
- organizationIds.add(workspace.getId());
- invitedUser.setOrganizationIds(organizationIds);
+ workspaceIds.add(workspace.getId());
+ invitedUser.setWorkspaceIds(workspaceIds);
//Lets save the updated user object
return repository.save(invitedUser);
@@ -783,7 +783,7 @@ public Mono<List<User>> inviteUsers(InviteUsersDTO inviteUsersDTO, String origin
// Trigger the flow to first add the users to the workspace and then update each user with the workspaceId
// added to the user's list of workspaces.
Mono<List<User>> triggerAddUserWorkspaceFinalFlowMono = workspaceWithUsersAddedMono
- .then(usersUpdatedWithOrgMono);
+ .then(usersUpdatedWithWorkspaceMono);
// Use a synchronous sink which does not take subscription cancellations into account. This that even if the
// subscriber has cancelled its subscription, the create method will still generates its event.
@@ -951,7 +951,7 @@ public Mono<UserProfileDTO> buildUserProfileDTO(User user) {
final UserProfileDTO profile = new UserProfileDTO();
profile.setEmail(userFromDb.getEmail());
- profile.setOrganizationIds(userFromDb.getOrganizationIds());
+ profile.setWorkspaceIds(userFromDb.getWorkspaceIds());
profile.setUsername(userFromDb.getUsername());
profile.setName(userFromDb.getName());
profile.setGender(userFromDb.getGender());
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java
index e1f96500ecca..17aa0af01764 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java
@@ -11,7 +11,7 @@ public interface UserWorkspaceServiceCE {
Mono<User> addUserToWorkspace(String workspaceId, User user);
- Mono<Workspace> addUserRoleToWorkspace(String orgId, UserRole userRole);
+ Mono<Workspace> addUserRoleToWorkspace(String workspaceId, UserRole userRole);
Mono<Workspace> addUserToWorkspaceGivenUserObject(Workspace workspace, User user, UserRole userRole);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
index 8ce0d57fd544..b235737d705d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
@@ -38,7 +38,7 @@
import java.util.Map;
import java.util.Set;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
@Slf4j
@@ -71,15 +71,15 @@ public UserWorkspaceServiceCEImpl(SessionUserService sessionUserService,
}
/**
- * This function adds an organizationId to the user. This will allow users to switch between multiple workspace
+ * This function adds an workspaceId to the user. This will allow users to switch between multiple workspace
* and operate inside them independently.
*
- * @param orgId The organizationId being added to the user.
+ * @param workspaceId The workspaceId being added to the user.
* @param user
* @return
*/
@Override
- public Mono<User> addUserToWorkspace(String orgId, User user) {
+ public Mono<User> addUserToWorkspace(String workspaceId, User user) {
Mono<User> currentUserMono;
if (user == null) {
@@ -91,12 +91,12 @@ public Mono<User> addUserToWorkspace(String orgId, User user) {
// Querying by example here because the workspaceRepository.findById wasn't working when the user
// signs up for a new account via Google SSO.
- Workspace exampleOrg = new Workspace();
- exampleOrg.setId(orgId);
- exampleOrg.setPolicies(null);
+ Workspace exampleWorkspace = new Workspace();
+ exampleWorkspace.setId(workspaceId);
+ exampleWorkspace.setPolicies(null);
- return workspaceRepository.findOne(Example.of(exampleOrg))
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, orgId)))
+ return workspaceRepository.findOne(Example.of(exampleWorkspace))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)))
.zipWith(currentUserMono)
.map(tuple -> {
Workspace workspace = tuple.getT1();
@@ -105,31 +105,31 @@ public Mono<User> addUserToWorkspace(String orgId, User user) {
return user1;
})
.map(user1 -> {
- Set<String> workspaceIds = user1.getOrganizationIds();
+ Set<String> workspaceIds = user1.getWorkspaceIds();
if (workspaceIds == null) {
workspaceIds = new HashSet<>();
- if (user1.getCurrentOrganizationId() != null) {
- // If the list of workspaceIds for a user is null, add the current user org
+ if (user1.getCurrentWorkspaceId() != null) {
+ // If the list of workspaceIds for a user is null, add the current user workspace
// to the new list as well
- workspaceIds.add(user1.getCurrentOrganizationId());
+ workspaceIds.add(user1.getCurrentWorkspaceId());
}
}
- if (!workspaceIds.contains(orgId)) {
+ if (!workspaceIds.contains(workspaceId)) {
// Only add to the workspaceIds array if it's not already present
- workspaceIds.add(orgId);
- user1.setOrganizationIds(workspaceIds);
+ workspaceIds.add(workspaceId);
+ user1.setWorkspaceIds(workspaceIds);
}
// Set the current workspace to the newly added workspace
- user1.setCurrentOrganizationId(orgId);
+ user1.setCurrentWorkspaceId(workspaceId);
return user1;
})
.flatMap(userRepository::save);
}
@Override
- public Mono<Workspace> addUserRoleToWorkspace(String orgId, UserRole userRole) {
- Mono<Workspace> workspaceMono = workspaceRepository.findById(orgId, MANAGE_ORGANIZATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, orgId)));
+ public Mono<Workspace> addUserRoleToWorkspace(String workspaceId, UserRole userRole) {
+ Mono<Workspace> workspaceMono = workspaceRepository.findById(workspaceId, MANAGE_WORKSPACES)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)));
Mono<User> userMono = userRepository.findByEmail(userRole.getUsername())
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER)));
@@ -165,9 +165,9 @@ public Mono<Workspace> addUserToWorkspaceGivenUserObject(Workspace workspace, Us
// Generate all the policies for Workspace, Application, Page and Actions for the current user
Set<AclPermission> rolePermissions = role.getPermissions();
- Map<String, Policy> orgPolicyMap = policyUtils.generatePolicyFromPermission(rolePermissions, user);
- Map<String, Policy> applicationPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Workspace.class, Application.class);
- Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Workspace.class, Datasource.class);
+ Map<String, Policy> workspacePolicyMap = policyUtils.generatePolicyFromPermission(rolePermissions, user);
+ Map<String, Policy> applicationPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(workspacePolicyMap, Workspace.class, Application.class);
+ Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(workspacePolicyMap, Workspace.class, Datasource.class);
Map<String, Policy> pagePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(applicationPolicyMap, Application.class, Page.class);
Map<String, Policy> actionPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(pagePolicyMap, Page.class, Action.class);
Map<String, Policy> commentThreadPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(
@@ -177,7 +177,7 @@ public Mono<Workspace> addUserToWorkspaceGivenUserObject(Workspace workspace, Us
applicationPolicyMap, Application.class, Theme.class
);
//Now update the workspace policies
- Workspace updatedWorkspace = policyUtils.addPoliciesToExistingObject(orgPolicyMap, workspace);
+ Workspace updatedWorkspace = policyUtils.addPoliciesToExistingObject(workspacePolicyMap, workspace);
updatedWorkspace.setUserRoles(userRoles);
// Update the underlying application/page/action
@@ -207,14 +207,14 @@ public Mono<Workspace> addUserToWorkspaceGivenUserObject(Workspace workspace, Us
)
.flatMap(tuple -> {
//By now all the datasources/applications/pages/actions have been updated. Just save the workspace now
- Workspace updatedOrgBeforeSave = tuple.getT5();
- return workspaceRepository.save(updatedOrgBeforeSave);
+ Workspace updatedWorkspaceBeforeSave = tuple.getT5();
+ return workspaceRepository.save(updatedWorkspaceBeforeSave);
});
}
@Override
- public Mono<User> leaveWorkspace(String orgId) {
- Mono<Workspace> workspaceMono = workspaceRepository.findById(orgId);
+ public Mono<User> leaveWorkspace(String workspaceId) {
+ Mono<Workspace> workspaceMono = workspaceRepository.findById(workspaceId);
Mono<User> userMono = sessionUserService.getCurrentUser()
.flatMap(user1 -> userRepository.findByEmail(user1.getUsername()));
@@ -226,7 +226,7 @@ public Mono<User> leaveWorkspace(String orgId) {
UserRole userRole = new UserRole();
userRole.setUsername(user.getUsername());
- user.getOrganizationIds().remove(workspace.getId());
+ user.getWorkspaceIds().remove(workspace.getId());
return this.updateMemberRole(
workspace, user, userRole, user, null
).thenReturn(user);
@@ -256,9 +256,9 @@ private Mono<Workspace> removeUserRoleFromWorkspaceGivenUserObject(Workspace wor
// Generate all the policies for Workspace, Application, Page and Actions
Set<AclPermission> rolePermissions = role.getPermissions();
- Map<String, Policy> orgPolicyMap = policyUtils.generatePolicyFromPermission(rolePermissions, user);
- Map<String, Policy> applicationPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Workspace.class, Application.class);
- Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(orgPolicyMap, Workspace.class, Datasource.class);
+ Map<String, Policy> workspacePolicyMap = policyUtils.generatePolicyFromPermission(rolePermissions, user);
+ Map<String, Policy> applicationPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(workspacePolicyMap, Workspace.class, Application.class);
+ Map<String, Policy> datasourcePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(workspacePolicyMap, Workspace.class, Datasource.class);
Map<String, Policy> pagePolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(applicationPolicyMap, Application.class, Page.class);
Map<String, Policy> actionPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(pagePolicyMap, Page.class, Action.class);
Map<String, Policy> commentThreadPolicyMap = policyUtils.generateInheritedPoliciesFromSourcePolicies(
@@ -269,7 +269,7 @@ private Mono<Workspace> removeUserRoleFromWorkspaceGivenUserObject(Workspace wor
);
//Now update the workspace policies
- Workspace updatedWorkspace = policyUtils.removePoliciesFromExistingObject(orgPolicyMap, workspace);
+ Workspace updatedWorkspace = policyUtils.removePoliciesFromExistingObject(workspacePolicyMap, workspace);
updatedWorkspace.setUserRoles(userRoles);
// Update the underlying application/page/action
@@ -301,8 +301,8 @@ private Mono<Workspace> removeUserRoleFromWorkspaceGivenUserObject(Workspace wor
updatedThemesFlux.collectList()
).flatMap(tuple -> {
//By now all the datasources/applications/pages/actions have been updated. Just save the workspace now
- Workspace updatedOrgBeforeSave = tuple.getT6();
- return workspaceRepository.save(updatedOrgBeforeSave);
+ Workspace updatedWorkspaceBeforeSave = tuple.getT6();
+ return workspaceRepository.save(updatedWorkspaceBeforeSave);
});
}
@@ -310,7 +310,7 @@ private Mono<UserRole> updateMemberRole(Workspace workspace, User user, UserRole
List<UserRole> userRoles = workspace.getUserRoles();
// count how many admins are there is this workspace
- long orgAdminCount = userRoles.stream().filter(
+ long workspaceAdminCount = userRoles.stream().filter(
userRole1 -> userRole1.getRole() == AppsmithRole.ORGANIZATION_ADMIN
).count();
@@ -323,8 +323,8 @@ private Mono<UserRole> updateMemberRole(Workspace workspace, User user, UserRole
return Mono.just(userRole);
} else if(role.getRole().equals(AppsmithRole.ORGANIZATION_ADMIN)) {
// user is currently admin, check if this user is the only admin
- if(orgAdminCount == 1) {
- return Mono.error(new AppsmithException(AppsmithError.REMOVE_LAST_ORG_ADMIN_ERROR));
+ if(workspaceAdminCount == 1) {
+ return Mono.error(new AppsmithException(AppsmithError.REMOVE_LAST_WORKSPACE_ADMIN_ERROR));
}
}
@@ -352,16 +352,16 @@ private Mono<UserRole> updateMemberRole(Workspace workspace, User user, UserRole
.thenReturn(addedWorkspace);
});
} else {
- // If the roleName was not present, then it implies that the user is being removed from the org.
+ // If the roleName was not present, then it implies that the user is being removed from the workspace.
// Since at this point we have already removed the user from the workspace,
- // remove the workspace from recent org list of UserData
- // we also need to remove the org id from User.orgIdList
+ // remove the workspace from recent workspace list of UserData
+ // we also need to remove the workspace id from User.workspaceIdList
finalUpdatedWorkspaceMono = userDataService
- .removeRecentOrgAndApps(user.getId(), workspace.getId())
+ .removeRecentWorkspaceAndApps(user.getId(), workspace.getId())
.then(userRemovedWorkspaceMono)
.flatMap(workspace1 -> {
- if(user.getOrganizationIds() != null) {
- user.getOrganizationIds().remove(workspace.getId());
+ if(user.getWorkspaceIds() != null) {
+ user.getWorkspaceIds().remove(workspace.getId());
return userRepository.save(user).thenReturn(workspace1);
}
return Mono.just(workspace1);
@@ -379,19 +379,19 @@ private Mono<UserRole> updateMemberRole(Workspace workspace, User user, UserRole
/**
* This method is used when an admin of an workspace changes the role or removes a member.
* Admin user can also remove himself from the workspace, if there is another admin there in the workspace.
- * @param orgId ID of the workspace
+ * @param workspaceId ID of the workspace
* @param userRole updated role of the target member. userRole.roleName will be null when removing a member
* @param originHeader
* @return The updated UserRole
*/
@Override
- public Mono<UserRole> updateRoleForMember(String orgId, UserRole userRole, String originHeader) {
+ public Mono<UserRole> updateRoleForMember(String workspaceId, UserRole userRole, String originHeader) {
if (userRole.getUsername() == null) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "username"));
}
Mono<Workspace> workspaceMono = workspaceRepository
- .findById(orgId, MANAGE_ORGANIZATIONS)
+ .findById(workspaceId, MANAGE_WORKSPACES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
"Change role of a member")));
Mono<User> userMono = userRepository.findByEmail(userRole.getUsername());
@@ -418,7 +418,7 @@ public Mono<Workspace> bulkAddUsersToWorkspace(Workspace workspace, List<User> u
for (User user : users) {
// If the user already exists in the workspace, skip adding the user to the workspace user roles
- if (userRoles.stream().anyMatch(orgRole -> orgRole.getUsername().equals(user.getUsername()))) {
+ if (userRoles.stream().anyMatch(workspaceRole -> workspaceRole.getUsername().equals(user.getUsername()))) {
continue;
}
// User was not found in the workspace. Continue with adding it
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
index 0a2ea2360240..bb56c53885e2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
@@ -25,13 +25,13 @@ public interface WorkspaceServiceCE extends CrudService<Workspace, String> {
Mono<Workspace> save(Workspace workspace);
- Mono<Workspace> findByIdAndPluginsPluginId(String organizationId, String pluginId);
+ Mono<Workspace> findByIdAndPluginsPluginId(String workspaceId, String pluginId);
Flux<Workspace> findByIdsIn(Set<String> ids, String tenantId, AclPermission permission);
- Mono<Map<String, String>> getUserRolesForWorkspace(String orgId);
+ Mono<Map<String, String>> getUserRolesForWorkspace(String workspaceId);
- Mono<List<UserRole>> getWorkspaceMembers(String orgId);
+ Mono<List<UserRole>> getWorkspaceMembers(String workspaceId);
Mono<Workspace> uploadLogo(String workspaceId, Part filePart);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
index 5f4db2bf95a4..e35011cfd0fd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
@@ -47,10 +47,10 @@
import java.util.Set;
import java.util.stream.Collectors;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
import static com.appsmith.server.acl.AclPermission.READ_USERS;
-import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.USER_MANAGE_WORKSPACES;
@Slf4j
public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Workspace, String>
@@ -95,7 +95,7 @@ public WorkspaceServiceCEImpl(Scheduler scheduler,
public Flux<Workspace> get(MultiValueMap<String, String> params) {
return sessionUserService.getCurrentUser()
.flatMapMany(user -> {
- Set<String> workspaceIds = user.getOrganizationIds();
+ Set<String> workspaceIds = user.getWorkspaceIds();
if (workspaceIds == null || workspaceIds.isEmpty()) {
log.error("No workspace set for user: {}. Returning empty list of workspaces", user.getEmail());
return Flux.empty();
@@ -116,7 +116,7 @@ public Flux<Workspace> get(MultiValueMap<String, String> params) {
@Override
public Mono<Workspace> createDefault(final Workspace workspace, User user) {
workspace.setName(user.computeFirstName() + "'s apps");
- workspace.setIsAutoGeneratedOrganization(true);
+ workspace.setIsAutoGeneratedWorkspace(true);
return create(workspace, user);
}
@@ -140,7 +140,7 @@ public Mono<Workspace> create(Workspace workspace, User user) {
// Does the user have permissions to create a workspace?
boolean isManageOrgPolicyPresent = user.getPolicies().stream()
- .anyMatch(policy -> policy.getPermission().equals(USER_MANAGE_ORGANIZATIONS.getValue()));
+ .anyMatch(policy -> policy.getPermission().equals(USER_MANAGE_WORKSPACES.getValue()));
if (!isManageOrgPolicyPresent) {
return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Create organization"));
@@ -198,7 +198,7 @@ public Mono<Workspace> create(Workspace workspace) {
@Override
public Mono<Workspace> update(String id, Workspace resource) {
- Mono<Workspace> findWorkspaceMono = repository.findById(id, MANAGE_ORGANIZATIONS)
+ Mono<Workspace> findWorkspaceMono = repository.findById(id, MANAGE_WORKSPACES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, id)));
// In case the update is not used to update the policies, then set the policies to null to ensure that the
@@ -223,7 +223,7 @@ public Mono<Workspace> update(String id, Workspace resource) {
@Override
public Mono<Workspace> getById(String id) {
- return findById(id, AclPermission.READ_ORGANIZATIONS);
+ return findById(id, AclPermission.READ_WORKSPACES);
}
@Override
@@ -252,18 +252,18 @@ public Flux<Workspace> findByIdsIn(Set<String> ids, String tenantId, AclPermissi
}
@Override
- public Mono<Map<String, String>> getUserRolesForWorkspace(String orgId) {
- if (orgId == null || orgId.isEmpty()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ public Mono<Map<String, String>> getUserRolesForWorkspace(String workspaceId) {
+ if (workspaceId == null || workspaceId.isEmpty()) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
- Mono<Workspace> workspaceMono = repository.findById(orgId, ORGANIZATION_INVITE_USERS);
+ Mono<Workspace> workspaceMono = repository.findById(workspaceId, WORKSPACE_INVITE_USERS);
Mono<String> usernameMono = sessionUserService
.getCurrentUser()
.map(User::getUsername);
return workspaceMono
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, orgId)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)))
.zipWith(usernameMono)
.flatMap(tuple -> {
Workspace workspace = tuple.getT1();
@@ -294,10 +294,10 @@ public Mono<Map<String, String>> getUserRolesForWorkspace(String orgId) {
}
@Override
- public Mono<List<UserRole>> getWorkspaceMembers(String orgId) {
+ public Mono<List<UserRole>> getWorkspaceMembers(String workspaceId) {
return repository
- .findById(orgId, ORGANIZATION_INVITE_USERS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, orgId)))
+ .findById(workspaceId, WORKSPACE_INVITE_USERS)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)))
.map(workspace -> {
final List<UserRole> userRoles = workspace.getUserRoles();
return CollectionUtils.isEmpty(userRoles) ? Collections.emptyList() : userRoles;
@@ -305,9 +305,9 @@ public Mono<List<UserRole>> getWorkspaceMembers(String orgId) {
}
@Override
- public Mono<Workspace> uploadLogo(String organizationId, Part filePart) {
- final Mono<Workspace> findWorkspaceMono = repository.findById(organizationId, MANAGE_ORGANIZATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, organizationId)));
+ public Mono<Workspace> uploadLogo(String workspaceId, Part filePart) {
+ final Mono<Workspace> findWorkspaceMono = repository.findById(workspaceId, MANAGE_WORKSPACES)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)));
// We don't execute the upload Mono if we don't find the workspace.
final Mono<Asset> uploadAssetMono = assetService.upload(filePart, Constraint.WORKSPACE_LOGO_SIZE_KB, false);
@@ -332,10 +332,10 @@ public Mono<Workspace> uploadLogo(String organizationId, Part filePart) {
}
@Override
- public Mono<Workspace> deleteLogo(String organizationId) {
+ public Mono<Workspace> deleteLogo(String workspaceId) {
return repository
- .findById(organizationId, MANAGE_ORGANIZATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, organizationId)))
+ .findById(workspaceId, MANAGE_WORKSPACES)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId)))
.flatMap(workspace -> {
final String prevAssetId = workspace.getLogoAssetId();
if(prevAssetId == null) {
@@ -357,10 +357,10 @@ public Flux<Workspace> getAll() {
@Override
public Mono<Workspace> archiveById(String workspaceId) {
- return applicationRepository.countByOrganizationId(workspaceId).flatMap(appCount -> {
+ return applicationRepository.countByWorkspaceId(workspaceId).flatMap(appCount -> {
if(appCount == 0) { // no application found under this workspace
- // fetching the org first to make sure user has permission to archive
- return repository.findById(workspaceId, MANAGE_ORGANIZATIONS)
+ // fetching the workspace first to make sure user has permission to archive
+ return repository.findById(workspaceId, MANAGE_WORKSPACES)
.switchIfEmpty(Mono.error(new AppsmithException(
AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId
)))
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandlerImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandlerImpl.java
index 4fb2353cdb83..d27a41b8a220 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandlerImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandlerImpl.java
@@ -17,13 +17,13 @@ public class EmailEventHandlerImpl extends EmailEventHandlerCEImpl implements Em
public EmailEventHandlerImpl(ApplicationEventPublisher applicationEventPublisher,
EmailSender emailSender,
- WorkspaceRepository organizationRepository,
+ WorkspaceRepository workspaceRepository,
ApplicationRepository applicationRepository,
NewPageRepository newPageRepository,
PolicyUtils policyUtils,
EmailConfig emailConfig) {
- super(applicationEventPublisher, emailSender, organizationRepository, applicationRepository, newPageRepository,
+ super(applicationEventPublisher, emailSender, workspaceRepository, applicationRepository, newPageRepository,
policyUtils, emailConfig);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PingScheduledTaskImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PingScheduledTaskImpl.java
index 1fb967454141..dc5f0505541b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PingScheduledTaskImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PingScheduledTaskImpl.java
@@ -28,7 +28,7 @@ public PingScheduledTaskImpl(
ConfigService configService,
SegmentConfig segmentConfig,
CommonConfig commonConfig,
- WorkspaceRepository organizationRepository,
+ WorkspaceRepository workspaceRepository,
ApplicationRepository applicationRepository,
NewPageRepository newPageRepository,
NewActionRepository newActionRepository,
@@ -40,7 +40,7 @@ public PingScheduledTaskImpl(
configService,
segmentConfig,
commonConfig,
- organizationRepository,
+ workspaceRepository,
applicationRepository,
newPageRepository,
newActionRepository,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java
index c09a404f7f03..80de976c4471 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java
@@ -15,8 +15,8 @@ public class UserChangedHandlerImpl extends UserChangedHandlerCEImpl implements
public UserChangedHandlerImpl(ApplicationEventPublisher applicationEventPublisher,
CommentRepository commentRepository,
NotificationRepository notificationRepository,
- WorkspaceRepository organizationRepository) {
+ WorkspaceRepository workspaceRepository) {
- super(applicationEventPublisher, commentRepository, notificationRepository, organizationRepository);
+ super(applicationEventPublisher, commentRepository, notificationRepository, workspaceRepository);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
index e571bba81675..067bfc71251d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
@@ -41,7 +41,7 @@
import java.util.stream.IntStream;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static java.util.stream.Collectors.toMap;
@@ -94,24 +94,24 @@ public Mono<UserHomepageDTO> getAllApplications() {
UserHomepageDTO userHomepageDTO = new UserHomepageDTO();
userHomepageDTO.setUser(user);
- Set<String> orgIds = user.getOrganizationIds();
- if(CollectionUtils.isEmpty(orgIds)) {
- userHomepageDTO.setOrganizationApplications(new ArrayList<>());
+ Set<String> workspaceIdss = user.getWorkspaceIds();
+ if(CollectionUtils.isEmpty(workspaceIdss)) {
+ userHomepageDTO.setWorkspaceApplications(new ArrayList<>());
return Mono.just(userHomepageDTO);
}
// create a set of org id where recently used ones will be at the beginning
- List<String> recentlyUsedOrgIds = userData.getRecentlyUsedOrgIds();
- Set<String> orgIdSortedSet = new LinkedHashSet<>();
- if(recentlyUsedOrgIds != null && recentlyUsedOrgIds.size() > 0) {
+ List<String> recentlyUsedWorkspaceIds = userData.getRecentlyUsedWorkspaceIds();
+ Set<String> workspaceIdSortedSet = new LinkedHashSet<>();
+ if(recentlyUsedWorkspaceIds != null && recentlyUsedWorkspaceIds.size() > 0) {
// user has a recently used list, add them to the beginning
- orgIdSortedSet.addAll(recentlyUsedOrgIds);
+ workspaceIdSortedSet.addAll(recentlyUsedWorkspaceIds);
}
- orgIdSortedSet.addAll(orgIds); // add all other if not added already
+ workspaceIdSortedSet.addAll(workspaceIdss); // add all other if not added already
// Collect all the applications as a map with workspace id as a key
Flux<Application> applicationFlux = applicationRepository
- .findByMultipleOrganizationIds(orgIds, READ_APPLICATIONS)
+ .findByMultipleWorkspaceIds(workspaceIdss, READ_APPLICATIONS)
// Git connected apps will have gitApplicationMetadat
.filter(application -> application.getGitApplicationMetadata() == null
// 1. When the ssh key is generated by user and then the connect app fails
@@ -140,24 +140,24 @@ public Mono<UserHomepageDTO> getAllApplications() {
}
Mono<Map<String, Collection<Application>>> applicationsMapMono = applicationFlux.collectMultimap(
- Application::getOrganizationId, Function.identity()
+ Application::getWorkspaceId, Function.identity()
);
return workspaceService
- .findByIdsIn(orgIds, user.getTenantId(), READ_ORGANIZATIONS)
+ .findByIdsIn(workspaceIdss, user.getTenantId(), READ_WORKSPACES)
.collectMap(Workspace::getId, v -> v)
.zipWith(applicationsMapMono)
.map(tuple -> {
Map<String, Workspace> workspace = tuple.getT1();
- Map<String, Collection<Application>> applicationsCollectionByOrgId = tuple.getT2();
+ Map<String, Collection<Application>> applicationsCollectionByWorkspaceId = tuple.getT2();
List<WorkspaceApplicationsDTO> workspaceApplicationsDTOS = new ArrayList<>();
- for(String orgId : orgIdSortedSet) {
- Workspace workspace1 = workspace.get(orgId);
+ for(String workspaceId : workspaceIdSortedSet) {
+ Workspace workspace1 = workspace.get(workspaceId);
if(workspace1 != null) {
- Collection<Application> applicationCollection = applicationsCollectionByOrgId.get(workspace1.getId());
+ Collection<Application> applicationCollection = applicationsCollectionByWorkspaceId.get(workspace1.getId());
final List<Application> applicationList = new ArrayList<>();
if (!CollectionUtils.isEmpty(applicationCollection)) {
@@ -165,7 +165,7 @@ public Mono<UserHomepageDTO> getAllApplications() {
}
WorkspaceApplicationsDTO workspaceApplicationsDTO = new WorkspaceApplicationsDTO();
- workspaceApplicationsDTO.setOrganization(workspace1);
+ workspaceApplicationsDTO.setWorkspace(workspace1);
workspaceApplicationsDTO.setApplications(applicationList);
workspaceApplicationsDTO.setUserRoles(workspace1.getUserRoles());
@@ -173,12 +173,12 @@ public Mono<UserHomepageDTO> getAllApplications() {
}
}
- userHomepageDTO.setOrganizationApplications(workspaceApplicationsDTOS);
+ userHomepageDTO.setWorkspaceApplications(workspaceApplicationsDTOS);
return userHomepageDTO;
});
})
.flatMap(userHomepageDTO -> {
- List<String> applicationIds = userHomepageDTO.getOrganizationApplications().stream()
+ List<String> applicationIds = userHomepageDTO.getWorkspaceApplications().stream()
.map(workspaceApplicationsDTO ->
workspaceApplicationsDTO.getApplications().stream()
.map(BaseDomain::getId).collect(Collectors.toList())
@@ -188,7 +188,7 @@ public Mono<UserHomepageDTO> getAllApplications() {
return newPageService.findPageSlugsByApplicationIds(applicationIds, READ_PAGES)
.collectMultimap(NewPage::getApplicationId)
.map(applicationPageMap -> {
- for (WorkspaceApplicationsDTO workspaceApps : userHomepageDTO.getOrganizationApplications()) {
+ for (WorkspaceApplicationsDTO workspaceApps : userHomepageDTO.getWorkspaceApplications()) {
for (Application application : workspaceApps.getApplications()) {
setDefaultPageSlug(application, applicationPageMap, Application::getPages, NewPage::getUnpublishedPage);
setDefaultPageSlug(application, applicationPageMap, Application::getPublishedPages, NewPage::getPublishedPage);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationForkingServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationForkingServiceCEImpl.java
index 908bf119e52f..f78e0303cf36 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationForkingServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationForkingServiceCEImpl.java
@@ -42,7 +42,7 @@ public Mono<Application> forkApplicationToWorkspace(String srcApplicationId, Str
final Mono<Application> sourceApplicationMono = applicationService.findById(srcApplicationId, AclPermission.READ_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, srcApplicationId)));
- final Mono<Workspace> targetWorkspaceMono = workspaceService.findById(targetWorkspaceId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS)
+ final Mono<Workspace> targetWorkspaceMono = workspaceService.findById(targetWorkspaceId, AclPermission.WORKSPACE_MANAGE_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.WORKSPACE, targetWorkspaceId)));
Mono<User> userMono = sessionUserService.getCurrentUser();
@@ -116,13 +116,13 @@ public Mono<Application> forkApplicationToWorkspace(String srcApplicationId,
.map(responseUtils::updateApplicationWithDefaultResources);
}
- private Mono<Application> sendForkApplicationAnalyticsEvent(String applicationId, String orgId, Application application) {
+ private Mono<Application> sendForkApplicationAnalyticsEvent(String applicationId, String workspaceId, Application application) {
return applicationService.findById(applicationId, AclPermission.READ_APPLICATIONS)
.flatMap(sourceApplication -> {
final Map<String, Object> data = Map.of(
"forkedFromAppId", applicationId,
- "forkedToOrgId", orgId,
+ "forkedToOrgId", workspaceId,
"forkedFromAppName", sourceApplication.getName()
);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
index b0c9a6c3ff86..eb304ccc67cd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
@@ -1087,7 +1087,7 @@ private Mono<CRUDPageResponseDTO> sendGenerateCRUDPageAnalyticsEvent(CRUDPageRes
"pageName", page.getName(),
"pluginName", pluginName,
"datasourceId", datasource.getId(),
- "organizationId", datasource.getOrganizationId()
+ "organizationId", datasource.getWorkspaceId()
);
analyticsService.sendEvent(AnalyticsEvents.GENERATE_CRUD_PAGE.getEventName(), currentUser.getUsername(), data);
} catch (Exception e) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EmailEventHandlerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EmailEventHandlerCEImpl.java
index 3cb1d826ae58..b7cfcb0e953d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EmailEventHandlerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EmailEventHandlerCEImpl.java
@@ -61,7 +61,7 @@ public Mono<Boolean> publish(String authorUserName, String applicationId, Commen
newPage -> newPage.getUnpublishedPage().getName())
)
.flatMap(objects -> workspaceRepository
- .findById(objects.getT1().getOrganizationId())
+ .findById(objects.getT1().getWorkspaceId())
.map(workspace -> {
String pagename = objects.getT2();
applicationEventPublisher.publishEvent(
@@ -83,7 +83,7 @@ public Mono<Boolean> publish(String authorUserName, String applicationId, Commen
.zipWith(newPageRepository.findById(thread.getPageId())
.map(newPage -> newPage.getUnpublishedPage().getName())
)
- .flatMap(objects -> workspaceRepository.findById(objects.getT1().getOrganizationId())
+ .flatMap(objects -> workspaceRepository.findById(objects.getT1().getWorkspaceId())
.map(workspace -> {
applicationEventPublisher.publishEvent(
new CommentThreadClosedEvent(
@@ -98,7 +98,7 @@ public Mono<Boolean> publish(String authorUserName, String applicationId, Commen
@EventListener
public void handle(CommentAddedEvent event) {
this.sendEmailForCommentAdded(
- event.getOrganization(),
+ event.getWorkspace(),
event.getApplication(),
event.getComment(),
event.getOriginHeader(),
@@ -113,7 +113,7 @@ public void handle(CommentAddedEvent event) {
public void handle(CommentThreadClosedEvent event) {
this.sendEmailForCommentThreadResolved(
event.getAuthorUserName(),
- event.getOrganization(),
+ event.getWorkspace(),
event.getApplication(),
event.getCommentThread(),
event.getOriginHeader(),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java
index 5df5a69097a3..4e308ddb403e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java
@@ -89,7 +89,7 @@ public Mono<Workspace> cloneExamplesWorkspace() {
* @return Empty Mono.
*/
private Mono<Workspace> cloneExamplesWorkspace(User user) {
- if (!CollectionUtils.isEmpty(user.getOrganizationIds())) {
+ if (!CollectionUtils.isEmpty(user.getWorkspaceIds())) {
// Don't create an examples workspace if the user already has some workspaces, perhaps because they
// were invited to some.
return Mono.empty();
@@ -147,7 +147,7 @@ public Mono<Workspace> cloneWorkspaceForUser(
})
.flatMap(newWorkspace -> {
User userUpdate = new User();
- userUpdate.setExamplesOrganizationId(newWorkspace.getId());
+ userUpdate.setExamplesWorkspaceId(newWorkspace.getId());
userUpdate.setPasswordResetInitiated(user.getPasswordResetInitiated());
userUpdate.setSource(user.getSource());
userUpdate.setGroupIds(null);
@@ -193,7 +193,7 @@ public Mono<List<String>> cloneApplications(
})
.thenMany(applicationFlux)
.flatMap(application -> {
- application.setOrganizationId(toWorkspaceId);
+ application.setWorkspaceId(toWorkspaceId);
final String defaultPageId = application.getPages().stream()
.filter(ApplicationPage::isDefault)
@@ -249,7 +249,7 @@ public Mono<List<String>> cloneApplications(
final String originalActionId = newAction.getId();
log.info("Creating clone of action {}", originalActionId);
makePristine(newAction);
- newAction.setOrganizationId(toWorkspaceId);
+ newAction.setWorkspaceId(toWorkspaceId);
ActionDTO action = newAction.getUnpublishedAction();
action.setCollectionId(null);
@@ -267,7 +267,7 @@ public Mono<List<String>> cloneApplications(
return action;
});
} else {
- datasourceInsideAction.setOrganizationId(toWorkspaceId);
+ datasourceInsideAction.setWorkspaceId(toWorkspaceId);
}
}
return Mono.zip(actionMono
@@ -300,7 +300,7 @@ actionDTO, new AppsmithEventContext(AppsmithEventContextType.CLONE_PAGE))
defaultResources.setPageId(savedPage.getId());
unpublishedCollection.setDefaultResources(defaultResources);
- actionCollection.setOrganizationId(toWorkspaceId);
+ actionCollection.setWorkspaceId(toWorkspaceId);
actionCollection.setApplicationId(savedPage.getApplicationId());
DefaultResources defaultResources1 = new DefaultResources();
@@ -472,9 +472,9 @@ private Mono<Application> cloneApplicationDocument(Application application) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
}
- String orgId = application.getOrganizationId();
- if (!StringUtils.hasText(orgId)) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ String workspaceId = application.getWorkspaceId();
+ if (!StringUtils.hasText(workspaceId)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
// Clean the object so that it will be saved as a new application for the currently signed in user.
@@ -487,14 +487,14 @@ private Mono<Application> cloneApplicationDocument(Application application) {
Mono<User> userMono = sessionUserService.getCurrentUser();
- return applicationPageService.setApplicationPolicies(userMono, orgId, application)
+ return applicationPageService.setApplicationPolicies(userMono, workspaceId, application)
.flatMap(applicationToCreate ->
createSuffixedApplication(applicationToCreate, applicationToCreate.getName(), 0)
);
}
public Mono<Datasource> cloneDatasource(String datasourceId, String toWorkspaceId) {
- final Mono<List<Datasource>> existingDatasourcesMono = datasourceRepository.findAllByOrganizationId(toWorkspaceId)
+ final Mono<List<Datasource>> existingDatasourcesMono = datasourceRepository.findAllByWorkspaceId(toWorkspaceId)
.collectList();
return Mono.zip(datasourceRepository.findById(datasourceId), existingDatasourcesMono)
@@ -524,7 +524,7 @@ public Mono<Datasource> cloneDatasource(String datasourceId, String toWorkspaceI
.switchIfEmpty(Mono.defer(() -> {
// No matching existing datasource found, so create a new one.
makePristine(templateDatasource);
- templateDatasource.setOrganizationId(toWorkspaceId);
+ templateDatasource.setWorkspaceId(toWorkspaceId);
return createSuffixedDatasource(templateDatasource);
}));
});
@@ -548,7 +548,7 @@ private Mono<Datasource> createSuffixedDatasource(Datasource datasource, String
return datasourceService.create(datasource)
.onErrorResume(DuplicateKeyException.class, error -> {
if (error.getMessage() != null
- && error.getMessage().contains("organization_datasource_deleted_compound_index")) {
+ && error.getMessage().contains("workspace_datasource_deleted_compound_index")) {
// The duplicate key error is because of the `name` field.
return createSuffixedDatasource(datasource, name, 1 + suffix);
}
@@ -570,8 +570,8 @@ private Mono<Application> createSuffixedApplication(Application application, Str
return applicationService.createDefault(application)
.onErrorResume(DuplicateKeyException.class, error -> {
if (error.getMessage() != null
- // organization_application_deleted_gitApplicationMetadata_compound_index
- && error.getMessage().contains("organization_application_deleted_gitApplicationMetadata_compound_index")) {
+ // workspace_application_deleted_gitApplicationMetadata_compound_index
+ && error.getMessage().contains("workspace_application_deleted_gitApplicationMetadata_compound_index")) {
// The duplicate key error is because of the `name` field.
return createSuffixedApplication(application, name, 1 + suffix);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java
index cd41e4974c84..811c5b6a4bc8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java
@@ -26,11 +26,11 @@ public interface ImportExportApplicationServiceCE {
/**
* This function will take the Json filepart and saves the application in workspace
*
- * @param orgId workspace to which the application needs to be hydrated
+ * @param workspaceId workspace to which the application needs to be hydrated
* @param filePart Json file which contains the entire application object
* @return saved application in DB
*/
- Mono<ApplicationImportDTO> extractFileAndSaveApplication(String orgId, Part filePart);
+ Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspaceId, Part filePart);
Mono<Application> mergeApplicationJsonWithApplication(String organizationId, String applicationId, String branchName, ApplicationJson applicationJson, List<String> pagesToImport);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
index 17b59d303204..0b6310cea424 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
@@ -237,7 +237,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
}
// Refactor application to remove the ids
- final String workspaceId = application.getOrganizationId();
+ final String workspaceId = application.getWorkspaceId();
List<String> pageOrderList = application.getPages().stream().map(applicationPage -> applicationPage.getId()).collect(Collectors.toList());
List<String> publishedPageOrderList = application.getPublishedPages().stream().map(applicationPage -> applicationPage.getId()).collect(Collectors.toList());
removeUnwantedFieldsFromApplicationDuringExport(application);
@@ -326,8 +326,8 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
}
Flux<Datasource> datasourceFlux = Boolean.TRUE.equals(application.getExportWithConfiguration())
- ? datasourceRepository.findAllByOrganizationId(workspaceId, AclPermission.READ_DATASOURCES)
- : datasourceRepository.findAllByOrganizationId(workspaceId, MANAGE_DATASOURCES);
+ ? datasourceRepository.findAllByWorkspaceId(workspaceId, AclPermission.READ_DATASOURCES)
+ : datasourceRepository.findAllByWorkspaceId(workspaceId, MANAGE_DATASOURCES);
return datasourceFlux.collectList();
})
@@ -343,7 +343,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
})
.map(actionCollection -> {
// Remove references to ids since the serialized version does not have this information
- actionCollection.setOrganizationId(null);
+ actionCollection.setWorkspaceId(null);
actionCollection.setPolicies(null);
actionCollection.setApplicationId(null);
actionCollection.setUpdatedAt(null);
@@ -387,7 +387,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
})
.map(newAction -> {
newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
- newAction.setOrganizationId(null);
+ newAction.setWorkspaceId(null);
newAction.setPolicies(null);
newAction.setApplicationId(null);
newAction.setUpdatedAt(null);
@@ -462,7 +462,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
applicationJson.getDatasourceList().forEach(datasource -> {
decryptedFields.put(datasource.getName(), getDecryptedFields(datasource));
datasource.setId(null);
- datasource.setOrganizationId(null);
+ datasource.setWorkspaceId(null);
datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
datasource.setStructure(null);
});
@@ -470,7 +470,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
} else {
applicationJson.getDatasourceList().forEach(datasource -> {
datasource.setId(null);
- datasource.setOrganizationId(null);
+ datasource.setWorkspaceId(null);
datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
datasource.setStructure(null);
// Remove the datasourceConfiguration object as user will configure it once imported to other instance
@@ -560,7 +560,7 @@ public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspace
final MediaType contentType = filePart.headers().getContentType();
if (workspaceId == null || workspaceId.isEmpty()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
}
if (contentType == null || !ALLOWED_CONTENT_TYPES.contains(contentType)) {
@@ -716,7 +716,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
Mono<User> currUserMono = sessionUserService.getCurrentUser().cache();
final Flux<Datasource> existingDatasourceFlux = datasourceRepository
- .findAllByOrganizationId(workspaceId, MANAGE_DATASOURCES)
+ .findAllByWorkspaceId(workspaceId, MANAGE_DATASOURCES)
.cache();
assert importedApplication != null: "Received invalid application object!";
@@ -732,7 +732,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
pluginMap.put(pluginReference, plugin.getId());
return plugin;
})
- .then(workspaceService.findById(workspaceId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS))
+ .then(workspaceService.findById(workspaceId, AclPermission.WORKSPACE_MANAGE_APPLICATIONS))
.switchIfEmpty(Mono.error(
new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId))
)
@@ -790,7 +790,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
// This is explicitly copied over from the map we created before
datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
- datasource.setOrganizationId(workspaceId);
+ datasource.setWorkspaceId(workspaceId);
// Check if any decrypted fields are present for datasource
if (importedDoc.getDecryptedFields()!= null
@@ -822,7 +822,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
return application;
})
.flatMap(application -> {
- importedApplication.setOrganizationId(workspaceId);
+ importedApplication.setWorkspaceId(workspaceId);
// Application Id will be present for GIT sync
if (!StringUtils.isEmpty(applicationId)) {
return applicationService.findById(applicationId, MANAGE_APPLICATIONS)
@@ -1116,7 +1116,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
stopwatch.stopAndLogTimeInMillis();
final Map<String, Object> data = Map.of(
FieldName.APPLICATION_ID, application.getId(),
- FieldName.ORGANIZATION_ID, application.getOrganizationId(),
+ FieldName.ORGANIZATION_ID, application.getWorkspaceId(),
"pageCount", applicationJson.getPageList().size(),
"actionCount", applicationJson.getActionList().size(),
"JSObjectCount", applicationJson.getActionCollectionList().size(),
@@ -1380,7 +1380,7 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
Map<String, InvisibleActionFields> invisibleActionFieldsMap) {
Map<String, NewAction> savedActionsGitIdToActionsMap = new HashMap<>();
- final String workspaceId = importedApplication.getOrganizationId();
+ final String workspaceId = importedApplication.getWorkspaceId();
if (CollectionUtils.isEmpty(importedNewActionList)) {
return Flux.fromIterable(new ArrayList<>());
}
@@ -1427,7 +1427,7 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
}
examplesWorkspaceCloner.makePristine(newAction);
- newAction.setOrganizationId(workspaceId);
+ newAction.setWorkspaceId(workspaceId);
newAction.setApplicationId(importedApplication.getId());
newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
newActionService.generateAndSetActionPolicies(parentPage, newAction);
@@ -1542,7 +1542,7 @@ private Flux<Tuple2<String, ActionCollection>> importAndSaveActionCollection(
Map<String, Map<String, String>> unpublishedCollectionIdToActionIdsMap,
Map<String, Map<String, String>> publishedCollectionIdToActionIdsMap) {
- final String workspaceId = importedApplication.getOrganizationId();
+ final String workspaceId = importedApplication.getWorkspaceId();
return Flux.fromIterable(importedActionCollectionList)
.filter(actionCollection -> actionCollection.getUnpublishedCollection() != null
&& !StringUtils.isEmpty(actionCollection.getUnpublishedCollection().getPageId()))
@@ -1575,7 +1575,7 @@ private Flux<Tuple2<String, ActionCollection>> importAndSaveActionCollection(
}
examplesWorkspaceCloner.makePristine(actionCollection);
- actionCollection.setOrganizationId(workspaceId);
+ actionCollection.setWorkspaceId(workspaceId);
actionCollection.setApplicationId(importedApplication.getId());
actionCollectionService.generateAndSetPolicies(parentPage, actionCollection);
@@ -1802,7 +1802,7 @@ private String sanitizeDatasourceInActionDTO(ActionDTO actionDTO,
if (ds.getId() != null) {
//Mapping ds name in id field
ds.setId(datasourceMap.get(ds.getId()));
- ds.setOrganizationId(null);
+ ds.setWorkspaceId(null);
if (ds.getPluginId() != null) {
ds.setPluginId(pluginMap.get(ds.getPluginId()));
}
@@ -1810,7 +1810,7 @@ private String sanitizeDatasourceInActionDTO(ActionDTO actionDTO,
} else {
// This means we don't have regular datasource it can be simple REST_API and will also be used when
// importing the action to populate the data
- ds.setOrganizationId(workspaceId);
+ ds.setWorkspaceId(workspaceId);
ds.setPluginId(pluginMap.get(ds.getPluginId()));
return "";
}
@@ -1941,7 +1941,7 @@ private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> exi
// No matching existing datasource found, so create a new one.
datasource.setIsConfigured(datasourceConfig != null && datasourceConfig.getAuthentication() != null);
return datasourceService
- .findByNameAndOrganizationId(datasource.getName(), workspaceId, AclPermission.MANAGE_DATASOURCES)
+ .findByNameAndWorkspaceId(datasource.getName(), workspaceId, AclPermission.MANAGE_DATASOURCES)
.flatMap(duplicateNameDatasource ->
getUniqueSuffixForDuplicateNameEntity(duplicateNameDatasource, workspaceId)
)
@@ -2054,8 +2054,8 @@ private DecryptedSensitiveFields getDecryptedFields(Datasource datasource) {
return null;
}
- public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String orgId) {
- Mono<List<Datasource>> listMono = datasourceService.findAllByOrganizationId(orgId, MANAGE_DATASOURCES).collectList();
+ public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String workspaceId) {
+ Mono<List<Datasource>> listMono = datasourceService.findAllByWorkspaceId(workspaceId, MANAGE_DATASOURCES).collectList();
return newActionService.findAllByApplicationIdAndViewMode(applicationId, false, AclPermission.READ_ACTIONS, null)
.collectList()
.zipWith(listMono)
@@ -2073,7 +2073,7 @@ public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId
}
private void removeUnwantedFieldsFromApplicationDuringExport(Application application) {
- application.setOrganizationId(null);
+ application.setWorkspaceId(null);
application.setPages(null);
application.setPublishedPages(null);
application.setModifiedBy(null);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
index 7737ef02901c..3c4b020f3576 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PingScheduledTaskCEImpl.java
@@ -39,7 +39,7 @@ public class PingScheduledTaskCEImpl implements PingScheduledTaskCE {
private final CommonConfig commonConfig;
- private final WorkspaceRepository organizationRepository;
+ private final WorkspaceRepository workspaceRepository;
private final ApplicationRepository applicationRepository;
private final NewPageRepository newPageRepository;
private final NewActionRepository newActionRepository;
@@ -114,7 +114,7 @@ public void pingStats() {
Mono.zip(
configService.getInstanceId().defaultIfEmpty("null"),
NetworkUtils.getExternalAddress(),
- organizationRepository.countByDeletedAtNull().defaultIfEmpty(0L),
+ workspaceRepository.countByDeletedAtNull().defaultIfEmpty(0L),
applicationRepository.countByDeletedAtNull().defaultIfEmpty(0L),
newPageRepository.countByDeletedAtNull().defaultIfEmpty(0L),
newActionRepository.countByDeletedAtNull().defaultIfEmpty(0L),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PluginScheduledTaskCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PluginScheduledTaskCEImpl.java
index ba46173c444d..fdc6f9cdb606 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PluginScheduledTaskCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PluginScheduledTaskCEImpl.java
@@ -70,8 +70,8 @@ public void updateRemotePlugins() {
});
// Save new data for this plugin,
- // then make sure to install to organizations in case the default installation flag changed
- final Mono<List<Workspace>> updatedPluginsOrganizationFlux = pluginService
+ // then make sure to install to workspaces in case the default installation flag changed
+ final Mono<List<Workspace>> updatedPluginsWorkspaceFlux = pluginService
.saveAll(updatablePlugins)
.filter(Plugin::getDefaultInstall)
.collectList()
@@ -79,8 +79,8 @@ public void updateRemotePlugins() {
.collectList();
// Create plugin,
- // then install to all organizations if default installation is turned on
- final Mono<List<Workspace>> organizationFlux =
+ // then install to all workspaces if default installation is turned on
+ final Mono<List<Workspace>> workspaceFlux =
Flux.fromIterable(insertablePlugins)
.flatMap(pluginService::create)
.filter(Plugin::getDefaultInstall)
@@ -88,8 +88,8 @@ public void updateRemotePlugins() {
.flatMapMany(pluginService::installDefaultPlugins)
.collectList();
- return updatedPluginsOrganizationFlux
- .zipWith(organizationFlux)
+ return updatedPluginsWorkspaceFlux
+ .zipWith(workspaceFlux)
.then();
})
.subscribeOn(Schedulers.single())
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
index 2b85280e9fbb..b287a6c1c51b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserSignupCEImpl.java
@@ -102,7 +102,7 @@ public Mono<User> signupAndLogin(User user, ServerWebExchange exchange) {
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.INTERNAL_SERVER_ERROR)))
.flatMap(tuple -> {
final User savedUser = tuple.getT1().getUser();
- final String organizationId = tuple.getT1().getDefaultOrganizationId();
+ final String workspaceId = tuple.getT1().getDefaultWorkspaceId();
final WebSession session = tuple.getT2();
final SecurityContext securityContext = tuple.getT3();
@@ -117,7 +117,7 @@ public Mono<User> signupAndLogin(User user, ServerWebExchange exchange) {
MultiValueMap<String, String> queryParams = exchange.getRequest().getQueryParams();
String redirectQueryParamValue = queryParams.getFirst(REDIRECT_URL_QUERY_PARAM);
- boolean createApplication = StringUtils.isEmpty(redirectQueryParamValue) && !StringUtils.isEmpty(organizationId);
+ boolean createApplication = StringUtils.isEmpty(redirectQueryParamValue) && !StringUtils.isEmpty(workspaceId);
// need to create default application
return authenticationSuccessHandler
.onAuthenticationSuccess(webFilterExchange, authentication, createApplication, true)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/EmbeddedMongoConfig.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/EmbeddedMongoConfig.java
new file mode 100644
index 000000000000..1a4d3360627f
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/EmbeddedMongoConfig.java
@@ -0,0 +1,21 @@
+package com.appsmith.server.configurations;
+
+import java.io.IOException;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig;
+import de.flapdoodle.embed.mongo.config.MongodConfig;
+import de.flapdoodle.embed.mongo.distribution.Version;
+
+@Configuration
+public class EmbeddedMongoConfig {
+ @Bean
+ public ImmutableMongodConfig prepareMongodConfig() throws IOException {
+ ImmutableMongodConfig mongoConfigConfig = MongodConfig.builder()
+ .version(Version.Main.V4_2)
+ .build();
+ return mongoConfigConfig;
+ }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
index af3bab16a3d5..ac7da1c53ad8 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
@@ -33,17 +33,17 @@
import java.util.stream.Collectors;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_EXPORT_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static com.appsmith.server.acl.AclPermission.READ_USERS;
-import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.USER_MANAGE_WORKSPACES;
import static org.springframework.data.mongodb.core.query.Criteria.where;
@Slf4j
@@ -72,19 +72,19 @@ ApplicationRunner init(UserRepository userRepository,
.users(Set.of(API_USER_EMAIL))
.build();
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of(API_USER_EMAIL))
.build();
- Policy exportOrgAppPolicy = Policy.builder().permission(ORGANIZATION_EXPORT_APPLICATIONS.getValue())
+ Policy exportWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_EXPORT_APPLICATIONS.getValue())
.users(Set.of(API_USER_EMAIL))
.build();
- Policy userManageOrgPolicy = Policy.builder().permission(USER_MANAGE_ORGANIZATIONS.getValue())
+ Policy userManageWorkspacePolicy = Policy.builder().permission(USER_MANAGE_WORKSPACES.getValue())
.users(Set.of(API_USER_EMAIL, TEST_USER_EMAIL, ADMIN_USER_EMAIL, DEV_USER_EMAIL))
.build();
- Policy inviteUserOrgPolicy = Policy.builder().permission(ORGANIZATION_INVITE_USERS.getValue())
+ Policy inviteUserWorkspacePolicy = Policy.builder().permission(WORKSPACE_INVITE_USERS.getValue())
.users(Set.of(API_USER_EMAIL))
.build();
@@ -96,11 +96,11 @@ ApplicationRunner init(UserRepository userRepository,
.users(Set.of(API_USER_EMAIL))
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(Set.of(API_USER_EMAIL))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of(API_USER_EMAIL))
.build();
@@ -125,16 +125,16 @@ ApplicationRunner init(UserRepository userRepository,
.build();
Object[][] userData = {
- {"user test", TEST_USER_EMAIL, UserState.ACTIVATED, Set.of(readTestUserPolicy, userManageOrgPolicy)},
- {"api_user", API_USER_EMAIL, UserState.ACTIVATED, Set.of(userManageOrgPolicy, readApiUserPolicy, manageApiUserPolicy)},
- {"admin test", ADMIN_USER_EMAIL, UserState.ACTIVATED, Set.of(readAdminUserPolicy, userManageOrgPolicy)},
- {"developer test", DEV_USER_EMAIL, UserState.ACTIVATED, Set.of(readDevUserPolicy, userManageOrgPolicy)},
+ {"user test", TEST_USER_EMAIL, UserState.ACTIVATED, Set.of(readTestUserPolicy, userManageWorkspacePolicy)},
+ {"api_user", API_USER_EMAIL, UserState.ACTIVATED, Set.of(userManageWorkspacePolicy, readApiUserPolicy, manageApiUserPolicy)},
+ {"admin test", ADMIN_USER_EMAIL, UserState.ACTIVATED, Set.of(readAdminUserPolicy, userManageWorkspacePolicy)},
+ {"developer test", DEV_USER_EMAIL, UserState.ACTIVATED, Set.of(readDevUserPolicy, userManageWorkspacePolicy)},
};
- Object[][] orgData = {
+ Object[][] workspaceData = {
{"Spring Test Workspace", "appsmith-spring-test.com", "appsmith.com", "spring-test-workspace",
- Set.of(manageOrgAppPolicy, manageOrgPolicy, readOrgPolicy, inviteUserOrgPolicy, exportOrgAppPolicy)},
+ Set.of(manageWorkspaceAppPolicy, manageWorkspacePolicy, readWorkspacePolicy, inviteUserWorkspacePolicy, exportWorkspaceAppPolicy)},
{"Another Test Workspace", "appsmith-another-test.com", "appsmith.com", "another-test-workspace",
- Set.of(manageOrgAppPolicy, manageOrgPolicy, readOrgPolicy, inviteUserOrgPolicy, exportOrgAppPolicy)}
+ Set.of(manageWorkspaceAppPolicy, manageWorkspacePolicy, readWorkspacePolicy, inviteUserWorkspacePolicy, exportWorkspaceAppPolicy)}
};
Object[][] appData = {
@@ -152,7 +152,7 @@ ApplicationRunner init(UserRepository userRepository,
{"Not Installed Plugin Name", PluginType.API, "not-installed-plugin"}
};
- // Seed the plugin data into the DB
+ // Seed the plugin data into the DB
Flux<Plugin> pluginFlux = Flux.just(pluginData)
.map(array -> {
log.debug("Creating the plugins");
@@ -186,18 +186,18 @@ ApplicationRunner init(UserRepository userRepository,
.collect(Collectors.toSet())
.cache()
.repeat()
- .zipWithIterable(List.of(orgData))
+ .zipWithIterable(List.of(workspaceData))
.map(tuple -> {
- final Set<WorkspacePlugin> orgPlugins = tuple.getT1();
- final Object[] orgArray = tuple.getT2();
+ final Set<WorkspacePlugin> workspacePlugins = tuple.getT1();
+ final Object[] workspaceArray = tuple.getT2();
Workspace workspace = new Workspace();
- workspace.setName((String) orgArray[0]);
- workspace.setDomain((String) orgArray[1]);
- workspace.setWebsite((String) orgArray[2]);
- workspace.setSlug((String) orgArray[3]);
- workspace.setPolicies((Set<Policy>) orgArray[4]);
- workspace.setPlugins(orgPlugins);
+ workspace.setName((String) workspaceArray[0]);
+ workspace.setDomain((String) workspaceArray[1]);
+ workspace.setWebsite((String) workspaceArray[2]);
+ workspace.setSlug((String) workspaceArray[3]);
+ workspace.setPolicies((Set<Policy>) workspaceArray[4]);
+ workspace.setPlugins(workspacePlugins);
List<UserRole> userRoles = new ArrayList<>();
UserRole userRole = new UserRole();
@@ -208,7 +208,7 @@ ApplicationRunner init(UserRepository userRepository,
userRoles.add(userRole);
workspace.setUserRoles(userRoles);
- log.debug("In the orgFlux. Create Workspace: {}", workspace);
+ log.debug("In the workspaceFlux. Create Workspace: {}", workspace);
return workspace;
})
.flatMap(workspaceRepository::save);
@@ -218,48 +218,48 @@ ApplicationRunner init(UserRepository userRepository,
.thenMany(userFlux)
.thenMany(workspaceFlux);
- Flux<User> addUserOrgFlux = workspaceFlux1
+ Flux<User> addUserWorkspaceFlux = workspaceFlux1
.flatMap(workspace -> userFlux
.flatMap(user -> {
- log.debug("**** In the addUserOrgFlux");
+ log.debug("**** In the addUserWorkspaceFlux");
log.debug("User: {}", user);
- log.debug("Org: {}", workspace);
- user.setCurrentOrganizationId(workspace.getId());
- Set<String> organizationIds = user.getOrganizationIds();
- if (organizationIds == null) {
- organizationIds = new HashSet<>();
+ log.debug("Workspace: {}", workspace);
+ user.setCurrentWorkspaceId(workspace.getId());
+ Set<String> workspaceIds = user.getWorkspaceIds();
+ if (workspaceIds == null) {
+ workspaceIds = new HashSet<>();
}
- organizationIds.add(workspace.getId());
- user.setOrganizationIds(organizationIds);
- log.debug("AddUserOrg User: {}, Org: {}", user, workspace);
+ workspaceIds.add(workspace.getId());
+ user.setWorkspaceIds(workspaceIds);
+ log.debug("AddUserWorkspace User: {}, Workspace: {}", user, workspace);
return userRepository.save(user)
.map(u -> {
- log.debug("Saved the org to user. User: {}", u);
+ log.debug("Saved the workspace to user. User: {}", u);
return u;
});
}));
- Query orgNameQuery = new Query(where("slug").is(orgData[0][3]));
- Mono<Workspace> orgByNameMono = mongoTemplate.findOne(orgNameQuery, Workspace.class)
- .switchIfEmpty(Mono.error(new Exception("Can't find org")));
+ Query workspaceNameQuery = new Query(where("slug").is(workspaceData[0][3]));
+ Mono<Workspace> workspaceByNameMono = mongoTemplate.findOne(workspaceNameQuery, Workspace.class)
+ .switchIfEmpty(Mono.error(new Exception("Can't find workspace")));
Query appNameQuery = new Query(where("name").is(appData[0][0]));
Mono<Application> appByNameMono = mongoTemplate.findOne(appNameQuery, Application.class)
.switchIfEmpty(Mono.error(new Exception("Can't find app")));
return args -> {
workspaceFlux1
- .thenMany(addUserOrgFlux)
- // Query the seed data to get the organizationId (required for application creation)
- .then(orgByNameMono)
- .map(org -> org.getId())
+ .thenMany(addUserWorkspaceFlux)
+ // Query the seed data to get the workspaceId (required for application creation)
+ .then(workspaceByNameMono)
+ .map(workspace -> workspace.getId())
// Seed the user data into the DB
- .flatMapMany(orgId ->
+ .flatMapMany(workspaceId ->
// Seed the application data into the DB
Flux.just(appData)
.map(array -> {
Application app = new Application();
app.setName((String) array[0]);
- app.setOrganizationId(orgId);
+ app.setWorkspaceId(workspaceId);
app.setPolicies((Set<Policy>) array[1]);
return app;
})
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/WorkspaceControllerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/WorkspaceControllerTest.java
index b56917ee5465..3872983db476 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/WorkspaceControllerTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/WorkspaceControllerTest.java
@@ -38,8 +38,8 @@ public class WorkspaceControllerTest {
@Test
@WithMockUser
- public void getOrganizationNoName() {
- webTestClient.post().uri("/api/v1/organizations").
+ public void getWorkspaceNoName() {
+ webTestClient.post().uri("/api/v1/workspaces").
contentType(MediaType.APPLICATION_JSON).
body(BodyInserters.fromValue("{}")).
exchange().
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomApplicationRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomApplicationRepositoryImplTest.java
index d8b43cc589d9..eba75f26a272 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomApplicationRepositoryImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomApplicationRepositoryImplTest.java
@@ -24,17 +24,17 @@ public class CustomApplicationRepositoryImplTest {
@Test
public void getAllApplicationId_WhenDataExists_ReturnsList() {
- String randomOrgId = UUID.randomUUID().toString();
+ String randomWorkspaceId = UUID.randomUUID().toString();
Application application1 = new Application();
- application1.setOrganizationId(randomOrgId);
+ application1.setWorkspaceId(randomWorkspaceId);
application1.setName("my test app");
Application application2 = new Application();
- application2.setOrganizationId(randomOrgId);
+ application2.setWorkspaceId(randomWorkspaceId);
application2.setName("my another test app");
Mono<List<String>> appIds = applicationRepository.saveAll(List.of(application1, application2))
- .then(applicationRepository.getAllApplicationId(randomOrgId));
+ .then(applicationRepository.getAllApplicationId(randomWorkspaceId));
StepVerifier.create(appIds).assertNext(strings -> {
assertThat(strings.size()).isEqualTo(2);
@@ -43,8 +43,8 @@ public void getAllApplicationId_WhenDataExists_ReturnsList() {
@Test
public void getAllApplicationId_WhenNoneExists_ReturnsEmptyList() {
- String randomOrgId = UUID.randomUUID().toString();
- Mono<List<String>> appIds = applicationRepository.getAllApplicationId(randomOrgId);
+ String randomWorkspaceId = UUID.randomUUID().toString();
+ Mono<List<String>> appIds = applicationRepository.getAllApplicationId(randomWorkspaceId);
StepVerifier.create(appIds).assertNext(strings -> {
assertThat(CollectionUtils.isEmpty(strings)).isTrue();
}).verifyComplete();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java
index b1173eac9ab0..55bfca95e055 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomUserDataRepositoryImplTest.java
@@ -25,24 +25,24 @@ public class CustomUserDataRepositoryImplTest {
@Autowired
private UserDataRepository userDataRepository;
- private Mono<UserData> createUser(String userId, List<String> orgIds, List<String> appIds) {
+ private Mono<UserData> createUser(String userId, List<String> workspaceIds, List<String> appIds) {
return userDataRepository
.findByUserId(userId)
.defaultIfEmpty(new UserData()).flatMap(userData -> {
userData.setUserId(userId);
- userData.setRecentlyUsedOrgIds(orgIds);
+ userData.setRecentlyUsedWorkspaceIds(workspaceIds);
userData.setRecentlyUsedAppIds(appIds);
return userDataRepository.save(userData);
});
}
@Test
- public void removeIdFromRecentlyUsedList_WhenOrgIdAlreadyExists_OrgIdRemoved() {
- // create an user data with 3 org id in the recently used orgid list
+ public void removeIdFromRecentlyUsedList_WhenWorkspaceIdAlreadyExists_WorkspaceIdRemoved() {
+ // create an user data with 3 org id in the recently used workspaceId list
String sampleUserId = "abcd";
Mono<UserData> createUserDataMono = createUser(sampleUserId, List.of("123", "234", "345"), null);
- // remove the 345 org id from the recently used orgid list
+ // remove the 345 org id from the recently used workspaceId list
Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
userData -> userDataRepository.removeIdFromRecentlyUsedList(
userData.getUserId(), "345", List.of())
@@ -55,18 +55,18 @@ public void removeIdFromRecentlyUsedList_WhenOrgIdAlreadyExists_OrgIdRemoved() {
Mono<UserData> userDataAfterUpdateMono = updateResultMono.then(readUserDataMono);
StepVerifier.create(userDataAfterUpdateMono).assertNext(userData -> {
- Assert.assertEquals(2, userData.getRecentlyUsedOrgIds().size());
- Assert.assertArrayEquals(List.of("123", "234").toArray(), userData.getRecentlyUsedOrgIds().toArray());
+ Assert.assertEquals(2, userData.getRecentlyUsedWorkspaceIds().size());
+ Assert.assertArrayEquals(List.of("123", "234").toArray(), userData.getRecentlyUsedWorkspaceIds().toArray());
}).verifyComplete();
}
@Test
- public void removeIdFromRecentlyUsedList_WhenOrgIdDoesNotExist_NothingRemoved() {
- // create an user data with 3 org id in the recently used orgid list
+ public void removeIdFromRecentlyUsedList_WhenWorkspaceIdDoesNotExist_NothingRemoved() {
+ // create an user data with 3 org id in the recently used workspaceId list
String sampleUserId = "efgh";
Mono<UserData> createUserDataMono = createUser(sampleUserId, List.of("123", "234", "345"), null);
- // remove the 345 org id from the recently used orgid list
+ // remove the 345 org id from the recently used workspaceId list
Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
userData -> userDataRepository.removeIdFromRecentlyUsedList(
userData.getUserId(), "678", List.of()
@@ -80,8 +80,8 @@ public void removeIdFromRecentlyUsedList_WhenOrgIdDoesNotExist_NothingRemoved()
Mono<UserData> userDataAfterUpdateMono = updateResultMono.then(readUserDataMono);
StepVerifier.create(userDataAfterUpdateMono).assertNext(userData -> {
- Assert.assertEquals(3, userData.getRecentlyUsedOrgIds().size());
- Assert.assertArrayEquals(List.of("123", "234", "345").toArray(), userData.getRecentlyUsedOrgIds().toArray());
+ Assert.assertEquals(3, userData.getRecentlyUsedWorkspaceIds().size());
+ Assert.assertArrayEquals(List.of("123", "234", "345").toArray(), userData.getRecentlyUsedWorkspaceIds().toArray());
}).verifyComplete();
}
@@ -91,9 +91,9 @@ public void removeIdFromRecentlyUsedList_WhenAppIdExists_AppIdRemoved() {
String sampleUserId = "abcd";
Mono<UserData> createUserDataMono = createUser(sampleUserId, null, List.of("123", "456", "789"));
- // remove the 345 org id from the recently used orgid list
+ // remove the 345 org id from the recently used workspaceId list
Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
- // orgId does not matter
+ // workspaceId does not matter
userData -> userDataRepository.removeIdFromRecentlyUsedList(
userData.getUserId(), "345", List.of("123", "789")) // remove 123 and 789
);
@@ -112,16 +112,16 @@ public void removeIdFromRecentlyUsedList_WhenAppIdExists_AppIdRemoved() {
}
@Test
- public void removeIdFromRecentlyUsedList_WhenOrgIdAndAppIdExists_BothAreRemoved() {
+ public void removeIdFromRecentlyUsedList_WhenWorkspaceIdAndAppIdExists_BothAreRemoved() {
// create a user data with 3 app id in the recently used appId list
String sampleUserId = "abcd";
Mono<UserData> createUserDataMono = createUser(
sampleUserId, List.of("abc", "efg", "hij"), List.of("123", "456", "789")
);
- // remove the 345 org id from the recently used orgid list
+ // remove the 345 org id from the recently used workspaceId list
Mono<UpdateResult> updateResultMono = createUserDataMono.flatMap(
- // orgId does not matter
+ // workspaceId does not matter
userData -> userDataRepository.removeIdFromRecentlyUsedList(
userData.getUserId(), "efg", List.of("123", "789")) // remove 123 and 789
);
@@ -134,12 +134,12 @@ public void removeIdFromRecentlyUsedList_WhenOrgIdAndAppIdExists_BothAreRemoved(
StepVerifier.create(userDataAfterUpdateMono).assertNext(userData -> {
List<String> recentlyUsedAppIds = userData.getRecentlyUsedAppIds();
- List<String> recentlyUsedOrgIds = userData.getRecentlyUsedOrgIds();
+ List<String> recentlyUsedWorkspaceIds = userData.getRecentlyUsedWorkspaceIds();
assertThat(recentlyUsedAppIds.size()).isEqualTo(1);
assertThat(recentlyUsedAppIds.get(0)).isEqualTo("456");
- assertThat(recentlyUsedOrgIds.size()).isEqualTo(2);
- assertThat(recentlyUsedOrgIds).contains("abc", "hij");
+ assertThat(recentlyUsedWorkspaceIds.size()).isEqualTo(2);
+ assertThat(recentlyUsedWorkspaceIds).contains("abc", "hij");
}).verifyComplete();
}
}
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/WorkspaceRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/WorkspaceRepositoryTest.java
index caaddb1d8dcb..e70e2197b5e0 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/WorkspaceRepositoryTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/WorkspaceRepositoryTest.java
@@ -27,7 +27,7 @@
public class WorkspaceRepositoryTest {
@Autowired
- private WorkspaceRepository organizationRepository;
+ private WorkspaceRepository workspaceRepository;
@Test
public void updateUserRoleNames_WhenUserIdMatched_AllOrgsUpdated() {
@@ -53,16 +53,16 @@ public void updateUserRoleNames_WhenUserIdMatched_AllOrgsUpdated() {
// create two orgs
Mono<Tuple2<Workspace, Workspace>> aveOrgsMonoZip = Mono.zip(
- organizationRepository.save(org1), organizationRepository.save(org2)
+ workspaceRepository.save(org1), workspaceRepository.save(org2)
);
Mono<Tuple2<Workspace, Workspace>> updatedOrgTupleMono = aveOrgsMonoZip.flatMap(objects -> {
// update the user names
- return organizationRepository.updateUserRoleNames(userId, newUserName).thenReturn(objects);
- }).flatMap(organizationTuple2 -> {
+ return workspaceRepository.updateUserRoleNames(userId, newUserName).thenReturn(objects);
+ }).flatMap(workspaceTuple2 -> {
// fetch the two orgs again
- Mono<Workspace> updatedOrg1Mono = organizationRepository.findBySlug(org1.getId());
- Mono<Workspace> updatedOrg2Mono = organizationRepository.findBySlug(org2.getId());
+ Mono<Workspace> updatedOrg1Mono = workspaceRepository.findBySlug(org1.getId());
+ Mono<Workspace> updatedOrg2Mono = workspaceRepository.findBySlug(org2.getId());
return Mono.zip(updatedOrg1Mono, updatedOrg2Mono);
});
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
index d021fdd71043..ff099d8bcdd1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
@@ -168,7 +168,7 @@ public void testCreateCollection_withRepeatedActionName_throwsError() throws IOE
actionCollectionDTO.setName("testCollection");
actionCollectionDTO.setPageId("testPageId");
actionCollectionDTO.setApplicationId("testApplicationId");
- actionCollectionDTO.setOrganizationId("testOrganizationId");
+ actionCollectionDTO.setWorkspaceId("testWorkspaceId");
actionCollectionDTO.setPluginId("testPluginId");
actionCollectionDTO.setPluginType(PluginType.JS);
@@ -209,7 +209,7 @@ public void testCreateCollection_createActionFailure_returnsWithIncompleteCollec
actionCollectionDTO.setName("testCollection");
actionCollectionDTO.setPageId("testPageId");
actionCollectionDTO.setApplicationId("testApplicationId");
- actionCollectionDTO.setOrganizationId("testOrganizationId");
+ actionCollectionDTO.setWorkspaceId("testWorkspaceId");
actionCollectionDTO.setPluginId("testPluginId");
actionCollectionDTO.setPluginType(PluginType.JS);
actionCollectionDTO.setDefaultResources(setDefaultResources(actionCollectionDTO));
@@ -263,7 +263,7 @@ public void testCreateCollection_validCollection_returnsPopulatedCollection() th
actionCollectionDTO.setName("testCollection");
actionCollectionDTO.setPageId("testPageId");
actionCollectionDTO.setApplicationId("testApplicationId");
- actionCollectionDTO.setOrganizationId("testOrganizationId");
+ actionCollectionDTO.setWorkspaceId("testWorkspaceId");
actionCollectionDTO.setPluginId("testPluginId");
ActionDTO action = new ActionDTO();
action.setName("testAction");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
index 9777f62d905e..f23c4b129269 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
@@ -111,15 +111,15 @@ public class ActionCollectionServiceTest {
Datasource datasource;
- String orgId;
+ String workspaceId;
@Before
@WithUserDetails(value = "api_user")
public void setup() {
User apiUser = userService.findByEmail("api_user").block();
assert apiUser != null;
- orgId = apiUser.getOrganizationIds().iterator().next();
- Workspace workspace = workspaceService.getById(orgId).block();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
+ Workspace workspace = workspaceService.getById(workspaceId).block();
if (testApp == null && testPage == null) {
//Create application and page which will be used by the tests to create actions for.
@@ -156,12 +156,12 @@ public void setup() {
layout.setPublishedDsl(dsl);
}
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
assert testWorkspace != null;
- orgId = testWorkspace.getId();
+ workspaceId = testWorkspace.getId();
datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Plugin installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
assert installedJsPlugin != null;
datasource.setPluginId(installedJsPlugin.getId());
@@ -190,7 +190,7 @@ public void createValidActionCollectionAndCheckPermissions() {
ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
actionCollectionDTO.setName("testActionCollection");
actionCollectionDTO.setApplicationId(testApp.getId());
- actionCollectionDTO.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO.setPageId(testPage.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setPluginType(PluginType.JS);
@@ -216,7 +216,7 @@ public void addUserToWorkspaceAsAdminAndCheckActionCollectionPermissions() {
ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
actionCollectionDTO.setName("testActionCollection");
actionCollectionDTO.setApplicationId(testApp.getId());
- actionCollectionDTO.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO.setPageId(testPage.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setPluginType(PluginType.JS);
@@ -227,7 +227,7 @@ public void addUserToWorkspaceAsAdminAndCheckActionCollectionPermissions() {
userRole.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
userRole.setUsername("[email protected]");
- userWorkspaceService.addUserRoleToWorkspace(testApp.getOrganizationId(), userRole).block();
+ userWorkspaceService.addUserRoleToWorkspace(testApp.getWorkspaceId(), userRole).block();
assert actionCollection != null;
Mono<ActionCollection> readActionCollectionMono =
@@ -275,7 +275,7 @@ public void refactorNameForActionRefactorsNameInCollection() {
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(testPage.getId());
actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setOrganizationId(orgId);
+ actionCollectionDTO1.setWorkspaceId(workspaceId);
actionCollectionDTO1.setPluginId(datasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("testAction1");
@@ -290,7 +290,7 @@ public void refactorNameForActionRefactorsNameInCollection() {
actionCollectionDTO2.setName("testCollection2");
actionCollectionDTO2.setPageId(testPage.getId());
actionCollectionDTO2.setApplicationId(testApp.getId());
- actionCollectionDTO2.setOrganizationId(orgId);
+ actionCollectionDTO2.setWorkspaceId(workspaceId);
actionCollectionDTO2.setPluginId(datasource.getPluginId());
ActionDTO action2 = new ActionDTO();
action2.setActionConfiguration(new ActionConfiguration());
@@ -353,7 +353,7 @@ public void testRefactorActionName_withActionNameEqualsRun_doesNotRefactorApiRun
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(testPage.getId());
actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setOrganizationId(orgId);
+ actionCollectionDTO1.setWorkspaceId(workspaceId);
actionCollectionDTO1.setPluginId(datasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("run");
@@ -368,7 +368,7 @@ public void testRefactorActionName_withActionNameEqualsRun_doesNotRefactorApiRun
actionCollectionDTO2.setName("testCollection2");
actionCollectionDTO2.setPageId(testPage.getId());
actionCollectionDTO2.setApplicationId(testApp.getId());
- actionCollectionDTO2.setOrganizationId(orgId);
+ actionCollectionDTO2.setWorkspaceId(workspaceId);
actionCollectionDTO2.setPluginId(datasource.getPluginId());
ActionDTO action2 = new ActionDTO();
action2.setActionConfiguration(new ActionConfiguration());
@@ -431,7 +431,7 @@ public void testActionCollectionInViewMode() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(testPage.getId());
actionCollectionDTO.setApplicationId(testApp.getId());
- actionCollectionDTO.setOrganizationId(orgId);
+ actionCollectionDTO.setWorkspaceId(workspaceId);
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -495,7 +495,7 @@ public void testDeleteActionCollection_afterApplicationPublish_clearsActionColle
actionCollectionDTO.setName("deleteTestCollection1");
actionCollectionDTO.setPageId(testPage.getId());
actionCollectionDTO.setApplicationId(testApp.getId());
- actionCollectionDTO.setOrganizationId(orgId);
+ actionCollectionDTO.setWorkspaceId(workspaceId);
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -534,7 +534,7 @@ public void testUpdateActionCollection_verifyUpdatedAtFieldUpdated() {
ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
actionCollectionDTO.setName("testActionCollection");
actionCollectionDTO.setApplicationId(testApp.getId());
- actionCollectionDTO.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO.setPageId(testPage.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setPluginType(PluginType.JS);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
index 3aceebe3fa68..2e2f3f7aaa97 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
@@ -173,7 +173,7 @@ public class ApplicationServiceTest {
@Autowired
ReactiveMongoOperations mongoOperations;
- String orgId;
+ String workspaceId;
static Plugin testPlugin = new Plugin();
@@ -186,9 +186,9 @@ public class ApplicationServiceTest {
public void setup() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
if (StringUtils.isEmpty(gitConnectedApp.getId())) {
- gitConnectedApp.setOrganizationId(orgId);
+ gitConnectedApp.setWorkspaceId(workspaceId);
GitApplicationMetadata gitData = new GitApplicationMetadata();
gitData.setBranchName("testBranch");
gitData.setDefaultBranchName("testBranch");
@@ -205,7 +205,7 @@ public void setup() {
})
// Assign the branchName to all the resources connected to the application
.flatMap(application -> importExportApplicationService.exportApplicationById(application.getId(), gitData.getBranchName()))
- .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson, gitConnectedApp.getId(), gitData.getBranchName()))
+ .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson, gitConnectedApp.getId(), gitData.getBranchName()))
.block();
testPlugin = pluginService.findByName("Installed Plugin Name").block();
@@ -216,7 +216,7 @@ public void setup() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
testDatasource = datasourceService.create(datasource).block();
}
}
@@ -235,7 +235,7 @@ private Mono<? extends BaseDomain> getArchivedResource(String id, Class<? extend
public void createApplicationWithNullName() {
Application application = new Application();
Mono<Application> applicationMono = Mono.just(application)
- .flatMap(app -> applicationPageService.createApplication(app, orgId));
+ .flatMap(app -> applicationPageService.createApplication(app, workspaceId));
StepVerifier
.create(applicationMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
@@ -248,7 +248,7 @@ public void createApplicationWithNullName() {
public void createValidApplication() {
Application testApplication = new Application();
testApplication.setName("ApplicationServiceTest TestApp");
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId);
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId);
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
@@ -269,7 +269,7 @@ public void createValidApplication() {
assertThat(application.getName()).isEqualTo("ApplicationServiceTest TestApp");
assertThat(application.getPolicies()).isNotEmpty();
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
- assertThat(application.getOrganizationId()).isEqualTo(orgId);
+ assertThat(application.getWorkspaceId()).isEqualTo(workspaceId);
assertThat(application.getModifiedBy()).isEqualTo("api_user");
assertThat(application.getUpdatedAt()).isNotNull();
assertThat(application.getEvaluationVersion()).isEqualTo(EVALUATION_VERSION);
@@ -287,7 +287,7 @@ public void defaultPageCreateOnCreateApplicationTest() {
Application testApplication = new Application();
testApplication.setName("ApplicationServiceTest TestAppForTestingPage");
Flux<PageDTO> pagesFlux = applicationPageService
- .createApplication(testApplication, orgId)
+ .createApplication(testApplication, workspaceId)
// Fetch the unpublished pages by applicationId
.flatMapMany(application -> newPageService.findByApplicationId(application.getId(), READ_PAGES, false));
@@ -337,7 +337,7 @@ public void getApplicationNullId() {
public void validGetApplicationById() {
Application application = new Application();
application.setName("validGetApplicationById-Test");
- Mono<Application> createApplication = applicationPageService.createApplication(application, orgId);
+ Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
Mono<Application> getApplication = createApplication.flatMap(t -> applicationService.getById(t.getId()));
StepVerifier.create(getApplication)
.assertNext(t -> {
@@ -357,7 +357,7 @@ public void validGetApplicationsByName() {
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.set(FieldName.NAME, application.getName());
- Mono<Application> createApplication = applicationPageService.createApplication(application, orgId);
+ Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
Flux<Application> getApplication = createApplication.flatMapMany(t -> applicationService.get(params));
StepVerifier.create(getApplication)
@@ -427,7 +427,7 @@ public void validGetApplications() {
Policy readAppPolicy = Policy.builder().permission(READ_APPLICATIONS.getValue())
.users(Set.of("api_user"))
.build();
- Mono<Application> createApplication = applicationPageService.createApplication(application, orgId);
+ Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
List<Application> applicationList = createApplication
.flatMapMany(t -> applicationService.get(new LinkedMultiValueMap<>()))
.collectList()
@@ -454,7 +454,7 @@ public void validUpdateApplication() {
Mono<Application> createApplication =
applicationPageService
- .createApplication(application, orgId);
+ .createApplication(application, workspaceId);
Mono<Application> updateApplication = createApplication
.map(t -> {
t.setName("NewValidUpdateApplication-Test");
@@ -483,8 +483,8 @@ public void invalidUpdateApplication() {
testApp2.setName("validApplication2");
Mono<List<Application>> createMultipleApplications = Mono.zip(
- applicationPageService.createApplication(testApp1, orgId),
- applicationPageService.createApplication(testApp2, orgId))
+ applicationPageService.createApplication(testApp1, workspaceId),
+ applicationPageService.createApplication(testApp2, workspaceId))
.map(tuple -> List.of(tuple.getT1(), tuple.getT2()));
Mono<Application> updateInvalidApplication = createMultipleApplications
@@ -533,12 +533,12 @@ public void reuseDeletedAppName() {
secondApp.setName("Ghost app");
Mono<Application> firstAppDeletion = applicationPageService
- .createApplication(firstApp, orgId)
+ .createApplication(firstApp, workspaceId)
.flatMap(app -> applicationService.archive(app))
.cache();
Mono<Application> secondAppCreation = firstAppDeletion.then(
- applicationPageService.createApplication(secondApp, orgId));
+ applicationPageService.createApplication(secondApp, workspaceId));
StepVerifier
.create(Mono.zip(firstAppDeletion, secondAppCreation))
@@ -566,12 +566,12 @@ public void getAllApplicationsForHome() {
//In case of anonymous user, we should have errored out. Assert that the user is not anonymous.
assertThat(userHomepageDTO.getUser().getIsAnonymous()).isFalse();
- List<WorkspaceApplicationsDTO> workspaceApplicationsDTOs = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> workspaceApplicationsDTOs = userHomepageDTO.getWorkspaceApplications();
assertThat(workspaceApplicationsDTOs.size()).isPositive();
for (WorkspaceApplicationsDTO workspaceApplicationDTO : workspaceApplicationsDTOs) {
- if (workspaceApplicationDTO.getOrganization().getName().equals("Spring Test Workspace")) {
- assertThat(workspaceApplicationDTO.getOrganization().getUserPermissions()).contains("read:organizations");
+ if (workspaceApplicationDTO.getWorkspace().getName().equals("Spring Test Workspace")) {
+ assertThat(workspaceApplicationDTO.getWorkspace().getUserPermissions()).contains("read:workspaces");
Application application = workspaceApplicationDTO.getApplications().get(0);
assertThat(application.getUserPermissions()).contains("read:applications");
@@ -600,12 +600,12 @@ public void getOnlyDefaultApplicationsConnectedToGitForHome() {
AppsmithBeanUtils.copyNestedNonNullProperties(gitConnectedApp.getGitApplicationMetadata(), childBranchGitData);
childBranchGitData.setBranchName("childBranch");
branchedApplication.setGitApplicationMetadata(childBranchGitData);
- branchedApplication.setOrganizationId(orgId);
+ branchedApplication.setWorkspaceId(workspaceId);
branchedApplication.setName(gitConnectedApp.getName());
Mono<Application> branchedApplicationMono = applicationPageService.createApplication(branchedApplication);
- Mono<List<Application>> gitConnectedAppsMono = applicationService.findByOrganizationId(orgId, READ_APPLICATIONS)
+ Mono<List<Application>> gitConnectedAppsMono = applicationService.findByWorkspaceId(workspaceId, READ_APPLICATIONS)
.filter(application -> application.getGitApplicationMetadata() != null)
.collectList();
@@ -619,11 +619,11 @@ public void getOnlyDefaultApplicationsConnectedToGitForHome() {
//In case of anonymous user, we should have errored out. Assert that the user is not anonymous.
assertThat(userHomepageDTO.getUser().getIsAnonymous()).isFalse();
- List<WorkspaceApplicationsDTO> workspaceApplicationsDTOs = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> workspaceApplicationsDTOs = userHomepageDTO.getWorkspaceApplications();
assertThat(workspaceApplicationsDTOs.size()).isPositive();
for (WorkspaceApplicationsDTO workspaceApplicationDTO : workspaceApplicationsDTOs) {
- if (workspaceApplicationDTO.getOrganization().getId().equals(orgId)) {
+ if (workspaceApplicationDTO.getWorkspace().getId().equals(workspaceId)) {
List<Application> applications = workspaceApplicationDTO
.getApplications()
.stream()
@@ -646,7 +646,7 @@ public void getAllApplicationsForHomeWhenNoApplicationPresent() {
// Create an workspace for this user first.
Workspace workspace = new Workspace();
- workspace.setName("usertest's organization");
+ workspace.setName("usertest's workspace");
Mono<Workspace> workspaceMono = workspaceService.create(workspace);
Mono<UserHomepageDTO> allApplications = workspaceMono
@@ -659,11 +659,11 @@ public void getAllApplicationsForHomeWhenNoApplicationPresent() {
//In case of anonymous user, we should have errored out. Assert that the user is not anonymous.
assertThat(userHomepageDTO.getUser().getIsAnonymous()).isFalse();
- List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getWorkspaceApplications();
// There should be atleast one workspace present in the output.
WorkspaceApplicationsDTO orgAppDto = workspaceApplications.get(0);
- assertThat(orgAppDto.getOrganization().getUserPermissions().contains("read:organizations"));
+ assertThat(orgAppDto.getWorkspace().getUserPermissions().contains("read:workspaces"));
})
.verifyComplete();
@@ -689,7 +689,7 @@ public void validMakeApplicationPublic() {
.users(Set.of("api_user", FieldName.ANONYMOUS_USER))
.build();
- Application createdApplication = applicationPageService.createApplication(application, orgId).block();
+ Application createdApplication = applicationPageService.createApplication(application, workspaceId).block();
ApplicationAccessDTO applicationAccessDTO = new ApplicationAccessDTO();
applicationAccessDTO.setPublicAccess(true);
@@ -739,7 +739,7 @@ public void validMakeApplicationPrivate() {
.users(Set.of("api_user"))
.build();
- Mono<Application> createApplication = applicationPageService.createApplication(application, orgId);
+ Mono<Application> createApplication = applicationPageService.createApplication(application, workspaceId);
ApplicationAccessDTO applicationAccessDTO = new ApplicationAccessDTO();
Mono<Application> privateAppMono = createApplication
@@ -798,7 +798,7 @@ public void makeApplicationPublic_applicationWithGitMetadata_success() {
// Create a branch
Application testApplication = new Application();
testApplication.setName("branch1");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
gitApplicationMetadata.setDefaultApplicationId(gitConnectedApp.getId());
gitApplicationMetadata.setBranchName("test");
@@ -859,7 +859,7 @@ public void makeApplicationPrivate_applicationWithGitMetadata_success() {
// Create a branch
Application testApplication = new Application();
testApplication.setName("branch2");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
gitApplicationMetadata.setDefaultApplicationId(gitConnectedApp.getId());
gitApplicationMetadata.setBranchName("test2");
@@ -934,7 +934,7 @@ public void validMakeApplicationPublicWithActions() {
.users(Set.of("api_user", FieldName.ANONYMOUS_USER))
.build();
- Application createdApplication = applicationPageService.createApplication(application, orgId).block();
+ Application createdApplication = applicationPageService.createApplication(application, workspaceId).block();
String pageId = createdApplication.getPages().get(0).getId();
@@ -945,7 +945,7 @@ public void validMakeApplicationPublicWithActions() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource savedDatasource = datasourceService.create(datasource).block();
@@ -968,7 +968,7 @@ public void validMakeApplicationPublicWithActions() {
ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
actionCollectionDTO.setName("testActionCollection");
actionCollectionDTO.setApplicationId(createdApplication.getId());
- actionCollectionDTO.setOrganizationId(orgId);
+ actionCollectionDTO.setWorkspaceId(workspaceId);
actionCollectionDTO.setPageId(pageId);
actionCollectionDTO.setPluginId(installedJsPlugin.getId());
actionCollectionDTO.setPluginType(PluginType.JS);
@@ -1051,7 +1051,7 @@ public void cloneApplication_applicationWithGitMetadata_success() {
assertThat(clonedApplication.getId()).isNotNull();
assertThat(clonedApplication.getName().equals("ApplicationServiceTest Clone Source TestApp Copy"));
assertThat(clonedApplication.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
- assertThat(clonedApplication.getOrganizationId().equals(orgId));
+ assertThat(clonedApplication.getWorkspaceId().equals(workspaceId));
assertThat(clonedApplication.getModifiedBy()).isEqualTo("api_user");
assertThat(clonedApplication.getUpdatedAt()).isNotNull();
assertThat(clonedApplication.getEvaluationVersion()).isNotNull();
@@ -1195,7 +1195,7 @@ public void cloneApplication_applicationWithGitMetadataAndActions_success() {
List<NewAction> srcActionList = tuple.getT3();
assertThat(clonedApplication.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
- assertThat(clonedApplication.getOrganizationId().equals(orgId));
+ assertThat(clonedApplication.getWorkspaceId().equals(workspaceId));
assertThat(clonedApplication.getModifiedBy()).isEqualTo("api_user");
assertThat(clonedApplication.getUpdatedAt()).isNotNull();
@@ -1234,7 +1234,7 @@ public void cloneApplication_withActionAndActionCollection_success() {
Application testApplication = new Application();
testApplication.setName("ApplicationServiceTest Clone Source TestApp");
- Mono<Application> originalApplicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> originalApplicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.cache();
Map<String, List<String>> originalResourceIds = new HashMap<>();
@@ -1287,7 +1287,7 @@ public void cloneApplication_withActionAndActionCollection_success() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(application.getPages().get(0).getId());
actionCollectionDTO.setApplicationId(application.getId());
- actionCollectionDTO.setOrganizationId(application.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(application.getWorkspaceId());
actionCollectionDTO.setPluginId(testPlugin.getId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("export default {\n" +
@@ -1375,7 +1375,7 @@ public void cloneApplication_withActionAndActionCollection_success() {
assertThat(application.getId()).isNotNull();
assertThat(application.getName().equals("ApplicationServiceTest Clone Source TestApp Copy"));
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
- assertThat(application.getOrganizationId().equals(orgId));
+ assertThat(application.getWorkspaceId().equals(workspaceId));
assertThat(application.getModifiedBy()).isEqualTo("api_user");
assertThat(application.getUpdatedAt()).isNotNull();
List<ApplicationPage> pages = application.getPages();
@@ -1531,7 +1531,7 @@ public void cloneApplication_withDeletedActionInActionCollection_deletedActionIs
Application testApplication = new Application();
testApplication.setName("ApplicationServiceTest-clone-application-deleted-action-within-collection");
- Mono<Application> originalApplicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> originalApplicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.cache();
Map<String, List<String>> originalResourceIds = new HashMap<>();
@@ -1556,7 +1556,7 @@ public void cloneApplication_withDeletedActionInActionCollection_deletedActionIs
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(application.getPages().get(0).getId());
actionCollectionDTO.setApplicationId(application.getId());
- actionCollectionDTO.setOrganizationId(application.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(application.getWorkspaceId());
actionCollectionDTO.setPluginId(testPlugin.getId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("export default {\n" +
@@ -1686,7 +1686,7 @@ public void cloneApplication_withDeletedActionInActionCollection_deletedActionIs
assertThat(application.getId()).isNotNull();
assertThat(application.getName().equals("ApplicationServiceTest Clone Source TestApp Copy"));
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
- assertThat(application.getOrganizationId().equals(orgId));
+ assertThat(application.getWorkspaceId().equals(workspaceId));
assertThat(application.getModifiedBy()).isEqualTo("api_user");
assertThat(application.getUpdatedAt()).isNotNull();
List<ApplicationPage> pages = application.getPages();
@@ -1765,7 +1765,7 @@ public void cloneApplication_withDeletedActionInActionCollection_deletedActionIs
public void cloneGitConnectedApplication_withUpdatedDefaultBranch_sucess() {
Application application = new Application();
application.setName("cloneGitConnectedApplication_withUpdatedDefaultBranch_sucess");
- application.setOrganizationId(orgId);
+ application.setWorkspaceId(workspaceId);
Application defaultApp = applicationPageService.createApplication(application)
.flatMap(application1 -> {
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
@@ -1785,7 +1785,7 @@ public void cloneGitConnectedApplication_withUpdatedDefaultBranch_sucess() {
// Add a branch to the git connected app
application = new Application();
application.setName("cloneGitConnectedApplication_withUpdatedDefaultBranch_sucess");
- application.setOrganizationId(orgId);
+ application.setWorkspaceId(workspaceId);
Mono<Application> forkedApp = applicationPageService.createApplication(application)
.flatMap(application1 -> {
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
@@ -1825,7 +1825,7 @@ public void basicPublishApplicationTest() {
String appName = "ApplicationServiceTest Publish Application";
testApplication.setName(appName);
testApplication.setAppLayout(new Application.AppLayout(Application.AppLayout.Type.DESKTOP));
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> applicationPageService.publish(application.getId(), true))
.then(applicationService.findByName(appName, MANAGE_APPLICATIONS))
.cache();
@@ -1879,7 +1879,7 @@ public void publishApplication_withArchivedUnpublishedResources_resourcesArchive
String appName = "Publish Application With Archived Page";
testApplication.setName(appName);
testApplication.setAppLayout(new Application.AppLayout(Application.AppLayout.Type.DESKTOP));
- Mono<Tuple3<NewAction, ActionCollection, NewPage>> resultMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Tuple3<NewAction, ActionCollection, NewPage>> resultMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> {
PageDTO page = new PageDTO();
page.setName("New Page");
@@ -1898,7 +1898,7 @@ public void publishApplication_withArchivedUnpublishedResources_resourcesArchive
final Plugin installedPlugin = tuple.getT2();
final Datasource datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
datasource.setPluginId(installedPlugin.getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -1917,7 +1917,7 @@ public void publishApplication_withArchivedUnpublishedResources_resourcesArchive
actionCollectionDTO.setPageId(page.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setApplicationId(testApplication.getId());
- actionCollectionDTO.setOrganizationId(testApplication.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(testApplication.getWorkspaceId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
ActionDTO action1 = new ActionDTO();
action1.setName("publishApplicationTest");
@@ -2019,7 +2019,7 @@ public void deleteUnpublishedPageFromApplication() {
Application testApplication = new Application();
String appName = "ApplicationServiceTest Publish Application Delete Page";
testApplication.setName(appName);
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> {
PageDTO page = new PageDTO();
page.setName("New Page");
@@ -2109,7 +2109,7 @@ public void changeDefaultPageForAPublishedApplication() {
Application testApplication = new Application();
String appName = "ApplicationServiceTest Publish Application Change Default Page";
testApplication.setName(appName);
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> {
PageDTO page = new PageDTO();
page.setName("New Page");
@@ -2173,7 +2173,7 @@ public void getApplicationInViewMode() {
Application testApplication = new Application();
String appName = "ApplicationServiceTest Get Application In View Mode";
testApplication.setName(appName);
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> {
PageDTO page = new PageDTO();
page.setName("New Page");
@@ -2227,7 +2227,7 @@ public void validCloneApplicationWhenCancelledMidWay() {
String appName = "ApplicationServiceTest Clone Application Midway Cancellation";
testApplication.setName(appName);
- Application originalApplication = applicationPageService.createApplication(testApplication, orgId)
+ Application originalApplication = applicationPageService.createApplication(testApplication, workspaceId)
.block();
String pageId = originalApplication.getPages().get(0).getId();
@@ -2239,7 +2239,7 @@ public void validCloneApplicationWhenCancelledMidWay() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource savedDatasource = datasourceService.create(datasource).block();
@@ -2274,7 +2274,7 @@ public void validCloneApplicationWhenCancelledMidWay() {
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(pageId);
actionCollectionDTO1.setApplicationId(originalApplication.getId());
- actionCollectionDTO1.setOrganizationId(orgId);
+ actionCollectionDTO1.setWorkspaceId(workspaceId);
actionCollectionDTO1.setPluginId(datasource.getPluginId());
ActionDTO jsAction = new ActionDTO();
jsAction.setName("jsFunc");
@@ -2349,7 +2349,7 @@ public void validCloneApplicationWhenCancelledMidWay() {
public void newApplicationShouldHavePublishedState() {
Application testApplication = new Application();
testApplication.setName("ApplicationServiceTest NewApp PublishedState");
- Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, orgId).cache();
+ Mono<Application> applicationMono = applicationPageService.createApplication(testApplication, workspaceId).cache();
Mono<PageDTO> publishedPageMono = applicationMono
.flatMap(application -> {
@@ -2381,7 +2381,7 @@ public void validGetApplicationPagesMultiPageApp() {
Application app = new Application();
app.setName("validGetApplicationPagesMultiPageApp-Test");
- Mono<Application> createApplicationMono = applicationPageService.createApplication(app, orgId)
+ Mono<Application> createApplicationMono = applicationPageService.createApplication(app, workspaceId)
.cache();
// Create all the pages for this application in a blocking manner.
@@ -2432,7 +2432,7 @@ public void validChangeViewAccessCancelledMidWay() {
String appName = "ApplicationServiceTest Public View Application Midway Cancellation";
testApplication.setName(appName);
- Application originalApplication = applicationPageService.createApplication(testApplication, orgId)
+ Application originalApplication = applicationPageService.createApplication(testApplication, workspaceId)
.block();
String pageId = originalApplication.getPages().get(0).getId();
@@ -2444,7 +2444,7 @@ public void validChangeViewAccessCancelledMidWay() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource savedDatasource = datasourceService.create(datasource).block();
@@ -2573,7 +2573,7 @@ public void saveLastEditInformation_WhenUserHasPermission_Updated() {
testApplication.setModifiedBy("test-user");
testApplication.setIsPublic(true);
- Mono<Application> updatedApplication = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Application> updatedApplication = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application ->
applicationService.saveLastEditInformation(application.getId())
);
@@ -2590,7 +2590,7 @@ public void saveLastEditInformation_WhenUserHasPermission_Updated() {
@Test
public void generateSshKeyPair_WhenDefaultApplicationIdNotSet_CurrentAppUpdated() {
Application unsavedApplication = new Application();
- unsavedApplication.setOrganizationId(orgId);
+ unsavedApplication.setWorkspaceId(workspaceId);
Map<String, Policy> policyMap = policyUtils.generatePolicyFromPermission(Set.of(MANAGE_APPLICATIONS), "api_user");
unsavedApplication.setPolicies(Set.copyOf(policyMap.values()));
unsavedApplication.setName("ssh-test-app");
@@ -2621,7 +2621,7 @@ public void generateSshKeyPair_WhenDefaultApplicationIdSet_DefaultApplicationUpd
Application unsavedMainApp = new Application();
unsavedMainApp.setPolicies(policies);
unsavedMainApp.setName("ssh-key-master-app");
- unsavedMainApp.setOrganizationId(orgId);
+ unsavedMainApp.setWorkspaceId(workspaceId);
Mono<Tuple2<Application, Application>> tuple2Mono = applicationRepository.save(unsavedMainApp)
.flatMap(savedApplication -> applicationService.createOrUpdateSshKeyPair(savedApplication.getId(), null).thenReturn(savedApplication))
@@ -2631,7 +2631,7 @@ public void generateSshKeyPair_WhenDefaultApplicationIdSet_DefaultApplicationUpd
unsavedChildApp.getGitApplicationMetadata().setDefaultApplicationId(savedMainApp.getId());
unsavedChildApp.setPolicies(policies);
unsavedChildApp.setName("ssh-key-child-app");
- unsavedChildApp.setOrganizationId(orgId);
+ unsavedChildApp.setWorkspaceId(workspaceId);
return applicationRepository.save(unsavedChildApp);
})
.flatMap(savedChildApp ->
@@ -2678,7 +2678,7 @@ public void deleteApplication_withPagesActionsAndActionCollections_resourcesArch
String appName = "deleteApplicationWithPagesAndActions";
testApplication.setName(appName);
- Mono<Tuple3<NewAction, ActionCollection, NewPage>> resultMono = applicationPageService.createApplication(testApplication, orgId)
+ Mono<Tuple3<NewAction, ActionCollection, NewPage>> resultMono = applicationPageService.createApplication(testApplication, workspaceId)
.flatMap(application -> {
PageDTO page = new PageDTO();
page.setName("New Page");
@@ -2698,7 +2698,7 @@ public void deleteApplication_withPagesActionsAndActionCollections_resourcesArch
final Datasource datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
datasource.setPluginId(installedPlugin.getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -2717,7 +2717,7 @@ public void deleteApplication_withPagesActionsAndActionCollections_resourcesArch
actionCollectionDTO.setPageId(page.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setApplicationId(testApplication.getId());
- actionCollectionDTO.setOrganizationId(testApplication.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(testApplication.getWorkspaceId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
ActionDTO action1 = new ActionDTO();
action1.setName("archivePageTest");
@@ -2779,7 +2779,7 @@ public void deleteApplication_withNullGitData_Success() {
Application testApplication = new Application();
String appName = "deleteApplication_withNullGitData_Success";
testApplication.setName(appName);
- Application application = applicationPageService.createApplication(testApplication, orgId).block();
+ Application application = applicationPageService.createApplication(testApplication, workspaceId).block();
Mono<Application> applicationMono = applicationPageService.deleteApplication(application.getId());
@@ -2803,7 +2803,7 @@ public void deleteApplication_WithDeployKeysNotConnectedToRemote_Success() {
gitAuth.setPublicKey("publicKey");
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
- Application application = applicationPageService.createApplication(testApplication, orgId).block();
+ Application application = applicationPageService.createApplication(testApplication, workspaceId).block();
Mono<Application> applicationMono = applicationPageService.deleteApplication(application.getId());
@@ -2828,7 +2828,7 @@ public void cloneApplication_WithCustomSavedTheme_ThemesAlsoCopied() {
Mono<Theme> createTheme = themeService.create(theme);
Mono<Tuple2<Theme, Tuple2<Application, Application>>> tuple2Application = createTheme
- .then(applicationPageService.createApplication(testApplication, orgId))
+ .then(applicationPageService.createApplication(testApplication, workspaceId))
.flatMap(application ->
themeService.updateTheme(application.getId(), null, theme).then(
themeService.persistCurrentTheme(application.getId(), null, new Theme())
@@ -2849,7 +2849,7 @@ public void cloneApplication_WithCustomSavedTheme_ThemesAlsoCopied() {
Application srcApp = objects.getT2().getT2();
assertThat(clonedApp.getEditModeThemeId()).isNotEqualTo(srcApp.getEditModeThemeId());
assertThat(clonedTheme.getApplicationId()).isNull();
- assertThat(clonedTheme.getOrganizationId()).isNull();
+ assertThat(clonedTheme.getWorkspaceId()).isNull();
})
.verifyComplete();
}
@@ -2863,14 +2863,14 @@ public void getApplicationConnectedToGit_defaultBranchUpdated_returnBranchSpecif
Application testApplication = new Application();
testApplication.setName("getApplicationConnectedToGit_defaultBranchUpdated_returnBranchSpecificApplication");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
GitApplicationMetadata gitData = new GitApplicationMetadata();
gitData.setBranchName("release");
gitData.setDefaultApplicationId(gitConnectedApp.getId());
testApplication.setGitApplicationMetadata(gitData);
Application application = applicationPageService.createApplication(testApplication)
.flatMap(application1 -> importExportApplicationService.exportApplicationById(gitConnectedApp.getId(), gitData.getBranchName())
- .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson, application1.getId(), gitData.getBranchName())))
+ .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson, application1.getId(), gitData.getBranchName())))
.block();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/BaseServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/BaseServiceTest.java
index fca0b81e7499..15bfc552e2d1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/BaseServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/BaseServiceTest.java
@@ -48,9 +48,9 @@ public void setup() {
testApplication.setName("BaseServiceTest TestApp");
User apiUser = userService.findByEmail("api_user").block();
- String orgId = apiUser.getOrganizationIds().iterator().next();
+ String workspaceId = apiUser.getWorkspaceIds().iterator().next();
- applicationPageService.createApplication(testApplication, orgId).subscribe();
+ applicationPageService.createApplication(testApplication, workspaceId).subscribe();
}
@Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
index cc798e430393..1c1ff5cddf0c 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CommentServiceTest.java
@@ -116,7 +116,7 @@ public void setup() {
.create(workspace).flatMap(workspace1 -> {
Application application = new Application();
application.setName(randomId + "-test-app");
- application.setOrganizationId(workspace1.getId());
+ application.setWorkspaceId(workspace1.getId());
return applicationPageService.createApplication(application);
})
.flatMap(application -> {
@@ -635,8 +635,8 @@ public void createThread_WhenPublicAppAndOutsideUser_CommentIsCreated() {
userRole.setRole(AppsmithRole.ORGANIZATION_ADMIN);
return userService.create(user)
- .then(userWorkspaceService.addUserRoleToWorkspace(application.getOrganizationId(), userRole))
- .then(userWorkspaceService.leaveWorkspace(application.getOrganizationId()))
+ .then(userWorkspaceService.addUserRoleToWorkspace(application.getWorkspaceId(), userRole))
+ .then(userWorkspaceService.leaveWorkspace(application.getWorkspaceId()))
.thenReturn(application);
}).flatMap(application -> {
String pageId = application.getPublishedPages().get(0).getId();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
index 38b50fb62804..e3540de6df83 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
@@ -64,7 +64,7 @@ public class CurlImporterServiceTest {
@Autowired
UserService userService;
- String orgId;
+ String workspaceId;
@Before
@WithUserDetails(value = "api_user")
@@ -73,7 +73,7 @@ public void setup() {
.thenReturn(List.of(this.pluginExecutor));
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
}
@Test
@@ -154,12 +154,12 @@ public void testImportAction_EmptyLex() {
Application app = new Application();
app.setName("curlTest Incorrect Command");
- Application application = applicationPageService.createApplication(app, orgId).block();
+ Application application = applicationPageService.createApplication(app, workspaceId).block();
assert application != null;
PageDTO page = newPageService.findPageById(application.getPages().get(0).getId(), AclPermission.MANAGE_PAGES, false).block();
assert page != null;
- Mono<ActionDTO> action = curlImporterService.importAction("'", page.getId(), "actionName", orgId, null);
+ Mono<ActionDTO> action = curlImporterService.importAction("'", page.getId(), "actionName", workspaceId, null);
StepVerifier
.create(action)
@@ -179,7 +179,7 @@ public void importValidCurlCommand() {
Application app = new Application();
app.setName("curlTest App");
- Mono<Application> applicationMono = applicationPageService.createApplication(app, orgId)
+ Mono<Application> applicationMono = applicationPageService.createApplication(app, workspaceId)
.flatMap(application1 -> {
String pageId = application1.getPages().get(0).getId();
return newPageService.findById(pageId, AclPermission.MANAGE_PAGES)
@@ -197,7 +197,7 @@ public void importValidCurlCommand() {
String command = "curl -X GET http://localhost:8080/api/v1/actions?name=something -H 'Accept: */*' -H 'Accept-Encoding: gzip, deflate' -H 'Authorization: Basic YXBpX3VzZXI6OHVBQDsmbUI6Y252Tn57Iw==' -H 'Cache-Control: no-cache' -H 'Connection: keep-alive' -H 'Content-Type: application/json' -H 'Cookie: SESSION=97c5def4-4f72-45aa-96fe-e8a9f5ade0b5,SESSION=97c5def4-4f72-45aa-96fe-e8a9f5ade0b5; SESSION=' -H 'Host: localhost:8080' -H 'Postman-Token: 16e4b6bc-2c7a-4ab1-a127-bca382dfc0f0,a6655daa-db07-4c5e-aca3-3fd505bd230d' -H 'User-Agent: PostmanRuntime/7.20.1' -H 'cache-control: no-cache' -d '{someJson}'";
Mono<ActionDTO> resultMono = defaultPageMono
- .flatMap(page -> curlImporterService.importAction(command, page.getId(), "actionName", orgId, "main"))
+ .flatMap(page -> curlImporterService.importAction(command, page.getId(), "actionName", workspaceId, "main"))
.cache();
Mono<NewAction> savedActionMono = resultMono.flatMap(actionDTO -> newActionService.getById(actionDTO.getId()));
@@ -230,7 +230,7 @@ public void importValidCurlCommand() {
Application branchedApplication = new Application();
branchedApplication.setName("branched curl test app");
- branchedApplication.setOrganizationId(orgId);
+ branchedApplication.setWorkspaceId(workspaceId);
branchedApplication = applicationPageService.createApplication(branchedApplication).block();
String branchedPageId = branchedApplication.getPages().get(0).getId();
@@ -246,7 +246,7 @@ public void importValidCurlCommand() {
.cache();
Mono<ActionDTO> branchedResultMono = branchedPageMono
- .flatMap(page -> curlImporterService.importAction(command, page.getDefaultResources().getPageId(), "actionName", orgId, "testBranch"))
+ .flatMap(page -> curlImporterService.importAction(command, page.getDefaultResources().getPageId(), "actionName", workspaceId, "testBranch"))
.cache();
// As importAction updates the ids with the defaultIds before sending the response to client we have to again
@@ -460,7 +460,7 @@ public void postmanExportCommands1() throws AppsmithException {
"--header 'Authorization: Basic abcdefghijklmnop==' \\\n" +
"--header 'Content-Type: text/plain' \\\n" +
"--data-raw '{\n" +
- "\t\"organizationId\" : \"5d8c9e946599b93bd51a3400\"\n" +
+ "\t\"workspaceId\" : \"5d8c9e946599b93bd51a3400\"\n" +
"}'"
);
assertMethod(action, HttpMethod.PUT);
@@ -472,7 +472,7 @@ public void postmanExportCommands1() throws AppsmithException {
new Property("Content-Type", "text/plain")
);
assertBody(action, "{\n" +
- "\t\"organizationId\" : \"5d8c9e946599b93bd51a3400\"\n" +
+ "\t\"workspaceId\" : \"5d8c9e946599b93bd51a3400\"\n" +
"}");
}
@@ -830,7 +830,7 @@ public void importInvalidHeader() {
public void importInvalidCurlCommand() {
String command = "invalid curl command here";
- Mono<ActionDTO> actionMono = curlImporterService.importAction(command, "pageId", "actionName", orgId, null);
+ Mono<ActionDTO> actionMono = curlImporterService.importAction(command, "pageId", "actionName", workspaceId, null);
StepVerifier
.create(actionMono)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
index 62e364318760..3418b6571c04 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
@@ -44,13 +44,13 @@ public class DatasourceContextServiceTest {
@MockBean
PluginExecutorHelper pluginExecutorHelper;
- String orgId = "";
+ String workspaceId = "";
@Before
@WithUserDetails(value = "api_user")
public void setup() {
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
- orgId = testWorkspace.getId();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
+ workspaceId = testWorkspace.getId();
}
@Test
@@ -70,7 +70,7 @@ public void checkDecryptionOfAuthenticationDTOTest() {
authenticationDTO.setPassword(password);
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
final Datasource createdDatasource = pluginMono
.map(plugin -> {
@@ -108,7 +108,7 @@ public void checkDecryptionOfAuthenticationDTONullPassword() {
DBAuth authenticationDTO = new DBAuth();
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
final Datasource createdDatasource = pluginMono
.map(plugin -> {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
index bc074778c69a..ae0d208db45b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
@@ -9,6 +9,7 @@
import com.appsmith.external.models.Endpoint;
import com.appsmith.external.models.OAuth2;
import com.appsmith.external.models.Policy;
+import com.appsmith.external.models.QDatasource;
import com.appsmith.external.models.SSLDetails;
import com.appsmith.external.models.UploadedFile;
import com.appsmith.external.services.EncryptionService;
@@ -54,6 +55,7 @@
import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static org.assertj.core.api.Assertions.assertThat;
+import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
@RunWith(SpringRunner.class)
@SpringBootTest
@@ -88,18 +90,18 @@ public class DatasourceServiceTest {
@MockBean
PluginExecutorHelper pluginExecutorHelper;
- String orgId = "";
+ String workspaceId = "";
@Before
@WithUserDetails(value = "api_user")
public void setup() {
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
- orgId = testWorkspace == null ? "" : testWorkspace.getId();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
+ workspaceId = testWorkspace == null ? "" : testWorkspace.getId();
}
@Test
@WithUserDetails(value = "api_user")
- public void datasourceDefaultNameCounterAsPerOrgId() {
+ public void datasourceDefaultNameCounterAsPerWorkspaceId() {
//Create new workspace
Workspace workspace11 = new Workspace();
workspace11.setId("random-org-id-1");
@@ -108,7 +110,7 @@ public void datasourceDefaultNameCounterAsPerOrgId() {
StepVerifier.create(workspaceService.create(workspace11)
.flatMap(org -> {
Datasource datasource = new Datasource();
- datasource.setOrganizationId(org.getId());
+ datasource.setWorkspaceId(org.getId());
return datasourceService.create(datasource);
})
.flatMap(datasource1 -> {
@@ -120,14 +122,14 @@ public void datasourceDefaultNameCounterAsPerOrgId() {
.flatMap(object -> {
final Workspace org2 = object.getT2();
Datasource datasource2 = new Datasource();
- datasource2.setOrganizationId(org2.getId());
+ datasource2.setWorkspaceId(org2.getId());
return Mono.zip(Mono.just(object.getT1()), datasourceService.create(datasource2));
}))
.assertNext(datasource -> {
assertThat(datasource.getT1().getName()).isEqualTo("Untitled Datasource");
- assertThat(datasource.getT1().getOrganizationId()).isEqualTo("random-org-id-1");
+ assertThat(datasource.getT1().getWorkspaceId()).isEqualTo("random-org-id-1");
assertThat(datasource.getT2().getName()).isEqualTo("Untitled Datasource");
- assertThat(datasource.getT2().getOrganizationId()).isEqualTo("random-org-id-2");
+ assertThat(datasource.getT2().getWorkspaceId()).isEqualTo("random-org-id-2");
})
.verifyComplete();
}
@@ -137,7 +139,7 @@ public void datasourceDefaultNameCounterAsPerOrgId() {
public void createDatasourceWithNullPluginId() {
Datasource datasource = new Datasource();
datasource.setName("DS-with-null-pluginId");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
StepVerifier
.create(datasourceService.create(datasource))
.assertNext(createdDatasource -> {
@@ -151,9 +153,9 @@ public void createDatasourceWithNullPluginId() {
@Test
@WithUserDetails(value = "api_user")
- public void createDatasourceWithNullOrganizationId() {
+ public void createDatasourceWithNullWorkspaceId() {
Datasource datasource = new Datasource();
- datasource.setName("DS-with-null-organizationId");
+ datasource.setName("DS-with-null-workspaceId");
datasource.setPluginId("random plugin id");
StepVerifier
.create(datasourceService.validateDatasource(datasource))
@@ -170,7 +172,7 @@ public void createDatasourceWithNullOrganizationId() {
public void createDatasourceWithId() {
Datasource datasource = new Datasource();
datasource.setId("randomId");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
StepVerifier
.create(datasourceService.create(datasource))
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
@@ -186,7 +188,7 @@ public void createDatasourceNotInstalledPlugin() {
Mono<Plugin> pluginMono = pluginService.findByName("Not Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("DS-with-uninstalled-plugin");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -217,7 +219,7 @@ public void createDatasourceValid() {
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("test datasource name");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -255,7 +257,7 @@ public void createAndUpdateDatasourceValidDB() {
Datasource datasource = new Datasource();
datasource.setName("test db datasource");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Connection connection = new Connection();
connection.setMode(Connection.Mode.READ_ONLY);
@@ -268,7 +270,7 @@ public void createAndUpdateDatasourceValidDB() {
datasourceConfiguration.setConnection(connection);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -309,7 +311,7 @@ public void createAndUpdateDatasourceDifferentAuthentication() {
Datasource datasource = new Datasource();
datasource.setName("test db datasource1");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Connection connection = new Connection();
connection.setMode(Connection.Mode.READ_ONLY);
@@ -326,7 +328,7 @@ public void createAndUpdateDatasourceDifferentAuthentication() {
datasourceConfiguration.setAuthentication(auth);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -376,12 +378,12 @@ public void createNamelessDatasource() {
Datasource datasource1 = new Datasource();
datasource1.setDatasourceConfiguration(new DatasourceConfiguration());
datasource1.getDatasourceConfiguration().setUrl("http://test.com");
- datasource1.setOrganizationId(orgId);
+ datasource1.setWorkspaceId(workspaceId);
Datasource datasource2 = new Datasource();
datasource2.setDatasourceConfiguration(new DatasourceConfiguration());
datasource2.getDatasourceConfiguration().setUrl("http://test.com");
- datasource2.setOrganizationId(orgId);
+ datasource2.setWorkspaceId(workspaceId);
final Mono<Tuple2<Datasource, Datasource>> datasourcesMono = pluginMono
.flatMap(plugin -> {
@@ -418,7 +420,7 @@ public void testDatasourceValid() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -444,7 +446,7 @@ public void testDatasourceEmptyFields() {
Datasource datasource = new Datasource();
datasource.setName("test db datasource empty");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Connection connection = new Connection();
connection.setMode(Connection.Mode.READ_ONLY);
@@ -461,7 +463,7 @@ public void testDatasourceEmptyFields() {
datasourceConfiguration.setAuthentication(auth);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -497,7 +499,7 @@ public void deleteDatasourceWithoutActions() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Datasource> datasourceMono = pluginMono
.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -524,7 +526,7 @@ public void deleteDatasourceWithActions() {
Mono<Datasource> datasourceMono = Mono
.zip(
- workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_ORGANIZATIONS),
+ workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_WORKSPACES),
pluginService.findByName("Installed Plugin Name")
)
.flatMap(objects -> {
@@ -536,7 +538,7 @@ public void deleteDatasourceWithActions() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(workspace.getId());
+ datasource.setWorkspaceId(workspace.getId());
datasource.setPluginId(plugin.getId());
final Application application = new Application();
@@ -566,7 +568,7 @@ public void deleteDatasourceWithActions() {
ActionDTO action = new ActionDTO();
action.setName("validAction");
- action.setOrganizationId(objects.getT1().getId());
+ action.setWorkspaceId(objects.getT1().getId());
action.setPluginId(objects.getT2().getId());
action.setPageId(page.getId());
ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -590,7 +592,7 @@ public void deleteDatasourceWithDeletedActions() {
Mono<Datasource> datasourceMono = Mono
.zip(
- workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_ORGANIZATIONS),
+ workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_WORKSPACES),
pluginService.findByName("Installed Plugin Name")
)
.flatMap(objects -> {
@@ -602,7 +604,7 @@ public void deleteDatasourceWithDeletedActions() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(workspace.getId());
+ datasource.setWorkspaceId(workspace.getId());
datasource.setPluginId(plugin.getId());
final Application application = new Application();
@@ -633,7 +635,7 @@ public void deleteDatasourceWithDeletedActions() {
ActionDTO action = new ActionDTO();
action.setName("validAction");
- action.setOrganizationId(objects.getT1().getId());
+ action.setWorkspaceId(objects.getT1().getId());
action.setPluginId(objects.getT2().getId());
action.setPageId(page.getId());
ActionConfiguration actionConfiguration = new ActionConfiguration();
@@ -676,7 +678,7 @@ public void checkEncryptionOfAuthenticationDTOTest() {
authenticationDTO.setPassword(password);
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -707,7 +709,7 @@ public void checkEncryptionOfAuthenticationDTONullPassword() {
authenticationDTO.setDatabaseName("admin");
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -743,7 +745,7 @@ public void checkEncryptionOfAuthenticationDTOAfterUpdate() {
authenticationDTO.setPassword(password);
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource createdDatasource = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -792,7 +794,7 @@ public void checkEncryptionOfAuthenticationDTOAfterRemoval() {
authenticationDTO.setPassword(password);
datasourceConfiguration.setAuthentication(authenticationDTO);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource createdDatasource = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -826,7 +828,7 @@ public void createDatasourceWithInvalidCharsInHost() {
Mono<Plugin> pluginMono = pluginService.findByPackageName("installed-db-plugin");
Datasource datasource = new Datasource();
datasource.setName("test datasource name with invalid hostnames");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setEndpoints(new ArrayList<>());
datasourceConfiguration.getEndpoints().add(new Endpoint("hostname/", 5432L));
@@ -869,7 +871,7 @@ public void createDatasourceWithHostnameStartingWithSpace() {
Mono<Plugin> pluginMono = pluginService.findByPackageName("installed-db-plugin");
Datasource datasource = new Datasource();
datasource.setName("test datasource name with hostname starting/ending with space");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setEndpoints(new ArrayList<>());
datasourceConfiguration.getEndpoints().add(new Endpoint(" hostname ", 5432L));
@@ -904,7 +906,7 @@ public void testHintMessageOnLocalhostUrlOnTestDatasourceEvent() {
datasourceConfiguration.setEndpoints(new ArrayList<>());
datasourceConfiguration.getEndpoints().add(endpoint);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Datasource> datasourceMono = pluginMono.map(plugin -> {
datasource.setPluginId(plugin.getId());
@@ -943,7 +945,7 @@ public void testHintMessageOnLocalhostUrlOnCreateEventOnApiDatasource() {
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("testName 2");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://localhost");
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -976,7 +978,7 @@ public void testHintMessageOnLocalhostUrlOnUpdateEventOnApiDatasource() {
Datasource datasource = new Datasource();
datasource.setName("testName 3");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Connection connection = new Connection();
connection.setMode(Connection.Mode.READ_ONLY);
@@ -984,7 +986,7 @@ public void testHintMessageOnLocalhostUrlOnUpdateEventOnApiDatasource() {
datasourceConfiguration.setConnection(connection);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -1029,7 +1031,7 @@ public void testHintMessageOnLocalhostUrlOnCreateEventOnNonApiDatasource() {
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("testName 4");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Endpoint endpoint = new Endpoint("http://localhost", 0L);
datasourceConfiguration.setEndpoints(new ArrayList<>());
@@ -1065,7 +1067,7 @@ public void testHintMessageOnLocalhostIPAddressOnUpdateEventOnNonApiDatasource()
Datasource datasource = new Datasource();
datasource.setName("testName 5");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
Connection connection = new Connection();
connection.setMode(Connection.Mode.READ_ONLY);
@@ -1073,7 +1075,7 @@ public void testHintMessageOnLocalhostIPAddressOnUpdateEventOnNonApiDatasource()
datasourceConfiguration.setConnection(connection);
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
@@ -1120,7 +1122,7 @@ public void testHintMessageNPE() {
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("NPE check");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setEndpoints(new ArrayList<>());
Endpoint nullEndpoint = null;
@@ -1148,16 +1150,16 @@ public void testHintMessageNPE() {
public void get_WhenDatasourcesPresent_SortedAndIsRecentlyCreatedFlagSet() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
- String organizationId = UUID.randomUUID().toString();
+ String workspaceId = UUID.randomUUID().toString();
List<Datasource> datasourceList = List.of(
- createDatasource("D", organizationId), // should have isRecentlyCreated=false
- createDatasource("C", organizationId), // should have isRecentlyCreated=true
- createDatasource("B", organizationId), // should have isRecentlyCreated=true
- createDatasource("A", organizationId) // should have isRecentlyCreated=true
+ createDatasource("D", workspaceId), // should have isRecentlyCreated=false
+ createDatasource("C", workspaceId), // should have isRecentlyCreated=true
+ createDatasource("B", workspaceId), // should have isRecentlyCreated=true
+ createDatasource("A", workspaceId) // should have isRecentlyCreated=true
);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add(FieldName.ORGANIZATION_ID, organizationId);
+ params.add(fieldName(QDatasource.datasource.workspaceId), workspaceId);
Mono<List<Datasource>> listMono = datasourceService.saveAll(datasourceList)
.thenMany(datasourceService.get(params))
@@ -1181,10 +1183,10 @@ public void get_WhenDatasourcesPresent_SortedAndIsRecentlyCreatedFlagSet() {
}).verifyComplete();
}
- private Datasource createDatasource(String name, String organizationId) {
+ private Datasource createDatasource(String name, String workspaceId) {
Datasource datasource = new Datasource();
datasource.setPluginId("mongo-plugin");
- datasource.setOrganizationId(organizationId);
+ datasource.setWorkspaceId(workspaceId);
datasource.setName(name);
Map<String, Policy> policyMap = policyUtils.generatePolicyFromPermission(Set.of(AclPermission.READ_DATASOURCES), "api_user");
datasource.setPolicies(Set.copyOf(policyMap.values()));
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
index efe80d6ae93d..e6fbe9ac941e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
@@ -149,7 +149,7 @@ public class GitServiceTest {
@MockBean
PluginExecutorHelper pluginExecutorHelper;
- private static String orgId;
+ private static String workspaceId;
private static Application gitConnectedApplication = new Application();
private static final String DEFAULT_GIT_PROFILE = "default";
private static final String DEFAULT_BRANCH = "defaultBranchName";
@@ -163,14 +163,14 @@ public class GitServiceTest {
@Before
public void setup() throws IOException, GitAPIException {
- if (StringUtils.isEmpty(orgId)) {
- orgId = workspaceRepository
- .findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS)
+ if (StringUtils.isEmpty(workspaceId)) {
+ workspaceId = workspaceRepository
+ .findByName("Another Test Workspace", AclPermission.READ_WORKSPACES)
.block()
.getId();
}
Mockito
- .when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(eq(orgId), Mockito.anyBoolean()))
+ .when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(eq(workspaceId), Mockito.anyBoolean()))
.thenReturn(Mono.just(-1));
Mockito
@@ -225,7 +225,7 @@ private GitConnectDTO getConnectRequest(String remoteUrl, GitProfile gitProfile)
}
private Application createApplicationConnectedToGit(String name, String branchName) throws IOException, GitAPIException {
- return createApplicationConnectedToGit(name, branchName, orgId);
+ return createApplicationConnectedToGit(name, branchName, workspaceId);
}
private Application createApplicationConnectedToGit(String name, String branchName, String workspaceId) throws IOException, GitAPIException {
@@ -254,7 +254,7 @@ private Application createApplicationConnectedToGit(String name, String branchNa
Application testApplication = new Application();
testApplication.setName(name);
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
@@ -312,7 +312,7 @@ public void connectApplicationToGit_InvalidGitApplicationMetadata_ThrowInvalidGi
Application testApplication = new Application();
testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
testApplication.setName("InvalidGitApplicationMetadata");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -340,7 +340,7 @@ public void connectApplicationToGit_EmptyPrivateKey_ThrowInvalidGitConfiguration
gitAuth.setPublicKey("publicKey");
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setName("EmptyPrivateKey");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
Application application1 = applicationPageService.createApplication(testApplication).block();
@@ -364,7 +364,7 @@ public void connectApplicationToGit_EmptyPublicKey_ThrowInvalidGitConfigurationE
gitAuth.setPrivateKey("privatekey");
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setName("EmptyPublicKey");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
Application application1 = applicationPageService.createApplication(testApplication).block();
@@ -390,7 +390,7 @@ public void connectApplicationToGit_InvalidRemoteUrl_ThrowInvalidRemoteUrl() thr
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("InvalidRemoteUrl");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -419,7 +419,7 @@ public void connectApplicationToGit_InvalidRemoteUrlHttp_ThrowInvalidRemoteUrl()
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("InvalidRemoteUrlHttp");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("https://github.com/test/testRepo.git", testUserProfile);
@@ -453,7 +453,7 @@ public void connectApplicationToGit_InvalidFilePath_ThrowIOException() throws IO
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("InvalidFilePath");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testy.git", testUserProfile);
@@ -482,7 +482,7 @@ public void connectApplicationToGit_ClonedRepoNotEmpty_Failure() throws IOExcept
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("ValidTest TestApp");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testy.git", testUserProfile);
@@ -543,7 +543,7 @@ public void connectApplicationToGit_WithEmptyPublishedPages_CloneSuccess() throw
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("validData_WithEmptyPublishedPages");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -598,7 +598,7 @@ public void connectApplicationToGit_WithoutGitProfileUsingDefaultProfile_CloneSu
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("emptyDefaultProfileConnectTest");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", gitProfile);
@@ -636,7 +636,7 @@ public void connectApplicationToGit_WithoutGitProfileUsingLocalProfile_ThrowAuth
gitApplicationMetadata.setRepoName("testRepo");
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("localGitProfile");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", gitProfile);
@@ -681,7 +681,7 @@ public void connectApplicationToGit_WithNonEmptyPublishedPages_CloneSuccess() th
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("connectApplicationToGit_WithNonEmptyPublishedPages");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
PageDTO page = new PageDTO();
@@ -710,7 +710,7 @@ public void connectApplicationToGit_WithNonEmptyPublishedPages_CloneSuccess() th
@WithUserDetails(value = "api_user")
public void connectApplicationToGit_moreThanThreePrivateRepos_throwException() throws IOException, GitAPIException {
Workspace workspace = new Workspace();
- workspace.setName("Limit Private Repo Test Organization");
+ workspace.setName("Limit Private Repo Test Workspace");
String limitPrivateRepoTestWorkspaceId = workspaceService.create(workspace).map(Workspace::getId).block();
Mockito
@@ -742,7 +742,7 @@ public void connectApplicationToGit_moreThanThreePrivateRepos_throwException() t
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("connectApplicationToGit_WithNonEmptyPublishedPages");
- testApplication.setOrganizationId(limitPrivateRepoTestWorkspaceId);
+ testApplication.setWorkspaceId(limitPrivateRepoTestWorkspaceId);
Application application = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -759,7 +759,7 @@ public void connectApplicationToGit_moreThanThreePrivateRepos_throwException() t
@WithUserDetails(value = "api_user")
public void connectApplicationToGit_toggleAccessibilityToPublicForConnectedApp_connectSuccessful() throws IOException, GitAPIException {
Workspace workspace = new Workspace();
- workspace.setName("Toggle Accessibility To Public From Private Repo Test Organization");
+ workspace.setName("Toggle Accessibility To Public From Private Repo Test Workspace");
String limitPrivateRepoTestWorkspaceId = workspaceService.create(workspace).map(Workspace::getId).block();
Mockito
@@ -790,7 +790,7 @@ public void connectApplicationToGit_toggleAccessibilityToPublicForConnectedApp_c
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("connectApplicationToGit_WithNonEmptyPublishedPages");
- testApplication.setOrganizationId(limitPrivateRepoTestWorkspaceId);
+ testApplication.setWorkspaceId(limitPrivateRepoTestWorkspaceId);
Application application = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -837,7 +837,7 @@ public void connectApplicationToGit_WithValidCustomGitDomain_CloneSuccess() thro
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("connectApplicationToGit_WithValidCustomGitDomain_CloneSuccess");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:user/test/tests/testRepo.git", testUserProfile);
@@ -871,7 +871,7 @@ public void updateGitMetadata_EmptyData_Success() {
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("updateGitMetadata_EmptyData_Success");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitApplicationMetadata gitApplicationMetadata1 = null;
@@ -897,7 +897,7 @@ public void updateGitMetadata_validData_Success() {
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("updateGitMetadata_EmptyData_Success1");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitApplicationMetadata gitApplicationMetadata1 = application1.getGitApplicationMetadata();
gitApplicationMetadata1.setRemoteUrl("https://test/.git");
@@ -945,7 +945,7 @@ public void detachRemote_applicationWithActionAndActionCollection_Success() {
gitApplicationMetadata.setBranchName("defaultBranch");
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("detachRemote_validData");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Mono<Application> applicationMono = applicationPageService.createApplication(testApplication)
.flatMap(application -> {
@@ -965,7 +965,7 @@ public void detachRemote_applicationWithActionAndActionCollection_Success() {
// Save action
Datasource datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(application.getOrganizationId());
+ datasource.setWorkspaceId(application.getWorkspaceId());
datasource.setPluginId(tuple.getT2().getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -1012,7 +1012,7 @@ public void detachRemote_applicationWithActionAndActionCollection_Success() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(application.getPages().get(0).getId());
actionCollectionDTO.setApplicationId(application.getId());
- actionCollectionDTO.setOrganizationId(application.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(application.getWorkspaceId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -1116,7 +1116,7 @@ public void detachRemote_EmptyGitData_NoChange() {
Application testApplication = new Application();
testApplication.setGitApplicationMetadata(null);
testApplication.setName("detachRemote_EmptyGitData");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
Mono<Application> applicationMono = gitService.detachRemote(application1.getId());
@@ -1134,7 +1134,7 @@ public void listBranchForApplication_emptyGitMetadata_throwError() {
Application testApplication = new Application();
testApplication.setGitApplicationMetadata(null);
testApplication.setName("validData_WithNonEmptyPublishedPages");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
Mono<List<GitBranchDTO>> listMono = gitService.listBranchForApplication(application1.getId(), false, "defaultBranch");
@@ -1157,7 +1157,7 @@ public void listBranchForApplication_applicationWithInvalidGitConfig_throwError(
Application testApplication = new Application();
testApplication.setGitApplicationMetadata(null);
testApplication.setName("listBranchForApplication_GitFailure_ThrowError");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
Mono<List<GitBranchDTO>> listMono = gitService.listBranchForApplication(application1.getId(), false, "defaultBranch");
@@ -1658,7 +1658,7 @@ public void commitApplication_applicationNotConnectedToGit_throwInvalidGitConfig
Application application = new Application();
application.setName("sampleAppNotConnectedToGit");
- application.setOrganizationId(orgId);
+ application.setWorkspaceId(workspaceId);
application.setId(null);
application = applicationPageService.createApplication(application).block();
@@ -1866,7 +1866,7 @@ public void createBranch_validCreateBranchRequest_newApplicationCreated() throws
gitApplicationMetadata.setGitAuth(gitAuth);
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("validAppWithActionAndActionCollection");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Mono<Application> createBranchMono = applicationPageService.createApplication(testApplication)
.flatMap(application ->
@@ -1883,7 +1883,7 @@ public void createBranch_validCreateBranchRequest_newApplicationCreated() throws
// Save action
Datasource datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(application.getOrganizationId());
+ datasource.setWorkspaceId(application.getWorkspaceId());
datasource.setPluginId(tuple.getT2().getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -1922,7 +1922,7 @@ public void createBranch_validCreateBranchRequest_newApplicationCreated() throws
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(application.getPages().get(0).getId());
actionCollectionDTO.setApplicationId(application.getId());
- actionCollectionDTO.setOrganizationId(application.getOrganizationId());
+ actionCollectionDTO.setWorkspaceId(application.getWorkspaceId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -2057,7 +2057,7 @@ public void connectApplicationToGit_cancelledMidway_cloneSuccess() throws IOExce
gitApplicationMetadata.setRemoteUrl("[email protected]:test/testRepo.git");
testApplication.setGitApplicationMetadata(gitApplicationMetadata);
testApplication.setName("validData");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
Application application1 = applicationPageService.createApplication(testApplication).block();
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
@@ -2247,7 +2247,7 @@ public void importApplicationFromGit_InvalidRemoteUrl_ThrowError() {
@Test
@WithUserDetails(value = "api_user")
- public void importApplicationFromGit_emptyOrganizationId_ThrowError() {
+ public void importApplicationFromGit_emptyWorkspaceId_ThrowError() {
GitConnectDTO gitConnectDTO = getConnectRequest("[email protected]:test/testRepo.git", testUserProfile);
Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(null, gitConnectDTO);
@@ -2267,7 +2267,7 @@ public void importApplicationFromGit_privateRepoLimitReached_ThrowApplicationLim
.when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(Mockito.any(), Mockito.anyBoolean()))
.thenReturn(Mono.just(0));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2293,7 +2293,7 @@ public void importApplicationFromGit_emptyRepo_ThrowError() {
Mockito.when(gitFileUtils.deleteLocalRepo(Mockito.any(Path.class)))
.thenReturn(Mono.just(true));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2317,7 +2317,7 @@ public void importApplicationFromGit_validRequest_Success() {
Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2347,7 +2347,7 @@ public void importApplicationFromGit_validRequestWithDuplicateApplicationName_Su
Application testApplication = new Application();
testApplication.setName("testGitRepo");
- testApplication.setOrganizationId(orgId);
+ testApplication.setWorkspaceId(workspaceId);
applicationPageService.createApplication(testApplication).block();
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
@@ -2355,7 +2355,7 @@ public void importApplicationFromGit_validRequestWithDuplicateApplicationName_Su
Mockito.when(gitFileUtils.reconstructApplicationJsonFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
.thenReturn(Mono.just(applicationJson));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2393,7 +2393,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
Datasource datasource = new Datasource();
datasource.setName("db-auth-testGitImportRepo");
datasource.setPluginId(pluginId);
- datasource.setOrganizationId(testWorkspaceId);
+ datasource.setWorkspaceId(testWorkspaceId);
datasourceService.create(datasource).block();
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
@@ -2402,7 +2402,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitFileUtils.deleteLocalRepo(Mockito.any(Path.class))).thenReturn(Mono.just(true));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2440,7 +2440,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
Datasource datasource = new Datasource();
datasource.setName("db-auth-testGitImportRepo");
datasource.setPluginId(pluginId);
- datasource.setOrganizationId(testWorkspaceId);
+ datasource.setWorkspaceId(testWorkspaceId);
datasourceService.create(datasource).block();
Mockito
@@ -2466,7 +2466,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
} catch (InterruptedException e) {
e.printStackTrace();
}
- return applicationService.findByOrganizationId(testWorkspaceId, READ_APPLICATIONS)
+ return applicationService.findByWorkspaceId(testWorkspaceId, READ_APPLICATIONS)
.filter(application1 -> "testGitImportRepoCancelledMidway".equals(application1.getName()))
.next();
});
@@ -2499,7 +2499,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfDiffer
Datasource datasource = new Datasource();
datasource.setName("db-auth-1");
datasource.setPluginId(pluginId);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
datasourceService.create(datasource).block();
Mockito.when(gitExecutor.cloneApplication(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
@@ -2509,7 +2509,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfDiffer
Mockito.when(gitFileUtils.deleteLocalRepo(Mockito.any(Path.class)))
.thenReturn(Mono.just(true));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
@@ -2532,7 +2532,7 @@ public void importApplicationFromGit_validRequestWithEmptyRepo_ThrowError() {
.thenReturn(Mono.just(applicationJson));
Mockito.when(gitFileUtils.deleteLocalRepo(Mockito.any(Path.class))).thenReturn(Mono.just(true));
- Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(orgId, gitConnectDTO);
+ Mono<ApplicationImportDTO> applicationMono = gitService.importApplicationFromGit(workspaceId, gitConnectDTO);
StepVerifier
.create(applicationMono)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index 92da44da8363..6ca60ea1a902 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -131,7 +131,7 @@ public class LayoutActionServiceTest {
Datasource datasource;
- String orgId;
+ String workspaceId;
String branchName;
@@ -144,8 +144,8 @@ public class LayoutActionServiceTest {
public void setup() {
newPageService.deleteAll();
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
- Workspace workspace = workspaceService.getById(orgId).block();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
+ Workspace workspace = workspaceService.getById(workspaceId).block();
if (testApp == null && testPage == null) {
//Create application and page which will be used by the tests to create actions for.
@@ -195,14 +195,14 @@ public void setup() {
GitApplicationMetadata gitData = new GitApplicationMetadata();
gitData.setBranchName("actionServiceTest");
newApp.setGitApplicationMetadata(gitData);
- gitConnectedApp = applicationPageService.createApplication(newApp, orgId)
+ gitConnectedApp = applicationPageService.createApplication(newApp, workspaceId)
.flatMap(application -> {
application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
return applicationService.save(application)
.zipWhen(application1 -> importExportApplicationService.exportApplicationById(application1.getId(), gitData.getBranchName()));
})
// Assign the branchName to all the resources connected to the application
- .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(orgId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+ .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
.block();
gitConnectedPage = newPageService.findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false).block();
@@ -210,17 +210,17 @@ public void setup() {
branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
}
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
- orgId = testWorkspace.getId();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
+ workspaceId = testWorkspace.getId();
datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
datasource.setPluginId(installed_plugin.getId());
jsDatasource = new Datasource();
jsDatasource.setName("Default JS Database");
- jsDatasource.setOrganizationId(orgId);
+ jsDatasource.setWorkspaceId(workspaceId);
Plugin installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
assert installedJsPlugin != null;
jsDatasource.setPluginId(installedJsPlugin.getId());
@@ -309,7 +309,7 @@ public void updateActionUpdatesLayout() {
actionConfiguration3.setIsValid(false);
action3.setActionConfiguration(actionConfiguration3);
Datasource d2 = new Datasource();
- d2.setOrganizationId(datasource.getOrganizationId());
+ d2.setWorkspaceId(datasource.getWorkspaceId());
d2.setPluginId(datasource.getPluginId());
d2.setIsAutoGenerated(true);
d2.setName("UNUSED_DATASOURCE");
@@ -703,7 +703,7 @@ public void testHintMessageOnLocalhostUrlOnUpdateActionEvent() {
updates.setUserPermissions(null);
Datasource ds = new Datasource();
ds.setName("testName");
- ds.setOrganizationId(datasource.getOrganizationId());
+ ds.setWorkspaceId(datasource.getWorkspaceId());
ds.setDatasourceConfiguration(new DatasourceConfiguration());
ds.getDatasourceConfiguration().setUrl("http://localhost");
ds.setPluginId(datasource.getPluginId());
@@ -800,7 +800,7 @@ public void refactorDuplicateActionName() {
duplicateNameCompleteAction.setUnpublishedAction(duplicateName);
duplicateNameCompleteAction.setPublishedAction(new ActionDTO());
duplicateNameCompleteAction.getPublishedAction().setDatasource(new Datasource());
- duplicateNameCompleteAction.setOrganizationId(duplicateName.getOrganizationId());
+ duplicateNameCompleteAction.setWorkspaceId(duplicateName.getWorkspaceId());
duplicateNameCompleteAction.setPluginType(duplicateName.getPluginType());
duplicateNameCompleteAction.setPluginId(duplicateName.getPluginId());
duplicateNameCompleteAction.setTemplateId(duplicateName.getTemplateId());
@@ -1011,7 +1011,7 @@ public void testWidgetNameRefactor_withSimpleUpdate_refactorsActionCollectionAnd
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(testPage.getId());
actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO1.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("testAction1");
@@ -1253,7 +1253,7 @@ public void testRefactorCollection_withModifiedName_ignoresName() {
ActionCollectionDTO originalActionCollectionDTO = new ActionCollectionDTO();
originalActionCollectionDTO.setName("originalName");
originalActionCollectionDTO.setApplicationId(testApp.getId());
- originalActionCollectionDTO.setOrganizationId(testApp.getOrganizationId());
+ originalActionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
originalActionCollectionDTO.setPageId(testPage.getId());
originalActionCollectionDTO.setPluginId(jsDatasource.getPluginId());
originalActionCollectionDTO.setPluginType(PluginType.JS);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
index 3519e3f52977..4d365c40e975 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
@@ -93,11 +93,11 @@ public class LayoutServiceTest {
public void setup() {
purgeAllPages();
User apiUser = userService.findByEmail("api_user").block();
- workspaceId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(workspaceId);
+ datasource.setWorkspaceId(workspaceId);
Plugin installedPlugin = pluginRepository.findByPackageName("installed-plugin").block();
installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
datasource.setPluginId(installedPlugin.getId());
@@ -360,7 +360,7 @@ public void getActionsExecuteOnLoad() {
monos.add(layoutActionService.createSingleAction(action));
Datasource d2 = new Datasource();
- d2.setOrganizationId(datasource.getOrganizationId());
+ d2.setWorkspaceId(datasource.getWorkspaceId());
d2.setPluginId(installedJsPlugin.getId());
d2.setIsAutoGenerated(true);
d2.setName("UNUSED_DATASOURCE");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
index dfa6c64b89a4..aa1b9e382efb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
@@ -79,7 +79,7 @@ public class MockDataServiceTest {
@MockBean
PluginExecutorHelper pluginExecutorHelper;
- String orgId = "";
+ String workspaceId = "";
Application testApp = null;
@@ -88,11 +88,11 @@ public class MockDataServiceTest {
@Before
@WithUserDetails(value = "api_user")
public void setup() {
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
- orgId = testWorkspace == null ? "" : testWorkspace.getId();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
+ workspaceId = testWorkspace == null ? "" : testWorkspace.getId();
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
- Workspace workspace = workspaceService.getById(orgId).block();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
+ Workspace workspace = workspaceService.getById(workspaceId).block();
if (testPage == null) {
//Create application and page which will be used by the tests to create actions for.
@@ -131,7 +131,7 @@ public void testCreateMockDataSetsMongo() {
Plugin pluginMono = pluginService.findByName("Installed Plugin Name").block();
MockDataSource mockDataSource = new MockDataSource();
mockDataSource.setName("Movies");
- mockDataSource.setOrganizationId(orgId);
+ mockDataSource.setWorkspaceId(workspaceId);
mockDataSource.setPackageName("mongo-plugin");
mockDataSource.setPluginId(pluginMono.getId());
@@ -170,7 +170,7 @@ public void testCreateMockDataSetsPostgres() {
Plugin pluginMono = pluginService.findByName("Installed Plugin Name").block();
MockDataSource mockDataSource = new MockDataSource();
mockDataSource.setName("Users");
- mockDataSource.setOrganizationId(orgId);
+ mockDataSource.setWorkspaceId(workspaceId);
mockDataSource.setPackageName("postgres-plugin");
mockDataSource.setPluginId(pluginMono.getId());
@@ -208,7 +208,7 @@ public void testCreateMockDataSetsDuplicateName() {
Plugin pluginMono = pluginService.findByName("Installed Plugin Name").block();
MockDataSource mockDataSource = new MockDataSource();
mockDataSource.setName("Movies");
- mockDataSource.setOrganizationId(orgId);
+ mockDataSource.setWorkspaceId(workspaceId);
mockDataSource.setPackageName("mongo-plugin");
mockDataSource.setPluginId(pluginMono.getId());
@@ -251,7 +251,7 @@ public void testGetDataFromMockDB() {
Plugin plugin = pluginService.findByPackageName("postgres-plugin").block();
MockDataSource mockDataSource = new MockDataSource();
mockDataSource.setName("Users");
- mockDataSource.setOrganizationId(orgId);
+ mockDataSource.setWorkspaceId(workspaceId);
mockDataSource.setPackageName("postgres-plugin");
mockDataSource.setPluginId(plugin.getId());
Datasource datasourceMono = mockDataService.createMockDataSet(mockDataSource).block();
@@ -262,7 +262,7 @@ public void testGetDataFromMockDB() {
actionConfiguration.setHttpMethod(HttpMethod.GET);
action.setActionConfiguration(actionConfiguration);
- action.setOrganizationId(orgId);
+ action.setWorkspaceId(workspaceId);
action.setPageId(testPage.getId());
action.setName("testActionExecuteDbQuery");
action.setDatasource(datasourceMono);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
index c86ac0639e48..d171ddca99b7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
@@ -116,15 +116,15 @@ public class PageServiceTest {
static String applicationId = null;
- static String orgId;
+ static String workspaceId;
@Before
@WithUserDetails(value = "api_user")
public void setup() {
purgeAllPages();
- if (StringUtils.isEmpty(orgId)) {
+ if (StringUtils.isEmpty(workspaceId)) {
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
}
}
@@ -132,7 +132,7 @@ public void setupTestApplication() {
if (application == null) {
Application newApp = new Application();
newApp.setName(UUID.randomUUID().toString());
- application = applicationPageService.createApplication(newApp, orgId).block();
+ application = applicationPageService.createApplication(newApp, workspaceId).block();
applicationId = application.getId();
}
}
@@ -143,14 +143,14 @@ private Application setupGitConnectedTestApplication(String uniquePrefix) {
GitApplicationMetadata gitData = new GitApplicationMetadata();
gitData.setBranchName(uniquePrefix + "_pageServiceTest");
newApp.setGitApplicationMetadata(gitData);
- return applicationPageService.createApplication(newApp, orgId)
+ return applicationPageService.createApplication(newApp, workspaceId)
.flatMap(application -> {
application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
return applicationService.save(application)
.zipWhen(application1 -> importExportApplicationService.exportApplicationById(application1.getId(), gitData.getBranchName()));
})
// Assign the branchName to all the resources connected to the application
- .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(orgId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+ .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
.block();
}
@@ -368,7 +368,7 @@ public void clonePage() {
action.setName("PageAction");
action.setActionConfiguration(new ActionConfiguration());
Datasource datasource = new Datasource();
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
datasource.setName("datasource test name for page test");
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
datasource.setPluginId(installed_plugin.getId());
@@ -409,7 +409,7 @@ public void clonePage() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(page.getId());
actionCollectionDTO.setApplicationId(applicationId);
- actionCollectionDTO.setOrganizationId(orgId);
+ actionCollectionDTO.setWorkspaceId(workspaceId);
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -515,7 +515,7 @@ public void clonePage_whenPageCloned_defaultIdsRetained() {
action.setName("PageAction");
action.setActionConfiguration(new ActionConfiguration());
Datasource datasource = new Datasource();
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
datasource.setName("datasource test for clone page");
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
datasource.setPluginId(installed_plugin.getId());
@@ -556,7 +556,7 @@ public void clonePage_whenPageCloned_defaultIdsRetained() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(page.getId());
actionCollectionDTO.setApplicationId(gitConnectedApplication.getId());
- actionCollectionDTO.setOrganizationId(orgId);
+ actionCollectionDTO.setWorkspaceId(workspaceId);
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("collectionBody");
@@ -707,11 +707,11 @@ public void reuseDeletedPageName() {
public void reOrderPageFromHighOrderToLowOrder() {
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
Application newApp = new Application();
newApp.setName(UUID.randomUUID().toString());
- application = applicationPageService.createApplication(newApp, orgId).block();
+ application = applicationPageService.createApplication(newApp, workspaceId).block();
applicationId = application.getId();
final String[] pageIds = new String[4];
@@ -758,11 +758,11 @@ public void reOrderPageFromHighOrderToLowOrder() {
public void reOrderPageFromLowOrderToHighOrder() {
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
Application newApp = new Application();
newApp.setName(UUID.randomUUID().toString());
- application = applicationPageService.createApplication(newApp, orgId).block();
+ application = applicationPageService.createApplication(newApp, workspaceId).block();
applicationId = application.getId();
final String[] pageIds = new String[4];
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
index 3a5a0bcf0bf4..697ef32a5be3 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
@@ -170,7 +170,7 @@ public void changeCurrentTheme_WhenSystemThemeSet_NoNewThemeCreated() {
Mono<String> defaultThemeIdMono = themeService.getDefaultThemeId().cache();
Application application = createApplication("api_user", Set.of(MANAGE_APPLICATIONS));
- application.setOrganizationId("theme-test-org-id");
+ application.setWorkspaceId("theme-test-org-id");
Mono<Theme> applicationThemeMono = defaultThemeIdMono
.flatMap(defaultThemeId -> {
application.setEditModeThemeId(defaultThemeId);
@@ -186,7 +186,7 @@ public void changeCurrentTheme_WhenSystemThemeSet_NoNewThemeCreated() {
StepVerifier.create(applicationThemeMono).assertNext(theme -> {
assertThat(theme.isSystemTheme()).isTrue();
assertThat(theme.getApplicationId()).isNull();
- assertThat(theme.getOrganizationId()).isNull();
+ assertThat(theme.getWorkspaceId()).isNull();
}).verifyComplete();
}
@@ -202,7 +202,7 @@ public void changeCurrentTheme_WhenSystemThemeSetOverCustomTheme_NewThemeNotCrea
customTheme.setPolicies(Set.copyOf(themePolicies));
Application application = createApplication("api_user", Set.of(MANAGE_APPLICATIONS));
- application.setOrganizationId("theme-test-org-id");
+ application.setWorkspaceId("theme-test-org-id");
Mono<Tuple2<Theme, Theme>> tuple2Mono = themeService.save(customTheme)
.flatMap(savedTheme -> {
@@ -227,7 +227,7 @@ public void changeCurrentTheme_WhenSystemThemeSetOverCustomTheme_NewThemeNotCrea
Theme oldTheme = themeTuple2.getT2();
assertThat(currentTheme.isSystemTheme()).isTrue();
assertThat(currentTheme.getApplicationId()).isNull();
- assertThat(currentTheme.getOrganizationId()).isNull();
+ assertThat(currentTheme.getWorkspaceId()).isNull();
assertThat(oldTheme.getId()).isNull();
}).verifyComplete();
}
@@ -310,7 +310,7 @@ public void cloneThemeToApplication_WhenSrcThemeIsCustomSavedTheme_NewCustomThem
assertThat(clonnedTheme.getId()).isNotEqualTo(srcTheme.getId());
assertThat(clonnedTheme.getDisplayName()).isEqualTo(srcTheme.getDisplayName());
assertThat(clonnedTheme.getApplicationId()).isNull();
- assertThat(clonnedTheme.getOrganizationId()).isNull();
+ assertThat(clonnedTheme.getWorkspaceId()).isNull();
})
.verifyComplete();
}
@@ -590,7 +590,7 @@ public void persistCurrentTheme_WhenCustomThemeIsSet_NewApplicationThemeCreated(
Mono<Tuple3<List<Theme>, Theme, Application>> tuple3Mono = themeService.save(customTheme).flatMap(theme -> {
Application application = createApplication("api_user", Set.of(MANAGE_APPLICATIONS));
application.setEditModeThemeId(theme.getId());
- application.setOrganizationId("theme-test-org-id");
+ application.setWorkspaceId("theme-test-org-id");
return applicationRepository.save(application);
}).flatMap(application -> {
Theme theme = new Theme();
@@ -608,7 +608,7 @@ public void persistCurrentTheme_WhenCustomThemeIsSet_NewApplicationThemeCreated(
Application application = tuple3.getT3();
assertThat(availableThemes.size()).isEqualTo(5); // one custom theme + 4 system themes
assertThat(persistedTheme.getApplicationId()).isNotEmpty(); // theme should have application id set
- assertThat(persistedTheme.getOrganizationId()).isEqualTo("theme-test-org-id"); // theme should have org id set
+ assertThat(persistedTheme.getWorkspaceId()).isEqualTo("theme-test-org-id"); // theme should have org id set
assertThat(policyUtils.isPermissionPresentForUser(
persistedTheme.getPolicies(), READ_THEMES.getValue(), "api_user")
).isTrue();
@@ -623,7 +623,7 @@ public void persistCurrentTheme_WhenCustomThemeIsSet_NewApplicationThemeCreated(
@Test
public void persistCurrentTheme_WhenSystemThemeIsSet_NewApplicationThemeCreated() {
Application application = createApplication("api_user", Set.of(MANAGE_APPLICATIONS));
- application.setOrganizationId("theme-test-org-id");
+ application.setWorkspaceId("theme-test-org-id");
Mono<Tuple2<List<Theme>, Theme>> tuple2Mono = themeService.getDefaultThemeId()
.flatMap(defaultThemeId -> {
application.setEditModeThemeId(defaultThemeId);
@@ -645,7 +645,7 @@ public void persistCurrentTheme_WhenSystemThemeIsSet_NewApplicationThemeCreated(
assertThat(availableThemes.size()).isEqualTo(5); // one custom theme + 4 system themes
assertThat(currentTheme.isSystemTheme()).isFalse();
assertThat(currentTheme.getApplicationId()).isNotEmpty(); // theme should have application id set
- assertThat(currentTheme.getOrganizationId()).isEqualTo("theme-test-org-id"); // theme should have org id set
+ assertThat(currentTheme.getWorkspaceId()).isEqualTo("theme-test-org-id"); // theme should have org id set
assertThat(policyUtils.isPermissionPresentForUser(currentTheme.getPolicies(), READ_THEMES.getValue(), "api_user")).isTrue();
assertThat(policyUtils.isPermissionPresentForUser(currentTheme.getPolicies(), MANAGE_THEMES.getValue(), "api_user")).isTrue();
}).verifyComplete();
@@ -717,7 +717,7 @@ public void updateName_WhenSystemTheme_NotAllowed() {
@Test
public void updateName_WhenCustomTheme_NameUpdated() {
Application application = createApplication("api_user", Set.of(MANAGE_APPLICATIONS));
- application.setOrganizationId("test-org");
+ application.setWorkspaceId("test-org");
Mono<Theme> updateThemeNameMono = themeService.getDefaultThemeId()
.flatMap(s -> {
@@ -742,7 +742,7 @@ public void updateName_WhenCustomTheme_NameUpdated() {
assertThat(theme.getDisplayName()).isEqualTo("new display name");
assertThat(theme.isSystemTheme()).isFalse();
assertThat(theme.getApplicationId()).isNotNull();
- assertThat(theme.getOrganizationId()).isEqualTo("test-org");
+ assertThat(theme.getWorkspaceId()).isEqualTo("test-org");
assertThat(theme.getConfig()).isNotNull();
}).verifyComplete();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
index caf1039629f3..cc9e1a5c3fb2 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java
@@ -166,7 +166,7 @@ public void testUploadAndDeleteProfilePhoto_validImage() {
public void testUploadProfilePhoto_invalidImageFormat() {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo.png"), new DefaultDataBufferFactory(), 4096)
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo.png"), new DefaultDataBufferFactory(), 4096)
.cache();
Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
@@ -184,7 +184,7 @@ public void testUploadProfilePhoto_invalidImageFormat() {
public void testUploadProfilePhoto_invalidImageSize() {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo_large.png"), new DefaultDataBufferFactory(), 4096)
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo_large.png"), new DefaultDataBufferFactory(), 4096)
.repeat(100) // So the file size looks like it's much larger than what it actually is.
.cache();
@@ -200,54 +200,54 @@ public void testUploadProfilePhoto_invalidImageSize() {
@Test
@WithUserDetails(value = "api_user")
- public void updateLastUsedAppAndOrgList_WhenListIsEmpty_orgIdPrepended() {
- String sampleOrgId = UUID.randomUUID().toString();
+ public void updateLastUsedAppAndWorkspaceList_WhenListIsEmpty_workspaceIdPrepended() {
+ String sampleWorkspaceId = UUID.randomUUID().toString();
Application application = new Application();
- application.setOrganizationId(sampleOrgId);
+ application.setWorkspaceId(sampleWorkspaceId);
final Mono<UserData> saveMono = userDataService.getForCurrentUser().flatMap(userData -> {
// set recently used org ids to null
- userData.setRecentlyUsedOrgIds(null);
+ userData.setRecentlyUsedWorkspaceIds(null);
return userDataRepository.save(userData);
- }).then(userDataService.updateLastUsedAppAndOrgList(application));
+ }).then(userDataService.updateLastUsedAppAndWorkspaceList(application));
StepVerifier.create(saveMono).assertNext(userData -> {
- Assert.assertEquals(1, userData.getRecentlyUsedOrgIds().size());
- Assert.assertEquals(sampleOrgId, userData.getRecentlyUsedOrgIds().get(0));
+ Assert.assertEquals(1, userData.getRecentlyUsedWorkspaceIds().size());
+ Assert.assertEquals(sampleWorkspaceId, userData.getRecentlyUsedWorkspaceIds().get(0));
}).verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
- public void updateLastUsedAppAndOrgList_WhenListIsNotEmpty_orgIdPrepended() {
+ public void updateLastUsedAppAndWorkspaceList_WhenListIsNotEmpty_workspaceIdPrepended() {
final Mono<UserData> resultMono = userDataService.getForCurrentUser().flatMap(userData -> {
// Set an initial list of org ids to the current user.
- userData.setRecentlyUsedOrgIds(Arrays.asList("123", "456"));
+ userData.setRecentlyUsedWorkspaceIds(Arrays.asList("123", "456"));
return userDataRepository.save(userData);
}).flatMap(userData -> {
// Now check whether a new org id is put at first.
- String sampleOrgId = "sample-org-id";
+ String sampleWorkspaceId = "sample-org-id";
Application application = new Application();
- application.setOrganizationId(sampleOrgId);
- return userDataService.updateLastUsedAppAndOrgList(application);
+ application.setWorkspaceId(sampleWorkspaceId);
+ return userDataService.updateLastUsedAppAndWorkspaceList(application);
});
StepVerifier.create(resultMono).assertNext(userData -> {
- Assert.assertEquals(3, userData.getRecentlyUsedOrgIds().size());
- Assert.assertEquals("sample-org-id", userData.getRecentlyUsedOrgIds().get(0));
+ Assert.assertEquals(3, userData.getRecentlyUsedWorkspaceIds().size());
+ Assert.assertEquals("sample-org-id", userData.getRecentlyUsedWorkspaceIds().get(0));
}).verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void updateLastUsedAppAndOrgList_TooManyRecentIds_ListsAreTruncated() {
- String sampleOrgId = "sample-org-id", sampleAppId = "sample-app-id";
+ String sampleWorkspaceId = "sample-org-id", sampleAppId = "sample-app-id";
final Mono<UserData> resultMono = userDataService.getForCurrentUser().flatMap(userData -> {
// Set an initial list of 12 org ids to the current user
- userData.setRecentlyUsedOrgIds(new ArrayList<>());
+ userData.setRecentlyUsedWorkspaceIds(new ArrayList<>());
for(int i = 1; i <= 12; i++) {
- userData.getRecentlyUsedOrgIds().add("org-" + i);
+ userData.getRecentlyUsedWorkspaceIds().add("org-" + i);
}
// Set an initial list of 22 app ids to the current user.
@@ -260,15 +260,15 @@ public void updateLastUsedAppAndOrgList_TooManyRecentIds_ListsAreTruncated() {
// Now check whether a new org id is put at first.
Application application = new Application();
application.setId(sampleAppId);
- application.setOrganizationId(sampleOrgId);
- return userDataService.updateLastUsedAppAndOrgList(application);
+ application.setWorkspaceId(sampleWorkspaceId);
+ return userDataService.updateLastUsedAppAndWorkspaceList(application);
});
StepVerifier.create(resultMono).assertNext(userData -> {
// org id list should be truncated to 10
- assertThat(userData.getRecentlyUsedOrgIds().size()).isEqualTo(10);
- assertThat(userData.getRecentlyUsedOrgIds().get(0)).isEqualTo(sampleOrgId);
- assertThat(userData.getRecentlyUsedOrgIds().get(9)).isEqualTo("org-9");
+ assertThat(userData.getRecentlyUsedWorkspaceIds().size()).isEqualTo(10);
+ assertThat(userData.getRecentlyUsedWorkspaceIds().get(0)).isEqualTo(sampleWorkspaceId);
+ assertThat(userData.getRecentlyUsedWorkspaceIds().get(9)).isEqualTo("org-9");
// app id list should be truncated to 20
assertThat(userData.getRecentlyUsedAppIds().size()).isEqualTo(20);
@@ -370,7 +370,7 @@ public void deleteProfilePhotot_WhenExists_RemovedFromAssetAndUserData() {
private FilePart createMockFilePart() {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo.png"), new DefaultDataBufferFactory(), 4096).cache();
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo.png"), new DefaultDataBufferFactory(), 4096).cache();
Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
Mockito.when(filepart.headers().getContentType()).thenReturn(MediaType.IMAGE_PNG);
return filepart;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
index 2701c22e7057..7bd0dcd25308 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
@@ -57,8 +57,8 @@
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_USERS;
-import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS;
-import static com.appsmith.server.acl.AclPermission.USER_READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.USER_MANAGE_WORKSPACES;
+import static com.appsmith.server.acl.AclPermission.USER_READ_WORKSPACES;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -174,13 +174,13 @@ public void updateUserWithValidWorkspace() {
//Add valid workspace id to the updateUser object.
Mono<User> userMono = workspaceService.create(updateWorkspace)
.flatMap(org -> {
- updateUser.setCurrentOrganizationId(org.getId());
+ updateUser.setCurrentWorkspaceId(org.getId());
return userMono1.flatMap(user -> userService.update(user.getId(), updateUser));
});
StepVerifier.create(userMono)
.assertNext(user -> {
- assertThat(user.getCurrentOrganizationId()).isEqualTo(updateUser.getCurrentOrganizationId());
+ assertThat(user.getCurrentWorkspaceId()).isEqualTo(updateUser.getCurrentWorkspaceId());
})
.verifyComplete();
}
@@ -211,7 +211,7 @@ public void createNewUserValid() {
.users(Set.of(newUser.getUsername())).build();
Policy manageUserOrgPolicy = Policy.builder()
- .permission(USER_MANAGE_ORGANIZATIONS.getValue())
+ .permission(USER_MANAGE_WORKSPACES.getValue())
.users(Set.of(newUser.getUsername())).build();
Policy readUserPolicy = Policy.builder()
@@ -219,7 +219,7 @@ public void createNewUserValid() {
.users(Set.of(newUser.getUsername())).build();
Policy readUserOrgPolicy = Policy.builder()
- .permission(USER_READ_ORGANIZATIONS.getValue())
+ .permission(USER_READ_WORKSPACES.getValue())
.users(Set.of(newUser.getUsername())).build();
Mono<User> userMono = userService.create(newUser);
@@ -235,7 +235,7 @@ public void createNewUserValid() {
// Since there is a template workspace, the user won't have an empty default workspace. They
// will get a clone of the default workspace when they first login. So, we expect it to be
// empty here.
- assertThat(user.getOrganizationIds()).hasSize(1);
+ assertThat(user.getWorkspaceIds()).hasSize(1);
assertThat(user.getTenantId() != null);
})
.verifyComplete();
@@ -256,7 +256,7 @@ public void createNewUser_WhenEmailHasUpperCase_SavedInLowerCase() {
.users(Set.of(sampleEmailLowercase)).build();
Policy manageUserOrgPolicy = Policy.builder()
- .permission(USER_MANAGE_ORGANIZATIONS.getValue())
+ .permission(USER_MANAGE_WORKSPACES.getValue())
.users(Set.of(sampleEmailLowercase)).build();
Policy readUserPolicy = Policy.builder()
@@ -264,7 +264,7 @@ public void createNewUser_WhenEmailHasUpperCase_SavedInLowerCase() {
.users(Set.of(sampleEmailLowercase)).build();
Policy readUserOrgPolicy = Policy.builder()
- .permission(USER_READ_ORGANIZATIONS.getValue())
+ .permission(USER_READ_WORKSPACES.getValue())
.users(Set.of(sampleEmailLowercase)).build();
Mono<User> userMono = userService.create(newUser);
@@ -282,7 +282,7 @@ public void createNewUser_WhenEmailHasUpperCase_SavedInLowerCase() {
// Since there is a template workspace, the user won't have an empty default workspace. They
// will get a clone of the default workspace when they first login. So, we expect it to be
// empty here.
- assertThat(user.getOrganizationIds()).hasSize(1);
+ assertThat(user.getWorkspaceIds()).hasSize(1);
})
.verifyComplete();
}
@@ -423,9 +423,9 @@ public void signUpViaGoogleIfAlreadyInvited() {
@Test
@WithUserDetails(value = "api_user")
- public void signUpAfterBeingInvitedToAppsmithOrganization() {
+ public void signUpAfterBeingInvitedToAppsmithWorkspace() {
Workspace workspace = new Workspace();
- workspace.setName("SignUp after adding user to Test Organization");
+ workspace.setName("SignUp after adding user to Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -442,7 +442,7 @@ public void signUpAfterBeingInvitedToAppsmithOrganization() {
ArrayList<String> users = new ArrayList<>();
users.add(newUserEmail);
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(workspace1.getId());
+ inviteUsersDTO.setWorkspaceId(workspace1.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_VIEWER.getName());
return userService.inviteUsers(inviteUsersDTO, "http://localhost:8080");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceWithDisabledSignupTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceWithDisabledSignupTest.java
index af38c8eed41f..e89f591a8a82 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceWithDisabledSignupTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceWithDisabledSignupTest.java
@@ -85,7 +85,7 @@ public void createNewAdminValidWhenDisabled() {
assertThat(user.getEmail()).isEqualTo("[email protected]");
assertThat(user.getName()).isNullOrEmpty();
assertThat(user.getPolicies()).isNotEmpty();
- assertThat(user.getOrganizationIds()).hasSize(1);
+ assertThat(user.getWorkspaceIds()).hasSize(1);
})
.verifyComplete();
}
@@ -106,7 +106,7 @@ public void createNewAdminValidWhenDisabled2() {
assertThat(user.getEmail()).isEqualTo("[email protected]");
assertThat(user.getName()).isNullOrEmpty();
assertThat(user.getPolicies()).isNotEmpty();
- assertThat(user.getOrganizationIds()).hasSize(1);
+ assertThat(user.getWorkspaceIds()).hasSize(1);
})
.verifyComplete();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
index 49963d1de397..14f540001911 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
@@ -79,10 +79,10 @@ public class UserWorkspaceServiceTest {
@BeforeEach
public void setup() {
- Workspace org = new Workspace();
- org.setName("Test org");
- org.setUserRoles(new ArrayList<>());
- this.workspace = workspaceRepository.save(org).block();
+ Workspace workspace = new Workspace();
+ workspace.setName("Test org");
+ workspace.setUserRoles(new ArrayList<>());
+ this.workspace = workspaceRepository.save(workspace).block();
}
private UserRole createUserRole(String username, String userId, AppsmithRole role) {
@@ -97,14 +97,14 @@ private UserRole createUserRole(String username, String userId, AppsmithRole rol
return userRole;
}
- private void addRolesToOrg(List<UserRole> roles) {
+ private void addRolesToWorkspace(List<UserRole> roles) {
this.workspace.setUserRoles(roles);
for (UserRole userRole : roles) {
Set<AclPermission> rolePermissions = userRole.getRole().getPermissions();
- Map<String, Policy> orgPolicyMap = policyUtils.generatePolicyFromPermission(
+ Map<String, Policy> workspacePolicyMap = policyUtils.generatePolicyFromPermission(
rolePermissions, userRole.getUsername()
);
- this.workspace = policyUtils.addPoliciesToExistingObject(orgPolicyMap, workspace);
+ this.workspace = policyUtils.addPoliciesToExistingObject(workspacePolicyMap, workspace);
}
this.workspace = workspaceRepository.save(workspace).block();
}
@@ -112,31 +112,31 @@ private void addRolesToOrg(List<UserRole> roles) {
@AfterEach
public void clear() {
User currentUser = userRepository.findByEmail("api_user").block();
- currentUser.getOrganizationIds().remove(workspace.getId());
+ currentUser.getWorkspaceIds().remove(workspace.getId());
userRepository.save(currentUser);
workspaceRepository.deleteById(workspace.getId()).block();
}
@Test
@WithUserDetails(value = "api_user")
- public void leaveOrganization_WhenUserExistsInOrg_RemovesUser() {
+ public void leaveWorkspace_WhenUserExistsInWorkspace_RemovesUser() {
User currentUser = userRepository.findByEmail("api_user").block();
- Set<String> organizationIdsBefore = Set.copyOf(currentUser.getOrganizationIds());
+ Set<String> workspaceIdsBefore = Set.copyOf(currentUser.getWorkspaceIds());
List<UserRole> userRolesBeforeAddUser = List.copyOf(workspace.getUserRoles());
- currentUser.getOrganizationIds().add(workspace.getId());
+ currentUser.getWorkspaceIds().add(workspace.getId());
userRepository.save(currentUser).block();
- // add org id and recent apps to user data
+ // add workspace id and recent apps to user data
Application application = new Application();
- application.setOrganizationId(workspace.getId());
+ application.setWorkspaceId(workspace.getId());
Mono<UserData> saveUserDataMono = applicationRepository.save(application).flatMap(savedApplication -> {
- // add app id and org id to recent list
+ // add app id and workspace id to recent list
UserData userData = new UserData();
userData.setRecentlyUsedAppIds(List.of(savedApplication.getId()));
- userData.setRecentlyUsedOrgIds(List.of(workspace.getId()));
+ userData.setRecentlyUsedWorkspaceIds(List.of(workspace.getId()));
return userDataService.updateForUser(currentUser, userData);
});
@@ -149,7 +149,7 @@ public void leaveOrganization_WhenUserExistsInOrg_RemovesUser() {
StepVerifier.create(userMono).assertNext(user -> {
assertEquals("api_user", user.getEmail());
- assertEquals(organizationIdsBefore, user.getOrganizationIds());
+ assertEquals(workspaceIdsBefore, user.getWorkspaceIds());
}).verifyComplete();
StepVerifier.create(workspaceRepository.findById(this.workspace.getId())).assertNext(workspace1 -> {
@@ -158,20 +158,20 @@ public void leaveOrganization_WhenUserExistsInOrg_RemovesUser() {
StepVerifier.create(userRepository.findByEmail("api_user")).assertNext(user1 -> {
assertFalse(
- "user's orgId list should not have left org id",
- user1.getOrganizationIds().contains(this.workspace.getId())
+ "user's workspaceId list should not have left workspace id",
+ user1.getWorkspaceIds().contains(this.workspace.getId())
);
}).verifyComplete();
StepVerifier.create(userDataService.getForUser(currentUser)).assertNext(userData -> {
- assertThat(CollectionUtils.isEmpty(userData.getRecentlyUsedOrgIds())).isTrue();
+ assertThat(CollectionUtils.isEmpty(userData.getRecentlyUsedWorkspaceIds())).isTrue();
assertThat(CollectionUtils.isEmpty(userData.getRecentlyUsedAppIds())).isTrue();
}).verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
- public void leaveOrganization_WhenUserDoesNotExistInOrg_ThrowsException() {
+ public void leaveWorkspace_WhenUserDoesNotExistInWorkspace_ThrowsException() {
Mono<User> userMono = userWorkspaceService.leaveWorkspace(this.workspace.getId());
StepVerifier.create(userMono).expectErrorMessage(
AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.USER + " api_user in the organization", workspace.getName())
@@ -187,13 +187,13 @@ public void updateRoleForMember_WhenAdminRoleRemovedWithNoOtherAdmin_ThrowsExcep
userWorkspaceService.addUserToWorkspaceGivenUserObject(workspace, currentUser, userRole).block();
- // try to remove the user from org
+ // try to remove the user from workspace
UserRole updatedRole = new UserRole();
updatedRole.setUsername(currentUser.getUsername());
Mono<UserRole> userRoleMono = userWorkspaceService.updateRoleForMember(workspace.getId(), updatedRole, null);
StepVerifier.create(userRoleMono).expectErrorMessage(
- AppsmithError.REMOVE_LAST_ORG_ADMIN_ERROR.getMessage()
+ AppsmithError.REMOVE_LAST_WORKSPACE_ADMIN_ERROR.getMessage()
).verify();
}
@@ -210,7 +210,7 @@ public void updateRoleForMember_WhenAdminRoleRemovedButOtherAdminExists_MemberRe
UserRole userRole = createUserRole(currentUser.getUsername(), currentUser.getId(), ORGANIZATION_ADMIN);
userWorkspaceService.addUserToWorkspaceGivenUserObject(workspace, currentUser, userRole).block();
- // try to remove the user from org
+ // try to remove the user from workspace
UserRole updatedRole = new UserRole();
updatedRole.setUsername(currentUser.getUsername());
@@ -237,11 +237,11 @@ private Application createTestApplicationForCommentThreadTests() {
userRoles.add(adminRole);
userRoles.add(devRole);
- addRolesToOrg(userRoles);
+ addRolesToWorkspace(userRoles);
// create a test application
Application application = new Application();
- application.setOrganizationId(this.workspace.getId());
+ application.setWorkspaceId(this.workspace.getId());
application.setName("Test application");
Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(
workspace.getPolicies(), Workspace.class, Application.class
@@ -316,7 +316,7 @@ public void updateRoleForMember_WhenCommentThreadExistsAndUserRemoved_UserRemove
@Test
@WithUserDetails("api_user")
- public void bulkAddUsersToOrganization_WhenNewUserAdded_ThreadPolicyUpdated() {
+ public void bulkAddUsersToWorkspace_WhenNewUserAdded_ThreadPolicyUpdated() {
// create a new user
User user = new User();
user.setEmail("new_test_user");
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
index d53ff87c5642..65de8cb0e0b9 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
@@ -56,12 +56,12 @@
import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_READ_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -132,7 +132,7 @@ public void createDefaultWorkspace() {
assertThat(workspace1.getName()).isEqualTo("api_user's apps");
assertThat(workspace1.getSlug()).isNotNull();
assertThat(workspace1.getEmail()).isEqualTo("api_user");
- assertThat(workspace1.getIsAutoGeneratedOrganization()).isTrue();
+ assertThat(workspace1.getIsAutoGeneratedWorkspace()).isTrue();
assertThat(workspace1.getTenantId()).isEqualTo(user.getTenantId());
})
.verifyComplete();
@@ -146,20 +146,20 @@ public void checkNewUsersDefaultWorkspace() {
newUser.setPassword("new-user-with-default-org-password");
Mono<User> userMono = userService.create(newUser).cache();
- Mono<Workspace> defaultOrgMono = userMono
+ Mono<Workspace> defaultWorkspaceMono = userMono
.flatMap(user -> workspaceRepository
- .findById(user.getOrganizationIds().stream().findFirst().get()));
+ .findById(user.getWorkspaceIds().stream().findFirst().get()));
- StepVerifier.create(Mono.zip(userMono, defaultOrgMono))
+ StepVerifier.create(Mono.zip(userMono, defaultWorkspaceMono))
.assertNext(tuple -> {
- Workspace defaultOrg = tuple.getT2();
+ Workspace defaultWorkspace = tuple.getT2();
User user = tuple.getT1();
assertThat(user.getId()).isNotNull();
assertThat(user.getEmail()).isEqualTo("[email protected]");
assertThat(user.getName()).isNullOrEmpty();
- assertThat(defaultOrg.getIsAutoGeneratedOrganization()).isTrue();
- assertThat(defaultOrg.getName()).isEqualTo("new-user-with-default-org's apps");
+ assertThat(defaultWorkspace.getIsAutoGeneratedWorkspace()).isTrue();
+ assertThat(defaultWorkspace.getName()).isEqualTo("new-user-with-default-org's apps");
})
.verifyComplete();
}
@@ -188,11 +188,11 @@ public void nullName() {
@Test
@WithUserDetails(value = "api_user")
public void validCreateWorkspaceTest() {
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("api_user"))
.build();
@@ -207,10 +207,10 @@ public void validCreateWorkspaceTest() {
User user = tuple.getT2();
assertThat(workspace1.getName()).isEqualTo("Test Name");
assertThat(workspace1.getPolicies()).isNotEmpty();
- assertThat(workspace1.getPolicies()).containsAll(Set.of(manageOrgAppPolicy, manageOrgPolicy));
+ assertThat(workspace1.getPolicies()).containsAll(Set.of(manageWorkspaceAppPolicy, manageWorkspacePolicy));
assertThat(workspace1.getSlug()).isEqualTo(TextUtils.makeSlug(workspace.getName()));
assertThat(workspace1.getEmail()).isEqualTo("api_user");
- assertThat(workspace1.getIsAutoGeneratedOrganization()).isNull();
+ assertThat(workspace1.getIsAutoGeneratedWorkspace()).isNull();
assertThat(workspace1.getTenantId()).isEqualTo(user.getTenantId());
})
.verifyComplete();
@@ -259,11 +259,11 @@ public void validGetWorkspaceByName() {
@Test
@WithUserDetails(value = "api_user")
public void validUpdateWorkspace() {
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("api_user"))
.build();
@@ -287,7 +287,7 @@ public void validUpdateWorkspace() {
assertThat(t.getName()).isEqualTo(workspace.getName());
assertThat(t.getId()).isEqualTo(workspace.getId());
assertThat(t.getDomain()).isEqualTo("abc.com");
- assertThat(t.getPolicies()).contains(manageOrgAppPolicy, manageOrgPolicy);
+ assertThat(t.getPolicies()).contains(manageWorkspaceAppPolicy, manageWorkspacePolicy);
})
.verifyComplete();
}
@@ -299,11 +299,11 @@ public void validUpdateWorkspace() {
@Test
@WithUserDetails(value = "api_user")
public void inValidupdateWorkspaceEmptyName() {
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("api_user"))
.build();
@@ -329,26 +329,26 @@ public void inValidupdateWorkspaceEmptyName() {
@Test
@WithUserDetails(value = "api_user")
public void createDuplicateNameWorkspace() {
- Workspace firstOrg = new Workspace();
- firstOrg.setName("Really good org");
- firstOrg.setDomain("example.com");
- firstOrg.setWebsite("https://example.com");
-
- Workspace secondOrg = new Workspace();
- secondOrg.setName(firstOrg.getName());
- secondOrg.setDomain(firstOrg.getDomain());
- secondOrg.setWebsite(firstOrg.getWebsite());
-
- Mono<Workspace> firstOrgCreation = workspaceService.create(firstOrg).cache();
- Mono<Workspace> secondOrgCreation = firstOrgCreation.then(workspaceService.create(secondOrg));
-
- StepVerifier.create(Mono.zip(firstOrgCreation, secondOrgCreation))
- .assertNext(orgsTuple -> {
- assertThat(orgsTuple.getT1().getName()).isEqualTo("Really good org");
- assertThat(orgsTuple.getT1().getSlug()).isEqualTo("really-good-org");
-
- assertThat(orgsTuple.getT2().getName()).isEqualTo("Really good org");
- assertThat(orgsTuple.getT2().getSlug()).isEqualTo("really-good-org");
+ Workspace firstWorkspace = new Workspace();
+ firstWorkspace.setName("Really good org");
+ firstWorkspace.setDomain("example.com");
+ firstWorkspace.setWebsite("https://example.com");
+
+ Workspace secondWorkspace = new Workspace();
+ secondWorkspace.setName(firstWorkspace.getName());
+ secondWorkspace.setDomain(firstWorkspace.getDomain());
+ secondWorkspace.setWebsite(firstWorkspace.getWebsite());
+
+ Mono<Workspace> firstWorkspaceCreation = workspaceService.create(firstWorkspace).cache();
+ Mono<Workspace> secondWorkspaceCreation = firstWorkspaceCreation.then(workspaceService.create(secondWorkspace));
+
+ StepVerifier.create(Mono.zip(firstWorkspaceCreation, secondWorkspaceCreation))
+ .assertNext(WorkspacesTuple -> {
+ assertThat(WorkspacesTuple.getT1().getName()).isEqualTo("Really good org");
+ assertThat(WorkspacesTuple.getT1().getSlug()).isEqualTo("really-good-org");
+
+ assertThat(WorkspacesTuple.getT2().getName()).isEqualTo("Really good org");
+ assertThat(WorkspacesTuple.getT2().getSlug()).isEqualTo("really-good-org");
})
.verifyComplete();
}
@@ -357,7 +357,7 @@ public void createDuplicateNameWorkspace() {
@WithUserDetails(value = "api_user")
public void getAllUserRolesForWorkspaceDomainAsAdministrator() {
Mono<Map<String, String>> userRolesForWorkspace = workspaceService.create(workspace)
- .flatMap(createdOrg -> workspaceService.getUserRolesForWorkspace(createdOrg.getId()));
+ .flatMap(createdWorkspace -> workspaceService.getUserRolesForWorkspace(createdWorkspace.getId()));
StepVerifier.create(userRolesForWorkspace)
.assertNext(roles -> {
@@ -371,7 +371,7 @@ public void getAllUserRolesForWorkspaceDomainAsAdministrator() {
@WithUserDetails(value = "api_user")
public void getAllMembersForWorkspace() {
Workspace testWorkspace = new Workspace();
- testWorkspace.setName("Get All Members For Organization Test");
+ testWorkspace.setName("Get All Members For Workspace Test");
testWorkspace.setDomain("test.com");
testWorkspace.setWebsite("https://test.com");
@@ -392,139 +392,139 @@ public void getAllMembersForWorkspace() {
}
/**
- * This test tests for an existing user being added to an organzation as admin.
- * The workspace object should have permissions to manage the org for the invited user.
+ * This test tests for an existing user being added to an workspace as admin.
+ * The workspace object should have permissions to manage the workspace for the invited user.
*/
@Test
@WithUserDetails(value = "api_user")
public void addExistingUserToWorkspaceAsAdmin() {
- Mono<Workspace> seedWorkspace = workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_ORGANIZATIONS)
+ Mono<Workspace> seedWorkspace = workspaceRepository.findByName("Spring Test Workspace", AclPermission.READ_WORKSPACES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND)));
- Mono<List<User>> usersAddedToOrgMono = seedWorkspace
+ Mono<List<User>> usersAddedToWorkspaceMono = seedWorkspace
.flatMap(workspace1 -> {
// Add user to workspace
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
ArrayList<String> users = new ArrayList<>();
users.add("[email protected]");
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(workspace1.getId());
+ inviteUsersDTO.setWorkspaceId(workspace1.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
return userService.inviteUsers(inviteUsersDTO, "http://localhost:8080");
})
.cache();
- Mono<Workspace> orgAfterUpdateMono = usersAddedToOrgMono
+ Mono<Workspace> workspaceAfterUpdateMono = usersAddedToWorkspaceMono
.then(seedWorkspace);
StepVerifier
- .create(Mono.zip(usersAddedToOrgMono, orgAfterUpdateMono))
+ .create(Mono.zip(usersAddedToWorkspaceMono, workspaceAfterUpdateMono))
.assertNext(tuple -> {
User user = tuple.getT1().get(0);
- Workspace org = tuple.getT2();
+ Workspace workspace = tuple.getT2();
- assertThat(org).isNotNull();
- assertThat(org.getName()).isEqualTo("Spring Test Workspace");
- assertThat(org.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
+ assertThat(workspace).isNotNull();
+ assertThat(workspace.getName()).isEqualTo("Spring Test Workspace");
+ assertThat(workspace.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- assertThat(org.getPolicies()).isNotEmpty();
- assertThat(org.getPolicies()).containsAll(Set.of(manageOrgAppPolicy, manageOrgPolicy, readOrgPolicy));
+ assertThat(workspace.getPolicies()).isNotEmpty();
+ assertThat(workspace.getPolicies()).containsAll(Set.of(manageWorkspaceAppPolicy, manageWorkspacePolicy, readWorkspacePolicy));
- Set<String> organizationIds = user.getOrganizationIds();
- assertThat(organizationIds).contains(org.getId());
+ Set<String> workspaceIds = user.getWorkspaceIds();
+ assertThat(workspaceIds).contains(workspace.getId());
})
.verifyComplete();
}
/**
- * This test tests for a new user being added to an organzation as admin.
+ * This test tests for a new user being added to an workspace as admin.
* The new user must be created at after invite flow and the new user must be disabled.
*/
@Test
@WithUserDetails(value = "api_user")
public void addNewUserToWorkspaceAsAdmin() {
- Mono<Workspace> seedWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS)
+ Mono<Workspace> seedWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND)));
- Mono<List<User>> userAddedToOrgMono = seedWorkspace
+ Mono<List<User>> userAddedToWorkspaceMono = seedWorkspace
.flatMap(workspace1 -> {
// Add user to workspace
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
ArrayList<String> users = new ArrayList<>();
users.add("[email protected]");
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(workspace1.getId());
+ inviteUsersDTO.setWorkspaceId(workspace1.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_ADMIN.getName());
return userService.inviteUsers(inviteUsersDTO, "http://localhost:8080");
})
.cache();
- Mono<Workspace> orgAfterUpdateMono = userAddedToOrgMono
+ Mono<Workspace> workspaceAfterUpdateMono = userAddedToWorkspaceMono
.then(seedWorkspace);
StepVerifier
- .create(Mono.zip(userAddedToOrgMono, orgAfterUpdateMono))
+ .create(Mono.zip(userAddedToWorkspaceMono, workspaceAfterUpdateMono))
.assertNext(tuple -> {
User user = tuple.getT1().get(0);
- Workspace org = tuple.getT2();
- log.debug("org user roles : {}", org.getUserRoles());
+ Workspace workspace = tuple.getT2();
+ log.debug("org user roles : {}", workspace.getUserRoles());
- assertThat(org).isNotNull();
- assertThat(org.getName()).isEqualTo("Another Test Workspace");
- assertThat(org.getUserRoles().stream()
+ assertThat(workspace).isNotNull();
+ assertThat(workspace.getName()).isEqualTo("Another Test Workspace");
+ assertThat(workspace.getUserRoles().stream()
.map(role -> role.getUsername())
.filter(username -> username.equals("[email protected]"))
.collect(Collectors.toSet())
).hasSize(1);
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageWorkspaceAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- assertThat(org.getPolicies()).isNotEmpty();
- assertThat(org.getPolicies()).containsAll(Set.of(manageOrgAppPolicy, manageOrgPolicy, readOrgPolicy));
+ assertThat(workspace.getPolicies()).isNotEmpty();
+ assertThat(workspace.getPolicies()).containsAll(Set.of(manageWorkspaceAppPolicy, manageWorkspacePolicy, readWorkspacePolicy));
assertThat(user).isNotNull();
assertThat(user.getIsEnabled()).isFalse();
- Set<String> organizationIds = user.getOrganizationIds();
- assertThat(organizationIds).contains(org.getId());
+ Set<String> workspaceIds = user.getWorkspaceIds();
+ assertThat(workspaceIds).contains(workspace.getId());
})
.verifyComplete();
}
/**
- * This test tests for a new user being added to an organzation as viewer.
+ * This test tests for a new user being added to an workspace as viewer.
* The new user must be created at after invite flow and the new user must be disabled.
*/
@Test
@WithUserDetails(value = "api_user")
public void addNewUserToWorkspaceAsViewer() {
Workspace workspace = new Workspace();
- workspace.setName("Add Viewer to Test Organization");
+ workspace.setName("Add Viewer to Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -532,53 +532,53 @@ public void addNewUserToWorkspaceAsViewer() {
.create(workspace)
.cache();
- Mono<List<User>> userAddedToOrgMono = workspaceMono
+ Mono<List<User>> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
ArrayList<String> users = new ArrayList<>();
users.add("[email protected]");
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(workspace1.getId());
+ inviteUsersDTO.setWorkspaceId(workspace1.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_VIEWER.getName());
return userService.inviteUsers(inviteUsersDTO, "http://localhost:8080");
})
.cache();
- Mono<Workspace> readOrgMono = workspaceRepository.findByName("Add Viewer to Test Organization");
+ Mono<Workspace> readWorkspaceMono = workspaceRepository.findByName("Add Viewer to Test Workspace");
- Mono<Workspace> orgAfterUpdateMono = userAddedToOrgMono
- .then(readOrgMono);
+ Mono<Workspace> workspaceAfterUpdateMono = userAddedToWorkspaceMono
+ .then(readWorkspaceMono);
StepVerifier
- .create(Mono.zip(userAddedToOrgMono, orgAfterUpdateMono))
+ .create(Mono.zip(userAddedToWorkspaceMono, workspaceAfterUpdateMono))
.assertNext(tuple -> {
User user = tuple.getT1().get(0);
- Workspace org = tuple.getT2();
+ Workspace workspace1 = tuple.getT2();
- assertThat(org).isNotNull();
- assertThat(org.getName()).isEqualTo("Add Viewer to Test Organization");
- assertThat(org.getUserRoles().stream()
+ assertThat(workspace1).isNotNull();
+ assertThat(workspace1.getName()).isEqualTo("Add Viewer to Test Workspace");
+ assertThat(workspace1.getUserRoles().stream()
.filter(role -> role.getUsername().equals("[email protected]"))
.collect(Collectors.toSet())
).hasSize(1);
- Policy readOrgAppsPolicy = Policy.builder().permission(ORGANIZATION_READ_APPLICATIONS.getValue())
+ Policy readWorkspaceAppsPolicy = Policy.builder().permission(WORKSPACE_READ_APPLICATIONS.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- assertThat(org.getPolicies()).isNotEmpty();
- assertThat(org.getPolicies()).containsAll(Set.of(readOrgAppsPolicy, readOrgPolicy));
+ assertThat(workspace1.getPolicies()).isNotEmpty();
+ assertThat(workspace1.getPolicies()).containsAll(Set.of(readWorkspaceAppsPolicy, readWorkspacePolicy));
assertThat(user).isNotNull();
assertThat(user.getIsEnabled()).isFalse();
- Set<String> organizationIds = user.getOrganizationIds();
- assertThat(organizationIds).contains(org.getId());
+ Set<String> workspaceIds = user.getWorkspaceIds();
+ assertThat(workspaceIds).contains(workspace1.getId());
})
.verifyComplete();
@@ -593,7 +593,7 @@ public void addNewUserToWorkspaceAsViewer() {
@WithUserDetails(value = "api_user")
public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions() {
Workspace workspace = new Workspace();
- workspace.setName("Member Management Admin Test Organization");
+ workspace.setName("Member Management Admin Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -603,22 +603,22 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
// Create an application for this workspace
Mono<Application> applicationMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
Application application = new Application();
application.setName("User Management Admin Test Application");
- return applicationPageService.createApplication(application, org.getId());
+ return applicationPageService.createApplication(application, workspace1.getId());
});
// Create datasource for this workspace
Mono<Datasource> datasourceMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
Datasource datasource = new Datasource();
datasource.setName("test datasource");
- datasource.setOrganizationId(org.getId());
+ datasource.setWorkspaceId(workspace1.getId());
return datasourceService.create(datasource);
});
- Mono<Workspace> userAddedToOrgMono = workspaceMono
+ Mono<Workspace> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
UserRole userRole = new UserRole();
@@ -627,7 +627,7 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
return userWorkspaceService.addUserRoleToWorkspace(workspace1.getId(), userRole);
})
.map(workspace1 -> {
- log.debug("Organization policies after adding user is : {}", workspace1.getPolicies());
+ log.debug("Workspace policies after adding user is : {}", workspace1.getPolicies());
return workspace1;
});
@@ -635,11 +635,11 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
AclPermission.READ_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
- Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Admin Test Organization")
+ Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Admin Test Workspace")
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "organization by name")));
Mono<Datasource> readDatasourceByNameMono = workspaceMono.flatMap(workspace1 ->
- datasourceRepository.findByNameAndOrganizationId("test datasource", workspace1.getId(),READ_DATASOURCES)
+ datasourceRepository.findByNameAndWorkspaceId("test datasource", workspace1.getId(),READ_DATASOURCES)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "Datasource")))
);
@@ -647,7 +647,7 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
// create application and datasource
.then(Mono.zip(applicationMono, datasourceMono))
// Now add the user
- .then(userAddedToOrgMono)
+ .then(userAddedToWorkspaceMono)
// Read application, workspace and datasource now to confirm the policies.
.then(Mono.zip(readApplicationByNameMono, readWorkspaceByNameMono, readDatasourceByNameMono));
@@ -655,10 +655,10 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
.create(testMono)
.assertNext(tuple -> {
Application application = tuple.getT1();
- Workspace org = tuple.getT2();
+ Workspace workspace1 = tuple.getT2();
Datasource datasource = tuple.getT3();
- assertThat(org).isNotNull();
- assertThat(org.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
+ assertThat(workspace1).isNotNull();
+ assertThat(workspace1.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user", "[email protected]"))
@@ -700,7 +700,7 @@ public void addUserToWorkspaceAsAdminAndCheckApplicationAndDatasourcePermissions
@WithUserDetails(value = "api_user")
public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
Workspace workspace = new Workspace();
- workspace.setName("Member Management Viewer Test Organization");
+ workspace.setName("Member Management Viewer Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -710,13 +710,13 @@ public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
// Create an application for this workspace
Mono<Application> applicationMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
Application application = new Application();
application.setName("User Management Viewer Test Application");
- return applicationPageService.createApplication(application, org.getId());
+ return applicationPageService.createApplication(application, workspace1.getId());
});
- Mono<Workspace> userAddedToOrgMono = workspaceMono
+ Mono<Workspace> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
UserRole userRole = new UserRole();
@@ -729,21 +729,21 @@ public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
AclPermission.READ_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
- Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Viewer Test Organization")
+ Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Viewer Test Workspace")
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "organization by name")));
Mono<Tuple2<Application, Workspace>> testMono = workspaceMono
.then(applicationMono)
- .then(userAddedToOrgMono)
+ .then(userAddedToWorkspaceMono)
.then(Mono.zip(readApplicationByNameMono, readWorkspaceByNameMono));
StepVerifier
.create(testMono)
.assertNext(tuple -> {
Application application = tuple.getT1();
- Workspace org = tuple.getT2();
- assertThat(org).isNotNull();
- assertThat(org.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
+ Workspace workspace1 = tuple.getT2();
+ assertThat(workspace1).isNotNull();
+ assertThat(workspace1.getUserRoles().get(1).getUsername()).isEqualTo("[email protected]");
log.debug("App policies are {}", application.getPolicies());
@@ -768,7 +768,7 @@ public void addUserToWorkspaceAsViewerAndCheckApplicationPermissions() {
@WithUserDetails(value = "api_user")
public void changeUserRoleAndCheckApplicationPermissionChanges() {
Workspace workspace = new Workspace();
- workspace.setName("Member Management Test Organization");
+ workspace.setName("Member Management Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -778,13 +778,13 @@ public void changeUserRoleAndCheckApplicationPermissionChanges() {
// Create an application for this workspace
Mono<Application> createApplicationMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
Application application = new Application();
application.setName("User Management Test Application");
- return applicationPageService.createApplication(application, org.getId());
+ return applicationPageService.createApplication(application, workspace1.getId());
});
- Mono<Workspace> userAddedToOrgMono = workspaceMono
+ Mono<Workspace> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
UserRole userRole = new UserRole();
@@ -798,16 +798,16 @@ public void changeUserRoleAndCheckApplicationPermissionChanges() {
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
Mono<UserRole> userRoleChangeMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
UserRole userRole = new UserRole();
userRole.setUsername("[email protected]");
userRole.setRoleName("App Viewer");
- return userWorkspaceService.updateRoleForMember(org.getId(), userRole, "http://localhost:8080");
+ return userWorkspaceService.updateRoleForMember(workspace1.getId(), userRole, "http://localhost:8080");
});
Mono<Application> applicationAfterRoleChange = workspaceMono
.then(createApplicationMono)
- .then(userAddedToOrgMono)
+ .then(userAddedToWorkspaceMono)
.then(userRoleChangeMono)
.then(readApplicationByNameMono);
@@ -836,7 +836,7 @@ public void changeUserRoleAndCheckApplicationPermissionChanges() {
@WithUserDetails(value = "api_user")
public void deleteUserRoleFromWorkspaceTest() {
Workspace workspace = new Workspace();
- workspace.setName("Member Management Delete Test Organization");
+ workspace.setName("Member Management Delete Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -846,13 +846,13 @@ public void deleteUserRoleFromWorkspaceTest() {
// Create an application for this workspace
Mono<Application> createApplicationMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
Application application = new Application();
application.setName("User Management Delete Test Application");
- return applicationPageService.createApplication(application, org.getId());
+ return applicationPageService.createApplication(application, workspace1.getId());
});
- Mono<Workspace> userAddedToOrgMono = workspaceMono
+ Mono<Workspace> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
UserRole userRole = new UserRole();
@@ -865,21 +865,21 @@ public void deleteUserRoleFromWorkspaceTest() {
AclPermission.READ_APPLICATIONS)
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application by name")));
- Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Delete Test Organization")
+ Mono<Workspace> readWorkspaceByNameMono = workspaceRepository.findByName("Member Management Delete Test Workspace")
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "workspace by name")));
Mono<UserRole> userRoleChangeMono = workspaceMono
- .flatMap(org -> {
+ .flatMap(workspace1 -> {
UserRole userRole = new UserRole();
userRole.setUsername("[email protected]");
// Setting the role name to null ensures that user is deleted from the workspace
userRole.setRoleName(null);
- return userWorkspaceService.updateRoleForMember(org.getId(), userRole, "http://localhost:8080");
+ return userWorkspaceService.updateRoleForMember(workspace1.getId(), userRole, "http://localhost:8080");
});
Mono<Tuple2<Application, Workspace>> tupleMono = workspaceMono
.then(createApplicationMono)
- .then(userAddedToOrgMono)
+ .then(userAddedToWorkspaceMono)
.then(userRoleChangeMono)
.then(Mono.zip(readApplicationByNameMono, readWorkspaceByNameMono));
@@ -888,8 +888,8 @@ public void deleteUserRoleFromWorkspaceTest() {
.create(tupleMono)
.assertNext(tuple -> {
Application application = tuple.getT1();
- Workspace org = tuple.getT2();
- assertThat(org.getUserRoles().size()).isEqualTo(1);
+ Workspace workspace1 = tuple.getT2();
+ assertThat(workspace1.getUserRoles().size()).isEqualTo(1);
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
@@ -912,7 +912,7 @@ public void deleteUserRoleFromWorkspaceTest() {
@WithUserDetails(value = "api_user")
public void addNewUsersBulkToWorkspaceAsViewer() {
Workspace workspace = new Workspace();
- workspace.setName("Add Bulk Viewers to Test Organization");
+ workspace.setName("Add Bulk Viewers to Test Workspace");
workspace.setDomain("example.com");
workspace.setWebsite("https://example.com");
@@ -920,7 +920,7 @@ public void addNewUsersBulkToWorkspaceAsViewer() {
.create(workspace)
.cache();
- Mono<List<User>> userAddedToOrgMono = workspaceMono
+ Mono<List<User>> userAddedToWorkspaceMono = workspaceMono
.flatMap(workspace1 -> {
// Add user to workspace
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
@@ -929,52 +929,52 @@ public void addNewUsersBulkToWorkspaceAsViewer() {
users.add("[email protected]");
users.add("[email protected]");
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(workspace1.getId());
+ inviteUsersDTO.setWorkspaceId(workspace1.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_VIEWER.getName());
return userService.inviteUsers(inviteUsersDTO, "http://localhost:8080");
})
.cache();
- Mono<Workspace> readOrgMono = workspaceRepository.findByName("Add Bulk Viewers to Test Organization");
+ Mono<Workspace> readWorkspaceMono = workspaceRepository.findByName("Add Bulk Viewers to Test Workspace");
- Mono<Workspace> orgAfterUpdateMono = userAddedToOrgMono
- .then(readOrgMono);
+ Mono<Workspace> workspaceAfterUpdateMono = userAddedToWorkspaceMono
+ .then(readWorkspaceMono);
StepVerifier
- .create(Mono.zip(userAddedToOrgMono, orgAfterUpdateMono))
+ .create(Mono.zip(userAddedToWorkspaceMono, workspaceAfterUpdateMono))
.assertNext(tuple -> {
User user = tuple.getT1().get(0);
- Workspace org = tuple.getT2();
+ Workspace workspace1 = tuple.getT2();
- assertThat(org).isNotNull();
- assertThat(org.getName()).isEqualTo("Add Bulk Viewers to Test Organization");
- assertThat(org.getUserRoles().stream()
+ assertThat(workspace1).isNotNull();
+ assertThat(workspace1.getName()).isEqualTo("Add Bulk Viewers to Test Workspace");
+ assertThat(workspace1.getUserRoles().stream()
.map(userRole -> userRole.getUsername())
.filter(username -> !username.equals("api_user"))
.collect(Collectors.toSet())
).containsAll(Set.of("[email protected]", "[email protected]",
"[email protected]"));
- Policy readOrgAppsPolicy = Policy.builder().permission(ORGANIZATION_READ_APPLICATIONS.getValue())
+ Policy readWorkspaceAppsPolicy = Policy.builder().permission(WORKSPACE_READ_APPLICATIONS.getValue())
.users(Set.of("api_user", "[email protected]",
"[email protected]",
"[email protected]"))
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]",
"[email protected]",
"[email protected]"))
.build();
- assertThat(org.getPolicies()).isNotEmpty();
- assertThat(org.getPolicies()).containsAll(Set.of(readOrgAppsPolicy, readOrgPolicy));
+ assertThat(workspace1.getPolicies()).isNotEmpty();
+ assertThat(workspace1.getPolicies()).containsAll(Set.of(readWorkspaceAppsPolicy, readWorkspacePolicy));
assertThat(user).isNotNull();
assertThat(user.getIsEnabled()).isFalse();
- Set<String> organizationIds = user.getOrganizationIds();
- assertThat(organizationIds).contains(org.getId());
+ Set<String> workspaceIds = user.getWorkspaceIds();
+ assertThat(workspaceIds).contains(workspace1.getId());
})
.verifyComplete();
@@ -1044,7 +1044,7 @@ public void uploadWorkspaceLogo_nullFilePart() throws IOException {
public void uploadWorkspaceLogo_largeFilePart() throws IOException {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo_large.png"), new DefaultDataBufferFactory(), 4096);
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo_large.png"), new DefaultDataBufferFactory(), 4096);
assertThat(dataBufferFlux.count().block()).isGreaterThan((int) Math.ceil(Constraint.WORKSPACE_LOGO_SIZE_KB/4.0));
Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
@@ -1052,10 +1052,10 @@ public void uploadWorkspaceLogo_largeFilePart() throws IOException {
// The pre-requisite of creating an workspace has been blocked for code readability
// The duration sets an upper limit for this test to run
- String orgId = workspaceService.create(workspace).blockOptional(Duration.ofSeconds(3)).map(Workspace::getId).orElse(null);
- assertThat(orgId).isNotNull();
+ String workspaceId = workspaceService.create(workspace).blockOptional(Duration.ofSeconds(3)).map(Workspace::getId).orElse(null);
+ assertThat(workspaceId).isNotNull();
- final Mono<Workspace> resultMono = workspaceService.uploadLogo(orgId, filepart);
+ final Mono<Workspace> resultMono = workspaceService.uploadLogo(workspaceId, filepart);
StepVerifier.create(resultMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
@@ -1078,7 +1078,7 @@ public void testDeleteLogo_invalidWorkspace() {
public void testUpdateAndDeleteLogo_validLogo() throws IOException {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo.png"), new DefaultDataBufferFactory(), 4096).cache();
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo.png"), new DefaultDataBufferFactory(), 4096).cache();
assertThat(dataBufferFlux.count().block()).isLessThanOrEqualTo((int) Math.ceil(Constraint.WORKSPACE_LOGO_SIZE_KB/4.0));
Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
@@ -1108,29 +1108,29 @@ public void testUpdateAndDeleteLogo_validLogo() throws IOException {
StepVerifier.create(deleteLogo)
.assertNext(x -> {
assertThat(x.getLogoAssetId()).isNull();
- log.debug("Deleted logo for org: {}", x.getId());
+ log.debug("Deleted logo for workspace: {}", x.getId());
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
- public void delete_WhenOrgHasApp_ThrowsException() {
+ public void delete_WhenWorkspaceHasApp_ThrowsException() {
Workspace workspace = new Workspace();
workspace.setName("Test org to test delete org");
- Mono<Workspace> deleteOrgMono = workspaceService.create(workspace)
- .flatMap(savedOrg -> {
+ Mono<Workspace> deleteWorkspaceMono = workspaceService.create(workspace)
+ .flatMap(savedWorkspace -> {
Application application = new Application();
- application.setOrganizationId(savedOrg.getId());
+ application.setWorkspaceId(savedWorkspace.getId());
application.setName("Test app to test delete org");
return applicationPageService.createApplication(application);
}).flatMap(application ->
- workspaceService.archiveById(application.getOrganizationId())
+ workspaceService.archiveById(application.getWorkspaceId())
);
StepVerifier
- .create(deleteOrgMono)
+ .create(deleteWorkspaceMono)
.expectErrorMessage(AppsmithError.UNSUPPORTED_OPERATION.getMessage())
.verify();
}
@@ -1140,45 +1140,45 @@ public void delete_WhenOrgHasApp_ThrowsException() {
public void delete_WithoutManagePermission_ThrowsException() {
Workspace workspace = new Workspace();
workspace.setName("Test org to test delete org");
- Policy readOrgPolicy = Policy.builder()
- .permission(READ_ORGANIZATIONS.getValue())
+ Policy readWorkspacePolicy = Policy.builder()
+ .permission(READ_WORKSPACES.getValue())
.users(Set.of("api_user", "[email protected]"))
.build();
- Policy manageOrgPolicy = Policy.builder()
- .permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageWorkspacePolicy = Policy.builder()
+ .permission(MANAGE_WORKSPACES.getValue())
.users(Set.of("[email protected]"))
.build();
// api user has read org permission but no manage org permission
- workspace.setPolicies(Set.of(readOrgPolicy, manageOrgPolicy));
+ workspace.setPolicies(Set.of(readWorkspacePolicy, manageWorkspacePolicy));
- Mono<Workspace> deleteOrgMono = workspaceRepository.save(workspace)
- .flatMap(savedOrg ->
- workspaceService.archiveById(savedOrg.getId())
+ Mono<Workspace> deleteWorkspaceMono = workspaceRepository.save(workspace)
+ .flatMap(savedWorkspace ->
+ workspaceService.archiveById(savedWorkspace.getId())
);
StepVerifier
- .create(deleteOrgMono)
+ .create(deleteWorkspaceMono)
.expectError(AppsmithException.class)
.verify();
}
@Test
@WithUserDetails(value = "api_user")
- public void delete_WhenOrgHasNoApp_OrgIsDeleted() {
+ public void delete_WhenWorkspaceHasNoApp_WorkspaceIsDeleted() {
Workspace workspace = new Workspace();
workspace.setName("Test org to test delete org");
- Mono<Workspace> deleteOrgMono = workspaceService.create(workspace)
- .flatMap(savedOrg ->
- workspaceService.archiveById(savedOrg.getId())
- .then(workspaceRepository.findById(savedOrg.getId()))
+ Mono<Workspace> deleteWorkspaceMono = workspaceService.create(workspace)
+ .flatMap(savedWorkspace ->
+ workspaceService.archiveById(savedWorkspace.getId())
+ .then(workspaceRepository.findById(savedWorkspace.getId()))
);
// using verifyComplete() only. If the Mono emits any data, it will fail the stepverifier
// as it doesn't expect an onNext signal at this point.
StepVerifier
- .create(deleteOrgMono)
+ .create(deleteWorkspaceMono)
.verifyComplete();
}
@@ -1187,9 +1187,9 @@ public void delete_WhenOrgHasNoApp_OrgIsDeleted() {
public void save_WhenNameIsPresent_SlugGenerated() {
String uniqueString = UUID.randomUUID().toString(); // to make sure name is not conflicted with other tests
Workspace workspace = new Workspace();
- workspace.setName("My Organization " + uniqueString);
+ workspace.setName("My Workspace " + uniqueString);
- String finalName = "Renamed Organization " + uniqueString;
+ String finalName = "Renamed Workspace " + uniqueString;
Mono<Workspace> workspaceMono = workspaceService.create(workspace)
.flatMap(savedWorkspace -> {
@@ -1208,7 +1208,7 @@ public void save_WhenNameIsPresent_SlugGenerated() {
@WithUserDetails(value = "api_user")
public void update_WhenNameIsNotPresent_SlugIsNotGenerated() {
String uniqueString = UUID.randomUUID().toString(); // to make sure name is not conflicted with other tests
- String initialName = "My Organization " + uniqueString;
+ String initialName = "My Workspace " + uniqueString;
Workspace workspace = new Workspace();
workspace.setName(initialName);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceUnitTest.java
index 152d917487e4..fde286695d48 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceUnitTest.java
@@ -26,7 +26,7 @@
import javax.validation.Validator;
import java.util.List;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
@RunWith(SpringJUnit4ClassRunner.class)
public class WorkspaceServiceUnitTest {
@@ -60,13 +60,13 @@ public void setUp() {
public void getWorkspaceMembers_WhenRoleIsNull_ReturnsEmptyList() {
// create a workspace object
Workspace testWorkspace = new Workspace();
- testWorkspace.setName("Get All Members For Organization Test");
+ testWorkspace.setName("Get All Members For Workspace Test");
testWorkspace.setDomain("test.com");
testWorkspace.setWebsite("https://test.com");
testWorkspace.setId("test-org-id");
// mock repository methods so that they return the objects we've created
- Mockito.when(workspaceRepository.findById("test-org-id", ORGANIZATION_INVITE_USERS))
+ Mockito.when(workspaceRepository.findById("test-org-id", WORKSPACE_INVITE_USERS))
.thenReturn(Mono.just(testWorkspace));
Mono<List<UserRole>> workspaceMembers = workspaceService.getWorkspaceMembers(testWorkspace.getId());
@@ -80,15 +80,15 @@ public void getWorkspaceMembers_WhenRoleIsNull_ReturnsEmptyList() {
@Test
public void getWorkspaceMembers_WhenNoOrgFound_ThrowsException() {
- String sampleOrgId = "test-org-id";
+ String sampleWorkspaceId = "test-org-id";
// mock repository methods so that they return the objects we've created
- Mockito.when(workspaceRepository.findById(sampleOrgId, ORGANIZATION_INVITE_USERS))
+ Mockito.when(workspaceRepository.findById(sampleWorkspaceId, WORKSPACE_INVITE_USERS))
.thenReturn(Mono.empty());
- Mono<List<UserRole>> workspaceMembers = workspaceService.getWorkspaceMembers(sampleOrgId);
+ Mono<List<UserRole>> workspaceMembers = workspaceService.getWorkspaceMembers(sampleWorkspaceId);
StepVerifier
.create(workspaceMembers)
- .expectErrorMessage(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.WORKSPACE, sampleOrgId))
+ .expectErrorMessage(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.WORKSPACE, sampleWorkspaceId))
.verify();
}
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
index 625032b9418a..068c7868fee8 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
@@ -164,7 +164,7 @@ public class ActionServiceCE_Test {
Datasource datasource;
- String orgId;
+ String workspaceId;
String branchName;
@@ -173,8 +173,8 @@ public class ActionServiceCE_Test {
public void setup() {
User apiUser = userService.findByEmail("api_user").block();
- orgId = apiUser.getOrganizationIds().iterator().next();
- Workspace workspace = workspaceService.getById(orgId).block();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
+ Workspace workspace = workspaceService.getById(workspaceId).block();
if (testApp == null && testPage == null) {
//Create application and page which will be used by the tests to create actions for.
@@ -214,14 +214,14 @@ public void setup() {
GitApplicationMetadata gitData = new GitApplicationMetadata();
gitData.setBranchName("actionServiceTest");
newApp.setGitApplicationMetadata(gitData);
- gitConnectedApp = applicationPageService.createApplication(newApp, orgId)
+ gitConnectedApp = applicationPageService.createApplication(newApp, workspaceId)
.flatMap(application -> {
application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
return applicationService.save(application)
.zipWhen(application1 -> importExportApplicationService.exportApplicationById(application1.getId(), gitData.getBranchName()));
})
// Assign the branchName to all the resources connected to the application
- .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(orgId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+ .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
.block();
gitConnectedPage = newPageService.findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false).block();
@@ -229,11 +229,11 @@ public void setup() {
branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
}
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
- orgId = testWorkspace.getId();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
+ workspaceId = testWorkspace.getId();
datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
datasource.setPluginId(installed_plugin.getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -1081,7 +1081,7 @@ public void executeActionWithExternalDatasource() {
Datasource externalDatasource = new Datasource();
externalDatasource.setName("Default Database");
- externalDatasource.setOrganizationId(orgId);
+ externalDatasource.setWorkspaceId(workspaceId);
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
externalDatasource.setPluginId(installed_plugin.getId());
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
@@ -1123,7 +1123,7 @@ public void updateShouldNotResetUserSetOnLoad() {
Datasource externalDatasource = new Datasource();
externalDatasource.setName("updateShouldNotResetUserSetOnLoad Database");
- externalDatasource.setOrganizationId(orgId);
+ externalDatasource.setWorkspaceId(workspaceId);
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
externalDatasource.setPluginId(installed_plugin.getId());
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
@@ -1191,7 +1191,7 @@ public void checkNewActionAndNewDatasourceAnonymousPermissionInPublicApp() {
.users(Set.of("api_user", FieldName.ANONYMOUS_USER))
.build();
- Application createdApplication = applicationPageService.createApplication(application, orgId).block();
+ Application createdApplication = applicationPageService.createApplication(application, workspaceId).block();
String pageId = createdApplication.getPages().get(0).getId();
@@ -1210,7 +1210,7 @@ public void checkNewActionAndNewDatasourceAnonymousPermissionInPublicApp() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Datasource savedDatasource = datasourceService.create(datasource).block();
@@ -2481,7 +2481,7 @@ public void suggestWidget_ArrayListDataEmpty_SuggestTextWidget() {
private Mono<PageDTO> createPage(Application app, PageDTO page) {
return newPageService
.findByNameAndViewMode(page.getName(), AclPermission.READ_PAGES, false)
- .switchIfEmpty(applicationPageService.createApplication(app, orgId)
+ .switchIfEmpty(applicationPageService.createApplication(app, workspaceId)
.map(application -> {
page.setApplicationId(application.getId());
return page;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
index 32fbf57dbe47..cc17d8f2b286 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
@@ -53,10 +53,10 @@ public void getAllApplications_WhenUnpublishedPageExists_ReturnsApplications() {
}).then(applicationFetcher.getAllApplications());
StepVerifier.create(homepageDTOMono).assertNext(userHomepageDTO -> {
- assertThat(userHomepageDTO.getOrganizationApplications()).isNotNull();
+ assertThat(userHomepageDTO.getWorkspaceApplications()).isNotNull();
- WorkspaceApplicationsDTO orgApps = userHomepageDTO.getOrganizationApplications().stream().filter(
- x -> x.getOrganization().getName().equals(newWorkspace.getName())
+ WorkspaceApplicationsDTO orgApps = userHomepageDTO.getWorkspaceApplications().stream().filter(
+ x -> x.getWorkspace().getName().equals(newWorkspace.getName())
).findFirst().orElse(new WorkspaceApplicationsDTO());
assertThat(orgApps.getApplications().size()).isEqualTo(1);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
index a06910873599..c09122f96558 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
@@ -34,7 +34,7 @@
import java.util.Set;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -95,7 +95,7 @@ private List<Application> createDummyApplications(int orgCount, int appCount) {
for(int i = 1; i <= orgCount; i++) {
for (int j = 1; j <= appCount; j++) {
Application application = new Application();
- application.setOrganizationId("org-" + i);
+ application.setWorkspaceId("org-" + i);
application.setId("org-" + i + "-app-" + j); // e.g. org-1-app-3
application.setName(application.getId()); // e.g. org-1-app-3
// Set dummy applicationPages
@@ -168,12 +168,12 @@ private void initMocks() {
testUser = new User();
testUser.setEmail("application-fetcher-test-user");
testUser.setIsAnonymous(false);
- testUser.setOrganizationIds(Set.of("org-1", "org-2", "org-3", "org-4"));
+ testUser.setWorkspaceIds(Set.of("org-1", "org-2", "org-3", "org-4"));
testUser.setTenantId(defaultTenantId);
Mockito.when(sessionUserService.getCurrentUser()).thenReturn(Mono.just(testUser));
Mockito.when(userService.findByEmail(testUser.getEmail())).thenReturn(Mono.just(testUser));
- Mockito.when(workspaceService.findByIdsIn(testUser.getOrganizationIds(), defaultTenantId, READ_ORGANIZATIONS))
+ Mockito.when(workspaceService.findByIdsIn(testUser.getWorkspaceIds(), defaultTenantId, READ_WORKSPACES))
.thenReturn(Flux.fromIterable(createDummyWorkspaces()));
Mockito.when(releaseNotesService.getReleaseNodes()).thenReturn(Mono.empty());
Mockito.when(releaseNotesService.computeNewFrom(any())).thenReturn("0");
@@ -191,8 +191,8 @@ public void getAllApplications_NoRecentOrgAndApps_AllEntriesReturned() {
List<Application> applications = createDummyApplications(4,4);
List<NewPage> pageList = createDummyPages(4, 4);
- Mockito.when(applicationRepository.findByMultipleOrganizationIds(
- testUser.getOrganizationIds(), READ_APPLICATIONS)
+ Mockito.when(applicationRepository.findByMultipleWorkspaceIds(
+ testUser.getWorkspaceIds(), READ_APPLICATIONS)
).thenReturn(Flux.fromIterable(applications));
Mockito.when(newPageService.findPageSlugsByApplicationIds(anyList(), eq(READ_PAGES)))
@@ -209,10 +209,10 @@ public void getAllApplications_NoRecentOrgAndApps_AllEntriesReturned() {
StepVerifier.create(applicationFetcher.getAllApplications())
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
assertThat(dtos.size()).isEqualTo(4);
for (WorkspaceApplicationsDTO dto : dtos) {
- assertThat(dto.getOrganization().getTenantId()).isEqualTo(defaultTenantId);
+ assertThat(dto.getWorkspace().getTenantId()).isEqualTo(defaultTenantId);
assertThat(dto.getApplications().size()).isEqualTo(4);
List<Application> applicationList = dto.getApplications();
for (Application application : applicationList) {
@@ -238,8 +238,8 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
List<Application> applications = createDummyApplications(4,4);
List<NewPage> pageList = createDummyPages(4, 4);
- Mockito.when(applicationRepository.findByMultipleOrganizationIds(
- testUser.getOrganizationIds(), READ_APPLICATIONS)
+ Mockito.when(applicationRepository.findByMultipleWorkspaceIds(
+ testUser.getWorkspaceIds(), READ_APPLICATIONS)
).thenReturn(Flux.fromIterable(applications));
Mockito.when(newPageService.findPageSlugsByApplicationIds(anyList(), eq(READ_PAGES)))
@@ -256,10 +256,10 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
StepVerifier.create(applicationFetcher.getAllApplications())
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
assertThat(dtos.size()).isEqualTo(4);
for (WorkspaceApplicationsDTO dto : dtos) {
- assertThat(dto.getOrganization().getTenantId()).isEqualTo(defaultTenantId);
+ assertThat(dto.getWorkspace().getTenantId()).isEqualTo(defaultTenantId);
assertThat(dto.getApplications().size()).isEqualTo(4);
List<Application> applicationList = dto.getApplications();
for (Application application : applicationList) {
@@ -278,7 +278,7 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
.thenReturn(Mono.just(new Application()));
Mono<UserHomepageDTO> userHomepageDTOMono = applicationFetcher.getAllApplications()
.flatMap(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
List<Application> applicationList = dtos.get(0).getApplications();
return Mono.just(applicationList.get(0));
})
@@ -288,7 +288,7 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
StepVerifier.create(userHomepageDTOMono)
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
assertThat(dtos.size()).isEqualTo(4);
for (WorkspaceApplicationsDTO dto : dtos) {
assertThat(dto.getApplications().size()).isEqualTo(4);
@@ -307,7 +307,7 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
// For connect and create branch flow scenarios where - defaultBranchName is somehow not saved in DB
userHomepageDTOMono = applicationFetcher.getAllApplications()
.flatMap(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
List<Application> applicationList = dtos.get(0).getApplications();
return Mono.just(applicationList.get(0));
})
@@ -315,7 +315,7 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
// Create a new branched App resource in the same org and verify that branch App does not show up in the response.
Application branchApp = new Application();
branchApp.setName("branched App");
- branchApp.setOrganizationId(application.getOrganizationId());
+ branchApp.setWorkspaceId(application.getWorkspaceId());
branchApp.setId("org-" + 5 + "-app-" + 5);
GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
gitApplicationMetadata.setDefaultApplicationId(application.getId());
@@ -344,7 +344,7 @@ public void getAllApplications_gitConnectedAppScenarios_OnlyTheDefaultBranchedAp
StepVerifier.create(userHomepageDTOMono)
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> dtos = userHomepageDTO.getWorkspaceApplications();
assertThat(dtos.size()).isEqualTo(4);
for (WorkspaceApplicationsDTO dto : dtos) {
assertThat(dto.getApplications().size()).isEqualTo(4);
@@ -367,7 +367,7 @@ public void getAllApplications_WhenUserHasRecentOrgAndApp_RecentEntriesComeFirst
initMocks();
// mock the user data to return recently used orgs and apps
UserData userData = new UserData();
- userData.setRecentlyUsedOrgIds(List.of("org-2", "org-4"));
+ userData.setRecentlyUsedWorkspaceIds(List.of("org-2", "org-4"));
userData.setRecentlyUsedAppIds(List.of("org-2-app-2", "org-2-app-1", "org-4-app-3"));
Mockito.when(userDataService.getForCurrentUser()).thenReturn(Mono.just(userData));
@@ -375,8 +375,8 @@ public void getAllApplications_WhenUserHasRecentOrgAndApp_RecentEntriesComeFirst
List<Application> applications = createDummyApplications(4,4);
List<NewPage> pageList = createDummyPages(4, 4);
- Mockito.when(applicationRepository.findByMultipleOrganizationIds(
- testUser.getOrganizationIds(), READ_APPLICATIONS)
+ Mockito.when(applicationRepository.findByMultipleWorkspaceIds(
+ testUser.getWorkspaceIds(), READ_APPLICATIONS)
).thenReturn(Flux.fromIterable(applications));
Mockito.when(newPageService.findPageSlugsByApplicationIds(anyList(), eq(READ_PAGES)))
@@ -390,7 +390,7 @@ public void getAllApplications_WhenUserHasRecentOrgAndApp_RecentEntriesComeFirst
StepVerifier.create(applicationFetcher.getAllApplications())
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getWorkspaceApplications();
assertThat(workspaceApplications).isNotNull();
assertThat(workspaceApplications.size()).isEqualTo(4);
@@ -405,11 +405,11 @@ public void getAllApplications_WhenUserHasRecentOrgAndApp_RecentEntriesComeFirst
);
// rest two orgs should have apps sorted in default order e.g. 1,2,3,4
- String org3AppPrefix = workspaceApplications.get(2).getOrganization().getId() + "-app-";
+ String org3AppPrefix = workspaceApplications.get(2).getWorkspace().getId() + "-app-";
checkAppsAreSorted(workspaceApplications.get(2).getApplications(),
List.of(org3AppPrefix+"1", org3AppPrefix+"2", org3AppPrefix+"3", org3AppPrefix+"4")
);
- String org4AppPrefix = workspaceApplications.get(3).getOrganization().getId() + "-app-";
+ String org4AppPrefix = workspaceApplications.get(3).getWorkspace().getId() + "-app-";
checkAppsAreSorted(workspaceApplications.get(3).getApplications(),
List.of(org4AppPrefix+"1", org4AppPrefix+"2", org4AppPrefix+"3", org4AppPrefix+"4")
);
@@ -421,15 +421,15 @@ public void getAllApplications_WhenUserHasRecentOrgButNoRecentApp_AppsAreSortedI
initMocks();
// mock the user data to return recently used orgs and apps
UserData userData = new UserData();
- userData.setRecentlyUsedOrgIds(List.of("org-3", "org-1"));
+ userData.setRecentlyUsedWorkspaceIds(List.of("org-3", "org-1"));
Mockito.when(userDataService.getForCurrentUser()).thenReturn(Mono.just(userData));
// mock the list of applications
List<Application> applications = createDummyApplications(3,3);
List<NewPage> pageList = createDummyPages(4, 4);
- Mockito.when(applicationRepository.findByMultipleOrganizationIds(
- testUser.getOrganizationIds(), READ_APPLICATIONS)
+ Mockito.when(applicationRepository.findByMultipleWorkspaceIds(
+ testUser.getWorkspaceIds(), READ_APPLICATIONS)
).thenReturn(Flux.fromIterable(applications));
Mockito.when(newPageService.findPageSlugsByApplicationIds(anyList(), eq(READ_PAGES)))
@@ -443,7 +443,7 @@ public void getAllApplications_WhenUserHasRecentOrgButNoRecentApp_AppsAreSortedI
StepVerifier.create(applicationFetcher.getAllApplications())
.assertNext(userHomepageDTO -> {
- List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getOrganizationApplications();
+ List<WorkspaceApplicationsDTO> workspaceApplications = userHomepageDTO.getWorkspaceApplications();
assertThat(workspaceApplications).isNotNull();
assertThat(workspaceApplications.size()).isEqualTo(4);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
index e31d7638b33d..48ed97d6e76f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
@@ -151,7 +151,7 @@ public class ApplicationForkingServiceTests {
private static String sourceAppId;
- private static String testUserOrgId;
+ private static String testUserWorkspaceId;
private static boolean isSetupDone = false;
@@ -167,12 +167,12 @@ public void setup() {
Workspace sourceWorkspace = new Workspace();
- sourceWorkspace.setName("Source Organization");
+ sourceWorkspace.setName("Source Workspace");
workspaceService.create(sourceWorkspace).map(Workspace::getId).block();
Application app1 = new Application();
app1.setName("1 - public app");
- app1.setOrganizationId(sourceWorkspace.getId());
+ app1.setWorkspaceId(sourceWorkspace.getId());
app1.setForkingEnabled(true);
app1 = applicationPageService.createApplication(app1).block();
sourceAppId = app1.getId();
@@ -182,7 +182,7 @@ public void setup() {
// Save action
Datasource datasource = new Datasource();
datasource.setName("Default Database");
- datasource.setOrganizationId(app1.getOrganizationId());
+ datasource.setWorkspaceId(app1.getWorkspaceId());
Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
datasource.setPluginId(installed_plugin.getId());
datasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -204,7 +204,7 @@ public void setup() {
actionCollectionDTO.setName("testCollection1");
actionCollectionDTO.setPageId(app1.getPages().get(0).getId());
actionCollectionDTO.setApplicationId(sourceAppId);
- actionCollectionDTO.setOrganizationId(sourceWorkspace.getId());
+ actionCollectionDTO.setWorkspaceId(sourceWorkspace.getId());
actionCollectionDTO.setPluginId(datasource.getPluginId());
actionCollectionDTO.setVariables(List.of(new JSValue("test", "String", "test", true)));
actionCollectionDTO.setBody("export default {\n" +
@@ -259,7 +259,7 @@ public void setup() {
ArrayList<String> users = new ArrayList<>();
users.add("[email protected]");
inviteUsersDTO.setUsernames(users);
- inviteUsersDTO.setOrgId(sourceWorkspace.getId());
+ inviteUsersDTO.setWorkspaceId(sourceWorkspace.getId());
inviteUsersDTO.setRoleName(AppsmithRole.ORGANIZATION_VIEWER.getName());
userService.inviteUsers(inviteUsersDTO, "http://localhost:8080").block();
@@ -280,10 +280,10 @@ public Mono<WorkspaceData> loadWorkspaceData(Workspace workspace) {
return Mono
.when(
applicationService
- .findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
.map(data.applications::add),
datasourceService
- .findAllByOrganizationId(workspace.getId(), READ_DATASOURCES)
+ .findAllByWorkspaceId(workspace.getId(), READ_DATASOURCES)
.map(data.datasources::add),
getActionsInWorkspace(workspace)
.map(data.actions::add)
@@ -296,12 +296,12 @@ public Mono<WorkspaceData> loadWorkspaceData(Workspace workspace) {
public void test1_cloneWorkspaceWithItsContents() {
Workspace targetWorkspace = new Workspace();
- targetWorkspace.setName("Target Organization");
+ targetWorkspace.setName("Target Workspace");
final Mono<Application> resultMono = workspaceService.create(targetWorkspace)
.map(Workspace::getId)
- .flatMap(targetOrganizationId ->
- applicationForkingService.forkApplicationToWorkspace(sourceAppId, targetOrganizationId)
+ .flatMap(targetWorkspaceId ->
+ applicationForkingService.forkApplicationToWorkspace(sourceAppId, targetWorkspaceId)
);
StepVerifier.create(resultMono
@@ -389,11 +389,11 @@ public void test1_cloneWorkspaceWithItsContents() {
public void test2_forkApplicationWithReadApplicationUserAccess() {
Workspace targetWorkspace = new Workspace();
- targetWorkspace.setName("test-user-organization");
+ targetWorkspace.setName("test-user-workspace");
final Mono<Application> resultMono = workspaceService.create(targetWorkspace)
.flatMap(workspace -> {
- testUserOrgId = workspace.getId();
+ testUserWorkspaceId = workspace.getId();
return applicationForkingService.forkApplicationToWorkspace(sourceAppId, workspace.getId());
});
@@ -409,11 +409,11 @@ public void test2_forkApplicationWithReadApplicationUserAccess() {
@WithUserDetails(value = "api_user")
public void test3_failForkApplicationWithInvalidPermission() {
- final Mono<Application> resultMono = applicationForkingService.forkApplicationToWorkspace(sourceAppId, testUserOrgId);
+ final Mono<Application> resultMono = applicationForkingService.forkApplicationToWorkspace(sourceAppId, testUserWorkspaceId);
StepVerifier.create(resultMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
- throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.WORKSPACE, testUserOrgId)))
+ throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.WORKSPACE, testUserWorkspaceId)))
.verify();
}
@@ -422,7 +422,7 @@ public void test3_failForkApplicationWithInvalidPermission() {
public void test4_validForkApplication_cancelledMidWay_createValidApplication() {
Workspace targetWorkspace = new Workspace();
- targetWorkspace.setName("Target Organization");
+ targetWorkspace.setName("Target Workspace");
targetWorkspace = workspaceService.create(targetWorkspace).block();
// Trigger the fork application flow
@@ -439,7 +439,7 @@ public void test4_validForkApplication_cancelledMidWay_createValidApplication()
} catch (InterruptedException e) {
e.printStackTrace();
}
- return applicationService.findByOrganizationId(workspace.getId(), READ_APPLICATIONS).next();
+ return applicationService.findByWorkspaceId(workspace.getId(), READ_APPLICATIONS).next();
})
.cache();
@@ -565,13 +565,13 @@ public void forkApplicationToWorkspace_WhenAppHasUnsavedThemeCustomization_Forke
// published mode should have the custom theme as we publish after forking the app
assertThat(publishedModeTheme.isSystemTheme()).isFalse();
// published mode theme will have no application id and org id set as the customizations were not saved
- assertThat(publishedModeTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(publishedModeTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(publishedModeTheme.getApplicationId()).isNullOrEmpty();
// edit mode theme should be a custom one
assertThat(editModeTheme.isSystemTheme()).isFalse();
// edit mode theme will have no application id and org id set as the customizations were not saved
- assertThat(editModeTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(editModeTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(editModeTheme.getApplicationId()).isNullOrEmpty();
// forked theme should have the same name as src theme
@@ -624,7 +624,7 @@ public void forkApplicationToWorkspace_WhenAppHasSystemTheme_SystemThemeSet() {
// edit mode theme should be system theme
assertThat(editModeTheme.isSystemTheme()).isTrue();
// edit mode theme will have no application id and org id set as it's system theme
- assertThat(editModeTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(editModeTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(editModeTheme.getApplicationId()).isNullOrEmpty();
// forked theme should be default theme
@@ -684,14 +684,14 @@ public void forkApplicationToWorkspace_WhenAppHasCustomSavedTheme_NewCustomTheme
assertThat(publishedModeTheme.isSystemTheme()).isFalse();
// published mode theme will have no application id and org id set as it's a copy
- assertThat(publishedModeTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(publishedModeTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(publishedModeTheme.getApplicationId()).isNullOrEmpty();
// edit mode theme should be a custom one
assertThat(editModeTheme.isSystemTheme()).isFalse();
// edit mode theme will have application id and org id set as the customizations were saved
- assertThat(editModeTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(editModeTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(editModeTheme.getApplicationId()).isNullOrEmpty();
// forked theme should have the same name as src theme
@@ -712,7 +712,7 @@ public void forkApplication_deletePageAfterBeingPublished_deletedPageIsNotCloned
targetWorkspace.setName("delete-edit-mode-page-target-org");
targetWorkspace = workspaceService.create(targetWorkspace).block();
assert targetWorkspace != null;
- final String targetOrgId = targetWorkspace.getId();
+ final String targetWorkspaceId = targetWorkspace.getId();
Workspace srcWorkspace = new Workspace();
srcWorkspace.setName("delete-edit-mode-page-src-org");
@@ -728,7 +728,7 @@ public void forkApplication_deletePageAfterBeingPublished_deletedPageIsNotCloned
final String pageId = Objects.requireNonNull(applicationPageService.createPage(pageDTO).block()).getId();
final Mono<Application> resultMono = applicationPageService.publish(originalAppId, true)
.flatMap(ignored -> applicationPageService.deleteUnpublishedPage(pageId))
- .flatMap(page -> applicationForkingService.forkApplicationToWorkspace(pageDTO.getApplicationId(), targetOrgId));
+ .flatMap(page -> applicationForkingService.forkApplicationToWorkspace(pageDTO.getApplicationId(), targetWorkspaceId));
StepVerifier.create(resultMono
.zipWhen(application1 -> newPageService.findNewPagesByApplicationId(application1.getId(), READ_PAGES).collectList()
@@ -754,7 +754,7 @@ public void forkApplication_deletePageAfterBeingPublished_deletedPageIsNotCloned
private Flux<ActionDTO> getActionsInWorkspace(Workspace workspace) {
return applicationService
- .findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
// fetch the unpublished pages
.flatMap(application -> newPageService.findByApplicationId(application.getId(), READ_PAGES, false))
.flatMap(page -> newActionService.getUnpublishedActionsExceptJs(new LinkedMultiValueMap<>(
@@ -793,7 +793,7 @@ public void forkGitConnectedApplication_defaultBranchUpdated_forkDefaultBranchAp
// Create a branch application
Application branchApp = new Application();
branchApp.setName("app_" + uniqueString);
- return applicationPageService.createApplication(branchApp, srcApplication.getOrganizationId())
+ return applicationPageService.createApplication(branchApp, srcApplication.getWorkspaceId())
.zipWith(Mono.just(srcApplication));
});
})
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
index 6b9e867eb51e..694860ac34bd 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
@@ -85,14 +85,14 @@ public void testGetAuthorizationCodeURL_missingDatasource() {
@Test
@WithUserDetails(value = "api_user")
public void testGetAuthorizationCodeURL_invalidDatasourceWithNullAuthentication() {
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
String workspaceId = testWorkspace == null ? "" : testWorkspace.getId();
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("Missing OAuth2 datasource");
- datasource.setOrganizationId(workspaceId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -122,14 +122,14 @@ public void testGetAuthorizationCodeURL_validDatasource() {
MockServerHttpRequest httpRequest = MockServerHttpRequest.get("").headers(mockHeaders).build();
- Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_ORGANIZATIONS).block();
+ Workspace testWorkspace = workspaceRepository.findByName("Another Test Workspace", AclPermission.READ_WORKSPACES).block();
String workspaceId = testWorkspace == null ? "" : testWorkspace.getId();
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
PageDTO testPage = new PageDTO();
testPage.setName("PageServiceTest TestApp");
User apiUser = userService.findByEmail("api_user").block();
- workspaceId = apiUser.getOrganizationIds().iterator().next();
+ workspaceId = apiUser.getWorkspaceIds().iterator().next();
Application newApp = new Application();
newApp.setName(UUID.randomUUID().toString());
@@ -142,7 +142,7 @@ public void testGetAuthorizationCodeURL_validDatasource() {
Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
Datasource datasource = new Datasource();
datasource.setName("Valid datasource for OAuth2");
- datasource.setOrganizationId(workspaceId);
+ datasource.setWorkspaceId(workspaceId);
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
OAuth2 authenticationDTO = new OAuth2();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
index 106b745f3f42..fc600756f9c4 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
@@ -180,7 +180,7 @@ public void setup() {
if (testApp == null) {
Application testApplication = new Application();
testApplication.setName("DB-Table-Page-Test-Application");
- testApplication.setOrganizationId(testWorkspace.getId());
+ testApplication.setWorkspaceId(testWorkspace.getId());
testApp = applicationPageService.createApplication(testApplication, testWorkspace.getId()).block();
}
@@ -207,7 +207,7 @@ public void setup() {
);
structure.setTables(tables);
testDatasource.setPluginId(postgreSQLPlugin.getId());
- testDatasource.setOrganizationId(testWorkspace.getId());
+ testDatasource.setWorkspaceId(testWorkspace.getId());
testDatasource.setName("CRUD-Page-Table-DS");
testDatasource.setStructure(structure);
datasourceConfiguration.setUrl("http://test.com");
@@ -242,7 +242,7 @@ public void createPageWithInvalidApplicationIdTest() {
public void createPageWithInvalidDatasourceTest() {
Datasource invalidDatasource = new Datasource();
- invalidDatasource.setOrganizationId(testWorkspace.getId());
+ invalidDatasource.setWorkspaceId(testWorkspace.getId());
invalidDatasource.setName("invalid_datasource");
invalidDatasource.setDatasourceConfiguration(new DatasourceConfiguration());
@@ -492,7 +492,7 @@ public void createPageWithLessColumnsComparedToTemplateForSql() {
pluginName.append(plugin.getName());
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("MySql-CRUD-Page-Table-With-Less-Columns-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -563,7 +563,7 @@ public void createPageWithValidPageIdForMySqlDS() {
pluginName.append(plugin.getName());
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("MySql-CRUD-Page-Table-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -627,7 +627,7 @@ public void createPageWithValidPageIdForRedshiftDS() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("Redshift-CRUD-Page-Table-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -685,7 +685,7 @@ public void createPageWithNullPageIdForMSSqlDS() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("MSSql-CRUD-Page-Table-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -740,7 +740,7 @@ public void createPageWithNullPageIdForSnowflake() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("Snowflake-CRUD-Page-Table-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
@@ -794,7 +794,7 @@ public void createPageWithNullPageIdForS3() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("S3-CRUD-Page-Table-DS");
datasource.setDatasourceConfiguration(datasourceConfiguration);
pluginName.append(plugin.getName());
@@ -862,7 +862,7 @@ public void createPageWithValidPageIdForGoogleSheet() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setDatasourceConfiguration(datasourceConfiguration);
datasource.setName("Google-Sheet-CRUD-Page-Table-DS");
return datasourceService.create(datasource);
@@ -922,7 +922,7 @@ public void createPageWithValidPageIdForMongoDB() {
.flatMap(plugin -> {
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
- datasource.setOrganizationId(testWorkspace.getId());
+ datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("Mongo-CRUD-Page-Table-DS");
datasource.setStructure(structure);
datasource.setDatasourceConfiguration(datasourceConfiguration);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
index 535ad4128115..ad8abba85ec7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceTriggerSolutionTest.java
@@ -60,7 +60,7 @@ public class DatasourceTriggerSolutionTest {
@Autowired
WorkspaceService workspaceService;
- String orgId;
+ String workspaceId;
String datasourceId;
@@ -69,13 +69,13 @@ public class DatasourceTriggerSolutionTest {
public void setup() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
Workspace workspace = new Workspace();
- workspace.setName("Datasource Trigger Test Organization");
+ workspace.setName("Datasource Trigger Test Workspace");
Workspace savedWorkspace = workspaceService.create(workspace).block();
- orgId = savedWorkspace.getId();
+ workspaceId = savedWorkspace.getId();
Datasource datasource = new Datasource();
datasource.setName("Datasource Trigger Database");
- datasource.setOrganizationId(orgId);
+ datasource.setWorkspaceId(workspaceId);
Plugin installed_plugin = pluginService.findByName("Installed Plugin Name").block();
datasource.setPluginId(installed_plugin.getId());
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java
index 83fc79d13dfa..65c233300434 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EmailEventHandlerTest.java
@@ -65,7 +65,7 @@ public class EmailEventHandlerTest {
String authorUserName = "abc";
String originHeader = "efg";
String applicationId = "application-id";
- String organizationId = "organization-id";
+ String workspaceId = "workspace-id";
String emailReceiverUsername = "email-receiver";
@Before
@@ -76,7 +76,7 @@ public void setUp() {
application = new Application();
application.setName("Test application for comment");
- application.setOrganizationId(organizationId);
+ application.setWorkspaceId(workspaceId);
workspace = new Workspace();
// add a role with email receiver username
@@ -86,7 +86,7 @@ public void setUp() {
workspace.setUserRoles(List.of(userRole));
Mockito.when(applicationRepository.findById(applicationId)).thenReturn(Mono.just(application));
- Mockito.when(workspaceRepository.findById(organizationId)).thenReturn(Mono.just(workspace));
+ Mockito.when(workspaceRepository.findById(workspaceId)).thenReturn(Mono.just(workspace));
NewPage newPage = new NewPage();
newPage.setUnpublishedPage(new PageDTO());
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
index 00ab65e510ee..7597d4414238 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
@@ -60,7 +60,7 @@ public class ExampleApplicationsAreMarked {
@WithUserDetails(value = "api_user")
public void exampleApplicationsAreMarked() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 3");
+ newWorkspace.setName("Template Workspace 3");
final Mono<List<Application>> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -77,22 +77,22 @@ public void exampleApplicationsAreMarked() {
// Create 4 applications inside the example workspace but only mark three applications as example
final Application app1 = new Application();
app1.setName("first application");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
app1.setIsPublic(true);
final Application app2 = new Application();
app2.setName("second application");
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setIsPublic(true);
final Application app3 = new Application();
app3.setName("third application");
- app3.setOrganizationId(workspace.getId());
+ app3.setWorkspaceId(workspace.getId());
app3.setIsPublic(false);
final Application app4 = new Application();
app4.setName("fourth application");
- app4.setOrganizationId(workspace.getId());
+ app4.setWorkspaceId(workspace.getId());
app4.setIsPublic(false);
Mockito.when(configService.getTemplateApplications()).thenReturn(Flux.fromIterable(List.of(app1, app2, app3)));
@@ -106,7 +106,7 @@ public void exampleApplicationsAreMarked() {
)
.thenReturn(workspace.getId());
})
- .flatMapMany(workspaceId -> applicationService.findByOrganizationId(workspaceId, READ_APPLICATIONS))
+ .flatMapMany(workspaceId -> applicationService.findByWorkspaceId(workspaceId, READ_APPLICATIONS))
.collectList();
StepVerifier.create(resultMono)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesWorkspaceClonerTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesWorkspaceClonerTests.java
index bc03fba4f8fe..70571b31ca64 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesWorkspaceClonerTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExamplesWorkspaceClonerTests.java
@@ -154,10 +154,10 @@ public Mono<WorkspaceData> loadWorkspaceData(Workspace workspace) {
return Mono
.when(
applicationService
- .findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
.map(data.applications::add),
datasourceService
- .findAllByOrganizationId(workspace.getId(), READ_DATASOURCES)
+ .findAllByWorkspaceId(workspace.getId(), READ_DATASOURCES)
.map(data.datasources::add),
getActionsInWorkspace(workspace)
.map(data.actions::add),
@@ -177,7 +177,7 @@ public void setup() {
@WithUserDetails(value = "api_user")
public void cloneEmptyWorkspace() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
final Mono<WorkspaceData> resultMono = workspaceService.create(newWorkspace)
.zipWith(sessionUserService.getCurrentUser())
.flatMap(tuple ->
@@ -203,7 +203,7 @@ public void cloneEmptyWorkspace() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithItsContents() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -213,10 +213,10 @@ public void cloneWorkspaceWithItsContents() {
final Workspace workspace = tuple.getT1();
Application app1 = new Application();
app1.setName("1 - public app");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
Application app2 = new Application();
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setName("2 - private app");
return Mono
@@ -257,7 +257,7 @@ public void cloneWorkspaceWithItsContents() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithOnlyPublicApplications() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -268,10 +268,10 @@ public void cloneWorkspaceWithOnlyPublicApplications() {
Application app1 = new Application();
app1.setName("1 - public app more");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
Application app2 = new Application();
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setName("2 - another public app more");
app2.setIsPublic(true);
@@ -328,7 +328,7 @@ public void cloneWorkspaceWithOnlyPublicApplications() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithOnlyPrivateApplications() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -339,10 +339,10 @@ public void cloneWorkspaceWithOnlyPrivateApplications() {
Application app1 = new Application();
app1.setName("1 - private app more");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
Application app2 = new Application();
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setName("2 - another private app more");
return Mono.when(
@@ -385,7 +385,7 @@ public void cloneApplicationMultipleTimes() {
final Workspace sourceOrg1 = tuple.getT1();
Application app1 = new Application();
app1.setName("awesome app");
- app1.setOrganizationId(sourceOrg1.getId());
+ app1.setWorkspaceId(sourceOrg1.getId());
return Mono.zip(
applicationPageService.createApplication(app1),
@@ -393,7 +393,7 @@ public void cloneApplicationMultipleTimes() {
);
})
.flatMapMany(tuple -> {
- final String orgId = tuple.getT2().getId();
+ final String workspaceId = tuple.getT2().getId();
final String originalId = tuple.getT1().getId();
final String originalName = tuple.getT1().getName();
@@ -404,13 +404,13 @@ public void cloneApplicationMultipleTimes() {
app.setName(originalName);
return app;
})
- .flatMap(app -> examplesWorkspaceCloner.cloneApplications(orgId, Flux.fromArray(new Application[]{ app })))
+ .flatMap(app -> examplesWorkspaceCloner.cloneApplications(workspaceId, Flux.fromArray(new Application[]{ app })))
.then();
// Clone this application into the same workspace thrice.
return cloneMono
.then(cloneMono)
.then(cloneMono)
- .thenMany(Flux.defer(() -> applicationRepository.findByOrganizationId(orgId)));
+ .thenMany(Flux.defer(() -> applicationRepository.findByWorkspaceId(workspaceId)));
})
.map(Application::getName)
.collectList();
@@ -427,7 +427,7 @@ public void cloneApplicationMultipleTimes() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithOnlyDatasources() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -438,7 +438,7 @@ public void cloneWorkspaceWithOnlyDatasources() {
final Datasource ds1 = new Datasource();
ds1.setName("datasource 1");
- ds1.setOrganizationId(workspace.getId());
+ ds1.setWorkspaceId(workspace.getId());
final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
ds1.setDatasourceConfiguration(datasourceConfiguration);
datasourceConfiguration.setUrl("http://httpbin.org/get");
@@ -448,7 +448,7 @@ public void cloneWorkspaceWithOnlyDatasources() {
final Datasource ds2 = new Datasource();
ds2.setName("datasource 2");
- ds2.setOrganizationId(workspace.getId());
+ ds2.setWorkspaceId(workspace.getId());
ds2.setDatasourceConfiguration(new DatasourceConfiguration());
DBAuth auth = new DBAuth();
auth.setPassword("answer-to-life");
@@ -480,7 +480,7 @@ public void cloneWorkspaceWithOnlyDatasources() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithOnlyDatasourcesSpecifiedExplicitly() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -491,7 +491,7 @@ public void cloneWorkspaceWithOnlyDatasourcesSpecifiedExplicitly() {
final Datasource ds1 = new Datasource();
ds1.setName("datasource 1");
- ds1.setOrganizationId(workspace.getId());
+ ds1.setWorkspaceId(workspace.getId());
ds1.setPluginId(installedPlugin.getId());
final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
ds1.setDatasourceConfiguration(datasourceConfiguration);
@@ -502,7 +502,7 @@ public void cloneWorkspaceWithOnlyDatasourcesSpecifiedExplicitly() {
final Datasource ds2 = new Datasource();
ds2.setName("datasource 2");
- ds2.setOrganizationId(workspace.getId());
+ ds2.setWorkspaceId(workspace.getId());
ds2.setPluginId(installedPlugin.getId());
ds2.setDatasourceConfiguration(new DatasourceConfiguration());
DBAuth auth = new DBAuth();
@@ -542,7 +542,7 @@ public void cloneWorkspaceWithOnlyDatasourcesSpecifiedExplicitly() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithDatasourcesAndApplications() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Mono<WorkspaceData> resultMono = Mono
.zip(
workspaceService.create(newWorkspace),
@@ -553,21 +553,21 @@ public void cloneWorkspaceWithDatasourcesAndApplications() {
final Application app1 = new Application();
app1.setName("first application");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
app1.setIsPublic(true);
final Application app2 = new Application();
app2.setName("second application");
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setIsPublic(true);
final Datasource ds1 = new Datasource();
ds1.setName("datasource 1");
- ds1.setOrganizationId(workspace.getId());
+ ds1.setWorkspaceId(workspace.getId());
final Datasource ds2 = new Datasource();
ds2.setName("datasource 2");
- ds2.setOrganizationId(workspace.getId());
+ ds2.setWorkspaceId(workspace.getId());
return Mono
.zip(
@@ -611,28 +611,28 @@ public void cloneWorkspaceWithDatasourcesAndApplications() {
@WithUserDetails(value = "api_user")
public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization 2");
+ newWorkspace.setName("Template Workspace 2");
final Workspace workspace = workspaceService.create(newWorkspace).block();
final User user = sessionUserService.getCurrentUser().block();
final Application app1 = new Application();
app1.setName("first application");
- app1.setOrganizationId(workspace.getId());
+ app1.setWorkspaceId(workspace.getId());
app1.setIsPublic(true);
final Application app2 = new Application();
app2.setName("second application");
- app2.setOrganizationId(workspace.getId());
+ app2.setWorkspaceId(workspace.getId());
app2.setIsPublic(true);
final Datasource ds1 = new Datasource();
ds1.setName("datasource 1");
- ds1.setOrganizationId(workspace.getId());
+ ds1.setWorkspaceId(workspace.getId());
ds1.setPluginId(installedPlugin.getId());
final Datasource ds2 = new Datasource();
ds2.setName("datasource 2");
- ds2.setOrganizationId(workspace.getId());
+ ds2.setWorkspaceId(workspace.getId());
ds2.setPluginId(installedPlugin.getId());
final Application app = applicationPageService.createApplication(app1).block();
@@ -665,7 +665,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
final ActionDTO newPageAction = new ActionDTO();
newPageAction.setName("newPageAction");
- newPageAction.setOrganizationId(workspace.getId());
+ newPageAction.setWorkspaceId(workspace.getId());
newPageAction.setDatasource(ds1WithId);
newPageAction.setPluginId(installedPlugin.getId());
newPageAction.setActionConfiguration(new ActionConfiguration());
@@ -674,7 +674,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
final ActionDTO action1 = new ActionDTO();
action1.setName("action1");
action1.setPageId(pageId1);
- action1.setOrganizationId(workspace.getId());
+ action1.setWorkspaceId(workspace.getId());
action1.setDatasource(ds1WithId);
action1.setPluginId(installedPlugin.getId());
@@ -683,7 +683,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
final ActionDTO action3 = new ActionDTO();
action3.setName("action3");
action3.setPageId(pageId2);
- action3.setOrganizationId(workspace.getId());
+ action3.setWorkspaceId(workspace.getId());
action3.setDatasource(ds2WithId);
action3.setPluginId(installedPlugin.getId());
@@ -693,7 +693,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
Datasource jsDatasource = new Datasource();
jsDatasource.setName("Default Database");
- jsDatasource.setOrganizationId(workspace.getId());
+ jsDatasource.setWorkspaceId(workspace.getId());
Plugin installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
assert installedJsPlugin != null;
jsDatasource.setPluginId(installedJsPlugin.getId());
@@ -702,7 +702,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(app.getPages().get(0).getId());
actionCollectionDTO1.setApplicationId(app.getId());
- actionCollectionDTO1.setOrganizationId(workspace.getId());
+ actionCollectionDTO1.setWorkspaceId(workspace.getId());
actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
ActionDTO action5 = new ActionDTO();
action5.setName("run");
@@ -756,7 +756,7 @@ public void cloneWorkspaceWithDatasourcesAndApplicationsAndActionsAndCollections
final String actionId = newPage1.getUnpublishedPage().getLayouts().get(0).getLayoutOnLoadActions().get(0).iterator().next().getId();
final NewAction newPageAction1 = mongoTemplate.findOne(Query.query(Criteria.where("id").is(actionId)), NewAction.class);
assert newPageAction1 != null;
- assertThat(newPageAction1.getOrganizationId()).isEqualTo(data.workspace.getId());
+ assertThat(newPageAction1.getWorkspaceId()).isEqualTo(data.workspace.getId());
assertThat(data.datasources).hasSize(2);
assertThat(map(data.datasources, Datasource::getName)).containsExactlyInAnyOrder(
@@ -797,12 +797,12 @@ public void cloneApplicationWithActionsThrice() {
final Application app1 = new Application();
app1.setName("that great app");
- app1.setOrganizationId(sourceOrg1.getId());
+ app1.setWorkspaceId(sourceOrg1.getId());
app1.setIsPublic(true);
final Datasource ds1 = new Datasource();
ds1.setName("datasource 1");
- ds1.setOrganizationId(sourceOrg1.getId());
+ ds1.setWorkspaceId(sourceOrg1.getId());
ds1.setPluginId(installedPlugin.getId());
DatasourceConfiguration dc = new DatasourceConfiguration();
ds1.setDatasourceConfiguration(dc);
@@ -849,7 +849,7 @@ public void cloneApplicationWithActionsThrice() {
final Datasource ds2 = new Datasource();
ds2.setName("datasource 2");
- ds2.setOrganizationId(sourceOrg1.getId());
+ ds2.setWorkspaceId(sourceOrg1.getId());
ds2.setPluginId(installedPlugin.getId());
DatasourceConfiguration dc2 = new DatasourceConfiguration();
ds2.setDatasourceConfiguration(dc2);
@@ -876,7 +876,7 @@ public void cloneApplicationWithActionsThrice() {
final Datasource ds3 = new Datasource();
ds3.setName("datasource 3");
- ds3.setOrganizationId(sourceOrg1.getId());
+ ds3.setWorkspaceId(sourceOrg1.getId());
ds3.setPluginId(installedPlugin.getId());
return applicationPageService.createApplication(app1)
@@ -898,21 +898,21 @@ public void cloneApplicationWithActionsThrice() {
final ActionDTO action1 = new ActionDTO();
action1.setName("action1");
action1.setPageId(firstPage.getId());
- action1.setOrganizationId(sourceOrg1.getId());
+ action1.setWorkspaceId(sourceOrg1.getId());
action1.setDatasource(ds1WithId);
action1.setPluginId(installedPlugin.getId());
final ActionDTO action2 = new ActionDTO();
action2.setPageId(firstPage.getId());
action2.setName("action2");
- action2.setOrganizationId(sourceOrg1.getId());
+ action2.setWorkspaceId(sourceOrg1.getId());
action2.setDatasource(ds1WithId);
action2.setPluginId(installedPlugin.getId());
final ActionDTO action3 = new ActionDTO();
action3.setPageId(firstPage.getId());
action3.setName("action3");
- action3.setOrganizationId(sourceOrg1.getId());
+ action3.setWorkspaceId(sourceOrg1.getId());
action3.setDatasource(ds2WithId);
action3.setPluginId(installedPlugin.getId());
@@ -1023,7 +1023,7 @@ private <InType, OutType> List<OutType> map(List<InType> list, Function<InType,
private Flux<ActionDTO> getActionsInWorkspace(Workspace workspace) {
return applicationService
- .findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
// fetch the unpublished pages
.flatMap(application -> newPageService.findByApplicationId(application.getId(), READ_PAGES, false))
.flatMap(page -> newActionService.getUnpublishedActionsExceptJs(new LinkedMultiValueMap<>(
@@ -1032,7 +1032,7 @@ private Flux<ActionDTO> getActionsInWorkspace(Workspace workspace) {
private Flux<ActionCollectionDTO> getActionCollectionsInWorkspace(Workspace workspace) {
return applicationService
- .findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
// fetch the unpublished pages
.flatMap(application -> newPageService.findByApplicationId(application.getId(), READ_PAGES, false))
.flatMap(page -> actionCollectionService.getPopulatedActionCollectionsByViewMode(new LinkedMultiValueMap<>(
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
index d790be75c7b8..1380cbb20ec6 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
@@ -178,13 +178,13 @@ public void setup() {
}
installedPlugin = pluginRepository.findByPackageName("installed-plugin").block();
Workspace workspace = new Workspace();
- workspace.setName("Import-Export-Test-Organization");
+ workspace.setName("Import-Export-Test-Workspace");
Workspace savedWorkspace = workspaceService.create(workspace).block();
workspaceId = savedWorkspace.getId();
Application testApplication = new Application();
testApplication.setName("Export-Application-Test-Application");
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setUpdatedAt(Instant.now());
testApplication.setLastDeployedAt(Instant.now());
testApplication.setModifiedBy("some-user");
@@ -195,7 +195,7 @@ public void setup() {
Datasource ds1 = new Datasource();
ds1.setName("DS1");
- ds1.setOrganizationId(workspaceId);
+ ds1.setWorkspaceId(workspaceId);
ds1.setPluginId(installedPlugin.getId());
final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://httpbin.org/get");
@@ -208,14 +208,14 @@ public void setup() {
ds2.setName("DS2");
ds2.setPluginId(installedPlugin.getId());
ds2.setDatasourceConfiguration(new DatasourceConfiguration());
- ds2.setOrganizationId(workspaceId);
+ ds2.setWorkspaceId(workspaceId);
DBAuth auth = new DBAuth();
auth.setPassword("awesome-password");
ds2.getDatasourceConfiguration().setAuthentication(auth);
jsDatasource = new Datasource();
jsDatasource.setName("Default JS datasource");
- jsDatasource.setOrganizationId(workspaceId);
+ jsDatasource.setWorkspaceId(workspaceId);
installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
assert installedJsPlugin != null;
jsDatasource.setPluginId(installedJsPlugin.getId());
@@ -273,7 +273,7 @@ private Mono<ApplicationJson> createAppJson(String filePath) {
private Workspace createTemplateWorkspace() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
return workspaceService.create(newWorkspace).block();
}
@@ -332,10 +332,10 @@ public void createExportAppJsonWithDatasourceButWithoutActionsTest() {
.flatMap(workspace -> {
final Datasource ds1 = datasourceMap.get("DS1");
- ds1.setOrganizationId(workspace.getId());
+ ds1.setWorkspaceId(workspace.getId());
final Datasource ds2 = datasourceMap.get("DS2");
- ds2.setOrganizationId(workspace.getId());
+ ds2.setWorkspaceId(workspace.getId());
return applicationPageService.createApplication(testApplication, workspaceId);
})
@@ -417,7 +417,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() {
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(testPage.getId());
actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO1.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("testAction1");
@@ -491,7 +491,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() {
NewPage defaultPage = pageList.get(0);
assertThat(exportedApp.getName()).isEqualTo(appName);
- assertThat(exportedApp.getOrganizationId()).isNull();
+ assertThat(exportedApp.getWorkspaceId()).isNull();
assertThat(exportedApp.getPages()).isNull();
assertThat(exportedApp.getPolicies()).isNull();
@@ -508,7 +508,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() {
assertThat(validAction.getApplicationId()).isNull();
assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
- assertThat(validAction.getOrganizationId()).isNull();
+ assertThat(validAction.getWorkspaceId()).isNull();
assertThat(validAction.getPolicies()).isNull();
assertThat(validAction.getId()).isNotNull();
ActionDTO unpublishedAction = validAction.getUnpublishedAction();
@@ -522,7 +522,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() {
assertThat(actionCollectionList).hasSize(1);
final ActionCollection actionCollection = actionCollectionList.get(0);
assertThat(actionCollection.getApplicationId()).isNull();
- assertThat(actionCollection.getOrganizationId()).isNull();
+ assertThat(actionCollection.getWorkspaceId()).isNull();
assertThat(actionCollection.getPolicies()).isNull();
assertThat(actionCollection.getId()).isNotNull();
assertThat(actionCollection.getUnpublishedCollection().getPluginType()).isEqualTo(PluginType.JS);
@@ -532,7 +532,7 @@ public void createExportAppJsonWithActionAndActionCollectionTest() {
assertThat(datasourceList).hasSize(1);
Datasource datasource = datasourceList.get(0);
- assertThat(datasource.getOrganizationId()).isNull();
+ assertThat(datasource.getWorkspaceId()).isNull();
assertThat(datasource.getId()).isNull();
assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(datasource.getDatasourceConfiguration()).isNull();
@@ -624,7 +624,7 @@ public void createExportAppJsonForGitTest() {
assertThat(applicationJson.getClientSchemaVersion()).isEqualTo(JsonSchemaVersions.clientVersion);
assertThat(exportedApp.getName()).isNotNull();
- assertThat(exportedApp.getOrganizationId()).isNull();
+ assertThat(exportedApp.getWorkspaceId()).isNull();
assertThat(exportedApp.getPages()).isNull();
assertThat(exportedApp.getGitApplicationMetadata()).isNull();
@@ -641,7 +641,7 @@ public void createExportAppJsonForGitTest() {
assertThat(validAction.getApplicationId()).isNull();
assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
- assertThat(validAction.getOrganizationId()).isNull();
+ assertThat(validAction.getWorkspaceId()).isNull();
assertThat(validAction.getPolicies()).isNull();
assertThat(validAction.getId()).isNotNull();
assertThat(validAction.getUnpublishedAction().getPageId())
@@ -649,7 +649,7 @@ public void createExportAppJsonForGitTest() {
assertThat(datasourceList).hasSize(1);
Datasource datasource = datasourceList.get(0);
- assertThat(datasource.getOrganizationId()).isNull();
+ assertThat(datasource.getWorkspaceId()).isNull();
assertThat(datasource.getId()).isNull();
assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(datasource.getDatasourceConfiguration()).isNull();
@@ -665,7 +665,7 @@ public void createExportAppJsonForGitTest() {
public void importApplicationFromInvalidFileTest() {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Flux<DataBuffer> dataBufferFlux = DataBufferUtils
- .read(new ClassPathResource("test_assets/OrganizationServiceTest/my_organization_logo.png"), new DefaultDataBufferFactory(), 4096)
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/my_workspace_logo.png"), new DefaultDataBufferFactory(), 4096)
.cache();
Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
@@ -681,7 +681,7 @@ public void importApplicationFromInvalidFileTest() {
@Test
@WithUserDetails(value = "api_user")
- public void importApplicationWithNullOrganizationIdTest() {
+ public void importApplicationWithNullWorkspaceIdTest() {
FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
Mono<ApplicationImportDTO> resultMono = importExportApplicationService
@@ -690,7 +690,7 @@ public void importApplicationWithNullOrganizationIdTest() {
StepVerifier
.create(resultMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
- throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.ORGANIZATION_ID)))
+ throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.WORKSPACE_ID)))
.verify();
}
@@ -729,7 +729,7 @@ public void importApplicationFromValidJsonFileTest() {
FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
@@ -750,7 +750,7 @@ public void importApplicationFromValidJsonFileTest() {
Application application = applicationImportDTO.getApplication();
return Mono.zip(
Mono.just(applicationImportDTO),
- datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(application.getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList(),
newPageService.findByApplicationId(application.getId(), MANAGE_PAGES, false).collectList(),
actionCollectionService.findAllByApplicationIdAndViewMode(application.getId(), false, MANAGE_ACTIONS, null).collectList()
@@ -766,7 +766,7 @@ public void importApplicationFromValidJsonFileTest() {
final List<ActionCollection> actionCollectionList = tuple.getT5();
assertThat(application.getName()).isEqualTo("valid_application");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
assertThat(application.getPages()).hasSize(2);
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
assertThat(application.getPublishedPages()).hasSize(1);
@@ -779,7 +779,7 @@ public void importApplicationFromValidJsonFileTest() {
assertThat(datasourceList).isNotEmpty();
datasourceList.forEach(datasource -> {
- assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
assertThat(datasource.getDatasourceConfiguration()).isNotNull();
});
@@ -854,7 +854,7 @@ public void importFromValidJson_cancelledMidway_importSuccess() {
} catch (InterruptedException e) {
e.printStackTrace();
}
- return applicationRepository.findByOrganizationId(workspace.getId(), READ_APPLICATIONS)
+ return applicationRepository.findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
.next();
});
@@ -895,12 +895,12 @@ public void importApplicationInWorkspace_WhenCustomizedThemes_ThemesCreated() {
assertThat(editTheme.isSystemTheme()).isFalse();
assertThat(editTheme.getDisplayName()).isEqualTo("Custom edit theme");
- assertThat(editTheme.getOrganizationId()).isNull();
+ assertThat(editTheme.getWorkspaceId()).isNull();
assertThat(editTheme.getApplicationId()).isNull();
assertThat(publishedTheme.isSystemTheme()).isFalse();
assertThat(publishedTheme.getDisplayName()).isEqualTo("Custom published theme");
- assertThat(publishedTheme.getOrganizationId()).isNullOrEmpty();
+ assertThat(publishedTheme.getWorkspaceId()).isNullOrEmpty();
assertThat(publishedTheme.getApplicationId()).isNullOrEmpty();
})
.verifyComplete();
@@ -913,7 +913,7 @@ public void importApplication_withoutActionCollection_succeedsWithoutError() {
FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application-without-action-collection.json");
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
@@ -932,7 +932,7 @@ public void importApplication_withoutActionCollection_succeedsWithoutError() {
.create(resultMono
.flatMap(applicationImportDTO -> Mono.zip(
Mono.just(applicationImportDTO),
- datasourceService.findAllByOrganizationId(applicationImportDTO.getApplication().getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(applicationImportDTO.getApplication().getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
getActionsInApplication(applicationImportDTO.getApplication()).collectList(),
newPageService.findByApplicationId(applicationImportDTO.getApplication().getId(), MANAGE_PAGES, false).collectList(),
actionCollectionService.findAllByApplicationIdAndViewMode(applicationImportDTO.getApplication().getId(), false
@@ -946,7 +946,7 @@ public void importApplication_withoutActionCollection_succeedsWithoutError() {
final List<ActionCollection> actionCollectionList = tuple.getT5();
assertThat(application.getName()).isEqualTo("valid_application");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
assertThat(application.getPages()).hasSize(2);
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
assertThat(application.getPublishedPages()).hasSize(1);
@@ -955,7 +955,7 @@ public void importApplication_withoutActionCollection_succeedsWithoutError() {
assertThat(datasourceList).isNotEmpty();
datasourceList.forEach(datasource -> {
- assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
assertThat(datasource.getDatasourceConfiguration()).isNotNull();
});
@@ -991,7 +991,7 @@ public void importApplication_WithoutThemes_LegacyThemesAssigned() {
FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application-without-theme.json");
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
final Mono<ApplicationImportDTO> resultMono = workspaceService.create(newWorkspace)
.flatMap(workspace -> importExportApplicationService
@@ -1014,7 +1014,7 @@ public void importApplication_withoutPageIdInActionCollection_succeeds() {
FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json");
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
final Mono<ApplicationImportDTO> resultMono = workspaceService
.create(newWorkspace)
@@ -1026,7 +1026,7 @@ public void importApplication_withoutPageIdInActionCollection_succeeds() {
.create(resultMono
.flatMap(applicationImportDTO -> Mono.zip(
Mono.just(applicationImportDTO),
- datasourceService.findAllByOrganizationId(applicationImportDTO.getApplication().getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(applicationImportDTO.getApplication().getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
getActionsInApplication(applicationImportDTO.getApplication()).collectList(),
newPageService.findByApplicationId(applicationImportDTO.getApplication().getId(), MANAGE_PAGES, false).collectList(),
actionCollectionService
@@ -1058,7 +1058,7 @@ public void importApplication_withoutPageIdInActionCollection_succeeds() {
public void exportImportApplication_importWithBranchName_updateApplicationResourcesWithBranch() {
Application testApplication = new Application();
testApplication.setName("Export-Import-Update-Branch_Test-App");
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setUpdatedAt(Instant.now());
testApplication.setLastDeployedAt(Instant.now());
testApplication.setModifiedBy("some-user");
@@ -1136,7 +1136,7 @@ public void importApplication_withUnConfiguredDatasources_Success() {
FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application-with-un-configured-datasource.json");
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue())
.users(Set.of("api_user"))
@@ -1157,7 +1157,7 @@ public void importApplication_withUnConfiguredDatasources_Success() {
Application application = applicationImportDTO.getApplication();
return Mono.zip(
Mono.just(applicationImportDTO),
- datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(application.getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList(),
newPageService.findByApplicationId(application.getId(), MANAGE_PAGES, false).collectList(),
actionCollectionService.findAllByApplicationIdAndViewMode(application.getId(), false, MANAGE_ACTIONS, null).collectList()
@@ -1173,7 +1173,7 @@ public void importApplication_withUnConfiguredDatasources_Success() {
final List<ActionCollection> actionCollectionList = tuple.getT5();
assertThat(application.getName()).isEqualTo("importExportTest");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
assertThat(application.getPages()).hasSize(1);
assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
assertThat(application.getPublishedPages()).hasSize(1);
@@ -1219,8 +1219,8 @@ public void importApplication_withUnConfiguredDatasources_Success() {
public void importApplicationIntoWorkspace_pageRemovedAndUpdatedDefaultPageNameInBranchApplication_Success() {
Application testApplication = new Application();
- testApplication.setName("importApplicationIntoOrganization_pageRemovedInBranchApplication_Success");
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setName("importApplicationIntoWorkspace_pageRemovedInBranchApplication_Success");
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setUpdatedAt(Instant.now());
testApplication.setLastDeployedAt(Instant.now());
testApplication.setModifiedBy("some-user");
@@ -1283,8 +1283,8 @@ public void importApplicationIntoWorkspace_pageRemovedAndUpdatedDefaultPageNameI
@WithUserDetails(value = "api_user")
public void importApplicationIntoWorkspace_pageAddedInBranchApplication_Success() {
Application testApplication = new Application();
- testApplication.setName("importApplicationIntoOrganization_pageAddedInBranchApplication_Success");
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setName("importApplicationIntoWorkspace_pageAddedInBranchApplication_Success");
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setUpdatedAt(Instant.now());
testApplication.setLastDeployedAt(Instant.now());
testApplication.setModifiedBy("some-user");
@@ -1350,8 +1350,8 @@ public void importUpdatedApplicationIntoWorkspaceFromFile_publicApplication_visi
.build();
Application testApplication = new Application();
- testApplication.setName("importUpdatedApplicationIntoOrganizationFromFile_publicApplication_visibilityFlagNotReset");
- testApplication.setOrganizationId(workspaceId);
+ testApplication.setName("importUpdatedApplicationIntoWorkspaceFromFile_publicApplication_visibilityFlagNotReset");
+ testApplication.setWorkspaceId(workspaceId);
testApplication.setUpdatedAt(Instant.now());
testApplication.setLastDeployedAt(Instant.now());
testApplication.setModifiedBy("some-user");
@@ -1399,11 +1399,11 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
4. Added page should be deleted from DB
*/
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-page-added");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
PageDTO page = new PageDTO();
@@ -1425,7 +1425,7 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
final List<PageDTO> pageList = tuple.getT2();
assertThat(application.getName()).isEqualTo("discard-change-page-added");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
assertThat(application.getPages()).hasSize(3);
assertThat(application.getPublishedPages()).hasSize(1);
assertThat(application.getModifiedBy()).isEqualTo("api_user");
@@ -1464,7 +1464,7 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1507,12 +1507,12 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
public void discardChange_addNewActionAfterImport_addedActionRemoved() {
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-action-added");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
ActionDTO action = new ActionDTO();
@@ -1539,7 +1539,7 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
final List<ActionDTO> actionList = tuple.getT2();
assertThat(application.getName()).isEqualTo("discard-change-action-added");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionNames = new ArrayList<>();
@@ -1557,7 +1557,7 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1576,7 +1576,7 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
final Application application = tuple.getT1();
final List<ActionDTO> actionList = tuple.getT2();
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionNames = new ArrayList<>();
actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
@@ -1597,18 +1597,18 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
public void discardChange_addNewActionCollectionAfterImport_addedActionCollectionRemoved() {
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application-without-action-collection.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-collection-added");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
actionCollectionDTO1.setName("discard-action-collection-test");
actionCollectionDTO1.setPageId(application.getPages().get(0).getId());
actionCollectionDTO1.setApplicationId(application.getId());
- actionCollectionDTO1.setOrganizationId(application.getOrganizationId());
+ actionCollectionDTO1.setWorkspaceId(application.getWorkspaceId());
actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("discard-action-collection-test-action");
@@ -1636,7 +1636,7 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
final List<ActionDTO> actionList = tuple.getT3();
assertThat(application.getName()).isEqualTo("discard-change-collection-added");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionCollectionNames = new ArrayList<>();
actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(actionCollection.getUnpublishedCollection().getName()));
@@ -1658,7 +1658,7 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1679,7 +1679,7 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
final List<ActionCollection> actionCollectionList = tuple.getT2();
final List<ActionDTO> actionList = tuple.getT3();
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionCollectionNames = new ArrayList<>();
actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(actionCollection.getUnpublishedCollection().getName()));
@@ -1704,11 +1704,11 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
public void discardChange_removeNewPageAfterImport_removedPageRestored() {
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-page-removed");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
Optional<ApplicationPage> applicationPage = application
@@ -1732,7 +1732,7 @@ public void discardChange_removeNewPageAfterImport_removedPageRestored() {
final List<PageDTO> pageList = tuple.getT2();
assertThat(application.getName()).isEqualTo("discard-change-page-removed");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
assertThat(application.getPages()).hasSize(1);
assertThat(pageList).hasSize(1);
@@ -1749,7 +1749,7 @@ public void discardChange_removeNewPageAfterImport_removedPageRestored() {
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1788,12 +1788,12 @@ public void discardChange_removeNewPageAfterImport_removedPageRestored() {
public void discardChange_removeNewActionAfterImport_removedActionRestored() {
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final String[] deletedActionName = new String[1];
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-action-removed");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
return getActionsInApplication(application)
@@ -1817,7 +1817,7 @@ public void discardChange_removeNewActionAfterImport_removedActionRestored() {
final List<ActionDTO> actionList = tuple.getT2();
assertThat(application.getName()).isEqualTo("discard-change-action-removed");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionNames = new ArrayList<>();
actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
@@ -1835,7 +1835,7 @@ public void discardChange_removeNewActionAfterImport_removedActionRestored() {
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1854,7 +1854,7 @@ public void discardChange_removeNewActionAfterImport_removedActionRestored() {
final Application application = tuple.getT1();
final List<ActionDTO> actionList = tuple.getT2();
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionNames = new ArrayList<>();
actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
@@ -1875,12 +1875,12 @@ public void discardChange_removeNewActionAfterImport_removedActionRestored() {
public void discardChange_removeNewActionCollection_removedActionCollectionRestored() {
Mono<ApplicationJson> applicationJsonMono = createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
- String orgId = createTemplateWorkspace().getId();
+ String workspaceId = createTemplateWorkspace().getId();
final String[] deletedActionCollectionNames = new String[1];
final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
.flatMap(applicationJson -> {
applicationJson.getExportedApplication().setName("discard-change-collection-removed");
- return importExportApplicationService.importApplicationInWorkspace(orgId, applicationJson);
+ return importExportApplicationService.importApplicationInWorkspace(workspaceId, applicationJson);
})
.flatMap(application -> {
return actionCollectionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
@@ -1904,7 +1904,7 @@ public void discardChange_removeNewActionCollection_removedActionCollectionResto
final List<ActionCollection> actionCollectionList = tuple.getT2();
assertThat(application.getName()).isEqualTo("discard-change-collection-removed");
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionCollectionNames = new ArrayList<>();
actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(actionCollection.getUnpublishedCollection().getName()));
@@ -1922,7 +1922,7 @@ public void discardChange_removeNewActionCollection_removedActionCollectionResto
importedApplication.getGitApplicationMetadata().setDefaultApplicationId(importedApplication.getId());
return applicationService.save(importedApplication)
.then(importExportApplicationService.importApplicationInWorkspace(
- importedApplication.getOrganizationId(),
+ importedApplication.getWorkspaceId(),
applicationJson,
importedApplication.getId(),
"main")
@@ -1941,7 +1941,7 @@ public void discardChange_removeNewActionCollection_removedActionCollectionResto
final Application application = tuple.getT1();
final List<ActionCollection> actionCollectionList = tuple.getT2();
- assertThat(application.getOrganizationId()).isNotNull();
+ assertThat(application.getWorkspaceId()).isNotNull();
List<String> actionCollectionNames = new ArrayList<>();
actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(actionCollection.getUnpublishedCollection().getName()));
@@ -2050,7 +2050,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields()
actionCollectionDTO1.setName("testCollection1");
actionCollectionDTO1.setPageId(testPage.getId());
actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO1.setWorkspaceId(testApp.getWorkspaceId());
actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
ActionDTO action1 = new ActionDTO();
action1.setName("testAction1");
@@ -2124,7 +2124,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields()
NewPage defaultPage = pageList.get(0);
assertThat(exportedApp.getName()).isEqualTo(appName);
- assertThat(exportedApp.getOrganizationId()).isNull();
+ assertThat(exportedApp.getWorkspaceId()).isNull();
assertThat(exportedApp.getPages()).isNull();
assertThat(exportedApp.getPolicies()).isNull();
@@ -2141,7 +2141,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields()
assertThat(validAction.getApplicationId()).isNull();
assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
- assertThat(validAction.getOrganizationId()).isNull();
+ assertThat(validAction.getWorkspaceId()).isNull();
assertThat(validAction.getPolicies()).isNull();
assertThat(validAction.getId()).isNotNull();
ActionDTO unpublishedAction = validAction.getUnpublishedAction();
@@ -2155,7 +2155,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields()
assertThat(actionCollectionList).hasSize(1);
final ActionCollection actionCollection = actionCollectionList.get(0);
assertThat(actionCollection.getApplicationId()).isNull();
- assertThat(actionCollection.getOrganizationId()).isNull();
+ assertThat(actionCollection.getWorkspaceId()).isNull();
assertThat(actionCollection.getPolicies()).isNull();
assertThat(actionCollection.getId()).isNotNull();
assertThat(actionCollection.getUnpublishedCollection().getPluginType()).isEqualTo(PluginType.JS);
@@ -2165,7 +2165,7 @@ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields()
assertThat(datasourceList).hasSize(1);
Datasource datasource = datasourceList.get(0);
- assertThat(datasource.getOrganizationId()).isNull();
+ assertThat(datasource.getWorkspaceId()).isNull();
assertThat(datasource.getId()).isNull();
assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(datasource.getDatasourceConfiguration()).isNotNull();
@@ -2232,7 +2232,7 @@ public void importApplication_datasourceWithSameNameAndDifferentPlugin_importedW
// Chose any plugin except for mongo, as json static file has mongo plugin for datasource
Plugin postgreSQLPlugin = pluginRepository.findByName("PostgreSQL").block();
testDatasource.setPluginId(postgreSQLPlugin.getId());
- testDatasource.setOrganizationId(testWorkspace.getId());
+ testDatasource.setWorkspaceId(testWorkspace.getId());
final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
testDatasource.setName(datasourceName);
datasourceService.create(testDatasource).block();
@@ -2243,7 +2243,7 @@ public void importApplication_datasourceWithSameNameAndDifferentPlugin_importedW
.create(resultMono
.flatMap(application -> Mono.zip(
Mono.just(application),
- datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(application.getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList()
)))
.assertNext(tuple -> {
@@ -2256,7 +2256,7 @@ public void importApplication_datasourceWithSameNameAndDifferentPlugin_importedW
List<String> datasourceNameList = new ArrayList<>();
assertThat(datasourceList).isNotEmpty();
datasourceList.forEach(datasource -> {
- assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
datasourceNameList.add(datasource.getName());
});
// Check if both suffixed and newly imported datasource are present
@@ -2285,7 +2285,7 @@ public void importApplication_datasourceWithSameNameAndPlugin_importedWithValidA
// Chose plugin same as mongo, as json static file has mongo plugin for datasource
Plugin postgreSQLPlugin = pluginRepository.findByName("MongoDB").block();
testDatasource.setPluginId(postgreSQLPlugin.getId());
- testDatasource.setOrganizationId(testWorkspace.getId());
+ testDatasource.setWorkspaceId(testWorkspace.getId());
final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
testDatasource.setName(datasourceName);
datasourceService.create(testDatasource).block();
@@ -2296,7 +2296,7 @@ public void importApplication_datasourceWithSameNameAndPlugin_importedWithValidA
.create(resultMono
.flatMap(application -> Mono.zip(
Mono.just(application),
- datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ datasourceService.findAllByWorkspaceId(application.getWorkspaceId(), MANAGE_DATASOURCES).collectList(),
newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList()
)))
.assertNext(tuple -> {
@@ -2309,7 +2309,7 @@ public void importApplication_datasourceWithSameNameAndPlugin_importedWithValidA
List<String> datasourceNameList = new ArrayList<>();
assertThat(datasourceList).isNotEmpty();
datasourceList.forEach(datasource -> {
- assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
datasourceNameList.add(datasource.getName());
});
// Check that there are no datasources are created with suffix names as datasource's are of same plugin
@@ -2596,7 +2596,7 @@ public void mergeApplicationJsonWithApplication_WhenPageNameConflicts_PageNamesR
Mono<Tuple3<ApplicationPagesDTO, List<NewAction>, List<ActionCollection>>> tuple2Mono = createAppAndPageMono.flatMap(application ->
// merge the application json with the application we've created
- importExportApplicationService.mergeApplicationJsonWithApplication(application.getOrganizationId(), application.getId(), null, applicationJson, null)
+ importExportApplicationService.mergeApplicationJsonWithApplication(application.getWorkspaceId(), application.getId(), null, applicationJson, null)
.thenReturn(application)
).flatMap(application ->
// fetch the application pages, this should contain pages from application json
@@ -2646,7 +2646,7 @@ public void mergeApplicationJsonWithApplication_WhenPageListIProvided_OnlyListed
Mono<ApplicationPagesDTO> applicationPagesDTOMono = createAppAndPageMono.flatMap(application ->
// merge the application json with the application we've created
- importExportApplicationService.mergeApplicationJsonWithApplication(application.getOrganizationId(), application.getId(), null, applicationJson, List.of("About", "Contact US"))
+ importExportApplicationService.mergeApplicationJsonWithApplication(application.getWorkspaceId(), application.getId(), null, applicationJson, List.of("About", "Contact US"))
.thenReturn(application)
).flatMap(application ->
// fetch the application pages, this should contain pages from application json
@@ -2692,7 +2692,7 @@ public void exportApplicationById_WhenThemeDoesNotExist_ExportedWithDefaultTheme
public void importApplication_invalidPluginReferenceForDatasource_throwException() {
Workspace newWorkspace = new Workspace();
- newWorkspace.setName("Template Organization");
+ newWorkspace.setName("Template Workspace");
ApplicationJson appJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json").block();
assert appJson != null;
@@ -2735,8 +2735,8 @@ public void importApplication_importSameApplicationTwice_applicationImportedLate
Application secondImportedApplication = tuple.getT2();
assertThat(firstImportedApplication.getName()).isEqualTo("valid_application");
assertThat(secondImportedApplication.getName()).isEqualTo("valid_application (1)");
- assertThat(firstImportedApplication.getOrganizationId()).isEqualTo(secondImportedApplication.getOrganizationId());
- assertThat(firstImportedApplication.getOrganizationId()).isNotNull();
+ assertThat(firstImportedApplication.getWorkspaceId()).isEqualTo(secondImportedApplication.getWorkspaceId());
+ assertThat(firstImportedApplication.getWorkspaceId()).isNotNull();
})
.verifyComplete();
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
index 587920355bd7..0a9107a729a5 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
@@ -51,13 +51,13 @@
import static com.appsmith.server.acl.AclPermission.MAKE_PUBLIC_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_INVITE_USERS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
+import static com.appsmith.server.acl.AclPermission.WORKSPACE_MANAGE_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.READ_ORGANIZATIONS;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static org.assertj.core.api.Assertions.assertThat;
@@ -104,23 +104,23 @@ public class ShareWorkspacePermissionTests {
Application savedApplication;
- String organizationId;
+ String workspaceId;
@Before
@WithUserDetails(value = "api_user")
public void setup() {
Workspace workspace = new Workspace();
- workspace.setName("Share Test Organization");
+ workspace.setName("Share Test Workspace");
Workspace savedWorkspace = workspaceService.create(workspace).block();
- organizationId = savedWorkspace.getId();
+ workspaceId = savedWorkspace.getId();
Application application = new Application();
application.setName("Share Test Application");
- application.setOrganizationId(organizationId);
- savedApplication = applicationPageService.createApplication(application, organizationId).block();
+ application.setWorkspaceId(workspaceId);
+ savedApplication = applicationPageService.createApplication(application, workspaceId).block();
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
- inviteUsersDTO.setOrgId(organizationId);
+ inviteUsersDTO.setWorkspaceId(workspaceId);
ArrayList<String> emails = new ArrayList<>();
// Invite Admin
@@ -141,7 +141,7 @@ public void setup() {
@Test
@WithUserDetails(value = "[email protected]")
public void testAdminPermissionsForInviteAndMakePublic() {
- Policy inviteUserPolicy = Policy.builder().permission(ORGANIZATION_INVITE_USERS.getValue())
+ Policy inviteUserPolicy = Policy.builder().permission(WORKSPACE_INVITE_USERS.getValue())
.users(Set.of("[email protected]", "[email protected]"))
.build();
@@ -150,7 +150,7 @@ public void testAdminPermissionsForInviteAndMakePublic() {
.build();
Mono<Application> applicationMono = applicationService.findById(savedApplication.getId());
- Mono<Workspace> workspaceMono = workspaceService.findById(organizationId, READ_ORGANIZATIONS);
+ Mono<Workspace> workspaceMono = workspaceService.findById(workspaceId, READ_WORKSPACES);
StepVerifier.create(Mono.zip(applicationMono, workspaceMono))
.assertNext(tuple -> {
@@ -169,7 +169,7 @@ public void testAdminPermissionsForInviteAndMakePublic() {
public void testAdminInviteRoles() {
Set<String> roles = Set.of("Administrator", "Developer", "App Viewer");
- Mono<Map<String, String>> userRolesForWorkspace = workspaceService.getUserRolesForWorkspace(organizationId);
+ Mono<Map<String, String>> userRolesForWorkspace = workspaceService.getUserRolesForWorkspace(workspaceId);
StepVerifier.create(userRolesForWorkspace)
.assertNext(rolesMap -> {
@@ -182,11 +182,11 @@ public void testAdminInviteRoles() {
@Test
@WithUserDetails(value = "[email protected]")
public void testDevPermissionsForInvite() {
- Policy inviteUserPolicy = Policy.builder().permission(ORGANIZATION_INVITE_USERS.getValue())
+ Policy inviteUserPolicy = Policy.builder().permission(WORKSPACE_INVITE_USERS.getValue())
.users(Set.of("[email protected]", "[email protected]"))
.build();
- Mono<Workspace> workspaceMono = workspaceService.findById(organizationId, READ_ORGANIZATIONS);
+ Mono<Workspace> workspaceMono = workspaceService.findById(workspaceId, READ_WORKSPACES);
StepVerifier.create(workspaceMono)
.assertNext(workspace -> {
@@ -201,7 +201,7 @@ public void testDevPermissionsForInvite() {
public void testDeveloperInviteRoles() {
Set<String> roles = Set.of("Developer", "App Viewer");
- Mono<Map<String, String>> userRolesForWorkspace = workspaceService.getUserRolesForWorkspace(organizationId);
+ Mono<Map<String, String>> userRolesForWorkspace = workspaceService.getUserRolesForWorkspace(workspaceId);
StepVerifier.create(userRolesForWorkspace)
.assertNext(rolesMap -> {
@@ -218,12 +218,12 @@ public void validInviteUserWhenCancelledMidWay() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
Workspace workspace = new Workspace();
- workspace.setName("Organization for Invite Cancellation Test");
+ workspace.setName("Workspace for Invite Cancellation Test");
Workspace savedWorkspace = workspaceService.create(workspace).block();
Application application = new Application();
application.setName("Application for Invite Cancellation Test");
- application.setOrganizationId(savedWorkspace.getId());
+ application.setWorkspaceId(savedWorkspace.getId());
savedApplication = applicationPageService.createApplication(application, savedWorkspace.getId()).block();
String pageId = savedApplication.getPages().get(0).getId();
@@ -235,7 +235,7 @@ public void validInviteUserWhenCancelledMidWay() {
DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
datasourceConfiguration.setUrl("http://test.com");
datasource.setDatasourceConfiguration(datasourceConfiguration);
- datasource.setOrganizationId(savedWorkspace.getId());
+ datasource.setWorkspaceId(savedWorkspace.getId());
Datasource savedDatasource = datasourceService.create(datasource).block();
@@ -266,7 +266,7 @@ public void validInviteUserWhenCancelledMidWay() {
ActionDTO savedAction3 = layoutActionService.createSingleAction(action3).block();
InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
- inviteUsersDTO.setOrgId(savedWorkspace.getId());
+ inviteUsersDTO.setWorkspaceId(savedWorkspace.getId());
ArrayList<String> emails = new ArrayList<>();
// Test invite
@@ -286,14 +286,14 @@ public void validInviteUserWhenCancelledMidWay() {
// ensures that we are guaranteed that the invite flow (which was cancelled in 5 ms) has run to completion
// before we fetch the org, app, pages and actions
Mono<Workspace> workspaceMono = Mono.just(savedWorkspace.getId())
- .flatMap(orgId -> {
+ .flatMap(workspaceId -> {
try {
// Before fetching the updated organzation, sleep for 10 seconds to ensure that the invite finishes
Thread.sleep(10000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- return workspaceService.findById(orgId, READ_ORGANIZATIONS);
+ return workspaceService.findById(workspaceId, READ_WORKSPACES);
})
.cache();
@@ -324,15 +324,15 @@ public void validInviteUserWhenCancelledMidWay() {
Set<String> userSet = Set.of("api_user", "[email protected]");
// Assert the policy for the invited user in workspace
- Policy manageOrgAppPolicy = Policy.builder().permission(ORGANIZATION_MANAGE_APPLICATIONS.getValue())
+ Policy manageOrgAppPolicy = Policy.builder().permission(WORKSPACE_MANAGE_APPLICATIONS.getValue())
.users(userSet)
.build();
- Policy manageOrgPolicy = Policy.builder().permission(MANAGE_ORGANIZATIONS.getValue())
+ Policy manageOrgPolicy = Policy.builder().permission(MANAGE_WORKSPACES.getValue())
.users(userSet)
.build();
- Policy readOrgPolicy = Policy.builder().permission(READ_ORGANIZATIONS.getValue())
+ Policy readOrgPolicy = Policy.builder().permission(READ_WORKSPACES.getValue())
.users(userSet)
.build();
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ActionCollectionServiceTest/mockObjects.json b/app/server/appsmith-server/src/test/resources/test_assets/ActionCollectionServiceTest/mockObjects.json
index 6a6ceb592faa..791455c80e5d 100644
--- a/app/server/appsmith-server/src/test/resources/test_assets/ActionCollectionServiceTest/mockObjects.json
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ActionCollectionServiceTest/mockObjects.json
@@ -49,7 +49,7 @@
"actionCollectionWithAction": {
"id": "testCollectionId",
"applicationId": "testApplicationId",
- "organizationId": "testOrganizationId",
+ "workspaceId": "testOrganizationId",
"unpublishedCollection": {
"name": "testCollection",
"pageId": "testPageId",
@@ -85,7 +85,7 @@
"actionCollectionDTOWithModifiedActions": {
"id": "testCollectionId",
"applicationId": "testApplicationId",
- "organizationId": "testOrganizationId",
+ "workspaceId": "testOrganizationId",
"name": "testCollection",
"pageId": "testPageId",
"pluginId": "testPluginId",
@@ -119,10 +119,10 @@
"actionCollectionAfterModifiedActions": {
"id": "testCollectionId",
"applicationId": "testApplicationId",
- "organizationId": "testOrganizationId",
+ "workspaceId": "testOrganizationId",
"unpublishedCollection": {
"id": "testCollectionId",
- "organizationId": "testOrganizationId",
+ "workspaceId": "testOrganizationId",
"name": "testCollection",
"pageId": "testPageId",
"pluginId": "testPluginId",
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/OrganizationServiceTest/my_organization_logo.png b/app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/my_workspace_logo.png
similarity index 100%
rename from app/server/appsmith-server/src/test/resources/test_assets/OrganizationServiceTest/my_organization_logo.png
rename to app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/my_workspace_logo.png
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/OrganizationServiceTest/my_organization_logo_large.png b/app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/my_workspace_logo_large.png
similarity index 100%
rename from app/server/appsmith-server/src/test/resources/test_assets/OrganizationServiceTest/my_organization_logo_large.png
rename to app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/my_workspace_logo_large.png
diff --git a/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md b/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
index 1e570ed02ae8..9c19bb9c2cb6 100644
--- a/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
+++ b/contributions/ServerCodeContributionsGuidelines/PluginCodeContributionsGuidelines.md
@@ -184,7 +184,7 @@ The `BasePlugin` & `PluginExecutor` classes define the basic operations of plugi
log.warn(plugin.getPackageName() + " already present in database.");
}
- installPluginToAllOrganizations(mongoTemplate, plugin.getId());
+ installPluginToAllWorkspaces(mongoTemplate, plugin.getId());
}
```
diff --git a/deploy/template/mongo-init.js.sh b/deploy/template/mongo-init.js.sh
index 9f33feaa494b..f24f2202dcc0 100644
--- a/deploy/template/mongo-init.js.sh
+++ b/deploy/template/mongo-init.js.sh
@@ -25,14 +25,14 @@ let res = [
"_id" : ObjectId("5df8c225078d501fc3f45361"),
"name" : "Admin",
"displayName" : "Admin",
- "organizationId" : "default-org",
+ "workspaceId" : "default-org",
"permissions" : [
"read:groups",
- "read:organizations",
+ "read:workspaces",
"create:users",
"update:users",
"create:groups",
- "create:organizations",
+ "create:workspaces",
"read:users",
"read:pages",
"create:pages",
@@ -92,14 +92,14 @@ let res = [
"_id" : ObjectId("5df8c1fa078d501fc3f44d41"),
"name" : "Member",
"displayName" : "Member",
- "organizationId" : "default-org",
+ "workspaceId" : "default-org",
"permissions" : [
"read:groups",
- "read:organizations",
+ "read:workspaces",
"create:users",
"update:users",
"create:groups",
- "create:organizations",
+ "create:workspaces",
"read:users",
"read:pages",
"create:pages",
@@ -158,14 +158,14 @@ let res = [
"_id" : ObjectId("5df8c1e0078d501fc3f4491b"),
"name" : "Owner",
"displayName" : "Owner",
- "organizationId" : "default-org",
+ "workspaceId" : "default-org",
"permissions" : [
"read:groups",
- "read:organizations",
+ "read:workspaces",
"create:users",
"update:users",
"create:groups",
- "create:organizations",
+ "create:workspaces",
"read:users",
"read:pages",
"create:pages",
|
e41145404a702b3e55bb2fab071847f35d991628
|
2023-06-12 17:50:29
|
arunvjn
|
fix: Modifies Action selector copy in onboarding flow (#24367)
| false
|
Modifies Action selector copy in onboarding flow (#24367)
|
fix
|
diff --git a/app/client/src/pages/Editor/GuidedTour/constants.tsx b/app/client/src/pages/Editor/GuidedTour/constants.tsx
index e8d3ed769f83..7f45cef1cab2 100644
--- a/app/client/src/pages/Editor/GuidedTour/constants.tsx
+++ b/app/client/src/pages/Editor/GuidedTour/constants.tsx
@@ -521,8 +521,9 @@ export const Steps: StepsType = {
{
text: (
<>
- Click the <b>+</b> button beside On success, select{" "}
- <b>Execute a query</b> {"&"} then choose <b>getCustomers</b> Query
+ Expand <b>Callbacks</b> section, click the <b>+</b> button beside{" "}
+ <b>On success</b>, select <b>Execute a query</b> {"&"} then choose{" "}
+ <b>getCustomers</b> Query
</>
),
},
|
ed8a4eba6838f97c9bc1b38494b545c68a41eb38
|
2024-06-12 19:53:51
|
Anagh Hegde
|
chore: consolidated response of block API (#34167)
| false
|
consolidated response of block API (#34167)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/BuildingBlockResponseDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/BuildingBlockResponseDTO.java
index 655b6f22b315..1b3147435710 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/BuildingBlockResponseDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/BuildingBlockResponseDTO.java
@@ -1,6 +1,10 @@
package com.appsmith.server.dtos;
import com.appsmith.external.dtos.DslExecutableDTO;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.NewAction;
import lombok.Data;
import java.util.List;
@@ -10,4 +14,16 @@ public class BuildingBlockResponseDTO {
String widgetDsl;
List<DslExecutableDTO> onPageLoadActions;
+
+ // New actions created in the current flow
+ List<NewAction> newActionList;
+
+ // New actionCollection created in the current flow
+ List<ActionCollection> actionCollectionList;
+
+ // All datasource in the workspace
+ List<Datasource> datasourceList;
+
+ // All libraries used in the current application
+ List<CustomJSLib> customJSLibList;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCEImpl.java
index db80d3ac15f7..1104aeb233b5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCEImpl.java
@@ -8,6 +8,7 @@
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.CustomJSLib;
@@ -28,6 +29,7 @@
import com.appsmith.server.helpers.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableService;
import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
import com.appsmith.server.refactors.applications.RefactoringService;
@@ -90,6 +92,8 @@ public class PartialImportServiceCEImpl implements PartialImportServiceCE {
private final ApplicationPageService applicationPageService;
private final NewActionService newActionService;
private final ActionCollectionService actionCollectionService;
+ private final DatasourceService datasourceService;
+ private final CustomJSLibService customJSLibService;
@Override
public Mono<Application> importResourceInPage(
@@ -469,18 +473,46 @@ public Mono<BuildingBlockResponseDTO> importBuildingBlock(BuildingBlockDTO build
}
});
});
+ // Fetch the datasource and customJsLibs
+ Mono<List<Datasource>> datasourceList = datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ buildingBlockDTO.getWorkspaceId(), AclPermission.MANAGE_DATASOURCES)
+ .collectList();
+ Mono<List<CustomJSLib>> customJSLibs = customJSLibService.getAllJSLibsInContext(
+ buildingBlockDTO.getApplicationId(), CreatorContextType.APPLICATION, branchName, false);
// Fetch all actions and action collections and update the onPageLoadActions with correct ids
- return actionCollectionService
- .findByPageId(buildingBlockDTO.getPageId())
- .collectList()
- .zipWith(newActionService
- .findByPageId(buildingBlockDTO.getPageId())
- .collectList())
+ return Mono.zip(
+ actionCollectionService
+ .findByPageId(buildingBlockDTO.getPageId())
+ .collectList(),
+ newActionService
+ .findByPageId(buildingBlockDTO.getPageId())
+ .collectList(),
+ datasourceList,
+ customJSLibs)
.flatMap(tuple -> {
List<ActionCollection> actionCollections = tuple.getT1();
List<NewAction> newActions = tuple.getT2();
+ buildingBlockResponseDTO.setDatasourceList(tuple.getT3());
+ buildingBlockResponseDTO.setCustomJSLibList(tuple.getT4());
+ // Filter the newly created actions and actionCollection
+ buildingBlockResponseDTO.setNewActionList(newActions.stream()
+ .filter(newAction -> buildingBlockImportDTO
+ .getRefactoredEntityNameMap()
+ .containsValue(newAction
+ .getUnpublishedAction()
+ .getName()))
+ .toList());
+ buildingBlockResponseDTO.setActionCollectionList(actionCollections.stream()
+ .filter(actionCollection -> buildingBlockImportDTO
+ .getRefactoredEntityNameMap()
+ .containsValue(actionCollection
+ .getUnpublishedCollection()
+ .getName()))
+ .toList());
+
actionCollections.forEach(actionCollection -> {
if (newOnPageLoadActionNames.contains(actionCollection
.getUnpublishedCollection()
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceImpl.java
index 6cb4bf4734fa..1e9638bef46a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceImpl.java
@@ -3,6 +3,7 @@
import com.appsmith.external.models.Datasource;
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.CustomJSLib;
import com.appsmith.server.domains.NewAction;
@@ -10,6 +11,7 @@
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.imports.importable.ImportableService;
import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
import com.appsmith.server.refactors.applications.RefactoringService;
@@ -60,7 +62,9 @@ public PartialImportServiceImpl(
WidgetRefactorUtil widgetRefactorUtil,
ApplicationPageService applicationPageService,
NewActionService newActionService,
- ActionCollectionService actionCollectionService) {
+ ActionCollectionService actionCollectionService,
+ DatasourceService datasourceService,
+ CustomJSLibService customJSLibService) {
super(
importService,
workspaceService,
@@ -86,6 +90,8 @@ public PartialImportServiceImpl(
widgetRefactorUtil,
applicationPageService,
newActionService,
- actionCollectionService);
+ actionCollectionService,
+ datasourceService,
+ customJSLibService);
}
}
|
493dba069031707ceb0c12d629dea569f1fab224
|
2024-12-12 00:54:59
|
subratadeypappu
|
fix: add check to avoid NPE when binding value is null (#38104)
| false
|
add check to avoid NPE when binding value is null (#38104)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
index 950cc8578ca8..95cb8b7e2b61 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
@@ -15,6 +15,7 @@
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
+import org.springframework.util.StringUtils;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -144,6 +145,14 @@ public Mono<Map<MustacheBindingToken, String>> refactorNameInDynamicBindings(
return Flux.fromIterable(bindingValues)
.flatMap(bindingValue -> {
+ if (!StringUtils.hasText(bindingValue.getValue())) {
+ // If the binding value is null or empty, it indicates an incorrect entry in the
+ // dynamicBindingPathList.
+ // Such bindings are considered invalid and can be safely discarded during refactoring.
+ // Therefore, we return an empty response.
+
+ return Mono.empty();
+ }
if (!bindingValue.getValue().contains(oldName)) {
// This case is not handled in RTS either, so skipping the RTS call here will not affect the
// behavior.
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
index 09f91cba6178..019654cc475d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
@@ -10,6 +10,7 @@
import reactor.test.StepVerifier;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -60,7 +61,8 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
token1.setValue("abc['foo']");
MustacheBindingToken token2 = new MustacheBindingToken();
token2.setValue("xyz['bar']");
- Set<MustacheBindingToken> bindings = Set.of(token1, token2);
+ MustacheBindingToken dummyToken = new MustacheBindingToken();
+ Set<MustacheBindingToken> bindings = Set.of(token1, token2, dummyToken);
String refactoredScript1 = "xyz['foo']";
String refactoredScript2 = "xyz['bar']";
@@ -71,7 +73,7 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
doReturn(Mono.just(responseMap1))
.when(astService)
- .refactorNameInDynamicBindings(Set.of(token1, token2), "abc", "xyz", 2, false);
+ .refactorNameInDynamicBindings(Set.of(token1, token2, dummyToken), "abc", "xyz", 2, false);
Mono<Map<MustacheBindingToken, String>> result =
astService.refactorNameInDynamicBindings(bindings, "abc", "xyz", 2, false);
@@ -85,6 +87,23 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
.verifyComplete();
}
+ @Test
+ void refactorNameInDynamicBindings_nullBindingValue_returnsEmptyMap() {
+ MustacheBindingToken token1 = new MustacheBindingToken();
+
+ Set<MustacheBindingToken> bindings = new HashSet<>();
+ bindings.add(token1);
+
+ Mono<Map<MustacheBindingToken, String>> result =
+ astService.refactorNameInDynamicBindings(bindings, "abc", "xyz", 2, false);
+
+ StepVerifier.create(result)
+ .assertNext(map -> {
+ assertThat(map).hasSize(0);
+ })
+ .verifyComplete();
+ }
+
@Test
void refactorNameInDynamicBindings_whenValidJSObjectRequest_thenReturnUpdatedScript() {
MustacheBindingToken token = new MustacheBindingToken();
|
24ee7f777fb89032de8a12b1a4d10a228a2a9581
|
2023-08-02 11:46:28
|
Shrikant Sharat Kandula
|
chore: Add support for custom CS URL in local_testing.sh script (#25927)
| false
|
Add support for custom CS URL in local_testing.sh script (#25927)
|
chore
|
diff --git a/scripts/local_testing.sh b/scripts/local_testing.sh
index 2b6e6eac345b..95734c1bc187 100755
--- a/scripts/local_testing.sh
+++ b/scripts/local_testing.sh
@@ -10,7 +10,7 @@ display_help()
echo "If --local or -l is passed, it will build with local changes"
echo "---------------------------------------------------------------------------------------"
echo
- echo "Syntax: $0 [-h] [-l] [-r [remote_url]] [branch_name]"
+ echo "Syntax: $0 [-h] [-l] [-r [remote_url]] [branch_name] [cs_url]"
echo "options:"
echo "-h Print this help"
echo "-l or --local Use the local codebase and not git"
@@ -29,13 +29,13 @@ pretty_print()
# Check whether user had supplied -h or --help. If yes display usage
if [[ ( $@ == "--help") || $@ == "-h" ]]
-then
+then
display_help
exit 0
fi
LOCAL=false
-if [[ ($@ == "--local" || $@ == "-l")]]
+if [[ ($1 == "--local" || $1 == "-l")]]
then
LOCAL=true
fi
@@ -50,18 +50,20 @@ if [[ ($LOCAL == true) ]]
then
pretty_print "Setting up instance with local changes"
BRANCH=release
+ cs_url=$2
elif [[ ($REMOTE == true) ]]
then
- pretty_print "Setting up instance with remote repository branch ..."
+ pretty_print "Setting up instance with remote repository branch ..."
REMOTE_REPOSITORY_URL=$2
REMOTE_BRANCH=$3
- pretty_print "Please ignore if the following error occurs: remote remote_origin_for_local_test already exists."
+ pretty_print "Please ignore if the following error occurs: remote remote_origin_for_local_test already exists."
git remote add remote_origin_for_local_test $REMOTE_REPOSITORY_URL || git remote set-url remote_origin_for_local_test $REMOTE_REPOSITORY_URL
- git fetch remote_origin_for_local_test
+ git fetch remote_origin_for_local_test
git checkout $REMOTE_BRANCH
git pull remote_origin_for_local_test $REMOTE_BRANCH
else
BRANCH=$1
+ cs_url=$2
pretty_print "Setting up instance to run on branch: $BRANCH"
cd "$(dirname "$0")"/..
git fetch origin $BRANCH
@@ -81,7 +83,8 @@ popd
pushd app/client/packages/rts/ > /dev/null && ./build.sh > /dev/null && pretty_print "RTS build successful. Starting Docker build ..."
popd
-docker build -t appsmith/appsmith-ce:local-testing . > /dev/null && pretty_print "Docker image build successful. Triggering run now ..."
+docker build -t appsmith/appsmith-ce:local-testing --build-arg APPSMITH_CLOUD_SERVICES_BASE_URL="${cs_url:-https://release-cs.appsmith.com}" . > /dev/null
+pretty_print "Docker image build successful. Triggering run now ..."
(docker stop appsmith || true) && (docker rm appsmith || true)
docker run -d --name appsmith -p 80:80 -v "$PWD/stacks:/appsmith-stacks" appsmith/appsmith-ce:local-testing && sleep 15 && pretty_print "Local instance is up! Open Appsmith at http://localhost! "
|
9895ee217e43ee3cf4154bbac2b797f9df2d2f2e
|
2023-09-25 09:49:21
|
Saroj
|
ci: Split spec improvements for cypress ci runs (#26774)
| false
|
Split spec improvements for cypress ci runs (#26774)
|
ci
|
diff --git a/.github/workflows/build-client-server.yml b/.github/workflows/build-client-server.yml
index ea090a91ea4b..cd97d37cc022 100644
--- a/.github/workflows/build-client-server.yml
+++ b/.github/workflows/build-client-server.yml
@@ -186,45 +186,63 @@ jobs:
run:
shell: bash
steps:
- # Deleting the existing dir's if any
- - name: Delete existing directories
+ - name: Setup node
if: needs.ci-test-limited.result != 'success'
- run: |
- rm -f ~/failed_spec_ci
- rm -f ~/combined_failed_spec_ci
-
- # Force store previous cypress dashboard url from cache
- - name: Store the previous cypress dashboard url
- if: success()
- uses: actions/cache@v3
+ uses: actions/setup-node@v3
with:
- path: |
- ~/cypress_url
- key: ${{ github.run_id }}-dashboard-url-${{ github.run_attempt }}
- restore-keys: |
- ${{ github.run_id }}-dashboard-url
-
- - name: Print cypress dashboard url
- id: dashboard_url
- run: |
- cypress_url="https://internal.appsmith.com/app/cypressdashboard/rundetails-64ec3df0c632e24c00764938?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}"
- echo "dashboard_url=$cypress_url" >> $GITHUB_OUTPUT
+ node-version: 18
+
+ - name: install pg
+ if: needs.ci-test-limited.result != 'success'
+ run : npm install pg
- # Download failed_spec list for all jobs
- - uses: actions/download-artifact@v3
+ - name: Fetch the failed specs
if: needs.ci-test-limited.result != 'success'
- id: download_ci
+ id: failed_specs
+ env:
+ DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
+ DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
+ DB_USER: ${{ secrets.CYPRESS_DB_USER }}
+ DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
+ RUN_ID: ${{ github.run_id }}
+ ATTEMPT_NUMBER: ${{ github.run_attempt }}
+ uses: actions/github-script@v6
with:
- name: failed-spec-ci-${{github.run_attempt}}
- path: ~/failed_spec_ci
+ script: |
+ const { Pool } = require("pg");
+ const { DB_HOST, DB_NAME, DB_USER, DB_PWD, RUN_ID, ATTEMPT_NUMBER } = process.env
+
+ const client = await new Pool({
+ user: DB_USER,
+ host: DB_HOST,
+ database: DB_NAME,
+ password: DB_PWD,
+ port: 5432,
+ connectionTimeoutMillis: 60000,
+ }).connect();
+
+ const result = await client.query(
+ `SELECT DISTINCT name FROM public."specs"
+ WHERE "matrixId" IN
+ (SELECT id FROM public."matrix"
+ WHERE "attemptId" = (
+ SELECT id FROM public."attempt" WHERE "workflowId" = $1 and "attempt" = $2
+ )
+ ) AND status = 'fail'`,
+ [RUN_ID, ATTEMPT_NUMBER],
+ );
+ client.release();
+ return result.rows.map((spec) => spec.name);
# In case for any ci job failure, create combined failed spec
- - name: "combine all specs for CI"
+ - name: combine all specs for CI
+ id: combine_ci
if: needs.ci-test-limited.result != 'success'
run: |
- echo "Debugging: failed specs in ~/failed_spec_ci/failed_spec_ci*"
- cat ~/failed_spec_ci/failed_spec_ci*
- cat ~/failed_spec_ci/failed_spec_ci* | sort -u >> ~/combined_failed_spec_ci
+ failed_specs=$(echo ${{steps.test.outputs.result}} | sed 's/\[\|\]//g' | tr -d ' ' | tr ',' '\n')
+ while read -r line; do
+ echo "$line" >> ~/combined_failed_spec_ci
+ done <<< "$failed_specs"
# Upload combined failed CI spec list to a file
# This is done for debugging.
@@ -285,45 +303,63 @@ jobs:
run:
shell: bash
steps:
- # Deleting the existing dir's if any
- - name: Delete existing directories
+ - name: Setup node
if: needs.ci-test-limited-existing-docker-image.result != 'success'
- run: |
- rm -f ~/failed_spec_ci
- rm -f ~/combined_failed_spec_ci
-
- # Force store previous cypress dashboard url from cache
- - name: Store the previous cypress dashboard url
- if: success()
- uses: actions/cache@v3
+ uses: actions/setup-node@v3
with:
- path: |
- ~/cypress_url
- key: ${{ github.run_id }}-dashboard-url-${{ github.run_attempt }}
- restore-keys: |
- ${{ github.run_id }}-dashboard-url
-
- - name: Print cypress dashboard url
- id: dashboard_url
- run: |
- cypress_url="https://internal.appsmith.com/app/cypressdashboard/rundetails-64ec3df0c632e24c00764938?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}"
- echo "dashboard_url=$cypress_url" >> $GITHUB_OUTPUT
+ node-version: 18
+
+ - name: install pg
+ if: needs.ci-test-limited-existing-docker-image.result != 'success'
+ run : npm install pg
- # Download failed_spec list for all jobs
- - uses: actions/download-artifact@v3
+ - name: Fetch the failed specs
if: needs.ci-test-limited-existing-docker-image.result != 'success'
- id: download_ci
+ id: failed_specs
+ env:
+ DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
+ DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
+ DB_USER: ${{ secrets.CYPRESS_DB_USER }}
+ DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
+ RUN_ID: ${{ github.run_id }}
+ ATTEMPT_NUMBER: ${{ github.run_attempt }}
+ uses: actions/github-script@v6
with:
- name: failed-spec-ci-${{github.run_attempt}}
- path: ~/failed_spec_ci
+ script: |
+ const { Pool } = require("pg");
+ const { DB_HOST, DB_NAME, DB_USER, DB_PWD, RUN_ID, ATTEMPT_NUMBER } = process.env
+
+ const client = await new Pool({
+ user: DB_USER,
+ host: DB_HOST,
+ database: DB_NAME,
+ password: DB_PWD,
+ port: 5432,
+ connectionTimeoutMillis: 60000,
+ }).connect();
+
+ const result = await client.query(
+ `SELECT DISTINCT name FROM public."specs"
+ WHERE "matrixId" IN
+ (SELECT id FROM public."matrix"
+ WHERE "attemptId" = (
+ SELECT id FROM public."attempt" WHERE "workflowId" = $1 and "attempt" = $2
+ )
+ ) AND status = 'fail'`,
+ [RUN_ID, ATTEMPT_NUMBER],
+ );
+ client.release();
+ return result.rows.map((spec) => spec.name);
# In case for any ci job failure, create combined failed spec
- - name: "combine all specs for CI"
+ - name: combine all specs for CI
+ id: combine_ci
if: needs.ci-test-limited-existing-docker-image.result != 'success'
run: |
- echo "Debugging: failed specs in ~/failed_spec_ci/failed_spec_ci*"
- cat ~/failed_spec_ci/failed_spec_ci*
- cat ~/failed_spec_ci/failed_spec_ci* | sort -u >> ~/combined_failed_spec_ci
+ failed_specs=$(echo ${{steps.test.outputs.result}} | sed 's/\[\|\]//g' | tr -d ' ' | tr ',' '\n')
+ while read -r line; do
+ echo "$line" >> ~/combined_failed_spec_ci
+ done <<< "$failed_specs"
# Upload combined failed CI spec list to a file
# This is done for debugging.
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml
index 2108fbcb6cca..93906478006c 100644
--- a/.github/workflows/integration-tests-command.yml
+++ b/.github/workflows/integration-tests-command.yml
@@ -95,48 +95,63 @@ jobs:
PAYLOAD_CONTEXT: ${{ toJson(github.event.client_payload) }}
run: echo "$PAYLOAD_CONTEXT"
- # Deleting the existing dir's if any
- - name: Delete existing directories
+ - name: Setup node
if: needs.ci-test.result != 'success'
- run: |
- rm -f ~/failed_spec_ci
- rm -f ~/combined_failed_spec_ci
-
- # Force store previous cypress dashboard url from cache
- - name: Store the previous cypress dashboard url
- continue-on-error: true
- if: success()
- uses: actions/cache@v3
+ uses: actions/setup-node@v3
with:
- path: |
- ~/cypress_url
- key: ${{ github.run_id }}-dashboard-url-${{ github.run_attempt }}
- restore-keys: |
- ${{ github.run_id }}-dashboard-url
-
- - name: Print cypress dashboard url
- continue-on-error: true
- id: dashboard_url
- run: |
- cypress_url="https://internal.appsmith.com/app/cypressdashboard/rundetails-64ec3df0c632e24c00764938?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}"
- echo "dashboard_url=$cypress_url" >> $GITHUB_OUTPUT
+ node-version: 18
- # Download failed_spec list for all jobs
- - uses: actions/download-artifact@v3
+ - name: install pg
if: needs.ci-test.result != 'success'
- id: download_ci
+ run : npm install pg
+
+ - name: Fetch the failed specs
+ if: needs.ci-test.result != 'success'
+ id: failed_specs
+ env:
+ DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
+ DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
+ DB_USER: ${{ secrets.CYPRESS_DB_USER }}
+ DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
+ RUN_ID: ${{ github.run_id }}
+ ATTEMPT_NUMBER: ${{ github.run_attempt }}
+ uses: actions/github-script@v6
with:
- name: failed-spec-ci-${{github.run_attempt}}
- path: ~/failed_spec_ci
+ script: |
+ const { Pool } = require("pg");
+ const { DB_HOST, DB_NAME, DB_USER, DB_PWD, RUN_ID, ATTEMPT_NUMBER } = process.env
+
+ const client = await new Pool({
+ user: DB_USER,
+ host: DB_HOST,
+ database: DB_NAME,
+ password: DB_PWD,
+ port: 5432,
+ connectionTimeoutMillis: 60000,
+ }).connect();
+
+ const result = await client.query(
+ `SELECT DISTINCT name FROM public."specs"
+ WHERE "matrixId" IN
+ (SELECT id FROM public."matrix"
+ WHERE "attemptId" = (
+ SELECT id FROM public."attempt" WHERE "workflowId" = $1 and "attempt" = $2
+ )
+ ) AND status = 'fail'`,
+ [RUN_ID, ATTEMPT_NUMBER],
+ );
+ client.release();
+ return result.rows.map((spec) => spec.name);
# In case for any ci job failure, create combined failed spec
- name: combine all specs for CI
id: combine_ci
if: needs.ci-test.result != 'success'
run: |
- echo "Debugging: failed specs in ~/failed_spec_ci/failed_spec_ci*"
- cat ~/failed_spec_ci/failed_spec_ci*
- cat ~/failed_spec_ci/failed_spec_ci* | sort -u >> ~/combined_failed_spec_ci
+ failed_specs=$(echo ${{steps.test.outputs.result}} | sed 's/\[\|\]//g' | tr -d ' ' | tr ',' '\n')
+ while read -r line; do
+ echo "$line" >> ~/combined_failed_spec_ci
+ done <<< "$failed_specs"
if [[ -z $(grep '[^[:space:]]' ~/combined_failed_spec_ci) ]] ; then
echo "specs_failed=0" >> $GITHUB_OUTPUT
else
@@ -156,7 +171,7 @@ jobs:
shell: bash
run: |
curl --request POST --url https://yatin-s-workspace-jk8ru5.us-east-1.xata.sh/db/CypressKnownFailures:main/tables/CypressKnownFailuires/query --header 'Authorization: Bearer ${{ secrets.XATA_TOKEN }}' --header 'Content-Type: application/json'|jq -r |grep Spec|cut -d ':' -f 2 2> /dev/null|sed 's/"//g'|sed 's/,//g' > ~/knownfailures
-
+
# Verify CI test failures against known failures
- name: Verify CI test failures against known failures
if: needs.ci-test.result != 'success'
@@ -181,7 +196,18 @@ jobs:
To know the list of identified flaky tests - <a href="https://app.appsmith.com/applications/613868bedd7786286ddd4a6a/pages/63ec710e8e503f763651791a" target="_blank">Refer here</a>
- name: Add a comment on the PR when ci-test is success
- if: needs.ci-test.result == 'success' || steps.combine_ci.outputs.specs_failed == '0'
+ if: needs.ci-test.result != 'success' && steps.combine_ci.outputs.specs_failed == '0'
+ uses: peter-evans/create-or-update-comment@v1
+ with:
+ issue-number: ${{ github.event.client_payload.pull_request.number }}
+ body: |
+ Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>.
+ Commit: `${{ github.event.client_payload.slash_command.args.named.sha }}`.
+ Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypressdashboard/rundetails-64ec3df0c632e24c00764938?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
+ It seems like there are some failures 😔. We are not able to recognize it, please check this manually <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" target="_blank">here.</a>
+
+ - name: Add a comment on the PR when ci-test is success
+ if: needs.ci-test.result == 'success' && steps.combine_ci.outputs.specs_failed == '0'
uses: peter-evans/create-or-update-comment@v1
with:
issue-number: ${{ github.event.client_payload.pull_request.number }}
diff --git a/app/client/cypress/cypress-split.ts b/app/client/cypress/cypress-split.ts
deleted file mode 100644
index 2b6fbace724e..000000000000
--- a/app/client/cypress/cypress-split.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-/* eslint-disable no-console */
-import globby from "globby";
-import minimatch from "minimatch";
-import { exec } from "child_process";
-
-const fs = require("fs/promises");
-
-type GetEnvOptions = {
- required?: boolean;
-};
-
-// used to roughly determine how many tests are in a file
-const testPattern = /(^|\s)(it)\(/g;
-
-// This function will get all the spec paths using the pattern
-async function getSpecFilePaths(
- specPattern: any,
- ignoreTestFiles: any,
-): Promise<string[]> {
- const files = globby.sync(specPattern, {
- ignore: ignoreTestFiles,
- });
-
- // ignore the files that doesn't match
- const ignorePatterns = [...(ignoreTestFiles || [])];
-
- // a function which returns true if the file does NOT match
- const doesNotMatchAllIgnoredPatterns = (file: string) => {
- // using {dot: true} here so that folders with a '.' in them are matched
- const MINIMATCH_OPTIONS = { dot: true, matchBase: true };
- return ignorePatterns.every((pattern) => {
- return !minimatch(file, pattern, MINIMATCH_OPTIONS);
- });
- };
- const filtered = files.filter(doesNotMatchAllIgnoredPatterns);
- return filtered;
-}
-
-// This function will determine the test counts in each file to sort it further
-async function getTestCount(filePath: string): Promise<number> {
- const content = await fs.readFile(filePath, "utf8");
- return content.match(testPattern)?.length || 0;
-}
-
-// Sorting the spec files as per the test count in it
-async function sortSpecFilesByTestCount(
- specPathsOriginal: string[],
-): Promise<string[]> {
- const specPaths = [...specPathsOriginal];
-
- const testPerSpec: Record<string, number> = {};
-
- for (const specPath of specPaths) {
- testPerSpec[specPath] = await getTestCount(specPath);
- }
-
- return (
- Object.entries(testPerSpec)
- // Sort by the number of tests per spec file. And this will create a consistent file list/ordering so that file division proper.
- .sort((a, b) => b[1] - a[1])
- .map((x) => x[0])
- );
-}
-
-// This function will split the specs between the runners by calculating the modulus between spec index and the totalRunners
-function splitSpecs(
- specs: string[],
- totalRunnersCount: number,
- currentRunner: number,
-): string[] {
- let specs_to_run = specs.filter((_, index) => {
- return index % totalRunnersCount === currentRunner;
- });
- return specs_to_run;
-}
-
-// This function will finally get the specs as a comma separated string to pass the specs to the command
-async function getSpecsToRun(
- totalRunnersCount = 0,
- currentRunner = 0,
- specPattern: string | string[] = "cypress/e2e/**/**/*.{js,ts}",
- ignorePattern: string | string[],
-): Promise<string[]> {
- try {
- const specFilePaths = await sortSpecFilesByTestCount(
- await getSpecFilePaths(specPattern, ignorePattern),
- );
-
- if (!specFilePaths.length) {
- throw Error("No spec files found.");
- }
- const specsToRun = splitSpecs(
- specFilePaths,
- totalRunnersCount,
- currentRunner,
- );
- return specsToRun;
- } catch (err) {
- console.error(err);
- process.exit(1);
- }
-}
-
-// This function will help to get and convert the env variables
-function getEnvNumber(
- varName: string,
- { required = false }: GetEnvOptions = {},
-): number {
- if (required && process.env[varName] === undefined) {
- throw Error(`${varName} is not set.`);
- }
- const value = Number(process.env[varName]);
- if (isNaN(value)) {
- throw Error(`${varName} is not a number.`);
- }
- return value;
-}
-
-// This function will helps to check and get env variables
-function getEnvValue(
- varName: string,
- { required = false }: GetEnvOptions = {},
-) {
- if (required && process.env[varName] === undefined) {
- throw Error(`${varName} is not set.`);
- }
- const value = process.env[varName] === undefined ? "" : process.env[varName];
- return value;
-}
-
-// This is to fetch the env variables from CI
-function getArgs() {
- return {
- totalRunners: getEnvValue("TOTAL_RUNNERS", { required: false }),
- thisRunner: getEnvValue("THIS_RUNNER", { required: false }),
- cypressSpecs: getEnvValue("CYPRESS_SPECS", { required: false }),
- };
-}
-
-export async function cypressSplit(on: any, config: any) {
- try {
- let currentRunner = 0;
- let allRunners = 1;
- let specPattern = await config.specPattern;
- const ignorePattern = await config.excludeSpecPattern;
- const { cypressSpecs, thisRunner, totalRunners } = getArgs();
-
- if (cypressSpecs != "")
- specPattern = cypressSpecs?.split(",").filter((val) => val !== "");
-
- if (totalRunners != "") {
- currentRunner = Number(thisRunner);
- allRunners = Number(totalRunners);
- }
-
- const specs = await getSpecsToRun(
- allRunners,
- currentRunner,
- specPattern,
- ignorePattern,
- );
-
- if (specs.length > 0) {
- config.specPattern = specs.length == 1 ? specs[0] : specs;
- } else {
- config.specPattern = "cypress/scripts/no_spec.ts";
- }
- return config;
- } catch (err) {
- console.log(err);
- }
-}
diff --git a/app/client/cypress/plugins/index.js b/app/client/cypress/plugins/index.js
index d24806da51d3..2f24408f1e4e 100644
--- a/app/client/cypress/plugins/index.js
+++ b/app/client/cypress/plugins/index.js
@@ -12,7 +12,7 @@ const {
} = require("cypress-image-snapshot/plugin");
const { tagify } = require("cypress-tags");
const { cypressHooks } = require("../scripts/cypress-hooks");
-const { cypressSplit } = require("../cypress-split");
+const { cypressSplit } = require("../scripts/cypress-split");
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
@@ -216,7 +216,7 @@ module.exports = async (on, config) => {
});
if (process.env["RUNID"]) {
- config = await cypressSplit(on, config);
+ config = await new cypressSplit().splitSpecs(on, config);
cypressHooks(on, config);
}
diff --git a/app/client/cypress/scripts/cypress-hooks.js b/app/client/cypress/scripts/cypress-hooks.js
deleted file mode 100644
index fb509f651633..000000000000
--- a/app/client/cypress/scripts/cypress-hooks.js
+++ /dev/null
@@ -1,244 +0,0 @@
-const { Pool } = require("pg");
-const os = require("os");
-const AWS = require("aws-sdk");
-const fs = require("fs");
-
-exports.cypressHooks = cypressHooks;
-
-// This function will helps to check and get env variables
-function getEnvValue(varName, { required = true }) {
- if (required && process.env[varName] === undefined) {
- throw Error(
- `Please check some or all the following ENV variables are not set properly [ RUNID, ATTEMPT_NUMBER, REPOSITORY, COMMITTER, TAG, BRANCH, THIS_RUNNER, CYPRESS_DB_USER, CYPRESS_DB_HOST, CYPRESS_DB_NAME, CYPRESS_DB_PWD, CYPRESS_S3_ACCESS, CYPRESS_S3_SECRET ].`,
- );
- }
- const value =
- process.env[varName] === undefined ? "Cypress test" : process.env[varName];
- return value;
-}
-
-//This is to setup the db client
-function configureDbClient() {
- const dbConfig = {
- user: getEnvValue("CYPRESS_DB_USER", { required: true }),
- host: getEnvValue("CYPRESS_DB_HOST", { required: true }),
- database: getEnvValue("CYPRESS_DB_NAME", { required: true }),
- password: getEnvValue("CYPRESS_DB_PWD", { required: true }),
- port: 5432,
- connectionTimeoutMillis: 60000,
- ssl: true,
- keepalives: 0,
- };
-
- const dbClient = new Pool(dbConfig);
-
- return dbClient;
-}
-
-// This is to setup the AWS client
-function configureS3() {
- AWS.config.update({ region: "ap-south-1" });
- const s3client = new AWS.S3({
- credentials: {
- accessKeyId: getEnvValue("CYPRESS_S3_ACCESS", { required: true }),
- secretAccessKey: getEnvValue("CYPRESS_S3_SECRET", { required: true }),
- },
- });
- return s3client;
-}
-
-// This is to upload files to s3 when required
-function uploadToS3(s3Client, filePath, key) {
- const fileContent = fs.readFileSync(filePath);
-
- const params = {
- Bucket: "appsmith-internal-cy-db",
- Key: key,
- Body: fileContent,
- };
- return s3Client.upload(params).promise();
-}
-
-async function cypressHooks(on, config) {
- const s3 = configureS3();
- const runData = {
- commitMsg: getEnvValue("COMMIT_INFO_MESSAGE", { required: false }),
- workflowId: getEnvValue("RUNID", { required: true }),
- attempt: getEnvValue("ATTEMPT_NUMBER", { required: true }),
- os: os.type(),
- repo: getEnvValue("REPOSITORY", { required: true }),
- committer: getEnvValue("COMMITTER", { required: true }),
- type: getEnvValue("TAG", { required: true }),
- branch: getEnvValue("BRANCH", { required: true }),
- };
- const matrix = {
- matrixId: getEnvValue("THIS_RUNNER", { required: true }),
- matrixStatus: "started",
- };
-
- const specData = {};
-
- await on("before:run", async (runDetails) => {
- runData.browser = runDetails.browser.name;
- const dbClient = await configureDbClient().connect();
- try {
- const runResponse = await dbClient.query(
- `INSERT INTO public.attempt ("workflowId", "attempt", "browser", "os", "repo", "committer", "type", "commitMsg", "branch")
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
- ON CONFLICT ("workflowId", attempt) DO NOTHING
- RETURNING id;`,
- [
- runData.workflowId,
- runData.attempt,
- runData.browser,
- runData.os,
- runData.repo,
- runData.committer,
- runData.type,
- runData.commitMsg,
- runData.branch,
- ],
- );
-
- if (runResponse.rows.length > 0) {
- runData.attemptId = runResponse.rows[0].id; // Save the inserted attempt ID for later updates
- } else {
- const res = await dbClient.query(
- `SELECT id FROM public.attempt WHERE "workflowId" = $1 AND attempt = $2`,
- [runData.workflowId, runData.attempt],
- );
- runData.attemptId = res.rows[0].id;
- }
-
- const matrixResponse = await dbClient.query(
- `INSERT INTO public.matrix ("workflowId", "matrixId", "status", "attemptId")
- VALUES ($1, $2, $3, $4)
- ON CONFLICT ("matrixId", "attemptId") DO NOTHING
- RETURNING id;`,
- [
- runData.workflowId,
- matrix.matrixId,
- matrix.matrixStatus,
- runData.attemptId,
- ],
- );
- matrix.id = matrixResponse.rows[0].id; // Save the inserted matrix ID for later updates
- } catch (err) {
- console.log(err);
- } finally {
- await dbClient.release();
- }
- });
-
- await on("before:spec", async (spec) => {
- specData.name = spec.relative;
- specData.matrixId = matrix.id;
- const dbClient = await configureDbClient().connect();
- try {
- if (!specData.name.includes("no_spec.ts")) {
- const specResponse = await dbClient.query(
- 'INSERT INTO public.specs ("name", "matrixId") VALUES ($1, $2) RETURNING id',
- [specData.name, matrix.id],
- );
- specData.specId = specResponse.rows[0].id; // Save the inserted spec ID for later updates
- }
- } catch (err) {
- console.log(err);
- } finally {
- await dbClient.release();
- }
- });
-
- await on("after:spec", async (spec, results) => {
- specData.testCount = results.stats.tests;
- specData.passes = results.stats.passes;
- specData.failed = results.stats.failures;
- specData.pending = results.stats.pending;
- specData.skipped = results.stats.skipped;
- specData.status = results.stats.failures > 0 ? "fail" : "pass";
- specData.duration = results.stats.wallClockDuration;
-
- const dbClient = await configureDbClient().connect();
- try {
- if (!specData.name.includes("no_spec.ts")) {
- await dbClient.query(
- 'UPDATE public.specs SET "testCount" = $1, "passes" = $2, "failed" = $3, "skipped" = $4, "pending" = $5, "status" = $6, "duration" = $7 WHERE id = $8',
- [
- results.stats.tests,
- results.stats.passes,
- results.stats.failures,
- results.stats.skipped,
- results.stats.pending,
- specData.status,
- specData.duration,
- specData.specId,
- ],
- );
- for (const test of results.tests) {
- const testResponse = await dbClient.query(
- `INSERT INTO public.tests ("name", "specId", "status", "retries", "retryData") VALUES ($1, $2, $3, $4, $5) RETURNING id`,
- [
- test.title[1],
- specData.specId,
- test.state,
- test.attempts.length,
- JSON.stringify(test.attempts),
- ],
- );
- if (
- test.attempts.some((attempt) => attempt.state === "failed") &&
- results.screenshots
- ) {
- const out = results.screenshots.filter(
- (scr) => scr.testId === test.testId,
- );
- console.log("Uploading screenshots...");
- for (const scr of out) {
- const key = `${testResponse.rows[0].id}_${specData.specId}_${
- scr.testAttemptIndex + 1
- }`;
- Promise.all([uploadToS3(s3, scr.path, key)]).catch((error) => {
- console.log("Error in uploading screenshots:", error);
- });
- }
- }
- }
-
- if (
- results.tests.some((test) =>
- test.attempts.some((attempt) => attempt.state === "failed"),
- ) &&
- results.video
- ) {
- console.log("Uploading video...");
- const key = `${specData.specId}`;
- Promise.all([uploadToS3(s3, results.video, key)]).catch((error) => {
- console.log("Error in uploading video:", error);
- });
- }
- }
- } catch (err) {
- console.log(err);
- } finally {
- await dbClient.release();
- }
- });
-
- on("after:run", async (runDetails) => {
- const dbClient = await configureDbClient().connect();
- try {
- await dbClient.query(
- `UPDATE public.matrix SET "status" = $1 WHERE id = $2`,
- ["done", matrix.id],
- );
- await dbClient.query(
- `UPDATE public.attempt SET "endTime" = $1 WHERE "id" = $2`,
- [new Date(), runData.attemptId],
- );
- } catch (err) {
- console.log(err);
- } finally {
- await dbClient.end();
- }
- });
-}
diff --git a/app/client/cypress/scripts/cypress-hooks.ts b/app/client/cypress/scripts/cypress-hooks.ts
new file mode 100644
index 000000000000..50a1dbc189d3
--- /dev/null
+++ b/app/client/cypress/scripts/cypress-hooks.ts
@@ -0,0 +1,147 @@
+import os from "os";
+import util from "./util";
+
+export async function cypressHooks(
+ on: Cypress.PluginEvents,
+ config: Cypress.PluginConfigOptions,
+) {
+ const _ = new util();
+ const s3 = _.configureS3();
+ const dbClient = _.configureDbClient();
+ const runData: any = {
+ workflowId: _.getVars().runId,
+ attempt: _.getVars().attempt_number,
+ os: os.type(),
+ };
+ const matrix: any = {
+ matrixId: _.getVars().thisRunner,
+ matrixStatus: "started",
+ };
+ const specData: any = {};
+
+ on("before:run", async (runDetails: Cypress.BeforeRunDetails) => {
+ runData.browser = runDetails.browser?.name;
+ const client = await dbClient.connect();
+ try {
+ const attemptRes = await client.query(
+ `UPDATE public."attempt" SET "browser" = $1, "os" = $2 WHERE "workflowId" = $3 AND attempt = $4 RETURNING id`,
+ [runData.browser, runData.os, runData.workflowId, runData.attempt],
+ );
+ runData.attemptId = attemptRes.rows[0].id;
+ const matrixRes = await client.query(
+ `SELECT id FROM public."matrix" WHERE "attemptId" = $1 AND "matrixId" = $2`,
+ [runData.attemptId, matrix.matrixId],
+ );
+ matrix.id = matrixRes.rowCount > 0 ? matrixRes.rows[0].id : "";
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ });
+
+ on("before:spec", async (spec: Cypress.Spec) => {
+ specData.name = spec.relative;
+ specData.matrixId = matrix.id;
+ const client = await dbClient.connect();
+ try {
+ if (!specData.name.includes("no_spec.ts")) {
+ const specResponse = await client.query(
+ `UPDATE public."specs" SET "status" = $1 WHERE "name" = $2 AND "matrixId" = $3 RETURNING id`,
+ ["in-progress", specData.name, matrix.id],
+ );
+ specData.specId = specResponse.rows[0].id;
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ });
+
+ on(
+ "after:spec",
+ async (spec: Cypress.Spec, results: CypressCommandLine.RunResult) => {
+ const client = await dbClient.connect();
+ try {
+ if (!specData.name.includes("no_spec.ts")) {
+ await client.query(
+ 'UPDATE public.specs SET "testCount" = $1, "passes" = $2, "failed" = $3, "skipped" = $4, "pending" = $5, "status" = $6, "duration" = $7 WHERE id = $8',
+ [
+ results.stats.tests,
+ results.stats.passes,
+ results.stats.failures,
+ results.stats.skipped,
+ results.stats.pending,
+ results.stats.failures > 0 ? "fail" : "pass",
+ results.stats.duration,
+ specData.specId,
+ ],
+ );
+ for (const test of results.tests) {
+ const testResponse = await client.query(
+ `INSERT INTO public.tests ("name", "specId", "status", "retries", "retryData") VALUES ($1, $2, $3, $4, $5) RETURNING id`,
+ [
+ test.title[1],
+ specData.specId,
+ test.state,
+ test.attempts.length,
+ test.displayError,
+ ],
+ );
+ if (
+ test.attempts.some((attempt) => attempt.state === "failed") &&
+ results.screenshots.length > 0
+ ) {
+ const out = results.screenshots.filter((scr) =>
+ scr.path.includes(test.title[1]),
+ );
+ console.log("Uploading screenshots...");
+ for (const scr of out) {
+ const attempt = scr.path.includes("attempt 2") ? 2 : 1;
+ const key = `${testResponse.rows[0].id}_${specData.specId}_${attempt}`;
+ await _.uploadToS3(s3, scr.path, key);
+ }
+ }
+ }
+
+ if (
+ results.tests.some((test) =>
+ test.attempts.some((attempt) => attempt.state === "failed"),
+ ) &&
+ results.video
+ ) {
+ console.log("Uploading video...");
+ const key = `${specData.specId}`;
+ await _.uploadToS3(s3, results.video, key);
+ }
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ },
+ );
+
+ on("after:run", async (runDetails) => {
+ const client = await dbClient.connect();
+ try {
+ if (!specData.name.includes("no_spec.ts")) {
+ await client.query(
+ `UPDATE public.matrix SET "status" = $1 WHERE id = $2`,
+ ["done", matrix.id],
+ );
+ await client.query(
+ `UPDATE public.attempt SET "endTime" = $1 WHERE "id" = $2`,
+ [new Date(), runData.attemptId],
+ );
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ await dbClient.end();
+ }
+ });
+}
diff --git a/app/client/cypress/scripts/cypress-split.ts b/app/client/cypress/scripts/cypress-split.ts
new file mode 100644
index 000000000000..b44c99970a5e
--- /dev/null
+++ b/app/client/cypress/scripts/cypress-split.ts
@@ -0,0 +1,325 @@
+/* eslint-disable no-console */
+import type { DataItem } from "./util";
+import util from "./util";
+import globby from "globby";
+import minimatch from "minimatch";
+import cypress from "cypress";
+
+export class cypressSplit {
+ util = new util();
+ dbClient = this.util.configureDbClient();
+
+ // This function will get all the spec paths using the pattern
+ private async getSpecFilePaths(
+ specPattern: any,
+ ignoreTestFiles: any,
+ ): Promise<string[]> {
+ const files = globby.sync(specPattern, {
+ ignore: ignoreTestFiles,
+ });
+
+ // ignore the files that doesn't match
+ const ignorePatterns = [...(ignoreTestFiles || [])];
+
+ // a function which returns true if the file does NOT match
+ const doesNotMatchAllIgnoredPatterns = (file: string) => {
+ // using {dot: true} here so that folders with a '.' in them are matched
+ const MINIMATCH_OPTIONS = { dot: true, matchBase: true };
+ return ignorePatterns.every((pattern) => {
+ return !minimatch(file, pattern, MINIMATCH_OPTIONS);
+ });
+ };
+ const filtered = files.filter(doesNotMatchAllIgnoredPatterns);
+ return filtered;
+ }
+
+ private async getSpecsWithTime(specs: string[], attemptId: number) {
+ const client = await this.dbClient.connect();
+ const defaultDuration = 180000;
+ const specsMap = new Map();
+ try {
+ const queryRes = await client.query(
+ 'SELECT * FROM public."spec_avg_duration" ORDER BY duration DESC',
+ );
+
+ queryRes.rows.forEach((obj) => {
+ specsMap.set(obj.name, obj);
+ });
+
+ const allSpecsWithDuration = specs.map((spec) => {
+ const match = specsMap.get(spec);
+ return match ? match : { name: spec, duration: defaultDuration };
+ });
+ const activeRunners = await this.util.getActiveRunners();
+ const activeRunnersFromDb = await this.getActiveRunnersFromDb(attemptId);
+ return await this.util.divideSpecsIntoBalancedGroups(
+ allSpecsWithDuration,
+ Number(activeRunners) - Number(activeRunnersFromDb),
+ );
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ // This function will finally get the specs as a comma separated string to pass the specs to the command
+ private async getSpecsToRun(
+ specPattern: string | string[] = "cypress/e2e/**/**/*.{js,ts}",
+ ignorePattern: string | string[],
+ attemptId: number,
+ ): Promise<string[]> {
+ try {
+ const specFilePaths = await this.getSpecFilePaths(
+ specPattern,
+ ignorePattern,
+ );
+
+ const specsToRun = await this.getSpecsWithTime(specFilePaths, attemptId);
+ return specsToRun === undefined
+ ? []
+ : specsToRun[0].map((spec) => spec.name);
+ } catch (err) {
+ console.error(err);
+ process.exit(1);
+ }
+ }
+
+ private async getActiveRunnersFromDb(attemptId: number) {
+ const client = await this.dbClient.connect();
+ try {
+ const matrixRes = await client.query(
+ `SELECT * FROM public."matrix" WHERE "attemptId" = $1`,
+ [attemptId],
+ );
+ return matrixRes.rowCount;
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async getAlreadyRunningSpecs() {
+ const client = await this.dbClient.connect();
+ try {
+ const dbRes = await client.query(
+ `SELECT name FROM public."specs"
+ WHERE "matrixId" IN
+ (SELECT id FROM public."matrix"
+ WHERE "attemptId" = (
+ SELECT id FROM public."attempt" WHERE "workflowId" = $1 and "attempt" = $2
+ )
+ )`,
+ [this.util.getVars().runId, this.util.getVars().attempt_number],
+ );
+ const specs: string[] =
+ dbRes.rows.length > 0 ? dbRes.rows.map((row) => row.name) : [];
+ return specs;
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async createAttempt() {
+ const client = await this.dbClient.connect();
+ try {
+ const runResponse = await client.query(
+ `INSERT INTO public."attempt" ("workflowId", "attempt", "repo", "committer", "type", "commitMsg", "branch")
+ VALUES ($1, $2, $3, $4, $5, $6, $7)
+ ON CONFLICT ("workflowId", attempt) DO NOTHING
+ RETURNING id;`,
+ [
+ this.util.getVars().runId,
+ this.util.getVars().attempt_number,
+ this.util.getVars().repository,
+ this.util.getVars().committer,
+ this.util.getVars().tag,
+ this.util.getVars().commitMsg,
+ this.util.getVars().branch,
+ ],
+ );
+
+ if (runResponse.rows.length > 0) {
+ return runResponse.rows[0].id;
+ } else {
+ const res = await client.query(
+ `SELECT id FROM public."attempt" WHERE "workflowId" = $1 AND attempt = $2`,
+ [this.util.getVars().runId, this.util.getVars().attempt_number],
+ );
+ return res.rows[0].id;
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async createMatrix(attemptId: number) {
+ const client = await this.dbClient.connect();
+ try {
+ const matrixResponse = await client.query(
+ `INSERT INTO public."matrix" ("workflowId", "matrixId", "status", "attemptId")
+ VALUES ($1, $2, $3, $4)
+ ON CONFLICT ("matrixId", "attemptId") DO NOTHING
+ RETURNING id;`,
+ [
+ this.util.getVars().runId,
+ this.util.getVars().thisRunner,
+ "started",
+ attemptId,
+ ],
+ );
+ return matrixResponse.rows[0].id;
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async getFailedSpecsFromPreviousRun(
+ workflowId = Number(this.util.getVars().runId),
+ attempt_number = Number(this.util.getVars().attempt_number) - 1,
+ ) {
+ const client = await this.dbClient.connect();
+ try {
+ const dbRes = await client.query(
+ `SELECT name FROM public."specs"
+ WHERE "matrixId" IN
+ (SELECT id FROM public."matrix"
+ WHERE "attemptId" = (
+ SELECT id FROM public."attempt" WHERE "workflowId" = $1 and "attempt" = $2
+ )
+ ) AND status IN ('fail', 'queued', 'in-progress')`,
+ [workflowId, attempt_number],
+ );
+ const specs: string[] =
+ dbRes.rows.length > 0 ? dbRes.rows.map((row) => row.name) : [];
+ return specs;
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async addSpecsToMatrix(matrixId: number, specs: string[]) {
+ const client = await this.dbClient.connect();
+ try {
+ for (const spec of specs) {
+ const res = await client.query(
+ `INSERT INTO public."specs" ("name", "matrixId", "status") VALUES ($1, $2, $3) RETURNING id`,
+ [spec, matrixId, "queued"],
+ );
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async addLockGetTheSpecs(
+ attemptId: number,
+ specPattern: string | string[],
+ ignorePattern: string | string[],
+ ) {
+ const client = await this.dbClient.connect();
+ let specs: string[] = [];
+ let locked = false;
+ try {
+ while (!locked) {
+ const result = await client.query(
+ `UPDATE public."attempt" SET is_locked = true WHERE id = $1 AND is_locked = false RETURNING id`,
+ [attemptId],
+ );
+ if (result.rows.length === 1) {
+ locked = true;
+ let runningSpecs: string[] =
+ (await this.getAlreadyRunningSpecs()) ?? [];
+ if (typeof ignorePattern === "string") {
+ runningSpecs.push(ignorePattern);
+ ignorePattern = runningSpecs;
+ } else {
+ ignorePattern = runningSpecs.concat(ignorePattern);
+ }
+ specs = await this.getSpecsToRun(
+ specPattern,
+ ignorePattern,
+ attemptId,
+ );
+ return specs;
+ } else {
+ await this.sleep(5000);
+ }
+ }
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private async updateTheSpecsAndReleaseLock(
+ attemptId: number,
+ specs: string[],
+ ) {
+ const client = await this.dbClient.connect();
+ try {
+ const matrixRes = await this.createMatrix(attemptId);
+ await this.addSpecsToMatrix(matrixRes, specs);
+ await client.query(
+ `UPDATE public."attempt" SET is_locked = false WHERE id = $1 AND is_locked = true RETURNING id`,
+ [attemptId],
+ );
+ } catch (err) {
+ console.log(err);
+ } finally {
+ client.release();
+ }
+ }
+
+ private sleep(ms: number): Promise<void> {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+ }
+
+ public async splitSpecs(
+ on: Cypress.PluginEvents,
+ config: Cypress.PluginConfigOptions,
+ ) {
+ try {
+ let specPattern = config.specPattern;
+ let ignorePattern: string | string[] = config.excludeSpecPattern;
+ const cypressSpecs = this.util.getVars().cypressSpecs;
+ const defaultSpec = "cypress/scripts/no_spec.ts";
+
+ if (cypressSpecs != "")
+ specPattern = cypressSpecs?.split(",").filter((val) => val !== "");
+ if (this.util.getVars().cypressRerun === "true") {
+ specPattern =
+ (await this.getFailedSpecsFromPreviousRun()) ?? defaultSpec;
+ }
+
+ const attempt = await this.createAttempt();
+ const specs =
+ (await this.addLockGetTheSpecs(attempt, specPattern, ignorePattern)) ??
+ [];
+ if (specs.length > 0 && !specs.includes(defaultSpec)) {
+ config.specPattern = specs.length == 1 ? specs[0] : specs;
+ await this.updateTheSpecsAndReleaseLock(attempt, specs);
+ } else {
+ config.specPattern = defaultSpec;
+ }
+
+ return config;
+ } catch (err) {
+ console.log(err);
+ } finally {
+ this.dbClient.end();
+ }
+ }
+}
diff --git a/app/client/cypress/scripts/util.ts b/app/client/cypress/scripts/util.ts
new file mode 100644
index 000000000000..858e09c01b1b
--- /dev/null
+++ b/app/client/cypress/scripts/util.ts
@@ -0,0 +1,149 @@
+import { Pool } from "pg";
+import AWS from "aws-sdk";
+import fs from "fs";
+import { Octokit } from "@octokit/rest";
+import fetch from "node-fetch";
+
+export interface DataItem {
+ name: string;
+ duration: string;
+}
+export default class util {
+ public getVars() {
+ return {
+ runId: this.getEnvValue("RUNID", { required: true }),
+ attempt_number: this.getEnvValue("ATTEMPT_NUMBER", { required: true }),
+ repository: this.getEnvValue("REPOSITORY", { required: true }),
+ committer: this.getEnvValue("COMMITTER", { required: true }),
+ tag: this.getEnvValue("TAG", { required: true }),
+ branch: this.getEnvValue("BRANCH", { required: true }),
+ cypressDbUser: this.getEnvValue("CYPRESS_DB_USER", { required: true }),
+ cypressDbHost: this.getEnvValue("CYPRESS_DB_HOST", { required: true }),
+ cypressDbName: this.getEnvValue("CYPRESS_DB_NAME", { required: true }),
+ cypressDbPwd: this.getEnvValue("CYPRESS_DB_PWD", { required: true }),
+ cypressS3Access: this.getEnvValue("CYPRESS_S3_ACCESS", {
+ required: true,
+ }),
+ cypressS3Secret: this.getEnvValue("CYPRESS_S3_SECRET", {
+ required: true,
+ }),
+ githubToken: process.env["GITHUB_TOKEN"],
+ commitMsg: this.getEnvValue("COMMIT_INFO_MESSAGE", { required: false }),
+ totalRunners: this.getEnvValue("TOTAL_RUNNERS", { required: false }),
+ thisRunner: this.getEnvValue("THIS_RUNNER", { required: true }),
+ cypressSpecs: this.getEnvValue("CYPRESS_SPECS", { required: false }),
+ cypressRerun: this.getEnvValue("CYPRESS_RERUN", { required: false }),
+ };
+ }
+
+ public async divideSpecsIntoBalancedGroups(
+ data: DataItem[],
+ numberOfGroups: number,
+ ): Promise<DataItem[][]> {
+ const groups: DataItem[][] = Array.from(
+ { length: numberOfGroups },
+ () => [],
+ );
+ data.forEach((item) => {
+ // Find the group with the shortest total duration and add the item to it
+ const shortestGroupIndex = groups.reduce(
+ (minIndex, group, currentIndex) => {
+ const totalDuration = groups[minIndex].reduce(
+ (acc, item) => acc + Number(item.duration),
+ 0,
+ );
+ const totalDurationCurrent = group.reduce(
+ (acc, item) => acc + Number(item.duration),
+ 0,
+ );
+ return totalDurationCurrent < totalDuration ? currentIndex : minIndex;
+ },
+ 0,
+ );
+ groups[shortestGroupIndex].push(item);
+ });
+ return groups;
+ }
+
+ public getEnvValue(varName: string, { required = true }): string {
+ if (required && process.env[varName] === undefined) {
+ throw Error(
+ `${varName} is not defined.
+ Please check all the following environment variables are defined properly
+ [ RUNID, ATTEMPT_NUMBER, REPOSITORY, COMMITTER, TAG, BRANCH, THIS_RUNNER, CYPRESS_DB_USER, CYPRESS_DB_HOST, CYPRESS_DB_NAME, CYPRESS_DB_PWD, CYPRESS_S3_ACCESS, CYPRESS_S3_SECRET ].`,
+ );
+ }
+ return process.env[varName] ?? "";
+ }
+
+ //This is to setup the db client
+ public configureDbClient() {
+ const dbConfig = {
+ user: this.getVars().cypressDbUser,
+ host: this.getVars().cypressDbHost,
+ database: this.getVars().cypressDbName,
+ password: this.getVars().cypressDbPwd,
+ port: 5432,
+ connectionTimeoutMillis: 60000,
+ ssl: true,
+ keepalives: 30,
+ };
+ const dbClient = new Pool(dbConfig);
+ return dbClient;
+ }
+
+ // This is to setup the AWS client
+ public configureS3() {
+ AWS.config.update({ region: "ap-south-1" });
+ const s3client = new AWS.S3({
+ credentials: {
+ accessKeyId: this.getVars().cypressS3Access,
+ secretAccessKey: this.getVars().cypressS3Secret,
+ },
+ });
+ return s3client;
+ }
+
+ // This is to upload files to s3 when required
+ public async uploadToS3(s3Client: AWS.S3, filePath: string, key: string) {
+ const fileContent = fs.readFileSync(filePath);
+ const params = {
+ Bucket: "appsmith-internal-cy-db",
+ Key: key,
+ Body: fileContent,
+ };
+ return await s3Client.upload(params).promise();
+ }
+
+ public async getActiveRunners() {
+ const octokit = new Octokit({
+ auth: this.getVars().githubToken,
+ request: {
+ fetch: fetch,
+ },
+ });
+ try {
+ const repo: string[] = this.getVars().repository.split("/");
+ const response = await octokit.request(
+ "GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs",
+ {
+ owner: repo[0],
+ repo: repo[1],
+ run_id: Number(this.getVars().runId),
+ per_page: 100,
+ headers: {
+ "X-GitHub-Api-Version": "2022-11-28",
+ },
+ },
+ );
+ const active_runners = response.data.jobs.filter(
+ (job) =>
+ (job.status === "in_progress" || job.status === "queued") &&
+ job.run_attempt === Number(this.getVars().attempt_number),
+ );
+ return active_runners.length;
+ } catch (error) {
+ console.error("Error:", error);
+ }
+ }
+}
diff --git a/app/client/cypress_ci_custom.config.ts b/app/client/cypress_ci_custom.config.ts
index c530a480b919..feadeff56e21 100644
--- a/app/client/cypress_ci_custom.config.ts
+++ b/app/client/cypress_ci_custom.config.ts
@@ -6,7 +6,7 @@ export default defineConfig({
requestTimeout: 60000,
responseTimeout: 60000,
pageLoadTimeout: 60000,
- videoUploadOnPasses: false,
+ video: true,
numTestsKeptInMemory: 5,
experimentalMemoryManagement: true,
reporter: "cypress-mochawesome-reporter",
diff --git a/app/client/cypress_ci_hosted.config.ts b/app/client/cypress_ci_hosted.config.ts
index 6b40587510ef..33948c1aa5bd 100644
--- a/app/client/cypress_ci_hosted.config.ts
+++ b/app/client/cypress_ci_hosted.config.ts
@@ -7,7 +7,7 @@ export default defineConfig({
responseTimeout: 60000,
pageLoadTimeout: 60000,
videoCompression: false,
- videoUploadOnPasses: false,
+ video: true,
numTestsKeptInMemory: 5,
experimentalMemoryManagement: true,
reporter: "cypress-mochawesome-reporter",
diff --git a/app/client/package.json b/app/client/package.json
index 92d1eb059318..ca4099a006e0 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -140,7 +140,6 @@
"normalizr": "^3.3.0",
"object-hash": "^3.0.0",
"path-to-regexp": "^6.2.0",
- "pg": "^8.11.3",
"popper.js": "^1.15.0",
"prismjs": "^1.27.0",
"proxy-memoize": "^1.2.0",
@@ -231,6 +230,7 @@
"@babel/helper-string-parser": "^7.19.4",
"@craco/craco": "^7.0.0",
"@faker-js/faker": "^7.4.0",
+ "@octokit/rest": "^20.0.1",
"@peculiar/webcrypto": "^1.4.3",
"@redux-saga/testing-utils": "^1.1.5",
"@sentry/webpack-plugin": "^1.18.9",
@@ -252,6 +252,7 @@
"@types/node": "^10.12.18",
"@types/node-forge": "^0.10.0",
"@types/object-hash": "^2.2.1",
+ "@types/pg": "^8.10.2",
"@types/prismjs": "^1.16.1",
"@types/react": "^17.0.2",
"@types/react-beautiful-dnd": "^11.0.4",
@@ -288,7 +289,7 @@
"compression-webpack-plugin": "^10.0.0",
"cra-bundle-analyzer": "^0.1.0",
"cy-verify-downloads": "^0.0.5",
- "cypress": "^12.17.4",
+ "cypress": "13.2.0",
"cypress-file-upload": "^4.1.1",
"cypress-image-snapshot": "^4.0.1",
"cypress-mochawesome-reporter": "^3.5.1",
@@ -322,6 +323,7 @@
"json5": "^2.2.3",
"lint-staged": "^13.2.0",
"msw": "^0.28.0",
+ "pg": "^8.11.3",
"plop": "^3.1.1",
"postcss": "^8.4.30",
"postcss-at-rules-variables": "^0.3.0",
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 8a5e4e5c6283..7520c1d9358d 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -2265,9 +2265,9 @@ __metadata:
languageName: node
linkType: hard
-"@cypress/request@npm:2.88.12":
- version: 2.88.12
- resolution: "@cypress/request@npm:2.88.12"
+"@cypress/request@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "@cypress/request@npm:3.0.0"
dependencies:
aws-sign2: ~0.7.0
aws4: ^1.8.0
@@ -2287,7 +2287,7 @@ __metadata:
tough-cookie: ^4.1.3
tunnel-agent: ^0.6.0
uuid: ^8.3.2
- checksum: 2c6fbf7f3127d41bffca8374beaa8cf95450495a8a077b00309ea9d94dd2a4da450a77fe038e8ad26c97cdd7c39b65c53c850f8338ce9bc2dbe23ce2e2b48329
+ checksum: 8ec81075b800b84df8a616dce820a194d562a35df251da234f849344022979f3675baa0b82988843f979a488e39bc1eec6204cfe660c75ace9bf4d2951edec43
languageName: node
linkType: hard
@@ -3941,6 +3941,133 @@ __metadata:
languageName: node
linkType: hard
+"@octokit/auth-token@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@octokit/auth-token@npm:4.0.0"
+ checksum: d78f4dc48b214d374aeb39caec4fdbf5c1e4fd8b9fcb18f630b1fe2cbd5a880fca05445f32b4561f41262cb551746aeb0b49e89c95c6dd99299706684d0cae2f
+ languageName: node
+ linkType: hard
+
+"@octokit/core@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "@octokit/core@npm:5.0.0"
+ dependencies:
+ "@octokit/auth-token": ^4.0.0
+ "@octokit/graphql": ^7.0.0
+ "@octokit/request": ^8.0.2
+ "@octokit/request-error": ^5.0.0
+ "@octokit/types": ^11.0.0
+ before-after-hook: ^2.2.0
+ universal-user-agent: ^6.0.0
+ checksum: 1a5d1112a2403d146aa1db7aaf81a31192ef6b0310a1e6f68c3e439fded22bd4b3a930f5071585e6ca0f2f5e7fc4a1aac68910525b71b03732c140e362d26a33
+ languageName: node
+ linkType: hard
+
+"@octokit/endpoint@npm:^9.0.0":
+ version: 9.0.0
+ resolution: "@octokit/endpoint@npm:9.0.0"
+ dependencies:
+ "@octokit/types": ^11.0.0
+ is-plain-object: ^5.0.0
+ universal-user-agent: ^6.0.0
+ checksum: 0e402c4d0fbe5b8053630cedb30dde5074bb6410828a05dc93d7e0fdd6c17f9a44b66586ef1a4e4ee0baa8d34ef7d6f535e2f04d9ea42909b7fc7ff55ce56a48
+ languageName: node
+ linkType: hard
+
+"@octokit/graphql@npm:^7.0.0":
+ version: 7.0.1
+ resolution: "@octokit/graphql@npm:7.0.1"
+ dependencies:
+ "@octokit/request": ^8.0.1
+ "@octokit/types": ^11.0.0
+ universal-user-agent: ^6.0.0
+ checksum: 7ee907987b1b8312c6f870c44455cbd3eed805bb1a4095038f4e7e62ee2e006bd766f2a71dfbe56b870cd8f7558309c602f00d3e252fe59578f4acf6249a4f17
+ languageName: node
+ linkType: hard
+
+"@octokit/openapi-types@npm:^18.0.0":
+ version: 18.0.0
+ resolution: "@octokit/openapi-types@npm:18.0.0"
+ checksum: d487d6c6c1965e583eee417d567e4fe3357a98953fc49bce1a88487e7908e9b5dbb3e98f60dfa340e23b1792725fbc006295aea071c5667a813b9c098185b56f
+ languageName: node
+ linkType: hard
+
+"@octokit/plugin-paginate-rest@npm:^8.0.0":
+ version: 8.0.0
+ resolution: "@octokit/plugin-paginate-rest@npm:8.0.0"
+ dependencies:
+ "@octokit/types": ^11.0.0
+ peerDependencies:
+ "@octokit/core": ">=5"
+ checksum: b5d7cee50523862c6ce7be057f7200e14ee4dcded462f27304c822c960a37efa23ed51080ea879f5d1e56e78f74baa17d2ce32eed5d726794abc35755777e32c
+ languageName: node
+ linkType: hard
+
+"@octokit/plugin-request-log@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@octokit/plugin-request-log@npm:4.0.0"
+ peerDependencies:
+ "@octokit/core": ">=5"
+ checksum: 2a8a6619640942092009a9248ceeb163ce01c978e2d7b2a7eb8686bd09a04b783c4cd9071eebb16652d233587abcde449a02ce4feabc652f0a171615fb3e9946
+ languageName: node
+ linkType: hard
+
+"@octokit/plugin-rest-endpoint-methods@npm:^9.0.0":
+ version: 9.0.0
+ resolution: "@octokit/plugin-rest-endpoint-methods@npm:9.0.0"
+ dependencies:
+ "@octokit/types": ^11.0.0
+ peerDependencies:
+ "@octokit/core": ">=5"
+ checksum: 8795cb29be042c839098886a03c2ec6051e3fd7a29f16f4f8a487aa2d85ceb00df8a4432499a43af550369bd730ce9b1b9d7eeff768745b80a3e67698ca9a5dd
+ languageName: node
+ linkType: hard
+
+"@octokit/request-error@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "@octokit/request-error@npm:5.0.0"
+ dependencies:
+ "@octokit/types": ^11.0.0
+ deprecation: ^2.0.0
+ once: ^1.4.0
+ checksum: 2012eca66f6b8fa4038b3bfe81d65a7134ec58e2caf45d229aca13b9653ab260abd95229bd1a8c11180ee0bcf738e2556831a85de28f39b175175653c3b79fdd
+ languageName: node
+ linkType: hard
+
+"@octokit/request@npm:^8.0.1, @octokit/request@npm:^8.0.2":
+ version: 8.1.1
+ resolution: "@octokit/request@npm:8.1.1"
+ dependencies:
+ "@octokit/endpoint": ^9.0.0
+ "@octokit/request-error": ^5.0.0
+ "@octokit/types": ^11.1.0
+ is-plain-object: ^5.0.0
+ universal-user-agent: ^6.0.0
+ checksum: dec3ba2cba14739159cd8d1653ad8ac6d58095e4ac294d312d20ce2c63c60c3cad2e5499137244dba3d681fd5cd7f74b4b5d4df024a19c0ee1831204e5a3a894
+ languageName: node
+ linkType: hard
+
+"@octokit/rest@npm:^20.0.1":
+ version: 20.0.1
+ resolution: "@octokit/rest@npm:20.0.1"
+ dependencies:
+ "@octokit/core": ^5.0.0
+ "@octokit/plugin-paginate-rest": ^8.0.0
+ "@octokit/plugin-request-log": ^4.0.0
+ "@octokit/plugin-rest-endpoint-methods": ^9.0.0
+ checksum: 9fb2e154a498e00598379b09d76cc7b67b3801e9c97d753f1a76e1163924188bf4cb1411ec152a038ae91e97b86d7146ff220b05adfb6e500e2300c87e14100a
+ languageName: node
+ linkType: hard
+
+"@octokit/types@npm:^11.0.0, @octokit/types@npm:^11.1.0":
+ version: 11.1.0
+ resolution: "@octokit/types@npm:11.1.0"
+ dependencies:
+ "@octokit/openapi-types": ^18.0.0
+ checksum: 72627a94ddaf7bc14db06572bcde67649aad608cd86548818380db9305f4c0ca9ca078a62dd883858a267e8ec8fd596a0fce416aa04197c439b9548efef609a7
+ languageName: node
+ linkType: hard
+
"@open-draft/until@npm:^1.0.3":
version: 1.0.3
resolution: "@open-draft/until@npm:1.0.3"
@@ -8076,10 +8203,10 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:*, @types/node@npm:>=10.0.0":
- version: 18.14.5
- resolution: "@types/node@npm:18.14.5"
- checksum: 415fb0edc132baa9580f1b7a381a3f10b662f5d7a7d11641917fa0961788ccede3272badc414aadc47306e9fc35c5f6c59159ac470b46d3f3a15fb0446224c8c
+"@types/node@npm:*, @types/node@npm:>=10.0.0, @types/node@npm:^18.17.5":
+ version: 18.17.15
+ resolution: "@types/node@npm:18.17.15"
+ checksum: eed11d4398ccdb999a4c65658ee75de621a4ad57aece48ed2fb8803b1e2711fadf58d8aefbdb0a447d69cf3cba602ca32fe0fc92077575950a796e1dc13baa0f
languageName: node
linkType: hard
@@ -8090,7 +8217,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:^16.0.0, @types/node@npm:^16.18.39":
+"@types/node@npm:^16.0.0":
version: 16.18.40
resolution: "@types/node@npm:16.18.40"
checksum: a683930491b4fd7cb2dc7684e32bbeedc4a83fb1949a7b15ea724fbfaa9988cec59091f169a3f1090cb91992caba8c1a7d50315b2c67c6e2579a3788bb09eec4
@@ -8118,6 +8245,17 @@ __metadata:
languageName: node
linkType: hard
+"@types/pg@npm:^8.10.2":
+ version: 8.10.2
+ resolution: "@types/pg@npm:8.10.2"
+ dependencies:
+ "@types/node": "*"
+ pg-protocol: "*"
+ pg-types: ^4.0.1
+ checksum: 49da89f64cec1bd12a3fbc0c72b17d685c2fee579726a529f62fcab395dbc5696d80455073409947a577164b3c53a90181a331e4a5d9357679f724d4ce37f4b9
+ languageName: node
+ linkType: hard
+
"@types/prettier@npm:^2.1.5":
version: 2.7.0
resolution: "@types/prettier@npm:2.7.0"
@@ -9913,6 +10051,7 @@ __metadata:
"@loadable/component": ^5.15.3
"@manaflair/redux-batch": ^1.0.0
"@mantine/hooks": ^5.10.1
+ "@octokit/rest": ^20.0.1
"@peculiar/webcrypto": ^1.4.3
"@redux-saga/testing-utils": ^1.1.5
"@sentry/react": ^6.2.4
@@ -9941,6 +10080,7 @@ __metadata:
"@types/node": ^10.12.18
"@types/node-forge": ^0.10.0
"@types/object-hash": ^2.2.1
+ "@types/pg": ^8.10.2
"@types/prismjs": ^1.16.1
"@types/react": ^17.0.2
"@types/react-beautiful-dnd": ^11.0.4
@@ -10003,7 +10143,7 @@ __metadata:
craco-babel-loader: ^1.0.4
cssnano: ^6.0.1
cy-verify-downloads: ^0.0.5
- cypress: ^12.17.4
+ cypress: 13.2.0
cypress-file-upload: ^4.1.1
cypress-image-snapshot: ^4.0.1
cypress-log-to-output: ^1.1.2
@@ -11081,6 +11221,13 @@ __metadata:
languageName: node
linkType: hard
+"before-after-hook@npm:^2.2.0":
+ version: 2.2.3
+ resolution: "before-after-hook@npm:2.2.3"
+ checksum: a1a2430976d9bdab4cd89cb50d27fa86b19e2b41812bf1315923b0cba03371ebca99449809226425dd3bcef20e010db61abdaff549278e111d6480034bebae87
+ languageName: node
+ linkType: hard
+
"better-opn@npm:^3.0.2":
version: 3.0.2
resolution: "better-opn@npm:3.0.2"
@@ -13583,13 +13730,13 @@ __metadata:
languageName: node
linkType: hard
-"cypress@npm:^12.17.4":
- version: 12.17.4
- resolution: "cypress@npm:12.17.4"
+"cypress@npm:13.2.0":
+ version: 13.2.0
+ resolution: "cypress@npm:13.2.0"
dependencies:
- "@cypress/request": 2.88.12
+ "@cypress/request": ^3.0.0
"@cypress/xvfb": ^1.2.4
- "@types/node": ^16.18.39
+ "@types/node": ^18.17.5
"@types/sinonjs__fake-timers": 8.1.1
"@types/sizzle": ^2.3.2
arch: ^2.2.0
@@ -13632,7 +13779,7 @@ __metadata:
yauzl: ^2.10.0
bin:
cypress: bin/cypress
- checksum: c9c79f5493b23e9c8cfb92d45d50ea9d0fae54210dde203bfa794a79436faf60108d826fe9007a7d67fddf7919802ad8f006b7ae56c5c198c75d5bc85bbc851b
+ checksum: 7647814f07626bd63e7b8dc4d066179fa40bf492c588bbc2626d983a2baab6cb77c29958dc92442f277e0a8e94866decc51c4de306021739c47e32baf5970219
languageName: node
linkType: hard
@@ -13945,6 +14092,13 @@ __metadata:
languageName: node
linkType: hard
+"deprecation@npm:^2.0.0":
+ version: 2.3.1
+ resolution: "deprecation@npm:2.3.1"
+ checksum: f56a05e182c2c195071385455956b0c4106fe14e36245b00c689ceef8e8ab639235176a96977ba7c74afb173317fac2e0ec6ec7a1c6d1e6eaa401c586c714132
+ languageName: node
+ linkType: hard
+
"deps-sort@npm:^2.0.0, deps-sort@npm:^2.0.1":
version: 2.0.1
resolution: "deps-sort@npm:2.0.1"
@@ -22271,7 +22425,7 @@ __metadata:
languageName: node
linkType: hard
-"obuf@npm:^1.0.0, obuf@npm:^1.1.2":
+"obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2":
version: 1.1.2
resolution: "obuf@npm:1.1.2"
checksum: 41a2ba310e7b6f6c3b905af82c275bf8854896e2e4c5752966d64cbcd2f599cfffd5932006bcf3b8b419dfdacebb3a3912d5d94e10f1d0acab59876c8757f27f
@@ -22910,6 +23064,13 @@ __metadata:
languageName: node
linkType: hard
+"pg-numeric@npm:1.0.2":
+ version: 1.0.2
+ resolution: "pg-numeric@npm:1.0.2"
+ checksum: 8899f8200caa1744439a8778a9eb3ceefb599d893e40a09eef84ee0d4c151319fd416634a6c0fc7b7db4ac268710042da5be700b80ef0de716fe089b8652c84f
+ languageName: node
+ linkType: hard
+
"pg-pool@npm:^3.6.1":
version: 3.6.1
resolution: "pg-pool@npm:3.6.1"
@@ -22919,7 +23080,7 @@ __metadata:
languageName: node
linkType: hard
-"pg-protocol@npm:^1.6.0":
+"pg-protocol@npm:*, pg-protocol@npm:^1.6.0":
version: 1.6.0
resolution: "pg-protocol@npm:1.6.0"
checksum: e12662d2de2011e0c3a03f6a09f435beb1025acdc860f181f18a600a5495dc38a69d753bbde1ace279c8c442536af9c1a7c11e1d0fe3fad3aa1348b28d9d2683
@@ -22939,6 +23100,21 @@ __metadata:
languageName: node
linkType: hard
+"pg-types@npm:^4.0.1":
+ version: 4.0.1
+ resolution: "pg-types@npm:4.0.1"
+ dependencies:
+ pg-int8: 1.0.1
+ pg-numeric: 1.0.2
+ postgres-array: ~3.0.1
+ postgres-bytea: ~3.0.0
+ postgres-date: ~2.0.1
+ postgres-interval: ^3.0.0
+ postgres-range: ^1.1.1
+ checksum: 05258ef2f27a75f1bf4e243f36bb749f85148339d3be818147bcc4aebe019ad7589a6869150713140250d81e5a46ec25dc6e0a031ea77e23db5ca232a0d7a3dc
+ languageName: node
+ linkType: hard
+
"pg@npm:^8.11.3":
version: 8.11.3
resolution: "pg@npm:8.11.3"
@@ -24440,6 +24616,13 @@ __metadata:
languageName: node
linkType: hard
+"postgres-array@npm:~3.0.1":
+ version: 3.0.2
+ resolution: "postgres-array@npm:3.0.2"
+ checksum: 5955f9dffeb6fa960c1a0b04fd4b2ba16813ddb636934ad26f902e4d76a91c0b743dcc6edc4cffc52deba7d547505e0020adea027c1d50a774f989cf955420d1
+ languageName: node
+ linkType: hard
+
"postgres-bytea@npm:~1.0.0":
version: 1.0.0
resolution: "postgres-bytea@npm:1.0.0"
@@ -24447,6 +24630,15 @@ __metadata:
languageName: node
linkType: hard
+"postgres-bytea@npm:~3.0.0":
+ version: 3.0.0
+ resolution: "postgres-bytea@npm:3.0.0"
+ dependencies:
+ obuf: ~1.1.2
+ checksum: 5f917a003fcaa0df7f285e1c37108ad474ce91193466b9bd4bcaecef2cdea98ca069c00aa6a8dbe6d2e7192336cadc3c9b36ae48d1555a299521918e00e2936b
+ languageName: node
+ linkType: hard
+
"postgres-date@npm:~1.0.4":
version: 1.0.7
resolution: "postgres-date@npm:1.0.7"
@@ -24454,6 +24646,13 @@ __metadata:
languageName: node
linkType: hard
+"postgres-date@npm:~2.0.1":
+ version: 2.0.1
+ resolution: "postgres-date@npm:2.0.1"
+ checksum: 0304bf8641a01412e4f5c3a374604e2e3dbc9dbee71d30df12fe60b32560c5674f887c2d15bafa2996f3b618b617398e7605f0e3669db43f31e614dfe69f8de7
+ languageName: node
+ linkType: hard
+
"postgres-interval@npm:^1.1.0":
version: 1.2.0
resolution: "postgres-interval@npm:1.2.0"
@@ -24463,6 +24662,20 @@ __metadata:
languageName: node
linkType: hard
+"postgres-interval@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "postgres-interval@npm:3.0.0"
+ checksum: c7a1cf006de97de663b6b8c4d2b167aa9909a238c4866a94b15d303762f5ac884ff4796cd6e2111b7f0a91302b83c570453aa8506fd005b5a5d5dfa87441bebc
+ languageName: node
+ linkType: hard
+
+"postgres-range@npm:^1.1.1":
+ version: 1.1.3
+ resolution: "postgres-range@npm:1.1.3"
+ checksum: bf7e194a18c490d02bda0bd02035a8da454d8fd2b22c55d3d03f185c038b2a6f52d0804417d8090864afefc2b7ed664b2d12c2454a4a0f545dcbbb86488fbdf1
+ languageName: node
+ linkType: hard
+
"postinstall-postinstall@npm:^2.1.0":
version: 2.1.0
resolution: "postinstall-postinstall@npm:2.1.0"
@@ -30031,6 +30244,13 @@ __metadata:
languageName: node
linkType: hard
+"universal-user-agent@npm:^6.0.0":
+ version: 6.0.0
+ resolution: "universal-user-agent@npm:6.0.0"
+ checksum: 5092bbc80dd0d583cef0b62c17df0043193b74f425112ea6c1f69bc5eda21eeec7a08d8c4f793a277eb2202ffe9b44bec852fa3faff971234cd209874d1b79ef
+ languageName: node
+ linkType: hard
+
"universalify@npm:^0.1.0":
version: 0.1.2
resolution: "universalify@npm:0.1.2"
|
c605677f903e2594df8727f7ceb15a816f21f2bf
|
2024-06-07 19:35:01
|
Shrikant Sharat Kandula
|
chore: Don't deserialize any request body to `Layout` (#34086)
| false
|
Don't deserialize any request body to `Layout` (#34086)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
index 2c88a5cc8e71..c99949d8d801 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
@@ -7,7 +7,6 @@
import com.appsmith.external.views.Views;
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.CompareDslActionDTO;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.AccessLevel;
import lombok.Getter;
@@ -50,7 +49,6 @@ public class Layout {
// this attribute will be used to display errors caused white calculating allOnLoadAction
// PageLoadActionsUtilCEImpl.java
- @JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonView({Views.Public.class, Views.Export.class})
List<ErrorDTO> layoutOnLoadActionErrors;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageCreationDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageCreationDTO.java
index cf567a80a25d..dc44f933e34a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageCreationDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageCreationDTO.java
@@ -1,22 +1,34 @@
package com.appsmith.server.dtos;
+import com.appsmith.external.dtos.DslExecutableDTO;
import com.appsmith.server.domains.Layout;
import com.appsmith.server.meta.validations.FileName;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
+import net.minidev.json.JSONObject;
import java.util.List;
+import java.util.Set;
public record PageCreationDTO(
@FileName(message = "Page names must be valid file names", isNullValid = false) @Size(max = 30) String name,
@NotEmpty @Size(min = 24, max = 50) String applicationId,
- @NotEmpty List<Layout> layouts) {
+ @NotEmpty List<LayoutDTO> layouts) {
+
+ public record LayoutDTO(JSONObject dsl, List<Set<DslExecutableDTO>> layoutOnLoadActions) {}
public PageDTO toPageDTO() {
final PageDTO page = new PageDTO();
page.setName(name.trim());
page.setApplicationId(applicationId);
- page.setLayouts(layouts);
+ page.setLayouts(layouts.stream()
+ .map(layoutDto -> {
+ final Layout l = new Layout();
+ l.setDsl(layoutDto.dsl);
+ l.setLayoutOnLoadActions(layoutDto.layoutOnLoadActions);
+ return l;
+ })
+ .toList());
return page;
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateMultiplePageLayoutDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateMultiplePageLayoutDTO.java
index ee21c95e0d5f..a401ac594569 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateMultiplePageLayoutDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UpdateMultiplePageLayoutDTO.java
@@ -1,10 +1,10 @@
package com.appsmith.server.dtos;
-import com.appsmith.server.domains.Layout;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.Setter;
+import net.minidev.json.JSONObject;
import java.util.List;
@@ -22,6 +22,8 @@ public static class UpdatePageLayoutDTO {
@NotNull private String layoutId;
- private Layout layout;
+ private LayoutDTO layout;
}
+
+ public record LayoutDTO(JSONObject dsl) {}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
index 53ced69c3eca..3518b3e9c98b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java
@@ -244,12 +244,10 @@ public Mono<Integer> updateMultipleLayouts(
List<Mono<LayoutDTO>> monoList = new ArrayList<>();
for (UpdateMultiplePageLayoutDTO.UpdatePageLayoutDTO pageLayout :
updateMultiplePageLayoutDTO.getPageLayouts()) {
+ final Layout layout = new Layout();
+ layout.setDsl(pageLayout.getLayout().dsl());
Mono<LayoutDTO> updatedLayoutMono = this.updateLayout(
- pageLayout.getPageId(),
- defaultApplicationId,
- pageLayout.getLayoutId(),
- pageLayout.getLayout(),
- branchName);
+ pageLayout.getPageId(), defaultApplicationId, pageLayout.getLayoutId(), layout, branchName);
monoList.add(updatedLayoutMono);
}
return Flux.merge(monoList).then(Mono.just(monoList.size()));
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index 9afcf75a561f..76ec9d3e7843 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -1023,13 +1023,13 @@ public void updateMultipleLayouts_MultipleLayouts_LayoutsUpdated() {
for (int i = 0; i < testPages.size(); i++) {
PageDTO page = testPages.get(i);
- Layout layout = page.getLayouts().get(0);
- layout.setDsl(createTestDslWithTestWidget("Layout" + (i + 1)));
+ final UpdateMultiplePageLayoutDTO.LayoutDTO layout =
+ new UpdateMultiplePageLayoutDTO.LayoutDTO(createTestDslWithTestWidget("Layout" + (i + 1)));
UpdateMultiplePageLayoutDTO.UpdatePageLayoutDTO pageLayoutDTO =
new UpdateMultiplePageLayoutDTO.UpdatePageLayoutDTO();
pageLayoutDTO.setPageId(page.getId());
- pageLayoutDTO.setLayoutId(layout.getId());
+ pageLayoutDTO.setLayoutId(page.getLayouts().get(0).getId());
pageLayoutDTO.setLayout(layout);
multiplePageLayoutDTO.getPageLayouts().add(pageLayoutDTO);
}
|
534bdd93b23de5aabe059ac4b628af84938f0fd6
|
2022-04-22 07:23:13
|
Vishnu Gp
|
fix: Add validation for Git URLs on server (#13182)
| false
|
Add validation for Git URLs on server (#13182)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index 64dc8ff40dcf..26f5877dedfa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -139,6 +139,7 @@ public enum AppsmithError {
GENERIC_JSON_IMPORT_ERROR(400, 4049, "Unable to import application in organization {0} with error {1}", AppsmithErrorAction.DEFAULT, null, ErrorType.BAD_REQUEST, null),
FILE_PART_DATA_BUFFER_ERROR(500, 5017, "Failed to upload file with error: {0}", AppsmithErrorAction.DEFAULT, null, ErrorType.BAD_REQUEST, null),
MIGRATION_ERROR(500, 5018, "This action is already migrated", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
+ INVALID_GIT_SSH_URL(400, 4050, "Please enter valid SSH URL of your repository", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, null),
;
private final Integer httpErrorCode;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
index 2b64c252da28..fc793db91325 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
@@ -712,6 +712,12 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
if (error instanceof TimeoutException) {
return Mono.error(new AppsmithException(AppsmithError.GIT_EXECUTION_TIMEOUT));
}
+ if (error instanceof ClassCastException) {
+ // To catch TransportHttp cast error in case HTTP URL is passed instead of SSH URL
+ if(error.getMessage().contains("TransportHttp")) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_URL));
+ }
+ }
return Mono.error(new AppsmithException(AppsmithError.GIT_GENERIC_ERROR, error.getMessage()));
});
});
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
index fc6b53f1761a..8c707c1e5f7f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
@@ -27,6 +27,14 @@ public void convertSshUrlToBrowserSupportedUrl() {
.isEqualTo("https://example.in/test/testRepo");
assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("ssh://[email protected]:user/test/tests/testRepo.git"))
.isEqualTo("https://example.test.net/user/test/tests/testRepo");
+ assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("[email protected]:v3/sladeping/pyhe/SpaceJunk.git"))
+ .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
+ assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("[email protected]:v3/sladeping/pyhe/SpaceJunk"))
+ .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
+ assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("ssh://[email protected]:v3/sladeping/pyhe/SpaceJunk.git"))
+ .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
+ assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("ssh://[email protected]:v3/sladeping/pyhe/SpaceJunk"))
+ .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
}
@Test
public void isRepoPrivate() {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
index f023b13e9a59..2d07d279da38 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
@@ -407,6 +407,34 @@ public void connectApplicationToGit_InvalidRemoteUrl_ThrowInvalidRemoteUrl() thr
.verify();
}
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void connectApplicationToGit_InvalidRemoteUrlHttp_ThrowInvalidRemoteUrl() throws ClassCastException {
+
+ Application testApplication = new Application();
+ GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
+ GitAuth gitAuth = new GitAuth();
+ gitAuth.setPublicKey("testkey");
+ gitAuth.setPrivateKey("privatekey");
+ gitApplicationMetadata.setGitAuth(gitAuth);
+ testApplication.setGitApplicationMetadata(gitApplicationMetadata);
+ testApplication.setName("InvalidRemoteUrlHttp");
+ testApplication.setOrganizationId(orgId);
+ Application application1 = applicationPageService.createApplication(testApplication).block();
+
+ GitConnectDTO gitConnectDTO = getConnectRequest("https://github.com/test/testRepo.git", testUserProfile);
+
+ Mockito.when(gitExecutor.cloneApplication(Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString()))
+ .thenReturn(Mono.error(new ClassCastException("TransportHttp")));
+
+ Mono<Application> applicationMono = gitService.connectApplicationToGit(application1.getId(), gitConnectDTO, "baseUrl");
+
+ StepVerifier
+ .create(applicationMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException && throwable.getMessage().equals(AppsmithError.INVALID_GIT_SSH_URL.getMessage()))
+ .verify();
+ }
+
@Test
@WithUserDetails(value = "api_user")
public void connectApplicationToGit_InvalidFilePath_ThrowIOException() throws IOException {
|
7cef53bb5eac7fc89796559150df6384b32fa67b
|
2023-01-27 12:18:01
|
Arjoban Singh
|
fix: resolve issue of double click to select all in checkbox group (#19994)
| false
|
resolve issue of double click to select all in checkbox group (#19994)
|
fix
|
diff --git a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
index b6765bc31987..4e1692bfaf6b 100644
--- a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
+++ b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
@@ -73,9 +73,6 @@ export const CheckboxGroupContainer = styled.div<CheckboxGroupContainerProps>`
${({ labelPosition }) =>
labelPosition === LabelPosition.Left && "min-height: 30px"};
}
- & .select-all {
- white-space: nowrap;
- }
`;
export interface SelectAllProps {
@@ -105,7 +102,7 @@ function SelectAll(props: SelectAllProps) {
accentColor={accentColor}
borderRadius={borderRadius}
checked={checked}
- className="select-all"
+ className="whitespace-nowrap"
disabled={disabled}
indeterminate={indeterminate}
inline={inline}
|
6075b96be267b52a0859990cb9a955aa646e43ef
|
2023-11-20 16:44:18
|
Dipyaman Biswas
|
chore: changes to accomodate logout being a GET call in EE (#28953)
| false
|
changes to accomodate logout being a GET call in EE (#28953)
|
chore
|
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 5a216d42ace1..677baecc94d3 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -326,8 +326,12 @@ export class HomePage {
//Maps to LogOut in command.js
public LogOutviaAPI() {
+ let httpMethod = "POST";
+ if (CURRENT_REPO === REPO.EE) {
+ httpMethod = "GET";
+ }
cy.request({
- method: "POST",
+ method: httpMethod,
url: "/api/v1/logout",
headers: {
"X-Requested-By": "Appsmith",
@@ -342,7 +346,10 @@ export class HomePage {
if (toNavigateToHome) this.NavigateToHome();
this.agHelper.GetNClick(this._profileMenu);
this.agHelper.GetNClick(this._signout);
- this.assertHelper.AssertNetworkStatus("@postLogout");
+ //Logout is still a POST request in CE
+ if (CURRENT_REPO === REPO.CE) {
+ this.assertHelper.AssertNetworkStatus("@postLogout");
+ }
return this.agHelper.Sleep(); //for logout to complete!
}
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index b11bc6777bbb..563b91a4f6d5 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -266,7 +266,10 @@ Cypress.Commands.add("GetUrlQueryParams", () => {
Cypress.Commands.add("LogOutUser", () => {
cy.wait(1000); //waiting for window to load
homePageTS.InvokeDispatchOnStore();
- assertHelper.AssertNetworkStatus("@postLogout", 200);
+ //Logout is still a POST request in CE
+ if (CURRENT_REPO === REPO.CE) {
+ assertHelper.AssertNetworkStatus("@postLogout", 200);
+ }
});
Cypress.Commands.add("LoginUser", (uname, pword, goToLoginPage = true) => {
@@ -399,12 +402,19 @@ Cypress.Commands.add("LogOut", (toCheckgetPluginForm = true) => {
// agHelper.AssertElementAbsence(
// locators._specificToast("Internal server error while processing request"),
// );
+
+ // Logout is a POST request in CE
+ const httpMethod = "POST";
+ if (CURRENT_REPO === REPO.EE) {
+ httpMethod = "GET";
+ }
+
if (CURRENT_REPO === REPO.CE)
toCheckgetPluginForm &&
assertHelper.AssertNetworkResponseData("@getPluginForm", false);
cy.request({
- method: "POST",
+ method: httpMethod,
url: "/api/v1/logout",
headers: {
"X-Requested-By": "Appsmith",
@@ -1023,7 +1033,12 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.intercept("GET", "/api/v1/applications/new").as("applications");
cy.intercept("GET", "/api/v1/users/profile").as("getUser");
cy.intercept("GET", "/api/v1/plugins?workspaceId=*").as("getPlugins");
- cy.intercept("POST", "/api/v1/logout").as("postLogout");
+
+ if (CURRENT_REPO === REPO.CE) {
+ cy.intercept("POST", "/api/v1/logout").as("postLogout");
+ } else if (CURRENT_REPO === REPO.EE) {
+ cy.intercept("GET", "/api/v1/logout").as("postLogout");
+ }
cy.intercept("GET", "/api/v1/datasources?workspaceId=*").as("getDataSources");
cy.intercept("GET", "/api/v1/pages?*mode=EDIT").as("getPagesForCreateApp");
cy.intercept("GET", "/api/v1/pages?*mode=PUBLISHED").as("getPagesForViewApp");
|
c5fa200ff33810a90173bd7555ceed62cf5e825c
|
2023-06-20 20:07:30
|
Rajat Agrawal
|
chore: Use cypress interceptors instead of wait to fix file csv flaky test (#24364)
| false
|
Use cypress interceptors instead of wait to fix file csv flaky test (#24364)
|
chore
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
index 8fddf9b27098..d164c917b7e6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Filepicker/FilePickerV2_CSV_spec.js
@@ -1,16 +1,19 @@
const commonlocators = require("../../../../../locators/commonlocators.json");
-import * as _ from "../../../../../support/Objects/ObjectsCore";
+import {
+ agHelper,
+ assertHelper,
+ locators,
+ propPane,
+ table,
+} from "../../../../../support/Objects/ObjectsCore";
const widgetName = "filepickerwidgetv2";
const ARRAY_CSV_HELPER_TEXT = `All non CSV, XLS(X), JSON or TSV filetypes will have an empty value`;
-const ObjectsRegistry =
- require("../../../../../support/Objects/Registry").ObjectsRegistry;
-let propPane = ObjectsRegistry.PropertyPane;
describe("File picker widget v2", () => {
before(() => {
cy.fixture("filePickerTableDSL").then((val) => {
- _.agHelper.AddDsl(val);
+ agHelper.AddDsl(val);
});
});
@@ -23,15 +26,22 @@ describe("File picker widget v2", () => {
commonlocators.filePickerDataFormat,
"Array of Objects (CSV, XLS(X), JSON, TSV)",
);
- cy.get(commonlocators.filePickerDataFormat)
- .last()
- .should("have.text", "Array of Objects (CSV, XLS(X), JSON, TSV)");
+
+ agHelper.AssertText(
+ commonlocators.filePickerDataFormat,
+ "text",
+ "Array of Objects (CSV, XLS(X), JSON, TSV)",
+ );
+
cy.get(
`.t--property-control-dataformat ${commonlocators.helperText}`,
).should("exist");
cy.get(
`.t--property-control-dataformat ${commonlocators.helperText}`,
).contains(ARRAY_CSV_HELPER_TEXT);
+
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
cy.get(commonlocators.filePickerInput)
.first()
.selectFile("cypress/fixtures/Test_csv.csv", {
@@ -39,7 +49,10 @@ describe("File picker widget v2", () => {
});
// wait for file to get uploaded
- cy.wait(3000);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
+ // The table takes a bit of time to load the values in the cells
+ table.WaitUntilTableLoad(0, 0, "v2");
cy.readTableV2dataPublish("1", "1").then((tabData) => {
const tabValue = tabData;
@@ -50,9 +63,12 @@ describe("File picker widget v2", () => {
expect(tabValue).to.be.equal("1000");
});
cy.get(
- `.t--widget-tablewidgetv2 .tbody .td[data-rowindex=${1}][data-colindex=${3}] input`,
+ `${locators._widgetInDeployed(
+ "tablewidgetv2",
+ )} .tbody .td[data-rowindex=${1}][data-colindex=${3}] input`,
).should("not.be.checked");
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Test for XLSX file
cy.get(commonlocators.filePickerInput)
@@ -60,7 +76,10 @@ describe("File picker widget v2", () => {
.selectFile("cypress/fixtures/TestSpreadsheet.xlsx", { force: true });
// wait for file to get uploaded
- cy.wait(3000);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
+ // The table takes a bit of time to load the values in the cells
+ table.WaitUntilTableLoad(0, 0, "v2");
cy.readTableV2dataPublish("0", "0").then((tabData) => {
expect(tabData).to.be.equal("Sheet1");
@@ -68,23 +87,20 @@ describe("File picker widget v2", () => {
cy.readTableV2dataPublish("0", "1").then((tabData) => {
expect(tabData).contains("Column A");
});
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Test for XLS file
cy.get(commonlocators.filePickerInput)
.first()
.selectFile("cypress/fixtures/SampleXLS.xls", { force: true });
- // wait for file to get uploaded
- cy.wait(3000);
-
cy.readTableV2dataPublish("0", "0").then((tabData) => {
expect(tabData).to.be.equal("Sheet1");
});
cy.readTableV2dataPublish("0", "1").then((tabData) => {
expect(tabData).contains("Dulce");
});
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Test for JSON File
cy.get(commonlocators.filePickerInput)
@@ -92,12 +108,15 @@ describe("File picker widget v2", () => {
.selectFile("cypress/fixtures/largeJSONData.json", { force: true });
// wait for file to get uploaded
- cy.wait(3000);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
+ // The table takes a bit of time to load the values in the cells
+ table.WaitUntilTableLoad(0, 0, "v2");
cy.readTableV2dataPublish("0", "2").then((tabData) => {
expect(tabData).to.contain("sunt aut facere");
});
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Test for TSV File
cy.get(commonlocators.filePickerInput)
@@ -105,12 +124,15 @@ describe("File picker widget v2", () => {
.selectFile("cypress/fixtures/Sample.tsv", { force: true });
// wait for file to get uploaded
- cy.wait(3000);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
+ // The table takes a bit of time to load the values in the cells
+ table.WaitUntilTableLoad(0, 0, "v2");
cy.readTableV2dataPublish("0", "0").then((tabData) => {
expect(tabData).to.be.equal("CONST");
});
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Drag and drop a text widget for binding file data
cy.dragAndDropToCanvas("textwidget", { x: 100, y: 100 });
@@ -123,27 +145,38 @@ describe("File picker widget v2", () => {
cy.get(commonlocators.filePickerInput)
.first()
.selectFile("cypress/fixtures/testdata.json", { force: true });
- cy.get(".t--widget-textwidget").should(
- "contain",
+ agHelper.GetNAssertContains(
+ locators._widgetInDeployed("textwidget"),
"data:application/json;base64",
);
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
// Test for Text file
cy.selectDropdownValue(commonlocators.filePickerDataFormat, "Text");
cy.get(commonlocators.filePickerInput)
.first()
.selectFile("cypress/fixtures/testdata.json", { force: true });
- cy.get(".t--widget-textwidget").should("contain", "baseUrl");
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
- cy.wait(3000);
- cy.get(".t--widget-textwidget").should("have.text", "");
+ agHelper.GetNAssertContains(
+ locators._widgetInDeployed("textwidget"),
+ "baseUrl",
+ );
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
+
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+
+ // The text widget takes a bit of time to load the values
+ cy.wait(2000);
+
+ agHelper.AssertText(locators._widgetInDeployed("textwidget"), "text", "");
cy.selectDropdownValue(commonlocators.filePickerDataFormat, "Binary");
cy.get(commonlocators.filePickerInput)
.first()
.selectFile("cypress/fixtures/testdata.json", { force: true });
- cy.get(".t--widget-textwidget").should("contain", "baseUrl");
- cy.get(".uppy-Dashboard-Item-action--remove").click({ force: true });
+ agHelper.GetNAssertContains(
+ locators._widgetInDeployed("textwidget"),
+ "baseUrl",
+ );
+ agHelper.GetNClick(commonlocators.filePickerRemoveButton, 0, true);
});
});
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index e89897c23c3f..f857892abfba 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -125,6 +125,7 @@
"filePickerButton": ".t--widget-filepickerwidget",
"filePickerInput": ".uppy-Dashboard-input",
"filePickerUploadButton": ".uppy-StatusBar-actionBtn--upload",
+ "filePickerRemoveButton": ".uppy-Dashboard-Item-action--remove",
"AddMoreFiles": ".uppy-DashboardContent-addMoreCaption",
"filePickerOnFilesSelected": ".t--property-control-onfilesselected",
"dataType": ".t--property-control-datatype input",
|
0da8c84ae1690e1196616055ff8fd1767d76d630
|
2020-11-20 12:45:48
|
devrk96
|
fix: App card boundaries UI (#1798)
| false
|
App card boundaries UI (#1798)
|
fix
|
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 20408a2d046d..7f4380b468ce 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -115,7 +115,7 @@ const Wrapper = styled(
height: ${props => props.theme.card.minHeight}px;
position: relative;
background-color: ${props => props.backgroundColor};
- margin: ${props => props.theme.spaces[4]}px;
+ margin: ${props => props.theme.spaces[5]}px;
.overlay {
display: block;
position: absolute;
diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx
index 9fd8f572258b..8d874ef55e61 100644
--- a/app/client/src/pages/Applications/index.tsx
+++ b/app/client/src/pages/Applications/index.tsx
@@ -304,7 +304,7 @@ const ApplicationAddCardWrapper = styled(Card)`
box-shadow: none;
border-radius: 0;
padding: 0;
- margin: ${props => props.theme.spaces[4]}px;
+ margin: ${props => props.theme.spaces[5]}px;
a {
display: block;
position: absolute;
|
7f31c9e269899cb946967fbad6053be9a06344b7
|
2024-10-09 15:33:46
|
Hetu Nandu
|
fix: Focus retention on inputs (#36770)
| false
|
Focus retention on inputs (#36770)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
similarity index 63%
rename from app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
index a6d5681ba0cb..85b373a4cdd4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Focus_retentions_inputs_spec.js
@@ -1,22 +1,23 @@
import reconnectDatasourceModal from "../../../../locators/ReconnectLocators";
import {
agHelper,
- apiPage,
dataSources,
homePage,
locators,
} from "../../../../support/Objects/ObjectsCore";
import EditorNavigation, {
+ PageLeftPane,
EntityType,
+ PagePaneSegment,
} from "../../../../support/Pages/EditorNavigation";
const apiwidget = require("../../../../locators/apiWidgetslocator.json");
const queryLocators = require("../../../../locators/QueryEditor.json");
-describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
+describe("Focus Retention of Inputs", { tags: ["@tag.IDE"] }, function () {
before("Import the test application", () => {
- homePage.CreateNewWorkspace("MaintainContext&Focus", true);
- homePage.ImportApp("ContextSwitching.json", "MaintainContext");
+ homePage.NavigateToHome();
+ homePage.ImportApp("ContextSwitching.json");
cy.wait("@importNewApplication").then((interception) => {
agHelper.Sleep();
const { isPartialImport } = interception.response.body.data;
@@ -46,26 +47,26 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
cy.focusCodeInput(".t--graphql-query-editor", { ch: 4, line: 1 });
- EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
+ PageLeftPane.selectItem("Rest_Api_1");
cy.wait(1000);
cy.xpath("//span[contains(text(), 'Params')]").click();
cy.focusCodeInput(apiwidget.queryKey);
cy.wait("@saveAction");
- EditorNavigation.SelectEntityByName("Rest_Api_2", EntityType.Api);
+ PageLeftPane.selectItem("Rest_Api_2");
cy.wait(1000);
- cy.xpath("//span[contains(text(), 'Headers')]").click();
+ agHelper.GetNClick("//span[contains(text(), 'Headers')]", 0);
cy.updateCodeInput(apiwidget.headerValue, "test");
cy.wait("@saveAction");
- EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
+ PageLeftPane.selectItem("SQL_Query");
cy.wait(1000);
cy.focusCodeInput(".t--actionConfiguration\\.body", { ch: 5, line: 0 });
cy.wait("@saveAction");
- EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
+ PageLeftPane.selectItem("S3_Query");
cy.wait(1000);
cy.focusCodeInput(".t--actionConfiguration\\.formData\\.bucket\\.data", {
@@ -75,25 +76,18 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
cy.wait(1000);
cy.wait("@saveAction");
- EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+ PageLeftPane.switchSegment(PagePaneSegment.JS);
+
+ PageLeftPane.selectItem("JSObject1");
cy.wait(1000);
cy.focusCodeInput(".js-editor", { ch: 4, line: 4 });
cy.wait("@saveAction");
- EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
+ PageLeftPane.selectItem("JSObject2");
cy.wait(1000);
cy.focusCodeInput(".js-editor", { ch: 2, line: 2 });
-
- EditorNavigation.SelectEntityByName("Mongo_Query", EntityType.Query);
-
- cy.wait(1000);
- dataSources.EnterJSContext({
- fieldLabel: "Collection",
- fieldValue: "TestCollection",
- });
- cy.wait("@saveAction");
});
it("2. Maintains focus on property/Api/Query/Js Pane", () => {
@@ -106,8 +100,14 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
line: 0,
});
+ PageLeftPane.switchSegment(PagePaneSegment.Queries);
+
//Maintains focus on the API pane
- EditorNavigation.SelectEntityByName("Graphql_Query", EntityType.Api);
+ PageLeftPane.selectItem("Graphql_Query");
+
+ agHelper
+ .GetElement(locators._queryName)
+ .should("have.text", "Graphql_Query");
cy.xpath("//span[contains(text(), 'Body')]/parent::button").should(
"have.attr",
@@ -116,10 +116,20 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
);
cy.assertCursorOnCodeInput(".t--graphql-query-editor", { ch: 4, line: 1 });
- EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
- // cy.assertCursorOnCodeInput(apiwidget.headerValue);
+ PageLeftPane.selectItem("Rest_Api_1");
+
+ agHelper.GetElement(locators._queryName).should("have.text", "Rest_Api_1");
- EditorNavigation.SelectEntityByName("Rest_Api_2", EntityType.Api);
+ cy.xpath("//span[contains(text(), 'Params')]/parent::button").should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+ cy.assertCursorOnCodeInput(apiwidget.queryKey, { ch: 0, line: 0 });
+
+ PageLeftPane.selectItem("Rest_Api_2");
+
+ agHelper.GetElement(locators._queryName).should("have.text", "Rest_Api_2");
cy.xpath("//span[contains(text(), 'Headers')]/parent::button").should(
"have.attr",
@@ -129,61 +139,35 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
cy.assertCursorOnCodeInput(apiwidget.headerValue);
//Maintains focus on Query panes
- EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
+ PageLeftPane.selectItem("SQL_Query");
+
+ agHelper.GetElement(locators._queryName).should("have.text", "SQL_Query");
cy.assertCursorOnCodeInput(".t--actionConfiguration\\.body", {
ch: 5,
line: 0,
});
- EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
+ PageLeftPane.selectItem("S3_Query");
cy.assertCursorOnCodeInput(
".t--actionConfiguration\\.formData\\.bucket\\.data",
{ ch: 2, line: 0 },
);
- // Removing as the Mongo collection is now converted to dropdown
- // entityExplorer.SelectEntityByName("Mongo_Query");
-
- // cy.assertCursorOnCodeInput(
- // ".t--actionConfiguration\\.formData\\.collection\\.data",
- // );
+ PageLeftPane.switchSegment(PagePaneSegment.JS);
//Maintains focus on JS Objects
- EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
+ PageLeftPane.selectItem("JSObject1");
cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 4 });
- EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
+ PageLeftPane.selectItem("JSObject2");
cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 2 });
});
- it("3. Check if selected tab on right tab persists", () => {
- EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
- apiPage.SelectRightPaneTab("Connections");
- EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
- EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
- apiPage.AssertRightPaneSelectedTab("Connections");
-
- //Check if the URL is persisted while switching pages
- cy.Createpage("Page2");
-
- EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
- EditorNavigation.SelectEntityByName("Rest_Api_1", EntityType.Api);
-
- EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
- cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
-
- EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
- cy.get(".t--nameOfApi .bp3-editable-text-content").should(
- "contain",
- "Rest_Api_1",
- );
- });
-
- it("4. Datasource edit mode has to be maintained", () => {
+ it("3. Datasource edit mode has to be maintained", () => {
EditorNavigation.SelectEntityByName("Appsmith", EntityType.Datasource);
dataSources.EditDatasource();
EditorNavigation.SelectEntityByName("Github", EntityType.Datasource);
@@ -192,7 +176,7 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
dataSources.AssertDSEditViewMode("Edit");
});
- it("5. Maintain focus of form control inputs", () => {
+ it("4. Maintain focus of form control inputs", () => {
EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
dataSources.ToggleUsePreparedStatement(false);
EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
@@ -202,14 +186,15 @@ describe("MaintainContext&Focus", { tags: ["@tag.IDE"] }, function () {
EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
cy.get(".bp3-editable-text-content").should("contain.text", "SQL_Query");
- cy.get(".t--form-control-SWITCH input").should("be.focused");
+ cy.xpath(queryLocators.querySettingsTab).click();
+ agHelper.GetElement(dataSources._usePreparedStatement).should("be.focused");
EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
agHelper.Sleep();
cy.xpath(queryLocators.querySettingsTab).click();
cy.xpath(queryLocators.queryTimeout).should("be.focused");
});
- it("6. Bug 21999 Maintain focus of code editor when Escape is pressed with autcomplete open + Bug 22960", () => {
+ it("5. Bug 21999 Maintain focus of code editor when Escape is pressed with autcomplete open + Bug 22960", () => {
EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
cy.assertCursorOnCodeInput(".js-editor", { ch: 2, line: 4 });
|
dc1196df64f3bee440b6dbcd3ed11cad472fc9fb
|
2023-07-26 16:53:09
|
Ayush Pahwa
|
fix: oauth empty config check (#25704)
| false
|
oauth empty config check (#25704)
|
fix
|
diff --git a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx
index 8f421c5e78bb..a875e4fea0af 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx
@@ -136,19 +136,17 @@ const mapStateToProps = (state: AppState, ownProps: any): ReduxStateProps => {
(d) => d.id === datasourceFromAction.id,
);
if (datasourceFromDataSourceList) {
- datasourceMerged = merge(
- {},
- datasourceFromAction,
- // datasourceFromDataSourceList,
- datasourceFromDataSourceList.datasourceStorages[currentEnvironment],
- );
+ const { datasourceStorages } = datasourceFromDataSourceList;
+ let dsObjectToMerge = {};
+ // in case the datasource is not configured for the current environment, we just merge with empty object
+ if (datasourceStorages.hasOwnProperty(currentEnvironment)) {
+ dsObjectToMerge = datasourceStorages[currentEnvironment];
+ }
+ datasourceMerged = merge({}, datasourceFromAction, dsObjectToMerge);
// update the id in object to datasourceId, this is because the value in id post merge is the id of the datasource storage
// and not of the datasource.
- datasourceMerged.id =
- datasourceFromDataSourceList.datasourceStorages[
- currentEnvironment
- ].datasourceId;
+ datasourceMerged.id = datasourceFromDataSourceList.id;
// Adding user permissions for datasource from datasourceFromDataSourceList
datasourceMerged.userPermissions =
|
b9aff18c624c6c04ca5cd920f8a819a19e09ea51
|
2022-10-11 15:24:04
|
Nidhi
|
chore: Refactoring refactor flows (#17442)
| false
|
Refactoring refactor flows (#17442)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionController.java
index ab5856a5810c..38d5a7427330 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionController.java
@@ -2,9 +2,9 @@
import com.appsmith.server.constants.Url;
import com.appsmith.server.controllers.ce.ActionControllerCE;
-import com.appsmith.server.services.ActionCollectionService;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,11 +14,11 @@
@Slf4j
public class ActionController extends ActionControllerCE {
- public ActionController(ActionCollectionService actionCollectionService,
- LayoutActionService layoutActionService,
- NewActionService newActionService) {
+ public ActionController(LayoutActionService layoutActionService,
+ NewActionService newActionService,
+ RefactoringSolution refactoringSolution) {
- super(layoutActionService, newActionService);
+ super(layoutActionService, newActionService, refactoringSolution);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/LayoutController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/LayoutController.java
index 5a18bf9363a6..d8de7e3fec15 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/LayoutController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/LayoutController.java
@@ -4,6 +4,7 @@
import com.appsmith.server.controllers.ce.LayoutControllerCE;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.LayoutService;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,9 +15,10 @@
public class LayoutController extends LayoutControllerCE {
public LayoutController(LayoutService layoutService,
- LayoutActionService layoutActionService) {
+ LayoutActionService layoutActionService,
+ RefactoringSolution refactoringSolution) {
- super(layoutService, layoutActionService);
+ super(layoutService, layoutActionService, refactoringSolution);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java
index 03f95bf34c0a..1725b6188043 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java
@@ -11,6 +11,7 @@
import com.appsmith.server.dtos.ResponseDTO;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -40,12 +41,15 @@ public class ActionControllerCE {
private final LayoutActionService layoutActionService;
private final NewActionService newActionService;
+ private final RefactoringSolution refactoringSolution;
@Autowired
public ActionControllerCE(LayoutActionService layoutActionService,
- NewActionService newActionService) {
+ NewActionService newActionService,
+ RefactoringSolution refactoringSolution) {
this.layoutActionService = layoutActionService;
this.newActionService = newActionService;
+ this.refactoringSolution = refactoringSolution;
}
@PostMapping
@@ -86,7 +90,7 @@ public Mono<ResponseDTO<ActionDTO>> moveAction(@RequestBody @Valid ActionMoveDTO
@PutMapping("/refactor")
public Mono<ResponseDTO<LayoutDTO>> refactorActionName(@RequestBody RefactorActionNameDTO refactorActionNameDTO,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
- return layoutActionService.refactorActionName(refactorActionNameDTO, branchName)
+ return refactoringSolution.refactorActionName(refactorActionNameDTO, branchName)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java
index d89722039516..fbc319cc3bee 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java
@@ -8,6 +8,7 @@
import com.appsmith.server.dtos.ResponseDTO;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.LayoutService;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -31,11 +32,15 @@ public class LayoutControllerCE {
private final LayoutService service;
private final LayoutActionService layoutActionService;
+ private final RefactoringSolution refactoringSolution;
+
@Autowired
public LayoutControllerCE(LayoutService layoutService,
- LayoutActionService layoutActionService) {
+ LayoutActionService layoutActionService,
+ RefactoringSolution refactoringSolution) {
this.service = layoutService;
this.layoutActionService = layoutActionService;
+ this.refactoringSolution = refactoringSolution;
}
@PostMapping("/pages/{defaultPageId}")
@@ -76,7 +81,7 @@ public Mono<ResponseDTO<Layout>> getLayoutView(@PathVariable String pageId,
@PutMapping("/refactor")
public Mono<ResponseDTO<LayoutDTO>> refactorWidgetName(@RequestBody RefactorNameDTO refactorNameDTO,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
- return layoutActionService.refactorWidgetName(refactorNameDTO, branchName)
+ return refactoringSolution.refactorWidgetName(refactorNameDTO, branchName)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
index 95be91e7cd14..f2876f3e274a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutCollectionServiceImpl.java
@@ -2,6 +2,7 @@
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.services.ce.LayoutCollectionServiceCEImpl;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -11,12 +12,13 @@ public class LayoutCollectionServiceImpl extends LayoutCollectionServiceCEImpl i
public LayoutCollectionServiceImpl(NewPageService newPageService,
LayoutActionService layoutActionService,
+ RefactoringSolution refactoringSolution,
ActionCollectionService actionCollectionService,
NewActionService newActionService,
AnalyticsService analyticsService,
ResponseUtils responseUtils) {
- super(newPageService, layoutActionService, actionCollectionService, newActionService, analyticsService,
+ super(newPageService, layoutActionService, refactoringSolution, actionCollectionService, newActionService, analyticsService,
responseUtils);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java
index 9b7ebda730dd..175cd03937f3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCE.java
@@ -5,8 +5,6 @@
import com.appsmith.external.models.ActionDTO;
import com.appsmith.server.dtos.ActionMoveDTO;
import com.appsmith.server.dtos.LayoutDTO;
-import com.appsmith.server.dtos.RefactorActionNameDTO;
-import com.appsmith.server.dtos.RefactorNameDTO;
import net.minidev.json.JSONObject;
import reactor.core.publisher.Mono;
@@ -20,16 +18,6 @@ public interface LayoutActionServiceCE {
Mono<ActionDTO> moveAction(ActionMoveDTO actionMoveDTO, String branchName);
- Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO);
-
- Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO, String branchName);
-
- Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO);
-
- Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO, String branchName);
-
- Mono<LayoutDTO> refactorName(String pageId, String layoutId, String oldName, String newName);
-
Mono<Boolean> isNameAllowed(String pageId, String layoutId, String newName);
Mono<ActionDTO> updateAction(String id, ActionDTO action);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
index 5e9805df39d3..d11ff8b18078 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
@@ -6,7 +6,6 @@
import com.appsmith.external.helpers.AppsmithEventContext;
import com.appsmith.external.helpers.AppsmithEventContextType;
import com.appsmith.external.helpers.MustacheHelper;
-import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.DefaultResources;
@@ -22,8 +21,6 @@
import com.appsmith.server.dtos.LayoutActionUpdateDTO;
import com.appsmith.server.dtos.LayoutDTO;
import com.appsmith.server.dtos.PageDTO;
-import com.appsmith.server.dtos.RefactorActionNameDTO;
-import com.appsmith.server.dtos.RefactorNameDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.DefaultResourcesUtils;
@@ -39,11 +36,7 @@
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.solutions.PageLoadActionsUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.minidev.json.JSONObject;
@@ -65,7 +58,6 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
@@ -93,13 +85,6 @@ public class LayoutActionServiceCEImpl implements LayoutActionServiceCE {
private final DatasourceService datasourceService;
- /*
- * To replace fetchUsers in `{{JSON.stringify(fetchUsers)}}` with getUsers, the following regex is required :
- * `\\b(fetchUsers)\\b`. To achieve this the following strings preWord and postWord are declared here to be used
- * at run time to create the regex pattern.
- */
- private final String preWord = "\\b(";
- private final String postWord = ")\\b";
private final String layoutOnLoadActionErrorToastMessage = "A cyclic dependency error has been encountered on current page, \nqueries on page load will not run. \n Please check debugger and Appsmith documentation for more information";
@@ -255,264 +240,6 @@ public Mono<ActionDTO> moveAction(ActionMoveDTO actionMoveDTO, String branchName
.map(responseUtils::updateActionDTOWithDefaultResources);
}
- @Override
- public Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO) {
- String pageId = refactorNameDTO.getPageId();
- String layoutId = refactorNameDTO.getLayoutId();
- String oldName = refactorNameDTO.getOldName();
- String newName = refactorNameDTO.getNewName();
- return isNameAllowed(pageId, layoutId, newName)
- .flatMap(allowed -> {
- if (!allowed) {
- return Mono.error(new AppsmithException(AppsmithError.NAME_CLASH_NOT_ALLOWED_IN_REFACTOR, oldName, newName));
- }
- return refactorName(pageId, layoutId, oldName, newName);
- });
- }
-
- @Override
- public Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO, String branchName) {
- if (StringUtils.isEmpty(branchName)) {
- return refactorWidgetName(refactorNameDTO);
- }
-
- return newPageService.findByBranchNameAndDefaultPageId(branchName, refactorNameDTO.getPageId(), MANAGE_PAGES)
- .flatMap(branchedPage -> {
- refactorNameDTO.setPageId(branchedPage.getId());
- return refactorWidgetName(refactorNameDTO);
- })
- .map(responseUtils::updateLayoutDTOWithDefaultResources);
- }
-
- @Override
- public Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO) {
- String pageId = refactorActionNameDTO.getPageId();
- String layoutId = refactorActionNameDTO.getLayoutId();
- String oldName = refactorActionNameDTO.getOldName();
- final String oldFullyQualifiedName = StringUtils.isEmpty(refactorActionNameDTO.getCollectionName()) ?
- oldName :
- refactorActionNameDTO.getCollectionName() + "." + oldName;
- String newName = refactorActionNameDTO.getNewName();
- final String newFullyQualifiedName = StringUtils.isEmpty(refactorActionNameDTO.getCollectionName()) ?
- newName :
- refactorActionNameDTO.getCollectionName() + "." + newName;
- String actionId = refactorActionNameDTO.getActionId();
- return Mono.just(newActionService.validateActionName(newName))
- .flatMap(isValidName -> {
- if (!isValidName) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_ACTION_NAME));
- }
- return isNameAllowed(pageId, layoutId, newFullyQualifiedName);
- })
- .flatMap(allowed -> {
- if (!allowed) {
- return Mono.error(new AppsmithException(AppsmithError.NAME_CLASH_NOT_ALLOWED_IN_REFACTOR, oldName, newName));
- }
- return newActionService
- .findActionDTObyIdAndViewMode(actionId, false, MANAGE_ACTIONS);
- })
- .flatMap(action -> {
- action.setName(newName);
- if (!StringUtils.isEmpty(refactorActionNameDTO.getCollectionName())) {
- action.setFullyQualifiedName(newFullyQualifiedName);
- }
- return newActionService.updateUnpublishedAction(actionId, action);
- })
- .then(refactorName(pageId, layoutId, oldFullyQualifiedName, newFullyQualifiedName));
- }
-
- @Override
- public Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO, String branchName) {
-
- String defaultActionId = refactorActionNameDTO.getActionId();
- return newActionService.findByBranchNameAndDefaultActionId(branchName, defaultActionId, MANAGE_ACTIONS)
- .flatMap(branchedAction -> {
- refactorActionNameDTO.setActionId(branchedAction.getId());
- refactorActionNameDTO.setPageId(branchedAction.getUnpublishedAction().getPageId());
- return refactorActionName(refactorActionNameDTO);
- })
- .map(responseUtils::updateLayoutDTOWithDefaultResources);
- }
-
- /**
- * Assumption here is that the refactoring name provided is indeed unique and is fit to be replaced everywhere.
- * <p>
- * At this point, the user must have MANAGE_PAGES and MANAGE_ACTIONS permissions for page and action respectively
- *
- * @param pageId
- * @param layoutId
- * @param oldName
- * @param newName
- * @return
- */
- @Override
- public Mono<LayoutDTO> refactorName(String pageId, String layoutId, String oldName, String newName) {
- String regexPattern = preWord + oldName + postWord;
- Pattern oldNamePattern = Pattern.compile(regexPattern);
-
- Mono<PageDTO> updatePageMono = newPageService
- // fetch the unpublished page
- .findPageById(pageId, MANAGE_PAGES, false)
- .flatMap(page -> {
- List<Layout> layouts = page.getLayouts();
- for (Layout layout : layouts) {
- if (layoutId.equals(layout.getId()) && layout.getDsl() != null) {
- final JsonNode dslNode = objectMapper.convertValue(layout.getDsl(), JsonNode.class);
- final JsonNode dslNodeAfterReplacement = this.replaceStringInJsonNode(dslNode, oldNamePattern, newName);
- layout.setDsl(objectMapper.convertValue(dslNodeAfterReplacement, JSONObject.class));
-
- // DSL has removed all the old names and replaced it with new name. If the change of name
- // was one of the mongoEscaped widgets, then update the names in the set as well
- Set<String> mongoEscapedWidgetNames = layout.getMongoEscapedWidgetNames();
- if (mongoEscapedWidgetNames != null && mongoEscapedWidgetNames.contains(oldName)) {
- mongoEscapedWidgetNames.remove(oldName);
- mongoEscapedWidgetNames.add(newName);
- }
- page.setLayouts(layouts);
- // Since the page has most probably changed, save the page and return.
- return newPageService.saveUnpublishedPage(page);
- }
- }
- // If we have reached here, the layout was not found and the page should be returned as is.
- return Mono.just(page);
- });
-
- Set<String> updatableCollectionIds = new HashSet<>();
-
- Mono<Set<String>> updateActionsMono = newActionService
- .findByPageIdAndViewMode(pageId, false, MANAGE_ACTIONS)
- /*
- * Assuming that the datasource should not be dependent on the widget and hence not going through the same
- * to look for replacement pattern.
- */
- .flatMap(newAction1 -> {
- final NewAction newAction = newAction1;
- // We need actionDTO to be populated with pluginType from NewAction
- // so that we can check for the JS path
- Mono<ActionDTO> actionMono = newActionService.generateActionByViewMode(newAction, false);
- return actionMono.flatMap(action -> {
- newAction.setUnpublishedAction(action);
- boolean actionUpdateRequired = false;
- ActionConfiguration actionConfiguration = action.getActionConfiguration();
- Set<String> jsonPathKeys = action.getJsonPathKeys();
-
- if (jsonPathKeys != null && !jsonPathKeys.isEmpty()) {
- // Since json path keys actually contain the entire inline js function instead of just the widget/action
- // name, we can not simply use the set.contains(obj) function. We need to iterate over all the keys
- // in the set and see if the old name is a substring of the json path key.
- for (String key : jsonPathKeys) {
- if (oldNamePattern.matcher(key).find()) {
- actionUpdateRequired = true;
- break;
- }
- }
- }
-
- if (!actionUpdateRequired || actionConfiguration == null) {
- return Mono.just(newAction);
- }
- // if actionUpdateRequired is true AND actionConfiguration is not null
- if (action.getCollectionId() != null) {
- updatableCollectionIds.add(action.getCollectionId());
- }
- final JsonNode actionConfigurationNode = objectMapper.convertValue(actionConfiguration, JsonNode.class);
- final JsonNode actionConfigurationNodeAfterReplacement = replaceStringInJsonNode(actionConfigurationNode, oldNamePattern, newName);
-
- ActionConfiguration newActionConfiguration = objectMapper.convertValue(actionConfigurationNodeAfterReplacement, ActionConfiguration.class);
- action.setActionConfiguration(newActionConfiguration);
- NewAction newAction2 = newActionService.extractAndSetJsonPathKeys(newAction);
- return newActionService.save(newAction2);
- });
-
- })
- .map(savedAction -> savedAction.getUnpublishedAction().getName())
- .collect(toSet())
- .flatMap(updatedActions -> {
- // If these actions belonged to collections, update the collection body
- return Flux.fromIterable(updatableCollectionIds)
- .flatMap(collectionId -> actionCollectionService.findById(collectionId, MANAGE_ACTIONS))
- .flatMap(actionCollection -> {
- final ActionCollectionDTO unpublishedCollection = actionCollection.getUnpublishedCollection();
- Matcher matcher = oldNamePattern.matcher(unpublishedCollection.getBody());
- String newBodyAsString = matcher.replaceAll(newName);
- unpublishedCollection.setBody(newBodyAsString);
- return actionCollectionService.save(actionCollection);
- })
- .collectList()
- .thenReturn(updatedActions);
- });
-
- return Mono.zip(updateActionsMono, updatePageMono)
- .flatMap(tuple -> {
- Set<String> updatedActionNames = tuple.getT1();
- PageDTO page = tuple.getT2();
- log.debug("Actions updated due to refactor name in page {} are : {}", pageId, updatedActionNames);
- List<Layout> layouts = page.getLayouts();
- for (Layout layout : layouts) {
- if (layoutId.equals(layout.getId())) {
- layout.setDsl(this.unescapeMongoSpecialCharacters(layout));
- return updateLayout(page.getId(), page.getApplicationId(), layout.getId(), layout);
- }
- }
- return Mono.empty();
- });
- }
-
- private JsonNode replaceStringInJsonNode(JsonNode jsonNode, Pattern oldNamePattern, String newName) {
- // If this is a text node, perform replacement directly
- if (jsonNode.isTextual()) {
- Matcher matcher = oldNamePattern.matcher(jsonNode.asText());
- String valueAfterReplacement = matcher.replaceAll(newName);
- return new TextNode(valueAfterReplacement);
- }
-
- // TODO This is special handling for the list widget that has been added to allow refactoring of
- // just the default widgets inside the list. This is required because for the list, the widget names
- // exist as keys at the location List1.template(.Text1) [Ref #9281]
- // Ideally, we should avoid any non-structural elements as keys. This will be improved in list widget v2
- if (jsonNode.has("type") && "LIST_WIDGET".equals(jsonNode.get("type").asText())) {
- final JsonNode template = jsonNode.get("template");
- JsonNode newJsonNode = null;
- String fieldName = null;
- final Iterator<String> templateIterator = template.fieldNames();
- while (templateIterator.hasNext()) {
- fieldName = templateIterator.next();
-
- // For each element within template, check whether it would match the replacement pattern
- final Matcher listWidgetTemplateKeyMatcher = oldNamePattern.matcher(fieldName);
- if (listWidgetTemplateKeyMatcher.find()) {
- newJsonNode = template.get(fieldName);
- break;
- }
- }
- if (newJsonNode != null) {
- // If such a pattern is found, remove that element and attach it back with the new name
- ((ObjectNode) template).remove(fieldName);
- ((ObjectNode) template).set(newName, newJsonNode);
- }
- }
-
- final Iterator<Map.Entry<String, JsonNode>> iterator = jsonNode.fields();
- // Go through each field to recursively operate on it
- while (iterator.hasNext()) {
- final Map.Entry<String, JsonNode> next = iterator.next();
- final JsonNode value = next.getValue();
- if (value.isArray()) {
- // If this field is an array type, iterate through each element and perform replacement
- final ArrayNode arrayNode = (ArrayNode) value;
- final ArrayNode newArrayNode = objectMapper.createArrayNode();
- arrayNode.forEach(x -> newArrayNode.add(replaceStringInJsonNode(x, oldNamePattern, newName)));
- // Make this array node created from replaced values the new value
- next.setValue(newArrayNode);
- } else {
- // This is either directly a text node or another json node
- // In either case, recurse over the entire value to get the replaced value
- next.setValue(replaceStringInJsonNode(value, oldNamePattern, newName));
- }
- }
- return jsonNode;
- }
-
/**
* Walks the DSL and extracts all the widget names from it.
* A widget is expected to have a few properties defining its own behaviour, with any mustache bindings present
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
index 6c15fa8ad3d1..bc3c6ed1c05d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java
@@ -24,6 +24,7 @@
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.NewActionService;
import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -53,6 +54,7 @@ public class LayoutCollectionServiceCEImpl implements LayoutCollectionServiceCE
private final NewPageService newPageService;
private final LayoutActionService layoutActionService;
+ private final RefactoringSolution refactoringSolution;
private final ActionCollectionService actionCollectionService;
private final NewActionService newActionService;
private final AnalyticsService analyticsService;
@@ -150,13 +152,13 @@ public Mono<ActionCollectionDTO> createCollection(ActionCollectionDTO collection
// Store the default resource ids
// Only store defaultPageId for collectionDTO level resource
- DefaultResources defaultDTOResource = new DefaultResources();
+ DefaultResources defaultDTOResource = new DefaultResources();
AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(collection.getDefaultResources(), defaultDTOResource);
defaultDTOResource.setApplicationId(null);
defaultDTOResource.setCollectionId(null);
defaultDTOResource.setBranchName(null);
- if(StringUtils.isEmpty(defaultDTOResource.getPageId())) {
+ if (StringUtils.isEmpty(defaultDTOResource.getPageId())) {
defaultDTOResource.setPageId(collection.getPageId());
}
collection.setDefaultResources(defaultDTOResource);
@@ -165,7 +167,7 @@ public Mono<ActionCollectionDTO> createCollection(ActionCollectionDTO collection
DefaultResources defaults = new DefaultResources();
AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(actionCollection.getDefaultResources(), defaults);
defaults.setPageId(null);
- if(StringUtils.isEmpty(defaults.getApplicationId())) {
+ if (StringUtils.isEmpty(defaults.getApplicationId())) {
defaults.setApplicationId(actionCollection.getApplicationId());
}
actionCollection.setDefaultResources(defaults);
@@ -309,7 +311,7 @@ public Mono<LayoutDTO> refactorCollectionName(RefactorActionCollectionNameDTO re
return actionUpdatesFlux
.then(actionCollectionService.update(branchedActionCollection.getId(), branchedActionCollection))
.then(branchedPageIdMono)
- .flatMap(branchedPageId -> layoutActionService.refactorName(branchedPageId, layoutId, oldName, newName));
+ .flatMap(branchedPageId -> refactoringSolution.refactorName(branchedPageId, layoutId, oldName, newName));
})
.map(responseUtils::updateLayoutDTOWithDefaultResources);
}
@@ -590,20 +592,20 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
.map(responseUtils::updateCollectionDTOWithDefaultResources)
.zipWith(newPageService.findById(pageId, MANAGE_PAGES),
(branchedActionCollection, newPage) -> {
- //redundant check
- if (newPage.getUnpublishedPage().getLayouts().size() > 0 ) {
- // redundant check as the collection lies inside a layout. Maybe required for testcases
- branchedActionCollection.setErrorReports(newPage.getUnpublishedPage().getLayouts().get(0).getLayoutOnLoadActionErrors());
- }
+ //redundant check
+ if (newPage.getUnpublishedPage().getLayouts().size() > 0) {
+ // redundant check as the collection lies inside a layout. Maybe required for testcases
+ branchedActionCollection.setErrorReports(newPage.getUnpublishedPage().getLayouts().get(0).getLayoutOnLoadActionErrors());
+ }
- return branchedActionCollection;
- });
+ return branchedActionCollection;
+ });
}
@Override
public Mono<LayoutDTO> refactorAction(RefactorActionNameInCollectionDTO refactorActionNameInCollectionDTO) {
// First perform refactor of the action itself
- final Mono<LayoutDTO> layoutDTOMono = layoutActionService
+ final Mono<LayoutDTO> layoutDTOMono = refactoringSolution
.refactorActionName(refactorActionNameInCollectionDTO.getRefactorAction())
.cache();
@@ -642,7 +644,7 @@ public Mono<LayoutDTO> refactorAction(RefactorActionNameInCollectionDTO refactor
});
Mono<String> branchedCollectionIdMono = StringUtils.isEmpty(branchName)
- ? Mono.just(defaultActionCollection.getId())
+ ? Mono.just(defaultActionCollection.getId())
: actionCollectionService
.findByBranchNameAndDefaultCollectionId(branchName, defaultActionCollection.getId(), MANAGE_ACTIONS)
.map(actionCollection -> {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolution.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolution.java
new file mode 100644
index 000000000000..7d5c4a102a5b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolution.java
@@ -0,0 +1,6 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.solutions.ce.RefactoringSolutionCE;
+
+public interface RefactoringSolution extends RefactoringSolutionCE {
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java
new file mode 100644
index 000000000000..169cb9c23a55
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java
@@ -0,0 +1,30 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.solutions.ce.RefactoringSolutionCEImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class RefactoringSolutionImpl extends RefactoringSolutionCEImpl implements RefactoringSolution {
+
+ public RefactoringSolutionImpl(ObjectMapper objectMapper,
+ NewPageService newPageService,
+ NewActionService newActionService,
+ ActionCollectionService actionCollectionService,
+ ResponseUtils responseUtils,
+ LayoutActionService layoutActionService) {
+ super(objectMapper,
+ newPageService,
+ newActionService,
+ actionCollectionService,
+ responseUtils,
+ layoutActionService);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCE.java
new file mode 100644
index 000000000000..669bac15ed79
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCE.java
@@ -0,0 +1,19 @@
+package com.appsmith.server.solutions.ce;
+
+import com.appsmith.server.dtos.LayoutDTO;
+import com.appsmith.server.dtos.RefactorActionNameDTO;
+import com.appsmith.server.dtos.RefactorNameDTO;
+import reactor.core.publisher.Mono;
+
+public interface RefactoringSolutionCE {
+
+ Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO);
+
+ Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO, String branchName);
+
+ Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO);
+
+ Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO, String branchName);
+
+ Mono<LayoutDTO> refactorName(String pageId, String layoutId, String oldName, String newName);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java
new file mode 100644
index 000000000000..5fd8bb8c1967
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java
@@ -0,0 +1,322 @@
+package com.appsmith.server.solutions.ce;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionDTO;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.dtos.ActionCollectionDTO;
+import com.appsmith.server.dtos.LayoutDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.RefactorActionNameDTO;
+import com.appsmith.server.dtos.RefactorNameDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.services.NewPageService;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONObject;
+import org.springframework.util.StringUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
+import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
+import static java.util.stream.Collectors.toSet;
+
+@Slf4j
+@RequiredArgsConstructor
+public class RefactoringSolutionCEImpl implements RefactoringSolutionCE {
+
+ private final ObjectMapper objectMapper;
+ private final NewPageService newPageService;
+ private final NewActionService newActionService;
+ private final ActionCollectionService actionCollectionService;
+ private final ResponseUtils responseUtils;
+ private final LayoutActionService layoutActionService;
+
+ /*
+ * To replace fetchUsers in `{{JSON.stringify(fetchUsers)}}` with getUsers, the following regex is required :
+ * `\\b(fetchUsers)\\b`. To achieve this the following strings preWord and postWord are declared here to be used
+ * at run time to create the regex pattern.
+ */
+ private final String preWord = "\\b(";
+ private final String postWord = ")\\b";
+
+
+ @Override
+ public Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO) {
+ String pageId = refactorNameDTO.getPageId();
+ String layoutId = refactorNameDTO.getLayoutId();
+ String oldName = refactorNameDTO.getOldName();
+ String newName = refactorNameDTO.getNewName();
+ return layoutActionService.isNameAllowed(pageId, layoutId, newName)
+ .flatMap(allowed -> {
+ if (!allowed) {
+ return Mono.error(new AppsmithException(AppsmithError.NAME_CLASH_NOT_ALLOWED_IN_REFACTOR, oldName, newName));
+ }
+ return this.refactorName(pageId, layoutId, oldName, newName);
+ });
+ }
+
+ @Override
+ public Mono<LayoutDTO> refactorWidgetName(RefactorNameDTO refactorNameDTO, String branchName) {
+ if (StringUtils.isEmpty(branchName)) {
+ return refactorWidgetName(refactorNameDTO);
+ }
+
+ return newPageService.findByBranchNameAndDefaultPageId(branchName, refactorNameDTO.getPageId(), MANAGE_PAGES)
+ .flatMap(branchedPage -> {
+ refactorNameDTO.setPageId(branchedPage.getId());
+ return refactorWidgetName(refactorNameDTO);
+ })
+ .map(responseUtils::updateLayoutDTOWithDefaultResources);
+ }
+
+ @Override
+ public Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO) {
+ String pageId = refactorActionNameDTO.getPageId();
+ String layoutId = refactorActionNameDTO.getLayoutId();
+ String oldName = refactorActionNameDTO.getOldName();
+ final String oldFullyQualifiedName = StringUtils.isEmpty(refactorActionNameDTO.getCollectionName()) ?
+ oldName :
+ refactorActionNameDTO.getCollectionName() + "." + oldName;
+ String newName = refactorActionNameDTO.getNewName();
+ final String newFullyQualifiedName = StringUtils.isEmpty(refactorActionNameDTO.getCollectionName()) ?
+ newName :
+ refactorActionNameDTO.getCollectionName() + "." + newName;
+ String actionId = refactorActionNameDTO.getActionId();
+ return Mono.just(newActionService.validateActionName(newName))
+ .flatMap(isValidName -> {
+ if (!isValidName) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_ACTION_NAME));
+ }
+ return layoutActionService.isNameAllowed(pageId, layoutId, newFullyQualifiedName);
+ })
+ .flatMap(allowed -> {
+ if (!allowed) {
+ return Mono.error(new AppsmithException(AppsmithError.NAME_CLASH_NOT_ALLOWED_IN_REFACTOR, oldName, newName));
+ }
+ return newActionService
+ .findActionDTObyIdAndViewMode(actionId, false, MANAGE_ACTIONS);
+ })
+ .flatMap(action -> {
+ action.setName(newName);
+ if (!StringUtils.isEmpty(refactorActionNameDTO.getCollectionName())) {
+ action.setFullyQualifiedName(newFullyQualifiedName);
+ }
+ return newActionService.updateUnpublishedAction(actionId, action);
+ })
+ .then(this.refactorName(pageId, layoutId, oldFullyQualifiedName, newFullyQualifiedName));
+ }
+
+ @Override
+ public Mono<LayoutDTO> refactorActionName(RefactorActionNameDTO refactorActionNameDTO, String branchName) {
+
+ String defaultActionId = refactorActionNameDTO.getActionId();
+ return newActionService.findByBranchNameAndDefaultActionId(branchName, defaultActionId, MANAGE_ACTIONS)
+ .flatMap(branchedAction -> {
+ refactorActionNameDTO.setActionId(branchedAction.getId());
+ refactorActionNameDTO.setPageId(branchedAction.getUnpublishedAction().getPageId());
+ return refactorActionName(refactorActionNameDTO);
+ })
+ .map(responseUtils::updateLayoutDTOWithDefaultResources);
+ }
+
+
+ /**
+ * Assumption here is that the refactoring name provided is indeed unique and is fit to be replaced everywhere.
+ * <p>
+ * At this point, the user must have MANAGE_PAGES and MANAGE_ACTIONS permissions for page and action respectively
+ *
+ * @param pageId
+ * @param layoutId
+ * @param oldName
+ * @param newName
+ * @return
+ */
+ @Override
+ public Mono<LayoutDTO> refactorName(String pageId, String layoutId, String oldName, String newName) {
+ String regexPattern = preWord + oldName + postWord;
+ Pattern oldNamePattern = Pattern.compile(regexPattern);
+
+ Mono<PageDTO> updatePageMono = newPageService
+ // fetch the unpublished page
+ .findPageById(pageId, MANAGE_PAGES, false)
+ .flatMap(page -> {
+ List<Layout> layouts = page.getLayouts();
+ for (Layout layout : layouts) {
+ if (layoutId.equals(layout.getId()) && layout.getDsl() != null) {
+ final JsonNode dslNode = objectMapper.convertValue(layout.getDsl(), JsonNode.class);
+ final JsonNode dslNodeAfterReplacement = this.replaceStringInJsonNode(dslNode, oldNamePattern, newName);
+ layout.setDsl(objectMapper.convertValue(dslNodeAfterReplacement, JSONObject.class));
+
+ // DSL has removed all the old names and replaced it with new name. If the change of name
+ // was one of the mongoEscaped widgets, then update the names in the set as well
+ Set<String> mongoEscapedWidgetNames = layout.getMongoEscapedWidgetNames();
+ if (mongoEscapedWidgetNames != null && mongoEscapedWidgetNames.contains(oldName)) {
+ mongoEscapedWidgetNames.remove(oldName);
+ mongoEscapedWidgetNames.add(newName);
+ }
+ page.setLayouts(layouts);
+ // Since the page has most probably changed, save the page and return.
+ return newPageService.saveUnpublishedPage(page);
+ }
+ }
+ // If we have reached here, the layout was not found and the page should be returned as is.
+ return Mono.just(page);
+ });
+
+ Set<String> updatableCollectionIds = new HashSet<>();
+
+ Mono<Set<String>> updateActionsMono = newActionService
+ .findByPageIdAndViewMode(pageId, false, MANAGE_ACTIONS)
+ /*
+ * Assuming that the datasource should not be dependent on the widget and hence not going through the same
+ * to look for replacement pattern.
+ */
+ .flatMap(newAction1 -> {
+ final NewAction newAction = newAction1;
+ // We need actionDTO to be populated with pluginType from NewAction
+ // so that we can check for the JS path
+ Mono<ActionDTO> actionMono = newActionService.generateActionByViewMode(newAction, false);
+ return actionMono.flatMap(action -> {
+ newAction.setUnpublishedAction(action);
+ boolean actionUpdateRequired = false;
+ ActionConfiguration actionConfiguration = action.getActionConfiguration();
+ Set<String> jsonPathKeys = action.getJsonPathKeys();
+
+ if (jsonPathKeys != null && !jsonPathKeys.isEmpty()) {
+ // Since json path keys actually contain the entire inline js function instead of just the widget/action
+ // name, we can not simply use the set.contains(obj) function. We need to iterate over all the keys
+ // in the set and see if the old name is a substring of the json path key.
+ for (String key : jsonPathKeys) {
+ if (oldNamePattern.matcher(key).find()) {
+ actionUpdateRequired = true;
+ break;
+ }
+ }
+ }
+
+ if (!actionUpdateRequired || actionConfiguration == null) {
+ return Mono.just(newAction);
+ }
+ // if actionUpdateRequired is true AND actionConfiguration is not null
+ if (action.getCollectionId() != null) {
+ updatableCollectionIds.add(action.getCollectionId());
+ }
+ final JsonNode actionConfigurationNode = objectMapper.convertValue(actionConfiguration, JsonNode.class);
+ final JsonNode actionConfigurationNodeAfterReplacement = replaceStringInJsonNode(actionConfigurationNode, oldNamePattern, newName);
+
+ ActionConfiguration newActionConfiguration = objectMapper.convertValue(actionConfigurationNodeAfterReplacement, ActionConfiguration.class);
+ action.setActionConfiguration(newActionConfiguration);
+ NewAction newAction2 = newActionService.extractAndSetJsonPathKeys(newAction);
+ return newActionService.save(newAction2);
+ });
+
+ })
+ .map(savedAction -> savedAction.getUnpublishedAction().getName())
+ .collect(toSet())
+ .flatMap(updatedActions -> {
+ // If these actions belonged to collections, update the collection body
+ return Flux.fromIterable(updatableCollectionIds)
+ .flatMap(collectionId -> actionCollectionService.findById(collectionId, MANAGE_ACTIONS))
+ .flatMap(actionCollection -> {
+ final ActionCollectionDTO unpublishedCollection = actionCollection.getUnpublishedCollection();
+ Matcher matcher = oldNamePattern.matcher(unpublishedCollection.getBody());
+ String newBodyAsString = matcher.replaceAll(newName);
+ unpublishedCollection.setBody(newBodyAsString);
+ return actionCollectionService.save(actionCollection);
+ })
+ .collectList()
+ .thenReturn(updatedActions);
+ });
+
+ return Mono.zip(updateActionsMono, updatePageMono)
+ .flatMap(tuple -> {
+ Set<String> updatedActionNames = tuple.getT1();
+ PageDTO page = tuple.getT2();
+ log.debug("Actions updated due to refactor name in page {} are : {}", pageId, updatedActionNames);
+ List<Layout> layouts = page.getLayouts();
+ for (Layout layout : layouts) {
+ if (layoutId.equals(layout.getId())) {
+ layout.setDsl(layoutActionService.unescapeMongoSpecialCharacters(layout));
+ return layoutActionService.updateLayout(page.getId(), page.getApplicationId(), layout.getId(), layout);
+ }
+ }
+ return Mono.empty();
+ });
+ }
+
+
+ private JsonNode replaceStringInJsonNode(JsonNode jsonNode, Pattern oldNamePattern, String newName) {
+ // If this is a text node, perform replacement directly
+ if (jsonNode.isTextual()) {
+ Matcher matcher = oldNamePattern.matcher(jsonNode.asText());
+ String valueAfterReplacement = matcher.replaceAll(newName);
+ return new TextNode(valueAfterReplacement);
+ }
+
+ // TODO This is special handling for the list widget that has been added to allow refactoring of
+ // just the default widgets inside the list. This is required because for the list, the widget names
+ // exist as keys at the location List1.template(.Text1) [Ref #9281]
+ // Ideally, we should avoid any non-structural elements as keys. This will be improved in list widget v2
+ if (jsonNode.has("type") && "LIST_WIDGET".equals(jsonNode.get("type").asText())) {
+ final JsonNode template = jsonNode.get("template");
+ JsonNode newJsonNode = null;
+ String fieldName = null;
+ final Iterator<String> templateIterator = template.fieldNames();
+ while (templateIterator.hasNext()) {
+ fieldName = templateIterator.next();
+
+ // For each element within template, check whether it would match the replacement pattern
+ final Matcher listWidgetTemplateKeyMatcher = oldNamePattern.matcher(fieldName);
+ if (listWidgetTemplateKeyMatcher.find()) {
+ newJsonNode = template.get(fieldName);
+ break;
+ }
+ }
+ if (newJsonNode != null) {
+ // If such a pattern is found, remove that element and attach it back with the new name
+ ((ObjectNode) template).remove(fieldName);
+ ((ObjectNode) template).set(newName, newJsonNode);
+ }
+ }
+
+ final Iterator<Map.Entry<String, JsonNode>> iterator = jsonNode.fields();
+ // Go through each field to recursively operate on it
+ while (iterator.hasNext()) {
+ final Map.Entry<String, JsonNode> next = iterator.next();
+ final JsonNode value = next.getValue();
+ if (value.isArray()) {
+ // If this field is an array type, iterate through each element and perform replacement
+ final ArrayNode arrayNode = (ArrayNode) value;
+ final ArrayNode newArrayNode = objectMapper.createArrayNode();
+ arrayNode.forEach(x -> newArrayNode.add(replaceStringInJsonNode(x, oldNamePattern, newName)));
+ // Make this array node created from replaced values the new value
+ next.setValue(newArrayNode);
+ } else {
+ // This is either directly a text node or another json node
+ // In either case, recurse over the entire value to get the replaced value
+ next.setValue(replaceStringInJsonNode(value, oldNamePattern, newName));
+ }
+ }
+ return jsonNode;
+ }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
index 4f1311574bf3..e148471b8782 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceImplTest.java
@@ -18,6 +18,7 @@
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.repositories.ActionCollectionRepository;
+import com.appsmith.server.solutions.RefactoringSolution;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mongodb.client.result.UpdateResult;
@@ -75,24 +76,20 @@ public class ActionCollectionServiceImplTest {
private CollectionService collectionService;
@MockBean
private PolicyGenerator policyGenerator;
-
@MockBean
NewPageService newPageService;
-
@MockBean
LayoutActionService layoutActionService;
-
@MockBean
ActionCollectionRepository actionCollectionRepository;
-
@MockBean
NewActionService newActionService;
-
@MockBean
ApplicationService applicationService;
-
@MockBean
ResponseUtils responseUtils;
+ @MockBean
+ RefactoringSolution refactoringSolution;
private final File mockObjects = new File("src/test/resources/test_assets/ActionCollectionServiceTest/mockObjects.json");
@@ -114,6 +111,7 @@ public void setUp() {
layoutCollectionService = new LayoutCollectionServiceImpl(
newPageService,
layoutActionService,
+ refactoringSolution,
actionCollectionService,
newActionService,
analyticsService,
@@ -743,7 +741,7 @@ public void testRefactorCollectionName_withEmptyActions_returnsValidLayout() {
jsonObject.put("key", "value");
layout.setDsl(jsonObject);
Mockito
- .when(layoutActionService.refactorName(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
+ .when(refactoringSolution.refactorName(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(layout));
Mockito
@@ -821,7 +819,7 @@ public void testRefactorCollectionName_withActions_returnsValidLayout() {
layout.setActionUpdates(new ArrayList<>());
layout.setLayoutOnLoadActions(new ArrayList<>());
Mockito
- .when(layoutActionService.refactorName(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
+ .when(refactoringSolution.refactorName(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(layout));
Mockito
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
index 887c9d07f8ff..ef6289807991 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
@@ -27,6 +27,7 @@
import com.appsmith.server.repositories.PermissionGroupRepository;
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.RefactoringSolution;
import lombok.extern.slf4j.Slf4j;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
@@ -82,6 +83,9 @@ public class ActionCollectionServiceTest {
@Autowired
LayoutActionService layoutActionService;
+ @Autowired
+ RefactoringSolution refactoringSolution;
+
@Autowired
NewPageService newPageService;
@@ -303,7 +307,7 @@ public void refactorNameForActionRefactorsNameInCollection() {
refactorActionNameDTO.setOldName("testAction1");
refactorActionNameDTO.setNewName("newTestAction1");
- final LayoutDTO layoutDTO = layoutActionService.refactorActionName(refactorActionNameDTO).block();
+ final LayoutDTO layoutDTO = refactoringSolution.refactorActionName(refactorActionNameDTO).block();
assert createdActionCollectionDTO2 != null;
final Mono<ActionCollection> actionCollectionMono = actionCollectionService.getById(createdActionCollectionDTO2.getId());
@@ -381,7 +385,7 @@ public void testRefactorActionName_withActionNameEqualsRun_doesNotRefactorApiRun
refactorActionNameDTO.setOldName("run");
refactorActionNameDTO.setNewName("newRun");
- final LayoutDTO layoutDTO = layoutActionService.refactorActionName(refactorActionNameDTO).block();
+ final LayoutDTO layoutDTO = refactoringSolution.refactorActionName(refactorActionNameDTO).block();
assert createdActionCollectionDTO2 != null;
final Mono<ActionCollection> actionCollectionMono = actionCollectionService.getById(createdActionCollectionDTO2.getId());
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index bffc01e2ce58..894afa878954 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -5,7 +5,6 @@
import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.Property;
import com.appsmith.server.constants.FieldName;
-import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.GitApplicationMetadata;
import com.appsmith.server.domains.Layout;
@@ -21,8 +20,6 @@
import com.appsmith.server.dtos.LayoutDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.dtos.RefactorActionNameDTO;
-import com.appsmith.server.dtos.RefactorActionNameInCollectionDTO;
-import com.appsmith.server.dtos.RefactorNameDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.MockPluginExecutor;
@@ -31,6 +28,7 @@
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.repositories.WorkspaceRepository;
import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.solutions.RefactoringSolution;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -54,7 +52,6 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
-import reactor.util.function.Tuple2;
import java.util.ArrayList;
import java.util.HashMap;
@@ -65,7 +62,6 @@
import java.util.UUID;
import java.util.stream.Collectors;
-import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static com.appsmith.server.constants.FieldName.DEFAULT_PAGE_LAYOUT;
import static com.mongodb.assertions.Assertions.assertNull;
@@ -104,6 +100,9 @@ public class LayoutActionServiceTest {
@Autowired
LayoutActionService layoutActionService;
+ @Autowired
+ RefactoringSolution refactoringSolution;
+
@Autowired
LayoutCollectionService layoutCollectionService;
@@ -370,233 +369,6 @@ public void updateActionUpdatesLayout() {
.verifyComplete();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void refactorActionName() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- ActionDTO action = new ActionDTO();
- action.setName("beforeNameChange");
- action.setPageId(testPage.getId());
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setHttpMethod(HttpMethod.GET);
- action.setActionConfiguration(actionConfiguration);
- action.setDatasource(datasource);
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "firstWidget");
- JSONArray temp = new JSONArray();
- temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
- dsl.put("dynamicBindingPathList", temp);
- dsl.put("testField", "{{ \tbeforeNameChange.data }}");
- final JSONObject innerObjectReference = new JSONObject();
- innerObjectReference.put("k", "{{\tbeforeNameChange.data}}");
- dsl.put("innerObjectReference", innerObjectReference);
- final JSONArray innerArrayReference = new JSONArray();
- innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tbeforeNameChange.data}}")));
- dsl.put("innerArrayReference", innerArrayReference);
-
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
- layout.setPublishedDsl(dsl);
-
- ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
-
- LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
-
-
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
- refactorActionNameDTO.setPageId(testPage.getId());
- refactorActionNameDTO.setLayoutId(firstLayout.getId());
- refactorActionNameDTO.setOldName("beforeNameChange");
- refactorActionNameDTO.setNewName("PostNameChange");
- refactorActionNameDTO.setActionId(createdAction.getId());
-
- LayoutDTO postNameChangeLayout = layoutActionService.refactorActionName(refactorActionNameDTO).block();
-
- Mono<NewAction> postNameChangeActionMono = newActionService.findById(createdAction.getId(), READ_ACTIONS);
-
- StepVerifier
- .create(postNameChangeActionMono)
- .assertNext(updatedAction -> {
-
- assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("PostNameChange");
-
- DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
- assertThat(actionDTO.getName()).isEqualTo("PostNameChange");
-
- dsl.put("testField", "{{ \tPostNameChange.data }}");
- innerObjectReference.put("k", "{{\tPostNameChange.data}}");
- innerArrayReference.clear();
- innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tPostNameChange.data}}")));
- assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void refactorActionName_forGitConnectedAction_success() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- ActionDTO action = new ActionDTO();
- action.setName("beforeNameChange");
- action.setPageId(gitConnectedPage.getId());
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setHttpMethod(HttpMethod.GET);
- action.setActionConfiguration(actionConfiguration);
- action.setDatasource(datasource);
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "firstWidget");
- JSONArray temp = new JSONArray();
- temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
- dsl.put("dynamicBindingPathList", temp);
- dsl.put("testField", "{{ \tbeforeNameChange.data }}");
- final JSONObject innerObjectReference = new JSONObject();
- innerObjectReference.put("k", "{{\tbeforeNameChange.data}}");
- dsl.put("innerObjectReference", innerObjectReference);
- final JSONArray innerArrayReference = new JSONArray();
- innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tbeforeNameChange.data}}")));
- dsl.put("innerArrayReference", innerArrayReference);
-
- Layout layout = gitConnectedPage.getLayouts().get(0);
- layout.setDsl(dsl);
- layout.setPublishedDsl(dsl);
-
- ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
-
- LayoutDTO firstLayout = layoutActionService.updateLayout(gitConnectedPage.getId(), gitConnectedPage.getApplicationId(), layout.getId(), layout, branchName).block();
-
-
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
- refactorActionNameDTO.setPageId(gitConnectedPage.getId());
- refactorActionNameDTO.setLayoutId(firstLayout.getId());
- refactorActionNameDTO.setOldName("beforeNameChange");
- refactorActionNameDTO.setNewName("PostNameChange");
- refactorActionNameDTO.setActionId(createdAction.getId());
-
- LayoutDTO postNameChangeLayout = layoutActionService.refactorActionName(refactorActionNameDTO).block();
-
- Mono<NewAction> postNameChangeActionMono = newActionService.findById(createdAction.getId(), READ_ACTIONS);
-
- StepVerifier
- .create(postNameChangeActionMono)
- .assertNext(updatedAction -> {
-
- assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("PostNameChange");
-
- DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
- assertThat(actionDTO.getName()).isEqualTo("PostNameChange");
-
- dsl.put("testField", "{{ \tPostNameChange.data }}");
- innerObjectReference.put("k", "{{\tPostNameChange.data}}");
- innerArrayReference.clear();
- innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tPostNameChange.data}}")));
- assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
- assertThat(updatedAction.getDefaultResources()).isNotNull();
- assertThat(updatedAction.getDefaultResources().getActionId()).isEqualTo(updatedAction.getId());
- assertThat(updatedAction.getDefaultResources().getApplicationId()).isEqualTo(gitConnectedApp.getId());
- assertThat(updatedAction.getUnpublishedAction().getDefaultResources().getPageId()).isEqualTo(gitConnectedPage.getId());
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void refactorActionNameToDeletedName() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- ActionDTO action = new ActionDTO();
- action.setName("Query1");
- action.setPageId(testPage.getId());
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setHttpMethod(HttpMethod.GET);
- action.setActionConfiguration(actionConfiguration);
- action.setDatasource(datasource);
-
- Layout layout = testPage.getLayouts().get(0);
-
- ActionDTO firstAction = layoutActionService.createSingleAction(action).block();
-
- layout.setDsl(layoutActionService.unescapeMongoSpecialCharacters(layout));
- LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- applicationPageService.publish(testPage.getApplicationId(), true).block();
-
- newActionService.deleteUnpublishedAction(firstAction.getId()).block();
-
- // Create another action with the same name as the erstwhile deleted action
- action.setId(null);
- ActionDTO secondAction = layoutActionService.createSingleAction(action).block();
-
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
- refactorActionNameDTO.setPageId(testPage.getId());
- refactorActionNameDTO.setLayoutId(firstLayout.getId());
- refactorActionNameDTO.setOldName("Query1");
- refactorActionNameDTO.setNewName("NewActionName");
- refactorActionNameDTO.setActionId(firstAction.getId());
-
- layoutActionService.refactorActionName(refactorActionNameDTO).block();
-
- Mono<NewAction> postNameChangeActionMono = newActionService.findById(secondAction.getId(), READ_ACTIONS);
-
- StepVerifier
- .create(postNameChangeActionMono)
- .assertNext(updatedAction -> {
-
- assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("NewActionName");
-
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void testRefactorActionName_withInvalidName_throwsError() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- ActionDTO action = new ActionDTO();
- action.setName("beforeNameChange");
- action.setPageId(testPage.getId());
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setHttpMethod(HttpMethod.GET);
- action.setActionConfiguration(actionConfiguration);
- action.setDatasource(datasource);
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "firstWidget");
- JSONArray temp = new JSONArray();
- temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
- dsl.put("dynamicBindingPathList", temp);
- dsl.put("testField", "{{ beforeNameChange.data }}");
-
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
- layout.setPublishedDsl(dsl);
-
- ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
-
- LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
- refactorActionNameDTO.setPageId(testPage.getId());
- assert firstLayout != null;
- refactorActionNameDTO.setLayoutId(firstLayout.getId());
- refactorActionNameDTO.setOldName("beforeNameChange");
- refactorActionNameDTO.setNewName("!PostNameChange");
- assert createdAction != null;
- refactorActionNameDTO.setActionId(createdAction.getId());
-
- final Mono<LayoutDTO> layoutDTOMono = layoutActionService.refactorActionName(refactorActionNameDTO);
-
- StepVerifier
- .create(layoutDTOMono)
- .expectErrorMatches(e -> e instanceof AppsmithException &&
- AppsmithError.INVALID_ACTION_NAME.getMessage().equalsIgnoreCase(e.getMessage()))
- .verify();
- }
-
@Test
@WithUserDetails(value = "api_user")
public void actionExecuteOnLoadChangeOnUpdateLayout() {
@@ -772,83 +544,6 @@ public void tableWidgetKeyEscape() {
.verifyComplete();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void refactorDuplicateActionName() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- String name = "duplicateName";
-
- ActionDTO action = new ActionDTO();
- action.setName(name);
- action.setPageId(testPage.getId());
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setHttpMethod(HttpMethod.GET);
- action.setActionConfiguration(actionConfiguration);
- action.setDatasource(datasource);
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "firstWidget");
- JSONArray temp = new JSONArray();
- temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
- dsl.put("dynamicBindingPathList", temp);
- dsl.put("testField", "{{ duplicateName.data }}");
-
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
- layout.setPublishedDsl(dsl);
-
- ActionDTO firstAction = layoutActionService.createSingleAction(action).block();
-
- ActionDTO duplicateName = new ActionDTO();
- duplicateName.setName(name);
- duplicateName.setPageId(testPage.getId());
- duplicateName.setActionConfiguration(actionConfiguration);
- duplicateName.setDatasource(datasource);
-
- NewAction duplicateNameCompleteAction = new NewAction();
- duplicateNameCompleteAction.setUnpublishedAction(duplicateName);
- duplicateNameCompleteAction.setPublishedAction(new ActionDTO());
- duplicateNameCompleteAction.getPublishedAction().setDatasource(new Datasource());
- duplicateNameCompleteAction.setWorkspaceId(duplicateName.getWorkspaceId());
- duplicateNameCompleteAction.setPluginType(duplicateName.getPluginType());
- duplicateNameCompleteAction.setPluginId(duplicateName.getPluginId());
- duplicateNameCompleteAction.setTemplateId(duplicateName.getTemplateId());
- duplicateNameCompleteAction.setProviderId(duplicateName.getProviderId());
- duplicateNameCompleteAction.setDocumentation(duplicateName.getDocumentation());
- duplicateNameCompleteAction.setApplicationId(duplicateName.getApplicationId());
-
- // Now save this action directly in the repo to create a duplicate action name scenario
- actionRepository.save(duplicateNameCompleteAction).block();
-
- LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
- refactorActionNameDTO.setPageId(testPage.getId());
- refactorActionNameDTO.setLayoutId(firstLayout.getId());
- refactorActionNameDTO.setOldName("duplicateName");
- refactorActionNameDTO.setNewName("newName");
- refactorActionNameDTO.setActionId(firstAction.getId());
-
- LayoutDTO postNameChangeLayout = layoutActionService.refactorActionName(refactorActionNameDTO).block();
-
- Mono<NewAction> postNameChangeActionMono = newActionService.findById(firstAction.getId(), READ_ACTIONS);
-
- StepVerifier
- .create(postNameChangeActionMono)
- .assertNext(updatedAction -> {
-
- assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("newName");
-
- DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
- assertThat(actionDTO.getName()).isEqualTo("newName");
-
- dsl.put("testField", "{{ newName.data }}");
- assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
- })
- .verifyComplete();
- }
-
@Test
@WithUserDetails(value = "api_user")
public void duplicateActionNameCreation() {
@@ -881,188 +576,6 @@ public void duplicateActionNameCreation() {
.verify();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void tableWidgetKeyEscapeRefactorName() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "Table1");
- dsl.put("type", "TABLE_WIDGET");
- Map primaryColumns = new HashMap<String, Object>();
- JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
- primaryColumns.put("_id", jsonObject);
- primaryColumns.put("_class", jsonObject);
- dsl.put("primaryColumns", primaryColumns);
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
-
- layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
- refactorNameDTO.setPageId(testPage.getId());
- refactorNameDTO.setLayoutId(layout.getId());
- refactorNameDTO.setOldName("Table1");
- refactorNameDTO.setNewName("NewNameTable1");
-
- Mono<LayoutDTO> widgetRenameMono = layoutActionService.refactorWidgetName(refactorNameDTO).cache();
-
- Mono<PageDTO> pageFromRepoMono = widgetRenameMono.then(newPageService.findPageById(testPage.getId(), READ_PAGES, false));
-
- StepVerifier
- .create(Mono.zip(widgetRenameMono, pageFromRepoMono))
- .assertNext(tuple -> {
- LayoutDTO updatedLayout = tuple.getT1();
- PageDTO pageFromRepo = tuple.getT2();
-
- String widgetName = (String) updatedLayout.getDsl().get("widgetName");
- assertThat(widgetName).isEqualTo("NewNameTable1");
-
- Map primaryColumns1 = (Map) updatedLayout.getDsl().get("primaryColumns");
- assertThat(primaryColumns1.keySet()).containsAll(Set.of(FieldName.MONGO_UNESCAPED_ID, FieldName.MONGO_UNESCAPED_CLASS));
-
- Map primaryColumns2 = (Map) pageFromRepo.getLayouts().get(0).getDsl().get("primaryColumns");
- assertThat(primaryColumns2.keySet()).containsAll(Set.of(FieldName.MONGO_ESCAPE_ID, FieldName.MONGO_ESCAPE_CLASS));
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void simpleWidgetNameRefactor() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "Table1");
- dsl.put("type", "TABLE_WIDGET");
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
-
- layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
- refactorNameDTO.setPageId(testPage.getId());
- refactorNameDTO.setLayoutId(layout.getId());
- refactorNameDTO.setOldName("Table1");
- refactorNameDTO.setNewName("NewNameTable1");
-
- Mono<LayoutDTO> widgetRenameMono = layoutActionService.refactorWidgetName(refactorNameDTO).cache();
-
- Mono<PageDTO> pageFromRepoMono = widgetRenameMono.then(newPageService.findPageById(testPage.getId(), READ_PAGES, false));
-
- StepVerifier
- .create(Mono.zip(widgetRenameMono, pageFromRepoMono))
- .assertNext(tuple -> {
- LayoutDTO updatedLayout = tuple.getT1();
- PageDTO pageFromRepo = tuple.getT2();
-
- String widgetName = (String) updatedLayout.getDsl().get("widgetName");
- assertThat(widgetName).isEqualTo("NewNameTable1");
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void testRefactorWidgetName_forDefaultWidgetsInList_updatesBothWidgetsAndTemplateReferences() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "List1");
- dsl.put("type", "LIST_WIDGET");
- JSONObject template = new JSONObject();
- template.put("oldWidgetName", "irrelevantContent");
- dsl.put("template", template);
- final JSONArray children = new JSONArray();
- final JSONObject defaultWidget = new JSONObject();
- defaultWidget.put("widgetName", "oldWidgetName");
- defaultWidget.put("type", "TEXT_WIDGET");
- children.add(defaultWidget);
- dsl.put("children", children);
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
-
- layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
- refactorNameDTO.setPageId(testPage.getId());
- refactorNameDTO.setLayoutId(layout.getId());
- refactorNameDTO.setOldName("oldWidgetName");
- refactorNameDTO.setNewName("newWidgetName");
-
- Mono<LayoutDTO> widgetRenameMono = layoutActionService.refactorWidgetName(refactorNameDTO).cache();
-
- StepVerifier
- .create(widgetRenameMono)
- .assertNext(updatedLayout -> {
- assertTrue(((Map) updatedLayout.getDsl().get("template")).containsKey("newWidgetName"));
- assertEquals("newWidgetName",
- ((Map) (((List) updatedLayout.getDsl().get("children")).get(0))).get("widgetName"));
- })
- .verifyComplete();
- }
-
- @Test
- @WithUserDetails(value = "api_user")
- public void testWidgetNameRefactor_withSimpleUpdate_refactorsActionCollectionAndItsAction() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- // Set up table widget in DSL
- JSONObject dsl = new JSONObject();
- dsl.put("widgetName", "Table1");
- dsl.put("type", "TABLE_WIDGET");
- Layout layout = testPage.getLayouts().get(0);
- layout.setDsl(dsl);
-
- layoutActionService.updateLayout(testPage.getId(), testPage.getApplicationId(), layout.getId(), layout).block();
-
- // Create an action collection that refers to the table
- ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
- actionCollectionDTO1.setName("testCollection1");
- actionCollectionDTO1.setPageId(testPage.getId());
- actionCollectionDTO1.setApplicationId(testApp.getId());
- actionCollectionDTO1.setWorkspaceId(testApp.getWorkspaceId());
- actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
- ActionDTO action1 = new ActionDTO();
- action1.setName("testAction1");
- action1.setActionConfiguration(new ActionConfiguration());
- action1.getActionConfiguration().setBody("\tTable1");
- actionCollectionDTO1.setBody("\tTable1");
- actionCollectionDTO1.setActions(List.of(action1));
- actionCollectionDTO1.setPluginType(PluginType.JS);
-
- final ActionCollectionDTO createdActionCollectionDTO1 = layoutCollectionService.createCollection(actionCollectionDTO1).block();
-
- RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
- refactorNameDTO.setPageId(testPage.getId());
- refactorNameDTO.setLayoutId(layout.getId());
- refactorNameDTO.setOldName("Table1");
- refactorNameDTO.setNewName("NewNameTable1");
-
- LayoutDTO updatedLayout = layoutActionService.refactorWidgetName(refactorNameDTO).block();
-
- assert createdActionCollectionDTO1 != null;
- final Mono<ActionCollection> actionCollectionMono = actionCollectionService.getById(createdActionCollectionDTO1.getId());
- final Optional<String> optional = createdActionCollectionDTO1.getDefaultToBranchedActionIdsMap().values().stream().findFirst();
- assert optional.isPresent();
- final Mono<NewAction> actionMono = newActionService.findById(optional.get());
-
- StepVerifier
- .create(Mono.zip(actionCollectionMono, actionMono))
- .assertNext(tuple -> {
- final ActionCollection actionCollection = tuple.getT1();
- final NewAction action = tuple.getT2();
- assertThat(actionCollection.getUnpublishedCollection().getBody()).isEqualTo("\tNewNameTable1");
- final ActionDTO unpublishedAction = action.getUnpublishedAction();
- assertThat(unpublishedAction.getJsonPathKeys().size()).isEqualTo(1);
- final Optional<String> first = unpublishedAction.getJsonPathKeys().stream().findFirst();
- assert first.isPresent();
- assertThat(first.get()).isEqualTo("\tNewNameTable1");
- assertThat(unpublishedAction.getActionConfiguration().getBody()).isEqualTo("\tNewNameTable1");
- })
- .verifyComplete();
- }
-
@SneakyThrows
@Test
@WithUserDetails(value = "api_user")
@@ -1255,64 +768,6 @@ public void simpleOnPageLoadActionCreationTest() throws JsonProcessingException
}
- @Test
- @WithUserDetails(value = "api_user")
- public void testRefactorCollection_withModifiedName_ignoresName() {
- Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
-
- ActionCollectionDTO originalActionCollectionDTO = new ActionCollectionDTO();
- originalActionCollectionDTO.setName("originalName");
- originalActionCollectionDTO.setApplicationId(testApp.getId());
- originalActionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
- originalActionCollectionDTO.setPageId(testPage.getId());
- originalActionCollectionDTO.setPluginId(jsDatasource.getPluginId());
- originalActionCollectionDTO.setPluginType(PluginType.JS);
-
- ActionDTO action1 = new ActionDTO();
- action1.setName("testAction1");
- action1.setActionConfiguration(new ActionConfiguration());
- action1.getActionConfiguration().setBody("Table1");
-
- originalActionCollectionDTO.setActions(List.of(action1));
-
- final ActionCollectionDTO dto = layoutCollectionService.createCollection(originalActionCollectionDTO).block();
-
- ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
- assert dto != null;
- actionCollectionDTO.setId(dto.getId());
- actionCollectionDTO.setBody("body");
- actionCollectionDTO.setName("newName");
-
- RefactorActionNameInCollectionDTO refactorActionNameInCollectionDTO = new RefactorActionNameInCollectionDTO();
- refactorActionNameInCollectionDTO.setActionCollection(actionCollectionDTO);
- RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO(
- dto.getActions().get(0).getId(),
- testPage.getId(),
- testPage.getLayouts().get(0).getId(),
- "testAction1",
- "newTestAction",
- "originalName"
- );
- refactorActionNameInCollectionDTO.setRefactorAction(refactorActionNameDTO);
-
- final Mono<Tuple2<ActionCollection, NewAction>> tuple2Mono = layoutCollectionService
- .refactorAction(refactorActionNameInCollectionDTO)
- .then(actionCollectionService.getById(dto.getId())
- .zipWith(newActionService.findById(dto.getActions().get(0).getId())));
-
- StepVerifier.create(tuple2Mono)
- .assertNext(tuple -> {
- final ActionCollectionDTO actionCollectionDTOResult = tuple.getT1().getUnpublishedCollection();
- final NewAction newAction = tuple.getT2();
- assertEquals("originalName", actionCollectionDTOResult.getName());
- assertEquals("body", actionCollectionDTOResult.getBody());
- assertEquals("newTestAction", newAction.getUnpublishedAction().getName());
- assertEquals("originalName.newTestAction", newAction.getUnpublishedAction().getFullyQualifiedName());
- })
- .verifyComplete();
-
- }
-
@SneakyThrows
@Test
@WithUserDetails(value = "api_user")
@@ -1638,12 +1093,11 @@ public void introduceCyclicDependencyAndRemoveLater() {
refactorActionNameDTO.setPageId(testPage.getId());
refactorActionNameDTO.setActionId(createdAction.getId());
- Mono<LayoutDTO> layoutDTOMono = layoutActionService.refactorActionName(refactorActionNameDTO);
+ Mono<LayoutDTO> layoutDTOMono = refactoringSolution.refactorActionName(refactorActionNameDTO);
StepVerifier.create(layoutDTOMono.map(layoutDTO -> layoutDTO.getLayoutOnLoadActionErrors().size()))
.expectNext(1)
.verifyComplete();
-
// updateAction to see if the error persists
actionDTO.setName("finalActionName");
Mono<ActionDTO> actionDTOMono = layoutActionService.updateSingleActionWithBranchName(createdAction.getId(), actionDTO, null);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java
new file mode 100644
index 000000000000..9a41d17f5f90
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java
@@ -0,0 +1,784 @@
+package com.appsmith.server.solutions.ce;
+
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionDTO;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.PluginType;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.GitApplicationMetadata;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.ActionCollectionDTO;
+import com.appsmith.server.dtos.DslActionDTO;
+import com.appsmith.server.dtos.LayoutDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.RefactorActionNameDTO;
+import com.appsmith.server.dtos.RefactorActionNameInCollectionDTO;
+import com.appsmith.server.dtos.RefactorNameDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.MockPluginExecutor;
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.repositories.NewActionRepository;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.LayoutCollectionService;
+import com.appsmith.server.services.NewActionService;
+import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.services.UserService;
+import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.solutions.RefactoringSolution;
+import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import reactor.util.function.Tuple2;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
+import static com.appsmith.server.acl.AclPermission.READ_PAGES;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+@Slf4j
+@DirtiesContext
+class RefactoringSolutionCETest {
+
+ @SpyBean
+ NewActionService newActionService;
+
+ @Autowired
+ ApplicationPageService applicationPageService;
+
+ @Autowired
+ UserService userService;
+
+ @Autowired
+ WorkspaceService workspaceService;
+
+ @Autowired
+ PluginRepository pluginRepository;
+
+ @MockBean
+ PluginExecutorHelper pluginExecutorHelper;
+
+ @Autowired
+ LayoutActionService layoutActionService;
+
+ @Autowired
+ RefactoringSolution refactoringSolution;
+
+ @Autowired
+ LayoutCollectionService layoutCollectionService;
+
+ @Autowired
+ NewPageService newPageService;
+
+ @Autowired
+ NewActionRepository actionRepository;
+
+ @Autowired
+ ActionCollectionService actionCollectionService;
+
+ @Autowired
+ ApplicationService applicationService;
+
+ @Autowired
+ ImportExportApplicationService importExportApplicationService;
+
+ Application testApp = null;
+
+ PageDTO testPage = null;
+
+ Application gitConnectedApp = null;
+
+ PageDTO gitConnectedPage = null;
+
+ Datasource datasource;
+
+ String workspaceId;
+
+ String branchName;
+
+ Datasource jsDatasource;
+
+ @BeforeEach
+ @WithUserDetails(value = "api_user")
+ public void setup() {
+ newPageService.deleteAll();
+ User apiUser = userService.findByEmail("api_user").block();
+ Workspace toCreate = new Workspace();
+ toCreate.setName("LayoutActionServiceTest");
+
+ Workspace workspace = workspaceService.create(toCreate, apiUser).block();
+ workspaceId = workspace.getId();
+
+ if (testApp == null && testPage == null) {
+ //Create application and page which will be used by the tests to create actions for.
+ Application application = new Application();
+ application.setName(UUID.randomUUID().toString());
+ testApp = applicationPageService.createApplication(application, workspace.getId()).block();
+
+ final String pageId = testApp.getPages().get(0).getId();
+
+ testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+
+ Layout layout = testPage.getLayouts().get(0);
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField")),
+ new JSONObject(Map.of("key", "testField2"))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("testField", "{{ query1.data }}");
+ dsl.put("testField2", "{{jsObject.jsFunction.data}}");
+
+ JSONObject dsl2 = new JSONObject();
+ dsl2.put("widgetName", "Table1");
+ dsl2.put("type", "TABLE_WIDGET");
+ Map<String, Object> primaryColumns = new HashMap<>();
+ JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+ primaryColumns.put("_id", "{{ query1.data }}");
+ primaryColumns.put("_class", jsonObject);
+ dsl2.put("primaryColumns", primaryColumns);
+ final ArrayList<Object> objects = new ArrayList<>();
+ JSONArray temp2 = new JSONArray();
+ temp2.addAll(List.of(new JSONObject(Map.of("key", "primaryColumns._id"))));
+ dsl2.put("dynamicBindingPathList", temp2);
+ objects.add(dsl2);
+ dsl.put("children", objects);
+
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+ layoutActionService.updateLayout(pageId, testApp.getId(), layout.getId(), layout).block();
+
+ testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+ }
+
+ if (gitConnectedApp == null) {
+ Application newApp = new Application();
+ newApp.setName(UUID.randomUUID().toString());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("actionServiceTest");
+ newApp.setGitApplicationMetadata(gitData);
+ gitConnectedApp = applicationPageService.createApplication(newApp, workspaceId)
+ .flatMap(application -> {
+ application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
+ return applicationService.save(application)
+ .zipWhen(application1 -> importExportApplicationService.exportApplicationById(application1.getId(), gitData.getBranchName()));
+ })
+ // Assign the branchName to all the resources connected to the application
+ .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspace(workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+ .block();
+
+ gitConnectedPage = newPageService.findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false).block();
+
+ branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
+ }
+
+ workspaceId = workspace.getId();
+ datasource = new Datasource();
+ datasource.setName("Default Database");
+ datasource.setWorkspaceId(workspaceId);
+ Plugin installed_plugin = pluginRepository.findByPackageName("installed-plugin").block();
+ datasource.setPluginId(installed_plugin.getId());
+
+ jsDatasource = new Datasource();
+ jsDatasource.setName("Default JS Database");
+ jsDatasource.setWorkspaceId(workspaceId);
+ Plugin installedJsPlugin = pluginRepository.findByPackageName("installed-js-plugin").block();
+ assert installedJsPlugin != null;
+ jsDatasource.setPluginId(installedJsPlugin.getId());
+ }
+
+ @AfterEach
+ @WithUserDetails(value = "api_user")
+ public void cleanup() {
+ applicationPageService.deleteApplication(testApp.getId()).block();
+ testApp = null;
+ testPage = null;
+ }
+
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void refactorActionName() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ ActionDTO action = new ActionDTO();
+ action.setName("beforeNameChange");
+ action.setPageId(testPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("testField", "{{ \tbeforeNameChange.data }}");
+ final JSONObject innerObjectReference = new JSONObject();
+ innerObjectReference.put("k", "{{\tbeforeNameChange.data}}");
+ dsl.put("innerObjectReference", innerObjectReference);
+ final JSONArray innerArrayReference = new JSONArray();
+ innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tbeforeNameChange.data}}")));
+ dsl.put("innerArrayReference", innerArrayReference);
+
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setPageId(testPage.getId());
+ refactorActionNameDTO.setLayoutId(firstLayout.getId());
+ refactorActionNameDTO.setOldName("beforeNameChange");
+ refactorActionNameDTO.setNewName("PostNameChange");
+ refactorActionNameDTO.setActionId(createdAction.getId());
+
+ LayoutDTO postNameChangeLayout = refactoringSolution.refactorActionName(refactorActionNameDTO).block();
+
+ Mono<NewAction> postNameChangeActionMono = newActionService.findById(createdAction.getId(), READ_ACTIONS);
+
+ StepVerifier
+ .create(postNameChangeActionMono)
+ .assertNext(updatedAction -> {
+
+ assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("PostNameChange");
+
+ DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
+ assertThat(actionDTO.getName()).isEqualTo("PostNameChange");
+
+ dsl.put("testField", "{{ \tPostNameChange.data }}");
+ innerObjectReference.put("k", "{{\tPostNameChange.data}}");
+ innerArrayReference.clear();
+ innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tPostNameChange.data}}")));
+ assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void refactorActionName_forGitConnectedAction_success() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ ActionDTO action = new ActionDTO();
+ action.setName("beforeNameChange");
+ action.setPageId(gitConnectedPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("testField", "{{ \tbeforeNameChange.data }}");
+ final JSONObject innerObjectReference = new JSONObject();
+ innerObjectReference.put("k", "{{\tbeforeNameChange.data}}");
+ dsl.put("innerObjectReference", innerObjectReference);
+ final JSONArray innerArrayReference = new JSONArray();
+ innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tbeforeNameChange.data}}")));
+ dsl.put("innerArrayReference", innerArrayReference);
+
+ Layout layout = gitConnectedPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ LayoutDTO firstLayout = layoutActionService.updateLayout(gitConnectedPage.getId(), testApp.getId(), layout.getId(), layout, branchName).block();
+
+
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setPageId(gitConnectedPage.getId());
+ refactorActionNameDTO.setLayoutId(firstLayout.getId());
+ refactorActionNameDTO.setOldName("beforeNameChange");
+ refactorActionNameDTO.setNewName("PostNameChange");
+ refactorActionNameDTO.setActionId(createdAction.getId());
+
+ LayoutDTO postNameChangeLayout = refactoringSolution.refactorActionName(refactorActionNameDTO).block();
+
+ Mono<NewAction> postNameChangeActionMono = newActionService.findById(createdAction.getId(), READ_ACTIONS);
+
+ StepVerifier
+ .create(postNameChangeActionMono)
+ .assertNext(updatedAction -> {
+
+ assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("PostNameChange");
+
+ DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
+ assertThat(actionDTO.getName()).isEqualTo("PostNameChange");
+
+ dsl.put("testField", "{{ \tPostNameChange.data }}");
+ innerObjectReference.put("k", "{{\tPostNameChange.data}}");
+ innerArrayReference.clear();
+ innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tPostNameChange.data}}")));
+ assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
+ assertThat(updatedAction.getDefaultResources()).isNotNull();
+ assertThat(updatedAction.getDefaultResources().getActionId()).isEqualTo(updatedAction.getId());
+ assertThat(updatedAction.getDefaultResources().getApplicationId()).isEqualTo(gitConnectedApp.getId());
+ assertThat(updatedAction.getUnpublishedAction().getDefaultResources().getPageId()).isEqualTo(gitConnectedPage.getId());
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void refactorActionNameToDeletedName() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ ActionDTO action = new ActionDTO();
+ action.setName("Query1");
+ action.setPageId(testPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+
+ Layout layout = testPage.getLayouts().get(0);
+
+ ActionDTO firstAction = layoutActionService.createSingleAction(action).block();
+
+ layout.setDsl(layoutActionService.unescapeMongoSpecialCharacters(layout));
+ LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ applicationPageService.publish(testPage.getApplicationId(), true).block();
+
+ newActionService.deleteUnpublishedAction(firstAction.getId()).block();
+
+ // Create another action with the same name as the erstwhile deleted action
+ action.setId(null);
+ ActionDTO secondAction = layoutActionService.createSingleAction(action).block();
+
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setPageId(testPage.getId());
+ refactorActionNameDTO.setLayoutId(firstLayout.getId());
+ refactorActionNameDTO.setOldName("Query1");
+ refactorActionNameDTO.setNewName("NewActionName");
+ refactorActionNameDTO.setActionId(firstAction.getId());
+
+ refactoringSolution.refactorActionName(refactorActionNameDTO).block();
+
+ Mono<NewAction> postNameChangeActionMono = newActionService.findById(secondAction.getId(), READ_ACTIONS);
+
+ StepVerifier
+ .create(postNameChangeActionMono)
+ .assertNext(updatedAction -> {
+
+ assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("NewActionName");
+
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void testRefactorActionName_withInvalidName_throwsError() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ ActionDTO action = new ActionDTO();
+ action.setName("beforeNameChange");
+ action.setPageId(testPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("testField", "{{ beforeNameChange.data }}");
+
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setPageId(testPage.getId());
+ assert firstLayout != null;
+ refactorActionNameDTO.setLayoutId(firstLayout.getId());
+ refactorActionNameDTO.setOldName("beforeNameChange");
+ refactorActionNameDTO.setNewName("!PostNameChange");
+ assert createdAction != null;
+ refactorActionNameDTO.setActionId(createdAction.getId());
+
+ final Mono<LayoutDTO> layoutDTOMono = refactoringSolution.refactorActionName(refactorActionNameDTO);
+
+ StepVerifier
+ .create(layoutDTOMono)
+ .expectErrorMatches(e -> e instanceof AppsmithException &&
+ AppsmithError.INVALID_ACTION_NAME.getMessage().equalsIgnoreCase(e.getMessage()))
+ .verify();
+ }
+
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void refactorDuplicateActionName() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ String name = "duplicateName";
+
+ ActionDTO action = new ActionDTO();
+ action.setName(name);
+ action.setPageId(testPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("testField", "{{ duplicateName.data }}");
+
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO firstAction = layoutActionService.createSingleAction(action).block();
+
+ ActionDTO duplicateName = new ActionDTO();
+ duplicateName.setName(name);
+ duplicateName.setPageId(testPage.getId());
+ duplicateName.setActionConfiguration(actionConfiguration);
+ duplicateName.setDatasource(datasource);
+
+ NewAction duplicateNameCompleteAction = new NewAction();
+ duplicateNameCompleteAction.setUnpublishedAction(duplicateName);
+ duplicateNameCompleteAction.setPublishedAction(new ActionDTO());
+ duplicateNameCompleteAction.getPublishedAction().setDatasource(new Datasource());
+ duplicateNameCompleteAction.setWorkspaceId(duplicateName.getWorkspaceId());
+ duplicateNameCompleteAction.setPluginType(duplicateName.getPluginType());
+ duplicateNameCompleteAction.setPluginId(duplicateName.getPluginId());
+ duplicateNameCompleteAction.setTemplateId(duplicateName.getTemplateId());
+ duplicateNameCompleteAction.setProviderId(duplicateName.getProviderId());
+ duplicateNameCompleteAction.setDocumentation(duplicateName.getDocumentation());
+ duplicateNameCompleteAction.setApplicationId(duplicateName.getApplicationId());
+
+ // Now save this action directly in the repo to create a duplicate action name scenario
+ actionRepository.save(duplicateNameCompleteAction).block();
+
+ LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setPageId(testPage.getId());
+ refactorActionNameDTO.setLayoutId(firstLayout.getId());
+ refactorActionNameDTO.setOldName("duplicateName");
+ refactorActionNameDTO.setNewName("newName");
+ refactorActionNameDTO.setActionId(firstAction.getId());
+
+ LayoutDTO postNameChangeLayout = refactoringSolution.refactorActionName(refactorActionNameDTO).block();
+
+ Mono<NewAction> postNameChangeActionMono = newActionService.findById(firstAction.getId(), READ_ACTIONS);
+
+ StepVerifier
+ .create(postNameChangeActionMono)
+ .assertNext(updatedAction -> {
+
+ assertThat(updatedAction.getUnpublishedAction().getName()).isEqualTo("newName");
+
+ DslActionDTO actionDTO = postNameChangeLayout.getLayoutOnLoadActions().get(0).iterator().next();
+ assertThat(actionDTO.getName()).isEqualTo("newName");
+
+ dsl.put("testField", "{{ newName.data }}");
+ assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
+ })
+ .verifyComplete();
+ }
+
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void tableWidgetKeyEscapeRefactorName() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "Table1");
+ dsl.put("type", "TABLE_WIDGET");
+ Map primaryColumns = new HashMap<String, Object>();
+ JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+ primaryColumns.put("_id", jsonObject);
+ primaryColumns.put("_class", jsonObject);
+ dsl.put("primaryColumns", primaryColumns);
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+
+ layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
+ refactorNameDTO.setPageId(testPage.getId());
+ refactorNameDTO.setLayoutId(layout.getId());
+ refactorNameDTO.setOldName("Table1");
+ refactorNameDTO.setNewName("NewNameTable1");
+
+ Mono<LayoutDTO> widgetRenameMono = refactoringSolution.refactorWidgetName(refactorNameDTO).cache();
+
+ Mono<PageDTO> pageFromRepoMono = widgetRenameMono.then(newPageService.findPageById(testPage.getId(), READ_PAGES, false));
+
+ StepVerifier
+ .create(Mono.zip(widgetRenameMono, pageFromRepoMono))
+ .assertNext(tuple -> {
+ LayoutDTO updatedLayout = tuple.getT1();
+ PageDTO pageFromRepo = tuple.getT2();
+
+ String widgetName = (String) updatedLayout.getDsl().get("widgetName");
+ assertThat(widgetName).isEqualTo("NewNameTable1");
+
+ Map primaryColumns1 = (Map) updatedLayout.getDsl().get("primaryColumns");
+ assertThat(primaryColumns1.keySet()).containsAll(Set.of(FieldName.MONGO_UNESCAPED_ID, FieldName.MONGO_UNESCAPED_CLASS));
+
+ Map primaryColumns2 = (Map) pageFromRepo.getLayouts().get(0).getDsl().get("primaryColumns");
+ assertThat(primaryColumns2.keySet()).containsAll(Set.of(FieldName.MONGO_ESCAPE_ID, FieldName.MONGO_ESCAPE_CLASS));
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void simpleWidgetNameRefactor() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "Table1");
+ dsl.put("type", "TABLE_WIDGET");
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+
+ layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
+ refactorNameDTO.setPageId(testPage.getId());
+ refactorNameDTO.setLayoutId(layout.getId());
+ refactorNameDTO.setOldName("Table1");
+ refactorNameDTO.setNewName("NewNameTable1");
+
+ Mono<LayoutDTO> widgetRenameMono = refactoringSolution.refactorWidgetName(refactorNameDTO).cache();
+
+ Mono<PageDTO> pageFromRepoMono = widgetRenameMono.then(newPageService.findPageById(testPage.getId(), READ_PAGES, false));
+
+ StepVerifier
+ .create(Mono.zip(widgetRenameMono, pageFromRepoMono))
+ .assertNext(tuple -> {
+ LayoutDTO updatedLayout = tuple.getT1();
+ PageDTO pageFromRepo = tuple.getT2();
+
+ String widgetName = (String) updatedLayout.getDsl().get("widgetName");
+ assertThat(widgetName).isEqualTo("NewNameTable1");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void testRefactorWidgetName_forDefaultWidgetsInList_updatesBothWidgetsAndTemplateReferences() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "List1");
+ dsl.put("type", "LIST_WIDGET");
+ JSONObject template = new JSONObject();
+ template.put("oldWidgetName", "irrelevantContent");
+ dsl.put("template", template);
+ final JSONArray children = new JSONArray();
+ final JSONObject defaultWidget = new JSONObject();
+ defaultWidget.put("widgetName", "oldWidgetName");
+ defaultWidget.put("type", "TEXT_WIDGET");
+ children.add(defaultWidget);
+ dsl.put("children", children);
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+
+ layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
+ refactorNameDTO.setPageId(testPage.getId());
+ refactorNameDTO.setLayoutId(layout.getId());
+ refactorNameDTO.setOldName("oldWidgetName");
+ refactorNameDTO.setNewName("newWidgetName");
+
+ Mono<LayoutDTO> widgetRenameMono = refactoringSolution.refactorWidgetName(refactorNameDTO).cache();
+
+ StepVerifier
+ .create(widgetRenameMono)
+ .assertNext(updatedLayout -> {
+ assertTrue(((Map) updatedLayout.getDsl().get("template")).containsKey("newWidgetName"));
+ assertEquals("newWidgetName",
+ ((Map) (((List) updatedLayout.getDsl().get("children")).get(0))).get("widgetName"));
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void testWidgetNameRefactor_withSimpleUpdate_refactorsActionCollectionAndItsAction() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ // Set up table widget in DSL
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "Table1");
+ dsl.put("type", "TABLE_WIDGET");
+ Layout layout = testPage.getLayouts().get(0);
+ layout.setDsl(dsl);
+
+ layoutActionService.updateLayout(testPage.getId(), testApp.getId(), layout.getId(), layout).block();
+
+ // Create an action collection that refers to the table
+ ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
+ actionCollectionDTO1.setName("testCollection1");
+ actionCollectionDTO1.setPageId(testPage.getId());
+ actionCollectionDTO1.setApplicationId(testApp.getId());
+ actionCollectionDTO1.setWorkspaceId(testApp.getWorkspaceId());
+ actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
+ ActionDTO action1 = new ActionDTO();
+ action1.setName("testAction1");
+ action1.setActionConfiguration(new ActionConfiguration());
+ action1.getActionConfiguration().setBody("\tTable1");
+ actionCollectionDTO1.setBody("\tTable1");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+
+ final ActionCollectionDTO createdActionCollectionDTO1 = layoutCollectionService.createCollection(actionCollectionDTO1).block();
+
+ RefactorNameDTO refactorNameDTO = new RefactorNameDTO();
+ refactorNameDTO.setPageId(testPage.getId());
+ refactorNameDTO.setLayoutId(layout.getId());
+ refactorNameDTO.setOldName("Table1");
+ refactorNameDTO.setNewName("NewNameTable1");
+
+ LayoutDTO updatedLayout = refactoringSolution.refactorWidgetName(refactorNameDTO).block();
+
+ assert createdActionCollectionDTO1 != null;
+ final Mono<ActionCollection> actionCollectionMono = actionCollectionService.getById(createdActionCollectionDTO1.getId());
+ final Optional<String> optional = createdActionCollectionDTO1.getDefaultToBranchedActionIdsMap().values().stream().findFirst();
+ assert optional.isPresent();
+ final Mono<NewAction> actionMono = newActionService.findById(optional.get());
+
+ StepVerifier
+ .create(Mono.zip(actionCollectionMono, actionMono))
+ .assertNext(tuple -> {
+ final ActionCollection actionCollection = tuple.getT1();
+ final NewAction action = tuple.getT2();
+ assertThat(actionCollection.getUnpublishedCollection().getBody()).isEqualTo("\tNewNameTable1");
+ final ActionDTO unpublishedAction = action.getUnpublishedAction();
+ assertThat(unpublishedAction.getJsonPathKeys().size()).isEqualTo(1);
+ final Optional<String> first = unpublishedAction.getJsonPathKeys().stream().findFirst();
+ assert first.isPresent();
+ assertThat(first.get()).isEqualTo("\tNewNameTable1");
+ assertThat(unpublishedAction.getActionConfiguration().getBody()).isEqualTo("\tNewNameTable1");
+ })
+ .verifyComplete();
+ }
+
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void testRefactorCollection_withModifiedName_ignoresName() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ ActionCollectionDTO originalActionCollectionDTO = new ActionCollectionDTO();
+ originalActionCollectionDTO.setName("originalName");
+ originalActionCollectionDTO.setApplicationId(testApp.getId());
+ originalActionCollectionDTO.setWorkspaceId(testApp.getWorkspaceId());
+ originalActionCollectionDTO.setPageId(testPage.getId());
+ originalActionCollectionDTO.setPluginId(jsDatasource.getPluginId());
+ originalActionCollectionDTO.setPluginType(PluginType.JS);
+
+ ActionDTO action1 = new ActionDTO();
+ action1.setName("testAction1");
+ action1.setActionConfiguration(new ActionConfiguration());
+ action1.getActionConfiguration().setBody("Table1");
+
+ originalActionCollectionDTO.setActions(List.of(action1));
+
+ final ActionCollectionDTO dto = layoutCollectionService.createCollection(originalActionCollectionDTO).block();
+
+ ActionCollectionDTO actionCollectionDTO = new ActionCollectionDTO();
+ assert dto != null;
+ actionCollectionDTO.setId(dto.getId());
+ actionCollectionDTO.setBody("body");
+ actionCollectionDTO.setName("newName");
+
+ RefactorActionNameInCollectionDTO refactorActionNameInCollectionDTO = new RefactorActionNameInCollectionDTO();
+ refactorActionNameInCollectionDTO.setActionCollection(actionCollectionDTO);
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO(
+ dto.getActions().get(0).getId(),
+ testPage.getId(),
+ testPage.getLayouts().get(0).getId(),
+ "testAction1",
+ "newTestAction",
+ "originalName"
+ );
+ refactorActionNameInCollectionDTO.setRefactorAction(refactorActionNameDTO);
+
+ final Mono<Tuple2<ActionCollection, NewAction>> tuple2Mono = layoutCollectionService
+ .refactorAction(refactorActionNameInCollectionDTO)
+ .then(actionCollectionService.getById(dto.getId())
+ .zipWith(newActionService.findById(dto.getActions().get(0).getId())));
+
+ StepVerifier.create(tuple2Mono)
+ .assertNext(tuple -> {
+ final ActionCollectionDTO actionCollectionDTOResult = tuple.getT1().getUnpublishedCollection();
+ final NewAction newAction = tuple.getT2();
+ assertEquals("originalName", actionCollectionDTOResult.getName());
+ assertEquals("body", actionCollectionDTOResult.getBody());
+ assertEquals("newTestAction", newAction.getUnpublishedAction().getName());
+ assertEquals("originalName.newTestAction", newAction.getUnpublishedAction().getFullyQualifiedName());
+ })
+ .verifyComplete();
+
+ }
+
+
+}
\ No newline at end of file
|
c95f9987f0a04f6ae3ed53cfaf012f996aaeded5
|
2023-09-19 19:10:45
|
Parthvi
|
test: Cypress - Fix flaky test (#27238)
| false
|
Cypress - Fix flaky test (#27238)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
index 0b65860f6ee0..a8fd66da84d4 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
@@ -1,53 +1,54 @@
import gitSyncLocators from "../../../../../locators/gitSyncLocators";
-import * as _ from "../../../../../support/Objects/ObjectsCore";
+import {
+ gitSync,
+ agHelper,
+ homePage,
+ onboarding,
+ locators,
+} from "../../../../../support/Objects/ObjectsCore";
import { REPO, CURRENT_REPO } from "../../../../../fixtures/REPO";
let repoName1, repoName2, repoName3, repoName4, windowOpenSpy;
describe("Repo Limit Exceeded Error Modal", function () {
before(() => {
- cy.generateUUID().then((uid) => {
- cy.Signup(`${uid}@appsmithtest.com`, uid);
- });
const uuid = require("uuid");
repoName1 = uuid.v4().split("-")[0];
repoName2 = uuid.v4().split("-")[0];
repoName3 = uuid.v4().split("-")[0];
repoName4 = uuid.v4().split("-")[0];
- _.agHelper.AssertElementVisibility(_.locators._sidebar);
- _.onboarding.closeIntroModal();
+ agHelper.AssertElementVisibility(locators._sidebar);
+ onboarding.closeIntroModal();
});
- it("1. Modal should be opened with proper components", function () {
- _.homePage.NavigateToHome();
- _.homePage.CreateNewApplication();
- _.gitSync.CreateNConnectToGit(repoName1, true, true);
+ it("1. Verify Repo limit flow for CE instance", function () {
+ homePage.LogOutviaAPI();
+ cy.generateUUID().then((uid) => {
+ cy.Signup(`${uid}@appsmithtest.com`, uid);
+ });
+ homePage.NavigateToHome();
+ homePage.CreateNewApplication();
+ gitSync.CreateNConnectToGit(repoName1, true, true);
cy.get("@gitRepoName").then((repName) => {
repoName1 = repName;
});
- _.homePage.NavigateToHome();
- _.homePage.CreateNewApplication();
- _.gitSync.CreateNConnectToGit(repoName2, true, true);
+ homePage.NavigateToHome();
+ homePage.CreateNewApplication();
+ gitSync.CreateNConnectToGit(repoName2, true, true);
cy.get("@gitRepoName").then((repName) => {
repoName2 = repName;
});
- _.homePage.NavigateToHome();
- _.homePage.CreateNewApplication();
- _.gitSync.CreateNConnectToGit(repoName3, true, true);
+ homePage.NavigateToHome();
+ homePage.CreateNewApplication();
+ gitSync.CreateNConnectToGit(repoName3, true, true);
cy.get("@gitRepoName").then((repName) => {
repoName3 = repName;
});
- _.homePage.NavigateToHome();
- _.homePage.CreateNewApplication();
- _.gitSync.CreateNConnectToGit(repoName4, false, true);
+ homePage.NavigateToHome();
+ homePage.CreateNewApplication();
+ gitSync.CreateNConnectToGit(repoName4, false, true);
cy.get("@gitRepoName").then((repName) => {
repoName4 = repName;
});
-
- // cy.createAppAndConnectGit(repoName1, false);
- // cy.createAppAndConnectGit(repoName2, false);
- // cy.createAppAndConnectGit(repoName3, false);
- // cy.createAppAndConnectGit(repoName4, false, true);
-
if (CURRENT_REPO === REPO.CE) {
cy.get(gitSyncLocators.repoLimitExceededErrorModal).should("exist");
@@ -110,9 +111,9 @@ describe("Repo Limit Exceeded Error Modal", function () {
url: "api/v1/applications/" + repoName4,
failOnStatusCode: false,
});
- _.gitSync.DeleteTestGithubRepo(repoName1);
- _.gitSync.DeleteTestGithubRepo(repoName2);
- _.gitSync.DeleteTestGithubRepo(repoName3);
- _.gitSync.DeleteTestGithubRepo(repoName4);
+ gitSync.DeleteTestGithubRepo(repoName1);
+ gitSync.DeleteTestGithubRepo(repoName2);
+ gitSync.DeleteTestGithubRepo(repoName3);
+ gitSync.DeleteTestGithubRepo(repoName4);
});
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
index da5312774aee..6ff422258a49 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
@@ -39,7 +39,8 @@ describe("Export application as a JSON file", function () {
it("2. User with admin access,should be able to export the app", function () {
if (CURRENT_REPO === REPO.CE) {
- cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+ homePage.Signout(false);
+ homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
homePage.NavigateToHome();
agHelper.GenerateUUID();
cy.get("@guid").then((uid) => {
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index 4807f105284d..ac052bf5d742 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -5,4 +5,4 @@ cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
# For running all specs - uncomment below:
#cypress/e2e/**/**/*
-#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.
+#ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.
\ No newline at end of file
|
d7a8a39ebf51ad6ab584244d1e0d7cc35923f0d0
|
2023-08-31 13:51:04
|
ashit-rath
|
chore: Workspace home page refactor for packages (#26654)
| false
|
Workspace home page refactor for packages (#26654)
|
chore
|
diff --git a/app/client/src/ce/constants/PackageConstants.ts b/app/client/src/ce/constants/PackageConstants.ts
new file mode 100644
index 000000000000..cc94a15a7962
--- /dev/null
+++ b/app/client/src/ce/constants/PackageConstants.ts
@@ -0,0 +1,15 @@
+type ID = string;
+
+export type Package = {
+ id: ID;
+ name: string; // Name of the package.
+ icon: string;
+ color: string;
+ workspaceId: ID; // ID of the workspace where the package is created.
+ description?: string; // Description that will show up in package installation section.
+ modifiedBy: string;
+ modifiedAt: string;
+ userPermissions: string[];
+};
+
+export type PackageMetadata = Package;
diff --git a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx
new file mode 100644
index 000000000000..5d0f95ba997b
--- /dev/null
+++ b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx
@@ -0,0 +1,106 @@
+import React from "react";
+import { Button } from "design-system";
+import { importSvg } from "design-system-old";
+import { useSelector } from "react-redux";
+
+import {
+ CardListContainer,
+ CardListWrapper,
+ PaddingWrapper,
+ ResourceHeading,
+ Space,
+} from "pages/Applications/CommonElements";
+import {
+ getIsCreatingApplicationByWorkspaceId,
+ getIsFetchingApplications,
+} from "@appsmith/selectors/applicationSelectors";
+import { NoAppsFound } from "@appsmith/pages/Applications";
+import ApplicationCard from "pages/Applications/ApplicationCard";
+import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
+import type { UpdateApplicationPayload } from "@appsmith/api/ApplicationApi";
+
+const NoAppsFoundIcon = importSvg(() => import("assets/svg/no-apps-icon.svg"));
+
+type ApplicationCardListProps = {
+ applications: ApplicationPayload[];
+ canInviteToWorkspace: boolean;
+ enableImportExport: boolean;
+ hasCreateNewApplicationPermission: boolean;
+ hasManageWorkspacePermissions: boolean;
+ isMobile?: boolean;
+ workspaceId: string;
+ onClickAddNewButton: (workspaceId: string) => void;
+ deleteApplication: (applicationId: string) => void;
+ updateApplicationDispatch: (
+ id: string,
+ data: UpdateApplicationPayload,
+ ) => void;
+};
+
+function ApplicationCardList({
+ applications,
+ canInviteToWorkspace,
+ deleteApplication,
+ enableImportExport,
+ hasCreateNewApplicationPermission,
+ hasManageWorkspacePermissions,
+ isMobile,
+ onClickAddNewButton,
+ updateApplicationDispatch,
+ workspaceId,
+}: ApplicationCardListProps) {
+ const isCreatingApplication = Boolean(
+ useSelector(getIsCreatingApplicationByWorkspaceId(workspaceId)),
+ );
+ const isFetchingApplications = useSelector(getIsFetchingApplications);
+
+ return (
+ <CardListContainer isMobile={isMobile}>
+ <ResourceHeading isLoading={isFetchingApplications}>Apps</ResourceHeading>
+ <Space />
+ <CardListWrapper isMobile={isMobile} key={workspaceId}>
+ {applications.map((application: any) => {
+ return (
+ <PaddingWrapper isMobile={isMobile} key={application.id}>
+ <ApplicationCard
+ application={application}
+ delete={deleteApplication}
+ enableImportExport={enableImportExport}
+ isFetchingApplications={isFetchingApplications}
+ isMobile={isMobile}
+ key={application.id}
+ permissions={{
+ hasCreateNewApplicationPermission,
+ hasManageWorkspacePermissions,
+ canInviteToWorkspace,
+ }}
+ update={updateApplicationDispatch}
+ workspaceId={workspaceId}
+ />
+ </PaddingWrapper>
+ );
+ })}
+ {applications.length === 0 && (
+ <NoAppsFound>
+ <NoAppsFoundIcon />
+ <span>There’s nothing inside this workspace</span>
+ {/* below component is duplicate. This is because of cypress test were failing */}
+ {hasCreateNewApplicationPermission && (
+ <Button
+ className="t--new-button createnew"
+ isLoading={isCreatingApplication}
+ onClick={() => onClickAddNewButton(workspaceId)}
+ size="md"
+ startIcon={"plus"}
+ >
+ New
+ </Button>
+ )}
+ </NoAppsFound>
+ )}
+ </CardListWrapper>
+ </CardListContainer>
+ );
+}
+
+export default ApplicationCardList;
diff --git a/app/client/src/ce/pages/Applications/PackageCardList.tsx b/app/client/src/ce/pages/Applications/PackageCardList.tsx
new file mode 100644
index 000000000000..258fb820b4d7
--- /dev/null
+++ b/app/client/src/ce/pages/Applications/PackageCardList.tsx
@@ -0,0 +1,14 @@
+import type { Package } from "@appsmith/constants/PackageConstants";
+
+export type PackageCardListProps = {
+ isMobile: boolean;
+ workspaceId: string;
+ packages?: Package[];
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function PackageCardList(props: PackageCardListProps) {
+ return null;
+}
+
+export default PackageCardList;
diff --git a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
new file mode 100644
index 000000000000..e0f309b5e1a3
--- /dev/null
+++ b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
@@ -0,0 +1,59 @@
+import React from "react";
+import { Button } from "design-system";
+import { useSelector } from "react-redux";
+
+import {
+ getIsCreatingApplicationByWorkspaceId,
+ getIsFetchingApplications,
+ getUserApplicationsWorkspacesList,
+} from "@appsmith/selectors/applicationSelectors";
+import { hasCreateNewAppPermission } from "@appsmith/utils/permissionHelpers";
+
+export type WorkspaceActionProps = {
+ workspaceId: string;
+ isMobile: boolean;
+ onCreateNewApplication: (workspaceId: string) => void;
+};
+
+function WorkspaceAction({
+ isMobile,
+ onCreateNewApplication,
+ workspaceId,
+}: WorkspaceActionProps) {
+ const isFetchingApplications = useSelector(getIsFetchingApplications);
+ const isCreatingApplication = Boolean(
+ useSelector(getIsCreatingApplicationByWorkspaceId(workspaceId)),
+ );
+ const workspaceList = useSelector(getUserApplicationsWorkspacesList);
+ const workspaceObject = workspaceList.find(
+ ({ workspace }) => workspace.id === workspaceId,
+ );
+
+ if (!workspaceObject) return null;
+
+ const { applications, workspace } = workspaceObject;
+
+ const hasCreateNewApplicationPermission =
+ hasCreateNewAppPermission(workspace.userPermissions) && !isMobile;
+
+ if (
+ !hasCreateNewApplicationPermission ||
+ isFetchingApplications ||
+ applications.length === 0
+ )
+ return null;
+
+ return (
+ <Button
+ className="t--new-button createnew"
+ isLoading={isCreatingApplication}
+ onClick={() => onCreateNewApplication(workspace.id)}
+ size="md"
+ startIcon={"plus"}
+ >
+ New
+ </Button>
+ );
+}
+
+export default WorkspaceAction;
diff --git a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
new file mode 100644
index 000000000000..3e46d27190df
--- /dev/null
+++ b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
@@ -0,0 +1,196 @@
+import React from "react";
+import styled from "styled-components";
+import {
+ Button,
+ Menu,
+ MenuItem,
+ MenuContent,
+ MenuTrigger,
+} from "design-system";
+import {
+ EditInteractionKind,
+ EditableText,
+ SavingState,
+ notEmptyValidator,
+} from "design-system-old";
+import type { Workspace } from "@appsmith/constants/workspaceConstants";
+import {
+ DropdownOnSelectActions,
+ getOnSelectAction,
+} from "pages/common/CustomizedDropdown/dropdownHelpers";
+
+type WorkspaceMenuProps = {
+ canDeleteWorkspace: boolean;
+ canInviteToWorkspace: boolean;
+ enableImportExport: boolean;
+ handleDeleteWorkspace: (workspaceId: string) => void;
+ handleResetMenuState: () => void;
+ handleWorkspaceMenuClose: (open: boolean) => void;
+ hasCreateNewApplicationPermission: boolean;
+ hasManageWorkspacePermissions: boolean;
+ isFetchingResources: boolean;
+ isSavingWorkspaceInfo: boolean;
+ leaveWS: (workspaceId: string) => void;
+ setSelectedWorkspaceIdForImportApplication: (workspaceId?: string) => void;
+ setWarnLeavingWorkspace: (show: boolean) => void;
+ setWarnDeleteWorkspace: (show: boolean) => void;
+ setWorkspaceToOpenMenu: (value: string | null) => void;
+ warnDeleteWorkspace: boolean;
+ warnLeavingWorkspace: boolean;
+ workspace: Workspace;
+ workspaceNameChange: (newName: string, workspaceId: string) => void;
+ workspaceToOpenMenu: string | null;
+};
+
+const WorkspaceRename = styled(EditableText)`
+ padding: 0 2px;
+`;
+
+function WorkspaceMenu({
+ canDeleteWorkspace,
+ canInviteToWorkspace,
+ enableImportExport,
+ handleDeleteWorkspace,
+ handleResetMenuState,
+ handleWorkspaceMenuClose,
+ hasCreateNewApplicationPermission,
+ hasManageWorkspacePermissions,
+ isFetchingResources,
+ isSavingWorkspaceInfo,
+ leaveWS,
+ setSelectedWorkspaceIdForImportApplication,
+ setWarnDeleteWorkspace,
+ setWarnLeavingWorkspace,
+ setWorkspaceToOpenMenu,
+ warnDeleteWorkspace,
+ warnLeavingWorkspace,
+ workspace,
+ workspaceNameChange,
+ workspaceToOpenMenu,
+}: WorkspaceMenuProps) {
+ return (
+ <Menu
+ className="t--workspace-name"
+ data-testid="t--workspace-name"
+ onOpenChange={handleWorkspaceMenuClose}
+ open={workspace.id === workspaceToOpenMenu}
+ >
+ <MenuTrigger>
+ <Button
+ className="t--options-icon"
+ isDisabled={isFetchingResources}
+ isIconButton
+ kind="tertiary"
+ onClick={() => {
+ setWorkspaceToOpenMenu(workspace.id);
+ }}
+ size="md"
+ startIcon="context-menu"
+ />
+ </MenuTrigger>
+ <MenuContent
+ align="end"
+ onEscapeKeyDown={handleResetMenuState}
+ onInteractOutside={handleResetMenuState}
+ width="205px"
+ >
+ {hasManageWorkspacePermissions && (
+ <>
+ <div
+ className="px-3 py-2"
+ onKeyDown={(e) => {
+ // This is to prevent the Menu component to take focus away from the input
+ // https://github.com/radix-ui/primitives/issues/1175
+ e.stopPropagation();
+ }}
+ >
+ <WorkspaceRename
+ className="t--workspace-rename-input"
+ defaultValue={workspace.name}
+ editInteractionKind={EditInteractionKind.SINGLE}
+ fill
+ hideEditIcon={false}
+ isEditingDefault={false}
+ isInvalid={(value: string) => {
+ return notEmptyValidator(value).message;
+ }}
+ onBlur={(value: string) => {
+ workspaceNameChange(value, workspace.id);
+ }}
+ placeholder="Workspace name"
+ savingState={
+ isSavingWorkspaceInfo
+ ? SavingState.STARTED
+ : SavingState.NOT_STARTED
+ }
+ underline
+ />
+ </div>
+ <MenuItem
+ data-testid="t--workspace-setting"
+ onSelect={() =>
+ getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
+ path: `/workspace/${workspace.id}/settings/general`,
+ })
+ }
+ startIcon="settings-2-line"
+ >
+ Settings
+ </MenuItem>
+ </>
+ )}
+ {enableImportExport && hasCreateNewApplicationPermission && (
+ <MenuItem
+ data-testid="t--workspace-import-app"
+ onSelect={() =>
+ setSelectedWorkspaceIdForImportApplication(workspace.id)
+ }
+ startIcon="download"
+ >
+ Import
+ </MenuItem>
+ )}
+ {hasManageWorkspacePermissions && canInviteToWorkspace && (
+ <MenuItem
+ onSelect={() =>
+ getOnSelectAction(DropdownOnSelectActions.REDIRECT, {
+ path: `/workspace/${workspace.id}/settings/members`,
+ })
+ }
+ startIcon="member"
+ >
+ Members
+ </MenuItem>
+ )}
+ {canInviteToWorkspace && (
+ <MenuItem
+ className="error-menuitem"
+ onSelect={() => {
+ !warnLeavingWorkspace
+ ? setWarnLeavingWorkspace(true)
+ : leaveWS(workspace.id);
+ }}
+ startIcon="logout"
+ >
+ {!warnLeavingWorkspace ? "Leave workspace" : "Are you sure?"}
+ </MenuItem>
+ )}
+ {canDeleteWorkspace && (
+ <MenuItem
+ className="error-menuitem"
+ onSelect={() => {
+ warnDeleteWorkspace
+ ? handleDeleteWorkspace(workspace.id)
+ : setWarnDeleteWorkspace(true);
+ }}
+ startIcon="delete-bin-line"
+ >
+ {!warnDeleteWorkspace ? "Delete workspace" : "Are you sure?"}
+ </MenuItem>
+ )}
+ </MenuContent>
+ </Menu>
+ );
+}
+
+export default WorkspaceMenu;
diff --git a/app/client/src/ce/pages/Applications/helpers.ts b/app/client/src/ce/pages/Applications/helpers.ts
new file mode 100644
index 000000000000..4640cd17d1bb
--- /dev/null
+++ b/app/client/src/ce/pages/Applications/helpers.ts
@@ -0,0 +1,15 @@
+import { getIsFetchingPackages } from "@appsmith/selectors/packageSelectors";
+import { useCallback } from "react";
+import { useSelector } from "react-redux";
+
+export const usePackage = () => {
+ const isFetchingPackages = useSelector(getIsFetchingPackages);
+
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
+ const createPackage = useCallback((workspaceId: string) => {}, []);
+
+ return {
+ isFetchingPackages,
+ createPackage,
+ };
+};
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index a39fb675ec36..66ed5440e391 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -31,34 +31,19 @@ import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstant
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import PageWrapper from "pages/common/PageWrapper";
import SubHeader from "pages/common/SubHeader";
-import ApplicationCard from "pages/Applications/ApplicationCard";
import WorkspaceInviteUsersForm from "@appsmith/pages/workspace/WorkspaceInviteUsersForm";
import type { User } from "constants/userConstants";
import { getCurrentUser } from "selectors/usersSelectors";
import { CREATE_WORKSPACE_FORM_NAME } from "@appsmith/constants/forms";
-import {
- DropdownOnSelectActions,
- getOnSelectAction,
-} from "pages/common/CustomizedDropdown/dropdownHelpers";
import {
AppIconCollection,
Classes,
EditableText,
- EditInteractionKind,
MenuItem as ListItem,
- notEmptyValidator,
- SavingState,
Text,
TextType,
} from "design-system-old";
-import {
- Button,
- Icon,
- Menu,
- MenuItem,
- MenuContent,
- MenuTrigger,
-} from "design-system";
+import { Divider, Icon } from "design-system";
import {
setShowAppInviteUsersDialog,
updateApplication,
@@ -110,15 +95,19 @@ import {
import { getTenantPermissions } from "@appsmith/selectors/tenantSelectors";
import { getAppsmithConfigs } from "@appsmith/configs";
import FormDialogComponent from "components/editorComponents/form/FormDialogComponent";
-import { importSvg } from "design-system-old";
-
-const NoAppsFoundIcon = importSvg(() => import("assets/svg/no-apps-icon.svg"));
+import WorkspaceMenu from "./WorkspaceMenu";
+import ApplicationCardList from "./ApplicationCardList";
+import { usePackage } from "@appsmith/pages/Applications/helpers";
+import PackageCardList from "@appsmith/pages/Applications/PackageCardList";
+import WorkspaceAction from "@appsmith/pages/Applications/WorkspaceAction";
export const { cloudHosting } = getAppsmithConfigs();
+export const CONTAINER_WRAPPER_PADDING = "var(--ads-v2-spaces-7)";
+
export const WorkspaceDropDown = styled.div<{ isMobile?: boolean }>`
display: flex;
- padding: ${(props) => (props.isMobile ? `10px 16px` : `10px 0`)};
+ padding: ${(props) => (props.isMobile ? `10px 16px` : `24px 0`)};
font-size: ${(props) => props.theme.fontSizes[1]}px;
justify-content: space-between;
align-items: center;
@@ -132,85 +121,10 @@ export const WorkspaceDropDown = styled.div<{ isMobile?: boolean }>`
`}
`;
-export const ApplicationCardsWrapper = styled.div<{ isMobile?: boolean }>`
- display: flex;
- flex-wrap: wrap;
- gap: ${({ isMobile }) => (isMobile ? 12 : 20)}px;
- font-size: ${(props) => props.theme.fontSizes[4]}px;
- padding: ${({ isMobile }) => (isMobile ? `10px 16px` : `10px 0`)};
-`;
-
export const WorkspaceSection = styled.div<{ isMobile?: boolean }>`
- margin-bottom: ${({ isMobile }) => (isMobile ? `8` : `40`)}px;
-`;
-
-export const PaddingWrapper = styled.div<{ isMobile?: boolean }>`
- display: flex;
- align-items: baseline;
- justify-content: center;
- width: ${(props) => props.theme.card.minWidth}px;
-
- @media screen and (min-width: 1500px) {
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth}px;
- height: ${(props) => props.theme.card.minHeight}px;
- }
- }
-
- @media screen and (min-width: 1500px) and (max-width: 1512px) {
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 5}px;
- height: ${(props) => props.theme.card.minHeight - 5}px;
- }
- }
- @media screen and (min-width: 1478px) and (max-width: 1500px) {
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 8}px;
- height: ${(props) => props.theme.card.minHeight - 8}px;
- }
- }
-
- @media screen and (min-width: 1447px) and (max-width: 1477px) {
- width: ${(props) =>
- props.theme.card.minWidth + props.theme.spaces[3] * 2}px;
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 8}px;
- height: ${(props) => props.theme.card.minHeight - 8}px;
- }
- }
-
- @media screen and (min-width: 1417px) and (max-width: 1446px) {
- width: ${(props) =>
- props.theme.card.minWidth + props.theme.spaces[3] * 2}px;
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 11}px;
- height: ${(props) => props.theme.card.minHeight - 11}px;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1417px) {
- width: ${(props) =>
- props.theme.card.minWidth + props.theme.spaces[2] * 2}px;
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 15}px;
- height: ${(props) => props.theme.card.minHeight - 15}px;
- }
- }
-
- @media screen and (max-width: 1400px) {
- width: ${(props) =>
- props.theme.card.minWidth + props.theme.spaces[2] * 2}px;
- .bp3-card {
- width: ${(props) => props.theme.card.minWidth - 15}px;
- height: ${(props) => props.theme.card.minHeight - 15}px;
- }
- }
-
- ${({ isMobile }) =>
- isMobile &&
- `
- width: 100% !important;
- `}
+ padding: ${({ isMobile }) =>
+ isMobile ? 0 : `0 ${CONTAINER_WRAPPER_PADDING}`};
+ margin-bottom: ${({ isMobile }) => (isMobile ? `8` : `0`)}px;
`;
export const LeftPaneWrapper = styled.div<{ isBannerVisible?: boolean }>`
@@ -232,7 +146,6 @@ export const LeftPaneWrapper = styled.div<{ isBannerVisible?: boolean }>`
padding: 0 16px;
`;
export const ApplicationContainer = styled.div<{ isMobile?: boolean }>`
- padding-top: 16px;
${({ isMobile }) =>
isMobile &&
`
@@ -468,7 +381,8 @@ export const CreateNewLabel = styled(Text)`
export const WorkspaceNameElement = styled(Text)<{ isMobile?: boolean }>`
max-width: ${({ isMobile }) => (isMobile ? 220 : 500)}px;
${truncateTextUsingEllipsis};
- color: var(--ads-v2-color-fg-emphasis);
+ color: var(--ads-v2-color-fg);
+ font-weight: var(--ads-font-weight-bold-xl);
`;
export const WorkspaceNameHolder = styled(Text)`
@@ -506,7 +420,7 @@ export const ApplicationsWrapper = styled.div<{ isMobile: boolean }>`
margin-left: ${(props) => props.theme.homePage.leftPane.width}px;
width: calc(100% - ${(props) => props.theme.homePage.leftPane.width}px);
scroll-behavior: smooth;
- padding: var(--ads-v2-spaces-7);
+ padding: ${CONTAINER_WRAPPER_PADDING} 0;
${({ isMobile }) =>
isMobile &&
`
@@ -520,6 +434,7 @@ export function ApplicationsSection(props: any) {
const enableImportExport = true;
const dispatch = useDispatch();
const theme = useContext(ThemeContext);
+ const { isFetchingPackages } = usePackage();
const isSavingWorkspaceInfo = useSelector(getIsSavingWorkspaceInfo);
const isFetchingApplications = useSelector(getIsFetchingApplications);
const userWorkspaces = useSelector(getUserApplicationsWorkspacesList);
@@ -547,6 +462,7 @@ export function ApplicationsSection(props: any) {
) => {
dispatch(updateApplication(id, data));
};
+ const isLoadingResources = isFetchingApplications || isFetchingPackages;
useEffect(() => {
// Clears URL params cache
@@ -573,7 +489,7 @@ export function ApplicationsSection(props: any) {
[dispatch],
);
- const WorkspaceNameChange = (newName: string, workspaceId: string) => {
+ const workspaceNameChange = (newName: string, workspaceId: string) => {
dispatch(
saveWorkspace({
id: workspaceId as string,
@@ -596,13 +512,13 @@ export function ApplicationsSection(props: any) {
>
<StyledAnchor id={workspaceSlug} />
<WorkspaceNameHolder
- className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
- type={TextType.H1}
+ className={isLoadingResources ? BlueprintClasses.SKELETON : ""}
+ type={TextType.H4}
>
<WorkspaceNameElement
- className={isFetchingApplications ? BlueprintClasses.SKELETON : ""}
+ className={isLoadingResources ? BlueprintClasses.SKELETON : ""}
isMobile={isMobile}
- type={TextType.H1}
+ type={TextType.H4}
>
{workspaceName}
</WorkspaceNameElement>
@@ -635,7 +551,7 @@ export function ApplicationsSection(props: any) {
}, []);
let updatedWorkspaces;
- if (!isFetchingApplications) {
+ if (!isLoadingResources) {
updatedWorkspaces = userWorkspaces;
} else {
updatedWorkspaces = loadingUserWorkspaces as any;
@@ -643,7 +559,7 @@ export function ApplicationsSection(props: any) {
let workspacesListComponent;
if (
- !isFetchingApplications &&
+ !isLoadingResources &&
props.searchKeyword &&
props.searchKeyword.trim().length > 0 &&
updatedWorkspaces.length === 0
@@ -664,7 +580,8 @@ export function ApplicationsSection(props: any) {
} else {
workspacesListComponent = updatedWorkspaces.map(
(workspaceObject: any, index: number) => {
- const { applications, workspace } = workspaceObject;
+ const isLastWorkspace = updatedWorkspaces.length === index + 1;
+ const { applications, packages, workspace } = workspaceObject;
const hasManageWorkspacePermissions = isPermitted(
workspace.userPermissions,
PERMISSION_TYPE.MANAGE_WORKSPACE,
@@ -679,7 +596,7 @@ export function ApplicationsSection(props: any) {
const hasCreateNewApplicationPermission =
hasCreateNewAppPermission(workspace.userPermissions) && !isMobile;
- const onClickAddNewButton = (workspaceId: string) => {
+ const onClickAddNewAppButton = (workspaceId: string) => {
if (
Object.entries(creatingApplicationMap).length === 0 ||
(creatingApplicationMap && !creatingApplicationMap[workspaceId])
@@ -713,244 +630,111 @@ export function ApplicationsSection(props: any) {
};
return (
- <WorkspaceSection
- className="t--workspace-section"
- isMobile={isMobile}
- key={index}
- >
- <WorkspaceDropDown isMobile={isMobile}>
- {(currentUser || isFetchingApplications) &&
- WorkspaceMenuTarget({
- workspaceName: workspace.name,
- workspaceSlug: workspace.id,
- })}
- {selectedWorkspaceIdForImportApplication && (
- <ImportApplicationModal
- isModalOpen={
- selectedWorkspaceIdForImportApplication === workspace.id
- }
- onClose={() => setSelectedWorkspaceIdForImportApplication("")}
- workspaceId={selectedWorkspaceIdForImportApplication}
- />
- )}
- {!isFetchingApplications && (
- <WorkspaceShareUsers>
- <SharedUserList workspaceId={workspace.id} />
- {canInviteToWorkspace && !isMobile && (
- <FormDialogComponent
- Form={WorkspaceInviteUsersForm}
- onOpenOrClose={handleFormOpenOrClose}
- placeholder={createMessage(
- INVITE_USERS_PLACEHOLDER,
- cloudHosting,
- )}
- workspace={workspace}
- />
- )}
- {hasCreateNewApplicationPermission &&
- !isFetchingApplications &&
- applications.length !== 0 && (
- <Button
- className="t--new-button createnew"
- isLoading={
- creatingApplicationMap &&
- creatingApplicationMap[workspace.id]
- }
- onClick={() => onClickAddNewButton(workspace.id)}
- size="md"
- startIcon={"plus"}
- >
- New
- </Button>
- )}
- {(currentUser || isFetchingApplications) &&
- !isMobile &&
- showWorkspaceMenuOptions && (
- <Menu
- className="t--workspace-name"
- data-testid="t--workspace-name"
- onOpenChange={handleWorkspaceMenuClose}
- open={workspace.id === workspaceToOpenMenu}
- >
- <MenuTrigger>
- <Button
- className="t--options-icon"
- isDisabled={isFetchingApplications}
- isIconButton
- kind="tertiary"
- onClick={() => {
- setWorkspaceToOpenMenu(workspace.id);
- }}
- size="md"
- startIcon="context-menu"
- />
- </MenuTrigger>
- <MenuContent
- align="end"
- onEscapeKeyDown={handleResetMenuState}
- onInteractOutside={handleResetMenuState}
- width="205px"
- >
- {hasManageWorkspacePermissions && (
- <>
- <div
- className="px-3 py-2"
- onKeyDown={(e) => {
- // This is to prevent the Menu component to take focus away from the input
- // https://github.com/radix-ui/primitives/issues/1175
- e.stopPropagation();
- }}
- >
- <WorkspaceRename
- className="t--workspace-rename-input"
- defaultValue={workspace.name}
- editInteractionKind={
- EditInteractionKind.SINGLE
- }
- fill
- hideEditIcon={false}
- isEditingDefault={false}
- isInvalid={(value: string) => {
- return notEmptyValidator(value).message;
- }}
- onBlur={(value: string) => {
- WorkspaceNameChange(value, workspace.id);
- }}
- placeholder="Workspace name"
- savingState={
- isSavingWorkspaceInfo
- ? SavingState.STARTED
- : SavingState.NOT_STARTED
- }
- underline
- />
- </div>
- <MenuItem
- data-testid="t--workspace-setting"
- onSelect={() =>
- getOnSelectAction(
- DropdownOnSelectActions.REDIRECT,
- {
- path: `/workspace/${workspace.id}/settings/general`,
- },
- )
- }
- startIcon="settings-2-line"
- >
- Settings
- </MenuItem>
- </>
- )}
- {enableImportExport &&
- hasCreateNewApplicationPermission && (
- <MenuItem
- data-testid="t--workspace-import-app"
- onSelect={() =>
- setSelectedWorkspaceIdForImportApplication(
- workspace.id,
- )
- }
- startIcon="download"
- >
- Import
- </MenuItem>
- )}
- {hasManageWorkspacePermissions &&
- canInviteToWorkspace && (
- <MenuItem
- onSelect={() =>
- getOnSelectAction(
- DropdownOnSelectActions.REDIRECT,
- {
- path: `/workspace/${workspace.id}/settings/members`,
- },
- )
- }
- startIcon="member"
- >
- Members
- </MenuItem>
- )}
- {canInviteToWorkspace && (
- <MenuItem
- className="error-menuitem"
- onSelect={() => {
- !warnLeavingWorkspace
- ? setWarnLeavingWorkspace(true)
- : leaveWS(workspace.id);
- }}
- startIcon="logout"
- >
- {!warnLeavingWorkspace
- ? "Leave workspace"
- : "Are you sure?"}
- </MenuItem>
- )}
- {applications.length === 0 && canDeleteWorkspace && (
- <MenuItem
- className="error-menuitem"
- onSelect={() => {
- warnDeleteWorkspace
- ? handleDeleteWorkspace(workspace.id)
- : setWarnDeleteWorkspace(true);
- }}
- startIcon="delete-bin-line"
- >
- {!warnDeleteWorkspace
- ? "Delete workspace"
- : "Are you sure?"}
- </MenuItem>
- )}
- </MenuContent>
- </Menu>
+ <React.Fragment key={workspace.id}>
+ <WorkspaceSection
+ className="t--workspace-section"
+ isMobile={isMobile}
+ key={index}
+ >
+ <WorkspaceDropDown isMobile={isMobile}>
+ {(currentUser || isLoadingResources) &&
+ WorkspaceMenuTarget({
+ workspaceName: workspace.name,
+ workspaceSlug: workspace.id,
+ })}
+ {selectedWorkspaceIdForImportApplication && (
+ <ImportApplicationModal
+ isModalOpen={
+ selectedWorkspaceIdForImportApplication === workspace.id
+ }
+ onClose={() =>
+ setSelectedWorkspaceIdForImportApplication("")
+ }
+ workspaceId={selectedWorkspaceIdForImportApplication}
+ />
+ )}
+ {!isLoadingResources && (
+ <WorkspaceShareUsers>
+ <SharedUserList workspaceId={workspace.id} />
+ {canInviteToWorkspace && !isMobile && (
+ <FormDialogComponent
+ Form={WorkspaceInviteUsersForm}
+ onOpenOrClose={handleFormOpenOrClose}
+ placeholder={createMessage(
+ INVITE_USERS_PLACEHOLDER,
+ cloudHosting,
+ )}
+ workspace={workspace}
+ />
)}
- </WorkspaceShareUsers>
- )}
- </WorkspaceDropDown>
- <ApplicationCardsWrapper isMobile={isMobile} key={workspace.id}>
- {applications.map((application: any) => {
- return (
- <PaddingWrapper isMobile={isMobile} key={application.id}>
- <ApplicationCard
- application={application}
- delete={deleteApplication}
- enableImportExport={enableImportExport}
+ <WorkspaceAction
isMobile={isMobile}
- key={application.id}
- permissions={{
- hasCreateNewApplicationPermission,
- hasManageWorkspacePermissions,
- canInviteToWorkspace,
- }}
- update={updateApplicationDispatch}
+ onCreateNewApplication={onClickAddNewAppButton}
workspaceId={workspace.id}
/>
- </PaddingWrapper>
- );
- })}
- {applications.length === 0 && (
- <NoAppsFound>
- <NoAppsFoundIcon />
- <span>There’s nothing inside this workspace</span>
- {/* below component is duplicate. This is because of cypress test were failing */}
- {hasCreateNewApplicationPermission && (
- <Button
- className="t--new-button createnew"
- isLoading={
- creatingApplicationMap &&
- creatingApplicationMap[workspace.id]
- }
- onClick={() => onClickAddNewButton(workspace.id)}
- size="md"
- startIcon={"plus"}
- >
- New
- </Button>
- )}
- </NoAppsFound>
+ {(currentUser || isLoadingResources) &&
+ !isMobile &&
+ showWorkspaceMenuOptions && (
+ <WorkspaceMenu
+ canDeleteWorkspace={
+ applications.length === 0 &&
+ packages.length === 0 &&
+ canDeleteWorkspace
+ }
+ canInviteToWorkspace={canInviteToWorkspace}
+ enableImportExport={enableImportExport}
+ handleDeleteWorkspace={handleDeleteWorkspace}
+ handleResetMenuState={handleResetMenuState}
+ handleWorkspaceMenuClose={handleWorkspaceMenuClose}
+ hasCreateNewApplicationPermission={
+ hasCreateNewApplicationPermission
+ }
+ hasManageWorkspacePermissions={
+ hasManageWorkspacePermissions
+ }
+ isFetchingResources={isLoadingResources}
+ isSavingWorkspaceInfo={isSavingWorkspaceInfo}
+ leaveWS={leaveWS}
+ setSelectedWorkspaceIdForImportApplication={
+ setSelectedWorkspaceIdForImportApplication
+ }
+ setWarnDeleteWorkspace={setWarnDeleteWorkspace}
+ setWarnLeavingWorkspace={setWarnLeavingWorkspace}
+ setWorkspaceToOpenMenu={setWorkspaceToOpenMenu}
+ warnDeleteWorkspace={warnDeleteWorkspace}
+ warnLeavingWorkspace={warnLeavingWorkspace}
+ workspace={workspace}
+ workspaceNameChange={workspaceNameChange}
+ workspaceToOpenMenu={workspaceToOpenMenu}
+ />
+ )}
+ </WorkspaceShareUsers>
+ )}
+ </WorkspaceDropDown>
+ <ApplicationCardList
+ applications={applications}
+ canInviteToWorkspace={canInviteToWorkspace}
+ deleteApplication={deleteApplication}
+ enableImportExport={enableImportExport}
+ hasCreateNewApplicationPermission={
+ hasCreateNewApplicationPermission
+ }
+ hasManageWorkspacePermissions={hasManageWorkspacePermissions}
+ isMobile={isMobile}
+ onClickAddNewButton={onClickAddNewAppButton}
+ updateApplicationDispatch={updateApplicationDispatch}
+ workspaceId={workspace.id}
+ />
+ {!isLoadingResources && (
+ <PackageCardList
+ isMobile={isMobile}
+ packages={packages}
+ workspaceId={workspace.id}
+ />
)}
- </ApplicationCardsWrapper>
- </WorkspaceSection>
+ </WorkspaceSection>
+ {!isLastWorkspace && <Divider />}
+ </React.Fragment>
);
},
);
@@ -988,6 +772,7 @@ export interface ApplicationProps {
showHeaderSeparator: boolean,
) => void;
resetEditor: () => void;
+ queryModuleFeatureFlagEnabled: boolean;
}
export interface ApplicationState {
diff --git a/app/client/src/ce/selectors/applicationSelectors.tsx b/app/client/src/ce/selectors/applicationSelectors.tsx
index ae21159a844d..16a152b47db8 100644
--- a/app/client/src/ce/selectors/applicationSelectors.tsx
+++ b/app/client/src/ce/selectors/applicationSelectors.tsx
@@ -1,27 +1,60 @@
import { createSelector } from "reselect";
+import { groupBy } from "lodash";
import type { AppState } from "@appsmith/reducers";
import type {
ApplicationsReduxState,
creatingApplicationMap,
} from "@appsmith/reducers/uiReducers/applicationsReducer";
-import type {
- ApplicationPayload,
- WorkspaceDetails,
-} from "@appsmith/constants/ReduxActionConstants";
+import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
import Fuse from "fuse.js";
import type { Workspaces } from "@appsmith/constants/workspaceConstants";
import type { GitApplicationMetadata } from "@appsmith/api/ApplicationApi";
import { hasCreateNewAppPermission } from "@appsmith/utils/permissionHelpers";
import { NAVIGATION_SETTINGS, SIDEBAR_WIDTH } from "constants/AppConstants";
+import { getPackagesList } from "@appsmith/selectors/packageSelectors";
+import type { PackageMetadata } from "@appsmith/constants/PackageConstants";
const fuzzySearchOptions = {
- keys: ["applications.name", "workspace.name"],
+ keys: ["applications.name", "workspace.name", "packages.name"],
shouldSort: true,
threshold: 0.5,
location: 0,
distance: 100,
};
+/**
+ * Helps injecting packages array into the Workspaces Array.
+ * workspacesList
+ * {
+ * workspace: {},
+ * applications: [],
+ * users:[]
+ * }
+ *
+ * @returns
+ * {
+ * workspace: {},
+ * applications: [],
+ * users:[],
+ * packages: []
+ * }
+ */
+const injectPackagesToWorkspacesList = (
+ workspacesList: Workspaces[] = [],
+ packages: PackageMetadata[] = [],
+) => {
+ const packagesGroupByWorkspaceId = groupBy(packages, (p) => p.workspaceId);
+
+ return workspacesList.map((workspacesObj) => {
+ const { workspace } = workspacesObj;
+
+ return {
+ ...workspacesObj,
+ packages: packagesGroupByWorkspaceId[workspace.id] || [],
+ };
+ });
+};
+
export const getApplicationsState = (state: AppState) => state.ui.applications;
export const getApplications = (state: AppState) =>
state.ui.applications.applicationList;
@@ -82,37 +115,47 @@ export const getApplicationList = createSelector(
export const getUserApplicationsWorkspacesList = createSelector(
getUserApplicationsWorkspaces,
getApplicationSearchKeyword,
+ getPackagesList,
(
applicationsWorkspaces?: Workspaces[],
keyword?: string,
- ): WorkspaceDetails[] => {
+ packages?: PackageMetadata[],
+ ) => {
+ const workspacesList = injectPackagesToWorkspacesList(
+ applicationsWorkspaces,
+ packages,
+ );
+
if (
- applicationsWorkspaces &&
- applicationsWorkspaces.length > 0 &&
+ workspacesList &&
+ workspacesList.length > 0 &&
keyword &&
keyword.trim().length > 0
) {
- const fuzzy = new Fuse(applicationsWorkspaces, fuzzySearchOptions);
- let workspaceList = fuzzy.search(keyword) as WorkspaceDetails[];
- workspaceList = workspaceList.map((workspace) => {
- const applicationFuzzy = new Fuse(workspace.applications, {
+ const fuzzy = new Fuse(workspacesList, fuzzySearchOptions);
+ const workspaceList = fuzzy.search(keyword);
+
+ return workspaceList.map((workspace) => {
+ const appFuzzy = new Fuse(workspace.applications, {
+ ...fuzzySearchOptions,
+ keys: ["name"],
+ });
+ const packageFuzzy = new Fuse(workspace.packages, {
...fuzzySearchOptions,
keys: ["name"],
});
- const applications = applicationFuzzy.search(keyword) as any[];
return {
...workspace,
- applications,
+ applications: appFuzzy.search(keyword),
+ packages: packageFuzzy.search(keyword),
};
});
-
- return workspaceList;
} else if (
- applicationsWorkspaces &&
+ workspacesList &&
(keyword === undefined || keyword.trim().length === 0)
) {
- return applicationsWorkspaces;
+ return workspacesList;
}
return [];
},
@@ -136,6 +179,13 @@ export const getIsCreatingApplication = createSelector(
applications.creatingApplication,
);
+export const getIsCreatingApplicationByWorkspaceId = (workspaceId: string) =>
+ createSelector(
+ getApplicationsState,
+ (applications: ApplicationsReduxState) =>
+ applications.creatingApplication[workspaceId],
+ );
+
export const getCreateApplicationError = createSelector(
getApplicationsState,
(applications: ApplicationsReduxState): string | undefined =>
diff --git a/app/client/src/ce/selectors/packageSelectors.ts b/app/client/src/ce/selectors/packageSelectors.ts
new file mode 100644
index 000000000000..a3bf6e1fea59
--- /dev/null
+++ b/app/client/src/ce/selectors/packageSelectors.ts
@@ -0,0 +1,15 @@
+import type { PackageMetadata } from "@appsmith/constants/PackageConstants";
+import type { AppState } from "@appsmith/reducers";
+
+const DEFAULT_PACKAGE_LIST: PackageMetadata[] = [];
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const getIsFetchingPackages = (state: AppState) => false;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const getIsCreatingPackage = (state: AppState, workspaceId: string) =>
+ false;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const getPackagesList = (state: AppState): PackageMetadata[] =>
+ DEFAULT_PACKAGE_LIST;
diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx
new file mode 100644
index 000000000000..08614b50f756
--- /dev/null
+++ b/app/client/src/components/common/Card.tsx
@@ -0,0 +1,355 @@
+import React from "react";
+import styled from "styled-components";
+import { Card as BlueprintCard, Classes } from "@blueprintjs/core";
+import { noop, omit } from "lodash";
+import { AppIcon, Size, TextType, Text } from "design-system-old";
+import type { PropsWithChildren } from "react";
+import type { HTMLDivProps, ICardProps } from "@blueprintjs/core";
+import type { MenuItemProps } from "design-system";
+
+import GitConnectedBadge from "./GitConnectedBadge";
+
+type CardProps = PropsWithChildren<{
+ backgroundColor: string;
+ contextMenu: React.ReactNode;
+ editedByText: string;
+ hasReadPermission: boolean;
+ icon: string;
+ isContextMenuOpen: boolean;
+ isFetching: boolean;
+ isMobile?: boolean;
+ moreActionItems: ModifiedMenuItemProps[];
+ primaryAction: (e: any) => void;
+ setShowOverlay: (show: boolean) => void;
+ showGitBadge: boolean;
+ showOverlay: boolean;
+ testId: string;
+ title: string;
+ titleTestId: string;
+}>;
+
+type NameWrapperProps = {
+ hasReadPermission: boolean;
+ showOverlay: boolean;
+ isContextMenuOpen: boolean;
+};
+
+type ModifiedMenuItemProps = MenuItemProps & {
+ key?: string;
+ "data-testid"?: string;
+};
+
+const ApplicationImage = styled.div`
+ && {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+`;
+
+const AppNameWrapper = styled.div<{ isFetching: boolean }>`
+ padding: 0;
+ padding-right: 12px;
+ ${(props) =>
+ props.isFetching
+ ? `
+ width: 119px;
+ height: 16px;
+ margin-left: 10px;
+ `
+ : null};
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3; /* number of lines to show */
+ -webkit-box-orient: vertical;
+ word-break: break-word;
+ color: ${(props) => props.theme.colors.text.heading};
+ flex: 1;
+
+ .bp3-popover-target {
+ display: inline;
+ }
+`;
+
+const Container = styled.div<{ isMobile?: boolean }>`
+ position: relative;
+ overflow: visible;
+ ${({ isMobile }) => isMobile && `width: 100%;`}
+`;
+
+const CircleAppIcon = styled(AppIcon)`
+ padding: 12px;
+ background-color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.07);
+ border-radius: 50%;
+
+ svg {
+ width: 100%;
+ height: 100%;
+ path {
+ fill: var(--ads-v2-color-fg);
+ }
+ }
+`;
+
+const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
+ <div
+ {...omit(props, ["hasReadPermission", "showOverlay", "isContextMenuOpen"])}
+ />
+))`
+ .bp3-card {
+ border-radius: var(--ads-v2-border-radius);
+ box-shadow: none;
+ padding: 16px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ ${(props) =>
+ props.showOverlay &&
+ `
+ {
+ justify-content: center;
+ align-items: center;
+
+ .overlay {
+ position: relative;
+ border-radius: var(--ads-v2-border-radius);
+ ${
+ props.hasReadPermission &&
+ `text-decoration: none;
+ &:after {
+ left: 0;
+ top: 0;
+ content: "";
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ }
+ & .control {
+ display: flex;
+ flex-direction: row;
+ z-index: 1;
+ }`
+ }
+
+ & div.overlay-blur {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: ${
+ props.hasReadPermission && !props.isContextMenuOpen
+ ? `rgba(255, 255, 255, 0.5)`
+ : null
+ };
+ border-radius: var(--ads-v2-border-radius);
+ @supports ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
+ background-color: transparent;
+ backdrop-filter: ${
+ props.hasReadPermission && !props.isContextMenuOpen
+ ? `blur(6px)`
+ : null
+ };
+ }
+ }
+ }
+ }
+ `}
+ overflow: hidden;
+`;
+
+const Wrapper = styled(
+ (
+ props: ICardProps & {
+ hasReadPermission?: boolean;
+ backgroundColor: string;
+ isMobile?: boolean;
+ },
+ ) => (
+ <BlueprintCard
+ {...omit(props, ["hasReadPermission", "backgroundColor", "isMobile"])}
+ />
+ ),
+)`
+ display: flex;
+ flex-direction: row-reverse;
+ justify-content: center;
+ width: ${(props) => props.theme.card.minWidth}px;
+ height: ${(props) => props.theme.card.minHeight}px;
+ position: relative;
+ background-color: ${(props) => props.backgroundColor};
+ border-radius: var(--ads-v2-border-radius);
+ .overlay {
+ display: block;
+ position: absolute;
+ left: 0;
+ top: 0;
+ height: 100%;
+ width: 100%;
+ ${(props) => !props.hasReadPermission && `pointer-events: none;`}
+ }
+ .bp3-card {
+ border-radius: var(--ads-v2-border-radius);
+ }
+ }
+
+ ${({ isMobile }) =>
+ isMobile &&
+ `
+ width: 100% !important;
+ height: 126px !important;
+ `}
+`;
+
+const Control = styled.div<{ fixed?: boolean }>`
+ outline: none;
+ border: none;
+ cursor: pointer;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ gap: 8px;
+ align-items: center;
+
+ .${Classes.BUTTON} {
+ margin-top: 7px;
+
+ div {
+ width: auto;
+ height: auto;
+ }
+ }
+
+ .${Classes.BUTTON_TEXT} {
+ font-size: 12px;
+ color: white;
+ }
+
+ .more {
+ position: absolute;
+ right: ${(props) => props.theme.spaces[6]}px;
+ top: ${(props) => props.theme.spaces[4]}px;
+ }
+`;
+
+const CardFooter = styled.div`
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 4px 0;
+ width: ${(props) => props.theme.card.minWidth}px;
+
+ @media screen and (min-width: 1500px) {
+ width: ${(props) => props.theme.card.minWidth}px;
+ }
+
+ @media screen and (min-width: 1500px) and (max-width: 1512px) {
+ width: ${(props) => props.theme.card.minWidth - 5}px;
+ }
+ @media screen and (min-width: 1478px) and (max-width: 1500px) {
+ width: ${(props) => props.theme.card.minWidth - 8}px;
+ }
+
+ @media screen and (min-width: 1447px) and (max-width: 1477px) {
+ width: ${(props) => props.theme.card.minWidth - 8}px;
+ }
+
+ @media screen and (min-width: 1417px) and (max-width: 1446px) {
+ width: ${(props) => props.theme.card.minWidth - 11}px;
+ }
+
+ @media screen and (min-width: 1400px) and (max-width: 1417px) {
+ width: ${(props) => props.theme.card.minWidth - 15}px;
+ }
+
+ @media screen and (max-width: 1400px) {
+ width: ${(props) => props.theme.card.minWidth - 15}px;
+ }
+`;
+
+const ModifiedDataComponent = styled.div`
+ font-size: 13px;
+ color: var(--ads-v2-color-fg-muted);
+ &::first-letter {
+ text-transform: uppercase;
+ }
+`;
+
+function Card({
+ backgroundColor,
+ children,
+ contextMenu,
+ editedByText,
+ hasReadPermission,
+ icon,
+ isContextMenuOpen,
+ isFetching,
+ isMobile,
+ moreActionItems,
+ primaryAction,
+ setShowOverlay,
+ showGitBadge,
+ showOverlay,
+ testId,
+ title,
+ titleTestId,
+}: CardProps) {
+ return (
+ <Container isMobile={isMobile} onClick={isMobile ? primaryAction : noop}>
+ <NameWrapper
+ className={testId}
+ hasReadPermission={hasReadPermission}
+ isContextMenuOpen={isContextMenuOpen}
+ onMouseEnter={() => {
+ !isFetching && setShowOverlay(true);
+ }}
+ onMouseLeave={() => {
+ // If the menu is not open, then setOverlay false
+ // Set overlay false on outside click.
+ !isContextMenuOpen && setShowOverlay(false);
+ }}
+ showOverlay={showOverlay}
+ >
+ <Wrapper
+ backgroundColor={backgroundColor}
+ className={isFetching ? Classes.SKELETON : `${testId}-background`}
+ hasReadPermission={hasReadPermission}
+ isMobile={isMobile}
+ >
+ <CircleAppIcon name={icon} size={Size.large} />
+ <AppNameWrapper
+ className={isFetching ? Classes.SKELETON : ""}
+ isFetching={isFetching}
+ >
+ <Text data-testid={titleTestId} type={TextType.H4}>
+ {title}
+ </Text>
+ </AppNameWrapper>
+ {showOverlay && !isMobile && (
+ <div className="overlay">
+ <div className="overlay-blur" />
+ <ApplicationImage className="image-container">
+ <Control className="control">{children}</Control>
+ </ApplicationImage>
+ </div>
+ )}
+ </Wrapper>
+ <CardFooter>
+ <ModifiedDataComponent>{editedByText}</ModifiedDataComponent>
+ {Boolean(moreActionItems.length) && !isMobile && contextMenu}
+ </CardFooter>
+ </NameWrapper>
+ {showGitBadge && <GitConnectedBadge />}
+ </Container>
+ );
+}
+
+export default Card;
diff --git a/app/client/src/components/common/GitConnectedBadge.tsx b/app/client/src/components/common/GitConnectedBadge.tsx
new file mode 100644
index 000000000000..0e1d9996cbbd
--- /dev/null
+++ b/app/client/src/components/common/GitConnectedBadge.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+import styled from "styled-components";
+import { Icon, Tooltip } from "design-system";
+
+import { CONNECTED_TO_GIT, createMessage } from "@appsmith/constants/messages";
+
+const StyledGitConnectedBadge = styled.div`
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: absolute;
+ top: -12px;
+ right: -12px;
+ box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.07);
+ background: var(--ads-v2-color-bg);
+`;
+
+function GitConnectedBadge() {
+ return (
+ <StyledGitConnectedBadge>
+ <Tooltip content={createMessage(CONNECTED_TO_GIT)}>
+ <Icon name="fork" size="md" />
+ </Tooltip>
+ </StyledGitConnectedBadge>
+ );
+}
+
+export default GitConnectedBadge;
diff --git a/app/client/src/ee/constants/PackageConstants.ts b/app/client/src/ee/constants/PackageConstants.ts
new file mode 100644
index 000000000000..1125592a472a
--- /dev/null
+++ b/app/client/src/ee/constants/PackageConstants.ts
@@ -0,0 +1 @@
+export * from "ce/constants/PackageConstants";
diff --git a/app/client/src/ee/pages/Applications/PackageCardList.tsx b/app/client/src/ee/pages/Applications/PackageCardList.tsx
new file mode 100644
index 000000000000..409818f59b98
--- /dev/null
+++ b/app/client/src/ee/pages/Applications/PackageCardList.tsx
@@ -0,0 +1,3 @@
+export * from "ce/pages/Applications/PackageCardList";
+import { default as CE_PackageCardList } from "ce/pages/Applications/PackageCardList";
+export default CE_PackageCardList;
diff --git a/app/client/src/ee/pages/Applications/WorkspaceAction.tsx b/app/client/src/ee/pages/Applications/WorkspaceAction.tsx
new file mode 100644
index 000000000000..bd6535d693cb
--- /dev/null
+++ b/app/client/src/ee/pages/Applications/WorkspaceAction.tsx
@@ -0,0 +1,3 @@
+export * from "ce/pages/Applications/WorkspaceAction";
+import { default as CE_WorkspaceAction } from "ce/pages/Applications/WorkspaceAction";
+export default CE_WorkspaceAction;
diff --git a/app/client/src/ee/pages/Applications/helpers.ts b/app/client/src/ee/pages/Applications/helpers.ts
new file mode 100644
index 000000000000..8307187f9069
--- /dev/null
+++ b/app/client/src/ee/pages/Applications/helpers.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Applications/helpers";
diff --git a/app/client/src/ee/selectors/packageSelectors.ts b/app/client/src/ee/selectors/packageSelectors.ts
new file mode 100644
index 000000000000..e6ec89652ae2
--- /dev/null
+++ b/app/client/src/ee/selectors/packageSelectors.ts
@@ -0,0 +1 @@
+export * from "ce/selectors/packageSelectors";
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 778ed6f35517..da77fad5ed31 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -1,14 +1,11 @@
import React, {
useEffect,
useState,
- useRef,
useContext,
useCallback,
useMemo,
} from "react";
import styled, { ThemeContext } from "styled-components";
-import type { HTMLDivProps, ICardProps } from "@blueprintjs/core";
-import { Card, Classes } from "@blueprintjs/core";
import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
import {
hasDeleteApplicationPermission,
@@ -20,29 +17,22 @@ import {
getApplicationIcon,
getRandomPaletteColor,
} from "utils/AppsmithUtils";
-import { noop, omit } from "lodash";
import type { AppIconName } from "design-system-old";
import {
- AppIcon,
ColorSelector,
EditableText,
EditInteractionKind,
IconSelector,
SavingState,
- Size,
- Text,
- TextType,
} from "design-system-old";
import type { MenuItemProps } from "design-system";
import {
Button,
- Icon,
Menu,
Divider,
MenuContent,
MenuItem,
MenuTrigger,
- Tooltip,
} from "design-system";
import { useDispatch, useSelector } from "react-redux";
import type {
@@ -50,14 +40,11 @@ import type {
UpdateApplicationPayload,
} from "@appsmith/api/ApplicationApi";
import {
- getIsFetchingApplications,
getIsSavingAppName,
getIsErroredSavingAppName,
} from "@appsmith/selectors/applicationSelectors";
-import { truncateString, howMuchTimeBeforeText } from "utils/helpers";
import ForkApplicationModal from "./ForkApplicationModal";
import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants";
-import { CONNECTED_TO_GIT, createMessage } from "@appsmith/constants/messages";
import { builderURL, viewerURL } from "RouteBuilder";
import history from "utils/history";
import urlBuilder from "entities/URLRedirect/URLAssembly";
@@ -65,190 +52,11 @@ import { toast } from "design-system";
import { getAppsmithConfigs } from "@appsmith/configs";
import { addItemsInContextMenu } from "@appsmith/utils";
import { getCurrentUser } from "actions/authActions";
+import Card from "components/common/Card";
+import { generateEditedByText } from "./helpers";
const { cloudHosting } = getAppsmithConfigs();
-type NameWrapperProps = {
- hasReadPermission: boolean;
- showOverlay: boolean;
- isMenuOpen: boolean;
-};
-
-const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
- <div {...omit(props, ["hasReadPermission", "showOverlay", "isMenuOpen"])} />
-))`
- .bp3-card {
- border-radius: var(--ads-v2-border-radius);
- box-shadow: none;
- padding: 16px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- ${(props) =>
- props.showOverlay &&
- `
- {
- justify-content: center;
- align-items: center;
-
- .overlay {
- position: relative;
- border-radius: var(--ads-v2-border-radius);
- ${
- props.hasReadPermission &&
- `text-decoration: none;
- &:after {
- left: 0;
- top: 0;
- content: "";
- position: absolute;
- height: 100%;
- width: 100%;
- }
- & .control {
- display: flex;
- flex-direction: row;
- z-index: 1;
- }`
- }
-
- & div.overlay-blur {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: ${
- props.hasReadPermission && !props.isMenuOpen
- ? `rgba(255, 255, 255, 0.5)`
- : null
- };
- border-radius: var(--ads-v2-border-radius);
- @supports ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
- background-color: transparent;
- backdrop-filter: ${
- props.hasReadPermission && !props.isMenuOpen
- ? `blur(6px)`
- : null
- };
- }
- }
- }
- }
- `}
- overflow: hidden;
-`;
-
-const Wrapper = styled(
- (
- props: ICardProps & {
- hasReadPermission?: boolean;
- backgroundColor: string;
- isMobile?: boolean;
- },
- ) => (
- <Card
- {...omit(props, ["hasReadPermission", "backgroundColor", "isMobile"])}
- />
- ),
-)`
- display: flex;
- flex-direction: row-reverse;
- justify-content: center;
- width: ${(props) => props.theme.card.minWidth}px;
- height: ${(props) => props.theme.card.minHeight}px;
- position: relative;
- background-color: ${(props) => props.backgroundColor};
- border-radius: var(--ads-v2-border-radius);
- .overlay {
- display: block;
- position: absolute;
- left: 0;
- top: 0;
- height: 100%;
- width: 100%;
- ${(props) => !props.hasReadPermission && `pointer-events: none;`}
- }
- .bp3-card {
- border-radius: var(--ads-v2-border-radius);
- }
- }
-
- ${({ isMobile }) =>
- isMobile &&
- `
- width: 100% !important;
- height: 126px !important;
- `}
-`;
-
-const ApplicationImage = styled.div`
- && {
- height: 100%;
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-`;
-
-const Control = styled.div<{ fixed?: boolean }>`
- outline: none;
- border: none;
- cursor: pointer;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- gap: 8px;
- align-items: center;
-
- .${Classes.BUTTON} {
- margin-top: 7px;
-
- div {
- width: auto;
- height: auto;
- }
- }
-
- .${Classes.BUTTON_TEXT} {
- font-size: 12px;
- color: white;
- }
-
- .more {
- position: absolute;
- right: ${(props) => props.theme.spaces[6]}px;
- top: ${(props) => props.theme.spaces[4]}px;
- }
-`;
-
-const AppNameWrapper = styled.div<{ isFetching: boolean }>`
- padding: 0;
- padding-right: 12px;
- ${(props) =>
- props.isFetching
- ? `
- width: 119px;
- height: 16px;
- margin-left: 10px;
- `
- : null};
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 3; /* number of lines to show */
- -webkit-box-orient: vertical;
- word-break: break-word;
- color: ${(props) => props.theme.colors.text.heading};
- flex: 1;
-
- .bp3-popover-target {
- display: inline;
- }
-`;
-
type ApplicationCardProps = {
application: ApplicationPayload;
share?: (applicationId: string) => void;
@@ -256,6 +64,7 @@ type ApplicationCardProps = {
update?: (id: string, data: UpdateApplicationPayload) => void;
enableImportExport?: boolean;
isMobile?: boolean;
+ isFetchingApplications: boolean;
permissions?: {
hasCreateNewApplicationPermission?: boolean;
hasManageWorkspacePermissions?: boolean;
@@ -264,40 +73,6 @@ type ApplicationCardProps = {
workspaceId: string;
};
-const CircleAppIcon = styled(AppIcon)`
- padding: 12px;
- background-color: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
- box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.07);
- border-radius: 50%;
-
- svg {
- width: 100%;
- height: 100%;
- path {
- fill: var(--ads-v2-color-fg);
- }
- }
-`;
-
-const ModifiedDataComponent = styled.div`
- font-size: 13px;
- color: var(--ads-v2-color-fg-muted);
- &::first-letter {
- text-transform: uppercase;
- }
-`;
-
-const CardFooter = styled.div`
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin: 4px auto 0;
- width: ${(props) => props.theme.card.minWidth - 8}px;
-`;
-
const IconScrollWrapper = styled.div`
position: relative;
.t--icon-selected {
@@ -316,43 +91,13 @@ const IconScrollWrapper = styled.div`
}
`;
-const StyledGitConnectedBadge = styled.div`
- width: 24px;
- height: 24px;
- border-radius: 50%;
- display: flex;
- justify-content: center;
- align-items: center;
- position: absolute;
- top: -12px;
- right: -12px;
- box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.07);
- background: var(--ads-v2-color-bg);
-`;
-
-function GitConnectedBadge() {
- return (
- <StyledGitConnectedBadge>
- <Tooltip content={createMessage(CONNECTED_TO_GIT)}>
- <Icon name="fork" size="md" />
- </Tooltip>
- </StyledGitConnectedBadge>
- );
-}
-
-const Container = styled.div<{ isMobile?: boolean }>`
- position: relative;
- overflow: visible;
- ${({ isMobile }) => isMobile && `width: 100%;`}
-`;
-
type ModifiedMenuItemProps = MenuItemProps & {
key?: string;
"data-testid"?: string;
};
export function ApplicationCard(props: ApplicationCardProps) {
- const isFetchingApplications = useSelector(getIsFetchingApplications);
+ const { isFetchingApplications } = props;
const theme = useContext(ThemeContext);
const isSavingName = useSelector(getIsSavingAppName);
const isErroredSavingName = useSelector(getIsErroredSavingAppName);
@@ -371,7 +116,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
const [isForkApplicationModalopen, setForkApplicationModalOpen] =
useState(false);
const [lastUpdatedValue, setLastUpdatedValue] = useState("");
- const appNameWrapperRef = useRef<HTMLDivElement>(null);
const dispatch = useDispatch();
const applicationId = props.application?.id;
@@ -451,7 +195,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
);
const updateColor = (color: string) => {
- setSelectedColor(color);
props.update &&
props.update(applicationId, {
color: color,
@@ -538,12 +281,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
params.branch = showGitBadge;
}
- const appNameText = (
- <Text data-testid="t--app-card-name" type={TextType.H3}>
- {props.application.name}
- </Text>
- );
-
const handleMenuOnClose = (open: boolean) => {
if (!open && !isDeleting) {
setIsMenuOpen(false);
@@ -561,7 +298,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
}
};
- const ContextMenu = (
+ const contextMenu = (
<>
<Menu className="more" onOpenChange={handleMenuOnClose} open={isMenuOpen}>
<MenuTrigger>
@@ -663,24 +400,10 @@ export function ApplicationCard(props: ApplicationCardProps) {
</>
);
- const editedByText = () => {
- let editedBy = props.application.modifiedBy
- ? props.application.modifiedBy
- : "";
- let editedOn = props.application.modifiedAt
- ? props.application.modifiedAt
- : "";
-
- if (editedBy === "" && editedOn === "") return "";
-
- editedBy = editedBy.split("@")[0];
- editedBy = truncateString(editedBy, 9);
-
- //assuming modifiedAt will be always available
- editedOn = howMuchTimeBeforeText(editedOn);
- editedOn = editedOn !== "" ? editedOn + " ago" : "";
- return editedBy + " edited " + editedOn;
- };
+ const editedByText = generateEditedByText({
+ modifiedAt: props.application.modifiedAt,
+ modifiedBy: props.application.modifiedBy,
+ });
function setURLParams() {
const page: ApplicationPagePayload | undefined =
@@ -751,83 +474,48 @@ export function ApplicationCard(props: ApplicationCardProps) {
);
return (
- <Container
+ <Card
+ backgroundColor={selectedColor}
+ contextMenu={contextMenu}
+ editedByText={editedByText}
+ hasReadPermission={hasReadPermission}
+ icon={appIcon}
+ isContextMenuOpen={isMenuOpen}
+ isFetching={isFetchingApplications}
isMobile={props.isMobile}
- onClick={props.isMobile ? launchApp : noop}
+ moreActionItems={moreActionItems}
+ primaryAction={launchApp}
+ setShowOverlay={setShowOverlay}
+ showGitBadge={Boolean(showGitBadge)}
+ showOverlay={showOverlay}
+ testId="t--application-card"
+ title={props.application.name}
+ titleTestId="t--app-card-name"
>
- <NameWrapper
- className="t--application-card"
- hasReadPermission={hasReadPermission}
- isMenuOpen={isMenuOpen}
- onMouseEnter={() => {
- !isFetchingApplications && setShowOverlay(true);
- }}
- onMouseLeave={() => {
- // If the menu is not open, then setOverlay false
- // Set overlay false on outside click.
- !isMenuOpen && setShowOverlay(false);
- }}
- showOverlay={showOverlay}
- >
- <Wrapper
- backgroundColor={selectedColor}
- className={
- isFetchingApplications
- ? Classes.SKELETON
- : "t--application-card-background"
- }
- hasReadPermission={hasReadPermission}
- isMobile={props.isMobile}
- key={props.application.id}
+ {hasEditPermission && !isMenuOpen && (
+ <Button
+ className="t--application-edit-link"
+ href={editModeURL}
+ onClick={editApp}
+ size="md"
+ startIcon={"pencil-line"}
>
- <CircleAppIcon name={appIcon} size={Size.large} />
- <AppNameWrapper
- className={isFetchingApplications ? Classes.SKELETON : ""}
- isFetching={isFetchingApplications}
- ref={appNameWrapperRef}
- >
- {appNameText}
- </AppNameWrapper>
- {showOverlay && !props.isMobile && (
- <div className="overlay">
- <div className="overlay-blur" />
- <ApplicationImage className="image-container">
- <Control className="control">
- {hasEditPermission && !isMenuOpen && (
- <Button
- className="t--application-edit-link"
- href={editModeURL}
- onClick={editApp}
- size="md"
- startIcon={"pencil-line"}
- >
- Edit
- </Button>
- )}
- {!isMenuOpen && (
- <Button
- className="t--application-view-link"
- href={viewModeURL}
- kind="secondary"
- onClick={launchApp}
- size="md"
- startIcon={"rocket"}
- >
- Launch
- </Button>
- )}
- </Control>
- </ApplicationImage>
- </div>
- )}
- </Wrapper>
- <CardFooter>
- <ModifiedDataComponent>{editedByText()}</ModifiedDataComponent>
- {!!moreActionItems.length && !props.isMobile && ContextMenu}
- </CardFooter>
- </NameWrapper>
- {showGitBadge && <GitConnectedBadge />}
- </Container>
+ Edit
+ </Button>
+ )}
+ {!isMenuOpen && (
+ <Button
+ className="t--application-view-link"
+ href={viewModeURL}
+ kind="secondary"
+ onClick={launchApp}
+ size="md"
+ startIcon={"rocket"}
+ >
+ Launch
+ </Button>
+ )}
+ </Card>
);
}
diff --git a/app/client/src/pages/Applications/CommonElements.tsx b/app/client/src/pages/Applications/CommonElements.tsx
new file mode 100644
index 000000000000..4268f6aeba01
--- /dev/null
+++ b/app/client/src/pages/Applications/CommonElements.tsx
@@ -0,0 +1,110 @@
+import React from "react";
+import styled from "styled-components";
+import { Text } from "design-system";
+import { Classes as BlueprintClasses } from "@blueprintjs/core";
+
+type ResourceHeadingProps = React.PropsWithChildren<{
+ isLoading?: boolean;
+}>;
+
+export const CardListContainer = styled.div<{ isMobile?: boolean }>`
+ ${({ isMobile }) => (isMobile ? `padding: 0 16px` : `padding-bottom: 24px;`)};
+`;
+
+export const CardListWrapper = styled.div<{ isMobile?: boolean }>`
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+ font-size: ${(props) => props.theme.fontSizes[4]}px;
+`;
+
+export const PaddingWrapper = styled.div<{ isMobile?: boolean }>`
+ display: flex;
+ align-items: baseline;
+ justify-content: center;
+ width: ${(props) => props.theme.card.minWidth}px;
+
+ @media screen and (min-width: 1500px) {
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth}px;
+ height: ${(props) => props.theme.card.minHeight}px;
+ }
+ }
+
+ @media screen and (min-width: 1500px) and (max-width: 1512px) {
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 5}px;
+ height: ${(props) => props.theme.card.minHeight - 5}px;
+ }
+ }
+ @media screen and (min-width: 1478px) and (max-width: 1500px) {
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 8}px;
+ height: ${(props) => props.theme.card.minHeight - 8}px;
+ }
+ }
+
+ @media screen and (min-width: 1447px) and (max-width: 1477px) {
+ width: ${(props) =>
+ props.theme.card.minWidth + props.theme.spaces[3] * 2}px;
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 8}px;
+ height: ${(props) => props.theme.card.minHeight - 8}px;
+ }
+ }
+
+ @media screen and (min-width: 1417px) and (max-width: 1446px) {
+ width: ${(props) =>
+ props.theme.card.minWidth + props.theme.spaces[3] * 2}px;
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 11}px;
+ height: ${(props) => props.theme.card.minHeight - 11}px;
+ }
+ }
+
+ @media screen and (min-width: 1400px) and (max-width: 1417px) {
+ width: ${(props) =>
+ props.theme.card.minWidth + props.theme.spaces[2] * 2}px;
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 15}px;
+ height: ${(props) => props.theme.card.minHeight - 15}px;
+ }
+ }
+
+ @media screen and (max-width: 1400px) {
+ width: ${(props) =>
+ props.theme.card.minWidth + props.theme.spaces[2] * 2}px;
+ .bp3-card {
+ width: ${(props) => props.theme.card.minWidth - 15}px;
+ height: ${(props) => props.theme.card.minHeight - 15}px;
+ }
+ }
+
+ ${({ isMobile }) =>
+ isMobile &&
+ `
+ width: 100% !important;
+ `}
+`;
+
+const StyledResourceHeadingText = styled(Text)`
+ font-weight: var(--ads-font-weight-bold-xl);
+`;
+
+export const Space = styled.div`
+ margin-bottom: 10px;
+`;
+
+export function ResourceHeading({
+ children,
+ isLoading = false,
+}: ResourceHeadingProps) {
+ return (
+ <StyledResourceHeadingText
+ className={isLoading ? BlueprintClasses.SKELETON : ""}
+ kind="heading-s"
+ >
+ {children}
+ </StyledResourceHeadingText>
+ );
+}
diff --git a/app/client/src/pages/Applications/helpers.ts b/app/client/src/pages/Applications/helpers.ts
index edeeb99db66f..27551d628a91 100644
--- a/app/client/src/pages/Applications/helpers.ts
+++ b/app/client/src/pages/Applications/helpers.ts
@@ -2,6 +2,9 @@ import type { AppIconName } from "design-system-old";
import type { AppColorCode } from "constants/DefaultTheme";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import { SubmissionError } from "redux-form";
+
+import { truncateString, howMuchTimeBeforeText } from "utils/helpers";
+
export type CreateApplicationFormValues = {
applicationName: string;
workspaceId: string;
@@ -9,6 +12,11 @@ export type CreateApplicationFormValues = {
appName?: AppIconName;
};
+export type EditedByTextProps = {
+ modifiedAt?: string;
+ modifiedBy?: string;
+};
+
export const CREATE_APPLICATION_FORM_NAME_FIELD = "applicationName";
export const createApplicationFormSubmitHandler = (
@@ -30,3 +38,21 @@ export const createApplicationFormSubmitHandler = (
throw new SubmissionError(error);
});
};
+
+export const generateEditedByText = ({
+ modifiedAt,
+ modifiedBy,
+}: EditedByTextProps) => {
+ let editedBy = modifiedBy ? modifiedBy : "";
+ let editedOn = modifiedAt ? modifiedAt : "";
+
+ if (editedBy === "" && editedOn === "") return "";
+
+ editedBy = editedBy.split("@")[0];
+ editedBy = truncateString(editedBy, 9);
+
+ //assuming modifiedAt will be always available
+ editedOn = howMuchTimeBeforeText(editedOn);
+ editedOn = editedOn !== "" ? editedOn + " ago" : "";
+ return editedBy + " edited " + editedOn;
+};
diff --git a/app/client/src/pages/common/SubHeader.tsx b/app/client/src/pages/common/SubHeader.tsx
index 12d8e07a75fe..3b21187e159a 100644
--- a/app/client/src/pages/common/SubHeader.tsx
+++ b/app/client/src/pages/common/SubHeader.tsx
@@ -14,18 +14,22 @@ import { useSelector } from "react-redux";
import { getIsFetchingApplications } from "@appsmith/selectors/applicationSelectors";
import { Indices } from "constants/Layers";
import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
+import { CONTAINER_WRAPPER_PADDING } from "@appsmith/pages/Applications";
const SubHeaderWrapper = styled.div<{
isMobile?: boolean;
isBannerVisible?: boolean;
}>`
- width: ${({ isMobile }) => (isMobile ? `100%` : `250px`)};
+ width: ${({ isMobile }) => (isMobile ? `100%` : `350px`)};
display: flex;
justify-content: space-between;
${(props) => (props.isBannerVisible ? "margin-top: 96px" : "")};
background: var(--ads-v2-color-bg);
z-index: ${({ isMobile }) => (isMobile ? Indices.Layer8 : Indices.Layer9)};
- ${({ isMobile }) => isMobile && `padding: 12px 16px; margin: 0px;`}
+ ${({ isMobile }) =>
+ isMobile
+ ? `padding: 12px 16px; margin: 0px;`
+ : `padding: 0 ${CONTAINER_WRAPPER_PADDING} 12px ${CONTAINER_WRAPPER_PADDING};`}
`;
const SearchContainer = styled.div`
flex-grow: 1;
|
5db1516e8d21275434e6195e09fe19abfa6957c8
|
2023-10-05 11:52:03
|
Shrikant Sharat Kandula
|
ci: Remove unused setup-depot step on RTS workflow
| false
|
Remove unused setup-depot step on RTS workflow
|
ci
|
diff --git a/.github/workflows/rts-build.yml b/.github/workflows/rts-build.yml
index 8c8c3f808163..f131f4d4563f 100644
--- a/.github/workflows/rts-build.yml
+++ b/.github/workflows/rts-build.yml
@@ -69,9 +69,6 @@ jobs:
- name: Print the Github event
run: echo ${{ github.event_name }}
- - name: Set up Depot CLI
- uses: depot/setup-action@v1
-
# In case this is second attempt try restoring status of the prior attempt from cache
- name: Restore the previous run result
uses: actions/cache@v3
|
353e007e781df8aa109803b3a96592352f07892c
|
2022-09-06 08:59:39
|
Aishwarya-U-R
|
test: Script updates for flaky tests (#16533)
| false
|
Script updates for flaky tests (#16533)
|
test
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/JSONForm/JSONForm_FieldChange_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/JSONForm/JSONForm_FieldChange_spec.js
index 666448dfab18..ae496c4a30ce 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/JSONForm/JSONForm_FieldChange_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/JSONForm/JSONForm_FieldChange_spec.js
@@ -173,6 +173,7 @@ describe("JSON Form Widget Field Change", () => {
cy.openFieldConfiguration("hobbies");
cy.selectDropdownValue(commonlocators.jsonFormFieldType, "Array");
+ cy.wait(2000); //for array field to reflect
cy.get(`${fieldPrefix}-hobbies`).then((hobbies) => {
cy.wrap(hobbies)
.find(".t--jsonformfield-array-add-btn")
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/List/List1_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/List/List1_spec.js
index 50032dcb2b95..5d8d1480e9f5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/List/List1_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/List/List1_spec.js
@@ -115,6 +115,7 @@ describe("Binding the list widget with text widget", function() {
"response.body.responseMeta.status",
200,
);
+ cy.reload();
cy.wait(2000);
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/MySQL2_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/MySQL2_Spec.ts
index 242340565f99..b68b47dadb6f 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/MySQL2_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/MySQL2_Spec.ts
@@ -331,6 +331,7 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => {
//Delete the test data
ee.ActionContextMenuByEntityName("Stores", "Delete", "Are you sure?");
agHelper.ValidateNetworkStatus("@deletePage", 200);
+ agHelper.RefreshPage();
});
it("12. Validate Drop of the Newly Created - Stores - Table from MySQL datasource", () => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts
index 108fa8e1f24f..b8e6726c849d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts
@@ -245,7 +245,7 @@ describe("JS Function Execution", function() {
);
// Fix parse error and assert that debugger error is removed
- jsEditor.EditJSObj(JS_OBJECT_WITHOUT_PARSE_ERROR, true);
+ jsEditor.EditJSObj(JS_OBJECT_WITHOUT_PARSE_ERROR, true, false);
agHelper.GetNClick(jsEditor._runButton);
agHelper.AssertContains("ran successfully"); //to not hinder with next toast msg in next case!
jsEditor.AssertParseError(false, true);
@@ -258,13 +258,13 @@ describe("JS Function Execution", function() {
// Switch back to response tab
agHelper.GetNClick(locator._responseTab);
// Re-introduce parse errors
- jsEditor.EditJSObj(JS_OBJECT_WITH_PARSE_ERROR + "}}", false);
+ jsEditor.EditJSObj(JS_OBJECT_WITH_PARSE_ERROR + "}}", false, false);
agHelper.GetNClick(jsEditor._runButton);
// Assert that there is a function execution parse error
jsEditor.AssertParseError(true, true);
// Delete function
- jsEditor.EditJSObj(JS_OBJECT_WITH_DELETED_FUNCTION, true);
+ jsEditor.EditJSObj(JS_OBJECT_WITH_DELETED_FUNCTION, true, false);
// Assert that parse error is removed from debugger when function is deleted
agHelper.GetNClick(locator._errorTab);
agHelper.AssertContains(
diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts
index d8cbc5b8ffdd..259c54950535 100644
--- a/app/client/cypress/support/Pages/JSEditor.ts
+++ b/app/client/cypress/support/Pages/JSEditor.ts
@@ -190,7 +190,7 @@ export class JSEditor {
}
//Edit the name of a JSObject's property (variable or function)
- public EditJSObj(newContent: string, toPrettify = true) {
+ public EditJSObj(newContent: string, toPrettify = true, toVerifyAutoSave = true) {
cy.get(this.locator._codeMirrorTextArea)
.first()
.focus()
@@ -200,7 +200,7 @@ export class JSEditor {
});
this.agHelper.Sleep(2000); //Settling time for edited js code
toPrettify && this.agHelper.ActionContextMenuWithInPane("Prettify Code");
- this.agHelper.AssertAutoSave();
+ toVerifyAutoSave && this.agHelper.AssertAutoSave();
}
public DisableJSContext(endp: string) {
|
2706298a11b91f0930b81242318926efa3b4ee83
|
2023-09-21 14:36:04
|
vadim
|
chore: WDS `fgNeutralSubtle` fine-tuning (#27510)
| false
|
WDS `fgNeutralSubtle` fine-tuning (#27510)
|
chore
|
diff --git a/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts b/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
index fc1997660063..e90973886b99 100644
--- a/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
+++ b/app/client/packages/design-system/theming/src/color/src/DarkModeTheme.ts
@@ -642,7 +642,7 @@ export class DarkModeTheme implements ColorModeTheme {
private get fgNeutralSubtle() {
const color = this.fgNeutral.clone();
- color.oklch.l -= 0.3;
+ color.oklch.l -= 0.15;
return color;
}
diff --git a/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts b/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
index 521a3ea6ba11..51cd502600db 100644
--- a/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
+++ b/app/client/packages/design-system/theming/src/color/src/LightModeTheme.ts
@@ -670,7 +670,7 @@ export class LightModeTheme implements ColorModeTheme {
private get fgNeutralSubtle() {
const color = this.fgNeutral.clone();
- color.oklch.l += 0.3;
+ color.oklch.l += 0.1;
return color;
}
diff --git a/app/client/packages/design-system/widgets/src/styles/src/textInputStyles.ts b/app/client/packages/design-system/widgets/src/styles/src/textInputStyles.ts
index 33e72e426cbf..244ab992537a 100644
--- a/app/client/packages/design-system/widgets/src/styles/src/textInputStyles.ts
+++ b/app/client/packages/design-system/widgets/src/styles/src/textInputStyles.ts
@@ -78,6 +78,7 @@ export const textInputStyles = css<HeadlessTextInputProps>`
*/
& [data-field-input] :is(input, textarea)::placeholder {
color: var(--color-fg-neutral-subtle);
+ opacity: 1;
}
& [data-field-input] :is(input, textarea):placeholder-shown {
|
d5b71d69331ff69ac1c9cc4983190cd559d73ae1
|
2023-12-07 10:54:02
|
Ankita Kinger
|
chore: Adding a tooltip conditionally on submenu options for query creation (#29273)
| false
|
Adding a tooltip conditionally on submenu options for query creation (#29273)
|
chore
|
diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
index 10b1b6077fd3..f8b5156a5f60 100644
--- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
@@ -147,6 +147,15 @@ export default function ExplorerSubMenu({
</EntityIcon>
));
+ const menuItem = (
+ <div className="flex items-center gap-2">
+ {icon && <span className="flex-shrink-0">{icon}</span>}
+ <span className="overflow-hidden whitespace-nowrap overflow-ellipsis">
+ {item.shortTitle || item.title}
+ </span>
+ </div>
+ );
+
return (
<MenuItem
data-testid="t--file-operation"
@@ -157,12 +166,13 @@ export default function ExplorerSubMenu({
handleOpenChange(false);
}}
>
- <div className="flex items-center gap-2">
- {icon && <span className="flex-shrink-0">{icon}</span>}
- <span className="overflow-hidden whitespace-nowrap overflow-ellipsis">
- {item.shortTitle || item.title}
- </span>
- </div>
+ {item.tooltip ? (
+ <Tooltip content={item.tooltip} placement="topRight">
+ {menuItem}
+ </Tooltip>
+ ) : (
+ menuItem
+ )}
</MenuItem>
);
})}
|
7596dfc35a233fff2670eaafb18506fe7d919aac
|
2022-10-03 15:25:11
|
Aishwarya-U-R
|
test: Script updates for flaky tests to unblock CI (#17264)
| false
|
Script updates for flaky tests to unblock CI (#17264)
|
test
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Promises_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Promises_Spec.ts
index 74765188a571..30274c7c62c0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Promises_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Promises_Spec.ts
@@ -183,7 +183,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
agHelper.AddDsl(val, locator._spanButton("Submit"));
});
apiPage.CreateAndFillApi(
- "https://api.jikan.moe/v3/search/anime?q={{this.params.name}}",
+ "https://api.jikan.moe/v4/anime?q={{this.params.name}}",
"GetAnime",
30000,
);
@@ -191,20 +191,20 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
propPane.UpdatePropertyFieldValue(
"Items",
`[{
- "name": {{ GetAnime.data.results[0].title }},
-"img": {{ GetAnime.data.results[0].image_url }},
-"synopsis": {{ GetAnime.data.results[0].synopsis }}
+ "name": {{ GetAnime.data.data[0].title }},
+ "img": {{GetAnime.data.data[0].images.jpg.image_url}},
+ "synopsis": {{ GetAnime.data.data[0].synopsis }}
+ },
+ {
+ "name": {{ GetAnime.data.data[3].title }},
+ "img": {{GetAnime.data.data[3].images.jpg.image_url}},
+ "synopsis": {{ GetAnime.data.data[3].synopsis }}
},
-{
- "name": {{ GetAnime.data.results[3].title }},
- "img": {{ GetAnime.data.results[3].image_url }},
- "synopsis": {{ GetAnime.data.results[3].synopsis }}
-},
-{
- "name": {{ GetAnime.data.results[2].title }},
- "img": {{ GetAnime.data.results[2].image_url }},
- "synopsis": {{ GetAnime.data.results[2].synopsis }}
-}]`,
+ {
+ "name": {{ GetAnime.data.data[2].title }},
+ "img": {{GetAnime.data.data[2].images.jpg.image_url}},
+ "synopsis": {{ GetAnime.data.data[2].synopsis }}
+ }]`,
);
agHelper.ValidateToastMessage(
"will be executed automatically on page load",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/Postgres2_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/Postgres2_Spec.ts
index bb7a7c44bbd3..2eb6f0b3d37d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/Postgres2_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/GenerateCRUD/Postgres2_Spec.ts
@@ -231,6 +231,7 @@ describe("Validate Postgres Generate CRUD with JSON Form", () => {
deployMode._jsonFormDatepickerFieldByName("Eta Updated"),
);
agHelper.GetNClick(locator._datePicker(23));
+ agHelper.GetNClick(deployMode._jsonFieldName("Distance To Go"));
deployMode.ClearJSONFieldValue("Distance To Go");
deployMode.EnterJSONInputValue("Distance To Go", "303");
@@ -497,6 +498,7 @@ describe("Validate Postgres Generate CRUD with JSON Form", () => {
1,
);
agHelper.GetNClick(locator._datePicker(2));
+ agHelper.GetNClick(deployMode._jsonFieldName("Distance To Go"), 1);
deployMode.ClearJSONFieldValue("Distance To Go", 1);
deployMode.EnterJSONInputValue("Distance To Go", "18.1", 1);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Postgres_DataTypes/Json_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Postgres_DataTypes/Json_Spec.ts
index 9ccb8922b884..ef62cb1308d2 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Postgres_DataTypes/Json_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Postgres_DataTypes/Json_Spec.ts
@@ -445,6 +445,7 @@ describe("Json & JsonB Datatype tests", function() {
deployMode._jsonFormDatepickerFieldByName("Published Date"),
);
agHelper.GetNClick(locator._datePicker(5));
+ agHelper.GetNClick(deployMode._jsonFieldName("Genres"));
deployMode.SelectJsonFormMultiSelect("Genres", [
"Fiction",
"Thriller",
@@ -472,6 +473,7 @@ describe("Json & JsonB Datatype tests", function() {
deployMode._jsonFormDatepickerFieldByName("Published Date"),
);
agHelper.GetNClick(locator._datePicker(15));
+ agHelper.GetNClick(deployMode._jsonFieldName("Genres"));
deployMode.SelectJsonFormMultiSelect("Genres", [
"Productivity",
"Reference",
@@ -497,6 +499,7 @@ describe("Json & JsonB Datatype tests", function() {
deployMode._jsonFormDatepickerFieldByName("Published Date"),
);
agHelper.GetNClick(locator._datePicker(15));
+ agHelper.GetNClick(deployMode._jsonFieldName("Genres"));
deployMode.SelectJsonFormMultiSelect("Genres", ["Fiction", "Spirituality"]);
agHelper.ClickButton("Insert");
@@ -521,6 +524,7 @@ describe("Json & JsonB Datatype tests", function() {
deployMode._jsonFormDatepickerFieldByName("Published Date"),
);
agHelper.GetNClick(locator._datePicker(25));
+ agHelper.GetNClick(deployMode._jsonFieldName("Genres"));
deployMode.SelectJsonFormMultiSelect(
"Genres",
["Fiction", "Thriller", "Horror"],
@@ -653,6 +657,8 @@ describe("Json & JsonB Datatype tests", function() {
deployMode._jsonFormDatepickerFieldByName("Published Date"),
);
agHelper.GetNClick(locator._datePicker(16));
+ agHelper.GetNClick(deployMode._jsonFieldName("Genres"));
+
deployMode.SelectJsonFormMultiSelect("Genres", [
"Marketing & Sales",
"Self-Help",
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index aa49def804e0..0627e79a9c1b 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -136,9 +136,9 @@ export class CommonLocators {
_lintWarningElement = "span.CodeMirror-lint-mark-warning";
_codeEditorWrapper = ".unfocused-code-editor";
_datePicker = (date: number) =>
- "//div[@class ='bp3-datepicker']//div[contains(@class, 'DayPicker-Day')]//div[text()='" +
+ "(//div[@class ='bp3-datepicker']//div[contains(@class, 'DayPicker-Day')]//div[text()='" +
date +
- "']";
+ "'])[last()]";
_inputWidgetValueField = (fieldName: string, input: boolean = true) =>
`//label[contains(@class, 't--input-widget-label')][text()='${fieldName}']/ancestor::div[@data-testid='input-container']//${
input ? "input" : "textarea"
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 6bcb53f86bd0..9d5ec0876845 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -136,7 +136,7 @@ export class AggregateHelper {
public GetElement(selector: ElementType, timeout = 20000) {
let locator;
if (typeof selector == "string") {
- locator = selector.startsWith("//")
+ locator = selector.startsWith("//") || selector.startsWith("(//")
? cy.xpath(selector, { timeout: timeout })
: cy.get(selector, { timeout: timeout });
} else locator = cy.wrap(selector);
@@ -455,10 +455,7 @@ export class AggregateHelper {
force = false,
waitTimeInterval = 500,
) {
- const locator = selector.startsWith("//")
- ? cy.xpath(selector)
- : cy.get(selector);
- return locator
+ return this.GetElement(selector)
.eq(index)
.scrollIntoView()
.click({ force: force })
diff --git a/app/client/cypress/support/Pages/DeployModeHelper.ts b/app/client/cypress/support/Pages/DeployModeHelper.ts
index 9ae26eadbe3d..3bedc9ce845e 100644
--- a/app/client/cypress/support/Pages/DeployModeHelper.ts
+++ b/app/client/cypress/support/Pages/DeployModeHelper.ts
@@ -4,8 +4,10 @@ export class DeployMode {
private locator = ObjectsRegistry.CommonLocators;
private agHelper = ObjectsRegistry.AggregateHelper;
+ _jsonFieldName = (fieldName: string) => `//p[text()='${fieldName}']`;
_jsonFormFieldByName = (fieldName: string, input: boolean = true) =>
- `//p[text()='${fieldName}']/ancestor::div[@direction='column']//div[@data-testid='input-container']//${
+ this._jsonFieldName(fieldName) +
+ `/ancestor::div[@direction='column']//div[@data-testid='input-container']//${
input ? "input" : "textarea"
}`;
_jsonFormRadioFieldByName = (fieldName: string) =>
@@ -46,7 +48,9 @@ export class DeployMode {
this.agHelper.WaitUntilEleAppear(eleToCheckInDeployPage);
localStorage.setItem("inDeployedMode", "true");
toCheckFailureToast &&
- this.agHelper.AssertElementAbsence(this.locator._specificToast("has failed")); //Validating bug - 14141 + 14252
+ this.agHelper.AssertElementAbsence(
+ this.locator._specificToast("has failed"),
+ ); //Validating bug - 14141 + 14252
this.agHelper.Sleep(2000); //for Depoy page to settle!
}
|
fbfb7a6fd7d15d2fff550087d2f5d9d0c1150937
|
2021-10-12 18:42:45
|
Nidhi
|
fix: Back to repository dispatch (#8469)
| false
|
Back to repository dispatch (#8469)
|
fix
|
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml
index bce3ee3220f2..5e3332740df1 100644
--- a/.github/workflows/integration-tests-command.yml
+++ b/.github/workflows/integration-tests-command.yml
@@ -408,6 +408,11 @@ jobs:
run:
shell: bash
steps:
+ - name: Dump the client payload context
+ env:
+ PAYLOAD_CONTEXT: ${{ toJson(github.event.client_payload) }}
+ run: echo "$PAYLOAD_CONTEXT"
+
# Update check run called "ui-test-result"
- name: Mark ui-test-result job as complete
uses: actions/github-script@v1
|
dee0a54227f85072f2e61cd7cec39d6252d3f21e
|
2023-11-22 14:04:48
|
arunvjn
|
fix: Preserve query execution data on name refactor (#28973)
| false
|
Preserve query execution data on name refactor (#28973)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts
new file mode 100644
index 000000000000..21bca5d8da35
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28985_spec.ts
@@ -0,0 +1,88 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+describe("Api execution results test cases", () => {
+ it("1. Check to see if API execution results are preserved after it is renamed", () => {
+ const {
+ agHelper,
+ apiPage,
+ dataManager,
+ entityExplorer,
+ jsEditor,
+ propPane,
+ } = _;
+ // Drag and drop a button widget
+ entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200);
+ entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 400, 400);
+
+ entityExplorer.NavigateToSwitcher("Explorer");
+ // Create a new API
+ apiPage.CreateAndFillApi(
+ dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl,
+ );
+
+ apiPage.RunAPI();
+
+ jsEditor.CreateJSObject(
+ `export default {
+ async func() {
+ return Api1.data
+ }
+ }`,
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: true,
+ shouldCreateNewJSObj: true,
+ prettify: true,
+ },
+ );
+
+ entityExplorer.SelectEntityByName("Button1");
+
+ // Set the label to the button
+ propPane.TypeTextIntoField(
+ "label",
+ "{{Api1.data ? 'Success 1' : 'Failed 1'}}",
+ );
+
+ propPane.ToggleJSMode("onClick", true);
+
+ propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
+
+ agHelper.ClickButton("Success 1");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ entityExplorer.RenameEntityFromExplorer("Api1", "Api123");
+
+ entityExplorer.SelectEntityByName("Button1");
+
+ agHelper.ClickButton("Success 1");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ entityExplorer.SelectEntityByName("Button2");
+
+ // Set the label to the button
+ propPane.TypeTextIntoField(
+ "label",
+ "{{JSObject1.func.data ? 'Success 2' : 'Failed 2'}}",
+ );
+
+ propPane.ToggleJSMode("onClick", true);
+
+ propPane.TypeTextIntoField("onClick", "{{showAlert('Successful')}}");
+
+ agHelper.ClickButton("Success 2");
+
+ agHelper.ValidateToastMessage("Successful");
+
+ entityExplorer.RenameEntityFromExplorer("JSObject1", "JSObject123");
+
+ entityExplorer.SelectEntityByName("Button2");
+
+ agHelper.ClickButton("Success 2");
+
+ agHelper.ValidateToastMessage("Successful");
+ });
+});
diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index 616d221f1516..63bc11a30deb 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -340,22 +340,17 @@ export const bindDataOnCanvas = (payload: {
};
};
-export const updateActionData = ({
- data,
- dataPath,
- entityName,
-}: {
- entityName: string;
- dataPath: string;
- data: unknown;
-}) => {
+export const updateActionData = (
+ payload: {
+ entityName: string;
+ dataPath: string;
+ data: unknown;
+ dataPathRef?: string;
+ }[],
+) => {
return {
type: ReduxActionTypes.UPDATE_ACTION_DATA,
- payload: {
- entityName,
- dataPath,
- data,
- },
+ payload,
};
};
diff --git a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
index c2541d9720ef..fb9ce61d83e1 100644
--- a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
+++ b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
@@ -82,11 +82,13 @@ export function* executeActionTriggers(
);
if (action) {
yield put(
- updateActionData({
- entityName: action.name,
- dataPath: "data",
- data: undefined,
- }),
+ updateActionData([
+ {
+ entityName: action.name,
+ dataPath: "data",
+ data: undefined,
+ },
+ ]),
);
}
break;
diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts
index 974b82536068..b7a9b6ddee58 100644
--- a/app/client/src/ce/sagas/JSActionSagas.ts
+++ b/app/client/src/ce/sagas/JSActionSagas.ts
@@ -7,7 +7,10 @@ import {
ReduxActionTypes,
} from "@appsmith/constants/ReduxActionConstants";
import { put, select, call } from "redux-saga/effects";
-import type { FetchActionsPayload } from "actions/pluginActionActions";
+import {
+ updateActionData,
+ type FetchActionsPayload,
+} from "actions/pluginActionActions";
import type { JSAction, JSCollection } from "entities/JSCollection";
import {
copyJSCollectionError,
@@ -370,6 +373,20 @@ export function* refactorJSObjectName(
actionId: id,
},
});
+ const jsObject: JSCollection = yield select((state) =>
+ getJSCollection(state, id),
+ );
+ const functions = jsObject.actions;
+ yield put(
+ updateActionData(
+ functions.map((f) => ({
+ entityName: newName,
+ data: undefined,
+ dataPath: `${f.name}.data`,
+ dataPathRef: `${oldName}.${f.name}.data`,
+ })),
+ ),
+ );
if (currentPageId === pageId) {
// @ts-expect-error: refactorResponse.data is of type unknown
yield updateCanvasWithDSL(refactorResponse.data, pageId, layoutId);
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index e0231fe9a099..76821241903a 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -1175,11 +1175,13 @@ function* executePageLoadAction(pageAction: PageAction) {
}),
);
yield put(
- updateActionData({
- entityName: action.name,
- dataPath: "data",
- data: payload.body,
- }),
+ updateActionData([
+ {
+ entityName: action.name,
+ dataPath: "data",
+ data: payload.body,
+ },
+ ]),
);
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.EXECUTE_ACTION,
@@ -1230,11 +1232,13 @@ function* executePageLoadAction(pageAction: PageAction) {
pageAction.id,
);
yield put(
- updateActionData({
- entityName: action.name,
- dataPath: "data",
- data: payload.body,
- }),
+ updateActionData([
+ {
+ entityName: action.name,
+ dataPath: "data",
+ data: payload.body,
+ },
+ ]),
);
yield take(ReduxActionTypes.SET_EVALUATED_TREE);
}
@@ -1392,11 +1396,13 @@ function* executePluginActionSaga(
);
yield put(
- updateActionData({
- entityName: pluginAction.name,
- dataPath: "data",
- data: isError ? undefined : payload.body,
- }),
+ updateActionData([
+ {
+ entityName: pluginAction.name,
+ dataPath: "data",
+ data: isError ? undefined : payload.body,
+ },
+ ]),
);
// TODO: Plugins are not always fetched before on page load actions are executed.
try {
@@ -1451,11 +1457,13 @@ function* executePluginActionSaga(
}),
);
yield put(
- updateActionData({
- entityName: pluginAction.name,
- dataPath: "data",
- data: EMPTY_RESPONSE.body,
- }),
+ updateActionData([
+ {
+ entityName: pluginAction.name,
+ dataPath: "data",
+ data: EMPTY_RESPONSE.body,
+ },
+ ]),
);
if (e instanceof UserCancelledActionExecutionError) {
// Case: user cancelled the request of file upload
@@ -1526,11 +1534,13 @@ function* clearTriggerActionResponse() {
if (action.data && !action.config.executeOnLoad) {
yield put(clearActionResponse(action.config.id));
yield put(
- updateActionData({
- entityName: action.config.name,
- dataPath: "data",
- data: undefined,
- }),
+ updateActionData([
+ {
+ entityName: action.config.name,
+ dataPath: "data",
+ data: undefined,
+ },
+ ]),
);
}
}
@@ -1587,16 +1597,14 @@ function* handleUpdateActionData(
entityName: string;
dataPath: string;
data: unknown;
+ dataPathRef?: string;
}>,
) {
- const { data, dataPath, entityName } = action.payload;
- yield call(evalWorker.request, EVAL_WORKER_ACTIONS.UPDATE_ACTION_DATA, [
- {
- entityName,
- dataPath,
- data,
- },
- ]);
+ yield call(
+ evalWorker.request,
+ EVAL_WORKER_ACTIONS.UPDATE_ACTION_DATA,
+ action.payload,
+ );
}
export function* watchPluginActionExecutionSagas() {
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index e61be91bab3f..dca0ed50158a 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -38,6 +38,7 @@ import {
moveActionError,
moveActionSuccess,
updateAction,
+ updateActionData,
updateActionProperty,
updateActionSuccess,
} from "actions/pluginActionActions";
@@ -747,6 +748,16 @@ export function* refactorActionName(
actionId: id,
},
});
+ yield put(
+ updateActionData([
+ {
+ entityName: newName,
+ dataPath: "data",
+ data: undefined,
+ dataPathRef: `${oldName}.data`,
+ },
+ ]),
+ );
if (currentPageId === pageId) {
// @ts-expect-error: refactorResponse is of type unknown
yield updateCanvasWithDSL(refactorResponse.data, pageId, layoutId);
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 820972156034..3252ef92f57b 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -219,11 +219,13 @@ function* setUpTourAppSaga() {
const query: ActionData | undefined = yield select(getQueryAction);
yield put(clearActionResponse(query?.config.id ?? ""));
yield put(
- updateActionData({
- entityName: query?.config.name || "",
- dataPath: "data",
- data: undefined,
- }),
+ updateActionData([
+ {
+ entityName: query?.config.name || "",
+ dataPath: "data",
+ data: undefined,
+ },
+ ]),
);
const applicationId: string = yield select(getCurrentApplicationId);
yield put(
diff --git a/app/client/src/workers/Evaluation/handlers/updateActionData.ts b/app/client/src/workers/Evaluation/handlers/updateActionData.ts
index d22a725d27ba..886cd02b81f6 100644
--- a/app/client/src/workers/Evaluation/handlers/updateActionData.ts
+++ b/app/client/src/workers/Evaluation/handlers/updateActionData.ts
@@ -1,6 +1,6 @@
import { dataTreeEvaluator } from "./evalTree";
import type { EvalWorkerSyncRequest } from "../types";
-import { set } from "lodash";
+import set from "lodash/set";
import { evalTreeWithChanges } from "../evalTreeWithChanges";
import DataStore from "../dataStore";
@@ -8,6 +8,7 @@ export interface UpdateActionProps {
entityName: string;
dataPath: string;
data: unknown;
+ dataPathRef?: string;
}
export default function (request: EvalWorkerSyncRequest) {
const actionsDataToUpdate: UpdateActionProps[] = request.data;
@@ -21,7 +22,13 @@ export function handleActionsDataUpdate(actionsToUpdate: UpdateActionProps[]) {
const evalTree = dataTreeEvaluator.getEvalTree();
for (const actionToUpdate of actionsToUpdate) {
- const { data, dataPath, entityName } = actionToUpdate;
+ const { dataPath, dataPathRef, entityName } = actionToUpdate;
+ let { data } = actionToUpdate;
+
+ if (dataPathRef) {
+ data = DataStore.getActionData(dataPathRef);
+ DataStore.deleteActionData(dataPathRef);
+ }
// update the evaltree
set(evalTree, `${entityName}.[${dataPath}]`, data);
// Update context
|
b0f69502b83df425c890a135a239ea0e0bbdca06
|
2024-05-14 11:12:32
|
Pawan Kumar
|
chore: use overflow: auto instead of scroll in widget explorer (#33342)
| false
|
use overflow: auto instead of scroll in widget explorer (#33342)
|
chore
|
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx
index 832692b8bf92..dda055665aea 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx
@@ -22,7 +22,7 @@ const AddWidgets = (props: { focusSearchInput?: boolean }) => {
onCloseClick={closeButtonClickHandler}
titleMessage={EDITOR_PANE_TEXTS.widgets_create_tab_title}
/>
- <Flex flexDirection="column" gap="spaces-3" overflowX="scroll">
+ <Flex flexDirection="column" gap="spaces-3" overflowX="auto">
<UIEntitySidebar focusSearchInput={props.focusSearchInput} isActive />
</Flex>
</>
diff --git a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
index c43d9d6720e7..edac5edd3130 100644
--- a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
+++ b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
@@ -9,7 +9,7 @@ import type {
WidgetTags,
} from "constants/WidgetConstants";
import { WIDGET_TAGS } from "constants/WidgetConstants";
-import { SearchInput, Text } from "design-system";
+import { Flex, SearchInput, Text } from "design-system";
import Fuse from "fuse.js";
import { debounce } from "lodash";
import React, { useEffect, useMemo, useRef, useState } from "react";
@@ -109,9 +109,10 @@ function UIEntitySidebar({
type="text"
/>
</div>
- <div
- className="flex-grow px-3 mt-2 overflow-y-scroll"
+ <Flex
+ className="flex-grow px-3 overflow-y-scroll"
data-testid="t--widget-sidebar-scrollable-wrapper"
+ pt="spaces-2"
>
{isEmpty && (
<Text
@@ -150,7 +151,7 @@ function UIEntitySidebar({
);
})}
</div>
- </div>
+ </Flex>
</div>
);
}
|
e4857851a964b9aefb0159b0ef1d0af75e24a31d
|
2023-02-08 13:05:35
|
Sangeeth Sivan
|
chore: upgrade page changes & license route removed on CE (#20412)
| false
|
upgrade page changes & license route removed on CE (#20412)
|
chore
|
diff --git a/app/client/src/assets/svg/be-upgrade/be-cta.svg b/app/client/src/assets/svg/be-upgrade/be-cta.svg
new file mode 100644
index 000000000000..85908c17f5c2
--- /dev/null
+++ b/app/client/src/assets/svg/be-upgrade/be-cta.svg
@@ -0,0 +1,157 @@
+<svg width="216" height="198" viewBox="0 0 216 198" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M57 197.102L109 179.102L57 155.102L7 174.102L57 197.102Z" fill="url(#paint0_linear_3933_98129)"/>
+<path d="M108 117.102L161 93.1016V155.102L108 179.102V117.102Z" fill="#DACEB8"/>
+<path d="M154.443 112.271L121 128.102L121.298 164.1L154.74 148.27L154.443 112.271Z" fill="#FF6D2D"/>
+<path d="M150.443 110.271L117 126.102L117.298 162.1L150.74 146.27L150.443 110.271Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M117 126.102L151.346 109.843L151.652 146.842L117.306 163.1L117 126.102ZM117.912 126.674L118.201 161.672L150.74 146.27L150.451 111.271L117.912 126.674Z" fill="black"/>
+<path d="M129.338 142.678C129.201 142.485 129.399 141.398 129.322 140.678C128.568 142.243 128.302 143.168 126.627 143.962C125.378 144.553 123.751 144.98 123.003 144.673C122.255 144.367 122.084 143.272 122.074 142.101C122.056 139.839 123.662 138.66 126.569 136.962L128.368 135.106C128.941 134.755 129.024 135.014 129.272 134.679C129.52 134.343 129.267 134.113 129.264 133.679C129.26 133.15 129.564 131.779 129.247 131.679C128.931 131.578 128.191 132.178 127.44 132.534C126.631 132.917 126.885 132.502 126.536 132.962C126.187 133.423 125.711 135.637 125.657 136.39L122.041 138.101C122.179 135.202 124.175 132.072 127.423 130.534C130.583 129.039 132.859 129.481 132.879 131.967L132.937 138.967C132.946 140.058 132.641 140.634 132.954 140.967L129.338 142.678ZM128.418 141.106C128.957 140.327 129.305 138.657 129.297 137.679L129.289 136.679C129.026 137.06 128.987 136.741 128.385 137.106L127.481 137.534C126.747 137.98 125.995 138.962 125.682 139.39C125.368 139.818 125.684 139.859 125.69 140.39C125.694 140.92 125.374 142.25 125.706 142.39C126.039 142.53 125.993 142.256 126.61 141.962C127.477 141.554 127.879 141.884 128.418 141.106Z" fill="black"/>
+<path d="M135.017 143.101L135 141.102L145.846 135.967L145.863 137.967L135.017 143.101Z" fill="black"/>
+<path d="M108 117.102L55.0004 93.1016V155.102L108 179.102V117.102Z" fill="#EBE2D3"/>
+<path d="M108 70.1016V117.102L161 93.1016L108 70.1016Z" fill="#DACEB8"/>
+<path d="M108 70.1016V117.102L55.0004 93.1016L108 70.1016Z" fill="#EBE2D3"/>
+<path d="M160 93.1016L109 118.102L143 119.102L190 93.1016H160Z" fill="#EBE2D3"/>
+<path d="M32 109.102L56 93.1016L109 118.102L88 136.102L32 109.102Z" fill="#DACEB8"/>
+<path d="M109 70.1016L56 93.1016L39 71.1016L95 50.1016L109 70.1016Z" fill="#DACEB8"/>
+<path d="M127 49.1016L109 70.1016L161 93.1016L177 71.1016L127 49.1016Z" fill="#EBE2D3"/>
+<path d="M141 62.1016L139 69.1016" stroke="#EE7541" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M148 64.1016L144 68.1016" stroke="#EE7541" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M91.4309 130.628C94.8639 112.405 97.7163 69.446 78.4919 44.4859C59.2675 19.5257 49.6376 16.9711 43.6561 17.5246" stroke="url(#paint1_linear_3933_98129)" stroke-width="6"/>
+<rect x="62.0018" y="15.1016" width="36" height="16" rx="8" fill="#FF6D2D"/>
+<path d="M76.0556 20.048L74.6672 24.4988L73.2629 20.048L71.6524 20.048L71.6524 25.6016L72.6124 25.6016L72.6124 20.9445L74.1515 25.6016L75.1591 25.6016L76.6982 20.8889L76.6982 25.6016L77.6582 25.6016L77.6582 20.048L76.0556 20.048ZM79.2284 21.0635C79.5537 21.0635 79.8076 20.8096 79.8076 20.4843C79.8076 20.1591 79.5537 19.9052 79.2284 19.9052C78.9032 19.9052 78.6493 20.1591 78.6493 20.4843C78.6493 20.8096 78.9032 21.0635 79.2284 21.0635ZM78.7683 25.6016L79.6727 25.6016L79.6727 21.6347L78.7683 21.6347L78.7683 25.6016ZM83.2778 24.11C83.8252 23.88 84.1664 23.4039 84.1664 22.793C84.1664 22.0393 83.6586 21.5236 82.8494 21.5236C82.2147 21.5236 81.7228 21.841 81.4848 22.3726L81.4848 20.048L80.5803 20.048L80.5803 25.6016L81.4848 25.6016L81.4848 23.6578C81.4848 22.8486 81.9132 22.3249 82.5241 22.3249C82.9208 22.3249 83.2223 22.5471 83.2223 22.9517C83.2223 23.4198 82.8176 23.7689 82.1829 23.7689L82.1829 24.3877C82.778 24.4432 83.2381 24.8796 83.3651 25.6016L84.4123 25.6016C84.2457 24.8717 83.8252 24.3639 83.2778 24.11ZM87.6962 24.348C87.5614 24.713 87.2123 24.9193 86.768 24.9193C86.1333 24.9193 85.7684 24.5305 85.689 23.872L88.5134 23.872C88.8942 22.5709 88.1723 21.5236 86.7759 21.5236C85.5224 21.5236 84.729 22.3567 84.729 23.6181C84.729 24.8796 85.5145 25.7126 86.7521 25.7126C87.7438 25.7126 88.4499 25.1811 88.68 24.348L87.6962 24.348ZM86.7601 22.2853C87.3868 22.2853 87.7121 22.6582 87.6566 23.2294L85.7049 23.2294C85.8001 22.6185 86.165 22.2853 86.7601 22.2853Z" fill="white"/>
+<g filter="url(#filter0_d_3933_98129)">
+<path d="M51.0001 26.1015L53.0001 18.1015C53.288 17.4165 53.3152 17.3896 54.0001 17.1015L62.0001 15.1015C62.5408 14.8738 62.6894 14.5993 63.0001 14.1015C63.3107 13.6037 63.0331 11.6874 63.0001 11.1015C62.967 10.5156 62.3647 10.5613 62.0001 10.1015C61.6354 9.64177 60.563 9.267 60.0001 9.10152L44.0001 4.10152C43.5102 3.95721 42.4949 3.97542 42.0001 4.10152C41.5052 4.22762 41.3612 4.74037 41.0001 5.10152C40.639 5.46267 40.1261 5.60658 40.0001 6.10152C39.874 6.59645 39.8558 7.61158 40.0001 8.10152L45.0001 24.1015C45.1655 24.6645 45.5404 25.7368 46.0001 26.1015C46.4598 26.4662 46.4142 27.0685 47.0001 27.1015C47.5859 27.1345 49.5023 27.4123 50.0001 27.1015C50.4978 26.7908 50.7724 26.6424 51.0001 26.1015Z" fill="#FF6D2D"/>
+<path d="M51.0001 26.1015L53.0001 18.1015C53.288 17.4165 53.3152 17.3896 54.0001 17.1015L62.0001 15.1015C62.5408 14.8738 62.6894 14.5993 63.0001 14.1015C63.3107 13.6037 63.0331 11.6874 63.0001 11.1015C62.967 10.5156 62.3647 10.5613 62.0001 10.1015C61.6354 9.64177 60.563 9.267 60.0001 9.10152L44.0001 4.10152C43.5102 3.95721 42.4949 3.97542 42.0001 4.10152C41.5052 4.22762 41.3612 4.74037 41.0001 5.10152C40.639 5.46267 40.1261 5.60658 40.0001 6.10152C39.874 6.59645 39.8558 7.61158 40.0001 8.10152L45.0001 24.1015C45.1655 24.6645 45.5404 25.7368 46.0001 26.1015C46.4598 26.4662 46.4142 27.0685 47.0001 27.1015C47.5859 27.1345 49.5023 27.4123 50.0001 27.1015C50.4978 26.7908 50.7724 26.6424 51.0001 26.1015Z" stroke="white" stroke-width="1.92239" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<g filter="url(#filter1_d_3933_98129)">
+<ellipse cx="16.5" cy="16.5" rx="16.5" ry="16.5" transform="matrix(0.999215 0.0396052 -0.24346 0.969911 106 14.1016)" fill="#5E5DC1"/>
+</g>
+<path d="M125.309 33.3639L126.77 27.5446C126.796 27.4414 127.047 26.6659 127.014 26.5747C126.98 26.4835 127.097 26.6295 127.014 26.5747L120.994 22.4181C120.914 22.3649 121.1 22.4223 120.994 22.4181C120.887 22.4139 121.098 22.3722 120.994 22.4181L112.026 25.981C111.917 26.0281 112.104 25.8942 112.026 25.981C111.947 26.0677 111.809 26.8477 111.782 26.9509L110.321 32.7701C110.295 32.8733 110.043 33.6488 110.077 33.74C110.111 33.8312 109.993 33.6853 110.077 33.74L117.096 37.9362C117.176 37.9894 116.99 37.932 117.096 37.9362C117.203 37.9404 116.992 37.9821 117.096 37.9362L125.065 34.3338C125.174 34.2866 124.987 34.4205 125.065 34.3338C125.143 34.247 125.282 33.467 125.309 33.3639V33.3639Z" stroke="white" stroke-width="1.16467" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M126.988 27.6953L119.019 31.2977L112 27.1016" stroke="white" stroke-width="1.16467" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M118 31.1016L115.808 39.8305" stroke="white" stroke-width="1.16467" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M116.001 54.1016L115.001 61.1016" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M121.001 59.1016V64.1016" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M104 54.1016V58.1016" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M59.9655 64.841L62.5529 72.2693" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M67 67.1016L69.2205 71.5814" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M48 67.1016L49.7764 70.6855" stroke="#5E5DC1" stroke-width="1.16831" stroke-linecap="round"/>
+<path d="M109 116.102C109 116.102 110.098 96.0219 132 86.1016C153.902 76.1813 174 80.1016 174 80.1016" stroke="url(#paint2_linear_3933_98129)" stroke-width="4.67324" stroke-linecap="round"/>
+<path d="M193.129 103.014C190.348 104.211 186.502 105.08 183.942 104.965C181.383 104.85 179.442 104.139 177.512 102.731C175.582 101.323 173.912 99.1826 172.919 96.7065C171.926 94.2305 171.898 91.2515 172 88.1016C172.102 84.9518 172.656 81.6331 173.837 78.3114C175.019 74.9897 176.358 72.3001 178.43 69.336C180.503 66.3718 184.066 62.9144 186.698 60.7801C189.331 58.6459 191.274 57.5836 194.047 56.6194L193.129 73.0145C192.277 73.3107 191.182 73.544 190.373 74.1997C189.564 74.8555 189.172 75.0792 188.536 75.9899C187.899 76.9007 187.98 77.3644 187.617 78.385C187.254 79.4056 186.73 81.8123 186.698 82.7801C186.667 83.7479 186.393 84.0193 186.698 84.7801C187.003 85.5409 187.943 86.5574 188.536 86.9899C189.129 87.4224 189.586 87.1644 190.373 87.1997C191.159 87.2351 192.274 87.382 193.129 87.0145V103.014Z" fill="#D3B8AC"/>
+<path d="M213.664 75.4027C213.664 79.7319 212.405 84.4914 210.067 88.9992C207.729 93.5069 204.433 97.5314 200.651 100.496C196.869 103.46 192.794 105.213 189.012 105.502C185.23 105.791 181.933 104.601 179.596 102.104L188.535 91.1895C189.501 92.2213 190.863 92.7128 192.427 92.5934C193.99 92.474 195.673 91.7499 197.236 90.5248C198.799 89.2997 200.161 87.6366 201.127 85.7738C202.093 83.911 202.614 81.9441 202.614 80.1551L213.664 75.4027Z" fill="#FF6D2D"/>
+<path d="M193.999 58.1016C197.304 56.6803 201.185 55.1129 204.104 55.7555C208.634 56.7525 209.599 59.038 211.453 61.5948C213.308 64.1515 214.771 68.1393 215.128 72.0144C215.485 75.8895 214.514 79.514 213.291 83.8046L201.348 83.9408C201.861 82.1447 203.335 79.7728 203.186 78.1506C203.036 76.5285 201.206 75.4062 200.43 74.3359C199.654 73.2656 199.815 72.3951 198.592 72.1261C197.37 71.8571 195.383 72.5066 193.999 73.1016V58.1016Z" fill="#3F3E87"/>
+<path d="M194.831 104.002C192.3 105.091 189.795 105.613 187.465 105.537C185.135 105.461 183.029 104.789 181.272 103.56C179.516 102.332 178.144 100.572 177.24 98.3869C176.337 96.2016 175.919 93.6354 176.012 90.8416C176.105 88.0478 176.707 85.0837 177.783 82.1266C178.858 79.1695 180.384 76.28 182.27 73.6309C184.156 70.9817 186.363 68.6272 188.76 66.7082C191.156 64.7892 193.692 63.345 196.217 62.4619L195.257 77.0375C194.481 77.3088 193.702 77.7526 192.966 78.3422C192.23 78.9318 191.551 79.6552 190.972 80.4692C190.393 81.2831 189.924 82.1709 189.593 83.0795C189.263 83.9881 189.078 84.8988 189.049 85.7572C189.021 86.6156 189.149 87.4041 189.427 88.0755C189.704 88.7469 190.126 89.2875 190.665 89.665C191.205 90.0424 191.852 90.249 192.568 90.2723C193.284 90.2957 194.054 90.1353 194.831 89.8008V104.002Z" fill="#FDE3D7"/>
+<path d="M194.831 63.0021C198.026 61.6282 201.168 61.1615 203.962 61.6458C206.756 62.1302 209.11 63.5497 210.803 65.7708C212.495 67.992 213.471 70.9417 213.638 74.3426C213.805 77.7435 213.157 81.4838 211.757 85.2115L201.917 84.2177C202.503 82.6572 202.774 81.0915 202.704 79.6679C202.634 78.2442 202.226 77.0094 201.517 76.0796C200.809 75.1498 199.823 74.5556 198.654 74.3528C197.484 74.1501 196.169 74.3455 194.831 74.9206V63.0021Z" fill="#5E5DC1"/>
+<circle cx="10.5" cy="10.5" r="10.5" transform="matrix(0.918641 -0.395094 0 1 184.999 78.1016)" fill="white"/>
+<path d="M48 89.1015C48 89.1015 65.4074 83.1801 82 89.1015C98.5926 95.0229 104 109.101 104 109.101" stroke="url(#paint3_linear_3933_98129)" stroke-width="4.67324" stroke-linecap="round"/>
+<g clip-path="url(#clip0_3933_98129)">
+<g clip-path="url(#clip1_3933_98129)">
+<path d="M3.72961 82.4421C3.72961 81.0614 4.79846 79.6099 6.11694 79.2001C7.43543 78.7902 8.50427 79.5773 8.50427 80.958V106.958C8.50427 108.339 7.43543 109.79 6.11694 110.2C4.79846 110.61 3.72961 109.823 3.72961 108.442V82.4421Z" fill="#DADAF0"/>
+<path d="M3.72961 91.4421C3.72961 90.0614 4.79846 88.6099 6.11694 88.2001C7.43543 87.7902 8.50427 88.5773 8.50427 89.958V106.958C8.50427 108.339 7.43543 109.79 6.11694 110.2C4.79846 110.61 3.72961 109.823 3.72961 108.442V91.4421Z" fill="#5E5DC1"/>
+</g>
+<g clip-path="url(#clip2_3933_98129)">
+<path d="M13.0208 68.5542C13.0208 67.1735 14.0896 65.722 15.4081 65.3121C16.7266 64.9023 17.7954 65.6894 17.7954 67.0701V103.07C17.7954 104.451 16.7266 105.902 15.4081 106.312C14.0896 106.722 13.0208 105.935 13.0208 104.554V68.5542Z" fill="#DADAF0"/>
+<path d="M13.0208 80.5542C13.0208 79.1735 14.0896 77.722 15.4081 77.3121C16.7266 76.9023 17.7954 77.6894 17.7954 79.0701V103.07C17.7954 104.451 16.7266 105.902 15.4081 106.312C14.0896 106.722 13.0208 105.935 13.0208 104.554V80.5542Z" fill="#5E5DC1"/>
+</g>
+<g clip-path="url(#clip3_3933_98129)">
+<path d="M22.3118 86.6663C22.3118 85.2855 23.3806 83.834 24.6991 83.4242C26.0176 83.0144 27.0864 83.8014 27.0864 85.1821V100.182C27.0864 101.563 26.0176 103.014 24.6991 103.424C23.3806 103.834 22.3118 103.047 22.3118 101.666V86.6663Z" fill="#DADAF0"/>
+<path d="M22.3118 93.6663C22.3118 92.2855 23.3806 90.834 24.6991 90.4242C26.0176 90.0144 27.0864 90.8014 27.0864 92.1821V102.182C27.0864 103.563 26.0176 105.014 24.6991 105.424C23.3806 105.834 22.3118 105.047 22.3118 103.666V93.6663Z" fill="#5E5DC1"/>
+</g>
+<g clip-path="url(#clip4_3933_98129)">
+<path d="M31.6028 70.7783C31.6028 69.3976 32.6716 67.9461 33.9901 67.5363C35.3086 67.1264 36.3774 67.9135 36.3774 69.2942V97.2942C36.3774 98.6749 35.3086 100.126 33.9901 100.536C32.6716 100.946 31.6028 100.159 31.6028 98.7783V70.7783Z" fill="#DADAF0"/>
+<path d="M31.6028 79.7783C31.6028 78.3976 32.6716 76.9461 33.9901 76.5363C35.3086 76.1264 36.3774 76.9135 36.3774 78.2942V97.2942C36.3774 98.6749 35.3086 100.126 33.9901 100.536C32.6716 100.946 31.6028 100.159 31.6028 98.7783V79.7783Z" fill="#5E5DC1"/>
+</g>
+</g>
+<rect width="44" height="11.9998" rx="5.99988" transform="matrix(0.975292 -0.220918 0.438783 0.898593 19.0001 54.1018)" fill="#2B2F3C"/>
+<rect width="33" height="11.9998" rx="5.99988" transform="matrix(0.975292 -0.220918 0.438783 0.898593 19.0001 54.1018)" fill="#5E5DC1"/>
+<mask id="mask0_3933_98129" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="21" y="47" width="34" height="17">
+<rect width="33" height="11.9998" rx="5.99988" transform="matrix(0.975292 -0.220918 0.438783 0.898593 19 54.1016)" fill="#7962EE"/>
+</mask>
+<g mask="url(#mask0_3933_98129)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9802 42.8046L9.64047 68.5534L10.5413 68.9851L22.881 43.2363L21.9802 42.8046ZM25.961 41.9029L13.6213 67.6517L14.5221 68.0833L26.8618 42.3346L25.961 41.9029ZM17.6022 66.7499L29.9419 41.0012L30.8427 41.4329L18.503 67.1816L17.6022 66.7499ZM33.9227 40.0995L21.583 65.8482L22.4838 66.2799L34.8235 40.5311L33.9227 40.0995ZM25.5639 64.9465L37.9036 39.1977L38.8044 39.6294L26.4647 65.3782L25.5639 64.9465ZM41.8845 38.296L29.5447 64.0448L30.4455 64.4765L42.7852 38.7277L41.8845 38.296ZM33.5256 63.143L45.8653 37.3943L46.7661 37.826L34.4264 63.5747L33.5256 63.143ZM49.8462 36.4926L37.5065 62.2413L38.4072 62.673L50.7469 36.9243L49.8462 36.4926ZM41.4873 61.3396L53.827 35.5909L54.7278 36.0225L42.3881 61.7713L41.4873 61.3396ZM57.8079 34.6891L45.4682 60.4379L46.3689 60.8696L58.7087 35.1208L57.8079 34.6891ZM49.449 59.5362L61.7887 33.7874L62.6895 34.2191L50.3498 59.9678L49.449 59.5362ZM65.7696 32.8857L53.4299 58.6344L54.3307 59.0661L66.6704 33.3174L65.7696 32.8857ZM57.4107 57.7327L69.7504 31.984L70.6512 32.4157L58.3115 58.1644L57.4107 57.7327ZM73.7313 31.0822L61.3916 56.831L62.2924 57.2627L74.6321 31.5139L73.7313 31.0822ZM65.3724 55.9293L77.7121 30.1805L78.6129 30.6122L66.2732 56.361L65.3724 55.9293ZM81.693 29.2788L69.3533 55.0276L70.2541 55.4592L82.5938 29.7105L81.693 29.2788Z" fill="white"/>
+</g>
+<g filter="url(#filter2_d_3933_98129)">
+<g clip-path="url(#clip5_3933_98129)">
+<rect width="26" height="14" rx="7" transform="matrix(0.995796 0.091597 -0.292925 0.956136 145 43.1016)" fill="#EE7541"/>
+<g filter="url(#filter3_dd_3933_98129)">
+<circle cx="5.84155" cy="5.84155" r="5.84155" transform="matrix(0.995796 0.091597 -0.292925 0.956136 157.754 45.4136)" fill="white"/>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_3933_98129" x="31.8886" y="0.475626" width="39.2671" height="39.2672" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4.48559"/>
+<feGaussianBlur stdDeviation="3.52439"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_3933_98129"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_3933_98129" result="shape"/>
+</filter>
+<filter id="filter1_d_3933_98129" x="101.497" y="14.7415" width="34.7327" height="34.3926" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="0.78615" dy="2.35845"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.168627 0 0 0 0 0.184314 0 0 0 0 0.235294 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_3933_98129"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_3933_98129" result="shape"/>
+</filter>
+<filter id="filter2_d_3933_98129" x="140.02" y="43.1016" width="38.186" height="21.4304" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="2.33662" dy="2.33662"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.168627 0 0 0 0 0.184314 0 0 0 0 0.235294 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_3933_98129"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_3933_98129" result="shape"/>
+</filter>
+<filter id="filter3_dd_3933_98129" x="152.795" y="43.9226" width="18.1301" height="17.2227" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0627451 0 0 0 0 0.0941176 0 0 0 0 0.156863 0 0 0 0.06 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_3933_98129"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0627451 0 0 0 0 0.0941176 0 0 0 0 0.156863 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_3933_98129" result="effect2_dropShadow_3933_98129"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_3933_98129" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_3933_98129" x1="74.4237" y1="171.387" x2="68.4597" y2="185.994" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#F7F7F7" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_3933_98129" x1="38.2251" y1="18.041" x2="92.3662" y2="110.905" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF6D2D"/>
+<stop offset="1" stop-color="#FF6D2D" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3933_98129" x1="175.806" y1="81.0045" x2="131.83" y2="118.977" gradientUnits="userSpaceOnUse">
+<stop stop-color="#5E5DC1"/>
+<stop offset="1" stop-color="#5E5DC1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_3933_98129" x1="45.9259" y1="86.7313" x2="99.2287" y2="81.326" gradientUnits="userSpaceOnUse">
+<stop stop-color="#5E5DC1"/>
+<stop offset="1" stop-color="#5E5DC1" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_3933_98129">
+<rect width="42" height="46" fill="white" transform="matrix(0.954932 -0.296826 0 1 0 65.1016)"/>
+</clipPath>
+<clipPath id="clip1_3933_98129">
+<path d="M3.72961 81.244C3.72961 80.525 4.28622 79.7691 4.97284 79.5557L7.26105 78.8444C7.94766 78.631 8.50427 79.0409 8.50427 79.7599V109.458L3.72961 110.942V81.244Z" fill="white"/>
+</clipPath>
+<clipPath id="clip2_3933_98129">
+<path d="M13.0208 67.3561C13.0208 66.6371 13.5774 65.8812 14.264 65.6678L16.5522 64.9565C17.2388 64.7431 17.7954 65.153 17.7954 65.872V105.57L13.0208 107.054V67.3561Z" fill="white"/>
+</clipPath>
+<clipPath id="clip3_3933_98129">
+<path d="M22.3118 85.4682C22.3118 84.7491 22.8684 83.9932 23.555 83.7798L25.8432 83.0686C26.5298 82.8551 27.0864 83.265 27.0864 83.984V102.682L22.3118 104.166V85.4682Z" fill="white"/>
+</clipPath>
+<clipPath id="clip4_3933_98129">
+<path d="M31.6028 69.5802C31.6028 68.8612 32.1594 68.1053 32.846 67.8919L35.1342 67.1806C35.8208 66.9672 36.3774 67.3771 36.3774 68.0961V99.7942L31.6028 101.278V69.5802Z" fill="white"/>
+</clipPath>
+<clipPath id="clip5_3933_98129">
+<rect width="26" height="14" rx="7" transform="matrix(0.995796 0.091597 -0.292925 0.956136 145 43.1016)" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/client/src/ce/AppRouter.tsx b/app/client/src/ce/AppRouter.tsx
index b5d915f61c1f..eb2b0b032b6b 100644
--- a/app/client/src/ce/AppRouter.tsx
+++ b/app/client/src/ce/AppRouter.tsx
@@ -14,7 +14,6 @@ import {
BUILDER_PATCH_PATH,
BUILDER_PATH,
BUILDER_PATH_DEPRECATED,
- LICENSE_CHECK_PATH,
PROFILE,
SETUP,
SIGNUP_SUCCESS_URL,
@@ -68,7 +67,6 @@ import {
} from "@appsmith/selectors/tenantSelectors";
import useBrandingTheme from "utils/hooks/useBrandingTheme";
import RouteChangeListener from "RouteChangeListener";
-import { Spinner } from "design-system-old";
/*
We use this polyfill to show emoji flags
@@ -135,7 +133,6 @@ export function Routes() {
*/}
<Redirect from={BUILDER_PATCH_PATH} to={BUILDER_PATH} />
<Redirect from={VIEWER_PATCH_PATH} to={VIEWER_PATH} />
- <SentryRoute component={Spinner} path={LICENSE_CHECK_PATH} />
<SentryRoute component={PageNotFound} />
</Switch>
);
diff --git a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
index 9bc04378a1a0..455bc52d4b9c 100644
--- a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
+++ b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
@@ -1,7 +1,7 @@
import React from "react";
import styled from "styled-components";
-import BEBannerImage from "assets/images/upgrade/be-cta/be-box-image.png";
import BETextImage from "assets/svg/be-upgrade/upgrade-to-be-text.svg";
+import BECtaImage from "assets/svg/be-upgrade/be-cta.svg";
import {
createMessage,
MOVE_TO_BUSINESS_EDITION,
@@ -11,8 +11,6 @@ import useOnUpgrade from "utils/hooks/useOnUpgrade";
import { Colors } from "constants/Colors";
export const UpgradeToBEPageWrapper = styled.div`
- display: flex;
- flex-direction: column;
width: 100%;
height: 100%;
background: linear-gradient(90deg, #fff 20px, transparent 1%) center,
@@ -21,13 +19,10 @@ export const UpgradeToBEPageWrapper = styled.div`
`;
export const ImageContainer = styled.div`
- display: flex;
- min-width: 50%;
+ min-width: 400px;
img {
- width: 400px;
- height: 400px;
- position: relative;
- right: 200px;
+ width: 600px;
+ height: 600px;
}
`;
@@ -54,25 +49,32 @@ export const Overlay = styled.div`
export const FlexContainer = styled.div`
display: flex;
- flex-direction: row;
align-items: center;
height: calc(100% - 96px);
width: 100%;
- padding: 48px 200px;
- justify-content: space-between;
- min-width: 900px;
+ justify-content: center;
+ min-width: 1200px;
`;
export const LeftWrapper = styled.div`
- display: flex;
- flex-direction: column;
- min-width: 80%;
+ min-width: 700px;
img {
- width: 800px;
- height: 800px;
+ width: 1000px;
+ height: 1000px;
}
`;
+export const ContentWrapper = styled.div`
+ display: flex;
+ height: 100%;
+ width: 1000px;
+ flex-direction: row;
+ padding: 48px 200px;
+ align-items: center;
+ justify-content: center;
+ min-width: 900px;
+`;
+
export const UpgradeToBEPage = () => {
const { onUpgrade } = useOnUpgrade({
logEventName: "BILLING_UPGRADE_ADMIN_SETTINGS",
@@ -82,13 +84,15 @@ export const UpgradeToBEPage = () => {
return (
<UpgradeToBEPageWrapper>
<Overlay>
- <FlexContainer>
- <LeftWrapper>
- <img alt="text-content" src={BETextImage} />
- </LeftWrapper>
- <ImageContainer>
- <img alt="Upgrade to Business Edition" src={BEBannerImage} />
- </ImageContainer>
+ <FlexContainer className="flex-container">
+ <ContentWrapper className="content-wrapper">
+ <LeftWrapper>
+ <img alt="text-content" src={BETextImage} />
+ </LeftWrapper>
+ <ImageContainer>
+ <img alt="Upgrade to Business Edition" src={BECtaImage} />
+ </ImageContainer>
+ </ContentWrapper>
</FlexContainer>
</Overlay>
<FooterContainer>
|
a41ccec01eb57a7c29093ee0f4bd71a360a43150
|
2023-06-27 10:59:52
|
akash-codemonk
|
chore: analytics for when app is marked public (#24835)
| false
|
analytics for when app is marked public (#24835)
|
chore
|
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
index 1477051e3b8a..1ae784598c46 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
@@ -21,6 +21,7 @@ import {
} from "@appsmith/utils/permissionHelpers";
import MakeApplicationForkable from "./MakeApplicationForkable";
import EmbedSnippetTab from "@appsmith/pages/Applications/EmbedSnippetTab";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const StyledPropertyHelpLabel = styled(PropertyHelpLabel)`
.bp3-popover-content > div {
@@ -68,15 +69,18 @@ function EmbedSettings() {
data-testid="t--embed-settings-application-public"
isDisabled={isFetchingApplication || isChangingViewAccess}
isSelected={application?.isPublic}
- onChange={() =>
+ onChange={() => {
+ AnalyticsUtil.logEvent("MAKE_APPLICATION_PUBLIC", {
+ isPublic: !application?.isPublic,
+ });
application &&
- dispatch(
- changeAppViewAccessInit(
- application?.id,
- !application?.isPublic,
- ),
- )
- }
+ dispatch(
+ changeAppViewAccessInit(
+ application?.id,
+ !application?.isPublic,
+ ),
+ );
+ }}
>
<StyledPropertyHelpLabel
label={createMessage(MAKE_APPLICATION_PUBLIC)}
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index dfd264a0c0b9..668363a31930 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -282,6 +282,7 @@ export function EditorHeader(props: EditorHeaderProps) {
appName,
pageCount,
...navigationSettingsWithPrefix,
+ isPublic: !!currentApplication?.isPublic,
});
}
};
diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
index 0c003f2d38da..1ab93ac16f1e 100644
--- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
@@ -24,6 +24,7 @@ import {
import { getAppsmithConfigs } from "@appsmith/configs";
import { hasInviteUserToApplicationPermission } from "@appsmith/utils/permissionHelpers";
import { Button, Icon, Switch, Tooltip } from "design-system";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const { cloudHosting } = getAppsmithConfigs();
@@ -142,6 +143,9 @@ function AppInviteUsersForm(props: any) {
isDisabled={isChangingViewAccess || isFetchingApplication}
isSelected={currentApplicationDetails.isPublic}
onChange={() => {
+ AnalyticsUtil.logEvent("MAKE_APPLICATION_PUBLIC", {
+ isPublic: !currentApplicationDetails.isPublic,
+ });
changeAppViewAccess(
applicationId,
!currentApplicationDetails.isPublic,
diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/utils/AnalyticsUtil.tsx
index d8ac2672ded5..ab20e2403d90 100644
--- a/app/client/src/utils/AnalyticsUtil.tsx
+++ b/app/client/src/utils/AnalyticsUtil.tsx
@@ -332,7 +332,8 @@ export type EventName =
| "JS_VARIABLE_CREATED"
| "JS_VARIABLE_MUTATED"
| "EXPLORER_WIDGET_CLICK"
- | "WIDGET_SEARCH";
+ | "WIDGET_SEARCH"
+ | "MAKE_APPLICATION_PUBLIC";
export type AI_EVENTS =
| "AI_QUERY_SENT"
|
688324e68b99a4ae4b246c82e39f759fa65b4d3d
|
2024-10-02 13:59:46
|
Ankita Kinger
|
chore: Adding the GraphQLEditorForm for the modularised flow (#36633)
| false
|
Adding the GraphQLEditorForm for the modularised flow (#36633)
|
chore
|
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
index 66ab320a3048..759ea60f1b70 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/PluginActionForm.tsx
@@ -4,6 +4,7 @@ import { Flex } from "@appsmith/ads";
import { useChangeActionCall } from "./hooks/useChangeActionCall";
import { usePluginActionContext } from "../../PluginActionContext";
import { UIComponentTypes } from "api/PluginApi";
+import GraphQLEditorForm from "./components/GraphQLEditor/GraphQLEditorForm";
const PluginActionForm = () => {
useChangeActionCall();
@@ -11,9 +12,12 @@ const PluginActionForm = () => {
return (
<Flex p="spaces-2" w="100%">
- {plugin.uiComponent === UIComponentTypes.ApiEditorForm ? (
+ {plugin.uiComponent === UIComponentTypes.ApiEditorForm && (
<APIEditorForm />
- ) : null}
+ )}
+ {plugin.uiComponent === UIComponentTypes.GraphQLEditorForm && (
+ <GraphQLEditorForm />
+ )}
</Flex>
);
};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
index da75a1482a26..8b71a662e410 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts
@@ -20,6 +20,7 @@ function useGetFormActionValues() {
// return empty values to avoid form ui issues
if (!formValues || !isAPIAction(formValues)) {
return {
+ actionConfigurationBody: "",
actionHeaders: [],
actionParams: [],
autoGeneratedHeaders: [],
@@ -28,6 +29,12 @@ function useGetFormActionValues() {
};
}
+ const actionConfigurationBody = get(
+ formValues,
+ "actionConfiguration.body",
+ "",
+ ) as string;
+
const actionHeaders = get(
formValues,
"actionConfiguration.headers",
@@ -67,6 +74,7 @@ function useGetFormActionValues() {
) as Property[];
return {
+ actionConfigurationBody,
actionHeaders,
autoGeneratedHeaders,
actionParams,
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
new file mode 100644
index 000000000000..717781b5a382
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import { reduxForm } from "redux-form";
+import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
+import CommonEditorForm from "../CommonEditorForm";
+import Pagination from "pages/Editor/APIEditor/GraphQL/Pagination";
+import { GRAPHQL_HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/GraphQLEditorConstants";
+import PostBodyData from "./PostBodyData";
+import { usePluginActionContext } from "PluginActionEditor";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { noop } from "lodash";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import useGetFormActionValues from "../CommonEditorForm/hooks/useGetFormActionValues";
+
+const FORM_NAME = API_EDITOR_FORM_NAME;
+
+function GraphQLEditorForm() {
+ const { action } = usePluginActionContext();
+ const theme = EditorTheme.LIGHT;
+
+ const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+ const isChangePermitted = getHasManageActionPermission(
+ isFeatureEnabled,
+ action.userPermissions,
+ );
+
+ const { actionConfigurationBody } = useGetFormActionValues();
+
+ return (
+ <CommonEditorForm
+ action={action}
+ bodyUIComponent={<PostBodyData actionName={action.name} />}
+ formName={FORM_NAME}
+ httpMethodOptions={GRAPHQL_HTTP_METHOD_OPTIONS}
+ isChangePermitted={isChangePermitted}
+ paginationUiComponent={
+ <Pagination
+ actionName={action.name}
+ formName={FORM_NAME}
+ onTestClick={noop}
+ paginationType={action.actionConfiguration.paginationType}
+ query={actionConfigurationBody}
+ theme={theme}
+ />
+ }
+ />
+ );
+}
+
+export default reduxForm({ form: FORM_NAME, enableReinitialize: true })(
+ GraphQLEditorForm,
+);
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx
new file mode 100644
index 000000000000..f897d38246e9
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData.tsx
@@ -0,0 +1,109 @@
+import React, { useCallback, useRef } from "react";
+import styled from "styled-components";
+import QueryEditor from "pages/Editor/APIEditor/GraphQL/QueryEditor";
+import VariableEditor from "pages/Editor/APIEditor/GraphQL/VariableEditor";
+import useHorizontalResize from "utils/hooks/useHorizontalResize";
+import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
+import classNames from "classnames";
+import { tailwindLayers } from "constants/Layers";
+
+const ResizableDiv = styled.div`
+ display: flex;
+ height: 100%;
+ flex-shrink: 0;
+`;
+
+const PostBodyContainer = styled.div`
+ display: flex;
+ height: 100%;
+ overflow: hidden;
+ &&&& .CodeMirror {
+ height: 100%;
+ border-top: 1px solid var(--ads-v2-color-border);
+ border-bottom: 1px solid var(--ads-v2-color-border);
+ border-radius: 0;
+ padding: 0;
+ }
+ & .CodeMirror-scroll {
+ margin: 0px;
+ padding: 0px;
+ overflow: auto !important;
+ }
+`;
+
+const ResizerHandler = styled.div<{ resizing: boolean }>`
+ width: 6px;
+ height: 100%;
+ margin-left: 2px;
+ border-right: 1px solid var(--ads-v2-color-border);
+ background: ${(props) =>
+ props.resizing ? "var(--ads-v2-color-border)" : "transparent"};
+ &:hover {
+ background: var(--ads-v2-color-border);
+ border-color: transparent;
+ }
+`;
+
+const DEFAULT_GRAPHQL_VARIABLE_WIDTH = 300;
+
+interface Props {
+ actionName: string;
+}
+
+function PostBodyData(props: Props) {
+ const { actionName } = props;
+ const theme = EditorTheme.LIGHT;
+ const resizeableRef = useRef<HTMLDivElement>(null);
+ const [variableEditorWidth, setVariableEditorWidth] = React.useState(
+ DEFAULT_GRAPHQL_VARIABLE_WIDTH,
+ );
+ /**
+ * Variable Editor's resizeable handler for the changing of width
+ */
+ const onVariableEditorWidthChange = useCallback((newWidth) => {
+ setVariableEditorWidth(newWidth);
+ }, []);
+
+ const { onMouseDown, onMouseUp, onTouchStart, resizing } =
+ useHorizontalResize(
+ resizeableRef,
+ onVariableEditorWidthChange,
+ undefined,
+ true,
+ );
+
+ return (
+ <PostBodyContainer>
+ <QueryEditor
+ dataTreePath={`${actionName}.config.body`}
+ height="100%"
+ name="actionConfiguration.body"
+ theme={theme}
+ />
+ <div
+ className={`w-2 h-full -ml-2 group cursor-ew-resize ${tailwindLayers.resizer}`}
+ onMouseDown={onMouseDown}
+ onTouchEnd={onMouseUp}
+ onTouchStart={onTouchStart}
+ >
+ <ResizerHandler
+ className={classNames({
+ "transform transition": true,
+ })}
+ resizing={resizing}
+ />
+ </div>
+ <ResizableDiv
+ ref={resizeableRef}
+ style={{
+ width: `${variableEditorWidth}px`,
+ paddingRight: "2px",
+ }}
+ >
+ <VariableEditor actionName={actionName} theme={theme} />
+ </ResizableDiv>
+ </PostBodyContainer>
+ );
+}
+
+export default PostBodyData;
diff --git a/app/client/src/api/PluginApi.ts b/app/client/src/api/PluginApi.ts
index ef8987b4208f..5bcc33486109 100644
--- a/app/client/src/api/PluginApi.ts
+++ b/app/client/src/api/PluginApi.ts
@@ -13,6 +13,7 @@ export enum UIComponentTypes {
UQIDbEditorForm = "UQIDbEditorForm",
ApiEditorForm = "ApiEditorForm",
JsEditorForm = "JsEditorForm",
+ GraphQLEditorForm = "GraphQLEditorForm",
}
export enum DatasourceComponentTypes {
diff --git a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
index 1a2d9d517898..adca7c27f607 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
@@ -14,7 +14,6 @@ interface ApiEditorContextContextProps {
saveActionName: (
params: SaveActionNameParams,
) => ReduxAction<SaveActionNameParams>;
- closeEditorLink?: React.ReactNode;
showRightPaneTabbedSection?: boolean;
actionRightPaneAdditionSections?: React.ReactNode;
notification?: React.ReactNode | string;
@@ -31,7 +30,6 @@ export function ApiEditorContextProvider({
actionRightPaneAdditionSections,
actionRightPaneBackLink,
children,
- closeEditorLink,
handleDeleteClick,
handleRunClick,
moreActionsMenu,
@@ -44,7 +42,6 @@ export function ApiEditorContextProvider({
() => ({
actionRightPaneAdditionSections,
actionRightPaneBackLink,
- closeEditorLink,
handleDeleteClick,
showRightPaneTabbedSection,
handleRunClick,
@@ -56,7 +53,6 @@ export function ApiEditorContextProvider({
[
actionRightPaneBackLink,
actionRightPaneAdditionSections,
- closeEditorLink,
handleDeleteClick,
showRightPaneTabbedSection,
handleRunClick,
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index 979c4edf1cb1..7c265e98b5c0 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -3,11 +3,7 @@ import { useSelector } from "react-redux";
import styled from "styled-components";
import FormLabel from "components/editorComponents/FormLabel";
import FormRow from "components/editorComponents/FormRow";
-import type {
- ActionResponse,
- PaginationField,
- SuggestedWidget,
-} from "api/ActionAPI";
+import type { ActionResponse, PaginationField } from "api/ActionAPI";
import type { Action, PaginationType } from "entities/Action";
import ApiResponseView from "components/editorComponents/ApiResponseView";
import type { AppState } from "ee/reducers";
@@ -15,7 +11,6 @@ import ActionNameEditor from "components/editorComponents/ActionNameEditor";
import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
import { Button } from "@appsmith/ads";
import { useParams } from "react-router";
-import type { Datasource } from "entities/Datasource";
import equal from "fast-deep-equal/es6";
import { getPlugin } from "ee/selectors/entitiesSelector";
import type { AutoGeneratedHeader } from "./helpers";
@@ -148,23 +143,11 @@ export interface CommonFormProps {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
datasourceParams?: any;
actionName: string;
- apiId: string;
apiName: string;
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
settingsConfig: any;
hintMessages?: Array<string>;
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- datasources?: any;
- currentPageId?: string;
- applicationId?: string;
- hasResponse: boolean;
- responseDataTypes: { key: string; title: string }[];
- responseDisplayFormat: { title: string; value: string };
- suggestedWidgets?: SuggestedWidget[];
- updateDatasource: (datasource: Datasource) => void;
- currentActionDatasourceId: string;
autoGeneratedActionConfigHeaders?: AutoGeneratedHeader[];
}
@@ -177,9 +160,6 @@ type CommonFormPropsWithExtraParams = CommonFormProps & {
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
handleSubmit: any;
- // defaultSelectedTabIndex
- defaultTabSelected?: number;
- closeEditorLink?: React.ReactNode;
httpsMethods: { value: string }[];
};
@@ -215,7 +195,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
actionConfigurationParams,
actionResponse,
autoGeneratedActionConfigHeaders,
- closeEditorLink,
formName,
handleSubmit,
hintMessages,
@@ -287,7 +266,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
return (
<MainContainer>
- {closeEditorLink}
<Form
data-testid={`t--action-form-${plugin?.type}`}
onSubmit={handleSubmit(noop)}
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
index cc502267e6f5..1ed0faf3cdda 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
@@ -1,76 +1,28 @@
-import React, { useCallback, useContext, useRef } from "react";
+import React from "react";
import { connect } from "react-redux";
import type { InjectedFormProps } from "redux-form";
-import { change, formValueSelector, reduxForm } from "redux-form";
-import classNames from "classnames";
-import styled from "styled-components";
+import { formValueSelector, reduxForm } from "redux-form";
import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
import type { Action } from "entities/Action";
import type { AppState } from "ee/reducers";
-import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
-import useHorizontalResize from "utils/hooks/useHorizontalResize";
import get from "lodash/get";
-import type { Datasource } from "entities/Datasource";
import {
getActionByBaseId,
getActionData,
} from "ee/selectors/entitiesSelector";
-import { isEmpty } from "lodash";
import type { CommonFormProps } from "../CommonEditorForm";
import CommonEditorForm from "../CommonEditorForm";
-import QueryEditor from "./QueryEditor";
-import { tailwindLayers } from "constants/Layers";
-import VariableEditor from "./VariableEditor";
import Pagination from "./Pagination";
-import { ApiEditorContext } from "../ApiEditorContext";
-import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
import { GRAPHQL_HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/GraphQLEditorConstants";
-
-const ResizeableDiv = styled.div`
- display: flex;
- height: 100%;
- flex-shrink: 0;
-`;
-
-const BodyWrapper = styled.div`
- display: flex;
- height: 100%;
- overflow: hidden;
- &&&& .CodeMirror {
- height: 100%;
- border-top: 1px solid var(--ads-v2-color-border);
- border-bottom: 1px solid var(--ads-v2-color-border);
- border-radius: 0;
- padding: 0;
- }
- & .CodeMirror-scroll {
- margin: 0px;
- padding: 0px;
- overflow: auto !important;
- }
-`;
-
-const ResizerHandler = styled.div<{ resizing: boolean }>`
- width: 6px;
- height: 100%;
- margin-left: 2px;
- border-right: 1px solid var(--ads-v2-color-border);
- background: ${(props) =>
- props.resizing ? "var(--ads-v2-color-border)" : "transparent"};
- &:hover {
- background: var(--ads-v2-color-border);
- border-color: transparent;
- }
-`;
+import PostBodyData from "PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/PostBodyData";
type APIFormProps = {
- httpMethodFromForm: string;
actionConfigurationBody: string;
} & CommonFormProps;
type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
-const DEFAULT_GRAPHQL_VARIABLE_WIDTH = 300;
+const FORM_NAME = API_EDITOR_FORM_NAME;
/**
* Graphql Editor form which uses the Common Editor and pass on the differentiating components from the API Editor.
@@ -79,72 +31,17 @@ const DEFAULT_GRAPHQL_VARIABLE_WIDTH = 300;
*/
function GraphQLEditorForm(props: Props) {
const { actionName } = props;
- const theme = EditorTheme.LIGHT;
- const sizeableRef = useRef<HTMLDivElement>(null);
- const [variableEditorWidth, setVariableEditorWidth] = React.useState(
- DEFAULT_GRAPHQL_VARIABLE_WIDTH,
- );
-
- const { closeEditorLink } = useContext(ApiEditorContext);
-
- /**
- * Variable Editor's resizeable handler for the changing of width
- */
- const onVariableEditorWidthChange = useCallback((newWidth) => {
- setVariableEditorWidth(newWidth);
- }, []);
-
- const { onMouseDown, onMouseUp, onTouchStart, resizing } =
- useHorizontalResize(
- sizeableRef,
- onVariableEditorWidthChange,
- undefined,
- true,
- );
return (
<CommonEditorForm
{...props}
- bodyUIComponent={
- <BodyWrapper>
- <QueryEditor
- dataTreePath={`${actionName}.config.body`}
- height="100%"
- name="actionConfiguration.body"
- theme={theme}
- />
- <div
- className={`w-2 h-full -ml-2 group cursor-ew-resize ${tailwindLayers.resizer}`}
- onMouseDown={onMouseDown}
- onTouchEnd={onMouseUp}
- onTouchStart={onTouchStart}
- >
- <ResizerHandler
- className={classNames({
- "transform transition": true,
- })}
- resizing={resizing}
- />
- </div>
- <ResizeableDiv
- ref={sizeableRef}
- style={{
- width: `${variableEditorWidth}px`,
- paddingRight: "2px",
- }}
- >
- <VariableEditor actionName={actionName} theme={theme} />
- </ResizeableDiv>
- </BodyWrapper>
- }
- closeEditorLink={closeEditorLink}
- defaultTabSelected={2}
- formName={API_EDITOR_FORM_NAME}
+ bodyUIComponent={<PostBodyData actionName={actionName} />}
+ formName={FORM_NAME}
httpsMethods={GRAPHQL_HTTP_METHOD_OPTIONS}
paginationUIComponent={
<Pagination
actionName={actionName}
- formName={API_EDITOR_FORM_NAME}
+ formName={FORM_NAME}
onTestClick={props.onRunClick}
paginationType={props.paginationType}
query={props.actionConfigurationBody}
@@ -154,28 +51,12 @@ function GraphQLEditorForm(props: Props) {
);
}
-const selector = formValueSelector(API_EDITOR_FORM_NAME);
-
-interface ReduxDispatchProps {
- updateDatasource: (datasource: Datasource) => void;
-}
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
- updateDatasource: (datasource) => {
- dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource));
- },
-});
+const selector = formValueSelector(FORM_NAME);
export default connect(
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(state: AppState, props: { pluginId: string; match?: any }) => {
- const httpMethodFromForm = selector(
- state,
- "actionConfiguration.httpMethod",
- );
const actionConfigurationHeaders =
selector(state, "actionConfiguration.headers") || [];
const actionConfigurationParams =
@@ -201,55 +82,27 @@ export default connect(
get(datasourceFromAction, "datasourceConfiguration.queryParameters") ||
[];
- const currentActionDatasourceId = selector(state, "datasource.id");
-
const actionConfigurationBody =
selector(state, "actionConfiguration.body") || "";
- let hasResponse = false;
- let suggestedWidgets;
const actionResponse = getActionData(state, apiId);
- if (actionResponse) {
- hasResponse =
- !isEmpty(actionResponse.statusCode) &&
- actionResponse.statusCode[0] === "2";
- suggestedWidgets = actionResponse.suggestedWidgets;
- }
-
- const actionData = getActionData(state, apiId);
- const { responseDataTypes, responseDisplayFormat } =
- actionResponseDisplayDataFormats(actionData);
-
return {
actionName,
actionResponse,
- apiId,
- httpMethodFromForm,
actionConfigurationHeaders,
actionConfigurationParams,
actionConfigurationBody,
- currentActionDatasourceId,
datasourceHeaders,
datasourceParams,
hintMessages,
- datasources: state.entities.datasources.list.filter(
- (d) => d.pluginId === props.pluginId,
- ),
- currentPageId: state.entities.pageList.currentPageId,
- applicationId: state.entities.pageList.applicationId,
- responseDataTypes,
- responseDisplayFormat,
- suggestedWidgets,
- hasResponse,
};
},
- mapDispatchToProps,
)(
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
reduxForm<Action, any>({
- form: API_EDITOR_FORM_NAME,
+ form: FORM_NAME,
enableReinitialize: true,
})(GraphQLEditorForm),
);
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
index 442d1669b085..53948e1520b4 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
@@ -18,9 +18,7 @@ import styled from "styled-components";
import { Text, TextType } from "@appsmith/ads-old";
import LazyCodeEditor from "components/editorComponents/LazyCodeEditor";
-const QueryHeader = styled.div`
- display: flex;
- width: 100%;
+const QueryHeader = styled(Text)`
background: var(--ads-v2-color-bg-subtle);
padding: 8px 16px;
`;
@@ -51,10 +49,8 @@ function QueryEditor(props: QueryProps) {
return (
<QueryWrapper className="t--graphql-query-editor">
- <QueryHeader>
- <Text color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
- Query
- </Text>
+ <QueryHeader color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
+ Query
</QueryHeader>
<Field
border={CodeEditorBorder.NONE}
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
index 157978191e93..89a3d3b96d34 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
@@ -24,9 +24,7 @@ const VariableWrapper = styled.div`
}
`;
-const VariableHeader = styled.div`
- display: flex;
- width: 100%;
+const VariableHeader = styled(Text)`
background: var(--ads-v2-color-bg-subtle);
padding: 8px 16px;
`;
@@ -53,10 +51,8 @@ interface VariableProps {
function VariableEditor(props: VariableProps) {
return (
<VariableWrapper className="t--graphql-variable-editor">
- <VariableHeader>
- <Text color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
- Query variables
- </Text>
+ <VariableHeader color={"var(--ads-v2-color-fg)"} type={TextType.H6}>
+ Query variables
</VariableHeader>
<DynamicTextField
border={CodeEditorBorder.NONE}
diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
index 1435dca07e8d..0df046c99766 100644
--- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
@@ -1,7 +1,7 @@
-import React, { useContext } from "react";
+import React from "react";
import { connect } from "react-redux";
import type { InjectedFormProps } from "redux-form";
-import { change, formValueSelector, reduxForm } from "redux-form";
+import { formValueSelector, reduxForm } from "redux-form";
import { API_EDITOR_FORM_NAME } from "ee/constants/forms";
import type { Action } from "entities/Action";
import PostBodyData from "./PostBodyData";
@@ -9,19 +9,11 @@ import type { AppState } from "ee/reducers";
import { getApiName } from "selectors/formSelectors";
import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
import get from "lodash/get";
-import type { Datasource } from "entities/Datasource";
-import {
- getAction,
- getActionData,
- getActionResponses,
-} from "ee/selectors/entitiesSelector";
-import { isEmpty } from "lodash";
+import { getAction, getActionResponses } from "ee/selectors/entitiesSelector";
import type { CommonFormProps } from "./CommonEditorForm";
import CommonEditorForm from "./CommonEditorForm";
import Pagination from "./Pagination";
import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
-import { ApiEditorContext } from "./ApiEditorContext";
-import { actionResponseDisplayDataFormats } from "../utils";
import { HTTP_METHOD_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants";
type APIFormProps = {
@@ -30,8 +22,9 @@ type APIFormProps = {
type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
+const FORM_NAME = API_EDITOR_FORM_NAME;
+
function ApiEditorForm(props: Props) {
- const { closeEditorLink } = useContext(ApiEditorContext);
const { actionName } = props;
const theme = EditorTheme.LIGHT;
@@ -41,8 +34,7 @@ function ApiEditorForm(props: Props) {
bodyUIComponent={
<PostBodyData dataTreePath={`${actionName}.config`} theme={theme} />
}
- closeEditorLink={closeEditorLink}
- formName={API_EDITOR_FORM_NAME}
+ formName={FORM_NAME}
httpsMethods={HTTP_METHOD_OPTIONS}
paginationUIComponent={
<Pagination
@@ -56,21 +48,9 @@ function ApiEditorForm(props: Props) {
);
}
-const selector = formValueSelector(API_EDITOR_FORM_NAME);
-
-interface ReduxDispatchProps {
- updateDatasource: (datasource: Datasource) => void;
-}
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
- updateDatasource: (datasource) => {
- dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource));
- },
-});
+const selector = formValueSelector(FORM_NAME);
-export default connect((state: AppState, props: { pluginId: string }) => {
+export default connect((state: AppState) => {
const httpMethodFromForm = selector(state, "actionConfiguration.httpMethod");
const actionConfigurationHeaders =
selector(state, "actionConfiguration.headers") || [];
@@ -110,19 +90,6 @@ export default connect((state: AppState, props: { pluginId: string }) => {
const responses = getActionResponses(state);
const actionResponse = responses[apiId];
- let hasResponse = false;
- let suggestedWidgets;
-
- if (actionResponse) {
- hasResponse =
- !isEmpty(actionResponse.statusCode) &&
- actionResponse.statusCode[0] === "2";
- suggestedWidgets = actionResponse.suggestedWidgets;
- }
-
- const actionData = getActionData(state, apiId);
- const { responseDataTypes, responseDisplayFormat } =
- actionResponseDisplayDataFormats(actionData);
return {
actionName,
@@ -136,19 +103,10 @@ export default connect((state: AppState, props: { pluginId: string }) => {
datasourceHeaders,
datasourceParams,
hintMessages,
- datasources: state.entities.datasources.list.filter(
- (d) => d.pluginId === props.pluginId,
- ),
- currentPageId: state.entities.pageList.currentPageId,
- applicationId: state.entities.pageList.applicationId,
- responseDataTypes,
- responseDisplayFormat,
- suggestedWidgets,
- hasResponse,
};
-}, mapDispatchToProps)(
+})(
reduxForm<Action, APIFormProps>({
- form: API_EDITOR_FORM_NAME,
+ form: FORM_NAME,
enableReinitialize: true,
})(ApiEditorForm),
);
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index 85b6d5651183..370964cc6dcc 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -197,7 +197,7 @@ export function EditorJSONtoForm(props: Props) {
uiComponent,
} = props;
- const { actionRightPaneAdditionSections, closeEditorLink, notification } =
+ const { actionRightPaneAdditionSections, notification } =
useContext(QueryEditorContext);
const params = useParams<{ baseApiId?: string; baseQueryId?: string }>();
@@ -232,9 +232,12 @@ export function EditorJSONtoForm(props: Props) {
const selectedConfigTab = useSelector(getQueryPaneConfigSelectedTabIndex);
- const setSelectedConfigTab = useCallback((selectedIndex: string) => {
- dispatch(setQueryPaneConfigSelectedTabIndex(selectedIndex));
- }, []);
+ const setSelectedConfigTab = useCallback(
+ (selectedIndex: string) => {
+ dispatch(setQueryPaneConfigSelectedTabIndex(selectedIndex));
+ },
+ [dispatch],
+ );
// when switching between different redux forms, make sure this redux form has been initialized before rendering anything.
// the initialized prop below comes from redux-form.
@@ -243,107 +246,102 @@ export function EditorJSONtoForm(props: Props) {
}
return (
- <>
- {closeEditorLink}
- <QueryFormContainer onSubmit={handleSubmit(noop)}>
- <QueryEditorHeader
- dataSources={dataSources}
- formName={formName}
- isRunning={isRunning}
- onCreateDatasourceClick={onCreateDatasourceClick}
- onRunClick={onRunClick}
- plugin={plugin}
- />
- {notification && (
- <StyledNotificationWrapper>{notification}</StyledNotificationWrapper>
- )}
- <Wrapper>
- <div className="flex flex-1 w-full">
- <SecondaryWrapper>
- <TabContainerView>
- <Tabs
- onValueChange={setSelectedConfigTab}
- value={selectedConfigTab || EDITOR_TABS.QUERY}
+ <QueryFormContainer onSubmit={handleSubmit(noop)}>
+ <QueryEditorHeader
+ dataSources={dataSources}
+ formName={formName}
+ isRunning={isRunning}
+ onCreateDatasourceClick={onCreateDatasourceClick}
+ onRunClick={onRunClick}
+ plugin={plugin}
+ />
+ {notification && (
+ <StyledNotificationWrapper>{notification}</StyledNotificationWrapper>
+ )}
+ <Wrapper>
+ <div className="flex flex-1 w-full">
+ <SecondaryWrapper>
+ <TabContainerView>
+ <Tabs
+ onValueChange={setSelectedConfigTab}
+ value={selectedConfigTab || EDITOR_TABS.QUERY}
+ >
+ <TabsListWrapper>
+ <TabsList>
+ <Tab
+ data-testid={`t--query-editor-` + EDITOR_TABS.QUERY}
+ value={EDITOR_TABS.QUERY}
+ >
+ Query
+ </Tab>
+ <Tab
+ data-testid={`t--query-editor-` + EDITOR_TABS.SETTINGS}
+ value={EDITOR_TABS.SETTINGS}
+ >
+ Settings
+ </Tab>
+ </TabsList>
+ </TabsListWrapper>
+ <TabPanelWrapper
+ className="tab-panel"
+ value={EDITOR_TABS.QUERY}
>
- <TabsListWrapper>
- <TabsList>
- <Tab
- data-testid={`t--query-editor-` + EDITOR_TABS.QUERY}
- value={EDITOR_TABS.QUERY}
- >
- Query
- </Tab>
- <Tab
- data-testid={`t--query-editor-` + EDITOR_TABS.SETTINGS}
- value={EDITOR_TABS.SETTINGS}
- >
- Settings
- </Tab>
- </TabsList>
- </TabsListWrapper>
- <TabPanelWrapper
- className="tab-panel"
- value={EDITOR_TABS.QUERY}
+ <SettingsWrapper
+ data-testid={`t--action-form-${plugin?.type}`}
>
- <SettingsWrapper
- data-testid={`t--action-form-${plugin?.type}`}
- >
- <FormRender
- editorConfig={editorConfig}
- formData={props.formData}
- formEvaluationState={props.formEvaluationState}
- formName={formName}
- uiComponent={uiComponent}
- />
- </SettingsWrapper>
- </TabPanelWrapper>
- <TabPanelWrapper value={EDITOR_TABS.SETTINGS}>
- <SettingsWrapper>
- <ActionSettings
- actionSettingsConfig={settingConfig}
- formName={formName}
- />
- </SettingsWrapper>
- </TabPanelWrapper>
- </Tabs>
- {documentationLink && (
- <Tooltip
- content={createMessage(DOCUMENTATION_TOOLTIP)}
- placement="top"
+ <FormRender
+ editorConfig={editorConfig}
+ formData={props.formData}
+ formEvaluationState={props.formEvaluationState}
+ formName={formName}
+ uiComponent={uiComponent}
+ />
+ </SettingsWrapper>
+ </TabPanelWrapper>
+ <TabPanelWrapper value={EDITOR_TABS.SETTINGS}>
+ <SettingsWrapper>
+ <ActionSettings
+ actionSettingsConfig={settingConfig}
+ formName={formName}
+ />
+ </SettingsWrapper>
+ </TabPanelWrapper>
+ </Tabs>
+ {documentationLink && (
+ <Tooltip
+ content={createMessage(DOCUMENTATION_TOOLTIP)}
+ placement="top"
+ >
+ <DocumentationButton
+ className="t--datasource-documentation-link"
+ kind="tertiary"
+ onClick={(e: React.MouseEvent) => {
+ e.stopPropagation();
+ handleDocumentationClick();
+ }}
+ size="sm"
+ startIcon="book-line"
>
- <DocumentationButton
- className="t--datasource-documentation-link"
- kind="tertiary"
- onClick={(e: React.MouseEvent) => {
- e.stopPropagation();
- handleDocumentationClick();
- }}
- size="sm"
- startIcon="book-line"
- >
- {createMessage(DOCUMENTATION)}
- </DocumentationButton>
- </Tooltip>
- )}
- </TabContainerView>
- <QueryDebuggerTabs
- actionName={actionName}
- actionResponse={actionResponse}
- actionSource={actionSource}
- currentActionConfig={currentActionConfig}
- isRunning={isRunning}
- onRunClick={onRunClick}
- runErrorMessage={runErrorMessage}
- showSchema={showSchema}
- />
- <RunHistory />
- </SecondaryWrapper>
- </div>
- <ActionRightPane
- additionalSections={actionRightPaneAdditionSections}
- />
- </Wrapper>
- </QueryFormContainer>
- </>
+ {createMessage(DOCUMENTATION)}
+ </DocumentationButton>
+ </Tooltip>
+ )}
+ </TabContainerView>
+ <QueryDebuggerTabs
+ actionName={actionName}
+ actionResponse={actionResponse}
+ actionSource={actionSource}
+ currentActionConfig={currentActionConfig}
+ isRunning={isRunning}
+ onRunClick={onRunClick}
+ runErrorMessage={runErrorMessage}
+ showSchema={showSchema}
+ />
+ <RunHistory />
+ </SecondaryWrapper>
+ </div>
+ <ActionRightPane additionalSections={actionRightPaneAdditionSections} />
+ </Wrapper>
+ </QueryFormContainer>
);
}
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
index c5089fc6bdfc..88d21b626452 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
@@ -11,7 +11,6 @@ interface QueryEditorContextContextProps {
saveActionName: (
params: SaveActionNameParams,
) => ReduxAction<SaveActionNameParams>;
- closeEditorLink?: React.ReactNode;
actionRightPaneAdditionSections?: React.ReactNode;
showSuggestedWidgets?: boolean;
notification?: string | React.ReactNode;
@@ -29,7 +28,6 @@ export function QueryEditorContextProvider({
actionRightPaneBackLink,
changeQueryPage,
children,
- closeEditorLink,
moreActionsMenu,
notification,
onCreateDatasourceClick,
@@ -42,7 +40,6 @@ export function QueryEditorContextProvider({
actionRightPaneBackLink,
actionRightPaneAdditionSections,
changeQueryPage,
- closeEditorLink,
moreActionsMenu,
onCreateDatasourceClick,
onEntityNotFoundBackClick,
@@ -54,7 +51,6 @@ export function QueryEditorContextProvider({
actionRightPaneBackLink,
actionRightPaneAdditionSections,
changeQueryPage,
- closeEditorLink,
moreActionsMenu,
onCreateDatasourceClick,
onEntityNotFoundBackClick,
|
f5ec68edfeae6a27c03da832ddaf86aa8ef12fa9
|
2021-03-11 07:28:59
|
allcontributors[bot]
|
docs: add monarch0111 as a contributor (#3481)
| false
|
add monarch0111 as a contributor (#3481)
|
docs
|
diff --git a/.all-contributorsrc b/.all-contributorsrc
index dc4e405027b0..76e0ddcf8997 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -325,6 +325,15 @@
"code",
"test"
]
+ },
+ {
+ "login": "monarch0111",
+ "name": "Abhishek",
+ "avatar_url": "https://avatars.githubusercontent.com/u/2965013?v=4",
+ "profile": "https://github.com/monarch0111",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 21c7715a9cd1..829c1647fa11 100644
--- a/README.md
+++ b/README.md
@@ -144,6 +144,7 @@ The Appsmith platform is available under the [Apache License 2.0](https://www.ap
<td align="center"><a href="https://github.com/zegerhoogeboom"><img src="https://avatars.githubusercontent.com/u/5371096?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zeger Hoogeboom</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=zegerhoogeboom" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Devedunkey"><img src="https://avatars.githubusercontent.com/u/29448764?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Yoo</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=Devedunkey" title="Code">💻</a></td>
<td align="center"><a href="http://dwayne.io"><img src="https://avatars.githubusercontent.com/u/347097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dwayne Forde</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=osis" title="Code">💻</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=osis" title="Tests">⚠️</a></td>
+ <td align="center"><a href="https://github.com/monarch0111"><img src="https://avatars.githubusercontent.com/u/2965013?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abhishek</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=monarch0111" title="Code">💻</a></td>
</tr>
</table>
|
37a17384906f0b93b4b4940b2596b64381d854ac
|
2022-10-30 17:07:02
|
amogh2019
|
fix: MongoPlugin Update Command : parsing valid document or array of valid documents (#17732)
| false
|
MongoPlugin Update Command : parsing valid document or array of valid documents (#17732)
|
fix
|
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java
index 5a2d5ec76472..c03ff3131750 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/commands/UpdateMany.java
@@ -26,6 +26,7 @@
import static com.external.plugins.constants.FieldName.UPDATE_OPERATION;
import static com.external.plugins.constants.FieldName.UPDATE_QUERY;
import static com.external.plugins.utils.MongoPluginUtils.parseSafely;
+import static com.external.plugins.utils.MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments;
@Getter
@Setter
@@ -84,7 +85,7 @@ public Document parseCommand() {
Document queryDocument = parseSafely("Query", this.query);
- Document updateDocument = parseSafely("Update", this.update);
+ Object updateDocument = parseSafelyDocumentAndArrayOfDocuments("Update", this.update);
Document update = new Document();
update.put("q", queryDocument);
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/utils/MongoPluginUtils.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/utils/MongoPluginUtils.java
index ecaa6f7612c9..74cbca5bf082 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/utils/MongoPluginUtils.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/utils/MongoPluginUtils.java
@@ -15,10 +15,15 @@
import com.external.plugins.commands.Insert;
import com.external.plugins.commands.MongoCommand;
import com.external.plugins.commands.UpdateMany;
+
+import org.bson.BsonInvalidOperationException;
import org.bson.Document;
import org.bson.json.JsonParseException;
import org.bson.types.Decimal128;
import org.bson.types.ObjectId;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.springframework.util.StringUtils;
import java.net.URLEncoder;
@@ -29,6 +34,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import static com.appsmith.external.helpers.PluginUtils.STRING_TYPE;
@@ -42,11 +48,29 @@ public class MongoPluginUtils {
public static Document parseSafely(String fieldName, String input) {
try {
return Document.parse(input);
- } catch (JsonParseException e) {
+ } catch (JsonParseException | BsonInvalidOperationException e) {
throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, fieldName + " could not be parsed into expected JSON format.");
}
}
+ public static Object parseSafelyDocumentAndArrayOfDocuments(String fieldName, String input){
+ try {
+ return parseSafely(fieldName, input);
+ } catch (AppsmithPluginException e) {
+ try {
+ List<Document> parsedDocumentList = new ArrayList<>();
+ JSONArray rawInputJsonArray = new JSONArray(input);
+ for (int i=0; i < rawInputJsonArray.length(); i++) {
+ parsedDocumentList.add(parseSafely(fieldName, rawInputJsonArray.getJSONObject(i).toString()));
+ }
+ return parsedDocumentList;
+ } catch (JSONException ne) {
+ throw new AppsmithPluginException(AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR, fieldName + " could not be parsed into expected JSON format.");
+ }
+ }
+
+ }
+
public static Boolean isRawCommand(Map<String, Object> formData) {
String command = PluginUtils.getDataValueSafelyFromFormData(formData, COMMAND, null);
return RAW.equals(command);
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/utils/MongoPluginUtilsTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/utils/MongoPluginUtilsTest.java
index 432c330e68c8..6445c483622a 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/utils/MongoPluginUtilsTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/utils/MongoPluginUtilsTest.java
@@ -5,18 +5,58 @@
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class MongoPluginUtilsTest {
@Test
- public void testGetDatabaseName_withoutDatabaseName_throwsDatasourceError() {
+ void testGetDatabaseName_withoutDatabaseName_throwsDatasourceError() {
final AppsmithPluginException exception = assertThrows(
AppsmithPluginException.class,
- () -> MongoPluginUtils.getDatabaseName(new DatasourceConfiguration())
- );
+ () -> MongoPluginUtils.getDatabaseName(new DatasourceConfiguration()));
assertEquals("Missing default database name.", exception.getMessage());
}
+
+ @Test
+ void testParseSafely_Success() {
+ assertNotNull(MongoPluginUtils.parseSafely("field", "{\"$set\":{name: \"Ram singh\"}}"));
+ }
+
+ @Test
+ void testParseSafely_FailureOnArrayValues() {
+ assertThrows(AppsmithPluginException.class,
+ () -> MongoPluginUtils.parseSafely("field", "[{\"$set\":{name: \"Ram singh\"}},{\"$set\":{age: 40}}]"));
+ }
+
+ @Test
+ void testParseSafelyDocumentAndArrayOfDocuments_Success() {
+ assertNotNull(MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments("field", "{\"$set\":{name: \"Ram singh\"}}"));
+ }
+
+ @Test
+ void testParseSafelyDocumentAndArrayOfDocumentst_FailureOnNonJsonValue() {
+ assertThrows(AppsmithPluginException.class,
+ () -> MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments("field", "{abc, pqr}"));
+ }
+
+ @Test
+ void testParseSafelyDocumentAndArrayOfDocuments_OnArrayValues_Success() {
+ assertNotNull(MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments("field",
+ "[{\"$set\":{name: \"Ram singh\"}},{\"$set\":{age: 40}}]"));
+ }
+
+ @Test
+ void testParseSafelyDocumentAndArrayOfDocuments_OnArrayValues_EmptyArray_Success() {
+ assertNotNull(MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments("field", "[]"));
+ }
+
+ @Test
+ void testParseSafelyDocumentAndArrayOfDocuments_onArrayValues_FailureOnNonJsonValue() {
+ assertThrows(AppsmithPluginException.class,
+ () -> MongoPluginUtils.parseSafelyDocumentAndArrayOfDocuments("field", "[abc, pqr]"));
+ }
+
}
\ No newline at end of file
|
f064d01f8430382a3622dde2e8c2937e5f83c185
|
2023-07-19 13:28:22
|
Saroj
|
ci: Remove cypress env values for custom script run (#25475)
| false
|
Remove cypress env values for custom script run (#25475)
|
ci
|
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index 1ea31d51df25..5823f4df90e6 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -184,7 +184,6 @@ jobs:
env:
APPSMITH_SSL_CERTIFICATE: ${{ secrets.APPSMITH_SSL_CERTIFICATE }}
APPSMITH_SSL_KEY: ${{ secrets.APPSMITH_SSL_KEY }}
- CYPRESS_URL: ${{ secrets.CYPRESS_URL }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
@@ -284,8 +283,6 @@ jobs:
uses: cypress-io/github-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
@@ -363,8 +360,6 @@ jobs:
uses: cypress-io/github-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png
new file mode 100644
index 000000000000..fb7dfd96f029
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/EmptyApp.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png
new file mode 100644
index 000000000000..74450c7b6417
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/Profile.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png
new file mode 100644
index 000000000000..a89a2381be97
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/apppage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png
new file mode 100644
index 000000000000..a89a2381be97
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png
new file mode 100644
index 000000000000..03ae033804da
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/loginpage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png
new file mode 100644
index 000000000000..f2a43963e2f9
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png
new file mode 100644
index 000000000000..fa434d76b6e8
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png
new file mode 100644
index 000000000000..f32fcbd8f754
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png
new file mode 100644
index 000000000000..5b42068fdd51
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png
new file mode 100644
index 000000000000..2cf487d9ce9e
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png
new file mode 100644
index 000000000000..102b2c2dee4f
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png
new file mode 100644
index 000000000000..13cb914d494d
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png
new file mode 100644
index 000000000000..86442585dbe3
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png
new file mode 100644
index 000000000000..86387284dc55
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png
new file mode 100644
index 000000000000..f335d099f8b0
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png
new file mode 100644
index 000000000000..33c951769497
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png
new file mode 100644
index 000000000000..0bcb4637917c
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png
new file mode 100644
index 000000000000..152bcb603f96
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png
new file mode 100644
index 000000000000..cccfd3888200
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png
new file mode 100644
index 000000000000..798a3ac90c45
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png
new file mode 100644
index 000000000000..5006f39b4d68
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png
new file mode 100644
index 000000000000..2cd8e9c5cffa
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png
new file mode 100644
index 000000000000..8bfc5894ea30
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png
new file mode 100644
index 000000000000..5006f39b4d68
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png
new file mode 100644
index 000000000000..4c786d88aac1
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineDisabled.snap.png differ
diff --git a/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png
new file mode 100644
index 000000000000..38474320c91c
Binary files /dev/null and b/app/client/snapshots/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js/inlineEnabled.snap.png differ
|
62a3871929918df7a2644be54b4a6ed5218ad03f
|
2024-08-13 14:21:09
|
Hetu Nandu
|
fix: Widget Overflow and Show Binding issue (#35651)
| false
|
Widget Overflow and Show Binding issue (#35651)
|
fix
|
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
index fc780df1a270..ddcf9f733c45 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
@@ -16,6 +16,10 @@ import { Button } from "@appsmith/ads";
import { getEntityProperties } from "ee/pages/Editor/Explorer/Entity/getEntityProperties";
import store from "store";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import {
+ APP_SIDEBAR_WIDTH,
+ DEFAULT_EXPLORER_PANE_WIDTH,
+} from "../../../../constants/AppConstants";
const BindingContainerMaxHeight = 300;
const EntityHeight = 36;
@@ -127,7 +131,8 @@ export function EntityProperties() {
ref.current.style.top = top - EntityHeight + "px";
ref.current.style.bottom = "unset";
}
- ref.current.style.left = "100%";
+ ref.current.style.left =
+ APP_SIDEBAR_WIDTH + DEFAULT_EXPLORER_PANE_WIDTH + "px";
}
}, [entityId]);
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx
index 39f1216aaa7d..119e510c8d22 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx
@@ -15,7 +15,6 @@ import {
BUILDER_PATH,
BUILDER_PATH_DEPRECATED,
} from "ee/constants/routes/appRoutes";
-import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";
import SegmentedHeader from "./components/SegmentedHeader";
import { useSelector } from "react-redux";
import { getIDEViewMode } from "selectors/ideSelectors";
@@ -34,6 +33,7 @@ const EditorPaneExplorer = () => {
}
className="relative ide-editor-left-pane__content"
flexDirection="column"
+ overflow="hidden"
width={
ideViewMode === EditorViewMode.FullScreen
? DEFAULT_EXPLORER_PANE_WIDTH
@@ -41,9 +41,6 @@ const EditorPaneExplorer = () => {
}
>
<SegmentedHeader />
- {/** Entity Properties component is needed to render
- the Bindings popover in the context menu. Will be removed eventually **/}
- <EntityProperties />
<Switch>
<SentryRoute
component={JSExplorer}
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
index 7f6abf5b100d..5f8d7d8cdcac 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
@@ -6,6 +6,7 @@ import Editor from "./Editor";
import { useSelector } from "react-redux";
import { getIDEViewMode } from "selectors/ideSelectors";
import { EditorViewMode } from "ee/entities/IDE/constants";
+import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";
const EditorPane = () => {
const width = useEditorPaneWidth();
@@ -27,6 +28,10 @@ const EditorPane = () => {
height="100%"
width={width}
>
+ {/** Entity Properties component is necessary to render
+ the Bindings popover in the context menu.
+ Will be removed eventually **/}
+ <EntityProperties />
<EditorPaneExplorer />
<Editor />
</Flex>
|
db713e946760e14c89a399527fe3357bf9a7b7aa
|
2024-11-05 18:29:26
|
Hetu Nandu
|
chore: [Plugin Action Editor] Query Form evaluation (#37224)
| false
|
[Plugin Action Editor] Query Form evaluation (#37224)
|
chore
|
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
index fdee4e73717f..44750c91be8a 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/UQIEditorForm.tsx
@@ -2,36 +2,33 @@ import React from "react";
import FormRender from "./FormRender";
import { usePluginActionContext } from "../../../../PluginActionContext";
import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
-import { getFormValues, reduxForm } from "redux-form";
-import type { QueryAction, SaaSAction } from "entities/Action";
-import { useSelector } from "react-redux";
-import { getFormEvaluationState } from "selectors/formSelectors";
+import { reduxForm } from "redux-form";
import { Flex } from "@appsmith/ads";
+import { useGoogleSheetsSetDefaultProperty } from "./hooks/useGoogleSheetsSetDefaultProperty";
+import { useFormData } from "./hooks/useFormData";
+import { useInitFormEvaluation } from "./hooks/useInitFormEvaluation";
const UQIEditorForm = () => {
- const { editorConfig, plugin } = usePluginActionContext();
+ const {
+ editorConfig,
+ plugin: { uiComponent },
+ } = usePluginActionContext();
- const formData = useSelector(getFormValues(QUERY_EDITOR_FORM_NAME)) as
- | QueryAction
- | SaaSAction;
+ useInitFormEvaluation();
- const formEvaluation = useSelector(getFormEvaluationState);
+ // Set default values for Google Sheets
+ useGoogleSheetsSetDefaultProperty();
- let formEvaluationState = {};
-
- // Fetching evaluations state only once the formData is populated
- if (!!formData) {
- formEvaluationState = formEvaluation[formData.id];
- }
+ const { data, evaluationState } = useFormData();
return (
<Flex flexDirection="column" overflowY="scroll" w="100%">
<FormRender
editorConfig={editorConfig}
- formData={formData}
- formEvaluationState={formEvaluationState}
+ formData={data}
+ formEvaluationState={evaluationState}
formName={QUERY_EDITOR_FORM_NAME}
- uiComponent={plugin.uiComponent}
+ uiComponent={uiComponent}
/>
</Flex>
);
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts
new file mode 100644
index 000000000000..61f798cc093e
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useFormData.ts
@@ -0,0 +1,22 @@
+import { useSelector } from "react-redux";
+import { getFormValues } from "redux-form";
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
+import type { QueryAction, SaaSAction } from "entities/Action";
+import { getFormEvaluationState } from "selectors/formSelectors";
+
+export const useFormData = () => {
+ const data = useSelector(getFormValues(QUERY_EDITOR_FORM_NAME)) as
+ | QueryAction
+ | SaaSAction;
+
+ const formEvaluation = useSelector(getFormEvaluationState);
+
+ let evaluationState = {};
+
+ // Fetching evaluations state only once the formData is populated
+ if (!!data) {
+ evaluationState = formEvaluation[data.id];
+ }
+
+ return { data, evaluationState };
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts
new file mode 100644
index 000000000000..b888239e3aaf
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useGoogleSheetsSetDefaultProperty.ts
@@ -0,0 +1,60 @@
+import { useEffect } from "react";
+import { PluginPackageName } from "entities/Action";
+import { merge } from "lodash";
+import { getConfigInitialValues } from "components/formControls/utils";
+import { diff, type Diff } from "deep-diff";
+import { getPathAndValueFromActionDiffObject } from "utils/getPathAndValueFromActionDiffObject";
+import { setActionProperty } from "actions/pluginActionActions";
+import { usePluginActionContext } from "../../../../../PluginActionContext";
+import { useDispatch } from "react-redux";
+
+export const useGoogleSheetsSetDefaultProperty = () => {
+ const {
+ action,
+ editorConfig,
+ plugin: { packageName },
+ settingsConfig,
+ } = usePluginActionContext();
+
+ const dispatch = useDispatch();
+
+ useEffect(
+ function setDefaultValuesForGoogleSheets() {
+ if (packageName === PluginPackageName.GOOGLE_SHEETS) {
+ const initialValues = {};
+
+ merge(
+ initialValues,
+ getConfigInitialValues(editorConfig as Record<string, unknown>[]),
+ );
+
+ merge(
+ initialValues,
+ getConfigInitialValues(settingsConfig as Record<string, unknown>[]),
+ );
+
+ // initialValues contains merge of action, editorConfig, settingsConfig and will be passed to redux form
+ merge(initialValues, action);
+
+ // @ts-expect-error: Types are not available
+ const actionObjectDiff: undefined | Diff<Action | undefined, Action>[] =
+ diff(action, initialValues);
+
+ const { path = "", value = "" } = {
+ ...getPathAndValueFromActionDiffObject(actionObjectDiff),
+ };
+
+ if (value && path) {
+ dispatch(
+ setActionProperty({
+ actionId: action.id,
+ propertyName: path,
+ value,
+ }),
+ );
+ }
+ }
+ },
+ [action, dispatch, editorConfig, packageName, settingsConfig],
+ );
+};
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts
new file mode 100644
index 000000000000..5c52cdfa89d2
--- /dev/null
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/hooks/useInitFormEvaluation.ts
@@ -0,0 +1,21 @@
+import { useEffect } from "react";
+import { initFormEvaluations } from "actions/evaluationActions";
+import { useDispatch } from "react-redux";
+import { usePluginActionContext } from "../../../../../PluginActionContext";
+
+export const useInitFormEvaluation = () => {
+ const dispatch = useDispatch();
+
+ const {
+ action: { baseId },
+ editorConfig,
+ settingsConfig,
+ } = usePluginActionContext();
+
+ useEffect(
+ function formEvaluationInit() {
+ dispatch(initFormEvaluations(editorConfig, settingsConfig, baseId));
+ },
+ [baseId, dispatch, editorConfig, settingsConfig],
+ );
+};
|
9ca5204109bdf82523c57b45212ff3d9b807cda8
|
2023-06-08 06:53:28
|
Harshit Pandey
|
fix: updated Box shadow UI (#23795)
| false
|
updated Box shadow UI (#23795)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js
index 6ff56f0310cf..1718cd4de248 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Basic_spec.js
@@ -777,27 +777,14 @@ describe("App Theming funtionality", function () {
});
//Change Shadow & verify
- cy.get(".ads-v2-segmented-control-value-0").eq(2).click({ force: true });
- cy.get(".ads-v2-segmented-control-value-0 div")
- .eq(2)
- .invoke("css", "box-shadow")
- .then((boxshadow) => {
- cy.get(".t--widget-button2 button").should(
- "have.css",
- "box-shadow",
- boxshadow, //rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px
- );
- cy.get(widgetsPage.iconWidgetBtn).should(
- "have.css",
- "box-shadow",
- "none",
- );
- cy.get(".t--widget-button1 button").should(
- "have.css",
- "box-shadow",
- "none",
- );
- });
+ cy.contains(".ads-v2-segmented-control-value-0", "Large").click();
+
+ cy.get(widgetsPage.iconWidgetBtn).should("have.css", "box-shadow", "none");
+ cy.get(".t--widget-button1 button").should(
+ "have.css",
+ "box-shadow",
+ "none",
+ );
cy.assertPageSave();
cy.wait(2000);
@@ -1004,29 +991,15 @@ describe("App Theming funtionality", function () {
});
//Change Shadow & verify
- cy.get(".ads-v2-segmented-control-value-0").eq(0).click({ force: true });
- cy.get(".ads-v2-segmented-control-value-0 div")
- .eq(0)
- .invoke("css", "box-shadow")
- .then((boxshadow) => {
- cy.get(".t--widget-button1 button").should(
- "have.css",
- "box-shadow",
- boxshadow, //rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px
- );
- cy.get(widgetsPage.iconWidgetBtn).should(
- "have.css",
- "box-shadow",
- "none",
- );
- cy.get(".t--widget-button2 button").should(
- "have.css",
- "box-shadow",
- //same value as previous box shadow selection
- //since revertion is not possible for box shadow - hence this widget maintains the same value
- "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
- );
- });
+ cy.contains(".ads-v2-segmented-control-value-0", "Small").click();
+ cy.get(widgetsPage.iconWidgetBtn).should("have.css", "box-shadow", "none");
+ cy.get(".t--widget-button2 button").should(
+ "have.css",
+ "box-shadow",
+ //same value as previous box shadow selection
+ //since revertion is not possible for box shadow - hence this widget maintains the same value
+ "rgba(0, 0, 0, 0.1) 0px 10px 15px -3px, rgba(0, 0, 0, 0.05) 0px 4px 6px -2px",
+ );
cy.assertPageSave();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Default_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Default_spec.js
index f4d2d02effd0..60cb014ab968 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Default_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_Default_spec.js
@@ -40,10 +40,6 @@ describe("Theme validation for default data", function () {
//Shadow validation
//cy.contains("Shadow").click({ force: true });
cy.wait(2000);
- cy.shadowMouseover("none");
- cy.shadowMouseover("S");
- cy.shadowMouseover("M");
- cy.shadowMouseover("L");
cy.contains("Shadow").click({ force: true });
//Font
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
index 2d7b31e070ff..6b6267968aaf 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_FormWidget_spec.js
@@ -47,11 +47,6 @@ describe("Theme validation usecases", function () {
cy.contains("Border").click({ force: true });
//Shadow validation
- //cy.contains("Shadow").click({ force: true });
- cy.shadowMouseover("none");
- cy.shadowMouseover("S");
- cy.shadowMouseover("M");
- cy.shadowMouseover("L");
cy.xpath(theme.locators._boxShadow("L")).click({ force: true });
cy.wait("@updateTheme").should(
"have.nested.property",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
index 7260e963ab12..35535438bea1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ThemingTests/Theme_MultiSelectWidget_spec.js
@@ -34,10 +34,6 @@ describe("Theme validation usecase for multi-select widget", function () {
//Shadow validation
//cy.contains("Shadow").click({ force: true });
cy.wait(2000);
- cy.shadowMouseover("none");
- cy.shadowMouseover("S");
- cy.shadowMouseover("M");
- cy.shadowMouseover("L");
cy.xpath(theme.locators._boxShadow("L")).click({ force: true });
cy.wait("@updateTheme").should(
"have.nested.property",
diff --git a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
index ea07504da900..fb674cdd344b 100644
--- a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
+++ b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx
@@ -2,8 +2,8 @@ import * as React from "react";
import type { ControlData, ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
-import { Icon, SegmentedControl, Tooltip } from "design-system";
-import { boxShadowOptions } from "constants/ThemeConstants";
+import { Icon, SegmentedControl } from "design-system";
+import { boxShadowOptions, sizeMappings } from "constants/ThemeConstants";
import type { DSEventDetail } from "utils/AppsmithUtils";
import {
DSEventTypes,
@@ -13,23 +13,13 @@ import {
export interface BoxShadowOptionsControlProps extends ControlProps {
propertyValue: string | undefined;
}
-
const options = Object.keys(boxShadowOptions).map((optionKey) => ({
- label: (
- <Tooltip content={optionKey} key={optionKey}>
- {optionKey === "none" ? (
- <div className="flex items-center justify-center w-5 h-5">
- <Icon name="close-line" size="md" />
- </div>
- ) : (
- <div
- className="flex items-center justify-center w-5 h-5 bg-white"
- style={{ boxShadow: boxShadowOptions[optionKey] }}
- />
- )}
- </Tooltip>
- ),
-
+ label:
+ optionKey === "none" ? (
+ <Icon name="close-line" size="md" />
+ ) : (
+ sizeMappings[optionKey]
+ ),
value: boxShadowOptions[optionKey],
}));
diff --git a/app/client/src/constants/ThemeConstants.tsx b/app/client/src/constants/ThemeConstants.tsx
index bade37be1fa0..7369a5e549ed 100644
--- a/app/client/src/constants/ThemeConstants.tsx
+++ b/app/client/src/constants/ThemeConstants.tsx
@@ -143,6 +143,15 @@ export const boxShadowOptions: Record<string, string> = {
L: "0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)",
};
+/**
+ * box shadow size mapping for the size name to displayed in property pane
+ */
+export const sizeMappings: Record<string, string> = {
+ S: "Small",
+ M: "Medium",
+ L: "Large",
+};
+
export const invertedBoxShadowOptions: Record<string, string> =
invert(boxShadowOptions);
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx
index 51709a6b4e57..498976e7bfd1 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx
@@ -1,7 +1,10 @@
import React, { useCallback } from "react";
import type { AppTheme } from "entities/AppTheming";
-import { Icon, Tooltip } from "design-system";
-import { invertedBoxShadowOptions } from "constants/ThemeConstants";
+import { Icon } from "design-system";
+import {
+ invertedBoxShadowOptions,
+ sizeMappings,
+} from "constants/ThemeConstants";
import { SegmentedControl } from "design-system";
interface ThemeBoxShadowControlProps {
@@ -41,20 +44,12 @@ function ThemeBoxShadowControl(props: ThemeBoxShadowControlProps) {
: "";
const buttonGroupOptions = Object.keys(options).map((optionKey) => ({
- label: (
- <Tooltip content={optionKey} key={optionKey}>
- {optionKey === "none" ? (
- <div className="flex items-center justify-center w-5 h-5">
- <Icon name="close-line" size="md" />
- </div>
- ) : (
- <div
- className="flex items-center justify-center w-5 h-5 bg-white"
- style={{ boxShadow: options[optionKey] }}
- />
- )}
- </Tooltip>
- ),
+ label:
+ optionKey === "none" ? (
+ <Icon name="close-line" size="md" />
+ ) : (
+ sizeMappings[optionKey]
+ ),
value: optionKey,
}));
|
685bd13fb97654ad11fe6f561e6740bb175ac93b
|
2023-04-14 20:09:01
|
sneha122
|
fix: gsheet ui issues fixed (#22384)
| false
|
gsheet ui issues fixed (#22384)
|
fix
|
diff --git a/app/client/cypress/integration/SanitySuite/Datasources/GoogleSheetsStub_spec.ts b/app/client/cypress/integration/SanitySuite/Datasources/GoogleSheetsStub_spec.ts
index c78ff8fa04b6..852bca9c6c66 100644
--- a/app/client/cypress/integration/SanitySuite/Datasources/GoogleSheetsStub_spec.ts
+++ b/app/client/cypress/integration/SanitySuite/Datasources/GoogleSheetsStub_spec.ts
@@ -14,7 +14,7 @@ describe("Google Sheets datasource test cases", function () {
VerifyFunctionDropdown([
"Read/Write | Selected Google Sheets",
"Read/Write | All Google Sheets",
- "Read Files | All Google Sheets",
+ "Read | All Google Sheets",
]);
dataSources.SaveDSFromDialog(false);
});
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
index 0e0ad3b0b348..cc5e9b71a686 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
@@ -73,10 +73,9 @@
"initialValue": "authorization_code"
},
{
- "label": "Scope",
+ "label": "Permissions | Scope",
"configProperty": "datasourceConfiguration.authentication.scopeString",
"controlType": "DROP_DOWN",
- "isRequired": true,
"options": [
{
"label": "Read/Write | Selected Google Sheets",
@@ -87,7 +86,7 @@
"value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive"
},
{
- "label": "Read Files | All Google Sheets",
+ "label": "Read | All Google Sheets",
"value": "https://www.googleapis.com/auth/spreadsheets.readonly,https://www.googleapis.com/auth/drive.readonly"
}
],
|
c54e1ba8d1f87878fd5f0973b31bb1e3d2b476ee
|
2023-05-10 15:36:09
|
Nilansh Bansal
|
fix: upload image logo fix (#23056)
| false
|
upload image logo fix (#23056)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
index 409cc08f19a2..d138bbcb728a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
@@ -58,6 +58,8 @@ public Mono<Asset> getById(String id) {
private Boolean checkImageTypeValidation(DataBuffer dataBuffer, MediaType contentType) throws IOException {
BufferedImage bufferedImage = ImageIO.read(dataBuffer.asInputStream());
+ // Resetting the position of the cursor
+ dataBuffer.readPosition(0);
if (bufferedImage == null) {
/*
This is true for SVG and ICO images.
|
67046f869320fd0a300046019481d585ee1c975d
|
2024-10-22 10:48:03
|
Ashit Rath
|
chore: Split library side pane for adding package control section (#36926)
| false
|
Split library side pane for adding package control section (#36926)
|
chore
|
diff --git a/app/client/src/IDE/Components/SidePaneWrapper.tsx b/app/client/src/IDE/Components/SidePaneWrapper.tsx
new file mode 100644
index 000000000000..5c1eaf1d88f7
--- /dev/null
+++ b/app/client/src/IDE/Components/SidePaneWrapper.tsx
@@ -0,0 +1,29 @@
+import { Flex } from "@appsmith/ads";
+import React from "react";
+import type { ReactNode } from "react";
+import styled from "styled-components";
+
+interface SidePaneContainerProps {
+ children?: ReactNode;
+ padded?: boolean;
+}
+
+const StyledContainer = styled(Flex)<Pick<SidePaneContainerProps, "padded">>`
+ padding: ${({ padded }) => padded && "var(--ads-v2-spaces-2)"};
+`;
+
+function SidePaneWrapper({ children, padded = false }: SidePaneContainerProps) {
+ return (
+ <StyledContainer
+ borderRight="1px solid var(--ads-v2-color-border)"
+ flexDirection="column"
+ height="100%"
+ padded={padded}
+ width={"100%"}
+ >
+ {children}
+ </StyledContainer>
+ );
+}
+
+export default SidePaneWrapper;
diff --git a/app/client/src/IDE/index.ts b/app/client/src/IDE/index.ts
index 358b1f2da97b..02e8aaf7ed86 100644
--- a/app/client/src/IDE/index.ts
+++ b/app/client/src/IDE/index.ts
@@ -54,6 +54,11 @@ export { default as IDEBottomView } from "./Components/BottomView";
* It switches between different editor states
*/
export { default as IDESidebar } from "./Components/Sidebar";
+/**
+ * IDESidePaneWrapper is used as a wrapper for side panes, which provides a border and optional padding
+ * and enforces 100% width and height to the parent.
+ */
+export { default as IDESidePaneWrapper } from "./Components/SidePaneWrapper";
/**
* ToolbarSettingsPopover is a popover attached to a settings toggle button in the toolbar
diff --git a/app/client/src/ce/RouteBuilder.ts b/app/client/src/ce/RouteBuilder.ts
index 406c9b42ee38..b8df54bcd135 100644
--- a/app/client/src/ce/RouteBuilder.ts
+++ b/app/client/src/ce/RouteBuilder.ts
@@ -204,3 +204,12 @@ export const queryAddURL = (props: URLBuilderParams): string =>
...props,
suffix: `queries/add`,
});
+
+export const appLibrariesURL = (): string =>
+ urlBuilder.build({
+ suffix: "libraries",
+ });
+export const appPackagesURL = (): string =>
+ urlBuilder.build({
+ suffix: "packages",
+ });
diff --git a/app/client/src/ce/constants/routes/appRoutes.ts b/app/client/src/ce/constants/routes/appRoutes.ts
index 949360d6e944..8031209435be 100644
--- a/app/client/src/ce/constants/routes/appRoutes.ts
+++ b/app/client/src/ce/constants/routes/appRoutes.ts
@@ -67,6 +67,7 @@ export const JS_COLLECTION_ID_ADD_PATH = `${JS_COLLECTION_EDITOR_PATH}/:baseColl
export const DATA_SOURCES_EDITOR_LIST_PATH = `/datasource`;
export const DATA_SOURCES_EDITOR_ID_PATH = `/datasource/:datasourceId`;
export const APP_LIBRARIES_EDITOR_PATH = `/libraries`;
+export const APP_PACKAGES_EDITOR_PATH = `/packages`;
export const APP_SETTINGS_EDITOR_PATH = `/settings`;
export const SAAS_GSHEET_EDITOR_ID_PATH = `/saas/google-sheets-plugin/datasources/:datasourceId`;
export const GEN_TEMPLATE_URL = "generate-page";
@@ -128,6 +129,12 @@ export const matchGeneratePagePath = (pathName: string) =>
match(`${BUILDER_CUSTOM_PATH}${GENERATE_TEMPLATE_FORM_PATH}`)(pathName) ||
match(`${BUILDER_PATH_DEPRECATED}${GENERATE_TEMPLATE_FORM_PATH}`)(pathName);
+export const matchAppLibrariesPath = (pathName: string) =>
+ match(`${BUILDER_PATH}${APP_LIBRARIES_EDITOR_PATH}`)(pathName);
+
+export const matchAppPackagesPath = (pathName: string) =>
+ match(`${BUILDER_PATH}${APP_PACKAGES_EDITOR_PATH}`)(pathName);
+
export const addBranchParam = (branch: string) => {
const url = new URL(window.location.href);
diff --git a/app/client/src/ce/entities/Engine/actionHelpers.ts b/app/client/src/ce/entities/Engine/actionHelpers.ts
index d27051602e57..96518343501e 100644
--- a/app/client/src/ce/entities/Engine/actionHelpers.ts
+++ b/app/client/src/ce/entities/Engine/actionHelpers.ts
@@ -30,6 +30,7 @@ export const getPageDependencyActions = (
currentWorkspaceId: string = "",
featureFlags: DependentFeatureFlags = {},
allResponses: EditConsolidatedApi,
+ applicationId: string,
) => {
const { datasources, pagesWithMigratedDsl, plugins } = allResponses || {};
const initActions = [
diff --git a/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts b/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
new file mode 100644
index 000000000000..489d1d74425b
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
@@ -0,0 +1,12 @@
+import { createMessage, HEADER_TITLES } from "ee/constants/messages";
+
+/**
+ * In CE this returns a simple text as title but this
+ * hook is extended in EE where based on feature flags
+ * the title changes
+ */
+function useLibraryHeaderTitle() {
+ return createMessage(HEADER_TITLES.LIBRARIES);
+}
+
+export default useLibraryHeaderTitle;
diff --git a/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
new file mode 100644
index 000000000000..3203c1b5b64e
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import JSLibrariesSection from "pages/Editor/IDE/LeftPane/JSLibrariesSection";
+import { IDESidePaneWrapper } from "IDE";
+
+const LibrarySidePane = () => {
+ return (
+ <IDESidePaneWrapper>
+ <JSLibrariesSection />
+ </IDESidePaneWrapper>
+ );
+};
+
+export default LibrarySidePane;
diff --git a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts
index e2efc6cafe78..c49f522c1c33 100644
--- a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts
+++ b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts
@@ -4,6 +4,7 @@ import {
API_EDITOR_ID_ADD_PATH,
API_EDITOR_ID_PATH,
APP_LIBRARIES_EDITOR_PATH,
+ APP_PACKAGES_EDITOR_PATH,
APP_SETTINGS_EDITOR_PATH,
BUILDER_CHECKLIST_PATH,
BUILDER_CUSTOM_PATH,
@@ -82,6 +83,7 @@ function useRoutes(path: string): RouteReturnType[] {
`${path}${SAAS_EDITOR_API_ID_PATH}`,
`${path}${SAAS_EDITOR_API_ID_ADD_PATH}`,
`${path}${APP_LIBRARIES_EDITOR_PATH}`,
+ `${path}${APP_PACKAGES_EDITOR_PATH}`,
`${path}${APP_SETTINGS_EDITOR_PATH}`,
],
},
diff --git a/app/client/src/constants/AppConstants.ts b/app/client/src/constants/AppConstants.ts
index 1d8994a6f2d4..c5d8ede0ae8c 100644
--- a/app/client/src/constants/AppConstants.ts
+++ b/app/client/src/constants/AppConstants.ts
@@ -9,6 +9,7 @@ export const CANVAS_DEFAULT_MIN_ROWS = Math.ceil(
export const DEFAULT_ENTITY_EXPLORER_WIDTH = 256;
export const DEFAULT_PROPERTY_PANE_WIDTH = 288;
export const APP_SETTINGS_PANE_WIDTH = 525;
+export const APP_LIBRARIES_PANE_WIDTH = 384;
export const DEFAULT_EXPLORER_PANE_WIDTH = 255;
export const SPLIT_SCREEN_RATIO = 0.404;
diff --git a/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts b/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
new file mode 100644
index 000000000000..0b81d5d9afea
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/Header/useLibraryHeaderTitle.ts
@@ -0,0 +1,3 @@
+export * from "ce/pages/Editor/IDE/Header/useLibraryHeaderTitle";
+import { default as CE_useLibraryHeaderTitle } from "ce/pages/Editor/IDE/Header/useLibraryHeaderTitle";
+export default CE_useLibraryHeaderTitle;
diff --git a/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
new file mode 100644
index 000000000000..20fb8b49fe3d
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
@@ -0,0 +1,3 @@
+export * from "ce/pages/Editor/IDE/LeftPane/LibrarySidePane";
+import { default as CE_LibrarySidePane } from "ce/pages/Editor/IDE/LeftPane/LibrarySidePane";
+export default CE_LibrarySidePane;
diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts
index a7520a0d03ea..8b63d0f333bc 100644
--- a/app/client/src/entities/Engine/AppEditorEngine.ts
+++ b/app/client/src/entities/Engine/AppEditorEngine.ts
@@ -199,6 +199,7 @@ export default class AppEditorEngine extends AppEngine {
private *loadPluginsAndDatasources(
allResponses: EditConsolidatedApi,
rootSpan: Span,
+ applicationId: string,
) {
const loadPluginsAndDatasourcesSpan = startNestedSpan(
"AppEditorEngine.loadPluginsAndDatasources",
@@ -211,7 +212,12 @@ export default class AppEditorEngine extends AppEngine {
getFeatureFlagsForEngine,
);
const { errorActions, initActions, successActions } =
- getPageDependencyActions(currentWorkspaceId, featureFlags, allResponses);
+ getPageDependencyActions(
+ currentWorkspaceId,
+ featureFlags,
+ allResponses,
+ applicationId,
+ );
if (!isAirgappedInstance) {
initActions.push(fetchMockDatasources(mockDatasources));
@@ -259,7 +265,12 @@ export default class AppEditorEngine extends AppEngine {
allResponses,
rootSpan,
);
- yield call(this.loadPluginsAndDatasources, allResponses, rootSpan);
+ yield call(
+ this.loadPluginsAndDatasources,
+ allResponses,
+ rootSpan,
+ applicationId,
+ );
}
public *completeChore(rootSpan: Span) {
diff --git a/app/client/src/navigation/FocusEntity.ts b/app/client/src/navigation/FocusEntity.ts
index e85b0ab64662..fcccac7a79a9 100644
--- a/app/client/src/navigation/FocusEntity.ts
+++ b/app/client/src/navigation/FocusEntity.ts
@@ -278,7 +278,10 @@ export function identifyEntityFromPath(path: string): FocusEntityInfo {
}
if (match.params.entity) {
- if (match.params.entity === "libraries") {
+ if (
+ match.params.entity === "libraries" ||
+ match.params.entity === "packages"
+ ) {
return {
entity: FocusEntity.LIBRARY,
id: "",
diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx
index 611d21227421..ee4365196a5c 100644
--- a/app/client/src/pages/Editor/IDE/Header/index.tsx
+++ b/app/client/src/pages/Editor/IDE/Header/index.tsx
@@ -77,6 +77,7 @@ import type { Page } from "entities/Page";
import { IDEHeader, IDEHeaderTitle } from "IDE";
import { APPLICATIONS_URL } from "constants/routes";
import { useNavigationMenuData } from "../../EditorName/useNavigationMenuData";
+import useLibraryHeaderTitle from "ee/pages/Editor/IDE/Header/useLibraryHeaderTitle";
const StyledDivider = styled(Divider)`
height: 50%;
@@ -92,6 +93,8 @@ interface HeaderTitleProps {
}
const HeaderTitleComponent = ({ appState, currentPage }: HeaderTitleProps) => {
+ const libraryHeaderTitle = useLibraryHeaderTitle();
+
switch (appState) {
case EditorState.DATA:
return (
@@ -110,12 +113,7 @@ const HeaderTitleComponent = ({ appState, currentPage }: HeaderTitleProps) => {
/>
);
case EditorState.LIBRARIES:
- return (
- <IDEHeaderTitle
- key={appState}
- title={createMessage(HEADER_TITLES.LIBRARIES)}
- />
- );
+ return <IDEHeaderTitle key={appState} title={libraryHeaderTitle} />;
default:
return <EditorTitle key={appState} title={currentPage?.pageName || ""} />;
}
diff --git a/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
index 4d17db5824ea..789a3837ebfa 100644
--- a/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
+++ b/app/client/src/pages/Editor/IDE/Layout/hooks/useGridLayoutTemplate.ts
@@ -16,6 +16,7 @@ import {
import {
APP_SETTINGS_PANE_WIDTH,
APP_SIDEBAR_WIDTH,
+ APP_LIBRARIES_PANE_WIDTH,
} from "constants/AppConstants";
import { useEditorStateLeftPaneWidth } from "./useEditorStateLeftPaneWidth";
import { type Area, Areas, SIDEBAR_WIDTH } from "../constants";
@@ -97,10 +98,10 @@ function useGridLayoutTemplate(): ReturnValue {
} else {
setColumns([
SIDEBAR_WIDTH,
- "255px",
+ `${APP_LIBRARIES_PANE_WIDTH}px`,
(windowWidth -
APP_SIDEBAR_WIDTH -
- 255 +
+ APP_LIBRARIES_PANE_WIDTH +
"px") as AnimatedGridUnit,
"0px",
]);
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
similarity index 56%
rename from app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
rename to app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
index b5444a9a0400..23c238595413 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/JSLibrariesSection.tsx
@@ -1,13 +1,13 @@
-import React from "react";
-import AddLibraryPopover from "./AddLibraryPopover";
-import PaneHeader from "./PaneHeader";
-import { useSelector } from "react-redux";
+import React, { useMemo } from "react";
+
+import PaneHeader from "pages/Editor/IDE/LeftPane/PaneHeader";
+import AddLibraryPopover from "pages/Editor/IDE/LeftPane/AddLibraryPopover";
import { selectLibrariesForExplorer } from "ee/selectors/entitiesSelector";
+import { useSelector } from "react-redux";
import { animated, useTransition } from "react-spring";
import { LibraryEntity } from "pages/Editor/Explorer/Libraries";
-import { Flex } from "@appsmith/ads";
-const LibrarySidePane = () => {
+function JSLibrariesSection() {
const libraries = useSelector(selectLibrariesForExplorer);
const transitions = useTransition(libraries, {
keys: (lib) => lib.name,
@@ -16,24 +16,18 @@ const LibrarySidePane = () => {
leave: { opacity: 1 },
});
+ const rightIcon = useMemo(() => <AddLibraryPopover />, []);
+
return (
- <Flex
- borderRight="1px solid var(--ads-v2-color-border)"
- flexDirection="column"
- height="100%"
- width={"100%"}
- >
- <PaneHeader
- rightIcon={<AddLibraryPopover />}
- title="Installed Libraries"
- />
+ <>
+ <PaneHeader rightIcon={rightIcon} title="Installed Libraries" />
{transitions((style, lib) => (
<animated.div style={style}>
<LibraryEntity lib={lib} />
</animated.div>
))}
- </Flex>
+ </>
);
-};
+}
-export default LibrarySidePane;
+export default JSLibrariesSection;
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
index 585632bc81e6..60a8eb743cb2 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx
@@ -1,9 +1,10 @@
-import React from "react";
+import React, { useMemo } from "react";
import styled from "styled-components";
import { Switch, useRouteMatch } from "react-router";
import { SentryRoute } from "ee/AppRouter";
import {
APP_LIBRARIES_EDITOR_PATH,
+ APP_PACKAGES_EDITOR_PATH,
APP_SETTINGS_EDITOR_PATH,
DATA_SOURCES_EDITOR_ID_PATH,
DATA_SOURCES_EDITOR_LIST_PATH,
@@ -12,8 +13,8 @@ import {
} from "constants/routes";
import AppSettingsPane from "./AppSettings";
import DataSidePane from "./DataSidePane";
-import LibrarySidePane from "./LibrarySidePane";
import EditorPane from "../EditorPane";
+import LibrarySidePane from "ee/pages/Editor/IDE/LeftPane/LibrarySidePane";
export const LeftPaneContainer = styled.div<{ showRightBorder?: boolean }>`
height: 100%;
@@ -26,23 +27,32 @@ export const LeftPaneContainer = styled.div<{ showRightBorder?: boolean }>`
const LeftPane = () => {
const { path } = useRouteMatch();
+ const dataSidePanePaths = useMemo(
+ () => [
+ `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`,
+ `${path}${DATA_SOURCES_EDITOR_ID_PATH}`,
+ `${path}${INTEGRATION_EDITOR_PATH}`,
+ `${path}${SAAS_GSHEET_EDITOR_ID_PATH}`,
+ ],
+ [path],
+ );
+
+ const librarySidePanePaths = useMemo(
+ () => [
+ `${path}${APP_LIBRARIES_EDITOR_PATH}`,
+ `${path}${APP_PACKAGES_EDITOR_PATH}`,
+ ],
+ [path],
+ );
+
return (
<LeftPaneContainer showRightBorder={false}>
<Switch>
- <SentryRoute
- component={DataSidePane}
- exact
- path={[
- `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`,
- `${path}${DATA_SOURCES_EDITOR_ID_PATH}`,
- `${path}${INTEGRATION_EDITOR_PATH}`,
- `${path}${SAAS_GSHEET_EDITOR_ID_PATH}`,
- ]}
- />
+ <SentryRoute component={DataSidePane} exact path={dataSidePanePaths} />
<SentryRoute
component={LibrarySidePane}
exact
- path={`${path}${APP_LIBRARIES_EDITOR_PATH}`}
+ path={librarySidePanePaths}
/>
<SentryRoute
component={AppSettingsPane}
|
1c0d103e56c8dbba990e0a2a04fa4f9e232ef7cc
|
2021-08-26 23:10:31
|
allcontributors[bot]
|
docs: add akshayrangasaid as a contributor for content, ideas (#6911)
| false
|
add akshayrangasaid as a contributor for content, ideas (#6911)
|
docs
|
diff --git a/.all-contributorsrc b/.all-contributorsrc
index da9106fd8f90..612cd3d7ca57 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -362,6 +362,16 @@
"bug",
"code"
]
+ },
+ {
+ "login": "akshayrangasaid",
+ "name": "akshayrangasaid",
+ "avatar_url": "https://avatars.githubusercontent.com/u/76783810?v=4",
+ "profile": "https://github.com/akshayrangasaid",
+ "contributions": [
+ "content",
+ "ideas"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index e298265f3c0b..add85fb058c4 100644
--- a/README.md
+++ b/README.md
@@ -189,6 +189,7 @@ We love our contributors! We're committed to fostering an open and welcoming env
<td align="center"><a href="http://www.navdeepsingh.in/"><img src="https://avatars.githubusercontent.com/u/2968787?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Navdeep Singh</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=navdeepsingh" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/aswathkk"><img src="https://avatars.githubusercontent.com/u/10436935?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aswath K</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=aswathkk" title="Code">💻</a></td>
<td align="center"><a href="http://appsmith.com"><img src="https://avatars.githubusercontent.com/u/11089579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Somangshu Goswami</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Asomangshu" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=somangshu" title="Code">💻</a></td>
+ <td align="center"><a href="https://github.com/akshayrangasaid"><img src="https://avatars.githubusercontent.com/u/76783810?v=4?s=100" width="100px;" alt=""/><br /><sub><b>akshayrangasaid</b></sub></a><br /><a href="#content-akshayrangasaid" title="Content">🖋</a> <a href="#ideas-akshayrangasaid" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
</table>
|
ca72f09ca9b87f782f89dd4d4d7cf26b6bdc6c64
|
2023-10-25 16:51:12
|
Guilherme Ventura
|
fix: traverse to next focusable widget (#28340)
| false
|
traverse to next focusable widget (#28340)
|
fix
|
diff --git a/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts b/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
index 9c4bc2a88916..6478ae7c0e46 100644
--- a/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
+++ b/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
@@ -31,7 +31,16 @@ export function handleTab(event: KeyboardEvent) {
default:
const tabbable = getTabbableDescendants(currentNode, shiftKey);
- nextTabbableDescendant = getNextTabbableDescendant(tabbable, shiftKey);
+ let isNextWidgetElementFocusable = false;
+ do {
+ nextTabbableDescendant = getNextTabbableDescendant(tabbable, shiftKey);
+ if (nextTabbableDescendant) {
+ isNextWidgetElementFocusable = !!getFocussableElementOfWidget(
+ nextTabbableDescendant,
+ );
+ }
+ tabbable.shift();
+ } while (!isNextWidgetElementFocusable && tabbable.length > 0);
}
// if nextTabbableDescendant is found, focus
|
e60375cd020f828527feb31ebf73cecadbc70df8
|
2022-08-28 11:58:01
|
arslanhaiderbuttar
|
test: Upgrade appsmith (#16203)
| false
|
Upgrade appsmith (#16203)
|
test
|
diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json
index 129ee0323e95..a59034d8d824 100644
--- a/app/client/cypress/fixtures/testdata.json
+++ b/app/client/cypress/fixtures/testdata.json
@@ -161,5 +161,8 @@
"audioRecorderBindingValue": "{{AudioRecorder1.isVisible}}",
"audioBindingValue": "{{Audio1.autoPlay}}",
"phoneBindingValue": "{{PhoneInput1.value}}",
- "fileBindingValue": "{{FilePicker1.isDirty}}"
+ "fileBindingValue": "{{FilePicker1.isDirty}}",
+ "UPGRADEUSERNAME": "[email protected]",
+ "UPGRADEPASSWORD": "Test@123",
+ "APPURL": "/applications/62e2e63c11fae56b4ef05150/pages/62e2e63c11fae56b4ef05152"
}
diff --git a/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/UpgradeAppsmith/UpgradeAppsimth_spec.js b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/UpgradeAppsmith/UpgradeAppsimth_spec.js
new file mode 100644
index 000000000000..5955c5f85abd
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/UpgradeAppsmith/UpgradeAppsimth_spec.js
@@ -0,0 +1,113 @@
+const publishPage = require("../../../../locators/publishWidgetspage.json");
+const testdata = require("../../../../fixtures/testdata.json");
+
+const testUrl = "http://localhost:5001/v1/parent/cmd";
+describe("Upgrade appsmith version", () => {
+ it("Upgrade Appsmith version and verify the Applications", () => {
+ const uuid = () => Cypress._.random(0, 10000);
+ const name = uuid();
+ cy.wait(2000);
+
+ cy.GetCWD(testUrl);
+
+ cy.log("Stop the container");
+ cy.StopTheContainer(testUrl, "appsmith"); // stop the old container
+ cy.wait(2000);
+
+ cy.GetCWD(testUrl);
+
+ cy.log("Get path");
+ cy.GetPath(testUrl, "appsmith").then((path) => {
+ cy.log(path);
+ path = path.split(" ");
+ path = path[1].split(" ");
+ path = path[0].slice(0, -7);
+ cy.log(path);
+
+ localStorage.setItem("ContainerName", `appsmith-160_${name}_updated`);
+
+ cy.log("Start old stack container");
+ cy.CreateAContainer(
+ testUrl,
+ path + "/oldstack/160",
+ "latest",
+ `appsmith-160_${name}_updated`,
+ );
+ cy.wait(45000);
+
+ cy.log("Verify Logs");
+ cy.GetAndVerifyLogs(testUrl, `appsmith-160_${name}_updated`); // Get and verify the logs
+ });
+
+ //verify the Applications after upgrade
+ cy.LoginFromAPI(testdata.UPGRADEUSERNAME, testdata.UPGRADEPASSWORD);
+ cy.visit(testdata.APPURL);
+
+ cy.get(".t--buttongroup-widget").should("exist");
+ cy.get(".t--buttongroup-widget")
+ .children()
+ .should("have.length", 3);
+
+ cy.get(publishPage.backToEditor).click({ force: true });
+
+ cy.get(".t--buttongroup-widget").should("exist");
+ cy.get(".t--buttongroup-widget")
+ .children()
+ .should("have.length", 3);
+
+ cy.log("Stop the container");
+ cy.StopTheContainer(testUrl, localStorage.getItem("ContainerName")); // stop the old container
+ cy.wait(2000);
+ });
+
+ it("Upgrade Appsmith from CE to EE and verify the Applications", () => {
+ cy.log("Stop the appsmith container");
+ cy.StopTheContainer(testUrl, "appsmith"); // stop the old container
+ cy.wait(2000);
+
+ const uuid = () => Cypress._.random(0, 10000);
+ const name = uuid();
+ cy.wait(2000);
+
+ cy.log("Get path");
+ cy.GetPath(testUrl, "appsmith").then((path) => {
+ path = path.split(" ");
+ path = path[1].split(" ");
+ path = path[0].slice(0, -7);
+ cy.log(path);
+
+ localStorage.setItem(
+ "ContainerName",
+ `appsmith-160-ce-${name}-enterprise`,
+ );
+
+ cy.log("Start old stack container");
+ cy.CreateEEContainer(
+ testUrl,
+ path + "/oldstack/ce",
+ "latest",
+ `appsmith-160-ce-${name}-enterprise`,
+ );
+ cy.wait(45000);
+
+ cy.log("Verify Logs");
+ cy.GetAndVerifyLogs(testUrl, `appsmith-160-ce-${name}-enterprise`); // Get and verify the logs
+ });
+
+ //verify the Applications after upgrade
+ cy.LoginFromAPI(testdata.UPGRADEUSERNAME, testdata.UPGRADEPASSWORD);
+ cy.visit(testdata.APPURL);
+
+ cy.get(".t--buttongroup-widget").should("exist");
+ cy.get(".t--buttongroup-widget")
+ .children()
+ .should("have.length", 3);
+
+ cy.get(publishPage.backToEditor).click({ force: true });
+
+ cy.get(".t--buttongroup-widget").should("exist");
+ cy.get(".t--buttongroup-widget")
+ .children()
+ .should("have.length", 3);
+ });
+});
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 5c9cc71b8a68..2a3c6b57dd7c 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1755,6 +1755,145 @@ Cypress.Commands.add("restoreLocalStorageCache", () => {
});
});
+Cypress.Commands.add("StopTheContainer", (path, containerName) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd: "docker stop " + containerName,
+ },
+ }).then((res) => {
+ cy.log(res.body.stderr);
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ });
+});
+
+Cypress.Commands.add("StopAllContainer", (path) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd: "docker kill $(docker ps -q)",
+ },
+ }).then((res) => {
+ expect(res.status).equal(200);
+ });
+});
+
+Cypress.Commands.add("StartTheContainer", (path, containerName) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd: "docker start " + containerName,
+ },
+ }).then((res) => {
+ cy.log(res.body.stderr);
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ });
+});
+
+Cypress.Commands.add(
+ "CreateAContainer",
+ (url, path, version, containerName) => {
+ let comm =
+ "cd " +
+ path +
+ ";docker run -d --name " +
+ containerName +
+ ' -p 80:80 -p 9001:9001 -v "' +
+ path +
+ '/stacks:/appsmith-stacks" appsmith/appsmith-ce:' +
+ version;
+
+ cy.log(comm);
+ cy.request({
+ method: "GET",
+ url: url,
+ qs: {
+ cmd: comm,
+ },
+ }).then((res) => {
+ cy.log(res.body.stderr);
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ });
+ },
+);
+
+Cypress.Commands.add(
+ "CreateEEContainer",
+ (url, path, version, containerName) => {
+ let comm =
+ "cd " +
+ path +
+ ";docker run -d --name " +
+ containerName +
+ ' -p 80:80 -p 9001:9001 -v "' +
+ path +
+ '/stacks:/appsmith-stacks" appsmith/appsmith-ee:' +
+ version;
+
+ cy.log(comm);
+ cy.request({
+ method: "GET",
+ url: url,
+ qs: {
+ cmd: comm,
+ },
+ }).then((res) => {
+ cy.log(res.body.stderr);
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ });
+ },
+);
+
+Cypress.Commands.add("GetPath", (path, containerName) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd:
+ "docker inspect -f '{{ .Mounts }}' " +
+ containerName +
+ "|awk '{print $2}'",
+ },
+ }).then((res) => {
+ return res.body.stdout;
+ });
+});
+
+Cypress.Commands.add("GetCWD", (path) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd: "pwd",
+ },
+ }).then((res) => {
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ });
+});
+
+Cypress.Commands.add("GetAndVerifyLogs", (path, containerName) => {
+ cy.request({
+ method: "GET",
+ url: path,
+ qs: {
+ cmd: "docker logs " + containerName + " 2>&1 | grep 'APPLIED'",
+ },
+ }).then((res) => {
+ cy.log(res.body.stderr);
+ cy.log(res.body.stdout);
+ expect(res.status).equal(200);
+ // expect(res.body.stdout).not.equal("");
+ });
+});
+
Cypress.Commands.add(
"typeTab",
{ prevSubject: "element" },
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index ec7133bebd03..b56cd362fb81 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -113,4 +113,8 @@ after(function() {
cy.DeleteAppByApi();
//-- LogOut Application---//
cy.LogOut();
+
+ const testUrl = "http://localhost:5001/v1/parent/cmd";
+ cy.log("Start the appsmith container");
+ cy.StartTheContainer(testUrl, "appsmith"); // stop the old container
});
|
519b53ea9b1e5bc8e740630813e966c8a0b7b67a
|
2024-06-25 16:00:41
|
albinAppsmith
|
feat: Overflow tabs list view (#34150)
| false
|
Overflow tabs list view (#34150)
|
feat
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
index 0a1126ee2991..e8bd59c4233b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/IDE_Add_Pane_Interactions_spec.ts
@@ -68,7 +68,7 @@ describe("IDE add pane interactions", { tags: ["@tag.IDE"] }, () => {
// check add pane
PageLeftPane.assertInAddView();
// close add tab
- FileTabs.closeTab("new");
+ FileTabs.closeTab("new_query");
// open add pane to add item
PageLeftPane.switchToAddNew();
// add item
diff --git a/app/client/cypress/support/Pages/IDE/FileTabs.ts b/app/client/cypress/support/Pages/IDE/FileTabs.ts
index 24bfa7bb53e1..2557436a1b35 100644
--- a/app/client/cypress/support/Pages/IDE/FileTabs.ts
+++ b/app/client/cypress/support/Pages/IDE/FileTabs.ts
@@ -1,8 +1,10 @@
import { ObjectsRegistry } from "../../Objects/Registry";
+import { sanitizeString } from "../../../../src/utils/URLUtils";
class FileTabs {
locators = {
container: "[data-testid='t--editor-tabs']",
- tabName: (name: string) => `[data-testid='t--ide-tab-${name}']`,
+ tabName: (name: string) =>
+ `[data-testid='t--ide-tab-${sanitizeString(name)}']`,
tabs: ".editor-tab",
addItem: "[data-testid='t--ide-tabs-add-button']",
closeTab: "[data-testid='t--tab-close-btn']",
diff --git a/app/client/src/IDE/Components/FileTab.tsx b/app/client/src/IDE/Components/FileTab.tsx
new file mode 100644
index 000000000000..ec32b7739666
--- /dev/null
+++ b/app/client/src/IDE/Components/FileTab.tsx
@@ -0,0 +1,98 @@
+import React from "react";
+import styled from "styled-components";
+import clsx from "classnames";
+
+import { Flex, Icon } from "design-system";
+import { sanitizeString } from "utils/URLUtils";
+
+interface FileTabProps {
+ isActive: boolean;
+ title: string;
+ onClick: () => void;
+ onClose: (e: React.MouseEvent) => void;
+ icon?: React.ReactNode;
+}
+
+export const StyledTab = styled(Flex)`
+ position: relative;
+ height: 100%;
+ font-size: 12px;
+ color: var(--ads-v2-colors-text-default);
+ cursor: pointer;
+ gap: var(--ads-v2-spaces-2);
+ border-top: 1px solid transparent;
+ border-top-left-radius: var(--ads-v2-border-radius);
+ border-top-right-radius: var(--ads-v2-border-radius);
+ align-items: center;
+ justify-content: center;
+ padding: var(--ads-v2-spaces-3);
+ border-left: 1px solid transparent;
+ border-right: 1px solid transparent;
+ border-top: 2px solid transparent;
+
+ &.active {
+ background: var(--ads-v2-colors-control-field-default-bg);
+ border-top-color: var(--ads-v2-color-bg-brand);
+ border-left-color: var(--ads-v2-color-border-muted);
+ border-right-color: var(--ads-v2-color-border-muted);
+ }
+
+ & > .tab-close {
+ position: relative;
+ right: -2px;
+ visibility: hidden;
+ }
+
+ &:hover > .tab-close {
+ visibility: visible;
+ }
+
+ &.active > .tab-close {
+ visibility: visible;
+ }
+`;
+
+export const TabTextContainer = styled.span`
+ width: 100%;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+`;
+
+export const TabIconContainer = styled.div`
+ height: 12px;
+ width: 12px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+ img {
+ width: 12px;
+ }
+`;
+
+export const FileTab = ({
+ icon,
+ isActive,
+ onClick,
+ onClose,
+ title,
+}: FileTabProps) => {
+ return (
+ <StyledTab
+ className={clsx("editor-tab", isActive && "active")}
+ data-testid={`t--ide-tab-${sanitizeString(title)}`}
+ onClick={onClick}
+ >
+ {icon ? <TabIconContainer>{icon}</TabIconContainer> : null}
+ <TabTextContainer>{title}</TabTextContainer>
+ {/* not using button component because of the size not matching design */}
+ <Icon
+ className="tab-close rounded-[4px] hover:bg-[var(--ads-v2-colors-action-tertiary-surface-hover-bg)] cursor-pointer p-[2px]"
+ data-testid="t--tab-close-btn"
+ name="close-line"
+ onClick={onClose}
+ />
+ </StyledTab>
+ );
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
index 71130f46e1cf..6d5a2c96abb3 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
@@ -17,6 +17,7 @@ import history from "utils/history";
import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
import { useModuleOptions } from "@appsmith/utils/moduleInstanceHelpers";
import { getJSUrl } from "@appsmith/pages/Editor/IDE/EditorPane/JS/utils";
+import { JSBlankState } from "pages/Editor/JSEditor/JSBlankState";
export const useJSAdd = () => {
const pageId = useSelector(getCurrentPageId);
@@ -95,7 +96,7 @@ export const useJSSegmentRoutes = (path: string): UseRoutes => {
},
{
key: "JSEmpty",
- component: ListJS,
+ component: JSBlankState,
exact: true,
path: [path],
},
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
index 90b37aee232f..3eedf95b8740 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
@@ -38,6 +38,7 @@ import { Tag, type ListItemProps } from "design-system";
import { useCurrentEditorState } from "pages/Editor/IDE/hooks";
import CurlImportEditor from "pages/Editor/APIEditor/CurlImportEditor";
import { createAddClassName } from "pages/Editor/IDE/EditorPane/utils";
+import { QueriesBlankState } from "pages/Editor/QueryEditor/QueriesBlankState";
export const useQueryAdd = () => {
const location = useLocation();
@@ -161,7 +162,7 @@ export const useQuerySegmentRoutes = (path: string): UseRoutes => {
},
{
key: "QueryEmpty",
- component: ListQuery,
+ component: QueriesBlankState,
exact: true,
path: [path],
},
diff --git a/app/client/src/ce/selectors/appIDESelectors.ts b/app/client/src/ce/selectors/appIDESelectors.ts
index dfd9faa67873..af37fe267181 100644
--- a/app/client/src/ce/selectors/appIDESelectors.ts
+++ b/app/client/src/ce/selectors/appIDESelectors.ts
@@ -6,6 +6,7 @@ import {
getQuerySegmentItems,
} from "@appsmith/selectors/entitiesSelector";
import { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
+import type { AppState } from "@appsmith/reducers";
export type EditorSegmentList = Array<{
group: string | "NA";
@@ -45,28 +46,22 @@ export const selectJSSegmentEditorList = createSelector(
},
);
-export const selectJSSegmentEditorTabs = createSelector(
- getJSSegmentItems,
- getJSTabs,
- (items, tabs) => {
- const keyedItems = keyBy(items, "key");
- return tabs
- .map((tab) => {
- return keyedItems[tab];
- })
- .filter(Boolean);
- },
-);
+export const selectJSSegmentEditorTabs = (state: AppState) => {
+ const items = getJSSegmentItems(state);
+ const tabs = getJSTabs(state);
-export const selectQuerySegmentEditorTabs = createSelector(
- getQuerySegmentItems,
- getQueryTabs,
- (items, tabs) => {
- const keyedItems = keyBy(items, "key");
- return tabs
- .map((tab) => {
- return keyedItems[tab];
- })
- .filter(Boolean);
- },
-);
+ const keyedItems = keyBy(items, "key");
+ return tabs
+ .map((tab) => {
+ return keyedItems[tab];
+ })
+ .filter(Boolean);
+};
+
+export const selectQuerySegmentEditorTabs = (state: AppState) => {
+ const items = getQuerySegmentItems(state);
+ const tabs = getQueryTabs(state);
+
+ const keyedItems = keyBy(items, "key");
+ return tabs.map((tab) => keyedItems[tab]).filter(Boolean);
+};
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/EditorPaneSegments.tsx b/app/client/src/pages/Editor/IDE/EditorPane/EditorPaneSegments.tsx
index c2daef1f8322..5d44ec5edf28 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/EditorPaneSegments.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/EditorPaneSegments.tsx
@@ -6,7 +6,7 @@ import QueriesSegment from "./Query";
import WidgetsSegment from "./UI";
import JSSegment from "./JS";
import SegmentedHeader from "./components/SegmentedHeader";
-import EditorTabs from "../EditorTabs/SplitScreenTabs";
+import EditorTabs from "../EditorTabs";
import {
jsSegmentRoutes,
querySegmentRoutes,
@@ -17,19 +17,23 @@ import {
BUILDER_PATH,
BUILDER_PATH_DEPRECATED,
} from "@appsmith/constants/routes/appRoutes";
+import { useSelector } from "react-redux";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { EditorViewMode } from "@appsmith/entities/IDE/constants";
const EditorPaneSegments = () => {
const { path } = useRouteMatch();
+ const ideViewMode = useSelector(getIDEViewMode);
return (
<Flex
+ className="relative"
flexDirection="column"
- gap="spacing-2"
height="100%"
overflow="hidden"
>
<SegmentedHeader />
- <EditorTabs />
+ {ideViewMode === EditorViewMode.SplitScreen ? <EditorTabs /> : null}
<Flex
className="ide-editor-left-pane__content"
flexDirection="column"
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
index 9990efc79d60..848999f4266b 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
@@ -151,7 +151,7 @@ describe("IDE Render: JS", () => {
).toBe(true);
// Tabs active state
expect(
- getByTestId("t--ide-tab-JSObject1").classList.contains("active"),
+ getByTestId("t--ide-tab-jsobject1").classList.contains("active"),
).toBe(true);
// Check if the form is rendered
expect(container.querySelector(".js-editor-tab")).not.toBeNull();
@@ -201,7 +201,7 @@ describe("IDE Render: JS", () => {
expect(getAllByText("JSObject2").length).toBe(2);
// Tabs active state
expect(
- getByTestId("t--ide-tab-JSObject2").classList.contains("active"),
+ getByTestId("t--ide-tab-jsobject2").classList.contains("active"),
).toBe(true);
// Check if the form is rendered
@@ -245,7 +245,7 @@ describe("IDE Render: JS", () => {
expect(getAllByText("JSObject3").length).toEqual(2);
// Tabs active state
expect(
- getByTestId("t--ide-tab-JSObject3").classList.contains("active"),
+ getByTestId("t--ide-tab-jsobject3").classList.contains("active"),
).toBe(false);
// Check js object is not rendered. Instead new tab should render
expect(container.querySelector(".js-editor-tab")).toBeNull();
@@ -283,7 +283,7 @@ describe("IDE Render: JS", () => {
expect(getAllByText("JSObject4").length).toEqual(1);
// Tabs active state
expect(
- getByTestId("t--ide-tab-JSObject4").classList.contains("active"),
+ getByTestId("t--ide-tab-jsobject4").classList.contains("active"),
).toBe(false);
// Check if the form is not rendered
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
index ccf56595ff1d..b3e21a8014eb 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
@@ -51,6 +51,7 @@ const ListJSObjects = () => {
return (
<JSContainer
className="ide-editor-left-pane__content-js"
+ flex="1"
flexDirection="column"
gap="spaces-3"
overflow="hidden"
@@ -77,7 +78,6 @@ const ListJSObjects = () => {
>
<Flex
data-testid="t--ide-list"
- flex="1"
flexDirection="column"
gap="spaces-4"
overflowY="auto"
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
index 186ae24fdfb9..2bd611ae258a 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
@@ -88,7 +88,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -121,7 +121,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -161,7 +161,7 @@ describe("IDE URL rendering of Queries", () => {
getByTestId("t--entity-item-Api1").classList.contains("active"),
).toBe(true);
// Tabs active state
- expect(getByTestId("t--ide-tab-Api1").classList.contains("active")).toBe(
+ expect(getByTestId("t--ide-tab-api1").classList.contains("active")).toBe(
true,
);
// Check if the form is rendered
@@ -205,7 +205,7 @@ describe("IDE URL rendering of Queries", () => {
// Check if api is rendered in side by side
expect(getAllByText("Api2").length).toBe(2);
// Tabs active state
- expect(getByTestId("t--ide-tab-Api2").classList.contains("active")).toBe(
+ expect(getByTestId("t--ide-tab-api2").classList.contains("active")).toBe(
true,
);
// Check if the form is rendered
@@ -244,7 +244,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -278,7 +278,7 @@ describe("IDE URL rendering of Queries", () => {
// There will be 1 Api4 text ( The tab )
expect(getAllByText("Api4").length).toEqual(1);
// Tabs active state
- expect(getByTestId("t--ide-tab-Api4").classList.contains("active")).toBe(
+ expect(getByTestId("t--ide-tab-api4").classList.contains("active")).toBe(
false,
);
// Add button should not present
@@ -291,7 +291,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -336,7 +336,7 @@ describe("IDE URL rendering of Queries", () => {
).toBe(true);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Query1").classList.contains("active"),
+ getByTestId("t--ide-tab-query1").classList.contains("active"),
).toBe(true);
await userEvent.click(getByRole("tab", { name: "Query" }));
@@ -384,7 +384,7 @@ describe("IDE URL rendering of Queries", () => {
expect(getAllByText("Query2").length).toBe(2);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Query2").classList.contains("active"),
+ getByTestId("t--ide-tab-query2").classList.contains("active"),
).toBe(true);
await userEvent.click(getByRole("tab", { name: "Query" }));
@@ -430,7 +430,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -469,7 +469,7 @@ describe("IDE URL rendering of Queries", () => {
expect(getAllByText("Query4").length).toEqual(1);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Query4").classList.contains("active"),
+ getByTestId("t--ide-tab-query4").classList.contains("active"),
).toBe(false);
// Add button should not present
expect(queryByTestId("t--ide-tabs-add-button")).toBeNull();
@@ -481,7 +481,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -527,7 +527,7 @@ describe("IDE URL rendering of Queries", () => {
).toBe(true);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Sheets1").classList.contains("active"),
+ getByTestId("t--ide-tab-sheets1").classList.contains("active"),
).toBe(true);
await userEvent.click(getByRole("tab", { name: "Query" }));
@@ -576,7 +576,7 @@ describe("IDE URL rendering of Queries", () => {
expect(getAllByText("Sheets2").length).toBe(2);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Sheets2").classList.contains("active"),
+ getByTestId("t--ide-tab-sheets2").classList.contains("active"),
).toBe(true);
await userEvent.click(getByRole("tab", { name: "Query" }));
@@ -625,7 +625,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
@@ -665,7 +665,7 @@ describe("IDE URL rendering of Queries", () => {
expect(getAllByText("Sheets4").length).toEqual(1);
// Tabs active state
expect(
- getByTestId("t--ide-tab-Sheets4").classList.contains("active"),
+ getByTestId("t--ide-tab-sheets4").classList.contains("active"),
).toBe(false);
// Add button active state
expect(queryByTestId("t--ide-tabs-add-button")).toBeNull();
@@ -677,7 +677,7 @@ describe("IDE URL rendering of Queries", () => {
getByText("New datasource");
getByText("REST API");
// Check new tab presence
- const newTab = getByTestId("t--ide-tab-new");
+ const newTab = getByTestId("t--ide-tab-new_query");
expect(newTab).not.toBeNull();
// Close button is rendered
expect(
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
new file mode 100644
index 000000000000..f5d3564a88bb
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+
+import { FileTab } from "IDE/Components/FileTab";
+import { useCurrentEditorState } from "../hooks";
+import {
+ EditorEntityTab,
+ EditorEntityTabState,
+} from "@appsmith/entities/IDE/constants";
+
+const AddTab = ({
+ isListActive,
+ newTabClickCallback,
+ onClose,
+}: {
+ newTabClickCallback: () => void;
+ onClose: (actionId?: string) => void;
+ isListActive: boolean;
+}) => {
+ const { segment, segmentMode } = useCurrentEditorState();
+
+ if (segmentMode !== EditorEntityTabState.Add) return null;
+
+ const onCloseClick = (e: React.MouseEvent) => {
+ e.stopPropagation();
+ onClose();
+ };
+
+ return (
+ <FileTab
+ isActive={segmentMode === EditorEntityTabState.Add && !isListActive}
+ onClick={newTabClickCallback}
+ onClose={(e) => onCloseClick(e)}
+ title={`New ${segment === EditorEntityTab.JS ? "JS" : "Query"}`}
+ />
+ );
+};
+
+export { AddTab };
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx
index b248f9e5f969..dbc77dd103f6 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx
@@ -9,6 +9,7 @@ const Container = (props: { children: ReactNode }) => {
backgroundColor="#FFFFFF"
borderBottom="1px solid var(--ads-v2-color-border-muted)"
gap="spaces-2"
+ id="ide-tabs-container"
maxHeight="32px"
minHeight="32px"
px="spaces-2"
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx
index 8b00ea582459..be5f41c683ac 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.test.tsx
@@ -1,8 +1,10 @@
import React from "react";
import { fireEvent, render } from "test/testUtils";
import FileTabs from "./FileTabs";
-import type { EntityItem } from "@appsmith/entities/IDE/constants";
+import { EditorState, type EntityItem } from "@appsmith/entities/IDE/constants";
import { PluginType } from "entities/Action";
+import { FocusEntity } from "navigation/FocusEntity";
+import { sanitizeString } from "utils/URLUtils";
describe("FileTabs", () => {
const mockTabs: EntityItem[] = [
@@ -14,22 +16,26 @@ describe("FileTabs", () => {
const mockNavigateToTab = jest.fn();
const mockOnClose = jest.fn();
+ const activeEntity = {
+ entity: FocusEntity.API,
+ id: "File 1",
+ appState: EditorState.EDITOR,
+ params: {},
+ };
it("renders tabs correctly", () => {
const { getByTestId, getByText } = render(
<FileTabs
+ currentEntity={activeEntity}
navigateToTab={mockNavigateToTab}
onClose={mockOnClose}
tabs={mockTabs}
/>,
);
- const editorTabsContainer = getByTestId("t--editor-tabs");
- expect(editorTabsContainer).not.toBeNull();
-
// Check if each tab is rendered with correct content
mockTabs.forEach((tab) => {
- const tabElement = getByTestId(`t--ide-tab-${tab.title}`);
+ const tabElement = getByTestId(`t--ide-tab-${sanitizeString(tab.title)}`);
expect(tabElement).not.toBeNull();
const tabTitleElement = getByText(tab.title);
@@ -40,12 +46,15 @@ describe("FileTabs", () => {
it("check tab click", () => {
const { getByTestId } = render(
<FileTabs
+ currentEntity={activeEntity}
navigateToTab={mockNavigateToTab}
onClose={mockOnClose}
tabs={mockTabs}
/>,
);
- const tabElement = getByTestId(`t--ide-tab-${mockTabs[0].title}`);
+ const tabElement = getByTestId(
+ `t--ide-tab-${sanitizeString(mockTabs[0].title)}`,
+ );
fireEvent.click(tabElement);
expect(mockNavigateToTab).toHaveBeenCalledWith(mockTabs[0]);
@@ -54,12 +63,15 @@ describe("FileTabs", () => {
it("check for close click", () => {
const { getByTestId } = render(
<FileTabs
+ currentEntity={activeEntity}
navigateToTab={mockNavigateToTab}
onClose={mockOnClose}
tabs={mockTabs}
/>,
);
- const tabElement = getByTestId(`t--ide-tab-${mockTabs[1].title}`);
+ const tabElement = getByTestId(
+ `t--ide-tab-${sanitizeString(mockTabs[1].title)}`,
+ );
const closeElement = tabElement.querySelector(
"[data-testid='t--tab-close-btn']",
) as HTMLElement;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx
index 90499d2b984f..215ccca50c17 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/FileTabs.tsx
@@ -1,54 +1,24 @@
-import React, { useEffect } from "react";
-import { useLocation } from "react-router";
-import clsx from "classnames";
-import { Flex, Icon, ScrollArea } from "design-system";
+import React from "react";
import {
- EditorEntityTab,
EditorEntityTabState,
type EntityItem,
} from "@appsmith/entities/IDE/constants";
-import {
- StyledTab,
- TabIconContainer,
- TabTextContainer,
-} from "./StyledComponents";
-import { identifyEntityFromPath } from "navigation/FocusEntity";
import { useCurrentEditorState } from "../hooks";
+import { FileTab } from "IDE/Components/FileTab";
+import type { FocusEntityInfo } from "navigation/FocusEntity";
interface Props {
tabs: EntityItem[];
navigateToTab: (tab: EntityItem) => void;
onClose: (actionId?: string) => void;
+ currentEntity: FocusEntityInfo;
+ isListActive?: boolean;
}
-const FILE_TABS_CONTAINER_ID = "file-tabs-container";
-
const FileTabs = (props: Props) => {
- const { navigateToTab, onClose, tabs } = props;
- const { segment, segmentMode } = useCurrentEditorState();
-
- const location = useLocation();
-
- const currentEntity = identifyEntityFromPath(location.pathname);
-
- useEffect(() => {
- const activetab = document.querySelector(".editor-tab.active");
- if (activetab) {
- activetab.scrollIntoView({
- inline: "nearest",
- });
- }
- }, [tabs, segmentMode]);
-
- useEffect(() => {
- const ele = document.getElementById(FILE_TABS_CONTAINER_ID)?.parentElement;
- if (ele && ele.scrollWidth > ele.clientWidth) {
- ele.style.borderRight = "1px solid var(--ads-v2-color-border)";
- } else if (ele) {
- ele.style.borderRight = "unset";
- }
- }, [tabs]);
+ const { currentEntity, isListActive, navigateToTab, onClose, tabs } = props;
+ const { segmentMode } = useCurrentEditorState();
const onCloseClick = (e: React.MouseEvent, id?: string) => {
e.stopPropagation();
@@ -56,59 +26,22 @@ const FileTabs = (props: Props) => {
};
return (
- <ScrollArea
- className="h-[32px] top-[0.5px]"
- data-testid="t--editor-tabs"
- options={{
- overflow: {
- x: "scroll",
- y: "hidden",
- },
- }}
- size={"sm"}
- >
- <Flex gap="spaces-2" height="100%" id={FILE_TABS_CONTAINER_ID}>
- {tabs.map((tab: EntityItem) => (
- <StyledTab
- className={clsx(
- "editor-tab",
- currentEntity.id === tab.key && "active",
- )}
- data-testid={`t--ide-tab-${tab.title}`}
- key={tab.key}
- onClick={() => navigateToTab(tab)}
- >
- <TabIconContainer>{tab.icon}</TabIconContainer>
- <TabTextContainer>{tab.title}</TabTextContainer>
- {/* not using button component because of the size not matching design */}
- <Icon
- className="tab-close rounded-[4px] hover:bg-[var(--ads-v2-colors-action-tertiary-surface-hover-bg)] cursor-pointer p-[2px]"
- data-testid="t--tab-close-btn"
- name="close-line"
- onClick={(e) => onCloseClick(e, tab.key)}
- />
- </StyledTab>
- ))}
- {/* New Tab */}
- {segmentMode === EditorEntityTabState.Add ? (
- <StyledTab
- className={clsx("editor-tab", "active")}
- data-testid={`t--ide-tab-new`}
- >
- <TabTextContainer>
- New {segment === EditorEntityTab.JS ? "JS" : "Query"}
- </TabTextContainer>
- {/* not using button component because of the size not matching design */}
- <Icon
- className="tab-close rounded-[4px] hover:bg-[var(--ads-v2-colors-action-tertiary-surface-hover-bg)] cursor-pointer p-[2px]"
- data-testid="t--tab-close-btn"
- name="close-line"
- onClick={(e) => onCloseClick(e)}
- />
- </StyledTab>
- ) : null}
- </Flex>
- </ScrollArea>
+ <>
+ {tabs.map((tab: EntityItem) => (
+ <FileTab
+ icon={tab.icon}
+ isActive={
+ currentEntity.id === tab.key &&
+ segmentMode !== EditorEntityTabState.Add &&
+ !isListActive
+ }
+ key={tab.key}
+ onClick={() => navigateToTab(tab)}
+ onClose={(e) => onCloseClick(e, tab.key)}
+ title={tab.title}
+ />
+ ))}
+ </>
);
};
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx
deleted file mode 100644
index f9a3f14c5f0f..000000000000
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useCallback } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { Button, Tooltip } from "design-system";
-import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors";
-import {
- EditorEntityTab,
- EditorViewMode,
-} from "@appsmith/entities/IDE/constants";
-import { setIdeEditorViewMode } from "actions/ideActions";
-import FileTabs from "./FileTabs";
-import Container from "./Container";
-import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks";
-import { TabSelectors } from "./constants";
-import {
- MINIMIZE_BUTTON_TOOLTIP,
- createMessage,
-} from "@appsmith/constants/messages";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
-import { AddButton } from "./AddButton";
-
-const FullScreenTabs = () => {
- const dispatch = useDispatch();
- const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
- const ideViewMode = useSelector(getIDEViewMode);
- const { segment } = useCurrentEditorState();
- const { closeClickHandler, tabClickHandler } = useIDETabClickHandlers();
-
- const setSplitScreenMode = useCallback(() => {
- dispatch(setIdeEditorViewMode(EditorViewMode.SplitScreen));
- AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
- to: EditorViewMode.SplitScreen,
- });
- }, []);
- const tabsConfig = TabSelectors[segment];
-
- const files = useSelector(tabsConfig.tabsSelector);
-
- if (!isSideBySideEnabled) return null;
- if (ideViewMode === EditorViewMode.SplitScreen) return null;
- if (segment === EditorEntityTab.UI) return null;
- return (
- <Container>
- <FileTabs
- navigateToTab={tabClickHandler}
- onClose={closeClickHandler}
- tabs={files}
- />
- {files.length > 0 ? <AddButton /> : null}
- <Tooltip
- content={createMessage(MINIMIZE_BUTTON_TOOLTIP)}
- placement="bottomRight"
- >
- <Button
- className="ml-auto !min-w-[24px]"
- data-testid="t--ide-minimize"
- id="editor-mode-minimize"
- isIconButton
- kind="tertiary"
- onClick={setSplitScreenMode}
- startIcon="minimize-v3"
- />
- </Tooltip>
- </Container>
- );
-};
-
-export default FullScreenTabs;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
new file mode 100644
index 000000000000..b053c6d9c1e3
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
@@ -0,0 +1,35 @@
+import React from "react";
+import styled from "styled-components";
+import { Flex } from "design-system";
+
+import { useCurrentEditorState } from "../hooks";
+import { EditorEntityTab } from "@appsmith/entities/IDE/constants";
+import ListQuery from "../EditorPane/Query/List";
+import ListJSObjects from "../EditorPane/JS/List";
+
+const ListContainer = styled(Flex)`
+ & .t--entity-item {
+ grid-template-columns: 0 auto 1fr auto auto auto auto auto;
+ height: 32px;
+
+ & .t--entity-name {
+ padding-left: var(--ads-v2-spaces-3);
+ }
+ }
+`;
+
+export const List = () => {
+ const { segment } = useCurrentEditorState();
+
+ return (
+ <ListContainer
+ bg="var(--ads-v2-color-bg)"
+ className="absolute top-[78px]"
+ h="calc(100% - 78px)"
+ w="100%"
+ zIndex="10"
+ >
+ {segment === EditorEntityTab.QUERIES ? <ListQuery /> : <ListJSObjects />}
+ </ListContainer>
+ );
+};
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx
index 503f09088967..1f6abf2f6a68 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx
@@ -9,7 +9,7 @@ import {
MenuTrigger,
Text,
} from "design-system";
-import { ListIconContainer, TabTextContainer } from "./StyledComponents";
+import { ListIconContainer, ListTitle } from "./StyledComponents";
interface Props {
items: EntityItem[];
@@ -50,7 +50,7 @@ const ListButton = (props: Props) => {
gap="spaces-2"
>
<ListIconContainer>{item.icon}</ListIconContainer>
- <TabTextContainer>{item.title}</TabTextContainer>
+ <ListTitle>{item.title}</ListTitle>
</Flex>
</MenuItem>
))}
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
new file mode 100644
index 000000000000..13eb9dd1c770
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx
@@ -0,0 +1,62 @@
+import React, { useCallback } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { Button, Tooltip } from "design-system";
+
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { EditorViewMode } from "@appsmith/entities/IDE/constants";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import {
+ MAXIMIZE_BUTTON_TOOLTIP,
+ MINIMIZE_BUTTON_TOOLTIP,
+ createMessage,
+} from "@appsmith/constants/messages";
+import { setIdeEditorViewMode } from "actions/ideActions";
+
+export const ScreenModeToggle = () => {
+ const dispatch = useDispatch();
+ const ideViewMode = useSelector(getIDEViewMode);
+
+ const toggleEditorMode = useCallback(() => {
+ const newMode =
+ ideViewMode === EditorViewMode.SplitScreen
+ ? EditorViewMode.FullScreen
+ : EditorViewMode.SplitScreen;
+
+ AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
+ to: newMode,
+ });
+ dispatch(setIdeEditorViewMode(newMode));
+ }, [ideViewMode, dispatch]);
+
+ return (
+ <Tooltip
+ content={
+ ideViewMode === EditorViewMode.SplitScreen
+ ? createMessage(MAXIMIZE_BUTTON_TOOLTIP)
+ : createMessage(MINIMIZE_BUTTON_TOOLTIP)
+ }
+ >
+ <Button
+ className="ml-auto !min-w-[24px]"
+ data-testid={
+ ideViewMode === EditorViewMode.SplitScreen
+ ? "t--ide-maximize"
+ : "t--ide-minimize"
+ }
+ id={
+ ideViewMode === EditorViewMode.SplitScreen
+ ? "editor-mode-maximize"
+ : "editor-mode-minimize"
+ }
+ isIconButton
+ kind="tertiary"
+ onClick={toggleEditorMode}
+ startIcon={
+ ideViewMode === EditorViewMode.SplitScreen
+ ? "maximize-v3"
+ : "minimize-v3"
+ }
+ />
+ </Tooltip>
+ );
+};
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
index 8b058b55ebdf..62358727c470 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
@@ -13,7 +13,7 @@ import {
MenuTrigger,
SearchInput,
} from "design-system";
-import { ListIconContainer, TabTextContainer } from "./StyledComponents";
+import { ListIconContainer, ListTitle } from "./StyledComponents";
interface Props {
allItems: EntityItem[];
@@ -64,7 +64,7 @@ const SearchableFilesList = (props: Props) => {
gap="spaces-2"
>
<ListIconContainer>{file.icon}</ListIconContainer>
- <TabTextContainer>{file.title}</TabTextContainer>
+ <ListTitle>{file.title}</ListTitle>
</Flex>
</MenuItem>
));
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/SplitScreenTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/SplitScreenTabs.tsx
deleted file mode 100644
index dd4f490b1bc4..000000000000
--- a/app/client/src/pages/Editor/IDE/EditorTabs/SplitScreenTabs.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useCallback } from "react";
-
-import FileTabs from "./FileTabs";
-import { useDispatch, useSelector } from "react-redux";
-import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors";
-import Container from "./Container";
-import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks";
-import {
- EditorEntityTab,
- EditorViewMode,
-} from "@appsmith/entities/IDE/constants";
-import { TabSelectors } from "./constants";
-import { Announcement } from "../EditorPane/components/Announcement";
-import { SearchableFilesList } from "./SearchableFilesList";
-import { AddButton } from "./AddButton";
-import { Button, Tooltip } from "design-system";
-import {
- MAXIMIZE_BUTTON_TOOLTIP,
- createMessage,
-} from "@appsmith/constants/messages";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
-import { setIdeEditorViewMode } from "actions/ideActions";
-
-const SplitScreenTabs = () => {
- const dispatch = useDispatch();
- const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
- const ideViewMode = useSelector(getIDEViewMode);
- const { segment } = useCurrentEditorState();
- const { closeClickHandler, tabClickHandler } = useIDETabClickHandlers();
-
- const tabsConfig = TabSelectors[segment];
-
- const files = useSelector(tabsConfig.tabsSelector);
- const allFilesList = useSelector(tabsConfig.listSelector);
-
- const handleMaximizeButtonClick = useCallback(() => {
- AnalyticsUtil.logEvent("EDITOR_MODE_CHANGE", {
- to: EditorViewMode.FullScreen,
- });
- dispatch(setIdeEditorViewMode(EditorViewMode.FullScreen));
- }, []);
-
- if (!isSideBySideEnabled) return null;
- if (ideViewMode === EditorViewMode.FullScreen) return null;
- if (segment === EditorEntityTab.UI) return null;
-
- return (
- <>
- {/* {files.length > 0 ? ( */}
- <Container>
- <SearchableFilesList
- allItems={allFilesList}
- navigateToTab={tabClickHandler}
- />
- <FileTabs
- navigateToTab={tabClickHandler}
- onClose={closeClickHandler}
- tabs={files}
- />
- {files.length > 0 ? <AddButton /> : null}
-
- <Tooltip content={createMessage(MAXIMIZE_BUTTON_TOOLTIP)}>
- <Button
- className="ml-auto !min-w-[24px]"
- data-testid="t--ide-maximize"
- id="editor-mode-maximize"
- isIconButton
- kind="tertiary"
- onClick={handleMaximizeButtonClick}
- startIcon="maximize-v3"
- />
- </Tooltip>
- </Container>
- <Announcement />
- </>
- );
-};
-
-export default SplitScreenTabs;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/StyledComponents.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/StyledComponents.tsx
index 66e40cd39356..d396860bfde6 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/StyledComponents.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/StyledComponents.tsx
@@ -1,77 +1,4 @@
import styled from "styled-components";
-import { Flex } from "design-system";
-
-/**
- * Logic for 54px in max width
- *
- * 4px tabs + add icon container left padding
- * 4px tabs + add icon container right padding
- * 4px gap between tabs and add icon
- * 16px 4px gap between every tabs * 4 (since max tab count is 5,
- * there will be 5 gaps)
- * 26px Add button width
- * 62px show more list button(considering 3 digit width as max)
- * ======================================
- * 127px
- *
- */
-export const StyledTab = styled(Flex)`
- position: relative;
- top: 1px;
- font-size: 12px;
- color: var(--ads-v2-colors-text-default);
- cursor: pointer;
- gap: var(--ads-v2-spaces-2);
- border-top: 1px solid transparent;
- border-top-left-radius: var(--ads-v2-border-radius);
- border-top-right-radius: var(--ads-v2-border-radius);
- align-items: center;
- justify-content: center;
- padding: var(--ads-v2-spaces-3);
- border-left: 1px solid transparent;
- border-right: 1px solid transparent;
- border-top: 2px solid transparent;
-
- &.active {
- background: var(--ads-v2-colors-control-field-default-bg);
- border-top-color: var(--ads-v2-color-bg-brand);
- border-left-color: var(--ads-v2-color-border-muted);
- border-right-color: var(--ads-v2-color-border-muted);
- }
-
- & > .tab-close {
- position: relative;
- right: -2px;
- visibility: hidden;
- }
-
- &:hover > .tab-close {
- visibility: visible;
- }
-
- &.active > .tab-close {
- visibility: visible;
- }
-`;
-
-export const TabTextContainer = styled.span`
- width: 100%;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
-`;
-
-export const TabIconContainer = styled.div`
- height: 12px;
- width: 12px;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- img {
- width: 12px;
- }
-`;
export const ListIconContainer = styled.div`
height: 18px;
@@ -84,3 +11,10 @@ export const ListIconContainer = styled.div`
width: 18px;
}
`;
+
+export const ListTitle = styled.span`
+ width: 100%;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+`;
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
new file mode 100644
index 000000000000..b3e1bd10773d
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
@@ -0,0 +1,138 @@
+import React, { useEffect, useState } from "react";
+import { shallowEqual, useSelector } from "react-redux";
+import { Flex, ScrollArea, ToggleButton } from "design-system";
+import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors";
+import type { EntityItem } from "@appsmith/entities/IDE/constants";
+import {
+ EditorEntityTab,
+ EditorEntityTabState,
+ EditorViewMode,
+} from "@appsmith/entities/IDE/constants";
+import FileTabs from "./FileTabs";
+import Container from "./Container";
+import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks";
+import { TabSelectors } from "./constants";
+import { AddButton } from "./AddButton";
+import { Announcement } from "../EditorPane/components/Announcement";
+import { useLocation } from "react-router";
+import { identifyEntityFromPath } from "navigation/FocusEntity";
+import { List } from "./List";
+import { ScreenModeToggle } from "./ScreenModeToggle";
+import { AddTab } from "./AddTab";
+
+const EditorTabs = () => {
+ const [showListView, setShowListView] = useState(false);
+ const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
+ const ideViewMode = useSelector(getIDEViewMode);
+ const { segment, segmentMode } = useCurrentEditorState();
+ const { closeClickHandler, tabClickHandler } = useIDETabClickHandlers();
+ const tabsConfig = TabSelectors[segment];
+ const files = useSelector(tabsConfig.tabsSelector, shallowEqual);
+
+ const location = useLocation();
+ const currentEntity = identifyEntityFromPath(location.pathname);
+
+ // Turn off list view while changing segment, files
+ useEffect(() => {
+ setShowListView(false);
+ }, [currentEntity.id, currentEntity.entity, files, segmentMode]);
+
+ // Show list view if all tabs is closed
+ useEffect(() => {
+ if (files.length === 0 && segmentMode !== EditorEntityTabState.Add) {
+ setShowListView(true);
+ }
+ }, [files, segmentMode, currentEntity.entity]);
+
+ // scroll to the active tab
+ useEffect(() => {
+ const activetab = document.querySelector(".editor-tab.active");
+ if (activetab) {
+ activetab.scrollIntoView({
+ inline: "nearest",
+ });
+ }
+ }, [files, segmentMode]);
+
+ // show border if add button is sticky
+ useEffect(() => {
+ const ele = document.querySelector<HTMLElement>(
+ '[data-testid="t--editor-tabs"] > [data-overlayscrollbars-viewport]',
+ );
+ if (ele && ele.scrollWidth > ele.clientWidth) {
+ ele.style.borderRight = "1px solid var(--ads-v2-color-border)";
+ } else if (ele) {
+ ele.style.borderRight = "unset";
+ }
+ }, [files]);
+
+ if (!isSideBySideEnabled) return null;
+ if (segment === EditorEntityTab.UI) return null;
+
+ const handleHamburgerClick = () => {
+ if (files.length === 0 && segmentMode !== EditorEntityTabState.Add) return;
+ setShowListView(!showListView);
+ };
+
+ const onTabClick = (tab: EntityItem) => {
+ setShowListView(false);
+ tabClickHandler(tab);
+ };
+
+ const newTabClickHandler = () => {
+ setShowListView(false);
+ };
+
+ return (
+ <>
+ <Container>
+ {ideViewMode === EditorViewMode.SplitScreen && (
+ <ToggleButton
+ icon="hamburger"
+ isSelected={showListView}
+ onClick={handleHamburgerClick}
+ size="md"
+ />
+ )}
+ <ScrollArea
+ className="h-[32px] top-[0.5px]"
+ data-testid="t--editor-tabs"
+ options={{
+ overflow: {
+ x: "scroll",
+ y: "hidden",
+ },
+ }}
+ size={"sm"}
+ >
+ <Flex className="items-center" gap="spaces-2" height="100%">
+ <FileTabs
+ currentEntity={currentEntity}
+ isListActive={showListView}
+ navigateToTab={onTabClick}
+ onClose={closeClickHandler}
+ tabs={files}
+ />
+ <AddTab
+ isListActive={showListView}
+ newTabClickCallback={newTabClickHandler}
+ onClose={closeClickHandler}
+ />
+ </Flex>
+ </ScrollArea>
+
+ {files.length > 0 ? <AddButton /> : null}
+ {/* Switch screen mode button */}
+ <ScreenModeToggle />
+ </Container>
+
+ {/* Overflow list */}
+ {showListView && ideViewMode === EditorViewMode.SplitScreen && <List />}
+
+ {/* Announcement modal */}
+ {ideViewMode === EditorViewMode.SplitScreen && <Announcement />}
+ </>
+ );
+};
+
+export default EditorTabs;
diff --git a/app/client/src/pages/Editor/IDE/MainPane/index.tsx b/app/client/src/pages/Editor/IDE/MainPane/index.tsx
index 23973c915b6e..edae34902ad8 100644
--- a/app/client/src/pages/Editor/IDE/MainPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/MainPane/index.tsx
@@ -3,12 +3,16 @@ import { BUILDER_PATH } from "constants/routes";
import { Route, Switch, useRouteMatch } from "react-router";
import * as Sentry from "@sentry/react";
import useRoutes from "@appsmith/pages/Editor/IDE/MainPane/useRoutes";
-import EditorTabs from "pages/Editor/IDE/EditorTabs/FullScreenTabs";
+import EditorTabs from "pages/Editor/IDE/EditorTabs";
import { useWidgetSelectionBlockListener } from "pages/Editor/IDE/hooks";
+import { useSelector } from "react-redux";
+import { getIDEViewMode } from "selectors/ideSelectors";
+import { EditorViewMode } from "@appsmith/entities/IDE/constants";
const SentryRoute = Sentry.withSentryRouting(Route);
export const MainPane = (props: { id: string }) => {
const { path } = useRouteMatch();
+ const ideViewMode = useSelector(getIDEViewMode);
const routes = useRoutes(path);
useWidgetSelectionBlockListener();
@@ -18,7 +22,7 @@ export const MainPane = (props: { id: string }) => {
data-testid="t--ide-main-pane"
id={props.id}
>
- <EditorTabs />
+ {ideViewMode === EditorViewMode.FullScreen ? <EditorTabs /> : null}
<Switch key={BUILDER_PATH}>
{routes.map((route) => (
<SentryRoute {...route} key={route.key} />
diff --git a/app/client/src/pages/Editor/IDE/hooks.ts b/app/client/src/pages/Editor/IDE/hooks.ts
index ef4639e90119..c7cbb2549e49 100644
--- a/app/client/src/pages/Editor/IDE/hooks.ts
+++ b/app/client/src/pages/Editor/IDE/hooks.ts
@@ -214,7 +214,7 @@ export const useIDETabClickHandlers = () => {
);
const closeClickHandler = useCallback(
- (actionId: string | undefined) => {
+ (actionId?: string) => {
if (!actionId) {
// handle JS
return segment === EditorEntityTab.JS ? closeAddJS() : closeAddQuery();
diff --git a/app/client/src/utils/URLUtils.ts b/app/client/src/utils/URLUtils.ts
index 55b6b1a2d3e2..b986f8aeb377 100644
--- a/app/client/src/utils/URLUtils.ts
+++ b/app/client/src/utils/URLUtils.ts
@@ -39,3 +39,7 @@ export function matchesURLPattern(url: string) {
) !== null
);
}
+
+export const sanitizeString = (str: string): string => {
+ return str.toLowerCase().replace(/[^a-z0-9]/g, "_");
+};
|
89b10b552018e0a852ec25560135a5387e49b67d
|
2021-09-07 18:15:17
|
Rishabh Saxena
|
fix: close notifications list on clicking a list item (#7178)
| false
|
close notifications list on clicking a list item (#7178)
|
fix
|
diff --git a/app/client/src/notifications/NotificationListItem.tsx b/app/client/src/notifications/NotificationListItem.tsx
index d2a0d8f9f39f..d6e4adf00dd1 100644
--- a/app/client/src/notifications/NotificationListItem.tsx
+++ b/app/client/src/notifications/NotificationListItem.tsx
@@ -6,7 +6,10 @@ import UserApi from "api/UserApi";
import { AppsmithNotification, NotificationTypes } from "entities/Notification";
import { getTypographyByKey } from "constants/DefaultTheme";
import { getCommentThreadURL } from "comments/utils";
-import { markNotificationAsReadRequest } from "actions/notificationActions";
+import {
+ markNotificationAsReadRequest,
+ setIsNotificationsListVisible,
+} from "actions/notificationActions";
import history from "utils/history";
import { useDispatch } from "react-redux";
@@ -142,6 +145,7 @@ function CommentNotification(props: { notification: AppsmithNotification }) {
mode,
pageId,
});
+ dispatch(setIsNotificationsListVisible(false));
history.push(
`${commentThreadUrl.pathname}${commentThreadUrl.search}${commentThreadUrl.hash}`,
);
@@ -211,6 +215,8 @@ function CommentThreadNotification(props: {
pageId,
});
+ dispatch(setIsNotificationsListVisible(false));
+
history.push(
`${commentThreadUrl.pathname}${commentThreadUrl.search}${commentThreadUrl.hash}`,
);
|
5aeee41104329dc946adfaf140d71d71e64b4ad0
|
2025-01-17 16:42:40
|
Hetu Nandu
|
chore: Make Split screen feature GA (#38731)
| false
|
Make Split screen feature GA (#38731)
|
chore
|
diff --git a/app/client/cypress/support/Objects/FeatureFlags.ts b/app/client/cypress/support/Objects/FeatureFlags.ts
index b8385241ddda..78fc490c3f97 100644
--- a/app/client/cypress/support/Objects/FeatureFlags.ts
+++ b/app/client/cypress/support/Objects/FeatureFlags.ts
@@ -3,7 +3,6 @@ import { ObjectsRegistry } from "./Registry";
import produce from "immer";
const defaultFlags = {
- release_side_by_side_ide_enabled: true,
rollout_remove_feature_walkthrough_enabled: false, // remove this flag from here when it's removed from code
release_git_modularisation_enabled: true,
};
diff --git a/app/client/src/IDE/hooks/useIsInSideBySideEditor.test.tsx b/app/client/src/IDE/hooks/useIsInSideBySideEditor.test.tsx
index 1f3c2d740fe6..81cf7a8d802f 100644
--- a/app/client/src/IDE/hooks/useIsInSideBySideEditor.test.tsx
+++ b/app/client/src/IDE/hooks/useIsInSideBySideEditor.test.tsx
@@ -17,9 +17,6 @@ import type { Store } from "redux";
const JS_COLLECTION_EDITOR_PATH =
"/app/app-name/page-665dd1103e4483728c9ed11a/edit/jsObjects";
const NON_JS_COLLECTION_EDITOR_PATH = "/some-other-path";
-const FEATURE_FLAGS = {
- rollout_side_by_side_enabled: true,
-};
const renderUseIsInSideBySideEditor = (
history: MemoryHistory,
@@ -41,7 +38,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.SplitScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
@@ -54,7 +50,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.FullScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
@@ -71,7 +66,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.SplitScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
@@ -88,7 +82,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.SplitScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
@@ -105,7 +98,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.SplitScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
@@ -130,7 +122,6 @@ describe("useIsInSideBySideEditor", () => {
const store = testStore(
getIDETestState({
ideView: EditorViewMode.SplitScreen,
- featureFlags: FEATURE_FLAGS,
}),
);
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 9e8d0b90cef0..1dcfb65c0059 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -24,14 +24,12 @@ export const FEATURE_FLAG = {
license_widget_rtl_support_enabled: "license_widget_rtl_support_enabled",
ab_one_click_learning_popover_enabled:
"ab_one_click_learning_popover_enabled",
- release_side_by_side_ide_enabled: "release_side_by_side_ide_enabled",
ab_appsmith_ai_query: "ab_appsmith_ai_query",
rollout_remove_feature_walkthrough_enabled:
"rollout_remove_feature_walkthrough_enabled",
rollout_eslint_enabled: "rollout_eslint_enabled",
release_drag_drop_building_blocks_enabled:
"release_drag_drop_building_blocks_enabled",
- rollout_side_by_side_enabled: "rollout_side_by_side_enabled",
release_layout_conversion_enabled: "release_layout_conversion_enabled",
release_anvil_toggle_enabled: "release_anvil_toggle_enabled",
release_git_persist_branch_enabled: "release_git_persist_branch_enabled",
@@ -79,11 +77,9 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
license_git_continuous_delivery_enabled: false,
license_widget_rtl_support_enabled: false,
ab_one_click_learning_popover_enabled: false,
- release_side_by_side_ide_enabled: false,
ab_appsmith_ai_query: false,
rollout_remove_feature_walkthrough_enabled: true,
rollout_eslint_enabled: false,
- rollout_side_by_side_enabled: false,
release_layout_conversion_enabled: false,
release_anvil_toggle_enabled: false,
release_git_persist_branch_enabled: false,
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index 9f1c5a7f4d55..1fe0cdb1451a 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -12764,7 +12764,6 @@ export const defaultAppState = {
release_show_new_sidebar_announcement_enabled: false,
rollout_app_sidebar_enabled: false,
ab_one_click_learning_popover_enabled: false,
- release_side_by_side_ide_enabled: false,
license_git_unlimited_repo_enabled: false,
ask_ai_js: false,
license_connection_pool_size_enabled: false,
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
index 565e73551df8..d42f0fcdd2b0 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/JSRender.test.tsx
@@ -9,10 +9,6 @@ import { EditorEntityTab, EditorViewMode } from "ee/entities/IDE/constants";
import { PageFactory } from "test/factories/PageFactory";
import { JSObjectFactory } from "test/factories/Actions/JSObject";
-const FeatureFlags = {
- rollout_side_by_side_enabled: true,
-};
-
const basePageId = "0123456789abcdef00000000";
describe("IDE Render: JS", () => {
@@ -24,7 +20,6 @@ describe("IDE Render: JS", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/jsObjects`,
- featureFlags: FeatureFlags,
},
);
@@ -49,7 +44,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/jsObjects`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -73,7 +67,6 @@ describe("IDE Render: JS", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/jsObjects/add`,
- featureFlags: FeatureFlags,
},
);
@@ -98,7 +91,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/jsObjects/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -137,7 +129,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/jsObjects/${js1.baseId}`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -194,7 +185,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/jsObjects/${js2.baseId}`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -241,7 +231,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/jsObjects/${js3.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -283,7 +272,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/jsObjects/${js4.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -334,7 +322,6 @@ describe("IDE Render: JS", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/jsObjects/${Main_JS.baseId}`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
index 77393a10131f..cf10c6cb9af3 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
@@ -13,10 +13,6 @@ import { PageFactory } from "test/factories/PageFactory";
import { screen, waitFor } from "@testing-library/react";
import { GoogleSheetFactory } from "test/factories/Actions/GoogleSheetFactory";
-const FeatureFlags = {
- rollout_side_by_side_enabled: true,
-};
-
const basePageId = "0123456789abcdef00000000";
describe("IDE URL rendering of Queries", () => {
@@ -28,7 +24,6 @@ describe("IDE URL rendering of Queries", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/queries`,
- featureFlags: FeatureFlags,
},
);
@@ -51,7 +46,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/queries`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -73,7 +67,6 @@ describe("IDE URL rendering of Queries", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/queries/add`,
- featureFlags: FeatureFlags,
},
);
@@ -102,7 +95,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${basePageId}/edit/queries/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -148,7 +140,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/api/${anApi.baseId}`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -205,7 +196,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/api/${anApi.baseId}`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -250,7 +240,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/api/${anApi.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -292,7 +281,6 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/api/${anApi.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -347,7 +335,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/queries/${anQuery.baseId}`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -402,7 +389,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/queries/${anQuery.baseId}`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -448,7 +434,7 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/${page.slug}-${page.pageId}/edit/queries/${anQuery.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
+
sagasToRun: sagasToRunForTests,
},
);
@@ -492,7 +478,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/queries/${anQuery.baseId}/add`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -548,7 +533,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -597,7 +581,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
@@ -646,7 +629,7 @@ describe("IDE URL rendering of Queries", () => {
{
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}/add`,
initialState: state,
- featureFlags: FeatureFlags,
+
sagasToRun: sagasToRunForTests,
},
);
@@ -691,7 +674,6 @@ describe("IDE URL rendering of Queries", () => {
url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}/add`,
sagasToRun: sagasToRunForTests,
initialState: state,
- featureFlags: FeatureFlags,
},
);
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
index 2bc26118bd81..ebea1b837310 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/UIRender.test.tsx
@@ -13,10 +13,6 @@ import {
} from "test/factories/WidgetFactoryUtils";
import { EditorViewMode } from "ee/entities/IDE/constants";
-const FeatureFlags = {
- rollout_side_by_side_enabled: true,
-};
-
const pageId = "0123456789abcdef00000000";
describe("IDE URL rendering: UI", () => {
@@ -32,7 +28,6 @@ describe("IDE URL rendering: UI", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${pageId}/edit`,
- featureFlags: FeatureFlags,
initialState: state,
},
);
@@ -52,7 +47,6 @@ describe("IDE URL rendering: UI", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${pageId}/edit/widgets`,
- featureFlags: FeatureFlags,
initialState: state,
},
);
@@ -101,7 +95,6 @@ describe("IDE URL rendering: UI", () => {
</Route>,
{
url,
- featureFlags: FeatureFlags,
initialState: state,
},
);
@@ -126,7 +119,6 @@ describe("IDE URL rendering: UI", () => {
</Route>,
{
url: `/app/applicationSlug/pageSlug-${pageId}/edit`,
- featureFlags: FeatureFlags,
initialState: state,
},
);
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx
index 68ddda6d141a..9b349f61c4d2 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx
@@ -1,8 +1,6 @@
import React from "react";
-import { Button, Flex, Text } from "@appsmith/ads";
+import { Flex, Text } from "@appsmith/ads";
import { createMessage } from "ee/constants/messages";
-import { useSelector } from "react-redux";
-import { getIsSideBySideEnabled } from "selectors/ideSelectors";
interface Props {
titleMessage: () => string;
@@ -10,32 +8,15 @@ interface Props {
}
const SegmentAddHeader = (props: Props) => {
- const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
-
return (
<Flex
alignItems="center"
- backgroundColor={
- isSideBySideEnabled
- ? "var(--ads-v2-color-white)"
- : "var(--ads-v2-color-gray-50)"
- }
+ backgroundColor="var(--ads-v2-color-white)"
justifyContent="space-between"
>
<Text color="var(--ads-v2-color-fg)" kind="heading-xs">
{createMessage(props.titleMessage)}
</Text>
- {isSideBySideEnabled ? null : (
- <Button
- aria-label="Close pane"
- data-testid="t--add-pane-close-icon"
- isIconButton
- kind={"secondary"}
- onClick={props.onCloseClick}
- size={"sm"}
- startIcon={"close-line"}
- />
- )}
</Flex>
);
};
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/Editortabs.test.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/Editortabs.test.tsx
index 507c72cdc623..183b76c0a226 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/Editortabs.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/Editortabs.test.tsx
@@ -10,10 +10,6 @@ import { PageFactory } from "test/factories/PageFactory";
import { APIFactory } from "test/factories/Actions/API";
import type { AppState } from "ee/reducers";
-const FeatureFlags = {
- rollout_side_by_side_enabled: true,
-};
-
describe("EditorTabs render checks", () => {
const page = PageFactory.build();
@@ -24,7 +20,6 @@ describe("EditorTabs render checks", () => {
</Route>,
{
url,
- featureFlags: FeatureFlags,
initialState: state,
},
);
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
index 00deacf7bec2..59dc1a3eebe5 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx
@@ -1,11 +1,7 @@
import React, { useCallback, useEffect } from "react";
import { shallowEqual, useDispatch, useSelector } from "react-redux";
import { Flex, ScrollArea, ToggleButton } from "@appsmith/ads";
-import {
- getIDEViewMode,
- getIsSideBySideEnabled,
- getListViewActiveState,
-} from "selectors/ideSelectors";
+import { getIDEViewMode, getListViewActiveState } from "selectors/ideSelectors";
import type { EntityItem } from "ee/entities/IDE/constants";
import {
EditorEntityTab,
@@ -29,7 +25,6 @@ import { useEventCallback } from "usehooks-ts";
import { EditableTab } from "./EditableTab";
const EditorTabs = () => {
- const isSideBySideEnabled = useSelector(getIsSideBySideEnabled);
const ideViewMode = useSelector(getIDEViewMode);
const { segment, segmentMode } = useCurrentEditorState();
const { closeClickHandler, tabClickHandler } = useIDETabClickHandlers();
@@ -97,8 +92,6 @@ const EditorTabs = () => {
dispatch(setListViewActiveState(false));
});
- if (!isSideBySideEnabled) return null;
-
if (segment === EditorEntityTab.UI) return null;
return (
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 30f7f6260d74..5f6b224f259b 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -125,7 +125,6 @@ import {
getCurrentBasePageId,
getCurrentPageId,
} from "selectors/editorSelectors";
-import { getIsSideBySideEnabled } from "selectors/ideSelectors";
import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
import AppsmithConsole from "utils/AppsmithConsole";
import { getDynamicBindingsChangesSaga } from "utils/DynamicBindingUtils";
@@ -1196,12 +1195,7 @@ function* handleCreateNewQueryFromActionCreator(
yield put(setShowQueryCreateNewModal(true));
// Side by Side ramp. Switch to SplitScreen mode to allow user to edit query
- // created while having context of the canvas
- const isSideBySideEnabled: boolean = yield select(getIsSideBySideEnabled);
-
- if (isSideBySideEnabled) {
- yield put(setIdeEditorViewMode(EditorViewMode.SplitScreen));
- }
+ yield put(setIdeEditorViewMode(EditorViewMode.SplitScreen));
// Wait for a query to be created
const createdQuery: ReduxAction<BaseAction> = yield take(
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index 7053f8fc5e9a..0955d27096c9 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -95,7 +95,6 @@ import {
import { getJsPaneDebuggerState } from "selectors/jsPaneSelectors";
import { logMainJsActionExecution } from "ee/utils/analyticsHelpers";
import { getFocusablePropertyPaneField } from "selectors/propertyPaneSelectors";
-import { getIsSideBySideEnabled } from "selectors/ideSelectors";
import { setIdeEditorViewMode } from "actions/ideActions";
import { EditorViewMode } from "ee/entities/IDE/constants";
import { updateJSCollectionAPICall } from "ee/sagas/ApiCallerSagas";
@@ -866,11 +865,7 @@ function* handleCreateNewJSFromActionCreator(
// Side by Side ramp. Switch to SplitScreen mode to allow user to edit JS function
// created while having context of the canvas
- const isSideBySideEnabled: boolean = yield select(getIsSideBySideEnabled);
-
- if (isSideBySideEnabled) {
- yield put(setIdeEditorViewMode(EditorViewMode.SplitScreen));
- }
+ yield put(setIdeEditorViewMode(EditorViewMode.SplitScreen));
// Create the JS Object with the given function name
const pageId: string = yield select(getCurrentPageId);
diff --git a/app/client/src/selectors/ideSelectors.tsx b/app/client/src/selectors/ideSelectors.tsx
index 6abbd7255a54..f3c0499779b0 100644
--- a/app/client/src/selectors/ideSelectors.tsx
+++ b/app/client/src/selectors/ideSelectors.tsx
@@ -1,30 +1,12 @@
import { createSelector } from "reselect";
-import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
import type { AppState } from "ee/reducers";
import { getPageActions } from "ee/selectors/entitiesSelector";
-import { EditorEntityTab, EditorViewMode } from "ee/entities/IDE/constants";
+import { EditorEntityTab } from "ee/entities/IDE/constants";
import { getCurrentBasePageId } from "./editorSelectors";
import type { ParentEntityIDETabs } from "../reducers/uiReducers/ideReducer";
import { get } from "lodash";
-export const getIsSideBySideEnabled = createSelector(
- selectFeatureFlags,
- (flags) =>
- flags.release_side_by_side_ide_enabled ||
- flags.rollout_side_by_side_enabled,
-);
-
-export const getIDEViewMode = createSelector(
- getIsSideBySideEnabled,
- (state) => state.ui.ide.view,
- (featureFlag, ideViewMode) => {
- if (featureFlag) {
- return ideViewMode;
- }
-
- return EditorViewMode.FullScreen;
- },
-);
+export const getIDEViewMode = (state: AppState) => state.ui.ide.view;
export const getActionsCount = (pageId: string) =>
createSelector(getPageActions(pageId), (actions) => {
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.