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
|
|---|---|---|---|---|---|---|---|
5676d6f6525ebae3a9d8a5f14b3fb3135c479c11
|
2021-10-20 10:52:17
|
kyteinsky
|
fix: Added hover state to the black-colored Launch button on Applications Page. (#8279)
| false
|
Added hover state to the black-colored Launch button on Applications Page. (#8279)
|
fix
|
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index d0f1af806dd4..1e5570154aab 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -97,9 +97,21 @@ const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
z-index: 1;
& .t--application-view-link {
- border: none;
- background-color: #000;
- color: #fff;
+ border: 2px solid ${Colors.BLACK};
+ background-color: ${Colors.BLACK};
+ color: ${Colors.WHITE};
+ }
+
+ & .t--application-view-link:hover {
+ background-color: transparent;
+ border: 2px solid ${Colors.BLACK};
+ color: ${Colors.BLACK};
+
+ svg {
+ path {
+ fill: ${Colors.BLACK};
+ }
+ }
}
& .t--application-edit-link, & .t--application-view-link {
@@ -110,7 +122,7 @@ const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
width: 16px;
height: 16px;
path {
- fill: #fff;
+ fill: ${Colors.WHITE};
}
}
}
|
fd24aabbb3c97297fa403edd95a1978eb5ce5971
|
2024-11-22 08:19:31
|
Hetu Nandu
|
fix: Min width in certain ADS Button usage (#37624)
| false
|
Min width in certain ADS Button usage (#37624)
|
fix
|
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index 5c3e54af7fbd..edd2b60af280 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -253,9 +253,6 @@ const LeftPaneDataSection = styled.div<{ isBannerVisible?: boolean }>`
height: calc(100vh - ${(props) => 48 + (props.isBannerVisible ? 48 : 0)}px);
display: flex;
flex-direction: column;
- button {
- height: 34px !important;
- }
`;
// Tags for some reason take all available space.
diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx
index 036a3d4a4ec2..54dcb5f0f349 100644
--- a/app/client/src/components/editorComponents/Debugger/index.tsx
+++ b/app/client/src/components/editorComponents/Debugger/index.tsx
@@ -3,8 +3,9 @@ import { useDispatch, useSelector } from "react-redux";
import DebuggerTabs from "./DebuggerTabs";
import { setErrorCount } from "actions/debuggerActions";
import { getMessageCount, showDebuggerFlag } from "selectors/debuggerSelectors";
-import { Button, Tooltip } from "@appsmith/ads";
+import { Tooltip } from "@appsmith/ads";
import useDebuggerTriggerClick from "./hooks/useDebuggerTriggerClick";
+import * as Styled from "./styles";
function Debugger() {
// Debugger render flag
@@ -33,7 +34,7 @@ export function DebuggerTrigger() {
return (
<Tooltip content={tooltipContent}>
- <Button
+ <Styled.DebuggerTriggerButton
className="t--debugger-count"
kind={messageCounters.errors > 0 ? "error" : "tertiary"}
onClick={onClick}
@@ -43,7 +44,7 @@ export function DebuggerTrigger() {
}
>
{messageCounters.errors > 99 ? "99+" : messageCounters.errors}
- </Button>
+ </Styled.DebuggerTriggerButton>
</Tooltip>
);
}
diff --git a/app/client/src/components/editorComponents/Debugger/styles.ts b/app/client/src/components/editorComponents/Debugger/styles.ts
new file mode 100644
index 000000000000..52721305f4f8
--- /dev/null
+++ b/app/client/src/components/editorComponents/Debugger/styles.ts
@@ -0,0 +1,10 @@
+import { Button } from "@appsmith/ads";
+import styled from "styled-components";
+
+export const DebuggerTriggerButton = styled(Button)`
+ /* Override the min-width of the button for debugger trigger only */
+
+ .ads-v2-button__content {
+ min-width: unset;
+ }
+`;
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index a024ab6b386f..20083d77bc2d 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -65,11 +65,6 @@ const MainConfiguration = styled.div`
.api-info-row {
padding-top: var(--ads-v2-spaces-5);
-
- .ads-v2-select > .rc-select-selector {
- min-width: 110px;
- width: 110px;
- }
}
.form-row-header {
|
6112e79bacfd6a666c6eb01fd4ff5e1e72ad1167
|
2022-12-15 09:36:13
|
Hetu Nandu
|
chore: Navigation analytics (#18781)
| false
|
Navigation analytics (#18781)
|
chore
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
index 5f2144786675..9727df576e1b 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
@@ -166,14 +166,17 @@ describe("Omnibar functionality test cases", () => {
// verify recently opened items with their subtext i.e page name
cy.xpath(omnibar.recentlyopenItem)
.eq(0)
- .should("have.text", "Button1")
- .next()
.should("have.text", "Page1");
cy.xpath(omnibar.recentlyopenItem)
.eq(1)
.should("have.text", "Audio1")
.next()
.should("have.text", "Page1");
+ cy.xpath(omnibar.recentlyopenItem)
+ .eq(2)
+ .should("have.text", "Button1")
+ .next()
+ .should("have.text", "Page1");
cy.xpath(omnibar.recentlyopenItem)
.eq(3)
.should("have.text", "Omnibar2")
diff --git a/app/client/src/AppRouter.tsx b/app/client/src/AppRouter.tsx
index 60a017c1988c..5f292412068a 100644
--- a/app/client/src/AppRouter.tsx
+++ b/app/client/src/AppRouter.tsx
@@ -38,15 +38,11 @@ import ErrorPage from "pages/common/ErrorPage";
import PageNotFound from "pages/common/ErrorPages/PageNotFound";
import PageLoadingBar from "pages/common/PageLoadingBar";
import ErrorPageHeader from "pages/common/ErrorPageHeader";
-import { getCurrentThemeDetails, ThemeMode } from "selectors/themeSelectors";
import { AppState } from "@appsmith/reducers";
-import { setThemeMode } from "actions/themeActions";
import { connect, useSelector } from "react-redux";
import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
import * as Sentry from "@sentry/react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
-import { trimTrailingSlash } from "utils/helpers";
import { getSafeCrash, getSafeCrashCode } from "selectors/errorSelectors";
import UserProfile from "pages/UserProfile";
import { getCurrentUser } from "actions/authActions";
@@ -54,7 +50,6 @@ import { selectFeatureFlags } from "selectors/usersSelectors";
import Setup from "pages/setup";
import Settings from "@appsmith/pages/AdminSettings";
import SignupSuccess from "pages/setup/SignupSuccess";
-import { Theme } from "constants/DefaultTheme";
import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
import TemplatesListLoader from "pages/Templates/loader";
import { fetchFeatureFlagsInit } from "actions/userActions";
@@ -76,47 +71,21 @@ const SentryRoute = Sentry.withSentryRouting(Route);
const loadingIndicator = <PageLoadingBar />;
-function changeAppBackground(currentTheme: any) {
- if (
- trimTrailingSlash(window.location.pathname) === "/applications" ||
- window.location.pathname.indexOf("/settings/") !== -1 ||
- trimTrailingSlash(window.location.pathname) === "/profile" ||
- trimTrailingSlash(window.location.pathname) === "/signup-success"
- ) {
- document.body.style.backgroundColor =
- currentTheme.colors.homepageBackground;
- } else {
- document.body.style.backgroundColor = currentTheme.colors.appBackground;
- }
-}
-
function AppRouter(props: {
safeCrash: boolean;
getCurrentUser: () => void;
getFeatureFlags: () => void;
getCurrentTenant: () => void;
- currentTheme: Theme;
safeCrashCode?: ERROR_CODES;
featureFlags: FeatureFlags;
- setTheme: (theme: ThemeMode) => void;
}) {
const { getCurrentTenant, getCurrentUser, getFeatureFlags } = props;
useEffect(() => {
- AnalyticsUtil.logEvent("ROUTE_CHANGE", { path: window.location.pathname });
- const stopListener = history.listen((location: any) => {
- AnalyticsUtil.logEvent("ROUTE_CHANGE", { path: location.pathname });
- changeAppBackground(props.currentTheme);
- });
getCurrentUser();
getFeatureFlags();
getCurrentTenant();
- return stopListener;
}, []);
- useEffect(() => {
- changeAppBackground(props.currentTheme);
- }, [props.currentTheme]);
-
useBrandingTheme();
const user = useSelector(getCurrentUserSelector);
@@ -201,16 +170,12 @@ function AppRouter(props: {
}
const mapStateToProps = (state: AppState) => ({
- currentTheme: getCurrentThemeDetails(state),
safeCrash: getSafeCrash(state),
safeCrashCode: getSafeCrashCode(state),
featureFlags: selectFeatureFlags(state),
});
const mapDispatchToProps = (dispatch: any) => ({
- setTheme: (mode: ThemeMode) => {
- dispatch(setThemeMode(mode));
- },
getCurrentUser: () => dispatch(getCurrentUser()),
getFeatureFlags: () => dispatch(fetchFeatureFlagsInit()),
getCurrentTenant: () => dispatch(getCurrentTenant()),
diff --git a/app/client/src/actions/focusHistoryActions.ts b/app/client/src/actions/focusHistoryActions.ts
index 5984f8f59860..3a5049965dd5 100644
--- a/app/client/src/actions/focusHistoryActions.ts
+++ b/app/client/src/actions/focusHistoryActions.ts
@@ -9,7 +9,6 @@ export const routeChanged = (location: Location<AppsmithLocationState>) => {
payload: { location },
};
};
-
export const pageChanged = (
pageId: string,
currPath: string,
diff --git a/app/client/src/actions/globalSearchActions.ts b/app/client/src/actions/globalSearchActions.ts
index 12ec22b21738..78ba5644b8e1 100644
--- a/app/client/src/actions/globalSearchActions.ts
+++ b/app/client/src/actions/globalSearchActions.ts
@@ -68,11 +68,6 @@ export const setGlobalSearchFilterContext = (payload: any) => ({
payload,
});
-export const updateRecentEntity = (payload: RecentEntity) => ({
- type: ReduxActionTypes.UPDATE_RECENT_ENTITY,
- payload,
-});
-
export const restoreRecentEntitiesRequest = (payload: {
applicationId: string;
branch?: string;
diff --git a/app/client/src/actions/recentEntityActions.ts b/app/client/src/actions/recentEntityActions.ts
index ca27c6c82dbf..7b8af27976de 100644
--- a/app/client/src/actions/recentEntityActions.ts
+++ b/app/client/src/actions/recentEntityActions.ts
@@ -1,6 +1 @@
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-
-export const handlePathUpdated = (location: typeof window.location) => ({
- type: ReduxActionTypes.HANDLE_PATH_UPDATED,
- payload: { location },
-});
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index 5dcdcb7f5a39..d476f211771f 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -123,7 +123,6 @@ export const ReduxActionTypes = {
"SET_IS_PAGE_LEVEL_WEBSOCKET_CONNECTED",
SET_SNIPING_MODE: "SET_SNIPING_MODE",
RESET_SNIPING_MODE: "RESET_SNIPING_MODE",
- HANDLE_PATH_UPDATED: "HANDLE_PATH_UPDATED",
RESET_EDITOR_REQUEST: "RESET_EDITOR_REQUEST",
RESET_EDITOR_SUCCESS: "RESET_EDITOR_SUCCESS",
INITIALIZE_EDITOR: "INITIALIZE_EDITOR",
@@ -511,7 +510,6 @@ export const ReduxActionTypes = {
"RESET_APPLICATION_WIDGET_STATE_REQUEST",
SAAS_GET_OAUTH_ACCESS_TOKEN: "SAAS_GET_OAUTH_ACCESS_TOKEN",
GET_OAUTH_ACCESS_TOKEN: "GET_OAUTH_ACCESS_TOKEN",
- UPDATE_RECENT_ENTITY: "UPDATE_RECENT_ENTITY",
RESTORE_RECENT_ENTITIES_REQUEST: "RESTORE_RECENT_ENTITIES_REQUEST",
RESTORE_RECENT_ENTITIES_SUCCESS: "RESTORE_RECENT_ENTITIES_SUCCESS",
SET_RECENT_ENTITIES: "SET_RECENT_ENTITIES",
diff --git a/app/client/src/ce/sagas/index.tsx b/app/client/src/ce/sagas/index.tsx
index fbba9dda76e1..01be86d2a00f 100644
--- a/app/client/src/ce/sagas/index.tsx
+++ b/app/client/src/ce/sagas/index.tsx
@@ -28,7 +28,6 @@ import utilSagas from "sagas/UtilSagas";
import saaSPaneSagas from "sagas/SaaSPaneSagas";
import actionExecutionChangeListeners from "sagas/WidgetLoadingSaga";
import globalSearchSagas from "sagas/GlobalSearchSagas";
-import recentEntitiesSagas from "sagas/RecentEntitiesSagas";
import websocketSagas from "sagas/WebsocketSagas/WebsocketSagas";
import debuggerSagas from "sagas/DebuggerSagas";
import replaySaga from "sagas/ReplaySaga";
@@ -75,7 +74,6 @@ export const sagas = [
formEvaluationChangeListener,
utilSagas,
globalSearchSagas,
- recentEntitiesSagas,
websocketSagas,
debuggerSagas,
saaSPaneSagas,
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index e51b5dc5b8c9..f092fbd11818 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -118,7 +118,7 @@ import {
EntityNavigationData,
getEntitiesForNavigation,
} from "selectors/navigationSelectors";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
type ReduxStateProps = ReturnType<typeof mapStateToProps>;
@@ -175,12 +175,6 @@ export type CodeEditorGutter = {
gutterId: string;
};
-export type CustomKeyMap = {
- // combination of keys
- combination: string;
- onKeyDown: (cm: CodeMirror.Editor) => void;
-};
-
export type EditorProps = EditorStyleProps &
EditorConfig & {
input: Partial<WrappedFieldInputProps>;
@@ -609,7 +603,6 @@ class CodeEditor extends Component<Props, State> {
}
handleClick = (cm: CodeMirror.Editor, event: MouseEvent) => {
- const entityInfo = this.getEntityInformation();
if (
event.target instanceof Element &&
event.target.hasAttribute(NAVIGATE_TO_ATTRIBUTE)
@@ -631,17 +624,14 @@ class CodeEditor extends Component<Props, State> {
const navigationData = this.props.entitiesForNavigation[
entityToNavigate
];
- history.push(navigationData.url, { directNavigation: true });
+ history.push(navigationData.url, {
+ invokedBy: NavigationMethod.CommandClick,
+ });
// TODO fix the widget navigation issue to remove this
if (navigationData.type === ENTITY_TYPE.WIDGET) {
this.props.selectWidget(navigationData.id);
}
-
- AnalyticsUtil.logEvent("Cmd+Click Navigation", {
- toType: navigationData.type,
- fromType: entityInfo.entityType,
- });
},
);
}
diff --git a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
index 60237c4083e0..61377d139210 100644
--- a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
@@ -16,7 +16,7 @@ import {
} from "selectors/entitiesSelector";
import { getLastSelectedWidget } from "selectors/ui";
import AnalyticsUtil from "utils/AnalyticsUtil";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { getQueryParams } from "utils/URLUtils";
import { datasourcesEditorIdURL, jsCollectionIdURL } from "RouteBuilder";
@@ -90,6 +90,7 @@ function WidgetLink(props: EntityLinkProps) {
props.id,
widget.type,
widget.pageId,
+ NavigationMethod.EntityExplorer,
props.id === selectedWidgetId,
);
AnalyticsUtil.logEvent("DEBUGGER_ENTITY_NAVIGATION", {
diff --git a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
index ea58fc31024d..7c38b01c5daf 100644
--- a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
+++ b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
@@ -9,17 +9,17 @@ import {
getCurrentPageId,
} from "selectors/editorSelectors";
import { getAction, getPlugins } from "selectors/entitiesSelector";
-import { onApiEditor, onQueryEditor, onCanvas } from "../helpers";
+import { onApiEditor, onCanvas, onQueryEditor } from "../helpers";
import { getLastSelectedWidget } from "selectors/ui";
import { getDataTree } from "selectors/dataTreeSelectors";
import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/useNavigateToWidget";
import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
import {
- isWidget,
isAction,
isJSAction,
+ isWidget,
} from "workers/Evaluation/evaluationUtils";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { jsCollectionIdURL } from "RouteBuilder";
import store from "store";
import { PluginType } from "entities/Action";
@@ -139,7 +139,12 @@ export const useEntityLink = () => {
const entity = dataTree[name];
if (!pageId) return;
if (isWidget(entity)) {
- navigateToWidget(entity.widgetId, entity.type, pageId || "");
+ navigateToWidget(
+ entity.widgetId,
+ entity.type,
+ pageId || "",
+ NavigationMethod.Debugger,
+ );
} else if (isAction(entity)) {
const actionConfig = getActionConfig(entity.pluginType);
let plugin;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
index 54322a258080..adf38234e331 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
@@ -1,14 +1,14 @@
import React, {
- useState,
- useMemo,
useCallback,
useEffect,
+ useMemo,
useRef,
+ useState,
} from "react";
import { useDispatch, useSelector } from "react-redux";
import styled, { ThemeProvider } from "styled-components";
import { useParams } from "react-router";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { AppState } from "@appsmith/reducers";
import SearchModal from "./SearchModal";
import AlgoliaSearchWrapper from "./AlgoliaSearchWrapper";
@@ -21,33 +21,33 @@ import Description from "./Description";
import ResultsNotFound from "./ResultsNotFound";
import { useNavigateToWidget } from "pages/Editor/Explorer/Widgets/useNavigateToWidget";
import {
- toggleShowGlobalSearchModal,
- setGlobalSearchQuery,
- setGlobalSearchFilterContext,
cancelSnippet,
insertSnippet,
+ setGlobalSearchFilterContext,
+ setGlobalSearchQuery,
+ toggleShowGlobalSearchModal,
} from "actions/globalSearchActions";
import {
- getItemType,
- getItemTitle,
- getItemPage,
- SEARCH_ITEM_TYPES,
- DocSearchItem,
- SearchItem,
algoliaHighlightTag,
- SEARCH_CATEGORY_ID,
- getEntityId,
+ DocSearchItem,
filterCategories,
+ getEntityId,
getFilterCategoryList,
- SearchCategory,
- isNavigation,
- isMenu,
- isSnippet,
- isDocumentation,
- SelectEvent,
+ getItemPage,
+ getItemTitle,
+ getItemType,
getOptionalFilters,
isActionOperation,
+ isDocumentation,
isMatching,
+ isMenu,
+ isNavigation,
+ isSnippet,
+ SEARCH_CATEGORY_ID,
+ SEARCH_ITEM_TYPES,
+ SearchCategory,
+ SearchItem,
+ SelectEvent,
} from "./utils";
import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
import { HelpBaseURL } from "constants/HelpConstants";
@@ -75,8 +75,8 @@ import {
useFilteredWidgets,
} from "./GlobalSearchHooks";
import {
- datasourcesEditorIdURL,
builderURL,
+ datasourcesEditorIdURL,
jsCollectionIdURL,
} from "RouteBuilder";
import { getPlugins } from "selectors/entitiesSelector";
@@ -405,6 +405,7 @@ function GlobalSearch() {
activeItem.widgetId,
activeItem.type,
activeItem.pageId,
+ NavigationMethod.Omnibar,
lastSelectedWidgetId === activeItem.widgetId,
);
};
@@ -416,7 +417,7 @@ function GlobalSearch() {
const plugin = plugins.find((plugin) => plugin?.id === pluginId);
const url = actionConfig?.getURL(pageId, id, pluginType, plugin);
toggleShow();
- url && history.push(url);
+ url && history.push(url, { invokedBy: NavigationMethod.Omnibar });
};
const handleJSCollectionClick = (item: SearchItem) => {
@@ -427,6 +428,7 @@ function GlobalSearch() {
pageId,
collectionId: id,
}),
+ { invokedBy: NavigationMethod.Omnibar },
);
toggleShow();
};
@@ -439,6 +441,7 @@ function GlobalSearch() {
datasourceId: item.id,
params: getQueryParams(),
}),
+ { invokedBy: NavigationMethod.Omnibar },
);
};
@@ -448,6 +451,7 @@ function GlobalSearch() {
builderURL({
pageId: item.pageId,
}),
+ { invokedBy: NavigationMethod.Omnibar },
);
};
diff --git a/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx b/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
index 511d291fbf6d..fa80fef07cb9 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/useRecentEntities.tsx
@@ -9,6 +9,7 @@ import {
import { SEARCH_ITEM_TYPES } from "./utils";
import { get } from "lodash";
import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
+import { FocusEntity } from "navigation/FocusEntity";
const recentEntitiesSelector = (state: AppState) =>
state.ui.globalSearch.recentEntities || [];
@@ -24,10 +25,10 @@ const useResentEntities = () => {
const pages = useSelector(getPageList) || [];
- const populatedRecentEntities = (recentEntities || [])
+ return (recentEntities || [])
.map((entity) => {
- const { id, params, type } = entity;
- if (type === "page") {
+ const { id, pageId, type } = entity;
+ if (type === FocusEntity.PAGE) {
const result = pages.find((page) => page.pageId === id);
if (result) {
return {
@@ -38,7 +39,7 @@ const useResentEntities = () => {
} else {
return null;
}
- } else if (type === "datasource") {
+ } else if (type === FocusEntity.DATASOURCE) {
const datasource = reducerDatasources.find(
(reducerDatasource) => reducerDatasource.id === id,
);
@@ -46,28 +47,26 @@ const useResentEntities = () => {
datasource && {
...datasource,
entityType: type,
- pageId: params?.pageId,
+ pageId,
}
);
- } else if (type === "action")
+ } else if (type === FocusEntity.API || type === FocusEntity.QUERY)
return {
...actions.find((action) => action?.config?.id === id),
entityType: type,
};
- else if (type === "jsAction")
+ else if (type === FocusEntity.JS_OBJECT)
return {
...jsActions.find(
(action: JSCollectionData) => action?.config?.id === id,
),
entityType: type,
};
- else if (type === "widget") {
+ else if (type === FocusEntity.PROPERTY_PANE) {
return { ...get(widgetsMap, id, null), entityType: type };
}
})
.filter(Boolean);
-
- return populatedRecentEntities;
};
export default useResentEntities;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
index 67150c130b0b..4f9be92bdf1e 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
@@ -28,6 +28,7 @@ import { getQueryParams } from "utils/URLUtils";
import history from "utils/history";
import { curlImportPageURL } from "RouteBuilder";
import { isMacOrIOS, modText, shiftText } from "utils/helpers";
+import { FocusEntity } from "navigation/FocusEntity";
export type SelectEvent =
| React.MouseEvent
@@ -36,9 +37,9 @@ export type SelectEvent =
| null;
export type RecentEntity = {
- type: string;
+ type: FocusEntity;
id: string;
- params?: Record<string, string | undefined>;
+ pageId: string;
};
export enum SEARCH_CATEGORY_ID {
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index 1cf60205c363..0d88f36e57a2 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -10,12 +10,10 @@ import store, { runSagaMiddleware } from "./store";
import { LayersContext, Layers } from "constants/Layers";
import AppRouter from "./AppRouter";
import * as Sentry from "@sentry/react";
-import { getCurrentThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import { getCurrentThemeDetails } from "selectors/themeSelectors";
import { connect } from "react-redux";
import { AppState } from "@appsmith/reducers";
-import { setThemeMode } from "actions/themeActions";
import { StyledToastContainer } from "design-system";
-import localStorage from "utils/localStorage";
import "./assets/styles/index.css";
import "./polyfills/corejs-add-on";
import GlobalStyles from "globalStyles";
@@ -43,13 +41,7 @@ function App() {
class ThemedApp extends React.Component<{
currentTheme: any;
- setTheme: (themeMode: ThemeMode) => void;
}> {
- componentDidMount() {
- if (localStorage.getItem("THEME") === "LIGHT") {
- this.props.setTheme(ThemeMode.LIGHT);
- }
- }
render() {
return (
<ThemeProvider theme={this.props.currentTheme}>
@@ -72,16 +64,8 @@ class ThemedApp extends React.Component<{
const mapStateToProps = (state: AppState) => ({
currentTheme: getCurrentThemeDetails(state),
});
-const mapDispatchToProps = (dispatch: any) => ({
- setTheme: (mode: ThemeMode) => {
- dispatch(setThemeMode(mode));
- },
-});
-const ThemedAppWithProps = connect(
- mapStateToProps,
- mapDispatchToProps,
-)(ThemedApp);
+const ThemedAppWithProps = connect(mapStateToProps)(ThemedApp);
ReactDOM.render(<App />, document.getElementById("root"));
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
index 06adae896330..9ddcfe40fb20 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
@@ -1,8 +1,8 @@
-import React, { useCallback, memo, useMemo } from "react";
+import React, { memo, useCallback, useMemo } from "react";
import { useSelector } from "react-redux";
import Entity, { EntityClassNames } from "../Entity";
import ActionEntityContextMenu from "./ActionEntityContextMenu";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { saveActionName } from "actions/pluginActionActions";
import PerformanceTracker, {
PerformanceTransactionName,
@@ -51,7 +51,7 @@ export const ExplorerActionEntity = memo((props: ExplorerActionEntityProps) => {
PerformanceTracker.startTracking(PerformanceTransactionName.OPEN_ACTION, {
url,
});
- url && history.push(url);
+ url && history.push(url, { invokedBy: NavigationMethod.EntityExplorer });
AnalyticsUtil.logEvent("ENTITY_EXPLORER_CLICK", {
type: "QUERIES/APIs",
fromUrl: location.pathname,
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
index ff0f48e72bd0..b34e9d151115 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
@@ -5,10 +5,10 @@ import DataSourceContextMenu from "./DataSourceContextMenu";
import { getPluginIcon } from "../ExplorerIcons";
import { getQueryIdFromURL } from "../helpers";
import Entity, { EntityClassNames } from "../Entity";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import {
- fetchDatasourceStructure,
expandDatasourceEntity,
+ fetchDatasourceStructure,
updateDatasourceName,
} from "actions/datasourceActions";
import { useDispatch, useSelector } from "react-redux";
@@ -66,7 +66,7 @@ const ExplorerDatasourceEntity = React.memo(
toUrl: url,
name: props.datasource.name,
});
- history.push(url);
+ history.push(url, { invokedBy: NavigationMethod.EntityExplorer });
}, [props.datasource.id, props.datasource.name, location.pathname]);
const queryId = getQueryIdFromURL();
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
index 339f8536202f..aceaa6d44c2e 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
@@ -1,6 +1,6 @@
import React, { memo, useCallback } from "react";
import Entity, { EntityClassNames } from "../Entity";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import JSCollectionEntityContextMenu from "./JSActionContextMenu";
import { saveJSObjectName } from "actions/jsActionActions";
import { useSelector } from "react-redux";
@@ -50,7 +50,9 @@ export const ExplorerJSCollectionEntity = memo(
toUrl: navigateToUrl,
name: jsAction.name,
});
- history.push(navigateToUrl);
+ history.push(navigateToUrl, {
+ invokedBy: NavigationMethod.EntityExplorer,
+ });
}
}, [pageId, jsAction.id, jsAction.name, location.pathname]);
diff --git a/app/client/src/pages/Editor/Explorer/Pages/index.tsx b/app/client/src/pages/Editor/Explorer/Pages/index.tsx
index dc65289b7eba..2b5861f5fe48 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/index.tsx
@@ -1,7 +1,7 @@
import React, {
useCallback,
- useMemo,
useEffect,
+ useMemo,
useRef,
useState,
} from "react";
@@ -12,15 +12,15 @@ import {
getCurrentPageId,
} from "selectors/editorSelectors";
import Entity, { EntityClassNames } from "../Entity";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
import { createPage, updatePage } from "actions/pageActions";
import {
+ currentPageIcon,
+ defaultPageIcon,
hiddenPageIcon,
pageIcon,
- defaultPageIcon,
- currentPageIcon,
} from "../ExplorerIcons";
-import { createMessage, ADD_PAGE_TOOLTIP } from "@appsmith/constants/messages";
+import { ADD_PAGE_TOOLTIP, createMessage } from "@appsmith/constants/messages";
import { Page } from "@appsmith/constants/ReduxActionConstants";
import { getNextEntityName } from "utils/AppsmithUtils";
import { extractCurrentDSL } from "utils/WidgetPropsUtils";
@@ -31,11 +31,11 @@ import { getExplorerPinned } from "selectors/explorerSelector";
import { setExplorerPinnedAction } from "actions/explorerActions";
import { selectAllPages } from "selectors/entitiesSelector";
import { builderURL } from "RouteBuilder";
-import { saveExplorerStatus, getExplorerStatus } from "../helpers";
+import { getExplorerStatus, saveExplorerStatus } from "../helpers";
import { tailwindLayers } from "constants/Layers";
import useResize, {
- DIRECTION,
CallbackResponseType,
+ DIRECTION,
} from "utils/hooks/useResize";
import AddPageContextMenu from "./AddPageContextMenu";
import AnalyticsUtil from "utils/AnalyticsUtil";
@@ -123,7 +123,9 @@ function Pages() {
toUrl: navigateToUrl,
});
dispatch(toggleInOnboardingWidgetSelection(true));
- history.push(navigateToUrl);
+ history.push(navigateToUrl, {
+ invokedBy: NavigationMethod.EntityExplorer,
+ });
const currentURL = navigateToUrl.split(/(?=\?)/g);
dispatch(
pageChanged(
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
index 70d1b3fbd285..041d24cabbd0 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback, memo } from "react";
+import React, { memo, useCallback, useMemo } from "react";
import Entity, { EntityClassNames } from "../Entity";
import { WidgetProps } from "widgets/BaseWidget";
import { WidgetType } from "constants/WidgetConstants";
@@ -15,6 +15,7 @@ import { builderURL } from "RouteBuilder";
import { useLocation } from "react-router";
import { hasManagePagePermission } from "@appsmith/utils/permissionHelpers";
import { getPagePermissions } from "selectors/editorSelectors";
+import { NavigationMethod } from "utils/history";
export type WidgetTree = WidgetProps & { children?: WidgetTree[] };
@@ -41,6 +42,7 @@ const useWidget = (
widgetId,
widgetType,
pageId,
+ NavigationMethod.EntityExplorer,
isWidgetSelected,
isMultiSelect,
isShiftSelect,
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
index 9b5d6dd9502a..098f13699c1b 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
+++ b/app/client/src/pages/Editor/Explorer/Widgets/useNavigateToWidget.ts
@@ -9,6 +9,7 @@ import { navigateToCanvas } from "./utils";
import { getCurrentPageWidgets } from "selectors/entitiesSelector";
import { inGuidedTour } from "selectors/onboardingSelectors";
import store from "store";
+import { NavigationMethod } from "utils/history";
export const useNavigateToWidget = () => {
const params = useParams<ExplorerURLParams>();
@@ -29,9 +30,10 @@ export const useNavigateToWidget = () => {
widgetId: string,
widgetType: WidgetType,
pageId: string,
+ navigationMethod?: NavigationMethod,
) => {
selectWidget(widgetId, false);
- navigateToCanvas(pageId, widgetId);
+ navigateToCanvas(pageId, widgetId, navigationMethod);
quickScrollToWidget(widgetId);
// Navigating to a widget from query pane seems to make the property pane
// appear below the entity explorer hence adding a timeout here
@@ -50,6 +52,7 @@ export const useNavigateToWidget = () => {
widgetId: string,
widgetType: WidgetType,
pageId: string,
+ navigationMethod: NavigationMethod,
isWidgetSelected?: boolean,
isMultiSelect?: boolean,
isShiftSelect?: boolean,
@@ -65,7 +68,7 @@ export const useNavigateToWidget = () => {
} else if (isMultiSelect) {
multiSelectWidgets(widgetId, pageId);
} else {
- selectSingleWidget(widgetId, widgetType, pageId);
+ selectSingleWidget(widgetId, widgetType, pageId, navigationMethod);
}
},
[dispatch, params, selectWidget],
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/utils.ts b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
index b74f8454acf1..f00479b7e8c0 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
+++ b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
@@ -1,7 +1,11 @@
import { builderURL } from "RouteBuilder";
-import history from "utils/history";
+import history, { NavigationMethod } from "utils/history";
-export const navigateToCanvas = (pageId: string, widgetId?: string) => {
+export const navigateToCanvas = (
+ pageId: string,
+ widgetId?: string,
+ invokedBy?: NavigationMethod,
+) => {
const currentPath = window.location.pathname;
const canvasEditorURL = `${builderURL({
pageId,
@@ -9,6 +13,6 @@ export const navigateToCanvas = (pageId: string, widgetId?: string) => {
persistExistingParams: true,
})}`;
if (currentPath !== canvasEditorURL) {
- history.push(canvasEditorURL);
+ history.push(canvasEditorURL, { invokedBy });
}
};
diff --git a/app/client/src/pages/Editor/PropertyPane/DraggableListControl.tsx b/app/client/src/pages/Editor/PropertyPane/DraggableListControl.tsx
index 97817359a9d4..abee45f2efef 100644
--- a/app/client/src/pages/Editor/PropertyPane/DraggableListControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/DraggableListControl.tsx
@@ -10,7 +10,6 @@ import React, { useCallback } from "react";
import { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { getSelectedPropertyPanelIndex } from "selectors/propertyPaneSelectors";
-import { selectFeatureFlags } from "selectors/usersSelectors";
export type DraggableListControlProps<
TItem extends BaseItemProps
@@ -22,7 +21,6 @@ export const DraggableListControl = <TItem extends BaseItemProps>(
props: DraggableListControlProps<TItem>,
) => {
const dispatch = useDispatch();
- const featureFlags = useSelector(selectFeatureFlags);
const defaultPanelIndex = useSelector((state: AppState) =>
getSelectedPropertyPanelIndex(state, props.propertyPath),
);
@@ -45,8 +43,7 @@ export const DraggableListControl = <TItem extends BaseItemProps>(
);
useEffect(() => {
- featureFlags.CONTEXT_SWITCHING &&
- onEdit &&
+ onEdit &&
defaultPanelIndex !== undefined &&
debouncedEditLeading(defaultPanelIndex);
}, [defaultPanelIndex]);
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 7cc61b23cf99..a44190c35813 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -30,15 +30,10 @@ import { getTheme, ThemeMode } from "selectors/themeSelectors";
import { ThemeProvider } from "styled-components";
import { Theme } from "constants/DefaultTheme";
import GlobalHotKeys from "./GlobalHotKeys";
-import { handlePathUpdated } from "actions/recentEntityActions";
import GitSyncModal from "pages/Editor/gitSync/GitSyncModal";
import DisconnectGitModal from "pages/Editor/gitSync/DisconnectGitModal";
-
-import history from "utils/history";
import { fetchPage, updateCurrentPage } from "actions/pageActions";
-
import { getCurrentPageId } from "selectors/editorSelectors";
-
import { getSearchQuery } from "utils/helpers";
import { getIsPageLevelSocketConnected } from "selectors/websocketSelectors";
import {
@@ -69,7 +64,6 @@ type EditorProps = {
user?: User;
lightTheme: Theme;
resetEditorRequest: () => void;
- handlePathUpdated: (location: typeof window.location) => void;
fetchPage: (pageId: string) => void;
updateCurrentPage: (pageId: string) => void;
handleBranchChange: (branch: string) => void;
@@ -83,9 +77,6 @@ type EditorProps = {
type Props = EditorProps & RouteComponentProps<BuilderRouteParams>;
class Editor extends Component<Props> {
- unlisten: any;
- prevLocation: any;
-
public state = {
registered: false,
};
@@ -108,9 +99,6 @@ class Editor extends Component<Props> {
branch,
mode: APP_MODE.EDIT,
});
- this.props.handlePathUpdated(window.location);
- this.prevLocation = window.location;
- this.unlisten = history.listen(this.handleHistoryChange);
if (this.props.isPageLevelSocketConnected && pageId) {
this.props.collabStartSharingPointerEvent(
@@ -173,7 +161,7 @@ class Editor extends Component<Props> {
} else {
/**
* First time load is handled by init sagas
- * If we don't check for `prevPageId`: fetch page is retriggered
+ * If we don't check for `prevPageId`: fetch page is re triggered
* when redirected to the default page
*/
if (prevPageId && pageId && isPageIdUpdated) {
@@ -196,22 +184,11 @@ class Editor extends Component<Props> {
} = this.props;
const branch = getSearchQuery(search, GIT_BRANCH_QUERY_KEY);
this.props.resetEditorRequest();
- if (typeof this.unlisten === "function") this.unlisten();
this.props.collabStopSharingPointerEvent(
getPageLevelSocketRoomId(pageId, branch),
);
}
- handleHistoryChange = (location: any) => {
- if (
- this.prevLocation?.pathname !== location?.pathname ||
- this.prevLocation?.search !== location?.search
- ) {
- this.props.handlePathUpdated(location);
- this.prevLocation = location;
- }
- };
-
public render() {
if (
!this.props.isEditorInitialized ||
@@ -277,8 +254,6 @@ const mapDispatchToProps = (dispatch: any) => {
initEditor: (payload: InitializeEditorPayload) =>
dispatch(initEditor(payload)),
resetEditorRequest: () => dispatch(resetEditorRequest()),
- handlePathUpdated: (location: typeof window.location) =>
- dispatch(handlePathUpdated(location)),
fetchPage: (pageId: string) => dispatch(fetchPage(pageId)),
updateCurrentPage: (pageId: string) => dispatch(updateCurrentPage(pageId)),
collabStartSharingPointerEvent: (pageId: string) =>
diff --git a/app/client/src/pages/common/AppRoute.tsx b/app/client/src/pages/common/AppRoute.tsx
deleted file mode 100644
index f0f78e2d90ab..000000000000
--- a/app/client/src/pages/common/AppRoute.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from "react";
-import { Route, RouteComponentProps } from "react-router-dom";
-import * as Sentry from "@sentry/react";
-import { connect } from "react-redux";
-import { getCurrentThemeDetails, ThemeMode } from "selectors/themeSelectors";
-import { AppState } from "@appsmith/reducers";
-import { setThemeMode } from "actions/themeActions";
-import equal from "fast-deep-equal/es6";
-const SentryRoute = Sentry.withSentryRouting(Route);
-
-interface AppRouteProps {
- currentTheme: any;
- path?: string;
- component:
- | React.ComponentType<RouteComponentProps<any>>
- | React.ComponentType<any>;
- exact?: boolean;
- logDisable?: boolean;
- name: string;
- location?: any;
- setTheme: (themeMode: ThemeMode) => void;
-}
-
-class AppRouteWithoutProps extends React.Component<AppRouteProps> {
- shouldComponentUpdate(prevProps: AppRouteProps, nextProps: AppRouteProps) {
- return !equal(prevProps?.location, nextProps?.location);
- }
-
- render() {
- const { currentTheme, ...rest } = this.props;
- if (
- window.location.pathname === "/applications" ||
- window.location.pathname.indexOf("/settings/") !== -1
- ) {
- document.body.style.backgroundColor =
- currentTheme.colors.homepageBackground;
- } else {
- document.body.style.backgroundColor = currentTheme.colors.appBackground;
- }
- return <SentryRoute {...rest} />;
- }
-}
-const mapStateToProps = (state: AppState) => ({
- currentTheme: getCurrentThemeDetails(state),
-});
-const mapDispatchToProps = (dispatch: any) => ({
- setTheme: (mode: ThemeMode) => {
- dispatch(setThemeMode(mode));
- },
-});
-
-const AppRoute = connect(
- mapStateToProps,
- mapDispatchToProps,
-)(AppRouteWithoutProps);
-
-(AppRoute as any).whyDidYouRender = {
- logOnDifferentValues: false,
-};
-
-export default AppRoute;
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index 46b01a40eb8c..35a494d847fa 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -274,6 +274,7 @@ export function* flushErrorsAndRedirectSaga(
if (safeCrash) {
yield put(flushErrors());
}
+ if (!action.payload.url) return;
history.push(action.payload.url);
}
diff --git a/app/client/src/sagas/GlobalSearchSagas.ts b/app/client/src/sagas/GlobalSearchSagas.ts
index bc81b090ac94..28ec88dbf3a9 100644
--- a/app/client/src/sagas/GlobalSearchSagas.ts
+++ b/app/client/src/sagas/GlobalSearchSagas.ts
@@ -24,13 +24,12 @@ import {
import { RecentEntity } from "components/editorComponents/GlobalSearch/utils";
import log from "loglevel";
import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
+import { FocusEntity, FocusEntityInfo } from "navigation/FocusEntity";
const getRecentEntitiesKey = (applicationId: string, branch?: string) =>
branch ? `${applicationId}-${branch}` : applicationId;
-export function* updateRecentEntitySaga(
- actionPayload: ReduxAction<RecentEntity>,
-) {
+export function* updateRecentEntitySaga(entityInfo: FocusEntityInfo) {
try {
const branch: string | undefined = yield select(getCurrentGitBranch);
@@ -55,7 +54,7 @@ export function* updateRecentEntitySaga(
yield all(waitForEffects);
- const { payload: entity } = actionPayload;
+ const { entity, id, pageId } = entityInfo;
let recentEntities: RecentEntity[] = yield select(
(state: AppState) => state.ui.globalSearch.recentEntities,
);
@@ -63,10 +62,10 @@ export function* updateRecentEntitySaga(
recentEntities = recentEntities.slice();
recentEntities = recentEntities.filter(
- (recentEntity: { type: string; id: string }) =>
- recentEntity.id !== entity.id,
+ (recentEntity: { type: FocusEntity; id: string }) =>
+ recentEntity.id !== id,
);
- recentEntities.unshift(entity);
+ recentEntities.unshift(<RecentEntity>{ type: entity, id, pageId });
recentEntities = recentEntities.slice(0, 6);
yield put(setRecentEntities(recentEntities));
@@ -98,7 +97,6 @@ export function* restoreRecentEntities(
export default function* globalSearchSagas() {
yield all([
- takeLatest(ReduxActionTypes.UPDATE_RECENT_ENTITY, updateRecentEntitySaga),
takeLatest(
ReduxActionTypes.RESTORE_RECENT_ENTITIES_REQUEST,
restoreRecentEntities,
diff --git a/app/client/src/sagas/NavigationSagas.ts b/app/client/src/sagas/NavigationSagas.ts
index 74badd57c0e0..6256bfa481dc 100644
--- a/app/client/src/sagas/NavigationSagas.ts
+++ b/app/client/src/sagas/NavigationSagas.ts
@@ -1,13 +1,8 @@
-import { all, call, put, select, takeEvery } from "redux-saga/effects";
-import {
- ReduxAction,
- ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+import { all, call, fork, put, select, takeEvery } from "redux-saga/effects";
import { setFocusHistory } from "actions/focusHistoryActions";
import { getCurrentFocusInfo } from "selectors/focusHistorySelectors";
import { FocusState } from "reducers/uiReducers/focusHistoryReducer";
import { FocusElementsConfig } from "navigation/FocusElements";
-import history from "utils/history";
import {
FocusEntity,
FocusEntityInfo,
@@ -19,23 +14,39 @@ import { getAction, getPlugin } from "selectors/entitiesSelector";
import { Action } from "entities/Action";
import { Plugin } from "api/PluginApi";
import log from "loglevel";
-import FeatureFlags from "entities/FeatureFlags";
-import { selectFeatureFlags } from "selectors/usersSelectors";
import { Location } from "history";
-import { AppsmithLocationState } from "utils/history";
+import history, {
+ AppsmithLocationState,
+ NavigationMethod,
+} from "utils/history";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import { getRecentEntityIds } from "selectors/globalSearchSelectors";
+import {
+ ReduxAction,
+ ReduxActionTypes,
+} from "ce/constants/ReduxActionConstants";
+import { getCurrentThemeDetails } from "selectors/themeSelectors";
+import { BackgroundTheme, changeAppBackground } from "sagas/ThemeSaga";
+import { updateRecentEntitySaga } from "sagas/GlobalSearchSagas";
let previousPath: string;
let previousHash: string | undefined;
+function* appBackgroundHandler() {
+ const currentTheme: BackgroundTheme = yield select(getCurrentThemeDetails);
+ changeAppBackground(currentTheme);
+}
+
function* handleRouteChange(
action: ReduxAction<{ location: Location<AppsmithLocationState> }>,
) {
const { hash, pathname, state } = action.payload.location;
try {
- const featureFlags: FeatureFlags = yield select(selectFeatureFlags);
- if (featureFlags.CONTEXT_SWITCHING) {
- yield call(contextSwitchingSaga, pathname, state, hash);
- }
+ yield call(logNavigationAnalytics, action.payload);
+ yield call(contextSwitchingSaga, pathname, state, hash);
+ yield call(appBackgroundHandler);
+ const entityInfo = identifyEntityFromPath(pathname, hash);
+ yield fork(updateRecentEntitySaga, entityInfo);
} catch (e) {
log.error("Error in focus change", e);
} finally {
@@ -44,6 +55,29 @@ function* handleRouteChange(
}
}
+function* logNavigationAnalytics(payload: {
+ location: Location<AppsmithLocationState>;
+}) {
+ const {
+ location: { hash, pathname, state },
+ } = payload;
+ const recentEntityIds: Array<string> = yield select(getRecentEntityIds);
+ const currentEntity = identifyEntityFromPath(pathname, hash);
+ const previousEntity = identifyEntityFromPath(previousPath, previousHash);
+ const isRecent = recentEntityIds.some(
+ (entityId) => entityId === currentEntity.id,
+ );
+ AnalyticsUtil.logEvent("ROUTE_CHANGE", {
+ toPath: pathname + hash,
+ fromPath: previousPath + previousHash || undefined,
+ navigationMethod: state?.invokedBy,
+ isRecent,
+ recentLength: recentEntityIds.length,
+ toType: currentEntity.entity,
+ fromType: previousEntity.entity,
+ });
+}
+
function* handlePageChange(
action: ReduxAction<{
pageId: string;
@@ -61,9 +95,8 @@ function* handlePageChange(
pageId,
} = action.payload;
try {
- const featureFlags: FeatureFlags = yield select(selectFeatureFlags);
const fromPageId = identifyEntityFromPath(fromPath)?.pageId;
- if (featureFlags.CONTEXT_SWITCHING && fromPageId && fromPageId !== pageId) {
+ if (fromPageId && fromPageId !== pageId) {
yield call(storeStateOfPage, fromPageId, fromPath, fromParamString);
yield call(setStateOfPage, pageId, currPath, currParamString);
@@ -234,7 +267,14 @@ function shouldSetState(
currHash?: string,
state?: AppsmithLocationState,
) {
- if (state && state.directNavigation) return true;
+ if (
+ state &&
+ state.invokedBy &&
+ state.invokedBy === NavigationMethod.CommandClick
+ ) {
+ // If it is a command click navigation, we will set the state
+ return true;
+ }
const prevFocusEntity = identifyEntityFromPath(prevPath, prevHash).entity;
const currFocusEntity = identifyEntityFromPath(currPath, currHash).entity;
@@ -272,7 +312,6 @@ function shouldStoreStateForCanvas(
(currFocusEntity !== FocusEntity.CANVAS || prevPath !== currPath)
);
}
-
export default function* rootSaga() {
yield all([takeEvery(ReduxActionTypes.ROUTE_CHANGED, handleRouteChange)]);
yield all([takeEvery(ReduxActionTypes.PAGE_CHANGED, handlePageChange)]);
diff --git a/app/client/src/sagas/RecentEntitiesSagas.ts b/app/client/src/sagas/RecentEntitiesSagas.ts
index 2d10fe895f9f..2181401b38c6 100644
--- a/app/client/src/sagas/RecentEntitiesSagas.ts
+++ b/app/client/src/sagas/RecentEntitiesSagas.ts
@@ -1,9 +1,3 @@
-import {
- ReduxActionTypes,
- ReduxAction,
-} from "@appsmith/constants/ReduxActionConstants";
-import { all, put, takeLatest } from "redux-saga/effects";
-import { updateRecentEntity } from "actions/globalSearchActions";
import { matchPath } from "react-router";
import { matchBasePath } from "pages/Editor/Explorer/helpers";
import {
@@ -14,7 +8,6 @@ import {
matchBuilderPath,
} from "constants/routes";
import { SAAS_EDITOR_API_ID_PATH } from "pages/Editor/SaaSEditor/constants";
-import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
export const getEntityInCurrentPath = (pathName: string) => {
const builderMatch = matchBuilderPath(pathName);
@@ -77,35 +70,3 @@ export const getEntityInCurrentPath = (pathName: string) => {
id: "",
};
};
-
-function* handleSelectWidget(action: ReduxAction<{ widgetId: string }>) {
- const builderMatch = matchBuilderPath(window.location.pathname);
- const { payload } = action;
- const selectedWidget = payload.widgetId;
- if (selectedWidget && selectedWidget !== MAIN_CONTAINER_WIDGET_ID)
- yield put(
- updateRecentEntity({
- type: "widget",
- id: selectedWidget,
- params: builderMatch?.params,
- }),
- );
-}
-
-function* handlePathUpdated(
- action: ReduxAction<{ location: typeof window.location }>,
-) {
- const { id, params, type } = getEntityInCurrentPath(
- action.payload.location.pathname,
- );
- if (type && id && id.indexOf(":") === -1) {
- yield put(updateRecentEntity({ type, id, params }));
- }
-}
-
-export default function* recentEntitiesSagas() {
- yield all([
- takeLatest(ReduxActionTypes.SELECT_WIDGET_INIT, handleSelectWidget),
- takeLatest(ReduxActionTypes.HANDLE_PATH_UPDATED, handlePathUpdated),
- ]);
-}
diff --git a/app/client/src/sagas/ThemeSaga.tsx b/app/client/src/sagas/ThemeSaga.tsx
index 42e299825694..2b74f6325cd7 100644
--- a/app/client/src/sagas/ThemeSaga.tsx
+++ b/app/client/src/sagas/ThemeSaga.tsx
@@ -2,11 +2,32 @@ import {
ReduxActionTypes,
ReduxAction,
} from "@appsmith/constants/ReduxActionConstants";
-import { takeLatest } from "redux-saga/effects";
+import { select, takeLatest } from "redux-saga/effects";
import localStorage from "utils/localStorage";
-import { ThemeMode } from "selectors/themeSelectors";
+import { getCurrentThemeDetails, ThemeMode } from "selectors/themeSelectors";
+import { trimTrailingSlash } from "utils/helpers";
+
+export type BackgroundTheme = {
+ colors: { homepageBackground: string; appBackground: string };
+};
+
+export function changeAppBackground(currentTheme: BackgroundTheme) {
+ if (
+ trimTrailingSlash(window.location.pathname) === "/applications" ||
+ window.location.pathname.indexOf("/settings/") !== -1 ||
+ trimTrailingSlash(window.location.pathname) === "/profile" ||
+ trimTrailingSlash(window.location.pathname) === "/signup-success"
+ ) {
+ document.body.style.backgroundColor =
+ currentTheme.colors.homepageBackground;
+ } else {
+ document.body.style.backgroundColor = currentTheme.colors.appBackground;
+ }
+}
export function* setThemeSaga(actionPayload: ReduxAction<ThemeMode>) {
+ const theme: BackgroundTheme = yield select(getCurrentThemeDetails);
+ changeAppBackground(theme);
yield localStorage.setItem("THEME", actionPayload.payload);
}
diff --git a/app/client/src/selectors/editorContextSelectors.ts b/app/client/src/selectors/editorContextSelectors.ts
index cb795dbcd02a..9c9a09c10fed 100644
--- a/app/client/src/selectors/editorContextSelectors.ts
+++ b/app/client/src/selectors/editorContextSelectors.ts
@@ -78,10 +78,7 @@ export const getIsCodeEditorFocused = createSelector(
featureFlags: FeatureFlags,
key: string | undefined,
): boolean => {
- if (featureFlags.CONTEXT_SWITCHING) {
- return !!(key && focusableField === key);
- }
- return false;
+ return !!(key && focusableField === key);
},
);
diff --git a/app/client/src/selectors/navigationSelectors.ts b/app/client/src/selectors/navigationSelectors.ts
index a4080c5a4ef2..e5694bcd6527 100644
--- a/app/client/src/selectors/navigationSelectors.ts
+++ b/app/client/src/selectors/navigationSelectors.ts
@@ -12,7 +12,7 @@ import { builderURL, jsCollectionIdURL } from "RouteBuilder";
export type EntityNavigationData = Record<
string,
- { name: string; id: string; type: ENTITY_TYPE; url: string | undefined }
+ { name: string; id: string; type: ENTITY_TYPE; url: string }
>;
export const getEntitiesForNavigation = createSelector(
@@ -29,11 +29,12 @@ export const getEntitiesForNavigation = createSelector(
(plugin) => plugin.id === action.config.pluginId,
);
const config = getActionConfig(action.config.pluginType);
+ if (!config) return;
navigationData[action.config.name] = {
name: action.config.name,
id: action.config.id,
type: ENTITY_TYPE.ACTION,
- url: config?.getURL(
+ url: config.getURL(
pageId,
action.config.id,
action.config.pluginType,
diff --git a/app/client/src/utils/history.ts b/app/client/src/utils/history.ts
index 758bfe539854..2a5678ff76db 100644
--- a/app/client/src/utils/history.ts
+++ b/app/client/src/utils/history.ts
@@ -1,7 +1,17 @@
// Leaving this require here. Importing causes type mismatches which have not been resolved by including the typings or any other means. Ref: https://github.com/remix-run/history/issues/802
const createHistory = require("history").createBrowserHistory;
-export default createHistory();
+import { History } from "history";
+
+const history: History<AppsmithLocationState> = createHistory();
+export default history;
+
+export enum NavigationMethod {
+ CommandClick = "CommandClick",
+ EntityExplorer = "EntityExplorer",
+ Omnibar = "Omnibar",
+ Debugger = "Debugger",
+}
export type AppsmithLocationState = {
- directNavigation?: boolean;
+ invokedBy?: NavigationMethod;
};
diff --git a/app/client/src/utils/storage.ts b/app/client/src/utils/storage.ts
index 2848c2494aad..55522189dde7 100644
--- a/app/client/src/utils/storage.ts
+++ b/app/client/src/utils/storage.ts
@@ -113,8 +113,7 @@ export const setPostWelcomeTourState = async (flag: boolean) => {
export const getPostWelcomeTourState = async () => {
try {
- const onboardingState = await store.getItem(STORAGE_KEYS.POST_WELCOME_TOUR);
- return onboardingState;
+ return await store.getItem(STORAGE_KEYS.POST_WELCOME_TOUR);
} catch (error) {
log.error("An error occurred when getting post welcome tour state", error);
}
|
f3afa81afeb300e0952fd3770acd23a9ca9ed7f1
|
2021-09-24 19:19:59
|
arunvjn
|
fix: copy snippet (#7769)
| false
|
copy snippet (#7769)
|
fix
|
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx b/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx
index 5e4c76c68a16..1c35274d3cf5 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx
@@ -33,6 +33,7 @@ import { Snippet, SnippetArgument } from "./utils";
import {
createMessage,
SNIPPET_COPY,
+ SNIPPET_EXECUTE,
SNIPPET_INSERT,
} from "constants/messages";
import { getExpectedValue } from "utils/validation/common";
@@ -155,7 +156,7 @@ const SnippetContainer = styled.div`
`;
const removeDynamicBinding = (value: string) => {
- const regex = /{{(.*?)}}/g;
+ const regex = /{{([\s\S]*?)}}/g;
return value.replace(regex, function(match, capture) {
return capture;
});
@@ -312,7 +313,9 @@ export default function SnippetDescription({ item }: { item: Snippet }) {
{getSnippet(template, selectedArgs)}
</SyntaxHighlighter>
<div className="action-icons">
- <CopyIcon onClick={() => handleCopy(getSnippet(snippet, {}))} />
+ <CopyIcon
+ onClick={() => handleCopy(getSnippet(template, selectedArgs))}
+ />
</div>
</div>
<div className="snippet-group">
@@ -346,7 +349,7 @@ export default function SnippetDescription({ item }: { item: Snippet }) {
<div className="actions-container">
{language === "javascript" && (
<Button
- className="t--apiFormRunBtn"
+ className="t--apiFormRunBtn snippet-execute"
disabled={executionInProgress}
onClick={handleRun}
size={Size.medium}
@@ -380,13 +383,15 @@ export default function SnippetDescription({ item }: { item: Snippet }) {
<SnippetContainer>
<div className="snippet-title">
<span>{title}</span>
- {selectedIndex === 0 && (
- <span className="action-msg">
- {createMessage(
- onEnter === SnippetAction.INSERT ? SNIPPET_INSERT : SNIPPET_COPY,
- )}
- </span>
- )}
+ <span className="action-msg">
+ {createMessage(
+ selectedIndex === 0
+ ? onEnter === SnippetAction.INSERT
+ ? SNIPPET_INSERT
+ : SNIPPET_COPY
+ : SNIPPET_EXECUTE,
+ )}
+ </span>
</div>
<div className="snippet-desc">{summary}</div>
<TabbedViewContainer className="tab-container">
diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
index 6ee88e97e9f8..3a593baf9d0b 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
@@ -484,6 +484,12 @@ function GlobalSearch() {
const handleSnippetClick = (event: SelectEvent, item: any) => {
if (event && event.type === "click") return;
+ const snippetExecuteBtn = document.querySelector(
+ ".snippet-execute",
+ ) as HTMLButtonElement;
+ if (snippetExecuteBtn && !snippetExecuteBtn.disabled) {
+ return snippetExecuteBtn && snippetExecuteBtn.click();
+ }
if (onEnterSnippet === SnippetAction.INSERT) {
dispatch(insertSnippet(get(item, "body.snippet", "")));
} else {
diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts
index ed07cff4b4e6..f9a5a68d296a 100644
--- a/app/client/src/constants/messages.ts
+++ b/app/client/src/constants/messages.ts
@@ -496,6 +496,7 @@ export const SNIPPET_EXECUTION_FAILED = () => `Snippet execution failed.`;
export const SNIPPET_INSERT = () => `Hit ⏎ to insert`;
export const SNIPPET_COPY = () => `Hit ⏎ to copy`;
+export const SNIPPET_EXECUTE = () => `Hit ⏎ to run`;
export const APPLY_SEARCH_CATEGORY = () => `⏎ Jump`;
// Git sync
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 309e20f229de..055d308d8e27 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -5,6 +5,7 @@ import {
put,
select,
take,
+ all,
} from "redux-saga/effects";
import {
@@ -55,7 +56,7 @@ import {
} from "./ReplaySaga";
import { updateAndSaveLayout } from "actions/pageActions";
-import { get } from "lodash";
+import { get, isUndefined } from "lodash";
import {
setEvaluatedArgument,
setEvaluatedSnippet,
@@ -382,41 +383,49 @@ export function* evaluateSnippetSaga(action: any) {
if (isTrigger) {
expression = `function() { ${expression} }`;
}
- const workerResponse = yield call(
- worker.request,
- EVAL_WORKER_ACTIONS.EVAL_EXPRESSION,
- {
- expression,
- dataType,
- isTrigger,
- },
- );
+ const workerResponse: {
+ errors: any;
+ result: any;
+ triggers: any;
+ } = yield call(worker.request, EVAL_WORKER_ACTIONS.EVAL_EXPRESSION, {
+ expression,
+ dataType,
+ isTrigger,
+ });
const { errors, result, triggers } = workerResponse;
if (triggers && triggers.length > 0) {
- yield call(
- executeActionTriggers,
- triggers[0],
- EventType.ON_SNIPPET_EXECUTE,
- {},
+ yield all(
+ triggers.map((trigger: any) =>
+ call(
+ executeActionTriggers,
+ trigger,
+ EventType.ON_SNIPPET_EXECUTE,
+ {},
+ ),
+ ),
);
+ //Result is when trigger is present. Following code will hide the evaluated snippet section
+ yield put(setEvaluatedSnippet(result));
} else {
+ /*
+ JSON.stringify(undefined) is undefined.
+ We need to set it manually to "undefined" for codeEditor to display it.
+ */
yield put(
setEvaluatedSnippet(
- result
- ? JSON.stringify(result, null, 2)
- : errors && errors.length
+ errors?.length
? JSON.stringify(errors, null, 2)
- : "",
+ : isUndefined(result)
+ ? "undefined"
+ : JSON.stringify(result),
),
);
}
Toaster.show({
text: createMessage(
- result || triggers
- ? SNIPPET_EXECUTION_SUCCESS
- : SNIPPET_EXECUTION_FAILED,
+ errors?.length ? SNIPPET_EXECUTION_FAILED : SNIPPET_EXECUTION_SUCCESS,
),
- variant: result || triggers ? Variant.success : Variant.danger,
+ variant: errors?.length ? Variant.danger : Variant.success,
});
yield put(
setGlobalSearchFilterContext({
@@ -429,6 +438,10 @@ export function* evaluateSnippetSaga(action: any) {
executionInProgress: false,
}),
);
+ Toaster.show({
+ text: createMessage(SNIPPET_EXECUTION_FAILED),
+ variant: Variant.danger,
+ });
log.error(e);
Sentry.captureException(e);
}
|
72dd22d49032672cad61509edc07a69b065a9d2c
|
2021-10-08 18:57:16
|
Nayan
|
fix: added a check to address NPE in home page when user has no organization (#8259)
| false
|
added a check to address NPE in home page when user has no organization (#8259)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
index f36621a00420..155b28cec3e7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcher.java
@@ -70,11 +70,18 @@ public Mono<UserHomepageDTO> getAllApplications() {
User user = userAndUserDataTuple.getT1();
UserData userData = userAndUserDataTuple.getT2();
+ UserHomepageDTO userHomepageDTO = new UserHomepageDTO();
+ userHomepageDTO.setUser(user);
+
Set<String> orgIds = user.getOrganizationIds();
+ if(CollectionUtils.isEmpty(orgIds)) {
+ userHomepageDTO.setOrganizationApplications(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<>(orgIds.size());
+ Set<String> orgIdSortedSet = new LinkedHashSet<>();
if(recentlyUsedOrgIds != null && recentlyUsedOrgIds.size() > 0) {
// user has a recently used list, add them to the beginning
orgIdSortedSet.addAll(recentlyUsedOrgIds);
@@ -86,9 +93,6 @@ public Mono<UserHomepageDTO> getAllApplications() {
.findByMultipleOrganizationIds(orgIds, READ_APPLICATIONS)
.collectMultimap(Application::getOrganizationId, Function.identity());
- UserHomepageDTO userHomepageDTO = new UserHomepageDTO();
- userHomepageDTO.setUser(user);
-
return organizationService
.findByIdsIn(orgIds, READ_ORGANIZATIONS)
.collectMap(Organization::getId, v -> v)
|
d74f0fe9f373aae9b11514afa2763b9005e06dcf
|
2023-12-21 14:33:30
|
Pawan Kumar
|
chore: move orientation and label position to content tab" (#29737)
| false
|
move orientation and label position to content tab" (#29737)
|
chore
|
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
index f550f4f9c90d..f83d9883acad 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
@@ -14,7 +14,7 @@ export const defaultsConfig = {
isDisabled: false,
isRequired: false,
isVisible: true,
- labelPosition: "left",
+ labelPosition: "right",
label: "Label",
orientation: "vertical",
version: 1,
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
index 7a21deaeb29b..e18ef286c177 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -67,6 +67,42 @@ export const propertyPaneContentConfig = [
},
},
},
+ {
+ helpText: "Controls widget orientation",
+ propertyName: "orientation",
+ label: "Orientation",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ {
+ label: "Horizontal",
+ value: "horizontal",
+ },
+ {
+ label: "Vertical",
+ value: "vertical",
+ },
+ ],
+ defaultValue: "vertical",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ {
+ helpText: "Sets the label position of the widget",
+ propertyName: "labelPosition",
+ label: "Options Label Position",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ { label: "Left", value: "left" },
+ { label: "Right", value: "right" },
+ ],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ defaultValue: "right",
+ },
],
},
{
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts
index 4273f741257f..7f43d3bde57a 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts
@@ -1,2 +1 @@
export { propertyPaneContentConfig } from "./contentConfig";
-export { propertyPaneStyleConfig } from "./styleConfig";
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/styleConfig.ts
deleted file mode 100644
index f51dfe0f3284..000000000000
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/styleConfig.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ValidationTypes } from "constants/WidgetValidation";
-
-export const propertyPaneStyleConfig = [
- {
- sectionName: "General",
- children: [
- {
- helpText: "Controls widget orientation",
- propertyName: "orientation",
- label: "Orientation",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- {
- label: "Horizontal",
- value: "horizontal",
- },
- {
- label: "Vertical",
- value: "vertical",
- },
- ],
- defaultValue: "vertical",
- isBindProperty: true,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- },
- {
- helpText: "Sets the label position of the widget",
- propertyName: "labelPosition",
- label: "Options Label Position",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- { label: "Left", value: "left" },
- { label: "Right", value: "right" },
- ],
- isBindProperty: false,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- defaultValue: "right",
- },
- ],
- },
-];
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx
index fa1eebd59018..7d44bb928529 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx
@@ -15,7 +15,6 @@ import {
featuresConfig,
metaConfig,
propertyPaneContentConfig,
- propertyPaneStyleConfig,
settersConfig,
} from "./../config";
import { validateInput } from "./helpers";
@@ -60,7 +59,7 @@ class WDSCheckboxGroupWidget extends BaseWidget<
}
static getPropertyPaneStyleConfig() {
- return propertyPaneStyleConfig;
+ return [];
}
static getDefaultPropertiesMap(): Record<string, string> {
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/defaultsConfig.ts
index 661c937064e1..7c68ac3317a4 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/defaultsConfig.ts
@@ -6,7 +6,7 @@ export const defaultsConfig = {
columns: 20,
animateLoading: true,
label: "Label",
- labelPosition: "left",
+ labelPosition: "right",
options: [
{ label: "Yes", value: "Y" },
{ label: "No", value: "N" },
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/contentConfig.ts
index f5c93aeec5b2..9194172e6367 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/contentConfig.ts
@@ -57,6 +57,42 @@ export const propertyPaneContentConfig = [
},
},
},
+ {
+ helpText: "Controls widget orientation",
+ propertyName: "orientation",
+ label: "Orientation",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ {
+ label: "Horizontal",
+ value: "horizontal",
+ },
+ {
+ label: "Vertical",
+ value: "vertical",
+ },
+ ],
+ defaultValue: "vertical",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ {
+ helpText: "Sets the label position of the widget",
+ propertyName: "labelPosition",
+ label: "Options Label Position",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ { label: "Left", value: "left" },
+ { label: "Right", value: "right" },
+ ],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ defaultValue: "right",
+ },
],
},
{
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/index.ts
index 4273f741257f..7f43d3bde57a 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/index.ts
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/index.ts
@@ -1,2 +1 @@
export { propertyPaneContentConfig } from "./contentConfig";
-export { propertyPaneStyleConfig } from "./styleConfig";
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/styleConfig.ts
deleted file mode 100644
index f51dfe0f3284..000000000000
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/config/propertyPaneConfig/styleConfig.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ValidationTypes } from "constants/WidgetValidation";
-
-export const propertyPaneStyleConfig = [
- {
- sectionName: "General",
- children: [
- {
- helpText: "Controls widget orientation",
- propertyName: "orientation",
- label: "Orientation",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- {
- label: "Horizontal",
- value: "horizontal",
- },
- {
- label: "Vertical",
- value: "vertical",
- },
- ],
- defaultValue: "vertical",
- isBindProperty: true,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- },
- {
- helpText: "Sets the label position of the widget",
- propertyName: "labelPosition",
- label: "Options Label Position",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- { label: "Left", value: "left" },
- { label: "Right", value: "right" },
- ],
- isBindProperty: false,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- defaultValue: "right",
- },
- ],
- },
-];
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx
index 72fb4faddc05..19bb5cc86a0b 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx
@@ -18,7 +18,6 @@ import {
metaConfig,
methodsConfig,
propertyPaneContentConfig,
- propertyPaneStyleConfig,
settersConfig,
} from "./config";
import { validateInput } from "./helpers";
@@ -63,7 +62,7 @@ class WDSRadioGroupWidget extends BaseWidget<
}
static getPropertyPaneStyleConfig() {
- return propertyPaneStyleConfig;
+ return [];
}
static getDerivedPropertiesMap() {
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
index 5228ed18f931..748e803a602f 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
@@ -14,7 +14,7 @@ export const defaultsConfig = {
isDisabled: false,
isRequired: false,
isVisible: true,
- labelPosition: "left",
+ labelPosition: "right",
label: "Label",
orientation: "vertical",
version: 1,
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
index 37d5aeb971d4..88b54b0313c7 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -67,6 +67,42 @@ export const propertyPaneContentConfig = [
},
},
},
+ {
+ helpText: "Controls widget orientation",
+ propertyName: "orientation",
+ label: "Orientation",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ {
+ label: "Horizontal",
+ value: "horizontal",
+ },
+ {
+ label: "Vertical",
+ value: "vertical",
+ },
+ ],
+ defaultValue: "vertical",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ {
+ helpText: "Sets the label position of the widget",
+ propertyName: "labelPosition",
+ label: "Options Label Position",
+ controlType: "ICON_TABS",
+ fullWidth: true,
+ options: [
+ { label: "Left", value: "left" },
+ { label: "Right", value: "right" },
+ ],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ defaultValue: "right",
+ },
],
},
{
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts
index 4273f741257f..7f43d3bde57a 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts
@@ -1,2 +1 @@
export { propertyPaneContentConfig } from "./contentConfig";
-export { propertyPaneStyleConfig } from "./styleConfig";
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/styleConfig.ts
deleted file mode 100644
index f51dfe0f3284..000000000000
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/styleConfig.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ValidationTypes } from "constants/WidgetValidation";
-
-export const propertyPaneStyleConfig = [
- {
- sectionName: "General",
- children: [
- {
- helpText: "Controls widget orientation",
- propertyName: "orientation",
- label: "Orientation",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- {
- label: "Horizontal",
- value: "horizontal",
- },
- {
- label: "Vertical",
- value: "vertical",
- },
- ],
- defaultValue: "vertical",
- isBindProperty: true,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- },
- {
- helpText: "Sets the label position of the widget",
- propertyName: "labelPosition",
- label: "Options Label Position",
- controlType: "ICON_TABS",
- fullWidth: true,
- options: [
- { label: "Left", value: "left" },
- { label: "Right", value: "right" },
- ],
- isBindProperty: false,
- isTriggerProperty: false,
- validation: { type: ValidationTypes.TEXT },
- defaultValue: "right",
- },
- ],
- },
-];
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx
index 2479041074e1..0ecf509addea 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx
@@ -15,7 +15,6 @@ import {
featuresConfig,
metaConfig,
propertyPaneContentConfig,
- propertyPaneStyleConfig,
settersConfig,
} from "./../config";
import { validateInput } from "./helpers";
@@ -60,7 +59,7 @@ class WDSSwitchGroupWidget extends BaseWidget<
}
static getPropertyPaneStyleConfig() {
- return propertyPaneStyleConfig;
+ return [];
}
static getDefaultPropertiesMap(): Record<string, string> {
|
fe7e4e82168bf7b75530aedb98f990bfbf655643
|
2024-02-01 13:45:28
|
Rudraprasad Das
|
fix: allowing custom username is git url validation (#30738)
| false
|
allowing custom username is git url validation (#30738)
|
fix
|
diff --git a/app/client/src/pages/Editor/gitSync/utils.test.ts b/app/client/src/pages/Editor/gitSync/utils.test.ts
index dce39bd59826..d3921224eeac 100644
--- a/app/client/src/pages/Editor/gitSync/utils.test.ts
+++ b/app/client/src/pages/Editor/gitSync/utils.test.ts
@@ -31,6 +31,8 @@ const validUrls = [
"git@gitlab__abcd.test.org:org__org/repoName.git",
"[email protected]:v3/something/with%20space%20(some)/geo-mantis",
"[email protected]:v3/something/with%20space%20some/geo-mantis",
+ "[email protected]:path/to/repo.git",
+ "[email protected]:org_name/repository_name.git",
];
const invalidUrls = [
@@ -62,7 +64,6 @@ const invalidUrls = [
"host.xz:/path/to/repo.git/",
"[email protected]:~user/path/to/repo.git/",
"host.xz:~user/path/to/repo.git/",
- "[email protected]:path/to/repo.git",
"host.xz:path/to/repo.git",
"rsync://host.xz/path/to/repo.git/",
];
diff --git a/app/client/src/pages/Editor/gitSync/utils.ts b/app/client/src/pages/Editor/gitSync/utils.ts
index 7bcdbde49467..9f730102b250 100644
--- a/app/client/src/pages/Editor/gitSync/utils.ts
+++ b/app/client/src/pages/Editor/gitSync/utils.ts
@@ -19,7 +19,7 @@ export const getIsStartingWithRemoteBranches = (
};
const GIT_REMOTE_URL_PATTERN =
- /^((git|ssh)|(git@[\w\-\.]+))(:(\/\/)?)([\w\.@\:\/\-~\(\)%]+)[^\/]$/im;
+ /^((git|ssh)|([\w\-\.]+@[\w\-\.]+))(:(\/\/)?)([\w\.@\:\/\-~\(\)%]+)[^\/]$/im;
const gitRemoteUrlRegExp = new RegExp(GIT_REMOTE_URL_PATTERN);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
index 1e5478765a84..d03a87a6ea13 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
@@ -49,11 +49,11 @@ public static String convertSshUrlToBrowserSupportedUrl(String sshUrl) {
public static String getRepoName(String remoteUrl) {
// Pattern to match git SSH URL
final Matcher matcher = Pattern.compile(
- "((git|ssh|http(s)?)|(git@[\\w\\-\\.]+))(:(\\/\\/)?)([\\w.@:/\\-~]+)(\\.git|)(\\/)?")
+ "((git|ssh)|([\\w\\-\\.]+@[\\w\\-\\.]+))(:(\\/\\/)?)([\\w.@:\\/\\-~\\(\\)\\%]+)(\\.git|)(\\/)?")
.matcher(remoteUrl);
if (matcher.find()) {
// To trim the postfix and prefix
- return matcher.group(7).replaceFirst("\\.git$", "").replaceFirst("^(.*[\\\\\\/])", "");
+ return matcher.group(6).replaceFirst("\\.git$", "").replaceFirst("^(.*[\\\\\\/])", "");
}
throw new AppsmithException(
AppsmithError.INVALID_GIT_CONFIGURATION,
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 5c1050b18c70..b67c8d5a22ee 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
@@ -3,6 +3,7 @@
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.AutoCommitConfig;
import com.appsmith.server.domains.GitApplicationMetadata;
+import com.appsmith.server.exceptions.AppsmithException;
import net.minidev.json.JSONObject;
import org.junit.jupiter.api.Test;
import reactor.test.StepVerifier;
@@ -13,6 +14,7 @@
import static com.appsmith.server.helpers.GitUtils.isDefaultBranchedApplication;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class GitUtilsTest {
@@ -65,7 +67,7 @@ public void isRepoPrivate() {
}
@Test
- public void getRepoName() {
+ public void getRepoName_WhenUrlIsValid_RepoNameReturned() {
assertThat(GitUtils.getRepoName("[email protected]:user/test/tests/lakechope.git"))
.isEqualTo("lakechope");
assertThat(GitUtils.getRepoName("[email protected]:test/ParkMyrtlows.git"))
@@ -78,6 +80,68 @@ public void getRepoName() {
.isEqualTo("SpaceJunk");
assertThat(GitUtils.getRepoName("[email protected]:org_org/testNewRepo.git"))
.isEqualTo("testNewRepo");
+
+ assertThat(GitUtils.getRepoName("[email protected]:user/project.git")).isEqualTo("project");
+ assertThat(GitUtils.getRepoName("git://a@b:c/d.git")).isEqualTo("d");
+ assertThat(GitUtils.getRepoName("[email protected]:user/project.git")).isEqualTo("project");
+ assertThat(GitUtils.getRepoName("ssh://[email protected]:port/path/to/repo.git"))
+ .isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://[email protected]/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://host.xz:port/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://host.xz/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://[email protected]/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://host.xz/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://[email protected]/~user/path/to/repo.git"))
+ .isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://host.xz/~user/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://[email protected]/~/path/to/repo.git"))
+ .isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("ssh://host.xz/~/path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("[email protected]:v3/something/other/thing.git"))
+ .isEqualTo("thing");
+ assertThat(GitUtils.getRepoName("[email protected]:v3/something/other/(thing).git"))
+ .isEqualTo("(thing)");
+ assertThat(GitUtils.getRepoName("[email protected]:v3/(((something)/(other)/(thing).git"))
+ .isEqualTo("(thing)");
+ assertThat(GitUtils.getRepoName("[email protected]:org__v3/(((something)/(other)/(thing).git"))
+ .isEqualTo("(thing)");
+ assertThat(GitUtils.getRepoName("[email protected]:org__org/repoName.git"))
+ .isEqualTo("repoName");
+ assertThat(GitUtils.getRepoName("git@gitlab__abcd.test.org:org__org/repoName.git"))
+ .isEqualTo("repoName");
+ assertThat(GitUtils.getRepoName("[email protected]:v3/something/with%20space%20(some)/geo-mantis"))
+ .isEqualTo("geo-mantis");
+ assertThat(GitUtils.getRepoName("[email protected]:v3/something/with%20space%20some/geo-mantis"))
+ .isEqualTo("geo-mantis");
+ assertThat(GitUtils.getRepoName("[email protected]:path/to/repo.git")).isEqualTo("repo");
+ assertThat(GitUtils.getRepoName("[email protected]:org_name/repository_name.git"))
+ .isEqualTo("repository_name");
+ }
+
+ @Test
+ public void getRepoName_WhenURLIsInvalid_ThrowsException() {
+ String[] invalidUrls = {
+ "https://github.com/user/project.git",
+ "http://github.com/user/project.git",
+ "https://192.168.101.127/user/project.git",
+ "http://192.168.101.127/user/project.git",
+ "[email protected].(com):v3/(((something)/(other)/(thing).git",
+ "http://host.xz/path/to/repo.git/",
+ "https://host.xz/path/to/repo.git/",
+ "/path/to/repo.git/",
+ "path/to/repo.git/",
+ "~/path/to/repo.git",
+ "file:///path/to/repo.git/",
+ "file://~/path/to/repo.git/",
+ "host.xz:/path/to/repo.git/",
+ "host.xz:~user/path/to/repo.git/",
+ "host.xz:path/to/repo.git",
+ "rsync://host.xz/path/to/repo.git/"
+ };
+
+ for (String url : invalidUrls) {
+ assertThrows(AppsmithException.class, () -> GitUtils.getRepoName(url), url + " is not invalid");
+ }
}
@Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
index 3ebd2543afd9..4b1049d8562d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
@@ -528,9 +528,8 @@ public void connectApplicationToGit_InvalidRemoteUrlHttp_ThrowInvalidRemoteUrl()
gitService.connectApplicationToGit(application1.getId(), gitConnectDTO, "baseUrl");
StepVerifier.create(applicationMono)
- .expectErrorMatches(throwable -> throwable instanceof AppsmithException
- && throwable.getMessage().equals(AppsmithError.INVALID_GIT_SSH_URL.getMessage()))
- .verify();
+ .verifyErrorMessage(AppsmithError.INVALID_GIT_CONFIGURATION.getMessage("Remote URL is incorrect, "
+ + "please add a URL in standard format. Example: [email protected]:username/reponame.git"));
}
@Test
|
005399e18acfa29ffac6ee5772a98d504a2b7e8a
|
2023-09-11 20:13:21
|
Nilansh Bansal
|
fix: welcome mail trigger (#27166)
| false
|
welcome mail trigger (#27166)
|
fix
|
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 cda058a1a753..134236016af9 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
@@ -248,9 +248,7 @@ private Mono<Void> formEmailVerificationRedirectionHandler(
if (TRUE.equals(isVerificationRequired)) {
return postVerificationRequiredHandler(webFilterExchange, user, null, FALSE);
} else {
- return userService
- .sendWelcomeEmail(user, originHeader)
- .then(redirectHelper.handleRedirect(webFilterExchange, null, false));
+ return redirectHelper.handleRedirect(webFilterExchange, null, false);
}
});
}
|
4f7fd1270eef5027303dcf05038c77d8a261a789
|
2024-10-16 12:49:37
|
Ankita Kinger
|
fix: Updating the permission check for run button in response pane (#36893)
| false
|
Updating the permission check for run button in response pane (#36893)
|
fix
|
diff --git a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
index 4b8f04d18a50..5f6c1748462f 100644
--- a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
+++ b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
@@ -149,6 +149,7 @@ function usePluginActionResponseTabs() {
actionName={action.name}
actionSource={actionSource}
currentActionConfig={action}
+ isRunDisabled={blockExecution}
isRunning={isRunning}
onRunClick={onRunClick}
runErrorMessage={""} // TODO
diff --git a/app/client/src/components/editorComponents/ApiResponseView.test.tsx b/app/client/src/components/editorComponents/ApiResponseView.test.tsx
index b440e9a409c2..189f6beaa306 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.test.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.test.tsx
@@ -81,7 +81,7 @@ describe("ApiResponseView", () => {
<Router>
<ApiResponseView
currentActionConfig={Api1}
- disabled={false}
+ isRunDisabled={false}
isRunning={false}
onRunClick={noop}
/>
diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx
index e459b509c033..8bf6a400adb4 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.tsx
@@ -33,7 +33,7 @@ import { ApiResponseHeaders } from "PluginActionEditor/components/PluginActionRe
interface Props {
currentActionConfig: Action;
theme?: EditorTheme;
- disabled: boolean;
+ isRunDisabled: boolean;
onRunClick: () => void;
actionResponse?: ActionResponse;
isRunning: boolean;
@@ -43,7 +43,7 @@ function ApiResponseView(props: Props) {
const {
actionResponse = EMPTY_RESPONSE,
currentActionConfig,
- disabled,
+ isRunDisabled = false,
isRunning,
theme = EditorTheme.LIGHT,
} = props;
@@ -99,7 +99,7 @@ function ApiResponseView(props: Props) {
<ApiResponse
action={currentActionConfig}
actionResponse={actionResponse}
- isRunDisabled={disabled}
+ isRunDisabled={isRunDisabled}
isRunning={isRunning}
onRunClick={onRunClick}
responseTabHeight={responseTabHeight}
@@ -113,7 +113,7 @@ function ApiResponseView(props: Props) {
panelComponent: (
<ApiResponseHeaders
actionResponse={actionResponse}
- isRunDisabled={disabled}
+ isRunDisabled={isRunDisabled}
isRunning={isRunning}
onDebugClick={onDebugClick}
onRunClick={onRunClick}
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index 80a1748ad0c7..43385e0143fe 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -341,7 +341,7 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
<ApiResponseView
actionResponse={actionResponse}
currentActionConfig={currentActionConfig}
- disabled={!isExecutePermitted}
+ isRunDisabled={blockExecution}
isRunning={isRunning}
onRunClick={onRunClick}
theme={theme}
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index 02650c405a68..d68a3989431b 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -21,7 +21,7 @@ import ActionRightPane from "components/editorComponents/ActionRightPane";
import type { ActionResponse } from "api/ActionAPI";
import type { Plugin } from "api/PluginApi";
import type { UIComponentTypes } from "api/PluginApi";
-import { EDITOR_TABS } from "constants/QueryEditorConstants";
+import { EDITOR_TABS, SQL_DATASOURCES } from "constants/QueryEditorConstants";
import type { FormEvalOutput } from "reducers/evaluationReducers/formEvaluationReducer";
import {
getPluginActionConfigSelectedTab,
@@ -37,6 +37,10 @@ import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
import FormRender from "./FormRender";
import QueryEditorHeader from "./QueryEditorHeader";
import RunHistory from "ee/components/RunHistory";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { getPluginNameFromId } from "ee/selectors/entitiesSelector";
const QueryFormContainer = styled.form`
flex: 1;
@@ -241,6 +245,35 @@ export function EditorJSONtoForm(props: Props) {
[dispatch],
);
+ const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+ const isExecutePermitted = getHasExecuteActionPermission(
+ isFeatureEnabled,
+ currentActionConfig?.userPermissions,
+ );
+
+ // get the current action's plugin name
+ const currentActionPluginName = useSelector((state: AppState) =>
+ getPluginNameFromId(state, currentActionConfig?.pluginId || ""),
+ );
+
+ let actionBody = "";
+
+ if (!!currentActionConfig?.actionConfiguration) {
+ if ("formData" in currentActionConfig?.actionConfiguration) {
+ // if the action has a formData (the action is postUQI e.g. Oracle)
+ actionBody =
+ currentActionConfig.actionConfiguration.formData?.body?.data || "";
+ } else {
+ // if the action is pre UQI, the path is different e.g. mySQL
+ actionBody = currentActionConfig.actionConfiguration?.body || "";
+ }
+ }
+
+ // if (the body is empty and the action is an sql datasource) or the user does not have permission, block action execution.
+ const blockExecution =
+ (!actionBody && SQL_DATASOURCES.includes(currentActionPluginName)) ||
+ !isExecutePermitted;
+
// 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.
if (!props.initialized) {
@@ -252,6 +285,7 @@ export function EditorJSONtoForm(props: Props) {
<QueryEditorHeader
dataSources={dataSources}
formName={formName}
+ isRunDisabled={blockExecution}
isRunning={isRunning}
onCreateDatasourceClick={onCreateDatasourceClick}
onRunClick={onRunClick}
@@ -334,6 +368,7 @@ export function EditorJSONtoForm(props: Props) {
actionResponse={actionResponse}
actionSource={actionSource}
currentActionConfig={currentActionConfig}
+ isRunDisabled={blockExecution}
isRunning={isRunning}
onRunClick={onRunClick}
runErrorMessage={runErrorMessage}
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index f3b66675e773..5e3b7ae6fe5e 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -46,6 +46,7 @@ const ResultsCount = styled.div`
interface QueryDebuggerTabsProps {
actionSource: SourceEntity;
currentActionConfig?: Action;
+ isRunDisabled?: boolean;
isRunning: boolean;
actionName: string; // Check what and how to get
runErrorMessage?: string;
@@ -59,6 +60,7 @@ function QueryDebuggerTabs({
actionResponse,
actionSource,
currentActionConfig,
+ isRunDisabled = false,
isRunning,
onRunClick,
runErrorMessage,
@@ -233,6 +235,7 @@ function QueryDebuggerTabs({
actionName={actionName}
actionSource={actionSource}
currentActionConfig={currentActionConfig}
+ isRunDisabled={isRunDisabled}
isRunning={isRunning}
onRunClick={onRunClick}
runErrorMessage={runErrorMessage}
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
index 38f9a9b3d72e..de9050cc7132 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx
@@ -5,22 +5,14 @@ import { StyledFormRow } from "./EditorJSONtoForm";
import styled from "styled-components";
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import {
- getHasExecuteActionPermission,
- getHasManageActionPermission,
-} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
import { useSelector } from "react-redux";
-import {
- getActionByBaseId,
- getPlugin,
- getPluginNameFromId,
-} from "ee/selectors/entitiesSelector";
+import { getActionByBaseId, getPlugin } from "ee/selectors/entitiesSelector";
import { QueryEditorContext } from "./QueryEditorContext";
import type { Plugin } from "api/PluginApi";
import type { Datasource } from "entities/Datasource";
import type { AppState } from "ee/reducers";
-import { SQL_DATASOURCES } from "constants/QueryEditorConstants";
import DatasourceSelector from "./DatasourceSelector";
import { getSavingStatusForActionName } from "selectors/actionSelectors";
import { getAssetUrl } from "ee/utils/airgapHelpers";
@@ -51,6 +43,7 @@ interface Props {
formName: string;
dataSources: Datasource[];
onCreateDatasourceClick: () => void;
+ isRunDisabled?: boolean;
isRunning: boolean;
onRunClick: () => void;
}
@@ -59,6 +52,7 @@ const QueryEditorHeader = (props: Props) => {
const {
dataSources,
formName,
+ isRunDisabled = false,
isRunning,
onCreateDatasourceClick,
onRunClick,
@@ -78,11 +72,6 @@ const QueryEditorHeader = (props: Props) => {
currentActionConfig?.userPermissions,
);
- const isExecutePermitted = getHasExecuteActionPermission(
- isFeatureEnabled,
- currentActionConfig?.userPermissions,
- );
-
const currentPlugin = useSelector((state: AppState) =>
getPlugin(state, currentActionConfig?.pluginId || ""),
);
@@ -95,29 +84,6 @@ const QueryEditorHeader = (props: Props) => {
const icon = ActionUrlIcon(iconUrl);
- // get the current action's plugin name
- const currentActionPluginName = useSelector((state: AppState) =>
- getPluginNameFromId(state, currentActionConfig?.pluginId || ""),
- );
-
- let actionBody = "";
-
- if (!!currentActionConfig?.actionConfiguration) {
- if ("formData" in currentActionConfig?.actionConfiguration) {
- // if the action has a formData (the action is postUQI e.g. Oracle)
- actionBody =
- currentActionConfig.actionConfiguration.formData?.body?.data || "";
- } else {
- // if the action is pre UQI, the path is different e.g. mySQL
- actionBody = currentActionConfig.actionConfiguration?.body || "";
- }
- }
-
- // if (the body is empty and the action is an sql datasource) or the user does not have permission, block action execution.
- const blockExecution =
- (!actionBody && SQL_DATASOURCES.includes(currentActionPluginName)) ||
- !isExecutePermitted;
-
return (
<StyledFormRow>
<NameWrapper>
@@ -141,7 +107,7 @@ const QueryEditorHeader = (props: Props) => {
<Button
className="t--run-query"
data-guided-tour-iid="run-query"
- isDisabled={blockExecution}
+ isDisabled={isRunDisabled}
isLoading={isRunning}
onClick={onRunClick}
size="md"
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
index a60834e8f1bf..97ecdfa432a2 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
@@ -28,9 +28,6 @@ import type { SourceEntity } from "entities/AppsmithConsole";
import type { Action } from "entities/Action";
import { getActionData } from "ee/selectors/entitiesSelector";
import { actionResponseDisplayDataFormats } from "../utils";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getHasExecuteActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
import { getErrorAsString } from "sagas/ActionExecution/errorUtils";
import { isString } from "lodash";
import ActionExecutionInProgressView from "components/editorComponents/ActionExecutionInProgressView";
@@ -72,6 +69,7 @@ const ResponseContentWrapper = styled.div<{ isError: boolean }>`
interface Props {
actionSource: SourceEntity;
+ isRunDisabled?: boolean;
isRunning: boolean;
onRunClick: () => void;
currentActionConfig: Action;
@@ -84,19 +82,13 @@ const QueryResponseTab = (props: Props) => {
actionName,
actionSource,
currentActionConfig,
+ isRunDisabled = false,
isRunning,
onRunClick,
runErrorMessage,
} = props;
const dispatch = useDispatch();
- const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
- const isExecutePermitted = getHasExecuteActionPermission(
- isFeatureEnabled,
- currentActionConfig?.userPermissions,
- );
-
const actionResponse = useSelector((state) =>
getActionData(state, currentActionConfig.id),
);
@@ -341,7 +333,7 @@ const QueryResponseTab = (props: Props) => {
)}
{!output && !error && (
<NoResponse
- isRunDisabled={!isExecutePermitted}
+ isRunDisabled={isRunDisabled}
isRunning={isRunning}
onRunClick={responseTabOnRunClick}
/>
|
108af3a0765670838f669e02e2a6993b05f817f8
|
2022-11-25 10:15:31
|
Satish Gandham
|
ci: Setup ted for perf tests (#18439)
| false
|
Setup ted for perf tests (#18439)
|
ci
|
diff --git a/.github/workflows/perf-test.yml b/.github/workflows/perf-test.yml
index 561dab896269..fdce19f2ef91 100644
--- a/.github/workflows/perf-test.yml
+++ b/.github/workflows/perf-test.yml
@@ -168,6 +168,18 @@ jobs:
yarn global add serve
echo "$(yarn global bin)" >> $GITHUB_PATH
+ - name: Load docker image
+ if: steps.run_result.outputs.run_result != 'success'
+ env:
+ APPSMITH_LICENSE_KEY: ${{ secrets.APPSMITH_LICENSE_KEY }}
+ working-directory: "."
+ run: |
+ mkdir -p ~/git-server/keys
+ mkdir -p ~/git-server/repos
+ docker run --name test-event-driver -d -p 2222:22 -p 5001:5001 -p 3306:3306 \
+ -p 5432:5432 -p 28017:27017 -p 25:25 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+ -v ~/git-server/repos:/git-server/repos appsmith/test-event-driver:latest
+
- name: Setting up the perf tests
if: steps.run_result.outputs.run_result != 'success'
shell: bash
|
ee5ce857b381a0f51906c6f1310c6c91ebade20a
|
2023-03-07 14:58:29
|
Shrikant Sharat Kandula
|
ci: Use release Segment Key (#21225)
| false
|
Use release Segment Key (#21225)
|
ci
|
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
index d0a76b3d321b..de3aacd58270 100644
--- a/.github/workflows/client-build.yml
+++ b/.github/workflows/client-build.yml
@@ -126,6 +126,8 @@ jobs:
run: |
if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
export REACT_APP_SEGMENT_CE_KEY="${{ secrets.APPSMITH_SEGMENT_CE_KEY }}"
+ else
+ export REACT_APP_SEGMENT_CE_KEY="${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }}"
fi
REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} \
REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} \
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 33e3c805c05c..80585da910f5 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -219,6 +219,8 @@ jobs:
context: .
push: true
platforms: linux/arm64,linux/amd64
+ build-args: |
+ APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }}
tags: |
${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{steps.vars.outputs.tag}}
@@ -264,6 +266,8 @@ jobs:
with:
context: app/server
push: true
+ build-args: |
+ APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }}
tags: |
${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}}
|
d66868a2827a92fd126377c82f45ab0d12787df0
|
2023-08-08 18:34:29
|
Aishwarya-U-R
|
test: Cypress | CI Stabilize (#26149)
| false
|
Cypress | CI Stabilize (#26149)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/ServerSide/LoginTests/LoginFailure_spec.js b/app/client/cypress/e2e/Regression/ServerSide/LoginTests/LoginFailure_spec.js
index fa30806e72e4..e25bf2f3aaaa 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/LoginTests/LoginFailure_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/LoginTests/LoginFailure_spec.js
@@ -12,8 +12,8 @@ describe("Login failure", function () {
deployMode.DeployApp(locators._emptyPageTxt);
cy.location()
.then((location) => {
- cy.LogOutUser();
appUrl = location.href.split("?")[0];
+ cy.LogOutUser();
cy.window({ timeout: 60000 }).then((win) => {
win.location.href = appUrl;
});
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index e8916bf3689f..e07e86bb4ba4 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1152,6 +1152,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
});
} catch (e) {
console.error(e);
+ return true;
}
}).as("productAlert");
});
|
28ac53bf6e69654dc9ddc5817b185d3a099bf515
|
2024-08-23 14:40:27
|
Jacques Ikot
|
fix: Ensure Select Column Displays Data When Options Are Not Set (#35817)
| false
|
Ensure Select Column Displays Data When Options Are Not Set (#35817)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
index bf1f91ae4a1c..fafe2da10f90 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
@@ -31,7 +31,13 @@ describe(
cy.get(".t--property-pane-section-collapse-events").should("exist");
});
- it("2. should check that options given in the property pane is appearing on the table", () => {
+ it("2. should check that select column returns value if no option is provided", () => {
+ cy.readTableV2data(0, 0).then((val) => {
+ expect(val).to.equal("#1");
+ });
+ });
+
+ it("3. should check that options given in the property pane is appearing on the table", () => {
cy.get(".t--property-control-options").should("exist");
cy.updateCodeInput(
".t--property-control-options",
@@ -74,7 +80,7 @@ describe(
cy.get(".menu-item-active.has-focus").should("contain", "#1");
});
- it("3. should check that placeholder property is working", () => {
+ it("4. should check that placeholder property is working", () => {
cy.updateCodeInput(
".t--property-control-options",
`
@@ -110,7 +116,7 @@ describe(
).should("contain", "choose an item");
});
- it("4. should check that filterable property is working", () => {
+ it("5. should check that filterable property is working", () => {
cy.updateCodeInput(
".t--property-control-options",
`
@@ -155,7 +161,7 @@ describe(
cy.get(".t--canvas-artboard").click({ force: true });
});
- it("5. should check that on option select is working", () => {
+ it("6. should check that on option select is working", () => {
featureFlagIntercept({ release_table_cell_label_value_enabled: true });
cy.openPropertyPane("tablewidgetv2");
cy.editColumn("step");
@@ -197,7 +203,7 @@ describe(
cy.discardTableRow(4, 0);
});
- it("6. should check that currentRow is accessible in the select options", () => {
+ it("7. should check that currentRow is accessible in the select options", () => {
cy.updateCodeInput(
".t--property-control-options",
`
@@ -222,7 +228,7 @@ describe(
cy.get(".menu-item-text").contains("#1").should("not.exist");
});
- it("7. should check that 'same select option in new row' property is working", () => {
+ it("8. should check that 'same select option in new row' property is working", () => {
_.propPane.NavigateBackToPropertyPane();
const checkSameOptionsInNewRowWhileEditing = () => {
@@ -288,7 +294,7 @@ describe(
checkSameOptionsWhileAddingNewRow();
});
- it("8. should check that 'new row select options' is working", () => {
+ it("9. should check that 'new row select options' is working", () => {
const checkNewRowOptions = () => {
// New row select options should be visible when "Same options in new row" is turned off
_.propPane.TogglePropertyState("Same options in new row", "Off");
@@ -353,7 +359,7 @@ describe(
checkNoOptionState();
});
- it("9. should check that server side filering is working", () => {
+ it("10. should check that server side filering is working", () => {
_.dataSources.CreateDataSource("Postgres");
_.dataSources.CreateQueryAfterDSSaved(
"SELECT * FROM public.astronauts {{this.params.filterText ? `WHERE name LIKE '%${this.params.filterText}%'` : ''}} LIMIT 10;",
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
index fbf3b7208b1f..792f1672e2c1 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
@@ -200,6 +200,7 @@ export const SelectCell = (props: SelectProps) => {
const cellLabelValue = useMemo(() => {
if (releaseTableSelectCellLabelValue) {
+ if (!options.length) return value;
const selectedOption = options.find(
(option) => option[TableSelectColumnOptionKeys.VALUE] === value,
);
|
b9ce30ef976cbd656a42fe4ab94f4f3ddd61f8b1
|
2024-11-25 12:53:10
|
Shrikant Sharat Kandula
|
fix: Restore doesn't work when backup file is renamed (#37666)
| false
|
Restore doesn't work when backup file is renamed (#37666)
|
fix
|
diff --git a/app/client/packages/rts/src/ctl/backup.ts b/app/client/packages/rts/src/ctl/backup.ts
index 772ef3cd5869..1ae5661eb12b 100644
--- a/app/client/packages/rts/src/ctl/backup.ts
+++ b/app/client/packages/rts/src/ctl/backup.ts
@@ -31,12 +31,9 @@ export async function run() {
try {
// PRE-BACKUP
- console.log("Available free space at /appsmith-stacks");
const availSpaceInBytes: number =
await getAvailableBackupSpaceInBytes("/appsmith-stacks");
- console.log("\n");
-
checkAvailableBackupSpace(availSpaceInBytes);
if (
diff --git a/app/client/packages/rts/src/ctl/restore.ts b/app/client/packages/rts/src/ctl/restore.ts
index 42e9692d6439..22e386b7838e 100644
--- a/app/client/packages/rts/src/ctl/restore.ts
+++ b/app/client/packages/rts/src/ctl/restore.ts
@@ -249,8 +249,8 @@ async function restoreGitStorageArchive(
async function checkRestoreVersionCompatability(restoreContentsPath: string) {
const currentVersion = await utils.getCurrentAppsmithVersion();
const manifest_data = await fsPromises.readFile(
- restoreContentsPath + "/manifest.json",
- { encoding: "utf8" },
+ path.join(restoreContentsPath, "manifest.json"),
+ "utf8",
);
const manifest_json = JSON.parse(manifest_data);
const restoreVersion = manifest_json["appsmithVersion"];
@@ -270,9 +270,9 @@ async function checkRestoreVersionCompatability(restoreContentsPath: string) {
"The Appsmith instance to be restored is not compatible with the current version.",
);
console.log(
- 'Please update your appsmith image to "index.docker.io/appsmith/appsmith-ce:' +
+ "Please update your appsmith image to 'index.docker.io/appsmith/appsmith-ce:" +
restoreVersion +
- '" in the "docker-compose.yml" file\nand run the cmd: "docker-compose restart" ' +
+ "' in the 'docker-compose.yml' file\nand run the cmd: 'docker-compose restart' " +
"after the restore process is completed, to ensure the restored instance runs successfully.",
);
const confirm = readlineSync.question(
@@ -352,9 +352,11 @@ export async function run() {
const backupName = backupFileName.replace(/\.tar\.gz$/, "");
const restoreRootPath = await fsPromises.mkdtemp(os.tmpdir());
- const restoreContentsPath = path.join(restoreRootPath, backupName);
await extractArchive(backupFilePath, restoreRootPath);
+
+ const restoreContentsPath = await figureOutContentsPath(restoreRootPath);
+
await checkRestoreVersionCompatability(restoreContentsPath);
console.log(
@@ -390,3 +392,44 @@ export async function run() {
function isArchiveEncrypted(backupFilePath: string) {
return backupFilePath.endsWith(".enc");
}
+
+async function figureOutContentsPath(root: string): Promise<string> {
+ const subfolders = await fsPromises.readdir(root, { withFileTypes: true });
+
+ try {
+ // Check if the root itself contains the contents.
+ await fsPromises.access(path.join(root, "manifest.json"));
+
+ return root;
+ } catch (error) {
+ // Ignore
+ }
+
+ for (const subfolder of subfolders) {
+ if (subfolder.isDirectory()) {
+ try {
+ // Try to find the `manifest.json` file.
+ await fsPromises.access(
+ path.join(root, subfolder.name, "manifest.json"),
+ );
+
+ return path.join(root, subfolder.name);
+ } catch (error) {
+ // Ignore
+ }
+
+ try {
+ // If that fails, look for the MongoDB data archive, since backups from v1.7.x and older won't have `manifest.json`.
+ await fsPromises.access(
+ path.join(root, subfolder.name, "mongodb-data.gz"),
+ );
+
+ return path.join(root, subfolder.name);
+ } catch (error) {
+ // Ignore
+ }
+ }
+ }
+
+ throw new Error("Could not find the contents of the backup archive.");
+}
|
44ce1d4b5ad9a0ed1483dd99e26e8241e660fc26
|
2022-02-11 16:32:47
|
Ayangade Adeoluwa
|
fix: fixes apiEditor url overflow, indicates active datasource in datasour… (#10663)
| false
|
fixes apiEditor url overflow, indicates active datasource in datasour… (#10663)
|
fix
|
diff --git a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
index 76c6826afdf1..874f8f3efdae 100644
--- a/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/codeEditorUtils.ts
@@ -66,3 +66,40 @@ export const isActionEntity = (entity: any): entity is DataTreeAction => {
export const isWidgetEntity = (entity: any): entity is DataTreeWidget => {
return entity.ENTITY_TYPE === ENTITY_TYPE.WIDGET;
};
+
+interface Event {
+ eventType: string;
+ eventHandlerFn?: (event: MouseEvent) => void;
+}
+
+export const addEventToHighlightedElement = (
+ element: any,
+ customClassName: string,
+ events?: Event[],
+) => {
+ element = document.getElementsByClassName(
+ customClassName, // the text class name is the classname used for the markText-fn for highlighting the text.
+ )[0];
+
+ if (events) {
+ for (const event of events) {
+ if (element && !!event.eventType && !!event.eventHandlerFn) {
+ // if the highlighted element exists, add an event listener to it.
+ element.addEventListener(event.eventType, event.eventHandlerFn);
+ }
+ }
+ }
+};
+
+export const removeEventFromHighlightedElement = (
+ element: any,
+ events?: Event[],
+) => {
+ if (events) {
+ for (const event of events) {
+ if (element && !!event.eventType && !!event.eventHandlerFn) {
+ element.removeEventListener(event.eventType, event.eventHandlerFn);
+ }
+ }
+ }
+};
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 35830b9b27c1..3a65f893b674 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -71,6 +71,8 @@ import {
isActionEntity,
isWidgetEntity,
removeNewLineChars,
+ addEventToHighlightedElement,
+ removeEventFromHighlightedElement,
} from "./codeEditorUtils";
import { commandsHelper } from "./commandsHelper";
import { getEntityNameAndPropertyPath } from "workers/evaluationUtils";
@@ -144,6 +146,11 @@ export type EditorProps = EditorStyleProps &
errors?: any;
isInvalid?: boolean;
isEditorHidden?: boolean;
+ codeEditorVisibleOverflow?: boolean; // flag for determining the input overflow type for the code editor
+ showCustomToolTipForHighlightedText?: boolean;
+ highlightedTextClassName?: string;
+ handleMouseEnter?: (event: MouseEvent) => void;
+ handleMouseLeave?: () => void;
};
type Props = ReduxStateProps &
@@ -166,7 +173,8 @@ class CodeEditor extends Component<Props, State> {
marking: [bindingMarker],
hinting: [bindingHint, commandsHelper],
};
-
+ // this is the higlighted element for any highlighted text in the codemirror
+ highlightedUrlElement: HTMLElement | undefined;
codeEditorTarget = React.createRef<HTMLDivElement>();
editor!: CodeMirror.Editor;
hinters: Hinter[] = [];
@@ -320,8 +328,46 @@ class CodeEditor extends Component<Props, State> {
});
}
+ handleMouseMove = () => {
+ // this code only runs when we want custom tool tip for any highlighted text inside codemirror instance
+ if (
+ this.props.showCustomToolTipForHighlightedText &&
+ this.props.highlightedTextClassName
+ ) {
+ addEventToHighlightedElement(
+ this.highlightedUrlElement,
+ this.props.highlightedTextClassName,
+ [
+ {
+ eventType: "mouseenter",
+ eventHandlerFn: this.props.handleMouseEnter,
+ },
+ {
+ eventType: "mouseleave",
+ eventHandlerFn: this.props.handleMouseLeave,
+ },
+ ],
+ );
+ }
+ };
+
componentWillUnmount() {
+ // if the highlighted element exists, remove the event listeners to prevent memory leaks
+ if (this.highlightedUrlElement) {
+ removeEventFromHighlightedElement(this.highlightedUrlElement, [
+ {
+ eventType: "mouseenter",
+ eventHandlerFn: this.props.handleMouseEnter,
+ },
+ {
+ eventType: "mouseleave",
+ eventHandlerFn: this.props.handleMouseLeave,
+ },
+ ]);
+ }
+
window.removeEventListener("keydown", this.handleKeydown);
+
// return if component unmounts before editor is created
if (!this.editor) return;
@@ -651,6 +697,7 @@ class CodeEditor extends Component<Props, State> {
border,
borderLess,
className,
+ codeEditorVisibleOverflow,
dataTreePath,
disabled,
dynamicData,
@@ -736,6 +783,7 @@ class CodeEditor extends Component<Props, State> {
className={`${className} ${replayHighlightClass} ${
isInvalid ? "t--codemirror-has-error" : ""
}`}
+ codeEditorVisibleOverflow={codeEditorVisibleOverflow}
disabled={disabled}
editorTheme={this.props.theme}
fill={fill}
@@ -745,6 +793,7 @@ class CodeEditor extends Component<Props, State> {
isFocused={this.state.isFocused}
isNotHover={this.state.isFocused || this.state.isOpened}
onMouseMove={this.handleLintTooltip}
+ onMouseOver={this.handleMouseMove}
ref={this.editorWrapperRef}
size={size}
>
diff --git a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
index 74dc52bba1e7..10df457e9daf 100644
--- a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
@@ -50,6 +50,7 @@ export const EditorWrapper = styled.div<{
hoverInteraction?: boolean;
fill?: boolean;
className?: string;
+ codeEditorVisibleOverflow?: boolean;
}>`
width: 100%;
${(props) =>
@@ -273,6 +274,18 @@ export const EditorWrapper = styled.div<{
return `height: ${height}`;
}}
}
+
+ ${(props) =>
+ props.codeEditorVisibleOverflow &&
+ `
+ &&&&&&&& .CodeMirror-scroll {
+ overflow: visible;
+ }
+
+ & .CodeEditorTarget {
+ height: ${props.isFocused ? "auto" : "35px"};
+ }
+ `}
`;
export const IconContainer = styled.div`
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
index 756bdf38ad98..536223441fd0 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
@@ -38,7 +38,7 @@ import { urlGroupsRegexExp } from "constants/AppsmithActionConstants/ActionConst
import styled from "styled-components";
import { DATA_SOURCES_EDITOR_ID_URL } from "constants/routes";
import Icon, { IconSize } from "components/ads/Icon";
-import Text, { TextType } from "components/ads/Text";
+import Text, { FontWeight, TextType } from "components/ads/Text";
import history from "utils/history";
import { getDatasourceInfo } from "pages/Editor/APIEditor/ApiRightPane";
import * as FontFamilies from "constants/Fonts";
@@ -54,6 +54,11 @@ import { ValidationTypes } from "constants/WidgetValidation";
import { DataTree, ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { getDataTree } from "selectors/dataTreeSelectors";
import { KeyValuePair } from "entities/Action";
+import _ from "lodash";
+import {
+ getDatasource,
+ getDatasourcesByPluginId,
+} from "selectors/entitiesSelector";
type ReduxStateProps = {
orgId: string;
@@ -75,6 +80,7 @@ type Props = EditorProps &
ReduxDispatchProps & {
input: Partial<WrappedFieldInputProps>;
pluginId: string;
+ codeEditorVisibleOverflow: boolean; // this variable adds a custom style to the codeEditor when focused.
};
const DatasourceContainer = styled.div`
@@ -92,6 +98,43 @@ const DatasourceContainer = styled.div`
}
`;
+const CustomToolTip = styled.span<{ width?: number }>`
+ visibility: hidden;
+ text-align: left;
+ padding: 10px 12px;
+ border-radius: 0px;
+ background-color: ${Colors.CODE_GRAY};
+ color: ${Colors.ALABASTER_ALT};
+ box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2), 0px 2px 10px rgba(0, 0, 0, 0.1);
+
+ position: absolute;
+ z-index: 1000;
+ bottom: 125%;
+ left: calc(-10px + ${(props) => (props.width ? props.width / 2 : 0)}px);
+ margin-left: -60px;
+
+ opacity: 0;
+ transition: opacity 0.01s 1s ease-in;
+
+ &::after {
+ content: "";
+ position: absolute;
+ top: 100%;
+ left: 50%;
+ height: 14px;
+ width: 14px;
+ margin-left: -5px;
+ border-width: 5px;
+ border-style: solid;
+ border-color: ${Colors.CODE_GRAY} transparent transparent transparent;
+ }
+
+ &.highlighter {
+ visibility: visible;
+ opacity: 1;
+ }
+`;
+
const hintContainerStyles: React.CSSProperties = {
display: "flex",
flexDirection: "column",
@@ -145,7 +188,15 @@ function CustomHint(props: { datasource: Datasource }) {
}
const apiFormValueSelector = formValueSelector(API_EDITOR_FORM_NAME);
-class EmbeddedDatasourcePathComponent extends React.Component<Props> {
+class EmbeddedDatasourcePathComponent extends React.Component<
+ Props,
+ { highlightedElementWidth: number }
+> {
+ constructor(props: Props) {
+ super(props);
+ this.state = { highlightedElementWidth: 0 };
+ }
+
handleDatasourceUrlUpdate = (datasourceUrl: string) => {
const { datasource, orgId, pluginId } = this.props;
const urlHasUpdated =
@@ -356,8 +407,41 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
return "";
};
+ // handles when user's mouse enters the highlighted component
+ handleMouseEnter = (event: MouseEvent) => {
+ if (
+ this.state.highlightedElementWidth !==
+ (event.currentTarget as HTMLElement).getBoundingClientRect()?.width
+ ) {
+ this.setState({
+ highlightedElementWidth: (event.currentTarget as HTMLElement).getBoundingClientRect()
+ ?.width,
+ });
+ }
+ // add class to trigger custom tooltip to show when mouse enters the component
+ document.getElementById("custom-tooltip")?.classList.add("highlighter");
+ };
+
+ // handles when user's mouse leaves the highlighted component
+ handleMouseLeave = () => {
+ // remove class to trigger custom tooltip to not show when mouse leaves the component.
+ document.getElementById("custom-tooltip")?.classList.remove("highlighter");
+ };
+
+ // if the next props is not equal to the current props, do not rerender, same for state
+ shouldComponentUpdate(nextProps: any, nextState: any) {
+ if (!_.isEqual(nextProps, this.props)) {
+ return true;
+ }
+ if (!_.isEqual(nextState, this.state)) {
+ return true;
+ }
+ return false;
+ }
+
render() {
const {
+ codeEditorVisibleOverflow,
datasource,
input: { value },
} = this.props;
@@ -381,6 +465,11 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
showLightningMenu: false,
fill: true,
expected: getExpectedValue({ type: ValidationTypes.SAFE_URL }),
+ codeEditorVisibleOverflow,
+ showCustomToolTipForHighlightedText: true,
+ highlightedTextClassName: "datasource-highlight",
+ handleMouseEnter: this.handleMouseEnter,
+ handleMouseLeave: this.handleMouseLeave,
};
return (
@@ -390,8 +479,30 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
border={CodeEditorBorder.ALL_SIDE}
className="t--datasource-editor"
evaluatedValue={this.handleEvaluatedValue()}
- height="35px"
/>
+ {datasource && datasource.name !== "DEFAULT_REST_DATASOURCE" && (
+ <CustomToolTip
+ id="custom-tooltip"
+ width={this.state.highlightedElementWidth}
+ >
+ <Text
+ color={Colors.ALABASTER_ALT}
+ style={{ fontSize: "10px", display: "block", fontWeight: 600 }}
+ type={TextType.SIDE_HEAD}
+ weight={FontWeight.BOLD}
+ >
+ Datasource
+ </Text>{" "}
+ <Text
+ color={Colors.ALABASTER_ALT}
+ style={{ display: "block" }}
+ type={TextType.P3}
+ >
+ {" "}
+ {datasource?.name}{" "}
+ </Text>
+ </CustomToolTip>
+ )}
{displayValue && datasource && !("id" in datasource) ? (
<StoreAsDatasource enable={!!displayValue} />
) : datasource && "id" in datasource ? (
@@ -426,8 +537,9 @@ const mapStateToProps = (
let datasourceMerged = datasourceFromAction;
// Todo: fix this properly later in #2164
if (datasourceFromAction && "id" in datasourceFromAction) {
- const datasourceFromDataSourceList = state.entities.datasources.list.find(
- (d) => d.id === datasourceFromAction.id,
+ const datasourceFromDataSourceList = getDatasource(
+ state,
+ datasourceFromAction.id,
);
if (datasourceFromDataSourceList) {
datasourceMerged = merge(
@@ -441,9 +553,7 @@ const mapStateToProps = (
return {
orgId: state.ui.orgs.currentOrg.id,
datasource: datasourceMerged,
- datasourceList: state.entities.datasources.list.filter(
- (d) => d.pluginId === ownProps.pluginId,
- ),
+ datasourceList: getDatasourcesByPluginId(state, ownProps.pluginId),
currentPageId: state.entities.pageList.currentPageId,
applicationId: getCurrentApplicationId(state),
dataTree: getDataTree(state),
@@ -469,6 +579,7 @@ function EmbeddedDatasourcePathField(
placeholder?: string;
theme: EditorTheme;
actionName: string;
+ codeEditorVisibleOverflow?: boolean;
},
) {
return (
diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx
index 05b984156531..82bc324c4116 100644
--- a/app/client/src/constants/Colors.tsx
+++ b/app/client/src/constants/Colors.tsx
@@ -42,6 +42,7 @@ export const Colors = {
FOAM: "#D9FDED",
GREEN: "#03B365",
+ LIGHT_GREEN_CYAN: "#e5f6ec",
JUNGLE_GREEN: "#24BA91",
JUNGLE_GREEN_DARKER: "#30A481",
FERN_GREEN: "#50AF6C",
diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
index 4b53cab12d16..4a03d2ef0f16 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useMemo } from "react";
import styled from "styled-components";
import Icon, { IconSize } from "components/ads/Icon";
import { StyledSeparator } from "pages/Applications/ProductUpdatesModal/ReleaseComponent";
@@ -13,9 +13,10 @@ import ActionRightPane, {
useEntityDependencies,
} from "components/editorComponents/ActionRightPane";
import { useSelector } from "react-redux";
-
import { Classes } from "components/ads/common";
import { getCurrentApplicationId } from "selectors/editorSelectors";
+import { Colors } from "constants/Colors";
+import { sortedDatasourcesHandler } from "./helpers";
const EmptyDatasourceContainer = styled.div`
display: flex;
@@ -117,6 +118,32 @@ const DataSourceNameContainer = styled.div`
}
`;
+const IconContainer = styled.div`
+ display: inherit;
+`;
+
+const SelectedDatasourceInfoContainer = styled.div`
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ padding: 2px 8px;
+ background-color: ${Colors.LIGHT_GREEN_CYAN};
+ margin-right: 5px;
+ text-transform: uppercase;
+ & p {
+ font-style: normal;
+ font-weight: 600;
+ font-size: 8px;
+ line-height: 10px;
+ display: flex;
+ align-items: center;
+ text-align: center;
+ letter-spacing: 0.4px;
+ text-transform: uppercase;
+ color: ${Colors.GREEN};
+ }
+`;
+
const SomeWrapper = styled.div`
border-left: 2px solid ${(props) => props.theme.colors.apiPane.dividerBg};
height: 100%;
@@ -168,7 +195,7 @@ export const getDatasourceInfo = (datasource: any): string => {
return info.join(" | ");
};
-export default function ApiRightPane(props: any) {
+function ApiRightPane(props: any) {
const [selectedIndex, setSelectedIndex] = useState(0);
const { entityDependencies, hasDependencies } = useEntityDependencies(
props.actionName,
@@ -179,6 +206,16 @@ export default function ApiRightPane(props: any) {
const applicationId = useSelector(getCurrentApplicationId);
+ // array of datasources with the current action's datasource first, followed by the rest.
+ const sortedDatasources = useMemo(
+ () =>
+ sortedDatasourcesHandler(
+ props.datasources,
+ props.currentActionDatasourceId,
+ ),
+ [props.datasources, props.currentActionDatasourceId],
+ );
+
return (
<DatasourceContainer>
<TabbedViewContainer>
@@ -194,7 +231,7 @@ export default function ApiRightPane(props: any) {
<DataSourceListWrapper
className={selectedIndex === 0 ? "show" : ""}
>
- {(props.datasources || []).map((d: any, idx: number) => {
+ {(sortedDatasources || []).map((d: any, idx: number) => {
const dataSourceInfo: string = getDatasourceInfo(d);
return (
<DatasourceCard
@@ -205,21 +242,28 @@ export default function ApiRightPane(props: any) {
<Text type={TextType.H5} weight={FontWeight.BOLD}>
{d.name}
</Text>
- <Icon
- name="edit"
- onClick={(e) => {
- e.stopPropagation();
- history.push(
- DATA_SOURCES_EDITOR_ID_URL(
- applicationId,
- props.currentPageId,
- d.id,
- getQueryParams(),
- ),
- );
- }}
- size={IconSize.LARGE}
- />
+ <IconContainer>
+ {d?.id === props.currentActionDatasourceId && (
+ <SelectedDatasourceInfoContainer>
+ <p>In use</p>
+ </SelectedDatasourceInfoContainer>
+ )}
+ <Icon
+ name="edit"
+ onClick={(e) => {
+ e.stopPropagation();
+ history.push(
+ DATA_SOURCES_EDITOR_ID_URL(
+ applicationId,
+ props.currentPageId,
+ d.id,
+ getQueryParams(),
+ ),
+ );
+ }}
+ size={IconSize.LARGE}
+ />
+ </IconContainer>
</DataSourceNameContainer>
<DatasourceURL>
{d.datasourceConfiguration.url}
@@ -278,3 +322,5 @@ export default function ApiRightPane(props: any) {
</DatasourceContainer>
);
}
+
+export default React.memo(ApiRightPane);
diff --git a/app/client/src/pages/Editor/APIEditor/Form.tsx b/app/client/src/pages/Editor/APIEditor/Form.tsx
index 6b83345ef5b7..7d8d12df4ac5 100644
--- a/app/client/src/pages/Editor/APIEditor/Form.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Form.tsx
@@ -58,7 +58,7 @@ import {
getAction,
getActionResponses,
} from "../../../selectors/entitiesSelector";
-import { isEmpty } from "lodash";
+import { isEmpty, isEqual } from "lodash";
import { Colors } from "constants/Colors";
import SearchSnippets from "components/ads/SnippetButton";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
@@ -70,6 +70,7 @@ import { Classes as BluePrintClasses } from "@blueprintjs/core";
import { replayHighlightClass } from "globalStyles/portals";
const Form = styled.form`
+ position: relative;
display: flex;
flex-direction: column;
flex: 1;
@@ -257,6 +258,7 @@ interface APIFormProps {
hasResponse: boolean;
suggestedWidgets?: SuggestedWidget[];
updateDatasource: (datasource: Datasource) => void;
+ currentActionDatasourceId: string;
}
type Props = APIFormProps & InjectedFormProps<Action, APIFormProps>;
@@ -535,6 +537,7 @@ function ApiEditorForm(props: Props) {
actionConfigurationHeaders,
actionConfigurationParams,
actionName,
+ currentActionDatasourceId,
handleSubmit,
headersCount,
hintMessages,
@@ -552,8 +555,11 @@ function ApiEditorForm(props: Props) {
const params = useParams<{ apiId?: string; queryId?: string }>();
- const actions: Action[] = useSelector((state: AppState) =>
- state.entities.actions.map((action) => action.config),
+ // passing lodash's equality function to ensure that this selector does not cause a rerender multiple times.
+ // it checks each value to make sure none has changed before recomputing the actions.
+ const actions: Action[] = useSelector(
+ (state: AppState) => state.entities.actions.map((action) => action.config),
+ isEqual,
);
const currentActionConfig: Action | undefined = actions.find(
(action) => action.id === params.apiId || action.id === params.queryId,
@@ -618,6 +624,7 @@ function ApiEditorForm(props: Props) {
<DatasourceWrapper className="t--dataSourceField">
<EmbeddedDatasourcePathField
actionName={actionName}
+ codeEditorVisibleOverflow
name="actionConfiguration.path"
placeholder="https://mock-api.appsmith.com/users"
pluginId={pluginId}
@@ -752,6 +759,7 @@ function ApiEditorForm(props: Props) {
<DataSourceList
actionName={actionName}
applicationId={props.applicationId}
+ currentActionDatasourceId={currentActionDatasourceId}
currentPageId={props.currentPageId}
datasources={props.datasources}
hasResponse={props.hasResponse}
@@ -800,6 +808,8 @@ export default connect((state: AppState, props: { pluginId: string }) => {
get(datasourceFromAction, "datasourceConfiguration.queryParameters") || [];
const apiId = selector(state, "id");
+ const currentActionDatasourceId = selector(state, "datasource.id");
+
const actionName = getApiName(state, apiId) || "";
const headers = selector(state, "actionConfiguration.headers");
let headersCount = 0;
@@ -849,6 +859,7 @@ export default connect((state: AppState, props: { pluginId: string }) => {
httpMethodFromForm,
actionConfigurationHeaders,
actionConfigurationParams,
+ currentActionDatasourceId,
datasourceHeaders,
datasourceParams,
headersCount,
diff --git a/app/client/src/pages/Editor/APIEditor/helpers.ts b/app/client/src/pages/Editor/APIEditor/helpers.ts
index 1f923dc76506..ad690ac41776 100644
--- a/app/client/src/pages/Editor/APIEditor/helpers.ts
+++ b/app/client/src/pages/Editor/APIEditor/helpers.ts
@@ -12,3 +12,22 @@ export const curlImportSubmitHandler = (
) => {
dispatch(submitCurlImportForm(values));
};
+
+export const sortedDatasourcesHandler = (
+ datasources: Record<string, any>,
+ currentDatasourceId: string,
+) => {
+ // this function sorts the datasources list, with the current action's datasource first, followed by others.
+ let sortedArr = [];
+
+ sortedArr = datasources.filter(
+ (d: { id: string }) => d?.id === currentDatasourceId,
+ );
+
+ sortedArr = [
+ ...sortedArr,
+ ...datasources.filter((d: { id: string }) => d?.id !== currentDatasourceId),
+ ];
+
+ return sortedArr;
+};
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 13f10353f803..e3efc24bcc68 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -34,7 +34,11 @@ import PerformanceTracker, {
import * as Sentry from "@sentry/react";
import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
import { CurrentApplicationData } from "constants/ReduxActionConstants";
-import { getPluginSettingConfigs } from "selectors/entitiesSelector";
+import {
+ getPageList,
+ getPlugins,
+ getPluginSettingConfigs,
+} from "selectors/entitiesSelector";
import { SAAS_EDITOR_API_ID_URL } from "../SaaSEditor/constants";
import history from "utils/history";
@@ -258,9 +262,9 @@ const mapStateToProps = (state: AppState, props: any): ReduxStateProps => {
actions: state.entities.actions,
currentApplication: getCurrentApplication(state),
currentPageName: getCurrentPageName(state),
- pages: state.entities.pageList.pages,
+ pages: getPageList(state),
apiName: apiName || "",
- plugins: state.entities.plugins.list,
+ plugins: getPlugins(state),
pluginId,
settingsConfig,
paginationType: _.get(apiAction, "actionConfiguration.paginationType"),
diff --git a/app/client/src/selectors/entitiesSelector.ts b/app/client/src/selectors/entitiesSelector.ts
index 3fc7bc7bbabf..664e7a0dc25a 100644
--- a/app/client/src/selectors/entitiesSelector.ts
+++ b/app/client/src/selectors/entitiesSelector.ts
@@ -491,6 +491,11 @@ export const getAllPageWidgets = createSelector(
},
);
+export const getPageList = createSelector(
+ (state: AppState) => state.entities.pageList.pages,
+ (pages) => pages,
+);
+
export const getPageListAsOptions = createSelector(
(state: AppState) => state.entities.pageList.pages,
(pages) =>
|
0291ef7e46b2a38948dc3cf1ab09bedc01425034
|
2024-03-27 08:58:27
|
Shrikant Sharat Kandula
|
ci: Allow special chars in PR body (#32089)
| false
|
Allow special chars in PR body (#32089)
|
ci
|
diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml
index d853277bee96..fc030806fb44 100644
--- a/.github/workflows/pr-automation.yml
+++ b/.github/workflows/pr-automation.yml
@@ -26,17 +26,18 @@ jobs:
if [[ '${{ github.event.label.name }}' != 'ok-to-test' ]]; then
echo "Irrelevant label '${{ github.event.label.name }}' added! "
exit 1
- fi
+ fi
# Reads the PR description to retrieve /ok-to-test slash command
- name: Get tags
id: getTags
+ env:
+ PR_BODY: ${{ github.event.pull_request.body }}
run: |
- REGEX='/ok-to-test tags="([^"]*)"';
- body='${{ github.event.pull_request.body }}';
- if [[ $body =~ $REGEX ]]; then
- echo "tags=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
- fi
+ REGEX='/ok-to-test tags="([^"]*)"';
+ if [[ $PR_BODY =~ $REGEX ]]; then
+ echo "tags=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
+ fi
# Parses the retrieved /ok-to-test slash command to retrieve tags
- name: Parse tags
@@ -45,10 +46,10 @@ jobs:
if [[ '${{ steps.getTags.outputs.tags }}' != '' ]]; then
echo "tags=${{ steps.getTags.outputs.tags }}" >> $GITHUB_OUTPUT
echo "outcome=success" >> $GITHUB_OUTPUT
- else
+ else
echo "Tags were not found!"
echo "outcome=failure" >> $GITHUB_OUTPUT
- fi
+ fi
# In case of missing tags, guides towards correct usage in test response
- name: Add test response with tags documentation link
@@ -57,7 +58,7 @@ jobs:
with:
content: |
<!-- This is an auto-generated comment: Cypress test results -->
- > [!WARNING]
+ > [!WARNING]
> The provided command lacks proper tags. Please modify PR body, specifying the tags you want to include or use `/ok-to-test tags="@tag.All"` to run all specs.
> Explore the tags documentation [here](https://www.notion.so/appsmith/Ok-to-test-With-Tags-7c0fc64d4efb4afebf53348cd6252918)
@@ -65,8 +66,8 @@ jobs:
regex: "<!-- This is an auto-generated comment: Cypress test results -->.*?<!-- end of auto-generated comment: Cypress test results -->"
regexFlags: ims
token: ${{ secrets.GITHUB_TOKEN }}
-
- # In case of missing tags, exit the workflow with failure
+
+ # In case of missing tags, exit the workflow with failure
- name: Stop the workflow run if tags are not present
if: steps.parseTags.outputs.outcome != 'success'
run: exit 1
@@ -87,13 +88,13 @@ jobs:
fi
# In case of incorrect usage for all test cases, inform the PR author of correct usage
- - name: Add test response to use correct @tag.All format
+ - name: Add test response to use correct @tag.All format
if: steps.checkAll.outputs.invalid_tags_all != ''
uses: nefrob/[email protected]
with:
content: |
<!-- This is an auto-generated comment: Cypress test results -->
- > [!WARNING]
+ > [!WARNING]
> Please use `/ok-to-test tags="@tag.All"` to run all specs.
> Explore the tags documentation [here](https://www.notion.so/appsmith/Ok-to-test-With-Tags-7c0fc64d4efb4afebf53348cd6252918)
@@ -102,20 +103,20 @@ jobs:
regex: "<!-- This is an auto-generated comment: Cypress test results -->.*?<!-- end of auto-generated comment: Cypress test results -->"
regexFlags: ims
token: ${{ secrets.GITHUB_TOKEN }}
-
+
# In case of incorrect usage for all test cases, exit the workflow with failure
- name: Stop the workflow run if given @tag.All format is wrong
if: steps.checkAll.outputs.invalid_tags_all != ''
run: exit 1
# In case of a run with all test cases, inform the PR author of better usage
- - name: Add test response to use @tag.All
+ - name: Add test response to use @tag.All
if: steps.checkAll.outputs.tags == ''
uses: nefrob/[email protected]
with:
content: |
<!-- This is an auto-generated comment: Cypress test results -->
- > [!WARNING]
+ > [!WARNING]
> Whoa, @tag.All spotted in your test suite! 🚀
> While @tag.All is cool, like a catch-all net, why not try specific tags? 🏷️
> Narrow down your suite with specific tags for quicker and more accurate tests! 🚀 Less waiting, more zipping through tests like a ninja!
@@ -126,14 +127,14 @@ jobs:
regex: "<!-- This is an auto-generated comment: Cypress test results -->.*?<!-- end of auto-generated comment: Cypress test results -->"
regexFlags: ims
token: ${{ secrets.GITHUB_TOKEN }}
-
+
# In case of a runnable command, update the PR with run details
- name: Add test response with link to workflow run
uses: nefrob/[email protected]
with:
content: |
<!-- This is an auto-generated comment: Cypress test results -->
- > [!TIP]
+ > [!TIP]
> Tests running at: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
> Commit: `${{ github.event.pull_request.head.sha }}`
> Workflow: `${{ github.workflow }}`
|
fb413277637f15749f3d7353ca632f6838524ff5
|
2024-05-15 17:20:00
|
albinAppsmith
|
feat: text-wrap change (#33475)
| false
|
text-wrap change (#33475)
|
feat
|
diff --git a/app/client/package.json b/app/client/package.json
index bda37257e6e5..f1f17dc4e5ad 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -113,7 +113,7 @@
"d3-geo": "^3.1.0",
"dayjs": "^1.10.6",
"deep-diff": "^1.0.2",
- "design-system": "npm:@appsmithorg/[email protected]",
+ "design-system": "npm:@appsmithorg/[email protected]",
"design-system-old": "npm:@appsmithorg/[email protected]",
"downloadjs": "^1.4.7",
"echarts": "^5.4.2",
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 2d6f4d78218b..d65db6c918b0 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -13134,7 +13134,7 @@ __metadata:
d3-geo: ^3.1.0
dayjs: ^1.10.6
deep-diff: ^1.0.2
- design-system: "npm:@appsmithorg/[email protected]"
+ design-system: "npm:@appsmithorg/[email protected]"
design-system-old: "npm:@appsmithorg/[email protected]"
diff: ^5.0.0
dotenv: ^8.1.0
@@ -17181,9 +17181,9 @@ __metadata:
languageName: node
linkType: hard
-"design-system@npm:@appsmithorg/[email protected]":
- version: 2.1.40
- resolution: "@appsmithorg/design-system@npm:2.1.40"
+"design-system@npm:@appsmithorg/[email protected]":
+ version: 2.1.41
+ resolution: "@appsmithorg/design-system@npm:2.1.41"
dependencies:
"@radix-ui/react-dialog": ^1.0.2
"@radix-ui/react-dropdown-menu": ^2.0.4
@@ -17215,7 +17215,7 @@ __metadata:
react-dom: ^17.0.2
react-router-dom: ^5.0.0
styled-components: ^5.3.6
- checksum: 0c45edd67a958fb0f192e405216b3103eb751197b49bb49c9377e9a6185f4a3de007142d5af2df03c9f2b2a9ac337604ca69d1065aac219d97e671f55ef37435
+ checksum: 43dd163bc993945b4376a96c04ab5c2a4752474fcc98dd4c911981d21f78a03742243d4f05fbc2e51c5e04639053972f6305f6078a3e0b452a5b206b9a8a5a72
languageName: node
linkType: hard
|
5b9153cb19039ba2e9d55d4856ec9bc8560d6507
|
2025-02-17 14:29:40
|
Rahul Barwal
|
feat: Implement infra code for infinite scroll implementation. (#39225)
| false
|
Implement infra code for infinite scroll implementation. (#39225)
|
feat
|
diff --git a/app/client/package.json b/app/client/package.json
index 43f757a30842..cdaa3998f2b2 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -91,6 +91,7 @@
"@types/d3-geo": "^3.1.0",
"@types/google.maps": "^3.51.0",
"@types/react-page-visibility": "^6.4.1",
+ "@types/react-window-infinite-loader": "^1.0.9",
"@types/web": "^0.0.99",
"@uppy/core": "^1.16.0",
"@uppy/dashboard": "^1.16.0",
@@ -203,6 +204,7 @@
"react-virtuoso": "^4.5.0",
"react-webcam": "^7.0.1",
"react-window": "^1.8.6",
+ "react-window-infinite-loader": "^1.0.10",
"react-zoom-pan-pinch": "^1.6.1",
"redux": "^4.0.1",
"redux-form": "^8.2.6",
diff --git a/app/client/src/widgets/TableWidgetV2/component/StaticTable.tsx b/app/client/src/widgets/TableWidgetV2/component/StaticTable.tsx
index 6af8dc468d6e..a759641e6218 100644
--- a/app/client/src/widgets/TableWidgetV2/component/StaticTable.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/StaticTable.tsx
@@ -42,6 +42,8 @@ type StaticTableProps = TableColumnHeaderProps & {
scrollContainerStyles: any;
useVirtual: boolean;
tableBodyRef?: React.MutableRefObject<HTMLDivElement | null>;
+ isLoading: boolean;
+ loadMoreFromEvaluations: () => void;
};
const StaticTable = (props: StaticTableProps, ref: React.Ref<SimpleBar>) => {
@@ -81,6 +83,8 @@ const StaticTable = (props: StaticTableProps, ref: React.Ref<SimpleBar>) => {
getTableBodyProps={props.getTableBodyProps}
height={props.height}
isAddRowInProgress={props.isAddRowInProgress}
+ isLoading={props.isLoading}
+ loadMoreFromEvaluations={props.loadMoreFromEvaluations}
multiRowSelection={!!props.multiRowSelection}
pageSize={props.pageSize}
prepareRow={props.prepareRow}
diff --git a/app/client/src/widgets/TableWidgetV2/component/Table.tsx b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
index 47354361b45b..5045d277d58f 100644
--- a/app/client/src/widgets/TableWidgetV2/component/Table.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
@@ -473,8 +473,10 @@ export function Table(props: TableProps) {
headerGroups={headerGroups}
height={props.height}
isAddRowInProgress={props.isAddRowInProgress}
+ isLoading={props.isLoading}
isResizingColumn={isResizingColumn}
isSortable={props.isSortable}
+ loadMoreFromEvaluations={props.nextPageClick}
multiRowSelection={props?.multiRowSelection}
pageSize={props.pageSize}
prepareRow={prepareRow}
@@ -512,8 +514,10 @@ export function Table(props: TableProps) {
height={props.height}
isAddRowInProgress={props.isAddRowInProgress}
isInfiniteScrollEnabled={props.isInfiniteScrollEnabled}
+ isLoading={props.isLoading}
isResizingColumn={isResizingColumn}
isSortable={props.isSortable}
+ loadMoreFromEvaluations={props.nextPageClick}
multiRowSelection={props?.multiRowSelection}
pageSize={props.pageSize}
prepareRow={prepareRow}
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/index.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/index.tsx
new file mode 100644
index 000000000000..f2cb83e1cba0
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/index.tsx
@@ -0,0 +1,59 @@
+import React, { type Ref } from "react";
+import type { Row as ReactTableRowType } from "react-table";
+import { type ReactElementType } from "react-window";
+import InfiniteLoader from "react-window-infinite-loader";
+import type SimpleBar from "simplebar-react";
+import type { TableSizes } from "../../Constants";
+import { useInfiniteVirtualization } from "./useInfiniteVirtualization";
+import { FixedInfiniteVirtualList } from "../VirtualList";
+
+interface InfiniteScrollBodyProps {
+ rows: ReactTableRowType<Record<string, unknown>>[];
+ height: number;
+ tableSizes: TableSizes;
+ innerElementType?: ReactElementType;
+ isLoading: boolean;
+ totalRecordsCount?: number;
+ itemCount: number;
+ loadMoreFromEvaluations: () => void;
+ pageSize: number;
+}
+
+const InfiniteScrollBody = React.forwardRef(
+ (props: InfiniteScrollBodyProps, ref: Ref<SimpleBar>) => {
+ const { isLoading, loadMoreFromEvaluations, pageSize, rows } = props;
+ const { isItemLoaded, itemCount, loadMoreItems } =
+ useInfiniteVirtualization({
+ rows,
+ totalRecordsCount: rows.length,
+ isLoading,
+ loadMore: loadMoreFromEvaluations,
+ pageSize,
+ });
+
+ return (
+ <div className="simplebar-content-wrapper">
+ <InfiniteLoader
+ isItemLoaded={isItemLoaded}
+ itemCount={itemCount + 5}
+ loadMoreItems={loadMoreItems}
+ >
+ {({ onItemsRendered, ref: infiniteLoaderRef }) => (
+ <FixedInfiniteVirtualList
+ height={props.height}
+ infiniteLoaderListRef={infiniteLoaderRef}
+ innerElementType={props.innerElementType}
+ onItemsRendered={onItemsRendered}
+ outerRef={ref}
+ pageSize={props.pageSize}
+ rows={props.rows}
+ tableSizes={props.tableSizes}
+ />
+ )}
+ </InfiniteLoader>
+ </div>
+ );
+ },
+);
+
+export default InfiniteScrollBody;
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.test.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.test.tsx
new file mode 100644
index 000000000000..946a240874b1
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.test.tsx
@@ -0,0 +1,152 @@
+import { renderHook } from "@testing-library/react-hooks";
+import { useInfiniteVirtualization } from "./useInfiniteVirtualization";
+import { act } from "@testing-library/react";
+import type { Row as ReactTableRowType } from "react-table";
+
+describe("useInfiniteVirtualization", () => {
+ const mockRows: ReactTableRowType<Record<string, unknown>>[] = [
+ {
+ id: "1",
+ original: { id: 1, name: "Test 1" },
+ index: 0,
+ cells: [],
+ values: {},
+ getRowProps: jest.fn(),
+ allCells: [],
+ subRows: [],
+ isExpanded: false,
+ canExpand: false,
+ depth: 0,
+ toggleRowExpanded: jest.fn(),
+ state: {},
+ toggleRowSelected: jest.fn(),
+ getToggleRowExpandedProps: jest.fn(),
+ isSelected: false,
+ isSomeSelected: false,
+ isGrouped: false,
+ groupByID: "",
+ groupByVal: "",
+ leafRows: [],
+ getToggleRowSelectedProps: jest.fn(),
+ setState: jest.fn(),
+ },
+ {
+ id: "2",
+ original: { id: 2, name: "Test 2" },
+ index: 1,
+ cells: [],
+ values: {},
+ getRowProps: jest.fn(),
+ allCells: [],
+ subRows: [],
+ isExpanded: false,
+ canExpand: false,
+ depth: 0,
+ toggleRowExpanded: jest.fn(),
+ state: {},
+ toggleRowSelected: jest.fn(),
+ getToggleRowExpandedProps: jest.fn(),
+ isSelected: false,
+ isSomeSelected: false,
+ isGrouped: false,
+ groupByID: "",
+ groupByVal: "",
+ leafRows: [],
+ getToggleRowSelectedProps: jest.fn(),
+ setState: jest.fn(),
+ },
+ ];
+
+ const defaultProps = {
+ rows: mockRows,
+ isLoading: false,
+ loadMore: jest.fn(),
+ pageSize: 10,
+ };
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it("should return correct itemCount when totalRecordsCount is provided", () => {
+ const totalRecordsCount = 100;
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization({
+ ...defaultProps,
+ totalRecordsCount,
+ }),
+ );
+
+ expect(result.current.itemCount).toBe(totalRecordsCount);
+ });
+
+ it("should return rows length as itemCount when totalRecordsCount is not provided", () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization(defaultProps),
+ );
+
+ expect(result.current.itemCount).toBe(defaultProps.rows.length);
+ });
+
+ it("should call loadMore when loadMoreItems is called and not loading", async () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization(defaultProps),
+ );
+
+ await act(async () => {
+ await result.current.loadMoreItems(0, 10);
+ });
+
+ expect(defaultProps.loadMore).toHaveBeenCalledTimes(1);
+ });
+
+ it("should not call loadMore when loadMoreItems is called and is loading", async () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization({
+ ...defaultProps,
+ isLoading: true,
+ }),
+ );
+
+ await act(async () => {
+ await result.current.loadMoreItems(0, 10);
+ });
+
+ expect(defaultProps.loadMore).not.toHaveBeenCalled();
+ });
+
+ it("should return correct isItemLoaded state for different scenarios", () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization(defaultProps),
+ );
+
+ // Index within rows length and not loading
+ expect(result.current.isItemLoaded(1)).toBe(true);
+
+ // Index beyond rows length and not loading
+ expect(result.current.isItemLoaded(5)).toBe(false);
+ });
+
+ it("should return false for isItemLoaded when loading", () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization({
+ ...defaultProps,
+ isLoading: true,
+ }),
+ );
+
+ // Even for index within rows length, should return false when loading
+ expect(result.current.isItemLoaded(1)).toBe(false);
+ });
+
+ it("should return zero itemCount when there are no records", () => {
+ const { result } = renderHook(() =>
+ useInfiniteVirtualization({
+ ...defaultProps,
+ rows: [],
+ }),
+ );
+
+ expect(result.current.itemCount).toBe(0);
+ });
+});
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.tsx
new file mode 100644
index 000000000000..e43540af5fa9
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/InifiniteScrollBody/useInfiniteVirtualization.tsx
@@ -0,0 +1,37 @@
+import { useCallback } from "react";
+import type { Row as ReactTableRowType } from "react-table";
+
+interface InfiniteVirtualizationProps {
+ rows: ReactTableRowType<Record<string, unknown>>[];
+ totalRecordsCount?: number;
+ isLoading: boolean;
+ loadMore: () => void;
+ pageSize: number;
+}
+
+interface UseInfiniteVirtualizationReturn {
+ itemCount: number;
+ loadMoreItems: (startIndex: number, stopIndex: number) => void;
+ isItemLoaded: (index: number) => boolean;
+}
+
+export const useInfiniteVirtualization = ({
+ isLoading,
+ loadMore,
+ rows,
+ totalRecordsCount,
+}: InfiniteVirtualizationProps): UseInfiniteVirtualizationReturn => {
+ const loadMoreItems = useCallback(async () => {
+ if (!isLoading) {
+ loadMore();
+ }
+
+ return Promise.resolve();
+ }, [isLoading, loadMore]);
+
+ return {
+ itemCount: totalRecordsCount ?? rows.length,
+ loadMoreItems,
+ isItemLoaded: (index) => !isLoading && index < rows.length,
+ };
+};
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/VirtualList.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/VirtualList.tsx
new file mode 100644
index 000000000000..c4d79bc97d5c
--- /dev/null
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/VirtualList.tsx
@@ -0,0 +1,91 @@
+import type { ListOnItemsRenderedProps, ReactElementType } from "react-window";
+import { FixedSizeList, areEqual } from "react-window";
+import React from "react";
+import type { ListChildComponentProps } from "react-window";
+import type { Row as ReactTableRowType } from "react-table";
+import { WIDGET_PADDING } from "constants/WidgetConstants";
+import { EmptyRow, Row } from "./Row";
+import type { TableSizes } from "../Constants";
+import type SimpleBar from "simplebar-react";
+
+const rowRenderer = React.memo((rowProps: ListChildComponentProps) => {
+ const { data, index, style } = rowProps;
+
+ if (index < data.length) {
+ const row = data[index];
+
+ return (
+ <Row
+ className="t--virtual-row"
+ index={index}
+ key={index}
+ row={row}
+ style={style}
+ />
+ );
+ } else {
+ return <EmptyRow style={style} />;
+ }
+}, areEqual);
+
+interface BaseVirtualListProps {
+ height: number;
+ tableSizes: TableSizes;
+ rows: ReactTableRowType<Record<string, unknown>>[];
+ pageSize: number;
+ innerElementType?: ReactElementType;
+ outerRef?: React.Ref<SimpleBar>;
+ onItemsRendered?: (props: ListOnItemsRenderedProps) => void;
+ infiniteLoaderListRef?: React.Ref<FixedSizeList>;
+}
+
+const BaseVirtualList = React.memo(function BaseVirtualList({
+ height,
+ infiniteLoaderListRef,
+ innerElementType,
+ onItemsRendered,
+ outerRef,
+ pageSize,
+ rows,
+ tableSizes,
+}: BaseVirtualListProps) {
+ return (
+ <FixedSizeList
+ className="virtual-list simplebar-content"
+ height={
+ height -
+ tableSizes.TABLE_HEADER_HEIGHT -
+ 2 * tableSizes.VERTICAL_PADDING
+ }
+ innerElementType={innerElementType}
+ itemCount={Math.max(rows.length, pageSize)}
+ itemData={rows}
+ itemSize={tableSizes.ROW_HEIGHT}
+ onItemsRendered={onItemsRendered}
+ outerRef={outerRef}
+ ref={infiniteLoaderListRef}
+ width={`calc(100% + ${2 * WIDGET_PADDING}px)`}
+ >
+ {rowRenderer}
+ </FixedSizeList>
+ );
+});
+
+/**
+ * The difference between next two components is in the number of arguments they expect.
+ */
+export const FixedInfiniteVirtualList = React.memo(
+ function FixedInfiniteVirtualList(props: BaseVirtualListProps) {
+ return <BaseVirtualList {...props} />;
+ },
+);
+
+type FixedVirtualListProps = Omit<
+ BaseVirtualListProps,
+ "onItemsRendered" | "infiniteLoaderListRef"
+>;
+export const FixedVirtualList = React.memo(function FixedVirtualList(
+ props: FixedVirtualListProps,
+) {
+ return <BaseVirtualList {...props} />;
+});
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
index dd23a4155cf6..3a5f4b63a209 100644
--- a/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
@@ -5,13 +5,13 @@ import type {
TableBodyPropGetter,
TableBodyProps,
} from "react-table";
-import type { ListChildComponentProps, ReactElementType } from "react-window";
-import { FixedSizeList, areEqual } from "react-window";
-import { WIDGET_PADDING } from "constants/WidgetConstants";
-import { EmptyRows, EmptyRow, Row } from "./Row";
+import { type ReactElementType } from "react-window";
+import type SimpleBar from "simplebar-react";
import type { ReactTableColumnProps, TableSizes } from "../Constants";
import type { HeaderComponentProps } from "../Table";
-import type SimpleBar from "simplebar-react";
+import InfiniteScrollBody from "./InifiniteScrollBody";
+import { EmptyRows, Row } from "./Row";
+import { FixedVirtualList } from "./VirtualList";
export type BodyContextType = {
accentColor: string;
@@ -49,26 +49,6 @@ export const BodyContext = React.createContext<BodyContextType>({
totalColumnsWidth: 0,
});
-const rowRenderer = React.memo((rowProps: ListChildComponentProps) => {
- const { data, index, style } = rowProps;
-
- if (index < data.length) {
- const row = data[index];
-
- return (
- <Row
- className="t--virtual-row"
- index={index}
- key={index}
- row={row}
- style={style}
- />
- );
- } else {
- return <EmptyRow style={style} />;
- }
-}, areEqual);
-
interface BodyPropsType {
getTableBodyProps(
propGetter?: TableBodyPropGetter<Record<string, unknown>> | undefined,
@@ -80,28 +60,22 @@ interface BodyPropsType {
tableSizes: TableSizes;
innerElementType?: ReactElementType;
isInfiniteScrollEnabled?: boolean;
+ isLoading: boolean;
+ loadMoreFromEvaluations: () => void;
}
const TableVirtualBodyComponent = React.forwardRef(
(props: BodyPropsType, ref: Ref<SimpleBar>) => {
return (
<div className="simplebar-content-wrapper">
- <FixedSizeList
- className="virtual-list simplebar-content"
- height={
- props.height -
- props.tableSizes.TABLE_HEADER_HEIGHT -
- 2 * props.tableSizes.VERTICAL_PADDING
- }
+ <FixedVirtualList
+ height={props.height}
innerElementType={props.innerElementType}
- itemCount={Math.max(props.rows.length, props.pageSize)}
- itemData={props.rows}
- itemSize={props.tableSizes.ROW_HEIGHT}
outerRef={ref}
- width={`calc(100% + ${2 * WIDGET_PADDING}px)`}
- >
- {rowRenderer}
- </FixedSizeList>
+ pageSize={props.pageSize}
+ rows={props.rows}
+ tableSizes={props.tableSizes}
+ />
</div>
);
},
@@ -191,7 +165,12 @@ export const TableBody = React.forwardRef(
}}
>
{isInfiniteScrollEnabled ? (
- <div>Infinite Scroll</div>
+ <InfiniteScrollBody
+ itemCount={rows.length}
+ ref={ref}
+ rows={rows}
+ {...restOfProps}
+ />
) : useVirtual ? (
<TableVirtualBodyComponent
isInfiniteScrollEnabled={false}
diff --git a/app/client/src/widgets/TableWidgetV2/component/VirtualTable.tsx b/app/client/src/widgets/TableWidgetV2/component/VirtualTable.tsx
index 15812dafcabe..25a55a0f045e 100644
--- a/app/client/src/widgets/TableWidgetV2/component/VirtualTable.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/VirtualTable.tsx
@@ -38,6 +38,8 @@ type VirtualTableProps = TableColumnHeaderProps & {
scrollContainerStyles: any;
useVirtual: boolean;
isInfiniteScrollEnabled: boolean;
+ isLoading: boolean;
+ loadMoreFromEvaluations: () => void;
};
const VirtualTable = (props: VirtualTableProps, ref: React.Ref<SimpleBar>) => {
@@ -61,8 +63,10 @@ const VirtualTable = (props: VirtualTableProps, ref: React.Ref<SimpleBar>) => {
innerElementType={VirtualTableInnerElement}
isAddRowInProgress={props.isAddRowInProgress}
isInfiniteScrollEnabled={props.isInfiniteScrollEnabled}
+ isLoading={props.isLoading}
isResizingColumn={props.isResizingColumn}
isSortable={props.isSortable}
+ loadMoreFromEvaluations={props.loadMoreFromEvaluations}
multiRowSelection={!!props.multiRowSelection}
pageSize={props.pageSize}
prepareRow={props.prepareRow}
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index fb2dcfec865f..cd0289c01363 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -11192,12 +11192,22 @@ __metadata:
languageName: node
linkType: hard
-"@types/react-window@npm:^1.8.2":
- version: 1.8.2
- resolution: "@types/react-window@npm:1.8.2"
+"@types/react-window-infinite-loader@npm:^1.0.9":
+ version: 1.0.9
+ resolution: "@types/react-window-infinite-loader@npm:1.0.9"
dependencies:
"@types/react": "*"
- checksum: c127ed420d881510fe647539342e7c494802aab12fd6cb61f9f8ba47ef16d3683e632b7a6a07eb0d284ea8f0953ae7941eafa2c51c0bcb3b176d009eac09c79a
+ "@types/react-window": "*"
+ checksum: 9f2c27f24bfa726ceaef6612a4adbda745f3455c877193f68dfa48591274c670a6df4fa6870785cff5f948e289ceb9a247fb7cbf67e3cd555ab16d11866fd63f
+ languageName: node
+ linkType: hard
+
+"@types/react-window@npm:*, @types/react-window@npm:^1.8.2":
+ version: 1.8.8
+ resolution: "@types/react-window@npm:1.8.8"
+ dependencies:
+ "@types/react": "*"
+ checksum: 253c9d6e0c942f34633edbddcbc369324403c42458ff004457c5bd5972961d8433a909c0cc1a89c918063d5eb85ecbdd774142af2555fae61f4ceb3ba9884b5a
languageName: node
linkType: hard
@@ -13003,6 +13013,7 @@ __metadata:
"@types/react-tabs": ^2.3.1
"@types/react-test-renderer": ^17.0.1
"@types/react-window": ^1.8.2
+ "@types/react-window-infinite-loader": ^1.0.9
"@types/redux-form": ^8.1.9
"@types/redux-mock-store": ^1.0.2
"@types/shallowequal": ^1.1.5
@@ -13206,6 +13217,7 @@ __metadata:
react-virtuoso: ^4.5.0
react-webcam: ^7.0.1
react-window: ^1.8.6
+ react-window-infinite-loader: ^1.0.10
react-zoom-pan-pinch: ^1.6.1
redux: ^4.0.1
redux-devtools-extension: ^2.13.8
@@ -29019,6 +29031,16 @@ __metadata:
languageName: node
linkType: hard
+"react-window-infinite-loader@npm:^1.0.10":
+ version: 1.0.10
+ resolution: "react-window-infinite-loader@npm:1.0.10"
+ peerDependencies:
+ react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0
+ react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0
+ checksum: 3ee79ce325e45a7d4d9f92c13e7ff4c523578fa454de3a440980b286d964eb951095c012a7f43ca75e9d86ed2b052c81b08134dfa8827144f44b059cc56514c3
+ languageName: node
+ linkType: hard
+
"react-window@npm:^1.8.6":
version: 1.8.8
resolution: "react-window@npm:1.8.8"
|
6c8c7b2da8a982df95c9bde9810b518626067507
|
2021-12-24 19:36:59
|
Paul Li
|
feat: camera widget (#8069)
| false
|
camera widget (#8069)
|
feat
|
diff --git a/app/client/package.json b/app/client/package.json
index c0fb960009e6..8c20f75bab05 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -102,6 +102,7 @@
"react-dnd-touch-backend": "^9.4.0",
"react-documents": "^1.0.4",
"react-dom": "^16.7.0",
+ "react-full-screen": "^1.1.0",
"react-google-maps": "^9.4.5",
"react-google-recaptcha": "^2.1.0",
"react-helmet": "^5.2.1",
@@ -128,6 +129,7 @@
"react-transition-group": "^4.3.0",
"react-use-gesture": "^7.0.4",
"react-virtuoso": "^1.9.0",
+ "react-webcam": "^6.0.0",
"react-window": "^1.8.6",
"react-zoom-pan-pinch": "^1.6.1",
"redux": "^4.0.1",
@@ -202,6 +204,7 @@
"@types/chance": "^1.0.7",
"@types/codemirror": "^0.0.96",
"@types/deep-diff": "^1.0.0",
+ "@types/dom-mediacapture-record": "^1.0.11",
"@types/downloadjs": "^1.4.2",
"@types/draft-js": "^0.11.1",
"@types/emoji-mart": "^3.0.4",
diff --git a/app/client/src/assets/icons/widget/camera.svg b/app/client/src/assets/icons/widget/camera.svg
new file mode 100755
index 000000000000..4e936cf6a9b1
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera.svg
@@ -0,0 +1,3 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+ <path fill="#4b4848" d="M9 3h6l2 2h4a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1h4l2-2zm3 16a6 6 0 1 0 0-12 6 6 0 0 0 0 12zm0-2a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widget/camera/camera-muted.svg b/app/client/src/assets/icons/widget/camera/camera-muted.svg
new file mode 100755
index 000000000000..8870a8631e14
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/camera-muted.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.6364 5C16.1382 5 16.5455 5.392 16.5455 5.875V9.55001L21.2846 6.35625C21.49 6.21801 21.7736 6.26613 21.9182 6.46476C21.9709 6.53826 22 6.62575 22 6.715V17.285C22 17.5265 21.7963 17.7226 21.5454 17.7226C21.4518 17.7226 21.3609 17.6945 21.2846 17.6438L16.5455 14.45V18.125C16.5455 18.608 16.1382 19 15.6364 19H2.90909C2.40728 19 2 18.608 2 18.125V5.875C2 5.392 2.40728 5 2.90909 5H15.6364ZM14.7272 6.75H3.81818V17.2501H14.7272V6.75ZM20.1818 9.23588L16.5455 11.6859V12.3141L20.1818 14.7641V9.23588Z" fill="white"/>
+<path d="M21.5 2.5L2 21.5" stroke="white" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/camera/camera-offline.svg b/app/client/src/assets/icons/widget/camera/camera-offline.svg
new file mode 100755
index 000000000000..0190cd1a1b56
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/camera-offline.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5861 20.0001H2.00007C1.73485 20.0001 1.4805 19.8947 1.29296 19.7072C1.10542 19.5196 1.00007 19.2653 1.00007 19.0001V5.00007C1.00007 4.73485 1.10542 4.4805 1.29296 4.29296C1.4805 4.10542 1.73485 4.00007 2.00007 4.00007H2.58607L0.393066 1.80807L1.80807 0.393066L21.6071 20.1931L20.1921 21.6071L18.5861 20.0001ZM4.58607 6.00007H3.00007V18.0001H16.5861L14.4061 15.8201C13.3486 16.657 12.0205 17.0762 10.6742 16.9981C9.32795 16.92 8.05726 16.35 7.10368 15.3965C6.1501 14.4429 5.5801 13.1722 5.502 11.8259C5.4239 10.4796 5.84315 9.15151 6.68007 8.09407L4.58607 6.00007ZM8.11007 9.52507C7.64905 10.1988 7.43805 11.0125 7.51359 11.8254C7.58912 12.6383 7.94644 13.3992 8.5237 13.9764C9.10097 14.5537 9.86187 14.911 10.6747 14.9865C11.4876 15.0621 12.3013 14.8511 12.9751 14.3901L8.11007 9.52507ZM21.0001 16.7851L19.0001 14.7851V6.00007H15.1721L13.1721 4.00007H8.82807L8.52107 4.30707L7.10707 2.89307L8.00007 2.00007H14.0001L16.0001 4.00007H20.0001C20.2653 4.00007 20.5196 4.10542 20.7072 4.29296C20.8947 4.4805 21.0001 4.73485 21.0001 5.00007V16.7861V16.7851ZM10.2631 6.05007C11.1024 5.93646 11.9567 6.01825 12.7592 6.28905C13.5618 6.55985 14.2909 7.01236 14.8899 7.61128C15.4888 8.21021 15.9413 8.93937 16.2121 9.74191C16.4829 10.5445 16.5647 11.3987 16.4511 12.2381L14.1131 9.90007C13.7783 9.25128 13.2499 8.72282 12.6011 8.38807L10.2631 6.05007Z" fill="#858282"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/camera/camera.svg b/app/client/src/assets/icons/widget/camera/camera.svg
new file mode 100755
index 000000000000..08cf224f98b7
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/camera.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="14" viewBox="0 0 20 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.3334 0.333496C13.7934 0.333496 14.1667 0.706829 14.1667 1.16683V4.66683L18.5109 1.62516C18.6992 1.4935 18.9592 1.53933 19.0917 1.7285C19.14 1.7985 19.1667 1.88183 19.1667 1.96683V12.0335C19.1667 12.2635 18.98 12.4502 18.75 12.4502C18.6642 12.4502 18.5809 12.4235 18.5109 12.3752L14.1667 9.3335V12.8335C14.1667 13.2935 13.7934 13.6668 13.3334 13.6668H1.66671C1.20671 13.6668 0.833374 13.2935 0.833374 12.8335V1.16683C0.833374 0.706829 1.20671 0.333496 1.66671 0.333496H13.3334ZM12.5 2.00016H2.50004V12.0002H12.5V2.00016ZM17.5 4.36766L14.1667 6.701V7.29933L17.5 9.63266V4.36766Z" fill="white"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/camera/exit-fullscreen.svg b/app/client/src/assets/icons/widget/camera/exit-fullscreen.svg
new file mode 100644
index 000000000000..74aec6494192
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/exit-fullscreen.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">
+ <path d="M5.5 0a.5.5 0 0 1 .5.5v4A1.5 1.5 0 0 1 4.5 6h-4a.5.5 0 0 1 0-1h4a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 1 .5-.5zm5 0a.5.5 0 0 1 .5.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 1 0 1h-4A1.5 1.5 0 0 1 10 4.5v-4a.5.5 0 0 1 .5-.5zM0 10.5a.5.5 0 0 1 .5-.5h4A1.5 1.5 0 0 1 6 11.5v4a.5.5 0 0 1-1 0v-4a.5.5 0 0 0-.5-.5h-4a.5.5 0 0 1-.5-.5zm10 1a1.5 1.5 0 0 1 1.5-1.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 0-.5.5v4a.5.5 0 0 1-1 0v-4z" fill="white" />
+</svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widget/camera/fullscreen.svg b/app/client/src/assets/icons/widget/camera/fullscreen.svg
new file mode 100755
index 000000000000..129c7504a73b
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/fullscreen.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="16" viewBox="0 0 18 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.6667 0.5H17.3333V5.5H15.6667V2.16667H12.3333V0.5H15.6667ZM2.33332 0.5H5.66666V2.16667H2.33332V5.5H0.666656V0.5H2.33332ZM15.6667 13.8333V10.5H17.3333V15.5H12.3333V13.8333H15.6667ZM2.33332 13.8333H5.66666V15.5H0.666656V10.5H2.33332V13.8333Z" fill="white"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/camera/microphone-muted.svg b/app/client/src/assets/icons/widget/camera/microphone-muted.svg
new file mode 100755
index 000000000000..1f64cef1a612
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/microphone-muted.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.3929 0C16.2411 0 16.0893 0.0642857 15.9679 0.192857L11.5357 4.88571V3.21429C11.5357 1.44643 10.1696 0 8.5 0C6.83036 0 5.46429 1.44643 5.46429 3.21429V9.64286C5.46429 10.125 5.58571 10.575 5.7375 10.9929L4.82679 11.9571C4.43214 11.2821 4.21964 10.4786 4.21964 9.64286V7.71429C4.21964 7.36071 3.94643 7.07143 3.6125 7.07143C3.27857 7.07143 3.00536 7.36071 3.00536 7.71429V9.64286C3.00536 10.8321 3.33929 11.9571 3.94643 12.8893L0.182143 16.9071C0.0607143 17.0036 0 17.1643 0 17.3571C0 17.7107 0.273214 18 0.607143 18C0.789286 18 0.941071 17.9357 1.03214 17.8071L11.2929 6.94286C11.3232 6.91071 11.3839 6.87857 11.4143 6.81429L16.8179 1.09286C16.9393 0.996429 17 0.803571 17 0.642857C17 0.289286 16.7268 0 16.3929 0ZM13.3571 7.07143C13.0232 7.07143 12.75 7.36071 12.75 7.71429V9.64286C12.75 12.1179 10.8982 14.1107 8.56071 14.1429C8.53036 14.1429 8.5 14.1429 8.46964 14.1429C8.43929 14.1429 8.40893 14.1429 8.40893 14.1429C7.92321 14.1429 7.4375 14.0464 7.0125 13.8857C6.95179 13.8536 6.86071 13.8536 6.8 13.8536C6.46607 13.8536 6.19286 14.1429 6.19286 14.4964C6.19286 14.7857 6.375 15.0107 6.61786 15.1071C7.0125 15.2679 7.4375 15.3643 7.89286 15.4286V16.7143H6.07143C5.7375 16.7143 5.46429 17.0036 5.46429 17.3571C5.46429 17.7107 5.7375 18 6.07143 18H8.40893C8.43929 18 8.46964 18 8.5 18C8.53036 18 8.56071 18 8.59107 18H10.9286C11.2625 18 11.5357 17.7107 11.5357 17.3571C11.5357 17.0036 11.2625 16.7143 10.9286 16.7143H9.10714V15.3964C11.8393 15.075 13.9643 12.6321 13.9643 9.64286V7.71429C13.9643 7.36071 13.6911 7.07143 13.3571 7.07143Z" fill="white"/>
+</svg>
diff --git a/app/client/src/assets/icons/widget/camera/microphone.svg b/app/client/src/assets/icons/widget/camera/microphone.svg
new file mode 100755
index 000000000000..0371b857a713
--- /dev/null
+++ b/app/client/src/assets/icons/widget/camera/microphone.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.99994 2.50016C7.3369 2.50016 6.70102 2.76355 6.23218 3.2324C5.76333 3.70124 5.49994 4.33712 5.49994 5.00016V8.3335C5.49994 8.99654 5.76333 9.63242 6.23218 10.1013C6.70102 10.5701 7.3369 10.8335 7.99994 10.8335C8.66298 10.8335 9.29887 10.5701 9.76771 10.1013C10.2366 9.63242 10.4999 8.99654 10.4999 8.3335V5.00016C10.4999 4.33712 10.2366 3.70124 9.76771 3.2324C9.29887 2.76355 8.66298 2.50016 7.99994 2.50016ZM7.99994 0.833496C8.54712 0.833496 9.08893 0.94127 9.59446 1.15066C10.1 1.36006 10.5593 1.66697 10.9462 2.05388C11.3331 2.4408 11.64 2.90012 11.8494 3.40565C12.0588 3.91117 12.1666 4.45299 12.1666 5.00016V8.3335C12.1666 9.43856 11.7276 10.4984 10.9462 11.2798C10.1648 12.0612 9.10501 12.5002 7.99994 12.5002C6.89487 12.5002 5.83507 12.0612 5.05366 11.2798C4.27226 10.4984 3.83328 9.43856 3.83328 8.3335V5.00016C3.83328 3.89509 4.27226 2.83529 5.05366 2.05388C5.83507 1.27248 6.89487 0.833496 7.99994 0.833496ZM0.545776 9.16683H2.22494C2.42685 10.5541 3.1215 11.8224 4.1818 12.7396C5.24211 13.6567 6.59718 14.1615 7.99911 14.1615C9.40104 14.1615 10.7561 13.6567 11.8164 12.7396C12.8767 11.8224 13.5714 10.5541 13.7733 9.16683H15.4533C15.2638 10.8574 14.5055 12.4335 13.3026 13.6364C12.0998 14.8394 10.5238 15.598 8.83328 15.7877V19.1668H7.16661V15.7877C5.47589 15.5982 3.89976 14.8397 2.69676 13.6367C1.49375 12.4337 0.735287 10.8575 0.545776 9.16683Z" fill="white"/>
+</svg>
diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
index 6dbd6732ff42..24fd4d9ffcda 100644
--- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
+++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
@@ -92,6 +92,9 @@ export enum EventType {
ON_RECORDING_COMPLETE = "ON_RECORDING_COMPLETE",
ON_SWITCH_GROUP_SELECTION_CHANGE = "ON_SWITCH_GROUP_SELECTION_CHANGE",
ON_JS_FUNCTION_EXECUTE = "ON_JS_FUNCTION_EXECUTE",
+ ON_CAMERA_IMAGE_CAPTURE = "ON_CAMERA_IMAGE_CAPTURE",
+ ON_CAMERA_VIDEO_RECORDING_START = "ON_CAMERA_VIDEO_RECORDING_START",
+ ON_CAMERA_VIDEO_RECORDING_STOP = "ON_CAMERA_VIDEO_RECORDING_STOP",
}
export interface PageAction {
diff --git a/app/client/src/globalStyles/tooltip.ts b/app/client/src/globalStyles/tooltip.ts
index 1eb98effd7e7..77c42b3e332f 100644
--- a/app/client/src/globalStyles/tooltip.ts
+++ b/app/client/src/globalStyles/tooltip.ts
@@ -8,9 +8,10 @@ export const GLOBAL_STYLE_TOOLTIP_CLASSNAME = "ads-global-tooltip";
export const TooltipStyles = createGlobalStyle<{
theme: Theme;
}>`
- .${Classes.PORTAL} {
- .${Classes.TOOLTIP}.${GLOBAL_STYLE_TOOLTIP_CLASSNAME} {
- max-width: 350px;
+ .${Classes.PORTAL} .${Classes.TOOLTIP}.${GLOBAL_STYLE_TOOLTIP_CLASSNAME}, .${
+ Classes.TOOLTIP
+}.${GLOBAL_STYLE_TOOLTIP_CLASSNAME} {
+ max-width: 350px;
overflow-wrap: anywhere;
.${Classes.POPOVER_CONTENT} {
padding: 10px 12px;
@@ -30,6 +31,5 @@ export const TooltipStyles = createGlobalStyle<{
.${CsClasses.BP3_POPOVER_ARROW_FILL} {
fill: ${(props) => props.theme.colors.tooltip.darkBg};
}
- }
}
`;
diff --git a/app/client/src/icons/WidgetIcons.tsx b/app/client/src/icons/WidgetIcons.tsx
index b0dbbbae4588..3d3df1bd5d26 100644
--- a/app/client/src/icons/WidgetIcons.tsx
+++ b/app/client/src/icons/WidgetIcons.tsx
@@ -1,4 +1,7 @@
import React, { JSXElementConstructor } from "react";
+import styled from "styled-components";
+
+import { Colors } from "constants/Colors";
import { IconProps, IconWrapper } from "constants/IconConstants";
import { ReactComponent as SpinnerIcon } from "assets/icons/widget/alert.svg";
import { ReactComponent as ButtonIcon } from "assets/icons/widget/button.svg";
@@ -35,8 +38,7 @@ import { ReactComponent as CheckboxGroupIcon } from "assets/icons/widget/checkbo
import { ReactComponent as AudioRecorderIcon } from "assets/icons/widget/audio-recorder.svg";
import { ReactComponent as ButtonGroupIcon } from "assets/icons/widget/button-group.svg";
import { ReactComponent as SwitchGroupIcon } from "assets/icons/widget/switch-group.svg";
-import styled from "styled-components";
-import { Colors } from "constants/Colors";
+import { ReactComponent as CameraIcon } from "assets/icons/widget/camera.svg";
/* eslint-disable react/display-name */
@@ -231,6 +233,11 @@ export const WidgetIcons: {
<SwitchGroupIcon />
</StyledIconWrapper>
),
+ CAMERA_WIDGET: (props: IconProps) => (
+ <StyledIconWrapper {...props}>
+ <CameraIcon />
+ </StyledIconWrapper>
+ ),
};
export type WidgetIcon = typeof WidgetIcons[keyof typeof WidgetIcons];
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index 83b110785cc1..c4b4f7d49cc6 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -418,3 +418,34 @@ export const getPageURL = (
page.pageId,
);
};
+
+/**
+ * Convert Base64 string to Blob
+ * @param base64Data
+ * @param contentType
+ * @param sliceSize
+ * @returns
+ */
+export const base64ToBlob = (
+ base64Data: string,
+ contentType = "",
+ sliceSize = 512,
+) => {
+ const byteCharacters = atob(base64Data);
+ const byteArrays = [];
+
+ for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+ const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+ const byteNumbers = new Array(slice.length);
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers[i] = slice.charCodeAt(i);
+ }
+
+ const byteArray = new Uint8Array(byteNumbers);
+ byteArrays.push(byteArray);
+ }
+
+ const blob = new Blob(byteArrays, { type: contentType });
+ return blob;
+};
diff --git a/app/client/src/utils/WidgetRegistry.tsx b/app/client/src/utils/WidgetRegistry.tsx
index bd3975dfe41a..9bd545a78821 100644
--- a/app/client/src/utils/WidgetRegistry.tsx
+++ b/app/client/src/utils/WidgetRegistry.tsx
@@ -114,6 +114,10 @@ import SwitchGroupWidget, {
import log from "loglevel";
+import CameraWidget, {
+ CONFIG as CAMERA_WIDGET_CONFIG,
+} from "widgets/CameraWidget";
+
export const registerWidgets = () => {
const start = performance.now();
registerWidget(CanvasWidget, CANVAS_WIDGET_CONFIG);
@@ -158,6 +162,7 @@ export const registerWidgets = () => {
registerWidget(SingleSelectTreeWidget, SINGLE_SELECT_TREE_WIDGET_CONFIG);
registerWidget(SwitchGroupWidget, SWITCH_GROUP_WIDGET_CONFIG);
registerWidget(AudioWidget, AUDIO_WIDGET_CONFIG);
+ registerWidget(CameraWidget, CAMERA_WIDGET_CONFIG);
log.debug("Widget registration took: ", performance.now() - start, "ms");
};
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.ts b/app/client/src/utils/autocomplete/EntityDefinitions.ts
index ed6307a4d49c..7f3cfd00901f 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.ts
@@ -430,6 +430,17 @@ export const entityDefinitions: Record<string, unknown> = {
"!url": "https://docs.appsmith.com/widget-reference/switch-group",
selectedValues: "[string]",
},
+ CAMERA_WIDGET: {
+ "!doc":
+ "Camera widget allows users to take a picture or record videos through their system camera using browser permissions.",
+ "!url": "https://docs.appsmith.com/widget-reference/camera",
+ imageBlobURL: "string",
+ imageDataURL: "string",
+ imageRawBinary: "string",
+ videoBlobURL: "string",
+ videoDataURL: "string",
+ videoRawBinary: "string",
+ },
};
export const GLOBAL_DEFS = {
diff --git a/app/client/src/widgets/CameraWidget/component/index.tsx b/app/client/src/widgets/CameraWidget/component/index.tsx
new file mode 100644
index 000000000000..5fb926905006
--- /dev/null
+++ b/app/client/src/widgets/CameraWidget/component/index.tsx
@@ -0,0 +1,1207 @@
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import styled, { css } from "styled-components";
+import { Button, Icon, Menu, MenuItem, Position } from "@blueprintjs/core";
+import { Popover2 } from "@blueprintjs/popover2";
+import Webcam from "react-webcam";
+import { useStopwatch } from "react-timer-hook";
+import {
+ FullScreen,
+ FullScreenHandle,
+ useFullScreenHandle,
+} from "react-full-screen";
+
+import { ThemeProp } from "components/ads/common";
+import {
+ ButtonBorderRadius,
+ ButtonBorderRadiusTypes,
+ ButtonVariant,
+ ButtonVariantTypes,
+} from "components/constants";
+import { SupportedLayouts } from "reducers/entityReducers/pageListReducer";
+import { getCurrentApplicationLayout } from "selectors/editorSelectors";
+import { useSelector } from "store";
+import { Colors } from "constants/Colors";
+import TooltipComponent from "components/ads/Tooltip";
+
+import {
+ CameraMode,
+ CameraModeTypes,
+ DeviceType,
+ DeviceTypes,
+ MediaCaptureAction,
+ MediaCaptureActionTypes,
+ MediaCaptureStatus,
+ MediaCaptureStatusTypes,
+} from "../constants";
+import { ReactComponent as CameraOfflineIcon } from "assets/icons/widget/camera/camera-offline.svg";
+import { ReactComponent as CameraIcon } from "assets/icons/widget/camera/camera.svg";
+import { ReactComponent as CameraMutedIcon } from "assets/icons/widget/camera/camera-muted.svg";
+import { ReactComponent as MicrophoneIcon } from "assets/icons/widget/camera/microphone.svg";
+import { ReactComponent as MicrophoneMutedIcon } from "assets/icons/widget/camera/microphone-muted.svg";
+import { ReactComponent as FullScreenIcon } from "assets/icons/widget/camera/fullscreen.svg";
+import { ReactComponent as ExitFullScreenIcon } from "assets/icons/widget/camera/exit-fullscreen.svg";
+
+const overlayerMixin = css`
+ position: absolute;
+ width: 100%;
+ left: 0;
+ top: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+`;
+
+export interface CameraContainerProps {
+ disabled: boolean;
+ scaleAxis: "x" | "y";
+}
+
+const CameraContainer = styled.div<CameraContainerProps>`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ overflow: hidden;
+ ${({ disabled }) => disabled && `background: ${Colors.GREY_3}`};
+
+ .fullscreen {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ width: 100%;
+ height: 100%;
+
+ span.error-text {
+ color: ${Colors.GREY_8};
+ }
+ }
+
+ video {
+ max-width: none;
+ ${({ scaleAxis }) => (scaleAxis === "x" ? `width: 100%` : `height: 100%`)};
+ }
+
+ .fullscreen-enabled {
+ video {
+ height: 100%;
+ }
+ }
+`;
+
+export interface DisabledOverlayerProps {
+ disabled: boolean;
+}
+
+const DisabledOverlayer = styled.div<DisabledOverlayerProps>`
+ ${overlayerMixin}
+ display: ${({ disabled }) => (disabled ? `flex` : `none`)};
+ height: 100%;
+ z-index: 2;
+ background: ${Colors.GREY_3};
+`;
+
+const PhotoViewer = styled.img`
+ ${overlayerMixin}
+ height: 100%;
+`;
+
+const VideoPlayer = styled.video`
+ ${overlayerMixin}
+`;
+
+const ControlPanelContainer = styled.div`
+ width: 100%;
+`;
+
+export interface ControlPanelOverlayerProps {
+ appLayoutType?: SupportedLayouts;
+}
+
+const ControlPanelOverlayer = styled.div<ControlPanelOverlayerProps>`
+ position: absolute;
+ width: 100%;
+ left: 0;
+ bottom: 0;
+ padding: 1%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ flex-direction: ${({ appLayoutType }) =>
+ appLayoutType === "MOBILE" ? `column` : `row`};
+`;
+
+const MediaInputsContainer = styled.div`
+ display: flex;
+ flex: 1;
+ justify-content: flex-start;
+`;
+
+const MainControlContainer = styled.div`
+ display: flex;
+ flex: 1;
+ justify-content: center;
+`;
+
+const FullscreenContainer = styled.div`
+ display: flex;
+ flex: 1;
+ justify-content: flex-end;
+`;
+
+const TimerContainer = styled.div`
+ position: absolute;
+ top: 2%;
+ padding: 1%;
+ background: #4b4848;
+ color: #ffffff;
+`;
+
+export interface StyledButtonProps {
+ variant: ButtonVariant;
+ borderRadius: ButtonBorderRadius;
+}
+
+const StyledButton = styled(Button)<ThemeProp & StyledButtonProps>`
+ z-index: 1;
+ height: 32px;
+ width: 32px;
+ margin: 0 1%;
+ box-shadow: none !important;
+ ${({ borderRadius }) =>
+ borderRadius === ButtonBorderRadiusTypes.CIRCLE &&
+ `
+ border-radius: 50%;
+ `}
+ border: ${({ variant }) =>
+ variant === ButtonVariantTypes.SECONDARY ? `1px solid white` : `none`};
+ background: ${({ theme, variant }) =>
+ variant === ButtonVariantTypes.PRIMARY
+ ? theme.colors.button.primary.primary.bgColor
+ : `none`} !important;
+`;
+
+export interface ControlPanelProps {
+ mode: CameraMode;
+ audioInputs: MediaDeviceInfo[];
+ audioMuted: boolean;
+ videoMuted: boolean;
+ videoInputs: MediaDeviceInfo[];
+ status: MediaCaptureStatus;
+ appLayoutType?: SupportedLayouts;
+ fullScreenHandle: FullScreenHandle;
+ onCaptureImage: () => void;
+ onError: (errorMessage: string) => void;
+ onMediaInputChange: (mediaDeviceInfo: MediaDeviceInfo) => void;
+ onRecordingStart: () => void;
+ onRecordingStop: () => void;
+ onResetMedia: () => void;
+ onStatusChange: (status: MediaCaptureStatus) => void;
+ onToggleAudio: (isMute: boolean) => void;
+ onToggleVideo: (isMute: boolean) => void;
+ onVideoPlay: () => void;
+ onVideoPause: () => void;
+}
+
+function ControlPanel(props: ControlPanelProps) {
+ const {
+ appLayoutType,
+ audioInputs,
+ audioMuted,
+ fullScreenHandle,
+ mode,
+ onCaptureImage,
+ onError,
+ onMediaInputChange,
+ onRecordingStart,
+ onRecordingStop,
+ onResetMedia,
+ onStatusChange,
+ onToggleAudio,
+ onToggleVideo,
+ onVideoPause,
+ onVideoPlay,
+ status,
+ videoInputs,
+ videoMuted,
+ } = props;
+
+ const handleControlClick = (action: MediaCaptureAction) => {
+ return () => {
+ switch (action) {
+ case MediaCaptureActionTypes.IMAGE_CAPTURE:
+ // First, check for media device permissions
+ navigator.mediaDevices
+ .getUserMedia({ video: true, audio: false })
+ .then(() => {
+ onCaptureImage();
+ onStatusChange(MediaCaptureStatusTypes.IMAGE_CAPTURED);
+ })
+ .catch((err) => {
+ onError(err.message);
+ });
+
+ break;
+ case MediaCaptureActionTypes.IMAGE_SAVE:
+ onStatusChange(MediaCaptureStatusTypes.IMAGE_SAVED);
+ break;
+ case MediaCaptureActionTypes.IMAGE_DISCARD:
+ onResetMedia();
+ onStatusChange(MediaCaptureStatusTypes.IMAGE_DEFAULT);
+ break;
+ case MediaCaptureActionTypes.IMAGE_REFRESH:
+ onResetMedia();
+ onStatusChange(MediaCaptureStatusTypes.IMAGE_DEFAULT);
+ break;
+
+ case MediaCaptureActionTypes.RECORDING_START:
+ // First, check for media device permissions
+ navigator.mediaDevices
+ .getUserMedia({ video: true, audio: true })
+ .then(() => {
+ onRecordingStart();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_RECORDING);
+ })
+ .catch((err) => {
+ onError(err.message);
+ });
+
+ break;
+ case MediaCaptureActionTypes.RECORDING_STOP:
+ onRecordingStop();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_CAPTURED);
+ break;
+ case MediaCaptureActionTypes.RECORDING_DISCARD:
+ onResetMedia();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_DEFAULT);
+ break;
+ case MediaCaptureActionTypes.RECORDING_SAVE:
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_SAVED);
+ break;
+ case MediaCaptureActionTypes.VIDEO_PLAY:
+ onVideoPlay();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_PLAYING);
+ break;
+ case MediaCaptureActionTypes.VIDEO_PAUSE:
+ onVideoPause();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_PAUSED);
+ break;
+ case MediaCaptureActionTypes.VIDEO_PLAY_AFTER_SAVE:
+ onVideoPlay();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_PLAYING_AFTER_SAVE);
+ break;
+ case MediaCaptureActionTypes.VIDEO_PAUSE_AFTER_SAVE:
+ onVideoPause();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_PAUSED_AFTER_SAVE);
+ break;
+ case MediaCaptureActionTypes.VIDEO_REFRESH:
+ onResetMedia();
+ onStatusChange(MediaCaptureStatusTypes.VIDEO_DEFAULT);
+ break;
+ default:
+ break;
+ }
+ };
+ };
+
+ const renderMediaDeviceSelectors = () => {
+ return (
+ <>
+ {mode === CameraModeTypes.VIDEO && (
+ <DevicePopover
+ deviceType={DeviceTypes.MICROPHONE}
+ disabled={audioMuted}
+ items={audioInputs}
+ onDeviceMute={onToggleAudio}
+ onItemClick={onMediaInputChange}
+ />
+ )}
+ <DevicePopover
+ deviceType={DeviceTypes.CAMERA}
+ disabled={videoMuted}
+ items={videoInputs}
+ onDeviceMute={onToggleVideo}
+ onItemClick={onMediaInputChange}
+ />
+ </>
+ );
+ };
+
+ const renderControls = () => {
+ switch (status) {
+ case MediaCaptureStatusTypes.IMAGE_DEFAULT:
+ return (
+ <TooltipComponent
+ content="Take photo"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="full-circle" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.IMAGE_CAPTURE,
+ )}
+ variant={ButtonVariantTypes.SECONDARY}
+ />
+ </TooltipComponent>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.IMAGE_CAPTURED:
+ return (
+ <>
+ <TooltipComponent
+ content="Save"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={<Icon color="white" icon="tick" iconSize={20} />}
+ onClick={handleControlClick(MediaCaptureActionTypes.IMAGE_SAVE)}
+ variant={ButtonVariantTypes.PRIMARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Discard"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="cross" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.IMAGE_DISCARD,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.IMAGE_SAVED:
+ return (
+ <TooltipComponent
+ content="Refresh"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="refresh" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.IMAGE_REFRESH,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_DEFAULT:
+ return (
+ <TooltipComponent
+ content="Start recording"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="#F22B2B" icon="full-circle" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_START,
+ )}
+ variant={ButtonVariantTypes.SECONDARY}
+ />
+ </TooltipComponent>
+ );
+ break;
+ case MediaCaptureStatusTypes.VIDEO_RECORDING:
+ return (
+ <>
+ <TooltipComponent
+ content="Stop recording"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="#F22B2B" icon="stop" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_STOP,
+ )}
+ variant={ButtonVariantTypes.SECONDARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Discard"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="cross" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_DISCARD,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_CAPTURED:
+ return (
+ <>
+ <TooltipComponent
+ content="Save"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={<Icon color="white" icon="tick" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_SAVE,
+ )}
+ variant={ButtonVariantTypes.PRIMARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Play"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="play" iconSize={20} />}
+ onClick={handleControlClick(MediaCaptureActionTypes.VIDEO_PLAY)}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Discard"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="cross" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_DISCARD,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_PLAYING:
+ return (
+ <>
+ <TooltipComponent
+ content="Save"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={<Icon color="white" icon="tick" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_SAVE,
+ )}
+ variant={ButtonVariantTypes.PRIMARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Pause"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="pause" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_PAUSE,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Discard"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="cross" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_DISCARD,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_PAUSED:
+ return (
+ <>
+ <TooltipComponent
+ content="Save"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={<Icon color="white" icon="tick" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_SAVE,
+ )}
+ variant={ButtonVariantTypes.PRIMARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Play"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="play" iconSize={20} />}
+ onClick={handleControlClick(MediaCaptureActionTypes.VIDEO_PLAY)}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Discard"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="cross" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.RECORDING_DISCARD,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_SAVED:
+ return (
+ <>
+ <TooltipComponent
+ content="Play"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="play" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_PLAY_AFTER_SAVE,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Refresh"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="refresh" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_REFRESH,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_PLAYING_AFTER_SAVE:
+ return (
+ <>
+ <TooltipComponent
+ content="Pause"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="pause" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_PAUSE_AFTER_SAVE,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Refresh"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="refresh" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_REFRESH,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ case MediaCaptureStatusTypes.VIDEO_PAUSED_AFTER_SAVE:
+ return (
+ <>
+ <TooltipComponent
+ content="Play"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="play" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_PLAY_AFTER_SAVE,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ <TooltipComponent
+ content="Refresh"
+ donotUsePortal
+ position={Position.TOP}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.CIRCLE}
+ icon={<Icon color="white" icon="refresh" iconSize={20} />}
+ onClick={handleControlClick(
+ MediaCaptureActionTypes.VIDEO_REFRESH,
+ )}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ </>
+ );
+ break;
+
+ default:
+ break;
+ }
+ };
+
+ const renderFullscreenControl = () => {
+ return fullScreenHandle.active ? (
+ <TooltipComponent
+ content="Exit full screen"
+ donotUsePortal
+ position={Position.TOP_RIGHT}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={
+ <Icon color="white" icon={<ExitFullScreenIcon />} iconSize={20} />
+ }
+ onClick={fullScreenHandle.exit}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ ) : (
+ <TooltipComponent
+ content="Full screen"
+ donotUsePortal
+ position={Position.TOP_RIGHT}
+ >
+ <StyledButton
+ borderRadius={ButtonBorderRadiusTypes.SHARP}
+ icon={<Icon color="white" icon={<FullScreenIcon />} iconSize={20} />}
+ onClick={fullScreenHandle.enter}
+ variant={ButtonVariantTypes.TERTIARY}
+ />
+ </TooltipComponent>
+ );
+ };
+
+ return (
+ <ControlPanelContainer>
+ <ControlPanelOverlayer appLayoutType={appLayoutType}>
+ <MediaInputsContainer>
+ {renderMediaDeviceSelectors()}
+ </MediaInputsContainer>
+ <MainControlContainer>{renderControls()}</MainControlContainer>
+ <FullscreenContainer>{renderFullscreenControl()}</FullscreenContainer>
+ </ControlPanelOverlayer>
+ </ControlPanelContainer>
+ );
+}
+
+// Timer(recording & playing)
+const getFormattedDigit = (value: number) => {
+ return value >= 10 ? value.toString() : `0${value.toString()}`;
+};
+export interface TimerProps {
+ days: number;
+ hours: number;
+ minutes: number;
+ seconds: number;
+}
+
+function Timer(props: TimerProps) {
+ const { days, hours, minutes, seconds } = props;
+ return (
+ <TimerContainer>
+ {!!days && <span>{`${getFormattedDigit(days)}:`}</span>}
+ {!!hours && <span>{`${getFormattedDigit(hours)}:`}</span>}
+ <span>{`${getFormattedDigit(minutes)}:`}</span>
+ <span>{`${getFormattedDigit(seconds)}`}</span>
+ </TimerContainer>
+ );
+}
+
+// Device menus (microphone, camera)
+export interface DeviceMenuProps {
+ items: MediaDeviceInfo[];
+ onItemClick: (item: MediaDeviceInfo) => void;
+}
+
+function DeviceMenu(props: DeviceMenuProps) {
+ const { items, onItemClick } = props;
+ return (
+ <Menu>
+ {items.map((item: MediaDeviceInfo) => {
+ return (
+ <MenuItem
+ key={item.deviceId}
+ onClick={() => onItemClick(item)}
+ text={item.label || item.deviceId}
+ />
+ );
+ })}
+ </Menu>
+ );
+}
+
+export interface DevicePopoverProps {
+ deviceType: DeviceType;
+ disabled?: boolean;
+ items: MediaDeviceInfo[];
+ onDeviceMute?: (isMute: boolean) => void;
+ onItemClick: (item: MediaDeviceInfo) => void;
+}
+
+function DevicePopover(props: DevicePopoverProps) {
+ const { deviceType, disabled, items, onDeviceMute, onItemClick } = props;
+
+ const handleDeviceMute = useCallback(() => {
+ if (onDeviceMute) {
+ onDeviceMute(!disabled);
+ }
+ }, [disabled, onDeviceMute]);
+
+ const renderLeftIcon = (deviceType: DeviceType) => {
+ if (deviceType === DeviceTypes.CAMERA) {
+ if (disabled) {
+ return <CameraMutedIcon />;
+ }
+ return <CameraIcon />;
+ }
+ if (disabled) {
+ return <MicrophoneMutedIcon />;
+ }
+ return <MicrophoneIcon />;
+ };
+
+ return (
+ <>
+ <Button
+ icon={renderLeftIcon(deviceType)}
+ minimal
+ onClick={handleDeviceMute}
+ />
+ <Popover2
+ content={<DeviceMenu items={items} onItemClick={onItemClick} />}
+ >
+ <Button minimal rightIcon={<Icon color="white" icon="caret-down" />} />
+ </Popover2>
+ </>
+ );
+}
+
+function CameraComponent(props: CameraComponentProps) {
+ const {
+ disabled,
+ height,
+ mirrored,
+ mode,
+ onImageCapture,
+ onRecordingStart,
+ onRecordingStop,
+ videoBlobURL,
+ width,
+ } = props;
+
+ const webcamRef = useRef<Webcam>(null);
+ const mediaRecorderRef = useRef<MediaRecorder>();
+ const videoElementRef = useRef<HTMLVideoElement>(null);
+
+ const [scaleAxis, setScaleAxis] = useState<"x" | "y">("x");
+ const [audioInputs, setAudioInputs] = useState<MediaDeviceInfo[]>([]);
+ const [videoInputs, setVideoInputs] = useState<MediaDeviceInfo[]>([]);
+ const [audioConstraints, setAudioConstraints] = useState<
+ MediaTrackConstraints
+ >({});
+ const [videoConstraints, setVideoConstraints] = useState<
+ MediaTrackConstraints
+ >({});
+ const [image, setImage] = useState<string | null>();
+ const [mediaCaptureStatus, setMediaCaptureStatus] = useState<
+ MediaCaptureStatus
+ >(MediaCaptureStatusTypes.IMAGE_DEFAULT);
+ const [isPhotoViewerReady, setIsPhotoViewerReady] = useState(false);
+ const [isVideoPlayerReady, setIsVideoPlayerReady] = useState(false);
+ const [playerDays, setPlayerDays] = useState(0);
+ const [playerHours, setPlayerHours] = useState(0);
+ const [playerMinutes, setPlayerMinutes] = useState(0);
+ const [playerSeconds, setPlayerSeconds] = useState(0);
+ const [isReadyPlayerTimer, setIsReadyPlayerTimer] = useState<boolean>(false);
+ const [isAudioMuted, setIsAudioMuted] = useState(false);
+ const [isVideoMuted, setIsVideoMuted] = useState(false);
+ const [error, setError] = useState<string>("");
+ const { days, hours, minutes, pause, reset, seconds, start } = useStopwatch({
+ autoStart: false,
+ });
+ const fullScreenHandle = useFullScreenHandle();
+
+ useEffect(() => {
+ navigator.mediaDevices
+ .enumerateDevices()
+ .then(handleDeviceInputs)
+ .catch((err) => {
+ setError(err.message);
+ });
+ }, []);
+
+ useEffect(() => {
+ if (webcamRef.current && webcamRef.current.stream) {
+ updateMediaTracksEnabled(webcamRef.current.stream);
+ }
+ }, [isAudioMuted, isVideoMuted]);
+
+ useEffect(() => {
+ if (width > height) {
+ setScaleAxis("x");
+ return;
+ }
+ setScaleAxis("y");
+ }, [height, width]);
+
+ useEffect(() => {
+ setIsReadyPlayerTimer(false);
+ if (mode === CameraModeTypes.CAMERA) {
+ setMediaCaptureStatus(MediaCaptureStatusTypes.IMAGE_DEFAULT);
+ return;
+ }
+ setMediaCaptureStatus(MediaCaptureStatusTypes.VIDEO_DEFAULT);
+
+ return () => {
+ mediaRecorderRef.current?.removeEventListener(
+ "dataavailable",
+ handleDataAvailable,
+ );
+ };
+ }, [mode]);
+
+ useEffect(() => {
+ onImageCapture(image);
+ }, [image]);
+
+ useEffect(() => {
+ if (videoBlobURL && videoElementRef.current) {
+ videoElementRef.current.src = videoBlobURL;
+ videoElementRef.current.addEventListener("ended", handlePlayerEnded);
+ videoElementRef.current.addEventListener("timeupdate", handleTimeUpdate);
+ }
+
+ return () => {
+ videoElementRef.current?.removeEventListener("ended", handlePlayerEnded);
+ videoElementRef.current?.removeEventListener(
+ "timeupdate",
+ handleTimeUpdate,
+ );
+ };
+ }, [videoBlobURL, videoElementRef.current]);
+
+ useEffect(() => {
+ // Set the flags for previewing the captured photo and video
+ const photoReadyStates: MediaCaptureStatus[] = [
+ MediaCaptureStatusTypes.IMAGE_CAPTURED,
+ MediaCaptureStatusTypes.IMAGE_SAVED,
+ ];
+ const videoReadyStates: MediaCaptureStatus[] = [
+ MediaCaptureStatusTypes.VIDEO_CAPTURED,
+ MediaCaptureStatusTypes.VIDEO_PLAYING,
+ MediaCaptureStatusTypes.VIDEO_PAUSED,
+ MediaCaptureStatusTypes.VIDEO_SAVED,
+ MediaCaptureStatusTypes.VIDEO_PLAYING_AFTER_SAVE,
+ MediaCaptureStatusTypes.VIDEO_PAUSED_AFTER_SAVE,
+ ];
+ setIsPhotoViewerReady(photoReadyStates.includes(mediaCaptureStatus));
+ setIsVideoPlayerReady(videoReadyStates.includes(mediaCaptureStatus));
+ }, [mediaCaptureStatus]);
+
+ const appLayout = useSelector(getCurrentApplicationLayout);
+
+ const handleDeviceInputs = useCallback(
+ (mediaInputs: MediaDeviceInfo[]) => {
+ setAudioInputs(mediaInputs.filter(({ kind }) => kind === "audioinput"));
+ setVideoInputs(mediaInputs.filter(({ kind }) => kind === "videoinput"));
+ },
+ [setAudioInputs, setVideoInputs],
+ );
+
+ const handleMediaDeviceChange = useCallback(
+ (mediaDeviceInfo: MediaDeviceInfo) => {
+ if (mediaDeviceInfo.kind === "audioinput") {
+ setAudioConstraints({
+ ...audioConstraints,
+ deviceId: mediaDeviceInfo.deviceId,
+ });
+ }
+ if (mediaDeviceInfo.kind === "videoinput") {
+ setVideoConstraints({
+ ...videoConstraints,
+ deviceId: mediaDeviceInfo.deviceId,
+ });
+ }
+ },
+ [],
+ );
+
+ const updateMediaTracksEnabled = (stream: MediaStream) => {
+ stream.getAudioTracks()[0].enabled = !isAudioMuted;
+ stream.getVideoTracks()[0].enabled = !isVideoMuted;
+ };
+
+ const captureImage = useCallback(() => {
+ if (webcamRef.current) {
+ const capturedImage = webcamRef.current.getScreenshot();
+ setImage(capturedImage);
+ }
+ }, [webcamRef, setImage]);
+
+ const resetMedia = useCallback(() => {
+ setIsReadyPlayerTimer(false);
+ reset(0, false);
+
+ if (mode === CameraModeTypes.CAMERA) {
+ setImage(null);
+ return;
+ }
+ onRecordingStop(null);
+ }, [mode]);
+
+ const handleStatusChange = useCallback(
+ (status: MediaCaptureStatus) => {
+ setMediaCaptureStatus(status);
+ },
+ [setMediaCaptureStatus],
+ );
+
+ const handleRecordingStart = useCallback(() => {
+ if (webcamRef.current && webcamRef.current.stream) {
+ mediaRecorderRef.current = new MediaRecorder(webcamRef.current.stream, {
+ mimeType: "video/webm",
+ });
+ mediaRecorderRef.current.addEventListener(
+ "dataavailable",
+ handleDataAvailable,
+ );
+ mediaRecorderRef.current.start();
+ start();
+ onRecordingStart();
+ }
+ }, [webcamRef, mediaRecorderRef]);
+
+ const handleDataAvailable = useCallback(
+ ({ data }) => {
+ if (data.size > 0) {
+ onRecordingStop(data);
+ }
+ },
+ [onRecordingStop],
+ );
+
+ const handleRecordingStop = useCallback(() => {
+ mediaRecorderRef.current?.stop();
+ pause();
+ }, [mediaRecorderRef, webcamRef]);
+
+ const handleVideoPlay = useCallback(() => {
+ if (!isReadyPlayerTimer) {
+ reset(0, false);
+ setIsReadyPlayerTimer(true);
+ }
+ videoElementRef.current?.play();
+ }, [videoElementRef]);
+
+ const handleVideoPause = () => {
+ videoElementRef.current?.pause();
+ };
+
+ const handlePlayerEnded = () => {
+ setMediaCaptureStatus((prevStatus) => {
+ switch (prevStatus) {
+ case MediaCaptureStatusTypes.VIDEO_PLAYING_AFTER_SAVE:
+ return MediaCaptureStatusTypes.VIDEO_SAVED;
+ default:
+ return MediaCaptureStatusTypes.VIDEO_CAPTURED;
+ }
+ });
+ };
+
+ const handleTimeUpdate = () => {
+ if (videoElementRef.current) {
+ const totalSeconds = Math.ceil(videoElementRef.current.currentTime);
+
+ setPlayerDays(Math.floor(totalSeconds / (60 * 60 * 24)));
+ setPlayerHours(Math.floor((totalSeconds % (60 * 60 * 24)) / (60 * 60)));
+ setPlayerMinutes(Math.floor((totalSeconds % (60 * 60)) / 60));
+ setPlayerSeconds(Math.floor(totalSeconds % 60));
+ }
+ };
+
+ const handleUserMedia = (stream: MediaStream) => {
+ updateMediaTracksEnabled(stream);
+ };
+
+ const handleUserMediaErrors = useCallback((error: string | DOMException) => {
+ if (typeof error === "string") {
+ setError(error);
+ }
+ setError((error as DOMException).message);
+ }, []);
+
+ const renderTimer = () => {
+ if (mode === CameraModeTypes.VIDEO) {
+ if (isReadyPlayerTimer) {
+ return (
+ <Timer
+ days={playerDays}
+ hours={playerHours}
+ minutes={playerMinutes}
+ seconds={playerSeconds}
+ />
+ );
+ }
+ return (
+ <Timer days={days} hours={hours} minutes={minutes} seconds={seconds} />
+ );
+ }
+ return null;
+ };
+
+ const renderComponent = () => {
+ if (error) {
+ return (
+ <>
+ <CameraOfflineIcon />
+ <span className="error-text">{error}</span>
+ {error === "Permission denied" && (
+ <a
+ href="https://help.sprucehealth.com/article/386-changing-permissions-for-video-and-audio-on-your-internet-browser"
+ rel="noreferrer"
+ target="_blank"
+ >
+ Know more
+ </a>
+ )}
+ </>
+ );
+ }
+
+ return (
+ <>
+ <DisabledOverlayer disabled={disabled}>
+ <CameraOfflineIcon />
+ </DisabledOverlayer>
+
+ <Webcam
+ audio
+ audioConstraints={audioConstraints}
+ mirrored={mode === CameraModeTypes.VIDEO ? false : mirrored}
+ muted
+ onUserMedia={handleUserMedia}
+ onUserMediaError={handleUserMediaErrors}
+ ref={webcamRef}
+ videoConstraints={videoConstraints}
+ />
+
+ {isPhotoViewerReady && image && <PhotoViewer src={image} />}
+
+ {isVideoPlayerReady && <VideoPlayer ref={videoElementRef} />}
+
+ <ControlPanel
+ appLayoutType={appLayout?.type}
+ audioInputs={audioInputs}
+ audioMuted={isAudioMuted}
+ fullScreenHandle={fullScreenHandle}
+ mode={mode}
+ onCaptureImage={captureImage}
+ onError={setError}
+ onMediaInputChange={handleMediaDeviceChange}
+ onRecordingStart={handleRecordingStart}
+ onRecordingStop={handleRecordingStop}
+ onResetMedia={resetMedia}
+ onStatusChange={handleStatusChange}
+ onToggleAudio={setIsAudioMuted}
+ onToggleVideo={setIsVideoMuted}
+ onVideoPause={handleVideoPause}
+ onVideoPlay={handleVideoPlay}
+ status={mediaCaptureStatus}
+ videoInputs={videoInputs}
+ videoMuted={isVideoMuted}
+ />
+
+ {renderTimer()}
+ </>
+ );
+ };
+
+ return (
+ <CameraContainer disabled={!!error || disabled} scaleAxis={scaleAxis}>
+ <FullScreen handle={fullScreenHandle}>{renderComponent()}</FullScreen>
+ </CameraContainer>
+ );
+}
+
+export interface CameraComponentProps {
+ disabled: boolean;
+ height: number;
+ mirrored: boolean;
+ mode: CameraMode;
+ onImageCapture: (image?: string | null) => void;
+ onRecordingStart: () => void;
+ onRecordingStop: (video: Blob | null) => void;
+ videoBlobURL?: string;
+ width: number;
+}
+
+export default CameraComponent;
diff --git a/app/client/src/widgets/CameraWidget/constants.ts b/app/client/src/widgets/CameraWidget/constants.ts
new file mode 100644
index 000000000000..c7f25c95b25e
--- /dev/null
+++ b/app/client/src/widgets/CameraWidget/constants.ts
@@ -0,0 +1,47 @@
+// This file contains common constants which can be used across the widget configuration file (index.ts), widget and component folders.
+export enum CameraModeTypes {
+ CAMERA = "CAMERA",
+ VIDEO = "VIDEO",
+}
+
+export type CameraMode = keyof typeof CameraModeTypes;
+
+export enum MediaCaptureStatusTypes {
+ IMAGE_DEFAULT = "IMAGE_DEFAULT",
+ IMAGE_CAPTURED = "IMAGE_CAPTURED",
+ IMAGE_SAVED = "IMAGE_SAVED",
+ VIDEO_DEFAULT = "VIDEO_DEFAULT",
+ VIDEO_RECORDING = "VIDEO_RECORDING",
+ VIDEO_CAPTURED = "VIDEO_CAPTURED",
+ VIDEO_PLAYING = "VIDEO_PLAYING",
+ VIDEO_PAUSED = "VIDEO_PAUSED",
+ VIDEO_SAVED = "VIDEO_SAVED",
+ VIDEO_PLAYING_AFTER_SAVE = "VIDEO_PLAYING_AFTER_SAVE",
+ VIDEO_PAUSED_AFTER_SAVE = "VIDEO_PAUSED_AFTER_SAVE",
+}
+
+export type MediaCaptureStatus = keyof typeof MediaCaptureStatusTypes;
+
+export enum MediaCaptureActionTypes {
+ IMAGE_CAPTURE = "IMAGE_CAPTURE",
+ IMAGE_SAVE = "IMAGE_SAVE",
+ IMAGE_DISCARD = "IMAGE_DISCARD",
+ IMAGE_REFRESH = "IMAGE_REFRESH",
+ RECORDING_START = "RECORDING_START",
+ RECORDING_STOP = "RECORDING_STOP",
+ RECORDING_DISCARD = "RECORDING_DISCARD",
+ RECORDING_SAVE = "RECORDING_SAVE",
+ VIDEO_PLAY = "VIDEO_PLAY",
+ VIDEO_PAUSE = "VIDEO_PAUSE",
+ VIDEO_PLAY_AFTER_SAVE = "VIDEO_PLAY_AFTER_SAVE",
+ VIDEO_PAUSE_AFTER_SAVE = "VIDEO_PAUSE_AFTER_SAVE",
+ VIDEO_REFRESH = "VIDEO_REFRESH",
+}
+
+export type MediaCaptureAction = keyof typeof MediaCaptureActionTypes;
+
+export enum DeviceTypes {
+ MICROPHONE = "MICROPHONE",
+ CAMERA = "CAMERA",
+}
+export type DeviceType = keyof typeof DeviceTypes;
diff --git a/app/client/src/widgets/CameraWidget/icon.svg b/app/client/src/widgets/CameraWidget/icon.svg
new file mode 100755
index 000000000000..2a9b5b353b77
--- /dev/null
+++ b/app/client/src/widgets/CameraWidget/icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><g fill="#4b4848">
+ <path fill="none" d="M0 0h24v24H0z"/><path d="M9 3h6l2 2h4a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1h4l2-2zm3 16a6 6 0 1 0 0-12 6 6 0 0 0 0 12zm0-2a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
+</g></svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/CameraWidget/index.ts b/app/client/src/widgets/CameraWidget/index.ts
new file mode 100644
index 000000000000..8fdbce53b9cd
--- /dev/null
+++ b/app/client/src/widgets/CameraWidget/index.ts
@@ -0,0 +1,30 @@
+import Widget from "./widget";
+import IconSVG from "./icon.svg";
+import { GRID_DENSITY_MIGRATION_V1 } from "widgets/constants";
+import { CameraModeTypes } from "./constants";
+
+export const CONFIG = {
+ type: Widget.getWidgetType(),
+ name: "Camera", // The display name which will be made in uppercase and show in the widgets panel ( can have spaces )
+ iconSVG: IconSVG,
+ needsMeta: true, // Defines if this widget adds any meta properties
+ isCanvas: false, // Defines if this widget has a canvas within in which we can drop other widgets
+ defaults: {
+ widgetName: "Camera",
+ rows: 8.25 * GRID_DENSITY_MIGRATION_V1,
+ columns: 6.25 * GRID_DENSITY_MIGRATION_V1,
+ mode: CameraModeTypes.CAMERA,
+ isDisabled: false,
+ isVisible: true,
+ isMirrored: true,
+ version: 1,
+ },
+ properties: {
+ derived: Widget.getDerivedPropertiesMap(),
+ default: Widget.getDefaultPropertiesMap(),
+ meta: Widget.getMetaPropertiesMap(),
+ config: Widget.getPropertyPaneConfig(),
+ },
+};
+
+export default Widget;
diff --git a/app/client/src/widgets/CameraWidget/widget/index.tsx b/app/client/src/widgets/CameraWidget/widget/index.tsx
new file mode 100644
index 000000000000..61563bcb6ec1
--- /dev/null
+++ b/app/client/src/widgets/CameraWidget/widget/index.tsx
@@ -0,0 +1,275 @@
+import React from "react";
+
+import BaseWidget, { WidgetProps, WidgetState } from "widgets/BaseWidget";
+import { DerivedPropertiesMap } from "utils/WidgetFactory";
+import { ValidationTypes } from "constants/WidgetValidation";
+import { WIDGET_PADDING } from "constants/WidgetConstants";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+import { base64ToBlob, createBlobUrl } from "utils/AppsmithUtils";
+import { FileDataTypes } from "widgets/constants";
+
+import CameraComponent from "../component";
+import {
+ CameraMode,
+ CameraModeTypes,
+ MediaCaptureStatusTypes,
+} from "../constants";
+
+class CameraWidget extends BaseWidget<CameraWidgetProps, WidgetState> {
+ static getPropertyPaneConfig() {
+ return [
+ {
+ sectionName: "General",
+ children: [
+ {
+ propertyName: "mode",
+ label: "Mode",
+ controlType: "DROP_DOWN",
+ helpText: "Whether a picture is taken or a video is recorded",
+ options: [
+ {
+ label: "Camera",
+ value: "CAMERA",
+ },
+ {
+ label: "Video",
+ value: "VIDEO",
+ },
+ ],
+ isBindProperty: false,
+ isTriggerProperty: false,
+ validation: {
+ type: ValidationTypes.TEXT,
+ params: {
+ allowedValues: ["CAMERA", "VIDEO"],
+ },
+ },
+ },
+ {
+ propertyName: "isDisabled",
+ label: "Disabled",
+ controlType: "SWITCH",
+ helpText: "Disables clicks to this widget",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.BOOLEAN },
+ },
+ {
+ propertyName: "isVisible",
+ label: "Visible",
+ helpText: "Controls the visibility of the widget",
+ controlType: "SWITCH",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.BOOLEAN },
+ },
+ {
+ propertyName: "isMirrored",
+ label: "Mirrored",
+ helpText: "Show camera preview and get the screenshot mirrored",
+ controlType: "SWITCH",
+ hidden: (props: CameraWidgetProps) =>
+ props.mode === CameraModeTypes.VIDEO,
+ dependencies: ["mode"],
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.BOOLEAN },
+ },
+ ],
+ },
+ {
+ sectionName: "Actions",
+ children: [
+ {
+ helpText: "Triggers an action when the image is captured",
+ propertyName: "onImageCapture",
+ label: "OnImageCapture",
+ controlType: "ACTION_SELECTOR",
+ hidden: (props: CameraWidgetProps) =>
+ props.mode === CameraModeTypes.VIDEO,
+ dependencies: ["mode"],
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: true,
+ },
+ {
+ helpText: "Triggers an action when the video recording get started",
+ propertyName: "onRecordingStart",
+ label: "OnRecordingStart",
+ controlType: "ACTION_SELECTOR",
+ hidden: (props: CameraWidgetProps) =>
+ props.mode === CameraModeTypes.CAMERA,
+ dependencies: ["mode"],
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: true,
+ },
+ {
+ helpText: "Triggers an action when the video recording stops",
+ propertyName: "onRecordingStop",
+ label: "OnRecordingStop",
+ controlType: "ACTION_SELECTOR",
+ hidden: (props: CameraWidgetProps) =>
+ props.mode === CameraModeTypes.CAMERA,
+ dependencies: ["mode"],
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: true,
+ },
+ ],
+ },
+ ];
+ }
+
+ static getDerivedPropertiesMap(): DerivedPropertiesMap {
+ return {};
+ }
+
+ static getDefaultPropertiesMap(): Record<string, string> {
+ return {};
+ }
+
+ static getMetaPropertiesMap(): Record<string, any> {
+ return {
+ image: null,
+ imageBlobURL: undefined,
+ imageDataURL: undefined,
+ imageRawBinary: undefined,
+ mediaCaptureStatus: MediaCaptureStatusTypes.IMAGE_DEFAULT,
+ timer: undefined,
+ videoBlobURL: undefined,
+ videoDataURL: undefined,
+ videoRawBinary: undefined,
+ };
+ }
+
+ static getWidgetType(): string {
+ return "CAMERA_WIDGET";
+ }
+
+ getPageView() {
+ const {
+ bottomRow,
+ isDisabled,
+ isMirrored,
+ leftColumn,
+ mode,
+ parentColumnSpace,
+ parentRowSpace,
+ rightColumn,
+ topRow,
+ videoBlobURL,
+ } = this.props;
+
+ const height = (bottomRow - topRow) * parentRowSpace - WIDGET_PADDING * 2;
+ const width =
+ (rightColumn - leftColumn) * parentColumnSpace - WIDGET_PADDING * 2;
+
+ return (
+ <CameraComponent
+ disabled={isDisabled}
+ height={height}
+ mirrored={isMirrored}
+ mode={mode}
+ onImageCapture={this.handleImageCapture}
+ onRecordingStart={this.handleRecordingStart}
+ onRecordingStop={this.handleRecordingStop}
+ videoBlobURL={videoBlobURL}
+ width={width}
+ />
+ );
+ }
+
+ handleImageCapture = (image?: string | null) => {
+ if (!image) {
+ URL.revokeObjectURL(this.props.imageBlobURL);
+
+ this.props.updateWidgetMetaProperty("imageBlobURL", undefined);
+ this.props.updateWidgetMetaProperty("imageDataURL", undefined);
+ this.props.updateWidgetMetaProperty("imageRawBinary", undefined);
+ return;
+ }
+ const base64Data = image.split(",")[1];
+ const imageBlob = base64ToBlob(base64Data, "image/webp");
+ const blobURL = URL.createObjectURL(imageBlob);
+ const blobIdForBase64 = createBlobUrl(imageBlob, FileDataTypes.Base64);
+ const blobIdForRaw = createBlobUrl(imageBlob, FileDataTypes.Binary);
+
+ this.props.updateWidgetMetaProperty("imageBlobURL", blobURL);
+ this.props.updateWidgetMetaProperty("imageDataURL", blobIdForBase64, {
+ triggerPropertyName: "onImageCapture",
+ dynamicString: this.props.onImageCapture,
+ event: {
+ type: EventType.ON_CAMERA_IMAGE_CAPTURE,
+ },
+ });
+ this.props.updateWidgetMetaProperty("imageRawBinary", blobIdForRaw, {
+ triggerPropertyName: "onImageCapture",
+ dynamicString: this.props.onImageCapture,
+ event: {
+ type: EventType.ON_CAMERA_IMAGE_CAPTURE,
+ },
+ });
+ };
+
+ handleRecordingStart = () => {
+ if (this.props.onRecordingStart) {
+ super.executeAction({
+ triggerPropertyName: "onRecordingStart",
+ dynamicString: this.props.onRecordingStart,
+ event: {
+ type: EventType.ON_CAMERA_VIDEO_RECORDING_START,
+ },
+ });
+ }
+ };
+
+ handleRecordingStop = (video?: Blob | null) => {
+ if (!video) {
+ if (this.props.videoBlobURL) {
+ URL.revokeObjectURL(this.props.videoBlobURL);
+ }
+
+ this.props.updateWidgetMetaProperty("videoBlobURL", undefined);
+ this.props.updateWidgetMetaProperty("videoDataURL", undefined);
+ this.props.updateWidgetMetaProperty("videoRawBinary", undefined);
+ return;
+ }
+
+ const blobURL = URL.createObjectURL(video);
+ const blobIdForBase64 = createBlobUrl(video, FileDataTypes.Base64);
+ const blobIdForRaw = createBlobUrl(video, FileDataTypes.Binary);
+
+ this.props.updateWidgetMetaProperty("videoBlobURL", blobURL);
+ this.props.updateWidgetMetaProperty("videoDataURL", blobIdForBase64, {
+ triggerPropertyName: "onRecordingStop",
+ dynamicString: this.props.onRecordingStop,
+ event: {
+ type: EventType.ON_CAMERA_VIDEO_RECORDING_STOP,
+ },
+ });
+ this.props.updateWidgetMetaProperty("videoRawBinary", blobIdForRaw, {
+ triggerPropertyName: "onRecordingStop",
+ dynamicString: this.props.onRecordingStop,
+ event: {
+ type: EventType.ON_CAMERA_VIDEO_RECORDING_STOP,
+ },
+ });
+ };
+}
+
+export interface CameraWidgetProps extends WidgetProps {
+ isDisabled: boolean;
+ isMirrored: boolean;
+ isVisible: boolean;
+ mode: CameraMode;
+ onImageCapture?: string;
+ onRecordingStart?: string;
+ onRecordingStop?: string;
+ videoBlobURL?: string;
+}
+
+export default CameraWidget;
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 8ec2173db52d..4ca9668798a7 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -2771,6 +2771,11 @@
version "1.0.0"
resolved "https://registry.npmjs.org/@types/deep-diff/-/deep-diff-1.0.0.tgz"
+"@types/dom-mediacapture-record@^1.0.11":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.11.tgz#f61b17e6131d76629d4039b02634c7e786b82c3a"
+ integrity sha512-ODVOH95x08arZhbQOjH3no7Iye64akdO+55nM+IGtTzpu2ACKr9CQTrI//CCVieIjlI/eL+rK1hQjMycxIgylQ==
+
"@types/dom4@^2.0.1":
version "2.0.1"
resolved "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.1.tgz"
@@ -8038,6 +8043,11 @@ fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+fscreen@^1.0.2:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/fscreen/-/fscreen-1.2.0.tgz#1a8c88e06bc16a07b473ad96196fb06d6657f59e"
+ integrity sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==
+
fsevents@^1.2.7:
version "1.2.13"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"
@@ -13598,6 +13608,13 @@ react-fast-compare@^3.0.0, react-fast-compare@^3.0.1:
version "3.2.0"
resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz"
+react-full-screen@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/react-full-screen/-/react-full-screen-1.1.0.tgz#696c586da25652ed10d88046f8dc0b6620f4ef96"
+ integrity sha512-ivL/HrcfHhEUJWmgoiDKP7Xfy127LGz9x3VnwVxljJ0ky1D1YqJmXjhxnuEhfqT3yociJy/HCk9/yyJ3HEAjaw==
+ dependencies:
+ fscreen "^1.0.2"
+
react-google-maps@^9.4.5:
version "9.4.5"
resolved "https://registry.npmjs.org/react-google-maps/-/react-google-maps-9.4.5.tgz"
@@ -13984,6 +14001,11 @@ react-virtuoso@^1.9.0:
react-app-polyfill "^1.0.6"
resize-observer-polyfill "^1.5.1"
+react-webcam@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/react-webcam/-/react-webcam-6.0.0.tgz#46dd9ba44cebe6bf3cc4ea2ff09d12243900abfa"
+ integrity sha512-pw7067WYnDHRjAXYXrsLeig9/AAxCFDnnaEJzZ5ep6UZoYMqF4UNRtVkeTk0LotpwqT/c8vHisn/+QodNbUsQA==
+
react-window@^1.8.2:
version "1.8.5"
resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.5.tgz"
|
beb3b268f9333632833b62ac0e164e2ade40af12
|
2023-09-20 12:30:55
|
Hetu Nandu
|
chore: Remove the table widget activation experiment (#27422)
| false
|
Remove the table widget activation experiment (#27422)
|
chore
|
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 6c357f8b1cfb..bfdd1b08663c 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -16,7 +16,6 @@ export const FEATURE_FLAG = {
"release_table_serverside_filtering_enabled",
release_custom_echarts_enabled: "release_custom_echarts_enabled",
license_branding_enabled: "license_branding_enabled",
- ab_table_widget_activation_enabled: "ab_table_widget_activation_enabled",
ab_gif_signposting_enabled: "ab_gif_signposting_enabled",
release_git_status_lite_enabled: "release_git_status_lite_enabled",
license_sso_saml_enabled: "license_sso_saml_enabled",
@@ -44,7 +43,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
release_table_serverside_filtering_enabled: false,
release_custom_echarts_enabled: false,
license_branding_enabled: false,
- ab_table_widget_activation_enabled: false,
ab_gif_signposting_enabled: false,
release_git_status_lite_enabled: false,
license_sso_saml_enabled: false,
diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx
index 10ca0babb3d4..0f49425f24b2 100644
--- a/app/client/src/ce/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ce/sagas/ApplicationSagas.tsx
@@ -129,9 +129,6 @@ import {
keysOfNavigationSetting,
} from "constants/AppConstants";
import { setAllEntityCollapsibleStates } from "actions/editorContextActions";
-import { selectFeatureFlagCheck } from "@appsmith/selectors/featureFlagsSelectors";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
-import { generateReactKey } from "utils/generators";
import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors";
import type { DeletingMultipleApps } from "@appsmith/reducers/uiReducers/applicationsReducer";
@@ -649,28 +646,6 @@ export function* createApplicationSaga(
// ensures user receives the updates in the app just created
yield put(reconnectAppLevelWebsocket());
yield put(reconnectPageLevelWebsocket());
-
- const tableWidgetExperimentEnabled: boolean = yield select(
- selectFeatureFlagCheck,
- FEATURE_FLAG.ab_table_widget_activation_enabled,
- );
- if (tableWidgetExperimentEnabled) {
- yield take(ReduxActionTypes.FETCH_WORKSPACE_SUCCESS);
- yield put({
- type: ReduxActionTypes.WIDGET_ADD_CHILD,
- payload: {
- widgetId: "0",
- type: "TABLE_WIDGET_V2",
- leftColumn: 15,
- topRow: 6,
- columns: 34,
- rows: 28,
- parentRowSpace: 10,
- parentColumnSpace: 13.390625,
- newWidgetId: generateReactKey(),
- },
- });
- }
}
}
} catch (error) {
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index a8bcd7016a23..4a7896d8ecfd 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -87,8 +87,6 @@ import type { StepState } from "reducers/uiReducers/onBoardingReducer";
import { isUndefined } from "lodash";
import { isAirgapped } from "@appsmith/utils/airgapHelpers";
import { SIGNPOSTING_ANALYTICS_STEP_NAME } from "pages/Editor/FirstTimeUserOnboarding/constants";
-import { selectFeatureFlagCheck } from "@appsmith/selectors/featureFlagsSelectors";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
const GUIDED_TOUR_STORAGE_KEY = "GUIDED_TOUR_STORAGE_KEY";
@@ -460,27 +458,6 @@ function* firstTimeUserOnboardingInitSaga(
}
yield put(setSignpostingOverlay(showOverlay));
- const tableWidgetExperimentEnabled: boolean = yield select(
- selectFeatureFlagCheck,
- FEATURE_FLAG.ab_table_widget_activation_enabled,
- );
- if (tableWidgetExperimentEnabled) {
- yield take(ReduxActionTypes.FETCH_WORKSPACE_SUCCESS);
- yield put({
- type: ReduxActionTypes.WIDGET_ADD_CHILD,
- payload: {
- widgetId: "0",
- type: "TABLE_WIDGET_V2",
- leftColumn: 15,
- topRow: 6,
- columns: 34,
- rows: 28,
- parentRowSpace: 10,
- parentColumnSpace: 13.390625,
- newWidgetId: generateReactKey(),
- },
- });
- }
// Show the modal once the editor is loaded. The delay is to grab user attention back once the editor
yield delay(1000);
yield put({
|
a3099d188c9be1811b77728a2d74c396c610dc55
|
2023-04-18 16:33:26
|
Ravi Kumar Prasad
|
feat: Add tracking events for action selector (#22428)
| false
|
Add tracking events for action selector (#22428)
|
feat
|
diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx
index 1cdcf6b16161..790f4d482160 100644
--- a/app/client/src/components/editorComponents/ActionCreator/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx
@@ -1,12 +1,19 @@
import React, { useCallback, useEffect, useRef, useState } from "react";
-import { getActionBlocks } from "@shared/ast";
-import type { ActionCreatorProps } from "./types";
-import { getCodeFromMoustache, isEmptyBlock } from "./utils";
+import { getActionBlocks, getCallExpressions } from "@shared/ast";
+import type { ActionCreatorProps, ActionTree } from "./types";
+import {
+ getCodeFromMoustache,
+ getSelectedFieldFromValue,
+ isEmptyBlock,
+} from "./utils";
import { diff } from "deep-diff";
import Action from "./viewComponents/Action";
import { useSelector } from "react-redux";
import { selectEvaluationVersion } from "@appsmith/selectors/applicationSelectors";
import { generateReactKey } from "../../../utils/generators";
+import { useApisQueriesAndJsActionOptions } from "./helpers";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import { getActionTypeLabel } from "./viewComponents/ActionBlockTree/utils";
export const ActionCreatorContext = React.createContext<{
label: string;
@@ -43,6 +50,8 @@ const ActionCreator = React.forwardRef(
const previousBlocks = useRef<string[]>([]);
const evaluationVersion = useSelector(selectEvaluationVersion);
+ const actionOptions = useApisQueriesAndJsActionOptions(() => null);
+
useEffect(() => {
setActions((prev) => {
const newActions: Record<string, string> = {};
@@ -129,7 +138,52 @@ const ActionCreator = React.forwardRef(
childUpdate.current = true;
if (newValueWithoutMoustache) {
newActions[id] = newValueWithoutMoustache;
+ const prevValue = actions[id];
+ const option = getSelectedFieldFromValue(
+ newValueWithoutMoustache,
+ actionOptions,
+ );
+
+ const actionType = (option?.type ||
+ option?.value) as ActionTree["actionType"];
+
+ // If the previous value was empty, we're adding a new action
+ if (prevValue === "") {
+ AnalyticsUtil.logEvent("ACTION_ADDED", {
+ actionType: getActionTypeLabel(actionType),
+ code: newValueWithoutMoustache,
+ callback: null,
+ });
+ } else {
+ const prevRootCallExpression = getCallExpressions(
+ actions[id],
+ evaluationVersion,
+ )[0];
+ const newRootCallExpression = getCallExpressions(
+ newValueWithoutMoustache,
+ evaluationVersion,
+ )[0];
+
+ // We don't want the modified event to be triggered when the success/failure
+ // callbacks are modified/added/removed
+ // So, we check if the root call expression is the same
+ if (prevRootCallExpression?.code !== newRootCallExpression?.code) {
+ AnalyticsUtil.logEvent("ACTION_MODIFIED", {
+ actionType: getActionTypeLabel(actionType),
+ code: newValueWithoutMoustache,
+ callback: null,
+ });
+ }
+ }
} else {
+ const option = getSelectedFieldFromValue(newActions[id], actionOptions);
+ const actionType = (option?.type ||
+ option?.value) as ActionTree["actionType"];
+ AnalyticsUtil.logEvent("ACTION_DELETED", {
+ actionType: getActionTypeLabel(actionType),
+ code: newActions[id],
+ callback: null,
+ });
delete newActions[id];
!actions[id] && setActions(newActions);
}
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
index 41261516a75f..7dbf4a2c33d1 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
@@ -9,6 +9,8 @@ import type { TActionBlock, VariantType } from "../../types";
import { chainableFns } from "../../utils";
import ActionCard from "./ActionCard";
import ActionSelector from "./ActionSelector";
+import AnalyticsUtil from "utils/AnalyticsUtil";
+import { getActionTypeLabel } from "../ActionBlockTree/utils";
const EMPTY_ACTION_BLOCK: TActionBlock = {
code: "",
@@ -230,11 +232,38 @@ export default function ActionTree(props: {
isDummyBlockDelete =
blocks[index].actionType ===
AppsmithFunction.none;
- blocks.splice(index, 1);
+
+ const deletedBlock = blocks.splice(index, 1)[0];
+ AnalyticsUtil.logEvent("ACTION_DELETED", {
+ actionType: getActionTypeLabel(
+ deletedBlock.actionType,
+ ),
+ code: deletedBlock.code,
+ callback: blockType,
+ });
} else {
+ const prevActionType = blocks[index].actionType;
+ const newActionType = childActionBlock.actionType;
+ const newActionCode = childActionBlock.code;
blocks[index].code = childActionBlock.code;
blocks[index].actionType =
childActionBlock.actionType;
+
+ const actionTypeLabel =
+ getActionTypeLabel(newActionType);
+ if (prevActionType === AppsmithFunction.none) {
+ AnalyticsUtil.logEvent("ACTION_ADDED", {
+ actionType: actionTypeLabel,
+ code: newActionCode,
+ callback: blockType,
+ });
+ } else {
+ AnalyticsUtil.logEvent("ACTION_MODIFIED", {
+ actionType: actionTypeLabel,
+ code: newActionCode,
+ callback: blockType,
+ });
+ }
}
if (isDummyBlockDelete) {
setActionBlock(newActionBlock);
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
index 1ae4474e13ce..0496ec744547 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx
@@ -221,3 +221,9 @@ export function getActionInfo(
return { Icon, actionTypeLabel, action };
}
+
+export function getActionTypeLabel(
+ actionType: ActionTree["actionType"],
+): string {
+ return FIELD_GROUP_CONFIG[actionType].label;
+}
diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/utils/AnalyticsUtil.tsx
index 9c71f80f4bb7..a5baf3905383 100644
--- a/app/client/src/utils/AnalyticsUtil.tsx
+++ b/app/client/src/utils/AnalyticsUtil.tsx
@@ -292,6 +292,7 @@ export type EventName =
| LIBRARY_EVENTS
| "APP_SETTINGS_SECTION_CLICK"
| APP_NAVIGATION_EVENT_NAMES
+ | ACTION_SELECTOR_EVENT_NAMES
| "PRETTIFY_AND_SAVE_KEYBOARD_SHORTCUT";
export type LIBRARY_EVENTS =
@@ -324,6 +325,11 @@ export type APP_NAVIGATION_EVENT_NAMES =
| "APP_NAVIGATION_BACKGROUND_COLOR"
| "APP_NAVIGATION_SHOW_SIGN_IN";
+export type ACTION_SELECTOR_EVENT_NAMES =
+ | "ACTION_ADDED"
+ | "ACTION_DELETED"
+ | "ACTION_MODIFIED";
+
function getApplicationId(location: Location) {
const pathSplit = location.pathname.split("/");
const applicationsIndex = pathSplit.findIndex(
|
0b4474f58943b28f371a1f14bbdc27a9104d5d9d
|
2023-08-30 00:57:23
|
Ayangade Adeoluwa
|
fix: googleapi script loading for import apps (#26708)
| false
|
googleapi script loading for import apps (#26708)
|
fix
|
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 9158857ba040..9550e59fba73 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -39,6 +39,7 @@
};
const CLOUD_HOSTING = parseConfig("__APPSMITH_CLOUD_HOSTING__");
const ZIPY_KEY = parseConfig("__APPSMITH_ZIPY_SDK_KEY__");
+ const AIRGAPPED = parseConfig("__APPSMITH_AIRGAP_ENABLED__");
</script>
<script>
window.__APPSMITH_CHUNKS_TO_PRELOAD =
@@ -73,6 +74,36 @@
const head = document.getElementsByTagName("head")[0];
head && head.appendChild(script);
}
+
+ // This function is triggered on load of google apis javascript library
+ // Even though the script is loaded asynchronously, in case of firefox run on windows
+ // The gapi script is getting loaded even before the last script of index.html
+ // Hence defining this function before loading gapi
+ // For more info: https://github.com/appsmithorg/appsmith/issues/21033
+ const gapiLoaded = () => {
+ window.googleAPIsLoaded = true;
+ };
+ const onError = () => {
+ window.googleAPIsLoaded = false;
+ };
+
+ if (!AIRGAPPED) {
+ // Adding this Library to access google file picker API in case of limiting google sheet access
+ const script2 = document.createElement("script");
+ script2.crossOrigin = "anonymous";
+ script2.async = true;
+ script2.defer = true;
+ script2.src = "https://apis.google.com/js/api.js";
+ script2.id = "googleapis";
+ script2.onload = () => {
+ gapiLoaded();
+ };
+ script2.onerror = () => {
+ onError();
+ };
+ const headElement = document.getElementsByTagName("head")[0];
+ headElement && headElement.appendChild(script2);
+ }
</script>
</head>
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 014cd533b352..10b185890817 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -42,7 +42,6 @@ import { Spinner } from "design-system";
import SignpostingOverlay from "pages/Editor/FirstTimeUserOnboarding/Overlay";
import { editorInitializer } from "../../utils/editor/EditorUtils";
import { widgetInitialisationSuccess } from "../../actions/widgetActions";
-import { isAirgapped } from "@appsmith/utils/airgapHelpers";
type EditorProps = {
currentApplicationId?: string;
@@ -139,18 +138,7 @@ class Editor extends Component<Props> {
this.props.resetEditorRequest();
}
- // This function is triggered on load of google apis javascript library
- gapiLoaded = () => {
- (window as any).googleAPIsLoaded = true;
- return undefined;
- };
- onError = () => {
- (window as any).googleAPIsLoaded = false;
- return undefined;
- };
-
public render() {
- const isAirgappedInstance = isAirgapped();
if (!this.props.isEditorInitialized || this.props.loadingGuidedTour) {
return (
<CenteredWrapper
@@ -168,17 +156,6 @@ class Editor extends Component<Props> {
<title>
{`${this.props.currentApplicationName} |`} Editor | Appsmith
</title>
-
- {!isAirgappedInstance && !(window as any)?.googleAPIsLoaded ? (
- <script
- async
- defer
- id="googleapis"
- onError={this.onError()}
- onLoad={this.gapiLoaded()}
- src="https://apis.google.com/js/api.js"
- />
- ) : null}
</Helmet>
<GlobalHotKeys>
<MainContainer />
|
f03a163a3821d5f322289cfbb2cfff6c8f6f39f6
|
2022-03-31 21:56:18
|
Anagh Hegde
|
feat: Export application with datasource configuration for sample apps and templates (#12310)
| false
|
Export application with datasource configuration for sample apps and templates (#12310)
|
feat
|
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 c664bf68be91..87e72843c229 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
@@ -140,6 +140,9 @@ public String getLastDeployedAt() {
@JsonIgnore
String editModeThemeId;
+ // TODO Temporary provision for exporting the application with datasource configuration for the sample/template apps
+ Boolean exportWithConfiguration;
+
// This constructor is used during clone application. It only deeply copies selected fields. The rest are either
// initialized newly or is left up to the calling function to set.
public Application(Application application) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/HelperMethods.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/HelperMethods.java
index d21d5ebacf3a..56026ced3390 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/HelperMethods.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/HelperMethods.java
@@ -3,6 +3,7 @@
import com.appsmith.server.domains.ApplicationJson;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.helpers.CollectionUtils;
import java.time.Instant;
import java.util.List;
@@ -23,17 +24,19 @@ public static void updateArchivedAtByDeletedATForActions(List<NewAction> actionL
public static void migrateActionFormDataToObject(ApplicationJson applicationJson) {
final List<NewAction> actionList = applicationJson.getActionList();
- actionList.parallelStream()
- .forEach(newAction -> {
- // determine plugin
- final String pluginName = newAction.getPluginId();
- if ("mongo-plugin".equals(pluginName)) {
- DatabaseChangelog2.migrateMongoActionsFormData(newAction);
- } else if ("amazons3-plugin".equals(pluginName)) {
- DatabaseChangelog2.migrateAmazonS3ActionsFormData(newAction);
- } else if ("firestore-plugin".equals(pluginName)) {
- DatabaseChangelog2.migrateFirestoreActionsFormData(newAction);
- }
- });
+ if (!CollectionUtils.isNullOrEmpty(actionList)) {
+ actionList.parallelStream()
+ .forEach(newAction -> {
+ // determine plugin
+ final String pluginName = newAction.getPluginId();
+ if ("mongo-plugin".equals(pluginName)) {
+ DatabaseChangelog2.migrateMongoActionsFormData(newAction);
+ } else if ("amazons3-plugin".equals(pluginName)) {
+ DatabaseChangelog2.migrateAmazonS3ActionsFormData(newAction);
+ } else if ("firestore-plugin".equals(pluginName)) {
+ DatabaseChangelog2.migrateFirestoreActionsFormData(newAction);
+ }
+ });
+ }
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java
index bf25f6994552..a3b9495ad896 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java
@@ -1,5 +1,6 @@
package com.appsmith.server.solutions;
+import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.repositories.ActionCollectionRepository;
import com.appsmith.server.repositories.DatasourceRepository;
import com.appsmith.server.repositories.NewActionRepository;
@@ -38,11 +39,12 @@ public ImportExportApplicationServiceImpl(DatasourceService datasourceService,
ExamplesOrganizationCloner examplesOrganizationCloner,
ActionCollectionRepository actionCollectionRepository,
ActionCollectionService actionCollectionService,
- ThemeService themeService) {
+ ThemeService themeService,
+ PolicyUtils policyUtils) {
super(datasourceService, sessionUserService, newActionRepository, datasourceRepository, pluginRepository,
organizationService, applicationService, newPageService, applicationPageService, newPageRepository,
newActionService, sequenceService, examplesOrganizationCloner, actionCollectionRepository,
- actionCollectionService, themeService);
+ actionCollectionService, themeService, policyUtils);
}
}
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 5b377d47a6a6..da9412dc4a74 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
@@ -2,6 +2,7 @@
import com.appsmith.external.helpers.AppsmithBeanUtils;
import com.appsmith.external.helpers.Stopwatch;
+import com.appsmith.external.models.AuthenticationDTO;
import com.appsmith.external.models.AuthenticationResponse;
import com.appsmith.external.models.BaseDomain;
import com.appsmith.external.models.BasicAuth;
@@ -31,6 +32,7 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.DefaultResourcesUtils;
+import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.migrations.ApplicationVersion;
import com.appsmith.server.migrations.JsonSchemaMigration;
import com.appsmith.server.migrations.JsonSchemaVersions;
@@ -81,6 +83,9 @@
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_PAGES;
+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_PAGES;
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
@Slf4j
@@ -103,6 +108,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
private final ActionCollectionRepository actionCollectionRepository;
private final ActionCollectionService actionCollectionService;
private final ThemeService themeService;
+ private final PolicyUtils policyUtils;
private static final Set<MediaType> ALLOWED_CONTENT_TYPES = Set.of(MediaType.APPLICATION_JSON);
private static final String INVALID_JSON_FILE = "invalid json file";
@@ -111,10 +117,6 @@ private enum PublishType {
UNPUBLISHED, PUBLISHED
}
- private enum IdType {
- RESOURCE_ID, DEFAULT_RESOURCE_ID
- }
-
/**
* This function will give the application resource to rebuild the application in import application flow
*
@@ -144,12 +146,38 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
}
+ // Check permissions depending upon the serialization objective:
+ // Git-sync => Manage permission
+ // Share application
+ // : Normal apps => Export permission
+ // : Sample apps where datasource config needs to be shared => Read permission
+
Mono<Application> applicationMono = SerialiseApplicationObjective.VERSION_CONTROL.equals(serialiseFor)
? applicationService.findById(applicationId, MANAGE_APPLICATIONS)
- : applicationService.findById(applicationId, EXPORT_APPLICATIONS)
+ : applicationService.findById(applicationId, READ_APPLICATIONS)
.switchIfEmpty(Mono.error(
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId))
- );
+ )
+ .zipWith(sessionUserService.getCurrentUser())
+ .map(objects -> {
+ Application application = objects.getT1();
+ User currentUser = objects.getT2();
+
+ if (Boolean.TRUE.equals(application.getExportWithConfiguration())) {
+ // Export the application with datasource configuration
+ return application;
+ }
+ // Explicitly setting the boolean to avoid NPE for future checks
+ application.setExportWithConfiguration(false);
+ // Check if the user have export_application permission
+ Boolean isExportPermissionGranted = policyUtils.isPermissionPresentForUser(
+ application.getPolicies(), EXPORT_APPLICATIONS.getValue(), currentUser.getUsername()
+ );
+ if (Boolean.TRUE.equals(isExportPermissionGranted)) {
+ return application;
+ }
+ throw new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId);
+ });
// Set json schema version which will be used to check the compatibility while importing the JSON
applicationJson.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
@@ -201,10 +229,13 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
removeUnwantedFieldsFromApplicationDuringExport(application);
examplesOrganizationCloner.makePristine(application);
applicationJson.setExportedApplication(application);
-
Set<String> dbNamesUsedInActions = new HashSet<>();
- return newPageRepository.findByApplicationId(applicationId, MANAGE_PAGES)
+ Flux<NewPage> pageFlux = Boolean.TRUE.equals(application.getExportWithConfiguration())
+ ? newPageRepository.findByApplicationId(applicationId, READ_PAGES)
+ : newPageRepository.findByApplicationId(applicationId, MANAGE_PAGES);
+
+ return pageFlux
.collectList()
.flatMap(newPageList -> {
// Extract mongoEscapedWidgets from pages and save it to applicationJson object as this
@@ -260,16 +291,22 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
applicationJson.setPageList(newPageList);
applicationJson.setPublishedLayoutmongoEscapedWidgets(publishedMongoEscapedWidgetsNames);
applicationJson.setUnpublishedLayoutmongoEscapedWidgets(unpublishedMongoEscapedWidgetsNames);
- return datasourceRepository
- .findAllByOrganizationId(organizationId, AclPermission.MANAGE_DATASOURCES)
- .collectList();
+
+ Flux<Datasource> datasourceFlux = Boolean.TRUE.equals(application.getExportWithConfiguration())
+ ? datasourceRepository.findAllByOrganizationId(organizationId, AclPermission.READ_DATASOURCES)
+ : datasourceRepository.findAllByOrganizationId(organizationId, AclPermission.MANAGE_DATASOURCES);
+
+ return datasourceFlux.collectList();
})
.flatMapMany(datasourceList -> {
datasourceList.forEach(datasource ->
datasourceIdToNameMap.put(datasource.getId(), datasource.getName()));
applicationJson.setDatasourceList(datasourceList);
- return actionCollectionRepository
- .findByApplicationId(applicationId, MANAGE_ACTIONS, null);
+
+ Flux<ActionCollection> actionCollectionFlux = Boolean.TRUE.equals(application.getExportWithConfiguration())
+ ? actionCollectionRepository.findByApplicationId(applicationId, READ_ACTIONS, null)
+ : actionCollectionRepository.findByApplicationId(applicationId, MANAGE_ACTIONS, null);
+ return actionCollectionFlux;
})
.map(actionCollection -> {
// Remove references to ids since the serialized version does not have this information
@@ -308,8 +345,12 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
// This object won't have the list of actions but we don't care about that today
// Because the actions will have a reference to the collection
applicationJson.setActionCollectionList(actionCollections);
- return newActionRepository
- .findByApplicationId(applicationId, MANAGE_ACTIONS, null);
+
+ Flux<NewAction> actionFlux = Boolean.TRUE.equals(application.getExportWithConfiguration())
+ ? newActionRepository.findByApplicationId(applicationId, READ_ACTIONS, null)
+ : newActionRepository.findByApplicationId(applicationId, MANAGE_ACTIONS, null);
+
+ return actionFlux;
})
.map(newAction -> {
newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
@@ -381,15 +422,28 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
.getDatasourceList()
.removeIf(datasource -> !dbNamesUsedInActions.contains(datasource.getName()));
- // Save decrypted fields for datasources
- applicationJson.getDatasourceList().forEach(datasource -> {
- datasource.setId(null);
- datasource.setOrganizationId(null);
- datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
- datasource.setStructure(null);
- // Remove the datasourceConfiguration object as user will configure it once imported to other instance
- datasource.setDatasourceConfiguration(null);
- });
+ // Save decrypted fields for datasources for internally used sample apps and templates only
+ if(Boolean.TRUE.equals(application.getExportWithConfiguration())) {
+ // Save decrypted fields for datasources
+ Map<String, DecryptedSensitiveFields> decryptedFields = new HashMap<>();
+ applicationJson.getDatasourceList().forEach(datasource -> {
+ decryptedFields.put(datasource.getName(), getDecryptedFields(datasource));
+ datasource.setId(null);
+ datasource.setOrganizationId(null);
+ datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
+ datasource.setStructure(null);
+ });
+ applicationJson.setDecryptedFields(decryptedFields);
+ } else {
+ applicationJson.getDatasourceList().forEach(datasource -> {
+ datasource.setId(null);
+ datasource.setOrganizationId(null);
+ datasource.setPluginId(pluginMap.get(datasource.getPluginId()));
+ datasource.setStructure(null);
+ // Remove the datasourceConfiguration object as user will configure it once imported to other instance
+ datasource.setDatasourceConfiguration(null);
+ });
+ }
// Update ids for layoutOnLoadAction
for (NewPage newPage : applicationJson.getPageList()) {
@@ -430,7 +484,8 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
});
}
}
-
+ // Disable exporting the application with datasource config once imported in destination instance
+ application.setExportWithConfiguration(null);
processStopwatch.stopAndLogTimeInMillis();
return applicationJson;
});
@@ -574,9 +629,6 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
Map<String, List<String>> publishedActionIdToCollectionIdMap = new HashMap<>();
Application importedApplication = importedDoc.getExportedApplication();
- if(importedApplication.getApplicationVersion() == null) {
- importedApplication.setApplicationVersion(ApplicationVersion.EARLIEST_VERSION);
- }
List<Datasource> importedDatasourceList = importedDoc.getDatasourceList();
List<NewPage> importedNewPageList = importedDoc.getPageList();
@@ -602,6 +654,10 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
if (!errorField.isEmpty()) {
return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, errorField, INVALID_JSON_FILE));
}
+ assert importedApplication != null;
+ if(importedApplication.getApplicationVersion() == null) {
+ importedApplication.setApplicationVersion(ApplicationVersion.EARLIEST_VERSION);
+ }
Mono<Application> importedApplicationMono = pluginRepository.findAll()
.map(plugin -> {
@@ -1687,19 +1743,23 @@ private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> exi
}
return existingDatasourceFlux
+ .map(ds -> {
+ final DatasourceConfiguration dsAuthConfig = ds.getDatasourceConfiguration();
+ if (dsAuthConfig != null && dsAuthConfig.getAuthentication() != null) {
+ dsAuthConfig.getAuthentication().setAuthenticationResponse(null);
+ dsAuthConfig.getAuthentication().setAuthenticationType(null);
+ }
+ return ds;
+ })
// For git import exclude datasource configuration
- .filter(ds -> ds.getName().equals(datasource.getName()))
+ .filter(ds -> applicationId != null ? ds.getName().equals(datasource.getName()) : ds.softEquals(datasource))
.next() // Get the first matching datasource, we don't need more than one here.
.switchIfEmpty(Mono.defer(() -> {
if (datasourceConfig != null && datasourceConfig.getAuthentication() != null) {
datasourceConfig.getAuthentication().setAuthenticationResponse(authResponse);
}
// No matching existing datasource found, so create a new one.
- if (datasourceConfig != null && datasourceConfig.getAuthentication() != null) {
- datasource.setIsConfigured(true);
- } else {
- datasource.setIsConfigured(false);
- }
+ datasource.setIsConfigured(datasourceConfig != null && datasourceConfig.getAuthentication() != null);
return datasourceService
.findByNameAndOrganizationId(datasource.getName(), organizationId, AclPermission.MANAGE_DATASOURCES)
.flatMap(duplicateNameDatasource ->
@@ -1790,6 +1850,41 @@ private Mono<Application> importThemes(Application application, ApplicationJson
});
}
+ /**
+ * This will be used to dehydrate sensitive fields from the datasource while exporting the application
+ *
+ * @param datasource entity from which sensitive fields need to be dehydrated
+ * @return sensitive fields which then will be deserialized and exported in JSON file
+ */
+ private DecryptedSensitiveFields getDecryptedFields(Datasource datasource) {
+ final AuthenticationDTO authentication = datasource.getDatasourceConfiguration() == null
+ ? null : datasource.getDatasourceConfiguration().getAuthentication();
+
+ if (authentication != null) {
+ DecryptedSensitiveFields dsDecryptedFields =
+ authentication.getAuthenticationResponse() == null
+ ? new DecryptedSensitiveFields()
+ : new DecryptedSensitiveFields(authentication.getAuthenticationResponse());
+
+ if (authentication instanceof DBAuth) {
+ DBAuth auth = (DBAuth) authentication;
+ dsDecryptedFields.setPassword(auth.getPassword());
+ dsDecryptedFields.setDbAuth(auth);
+ } else if (authentication instanceof OAuth2) {
+ OAuth2 auth = (OAuth2) authentication;
+ dsDecryptedFields.setPassword(auth.getClientSecret());
+ dsDecryptedFields.setOpenAuth2(auth);
+ } else if (authentication instanceof BasicAuth) {
+ BasicAuth auth = (BasicAuth) authentication;
+ dsDecryptedFields.setPassword(auth.getPassword());
+ dsDecryptedFields.setBasicAuth(auth);
+ }
+ dsDecryptedFields.setAuthType(authentication.getClass().getName());
+ return dsDecryptedFields;
+ }
+ return null;
+ }
+
public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String orgId) {
Mono<List<Datasource>> listMono = datasourceService.findAllByOrganizationId(orgId, MANAGE_DATASOURCES).collectList();
return newActionService.findAllByApplicationIdAndViewMode(applicationId, false, AclPermission.READ_ACTIONS, null)
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 501bb77aec6d..3d2068df891f 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
@@ -24,6 +24,7 @@
import com.appsmith.server.domains.Theme;
import com.appsmith.server.dtos.ActionCollectionDTO;
import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.ApplicationAccessDTO;
import com.appsmith.server.dtos.ApplicationImportDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.exceptions.AppsmithError;
@@ -59,8 +60,10 @@
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -107,6 +110,7 @@
@RunWith(SpringRunner.class)
@SpringBootTest
@DirtiesContext
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ImportExportApplicationServiceTests {
@Autowired
@@ -171,6 +175,7 @@ public class ImportExportApplicationServiceTests {
private static final Map<String, Datasource> datasourceMap = new HashMap<>();
private static Plugin installedJsPlugin;
private static Boolean isSetupDone = false;
+ private static String exportWithConfigurationAppId;
@Before
public void setup() {
@@ -326,38 +331,6 @@ public void exportApplicationById_WhenContainsInternalFields_InternalFieldsNotEx
.verifyComplete();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void createExportAppJsonWithoutActionsAndDatasourceTest() {
-
- final Mono<ApplicationJson> resultMono = importExportApplicationService.exportApplicationById(testAppId, "");
-
- StepVerifier.create(resultMono)
- .assertNext(applicationJson -> {
- Application exportedApp = applicationJson.getExportedApplication();
- List<NewPage> pageList = applicationJson.getPageList();
- List<NewAction> actionList = applicationJson.getActionList();
- List<Datasource> datasourceList = applicationJson.getDatasourceList();
-
- NewPage defaultPage = pageList.get(0);
-
- assertThat(exportedApp.getId()).isNull();
- assertThat(exportedApp.getOrganizationId()).isNull();
- assertThat(exportedApp.getPages()).isNull();
- assertThat(exportedApp.getPolicies()).isNull();
- assertThat(exportedApp.getUserPermissions()).isNull();
-
- assertThat(pageList.isEmpty()).isFalse();
- assertThat(defaultPage.getApplicationId()).isNull();
- assertThat(defaultPage.getUnpublishedPage().getLayouts().get(0).getLayoutOnLoadActions()).isNull();
-
- assertThat(actionList.isEmpty()).isTrue();
-
- assertThat(datasourceList.isEmpty()).isTrue();
- })
- .verifyComplete();
- }
-
@Test
@WithUserDetails(value = "api_user")
public void createExportAppJsonWithDatasourceButWithoutActionsTest() {
@@ -1966,8 +1939,248 @@ public void applySchemaMigration_jsonFileWithFirstVersion_migratedToLatestVersio
assertThat(latestApplicationJson.getClientSchemaVersion()).isEqualTo(JsonSchemaVersions.clientVersion);
})
.verifyComplete();
+ }
+ /**
+ * Testcase to check if the application is exported with the datasource configuration object if this setting is
+ * enabled from application object
+ * This can be enabled with exportWithConfiguration: true
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void test1_exportApplication_withDatasourceConfig_exportedWithDecryptedFields() {
+ Organization newOrganization = new Organization();
+ newOrganization.setName("template-org-with-ds");
+ Application testApplication = new Application();
+ testApplication.setName("exportApplication_withCredentialsForSampleApps_SuccessWithDecryptFields");
+ testApplication.setExportWithConfiguration(true);
+ testApplication = applicationPageService.createApplication(testApplication, orgId).block();
+ assert testApplication != null;
+ exportWithConfigurationAppId = testApplication.getId();
+ ApplicationAccessDTO accessDTO = new ApplicationAccessDTO();
+ accessDTO.setPublicAccess(true);
+ applicationService.changeViewAccess(exportWithConfigurationAppId, accessDTO).block();
+ final String appName = testApplication.getName();
+ final Mono<ApplicationJson> resultMono = Mono.zip(
+ Mono.just(testApplication),
+ newPageService.findPageById(testApplication.getPages().get(0).getId(), READ_PAGES, false)
+ )
+ .flatMap(tuple -> {
+ Application testApp = tuple.getT1();
+ PageDTO testPage = tuple.getT2();
+
+ Layout layout = testPage.getLayouts().get(0);
+ ObjectMapper objectMapper = new ObjectMapper();
+ JSONObject dsl = new JSONObject();
+ try {
+ dsl = new JSONObject(objectMapper.readValue(DEFAULT_PAGE_LAYOUT, new TypeReference<HashMap<String, Object>>() {
+ }));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+
+ ArrayList children = (ArrayList) dsl.get("children");
+ JSONObject testWidget = new JSONObject();
+ testWidget.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "testField"))));
+ testWidget.put("dynamicBindingPathList", temp);
+ testWidget.put("testField", "{{ validAction.data }}");
+ children.add(testWidget);
+
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(testPage.getId());
+ action.setExecuteOnLoad(true);
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS2"));
+
+ ActionDTO action2 = new ActionDTO();
+ action2.setName("validAction2");
+ action2.setPageId(testPage.getId());
+ action2.setExecuteOnLoad(true);
+ action2.setUserSetOnLoad(true);
+ ActionConfiguration actionConfiguration2 = new ActionConfiguration();
+ actionConfiguration2.setHttpMethod(HttpMethod.GET);
+ action2.setActionConfiguration(actionConfiguration2);
+ action2.setDatasource(datasourceMap.get("DS2"));
+
+ ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
+ actionCollectionDTO1.setName("testCollection1");
+ actionCollectionDTO1.setPageId(testPage.getId());
+ actionCollectionDTO1.setApplicationId(testApp.getId());
+ actionCollectionDTO1.setOrganizationId(testApp.getOrganizationId());
+ actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
+ ActionDTO action1 = new ActionDTO();
+ action1.setName("testAction1");
+ action1.setActionConfiguration(new ActionConfiguration());
+ action1.getActionConfiguration().setBody("mockBody");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+
+ return layoutCollectionService.createCollection(actionCollectionDTO1)
+ .then(layoutActionService.createSingleAction(action))
+ .then(layoutActionService.createSingleAction(action2))
+ .then(layoutActionService.updateLayout(testPage.getId(), layout.getId(), layout))
+ .then(importExportApplicationService.exportApplicationById(testApp.getId(), ""));
+ })
+ .cache();
+
+ Mono<List<NewAction>> actionListMono = resultMono
+ .then(newActionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null).collectList());
+
+ Mono<List<ActionCollection>> collectionListMono = resultMono.then(
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null).collectList());
+
+ Mono<List<NewPage>> pageListMono = resultMono.then(
+ newPageService
+ .findNewPagesByApplicationId(testApplication.getId(), READ_PAGES).collectList());
+
+ StepVerifier
+ .create(Mono.zip(resultMono, actionListMono, collectionListMono, pageListMono))
+ .assertNext(tuple -> {
+
+ ApplicationJson applicationJson = tuple.getT1();
+ List<NewAction> DBActions = tuple.getT2();
+ List<ActionCollection> DBCollections = tuple.getT3();
+ List<NewPage> DBPages = tuple.getT4();
+
+ Application exportedApp = applicationJson.getExportedApplication();
+ List<NewPage> pageList = applicationJson.getPageList();
+ List<NewAction> actionList = applicationJson.getActionList();
+ List<ActionCollection> actionCollectionList = applicationJson.getActionCollectionList();
+ List<Datasource> datasourceList = applicationJson.getDatasourceList();
+
+ List<String> exportedCollectionIds = actionCollectionList.stream().map(ActionCollection::getId).collect(Collectors.toList());
+ List<String> exportedActionIds = actionList.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBCollectionIds = DBCollections.stream().map(ActionCollection::getId).collect(Collectors.toList());
+ List<String> DBActionIds = DBActions.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBOnLayoutLoadActionIds = new ArrayList<>();
+ List<String> exportedOnLayoutLoadActionIds = new ArrayList<>();
+
+ DBPages.forEach(newPage ->
+ newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(actionDTO -> DBOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ })
+ );
+
+ pageList.forEach(newPage ->
+ newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(actionDTO -> exportedOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ })
+ );
+
+ NewPage defaultPage = pageList.get(0);
+
+ assertThat(exportedApp.getName()).isEqualTo(appName);
+ assertThat(exportedApp.getOrganizationId()).isNull();
+ assertThat(exportedApp.getPages()).isNull();
+
+ assertThat(exportedApp.getPolicies()).isNull();
+
+ assertThat(pageList).hasSize(1);
+ assertThat(defaultPage.getApplicationId()).isNull();
+ assertThat(defaultPage.getUnpublishedPage().getLayouts().get(0).getDsl()).isNotNull();
+ assertThat(defaultPage.getId()).isNull();
+ assertThat(defaultPage.getPolicies()).isEmpty();
+
+ assertThat(actionList.isEmpty()).isFalse();
+ assertThat(actionList).hasSize(3);
+ NewAction validAction = actionList.stream().filter(action -> action.getId().equals("Page1_validAction")).findFirst().get();
+ assertThat(validAction.getApplicationId()).isNull();
+ assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
+ assertThat(validAction.getOrganizationId()).isNull();
+ assertThat(validAction.getPolicies()).isNull();
+ assertThat(validAction.getId()).isNotNull();
+ ActionDTO unpublishedAction = validAction.getUnpublishedAction();
+ assertThat(unpublishedAction.getPageId()).isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(unpublishedAction.getDatasource().getPluginId()).isEqualTo(installedPlugin.getPackageName());
+
+ NewAction testAction1 = actionList.stream().filter(action -> action.getUnpublishedAction().getName().equals("testAction1")).findFirst().get();
+ assertThat(testAction1.getId()).isEqualTo("Page1_testCollection1.testAction1");
+
+ assertThat(actionCollectionList.isEmpty()).isFalse();
+ assertThat(actionCollectionList).hasSize(1);
+ final ActionCollection actionCollection = actionCollectionList.get(0);
+ assertThat(actionCollection.getApplicationId()).isNull();
+ assertThat(actionCollection.getOrganizationId()).isNull();
+ assertThat(actionCollection.getPolicies()).isNull();
+ assertThat(actionCollection.getId()).isNotNull();
+ assertThat(actionCollection.getUnpublishedCollection().getPluginType()).isEqualTo(PluginType.JS);
+ assertThat(actionCollection.getUnpublishedCollection().getPageId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(actionCollection.getUnpublishedCollection().getPluginId()).isEqualTo(installedJsPlugin.getPackageName());
+
+ assertThat(datasourceList).hasSize(1);
+ Datasource datasource = datasourceList.get(0);
+ assertThat(datasource.getOrganizationId()).isNull();
+ assertThat(datasource.getId()).isNull();
+ assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(datasource.getDatasourceConfiguration()).isNotNull();
+
+ final Map<String, InvisibleActionFields> invisibleActionFields = applicationJson.getInvisibleActionFields();
+
+ Assert.assertEquals(3, invisibleActionFields.size());
+ NewAction validAction2 = actionList.stream().filter(action -> action.getId().equals("Page1_validAction2")).findFirst().get();
+ Assert.assertEquals(true, invisibleActionFields.get(validAction2.getId()).getUnpublishedUserSetOnLoad());
+
+ assertThat(applicationJson.getUnpublishedLayoutmongoEscapedWidgets()).isNotEmpty();
+ assertThat(applicationJson.getPublishedLayoutmongoEscapedWidgets()).isNotEmpty();
+ assertThat(applicationJson.getEditModeTheme()).isNotNull();
+ assertThat(applicationJson.getEditModeTheme().isSystemTheme()).isTrue();
+ assertThat(applicationJson.getEditModeTheme().getName()).isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(applicationJson.getPublishedTheme()).isNotNull();
+ assertThat(applicationJson.getPublishedTheme().isSystemTheme()).isTrue();
+ assertThat(applicationJson.getPublishedTheme().getName()).isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(exportedCollectionIds).isNotEmpty();
+ assertThat(exportedCollectionIds).doesNotContain(String.valueOf(DBCollectionIds));
+
+ assertThat(exportedActionIds).isNotEmpty();
+ assertThat(exportedActionIds).doesNotContain(String.valueOf(DBActionIds));
+
+ assertThat(exportedOnLayoutLoadActionIds).isNotEmpty();
+ assertThat(exportedOnLayoutLoadActionIds).doesNotContain(String.valueOf(DBOnLayoutLoadActionIds));
+
+ assertThat(applicationJson.getDecryptedFields()).isNotNull();
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Test to check if the application can be exported with read only access if this is sample application
+ */
+ @Test
+ @WithUserDetails(value = "[email protected]")
+ public void test2_exportApplication_withReadOnlyAccess_exportedWithDecryptedFields() {
+ Mono<ApplicationJson> exportApplicationMono = importExportApplicationService
+ .exportApplicationById(exportWithConfigurationAppId, SerialiseApplicationObjective.SHARE);
+
+ StepVerifier
+ .create(exportApplicationMono)
+ .assertNext(applicationJson -> {
+ assertThat(applicationJson.getExportedApplication()).isNotNull();
+ assertThat(applicationJson.getDecryptedFields()).isNotNull();
+ })
+ .verifyComplete();
}
}
|
41d5ce7d25b292c611faea8d8124544265619ce8
|
2024-10-09 18:38:45
|
Ankita Kinger
|
chore: Adding the functionality of running and deleting an action under modularised flow (#36746)
| false
|
Adding the functionality of running and deleting an action under modularised flow (#36746)
|
chore
|
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
index d8cbdd88eb2f..9c046e9119ce 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx
@@ -9,13 +9,14 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
import { getHasManageActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
import Pagination from "pages/Editor/APIEditor/Pagination";
-import { noop } from "lodash";
import { reduxForm } from "redux-form";
+import { useHandleRunClick } from "PluginActionEditor/hooks";
const FORM_NAME = API_EDITOR_FORM_NAME;
const APIEditorForm = () => {
const { action } = usePluginActionContext();
+ const { handleRunClick } = useHandleRunClick();
const theme = EditorTheme.LIGHT;
const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
@@ -39,7 +40,7 @@ const APIEditorForm = () => {
paginationUiComponent={
<Pagination
actionName={action.name}
- onTestClick={noop}
+ onTestClick={handleRunClick}
paginationType={action.actionConfiguration.paginationType}
theme={theme}
/>
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
index 717781b5a382..96a9782c98af 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/GraphQLEditor/GraphQLEditorForm.tsx
@@ -9,7 +9,6 @@ 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";
@@ -38,7 +37,6 @@ function GraphQLEditorForm() {
<Pagination
actionName={action.name}
formName={FORM_NAME}
- onTestClick={noop}
paginationType={action.actionConfiguration.paginationType}
query={actionConfigurationBody}
theme={theme}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
index 4a3563f9e4f2..cfad25a5ee4c 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
@@ -1,11 +1,10 @@
-import React, { useCallback } from "react";
+import React from "react";
import { IDEToolbar } from "IDE";
import { Button, Menu, MenuContent, MenuTrigger, Tooltip } from "@appsmith/ads";
import { modText } from "utils/helpers";
import { usePluginActionContext } from "../PluginActionContext";
-import { useDispatch } from "react-redux";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { runAction } from "actions/pluginActionActions";
+import { useHandleRunClick } from "PluginActionEditor/hooks";
+import { useToggle } from "@mantine/hooks";
interface PluginActionToolbarProps {
runOptions?: React.ReactNode;
@@ -14,25 +13,9 @@ interface PluginActionToolbarProps {
}
const PluginActionToolbar = (props: PluginActionToolbarProps) => {
- const { action, datasource, plugin } = usePluginActionContext();
- const dispatch = useDispatch();
- const handleRunClick = useCallback(() => {
- AnalyticsUtil.logEvent("RUN_QUERY_CLICK", {
- actionName: action.name,
- actionId: action.id,
- pluginName: plugin.name,
- datasourceId: datasource?.id,
- isMock: datasource?.isMock,
- });
- dispatch(runAction(action.id));
- }, [
- action.id,
- action.name,
- datasource?.id,
- datasource?.isMock,
- dispatch,
- plugin.name,
- ]);
+ const { action } = usePluginActionContext();
+ const { handleRunClick } = useHandleRunClick();
+ const [isMenuOpen, toggleMenuOpen] = useToggle([false, true]);
return (
<IDEToolbar>
@@ -44,7 +27,7 @@ const PluginActionToolbar = (props: PluginActionToolbarProps) => {
placement="topRight"
showArrow={false}
>
- <Button kind="primary" onClick={handleRunClick} size="sm">
+ <Button kind="primary" onClick={() => handleRunClick()} size="sm">
Run
</Button>
</Tooltip>
@@ -54,7 +37,7 @@ const PluginActionToolbar = (props: PluginActionToolbarProps) => {
size="sm"
startIcon="settings-2-line"
/>
- <Menu key={action.id}>
+ <Menu onOpenChange={toggleMenuOpen} open={isMenuOpen}>
<MenuTrigger>
<Button
isIconButton
diff --git a/app/client/src/PluginActionEditor/hooks/index.ts b/app/client/src/PluginActionEditor/hooks/index.ts
index 5af0c9060d3a..00460d54c4c0 100644
--- a/app/client/src/PluginActionEditor/hooks/index.ts
+++ b/app/client/src/PluginActionEditor/hooks/index.ts
@@ -1 +1,3 @@
export { useActionSettingsConfig } from "ee/PluginActionEditor/hooks/useActionSettingsConfig";
+export { useHandleDeleteClick } from "ee/PluginActionEditor/hooks/useHandleDeleteClick";
+export { useHandleRunClick } from "ee/PluginActionEditor/hooks/useHandleRunClick";
diff --git a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
index b303bd34a059..18c863ccbc78 100644
--- a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
+++ b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
@@ -27,10 +27,12 @@ import Schema from "components/editorComponents/Debugger/Schema";
import QueryResponseTab from "pages/Editor/QueryEditor/QueryResponseTab";
import type { SourceEntity } from "entities/AppsmithConsole";
import { ENTITY_TYPE as SOURCE_ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
+import { useHandleRunClick } from "PluginActionEditor/hooks";
function usePluginActionResponseTabs() {
const { action, actionResponse, datasource, plugin } =
usePluginActionContext();
+ const { handleRunClick } = useHandleRunClick();
const IDEViewMode = useSelector(getIDEViewMode);
const errorCount = useSelector(getErrorCount);
@@ -69,7 +71,7 @@ function usePluginActionResponseTabs() {
actionResponse={actionResponse}
isRunDisabled={false}
isRunning={false}
- onRunClick={noop}
+ onRunClick={handleRunClick}
responseTabHeight={responseTabHeight}
theme={EditorTheme.LIGHT}
/>
@@ -84,7 +86,7 @@ function usePluginActionResponseTabs() {
isRunDisabled={false}
isRunning={false}
onDebugClick={noop}
- onRunClick={noop}
+ onRunClick={handleRunClick}
/>
),
},
@@ -131,7 +133,7 @@ function usePluginActionResponseTabs() {
actionSource={actionSource}
currentActionConfig={action}
isRunning={false}
- onRunClick={noop}
+ onRunClick={handleRunClick}
runErrorMessage={""} // TODO
/>
),
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts b/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts
new file mode 100644
index 000000000000..9742d722a9c5
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useHandleDeleteClick.ts
@@ -0,0 +1,26 @@
+import { deleteAction } from "actions/pluginActionActions";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+
+function useHandleDeleteClick() {
+ const { action } = usePluginActionContext();
+ const dispatch = useDispatch();
+
+ const handleDeleteClick = useCallback(
+ ({ onSuccess }: { onSuccess?: () => void }) => {
+ dispatch(
+ deleteAction({
+ id: action?.id ?? "",
+ name: action?.name ?? "",
+ onSuccess,
+ }),
+ );
+ },
+ [action.id, action.name, dispatch],
+ );
+
+ return { handleDeleteClick };
+}
+
+export { useHandleDeleteClick };
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts b/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts
new file mode 100644
index 000000000000..b44c80f5c618
--- /dev/null
+++ b/app/client/src/ce/PluginActionEditor/hooks/useHandleRunClick.ts
@@ -0,0 +1,21 @@
+import { runAction } from "actions/pluginActionActions";
+import type { PaginationField } from "api/ActionAPI";
+import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { useCallback } from "react";
+import { useDispatch } from "react-redux";
+
+function useHandleRunClick() {
+ const { action } = usePluginActionContext();
+ const dispatch = useDispatch();
+
+ const handleRunClick = useCallback(
+ (paginationField?: PaginationField) => {
+ dispatch(runAction(action?.id ?? "", paginationField));
+ },
+ [action.id, dispatch],
+ );
+
+ return { handleRunClick };
+}
+
+export { useHandleRunClick };
diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx b/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx
index 1fcab27adb36..d07d692c5e7f 100644
--- a/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx
+++ b/app/client/src/ce/pages/Editor/AppPluginActionEditor/components/PluginActionMoreActions.tsx
@@ -22,13 +22,13 @@ import {
import { useDispatch, useSelector } from "react-redux";
import {
copyActionRequest,
- deleteAction,
moveActionRequest,
} from "actions/pluginActionActions";
import { getCurrentPageId } from "selectors/editorSelectors";
import type { Page } from "entities/Page";
import { getPageList } from "ee/selectors/entitiesSelector";
import { ConvertToModuleCTA } from "./ConvertToModule";
+import { useHandleDeleteClick } from "PluginActionEditor/hooks";
const PageMenuItem = (props: {
page: Page;
@@ -126,18 +126,16 @@ const Move = () => {
};
const Delete = () => {
- const dispatch = useDispatch();
- const { action } = usePluginActionContext();
-
+ const { handleDeleteClick } = useHandleDeleteClick();
const [confirmDelete, setConfirmDelete] = useState(false);
- const deleteActionFromPage = useCallback(() => {
- dispatch(deleteAction({ id: action.id, name: action.name }));
- }, [action.id, action.name, dispatch]);
-
- const handleSelect = useCallback(() => {
- confirmDelete ? deleteActionFromPage() : setConfirmDelete(true);
- }, [confirmDelete, deleteActionFromPage]);
+ const handleSelect = useCallback(
+ (e?: Event) => {
+ e?.preventDefault();
+ confirmDelete ? handleDeleteClick({}) : setConfirmDelete(true);
+ },
+ [confirmDelete, handleDeleteClick],
+ );
const menuLabel = confirmDelete
? createMessage(CONFIRM_CONTEXT_DELETE)
diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts
index 988306feb3d7..ec84c03efdf9 100644
--- a/app/client/src/ce/utils/analyticsUtilTypes.ts
+++ b/app/client/src/ce/utils/analyticsUtilTypes.ts
@@ -52,7 +52,6 @@ export type EventName =
| "RUN_API_CLICK"
| "RUN_API_SHORTCUT"
| "DELETE_API"
- | "DELETE_API_CLICK"
| "IMPORT_API"
| "EXPAND_API"
| "IMPORT_API_CLICK"
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts b/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts
new file mode 100644
index 000000000000..f44960bfdde8
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useHandleDeleteClick.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useHandleDeleteClick";
diff --git a/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts b/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts
new file mode 100644
index 000000000000..bf69932b7c27
--- /dev/null
+++ b/app/client/src/ee/PluginActionEditor/hooks/useHandleRunClick.ts
@@ -0,0 +1 @@
+export * from "ce/PluginActionEditor/hooks/useHandleRunClick";
diff --git a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
index adca7c27f607..28cca89f39e0 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiEditorContext.tsx
@@ -5,7 +5,6 @@ import type { SaveActionNameParams } from "PluginActionEditor";
interface ApiEditorContextContextProps {
moreActionsMenu?: React.ReactNode;
- handleDeleteClick: () => void;
handleRunClick: (paginationField?: PaginationField) => void;
actionRightPaneBackLink?: React.ReactNode;
// TODO: Fix this the next time the file is edited
@@ -30,7 +29,6 @@ export function ApiEditorContextProvider({
actionRightPaneAdditionSections,
actionRightPaneBackLink,
children,
- handleDeleteClick,
handleRunClick,
moreActionsMenu,
notification,
@@ -42,7 +40,6 @@ export function ApiEditorContextProvider({
() => ({
actionRightPaneAdditionSections,
actionRightPaneBackLink,
- handleDeleteClick,
showRightPaneTabbedSection,
handleRunClick,
moreActionsMenu,
@@ -53,7 +50,6 @@ export function ApiEditorContextProvider({
[
actionRightPaneBackLink,
actionRightPaneAdditionSections,
- handleDeleteClick,
showRightPaneTabbedSection,
handleRunClick,
moreActionsMenu,
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index 7c265e98b5c0..71baf3d547d4 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -125,7 +125,6 @@ export interface CommonFormProps {
actionResponse?: ActionResponse;
pluginId: string;
onRunClick: (paginationField?: PaginationField) => void;
- onDeleteClick: () => void;
isRunning: boolean;
isDeleting: boolean;
paginationType: PaginationType;
diff --git a/app/client/src/pages/Editor/APIEditor/Editor.tsx b/app/client/src/pages/Editor/APIEditor/Editor.tsx
index a1a79bb7b73d..5ce681b23e05 100644
--- a/app/client/src/pages/Editor/APIEditor/Editor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Editor.tsx
@@ -187,7 +187,6 @@ class ApiEditor extends React.Component<Props> {
}
isDeleting={isDeleting}
isRunning={isRunning}
- onDeleteClick={this.context.handleDeleteClick}
onRunClick={this.context.handleRunClick}
paginationType={paginationType}
pluginId={pluginId}
@@ -205,7 +204,6 @@ class ApiEditor extends React.Component<Props> {
isDeleting={isDeleting}
isRunning={isRunning}
match={this.props.match}
- onDeleteClick={this.context.handleDeleteClick}
onRunClick={this.context.handleRunClick}
paginationType={paginationType}
pluginId={pluginId}
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
index 1ed0faf3cdda..45d6feb4cca1 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
@@ -42,7 +42,6 @@ function GraphQLEditorForm(props: Props) {
<Pagination
actionName={actionName}
formName={FORM_NAME}
- onTestClick={props.onRunClick}
paginationType={props.paginationType}
query={props.actionConfigurationBody}
/>
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
index 7dafea1a0010..07b74cf2e4cc 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
@@ -28,7 +28,6 @@ const PAGINATION_PREFIX =
interface PaginationProps {
actionName: string;
- onTestClick: (test?: "PREV" | "NEXT") => void;
paginationType: PaginationType;
theme?: EditorTheme;
query: string;
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 31328d250556..568fca9c0199 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -8,11 +8,7 @@ import {
getPluginSettingConfigs,
getPlugins,
} from "ee/selectors/entitiesSelector";
-import {
- deleteAction,
- runAction,
- saveActionName,
-} from "actions/pluginActionActions";
+import { runAction, saveActionName } from "actions/pluginActionActions";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import Editor from "./Editor";
import BackToCanvas from "components/common/BackToCanvas";
@@ -162,15 +158,6 @@ function ApiEditorWrapper(props: ApiEditorWrapperProps) {
return <BackToCanvas basePageId={basePageId} />;
}, [basePageId]);
- const handleDeleteClick = useCallback(() => {
- AnalyticsUtil.logEvent("DELETE_API_CLICK", {
- apiName,
- apiID: action?.id,
- pageName,
- });
- dispatch(deleteAction({ id: action?.id ?? "", name: apiName }));
- }, [pages, basePageId, apiName, action?.id, dispatch, pageName]);
-
const notification = useMemo(() => {
if (!isConverting) return null;
@@ -188,7 +175,6 @@ function ApiEditorWrapper(props: ApiEditorWrapperProps) {
return (
<ApiEditorContextProvider
actionRightPaneBackLink={actionRightPaneBackLink}
- handleDeleteClick={handleDeleteClick}
handleRunClick={handleRunClick}
moreActionsMenu={moreActionsMenu}
notification={notification}
|
bc669182c6f05d8f3587c0119c9c82db3b2caf89
|
2022-09-29 18:34:04
|
Nidhi
|
chore: Fixing dependencies (#17188)
| false
|
Fixing dependencies (#17188)
|
chore
|
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index 5653ca0f780c..435ccda22248 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -277,12 +277,6 @@
<groupId>com.segment.analytics.java</groupId>
<artifactId>analytics</artifactId>
<version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
|
d60b0b99dc445db4a46a805b0116985646d39e8a
|
2024-01-11 12:37:17
|
Trisha Anand
|
fix: Don't allow createApplication with any id set (#30167)
| false
|
Don't allow createApplication with any id set (#30167)
|
fix
|
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 add17397ba0b..cfb1c2f49fd1 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
@@ -432,6 +432,11 @@ public Mono<Application> createApplication(Application application) {
@Override
public Mono<Application> createApplication(Application application, String workspaceId) {
+
+ if (StringUtils.hasLength(application.getId())) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
+ }
+
if (application.getName() == null || application.getName().trim().isEmpty()) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
index c2e101f5ab0e..157ab8fd4a82 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationPageServiceTest.java
@@ -3,12 +3,15 @@
import com.appsmith.git.constants.CommonConstants;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.GitApplicationMetadata;
import com.appsmith.server.domains.Layout;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.newpages.base.NewPageService;
import com.appsmith.server.repositories.ApplicationRepository;
@@ -410,4 +413,22 @@ public void createOrUpdateSuffixedApplication_GitConnectedAppExistsWithSameName_
})
.verifyComplete();
}
+
+ @Test
+ @WithUserDetails("api_user")
+ public void createApplicationWithId_throwsException() {
+ final String appName = "app" + UUID.randomUUID();
+ Application application = new Application();
+ application.setName(appName);
+ String id = "anyIdHere";
+ application.setId(id);
+
+ Mono<Application> createApplicationMono =
+ applicationPageService.createApplication(application, workspace.getId());
+
+ StepVerifier.create(createApplicationMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable.getMessage().equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.ID, id)))
+ .verify();
+ }
}
|
856d2ad8123f9095947b5afd515f32d3989da724
|
2023-11-20 09:01:03
|
balajisoundar
|
feat: [Table Widget] Allow moment date formats in input and display d… (#28784)
| false
|
[Table Widget] Allow moment date formats in input and display d… (#28784)
|
feat
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
index 5f8ad27c1769..13686e9ad41a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.ts
@@ -84,13 +84,5 @@ describe("Table widget date column inline editing functionality", () => {
.then(($textData) =>
expect($textData).to.include("YYYY-MM-DDTHH:mm:ss.SSSZ"),
);
- propPane.UpdatePropertyFieldValue(
- "Date format",
- "YYYY-MM-DDTHH:mm:ss.SSSsZ",
- );
- //we should now see an error when an incorrect date format
- agHelper.AssertElementVisibility(
- `${propPane._propertyDateFormat} ${table._codeMirrorError}`,
- );
});
});
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Data.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Data.ts
index e1abfc9bc82b..7cb58156c3d7 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Data.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Data.ts
@@ -279,31 +279,6 @@ export default {
type: ValidationTypes.ARRAY_OF_TYPE_OR_TYPE,
params: {
type: ValidationTypes.TEXT,
- params: {
- allowedValues: [
- "YYYY-MM-DDTHH:mm:ss.SSSZ",
- DateInputFormat.EPOCH,
- DateInputFormat.MILLISECONDS,
- "YYYY-MM-DD",
- "YYYY-MM-DD HH:mm",
- "YYYY-MM-DDTHH:mm:ss.sssZ",
- "YYYY-MM-DDTHH:mm:ss",
- "YYYY-MM-DD hh:mm:ss",
- "Do MMM YYYY",
- "DD/MM/YYYY",
- "DD/MM/YYYY HH:mm",
- "LLL",
- "LL",
- "D MMMM, YYYY",
- "H:mm A D MMMM, YYYY",
- "MM-DD-YYYY",
- "DD-MM-YYYY",
- "MM/DD/YYYY",
- "DD/MM/YYYY",
- "DD/MM/YY",
- "MM/DD/YY",
- ],
- },
},
},
isTriggerProperty: false,
@@ -409,31 +384,6 @@ export default {
type: ValidationTypes.ARRAY_OF_TYPE_OR_TYPE,
params: {
type: ValidationTypes.TEXT,
- params: {
- allowedValues: [
- "YYYY-MM-DDTHH:mm:ss.SSSZ",
- "Epoch",
- "Milliseconds",
- "YYYY-MM-DD",
- "YYYY-MM-DD HH:mm",
- "YYYY-MM-DDTHH:mm:ss.sssZ",
- "YYYY-MM-DDTHH:mm:ss",
- "YYYY-MM-DD hh:mm:ss",
- "Do MMM YYYY",
- "DD/MM/YYYY",
- "DD/MM/YYYY HH:mm",
- "LLL",
- "LL",
- "D MMMM, YYYY",
- "H:mm A D MMMM, YYYY",
- "MM-DD-YYYY",
- "DD-MM-YYYY",
- "MM/DD/YYYY",
- "DD/MM/YYYY",
- "DD/MM/YY",
- "MM/DD/YY",
- ],
- },
},
},
isTriggerProperty: false,
|
5d44d4f2cfdde04e63b170b1c568ecc00a4c989e
|
2024-01-16 10:52:17
|
balajisoundar
|
chore: misc updates to custom widget (#30114)
| false
|
misc updates to custom widget (#30114)
|
chore
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
index 0a8913142f10..fb8c2636ce0a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Custom/CustomWidgetEditorPropertyPane_spec.ts
@@ -11,22 +11,18 @@ describe(
function () {
before(() => {
agHelper.AddDsl("customWidget");
- cy.wait(5000);
});
const getIframeBody = () => {
// get the iframe > document > body
// and retry until the body element is not empty
- return (
- cy
- .get(".t--widget-customwidget iframe")
- .its("0.contentDocument.body")
- .should("not.be.empty")
- // wraps "body" DOM element to allow
- // chaining more Cypress commands, like ".find(...)"
- // https://on.cypress.io/wrap
- .then(cy.wrap)
- );
+ return cy
+ .get(".t--widget-customwidget iframe")
+ .its("0.contentDocument")
+ .should("exist")
+ .its("body")
+ .should("not.be.undefined")
+ .then(cy.wrap);
};
it("shoud check that default model changes are converyed to custom component", () => {
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 59cefc92a8b7..c7e018b77c8e 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -2375,7 +2375,7 @@ export const CUSTOM_WIDGET_FEATURE = {
split: () => "Splits",
},
referrences: {
- title: () => "Referrences",
+ title: () => "References",
tooltip: {
open: () => "Open references",
close: () => "Close references",
diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts
index 9a77fddd0469..5c586903afde 100644
--- a/app/client/src/ce/utils/analyticsUtilTypes.ts
+++ b/app/client/src/ce/utils/analyticsUtilTypes.ts
@@ -350,7 +350,8 @@ export type EventName =
| "START_FROM_TEMPLATES_CLICK_SKIP_BUTTON"
| "SUPPORT_REQUEST_INITIATED"
| ONBOARDING_FLOW_EVENTS
- | CANVAS_STARTER_BUILDING_BLOCK_EVENTS;
+ | CANVAS_STARTER_BUILDING_BLOCK_EVENTS
+ | CUSTOM_WIDGET_EVENTS;
export type CANVAS_STARTER_BUILDING_BLOCK_EVENTS =
| "STARTER_BUILDING_BLOCK_HOVER"
@@ -429,3 +430,24 @@ export type VERSION_UPDATE_EVENTS =
| "VERSION_UPDATE_REQUESTED"
| "VERSION_UPDATE_SUCCESS"
| "VERSION_UPDATED_FAILED";
+
+export type CUSTOM_WIDGET_EVENTS =
+ | "CUSTOM_WIDGET_EDIT_SOURCE_CLICKED"
+ | "CUSTOM_WIDGET_ADD_EVENT_CLICKED"
+ | "CUSTOM_WIDGET_ADD_EVENT_CANCEL_CLICKED"
+ | "CUSTOM_WIDGET_ADD_EVENT_SAVE_CLICKED"
+ | "CUSTOM_WIDGET_EDIT_EVENT_CLICKED"
+ | "CUSTOM_WIDGET_DELETE_EVENT_CLICKED"
+ | "CUSTOM_WIDGET_EDIT_EVENT_SAVE_CLICKED"
+ | "CUSTOM_WIDGET_EDIT_EVENT_CANCEL_CLICKED"
+ | "CUSTOM_WIDGET_BUILDER_SRCDOC_UPDATE"
+ | "CUSTOM_WIDGET_BUILDER_TEMPLATE_OPENED"
+ | "CUSTOM_WIDGET_BUILDER_TEMPLATE_REVERT_TO_ORIGINAL_CLICKED"
+ | "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT"
+ | "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT_CANCELED"
+ | "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT_CONFIRMED"
+ | "CUSTOM_WIDGET_BUILDER_LAYOUT_CHANGED"
+ | "CUSTOM_WIDGET_BUILDER_REFERENCE_VISIBILITY_CHANGED"
+ | "CUSTOM_WIDGET_BUILDER_REFERENCE_EVENT_OPENED"
+ | "CUSTOM_WIDGET_BUILDER_DEBUGGER_CLEARED"
+ | "CUSTOM_WIDGET_BUILDER_DEBUGGER_VISIBILITY_CHANGED";
diff --git a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
index d0b8aade0e7b..4a2e880251ce 100644
--- a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
+++ b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
@@ -9,6 +9,7 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
interface ButtonControlState {
showInput: boolean;
@@ -72,8 +73,12 @@ class ButtonControl extends BaseControl<
reset = () => {
this.setState({ showInput: false, eventName: "", pristine: true });
};
+
onCancel = () => {
this.reset();
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_ADD_EVENT_CANCEL_CLICKED", {
+ widgetId: this.props.widgetProperties.widgetId,
+ });
};
onSave = () => {
@@ -83,6 +88,9 @@ class ButtonControl extends BaseControl<
);
this.batchUpdateProperties(updates);
this.reset();
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_ADD_EVENT_SAVE_CLICKED", {
+ widgetId: this.props.widgetProperties.widgetId,
+ });
};
hasError = () => {
@@ -172,7 +180,12 @@ class ButtonControl extends BaseControl<
) : (
<Button
kind="tertiary"
- onClick={() => this.setState({ showInput: true })}
+ onClick={() => {
+ this.setState({ showInput: true });
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_ADD_EVENT_CLICKED", {
+ widgetId: this.props.widgetProperties.widgetId,
+ });
+ }}
size="sm"
startIcon="plus"
>
diff --git a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
index 9f16fd167f96..6ea71a44442d 100644
--- a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
+++ b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
@@ -10,6 +10,7 @@ import {
} from "@appsmith/constants/messages";
import CustomWidgetBuilderService from "utils/CustomWidgetBuilderService";
import styled from "styled-components";
+import AnalyticsUtil from "utils/AnalyticsUtil";
interface ButtonControlState {
isSourceEditorOpen: boolean;
@@ -24,7 +25,32 @@ class ButtonControl extends BaseControl<ControlProps, ButtonControlState> {
isSourceEditorOpen: false,
};
+ getPayload = () => {
+ return {
+ name: this.props.widgetProperties.widgetName,
+ widgetId: this.props.widgetProperties.widgetId,
+ srcDoc: this.props.widgetProperties.srcDoc,
+ uncompiledSrcDoc: this.props.widgetProperties.uncompiledSrcDoc,
+ model:
+ this.props.widgetProperties.__evaluation__?.evaluatedValues
+ ?.defaultModel,
+ events: this.props.widgetProperties.events.reduce(
+ (prev: Record<string, string>, curr: string) => {
+ prev[curr] = this.props.widgetProperties[curr];
+
+ return prev;
+ },
+ {},
+ ),
+ theme: this.props.widgetProperties.__evaluation__?.evaluatedValues?.theme,
+ };
+ };
+
onCTAClick = () => {
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_EDIT_SOURCE_CLICKED", {
+ widgetId: this.props.widgetProperties.widgetId,
+ });
+
if (
CustomWidgetBuilderService.isConnected(
this.props.widgetProperties.widgetId,
@@ -40,22 +66,7 @@ class ButtonControl extends BaseControl<ControlProps, ButtonControlState> {
onMessage(CUSTOM_WIDGET_BUILDER_EVENTS.READY, () => {
postMessage({
type: CUSTOM_WIDGET_BUILDER_EVENTS.READY_ACK,
- name: this.props.widgetProperties.widgetName,
- srcDoc: this.props.widgetProperties.srcDoc,
- uncompiledSrcDoc: this.props.widgetProperties.uncompiledSrcDoc,
- model:
- this.props.widgetProperties.__evaluation__?.evaluatedValues
- ?.defaultModel,
- events: this.props.widgetProperties.events.reduce(
- (prev: Record<string, string>, curr: string) => {
- prev[curr] = this.props.widgetProperties[curr];
-
- return prev;
- },
- {},
- ),
- theme:
- this.props.widgetProperties.__evaluation__?.evaluatedValues?.theme,
+ ...this.getPayload(),
});
});
@@ -74,6 +85,7 @@ class ButtonControl extends BaseControl<ControlProps, ButtonControlState> {
onMessage(CUSTOM_WIDGET_BUILDER_EVENTS.DISCONNECTED, () => {
CustomWidgetBuilderService.closeConnection(
this.props.widgetProperties.widgetId,
+ true,
);
this.setState({
@@ -105,6 +117,7 @@ class ButtonControl extends BaseControl<ControlProps, ButtonControlState> {
this.props.widgetProperties.widgetId,
)?.postMessage({
type: CUSTOM_WIDGET_BUILDER_EVENTS.RESUME,
+ ...this.getPayload(),
});
}
}
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
index 84f8a297dad3..4198f38157a9 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
@@ -22,6 +22,7 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const StyledButton = styled(Button)`
height: 32px !important;
@@ -70,13 +71,14 @@ function ConfirmationModal(props: {
}
export function CodeTemplates() {
- const { bulkUpdate, initialSrcDoc, lastSaved } = useContext(
+ const { bulkUpdate, initialSrcDoc, lastSaved, widgetId } = useContext(
CustomWidgetBuilderContext,
);
const [open, setOpen] = useState(false);
const [selectedTemplate, setSelectedTemplate] = useState<SrcDoc | null>(null);
+ const [selectedTemplateName, setSelectedTemplateName] = useState("");
return (
<div className={styles.templateMenu}>
@@ -85,9 +87,13 @@ export function CodeTemplates() {
<StyledButton
className="t--custom-widget-template-trigger"
kind="secondary"
+ onClick={() => {
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_TEMPLATE_OPENED", {
+ widgetId: widgetId,
+ });
+ }}
size="sm"
startIcon="query"
- style={{}}
>
{createMessage(CUSTOM_WIDGET_FEATURE.template.buttonCTA)}
</StyledButton>
@@ -98,7 +104,17 @@ export function CodeTemplates() {
<MenuItem
onClick={() => {
setSelectedTemplate(initialSrcDoc);
+ setSelectedTemplateName(
+ CUSTOM_WIDGET_FEATURE.template.revert,
+ );
setOpen(true);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT",
+ {
+ widgetId: widgetId,
+ templateName: CUSTOM_WIDGET_FEATURE.template.revert,
+ },
+ );
}}
>
{createMessage(CUSTOM_WIDGET_FEATURE.template.revert)}
@@ -111,7 +127,15 @@ export function CodeTemplates() {
key={template.key}
onClick={() => {
setSelectedTemplate(template.uncompiledSrcDoc);
+ setSelectedTemplateName(template.key);
setOpen(true);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT",
+ {
+ widgetId: widgetId,
+ templateName: template.key,
+ },
+ );
}}
>
{template.key}
@@ -122,18 +146,42 @@ export function CodeTemplates() {
<ConfirmationModal
onCancel={() => {
setSelectedTemplate(null);
+ setSelectedTemplateName("");
setOpen(false);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT_CANCELED",
+ {
+ widgetId: widgetId,
+ templateName: selectedTemplateName,
+ },
+ );
}}
onOpenChange={(flag: boolean) => {
if (!flag) {
setSelectedTemplate(null);
+ setSelectedTemplateName("");
setOpen(false);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT_CANCELED",
+ {
+ widgetId: widgetId,
+ templateName: selectedTemplateName,
+ },
+ );
}
}}
onReplace={() => {
selectedTemplate && bulkUpdate?.(selectedTemplate);
setSelectedTemplate(null);
+ setSelectedTemplateName("");
setOpen(false);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_TEMPLATE_SELECT_CONFIRMED",
+ {
+ widgetId: widgetId,
+ templateName: selectedTemplateName,
+ },
+ );
}}
open={open}
/>
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
index f53550fa6b3d..92838e7d8b89 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
@@ -7,6 +7,7 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const StyledSegmentedControl = styled(SegmentedControl)`
& .ads-v2-icon {
@@ -15,10 +16,17 @@ const StyledSegmentedControl = styled(SegmentedControl)`
`;
export default function LayoutControls() {
- const context = useContext(CustomWidgetBuilderContext);
+ const { selectedLayout, selectLayout, widgetId } = useContext(
+ CustomWidgetBuilderContext,
+ );
const onChange = (value: string) => {
- context.selectLayout?.(value);
+ selectLayout?.(value);
+
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_LAYOUT_CHANGED", {
+ widgetId: widgetId,
+ layoutName: value,
+ });
};
return (
@@ -37,7 +45,7 @@ export default function LayoutControls() {
value: "tabs",
},
]}
- value={context.selectedLayout}
+ value={selectedLayout}
/>
</div>
);
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
index 65344233107a..000b87c21445 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
@@ -6,14 +6,23 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
export default function ReferenceTrigger() {
- const { isReferenceOpen, toggleReference } = useContext(
+ const { isReferenceOpen, toggleReference, widgetId } = useContext(
CustomWidgetBuilderContext,
);
const onClick = () => {
toggleReference?.();
+
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_REFERENCE_VISIBILITY_CHANGED",
+ {
+ widgetId: widgetId,
+ visible: !isReferenceOpen,
+ },
+ );
};
return (
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
index 0c42f32cd52b..8cbe5d6332d4 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
@@ -14,6 +14,7 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const StyledLazyCodeEditorWrapper = styled.div`
.CodeMirror-line.CodeMirror-line {
@@ -31,11 +32,16 @@ const StyledLazyCodeEditorWrapper = styled.div`
`;
export default function Events() {
- const { events } = useContext(CustomWidgetBuilderContext);
+ const { events, widgetId } = useContext(CustomWidgetBuilderContext);
const [openState, setOpenState] = useState<Record<string, boolean>>({});
const toggleOpen = useCallback((event: string) => {
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_REFERENCE_EVENT_OPENED", {
+ widgetId: widgetId,
+ eventName: event,
+ });
+
setOpenState((prev) => {
return {
...prev,
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/styles.module.css b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/styles.module.css
index ee1b9dea657e..b7598b2c3ba9 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/styles.module.css
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/styles.module.css
@@ -63,6 +63,9 @@
font-weight: 400;
margin-right: 2px;
cursor: pointer;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: calc(100% - 22px);
}
.eventControl {
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
index 7b93ffd53996..97d582351d06 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from "react";
+import React, { useCallback, useContext, useEffect } from "react";
import { Tabs, TabsList, Tab, TabPanel, Icon, Tooltip } from "design-system";
import DebuggerItem from "./debuggerItem";
import styles from "./styles.module.css";
@@ -11,6 +11,7 @@ import {
CUSTOM_WIDGET_FEATURE,
createMessage,
} from "@appsmith/constants/messages";
+import AnalyticsUtil from "utils/AnalyticsUtil";
const LOCAL_STORAGE_KEYS_IS_DEBUGGER_OPEN =
"custom-widget-builder-context-state-is-debugger-open";
@@ -23,7 +24,7 @@ export default function Debugger() {
false,
);
- const { clearDegbuggerLogs, debuggerLogs } = useContext(
+ const { clearDegbuggerLogs, debuggerLogs, widgetId } = useContext(
CustomWidgetBuilderContext,
);
@@ -31,6 +32,17 @@ export default function Debugger() {
scrollToRef.current?.scrollIntoView({ behavior: "smooth" });
}, [debuggerLogs]);
+ const toggle = useCallback(() => {
+ setOpen(!open);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_BUILDER_DEBUGGER_VISIBILITY_CHANGED",
+ {
+ widgetId: widgetId,
+ visible: !open,
+ },
+ );
+ }, [open]);
+
return (
<div className={styles.wrapper}>
<div className={styles.debuggerActions}>
@@ -43,31 +55,36 @@ export default function Debugger() {
debuggerLogs?.filter((d) => d.type === DebuggerLogType.LOG)
.length || 0
}
- onClick={() => setOpen(!open)}
+ onClick={() => toggle()}
warn={
debuggerLogs?.filter((d) => d.type === DebuggerLogType.WARN)
.length || 0
}
/>
- <Tooltip content="clear console">
+ <Tooltip content="Clear console">
<Icon
name="forbid-line"
- onClick={() => clearDegbuggerLogs?.()}
+ onClick={() => {
+ clearDegbuggerLogs?.();
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_DEBUGGER_CLEARED", {
+ widgetId: widgetId,
+ });
+ }}
size="md"
style={{ cursor: "pointer" }}
/>
</Tooltip>
- <Tooltip content={open ? "close console" : "open console"}>
+ <Tooltip content={open ? "Close console" : "Open console"}>
<Icon
name={open ? "arrow-down-s-line" : "arrow-up-s-line"}
- onClick={() => setOpen(!open)}
+ onClick={() => toggle()}
size="lg"
style={{ cursor: "pointer" }}
/>
</Tooltip>
</div>
<Tabs value={"Debugger"}>
- <TabsList className={styles.debuggerTab} onClick={() => setOpen(!open)}>
+ <TabsList className={styles.debuggerTab} onClick={() => toggle()}>
<Tab key="Debugger" value="Debugger">
{createMessage(CUSTOM_WIDGET_FEATURE.debugger.title)}
</Tab>
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx
index b35e7ca552f2..355e9ddbcb06 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx
@@ -11,8 +11,15 @@ import {
import type { AppThemeProperties } from "entities/AppTheming";
export default function Preview() {
- const { key, model, srcDoc, theme, updateDebuggerLogs, updateModel } =
- useContext(CustomWidgetBuilderContext);
+ const {
+ key,
+ model,
+ srcDoc,
+ theme,
+ updateDebuggerLogs,
+ updateModel,
+ widgetId,
+ } = useContext(CustomWidgetBuilderContext);
const [dimensions, setDimensions] = useState({
width: 300,
@@ -100,6 +107,7 @@ export default function Preview() {
args: [{ message }, { message: data }],
});
}}
+ widgetId={widgetId || ""}
width={dimensions.width}
/>
<Debugger />
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts b/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
index 91e085f71336..42941c6bbd08 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/constants.ts
@@ -19,6 +19,7 @@ export const LOCAL_STORAGE_KEYS_SELECTED_LAYOUT =
export const DEFAULT_CONTEXT_VALUE = {
name: "",
+ widgetId: "",
srcDoc: {
html: "<div>Hello World</div>",
js: "function test() {console.log('Hello World');}",
@@ -55,3 +56,6 @@ export const DEFAULT_CONTEXT_VALUE = {
export const CUSTOM_WIDGET_DOC_URL =
"https://docs.appsmith.com/reference/widgets/custom";
+
+export const CUSTOM_WIDGET_DEFAULT_MODEL_DOC_URL =
+ "https://docs.appsmith.com/reference/widgets/custom#default-model";
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx
index b730888822ca..748af2b6c1b5 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx
@@ -22,6 +22,8 @@ import {
} from "./types";
import { compileSrcDoc } from "./utility";
import ConnectionLost from "./connectionLost";
+import Helmet from "react-helmet";
+import AnalyticsUtil from "utils/AnalyticsUtil";
export const CustomWidgetBuilderContext = React.createContext<
Partial<CustomWidgetBuilderContextType>
@@ -56,7 +58,7 @@ export default function CustomWidgetBuilder() {
});
if (contextValue.lastSaved) {
- window.opener.postMessage(
+ window.opener?.postMessage(
{
type: CUSTOM_WIDGET_BUILDER_EVENTS.UPDATE_SRCDOC,
srcDoc: result.code,
@@ -106,7 +108,7 @@ export default function CustomWidgetBuilder() {
setSelectedLayout(layout);
},
close: () => {
- window.opener.focus();
+ window.opener?.focus();
window.close();
},
bulkUpdate: (uncompiledSrcDoc: SrcDoc) => {
@@ -129,6 +131,11 @@ export default function CustomWidgetBuilder() {
lastSaved: Date.now(),
};
});
+
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_BUILDER_SRCDOC_UPDATE", {
+ widgetId: contextValue.widgetId,
+ srcDocFile: editor,
+ });
},
updateModel: (model: Record<string, unknown>) => {
setContextValue((prev) => {
@@ -187,6 +194,7 @@ export default function CustomWidgetBuilder() {
return {
...prev,
name: event.data.name,
+ widgetId: event.data.widgetId,
srcDoc: event.data.srcDoc,
uncompiledSrcDoc: event.data.uncompiledSrcDoc,
initialSrcDoc: event.data.uncompiledSrcDoc,
@@ -222,13 +230,21 @@ export default function CustomWidgetBuilder() {
return {
...prev,
showConnectionLostMessage: false,
+ name: event.data.name,
+ widgetId: event.data.widgetId,
+ srcDoc: event.data.srcDoc,
+ uncompiledSrcDoc: event.data.uncompiledSrcDoc,
+ initialSrcDoc: event.data.uncompiledSrcDoc,
+ model: event.data.model,
+ events: event.data.events,
+ theme: event.data.theme,
};
});
break;
}
});
- window.opener.postMessage(
+ window.opener?.postMessage(
{
type: CUSTOM_WIDGET_BUILDER_EVENTS.READY,
},
@@ -236,7 +252,7 @@ export default function CustomWidgetBuilder() {
);
window.addEventListener("beforeunload", () => {
- window.opener.postMessage(
+ window.opener?.postMessage(
{
type: CUSTOM_WIDGET_BUILDER_EVENTS.DISCONNECTED,
},
@@ -252,6 +268,10 @@ export default function CustomWidgetBuilder() {
return (
<CustomWidgetBuilderContext.Provider value={context}>
+ <Helmet>
+ <meta charSet="utf-8" />
+ <title>{`${contextValue.name} | Builder | Appsmith`}</title>
+ </Helmet>
<Header />
{loading ? (
<Spinner className={styles.loader} size="lg" />
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts b/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
index 574e6d87b58b..46b418027fe3 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/types.ts
@@ -27,6 +27,7 @@ export interface SrcDoc {
export interface CustomWidgetBuilderContextValueType {
//Custom widget name
name: string;
+ widgetId: string;
isReferenceOpen: boolean;
selectedLayout: string;
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
index 696b55043d44..cfedc02a9e1f 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
@@ -70,6 +70,11 @@ const ResetIcon = importSvg(
const StyledDeviated = styled.div`
background-color: var(--ads-v2-color-bg-brand);
`;
+
+const LabelContainer = styled.div<{ hasEditIcon: boolean }>`
+ ${(props) => props.hasEditIcon && "max-width: calc(100% - 110px);"}
+`;
+
type Props = PropertyPaneControlConfig & {
panel: IPanelProps;
theme: EditorTheme;
@@ -646,6 +651,10 @@ const PropertyControl = memo((props: Props) => {
onDeleteProperties([props.propertyName]);
}
resetEditing();
+
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_EDIT_EVENT_SAVE_CLICKED", {
+ widgetId: widgetProperties.widgetId,
+ });
}, [
props,
onBatchUpdateProperties,
@@ -657,6 +666,10 @@ const PropertyControl = memo((props: Props) => {
const resetEditing = useCallback(() => {
setEditedName(props.propertyName);
setIsRenaming(false);
+
+ AnalyticsUtil.logEvent("CUSTOM_WIDGET_EDIT_EVENT_CANCEL_CLICKED", {
+ widgetId: widgetProperties.widgetId,
+ });
}, [props.propertyName]);
const { propertyName } = props;
@@ -913,8 +926,15 @@ const PropertyControl = memo((props: Props) => {
</div>
) : (
<div className="flex items-center justify-between">
- <div className={clsx("flex items-center justify-right gap-1")}>
+ <LabelContainer
+ className={clsx("flex items-center justify-right gap-1")}
+ hasEditIcon={
+ !!config.controlConfig?.allowEdit ||
+ !!config.controlConfig?.allowDelete
+ }
+ >
<PropertyHelpLabel
+ className="w-full"
label={label}
theme={props.theme}
tooltip={helpText}
@@ -964,7 +984,7 @@ const PropertyControl = memo((props: Props) => {
</button>
</>
)}
- </div>
+ </LabelContainer>
<div className={clsx("flex items-center justify-right")}>
{config.controlConfig?.allowEdit && (
<Button
@@ -975,7 +995,15 @@ const PropertyControl = memo((props: Props) => {
)}
isIconButton
kind="tertiary"
- onClick={() => setIsRenaming(true)}
+ onClick={() => {
+ setIsRenaming(true);
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_EDIT_EVENT_CLICKED",
+ {
+ widgetId: widgetProperties.widgetId,
+ },
+ );
+ }}
size="small"
startIcon="pencil-line"
/>
@@ -1000,6 +1028,13 @@ const PropertyControl = memo((props: Props) => {
onBatchUpdateProperties(updates);
}
onDeleteProperties([config.propertyName]);
+
+ AnalyticsUtil.logEvent(
+ "CUSTOM_WIDGET_DELETE_EVENT_CLICKED",
+ {
+ widgetId: widgetProperties.widgetId,
+ },
+ );
}}
size="small"
startIcon="trash"
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
index d75700825914..94d7691cc658 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
@@ -33,9 +33,9 @@ function PropertyHelpLabel(props: Props) {
content={props.tooltip || ""}
isDisabled={!toolTipDefined}
>
- <div onClick={props.onClick}>
+ <div className="w-full" onClick={props.onClick}>
<Label
- className={`t--property-control-label`}
+ className={`t--property-control-label w-full block text-ellipsis overflow-hidden`}
style={{
cursor: toolTipDefined ? "help" : "default",
}}
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index a6e75cd4b67d..53869a27b21c 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -389,6 +389,20 @@ function getDynamicTriggerPathListUpdate(
};
}
+const DYNAMIC_BINDING_IGNORED_LIST = [
+ /* Table widget */
+ "primaryColumns",
+ "derivedColumns",
+
+ /* custom widget */
+ "srcDoc.html",
+ "srcDoc.css",
+ "srcDoc.js",
+ "uncompiledSrcDoc.html",
+ "uncompiledSrcDoc.css",
+ "uncompiledSrcDoc.js",
+];
+
function getDynamicBindingPathListUpdate(
widget: WidgetProps,
propertyPath: string,
@@ -400,9 +414,12 @@ function getDynamicBindingPathListUpdate(
stringProp = JSON.stringify(propertyValue);
}
- //TODO(abhinav): This is not appropriate from the platform's archtecture's point of view.
+ /*
+ * TODO(Balaji Soundararajan): This is not appropriate from the platform's archtecture's point of view.
+ * This setting should come from widget configuration
+ */
// Figure out a holistic solutions where we donot have to stringify above.
- if (propertyPath === "primaryColumns" || propertyPath === "derivedColumns") {
+ if (DYNAMIC_BINDING_IGNORED_LIST.includes(propertyPath)) {
return {
propertyPath,
effect: DynamicPathUpdateEffectEnum.NOOP,
diff --git a/app/client/src/utils/CustomWidgetBuilderService.ts b/app/client/src/utils/CustomWidgetBuilderService.ts
index c2a2796b76a3..ee8624473f5b 100644
--- a/app/client/src/utils/CustomWidgetBuilderService.ts
+++ b/app/client/src/utils/CustomWidgetBuilderService.ts
@@ -86,11 +86,13 @@ export default class CustomWidgetBuilderService {
}
}
- static closeConnection(widgetId: string) {
+ static closeConnection(widgetId: string, skipClosing?: boolean) {
if (this.builderWindowConnections.has(widgetId)) {
- const connection = this.builderWindowConnections.get(widgetId);
+ if (!skipClosing) {
+ const connection = this.builderWindowConnections.get(widgetId);
- connection?.window?.close();
+ connection?.window?.close();
+ }
this.builderWindowConnections.delete(widgetId);
}
diff --git a/app/client/src/widgets/ContainerWidget/widget/index.tsx b/app/client/src/widgets/ContainerWidget/widget/index.tsx
index 9d9f903ae431..37a50ede5f32 100644
--- a/app/client/src/widgets/ContainerWidget/widget/index.tsx
+++ b/app/client/src/widgets/ContainerWidget/widget/index.tsx
@@ -291,8 +291,7 @@ export class ContainerWidget extends BaseWidget<
{
propertyName: "borderRadius",
label: "Border radius",
- helpText:
- "Rounds the corners of the icon button's outer border edge",
+ helpText: "Rounds the corners of the widgets's outer border edge",
controlType: "BORDER_RADIUS_OPTIONS",
isJSConvertible: true,
isBindProperty: true,
diff --git a/app/client/src/widgets/CustomWidget/component/constants.ts b/app/client/src/widgets/CustomWidget/component/constants.ts
index 5a6c53f161cf..bb38bdde2f7c 100644
--- a/app/client/src/widgets/CustomWidget/component/constants.ts
+++ b/app/client/src/widgets/CustomWidget/component/constants.ts
@@ -7,15 +7,22 @@ export const CUSTOM_WIDGET_LOAD_EVENTS = {
export const getAppsmithScriptSchema = (model: Record<string, unknown>) => ({
appsmith: {
mode: "",
- onUiChange: Function,
- onModelChange: Function,
- updateModel: Function,
- triggerEvent: Function,
model: model,
ui: {
width: 1,
height: 2,
},
+ theme: {
+ primaryColor: "",
+ backgroundColor: "",
+ borderRadius: "",
+ boxShadow: "",
+ },
+ onUiChange: Function,
+ onModelChange: Function,
+ onThemeChange: Function,
+ updateModel: Function,
+ triggerEvent: Function,
onReady: Function,
},
});
diff --git a/app/client/src/widgets/CustomWidget/component/index.tsx b/app/client/src/widgets/CustomWidget/component/index.tsx
index b91f7ce14421..82f29e6b0a6e 100644
--- a/app/client/src/widgets/CustomWidget/component/index.tsx
+++ b/app/client/src/widgets/CustomWidget/component/index.tsx
@@ -14,6 +14,15 @@ import appsmithConsole from "!!raw-loader!./appsmithConsole.js";
import css from "!!raw-loader!./reset.css";
import clsx from "clsx";
import type { AppThemeProperties } from "entities/AppTheming";
+import WidgetStyleContainer from "components/designSystems/appsmith/WidgetStyleContainer";
+import type { BoxShadow } from "components/designSystems/appsmith/WidgetStyleContainer";
+import type { Color } from "constants/Colors";
+import { connect } from "react-redux";
+import type { AppState } from "@appsmith/reducers";
+import { combinedPreviewModeSelector } from "selectors/editorSelectors";
+import { getAppMode } from "@appsmith/selectors/applicationSelectors";
+import { APP_MODE } from "entities/App";
+import { getWidgetPropsForPropertyPane } from "selectors/propertyPaneSelectors";
const StyledIframe = styled.iframe<{ width: number; height: number }>`
width: ${(props) => props.width - 8}px;
@@ -191,16 +200,26 @@ function CustomComponent(props: CustomComponentProps) {
})}
>
{props.needsOverlay && <OverlayDiv data-testid="iframe-overlay" />}
- <StyledIframe
- height={props.height}
- onLoad={() => {
- setLoading(false);
- }}
- ref={iframe}
- sandbox="allow-scripts allow-downloads"
- srcDoc={srcDoc}
- width={props.width}
- />
+ <WidgetStyleContainer
+ backgroundColor={props.backgroundColor}
+ borderColor={props.borderColor}
+ borderRadius={props.borderRadius}
+ borderWidth={props.borderWidth}
+ boxShadow={props.boxShadow}
+ widgetId={props.widgetId}
+ >
+ <StyledIframe
+ height={props.height}
+ loading="lazy"
+ onLoad={() => {
+ setLoading(false);
+ }}
+ ref={iframe}
+ sandbox="allow-scripts allow-downloads"
+ srcDoc={srcDoc}
+ width={props.width}
+ />
+ </WidgetStyleContainer>
</div>
);
}
@@ -221,6 +240,30 @@ export interface CustomComponentProps {
onConsole?: (type: string, message: string) => void;
renderMode: "EDITOR" | "DEPLOYED" | "BUILDER";
theme: AppThemeProperties;
+ borderColor?: Color;
+ backgroundColor?: Color;
+ borderWidth?: number;
+ borderRadius?: number;
+ boxShadow?: BoxShadow;
+ widgetId: string;
}
-export default CustomComponent;
+/**
+ * TODO: Balaji soundararajan - to refactor code to move out selected widget details to platform
+ */
+export const mapStateToProps = (
+ state: AppState,
+ ownProps: CustomComponentProps,
+) => {
+ const isPreviewMode = combinedPreviewModeSelector(state);
+ const appMode = getAppMode(state);
+
+ return {
+ needsOverlay:
+ appMode == APP_MODE.EDIT &&
+ !isPreviewMode &&
+ ownProps.widgetId !== getWidgetPropsForPropertyPane(state)?.widgetId,
+ };
+};
+
+export default connect(mapStateToProps)(CustomComponent);
diff --git a/app/client/src/widgets/CustomWidget/widget/defaultApp.ts b/app/client/src/widgets/CustomWidget/widget/defaultApp.ts
index 47565bb5dd95..d98fb154eba4 100644
--- a/app/client/src/widgets/CustomWidget/widget/defaultApp.ts
+++ b/app/client/src/widgets/CustomWidget/widget/defaultApp.ts
@@ -7,8 +7,7 @@ export default {
height: calc(var(--appsmith-ui-height) * 1px);
width: calc(var(--appsmith-ui-width) * 1px);
justify-content: center;
- border-radius: var(--appsmith-theme-borderRadius);
- box-shadow: var(--appsmith-theme-boxShadow);
+ border-radius: 0px;
}
.tip-container {
@@ -37,13 +36,14 @@ export default {
.button-container button {
margin: 0 10px;
+ border-radius: var(--appsmith-theme-borderRadius) !important;
}
.button-container button.primary {
background: var(--appsmith-theme-primaryColor) !important;
}
-.button-container button.reset {
+.button-container button.reset:not([disabled]) {
color: var(--appsmith-theme-primaryColor) !important;
border-color: var(--appsmith-theme-primaryColor) !important;
}`,
@@ -75,7 +75,7 @@ function App() {
</div>
<div className="button-container">
<Button className="primary" onClick={handleNext} type="primary">Next Tip</Button>
- <Button className="reset" onClick={handleReset}>Reset</Button>
+ <Button className="reset" disabled={currentIndex === 0} onClick={handleReset}>Reset</Button>
</div>
</Card>
);
@@ -93,8 +93,7 @@ appsmith.onReady(() => {
height: calc(var(--appsmith-ui-height) * 1px);
width: calc(var(--appsmith-ui-width) * 1px);
justify-content: center;
- border-radius: var(--appsmith-theme-borderRadius);
- box-shadow: var(--appsmith-theme-boxShadow);
+ border-radius: 0px;
}
.tip-container {
@@ -123,13 +122,14 @@ appsmith.onReady(() => {
.button-container button {
margin: 0 10px;
+ border-radius: var(--appsmith-theme-borderRadius) !important;
}
.button-container button.primary {
background: var(--appsmith-theme-primaryColor) !important;
}
-.button-container button.reset {
+.button-container button.reset:not([disabled]) {
color: var(--appsmith-theme-primaryColor) !important;
border-color: var(--appsmith-theme-primaryColor) !important;
}`,
@@ -161,6 +161,7 @@ function App() {
type: "primary"
}, "Next Tip"), /*#__PURE__*/React.createElement(Button, {
className: "reset",
+ disabled: currentIndex === 0,
onClick: handleReset
}, "Reset")));
}
diff --git a/app/client/src/widgets/CustomWidget/widget/index.tsx b/app/client/src/widgets/CustomWidget/widget/index.tsx
index 7eb91aaacf26..2b370b5ff0ac 100644
--- a/app/client/src/widgets/CustomWidget/widget/index.tsx
+++ b/app/client/src/widgets/CustomWidget/widget/index.tsx
@@ -8,9 +8,13 @@ import BaseWidget from "widgets/BaseWidget";
import CustomComponent from "../component";
import IconSVG from "../icon.svg";
-import { RenderModes, WIDGET_TAGS } from "constants/WidgetConstants";
+import { WIDGET_TAGS } from "constants/WidgetConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import type { AppThemeProperties, SetterConfig } from "entities/AppTheming";
+import type {
+ AppThemeProperties,
+ SetterConfig,
+ Stylesheet,
+} from "entities/AppTheming";
import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
import type { AutocompletionDefinitions } from "WidgetProvider/constants";
import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
@@ -19,9 +23,14 @@ import { DEFAULT_MODEL } from "../constants";
import defaultApp from "./defaultApp";
import type { ExtraDef } from "utils/autocomplete/defCreatorUtils";
import { generateTypeDef } from "utils/autocomplete/defCreatorUtils";
-import { CUSTOM_WIDGET_DOC_URL } from "pages/Editor/CustomWidgetBuilder/constants";
+import {
+ CUSTOM_WIDGET_DEFAULT_MODEL_DOC_URL,
+ CUSTOM_WIDGET_DOC_URL,
+} from "pages/Editor/CustomWidgetBuilder/constants";
import { Link } from "design-system";
import styled from "styled-components";
+import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { Colors } from "constants/Colors";
const StyledLink = styled(Link)`
display: inline-block;
@@ -52,7 +61,7 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
return {
widgetName: "Custom",
rows: 30,
- columns: 20,
+ columns: 23,
version: 1,
onResetClick: "{{showAlert('Successfully reset!!', '');}}",
events: ["onResetClick"],
@@ -62,6 +71,9 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
uncompiledSrcDoc: defaultApp.uncompiledSrcDoc,
theme: "{{appsmith.theme}}",
dynamicBindingPathList: [{ key: "theme" }],
+ borderColor: Colors.GREY_5,
+ borderWidth: "1",
+ backgroundColor: "#FFFFFF",
};
}
@@ -83,6 +95,13 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
};
}
+ static getStylesheetConfig(): Stylesheet {
+ return {
+ borderRadius: "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ boxShadow: "{{appsmith.theme.boxShadow.appBoxShadow}}",
+ };
+ }
+
static getPropertyPaneContentConfig() {
return [
{
@@ -126,7 +145,7 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
kind="secondary"
rel="noopener noreferrer"
target="_blank"
- to={CUSTOM_WIDGET_DOC_URL}
+ to={CUSTOM_WIDGET_DEFAULT_MODEL_DOC_URL}
>
Read more
</StyledLink>
@@ -190,6 +209,7 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
},
},
dependencies: ["events"],
+ helpText: "when the event is triggered from custom widget",
}));
},
children: [
@@ -217,7 +237,71 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
}
static getPropertyPaneStyleConfig() {
- return [];
+ return [
+ {
+ sectionName: "Color",
+ children: [
+ {
+ helpText: "Use a html color name, HEX, RGB or RGBA value",
+ placeholderText: "#FFFFFF / Gray / rgb(255, 99, 71)",
+ propertyName: "backgroundColor",
+ label: "Background color",
+ controlType: "COLOR_PICKER",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ {
+ helpText: "Use a html color name, HEX, RGB or RGBA value",
+ placeholderText: "#FFFFFF / Gray / rgb(255, 99, 71)",
+ propertyName: "borderColor",
+ label: "Border color",
+ controlType: "COLOR_PICKER",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ ],
+ },
+ {
+ sectionName: "Border and shadow",
+ children: [
+ {
+ helpText: "Enter value for border width",
+ propertyName: "borderWidth",
+ label: "Border width",
+ placeholderText: "Enter value in px",
+ controlType: "INPUT_TEXT",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.NUMBER },
+ postUpdateAction: ReduxActionTypes.CHECK_CONTAINERS_FOR_AUTO_HEIGHT,
+ },
+ {
+ propertyName: "borderRadius",
+ label: "Border radius",
+ helpText: "Rounds the corners of the widgets's outer border edge",
+ controlType: "BORDER_RADIUS_OPTIONS",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ {
+ propertyName: "boxShadow",
+ label: "Box shadow",
+ helpText:
+ "Enables you to cast a drop shadow from the frame of the widget",
+ controlType: "BOX_SHADOW_OPTIONS",
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: { type: ValidationTypes.TEXT },
+ },
+ ],
+ },
+ ];
}
static getDerivedPropertiesMap(): DerivedPropertiesMap {
@@ -270,17 +354,19 @@ class CustomWidget extends BaseWidget<CustomWidgetProps, WidgetState> {
getWidgetView() {
return (
<CustomComponent
+ backgroundColor={this.props.backgroundColor}
+ borderColor={this.props.borderColor}
+ borderRadius={this.props.borderRadius}
+ borderWidth={this.props.borderWidth}
+ boxShadow={this.props.boxShadow}
execute={this.execute}
height={this.props.componentHeight}
model={this.props.model || {}}
- needsOverlay={
- this.props.renderMode === RenderModes.CANVAS &&
- !this.props.isWidgetSelected
- }
renderMode={this.getRenderMode()}
srcDoc={this.props.srcDoc}
theme={this.props.theme}
update={this.update}
+ widgetId={this.props.widgetId}
width={this.props.componentWidth}
/>
);
|
b84caa78051bbac28450400cf37568476bd4e8b5
|
2023-05-08 10:52:47
|
Sangeeth Sivan
|
fix: enable uppy informer for airgapped instances (#23003)
| false
|
enable uppy informer for airgapped instances (#23003)
|
fix
|
diff --git a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
index 499e5a20c227..09ba40575f28 100644
--- a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
+++ b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
@@ -7,10 +7,8 @@ import { USER_PHOTO_ASSET_URL } from "constants/userConstants";
import { DisplayImageUpload } from "design-system-old";
import type Uppy from "@uppy/core";
-import { isAirgapped } from "@appsmith/utils/airgapHelpers";
function FormDisplayImage() {
- const isAirgappedInstance = isAirgapped();
const [file, setFile] = useState<any>();
const dispatch = useDispatch();
const user = useSelector(getCurrentUser);
@@ -55,7 +53,6 @@ function FormDisplayImage() {
return (
<DisplayImageUpload
- disableUppyInformer={isAirgappedInstance}
onChange={onSelectFile}
onRemove={removeProfileImage}
submit={upload}
diff --git a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
index b7b333dec336..ea70f8d046d5 100644
--- a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
@@ -29,7 +29,6 @@ import FilePickerComponent from "../component";
import FileDataTypes from "../constants";
import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
import type { AutocompletionDefinitions } from "widgets/constants";
-import { isAirgapped } from "@appsmith/utils/airgapHelpers";
const CSV_ARRAY_LABEL = "Array (CSVs only)";
const CSV_FILE_TYPE_REGEX = /.+(\/csv)$/;
@@ -40,8 +39,6 @@ const isCSVFileType = (str: string) => CSV_FILE_TYPE_REGEX.test(str);
type Result = string | Buffer | ArrayBuffer | null;
-const isAirgappedInstance = isAirgapped();
-
const FilePickerGlobalStyles = createGlobalStyle<{
borderRadius?: string;
}>`
@@ -611,7 +608,7 @@ class FilePickerWidget extends BaseWidget<
closeAfterFinish: true,
closeModalOnClickOutside: true,
disableStatusBar: false,
- disableInformer: isAirgappedInstance,
+ disableInformer: false,
disableThumbnailGenerator: false,
disablePageScrollWhenModalOpen: true,
proudlyDisplayPoweredByUppy: false,
|
7909ae8680d9338d295bb9e63ac8932cf7c434c1
|
2021-12-16 13:31:09
|
Sumit Kumar
|
feat: port Firestore plugin to UQI (#9393)
| false
|
port Firestore plugin to UQI (#9393)
|
feat
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
index 9b5450ef8c24..2e73780c1809 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/PluginUtils.java
@@ -91,6 +91,36 @@ public static Boolean validConfigurationPresentInFormData(Map<String, Object> fo
return getValueSafelyFromFormData(formData, field) != null;
}
+ /**
+ * Get value from `formData` map and also type cast it to the class of type `T` before returning the value. In
+ * case the value is null, then the defaultValue is returned.
+ *
+ * @param formData
+ * @param field : key path used to fetch value from formData
+ * @param type : returned value is type casted to the type of this object before return.
+ * @param defaultValue : this value is returned if the obtained value is null
+ * @param <T> : type parameter to which the obtained value is cast to.
+ * @return : obtained value (post type cast) if non-null, otherwise defaultValue
+ */
+ public static <T> T getValueSafelyFromFormData(Map<String, Object> formData, String field, Class<T> type,
+ T defaultValue) {
+ Object formDataValue = getValueSafelyFromFormData(formData, field);
+ return formDataValue != null ? (T) formDataValue : defaultValue;
+ }
+
+ /**
+ * Get value from `formData` map and also type cast it to the class of type `T` before returning the value.
+ *
+ * @param formData
+ * @param field : key path used to fetch value from formData
+ * @param type : returned value is type casted to the type of this object before return.
+ * @param <T> : type parameter to which the obtained value is cast to.
+ * @return : obtained value (post type cast) if non-null, otherwise null.
+ */
+ public static <T> T getValueSafelyFromFormData(Map<String, Object> formData, String field, Class<T> type) {
+ return (T) (getValueSafelyFromFormData(formData, field));
+ }
+
public static Object getValueSafelyFromFormData(Map<String, Object> formData, String field) {
if (CollectionUtils.isEmpty(formData)) {
return null;
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/constants/FieldName.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/constants/FieldName.java
new file mode 100644
index 000000000000..673f4a8a699a
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/constants/FieldName.java
@@ -0,0 +1,16 @@
+package com.external.constants;
+
+public class FieldName {
+ public static final String COMMAND = "command";
+ public static final String TIMESTAMP_VALUE_PATH = "timestampValuePath";
+ public static final String DELETE_KEY_PATH = "deleteKeyPath";
+ public static final String LIMIT_DOCUMENTS = "limitDocuments";
+ public static final String ORDER_BY = "orderBy";
+ public static final String START_AFTER = "startAfter";
+ public static final String END_BEFORE = "endBefore";
+ public static final String WHERE = "where";
+ public static final String CHILDREN = "children";
+
+ public static final String WHERE_CHILDREN = WHERE + "." + CHILDREN;
+}
+
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
index c5cef77f99fc..56067611ee60 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
@@ -11,7 +11,6 @@
import com.appsmith.external.models.DatasourceStructure;
import com.appsmith.external.models.DatasourceTestResult;
import com.appsmith.external.models.PaginationField;
-import com.appsmith.external.models.Property;
import com.appsmith.external.models.RequestParamDTO;
import com.appsmith.external.plugins.BasePlugin;
import com.appsmith.external.plugins.PluginExecutor;
@@ -56,8 +55,18 @@
import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_PATH;
-import static com.appsmith.external.helpers.PluginUtils.getActionConfigurationPropertyPath;
+import static com.external.constants.FieldName.COMMAND;
+import static com.appsmith.external.helpers.PluginUtils.getValueSafelyFromFormData;
+import static com.external.constants.FieldName.DELETE_KEY_PATH;
+import static com.external.constants.FieldName.END_BEFORE;
+import static com.external.constants.FieldName.LIMIT_DOCUMENTS;
+import static com.external.constants.FieldName.ORDER_BY;
+import static com.external.constants.FieldName.START_AFTER;
+import static com.external.constants.FieldName.TIMESTAMP_VALUE_PATH;
+import static com.external.constants.FieldName.WHERE;
+import static com.external.constants.FieldName.WHERE_CHILDREN;
import static com.external.utils.WhereConditionUtils.applyWhereConditional;
+import static org.apache.commons.lang3.StringUtils.isBlank;
/**
* Datasource properties:
@@ -70,13 +79,6 @@
*/
public class FirestorePlugin extends BasePlugin {
- private static final int ORDER_PROPERTY_INDEX = 1;
- private static final int LIMIT_PROPERTY_INDEX = 2;
- private static final int WHERE_CONDITIONAL_PROPERTY_INDEX = 3;
- private static final int START_AFTER_PROPERTY_INDEX = 6;
- private static final int END_BEFORE_PROPERTY_INDEX = 7;
- private static final int FIELDVALUE_TIMESTAMP_PROPERTY_INDEX = 8;
- private static final int FIELDVALUE_DELETE_PROPERTY_INDEX = 9;
private static final String FIELDVALUE_TIMESTAMP_METHOD_NAME = "serverTimestamp";
public FirestorePlugin(PluginWrapper wrapper) {
@@ -114,46 +116,57 @@ public Mono<ActionExecutionResult> executeParameterized(
final String path = actionConfiguration.getPath();
requestData.put("path", path == null ? "" : path);
- final List<Property> properties = actionConfiguration.getPluginSpecifiedTemplates();
- final com.external.plugins.Method method = CollectionUtils.isEmpty(properties)
- ? null
- : com.external.plugins.Method.valueOf((String) properties.get(0).getValue());
- requestData.put("method", method == null ? "" : method.toString());
+ Map<String, Object> formData = actionConfiguration.getFormData();
+ String command = getValueSafelyFromFormData(formData, COMMAND, String.class);
+
+ if (isBlank(command)) {
+ return Mono.error(
+ new AppsmithPluginException(
+ AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
+ "Mandatory parameter 'Command' is missing. Did you forget to select one of the commands" +
+ " from the Command dropdown ?"
+ )
+ );
+ }
+
+ requestData.put("command", command);
+ final com.external.plugins.Method method = com.external.plugins.Method.valueOf(command);
List<RequestParamDTO> requestParams = new ArrayList<>();
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0), method == null ? "" :
- method.toString(), null, null, null));
+ requestParams.add(new RequestParamDTO(COMMAND, command, null, null, null));
requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
final PaginationField paginationField = executeActionDTO == null ? null : executeActionDTO.getPaginationField();
+ Set<String> hintMessages = new HashSet<>();
+
return Mono
.justOrEmpty(actionConfiguration.getBody())
.defaultIfEmpty("")
.flatMap(strBody -> {
- if (StringUtils.isBlank(path)) {
+ if (method == null) {
return Mono.error(new AppsmithPluginException(
AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "Document/Collection path cannot be empty"
+ "Missing Firestore method."
));
}
- if (path.startsWith("/") || path.endsWith("/")) {
+ if (isBlank(path)) {
return Mono.error(new AppsmithPluginException(
AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "Firestore paths should not begin or end with `/` character."
+ "Document/Collection path cannot be empty"
));
}
- if (method == null) {
+ if (path.startsWith("/") || path.endsWith("/")) {
return Mono.error(new AppsmithPluginException(
AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "Missing Firestore method."
+ "Firestore paths should not begin or end with `/` character."
));
}
- if (StringUtils.isBlank(strBody)) {
+ if (isBlank(strBody)) {
switch(method) {
case UPDATE_DOCUMENT:
case CREATE_DOCUMENT:
@@ -182,28 +195,19 @@ public Mono<ActionExecutionResult> executeParameterized(
.flatMap(mapBody -> {
if (mapBody.isEmpty()) {
+
if(method.isBodyNeeded()) {
return Mono.error(new AppsmithPluginException(
AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "The method " + method.toString() + " needs a non-empty body to work."
+ "The method " + method + " needs a non-empty body to work."
));
}
- /*
- * - If body and all of the FieldValue paths are empty, then return error.
- * - Not applicable to GET and DELETE methods.
- */
- if ((Method.SET_DOCUMENT.equals(method) || Method.UPDATE_DOCUMENT.equals(method)
- || Method.CREATE_DOCUMENT.equals(method) || Method.ADD_TO_COLLECTION.equals(method))
- && (properties == null || ((properties.size() < FIELDVALUE_TIMESTAMP_PROPERTY_INDEX + 1
- || properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX) == null
- || StringUtils.isEmpty((String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue()))
- && (properties.size() < FIELDVALUE_DELETE_PROPERTY_INDEX
- || properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX) == null
- || StringUtils.isEmpty((String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue()))))) {
+ if (isSetOrUpdateOrCreateOrAddMethod(method)
+ && isTimestampAndDeleteFieldValuePathEmpty(formData)) {
return Mono.error(new AppsmithPluginException(
AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "The method " + method.toString() + " needs at least one of the following " +
+ "The method " + method + " needs at least one of the following " +
"fields to be non-empty: 'Timestamp Value Path', 'Delete Key Value " +
"Pair Path', 'Body'"
));
@@ -214,7 +218,7 @@ public Mono<ActionExecutionResult> executeParameterized(
/*
* - Update mapBody with FieldValue.xyz() values if the FieldValue paths are provided.
*/
- insertFieldValues(mapBody, properties, method, requestParams);
+ insertFieldValues(mapBody, formData, method, requestParams);
} catch (AppsmithPluginException e) {
return Mono.error(e);
}
@@ -225,8 +229,8 @@ public Mono<ActionExecutionResult> executeParameterized(
if (method.isDocumentLevel()) {
return handleDocumentLevelMethod(connection, path, method, mapBody, query, requestParams);
} else {
- return handleCollectionLevelMethod(connection, path, method, properties, mapBody,
- paginationField, query, requestParams);
+ return handleCollectionLevelMethod(connection, path, method, formData, mapBody,
+ paginationField, query, requestParams, hintMessages);
}
})
.onErrorResume(error -> {
@@ -242,26 +246,39 @@ public Mono<ActionExecutionResult> executeParameterized(
request.setQuery(query);
request.setRequestParams(requestParams);
result.setRequest(request);
+ result.setMessages(hintMessages);
return result;
})
.subscribeOn(scheduler);
}
+ private boolean isTimestampAndDeleteFieldValuePathEmpty(Map<String, Object> formData) {
+ if (isBlank(getValueSafelyFromFormData(formData, TIMESTAMP_VALUE_PATH, String.class))
+ && isBlank(getValueSafelyFromFormData(formData, DELETE_KEY_PATH, String.class))) {
+ return true;
+ }
+
+ return false;
+ }
+
+ private boolean isSetOrUpdateOrCreateOrAddMethod(Method method) {
+ return Method.SET_DOCUMENT.equals(method) || Method.UPDATE_DOCUMENT.equals(method)
+ || Method.CREATE_DOCUMENT.equals(method) || Method.ADD_TO_COLLECTION.equals(method);
+ }
+
/*
* - Update mapBody with FieldValue.xyz() values if the FieldValue paths are provided.
*/
private void insertFieldValues(Map<String, Object> mapBody,
- List<Property> properties,
+ Map<String, Object> formData,
Method method,
List<RequestParamDTO> requestParams) throws AppsmithPluginException {
/*
* - Check that FieldValue.delete() option is only available for UPDATE operation.
*/
- if(!Method.UPDATE_DOCUMENT.equals(method)
- && properties.size() > FIELDVALUE_DELETE_PROPERTY_INDEX
- && properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX) != null
- && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue())) {
+ if (!Method.UPDATE_DOCUMENT.equals(method)
+ && !isBlank(getValueSafelyFromFormData(formData, DELETE_KEY_PATH, String.class))) {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_ERROR,
"Appsmith has found an unexpected query form property - 'Delete Key Value Pair Path'. Please " +
@@ -272,12 +289,9 @@ private void insertFieldValues(Map<String, Object> mapBody,
/*
* - Parse delete path.
*/
- if( properties.size() > FIELDVALUE_DELETE_PROPERTY_INDEX
- && properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX) != null
- && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue())) {
- String deletePaths = (String) properties.get(FIELDVALUE_DELETE_PROPERTY_INDEX).getValue();
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(FIELDVALUE_DELETE_PROPERTY_INDEX),
- deletePaths, null, null, null));
+ if(!isBlank(getValueSafelyFromFormData(formData, DELETE_KEY_PATH, String.class))) {
+ String deletePaths = getValueSafelyFromFormData(formData, DELETE_KEY_PATH, String.class);
+ requestParams.add(new RequestParamDTO(DELETE_KEY_PATH, deletePaths, null, null, null));
List<String> deletePathsList;
try {
deletePathsList = objectMapper.readValue(deletePaths, new TypeReference<List<String>>(){});
@@ -305,12 +319,8 @@ private void insertFieldValues(Map<String, Object> mapBody,
/*
* - Check that FieldValue.serverTimestamp() option is not available for any GET or DELETE operations.
*/
- if((Method.GET_DOCUMENT.equals(method)
- || Method.GET_COLLECTION.equals(method)
- || Method.DELETE_DOCUMENT.equals(method))
- && properties.size() > FIELDVALUE_TIMESTAMP_PROPERTY_INDEX
- && properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX) != null
- && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue())) {
+ if (isGetOrDeleteMethod(method)
+ && !isBlank(getValueSafelyFromFormData(formData, TIMESTAMP_VALUE_PATH, String.class))) {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_ERROR,
"Appsmith has found an unexpected query form property - 'Timestamp Value Path'. Please reach " +
@@ -321,12 +331,9 @@ private void insertFieldValues(Map<String, Object> mapBody,
/*
* - Parse severTimestamp FieldValue path.
*/
- if(properties.size() > FIELDVALUE_TIMESTAMP_PROPERTY_INDEX
- && properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX) != null
- && !StringUtils.isEmpty((String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue())) {
- String timestampValuePaths = (String) properties.get(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX).getValue();
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(FIELDVALUE_TIMESTAMP_PROPERTY_INDEX),
- timestampValuePaths, null, null, null));
+ if(!isBlank(getValueSafelyFromFormData(formData, TIMESTAMP_VALUE_PATH, String.class))) {
+ String timestampValuePaths = getValueSafelyFromFormData(formData, TIMESTAMP_VALUE_PATH, String.class);
+ requestParams.add(new RequestParamDTO(TIMESTAMP_VALUE_PATH, timestampValuePaths, null, null, null));
List<String> timestampPathsStringList; // ["key1.key2", "key3.key4"]
try {
timestampPathsStringList = objectMapper.readValue(timestampValuePaths,
@@ -340,7 +347,7 @@ private void insertFieldValues(Map<String, Object> mapBody,
}
/*
- * - Update all of the map body keys that need to store timestamp.
+ * - Update all the map body keys that need to store timestamp.
* - Since serverTimestamp FieldValue can be used with non update operations like create and set, "."
* (dot) notation cannot be directly used to refer to nested paths.
* - We cannot use the dotted notation directly with timestamp FieldValue because during set/create
@@ -354,6 +361,11 @@ private void insertFieldValues(Map<String, Object> mapBody,
}
}
+ private boolean isGetOrDeleteMethod(Method method) {
+ return Method.GET_DOCUMENT.equals(method) || Method.GET_COLLECTION.equals(method)
+ || Method.DELETE_DOCUMENT.equals(method);
+ }
+
/*
* - A common method that can be used for any FieldValue option.
* - It iterates over the map body and replaces the value of keys defined by pathsList with a FieldValue
@@ -500,16 +512,17 @@ public Mono<ActionExecutionResult> handleCollectionLevelMethod(
Firestore connection,
String path,
Method method,
- List<Property> properties,
+ Map<String, Object> formData,
Map<String, Object> mapBody,
PaginationField paginationField,
String query,
- List<RequestParamDTO> requestParams) {
+ List<RequestParamDTO> requestParams,
+ Set<String> hintMessages) {
final CollectionReference collection = connection.collection(path);
if (method == Method.GET_COLLECTION) {
- return methodGetCollection(collection, properties, paginationField, requestParams);
+ return methodGetCollection(collection, formData, paginationField, requestParams, hintMessages);
} else if (method == Method.ADD_TO_COLLECTION) {
requestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY, query, null, null, null));
@@ -523,28 +536,13 @@ public Mono<ActionExecutionResult> handleCollectionLevelMethod(
));
}
- private String getPropertyAt(List<Property> properties, int index, String defaultValue) {
- if (properties.size() <= index) {
- return defaultValue;
- }
-
- final Property property = properties.get(index);
- if (property == null) {
- return defaultValue;
- }
-
- final String value = (String) property.getValue();
- return value != null ? value : defaultValue;
- }
-
- private Mono<ActionExecutionResult> methodGetCollection(CollectionReference query, List<Property> properties,
+ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference query, Map<String, Object> formData,
PaginationField paginationField,
- List<RequestParamDTO> requestParams) {
- final String limitString = getPropertyAt(properties, LIMIT_PROPERTY_INDEX, "10");
+ List<RequestParamDTO> requestParams, Set<String> hintMessages) {
+ final String limitString = getValueSafelyFromFormData(formData, LIMIT_DOCUMENTS, String.class);
final int limit = StringUtils.isEmpty(limitString) ? 10 : Integer.parseInt(limitString);
- final String orderByString = getPropertyAt(properties, ORDER_PROPERTY_INDEX, "");
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(ORDER_PROPERTY_INDEX),
- orderByString, null, null, null));
+ final String orderByString = getValueSafelyFromFormData(formData, ORDER_BY, String.class, "");
+ requestParams.add(new RequestParamDTO(ORDER_BY, orderByString, null, null, null));
final List<String> orderings;
try {
@@ -555,9 +553,8 @@ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference quer
}
Map<String, Object> startAfterTemp = null;
- final String startAfterJson = getPropertyAt(properties, START_AFTER_PROPERTY_INDEX, "{}");
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(START_AFTER_PROPERTY_INDEX),
- startAfterJson, null, null, null));
+ final String startAfterJson = getValueSafelyFromFormData(formData, START_AFTER, String.class, "{}");
+ requestParams.add(new RequestParamDTO(START_AFTER, startAfterJson, null, null, null));
if (PaginationField.NEXT.equals(paginationField)) {
try {
startAfterTemp = StringUtils.isEmpty(startAfterJson) ? Collections.emptyMap() : objectMapper.readValue(startAfterJson, Map.class);
@@ -567,9 +564,8 @@ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference quer
}
Map<String, Object> endBeforeTemp = null;
- final String endBeforeJson = getPropertyAt(properties, END_BEFORE_PROPERTY_INDEX, "{}");
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(END_BEFORE_PROPERTY_INDEX),
- endBeforeJson, null, null, null));
+ final String endBeforeJson = getValueSafelyFromFormData(formData, END_BEFORE, String.class, "{}");
+ requestParams.add(new RequestParamDTO(END_BEFORE, endBeforeJson, null, null, null));
if (PaginationField.PREV.equals(paginationField)) {
try {
endBeforeTemp = StringUtils.isEmpty(endBeforeJson) ? Collections.emptyMap() : objectMapper.readValue(endBeforeJson, Map.class);
@@ -578,8 +574,8 @@ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference quer
}
}
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(LIMIT_PROPERTY_INDEX),
- limitString == null ? "" : limitString, null, null, null));
+ requestParams.add(new RequestParamDTO(LIMIT_DOCUMENTS, limitString == null ? "" : limitString, null, null
+ , null));
final Map<String, Object> startAfter = startAfterTemp;
final Map<String, Object> endBefore = endBeforeTemp;
@@ -618,32 +614,25 @@ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference quer
})
// Apply where condition, if provided.
.flatMap(query1 -> {
- if (!isWhereMethodUsed(properties)) {
+ if (!isWhereMethodUsed(formData)) {
return Mono.just(query1);
}
- List<Object> conditionList = (List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue();
- requestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(WHERE_CONDITIONAL_PROPERTY_INDEX),
- conditionList, null, null, null));
+ List<Object> conditionList = getValueSafelyFromFormData(formData, WHERE_CHILDREN, List.class,
+ new ArrayList());
+ requestParams.add(new RequestParamDTO(WHERE, conditionList, null, null, null));
for(Object condition : conditionList) {
- String path = ((Map<String, String>)condition).get("path");
- String operatorString = ((Map<String, String>)condition).get("operator");
+ String path = ((Map<String, String>)condition).get("key");
+ String operatorString = ((Map<String, String>)condition).get("condition");
String value = ((Map<String, String>)condition).get("value");
- /**
- * - If all values in all where condition tuples are null, then isWhereMethodUsed(...)
- * function will indicate that where conditions are not used effectively and program
- * execution would return without reaching here.
- */
if (StringUtils.isEmpty(path) || StringUtils.isEmpty(operatorString) || StringUtils.isEmpty(value)) {
- return Mono.error(
- new AppsmithPluginException(
- AppsmithPluginError.PLUGIN_EXECUTE_ARGUMENT_ERROR,
- "One of the where condition fields has been found empty. Please fill " +
- "all the where condition fields and try again."
- )
- );
+ String emptyConditionMessage = "At least one of the conditions in the 'where' clause " +
+ "has missing operator or operand(s). These conditions were ignored during the" +
+ " execution of the query.";
+ hintMessages.add(emptyConditionMessage);
+ continue;
}
try {
@@ -689,17 +678,18 @@ private Mono<ActionExecutionResult> methodGetCollection(CollectionReference quer
});
}
- private boolean isWhereMethodUsed(List<Property> properties) {
- // Check if the where property list does not exist or is null
- if(properties.size() <= WHERE_CONDITIONAL_PROPERTY_INDEX || properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX) == null
- || CollectionUtils.isEmpty((List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue())) {
+ private boolean isWhereMethodUsed(Map<String, Object> formData) {
+ List<Object> conditionList = getValueSafelyFromFormData(formData, WHERE_CHILDREN, List.class,
+ new ArrayList());
+
+ // Check if the where clause does not exist
+ if (CollectionUtils.isEmpty(conditionList)) {
return false;
}
- // Check if all values in the where property list are null.
- boolean allValuesNull = ((List) properties.get(WHERE_CONDITIONAL_PROPERTY_INDEX).getValue()).stream()
- .allMatch(valueMap -> valueMap == null ||
- ((Map) valueMap).entrySet().stream().allMatch(e -> ((Map.Entry) e).getValue() == null));
+ // Check if all keys in the where clause are null.
+ boolean allValuesNull = conditionList.stream()
+ .allMatch(condition -> isBlank((String) ((Map) condition).get("key")));
if (allValuesNull) {
return false;
@@ -869,7 +859,7 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
}
- if (StringUtils.isBlank(datasourceConfiguration.getUrl())) {
+ if (isBlank(datasourceConfiguration.getUrl())) {
invalids.add("Missing Firestore URL.");
}
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
new file mode 100644
index 000000000000..ce742fd87ea6
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
@@ -0,0 +1,32 @@
+{
+ "identifier": "ADD_TO_COLLECTION",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'ADD_TO_COLLECTION'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Timestamp Value Path (use dot(.) notation to reference nested key e.g. [\"key1.key2\"])",
+ "configProperty": "actionConfiguration.formData.timestampValuePath",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "",
+ "placeholderText": "[\"checkinLog.timestampKey\", \"auditLog.timestampKey\"]"
+ },
+ {
+ "label": "Body",
+ "configProperty": "actionConfiguration.body",
+ "controlType": "QUERY_DYNAMIC_TEXT",
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
new file mode 100644
index 000000000000..63df27728698
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
@@ -0,0 +1,32 @@
+{
+ "identifier": "CREATE_DOCUMENT",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'CREATE_DOCUMENT'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Timestamp Value Path (use dot(.) notation to reference nested key e.g. [\"key1.key2\"])",
+ "configProperty": "actionConfiguration.formData.timestampValuePath",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "",
+ "placeholderText": "[\"checkinLog.timestampKey\", \"auditLog.timestampKey\"]"
+ },
+ {
+ "label": "Body",
+ "configProperty": "actionConfiguration.body",
+ "controlType": "QUERY_DYNAMIC_TEXT",
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
new file mode 100644
index 000000000000..621a7d9399dd
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
@@ -0,0 +1,17 @@
+{
+ "identifier": "DELETE_DOCUMENT",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'DELETE_DOCUMENT'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
new file mode 100644
index 000000000000..3e0ea085be73
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
@@ -0,0 +1,92 @@
+{
+ "identifier": "GET_COLLECTION",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'GET_COLLECTION'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Order By (JSON array of field names to order by)",
+ "configProperty": "actionConfiguration.formData.orderBy",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "",
+ "placeholderText": "[\"ascendingField\", \"-descendingField\", \"nestedObj.field\"]"
+ },
+ {
+ "label": "Start After",
+ "configProperty": "actionConfiguration.formData.startAfter",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "End Before",
+ "configProperty": "actionConfiguration.formData.endBefore",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Limit Documents",
+ "configProperty": "actionConfiguration.formData.limitDocuments",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "10"
+ },
+ {
+ "label": "Where",
+ "configProperty": "actionConfiguration.formData.where",
+ "nestedLevels": 1,
+ "controlType": "WHERE_CLAUSE",
+ "logicalTypes": [
+ {
+ "label": "AND",
+ "value": "AND"
+ }
+ ],
+ "comparisonTypes": [
+ {
+ "label": "==",
+ "value": "EQ"
+ },
+ {
+ "label": "<",
+ "value": "LT"
+ },
+ {
+ "label": "<=",
+ "value": "LTE"
+ },
+ {
+ "label": ">=",
+ "value": "GTE"
+ },
+ {
+ "label": ">",
+ "value": "GT"
+ },
+ {
+ "label": "in",
+ "value": "IN"
+ },
+ {
+ "label": "not in",
+ "value": "NOT_IN"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json
new file mode 100644
index 000000000000..a46c74bf9ce2
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json
@@ -0,0 +1,17 @@
+{
+ "identifier": "GET_DOCUMENT",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'GET_DOCUMENT'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json
new file mode 100644
index 000000000000..d1bd3fac4b6b
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json
@@ -0,0 +1,39 @@
+{
+ "command" : {
+ "label": "Commands",
+ "description": "Choose method you would like to use",
+ "configProperty": "actionConfiguration.formData.command",
+ "controlType": "DROP_DOWN",
+ "initialValue": "GET_DOCUMENT",
+ "options": [
+ {
+ "label": "Get Single Document",
+ "fileName": "getDocument.json"
+ },
+ {
+ "label": "Get Documents in Collection",
+ "fileName": "getCollection.json"
+ },
+ {
+ "label": "Set Document",
+ "fileName": "setDocument.json"
+ },
+ {
+ "label": "Create Document",
+ "fileName": "createDocument.json"
+ },
+ {
+ "label": "Add Document to Collection",
+ "fileName": "addToCollection.json"
+ },
+ {
+ "label": "Update Document",
+ "fileName": "updateDocument.json"
+ },
+ {
+ "label": "Delete Document",
+ "fileName": "deleteDocument.json"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json
new file mode 100644
index 000000000000..5b7e3591cdc3
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json
@@ -0,0 +1,32 @@
+{
+ "identifier": "SET_DOCUMENT",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'SET_DOCUMENT'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Timestamp Value Path (use dot(.) notation to reference nested key e.g. [\"key1.key2\"])",
+ "configProperty": "actionConfiguration.formData.timestampValuePath",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "placeholderText": "[\"checkinLog.timestampKey\", \"auditLog.timestampKey\"]",
+ "initialValue": ""
+ },
+ {
+ "label": "Body",
+ "configProperty": "actionConfiguration.body",
+ "controlType": "QUERY_DYNAMIC_TEXT",
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json
new file mode 100644
index 000000000000..a196c4e5014d
--- /dev/null
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json
@@ -0,0 +1,41 @@
+{
+ "identifier": "UPDATE_DOCUMENT",
+ "controlType" : "SECTION",
+ "conditionals": {
+ "show": "{{actionConfiguration.formData.command === 'UPDATE_DOCUMENT'}}"
+ },
+ "children" : [
+ {
+ "label": "Collection/Document Path",
+ "configProperty": "actionConfiguration.path",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": ""
+ },
+ {
+ "label": "Timestamp Value Path (use dot(.) notation to reference nested key e.g. [\"key1.key2\"])",
+ "configProperty": "actionConfiguration.formData.timestampValuePath",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "",
+ "placeholderText": "[\"checkinLog.timestampKey\", \"auditLog.timestampKey\"]"
+ },
+ {
+ "label": "Delete Key Value Pair Path (use dot(.) notation to reference nested key e.g. [\"key1.key2\"])",
+ "configProperty": "actionConfiguration.formData.deleteKeyPath",
+ "controlType": "QUERY_DYNAMIC_INPUT_TEXT",
+ "evaluationSubstitutionType": "TEMPLATE",
+ "isRequired": true,
+ "initialValue": "",
+ "placeholderText": "[\"userKey.nestedNamekey\", \"cityKey.nestedPincodeKey\"]"
+ },
+ {
+ "label": "Body",
+ "configProperty": "actionConfiguration.body",
+ "controlType": "QUERY_DYNAMIC_TEXT",
+ "initialValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
index a25a210c88a3..979fd2cd7526 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
@@ -31,7 +31,6 @@
import org.testcontainers.utility.DockerImageName;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
-import reactor.util.function.Tuple4;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -45,6 +44,17 @@
import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY;
import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_PATH;
import static com.appsmith.external.helpers.PluginUtils.getActionConfigurationPropertyPath;
+import static com.appsmith.external.helpers.PluginUtils.setValueSafelyInFormData;
+import static com.external.constants.FieldName.CHILDREN;
+import static com.external.constants.FieldName.COMMAND;
+import static com.external.constants.FieldName.DELETE_KEY_PATH;
+import static com.external.constants.FieldName.END_BEFORE;
+import static com.external.constants.FieldName.LIMIT_DOCUMENTS;
+import static com.external.constants.FieldName.ORDER_BY;
+import static com.external.constants.FieldName.START_AFTER;
+import static com.external.constants.FieldName.TIMESTAMP_VALUE_PATH;
+import static com.external.constants.FieldName.WHERE;
+import static com.external.constants.FieldName.WHERE_CHILDREN;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -136,7 +146,10 @@ public static void setUp() throws ExecutionException, InterruptedException {
public void testGetSingleDocument() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("initial/one");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "GET_DOCUMENT")));
+
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -157,8 +170,7 @@ public void testGetSingleDocument() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "GET_DOCUMENT", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "GET_DOCUMENT", null, null, null)); // Method
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
@@ -170,7 +182,9 @@ public void testGetSingleDocument() {
public void testGetSingleDocument2() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("initial/two");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "GET_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -198,7 +212,9 @@ public void testGetSingleDocument2() {
public void testGetSingleDocument3() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("initial/inner-ref");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "GET_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -227,7 +243,9 @@ public void testGetSingleDocument3() {
public void testGetDocumentsInCollection() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("initial");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "GET_COLLECTION")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_COLLECTION");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -289,7 +307,9 @@ public void testSetNewDocument() {
" \"lastName\":\"lastTest\"\n" +
"}");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "SET_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "SET_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -303,8 +323,7 @@ public void testSetNewDocument() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "SET_DOCUMENT", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "SET_DOCUMENT", null, null, null)); // Method
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
@@ -323,7 +342,9 @@ public void testCreateDocument() {
" \"lastName\":\"lastTest\"\n" +
"}");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "CREATE_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "CREATE_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -337,8 +358,7 @@ public void testCreateDocument() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "CREATE_DOCUMENT", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "CREATE_DOCUMENT", null, null, null));
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
@@ -356,7 +376,9 @@ public void testUpdateDocument() {
" \"value\": 2\n" +
"}");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "UPDATE_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "UPDATE_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -380,7 +402,9 @@ public void testDeleteDocument() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("changing/to-delete");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "DELETE_DOCUMENT")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "DELETE_DOCUMENT");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -400,8 +424,7 @@ public void testDeleteDocument() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "DELETE_DOCUMENT", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "DELETE_DOCUMENT", null, null, null));
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
@@ -414,7 +437,9 @@ public void testAddToCollection() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("changing");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property("method", "ADD_TO_COLLECTION")));
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "ADD_TO_COLLECTION");
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setBody("{\n" +
" \"question\": \"What is the answer to life, universe and everything else?\",\n" +
@@ -434,8 +459,7 @@ public void testAddToCollection() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "ADD_TO_COLLECTION", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "ADD_TO_COLLECTION", null, null, null));
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
@@ -449,23 +473,22 @@ private ActionConfiguration constructActionConfiguration(Map<String, Object> fir
final ObjectMapper objectMapper = new ObjectMapper();
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("pagination");
- List<Property> propertyList = new ArrayList<>();
- propertyList.add(new Property("method", "GET_COLLECTION"));
- propertyList.add(new Property("order", "[\"n\"]"));
- propertyList.add(new Property("limit", "5"));
+
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_COLLECTION");
+ setValueSafelyInFormData(configMap, ORDER_BY, "[\"n\"]");
+ setValueSafelyInFormData(configMap, LIMIT_DOCUMENTS, "5");
if (first != null && last != null) {
try {
- propertyList.add(new Property());
- propertyList.add(new Property());
- propertyList.add(new Property());
- propertyList.add(new Property("startAfter", objectMapper.writeValueAsString(last)));
- propertyList.add(new Property("endBefore", objectMapper.writeValueAsString(first)));
+ setValueSafelyInFormData(configMap, START_AFTER, objectMapper.writeValueAsString(last));
+ setValueSafelyInFormData(configMap, END_BEFORE, objectMapper.writeValueAsString(first));
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
- actionConfiguration.setPluginSpecifiedTemplates(propertyList);
+
+ actionConfiguration.setFormData(configMap);
return actionConfiguration;
}
@@ -577,11 +600,12 @@ public void testDatasourceCreateErrorOnBadServiceAccountCredentials() {
public void testGetDocumentsInCollectionOrdering() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("pagination");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(
- new Property("method", "GET_COLLECTION"),
- new Property("order", "[\"firm\", \"name\"]"),
- new Property("limit", "15")
- ));
+
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_COLLECTION");
+ setValueSafelyInFormData(configMap, ORDER_BY, "[\"firm\", \"name\"]");
+ setValueSafelyInFormData(configMap, LIMIT_DOCUMENTS, "15");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -620,20 +644,14 @@ public void testGetDocumentsInCollectionOrdering() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "GET_COLLECTION", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "GET_COLLECTION", null, null, null));
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(1),
- "[\"firm\", \"name\"]", null, null, null)); // Order by
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(6), "{}", null,
- null, null)); // Start after
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(7), "{}", null,
- null, null)); // End before
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(2), "15", null,
- null, null)); // Limit
+ expectedRequestParams.add(new RequestParamDTO(ORDER_BY, "[\"firm\", \"name\"]", null, null, null)); // Order by
+ expectedRequestParams.add(new RequestParamDTO(START_AFTER, "{}", null, null, null)); // Start after
+ expectedRequestParams.add(new RequestParamDTO(END_BEFORE, "{}", null, null, null)); // End before
+ expectedRequestParams.add(new RequestParamDTO(LIMIT_DOCUMENTS, "15", null, null, null)); // Limit
assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
-
})
.verifyComplete();
}
@@ -642,11 +660,12 @@ public void testGetDocumentsInCollectionOrdering() {
public void testGetDocumentsInCollectionOrdering2() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("pagination");
- actionConfiguration.setPluginSpecifiedTemplates(List.of(
- new Property("method", "GET_COLLECTION"),
- new Property("order", "[\"firm\", \"-name\"]"),
- new Property("limit", "15")
- ));
+
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_COLLECTION");
+ setValueSafelyInFormData(configMap, ORDER_BY, "[\"firm\", \"-name\"]");
+ setValueSafelyInFormData(configMap, LIMIT_DOCUMENTS, "15");
+ actionConfiguration.setFormData(configMap);
Mono<ActionExecutionResult> resultMono = pluginExecutor
.executeParameterized(firestoreConnection, null, dsConfig, actionConfiguration);
@@ -686,21 +705,18 @@ public void testGetDocumentsInCollectionOrdering2() {
@Test
public void testWhereConditional() {
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPath("initial");
- List<Property> pluginSpecifiedTemplates = new ArrayList<>();
- pluginSpecifiedTemplates.add(new Property("method", "GET_COLLECTION"));
- pluginSpecifiedTemplates.add(new Property("order", null));
- pluginSpecifiedTemplates.add(new Property("limit", null));
- Property whereProperty = new Property("where", null);
- whereProperty.setValue(new ArrayList<>());
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_COLLECTION");
+
+ List<Object> children = new ArrayList<>();
+
/*
* - get all documents where category == test.
* - this returns 2 documents.
*/
- ((List) whereProperty.getValue()).add(new HashMap<String, Object>() {{
- put("path", "{{Input1.text}}");
- put("operator", "EQ");
+ children.add(new HashMap<String, Object>() {{
+ put("key", "{{Input1.text}}");
+ put("condition", "EQ");
put("value", "{{Input2.text}}");
}});
@@ -708,14 +724,19 @@ public void testWhereConditional() {
* - get all documents where name == two.
* - Of the two documents returned by above condition, this will narrow it down to one.
*/
- ((List) whereProperty.getValue()).add(new HashMap<String, Object>() {{
- put("path", "{{Input3.text}}");
- put("operator", "EQ");
+ children.add(new HashMap<String, Object>() {{
+ put("key", "{{Input3.text}}");
+ put("condition", "EQ");
put("value", "{{Input4.text}}");
}});
- pluginSpecifiedTemplates.add(whereProperty);
- actionConfiguration.setPluginSpecifiedTemplates(pluginSpecifiedTemplates);
+ Map<String, Object> whereMap = new HashMap<>();
+ whereMap.put(CHILDREN, children);
+ setValueSafelyInFormData(configMap, WHERE, whereMap);
+
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setPath("initial");
+ actionConfiguration.setFormData(configMap);
List params = new ArrayList();
Param param = new Param();
@@ -766,19 +787,13 @@ public void testWhereConditional() {
@Test
public void testUpdateDocumentWithFieldValueTimestamp() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "UPDATE_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(new Property("key path", "[\"value\"]")); // index 8 - path for timestampServer fieldValue.
+
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "UPDATE_DOCUMENT");
+ setValueSafelyInFormData(configMap, TIMESTAMP_VALUE_PATH, "[\"value\"]");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -817,20 +832,12 @@ public void testUpdateDocumentWithFieldValueTimestamp() {
*/
@Test
public void testUpdateDocumentWithFieldValueDelete() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "UPDATE_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(null); // index 8
- properties.add(new Property("key path", "[\"value\"]")); // index 9 - path for delete fieldValue.
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "UPDATE_DOCUMENT");
+ setValueSafelyInFormData(configMap, DELETE_KEY_PATH, "[\"value\"]");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -851,12 +858,10 @@ public void testUpdateDocumentWithFieldValueDelete() {
* - The other two RequestParamDTO attributes - label and type are null at this point.
*/
List<RequestParamDTO> expectedRequestParams = new ArrayList<>();
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(0),
- "UPDATE_DOCUMENT", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(COMMAND, "UPDATE_DOCUMENT", null, null, null));
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_PATH, actionConfiguration.getPath(),
null, null, null)); // Path
- expectedRequestParams.add(new RequestParamDTO(getActionConfigurationPropertyPath(9),
- "[\"value\"]", null, null, null)); // Method
+ expectedRequestParams.add(new RequestParamDTO(DELETE_KEY_PATH, "[\"value\"]", null, null, null)); // Method
expectedRequestParams.add(new RequestParamDTO(ACTION_CONFIGURATION_BODY,
actionConfiguration.getBody(), null, null, null)); // Body
assertEquals(result.getRequest().getRequestParams().toString(), expectedRequestParams.toString());
@@ -884,20 +889,12 @@ public void testUpdateDocumentWithFieldValueDelete() {
@Test
public void testFieldValueDeleteWithUnsupportedAction() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "CREATE_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(null); // index 8
- properties.add(new Property("key path", "[\"value\"]")); // index 9 - path for delete fieldValue.
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "CREATE_DOCUMENT");
+ setValueSafelyInFormData(configMap, DELETE_KEY_PATH, "[\"value\"]");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -920,19 +917,12 @@ public void testFieldValueDeleteWithUnsupportedAction() {
@Test
public void testFieldValueTimestampWithUnsupportedAction() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "GET_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(new Property("key path", "[\"value\"]")); // index 8 - path for serverTimestamp fieldValue.
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "GET_DOCUMENT");
+ setValueSafelyInFormData(configMap, TIMESTAMP_VALUE_PATH, "[\"value\"]");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -954,20 +944,12 @@ public void testFieldValueTimestampWithUnsupportedAction() {
@Test
public void testFieldValueDeleteWithBadArgument() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "UPDATE_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(null); // index 8
- properties.add(new Property("key path", "value")); // index 9 - path for delete fieldValue.
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "UPDATE_DOCUMENT");
+ setValueSafelyInFormData(configMap, DELETE_KEY_PATH, "value");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -989,19 +971,12 @@ public void testFieldValueDeleteWithBadArgument() {
@Test
public void testFieldValueTimestampWithBadArgument() {
- List<Property> properties = new ArrayList<>();
- properties.add(new Property("method", "UPDATE_DOCUMENT")); // index 0
- properties.add(null); // index 1
- properties.add(null); // index 2
- properties.add(null); // index 3
- properties.add(null); // index 4
- properties.add(null); // index 5
- properties.add(null); // index 6
- properties.add(null); // index 7
- properties.add(new Property("key path", "value")); // index 8 - path for serverTimestamp fieldValue.
+ Map<String, Object> configMap = new HashMap<>();
+ setValueSafelyInFormData(configMap, COMMAND, "UPDATE_DOCUMENT");
+ setValueSafelyInFormData(configMap, TIMESTAMP_VALUE_PATH, "value");
ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.setPluginSpecifiedTemplates(properties);
+ actionConfiguration.setFormData(configMap);
actionConfiguration.setPath("changing/to-update");
actionConfiguration.setBody("{\n" +
" \"value\": 2\n" +
@@ -1022,10 +997,12 @@ public void testFieldValueTimestampWithBadArgument() {
.verifyComplete();
}
+ // TODO: fix it.
@Test
public void testDynamicBindingSubstitutionInActionConfiguration() {
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPath("{{Input1.text}}");
+
List<Property> pluginSpecifiedTemplates = new ArrayList<>();
pluginSpecifiedTemplates.add(new Property("method", "GET_COLLECTION"));
pluginSpecifiedTemplates.add(new Property("order", null));
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 f2a08d9545c8..01c035317f38 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
@@ -144,6 +144,16 @@
@ChangeLog(order = "001")
public class DatabaseChangelog {
+ public static ObjectMapper objectMapper = new ObjectMapper();
+ public static final String FIRESTORE_PLUGIN_NAME = "firestore-plugin";
+ public static final String CONDITION_KEY = "condition";
+ public static final String CHILDREN_KEY = "children";
+ public static final String OPERATOR_KEY = "operator";
+ public static final String VALUE_KEY = "value";
+ public static final String PATH_KEY = "path";
+ public static final String AND = "AND";
+ public static final String KEY = "key";
+
@AllArgsConstructor
@NoArgsConstructor
@Setter
@@ -3472,8 +3482,93 @@ public void updateGitApplicationMetadataIndex(MongockTemplate mongoTemplate) {
Map.entry(8, List.of("list.unSignedUrl"))
);
- private void updateFormDataMultipleOptions(int index, Object value, Map formData, Map<Integer, List<String>> migrationMap) {
+ /**
+ * This class is meant to hold any method that is required to transform data before migrating the data to UQI
+ * schema. Usage of a class makes the data transformation process modular e.g. someone could create
+ * another class extending this class and override the `transformData` method.
+ */
+ public class UQIMigrationDataTransformer {
+
+ /**
+ * This method holds the steps to transform data before it is migrated to UQI schema.
+ * Each transformation is uniquely identified by the combination of plugin name and the transformation name.
+ *
+ * @param pluginName - name of the plugin for which the transformation is intended
+ * @param transformationName - name of the transformation relative to the plugin
+ * @param value - value that needs to be transformed
+ * @return - transformed value
+ */
+ public Object transformData(String pluginName, String transformationName, Object value) {
+
+ if (value == null) {
+ return value;
+ }
+
+ switch (pluginName) {
+ /* Data transformations for Firestore plugin are defined in this case. */
+ case FIRESTORE_PLUGIN_NAME:
+ /**
+ * This case takes care of transforming Firestore's where clause data to UQI's where
+ * clause schema.
+ */
+ if ("where-clause-migration".equals(transformationName)) {
+ /* This map will hold the transformed data as per UQI's where clause schema */
+ HashMap<String, Object> uqiWhereMap = new HashMap<>();
+ uqiWhereMap.put(CONDITION_KEY, AND);
+ uqiWhereMap.put(CHILDREN_KEY, new ArrayList<>());
+
+ List<Map<String, Object>> oldListOfConditions = (List<Map<String, Object>>) value;
+ oldListOfConditions.stream()
+ .forEachOrdered(oldCondition -> {
+ /* Map old values to keys in the new UQI format. */
+ Map<String, Object> uqiCondition = new HashMap<>();
+ uqiCondition.put(CONDITION_KEY, oldCondition.get(OPERATOR_KEY));
+ uqiCondition.put(KEY, oldCondition.get(PATH_KEY));
+ uqiCondition.put(VALUE_KEY, oldCondition.get(VALUE_KEY));
+
+ /* Add condition to the UQI where clause. */
+ ((List) uqiWhereMap.get(CHILDREN_KEY)).add(uqiCondition);
+ });
+
+ return uqiWhereMap;
+ }
+
+ /**
+ * Throw error since no handler could be found for the pluginName and transformationName
+ * combination.
+ */
+ String transformationKeyNotFoundErrorMessage = "Data transformer failed to find any " +
+ "matching case for plugin: " + pluginName + " and key: " + transformationName + ". Please " +
+ "contact Appsmith customer support to resolve this.";
+ assert false : transformationKeyNotFoundErrorMessage;
+
+ break;
+ default:
+ /* Throw error since no handler could be found for the plugin matching pluginName */
+ String noPluginHandlerFoundErrorMessage = "Data transformer failed to find any matching case for " +
+ "plugin: " + pluginName + ". Please contact Appsmith customer support to resolve this.";
+ assert false : noPluginHandlerFoundErrorMessage;
+ }
+
+ /* Execution flow is never expected to reach here. */
+ String badExecutionFlowErrorMessage = "Execution flow is never supposed to reach here. Please contact " +
+ "Appsmith customer support to resolve this.";
+ assert false : badExecutionFlowErrorMessage;
+
+ return value;
+ }
+ }
+
+ private void updateFormDataMultipleOptions(int index, Object value, Map formData,
+ Map<Integer, List<String>> migrationMap,
+ Map<Integer, String> uqiDataTransformationMap,
+ UQIMigrationDataTransformer dataTransformer,
+ String pluginName) {
if (migrationMap.containsKey(index)) {
+ if (dataTransformer != null && uqiDataTransformationMap.containsKey(index)) {
+ String transformationKey = uqiDataTransformationMap.get(index);
+ value = dataTransformer.transformData(pluginName, transformationKey, value);
+ }
List<String> paths = migrationMap.get(index);
for (String path : paths) {
setValueSafelyInFormData(formData, path, value);
@@ -3481,16 +3576,20 @@ private void updateFormDataMultipleOptions(int index, Object value, Map formData
}
}
- public Map iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(List<Property> pluginSpecifiedTemplates, Map<Integer, List<String>> migrationMap) {
+ public Map iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(List<Property> pluginSpecifiedTemplates,
+ Map<Integer, List<String>> migrationMap, Map<Integer, String> uqiDataTransformationMap,
+ UQIMigrationDataTransformer dataTransformer, String pluginName) {
if (pluginSpecifiedTemplates != null && !pluginSpecifiedTemplates.isEmpty()) {
Map<String, Object> formData = new HashMap<>();
for (int i = 0; i < pluginSpecifiedTemplates.size(); i++) {
Property template = pluginSpecifiedTemplates.get(i);
if (template != null) {
- updateFormDataMultipleOptions(i, template.getValue(), formData, migrationMap);
+ updateFormDataMultipleOptions(i, template.getValue(), formData, migrationMap,
+ uqiDataTransformationMap, dataTransformer, pluginName);
}
}
+
return formData;
}
@@ -3531,7 +3630,8 @@ public void migrateS3PluginToUqi(MongockTemplate mongockTemplate) {
List<Property> pluginSpecifiedTemplates = unpublishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
unpublishedAction.getActionConfiguration().setFormData(
- iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates, s3MigrationMap)
+ iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates,
+ s3MigrationMap, null, null, null)
);
unpublishedAction.getActionConfiguration().setPluginSpecifiedTemplates(null);
@@ -3540,67 +3640,17 @@ public void migrateS3PluginToUqi(MongockTemplate mongockTemplate) {
publishedAction.getActionConfiguration().getPluginSpecifiedTemplates() != null) {
pluginSpecifiedTemplates = publishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
publishedAction.getActionConfiguration().setFormData(
- iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates, s3MigrationMap)
+ iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates,
+ s3MigrationMap, null, null, null)
);
publishedAction.getActionConfiguration().setPluginSpecifiedTemplates(null);
}
- // Now migrate the dynamic binding pathlist
+ // Migrate the dynamic binding path list for unpublished action
List<Property> dynamicBindingPathList = unpublishedAction.getDynamicBindingPathList();
-
- if (!CollectionUtils.isEmpty(dynamicBindingPathList)) {
- List<Property> newDynamicBindingPathList = new ArrayList<>();
- for (Property path : dynamicBindingPathList) {
- String pathKey = path.getKey();
- if (pathKey.contains("pluginSpecifiedTemplates")) {
-
- // Pattern looks for pluginSpecifiedTemplates[12 and extracts the 12
- Pattern pattern = Pattern.compile("(?<=pluginSpecifiedTemplates\\[)([0-9]+)");
- Matcher matcher = pattern.matcher(pathKey);
-
- while (matcher.find()) {
- int index = Integer.parseInt(matcher.group());
- List<String> partialPaths = s3MigrationMap.get(index);
- for (String partialPath : partialPaths) {
- Property dynamicBindingPath = new Property("formData." + partialPath, null);
- newDynamicBindingPathList.add(dynamicBindingPath);
- }
- }
- } else {
- // this dynamic binding is for body. Add as is
- newDynamicBindingPathList.add(path);
- }
-
- // We may have an invalid dynamic binding. Trim the same
- List<String> dynamicBindingPathNames = newDynamicBindingPathList
- .stream()
- .map(property -> property.getKey())
- .collect(Collectors.toList());
-
- Set<String> pathsToRemove = getInvalidDynamicBindingPathsInAction(objectMapper, s3Action, dynamicBindingPathNames);
-
- // We have found atleast 1 invalid dynamic binding path.
- if (!pathsToRemove.isEmpty()) {
- // First remove the invalid paths from the set of paths
- dynamicBindingPathNames.removeAll(pathsToRemove);
-
- // Transform the set of paths to Property as it is stored in the db.
- List<Property> updatedDynamicBindingPathList = dynamicBindingPathNames
- .stream()
- .map(dynamicBindingPath -> {
- Property property = new Property();
- property.setKey(dynamicBindingPath);
- return property;
- })
- .collect(Collectors.toList());
-
- // Reset the path list to only contain valid binding paths.
- newDynamicBindingPathList = updatedDynamicBindingPathList;
- }
- }
-
- unpublishedAction.setDynamicBindingPathList(newDynamicBindingPathList);
- }
+ List<Property> newDynamicBindingPathList = getUpdatedDynamicBindingPathList(dynamicBindingPathList,
+ objectMapper, s3Action, s3MigrationMap);
+ unpublishedAction.setDynamicBindingPathList(newDynamicBindingPathList);
actionsToSave.add(s3Action);
}
@@ -3613,6 +3663,77 @@ public void migrateS3PluginToUqi(MongockTemplate mongockTemplate) {
mongockTemplate.save(s3Plugin);
}
+ /**
+ * Method to port `dynamicBindingPathList` to UQI model.
+ *
+ * @param dynamicBindingPathList : old dynamicBindingPathList
+ * @param objectMapper
+ * @param action
+ * @param migrationMap : A mapping from `pluginSpecifiedTemplates` index to attribute path in UQI model. For
+ * reference, please check out the `s3MigrationMap` defined above.
+ * @return : updated dynamicBindingPathList - ported to UQI model.
+ */
+ private List<Property> getUpdatedDynamicBindingPathList(List<Property> dynamicBindingPathList,
+ ObjectMapper objectMapper, NewAction action,
+ Map<Integer, List<String>> migrationMap) {
+ // Return if empty.
+ if (CollectionUtils.isEmpty(dynamicBindingPathList)) {
+ return dynamicBindingPathList;
+ }
+
+ List<Property> newDynamicBindingPathList = new ArrayList<>();
+ for (Property path : dynamicBindingPathList) {
+ String pathKey = path.getKey();
+ if (pathKey.contains("pluginSpecifiedTemplates")) {
+
+ // Pattern looks for pluginSpecifiedTemplates[12 and extracts the 12
+ Pattern pattern = Pattern.compile("(?<=pluginSpecifiedTemplates\\[)([0-9]+)");
+ Matcher matcher = pattern.matcher(pathKey);
+
+ while (matcher.find()) {
+ int index = Integer.parseInt(matcher.group());
+ List<String> partialPaths = migrationMap.get(index);
+ for (String partialPath : partialPaths) {
+ Property dynamicBindingPath = new Property("formData." + partialPath, null);
+ newDynamicBindingPathList.add(dynamicBindingPath);
+ }
+ }
+ } else {
+ // this dynamic binding is for body. Add as is
+ newDynamicBindingPathList.add(path);
+ }
+
+ // We may have an invalid dynamic binding. Trim the same
+ List<String> dynamicBindingPathNames = newDynamicBindingPathList
+ .stream()
+ .map(property -> property.getKey())
+ .collect(Collectors.toList());
+
+ Set<String> pathsToRemove = getInvalidDynamicBindingPathsInAction(objectMapper, action, dynamicBindingPathNames);
+
+ // We have found atleast 1 invalid dynamic binding path.
+ if (!pathsToRemove.isEmpty()) {
+ // First remove the invalid paths from the set of paths
+ dynamicBindingPathNames.removeAll(pathsToRemove);
+
+ // Transform the set of paths to Property as it is stored in the db.
+ List<Property> updatedDynamicBindingPathList = dynamicBindingPathNames
+ .stream()
+ .map(dynamicBindingPath -> {
+ Property property = new Property();
+ property.setKey(dynamicBindingPath);
+ return property;
+ })
+ .collect(Collectors.toList());
+
+ // Reset the path list to only contain valid binding paths.
+ newDynamicBindingPathList = updatedDynamicBindingPathList;
+ }
+ }
+
+ return newDynamicBindingPathList;
+ }
+
@ChangeSet(order = "094", id = "set-slug-to-application-and-page", author = "")
public void setSlugToApplicationAndPage(MongockTemplate mongockTemplate) {
// update applications
@@ -3974,7 +4095,7 @@ public void addPluginNameForGoogleSheets(MongockTemplate mongockTemplate) {
mongockTemplate.save(googleSheetsPlugin);
}
- @ChangeSet(order = "101", id = "insert-default-resources", author = "")
+ @ChangeSet(order = "102", id = "insert-default-resources", author = "")
public void insertDefaultResources(MongockTemplate mongockTemplate) {
// Update datasources
@@ -4334,4 +4455,114 @@ public void clearRedisCache(ReactiveRedisOperations<String, String> reactiveRedi
flushdb.subscribe();
}
+ /* Map values from pluginSpecifiedTemplates to formData (UQI) */
+ public final static Map<Integer, List<String>> firestoreMigrationMap = Map.ofEntries(
+ Map.entry(0, List.of("command")),
+ Map.entry(1, List.of("orderBy")),
+ Map.entry(2, List.of("limitDocuments")),
+ Map.entry(3, List.of("where")),
+ Map.entry(4, List.of("")), // index 4 is not used in pluginSpecifiedTemplates
+ Map.entry(5, List.of("")), // index 5 is not used in pluginSpecifiedTemplates
+ Map.entry(6, List.of("startAfter")),
+ Map.entry(7, List.of("endBefore")),
+ Map.entry(8, List.of("timestampValuePath")),
+ Map.entry(9, List.of("deleteKeyPath"))
+ );
+
+ /**
+ * This map indicates which fields in pluginSpecifiedTemplates require a transformation before their data can be
+ * migrated to the UQI schema.
+ * The key contains the index of the data that needs transformation and the value indicates the which kind of
+ * transformation is required. e.g. (3, "where-clause-migration") indicates that the value against index 3 in
+ * pluginSpecifiedTemplates needs to be migrated by the rules identified by the string "where-clause-migration".
+ * The rules are defined in the class UQIMigrationDataTransformer.
+ */
+ public static final Map<Integer, String> firestoreUQIDataTransformationMap = Map.ofEntries(
+ Map.entry(3, "where-clause-migration")
+ );
+
+ @ChangeSet(order = "103", id = "migrate-firestore-to-uqi", author = "")
+ public void migrateFirestorePluginToUqi(MongockTemplate mongockTemplate) {
+
+ // Update Firestore plugin to indicate use of UQI schema
+ Plugin firestorePlugin = mongockTemplate.findOne(
+ query(where("packageName").is("firestore-plugin")),
+ Plugin.class
+ );
+ firestorePlugin.setUiComponent("UQIDbEditorForm");
+
+
+ // Find all Firestore actions
+ List<NewAction> firestoreActions = mongockTemplate.find(
+ query(new Criteria().andOperator(
+ where(fieldName(QNewAction.newAction.pluginId)).is(firestorePlugin.getId()))),
+ NewAction.class
+ );
+
+ List<NewAction> actionsToSave = new ArrayList<>();
+
+ for (NewAction firestoreAction : firestoreActions) {
+ ActionDTO unpublishedAction = firestoreAction.getUnpublishedAction();
+
+ /* No migrations required if action configuration does not exist. */
+ if (unpublishedAction == null || unpublishedAction.getActionConfiguration() == null) {
+ continue;
+ }
+
+ List<Property> pluginSpecifiedTemplates = unpublishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
+ UQIMigrationDataTransformer uqiMigrationDataTransformer = new UQIMigrationDataTransformer();
+
+ /**
+ * Migrate unpublished action configuration data.
+ * Create `formData` used in UQI schema from the `pluginSpecifiedTemplates` used earlier.
+ */
+ unpublishedAction.getActionConfiguration().setFormData(
+ iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates,
+ firestoreMigrationMap, firestoreUQIDataTransformationMap, uqiMigrationDataTransformer,
+ "firestore-plugin")
+ );
+
+ /* `pluginSpecifiedTemplates` is no longer required since `formData` will be used in UQI schema. */
+ unpublishedAction.getActionConfiguration().setPluginSpecifiedTemplates(null);
+
+ /**
+ * Migrate published action configuration data.
+ * Create `formData` used in UQI schema from the `pluginSpecifiedTemplates` used earlier.
+ */
+ ActionDTO publishedAction = firestoreAction.getPublishedAction();
+ if (publishedAction != null && publishedAction.getActionConfiguration() != null &&
+ publishedAction.getActionConfiguration().getPluginSpecifiedTemplates() != null) {
+ pluginSpecifiedTemplates = publishedAction.getActionConfiguration().getPluginSpecifiedTemplates();
+ publishedAction.getActionConfiguration().setFormData(
+ iteratePluginSpecifiedTemplatesAndCreateFormDataMultipleOptions(pluginSpecifiedTemplates,
+ firestoreMigrationMap, firestoreUQIDataTransformationMap, uqiMigrationDataTransformer
+ , "firestore-plugin")
+ );
+
+ /* `pluginSpecifiedTemplates` is no longer required since `formData` will be used in UQI schema. */
+ publishedAction.getActionConfiguration().setPluginSpecifiedTemplates(null);
+ }
+
+ /**
+ * Migrate the dynamic binding path list for unpublished action.
+ * Please note that there is no requirement to migrate the dynamic binding path list for published actions
+ * since the `on page load` actions do not get computed on published actions data. They are only computed
+ * on unpublished actions data and copied over for the view mode.
+ */
+ List<Property> dynamicBindingPathList = unpublishedAction.getDynamicBindingPathList();
+ List<Property> newDynamicBindingPathList = getUpdatedDynamicBindingPathList(dynamicBindingPathList,
+ objectMapper, firestoreAction, firestoreMigrationMap);
+ unpublishedAction.setDynamicBindingPathList(newDynamicBindingPathList);
+
+ actionsToSave.add(firestoreAction);
+ }
+
+ // Save the actions which have been migrated.
+ for (NewAction firestoreAction : actionsToSave) {
+ mongockTemplate.save(firestoreAction);
+ }
+
+ // Update plugin data.
+ mongockTemplate.save(firestorePlugin);
+ }
}
|
8b8ddb3390221752a05de54fd63343dac858cb09
|
2021-09-16 10:09:55
|
akash-codemonk
|
fix: Quickly clicking do it for me button shows errors during onboarding (#7386)
| false
|
Quickly clicking do it for me button shows errors during onboarding (#7386)
|
fix
|
diff --git a/app/client/src/components/editorComponents/Onboarding/Helper.tsx b/app/client/src/components/editorComponents/Onboarding/Helper.tsx
index 8507d0a3700e..cba0902fd060 100644
--- a/app/client/src/components/editorComponents/Onboarding/Helper.tsx
+++ b/app/client/src/components/editorComponents/Onboarding/Helper.tsx
@@ -233,6 +233,19 @@ function Helper() {
const snippetRef: MutableRefObject<HTMLDivElement | null> = useRef(null);
const write = useClipboard(snippetRef);
+ const isClickedRef = useRef(false);
+
+ const cheatActionOnClick = () => {
+ if (isClickedRef.current) return;
+
+ dispatch(helperConfig.cheatAction?.action);
+ isClickedRef.current = true;
+ };
+
+ useEffect(() => {
+ isClickedRef.current = false;
+ }, [helperConfig.step]);
+
if (!showHelper) return null;
const copyBindingToClipboard = () => {
@@ -352,9 +365,7 @@ function Helper() {
{(cheatMode || !helperConfig.action) && (
<CheatActionButton
className="t--onboarding-cheat-action"
- onClick={() => {
- dispatch(helperConfig.cheatAction?.action);
- }}
+ onClick={cheatActionOnClick}
>
{helperConfig.cheatAction?.label}
</CheatActionButton>
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 25951b1d80c3..518c725425c1 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -36,7 +36,7 @@ import {
setOnboardingWelcomeState,
} from "utils/storage";
import { validateResponse } from "./ErrorSagas";
-import { getSelectedWidget, getWidgets } from "./selectors";
+import { getSelectedWidget, getWidgetByName, getWidgets } from "./selectors";
import {
endOnboarding,
setCurrentStep,
@@ -688,6 +688,10 @@ function* executeQuery() {
function* addWidget(widgetConfig: any) {
try {
+ const widget = yield select(getWidgetByName, widgetConfig.widgetName ?? "");
+ // If widget already exists return
+ if (widget) return;
+
const newWidget = {
newWidgetId: generateReactKey(),
widgetId: "0",
|
fb275ec9cbd9fdfba40d545c5bff3373e7406791
|
2024-04-18 14:33:37
|
Pawan Kumar
|
chore: Update defaults (#32736)
| false
|
Update defaults (#32736)
|
chore
|
diff --git a/app/client/src/components/propertyControls/MenuItemsControl.tsx b/app/client/src/components/propertyControls/MenuItemsControl.tsx
index a575e054f023..f17d2a03ebeb 100644
--- a/app/client/src/components/propertyControls/MenuItemsControl.tsx
+++ b/app/client/src/components/propertyControls/MenuItemsControl.tsx
@@ -2,7 +2,6 @@ import React from "react";
import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import { generateReactKey } from "utils/generators";
-import { getNextEntityName } from "utils/AppsmithUtils";
import orderBy from "lodash/orderBy";
import isString from "lodash/isString";
import isUndefined from "lodash/isUndefined";
@@ -154,16 +153,13 @@ class MenuItemsControl extends BaseControl<ControlProps, State> {
let menuItems = this.props.propertyValue || [];
const menuItemsArray = this.getMenuItems();
const newMenuItemId = generateReactKey({ prefix: "menuItem" });
- const newMenuItemLabel = getNextEntityName(
- "Menu Item ",
- menuItemsArray.map((menuItem: any) => menuItem.label),
- );
+
menuItems = {
...menuItems,
[newMenuItemId]: {
id: newMenuItemId,
index: menuItemsArray.length,
- label: newMenuItemLabel,
+ label: "Menu Item",
widgetId: generateReactKey(),
isDisabled: false,
isVisible: true,
diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
index 0419b6f749b5..5049dfc1bcec 100644
--- a/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts
@@ -11,7 +11,7 @@ export const propertyPaneContentConfig = [
propertyName: "label",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Name:",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -68,7 +68,8 @@ export const propertyPaneContentConfig = [
propertyName: "tooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Value must be atleast 6 chars",
+ placeholderText:
+ "The tooltip may include relevant information or instructions",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -78,7 +79,7 @@ export const propertyPaneContentConfig = [
propertyName: "placeholderText",
label: "Placeholder",
controlType: "INPUT_TEXT",
- placeholderText: "Placeholder",
+ placeholderText: "Value placeholder",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts
index 52aa5cb85824..8c3255afbe73 100644
--- a/app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts
@@ -4,13 +4,12 @@ import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
export const defaultsConfig = {
animateLoading: true,
- text: "Submit",
+ text: "Do something",
buttonVariant: BUTTON_VARIANTS.filled,
buttonColor: COLORS.accent,
widgetName: "Button",
isDisabled: false,
isVisible: true,
- isDefaultClickDisabled: true,
disabledWhenInvalid: false,
resetFormOnClick: false,
recaptchaType: RecaptchaTypes.V3,
diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts
index 4e9f411cef68..82d76c4df8ed 100644
--- a/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts
@@ -11,7 +11,7 @@ export const propertyPaneContentConfig = [
label: "Label",
helpText: "Sets the label of the button",
controlType: "INPUT_TEXT",
- placeholderText: "Submit",
+ placeholderText: "Do Something",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -35,7 +35,7 @@ export const propertyPaneContentConfig = [
propertyName: "tooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Submits Form",
+ placeholderText: "Does the thing",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
index f3cd7d9d6d45..03907cf52fbe 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts
@@ -8,11 +8,11 @@ export const defaultsConfig = {
{ label: "Green", value: "GREEN" },
{ label: "Red", value: "RED" },
],
- defaultSelectedValues: ["BLUE"],
+ defaultSelectedValues: ["BLUE", "RED"],
isDisabled: false,
isRequired: false,
isVisible: true,
- label: "Label",
+ label: "Color",
orientation: "vertical",
version: 1,
widgetName: "CheckboxGroup",
diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
index d7a42aa60842..74ed6e89c030 100644
--- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -51,7 +51,7 @@ export const propertyPaneContentConfig = [
helpText: "Sets the values of the options checked by default",
propertyName: "defaultSelectedValues",
label: "Default selected values",
- placeholderText: '["apple", "orange"]',
+ placeholderText: '["BLUE", "RED"]',
controlType: "INPUT_TEXT",
isBindProperty: true,
isTriggerProperty: false,
@@ -98,7 +98,7 @@ export const propertyPaneContentConfig = [
propertyName: "label",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Enter label text",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -108,7 +108,7 @@ export const propertyPaneContentConfig = [
propertyName: "labelTooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Value must be atleast 6 chars",
+ placeholderText: "Colors look darker on prints",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts
index 98c332074135..69c9a30b0fc9 100644
--- a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts
@@ -9,7 +9,7 @@ export const propertyPaneContentConfig = [
label: "Text",
controlType: "INPUT_TEXT",
helpText: "Displays a label next to the widget",
- placeholderText: "I agree to the T&C",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts
index 2ce38e5eba6e..bb423d8bc9d4 100644
--- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts
@@ -12,5 +12,6 @@ export const defaultsConfig = {
defaultCurrencyCode: getDefaultCurrency().currency,
decimals: 0,
showStepArrows: false,
+ label: "Current Price",
responsiveBehavior: ResponsiveBehavior.Fill,
} as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts
index 4b11c86cab0d..c6ef1931fe5b 100644
--- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts
@@ -15,7 +15,7 @@ export const propertyPaneContentConfig = [
propertyName: "defaultText",
label: "Default value",
controlType: "INPUT_TEXT",
- placeholderText: "100",
+ placeholderText: "42",
isBindProperty: true,
isTriggerProperty: false,
validation: {
diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts b/app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts
index 84e0aaa882b9..e8627720f075 100644
--- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts
+++ b/app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts
@@ -17,11 +17,11 @@ export const CurrencyDropdownOptions = getCurrencyOptions();
export const getDefaultCurrency = () => {
return {
- code: "IN",
- currency: "INR",
- currency_name: "Indian Rupee",
- label: "India",
- phone: "91",
- symbol_native: "₹",
+ code: "US",
+ currency: "USD",
+ currency_name: "United States Dollar",
+ label: "United States",
+ phone: "1",
+ symbol_native: "$",
};
};
diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
index 29c42e46fa76..6a3e575787a8 100644
--- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx
@@ -26,6 +26,7 @@ import type { CurrencyInputWidgetProps } from "./types";
import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget";
import { getCountryCodeFromCurrencyCode, validateInput } from "./helpers";
import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types";
+import { klona as clone } from "klona";
class WDSCurrencyInputWidget extends WDSBaseInputWidget<
CurrencyInputWidgetProps,
@@ -58,10 +59,44 @@ class WDSCurrencyInputWidget extends WDSBaseInputWidget<
}
static getPropertyPaneContentConfig() {
- return mergeWidgetConfig(
- config.propertyPaneContentConfig,
- super.getPropertyPaneContentConfig(),
+ const parentConfig = clone(super.getPropertyPaneContentConfig());
+ const labelSectionIndex = parentConfig.findIndex(
+ (section) => section.sectionName === "Label",
);
+ const labelPropertyIndex = parentConfig[
+ labelSectionIndex
+ ].children.findIndex((property) => property.propertyName === "label");
+
+ parentConfig[labelSectionIndex].children[labelPropertyIndex] = {
+ ...parentConfig[labelSectionIndex].children[labelPropertyIndex],
+ placeholderText: "Current Price",
+ } as any;
+
+ const generalSectionIndex = parentConfig.findIndex(
+ (section) => section.sectionName === "General",
+ );
+ const tooltipPropertyIndex = parentConfig[
+ generalSectionIndex
+ ].children.findIndex((property) => property.propertyName === "tooltip");
+
+ parentConfig[generalSectionIndex].children[tooltipPropertyIndex] = {
+ ...parentConfig[generalSectionIndex].children[tooltipPropertyIndex],
+ placeholderText:
+ "Prices in other currencies should be recalculated in USD",
+ } as any;
+
+ const placeholderPropertyIndex = parentConfig[
+ generalSectionIndex
+ ].children.findIndex(
+ (property) => property.propertyName === "placeholderText",
+ );
+
+ parentConfig[generalSectionIndex].children[placeholderPropertyIndex] = {
+ ...parentConfig[generalSectionIndex].children[placeholderPropertyIndex],
+ placeholderText: "10",
+ } as any;
+
+ return mergeWidgetConfig(config.propertyPaneContentConfig, parentConfig);
}
static getPropertyPaneStyleConfig() {
diff --git a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
index cc4e7cc7338d..1d4023bc27c9 100644
--- a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx
@@ -1,8 +1,11 @@
-import IconSVG from "../icon.svg";
-import ThumbnailSVG from "../thumbnail.svg";
+import { klona as clone } from "klona";
import { WIDGET_TAGS } from "constants/WidgetConstants";
+import { ValidationTypes } from "constants/WidgetValidation";
import { WDSParagraphWidget } from "widgets/wds/WDSParagraphWidget";
+import IconSVG from "../icon.svg";
+import ThumbnailSVG from "../thumbnail.svg";
+
class WDSHeadingWidget extends WDSParagraphWidget {
static type = "WDS_HEADING_WIDGET";
@@ -21,9 +24,36 @@ class WDSHeadingWidget extends WDSParagraphWidget {
...super.getDefaults(),
fontSize: "heading",
widgetName: "Heading",
- text: "Heading",
+ text: "Header",
};
}
+
+ static getPropertyPaneContentConfig() {
+ const parentConfig = clone(super.getPropertyPaneContentConfig());
+
+ const generelSectionIndex = parentConfig.findIndex(
+ (section) => section.sectionName === "General",
+ );
+ const textPropertyIndex = parentConfig[
+ generelSectionIndex
+ ].children.findIndex((property) => property.propertyName === "text");
+
+ parentConfig[generelSectionIndex].children[textPropertyIndex] = {
+ propertyName: "text",
+ helpText: "Sets the text of the widget",
+ label: "Text",
+ controlType: "INPUT_TEXT",
+ placeholderText: "Header",
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: {
+ type: ValidationTypes.TEXT,
+ params: { limitLineBreaks: true },
+ },
+ };
+
+ return parentConfig;
+ }
}
export { WDSHeadingWidget };
diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts
index 1dee7795aa95..d6117af3a745 100644
--- a/app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts
@@ -1,19 +1,14 @@
import { BUTTON_VARIANTS, COLORS } from "@design-system/widgets";
-import { IconNames } from "@blueprintjs/icons";
import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
-import { ICON_BUTTON_MIN_WIDTH } from "constants/minWidthConstants";
export const defaultsConfig = {
- iconName: IconNames.PLUS,
+ iconName: "plus",
buttonVariant: BUTTON_VARIANTS.filled,
buttonColor: COLORS.accent,
isDisabled: false,
isVisible: true,
- rows: 4,
- columns: 4,
widgetName: "IconButton",
version: 1,
animateLoading: true,
responsiveBehavior: ResponsiveBehavior.Hug,
- minWidth: ICON_BUTTON_MIN_WIDTH,
};
diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts
index 2fe52362c1aa..3bdcb2c9ad3f 100644
--- a/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts
@@ -42,7 +42,7 @@ export const propertyPaneContentConfig = [
propertyName: "tooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Add Input Field",
+ placeholderText: "Add new item",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx
index 19e8962fecb4..c2582c94d13f 100644
--- a/app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx
@@ -1,6 +1,7 @@
import React from "react";
import BaseWidget from "widgets/BaseWidget";
import type { SetterConfig } from "entities/AppTheming";
+import type { WidgetDefaultProps } from "WidgetProvider/constants";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import * as config from "./../config";
@@ -26,7 +27,7 @@ class WDSIconButtonWidget extends BaseWidget<
}
static getDefaults() {
- return config.defaultsConfig;
+ return config.defaultsConfig as unknown as WidgetDefaultProps;
}
static getAnvilConfig() {
diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts
index 885b06300857..bbeec6d4250e 100644
--- a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts
@@ -37,7 +37,7 @@ export const defaultsConfig = {
buttonColor: "accent",
},
button4: {
- label: "Save",
+ label: "Save Changes",
isVisible: true,
isDisabled: false,
widgetId: "",
diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts
index bf0145648d66..d8cdd4fc7283 100644
--- a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts
@@ -40,7 +40,7 @@ export const propertyPaneContentConfig = [
helpText: "Sets the label of the button",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Enter label",
+ placeholderText: "Do Something",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts
index 60a679f4fa9f..14622efb1309 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts
@@ -7,6 +7,7 @@ export const defaultsConfig = {
inputType: "TEXT",
widgetName: "Input",
version: 2,
+ label: "Label",
showStepArrows: false,
responsiveBehavior: ResponsiveBehavior.Fill,
};
diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts
index dae7765c5925..f610936765fc 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts
@@ -50,9 +50,9 @@ export const propertyPaneContentConfig = [
helpText:
"Sets the default text of the widget. The text is updated if the default text changes",
propertyName: "defaultText",
- label: "Default value",
+ label: "Value",
controlType: "INPUT_TEXT",
- placeholderText: "John Doe",
+ placeholderText: "Value",
isBindProperty: true,
isTriggerProperty: false,
validation: {
diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
index cadd098930e6..f3f919846379 100644
--- a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
@@ -37,10 +37,9 @@ class WDSInputWidget extends WDSBaseInputWidget<InputWidgetProps, WidgetState> {
}
static getPropertyPaneContentConfig() {
- return mergeWidgetConfig(
- config.propertyPaneContentConfig,
- super.getPropertyPaneContentConfig(),
- );
+ const parentConfig = super.getPropertyPaneContentConfig();
+
+ return mergeWidgetConfig(config.propertyPaneContentConfig, parentConfig);
}
static getPropertyPaneStyleConfig() {
diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts
index 93065abbdbe6..6c93870139a5 100644
--- a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts
@@ -2,7 +2,7 @@ import { BUTTON_VARIANTS, COLORS } from "@design-system/widgets";
import type { WidgetDefaultProps } from "WidgetProvider/constants";
export const defaultsConfig = {
- label: "Open Menu",
+ label: "Open The Menu…",
triggerButtonVariant: BUTTON_VARIANTS.filled,
triggerButtonColor: COLORS.accent,
isCompact: false,
@@ -12,7 +12,7 @@ export const defaultsConfig = {
menuItemsSource: "static",
menuItems: {
menuItem1: {
- label: "First Menu Item",
+ label: "Bake",
id: "menuItem1",
widgetId: "",
isVisible: true,
@@ -20,7 +20,7 @@ export const defaultsConfig = {
index: 0,
},
menuItem2: {
- label: "Second Menu Item",
+ label: "Fry",
id: "menuItem2",
widgetId: "",
isVisible: true,
@@ -28,7 +28,7 @@ export const defaultsConfig = {
index: 1,
},
menuItem3: {
- label: "Third Menu Item",
+ label: "Boil",
id: "menuItem3",
widgetId: "",
isVisible: true,
diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts
index 461933e41eae..d7f25e39b9a3 100644
--- a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts
+++ b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts
@@ -25,7 +25,7 @@ export const menuItemsConfig = {
helpText: "Sets the label of a menu item",
label: "Label",
controlType: "INPUT_TEXT",
- placeholderText: "Download",
+ placeholderText: "Do Something",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
index 8dd81b4a9b02..4af8b7bb0c5d 100644
--- a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
@@ -16,7 +16,7 @@ export const propertyPaneContentConfig = [
helpText: "Sets the label of a menu",
label: "Label",
controlType: "INPUT_TEXT",
- placeholderText: "Open",
+ placeholderText: "Open The Menu…",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx
index bbd54903cdad..d55c5d082fb9 100644
--- a/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx
@@ -18,7 +18,6 @@ import {
EventType,
type ExecuteTriggerPayload,
} from "constants/AppsmithActionConstants/ActionConstants";
-import { Text } from "@design-system/widgets";
class WDSMenuButtonWidget extends BaseWidget<
MenuButtonWidgetProps,
@@ -187,9 +186,7 @@ class WDSMenuButtonWidget extends BaseWidget<
<MenuList>
{visibleItems.map((menuItem: MenuItem) => (
- <Item key={menuItem.id}>
- <Text color={menuItem.textColor}>{menuItem.label}</Text>
- </Item>
+ <Item key={menuItem.id}>{menuItem.label}</Item>
))}
</MenuList>
</Menu>
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts
index a1c38464d7b4..b2337a8794e3 100644
--- a/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts
@@ -18,9 +18,9 @@ export const defaultsConfig = {
showFooter: true,
showHeader: true,
size: "medium",
- title: "Modal",
+ title: "Modal Title",
showSubmitButton: true,
- submitButtonText: "Submit",
+ submitButtonText: "Save Changes",
cancelButtonText: "Cancel",
blueprint: {
operations: [
diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts
index ef84b3d10edb..8cac94cba750 100644
--- a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts
@@ -1,7 +1,6 @@
-import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-export const propertyPaneContentConfig: PropertyPaneConfig[] = [
+export const propertyPaneContentConfig = [
{
sectionName: "General",
children: [
@@ -54,6 +53,7 @@ export const propertyPaneContentConfig: PropertyPaneConfig[] = [
dependencies: ["showHeader"],
isBindProperty: false,
isTriggerProperty: false,
+ placeholderText: "Record details",
},
],
},
@@ -87,6 +87,7 @@ export const propertyPaneContentConfig: PropertyPaneConfig[] = [
dependencies: ["showSubmitButton", "showFooter"],
isBindProperty: false,
isTriggerProperty: false,
+ placeholderText: "Submit",
},
{
propertyName: "cancelButtonText",
@@ -97,6 +98,7 @@ export const propertyPaneContentConfig: PropertyPaneConfig[] = [
dependencies: ["showCancelButton", "showFooter"],
isBindProperty: false,
isTriggerProperty: false,
+ placeholderText: "Cancel",
},
],
},
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
index 51cf36c82f3c..f2ecdcc50ca6 100644
--- a/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts
@@ -7,7 +7,7 @@ import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
import type { WidgetDefaultProps } from "WidgetProvider/constants";
export const defaultsConfig = {
- text: "Hello {{appsmith.user.name || appsmith.user.email}}",
+ text: "The important thing is not to stop questioning. Curiosity has its own reason for existence. One cannot help but be in awe when he contemplates the mysteries of eternity, of life, of the marvelous structure of reality. It is enough if one tries merely to comprehend a little of this mystery each day.",
fontSize: "body",
textAlign: "left",
textColor: "neutral",
diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts
index 60289881add0..2ed867ea5cbd 100644
--- a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts
@@ -9,7 +9,8 @@ export const propertyPaneContentConfig = [
helpText: "Sets the text of the widget",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Name:",
+ placeholderText:
+ "The important thing is not to stop questioning. Curiosity has its own reason for existence.",
isBindProperty: true,
isTriggerProperty: false,
validation: {
@@ -22,7 +23,7 @@ export const propertyPaneContentConfig = [
helpText: "Controls the number of lines displayed",
label: "Line clamp (max lines)",
controlType: "INPUT_TEXT",
- placeholderText: "No. of lines to display",
+ placeholderText: "unlimited",
isBindProperty: true,
isTriggerProperty: false,
validation: {
diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts
index bc2dad094e01..ce46e4645625 100644
--- a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts
@@ -12,4 +12,5 @@ export const defaultsConfig = {
allowDialCodeChange: false,
allowFormatting: true,
responsiveBehavior: ResponsiveBehavior.Fill,
+ label: "Phone number",
} as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts
index 25fe54920572..ba080758e249 100644
--- a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts
@@ -16,7 +16,7 @@ export const propertyPaneContentConfig = [
propertyName: "defaultText",
label: "Default value",
controlType: "INPUT_TEXT",
- placeholderText: "(000) 000-0000",
+ placeholderText: "(123) 456-7890",
isBindProperty: true,
isTriggerProperty: false,
validation: {
diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
index cdd39a5b160f..754617ef97a8 100644
--- a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx
@@ -1,6 +1,7 @@
import React from "react";
import log from "loglevel";
import merge from "lodash/merge";
+import { klona as clone } from "klona";
import * as Sentry from "@sentry/react";
import { mergeWidgetConfig } from "utils/helpers";
import type { CountryCode } from "libphonenumber-js";
@@ -45,10 +46,44 @@ class WDSPhoneInputWidget extends WDSBaseInputWidget<
}
static getPropertyPaneContentConfig() {
- return mergeWidgetConfig(
- config.propertyPaneContentConfig,
- super.getPropertyPaneContentConfig(),
+ const parentConfig = clone(super.getPropertyPaneContentConfig());
+
+ const labelSectionIndex = parentConfig.findIndex(
+ (section) => section.sectionName === "Label",
+ );
+ const labelPropertyIndex = parentConfig[
+ labelSectionIndex
+ ].children.findIndex((property) => property.propertyName === "label");
+
+ parentConfig[labelSectionIndex].children[labelPropertyIndex] = {
+ ...parentConfig[labelSectionIndex].children[labelPropertyIndex],
+ placeholderText: "Phone Number",
+ } as any;
+
+ const generalSectionIndex = parentConfig.findIndex(
+ (section) => section.sectionName === "General",
);
+ const tooltipPropertyIndex = parentConfig[
+ generalSectionIndex
+ ].children.findIndex((property) => property.propertyName === "tooltip");
+
+ parentConfig[generalSectionIndex].children[tooltipPropertyIndex] = {
+ ...parentConfig[generalSectionIndex].children[tooltipPropertyIndex],
+ placeholderText: "You may skip local prefixes",
+ } as any;
+
+ const placeholderPropertyIndex = parentConfig[
+ generalSectionIndex
+ ].children.findIndex(
+ (property) => property.propertyName === "placeholderText",
+ );
+
+ parentConfig[generalSectionIndex].children[placeholderPropertyIndex] = {
+ ...parentConfig[generalSectionIndex].children[placeholderPropertyIndex],
+ placeholderText: "(123) 456-7890",
+ } as any;
+
+ return mergeWidgetConfig(config.propertyPaneContentConfig, parentConfig);
}
static getAutocompleteDefinitions(): AutocompletionDefinitions {
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts
index 5decf0372b51..e49a93cbf617 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts
@@ -3,12 +3,13 @@ import type { WidgetDefaultProps } from "WidgetProvider/constants";
export const defaultsConfig = {
animateLoading: true,
- label: "Label",
+ label: "Size",
options: [
- { label: "Yes", value: "Y" },
- { label: "No", value: "N" },
+ { label: "Small", value: "S" },
+ { label: "Medium", value: "M" },
+ { label: "Large", value: "L" },
],
- defaultOptionValue: "Y",
+ defaultOptionValue: "L",
isRequired: false,
isDisabled: false,
isInline: true,
diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
index 99fb98789ae8..4aa6d297be0a 100644
--- a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -88,7 +88,7 @@ export const propertyPaneContentConfig = [
propertyName: "label",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Enter label text",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -98,7 +98,7 @@ export const propertyPaneContentConfig = [
propertyName: "labelTooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Value must be atleast 6 chars",
+ placeholderText: "Unisex shirt sizes, relaxed fit",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSStatBoxWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSStatBoxWidget/config/defaultsConfig.ts
index 19ebef17d04f..dbc037cbbef3 100644
--- a/app/client/src/widgets/wds/WDSStatBoxWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSStatBoxWidget/config/defaultsConfig.ts
@@ -7,10 +7,10 @@ export const defaultsConfig = {
version: 1,
animateLoading: true,
valueImpact: "positive",
- valueChange: "+120%",
- value: "1500",
+ valueChange: "+50%",
+ value: "42",
label: "Active Users",
- sublabel: "Since 21 Jan 2022",
- iconName: "user",
+ sublabel: "This week",
+ iconName: "shopping-bag",
responsiveBehavior: ResponsiveBehavior.Fill,
} as unknown as WidgetDefaultProps;
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
index b08d58e26756..07bbf0693c7f 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts
@@ -8,7 +8,7 @@ export const defaultsConfig = {
{ label: "Green", value: "GREEN" },
{ label: "Red", value: "RED" },
],
- defaultSelectedValues: ["BLUE"],
+ defaultSelectedValues: ["BLUE", "RED"],
isDisabled: false,
isRequired: false,
isVisible: true,
diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
index a9e2f6fd5048..ca7a89e6d2ee 100644
--- a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -52,7 +52,7 @@ export const propertyPaneContentConfig = [
helpText: "Sets the values of the options turned on by default",
propertyName: "defaultSelectedValues",
label: "Default selected values",
- placeholderText: '["apple", "orange"]',
+ placeholderText: '["BLUE", "RED"]',
controlType: "INPUT_TEXT",
isBindProperty: true,
isTriggerProperty: false,
@@ -113,7 +113,7 @@ export const propertyPaneContentConfig = [
propertyName: "label",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Enter label text",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
@@ -123,7 +123,7 @@ export const propertyPaneContentConfig = [
propertyName: "labelTooltip",
label: "Tooltip",
controlType: "INPUT_TEXT",
- placeholderText: "Value must be atleast 6 chars",
+ placeholderText: "Colors look darker on prints",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts
index 99836d1c4af4..f7117ba1eb81 100644
--- a/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts
@@ -9,7 +9,7 @@ export const propertyPaneContentConfig = [
label: "Text",
controlType: "INPUT_TEXT",
helpText: "Displays a label next to the widget",
- placeholderText: "Enable Option",
+ placeholderText: "Label",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts
index 42552d7a6ceb..dae849ad8a8e 100644
--- a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts
+++ b/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts
@@ -4,7 +4,7 @@ import type { WidgetDefaultProps } from "WidgetProvider/constants";
export const defaultsConfig = {
widgetName: "ToolbarButtons",
orientation: "horizontal",
- buttonVariant: "filled",
+ buttonVariant: "ghost",
buttonColor: "accent",
isDisabled: false,
isVisible: true,
@@ -13,33 +13,51 @@ export const defaultsConfig = {
responsiveBehavior: ResponsiveBehavior.Fill,
buttonsList: {
button1: {
- label: "Favorite",
+ label: "Add",
isVisible: true,
isDisabled: false,
widgetId: "",
id: "button1",
index: 0,
- iconName: "heart",
+ iconName: "plus",
iconAlign: "start",
},
button2: {
- label: "Add",
+ label: "Edit",
isVisible: true,
isDisabled: false,
widgetId: "",
id: "button2",
index: 1,
- iconName: "plus",
+ iconName: "pencil",
iconAlign: "start",
},
button3: {
- label: "Bookmark",
+ label: "Copy",
isVisible: true,
isDisabled: false,
widgetId: "",
id: "button3",
index: 2,
- iconName: "bookmark",
+ iconName: "copy",
+ iconAlign: "start",
+ },
+ separator: {
+ isVisible: true,
+ isDisabled: false,
+ widgetId: "",
+ id: "separator",
+ index: 2,
+ itemType: "SEPARATOR",
+ },
+ button4: {
+ label: "Delete",
+ isVisible: true,
+ isDisabled: false,
+ widgetId: "",
+ id: "button4",
+ index: 2,
+ iconName: "trash",
iconAlign: "start",
},
},
diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts
index 8e33dbe42689..726fa942967f 100644
--- a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts
@@ -38,7 +38,7 @@ export const propertyPaneContentConfig = [
helpText: "Sets the label of the button",
label: "Text",
controlType: "INPUT_TEXT",
- placeholderText: "Enter label",
+ placeholderText: "Do something",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
|
0cbc6bfd40084436a3b2573180709c6a7e96f453
|
2024-01-24 13:25:58
|
Rudraprasad Das
|
feat: adding continuous delivery tab in git settings (#30512)
| false
|
adding continuous delivery tab in git settings (#30512)
|
feat
|
diff --git a/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx
new file mode 100644
index 000000000000..c13c29b1b36c
--- /dev/null
+++ b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx
@@ -0,0 +1,58 @@
+import {
+ CONFIGURE_CD_DESC,
+ CONFIGURE_CD_TITLE,
+ TRY_APPSMITH_ENTERPRISE,
+ createMessage,
+} from "@appsmith/constants/messages";
+import { Button, Text } from "design-system";
+import { useAppsmithEnterpriseLink } from "pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks";
+import React from "react";
+import styled from "styled-components";
+
+const Container = styled.div`
+ padding-top: 8px;
+ padding-bottom: 16px;
+ overflow: auto;
+ min-height: calc(360px + 52px);
+`;
+
+const SectionTitle = styled(Text)`
+ font-weight: 600;
+ margin-bottom: 4px;
+`;
+
+const SectionDesc = styled(Text)`
+ margin-bottom: 12px;
+`;
+
+const StyledButton = styled(Button)`
+ display: inline-block;
+`;
+
+function UnlicensedGitCD() {
+ const enterprisePricingLink = useAppsmithEnterpriseLink(
+ "git_continuous_delivery",
+ );
+
+ return (
+ <Container>
+ <SectionTitle kind="heading-s" renderAs="h3">
+ {createMessage(CONFIGURE_CD_TITLE)}
+ </SectionTitle>
+ <SectionDesc kind="body-m" renderAs="p">
+ {createMessage(CONFIGURE_CD_DESC)}
+ </SectionDesc>
+ <StyledButton
+ href={enterprisePricingLink}
+ kind="primary"
+ renderAs="a"
+ size="md"
+ target="_blank"
+ >
+ {createMessage(TRY_APPSMITH_ENTERPRISE)}
+ </StyledButton>
+ </Container>
+ );
+}
+
+export default UnlicensedGitCD;
diff --git a/app/client/src/ce/components/gitComponents/GitSettingsCDTab/index.tsx b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/index.tsx
new file mode 100644
index 000000000000..95689155edb1
--- /dev/null
+++ b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/index.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+import UnlicensedGitCD from "./UnlicensedGitCD";
+
+function GitSettingsCDTab() {
+ return <UnlicensedGitCD />;
+}
+
+export default GitSettingsCDTab;
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index f2f3a78e6174..a06c1da47a21 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -1109,10 +1109,16 @@ export const UPDATE_DEFAULT_BRANCH_SUCCESS = (branchName: string) =>
`Updated default branch ${!!branchName ? `to ${branchName}` : ""}`;
export const CONTACT_ADMIN_FOR_GIT = () =>
"Please contact your workspace admin to connect your app to a git repo";
+// Git Branch Protection end
export const GENERAL = () => "General";
export const BRANCH = () => "Branch";
-// Git Branch Protection end
+
+export const CONTINUOUS_DELIVERY = () => "Continuous delivery";
+export const CONFIGURE_CD_TITLE = () => "Configure continuous delivery";
+export const CONFIGURE_CD_DESC = () =>
+ "To automatically trigger a pull when changes occur on the remote branch, consider upgrading to our enterprise edition for enhanced functionality";
+export const TRY_APPSMITH_ENTERPRISE = () => "Try Appsmith Enterprise";
export const NAV_DESCRIPTION = () =>
`Navigate to any page, widget or file across this project.`;
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 095765c95d01..36675e75eac8 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -27,6 +27,10 @@ export const FEATURE_FLAG = {
"release_server_dsl_migrations_enabled",
license_git_branch_protection_enabled:
"license_git_branch_protection_enabled",
+ license_git_continuous_delivery_enabled:
+ "license_git_continuous_delivery_enabled",
+ release_git_continuous_delivery_enabled:
+ "release_git_continuous_delivery_enabled",
release_git_autocommit_feature_enabled:
"release_git_autocommit_feature_enabled",
license_widget_rtl_support_enabled: "license_widget_rtl_support_enabled",
@@ -73,6 +77,8 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
release_server_dsl_migrations_enabled: false,
license_git_branch_protection_enabled: false,
release_git_autocommit_feature_enabled: false,
+ license_git_continuous_delivery_enabled: false,
+ release_git_continuous_delivery_enabled: false,
license_widget_rtl_support_enabled: false,
release_custom_widgets_enabled: false,
ab_create_new_apps_enabled: false,
diff --git a/app/client/src/ee/components/gitComponents/GitSettingsCDTab/index.tsx b/app/client/src/ee/components/gitComponents/GitSettingsCDTab/index.tsx
new file mode 100644
index 000000000000..cab3cb59c053
--- /dev/null
+++ b/app/client/src/ee/components/gitComponents/GitSettingsCDTab/index.tsx
@@ -0,0 +1,2 @@
+import GitSettingsCDTab from "ce/components/gitComponents/GitSettingsCDTab";
+export default GitSettingsCDTab;
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
index 525f14e04b9d..d60210847e6c 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
@@ -17,7 +17,7 @@ import { useAppsmithEnterpriseLink } from "./hooks";
import AnalyticsUtil from "utils/AnalyticsUtil";
const Container = styled.div`
- padding-top: 16px;
+ padding-top: 8px;
padding-bottom: 16px;
`;
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/index.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/index.tsx
index 8ac082550f5c..7efc13b20927 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/index.tsx
@@ -1,6 +1,5 @@
import React from "react";
import styled from "styled-components";
-import { ModalBody } from "design-system";
import GitDefaultBranch from "./GitDefaultBranch";
import GitProtectedBranches from "./GitProtectedBranches";
import {
@@ -22,12 +21,10 @@ function TabBranch() {
const showProtectedBranches = isManageProtectedBranchesPermitted;
return (
- <ModalBody>
- <Container>
- {showDefaultBranch && <GitDefaultBranch />}
- {showProtectedBranches && <GitProtectedBranches />}
- </Container>
- </ModalBody>
+ <Container>
+ {showDefaultBranch && <GitDefaultBranch />}
+ {showProtectedBranches && <GitProtectedBranches />}
+ </Container>
);
}
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/index.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/index.tsx
index b3dbe4e866cc..3a39bd1265cc 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/index.tsx
@@ -2,7 +2,6 @@ import React from "react";
import GitUserSettings from "./GitUserSettings";
import DangerZone from "./DangerZone";
import styled from "styled-components";
-import { ModalBody } from "design-system";
import {
useHasConnectToGitPermission,
useHasManageAutoCommitPermission,
@@ -20,12 +19,10 @@ function TabGeneral() {
const showDangerZone = isConnectToGitPermitted || isManageAutoCommitPermitted;
return (
- <ModalBody>
- <Container>
- <GitUserSettings />
- {showDangerZone && <DangerZone />}
- </Container>
- </ModalBody>
+ <Container>
+ <GitUserSettings />
+ {showDangerZone && <DangerZone />}
+ </Container>
);
}
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx
index 3deff4cd1fde..cb199d548559 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
import {
activeGitSettingsModalTabSelector,
isGitSettingsModalOpenSelector,
@@ -8,29 +8,22 @@ import { setGitSettingsModalOpenAction } from "actions/gitSyncActions";
import GitErrorPopup from "../components/GitErrorPopup";
-import { Modal, ModalContent, ModalHeader } from "design-system";
+import { Modal, ModalBody, ModalContent, ModalHeader } from "design-system";
import styled from "styled-components";
import Menu from "../Menu";
import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer";
import {
BRANCH,
+ CONTINUOUS_DELIVERY,
GENERAL,
SETTINGS_GIT,
createMessage,
} from "@appsmith/constants/messages";
import TabGeneral from "./TabGeneral";
import TabBranch from "./TabBranch";
-
-const menuOptions = [
- {
- key: GitSettingsTab.GENERAL,
- title: createMessage(GENERAL),
- },
- {
- key: GitSettingsTab.BRANCH,
- title: createMessage(BRANCH),
- },
-];
+import GitSettingsCDTab from "@appsmith/components/gitComponents/GitSettingsCDTab";
+import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
const StyledModalContent = styled(ModalContent)`
&&& {
@@ -45,6 +38,33 @@ const StyledModalContent = styled(ModalContent)`
function GitSettingsModal() {
const isModalOpen = useSelector(isGitSettingsModalOpenSelector);
const activeTabKey = useSelector(activeGitSettingsModalTabSelector);
+
+ const isGitCDEnabled = useFeatureFlag(
+ FEATURE_FLAG.release_git_continuous_delivery_enabled,
+ );
+
+ const menuOptions = useMemo(() => {
+ const menuOptions = [
+ {
+ key: GitSettingsTab.GENERAL,
+ title: createMessage(GENERAL),
+ },
+ {
+ key: GitSettingsTab.BRANCH,
+ title: createMessage(BRANCH),
+ },
+ ];
+
+ if (isGitCDEnabled) {
+ menuOptions.push({
+ key: GitSettingsTab.CD,
+ title: createMessage(CONTINUOUS_DELIVERY),
+ });
+ }
+
+ return menuOptions;
+ }, [isGitCDEnabled]);
+
const dispatch = useDispatch();
const setActiveTabKey = (tabKey: GitSettingsTab) => {
@@ -79,8 +99,13 @@ function GitSettingsModal() {
}
options={menuOptions}
/>
- {activeTabKey === GitSettingsTab.GENERAL && <TabGeneral />}
- {activeTabKey === GitSettingsTab.BRANCH && <TabBranch />}
+ <ModalBody>
+ {activeTabKey === GitSettingsTab.GENERAL && <TabGeneral />}
+ {activeTabKey === GitSettingsTab.BRANCH && <TabBranch />}
+ {isGitCDEnabled && activeTabKey === GitSettingsTab.CD && (
+ <GitSettingsCDTab />
+ )}
+ </ModalBody>
</StyledModalContent>
</Modal>
<GitErrorPopup />
|
e018db8ec735b0e612be2b385a0db9face50f70b
|
2023-11-30 17:41:06
|
Nidhi
|
fix: Split validateActionName (#29243)
| false
|
Split validateActionName (#29243)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
index f2c52abf2577..c819b93b0c93 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
@@ -286,7 +286,7 @@ public Mono<ActionDTO> validateAndSaveActionToRepository(NewAction newAction) {
this.validateCreatorId(action);
- if (!entityValidationService.validateName(action.getName())) {
+ if (!isValidActionName(action)) {
action.setIsValid(false);
invalids.add(AppsmithError.INVALID_ACTION_NAME.getMessage());
}
@@ -415,6 +415,10 @@ public Mono<ActionDTO> validateAndSaveActionToRepository(NewAction newAction) {
.flatMap(this::setTransientFieldsInUnpublishedAction);
}
+ protected boolean isValidActionName(ActionDTO action) {
+ return entityValidationService.validateName(action.getName());
+ }
+
protected Mono<ActionDTO> validateCreatorId(ActionDTO action) {
if (action.getPageId() == null || action.getPageId().isBlank()) {
throw new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID);
|
53bcdafe91757b719da07b60d60d6ee4500fc8f6
|
2023-10-06 19:38:19
|
Shrikant Sharat Kandula
|
fix: Get Java from GitHub release artifacts directly (#27862)
| false
|
Get Java from GitHub release artifacts directly (#27862)
|
fix
|
diff --git a/Dockerfile b/Dockerfile
index ac00f440db11..cf0f66437869 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,7 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
supervisor curl cron nfs-common nginx nginx-extras gnupg wget netcat openssh-client \
gettext \
- python3-pip python3-venv git ca-certificates-java \
- && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
- && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
- && apt-get update && apt-get install --no-install-recommends --yes temurin-17-jdk \
+ python3-pip python3-venv git ca-certificates \
&& pip install --no-cache-dir git+https://github.com/coderanger/supervisor-stdout@973ba19967cdaf46d9c1634d1675fc65b9574f6e \
&& python3 -m venv --prompt certbot /opt/certbot/venv \
&& /opt/certbot/venv/bin/pip install --upgrade certbot setuptools pip \
@@ -38,6 +35,14 @@ RUN curl --silent --show-error --location https://www.mongodb.org/static/pgp/ser
# This is to get semver 7.5.2, for a CVE fix, might be able to remove it with later versions on NodeJS.
&& npm install -g [email protected]
+# Install Java
+RUN set -o xtrace \
+ && mkdir -p /opt/java \
+ # Assets from https://github.com/adoptium/temurin17-binaries/releases
+ && version="$(curl --write-out '%{redirect_url}' 'https://github.com/adoptium/temurin17-binaries/releases/latest' | sed 's,.*jdk-,,')" \
+ && curl --location --output /tmp/java.tar.gz "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-$version/OpenJDK17U-jdk_$(uname -m | sed s/x86_64/x64/)_linux_hotspot_$(echo $version | tr + _).tar.gz" \
+ && tar -xzf /tmp/java.tar.gz -C /opt/java --strip-components 1
+
# Clean up cache file - Service layer
RUN rm -rf \
/root/.cache \
@@ -87,8 +92,8 @@ RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd
&& find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true \
&& node prepare-image.mjs
-# Update path to load appsmith utils tool as default
-ENV PATH /opt/appsmith/utils/node_modules/.bin:$PATH
+ENV PATH /opt/appsmith/utils/node_modules/.bin:/opt/java/bin:$PATH
+
LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh
diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh
index e10a810ceb09..0e104b031912 100644
--- a/deploy/docker/fs/opt/appsmith/entrypoint.sh
+++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh
@@ -255,6 +255,7 @@ is_empty_directory() {
}
check_setup_custom_ca_certificates() {
+ # old, deprecated, should be removed.
local stacks_ca_certs_path
stacks_ca_certs_path="$stacks_path/ca-certs"
@@ -279,12 +280,41 @@ check_setup_custom_ca_certificates() {
fi
+ update-ca-certificates --fresh
+}
+
+setup-custom-ca-certificates() (
+ local stacks_ca_certs_path="$stacks_path/ca-certs"
+ local store="$TMP/cacerts"
+ local opts_file="$TMP/java-cacerts-opts"
+
+ rm -f "$store" "$opts_file"
+
if [[ -n "$(ls "$stacks_ca_certs_path"/*.pem 2>/dev/null)" ]]; then
- echo "Looks like you have some '.pem' files in your 'ca-certs' folder. Please rename them to '.crt' to be picked up autatically.".
+ echo "Looks like you have some '.pem' files in your 'ca-certs' folder. Please rename them to '.crt' to be picked up automatically.".
fi
- update-ca-certificates --fresh
-}
+ if ! [[ -d "$stacks_ca_certs_path" && "$(find "$stacks_ca_certs_path" -maxdepth 1 -type f -name '*.crt' | wc -l)" -gt 0 ]]; then
+ echo "No custom CA certificates found."
+ return
+ fi
+
+ # Import the system CA certificates into the store.
+ keytool -importkeystore \
+ -srckeystore /opt/java/lib/security/cacerts \
+ -destkeystore "$store" \
+ -srcstorepass changeit \
+ -deststorepass changeit
+
+ # Add the custom CA certificates to the store.
+ find "$stacks_ca_certs_path" -maxdepth 1 -type f -name '*.crt' \
+ -exec keytool -import -noprompt -keystore "$store" -file '{}' -storepass changeit ';'
+
+ {
+ echo "-Djavax.net.ssl.trustStore=$store"
+ echo "-Djavax.net.ssl.trustStorePassword=changeit"
+ } > "$opts_file"
+)
configure_supervisord() {
local supervisord_conf_source="/opt/appsmith/templates/supervisord"
@@ -438,6 +468,8 @@ else
fi
check_setup_custom_ca_certificates
+setup-custom-ca-certificates
+
mount_letsencrypt_directory
check_redis_compatible_page_size
diff --git a/deploy/docker/fs/opt/appsmith/run-java.sh b/deploy/docker/fs/opt/appsmith/run-java.sh
index 99ec07dde064..9f310c21e8c6 100755
--- a/deploy/docker/fs/opt/appsmith/run-java.sh
+++ b/deploy/docker/fs/opt/appsmith/run-java.sh
@@ -5,7 +5,7 @@ set -o pipefail
set -o nounset
set -o noglob
-declare -a proxy_args
+declare -a extra_args
proxy_configured=0
match-proxy-url() {
@@ -22,23 +22,23 @@ match-proxy-url() {
}
if match-proxy-url "${HTTP_PROXY-}"; then
- proxy_args+=(-Dhttp.proxyHost="$proxy_host" -Dhttp.proxyPort="$proxy_port")
+ extra_args+=(-Dhttp.proxyHost="$proxy_host" -Dhttp.proxyPort="$proxy_port")
if [[ -n $proxy_user ]]; then
- proxy_args+=(-Dhttp.proxyUser="$proxy_user")
+ extra_args+=(-Dhttp.proxyUser="$proxy_user")
fi
if [[ -n $proxy_pass ]]; then
- proxy_args+=(-Dhttp.proxyPassword="$proxy_pass")
+ extra_args+=(-Dhttp.proxyPassword="$proxy_pass")
fi
proxy_configured=1
fi
if match-proxy-url "${HTTPS_PROXY-}"; then
- proxy_args+=(-Dhttps.proxyHost="$proxy_host" -Dhttps.proxyPort="$proxy_port")
+ extra_args+=(-Dhttps.proxyHost="$proxy_host" -Dhttps.proxyPort="$proxy_port")
if [[ -n $proxy_user ]]; then
- proxy_args+=(-Dhttps.proxyUser="$proxy_user")
+ extra_args+=(-Dhttps.proxyUser="$proxy_user")
fi
if [[ -n $proxy_pass ]]; then
- proxy_args+=(-Dhttps.proxyPassword="$proxy_pass")
+ extra_args+=(-Dhttps.proxyPassword="$proxy_pass")
fi
proxy_configured=1
fi
@@ -50,7 +50,11 @@ if [[ -z "${NO_PROXY-}" ]]; then
fi
if [[ $proxy_configured == 1 ]]; then
- proxy_args+=(-Djava.net.useSystemProxies=true -Dhttp.nonProxyHosts="${NO_PROXY//,/|}")
+ extra_args+=(-Djava.net.useSystemProxies=true -Dhttp.nonProxyHosts="${NO_PROXY//,/|}")
+fi
+
+if [[ -f "$TMP/java-cacerts-opts" ]]; then
+ extra_args+=("@$TMP/java-cacerts-opts")
fi
# Wait until RTS started and listens on port 8091
@@ -69,5 +73,5 @@ exec java ${APPSMITH_JAVA_ARGS:-} ${APPSMITH_JAVA_HEAP_ARG:-} \
-XX:+ShowCodeDetailsInExceptionMessages \
-Djava.security.egd=file:/dev/./urandom \
-Dlog4j2.formatMsgNoLookups=true \
- "${proxy_args[@]}" \
+ "${extra_args[@]}" \
-jar server.jar
|
bfc79bdfd3b09ab709534ec4440f8ca6c7079f1c
|
2022-09-24 15:31:52
|
Manish Kumar
|
feat: Informative error messages on cyclic dependency for queries on page load (#16634)
| false
|
Informative error messages on cyclic dependency for queries on page load (#16634)
|
feat
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js
new file mode 100644
index 000000000000..878390c10e82
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/OnLoadTests/JSOnLoad_cyclic_dependency_errors_spec.js
@@ -0,0 +1,184 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+
+const dsl = require("../../../../fixtures/inputdsl.json");
+const buttonDsl = require("../../../../fixtures/buttondsl.json");
+const datasource = require("../../../../locators/DatasourcesEditor.json");
+const widgetsPage = require("../../../../locators/Widgets.json");
+const queryLocators = require("../../../../locators/QueryEditor.json");
+import jsActions from "../../../../locators/jsActionLocators.json";
+import { Entity } from "draft-js";
+const jsEditor = ObjectsRegistry.JSEditor;
+const ee = ObjectsRegistry.EntityExplorer;
+const explorer = require("../../../../locators/explorerlocators.json");
+const agHelper = ObjectsRegistry.AggregateHelper;
+const pageid = "MyPage";
+let queryName;
+
+/*
+Cyclic Depedency Error if occurs, Message would be shown in following 6 cases:
+1. On page load actions
+2. When updating DSL attribute
+3. When updating JS Object name
+4. When updating Js Object content
+5. When updating DSL name
+6. When updating Datasource query
+*/
+
+describe("Cyclic Dependency Informational Error Messagaes", function() {
+ before(() => {
+ cy.addDsl(dsl);
+ cy.wait(3000); //dsl to settle!
+ });
+
+
+ it("1. Create Users Sample DB & Sample DB Query", () => {
+ //Step1
+ cy.wait(2000);
+ cy.NavigateToDatasourceEditor();
+
+ //Step2
+ cy.get(datasource.mockUserDatabase).click();
+
+ //Step3 & 4
+ cy.get(`${datasource.datasourceCard}`)
+ .contains("Users")
+ .get(`${datasource.createQuery}`)
+ .last()
+ .click({ force: true });
+
+ //Step5.1: Click the editing field
+ cy.get(".t--action-name-edit-field").click({ force: true });
+
+ cy.generateUUID().then((uid) => {
+ queryName = "query" + uid;
+ //Step5.2: Click the editing field
+ cy.get(queryLocators.queryNameField).type(queryName);
+
+ // switching off Use Prepared Statement toggle
+ cy.get(queryLocators.switch)
+ .last()
+ .click({ force: true });
+
+ //Step 6.1: Click on Write query area
+ cy.get(queryLocators.templateMenu).click();
+ cy.get(queryLocators.query).click({ force: true });
+
+ // Step6.2: writing query to get the schema
+ cy.get(".CodeMirror textarea")
+ .first()
+ .focus()
+ .type("SELECT gender FROM users ORDER BY id LIMIT 10;", {
+ force: true,
+ parseSpecialCharSequences: false,
+ });
+ cy.WaitAutoSave();
+ });
+ });
+
+ // Step 1: simulate cyclic depedency
+ it("2. Create Input Widget & Bind Input Widget Default text to Query Created", () => {
+ cy.get(widgetsPage.widgetSwitchId).click();
+ cy.openPropertyPane("inputwidgetv2");
+ cy.get(widgetsPage.defaultInput).type("{{" + queryName + ".data[0].gender");
+ cy.widgetText("gender", widgetsPage.inputWidget, widgetsPage.inputval);
+ cy.assertPageSave();
+ });
+
+
+
+ //Case 1: On page load actions
+ it ("3. Reload Page and it should provide errors in response", () => {
+ // cy.get(widgetsPage.NavHomePage).click({ force: true });
+ cy.reload();
+ cy.openPropertyPane("inputwidgetv2");
+ cy.wait("@getPage").should(
+ "have.nested.property",
+ "response.body.data.layouts[0].layoutOnLoadActionErrors.length",
+ 1,
+ );
+ });
+
+ it ("4. update input widget's placeholder property and check errors array", () => {
+ // Case 2: When updating DSL attribute
+ cy.get(widgetsPage.placeholder).type("cyclic placeholder");
+ cy.wait("@updateLayout").should(
+ "have.nested.property",
+ "response.body.data.layoutOnLoadActionErrors.length",
+ 1,
+ );
+ });
+
+ it("5. Add JSObject and update its name, content and check for errors", () => {
+ // Case 3: When updating JS Object name
+ jsEditor.CreateJSObject(
+ `export default {
+ fun: async () => {
+ showAlert("New Js Object");
+ }
+ }`,
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: true,
+ shouldCreateNewJSObj: true,
+ },
+ )
+ jsEditor.RenameJSObjFromPane("newName")
+
+ cy.wait("@renameJsAction").should(
+ "have.nested.property",
+ "response.body.data.layoutOnLoadActionErrors.length",
+ 1,
+ );
+
+ // Case 4: When updating Js Object content
+ const syncJSCode = `export default {
+ asyncToSync : ()=>{
+ return "yes";
+ }
+ }`;
+ jsEditor.EditJSObj(syncJSCode, false);
+
+ cy.wait("@jsCollections").should(
+ "have.nested.property",
+ "response.body.data.errorReports.length",
+ 1,
+ );
+ });
+
+ // Case 5: When updating DSL name
+ it("6. Update Widget Name and check for errors", () => {
+
+ let entityName = "gender";
+ let newEntityName = "newInput";
+ ee.SelectEntityByName(entityName, "Widgets");
+ agHelper.RenameWidget(entityName, newEntityName);
+ cy.wait("@updateWidgetName").should(
+ "have.nested.property",
+ "response.body.data.layoutOnLoadActionErrors.length",
+ 1,
+ );
+
+ });
+
+ // Case 6: When updating Datasource query
+ it("7. Update Query and check for errors", () => {
+ cy.get(".t--entity-name")
+ .contains(queryName)
+ .click({ force: true });
+ // update query and check for cyclic depedency issue
+ cy.get(queryLocators.query).click({ force: true });
+ cy.get(".CodeMirror textarea")
+ .first()
+ .focus()
+ .type(" ", {
+ force: true,
+ parseSpecialCharSequences: false,
+ });
+ cy.wait("@saveAction").should(
+ "have.nested.property",
+ "response.body.data.errorReports.length",
+ 1,
+ );
+ });
+});
\ No newline at end of file
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index 741aecf85a18..5e5b1c2ec104 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -1,7 +1,10 @@
import Api from "api/Api";
import { ApiResponse } from "./ApiResponses";
import axios, { AxiosPromise, CancelTokenSource } from "axios";
-import { PageAction } from "constants/AppsmithActionConstants/ActionConstants";
+import {
+ LayoutOnLoadActionErrors,
+ PageAction,
+} from "constants/AppsmithActionConstants/ActionConstants";
import { DSLWidget } from "widgets/constants";
import {
ClonePageActionPayload,
@@ -31,6 +34,7 @@ export type PageLayout = {
dsl: Partial<DSLWidget>;
layoutOnLoadActions: PageAction[][];
layoutActions: PageAction[];
+ layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
};
export type FetchPageResponseData = {
@@ -41,6 +45,7 @@ export type FetchPageResponseData = {
layouts: Array<PageLayout>;
lastUpdatedTime: number;
customSlug?: string;
+ layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
};
export type FetchPublishedPageResponseData = FetchPageResponseData;
@@ -56,6 +61,7 @@ export type SavePageResponseData = {
name: string;
collectionId?: string;
}>;
+ layoutOnLoadActionErrors?: Array<LayoutOnLoadActionErrors>;
};
export type CreatePageRequest = Omit<
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index b3d2bd3fb181..c3c890db73d5 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -1,5 +1,8 @@
import { WidgetCardProps, WidgetProps } from "widgets/BaseWidget";
-import { PageAction } from "constants/AppsmithActionConstants/ActionConstants";
+import {
+ LayoutOnLoadActionErrors,
+ PageAction,
+} from "constants/AppsmithActionConstants/ActionConstants";
import { Workspace } from "constants/workspaceConstants";
import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
import { AppLayoutConfig } from "reducers/entityReducers/pageListReducer";
@@ -916,6 +919,7 @@ export interface UpdateCanvasPayload {
currentApplicationId: string;
pageActions: PageAction[][];
updatedWidgetIds?: string[];
+ layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
}
export interface ShowPropertyPanePayload {
diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
index 4e3740e0c253..01be0995553d 100644
--- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
+++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
@@ -129,6 +129,12 @@ export interface ExecuteErrorPayload extends ErrorActionPayload {
data: ActionResponse;
}
+export interface LayoutOnLoadActionErrors {
+ errorType: string;
+ code: number;
+ message: string;
+}
+
// Group 1 = datasource (https://www.domain.com)
// Group 2 = path (/nested/path)
// Group 3 = params (?param=123¶m2=12)
diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
index efce5a33c31e..9de7b47ea0e4 100644
--- a/app/client/src/entities/Action/index.ts
+++ b/app/client/src/entities/Action/index.ts
@@ -1,6 +1,7 @@
import { EmbeddedRestDatasource } from "entities/Datasource";
import { DynamicPath } from "utils/DynamicBindingUtils";
import _ from "lodash";
+import { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
import { Plugin } from "api/PluginApi";
export enum PluginType {
@@ -114,6 +115,7 @@ export interface BaseAction {
confirmBeforeExecute?: boolean;
eventData?: any;
messages: string[];
+ errorReports?: Array<LayoutOnLoadActionErrors>;
}
interface BaseApiAction extends BaseAction {
diff --git a/app/client/src/entities/AppsmithConsole/logtype.ts b/app/client/src/entities/AppsmithConsole/logtype.ts
index 47ca6f557fb6..7b5c861e0687 100644
--- a/app/client/src/entities/AppsmithConsole/logtype.ts
+++ b/app/client/src/entities/AppsmithConsole/logtype.ts
@@ -11,6 +11,7 @@ enum LOG_TYPE {
JS_ACTION_UPDATE,
JS_PARSE_ERROR,
JS_PARSE_SUCCESS,
+ CYCLIC_DEPENDENCY_ERROR,
}
export default LOG_TYPE;
diff --git a/app/client/src/entities/JSCollection/index.ts b/app/client/src/entities/JSCollection/index.ts
index 04031eafecae..eaca82280f21 100644
--- a/app/client/src/entities/JSCollection/index.ts
+++ b/app/client/src/entities/JSCollection/index.ts
@@ -1,5 +1,6 @@
import { BaseAction } from "../Action";
import { PluginType } from "entities/Action";
+import { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
export type Variable = {
name: string;
@@ -16,6 +17,7 @@ export interface JSCollection {
actions: Array<JSAction>;
body: string;
variables: Array<Variable>;
+ errorReports?: Array<LayoutOnLoadActionErrors>;
}
export interface JSActionConfig {
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index f9a156b879d0..46e1ee6a3cb6 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -6,7 +6,10 @@ import {
ReduxActionErrorTypes,
} from "@appsmith/constants/ReduxActionConstants";
import moment from "moment";
-import { PageAction } from "constants/AppsmithActionConstants/ActionConstants";
+import {
+ LayoutOnLoadActionErrors,
+ PageAction,
+} from "constants/AppsmithActionConstants/ActionConstants";
const initialState: EditorReduxState = {
initialized: false,
@@ -116,6 +119,7 @@ const editorReducer = createReducer(initialState, {
currentLayoutId,
currentPageId,
currentPageName,
+ layoutOnLoadActionErrors,
pageActions,
pageWidgetId,
} = action.payload;
@@ -129,6 +133,7 @@ const editorReducer = createReducer(initialState, {
currentApplicationId,
currentPageId,
pageActions,
+ layoutOnLoadActionErrors,
};
},
[ReduxActionTypes.CLONE_PAGE_INIT]: (state: EditorReduxState) => {
@@ -222,6 +227,7 @@ export interface EditorReduxState {
isSnipingMode: boolean;
isPreviewMode: boolean;
zoomLevel: number;
+ layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
loadingStates: {
saving: boolean;
savingError: boolean;
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 219421da1f1f..84144d0c75e7 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -31,7 +31,7 @@ import {
getAppMode,
getCurrentApplication,
} from "selectors/applicationSelectors";
-import _, { get, isArray, isString, set } from "lodash";
+import { get, isArray, isString, set, find, isNil, flatten } from "lodash";
import AppsmithConsole from "utils/AppsmithConsole";
import { ENTITY_TYPE, PLATFORM_ERROR } from "entities/AppsmithConsole";
import { validateResponse } from "sagas/ErrorSagas";
@@ -50,6 +50,7 @@ import {
import { Variant } from "components/ads/common";
import {
EventType,
+ LayoutOnLoadActionErrors,
PageAction,
RESP_HEADER_DATATYPE,
} from "constants/AppsmithActionConstants/ActionConstants";
@@ -57,6 +58,7 @@ import {
getCurrentPageId,
getIsSavingEntity,
getLayoutOnLoadActions,
+ getLayoutOnLoadIssues,
} from "selectors/editorSelectors";
import PerformanceTracker, {
PerformanceTransactionName,
@@ -110,6 +112,7 @@ import { isTrueObject, findDatatype } from "workers/evaluationUtils";
import { handleExecuteJSFunctionSaga } from "sagas/JSPaneSagas";
import { Plugin } from "api/PluginApi";
import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils";
+import { checkAndLogErrorsIfCyclicDependency } from "sagas/helper";
enum ActionResponseDataTypes {
BINARY = "BINARY",
@@ -119,12 +122,9 @@ export const getActionTimeout = (
state: AppState,
actionId: string,
): number | undefined => {
- const action = _.find(
- state.entities.actions,
- (a) => a.config.id === actionId,
- );
+ const action = find(state.entities.actions, (a) => a.config.id === actionId);
if (action) {
- const timeout = _.get(
+ const timeout = get(
action,
"config.actionConfiguration.timeoutInMillisecond",
DEFAULT_EXECUTE_ACTION_TIMEOUT_MS,
@@ -270,7 +270,7 @@ function* evaluateActionParams(
executeActionRequest: ExecuteActionRequest,
executionParams?: Record<string, any> | string,
) {
- if (_.isNil(bindings) || bindings.length === 0) {
+ if (isNil(bindings) || bindings.length === 0) {
formData.append("executeActionDTO", JSON.stringify(executeActionRequest));
return [];
}
@@ -831,7 +831,13 @@ function* executePageLoadAction(pageAction: PageAction) {
function* executePageLoadActionsSaga() {
try {
const pageActions: PageAction[][] = yield select(getLayoutOnLoadActions);
- const actionCount = _.flatten(pageActions).length;
+ const layoutOnLoadActionErrors: LayoutOnLoadActionErrors[] = yield select(
+ getLayoutOnLoadIssues,
+ );
+ const actionCount = flatten(pageActions).length;
+
+ // when cyclical depedency issue is there,
+ // none of the page load actions would be executed
PerformanceTracker.startAsyncTracking(
PerformanceTransactionName.EXECUTE_PAGE_LOAD_ACTIONS,
{ numActions: actionCount },
@@ -846,10 +852,10 @@ function* executePageLoadActionsSaga() {
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.EXECUTE_PAGE_LOAD_ACTIONS,
);
-
// We show errors in the debugger once onPageLoad actions
// are executed
yield put(hideDebuggerErrors(false));
+ checkAndLogErrorsIfCyclicDependency(layoutOnLoadActionErrors);
} catch (e) {
log.error(e);
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index e7cf08b11a7a..e2e34df2f3ec 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -111,6 +111,7 @@ import {
saasEditorApiIdURL,
} from "RouteBuilder";
import { PLUGIN_PACKAGE_MONGO } from "constants/QueryEditorConstants";
+import { checkAndLogErrorsIfCyclicDependency } from "./helper";
export function* createActionSaga(
actionPayload: ReduxAction<
@@ -325,6 +326,7 @@ export function* updateActionSaga(
// @ts-expect-error: Types are not available
action,
);
+
const isValidResponse: boolean = yield validateResponse(response);
if (isValidResponse) {
const pageName: string = yield select(
@@ -356,6 +358,9 @@ export function* updateActionSaga(
);
yield put(updateActionSuccess({ data: response.data }));
+ checkAndLogErrorsIfCyclicDependency(
+ (response.data as Action).errorReports,
+ );
}
} catch (error) {
PerformanceTracker.stopAsyncTracking(
diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/sagas/JSActionSagas.ts
index 2ab974d3ca4d..5d5c29947e60 100644
--- a/app/client/src/sagas/JSActionSagas.ts
+++ b/app/client/src/sagas/JSActionSagas.ts
@@ -45,7 +45,7 @@ import {
ERROR_JS_COLLECTION_RENAME_FAIL,
} from "@appsmith/constants/messages";
import { validateResponse } from "./ErrorSagas";
-import PageApi, { FetchPageResponse } from "api/PageApi";
+import PageApi, { FetchPageResponse, PageLayout } from "api/PageApi";
import { updateCanvasWithDSL } from "sagas/PageSagas";
import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
import { ApiResponse } from "api/ApiResponses";
@@ -56,6 +56,7 @@ import { CreateJSCollectionRequest } from "api/JSActionAPI";
import * as log from "loglevel";
import { builderURL, jsCollectionIdURL } from "RouteBuilder";
import AnalyticsUtil, { EventLocation } from "utils/AnalyticsUtil";
+import { checkAndLogErrorsIfCyclicDependency } from "./helper";
export function* fetchJSCollectionsSaga(
action: EvaluationReduxAction<FetchActionsPayload>,
@@ -372,6 +373,9 @@ export function* refactorJSObjectName(
} else {
yield put(fetchJSCollectionsForPage(pageId));
}
+ checkAndLogErrorsIfCyclicDependency(
+ (refactorResponse.data as PageLayout).layoutOnLoadActionErrors,
+ );
}
}
}
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index 64258f3bf94d..94ce608ceaa4 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -83,6 +83,7 @@ import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUt
import { APP_MODE } from "entities/App";
import { getAppMode } from "selectors/applicationSelectors";
import AnalyticsUtil, { EventLocation } from "utils/AnalyticsUtil";
+import { checkAndLogErrorsIfCyclicDependency } from "./helper";
function* handleCreateNewJsActionSaga(
action: ReduxAction<{ pageId: string; from: EventLocation }>,
@@ -481,6 +482,9 @@ function* handleUpdateJSCollectionBody(
if (isValidResponse) {
// @ts-expect-error: response is of type unknown
yield put(updateJSCollectionBodySuccess({ data: response?.data }));
+ checkAndLogErrorsIfCyclicDependency(
+ (response.data as JSCollection).errorReports,
+ );
}
}
} catch (error) {
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index 0f2b7599c476..3dff85531e9e 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -37,6 +37,7 @@ import PageApi, {
FetchPublishedPageRequest,
PageLayout,
SavePageResponse,
+ SavePageResponseData,
SetPageOrderRequest,
UpdatePageRequest,
UpdateWidgetNameRequest,
@@ -115,6 +116,7 @@ import { DataTree } from "entities/DataTree/dataTreeFactory";
import { builderURL } from "RouteBuilder";
import { failFastApiCalls } from "./InitSagas";
import { takeEvery } from "redux-saga/effects";
+import { checkAndLogErrorsIfCyclicDependency } from "./helper";
const WidgetTypes = WidgetFactory.widgetTypes;
@@ -199,6 +201,8 @@ export const getCanvasWidgetsPayload = (
currentLayoutId: pageResponse.data.layouts[0].id, // TODO(abhinav): Handle for multiple layouts
currentApplicationId: pageResponse.data.applicationId,
pageActions: pageResponse.data.layouts[0].layoutOnLoadActions || [],
+ layoutOnLoadActionErrors:
+ pageResponse.data.layouts[0].layoutOnLoadActionErrors || [],
};
};
@@ -446,6 +450,10 @@ function* savePageSaga(action: ReduxAction<{ isRetry?: boolean }>) {
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.SAVE_PAGE_API,
);
+ checkAndLogErrorsIfCyclicDependency(
+ (savePageResponse.data as SavePageResponseData)
+ .layoutOnLoadActionErrors,
+ );
}
} catch (error) {
PerformanceTracker.stopAsyncTracking(
@@ -828,6 +836,9 @@ export function* updateWidgetNameSaga(
dsl: response.data.dsl,
},
});
+ checkAndLogErrorsIfCyclicDependency(
+ (response.data as PageLayout).layoutOnLoadActionErrors,
+ );
}
} else {
yield put({
diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts
index b0384198ae4c..0fb9f3703966 100644
--- a/app/client/src/sagas/helper.ts
+++ b/app/client/src/sagas/helper.ts
@@ -1,7 +1,20 @@
+import { Toaster } from "components/ads/Toast";
+import { createMessage } from "ce/constants/messages";
+import { Variant } from "components/ads";
+import { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
import {
FormEvalOutput,
ConditionalOutput,
} from "reducers/evaluationReducers/formEvaluationReducer";
+import AppsmithConsole from "utils/AppsmithConsole";
+import LOG_TYPE from "entities/AppsmithConsole/logtype";
+import {
+ ENTITY_TYPE,
+ Log,
+ LOG_CATEGORY,
+ PLATFORM_ERROR,
+ Severity,
+} from "entities/AppsmithConsole";
// function to extract all objects that have dynamic values
export const extractFetchDynamicValueFormConfigs = (
@@ -31,3 +44,72 @@ export const extractQueueOfValuesToBeFetched = (evalOutput: FormEvalOutput) => {
});
return output;
};
+
+/**
+ * Function checks if in API response, cyclic dependency issues are there or not
+ *
+ * @param layoutErrors - array of cyclical dependency issues
+ * @returns boolean
+ */
+const checkIfNoCyclicDependencyErrors = (
+ layoutErrors?: Array<LayoutOnLoadActionErrors>,
+): boolean => {
+ return !layoutErrors || (!!layoutErrors && layoutErrors.length === 0);
+};
+
+/**
+ * // Function logs all cyclic dependency errors in debugger
+ *
+ * @param layoutErrors - array of cyclical dependency issues
+ */
+const logCyclicDependecyErrors = (
+ layoutErrors?: Array<LayoutOnLoadActionErrors>,
+) => {
+ if (!!layoutErrors) {
+ for (let index = 0; index < layoutErrors.length; index++) {
+ Toaster.show({
+ text: createMessage(() => {
+ return layoutErrors[index]?.errorType;
+ }),
+ variant: Variant.danger,
+ });
+ }
+ AppsmithConsole.addLogs(
+ layoutErrors.reduce((acc: Log[], error: LayoutOnLoadActionErrors) => {
+ acc.push({
+ severity: Severity.ERROR,
+ category: LOG_CATEGORY.PLATFORM_GENERATED,
+ timestamp: Date.now().toString(),
+ id: error?.code?.toString(),
+ logType: LOG_TYPE.CYCLIC_DEPENDENCY_ERROR,
+ text: !!error.message ? error.message : error.errorType,
+ messages: [
+ {
+ message: !!error.message ? error.message : error.errorType,
+ type: PLATFORM_ERROR.PLUGIN_EXECUTION,
+ },
+ ],
+ source: {
+ type: ENTITY_TYPE.ACTION,
+ name: error?.code?.toString(),
+ id: error?.code?.toString(),
+ },
+ });
+ return acc;
+ }, []),
+ );
+ }
+};
+
+/**
+ * // Function checks and logs cyclic depedency errors
+ *
+ * @param layoutErrors - array of cyclical dependency issues
+ */
+export const checkAndLogErrorsIfCyclicDependency = (
+ layoutErrors?: Array<LayoutOnLoadActionErrors>,
+) => {
+ if (!checkIfNoCyclicDependencyErrors(layoutErrors)) {
+ logCyclicDependecyErrors(layoutErrors);
+ }
+};
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index eb8b7c56d8a0..d273d6d0ecc4 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -97,6 +97,10 @@ export const getPageSavingError = (state: AppState) => {
export const getLayoutOnLoadActions = (state: AppState) =>
state.ui.editor.pageActions || [];
+export const getLayoutOnLoadIssues = (state: AppState) => {
+ return state.ui.editor.layoutOnLoadActionErrors || [];
+};
+
export const getIsPublishingApplication = (state: AppState) =>
state.ui.editor.loadingStates.publishing;
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/ErrorDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/ErrorDTO.java
index bec7ec4bab80..bfd0945db2ba 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/ErrorDTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/ErrorDTO.java
@@ -28,4 +28,11 @@ public ErrorDTO(int code, String message) {
this.code = code;
this.message = message;
}
+
+ public ErrorDTO(int code, String errorType, String message) {
+ this.code = code;
+ this.errorType = errorType;
+ this.message = message;
+
+ }
}
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 a23b636c3519..bd226315c840 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
@@ -5,11 +5,13 @@
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.CompareDslActionDTO;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import net.minidev.json.JSONObject;
+import com.appsmith.external.exceptions.ErrorDTO;
import java.util.List;
import java.util.Set;
@@ -38,6 +40,10 @@ public class Layout extends BaseDomain {
List<Set<DslActionDTO>> layoutOnLoadActions;
+ // this attribute will be used to display errors caused white calculating allOnLoadAction PageLoadActionsUtilCEImpl.java
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ List<ErrorDTO> layoutOnLoadActionErrors;
+
@Deprecated
@JsonIgnore
Set<DslActionDTO> publishedLayoutActions;
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 77e3d8c6e8ff..bcedc07619aa 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
@@ -6,8 +6,10 @@
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.PluginType;
import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.external.exceptions.ErrorDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -44,6 +46,11 @@ public class ActionCollectionDTO {
// This field will only be populated if this collection is bound to one plugin (eg: JS)
String pluginId;
+ //this attribute carries error messages while processing the actionCollection
+ @Transient
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ List<ErrorDTO> errorReports;
+
PluginType pluginType;
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
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 12ab3a43d320..2a74cb8fe3ce 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
@@ -8,6 +8,7 @@
import com.appsmith.server.domains.ActionProvider;
import com.appsmith.server.domains.Documentation;
import com.appsmith.server.domains.PluginType;
+import com.appsmith.external.exceptions.ErrorDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -61,6 +62,11 @@ public class ActionDTO {
ActionConfiguration actionConfiguration;
+ //this attribute carries error messages while processing the actionCollection
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ @Transient
+ List<ErrorDTO> errorReports;
+
Boolean executeOnLoad;
Boolean clientSideExecution;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutDTO.java
index f6852327ec41..b2741879a9f2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutDTO.java
@@ -1,12 +1,16 @@
package com.appsmith.server.dtos;
import com.appsmith.server.domains.ScreenType;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import net.minidev.json.JSONObject;
+import com.appsmith.external.exceptions.ErrorDTO;
+import org.springframework.data.annotation.Transient;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
@Getter
@@ -21,6 +25,11 @@ public class LayoutDTO {
List<Set<DslActionDTO>> layoutOnLoadActions;
+ // this attribute will be used to display errors caused white calculating allOnLoadAction PageLoadActionsUtilCEImpl.java
+ @Transient
+ @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+ List<ErrorDTO> layoutOnLoadActionErrors;
+
// All the actions which have been updated as part of updateLayout function call
List<LayoutActionUpdateDTO> actionUpdates;
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 88f9670a793d..25b86f0708ae 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
@@ -23,6 +23,7 @@
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.dtos.RefactorActionNameDTO;
import com.appsmith.server.dtos.RefactorNameDTO;
+import com.appsmith.external.exceptions.ErrorDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.DefaultResourcesUtils;
@@ -98,6 +99,7 @@ public class LayoutActionServiceCEImpl implements LayoutActionServiceCE {
*/
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";
/**
@@ -758,11 +760,20 @@ public Mono<ActionDTO> updateSingleAction(String id, ActionDTO action) {
@Override
public Mono<ActionDTO> updateSingleActionWithBranchName(String defaultActionId, ActionDTO action, String branchName) {
+ String pageId = action.getPageId();
action.setApplicationId(null);
action.setPageId(null);
return newActionService.findByBranchNameAndDefaultActionId(branchName, defaultActionId, MANAGE_ACTIONS)
.flatMap(newAction -> updateSingleAction(newAction.getId(), action))
- .map(responseUtils::updateActionDTOWithDefaultResources);
+ .map(responseUtils::updateActionDTOWithDefaultResources)
+ .zipWith(newPageService.findPageById(pageId, MANAGE_PAGES, false), (actionDTO, pageDTO) -> {
+ // redundant check
+ if (pageDTO.getLayouts().size() > 0) {
+ actionDTO.setErrorReports(pageDTO.getLayouts().get(0).getLayoutOnLoadActionErrors());
+ }
+ return actionDTO;
+ });
+
}
@Override
@@ -891,11 +902,18 @@ public Mono<LayoutDTO> updateLayout(String pageId, String layoutId, Layout layou
AtomicReference<Boolean> validOnPageLoadActions = new AtomicReference<>(Boolean.TRUE);
+ // setting the layoutOnLoadActionActionErrors to null to remove the existing errors before new DAG calculation.
+ layout.setLayoutOnLoadActionErrors(new ArrayList<>());
+
Mono<List<Set<DslActionDTO>>> allOnLoadActionsMono = pageLoadActionsUtil
.findAllOnLoadActions(pageId, widgetNames, edges, widgetDynamicBindingsMap, flatmapPageLoadActions, actionsUsedInDSL)
.onErrorResume(AppsmithException.class, error -> {
log.info(error.getMessage());
validOnPageLoadActions.set(FALSE);
+ layout.setLayoutOnLoadActionErrors(List.of(
+ new ErrorDTO(error.getAppErrorCode(),
+ layoutOnLoadActionErrorToastMessage,
+ error.getMessage())));
return Mono.just(new ArrayList<>());
});
@@ -986,6 +1004,7 @@ private LayoutDTO generateResponseDTO(Layout layout) {
layoutDTO.setDsl(layout.getDsl());
layoutDTO.setScreen(layout.getScreen());
layoutDTO.setLayoutOnLoadActions(layout.getLayoutOnLoadActions());
+ layoutDTO.setLayoutOnLoadActionErrors(layout.getLayoutOnLoadActionErrors());
layoutDTO.setUserPermissions(layout.getUserPermissions());
return layoutDTO;
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 0e871a67898c..efef2468e2bf 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
@@ -34,9 +34,9 @@
import java.time.Instant;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
import java.util.Objects;
+import java.util.Map;
+import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -437,6 +437,8 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
}
+ final String pageId = actionCollectionDTO.getPageId();
+
Mono<ActionCollection> branchedActionCollectionMono = actionCollectionService
.findByBranchNameAndDefaultCollectionId(branchName, id, MANAGE_ACTIONS)
.cache();
@@ -532,6 +534,7 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
.collect(toMap(actionDTO -> actionDTO.getDefaultResources().getActionId(), ActionDTO::getId))
);
+
// First collect all valid action ids from before, and diff against incoming action ids
return branchedActionCollectionMono
.map(branchedActionCollection -> {
@@ -584,7 +587,17 @@ public Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id,
.flatMap(actionCollectionDTO1 -> actionCollectionService.populateActionCollectionByViewMode(
actionCollection.getUnpublishedCollection(),
false)))
- .map(responseUtils::updateCollectionDTOWithDefaultResources);
+ .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());
+ }
+
+ return branchedActionCollection;
+ });
}
@Override
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 baa526f2057f..09aee193be6e 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
@@ -143,6 +143,7 @@ public void setUp() {
Mockito
.when(analyticsService.sendArchiveEvent(Mockito.any(), Mockito.any()))
.thenAnswer(invocationOnMock -> Mono.justOrEmpty(invocationOnMock.getArguments()[0]));
+
}
<T> DefaultResources setDefaultResources(T collection) {
@@ -381,6 +382,12 @@ public void testUpdateUnpublishedActionCollection_withInvalidId_throwsError() th
.findByBranchNameAndDefaultPageId(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(newPage));
+
+ Mockito
+ .when(newPageService
+ .findById(Mockito.any(), Mockito.any()))
+ .thenReturn(Mono.just(newPage));
+
final Mono<ActionCollectionDTO> actionCollectionDTOMono =
layoutCollectionService.updateUnpublishedActionCollection("testId", actionCollectionDTO, null);
@@ -456,6 +463,12 @@ public void testUpdateUnpublishedActionCollection_withModifiedCollection_returns
.when(newPageService.findByBranchNameAndDefaultPageId(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Mono.just(newPage));
+ Mockito
+ .when(newPageService
+ .findById(Mockito.any(), Mockito.any()))
+ .thenReturn(Mono.just(newPage));
+
+
final Mono<ActionCollectionDTO> actionCollectionDTOMono =
layoutCollectionService.updateUnpublishedActionCollection("testCollectionId", modifiedActionCollectionDTO, null);
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 547af5f76521..15eb540a85f5 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
@@ -1551,4 +1551,104 @@ public void testPageLoadActionWhenSetBothWaysExplicitlyAndImplicitlyViaWidget()
})
.verifyComplete();
}
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void introduceCyclicDependencyAndRemoveLater(){
+
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(new MockPluginExecutor()));
+
+ // creating new action based on which we will introduce cyclic dependency
+ ActionDTO actionDTO = new ActionDTO();
+ actionDTO.setName("actionName");
+ actionDTO.setPageId(testPage.getId());
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ actionDTO.setActionConfiguration(actionConfiguration);
+ actionDTO.setDatasource(datasource);
+ actionDTO.setExecuteOnLoad(true);
+
+ ActionDTO createdAction = layoutActionService.createSingleAction(actionDTO).block();
+
+ // retrieving layout from test page;
+ Layout layout = testPage.getLayouts().get(0);
+
+ JSONObject mainDsl = layout.getDsl();
+ JSONObject dsl = new JSONObject();
+ dsl.put("widgetName", "inputWidget");
+ JSONArray temp = new JSONArray();
+ temp.addAll(List.of(new JSONObject(Map.of("key", "defaultText" ))));
+ dsl.put("dynamicBindingPathList", temp);
+ dsl.put("defaultText", "{{ \tactionName.data[0].inputWidget}}");
+
+ final JSONObject innerObjectReference = new JSONObject();
+ innerObjectReference.put("k", "{{\tactionName.data[0].inputWidget}}");
+
+ final JSONArray innerArrayReference = new JSONArray();
+ innerArrayReference.add(new JSONObject(Map.of("innerK", "{{\tactionName.data[0].inputWidget}}")));
+
+ dsl.put("innerArrayReference", innerArrayReference);
+ dsl.put("innerObjectReference", innerObjectReference);
+
+ final ArrayList<Object> objects = new ArrayList<>();
+ objects.add(dsl);
+
+ mainDsl.put("children", objects);
+ layout.setDsl(mainDsl);
+
+ LayoutDTO firstLayout = layoutActionService.updateLayout(testPage.getId(), layout.getId(), layout).block();
+
+ // by default there should be no error in the layout, hence no error should be sent to ActionDTO/ errorReports will be null
+ if (createdAction.getErrorReports() != null) {
+ assert(createdAction.getErrorReports() instanceof List || createdAction.getErrorReports() == null);
+ assert(createdAction.getErrorReports() == null);
+ }
+
+ // since the dependency has been introduced calling updateLayout will return a LayoutDTO with a populated layoutOnLoadActionErrors
+ assert(firstLayout.getLayoutOnLoadActionErrors() instanceof List);
+ assert (firstLayout.getLayoutOnLoadActionErrors().size() ==1 );
+
+ // refactoring action to carry the existing error in DSL
+ RefactorActionNameDTO refactorActionNameDTO = new RefactorActionNameDTO();
+ refactorActionNameDTO.setOldName("actionName");
+ refactorActionNameDTO.setNewName("newActionName");
+ refactorActionNameDTO.setLayoutId(layout.getId());
+ refactorActionNameDTO.setPageId(testPage.getId());
+ refactorActionNameDTO.setActionId(createdAction.getId());
+
+ Mono<LayoutDTO> layoutDTOMono = layoutActionService.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);
+
+ StepVerifier.create(actionDTOMono.map(
+
+ actionDTO1 -> actionDTO1.getErrorReports().size()
+ ))
+ .expectNext(1).verifyComplete();
+
+
+
+ JSONObject newDsl = new JSONObject();
+ newDsl.put("widgetName", "newInputWidget");
+ newDsl.put("innerArrayReference", innerArrayReference);
+ newDsl.put("innerObjectReference", innerObjectReference);
+
+ objects.remove(0);
+ objects.add(newDsl);
+ mainDsl.put("children", objects);
+
+ layout.setDsl(mainDsl);
+
+ LayoutDTO changedLayoutDTO = layoutActionService.updateLayout(testPage.getId(), layout.getId(), layout).block();
+ assert(changedLayoutDTO.getLayoutOnLoadActionErrors() instanceof List);
+ assert (changedLayoutDTO.getLayoutOnLoadActionErrors().size() == 0);
+
+ }
+
}
|
66b9f6942669993767327cffb84ef82607aa81e4
|
2021-12-16 12:28:30
|
Aswath K
|
fix: Issue with deleting page (#9784)
| false
|
Issue with deleting page (#9784)
|
fix
|
diff --git a/app/client/src/pages/Editor/PagesEditor/PageListItem.tsx b/app/client/src/pages/Editor/PagesEditor/PageListItem.tsx
index 07a5944efba5..299dd88ff7eb 100644
--- a/app/client/src/pages/Editor/PagesEditor/PageListItem.tsx
+++ b/app/client/src/pages/Editor/PagesEditor/PageListItem.tsx
@@ -96,7 +96,7 @@ function PageListItem(props: PageListItemProps) {
*/
const clonePageCallback = useCallback((): void => {
dispatch(clonePageInit(item.pageId, true));
- }, [dispatch]);
+ }, [dispatch, item]);
/**
* delete the page
@@ -109,7 +109,7 @@ function PageListItem(props: PageListItemProps) {
AnalyticsUtil.logEvent("DELETE_PAGE", {
pageName: item.pageName,
});
- }, [dispatch]);
+ }, [dispatch, item]);
/**
* sets the page as default
@@ -118,7 +118,7 @@ function PageListItem(props: PageListItemProps) {
*/
const setPageAsDefaultCallback = useCallback((): void => {
dispatch(setPageAsDefault(item.pageId, applicationId));
- }, [dispatch]);
+ }, [dispatch, item, applicationId]);
/**
* sets the page hidden
@@ -127,7 +127,7 @@ function PageListItem(props: PageListItemProps) {
*/
const setPageHidden = useCallback(() => {
return dispatch(updatePage(item.pageId, item.pageName, !item.isHidden));
- }, [dispatch]);
+ }, [dispatch, item]);
return (
<Container>
|
a1fb4ba197228d5a3046741ea5fdd02fe9edcaa4
|
2023-12-07 18:23:27
|
sharanya-appsmith
|
test: Cypress - Added cypress grep library (#29259)
| false
|
Cypress - Added cypress grep library (#29259)
|
test
|
diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
index b59c45bc8ad5..a43c7838135b 100644
--- a/.github/workflows/ci-test-limited.yml
+++ b/.github/workflows/ci-test-limited.yml
@@ -198,6 +198,7 @@ jobs:
-e FLAGSMITH_URL=http://host.docker.internal:5001/flagsmith \
-e FLAGSMITH_SERVER_KEY=dummykey \
-e FLAGSMITH_SERVER_KEY_BUSINESS_FEATURES=dummykeybusinessfeatures \
+ -e LAUNCHDARKLY_BUSINESS_FLAGS_SERVER_KEY=$LAUNCHDARKLY_BUSINESS_FLAGS_SERVER_KEY \
appsmith/cloud-services:release
cd cicontainerlocal
docker run -d --name appsmith -p 80:80 -p 9001:9001 \
diff --git a/app/client/cypress-add-tags.js b/app/client/cypress-add-tags.js
new file mode 100644
index 000000000000..6dc91c3175e8
--- /dev/null
+++ b/app/client/cypress-add-tags.js
@@ -0,0 +1,67 @@
+const fs = require("fs");
+const path = require("path");
+const readline = require("readline");
+
+const args = process.argv.slice(2);
+if (args.length < 2) {
+ console.error("Please provide a file path and TAG as CLI arguments");
+ process.exit(1);
+}
+
+const TAG = args[1];
+
+function processFile(filePath) {
+ const fileStream = fs.createReadStream(filePath);
+
+ const rl = readline.createInterface({
+ input: fileStream,
+ crlfDelay: Infinity,
+ });
+
+ let newFileContent = "";
+
+ rl.on("line", (line) => {
+ if (line.trim().startsWith("describe(")) {
+ const startIndex = line.indexOf("(");
+ const endIndex = line.lastIndexOf(",");
+ const firstStringParam = line.substring(startIndex + 1, endIndex);
+
+ if (line.includes("{ tags: ")) {
+ const tagsStartIndex = line.indexOf("{ tags: [") + 9;
+ const tagsEndIndex = line.indexOf("] }");
+ const existingTags = line.substring(tagsStartIndex, tagsEndIndex);
+ const updatedTags = `${existingTags}, "${TAG}"`;
+ const updatedLine = line.replace(existingTags, updatedTags);
+ newFileContent += updatedLine + "\n";
+ } else {
+ const updatedLine = line.replace(
+ firstStringParam,
+ `${firstStringParam}, { tags: ["${TAG}"] }`,
+ );
+ newFileContent += updatedLine + "\n";
+ }
+ } else {
+ newFileContent += line + "\n";
+ }
+ });
+
+ rl.on("close", () => {
+ fs.writeFileSync(filePath, newFileContent);
+ });
+}
+
+function processDirectory(directory) {
+ fs.readdirSync(directory).forEach((file) => {
+ let fullPath = path.join(directory, file);
+ if (fs.lstatSync(fullPath).isDirectory()) {
+ processDirectory(fullPath);
+ } else if (
+ path.extname(fullPath) === ".js" ||
+ path.extname(fullPath) === ".ts"
+ ) {
+ processFile(fullPath);
+ }
+ });
+}
+
+processDirectory(args[0]);
diff --git a/app/client/cypress.config.ts b/app/client/cypress.config.ts
index d9c93b1f95ef..3d988077426f 100644
--- a/app/client/cypress.config.ts
+++ b/app/client/cypress.config.ts
@@ -28,9 +28,13 @@ export default defineConfig({
env: {
USERNAME: "xxxx",
PASSWORD: "xxx",
+ grepFilterSpecs: true,
+ grepOmitFiltered: true,
},
setupNodeEvents(on, config) {
- return require("./cypress/plugins/index.js")(on, config);
+ require("@cypress/grep/src/plugin")(config);
+ require("./cypress/plugins/index.js")(on, config);
+ return config;
},
specPattern: "cypress/e2e/**/*.{js,ts}",
testIsolation: false,
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
index 2c405516d0e8..0a5e0a4114ea 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
@@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
const dataSourceName = "gsheet";
let appName = "gsheet-app";
let spreadSheetName = "test-sheet";
-describe("GSheet-widget binding", function () {
+describe("GSheet-widget binding", { tags: ["@tag.Datasource"] }, function () {
before("Setup app and spreadsheet", function () {
//Setting up the app name
const uuid = Cypress._.random(0, 10000);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
index a396dbaf3519..08917bf03894 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js
@@ -5,7 +5,7 @@ import * as _ from "../../../../../support/Objects/ObjectsCore";
let repoName;
let childBranchKey = "ChildBranch";
let mainBranch = "master";
-describe("Git sync modal: merge tab", function () {
+describe("Git sync modal: merge tab", { tags: ["@tag.Git"] }, function () {
before(() => {
_.homePage.NavigateToHome();
cy.createWorkspace();
diff --git a/app/client/cypress/plugins/index.js b/app/client/cypress/plugins/index.js
index 3ec32eaa6097..6ceb683e846a 100644
--- a/app/client/cypress/plugins/index.js
+++ b/app/client/cypress/plugins/index.js
@@ -223,6 +223,17 @@ module.exports = async (on, config) => {
},
});
+ console.log("Type of 'config.specPattern':", typeof config.specPattern);
+ /**
+ * Cypress grep plug return specPattern as object and with absolute path
+ */
+ if (typeof config.specPattern == "object") {
+ config.specPattern = config.specPattern.map((spec) => {
+ return spec.replace(process.cwd() + "/", "");
+ });
+ }
+ console.log("config.specPattern:", config.specPattern);
+
if (process.env["RUNID"]) {
config = await new cypressSplit().splitSpecs(on, config);
cypressHooks(on, config);
diff --git a/app/client/cypress/support/e2e.js b/app/client/cypress/support/e2e.js
index 5631f3ac0ca2..dc16172de1fa 100644
--- a/app/client/cypress/support/e2e.js
+++ b/app/client/cypress/support/e2e.js
@@ -41,8 +41,10 @@ import {
FEATURE_WALKTHROUGH_INDEX_KEY,
WALKTHROUGH_TEST_PAGE,
} from "./Constants.js";
+const registerCypressGrep = require("@cypress/grep");
/// <reference types="cypress-xpath" />
+registerCypressGrep();
installLogsCollector();
Cypress.on("uncaught:exception", (error) => {
diff --git a/app/client/cypress/tags.js b/app/client/cypress/tags.js
new file mode 100644
index 000000000000..0224164e924c
--- /dev/null
+++ b/app/client/cypress/tags.js
@@ -0,0 +1,34 @@
+module.exports = {
+ Tag: [
+ "@tag.excludeForAirgap",
+ "@tag.airgap",
+ "@tag.Git",
+ "@tag.Widget",
+ "@tag.Multiselect",
+ "@tag.Slider",
+ "@tag.CurrencyInput",
+ "@tag.Text",
+ "@tag.Statbox",
+ "@tag.Modal",
+ "@tag.Filepicker",
+ "@tag.Select",
+ "@tag.RichTextEditor",
+ "@tag.Switch",
+ "@tag.List",
+ "@tag.Button",
+ "@tag.Divider",
+ "@tag.Audio",
+ "@tag.Table",
+ "@tag.Image",
+ "@tag.Tab",
+ "@tag.JSONForm",
+ "@tag.Binding",
+ "@tag.IDE",
+ "@tag.Datasource",
+ "@tag.JS",
+ "@tag.GenerateCRUD",
+ "@tag.MobileResponsive",
+ "@tag.Theme",
+ "@tag.Random",
+ ],
+};
diff --git a/app/client/cypress_ci.config.ts b/app/client/cypress_ci.config.ts
index d54d3bb449f7..0405a3c129e6 100644
--- a/app/client/cypress_ci.config.ts
+++ b/app/client/cypress_ci.config.ts
@@ -25,6 +25,7 @@ export default defineConfig({
e2e: {
baseUrl: "http://localhost/",
setupNodeEvents(on, config) {
+ require("@cypress/grep/src/plugin")(config);
return require("./cypress/plugins/index.js")(on, config);
},
specPattern: "cypress/e2e/**/*.{js,ts}",
diff --git a/app/client/cypress_ci_custom.config.ts b/app/client/cypress_ci_custom.config.ts
index 9ffd3a80b29c..bd127b8d0e7d 100644
--- a/app/client/cypress_ci_custom.config.ts
+++ b/app/client/cypress_ci_custom.config.ts
@@ -29,6 +29,10 @@ export default defineConfig({
},
e2e: {
baseUrl: "http://localhost/",
+ env: {
+ grepFilterSpecs: true,
+ grepOmitFiltered: true,
+ },
setupNodeEvents(on, config) {
require("cypress-mochawesome-reporter/plugin")(on);
on(
@@ -46,6 +50,7 @@ export default defineConfig({
}
},
);
+ require("@cypress/grep/src/plugin")(config);
return require("./cypress/plugins/index.js")(on, config);
},
specPattern: "cypress/e2e/**/*.{js,ts}",
diff --git a/app/client/cypress_ci_hosted.config.ts b/app/client/cypress_ci_hosted.config.ts
index fd3f80f2c083..1c9a4b9df188 100644
--- a/app/client/cypress_ci_hosted.config.ts
+++ b/app/client/cypress_ci_hosted.config.ts
@@ -47,6 +47,7 @@ export default defineConfig({
}
},
);
+ require("@cypress/grep/src/plugin")(config);
return require("./cypress/plugins/index.js")(on, config);
},
specPattern: [
diff --git a/app/client/package.json b/app/client/package.json
index 7af371cb913f..4096081ac021 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -239,6 +239,7 @@
"@babel/helper-create-regexp-features-plugin": "^7.18.6",
"@babel/helper-string-parser": "^7.19.4",
"@craco/craco": "^7.0.0",
+ "@cypress/grep": "^4.0.1",
"@faker-js/faker": "^7.4.0",
"@octokit/rest": "^20.0.1",
"@peculiar/webcrypto": "^1.4.3",
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 220744d07d38..87ab02f3c4e1 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -2910,6 +2910,19 @@ __metadata:
languageName: node
linkType: hard
+"@cypress/grep@npm:^4.0.1":
+ version: 4.0.1
+ resolution: "@cypress/grep@npm:4.0.1"
+ dependencies:
+ debug: ^4.3.4
+ find-test-names: ^1.19.0
+ globby: ^11.0.4
+ peerDependencies:
+ cypress: ">=10"
+ checksum: ca8e69cc6cceda54162fc4fdcd361dea4ef1877b761cd9d2f7a53b83e58f201b58b13427eccdc1a2a5054b83d53a3ca0279d3ea815cb3cc065d72a0e2c48b1be
+ languageName: node
+ linkType: hard
+
"@cypress/request@npm:^3.0.0":
version: 3.0.0
resolution: "@cypress/request@npm:3.0.0"
@@ -12266,6 +12279,7 @@ __metadata:
"@blueprintjs/popover2": ^0.5.0
"@blueprintjs/select": ^3.10.0
"@craco/craco": ^7.0.0
+ "@cypress/grep": ^4.0.1
"@design-system/storybook": "workspace:^"
"@design-system/theming": "workspace:^"
"@design-system/widgets": "workspace:^"
@@ -18796,6 +18810,24 @@ __metadata:
languageName: node
linkType: hard
+"find-test-names@npm:^1.19.0":
+ version: 1.28.14
+ resolution: "find-test-names@npm:1.28.14"
+ dependencies:
+ "@babel/parser": ^7.23.0
+ "@babel/plugin-syntax-jsx": ^7.22.5
+ acorn-walk: ^8.2.0
+ debug: ^4.3.3
+ globby: ^11.0.4
+ simple-bin-help: ^1.8.0
+ bin:
+ find-test-names: bin/find-test-names.js
+ print-tests: bin/print-tests.js
+ update-test-count: bin/update-test-count.js
+ checksum: 57f96f4b2259b6dd3c6d12c9fdea9ea6c961850b0f7354423ff49d074081c39fffe945ec218496257dcb4f9578f62c4a3794c2ec6d507ef3f04a72219c304708
+ languageName: node
+ linkType: hard
+
"find-up@npm:^3.0.0":
version: 3.0.0
resolution: "find-up@npm:3.0.0"
@@ -30357,6 +30389,13 @@ __metadata:
languageName: node
linkType: hard
+"simple-bin-help@npm:^1.8.0":
+ version: 1.8.0
+ resolution: "simple-bin-help@npm:1.8.0"
+ checksum: 50cd5753325a2632979e63f231fc73ea187fa468e389ab1f44cb6fbafb6257024a3b8ac6744f35cb499b392fe85aecba35e9e26b4dc042c941655022f3b8a2ce
+ languageName: node
+ linkType: hard
+
"simple-concat@npm:^1.0.0":
version: 1.0.1
resolution: "simple-concat@npm:1.0.1"
|
db20525cb77d6f0c9420f1cc4c4dcb77a0a30ef1
|
2023-05-12 03:53:21
|
Aishwarya-U-R
|
test: Cypress - Flaky fix (#23247)
| false
|
Cypress - Flaky fix (#23247)
|
test
|
diff --git a/app/client/cypress/integration/Regression_TestSuite/ServerSideTests/QueryPane/MySQL_Spec.ts b/app/client/cypress/integration/Regression_TestSuite/ServerSideTests/QueryPane/MySQL_Spec.ts
index 868358eec773..486115cd7d0a 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ServerSideTests/QueryPane/MySQL_Spec.ts
+++ b/app/client/cypress/integration/Regression_TestSuite/ServerSideTests/QueryPane/MySQL_Spec.ts
@@ -57,7 +57,10 @@ describe("Validate MySQL query UI flows - Bug 14054", () => {
it("4. Verify Deletion of the datasource", () => {
ee.SelectEntityByName(dsName, "Datasources");
ee.ActionContextMenuByEntityName(dsName, "Delete", "Are you sure?");
- agHelper.ValidateNetworkStatus("@deleteDatasource", 200);
+
+ cy.wait("@deleteDatasource").should((response: any) => {
+ expect(response.status).to.be.oneOf([200, 409]);
+ });
});
function runQueryNValidate(query: string, columnHeaders: string[]) {
|
101b21b901ad08c65f89e7f2c78885783c9239ea
|
2021-09-23 15:22:11
|
Anagh Hegde
|
fix: Widget suggestion for firestore datasource (#7375)
| false
|
Widget suggestion for firestore datasource (#7375)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java
index ee61de267b5f..9e6f92900078 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WidgetSuggestionHelper.java
@@ -5,23 +5,31 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
@Slf4j
public class WidgetSuggestionHelper {
- private static List<String> fields;
- private static List<String> numericFields;
- private static List<String> objectFields;
+ @Getter
+ @Setter
+ @NoArgsConstructor
+ private static class DataFields {
+ List<String> fields;
+ List<String> numericFields;
+ List<String> objectFields;
+ }
/**
- * Suggest the best widget to the query response. We currently planning to support List, Select, Table, Text and Chart widgets
+ * Suggest the best widget to the query response. We currently support Select, Table, Text and Chart widgets
* @return List of Widgets with binding query
*/
public static List<WidgetSuggestionDTO> getSuggestedWidgets(Object data) {
@@ -29,99 +37,112 @@ public static List<WidgetSuggestionDTO> getSuggestedWidgets(Object data) {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
if(data instanceof ArrayNode) {
- if( ((ArrayNode) data).isEmpty() ) {
- return widgetTypeList;
- }
- if(((ArrayNode) data).isArray()) {
- ArrayNode array = null;
- try {
- array = (ArrayNode) data;
- } catch(ClassCastException e) {
- log.warn("Error while casting data to suggest widget.", e);
- widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
- }
- int length = array.size();
- JsonNode node = array.get(0);
- JsonNodeType nodeType = node.getNodeType();
-
- collectFieldsFromData(node.fields());
-
- if(JsonNodeType.STRING.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeString(fields, length);
- }
-
- if(JsonNodeType.OBJECT.equals(nodeType) || JsonNodeType.ARRAY.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeArray(fields, numericFields);
- }
+ widgetTypeList = handleArrayNode((ArrayNode) data);
+ } else if(data instanceof JsonNode) {
+ widgetTypeList = handleJsonNode((JsonNode) data);
+ } else if (data instanceof List && !((List) data).isEmpty()) {
+ widgetTypeList = handleList((List) data);
+ } else if (data != null) {
+ widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
+ }
+ return widgetTypeList;
+ }
- if(JsonNodeType.NUMBER.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeNumber();
- }
+ private static List<WidgetSuggestionDTO> handleArrayNode(ArrayNode array) {
+ if (array.isEmpty()) {
+ return new ArrayList<>();
+ }
+ //TODO - check other data types
+ if (array.isArray()) {
+ int length = array.size();
+ JsonNode node = array.get(0);
+ JsonNodeType nodeType = node.getNodeType();
+
+ DataFields dataFields = collectFieldsFromData(node.fields());
+
+ if (JsonNodeType.STRING.equals(nodeType)) {
+ return getWidgetsForTypeString(dataFields.getFields(), length);
+ } else if (JsonNodeType.OBJECT.equals(nodeType) || JsonNodeType.ARRAY.equals(nodeType)) {
+ return getWidgetsForTypeArray(dataFields.getFields(), dataFields.getNumericFields());
+ } else if (JsonNodeType.NUMBER.equals(nodeType)) {
+ return getWidgetsForTypeNumber();
}
- } else {
- if(data instanceof JsonNode) {
- if (((JsonNode) data).isEmpty()) {
- return widgetTypeList;
- }
- if (((JsonNode) data).isObject()) {
- ObjectNode node = (ObjectNode) data;
- int length = node.size();
- JsonNodeType nodeType = node.getNodeType();
-
- collectFieldsFromData(node.fields());
-
- if(JsonNodeType.STRING.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeString(fields, length);
- }
-
- if(JsonNodeType.ARRAY.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeArray(fields, numericFields);
- }
+ }
+ return new ArrayList<>();
+ }
- if(JsonNodeType.OBJECT.equals(nodeType)) {
- /*
- * Get fields from nested object
- * use the for table, list, chart and Select
- */
- if(objectFields.isEmpty()) {
- widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
- } else {
- String nestedFieldName = objectFields.get(0);
- if(node.get(nestedFieldName).size() == 0) {
- widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
- } else {
- collectFieldsFromData(node.get(nestedFieldName).get(0).fields());
- widgetTypeList = getWidgetsForTypeNestedObject(nestedFieldName);
- }
- }
- }
+ private static List<WidgetSuggestionDTO> handleJsonNode(JsonNode node) {
+ List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
+ if (node.isEmpty()) {
+ return widgetTypeList;
+ }
- if(JsonNodeType.NUMBER.equals(nodeType)) {
- widgetTypeList = getWidgetsForTypeNumber();
+ if (node.isObject()) {
+ int length = node.size();
+ JsonNodeType nodeType = node.getNodeType();
+
+ DataFields dataFields = collectFieldsFromData(node.fields());
+
+ if (JsonNodeType.STRING.equals(nodeType)) {
+ widgetTypeList = getWidgetsForTypeString(dataFields.getFields(), length);
+ } else if (JsonNodeType.ARRAY.equals(nodeType)) {
+ widgetTypeList = getWidgetsForTypeArray(dataFields.getFields(), dataFields.getNumericFields());
+ } else if (JsonNodeType.OBJECT.equals(nodeType)) {
+ /*
+ * Get fields from nested object
+ * use the for table, list, chart and Select
+ */
+ if (dataFields.objectFields.isEmpty()) {
+ widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
+ } else {
+ String nestedFieldName = dataFields.getObjectFields().get(0);
+ if (node.get(nestedFieldName).size() == 0) {
+ widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
+ } else {
+ dataFields = collectFieldsFromData(node.get(nestedFieldName).get(0).fields());
+ widgetTypeList = getWidgetsForTypeNestedObject(nestedFieldName, dataFields.getFields(), dataFields.getNumericFields());
}
}
+ } else if (JsonNodeType.NUMBER.equals(nodeType)) {
+ widgetTypeList = getWidgetsForTypeNumber();
+ }
+ } else if (node.isArray() || node.isNumber() || node.isTextual()) {
+ DataFields dataFields = collectFieldsFromData(node.fields());
+ widgetTypeList = getWidgetsForTypeString(dataFields.getFields(), 0);
+ }
+ return widgetTypeList;
+ }
- if(((JsonNode) data).isArray() || ((JsonNode) data).isNumber() || ((JsonNode) data).isTextual() ) {
- widgetTypeList = getWidgetsForTypeString(fields, 0);
+ private static List<WidgetSuggestionDTO> handleList(List dataList) {
+ if (dataList.get(0) instanceof Map) {
+ Map map = (Map) dataList.get(0);
+ Set fieldList = map.keySet();
+ List<String> fields = new ArrayList<>();
+ List<String> numericFields = new ArrayList<>();
+
+ //Get all the fields from the object and check for the possible widget match
+ for (Object key : fieldList) {
+ if (map.get(key) instanceof String) {
+ fields.add(((String) key));
}
- }
- else {
- if (data != null ) {
- widgetTypeList.add(getWidget(WidgetType.TEXT_WIDGET));
+ if (map.get(key) instanceof Number) {
+ numericFields.add(((String) key));
}
}
+ return getWidgetsForTypeArray(fields, numericFields);
}
- return widgetTypeList;
+ return List.of(getWidget(WidgetType.TABLE_WIDGET), getWidget(WidgetType.TEXT_WIDGET));
}
/*
* We support only TEXT, CHART, DROPDOWN, TABLE, INPUT widgets as part of the suggestion
* We need string and number type fields to construct the query which will bind data to the above widgets
*/
- private static void collectFieldsFromData(Iterator<Map.Entry<String, JsonNode>> jsonFields) {
- fields = new ArrayList<>();
- numericFields = new ArrayList<>();
- objectFields = new ArrayList<>();
+ private static DataFields collectFieldsFromData(Iterator<Map.Entry<String, JsonNode>> jsonFields) {
+ DataFields dataFields = new DataFields();
+ List<String> fields = new ArrayList<>();
+ List<String> numericFields = new ArrayList<>();
+ List<String> objectFields = new ArrayList<>();
while(jsonFields.hasNext()) {
Map.Entry<String, JsonNode> jsonField = jsonFields.next();
if(JsonNodeType.STRING.equals(jsonField.getValue().getNodeType())) {
@@ -135,6 +156,10 @@ private static void collectFieldsFromData(Iterator<Map.Entry<String, JsonNode>>
objectFields.add(jsonField.getKey());
}
}
+ dataFields.setFields(fields);
+ dataFields.setNumericFields(numericFields);
+ dataFields.setObjectFields(objectFields);
+ return dataFields;
}
private static List<WidgetSuggestionDTO> getWidgetsForTypeString(List<String> fields, int length) {
@@ -177,7 +202,9 @@ private static List<WidgetSuggestionDTO> getWidgetsForTypeNumber() {
* When the response from the action is has nested data(Ex : Object containing array of fields) and only 1 level is supported
* For nested data, the binding query changes from data.map() --> data.nestedFieldName.map()
*/
- private static List<WidgetSuggestionDTO> getWidgetsForTypeNestedObject(String nestedFieldName) {
+ private static List<WidgetSuggestionDTO> getWidgetsForTypeNestedObject(String nestedFieldName,
+ List<String> fields,
+ List<String> numericFields) {
List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
/*
* fields - contains all the fields inside the nested data and nested data is considered to only 1 level
@@ -216,5 +243,4 @@ public static WidgetSuggestionDTO getWidgetNestedData(WidgetType widgetType, Str
return widgetSuggestionDTO;
}
-
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
index 9340247dbfb1..399ff57dc3e5 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
@@ -2098,4 +2098,131 @@ public void testWidgetSuggestionNestedData() throws JsonProcessingException {
}
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void suggestWidget_ArrayListData_SuggestTableTextChartDropDownWidget() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+ ActionExecutionResult mockResult = new ActionExecutionResult();
+ ArrayList<JSONObject> listData = new ArrayList<>();
+ JSONObject jsonObject = new JSONObject(Map.of("url", "images/thumbnails/0001.jpg", "width",32, "height", 32));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0001.jpg", "width",42, "height", 22));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0002.jpg", "width",52, "height", 12));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0003.jpg", "width",62, "height", 52));
+ listData.add(jsonObject);
+ mockResult.setIsExecutionSuccess(true);
+ mockResult.setBody(listData);
+ mockResult.setStatusCode("200");
+ mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+ mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+ List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.CHART_WIDGET, "url", "width"));
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "url", "url"));
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET));
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
+ mockResult.setSuggestedWidgets(widgetTypeList);
+
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.POST);
+ actionConfiguration.setBody("random-request-body");
+ actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+ action.setActionConfiguration(actionConfiguration);
+ action.setPageId(testPage.getId());
+ action.setName("testActionExecute");
+ action.setDatasource(datasource);
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+ executeActionDTO.setActionId(createdAction.getId());
+ executeActionDTO.setViewMode(false);
+
+ executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+ List.of(new ParsedDataType(DisplayDataType.RAW)));
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void suggestWidget_ArrayListData_SuggestTableTextDropDownWidget() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+ ActionExecutionResult mockResult = new ActionExecutionResult();
+ ArrayList<JSONObject> listData = new ArrayList<>();
+ JSONObject jsonObject = new JSONObject(Map.of("url", "images/thumbnails/0001.jpg", "width","32", "height", "32"));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0001.jpg", "width","42", "height", "22"));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0002.jpg", "width","52", "height", "12"));
+ listData.add(jsonObject);
+ jsonObject = new JSONObject(Map.of("url", "images/0003.jpg", "width","62", "height", "52"));
+ listData.add(jsonObject);
+ mockResult.setIsExecutionSuccess(true);
+ mockResult.setBody(listData);
+ mockResult.setStatusCode("200");
+ mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+ mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+ List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.DROP_DOWN_WIDGET, "url", "width"));
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TABLE_WIDGET));
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
+ mockResult.setSuggestedWidgets(widgetTypeList);
+
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.POST);
+ actionConfiguration.setBody("random-request-body");
+ actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+ action.setActionConfiguration(actionConfiguration);
+ action.setPageId(testPage.getId());
+ action.setName("testActionExecute");
+ action.setDatasource(datasource);
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+ executeActionDTO.setActionId(createdAction.getId());
+ executeActionDTO.setViewMode(false);
+
+ executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+ List.of(new ParsedDataType(DisplayDataType.RAW)));
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void suggestWidget_ArrayListDataEmpty_SuggestTextWidget() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
+ ActionExecutionResult mockResult = new ActionExecutionResult();
+ ArrayList<JSONObject> listData = new ArrayList<>();
+ mockResult.setIsExecutionSuccess(true);
+ mockResult.setBody(listData);
+ mockResult.setStatusCode("200");
+ mockResult.setHeaders(objectMapper.valueToTree(Map.of("response-header-key", "response-header-value")));
+ mockResult.setDataTypes(List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+ List<WidgetSuggestionDTO> widgetTypeList = new ArrayList<>();
+ widgetTypeList.add(WidgetSuggestionHelper.getWidget(WidgetType.TEXT_WIDGET));
+ mockResult.setSuggestedWidgets(widgetTypeList);
+
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.POST);
+ actionConfiguration.setBody("random-request-body");
+ actionConfiguration.setHeaders(List.of(new Property("random-header-key", "random-header-value")));
+ action.setActionConfiguration(actionConfiguration);
+ action.setPageId(testPage.getId());
+ action.setName("testActionExecute");
+ action.setDatasource(datasource);
+ ActionDTO createdAction = layoutActionService.createSingleAction(action).block();
+
+ ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
+ executeActionDTO.setActionId(createdAction.getId());
+ executeActionDTO.setViewMode(false);
+
+ executeAndAssertAction(executeActionDTO, actionConfiguration, mockResult,
+ List.of(new ParsedDataType(DisplayDataType.RAW)));
+
+ }
+
}
|
3c38ca950a981bc256d7e3b91a6a3d562d1cb347
|
2024-06-03 18:03:30
|
sneha122
|
fix: [Perf Improvement] removed unnecessary individual DB calls to plugin and fetched al… (#33712)
| false
|
[Perf Improvement] removed unnecessary individual DB calls to plugin and fetched al… (#33712)
|
fix
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/DatasourceSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/DatasourceSpan.java
new file mode 100644
index 000000000000..0445211d1c06
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/DatasourceSpan.java
@@ -0,0 +1,9 @@
+package com.appsmith.external.constants.spans;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+public class DatasourceSpan {
+ public static final String FETCH_ALL_DATASOURCES_WITH_STORAGES =
+ APPSMITH_SPAN_PREFIX + "get_all_datasource_storage";
+ public static final String FETCH_ALL_PLUGINS_IN_WORKSPACE = APPSMITH_SPAN_PREFIX + "get_all_plugins_in_workspace";
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
index 91cc1e08a634..690847fd0e1b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
@@ -35,12 +35,14 @@
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.EnvironmentPermission;
import com.appsmith.server.solutions.WorkspacePermission;
+import io.micrometer.observation.ObservationRegistry;
import jakarta.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
+import reactor.core.observability.micrometer.Micrometer;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
@@ -59,6 +61,8 @@
import java.util.Set;
import java.util.UUID;
+import static com.appsmith.external.constants.spans.DatasourceSpan.FETCH_ALL_DATASOURCES_WITH_STORAGES;
+import static com.appsmith.external.constants.spans.DatasourceSpan.FETCH_ALL_PLUGINS_IN_WORKSPACE;
import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
import static com.appsmith.server.helpers.CollectionUtils.isNullOrEmpty;
import static com.appsmith.server.helpers.DatasourceAnalyticsUtils.getAnalyticsProperties;
@@ -87,6 +91,7 @@ public class DatasourceServiceCEImpl implements DatasourceServiceCE {
private final EnvironmentPermission environmentPermission;
private final RateLimitService rateLimitService;
private final FeatureFlagService featureFlagService;
+ private final ObservationRegistry observationRegistry;
// Defines blocking duration for test as well as connection created for query execution
// This will block the creation of datasource connection for 5 minutes, in case of more than 3 failed connection
@@ -112,7 +117,8 @@ public DatasourceServiceCEImpl(
DatasourceStorageService datasourceStorageService,
EnvironmentPermission environmentPermission,
RateLimitService rateLimitService,
- FeatureFlagService featureFlagService) {
+ FeatureFlagService featureFlagService,
+ ObservationRegistry observationRegistry) {
this.workspaceService = workspaceService;
this.sessionUserService = sessionUserService;
@@ -130,6 +136,7 @@ public DatasourceServiceCEImpl(
this.environmentPermission = environmentPermission;
this.rateLimitService = rateLimitService;
this.featureFlagService = featureFlagService;
+ this.observationRegistry = observationRegistry;
}
@Override
@@ -766,14 +773,19 @@ public Flux<Datasource> getAllWithStorages(MultiValueMap<String, String> params)
@Override
public Flux<Datasource> getAllByWorkspaceIdWithStorages(String workspaceId, AclPermission permission) {
+ Mono<Map<String, Plugin>> pluginsMapMono = pluginService
+ .findAllPluginsInWorkspace(workspaceId)
+ .name(FETCH_ALL_PLUGINS_IN_WORKSPACE)
+ .tap(Micrometer.observation(observationRegistry));
- return repository
+ return pluginsMapMono.flatMapMany(pluginsMap -> repository
.findAllByWorkspaceId(workspaceId, permission)
.publishOn(Schedulers.boundedElastic())
.flatMap(datasource -> datasourceStorageService
.findByDatasource(datasource)
.publishOn(Schedulers.boundedElastic())
- .flatMap(datasourceStorageService::populateHintMessages)
+ .flatMap(datasourceStorage ->
+ datasourceStorageService.populateHintMessages(datasourceStorage, pluginsMap))
.map(datasourceStorageService::createDatasourceStorageDTOFromDatasourceStorage)
.collectMap(DatasourceStorageDTO::getEnvironmentId)
.flatMap(datasourceStorages -> {
@@ -781,10 +793,12 @@ public Flux<Datasource> getAllByWorkspaceIdWithStorages(String workspaceId, AclP
return Mono.just(datasource);
}))
.collectList()
+ .name(FETCH_ALL_DATASOURCES_WITH_STORAGES)
+ .tap(Micrometer.observation(observationRegistry))
.flatMapMany(datasourceList -> {
markRecentlyUsed(datasourceList, 3);
return Flux.fromIterable(datasourceList);
- });
+ }));
}
@Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
index 8af407c594ce..1fc7bf66b43d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
@@ -16,6 +16,7 @@
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.EnvironmentPermission;
import com.appsmith.server.solutions.WorkspacePermission;
+import io.micrometer.observation.ObservationRegistry;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -39,7 +40,8 @@ public DatasourceServiceImpl(
DatasourceStorageService datasourceStorageService,
EnvironmentPermission environmentPermission,
RateLimitService rateLimitService,
- FeatureFlagService featureFlagService) {
+ FeatureFlagService featureFlagService,
+ ObservationRegistry observationRegistry) {
super(
repository,
@@ -57,6 +59,7 @@ public DatasourceServiceImpl(
datasourceStorageService,
environmentPermission,
rateLimitService,
- featureFlagService);
+ featureFlagService,
+ observationRegistry);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCE.java
index 0d115dc5b9a6..0f9966566561 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCE.java
@@ -4,6 +4,7 @@
import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.external.models.DatasourceStorageDTO;
import com.appsmith.external.models.MustacheBindingToken;
+import com.appsmith.server.domains.Plugin;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -37,6 +38,8 @@ Mono<DatasourceStorage> updateDatasourceStorage(
Mono<DatasourceStorage> checkEnvironment(DatasourceStorage datasourceStorage);
+ Mono<DatasourceStorage> populateHintMessages(DatasourceStorage datasourceStorage, Map<String, Plugin> pluginsMap);
+
Mono<DatasourceStorage> populateHintMessages(DatasourceStorage datasourceStorage);
Map<String, Object> getAnalyticsProperties(DatasourceStorage datasourceStorage);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
index 6cc989e34fa0..751a7fcf2814 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
@@ -244,7 +244,12 @@ private DatasourceStorage sanitizeDatasourceStorage(DatasourceStorage datasource
@Override
public Mono<DatasourceStorage> populateHintMessages(DatasourceStorage datasourceStorage) {
+ return this.populateHintMessages(datasourceStorage, null);
+ }
+ @Override
+ public Mono<DatasourceStorage> populateHintMessages(
+ DatasourceStorage datasourceStorage, Map<String, Plugin> pluginsMap) {
if (datasourceStorage == null) {
/*
* - Not throwing an exception here because we do not throw an error in case of missing datasourceStorage.
@@ -261,7 +266,13 @@ public Mono<DatasourceStorage> populateHintMessages(DatasourceStorage datasource
return Mono.just(datasourceStorage);
}
- final Mono<Plugin> pluginMono = pluginService.findById(datasourceStorage.getPluginId());
+ Mono<Plugin> pluginMono;
+ if (pluginsMap == null) {
+ pluginMono = pluginService.findById(datasourceStorage.getPluginId());
+ } else {
+ pluginMono = Mono.justOrEmpty(pluginsMap.get(datasourceStorage.getPluginId()));
+ }
+
Mono<PluginExecutor> pluginExecutorMono = pluginExecutorHelper
.getPluginExecutor(pluginMono)
.switchIfEmpty(Mono.error(new AppsmithException(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
index 3362c3225995..de74654b5efe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
@@ -48,4 +48,6 @@ public interface PluginServiceCE extends CrudService<Plugin, String> {
Flux<Plugin> saveAll(Iterable<Plugin> plugins);
Flux<Plugin> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields);
+
+ Mono<Map<String, Plugin>> findAllPluginsInWorkspace(String workspaceId);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
index 379b712dccc0..ca2c8d500923 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
@@ -104,26 +104,13 @@ public PluginServiceCEImpl(
}
@Override
- public Flux<Plugin> getInWorkspace(@NonNull String workspaceId) {
- // TODO : Think about the various scenarios where this plugin api is called and then decide on permissions.
- Mono<Workspace> workspaceMono = workspaceService.getById(workspaceId);
-
- return workspaceMono
- .flatMapMany(workspace -> {
- if (workspace.getPlugins() == null) {
- log.debug(
- "Null installed plugins found for workspace: {}. Return empty plugins",
- workspace.getName());
- return Flux.empty();
- }
-
- Set<String> pluginIds = workspace.getPlugins().stream()
- .map(WorkspacePlugin::getPluginId)
- .filter(Objects::nonNull)
- .collect(Collectors.toUnmodifiableSet());
+ public Mono<Map<String, Plugin>> findAllPluginsInWorkspace(String workspaceId) {
+ return getAllPlugins(workspaceId).collectMap(Plugin::getId);
+ }
- return repository.findAllById(pluginIds);
- })
+ @Override
+ public Flux<Plugin> getInWorkspace(@NonNull String workspaceId) {
+ return getAllPlugins(workspaceId)
.flatMap(plugin ->
getTemplates(plugin).doOnSuccess(plugin::setTemplates).thenReturn(plugin));
}
@@ -634,6 +621,25 @@ private JsonNode loadPluginResourceGivenPluginAsJsonNode(Plugin plugin, String r
});
}
+ private Flux<Plugin> getAllPlugins(String workspaceId) {
+ // TODO : Think about the various scenarios where this plugin api is called and then decide on permissions.
+ Mono<Workspace> workspaceMono = workspaceService.getById(workspaceId);
+
+ return workspaceMono.flatMapMany(workspace -> {
+ if (workspace.getPlugins() == null) {
+ log.debug("Null installed plugins found for workspace: {}. Return empty plugins", workspace.getName());
+ return Flux.empty();
+ }
+
+ Set<String> pluginIds = workspace.getPlugins().stream()
+ .map(WorkspacePlugin::getPluginId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toUnmodifiableSet());
+
+ return repository.findAllById(pluginIds);
+ });
+ }
+
@Data
static class PluginTemplatesMeta {
List<PluginTemplate> templates;
|
54bb8bffe0471d6c7dbf0330fcd7cfeab8ae007a
|
2021-12-30 13:31:45
|
Tolulope Adetula
|
fix: rich text editor cursor fix (#9889)
| false
|
rich text editor cursor fix (#9889)
|
fix
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
index 5801d2abf461..7f829265e460 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/RichTextEditor_spec.js
@@ -81,7 +81,7 @@ describe("RichTextEditor Widget Functionality", function() {
cy.get(publishPage.richTextEditorWidget).should("be.visible");
});
- it("RichTextEditor-check Hide toolbar field validaton", function() {
+ it("RichTextEditor-check Hide toolbar field validation", function() {
// Check the Hide toolbar checkbox
cy.CheckWidgetProperties(commonlocators.hideToolbarCheckbox);
cy.validateToolbarHidden(
@@ -95,7 +95,7 @@ describe("RichTextEditor Widget Functionality", function() {
);
});
- it("RichTextEditor-uncheck Hide toolbar field validaton", function() {
+ it("RichTextEditor-uncheck Hide toolbar field validation", function() {
// Uncheck the Hide toolbar checkbox
cy.UncheckWidgetProperties(commonlocators.hideToolbarCheckbox);
cy.validateToolbarVisible(
diff --git a/app/client/package.json b/app/client/package.json
index 8c20f75bab05..310983bf8469 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -24,6 +24,7 @@
"@sentry/react": "^6.2.4",
"@sentry/tracing": "^6.2.4",
"@sentry/webpack-plugin": "^1.12.1",
+ "@tinymce/tinymce-react": "^3.13.0",
"@uppy/core": "^1.16.0",
"@uppy/dashboard": "^1.16.0",
"@uppy/file-input": "^1.4.22",
diff --git a/app/client/src/widgets/RichTextEditorWidget/component/index.tsx b/app/client/src/widgets/RichTextEditorWidget/component/index.tsx
index 3e7fe48eec53..234b30cdaa2b 100644
--- a/app/client/src/widgets/RichTextEditorWidget/component/index.tsx
+++ b/app/client/src/widgets/RichTextEditorWidget/component/index.tsx
@@ -1,7 +1,6 @@
-import React, { useEffect, useState, useRef } from "react";
-import { debounce } from "lodash";
+import React, { useEffect, useRef } from "react";
import styled from "styled-components";
-import { useScript, ScriptStatus } from "utils/hooks/useScript";
+import { Editor } from "@tinymce/tinymce-react";
const StyledRTEditor = styled.div`
&& {
@@ -26,112 +25,67 @@ export interface RichtextEditorComponentProps {
placeholder?: string;
widgetId: string;
isDisabled?: boolean;
+ defaultText?: string;
isVisible?: boolean;
isToolbarHidden: boolean;
onValueChange: (valueAsString: string) => void;
}
export function RichtextEditorComponent(props: RichtextEditorComponentProps) {
- const status = useScript(
- "https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.7.0/tinymce.min.js",
- );
-
- const [isEditorInitialised, setIsEditorInitialised] = useState(false);
- const [editorInstance, setEditorInstance] = useState(null as any);
+ const [value, setValue] = React.useState<string>(props.defaultText as string);
+ const editorRef = useRef<any>(null);
+ const isInit = useRef<boolean>(false);
const toolbarConfig =
"undo redo | formatselect | bold italic backcolor forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | table | help";
- /* Using editorContent as a variable to save editor content locally to verify against new content*/
- const editorContent = useRef("");
- /* eslint-disable react-hooks/exhaustive-deps */
useEffect(() => {
- if (editorInstance !== null) {
- editorInstance.mode.set(
- props.isDisabled === true ? "readonly" : "design",
- );
- }
- }, [props.isDisabled, editorInstance, isEditorInitialised]);
+ if (!value) return;
+ // Prevent calling onTextChange when initialized
+ if (!isInit.current) return;
+ const timeOutId = setTimeout(() => props.onValueChange(value), 1000);
+ return () => clearTimeout(timeOutId);
+ }, [value]);
useEffect(() => {
- if (
- editorInstance !== null &&
- (editorContent.current.length === 0 ||
- editorContent.current !== props.defaultValue)
- ) {
- const content = props.defaultValue;
+ if (!props.defaultText) return;
+ setValue(props.defaultText);
+ }, [props.defaultText]);
- editorInstance.setContent(content, {
- format: "html",
- });
+ const onEditorChange = (newValue: string) => {
+ if (!isInit.current) {
+ isInit.current = true;
+ return;
}
- }, [props.defaultValue, editorInstance, isEditorInitialised]);
- useEffect(() => {
- if (status !== ScriptStatus.READY) return;
- const onChange = debounce((content: string) => {
- editorContent.current = content;
- props.onValueChange(content);
- }, 200);
-
- const editorId = `rte-${props.widgetId}`;
- const selector = `textarea#${editorId}`;
-
- const prevEditor = (window as any).tinyMCE.get(editorId);
- if (prevEditor) {
- // following code is just a patch for tinyMCE's issue with firefox
- prevEditor.contentWindow = window;
- // removing in case it was not properly removed, which will cause problems
- prevEditor.remove();
- }
-
- (window as any).tinyMCE.init({
- forced_root_block: false,
- height: "100%",
- selector: selector,
- menubar: false,
- branding: false,
- resize: false,
- setup: (editor: any) => {
- editor.mode.set(props.isDisabled === true ? "readonly" : "design");
- const content = props.defaultValue;
- editor.setContent(content, { format: "html" });
- editor
- .on("Change", () => {
- onChange(editor.getContent({ format: "html" }));
- })
- .on("Undo", () => {
- onChange(editor.getContent({ format: "html" }));
- })
- .on("Redo", () => {
- onChange(editor.getContent({ format: "html" }));
- })
- .on("KeyUp", () => {
- onChange(editor.getContent({ format: "html" }));
- });
- setEditorInstance(editor);
- editor.on("init", () => {
- setIsEditorInitialised(true);
- });
- },
- plugins: [
- "advlist autolink lists link image charmap print preview anchor",
- "searchreplace visualblocks code fullscreen",
- "insertdatetime media table paste code help",
- ],
- toolbar: props.isToolbarHidden ? false : toolbarConfig,
- toolbar_mode: "sliding",
- });
-
- return () => {
- (window as any).tinyMCE.EditorManager.remove(selector);
- editorInstance !== null && editorInstance.remove();
- };
- }, [status, props.isToolbarHidden]);
-
- if (status !== ScriptStatus.READY) return null;
-
+ if (newValue === value) return;
+ setValue(newValue);
+ };
return (
- <StyledRTEditor>
- <textarea id={`rte-${props.widgetId}`} />
+ <StyledRTEditor className={`container-${props.widgetId}`}>
+ <Editor
+ disabled={props.isDisabled}
+ id={`rte-${props.widgetId}`}
+ init={{
+ height: "100%",
+ menubar: false,
+ toolbar_mode: "sliding",
+ forced_root_block: false,
+ branding: false,
+ resize: false,
+ plugins: [
+ "advlist autolink lists link image charmap print preview anchor",
+ "searchreplace visualblocks code fullscreen",
+ "insertdatetime media table paste code help",
+ ],
+ }}
+ key={`editor_${props.isToolbarHidden}`}
+ onEditorChange={onEditorChange}
+ onInit={(evt, editor) => {
+ editorRef.current = editor;
+ }}
+ tinymceScriptSrc="https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.10.1/tinymce.min.js"
+ toolbar={props.isToolbarHidden ? false : toolbarConfig}
+ value={value}
+ />
</StyledRTEditor>
);
}
diff --git a/app/client/src/widgets/RichTextEditorWidget/widget/index.tsx b/app/client/src/widgets/RichTextEditorWidget/widget/index.tsx
index 5c45a8e3a7fd..edb7da63c48c 100644
--- a/app/client/src/widgets/RichTextEditorWidget/widget/index.tsx
+++ b/app/client/src/widgets/RichTextEditorWidget/widget/index.tsx
@@ -162,9 +162,15 @@ class RichTextEditorWidget extends BaseWidget<
const converter = new showdown.Converter();
defaultValue = converter.makeHtml(defaultValue);
}
+ let defaultText = this.props.defaultText || "";
+ if (this.props.inputType === RTEFormats.MARKDOWN) {
+ const converter = new showdown.Converter();
+ defaultText = converter.makeHtml(defaultText);
+ }
return (
<Suspense fallback={<Skeleton />}>
<RichTextEditorComponent
+ defaultText={defaultText}
defaultValue={defaultValue}
isDisabled={this.props.isDisabled}
isToolbarHidden={!!this.props.isToolbarHidden}
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index b1a28b29a5b1..6687a59519b4 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -2694,6 +2694,14 @@
dependencies:
"@babel/runtime" "^7.12.5"
+"@tinymce/tinymce-react@^3.13.0":
+ version "3.13.0"
+ resolved "https://registry.yarnpkg.com/@tinymce/tinymce-react/-/tinymce-react-3.13.0.tgz#51ae6dbaa4076efde3389229d61c38e4533bc5ee"
+ integrity sha512-8+OHYIUP9W5D5z7gknausaG48ovQtEvjcK4c+zpha7QppRVVX0ltaINpo10V6Vb4qj9Jf7ZFfZpMRxxcFL2YvQ==
+ dependencies:
+ prop-types "^15.6.2"
+ tinymce "^5.5.1"
+
"@transloadit/[email protected]":
version "0.0.7"
resolved "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz"
@@ -15945,6 +15953,11 @@ tinycolor2@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
+tinymce@^5.5.1:
+ version "5.10.2"
+ resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.2.tgz#cf1ff01025909be26c64348509e6de8e70d58e1d"
+ integrity sha512-5QhnZ6c8F28fYucLLc00MM37fZoAZ4g7QCYzwIl38i5TwJR5xGqzOv6YMideyLM4tytCzLCRwJoQen2LI66p5A==
+
title-case@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"
|
963b425208b14a39b5de2bcbc1520acfef7a063b
|
2024-05-28 17:12:59
|
Pawan Kumar
|
chore: fix table with and without connected data have different heights (#33797)
| false
|
fix table with and without connected data have different heights (#33797)
|
chore
|
diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx
index 1ce88b7bbab6..d66cdffaa812 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx
@@ -124,6 +124,7 @@ const TableColumnHeader = (props: TableColumnHeaderProps) => {
props.borderRadius,
{},
props.prepareRow,
+ true,
)}
</thead>
);
diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx
index 949dbe026fa6..80f1c2792694 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx
@@ -300,7 +300,7 @@ export const TooltipContentWrapper = styled.div<{ width?: number }>`
max-width: ${(props) => props.width}px;
`;
-export const EmptyRow = styled.div`
+export const EmptyRow = styled.tr`
display: flex;
flex: 1 0 auto;
`;
diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx
index c4378ad3808a..9050b8fc064b 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx
@@ -6,6 +6,7 @@ import type { ReactTableColumnProps } from "../Constants";
import { MULTISELECT_CHECKBOX_WIDTH, StickyType } from "../Constants";
import { EmptyCell, EmptyRow } from "../TableStyledWrappers";
import { renderBodyCheckBoxCell } from "./SelectionCheckboxCell";
+import { Text } from "@design-system/widgets";
const addStickyModifierClass = (
columns: ReactTableColumnProps[],
@@ -29,6 +30,7 @@ export const renderEmptyRows = (
borderRadius: string,
style?: CSSProperties,
prepareRow?: (row: Row<Record<string, unknown>>) => void,
+ isHeaderRow: boolean = false,
) => {
const rows: string[] = new Array(rowCount).fill("");
@@ -45,7 +47,7 @@ export const renderEmptyRows = (
},
};
return (
- <div {...rowProps} className="tr" key={index}>
+ <tr {...rowProps} className="tr" key={index}>
{multiRowSelection && renderBodyCheckBoxCell(false)}
{row.cells.map(
(cell: Cell<Record<string, unknown>>, cellIndex: number) => {
@@ -74,13 +76,16 @@ export const renderEmptyRows = (
? "td hidden-cell"
: `td${addStickyModifierClass(columns, cellIndex)}`
}
+ data-column-type="text"
key={cellProps.key}
style={{ ...cellProps.style, ...distanceFromEdge }}
- />
+ >
+ <Text>​</Text>
+ </div>
);
},
)}
- </div>
+ </tr>
);
});
} else {
@@ -153,13 +158,16 @@ export const renderEmptyRows = (
? "td hidden-cell"
: `td${addStickyModifierClass(columns, colIndex)}`
}
- role="cell"
+ role={isHeaderRow ? "columnheader" : "cell"}
{...stickyAttributes}
+ data-column-type="text"
key={colIndex}
sticky={column?.sticky ?? StickyType.NONE}
style={{ ...distanceFromEdge }}
width={column.width}
- />
+ >
+ <Text>​</Text>
+ </EmptyCell>
);
})}
</EmptyRow>
|
fef3ea84615d010cedc335d081690bf00d4a6a1a
|
2024-06-12 11:48:03
|
Shrikant Sharat Kandula
|
chore: Remove deprecated `.criteria` signatures (#34193)
| false
|
Remove deprecated `.criteria` signatures (#34193)
|
chore
|
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 bb0e6f5f0c3f..d033eee0ee9f 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
@@ -92,25 +92,6 @@ public Mono<T> updateFirstAndFind(@NonNull UpdateDefinition update) {
return repo.updateExecuteAndFind(this, update);
}
- @Deprecated(forRemoval = true)
- public QueryAllParams<T> criteria(Criteria... criteria) {
- if (criteria == null) {
- return this;
- }
- return criteria(List.of(criteria));
- }
-
- @Deprecated(forRemoval = true)
- public QueryAllParams<T> criteria(List<Criteria> criteria) {
- if (criteria == null) {
- return this;
- }
- for (Criteria c : criteria) {
- criteria(c);
- }
- return this;
- }
-
public QueryAllParams<T> criteria(Criteria c) {
if (c == null) {
return this;
|
7e209d261538f4b29cf27d6f41fc58ef488fc76b
|
2024-11-14 13:36:45
|
Shrikant Sharat Kandula
|
chore: Remove unused `UserData.role` (#37381)
| false
|
Remove unused `UserData.role` (#37381)
|
chore
|
diff --git a/app/client/src/ce/api/UserApi.tsx b/app/client/src/ce/api/UserApi.tsx
index 82697968b445..2dcadbe8e4fb 100644
--- a/app/client/src/ce/api/UserApi.tsx
+++ b/app/client/src/ce/api/UserApi.tsx
@@ -57,7 +57,6 @@ export interface UpdateUserRequest {
name?: string;
email?: string;
proficiency?: string;
- role?: string;
useCase?: string;
intercomConsentGiven?: boolean;
}
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 42f5cfa8379e..51baf2931703 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -417,14 +417,13 @@ export function* inviteUsers(
export function* updateUserDetailsSaga(action: ReduxAction<UpdateUserRequest>) {
try {
- const { email, intercomConsentGiven, name, proficiency, role, useCase } =
+ const { email, intercomConsentGiven, name, proficiency, useCase } =
action.payload;
const response: ApiResponse = yield callAPI(UserApi.updateUser, {
email,
name,
proficiency,
- role,
useCase,
intercomConsentGiven,
});
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 c7e8362a9bef..6daca7445769 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
@@ -33,11 +33,6 @@ public class UserData extends BaseDomain {
@JsonView(Views.Internal.class)
String userId;
- // Role of the user in their workspace, example, Designer, Developer, Product Lead etc.
- @JsonView(Views.Public.class)
- @Deprecated
- private String role;
-
// The development proficiency of the user for example, Beginner, Novice, Intermediate, Advanced.
@JsonView(Views.Public.class)
private String proficiency;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
index 1ef47a488822..e37213905b2d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java
@@ -19,9 +19,6 @@ public class UserSignupRequestDTO {
private String password;
- @Deprecated
- private String role;
-
private String proficiency;
private String useCase;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
index be2ae09ee4c8..9a289ea1dc56 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserUpdateCE_DTO.java
@@ -9,8 +9,6 @@
public class UserUpdateCE_DTO {
private String name;
- private String role;
-
private String proficiency;
private String useCase;
@@ -22,6 +20,6 @@ public boolean hasUserUpdates() {
}
public boolean hasUserDataUpdates() {
- return role != null || proficiency != null || useCase != null || isIntercomConsentGiven;
+ return proficiency != null || useCase != null || isIntercomConsentGiven;
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
index 3dcd578b4c3d..8c6153f94888 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
@@ -17,13 +17,7 @@ public interface AnalyticsServiceCE {
Mono<User> identifyUser(User user, UserData userData, String recentlyUsedWorkspaceId);
void identifyInstance(
- String instanceId,
- String role,
- String proficiency,
- String useCase,
- String adminEmail,
- String adminFullName,
- String ip);
+ String instanceId, String proficiency, String useCase, String adminEmail, String adminFullName, String ip);
Mono<Void> sendEvent(String event, String userId, Map<String, ?> properties);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
index 8c41a2fc8514..6887c468d162 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
@@ -141,7 +141,7 @@ public Mono<User> identifyUser(User user, UserData userData, String recentlyUsed
"isSuperUser", isSuperUser,
"instanceId", instanceId,
"mostRecentlyUsedWorkspaceId", tuple.getT4(),
- "role", ObjectUtils.defaultIfNull(userData.getRole(), ""),
+ "role", "",
"proficiency", ObjectUtils.defaultIfNull(userData.getProficiency(), ""),
"goal", ObjectUtils.defaultIfNull(userData.getUseCase(), ""))));
analytics.flush();
@@ -150,13 +150,7 @@ public Mono<User> identifyUser(User user, UserData userData, String recentlyUsed
}
public void identifyInstance(
- String instanceId,
- String role,
- String proficiency,
- String useCase,
- String adminEmail,
- String adminFullName,
- String ip) {
+ String instanceId, String proficiency, String useCase, String adminEmail, String adminFullName, String ip) {
if (!isActive()) {
return;
}
@@ -167,7 +161,7 @@ public void identifyInstance(
"isInstance",
true, // Is this "identify" data-point for a user or an instance?
ROLE,
- ObjectUtils.defaultIfNull(role, ""),
+ "",
PROFICIENCY,
ObjectUtils.defaultIfNull(proficiency, ""),
GOAL,
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 1589daf14bde..9cede7c2f620 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
@@ -618,9 +618,6 @@ public Mono<User> updateCurrentUser(final UserUpdateDTO allUpdates, ServerWebExc
if (allUpdates.hasUserDataUpdates()) {
final UserData updates = new UserData();
- if (StringUtils.hasLength(allUpdates.getRole())) {
- updates.setRole(allUpdates.getRole());
- }
if (StringUtils.hasLength(allUpdates.getProficiency())) {
updates.setProficiency(allUpdates.getProficiency());
}
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 75133d866d02..b60a7faae798 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
@@ -300,7 +300,6 @@ public Mono<User> signupAndLoginSuper(
})
.flatMap(user -> {
final UserData userData = new UserData();
- userData.setRole(userFromRequest.getRole());
userData.setProficiency(userFromRequest.getProficiency());
userData.setUseCase(userFromRequest.getUseCase());
@@ -380,9 +379,6 @@ public Mono<Void> signupAndLoginSuperFromFormData(String originHeader, ServerWeb
if (formData.containsKey(FieldName.NAME)) {
user.setName(formData.getFirst(FieldName.NAME));
}
- if (formData.containsKey("role")) {
- user.setRole(formData.getFirst("role"));
- }
if (formData.containsKey("proficiency")) {
user.setProficiency(formData.getFirst("proficiency"));
}
@@ -446,7 +442,7 @@ private Mono<Void> sendInstallationSetupAnalytics(
analyticsProps.put(DISABLE_TELEMETRY, !userFromRequest.isAllowCollectingAnonymousData());
analyticsProps.put(SUBSCRIBE_MARKETING, userFromRequest.isSignupForNewsletter());
analyticsProps.put(EMAIL, newsletterSignedUpUserEmail);
- analyticsProps.put(ROLE, ObjectUtils.defaultIfNull(userData.getRole(), ""));
+ analyticsProps.put(ROLE, "");
analyticsProps.put(PROFICIENCY, ObjectUtils.defaultIfNull(userData.getProficiency(), ""));
analyticsProps.put(GOAL, ObjectUtils.defaultIfNull(userData.getUseCase(), ""));
// ip is a reserved keyword for tracking events in Mixpanel though this is allowed in
@@ -460,7 +456,6 @@ private Mono<Void> sendInstallationSetupAnalytics(
analyticsService.identifyInstance(
instanceId,
- userData.getRole(),
userData.getProficiency(),
userData.getUseCase(),
newsletterSignedUpUserEmail,
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
index 6975f764cd61..6d29deb3eb3b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/CommonConfigTest.java
@@ -22,7 +22,6 @@ public class CommonConfigTest {
@Test
public void objectMapper_BeanCreated_WithPublicJsonViewAsDefault() throws JsonProcessingException {
UserData userData = new UserData();
- userData.setRole("new_role");
userData.setProficiency("abcd"); // this is public field
userData.setUserId("userId"); // this is internal field
userData.setUserPermissions(null);
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 03b2cdd7105a..7edad2e12835 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
@@ -425,21 +425,6 @@ public void updateNameOfUser_WithAccentedCharacters_IsValid() {
.verifyComplete();
}
- @Test
- @WithUserDetails(value = "api_user")
- public void updateRoleOfUser() {
- UserUpdateDTO updateUser = new UserUpdateDTO();
- updateUser.setRole("New role of user");
- final Mono<UserData> resultMono =
- userService.updateCurrentUser(updateUser, null).then(userDataService.getForUserEmail("api_user"));
- StepVerifier.create(resultMono)
- .assertNext(userData -> {
- assertNotNull(userData);
- assertThat(userData.getRole()).isEqualTo("New role of user");
- })
- .verifyComplete();
- }
-
@Test
@WithUserDetails(value = "api_user")
public void updateIntercomConsentOfUser() {
@@ -499,10 +484,9 @@ public void getIntercomConsentOfUserOnCloudHosting_AlwaysTrue() {
@Test
@WithUserDetails(value = "api_user")
- public void updateNameRoleAndUseCaseOfUser() {
+ public void updateNameAndUseCaseOfUser() {
UserUpdateDTO updateUser = new UserUpdateDTO();
updateUser.setName("New name of user here");
- updateUser.setRole("New role of user");
updateUser.setUseCase("New use case");
final Mono<Tuple2<User, UserData>> resultMono = userService
.updateCurrentUser(updateUser, null)
@@ -514,7 +498,6 @@ public void updateNameRoleAndUseCaseOfUser() {
assertNotNull(user);
assertNotNull(userData);
assertEquals("New name of user here", user.getName());
- assertEquals("New role of user", userData.getRole());
assertEquals("New use case", userData.getUseCase());
})
.verifyComplete();
|
db493eb6a9b85e006783942ace705685a40aacb4
|
2023-12-14 18:20:18
|
vadim
|
chore: WDS elevation colors refinement (#29618)
| false
|
WDS elevation colors refinement (#29618)
|
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 ea70dd722a10..fa94ab86b6ba 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
@@ -592,7 +592,7 @@ export class DarkModeTheme implements ColorModeTheme {
private get bgElevation1() {
const color = this.bg.clone();
- color.oklch.l += 0.05;
+ color.oklch.l += 0.07;
return color;
}
@@ -600,7 +600,7 @@ export class DarkModeTheme implements ColorModeTheme {
private get bgElevation2() {
const color = this.bgElevation1.clone();
- color.oklch.l += 0.05;
+ color.oklch.l += 0.04;
return color;
}
@@ -608,7 +608,7 @@ export class DarkModeTheme implements ColorModeTheme {
private get bgElevation3() {
const color = this.bgElevation2.clone();
- color.oklch.l += 0.05;
+ color.oklch.l += 0.02;
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 4b62738bbaba..5dd645f49c8b 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
@@ -133,7 +133,7 @@ export class LightModeTheme implements ColorModeTheme {
}
if (!this.seedIsVeryLight) {
- color.oklch.l = 0.985;
+ color.oklch.l = 0.96;
}
// Cold colors can have a bit more chroma while staying perceptually neutral
@@ -619,7 +619,13 @@ export class LightModeTheme implements ColorModeTheme {
private get bgElevation1() {
const color = this.bg.clone();
- color.oklch.l += 0.01;
+ if (this.seedIsVeryLight) {
+ color.oklch.l += 0.015;
+ }
+
+ if (!this.seedIsVeryLight) {
+ color.oklch.l += 0.02;
+ }
return color;
}
@@ -627,8 +633,13 @@ export class LightModeTheme implements ColorModeTheme {
private get bgElevation2() {
const color = this.bgElevation1.clone();
- color.oklch.l += 0.01;
+ if (this.seedIsVeryLight) {
+ color.oklch.l += 0.012;
+ }
+ if (!this.seedIsVeryLight) {
+ color.oklch.l += 0.015;
+ }
return color;
}
diff --git a/app/client/packages/design-system/theming/src/color/tests/LightModeTheme.test.ts b/app/client/packages/design-system/theming/src/color/tests/LightModeTheme.test.ts
index 81278ef32133..f7ce48a170ee 100644
--- a/app/client/packages/design-system/theming/src/color/tests/LightModeTheme.test.ts
+++ b/app/client/packages/design-system/theming/src/color/tests/LightModeTheme.test.ts
@@ -8,7 +8,7 @@ describe("bg color", () => {
it("should return correct color when lightness < 0.93", () => {
const { bg } = new LightModeTheme("oklch(0.92 0.09 231)").getColors();
- expect(bg).toBe("rgb(95.828% 98.573% 100%)");
+ expect(bg).toBe("rgb(92.567% 95.296% 96.777%)");
});
it("should return correct color when hue > 120 && hue < 300", () => {
@@ -18,12 +18,12 @@ describe("bg color", () => {
it("should return correct color when hue < 120 or hue > 300", () => {
const { bg } = new LightModeTheme("oklch(0.92 0.07 110)").getColors();
- expect(bg).toBe("rgb(98.101% 98.258% 96.176%)");
+ expect(bg).toBe("rgb(94.827% 94.982% 92.913%)");
});
it("should return correct color when chroma < 0.04", () => {
const { bg } = new LightModeTheme("oklch(0.92 0.02 110)").getColors();
- expect(bg).toBe("rgb(98.026% 98.026% 98.026%)");
+ expect(bg).toBe("rgb(94.752% 94.752% 94.752%)");
});
});
@@ -794,12 +794,12 @@ describe("bdFocus color", () => {
it("should return correct color when hue is between 0 and 55", () => {
const { bdFocus } = new LightModeTheme("oklch(0.85 0.1 30)").getColors();
- expect(bdFocus).toEqual("rgb(100% 70.125% 64.059%)");
+ expect(bdFocus).toEqual("rgb(72.468% 27.962% 22.197%)");
});
it("should return correct color when hue > 340", () => {
const { bdFocus } = new LightModeTheme("oklch(0.85 0.1 350)").getColors();
- expect(bdFocus).toEqual("rgb(100% 67.07% 84.709%)");
+ expect(bdFocus).toEqual("rgb(68.494% 27.322% 49.304%)");
});
});
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 a5091ef14ba7..316662bcee2d 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
@@ -57,9 +57,9 @@
"1": "0px"
},
"boxShadow": {
- "1": "0 2px 2px 0 rgba(0, 0, 0, 0.2)",
- "2": "0 2px 2px 0 rgba(0, 0, 0, 0.2)",
- "3": "0 2px 2px 0 rgba(0, 0, 0, 0.2)"
+ "1": "0 8px 8px 0 rgba(0, 0, 0, 0.05)",
+ "2": "0 4px 4px 0 rgba(0, 0, 0, 0.1)",
+ "3": "0 2px 2px 0 rgba(0, 0, 0, 0.15)"
},
"borderWidth": {
"1": "1px",
diff --git a/app/client/packages/design-system/widgets/src/testing/Elevation.tsx b/app/client/packages/design-system/widgets/src/testing/Elevation.tsx
index e1a72994f8ab..767feeaddee6 100644
--- a/app/client/packages/design-system/widgets/src/testing/Elevation.tsx
+++ b/app/client/packages/design-system/widgets/src/testing/Elevation.tsx
@@ -24,7 +24,7 @@ export const Elevation = () => {
padding="spacing-6"
style={{
background: "var(--color-bg-elevation-3)",
- boxShadow: "var(--box-shadow-1)",
+ boxShadow: "var(--box-shadow-3)",
}}
/>
</Flex>
|
5b41dbae15de081831fb05affac73719913c03fa
|
2023-09-19 16:49:22
|
arunvjn
|
fix: Remove duplicate debugger logs for showModal function (#27382)
| false
|
Remove duplicate debugger logs for showModal function (#27382)
|
fix
|
diff --git a/app/client/src/sagas/ActionExecution/ModalSagas.ts b/app/client/src/sagas/ActionExecution/ModalSagas.ts
index 174e42ba2c9d..9394e65ed55a 100644
--- a/app/client/src/sagas/ActionExecution/ModalSagas.ts
+++ b/app/client/src/sagas/ActionExecution/ModalSagas.ts
@@ -19,7 +19,7 @@ export function* openModalSaga(action: TShowModalDescription) {
}
yield put(action);
AppsmithConsole.info({
- text: `openModal(${modalName}) was triggered`,
+ text: `showModal('${modalName ?? ""}') was triggered`,
});
}
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index 3bb0ca2d49a1..c391b03a0997 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -38,8 +38,6 @@ import { updateWidgetMetaPropAndEval } from "actions/metaActions";
import { focusWidget, showModal } from "actions/widgetActions";
import log from "loglevel";
import { flatten } from "lodash";
-import AppsmithConsole from "utils/AppsmithConsole";
-
import WidgetFactory from "WidgetProvider/factory";
import type { WidgetProps } from "widgets/BaseWidget";
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
@@ -119,12 +117,6 @@ export function* showModalByNameSaga(
widget.widgetName === action.payload.modalName,
);
if (modal) {
- AppsmithConsole.info({
- text: action.payload.modalName
- ? `showModal('${action.payload.modalName}') was triggered`
- : `showModal() was triggered`,
- });
-
yield put(showModal(modal.widgetId));
}
}
|
c6c5e4fef30d25aae4240ddb8a6aac25c3bfd3c7
|
2021-09-21 08:33:22
|
Shrikant Sharat Kandula
|
ci: Add CI workflow for building fat container (#7385)
| false
|
Add CI workflow for building fat container (#7385)
|
ci
|
diff --git a/.github/workflows/client-test.yml b/.github/workflows/test-build-docker-image.yml
similarity index 72%
rename from .github/workflows/client-test.yml
rename to .github/workflows/test-build-docker-image.yml
index fa966b11f657..4d34865766a1 100644
--- a/.github/workflows/client-test.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -1,4 +1,4 @@
-name: Appsmith Test Workflow
+name: Test, build and push Docker Image
on:
# This line enables manual triggering of this workflow.
@@ -10,6 +10,7 @@ on:
paths:
- "app/client/**"
- "app/server/**"
+ - "app/rts/**"
- "!app/client/cypress/manual_TestSuite/**"
# trigger for pushes to release and master
@@ -18,6 +19,7 @@ on:
paths:
- "app/client/**"
- "app/server/**"
+ - "app/rts/**"
- "!app/client/cypress/manual_TestSuite/**"
# Change the working directory for all the jobs in this workflow
@@ -40,12 +42,12 @@ jobs:
working-directory: app/client
shell: bash
- steps:
+ steps:
# Checkout the code
- uses: actions/checkout@v2
with:
fetch-depth: 0
-
+
# Checkout the code
- name: Checkout the merged commit from PR and base branch
if: github.event_name == 'pull_request_review'
@@ -136,7 +138,7 @@ jobs:
runs-on: ubuntu-latest
# Only run this workflow for internally triggered events
if: |
- github.event.pull_request.head.repo.full_name == github.repository ||
+ github.event.pull_request.head.repo.full_name == github.repository ||
github.event_name == 'push' ||
github.event_name == 'workflow_dispatch'
@@ -193,8 +195,8 @@ jobs:
echo "next_version = $next_version"
echo ::set-output name=version::$next_version-SNAPSHOT
echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
-
- - name: Build package
+
+ - name: Test and Build package
env:
APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools"
APPSMITH_REDIS_URL: "redis://127.0.0.1:6379"
@@ -212,10 +214,65 @@ jobs:
name: build
path: app/server/dist/
+ buildRts:
+ defaults:
+ run:
+ working-directory: app/rts
+ runs-on: ubuntu-latest
+ # Only run this workflow for internally triggered events
+ if: |
+ github.event.pull_request.head.repo.full_name == github.repository ||
+ github.event_name == 'push' ||
+ github.event_name == 'workflow_dispatch'
+
+ steps:
+ # Checkout the code
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ - name: Use Node.js 14.15.4
+ uses: actions/setup-node@v1
+ with:
+ node-version: "14.15.4"
+
+ # Here, the GITHUB_REF is of type /refs/head/<branch_name>. We extract branch_name from this by removing the
+ # first 11 characters. This can be used to build images for several branches
+ # Since this is an unreleased build, we get the latest released version number, increment the minor number in it,
+ # append a `-SNAPSHOT` at it's end to prepare the snapshot version number. This is used as the project's version.
+ - name: Get the version to tag the Docker image
+ id: vars
+ run: |
+ # Since this is an unreleased build, we set the version to incremented version number with a
+ # `-SNAPSHOT` suffix.
+ latest_released_version="$(git tag --list 'v*' --sort=-version:refname | head -1)"
+ echo "latest_released_version = $latest_released_version"
+ next_version="$(echo "$latest_released_version" | awk -F. -v OFS=. '{ $NF++; print }')"
+ echo "next_version = $next_version"
+ echo ::set-output name=version::$next_version-SNAPSHOT
+ echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+
+ - name: Build
+ run: ./build.sh
+
+ # Upload the build artifact so that it can be used by the test & deploy job in the workflow
+ - name: Upload server build bundle
+ uses: actions/upload-artifact@v2
+ with:
+ name: build
+ path: app/rts/dist/
+
ui-test:
- needs: [buildClient, buildServer]
+ needs: [buildClient, buildServer, buildRts]
# Only run if the build step is successful
- if: success()
+ # If the build has been triggered manually via workflow_dispatch or via a push to protected branches
+ # then we don't check for the PR approved state
+ if: |
+ success() &&
+ (github.event_name == 'workflow_dispatch' ||
+ github.event_name == 'push' ||
+ (github.event_name == 'pull_request_review' &&
+ github.event.review.state == 'approved'))
runs-on: ubuntu-latest
defaults:
run:
@@ -225,7 +282,7 @@ jobs:
fail-fast: false
matrix:
job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-
+
# Service containers to run with this job. Required for running tests
services:
# Label used to access the service container
@@ -250,7 +307,7 @@ jobs:
- name: Checkout the head commit of the branch
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
- uses: actions/checkout@v2
+ uses: actions/checkout@v2
# Setup Java
- name: Set up JDK 1.11
@@ -292,7 +349,7 @@ jobs:
echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
# Start server
- - name: start server
+ - name: Start server
working-directory: app/server
env:
APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools"
@@ -311,11 +368,12 @@ jobs:
- name: Wait for 30 seconds for server to start
run: |
- sleep 30s
-
- - name: Exit if Server hasnt started
+ sleep 30s
+
+ - name: "Exit if Server hasn't started"
run: |
- if [[ `ps -ef | grep "server-1.0-SNAPSHOT" | grep java |wc -l` == 0 ]]; then
+ lsof -i :8080 || true;
+ if [[ `ps -ef | grep "server-1.0-SNAPSHOT" | grep java |wc -l` == 0 ]]; then
echo "Server Not Started";
exit 1;
else
@@ -418,7 +476,6 @@ jobs:
ui-test-result:
needs: ui-test
- # Only run if the ui-test with matrices step is successful
if: always()
runs-on: ubuntu-latest
defaults:
@@ -467,6 +524,18 @@ jobs:
name: build
path: app/client/build
+ - name: Download the server build artifact
+ uses: actions/download-artifact@v2
+ with:
+ name: build
+ path: app/server/dist
+
+ - name: Download the server build artifact
+ uses: actions/download-artifact@v2
+ with:
+ name: build
+ path: app/rts/dist
+
# Here, the GITHUB_REF is of type /refs/head/<branch_name>. We extract branch_name from this by removing the
# first 11 characters. This can be used to build images for several branches
- name: Get the version to tag the Docker image
@@ -474,27 +543,82 @@ jobs:
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
# Build release Docker image and push to Docker Hub
- - name: Push release image to Docker Hub
+ - name: Push client release image to Docker Hub
if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
- run: |
- docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}} .
- echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}}
-
- # Build release-frozen Docker image and push to Docker Hub
- - name: Push release-frozen image to Docker Hub
- if: success() && github.ref == 'refs/heads/release-frozen' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+ working-directory: app/client
run: |
docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}} .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}}
# Build master Docker image and push to Docker Hub
- - name: Push production image to Docker Hub with commit tag
+ - name: Push client master image to Docker Hub with commit tag
if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+ working-directory: app/client
run: |
docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} .
docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA}
docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly
+
+ # Build release Docker image and push to Docker Hub
+ - name: Push server release image to Docker Hub
+ if: success() && github.ref == 'refs/heads/release'
+ working-directory: app/server
+ run: |
+ docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}}
+
+ # Build master Docker image and push to Docker Hub
+ - name: Push server master image to Docker Hub with commit tag
+ if: success() && github.ref == 'refs/heads/master'
+ working-directory: app/server
+ run: |
+ docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA} .
+ docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA}
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly
+
+ # Build release Docker image and push to Docker Hub
+ - name: Push RTS release image to Docker Hub
+ if: success() && github.ref == 'refs/heads/release'
+ working-directory: app/rts
+ run: |
+ docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}}
+
+ # Build master Docker image and push to Docker Hub
+ - name: Push RTS master image to Docker Hub with commit tag
+ if: success() && github.ref == 'refs/heads/master'
+ working-directory: app/rts
+ run: |
+ docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} .
+ docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA}
+ docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly
+
+ - name: Build and push release image to Docker Hub
+ if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+ run: |
+ docker build \
+ --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \
+ --tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{steps.branch_name.outputs.tag}} \
+ .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push --all-tags ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce
+
+ - name: Build and push master image to Docker Hub with commit tag
+ if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+ run: |
+ docker build \
+ --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \
+ --tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${GITHUB_SHA} \
+ --tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:nightly \
+ .
+ echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+ docker push --all-tags ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce
diff --git a/app/client/cypress/setup-test.sh b/app/client/cypress/setup-test.sh
index 6b55ad5cb370..47d47f2ff4c5 100755
--- a/app/client/cypress/setup-test.sh
+++ b/app/client/cypress/setup-test.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-# This script is responsible for setting up the local Nginx server for running E2E Cypress tests
+# This script is responsible for setting up the local Nginx server for running E2E Cypress tests
# on our CI/CD system. Currently the script is geared towards Github Actions
# Serve the react bundle on a specific port. Nginx will proxy to this port
@@ -47,7 +47,15 @@ echo "Sleeping for 30 seconds to let the servers start"
sleep 30
echo "Checking if the containers have started"
-sudo docker ps -a
+sudo docker ps -a
+for fcid in $(sudo docker ps -a | awk '/Exited/ { print $1 }'); do
+ echo "Logs for container '$fcid'."
+ docker logs "$fcid"
+done
+if sudo docker ps -a | grep -q Exited; then
+ echo "One or more containers failed to start." >&2
+ exit 1
+fi
echo "Checking if the server has started"
status_code=$(curl -o /dev/null -s -w "%{http_code}\n" https://dev.appsmith.com/api/v1/users)
@@ -62,7 +70,7 @@ while [ "$retry_count" -le "3" -a "$status_code" -eq "502" ]; do
done
echo "Checking if client and server have started"
-ps -ef |grep java 2>&1
+ps -ef |grep java 2>&1
ps -ef |grep serve 2>&1
if [ "$status_code" -eq "502" ]; then
@@ -70,7 +78,7 @@ if [ "$status_code" -eq "502" ]; then
exit 1
fi
-# Create the test user
+# Create the test user
curl -k --request POST -v 'https://dev.appsmith.com/api/v1/users' \
--header 'Content-Type: application/json' \
--data-raw '{
|
04f6208f86cd555abc73cfa70b9e39fe34e85514
|
2023-02-03 10:45:39
|
Shrikant Sharat Kandula
|
chore: Add version to analytics events (#20295)
| false
|
Add version to analytics events (#20295)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ProjectProperties.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ProjectProperties.java
index 1c2c1d343f64..c9a758a235bb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ProjectProperties.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ProjectProperties.java
@@ -16,6 +16,8 @@
@Getter
public class ProjectProperties {
+ public static final String EDITION = "CE";
+
@Value("${version:UNKNOWN}")
private String version;
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 ab07b0bb906a..30cd79c97ed3 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
@@ -15,4 +15,7 @@ public interface CustomUserDataRepositoryCE extends AppsmithRepository<UserData>
Mono<UpdateResult> removeIdFromRecentlyUsedList(String userId, String workspaceId, List<String> applicationIds);
Flux<UserData> findPhotoAssetsByUserIds(Iterable<String> userId);
+
+ Mono<String> fetchMostRecentlyUsedWorkspaceId(String userId);
+
}
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 c730f78b1dc6..3fe76c31e31c 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
@@ -9,6 +9,7 @@
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.util.CollectionUtils;
import reactor.core.publisher.Flux;
@@ -66,4 +67,17 @@ public Flux<UserData> findPhotoAssetsByUserIds(Iterable<String> userId) {
return queryAll(List.of(criteria), Optional.of(fieldsToInclude), Optional.empty(), Optional.empty());
}
+ @Override
+ public Mono<String> fetchMostRecentlyUsedWorkspaceId(String userId) {
+ final Query query = query(where(fieldName(QUserData.userData.userId)).is(userId));
+
+ query.fields().include(fieldName(QUserData.userData.recentlyUsedWorkspaceIds));
+
+ return mongoOperations.findOne(query, UserData.class)
+ .map(userData -> {
+ final List<String> recentlyUsedWorkspaceIds = userData.getRecentlyUsedWorkspaceIds();
+ return CollectionUtils.isEmpty(recentlyUsedWorkspaceIds) ? "" : recentlyUsedWorkspaceIds.get(0);
+ });
+ }
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/AnalyticsServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/AnalyticsServiceImpl.java
index d22822062495..c1f48dfd0ca0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/AnalyticsServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/AnalyticsServiceImpl.java
@@ -1,8 +1,10 @@
package com.appsmith.server.services;
import com.appsmith.server.configurations.CommonConfig;
+import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.helpers.UserUtils;
+import com.appsmith.server.repositories.UserDataRepository;
import com.appsmith.server.services.ce.AnalyticsServiceCEImpl;
import com.google.gson.Gson;
import com.segment.analytics.Analytics;
@@ -19,12 +21,10 @@ public AnalyticsServiceImpl(@Autowired(required = false) Analytics analytics,
SessionUserService sessionUserService,
CommonConfig commonConfig,
ConfigService configService,
- PolicyUtils policyUtils,
UserUtils userUtils,
- Gson gson) {
-
- super(analytics, sessionUserService, commonConfig, configService, policyUtils, userUtils, gson);
+ ProjectProperties projectProperties,
+ UserDataRepository userDataRepository) {
+ super(analytics, sessionUserService, commonConfig, configService, userUtils, projectProperties, userDataRepository);
}
-
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
index a9de5ccf3d6c..3d27dd0317da 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCE.java
@@ -14,6 +14,8 @@ public interface AnalyticsServiceCE {
Mono<User> identifyUser(User user, UserData userData);
+ Mono<User> identifyUser(User user, UserData userData, String recentlyUsedWorkspaceId);
+
void identifyInstance(String instanceId, String role, String useCase);
Mono<Void> sendEvent(String event, String userId, Map<String, ?> properties);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
index a55f5e83ee41..9e9c739bd401 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
@@ -3,17 +3,17 @@
import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.models.BaseDomain;
import com.appsmith.server.configurations.CommonConfig;
+import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.UserData;
import com.appsmith.server.helpers.ExchangeUtils;
-import com.appsmith.server.helpers.PolicyUtils;
import com.appsmith.server.helpers.UserUtils;
+import com.appsmith.server.repositories.UserDataRepository;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.SessionUserService;
-import com.google.gson.Gson;
import com.segment.analytics.Analytics;
import com.segment.analytics.messages.IdentifyMessage;
import com.segment.analytics.messages.TrackMessage;
@@ -39,22 +39,25 @@ public class AnalyticsServiceCEImpl implements AnalyticsServiceCE {
private final UserUtils userUtils;
- private final Gson gson;
+ private final ProjectProperties projectProperties;
+
+ private final UserDataRepository userDataRepository;
@Autowired
public AnalyticsServiceCEImpl(@Autowired(required = false) Analytics analytics,
SessionUserService sessionUserService,
CommonConfig commonConfig,
ConfigService configService,
- PolicyUtils policyUtils,
UserUtils userUtils,
- Gson gson) {
+ ProjectProperties projectProperties,
+ UserDataRepository userDataRepository) {
this.analytics = analytics;
this.sessionUserService = sessionUserService;
this.commonConfig = commonConfig;
this.configService = configService;
this.userUtils = userUtils;
- this.gson = gson;
+ this.projectProperties = projectProperties;
+ this.userDataRepository = userDataRepository;
}
public boolean isActive() {
@@ -65,18 +68,34 @@ private String hash(String value) {
return value == null ? "" : DigestUtils.sha256Hex(value);
}
+ @Override
public Mono<User> identifyUser(User user, UserData userData) {
+ return identifyUser(user, userData, null);
+ }
+
+ @Override
+ public Mono<User> identifyUser(User user, UserData userData, String recentlyUsedWorkspaceId) {
if (!isActive()) {
return Mono.just(user);
}
Mono<Boolean> isSuperUserMono = userUtils.isSuperUser(user);
- return Mono.just(user)
- .zipWith(isSuperUserMono)
+ final Mono<String> recentlyUsedWorkspaceIdMono = StringUtils.isEmpty(recentlyUsedWorkspaceId)
+ ? userDataRepository.fetchMostRecentlyUsedWorkspaceId(user.getId()).defaultIfEmpty("")
+ : Mono.just(recentlyUsedWorkspaceId);
+
+ return Mono.zip(
+ Mono.just(user),
+ isSuperUserMono,
+ configService.getInstanceId()
+ .defaultIfEmpty("unknown-instance-id"),
+ recentlyUsedWorkspaceIdMono
+ )
.map(tuple -> {
- User savedUser = tuple.getT1();
- final Boolean isSuperUser = tuple.getT2();
+ final User savedUser = tuple.getT1();
+ final boolean isSuperUser = tuple.getT2();
+ final String instanceId = tuple.getT3();
String username = savedUser.getUsername();
String name = savedUser.getName();
@@ -92,7 +111,9 @@ public Mono<User> identifyUser(User user, UserData userData) {
.traits(Map.of(
"name", ObjectUtils.defaultIfNull(name, ""),
"email", ObjectUtils.defaultIfNull(email, ""),
- "isSuperUser", isSuperUser != null && isSuperUser,
+ "isSuperUser", isSuperUser,
+ "instanceId", instanceId,
+ "mostRecentlyUsedWorkspaceId", tuple.getT4(),
"role", ObjectUtils.defaultIfNull(userData.getRole(), ""),
"goal", ObjectUtils.defaultIfNull(userData.getUseCase(), "")
))
@@ -174,6 +195,7 @@ public Mono<Void> sendEvent(String event, String userId, Map<String, ?> properti
TrackMessage.Builder messageBuilder = TrackMessage.builder(event).userId(userIdToSend);
analyticsProperties.put("originService", "appsmith-server");
analyticsProperties.put("instanceId", instanceId);
+ analyticsProperties.put("version", projectProperties.getVersion());
messageBuilder = messageBuilder.properties(analyticsProperties);
analytics.enqueue(messageBuilder);
return instanceId;
@@ -226,7 +248,7 @@ public <T extends BaseDomain> Mono<T> sendObjectEvent(AnalyticsEvents event, T o
return Mono.just(object);
}
- final String username = (object instanceof User ? (User) object : user).getUsername();
+ final String username = (object instanceof User objectAsUser ? objectAsUser : user).getUsername();
HashMap<String, Object> analyticsProperties = new HashMap<>();
analyticsProperties.put("id", id);
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 70ca326f79d3..569fae12cd8a 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
@@ -50,5 +50,4 @@ public interface UserDataServiceCE {
Mono<UserData> setCommentState(CommentOnboardingState commentOnboardingState);
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 23253c7e6071..6783a592fb43 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
@@ -22,6 +22,7 @@
import com.appsmith.server.solutions.UserChangedHandler;
import com.mongodb.DBObject;
import com.mongodb.client.result.UpdateResult;
+import org.apache.commons.collections.map.Flat3Map;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -36,6 +37,8 @@
import reactor.core.scheduler.Scheduler;
import jakarta.validation.Validator;
+import reactor.util.function.Tuple2;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -261,17 +264,25 @@ private Mono<Void> makeProfilePhotoResponse(ServerWebExchange exchange, UserData
*/
@Override
public Mono<UserData> updateLastUsedAppAndWorkspaceList(Application application) {
- return this.getForCurrentUser().flatMap(userData -> {
- // set recently used workspace ids
- userData.setRecentlyUsedWorkspaceIds(
- addIdToRecentList(userData.getRecentlyUsedWorkspaceIds(), application.getWorkspaceId(), 10)
- );
- // set recently used application ids
- userData.setRecentlyUsedAppIds(
- addIdToRecentList(userData.getRecentlyUsedAppIds(), application.getId(), 20)
- );
- return repository.save(userData);
- });
+ return sessionUserService.getCurrentUser()
+ .zipWhen(this::getForUser)
+ .flatMap(tuple -> {
+ final User user = tuple.getT1();
+ final UserData userData = tuple.getT2();
+ // set recently used workspace ids
+ userData.setRecentlyUsedWorkspaceIds(
+ addIdToRecentList(userData.getRecentlyUsedWorkspaceIds(), application.getWorkspaceId(), 10)
+ );
+ // set recently used application ids
+ userData.setRecentlyUsedAppIds(
+ addIdToRecentList(userData.getRecentlyUsedAppIds(), application.getId(), 20)
+ );
+ return Mono.zip(
+ analyticsService.identifyUser(user, userData, application.getWorkspaceId()),
+ repository.save(userData)
+ );
+ })
+ .map(Tuple2::getT2);
}
@Override
@@ -330,4 +341,5 @@ public Mono<UpdateResult> removeRecentWorkspaceAndApps(String userId, String wor
repository.removeIdFromRecentlyUsedList(userId, workspaceId, appIdsList)
);
}
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ReleaseNotesServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ReleaseNotesServiceCEImpl.java
index af897033af01..f89f2c4e0670 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ReleaseNotesServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ReleaseNotesServiceCEImpl.java
@@ -15,9 +15,12 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import org.springframework.web.util.UriBuilder;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
+import java.net.URI;
+import java.net.URL;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@@ -64,7 +67,9 @@ public Mono<List<ReleaseNode>> getReleaseNodes() {
// isCloudHosted should be true only for our cloud instance,
// For docker images that burn the segment key with the image, the CE key will be present
"&isSourceInstall=" + (commonConfig.isCloudHosting() || StringUtils.isEmpty(segmentConfig.getCeKey())) +
- (StringUtils.isEmpty(commonConfig.getRepo()) ? "" : ("&repo=" + commonConfig.getRepo()))
+ (StringUtils.isEmpty(commonConfig.getRepo()) ? "" : ("&repo=" + commonConfig.getRepo())) +
+ "&version=" + projectProperties.getVersion() +
+ "&edition=" + ProjectProperties.EDITION
)
.get()
.exchange()
|
1330485f4fe51db385eee741e2bb68630cbb8eb4
|
2024-04-29 10:57:35
|
subratadeypappu
|
fix: NPE in analytics service (#33005)
| false
|
NPE in analytics service (#33005)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
index ffd6f9d87b6d..3fff241d14b7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AnalyticsServiceCEImpl.java
@@ -259,12 +259,16 @@ public Mono<Void> sendEvent(String event, String userId, Map<String, ?> properti
analyticsProperties.put("originService", "appsmith-server");
analyticsProperties.put("instanceId", instanceId);
analyticsProperties.put("version", projectProperties.getVersion());
- analyticsProperties.put("edition", deploymentProperties.getEdition());
- analyticsProperties.put("cloudProvider", deploymentProperties.getCloudProvider());
- analyticsProperties.put("efs", deploymentProperties.getEfs());
- analyticsProperties.put("tool", deploymentProperties.getTool());
- analyticsProperties.put("hostname", deploymentProperties.getHostname());
- analyticsProperties.put("deployedAt", deploymentProperties.getDeployedAt());
+ analyticsProperties.put(
+ "edition", ObjectUtils.defaultIfNull(deploymentProperties.getEdition(), ""));
+ analyticsProperties.put(
+ "cloudProvider", ObjectUtils.defaultIfNull(deploymentProperties.getCloudProvider(), ""));
+ analyticsProperties.put("efs", ObjectUtils.defaultIfNull(deploymentProperties.getEfs(), ""));
+ analyticsProperties.put("tool", ObjectUtils.defaultIfNull(deploymentProperties.getTool(), ""));
+ analyticsProperties.put(
+ "hostname", ObjectUtils.defaultIfNull(deploymentProperties.getHostname(), ""));
+ analyticsProperties.put(
+ "deployedAt", ObjectUtils.defaultIfNull(deploymentProperties.getDeployedAt(), ""));
messageBuilder = messageBuilder.properties(analyticsProperties);
analytics.enqueue(messageBuilder);
|
2a8e37bf3be1570f3bd25f45cc5fb4503d66d6e8
|
2022-01-25 20:58:31
|
Ashok Kumar M
|
feat: Sliding Canvas for Dragging and Selection (#9983)
| false
|
Sliding Canvas for Dragging and Selection (#9983)
|
feat
|
diff --git a/app/client/cypress/locators/explorerlocators.json b/app/client/cypress/locators/explorerlocators.json
index 77b1d2a725dc..27c931efe796 100644
--- a/app/client/cypress/locators/explorerlocators.json
+++ b/app/client/cypress/locators/explorerlocators.json
@@ -24,8 +24,8 @@
"editEntityField": ".bp3-editable-text-input",
"entity": ".t--entity-name",
"addWidget": ".widgets .t--entity-add-btn",
- "dropHere": "#canvas-dragging-0",
"closeWidgets": ".t--close-widgets-sidebar",
+ "dropHere": "#div-dragarena-0",
"addDBQueryEntity": ".datasources .t--entity-add-btn",
"editEntity": ".t--entity-name input",
"explorerSwitchId": "#switcher--explorer",
diff --git a/app/client/src/actions/canvasSelectionActions.ts b/app/client/src/actions/canvasSelectionActions.ts
index 1c14985c0e20..5ab4aa0f608d 100644
--- a/app/client/src/actions/canvasSelectionActions.ts
+++ b/app/client/src/actions/canvasSelectionActions.ts
@@ -1,6 +1,6 @@
import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
-import { SelectedArenaDimensions } from "pages/common/CanvasSelectionArena";
-import { XYCord } from "utils/hooks/useCanvasDragging";
+import { SelectedArenaDimensions } from "pages/common/CanvasArenas/CanvasSelectionArena";
+import { XYCord } from "pages/common/CanvasArenas/hooks/useCanvasDragging";
export const setCanvasSelectionFromEditor = (
start: boolean,
diff --git a/app/client/src/components/editorComponents/DropTargetComponent.tsx b/app/client/src/components/editorComponents/DropTargetComponent.tsx
index 17b93039858c..f31523d42d3e 100644
--- a/app/client/src/components/editorComponents/DropTargetComponent.tsx
+++ b/app/client/src/components/editorComponents/DropTargetComponent.tsx
@@ -59,7 +59,7 @@ function Onboarding() {
*/
export const DropTargetContext: Context<{
updateDropTargetRows?: (
- widgetId: string,
+ widgetIdsToExclude: string[],
widgetBottomRow: number,
) => number | false;
}> = createContext({});
@@ -132,10 +132,13 @@ export function DropTargetComponent(props: DropTargetComponentProps) {
dropTargetRef.current.style.height = height;
}
};
- const updateDropTargetRows = (widgetId: string, widgetBottomRow: number) => {
+ const updateDropTargetRows = (
+ widgetIdsToExclude: string[],
+ widgetBottomRow: number,
+ ) => {
if (canDropTargetExtend) {
const newRows = calculateDropTargetRows(
- widgetId,
+ widgetIdsToExclude,
widgetBottomRow,
props.minHeight / GridDefaults.DEFAULT_GRID_ROW_HEIGHT - 1,
occupiedSpacesByChildren,
diff --git a/app/client/src/components/editorComponents/DropTargetUtils.ts b/app/client/src/components/editorComponents/DropTargetUtils.ts
index 1896e5671d2d..fe4de2105963 100644
--- a/app/client/src/components/editorComponents/DropTargetUtils.ts
+++ b/app/client/src/components/editorComponents/DropTargetUtils.ts
@@ -2,7 +2,7 @@ import { OccupiedSpace } from "constants/CanvasEditorConstants";
import { GridDefaults } from "constants/WidgetConstants";
export const calculateDropTargetRows = (
- widgetId: string,
+ widgetIdsToExclude: string[],
widgetBottomRow: number,
defaultRows: number,
occupiedSpacesByChildren?: OccupiedSpace[],
@@ -11,7 +11,7 @@ export const calculateDropTargetRows = (
let minBottomRow = widgetBottomRow;
if (occupiedSpacesByChildren) {
minBottomRow = occupiedSpacesByChildren.reduce((prev, next) => {
- if (next.id !== widgetId) {
+ if (!widgetIdsToExclude.includes(next.id)) {
return next.bottom > prev ? next.bottom : prev;
}
return prev;
diff --git a/app/client/src/components/editorComponents/ResizableComponent.tsx b/app/client/src/components/editorComponents/ResizableComponent.tsx
index 353d4e3a5b04..0abbdd17d96f 100644
--- a/app/client/src/components/editorComponents/ResizableComponent.tsx
+++ b/app/client/src/components/editorComponents/ResizableComponent.tsx
@@ -1,6 +1,4 @@
import React, { useContext, memo, useMemo } from "react";
-import { XYCord } from "utils/hooks/useCanvasDragging";
-
import {
WidgetOperations,
WidgetRowCols,
@@ -45,6 +43,7 @@ import { focusWidget } from "actions/widgetActions";
import { getParentToOpenIfAny } from "utils/hooks/useClickToSelectWidget";
import { GridDefaults } from "constants/WidgetConstants";
import { DropTargetContext } from "./DropTargetComponent";
+import { XYCord } from "pages/common/CanvasArenas/hooks/useCanvasDragging";
export type ResizableComponentProps = WidgetProps & {
paddingOffset: number;
@@ -274,7 +273,7 @@ export const ResizableComponent = memo(function ResizableComponent(
};
const updateBottomRow = (bottom: number) => {
if (props.parentId) {
- updateDropTargetRows && updateDropTargetRows(props.parentId, bottom);
+ updateDropTargetRows && updateDropTargetRows([props.parentId], bottom);
}
};
diff --git a/app/client/src/components/editorComponents/ResizableUtils.tsx b/app/client/src/components/editorComponents/ResizableUtils.tsx
index 0bfbf0e32af0..cf3717016710 100644
--- a/app/client/src/components/editorComponents/ResizableUtils.tsx
+++ b/app/client/src/components/editorComponents/ResizableUtils.tsx
@@ -1,6 +1,6 @@
-import { XYCord } from "utils/hooks/useCanvasDragging";
import { WidgetProps, WidgetRowCols } from "widgets/BaseWidget";
import { GridDefaults } from "constants/WidgetConstants";
+import { XYCord } from "pages/common/CanvasArenas/hooks/useCanvasDragging";
export type UIElementSize = { height: number; width: number };
diff --git a/app/client/src/pages/Editor/Canvas.tsx b/app/client/src/pages/Editor/Canvas.tsx
index b153288a4453..e2ae1aa0c9ce 100644
--- a/app/client/src/pages/Editor/Canvas.tsx
+++ b/app/client/src/pages/Editor/Canvas.tsx
@@ -8,7 +8,7 @@ import { DSLWidget } from "widgets/constants";
import CanvasMultiPointerArena, {
POINTERS_CANVAS_ID,
-} from "../common/CanvasMultiPointerArena";
+} from "../common/CanvasArenas/CanvasMultiPointerArena";
import { throttle } from "lodash";
import { RenderModes } from "constants/WidgetConstants";
import { isMultiplayerEnabledForUser as isMultiplayerEnabledForUserSelector } from "selectors/appCollabSelectors";
diff --git a/app/client/src/pages/Editor/GlobalHotKeys.test.tsx b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx
index 4c317f5e107c..b512ddbb6895 100644
--- a/app/client/src/pages/Editor/GlobalHotKeys.test.tsx
+++ b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx
@@ -490,7 +490,7 @@ describe("Cut/Copy/Paste hotkey", () => {
true,
);
});
- await component.findByTestId("canvas-0");
+ await component.findByTestId("canvas-selection-0");
selectedWidgets = await component.queryAllByTestId("t--selected");
//adding extra time to let cut cmd works
jest.useFakeTimers();
diff --git a/app/client/src/pages/Editor/MainContainer.test.tsx b/app/client/src/pages/Editor/MainContainer.test.tsx
index 0d9d1f4e75a2..0f86285f9d39 100644
--- a/app/client/src/pages/Editor/MainContainer.test.tsx
+++ b/app/client/src/pages/Editor/MainContainer.test.tsx
@@ -160,7 +160,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(tabsWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -260,7 +260,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(tabsWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -367,7 +367,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(tabsWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -471,7 +471,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(tabsWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
const dropTarget: any = component.container.getElementsByClassName(
"t--drop-target",
)[0];
@@ -577,7 +577,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(containerButton[0]);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -687,7 +687,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(draggableWidget);
});
- let mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ let mainCanvas: any = component.queryByTestId("div-dragarena-0");
expect(mainCanvas).toBeNull();
// Focus on widget and drag
@@ -699,7 +699,7 @@ describe("Drag and Drop widgets into Main container", () => {
fireEvent.dragStart(draggableWidget);
});
- mainCanvas = component.queryByTestId("canvas-dragging-0");
+ mainCanvas = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -796,7 +796,7 @@ describe("Drag in a nested container", () => {
fireEvent.dragStart(draggableContainerWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -864,7 +864,7 @@ describe("Drag in a nested container", () => {
fireEvent.dragStart(draggableTextWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
act(() => {
fireEvent(
mainCanvas,
@@ -945,7 +945,7 @@ describe("Drag in a nested container", () => {
fireEvent.dragStart(draggableInputWidget);
});
- const mainCanvas: any = component.queryByTestId("canvas-dragging-0");
+ const mainCanvas: any = component.queryByTestId("div-dragarena-0");
if (mainCanvas) {
act(() => {
diff --git a/app/client/src/pages/common/CanvasDraggingArena.tsx b/app/client/src/pages/common/CanvasArenas/CanvasDraggingArena.tsx
similarity index 53%
rename from app/client/src/pages/common/CanvasDraggingArena.tsx
rename to app/client/src/pages/common/CanvasArenas/CanvasDraggingArena.tsx
index 07d670c44db9..493295dd0def 100644
--- a/app/client/src/pages/common/CanvasDraggingArena.tsx
+++ b/app/client/src/pages/common/CanvasArenas/CanvasDraggingArena.tsx
@@ -1,21 +1,9 @@
import { theme } from "constants/DefaultTheme";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import React, { useMemo } from "react";
-import styled from "styled-components";
-import { useCanvasDragging } from "utils/hooks/useCanvasDragging";
-
-const StyledSelectionCanvas = styled.div<{ paddingBottom: number }>`
- position: absolute;
- top: 0px;
- left: 0px;
- height: calc(100% + ${(props) => props.paddingBottom}px);
- width: 100%;
- image-rendering: -moz-crisp-edges;
- image-rendering: -webkit-crisp-edges;
- image-rendering: pixelated;
- image-rendering: crisp-edges;
- overflow-y: auto;
-`;
+import { getNearestParentCanvas } from "utils/generators";
+import { useCanvasDragging } from "./hooks/useCanvasDragging";
+import { StickyCanvasArena } from "./StickyCanvasArena";
export interface SelectedArenaDimensions {
top: number;
@@ -50,9 +38,9 @@ export function CanvasDraggingArena({
return widgetId === MAIN_CONTAINER_WIDGET_ID;
}, [widgetId]);
- const canvasRef = React.useRef<HTMLDivElement>(null);
- const canvasDrawRef = React.useRef<HTMLCanvasElement>(null);
- const { showCanvas } = useCanvasDragging(canvasRef, canvasDrawRef, {
+ const slidingArenaRef = React.useRef<HTMLDivElement>(null);
+ const stickyCanvasRef = React.useRef<HTMLCanvasElement>(null);
+ const { showCanvas } = useCanvasDragging(slidingArenaRef, stickyCanvasRef, {
canExtend,
dropDisabled,
noPad,
@@ -62,17 +50,23 @@ export function CanvasDraggingArena({
snapRowSpace,
widgetId,
});
-
+ const canvasRef = React.useRef({
+ stickyCanvasRef,
+ slidingArenaRef,
+ });
return showCanvas ? (
- <>
- <canvas ref={canvasDrawRef} />
- <StyledSelectionCanvas
- data-testid={`canvas-dragging-${widgetId}`}
- id={`canvas-dragging-${widgetId}`}
- paddingBottom={needsPadding ? theme.canvasBottomPadding : 0}
- ref={canvasRef}
- />
- </>
+ <StickyCanvasArena
+ canExtend={canExtend}
+ canvasId={`canvas-dragging-${widgetId}`}
+ canvasPadding={needsPadding ? theme.canvasBottomPadding : 0}
+ getRelativeScrollingParent={getNearestParentCanvas}
+ id={`div-dragarena-${widgetId}`}
+ ref={canvasRef}
+ showCanvas={showCanvas}
+ snapColSpace={snapColumnSpace}
+ snapRowSpace={snapRowSpace}
+ snapRows={snapRows}
+ />
) : null;
}
CanvasDraggingArena.displayName = "CanvasDraggingArena";
diff --git a/app/client/src/pages/common/CanvasMultiPointerArena.tsx b/app/client/src/pages/common/CanvasArenas/CanvasMultiPointerArena.tsx
similarity index 100%
rename from app/client/src/pages/common/CanvasMultiPointerArena.tsx
rename to app/client/src/pages/common/CanvasArenas/CanvasMultiPointerArena.tsx
diff --git a/app/client/src/pages/common/CanvasSelectionArena.test.tsx b/app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.test.tsx
similarity index 69%
rename from app/client/src/pages/common/CanvasSelectionArena.test.tsx
rename to app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.test.tsx
index 39e1d944a5a6..49a93d01bd0c 100644
--- a/app/client/src/pages/common/CanvasSelectionArena.test.tsx
+++ b/app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.test.tsx
@@ -1,5 +1,4 @@
import { act, fireEvent, render } from "test/testUtils";
-import Canvas from "pages/Editor/Canvas";
import React from "react";
import {
buildChildren,
@@ -19,6 +18,7 @@ import GlobalHotKeys from "pages/Editor/GlobalHotKeys";
import { UpdatedMainContainer } from "test/testMockedWidgets";
import { MemoryRouter } from "react-router-dom";
import * as utilities from "selectors/editorSelectors";
+import Canvas from "pages/Editor/Canvas";
describe("Canvas selection test cases", () => {
it("Should select using canvas draw", () => {
@@ -41,25 +41,39 @@ describe("Canvas selection test cases", () => {
const dsl: any = widgetCanvasFactory.build({
children,
});
+ const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
+ const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
+ spyGetCanvasWidgetDsl.mockImplementation(mockGetCanvasWidgetDsl);
+ mockGetIsFetchingPage.mockImplementation(() => false);
const component = render(
- <MockPageDSL dsl={dsl}>
- <Canvas dsl={dsl} />
- </MockPageDSL>,
+ <MemoryRouter
+ initialEntries={["/applications/app_id/pages/page_id/edit"]}
+ >
+ <MockApplication>
+ <GlobalHotKeys>
+ <UpdatedMainContainer dsl={dsl} />
+ </GlobalHotKeys>
+ </MockApplication>
+ </MemoryRouter>,
+ { initialState: store.getState(), sagasToRun: sagasToRunForTests },
);
let selectionCanvas: any = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
+ );
+ const selectionDiv: any = component.queryByTestId(
+ `div-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("");
- fireEvent.mouseDown(selectionCanvas);
+ fireEvent.mouseDown(selectionDiv);
selectionCanvas = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("2");
- fireEvent.mouseUp(selectionCanvas);
+ fireEvent.mouseUp(selectionDiv);
selectionCanvas = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("");
@@ -85,16 +99,27 @@ describe("Canvas selection test cases", () => {
const dsl: any = widgetCanvasFactory.build({
children,
});
+ const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
+ const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
+ spyGetCanvasWidgetDsl.mockImplementation(mockGetCanvasWidgetDsl);
+ mockGetIsFetchingPage.mockImplementation(() => false);
const component = render(
- <MockPageDSL dsl={dsl}>
- <Canvas dsl={dsl} />
- </MockPageDSL>,
+ <MemoryRouter
+ initialEntries={["/applications/app_id/pages/page_id/edit"]}
+ >
+ <MockApplication>
+ <GlobalHotKeys>
+ <UpdatedMainContainer dsl={dsl} />
+ </GlobalHotKeys>
+ </MockApplication>
+ </MemoryRouter>,
+ { initialState: store.getState(), sagasToRun: sagasToRunForTests },
);
- const selectionCanvas: any = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ const selectionDiv: any = component.queryByTestId(
+ `div-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mousedown", {
bubbles: true,
@@ -107,7 +132,7 @@ describe("Canvas selection test cases", () => {
),
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mousemove", {
bubbles: true,
@@ -121,7 +146,7 @@ describe("Canvas selection test cases", () => {
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mouseup", {
bubbles: true,
@@ -165,27 +190,43 @@ describe("Canvas selection test cases", () => {
const dsl: any = widgetCanvasFactory.build({
children: containerChildren,
});
+ const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
+ const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
+ spyGetCanvasWidgetDsl.mockImplementation(mockGetCanvasWidgetDsl);
+ mockGetIsFetchingPage.mockImplementation(() => false);
const component = render(
- <MockPageDSL dsl={dsl}>
- <Canvas dsl={dsl} />
- </MockPageDSL>,
+ <MemoryRouter
+ initialEntries={["/applications/app_id/pages/page_id/edit"]}
+ >
+ <MockApplication>
+ <GlobalHotKeys>
+ <UpdatedMainContainer dsl={dsl} />
+ </GlobalHotKeys>
+ </MockApplication>
+ </MemoryRouter>,
+ { initialState: store.getState(), sagasToRun: sagasToRunForTests },
+ );
+ let selectionCanvas: any = component.queryByTestId(
+ `canvas-selection-${canvasId}`,
+ );
+ const selectionDiv: any = component.queryByTestId(
+ `div-selection-${canvasId}`,
);
- let selectionCanvas: any = component.queryByTestId(`canvas-${canvasId}`);
expect(selectionCanvas.style.zIndex).toBe("");
- fireEvent.mouseDown(selectionCanvas);
+ fireEvent.mouseDown(selectionDiv);
// should not allow draw when cmd/ctrl is not pressed
- selectionCanvas = component.queryByTestId(`canvas-${canvasId}`);
+ selectionCanvas = component.queryByTestId(`canvas-selection-${canvasId}`);
expect(selectionCanvas.style.zIndex).toBe("");
- fireEvent.mouseDown(selectionCanvas, {
+ fireEvent.mouseDown(selectionDiv, {
metaKey: true,
});
- selectionCanvas = component.queryByTestId(`canvas-${canvasId}`);
+ selectionCanvas = component.queryByTestId(`canvas-selection-${canvasId}`);
expect(selectionCanvas.style.zIndex).toBe("2");
- fireEvent.mouseUp(selectionCanvas);
- selectionCanvas = component.queryByTestId(`canvas-${canvasId}`);
+ fireEvent.mouseUp(selectionDiv);
+ selectionCanvas = component.queryByTestId(`canvas-selection-${canvasId}`);
expect(selectionCanvas.style.zIndex).toBe("");
});
@@ -237,12 +278,20 @@ describe("Canvas selection test cases", () => {
type: "CHECKBOX_WIDGET",
parentColumnSpace: 10,
parentRowSpace: 10,
+ topRow: 1,
+ bottomRow: 2,
+ rightColumn: 1,
+ leftColumn: 0,
parentId: canvasId,
},
{
type: "BUTTON_WIDGET",
parentColumnSpace: 10,
parentRowSpace: 10,
+ topRow: 1,
+ bottomRow: 3,
+ rightColumn: 2,
+ leftColumn: 1,
parentId: canvasId,
},
]);
@@ -272,14 +321,29 @@ describe("Canvas selection test cases", () => {
const dsl: any = widgetCanvasFactory.build({
children: containerChildren,
});
+ const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage");
+ const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
+ spyGetCanvasWidgetDsl.mockImplementation(mockGetCanvasWidgetDsl);
+ mockGetIsFetchingPage.mockImplementation(() => false);
+
const component = render(
- <MockPageDSL dsl={dsl}>
- <Canvas dsl={dsl} />
- </MockPageDSL>,
+ <MemoryRouter
+ initialEntries={["/applications/app_id/pages/page_id/edit"]}
+ >
+ <MockApplication>
+ <GlobalHotKeys>
+ <UpdatedMainContainer dsl={dsl} />
+ </GlobalHotKeys>
+ </MockApplication>
+ </MemoryRouter>,
+ { initialState: store.getState(), sagasToRun: sagasToRunForTests },
+ );
+
+ const selectionDiv: any = component.queryByTestId(
+ `div-selection-${canvasId}`,
);
- const selectionCanvas: any = component.queryByTestId(`canvas-${canvasId}`);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mousedown", {
metaKey: true,
@@ -293,7 +357,7 @@ describe("Canvas selection test cases", () => {
),
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mousemove", {
metaKey: true,
@@ -308,7 +372,7 @@ describe("Canvas selection test cases", () => {
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mouseup", {
metaKey: true,
@@ -364,7 +428,10 @@ describe("Canvas selection test cases", () => {
);
const widgetEditor: any = component.queryByTestId("widgets-editor");
let selectionCanvas: any = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
+ );
+ const selectionDiv: any = component.queryByTestId(
+ `div-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("");
act(() => {
@@ -372,22 +439,24 @@ describe("Canvas selection test cases", () => {
});
selectionCanvas = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("2");
- fireEvent.mouseEnter(selectionCanvas);
- fireEvent.mouseUp(selectionCanvas);
+ fireEvent.mouseEnter(selectionDiv);
+ fireEvent.mouseUp(selectionDiv);
selectionCanvas = component.queryByTestId(
- `canvas-${MAIN_CONTAINER_WIDGET_ID}`,
+ `canvas-selection-${MAIN_CONTAINER_WIDGET_ID}`,
);
expect(selectionCanvas.style.zIndex).toBe("");
act(() => {
fireEvent.dragStart(widgetEditor);
});
+ fireEvent.mouseEnter(selectionDiv);
+
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mousemove", {
bubbles: true,
@@ -401,7 +470,7 @@ describe("Canvas selection test cases", () => {
);
fireEvent(
- selectionCanvas,
+ selectionDiv,
syntheticTestMouseEvent(
new MouseEvent("mouseup", {
bubbles: true,
diff --git a/app/client/src/pages/common/CanvasSelectionArena.tsx b/app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.tsx
similarity index 66%
rename from app/client/src/pages/common/CanvasSelectionArena.tsx
rename to app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.tsx
index 240f607166d2..79d4f761879a 100644
--- a/app/client/src/pages/common/CanvasSelectionArena.tsx
+++ b/app/client/src/pages/common/CanvasArenas/CanvasSelectionArena.tsx
@@ -14,27 +14,15 @@ import {
getCurrentPageId,
previewModeSelector,
} from "selectors/editorSelectors";
-import styled from "styled-components";
import { getNearestParentCanvas } from "utils/generators";
-import { useCanvasDragToScroll } from "utils/hooks/useCanvasDragToScroll";
+import { useCanvasDragToScroll } from "./hooks/useCanvasDragToScroll";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
-import { XYCord } from "utils/hooks/useCanvasDragging";
+import { XYCord } from "./hooks/useCanvasDragging";
import { theme } from "constants/DefaultTheme";
-import { commentModeSelector } from "../../selectors/commentsSelectors";
import { getIsDraggingForSelection } from "selectors/canvasSelectors";
-
-const StyledSelectionCanvas = styled.canvas`
- position: absolute;
- top: 0px;
- left: 0px;
- height: calc(
- 100% +
- ${(props) =>
- props.id === "canvas-0" ? props.theme.canvasBottomPadding : 0}px
- );
- width: 100%;
- overflow-y: auto;
-`;
+import { commentModeSelector } from "../../../selectors/commentsSelectors";
+import { StickyCanvasArena } from "./StickyCanvasArena";
+import { getAbsolutePixels } from "utils/helpers";
export interface SelectedArenaDimensions {
top: number;
@@ -62,7 +50,10 @@ export function CanvasSelectionArena({
}) {
const dispatch = useDispatch();
const isCommentMode = useSelector(commentModeSelector);
- const canvasRef = React.useRef<HTMLCanvasElement>(null);
+ const canvasPadding =
+ widgetId === MAIN_CONTAINER_WIDGET_ID ? theme.canvasBottomPadding : 0;
+ const slidingArenaRef = React.useRef<HTMLDivElement>(null);
+ const stickyCanvasRef = React.useRef<HTMLCanvasElement>(null);
const parentWidget = useSelector((state: AppState) =>
getWidget(state, parentId || ""),
);
@@ -139,8 +130,9 @@ export function CanvasSelectionArena({
canDraw: canDrawOnEnter,
startPoints: canDrawOnEnter ? outOfCanvasStartPositions : undefined,
};
- if (canvasRef.current && canDrawOnEnter) {
- canvasRef.current.style.zIndex = "2";
+ if (slidingArenaRef.current && stickyCanvasRef.current && canDrawOnEnter) {
+ stickyCanvasRef.current.style.zIndex = "2";
+ slidingArenaRef.current.style.zIndex = "2";
}
}, [
isDraggingForSelection,
@@ -149,25 +141,24 @@ export function CanvasSelectionArena({
]);
useCanvasDragToScroll(
- canvasRef,
+ slidingArenaRef,
isCurrentWidgetDrawing || isResizing,
isDraggingForSelection || isResizing,
snapRows,
canExtend,
);
useEffect(() => {
- if (appMode === APP_MODE.EDIT && !isDragging && canvasRef.current) {
- // ToDo: Needs a repositioning canvas window to limit the highest number of pixels rendered for an application of any height.
- // as of today (Pixels rendered by canvas) ∝ (Application height) so as height increases will run into to dead renders.
- // https://on690.codesandbox.io/ to check the number of pixels limit supported for a canvas
- // const { devicePixelRatio: scale = 1 } = window;
-
- const scale = 1;
+ if (
+ appMode === APP_MODE.EDIT &&
+ !isDragging &&
+ slidingArenaRef.current &&
+ stickyCanvasRef.current
+ ) {
const scrollParent: Element | null = getNearestParentCanvas(
- canvasRef.current,
+ slidingArenaRef.current,
);
const scrollObj: any = {};
- let canvasCtx: any = canvasRef.current.getContext("2d");
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
const initRectangle = (): SelectedArenaDimensions => ({
top: 0,
left: 0,
@@ -215,40 +206,46 @@ export function CanvasSelectionArena({
};
const drawRectangle = (selectionDimensions: SelectedArenaDimensions) => {
- const strokeWidth = 1;
- canvasCtx.setLineDash([5]);
- canvasCtx.strokeStyle = "rgba(125,188,255,1)";
- canvasCtx.strokeRect(
- selectionDimensions.left - strokeWidth,
- selectionDimensions.top - strokeWidth,
- selectionDimensions.width + 2 * strokeWidth,
- selectionDimensions.height + 2 * strokeWidth,
- );
- canvasCtx.fillStyle = "rgb(84, 132, 236, 0.06)";
- canvasCtx.fillRect(
- selectionDimensions.left,
- selectionDimensions.top,
- selectionDimensions.width,
- selectionDimensions.height,
- );
+ if (stickyCanvasRef.current) {
+ const strokeWidth = 1;
+ const topOffset = getAbsolutePixels(
+ stickyCanvasRef.current.style.top,
+ );
+ const leftOffset = getAbsolutePixels(
+ stickyCanvasRef.current.style.left,
+ );
+ canvasCtx.setLineDash([5]);
+ canvasCtx.strokeStyle = "rgba(125,188,255,1)";
+ canvasCtx.strokeRect(
+ selectionDimensions.left - strokeWidth - leftOffset,
+ selectionDimensions.top - strokeWidth - topOffset,
+ selectionDimensions.width + 2 * strokeWidth,
+ selectionDimensions.height + 2 * strokeWidth,
+ );
+ canvasCtx.fillStyle = "rgb(84, 132, 236, 0.06)";
+ canvasCtx.fillRect(
+ selectionDimensions.left - leftOffset,
+ selectionDimensions.top - topOffset,
+ selectionDimensions.width,
+ selectionDimensions.height,
+ );
+ }
};
const onMouseLeave = () => {
- if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
- document.body.addEventListener("mouseup", onMouseUp, false);
- document.body.addEventListener("click", onClick, false);
- }
+ document.body.addEventListener("mouseup", onMouseUp, false);
+ document.body.addEventListener("click", onClick, false);
};
const onMouseEnter = (e: any) => {
if (
- canvasRef.current &&
+ slidingArenaRef.current &&
!isDragging &&
drawOnEnterObj?.current.canDraw
) {
firstRender(e, true);
drawOnEnterObj.current = defaultDrawOnObj;
- } else if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
+ } else {
document.body.removeEventListener("mouseup", onMouseUp);
document.body.removeEventListener("click", onClick);
}
@@ -274,13 +271,13 @@ export function CanvasSelectionArena({
top: 0,
left: 0,
};
- if (canvasRef.current && startPoints) {
+ if (slidingArenaRef.current && startPoints) {
const {
height,
left,
top,
width,
- } = canvasRef.current.getBoundingClientRect();
+ } = slidingArenaRef.current.getBoundingClientRect();
const outOfMaxBounds = {
x: startPoints.x < left + width,
y: startPoints.y < top + height,
@@ -307,28 +304,33 @@ export function CanvasSelectionArena({
};
const firstRender = (e: any, fromOuterCanvas = false) => {
- if (canvasRef.current && !isDragging) {
+ if (slidingArenaRef.current && stickyCanvasRef.current && !isDragging) {
isMultiSelect = e.ctrlKey || e.metaKey || e.shiftKey;
if (fromOuterCanvas) {
const { left, top } = startPositionsForOutCanvasSelection();
selectionRectangle.left = left;
selectionRectangle.top = top;
} else {
- selectionRectangle.left = e.offsetX - canvasRef.current.offsetLeft;
- selectionRectangle.top = e.offsetY - canvasRef.current.offsetTop;
+ selectionRectangle.left =
+ e.offsetX - slidingArenaRef.current.offsetLeft;
+ selectionRectangle.top =
+ e.offsetY - slidingArenaRef.current.offsetTop;
}
selectionRectangle.width = 0;
selectionRectangle.height = 0;
-
isDragging = true;
// bring the canvas to the top layer
- canvasRef.current.style.zIndex = "2";
+ stickyCanvasRef.current.style.zIndex = "2";
+ slidingArenaRef.current.style.zIndex = "2";
+ slidingArenaRef.current.style.cursor = "default";
}
};
const onMouseDown = (e: any) => {
+ const isNotRightClick = !(e.which === 3 || e.button === 2);
if (
- canvasRef.current &&
+ isNotRightClick &&
+ slidingArenaRef.current &&
(!isDraggableParent || e.ctrlKey || e.metaKey)
) {
dispatch(setCanvasSelectionStateAction(true, widgetId));
@@ -336,29 +338,35 @@ export function CanvasSelectionArena({
}
};
const onMouseUp = () => {
- if (isDragging && canvasRef.current) {
+ if (isDragging && slidingArenaRef.current && stickyCanvasRef.current) {
isDragging = false;
canvasCtx.clearRect(
0,
0,
- canvasRef.current.width,
- canvasRef.current.height,
+ stickyCanvasRef.current.width,
+ stickyCanvasRef.current.height,
);
- canvasRef.current.style.zIndex = "";
+ stickyCanvasRef.current.style.zIndex = "";
+ slidingArenaRef.current.style.zIndex = "";
+ slidingArenaRef.current.style.cursor = "";
dispatch(setCanvasSelectionStateAction(false, widgetId));
}
};
const onMouseMove = (e: any) => {
- if (isDragging && canvasRef.current) {
+ if (isDragging && slidingArenaRef.current && stickyCanvasRef.current) {
selectionRectangle.width =
- e.offsetX - canvasRef.current.offsetLeft - selectionRectangle.left;
+ e.offsetX -
+ slidingArenaRef.current.offsetLeft -
+ selectionRectangle.left;
selectionRectangle.height =
- e.offsetY - canvasRef.current.offsetTop - selectionRectangle.top;
+ e.offsetY -
+ slidingArenaRef.current.offsetTop -
+ selectionRectangle.top;
canvasCtx.clearRect(
0,
0,
- canvasRef.current.width,
- canvasRef.current.height,
+ stickyCanvasRef.current.width,
+ stickyCanvasRef.current.height,
);
const selectionDimensions = getSelectionDimensions();
drawRectangle(selectionDimensions);
@@ -392,36 +400,51 @@ export function CanvasSelectionArena({
};
const addEventListeners = () => {
- canvasRef.current?.addEventListener("click", onClick, false);
- canvasRef.current?.addEventListener("mousedown", onMouseDown, false);
- document.addEventListener("mouseup", onMouseUp, false);
- canvasRef.current?.addEventListener("mousemove", onMouseMove, false);
- canvasRef.current?.addEventListener("mouseleave", onMouseLeave, false);
- canvasRef.current?.addEventListener("mouseenter", onMouseEnter, false);
+ slidingArenaRef.current?.addEventListener("click", onClick, false);
+ slidingArenaRef.current?.addEventListener(
+ "mousedown",
+ onMouseDown,
+ false,
+ );
+ slidingArenaRef.current?.addEventListener("mouseup", onMouseUp, false);
+ slidingArenaRef.current?.addEventListener(
+ "mousemove",
+ onMouseMove,
+ false,
+ );
+ slidingArenaRef.current?.addEventListener(
+ "mouseleave",
+ onMouseLeave,
+ false,
+ );
+ slidingArenaRef.current?.addEventListener(
+ "mouseenter",
+ onMouseEnter,
+ false,
+ );
scrollParent?.addEventListener("scroll", onScroll, false);
};
const removeEventListeners = () => {
- canvasRef.current?.removeEventListener("mousedown", onMouseDown);
- document?.removeEventListener("mouseup", onMouseUp);
- canvasRef.current?.removeEventListener("mousemove", onMouseMove);
- canvasRef.current?.removeEventListener("mouseleave", onMouseLeave);
- canvasRef.current?.removeEventListener("mouseenter", onMouseEnter);
- canvasRef.current?.removeEventListener("click", onClick);
+ slidingArenaRef.current?.removeEventListener("mousedown", onMouseDown);
+ slidingArenaRef.current?.removeEventListener("mouseup", onMouseUp);
+ slidingArenaRef.current?.removeEventListener("mousemove", onMouseMove);
+ slidingArenaRef.current?.removeEventListener(
+ "mouseleave",
+ onMouseLeave,
+ );
+ slidingArenaRef.current?.removeEventListener(
+ "mouseenter",
+ onMouseEnter,
+ );
+ slidingArenaRef.current?.removeEventListener("click", onClick);
+ scrollParent?.removeEventListener("scroll", onScroll);
};
const init = () => {
- if (canvasRef.current) {
- const { height, width } = canvasRef.current.getBoundingClientRect();
- if (height && width) {
- canvasRef.current.width = width * scale;
- canvasRef.current.height =
- (snapRows * snapRowSpace +
- (widgetId === MAIN_CONTAINER_WIDGET_ID
- ? theme.canvasBottomPadding
- : 0)) *
- scale;
- }
- canvasCtx = canvasRef.current.getContext("2d");
- canvasCtx.scale(scale, scale);
+ if (
+ scrollParent &&
+ stickyCanvasRef.current &&
+ slidingArenaRef.current
+ ) {
removeEventListeners();
addEventListeners();
}
@@ -452,11 +475,22 @@ export function CanvasSelectionArena({
appMode === APP_MODE.EDIT &&
!(isDragging || isCommentMode || isPreviewMode || dropDisabled);
+ const canvasRef = React.useRef({
+ slidingArenaRef,
+ stickyCanvasRef,
+ });
return shouldShow ? (
- <StyledSelectionCanvas
- data-testid={`canvas-${widgetId}`}
- id={`canvas-${widgetId}`}
+ <StickyCanvasArena
+ canExtend={canExtend}
+ canvasId={`canvas-selection-${widgetId}`}
+ canvasPadding={canvasPadding}
+ getRelativeScrollingParent={getNearestParentCanvas}
+ id={`div-selection-${widgetId}`}
ref={canvasRef}
+ showCanvas={shouldShow}
+ snapColSpace={snapColumnSpace}
+ snapRowSpace={snapRowSpace}
+ snapRows={snapRows}
/>
) : null;
}
diff --git a/app/client/src/pages/common/CanvasArenas/StickyCanvasArena.tsx b/app/client/src/pages/common/CanvasArenas/StickyCanvasArena.tsx
new file mode 100644
index 000000000000..1da7a6fa2361
--- /dev/null
+++ b/app/client/src/pages/common/CanvasArenas/StickyCanvasArena.tsx
@@ -0,0 +1,137 @@
+import styled from "constants/DefaultTheme";
+import React, { forwardRef, RefObject, useEffect, useRef } from "react";
+import ResizeObserver from "resize-observer-polyfill";
+
+interface StickyCanvasArenaProps {
+ showCanvas: boolean;
+ canvasId: string;
+ id: string;
+ canvasPadding: number;
+ snapRows: number;
+ snapColSpace: number;
+ snapRowSpace: number;
+ getRelativeScrollingParent: (child: HTMLDivElement) => Element | null;
+ canExtend: boolean;
+ ref: StickyCanvasArenaRef;
+}
+
+interface StickyCanvasArenaRef {
+ stickyCanvasRef: RefObject<HTMLCanvasElement>;
+ slidingArenaRef: RefObject<HTMLDivElement>;
+}
+
+const StyledCanvasSlider = styled.div<{ paddingBottom: number }>`
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ height: calc(100% + ${(props) => props.paddingBottom}px);
+ width: 100%;
+ image-rendering: -moz-crisp-edges;
+ image-rendering: -webkit-crisp-edges;
+ image-rendering: pixelated;
+ image-rendering: crisp-edges;
+ overflow-y: auto;
+`;
+
+export const StickyCanvasArena = forwardRef(
+ (props: StickyCanvasArenaProps, ref: any) => {
+ const {
+ canExtend,
+ canvasId,
+ canvasPadding,
+ getRelativeScrollingParent,
+ id,
+ showCanvas,
+ snapColSpace,
+ snapRows,
+ snapRowSpace,
+ } = props;
+ const { slidingArenaRef, stickyCanvasRef } = ref.current;
+
+ const interSectionObserver = useRef(
+ new IntersectionObserver((entries) => {
+ entries.forEach(updateCanvasStylesIntersection);
+ }),
+ );
+ const resizeObserver = useRef(
+ new ResizeObserver(() => {
+ observeSlider();
+ }),
+ );
+ const { devicePixelRatio: scale = 1 } = window;
+
+ const repositionSliderCanvas = (entry: IntersectionObserverEntry) => {
+ stickyCanvasRef.current.style.width = entry.intersectionRect.width + "px";
+ stickyCanvasRef.current.style.position = "absolute";
+ const calculatedLeftOffset =
+ entry.intersectionRect.left - entry.boundingClientRect.left;
+ const calculatedTopOffset =
+ entry.intersectionRect.top - entry.boundingClientRect.top;
+ stickyCanvasRef.current.style.top = calculatedTopOffset + "px";
+ stickyCanvasRef.current.style.left = calculatedLeftOffset + "px";
+ stickyCanvasRef.current.style.height =
+ entry.intersectionRect.height + "px";
+ };
+
+ const rescaleSliderCanvas = (entry: IntersectionObserverEntry) => {
+ stickyCanvasRef.current.height = entry.intersectionRect.height * scale;
+ stickyCanvasRef.current.width = entry.intersectionRect.width * scale;
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
+ canvasCtx.scale(scale, scale);
+ };
+
+ const updateCanvasStylesIntersection = (
+ entry: IntersectionObserverEntry,
+ ) => {
+ if (slidingArenaRef.current) {
+ const parentCanvas: Element | null = getRelativeScrollingParent(
+ slidingArenaRef.current,
+ );
+
+ if (parentCanvas && stickyCanvasRef.current) {
+ repositionSliderCanvas(entry);
+ rescaleSliderCanvas(entry);
+ }
+ }
+ };
+ const observeSlider = () => {
+ interSectionObserver.current.disconnect();
+ interSectionObserver.current.observe(slidingArenaRef.current);
+ };
+
+ useEffect(() => {
+ observeSlider();
+ }, [showCanvas, snapRows, canExtend, snapColSpace, snapRowSpace]);
+
+ useEffect(() => {
+ let parentCanvas: Element | null;
+ if (slidingArenaRef.current) {
+ parentCanvas = getRelativeScrollingParent(slidingArenaRef.current);
+ parentCanvas?.addEventListener("scroll", observeSlider, false);
+ parentCanvas?.addEventListener("mouseover", observeSlider, false);
+ }
+ resizeObserver.current.observe(slidingArenaRef.current);
+ return () => {
+ parentCanvas?.removeEventListener("scroll", observeSlider);
+ parentCanvas?.removeEventListener("mouseover", observeSlider);
+ resizeObserver.current.unobserve(slidingArenaRef.current);
+ };
+ }, []);
+
+ return (
+ <>
+ {/* Canvas will always be sticky to its scrollable parent's view port. i.e,
+ it will only be as big as its viewable area so maximum size would be less
+ than screen width and height in all cases. */}
+ <canvas data-testid={canvasId} id={canvasId} ref={stickyCanvasRef} />
+ <StyledCanvasSlider
+ data-testid={id}
+ id={id}
+ paddingBottom={canvasPadding}
+ ref={slidingArenaRef}
+ />
+ </>
+ );
+ },
+);
+StickyCanvasArena.displayName = "StickyCanvasArena";
diff --git a/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts b/app/client/src/pages/common/CanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
similarity index 95%
rename from app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
rename to app/client/src/pages/common/CanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
index ea057f31b8c7..adca0079f8b2 100644
--- a/app/client/src/utils/hooks/useBlocksToBeDraggedOnCanvas.ts
+++ b/app/client/src/pages/common/CanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
@@ -17,18 +17,18 @@ import {
widgetOperationParams,
} from "utils/WidgetPropsUtils";
import { DropTargetContext } from "components/editorComponents/DropTargetComponent";
-import { XYCord } from "utils/hooks/useCanvasDragging";
import { isEmpty, isEqual } from "lodash";
-import { CanvasDraggingArenaProps } from "pages/common/CanvasDraggingArena";
+import { CanvasDraggingArenaProps } from "pages/common/CanvasArenas/CanvasDraggingArena";
import { useDispatch } from "react-redux";
import { ReduxActionTypes } from "constants/ReduxActionConstants";
import { EditorContext } from "components/editorComponents/EditorContextProvider";
-import { useWidgetSelection } from "./useWidgetSelection";
+import { useWidgetSelection } from "../../../../utils/hooks/useWidgetSelection";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { snapToGrid } from "utils/helpers";
import { stopReflowAction } from "actions/reflowActions";
import { DragDetails } from "reducers/uiReducers/dragResizeReducer";
import { getIsReflowing } from "selectors/widgetReflowSelectors";
+import { XYCord } from "./useCanvasDragging";
export interface WidgetDraggingUpdateParams extends WidgetDraggingBlock {
updateWidgetParams: WidgetOperationParams;
@@ -324,12 +324,19 @@ export const useBlocksToBeDraggedOnCanvas = ({
} as XYCord,
{ x: 0, y: 0 },
);
- return updateBottomRow(top, rows);
+ const widgetIdsToExclude = drawingBlocks.map((a) => a.widgetId);
+ return updateBottomRow(top, rows, widgetIdsToExclude);
}
};
- const updateBottomRow = (bottom: number, rows: number) => {
+ const updateBottomRow = (
+ bottom: number,
+ rows: number,
+ widgetIdsToExclude: string[],
+ ) => {
if (bottom > rows - GridDefaults.CANVAS_EXTENSION_OFFSET) {
- return updateDropTargetRows && updateDropTargetRows(widgetId, bottom);
+ return (
+ updateDropTargetRows && updateDropTargetRows(widgetIdsToExclude, bottom)
+ );
}
};
const rowRef = useRef(snapRows);
diff --git a/app/client/src/utils/hooks/useCanvasDragToScroll.ts b/app/client/src/pages/common/CanvasArenas/hooks/useCanvasDragToScroll.ts
similarity index 100%
rename from app/client/src/utils/hooks/useCanvasDragToScroll.ts
rename to app/client/src/pages/common/CanvasArenas/hooks/useCanvasDragToScroll.ts
diff --git a/app/client/src/utils/hooks/useCanvasDragging.ts b/app/client/src/pages/common/CanvasArenas/hooks/useCanvasDragging.ts
similarity index 81%
rename from app/client/src/utils/hooks/useCanvasDragging.ts
rename to app/client/src/pages/common/CanvasArenas/hooks/useCanvasDragging.ts
index 0f01782d828e..acecaf889671 100644
--- a/app/client/src/utils/hooks/useCanvasDragging.ts
+++ b/app/client/src/pages/common/CanvasArenas/hooks/useCanvasDragging.ts
@@ -1,32 +1,33 @@
+import { OccupiedSpace } from "constants/CanvasEditorConstants";
import {
CONTAINER_GRID_PADDING,
GridDefaults,
} from "constants/WidgetConstants";
import { debounce, isEmpty, throttle } from "lodash";
-import { CanvasDraggingArenaProps } from "pages/common/CanvasDraggingArena";
+import { CanvasDraggingArenaProps } from "pages/common/CanvasArenas/CanvasDraggingArena";
import { useEffect, useRef } from "react";
-import { ReflowDirection, ReflowedSpaceMap } from "reflow/reflowTypes";
-import { useReflow, ReflowInterface } from "utils/hooks/useReflow";
import { useSelector } from "react-redux";
+import { ReflowDirection, ReflowedSpaceMap } from "reflow/reflowTypes";
import { getZoomLevel } from "selectors/editorSelectors";
+import { isReflowEnabled } from "selectors/widgetReflowSelectors";
import { getNearestParentCanvas } from "utils/generators";
+import { getAbsolutePixels } from "utils/helpers";
+import { useWidgetDragResize } from "utils/hooks/dragResizeHooks";
+import { ReflowInterface, useReflow } from "utils/hooks/useReflow";
import { getDropZoneOffsets, noCollision } from "utils/WidgetPropsUtils";
-import { useWidgetDragResize } from "./dragResizeHooks";
import {
useBlocksToBeDraggedOnCanvas,
WidgetDraggingBlock,
} from "./useBlocksToBeDraggedOnCanvas";
import { useCanvasDragToScroll } from "./useCanvasDragToScroll";
-import { OccupiedSpace } from "constants/CanvasEditorConstants";
-import { isReflowEnabled } from "selectors/widgetReflowSelectors";
export interface XYCord {
x: number;
y: number;
}
export const useCanvasDragging = (
- canvasRef: React.RefObject<HTMLDivElement>,
- canvasDrawRef: React.RefObject<HTMLCanvasElement>,
+ slidingArenaRef: React.RefObject<HTMLDivElement>,
+ stickyCanvasRef: React.RefObject<HTMLCanvasElement>,
{
canExtend,
dropDisabled,
@@ -88,66 +89,6 @@ export const useCanvasDragging = (
setDraggingNewWidget,
setDraggingState,
} = useWidgetDragResize();
- const getCanvasToDrawTopOffset = (
- scrollParentTop: number,
- scrollParentTopHeight: number,
- canvasTop: number,
- canvasHeight: number,
- ) => {
- return scrollParentTop > canvasTop
- ? Math.min(
- scrollParentTop - canvasTop,
- canvasHeight - scrollParentTopHeight,
- )
- : 0;
- };
-
- const updateCanvasStyles = () => {
- const parentCanvas: Element | null = getNearestParentCanvas(
- canvasRef.current,
- );
-
- if (parentCanvas && canvasDrawRef.current && canvasRef.current) {
- const {
- height: scrollParentTopHeight,
- } = parentCanvas.getBoundingClientRect();
- const { width } = canvasRef.current.getBoundingClientRect();
- canvasDrawRef.current.style.width = width / canvasZoomLevel + "px";
- canvasDrawRef.current.style.position = canExtend ? "absolute" : "sticky";
- canvasDrawRef.current.style.left = "0px";
- canvasDrawRef.current.style.top = getCanvasTopOffset() + "px";
- canvasDrawRef.current.style.height =
- scrollParentTopHeight / canvasZoomLevel + "px";
- }
- };
-
- const getCanvasTopOffset = () => {
- const parentCanvas: Element | null = getNearestParentCanvas(
- canvasRef.current,
- );
-
- if (parentCanvas && canvasDrawRef.current && canvasRef.current) {
- if (canExtend) {
- return parentCanvas.scrollTop;
- } else {
- const {
- height: scrollParentTopHeight,
- top: scrollParentTop,
- } = parentCanvas.getBoundingClientRect();
- const {
- height: canvasHeight,
- top: canvasTop,
- } = canvasRef.current.getBoundingClientRect();
- return getCanvasToDrawTopOffset(
- scrollParentTop,
- scrollParentTopHeight,
- canvasTop,
- canvasHeight,
- );
- }
- }
- return 0;
- };
const mouseAttributesRef = useRef<{
prevEvent: any;
@@ -176,7 +117,7 @@ export const useCanvasDragging = (
});
const canScroll = useCanvasDragToScroll(
- canvasRef,
+ slidingArenaRef,
isCurrentDraggedCanvas,
isDragging,
snapRows,
@@ -235,7 +176,7 @@ export const useCanvasDragging = (
useEffect(() => {
if (
- canvasRef.current &&
+ slidingArenaRef.current &&
!isResizing &&
isDragging &&
blocksToDraw.length > 0
@@ -243,7 +184,7 @@ export const useCanvasDragging = (
// doing throttling coz reflow moves are also throttled and resetCanvas can be called multiple times
const throttledStopReflowing = throttle(stopReflowing, 50);
const scrollParent: Element | null = getNearestParentCanvas(
- canvasRef.current,
+ slidingArenaRef.current,
);
let canvasIsDragging = false;
let isUpdatingRows = false;
@@ -272,15 +213,15 @@ export const useCanvasDragging = (
const resetCanvasState = () => {
throttledStopReflowing();
- if (canvasDrawRef.current && canvasRef.current) {
- const canvasCtx: any = canvasDrawRef.current.getContext("2d");
+ if (stickyCanvasRef.current && slidingArenaRef.current) {
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
canvasCtx.clearRect(
0,
0,
- canvasDrawRef.current.width,
- canvasDrawRef.current.height,
+ stickyCanvasRef.current.width,
+ stickyCanvasRef.current.height,
);
- canvasRef.current.style.zIndex = "";
+ slidingArenaRef.current.style.zIndex = "";
canvasIsDragging = false;
}
};
@@ -347,7 +288,7 @@ export const useCanvasDragging = (
!isResizing &&
isDragging &&
!canvasIsDragging &&
- canvasRef.current
+ slidingArenaRef.current
) {
if (!isNewWidget) {
startPoints.left =
@@ -360,7 +301,7 @@ export const useCanvasDragging = (
setDraggingCanvas(widgetId);
}
canvasIsDragging = true;
- canvasRef.current.style.zIndex = "2";
+ slidingArenaRef.current.style.zIndex = "2";
if (over) {
lastMousePosition = {
...mouseAttributesRef.current.lastMousePositionOutsideCanvas,
@@ -500,9 +441,13 @@ export const useCanvasDragging = (
GridDefaults.DEFAULT_GRID_COLUMNS,
block.detachFromLayout,
);
+ const widgetIdsToExclude = currentRectanglesToDraw.map(
+ (a) => a.widgetId,
+ );
const newRows = updateBottomRow(
currentReflowParams.bottomMostRow,
rowRef.current,
+ widgetIdsToExclude,
);
rowRef.current = newRows ? newRows : rowRef.current;
currentRectanglesToDraw[0].isNotColliding =
@@ -513,7 +458,7 @@ export const useCanvasDragging = (
}
};
const onMouseMove = (e: any, firstMove = false) => {
- if (isDragging && canvasIsDragging && canvasRef.current) {
+ if (isDragging && canvasIsDragging && slidingArenaRef.current) {
const delta = {
left: e.offsetX - startPoints.left - parentDiff.left,
top: e.offsetY - startPoints.top - parentDiff.top,
@@ -545,7 +490,7 @@ export const useCanvasDragging = (
each.detachFromLayout,
),
}));
- if (rowDelta && canvasRef.current) {
+ if (rowDelta && slidingArenaRef.current) {
isUpdatingRows = true;
canScroll.current = false;
renderNewRows(delta);
@@ -565,8 +510,8 @@ export const useCanvasDragging = (
};
const renderNewRows = debounce((delta) => {
isUpdatingRows = true;
- if (canvasRef.current && canvasDrawRef.current) {
- const canvasCtx: any = canvasDrawRef.current.getContext("2d");
+ if (slidingArenaRef.current && stickyCanvasRef.current) {
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
currentRectanglesToDraw = blocksToDraw.map((each) => {
return {
@@ -595,8 +540,8 @@ export const useCanvasDragging = (
canvasCtx.clearRect(
0,
0,
- canvasDrawRef.current.width,
- canvasDrawRef.current.height,
+ stickyCanvasRef.current.width,
+ stickyCanvasRef.current.height,
);
canvasCtx.restore();
renderBlocks();
@@ -619,18 +564,18 @@ export const useCanvasDragging = (
const renderBlocks = () => {
if (
- canvasRef.current &&
+ slidingArenaRef.current &&
isCurrentDraggedCanvas &&
canvasIsDragging &&
- canvasDrawRef.current
+ stickyCanvasRef.current
) {
- const canvasCtx: any = canvasDrawRef.current.getContext("2d");
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
canvasCtx.save();
canvasCtx.clearRect(
0,
0,
- canvasDrawRef.current.width,
- canvasDrawRef.current.height,
+ stickyCanvasRef.current.width,
+ stickyCanvasRef.current.height,
);
isUpdatingRows = false;
canvasCtx.transform(canvasZoomLevel, 0, 0, canvasZoomLevel, 0, 0);
@@ -645,14 +590,19 @@ export const useCanvasDragging = (
const drawBlockOnCanvas = (blockDimensions: WidgetDraggingBlock) => {
if (
- canvasDrawRef.current &&
- canvasRef.current &&
+ stickyCanvasRef.current &&
+ slidingArenaRef.current &&
scrollParent &&
isCurrentDraggedCanvas &&
canvasIsDragging
) {
- const canvasCtx: any = canvasDrawRef.current.getContext("2d");
- const topOffset = getCanvasTopOffset();
+ const canvasCtx: any = stickyCanvasRef.current.getContext("2d");
+ const topOffset = getAbsolutePixels(
+ stickyCanvasRef.current.style.top,
+ );
+ const leftOffset = getAbsolutePixels(
+ stickyCanvasRef.current.style.left,
+ );
const snappedXY = getSnappedXY(
snapColumnSpace,
snapRowSpace,
@@ -670,7 +620,9 @@ export const useCanvasDragging = (
blockDimensions.isNotColliding ? "rgb(104, 113, 239, 0.6)" : "red"
}`;
canvasCtx.fillRect(
- blockDimensions.left + (noPad ? 0 : CONTAINER_GRID_PADDING),
+ blockDimensions.left -
+ leftOffset +
+ (noPad ? 0 : CONTAINER_GRID_PADDING),
blockDimensions.top -
topOffset +
(noPad ? 0 : CONTAINER_GRID_PADDING),
@@ -684,7 +636,10 @@ export const useCanvasDragging = (
canvasCtx.setLineDash([3]);
canvasCtx.strokeStyle = "rgb(104, 113, 239)";
canvasCtx.strokeRect(
- snappedXY.X + strokeWidth + (noPad ? 0 : CONTAINER_GRID_PADDING),
+ snappedXY.X -
+ leftOffset +
+ strokeWidth +
+ (noPad ? 0 : CONTAINER_GRID_PADDING),
snappedXY.Y -
topOffset +
strokeWidth +
@@ -724,18 +679,29 @@ export const useCanvasDragging = (
};
const onMouseOver = (e: any) => onFirstMoveOnCanvas(e, true);
const initializeListeners = () => {
- canvasRef.current?.addEventListener("mousemove", onMouseMove, false);
- canvasRef.current?.addEventListener("mouseup", onMouseUp, false);
- scrollParent?.addEventListener("scroll", updateCanvasStyles, false);
+ slidingArenaRef.current?.addEventListener(
+ "mousemove",
+ onMouseMove,
+ false,
+ );
+ slidingArenaRef.current?.addEventListener(
+ "mouseup",
+ onMouseUp,
+ false,
+ );
scrollParent?.addEventListener("scroll", onScroll, false);
- canvasRef.current?.addEventListener("mouseover", onMouseOver, false);
- canvasRef.current?.addEventListener(
+ slidingArenaRef.current?.addEventListener(
+ "mouseover",
+ onMouseOver,
+ false,
+ );
+ slidingArenaRef.current?.addEventListener(
"mouseout",
resetCanvasState,
false,
);
- canvasRef.current?.addEventListener(
+ slidingArenaRef.current?.addEventListener(
"mouseleave",
resetCanvasState,
false,
@@ -745,33 +711,38 @@ export const useCanvasDragging = (
window.addEventListener("mousemove", captureMousePosition);
};
const startDragging = () => {
- if (canvasRef.current && canvasDrawRef.current && scrollParent) {
- const { height } = scrollParent.getBoundingClientRect();
- const { width } = canvasRef.current.getBoundingClientRect();
- const canvasCtx: any = canvasDrawRef.current.getContext("2d");
- canvasDrawRef.current.width = width * scale;
- canvasDrawRef.current.height = height * scale;
- canvasCtx.scale(scale, scale);
- updateCanvasStyles();
+ if (
+ slidingArenaRef.current &&
+ stickyCanvasRef.current &&
+ scrollParent
+ ) {
initializeListeners();
if (
(isChildOfCanvas || isNewWidgetInitialTargetCanvas) &&
- canvasRef.current
+ slidingArenaRef.current
) {
- canvasRef.current.style.zIndex = "2";
+ slidingArenaRef.current.style.zIndex = "2";
}
}
};
startDragging();
return () => {
- canvasRef.current?.removeEventListener("mousemove", onMouseMove);
- canvasRef.current?.removeEventListener("mouseup", onMouseUp);
- scrollParent?.removeEventListener("scroll", updateCanvasStyles);
+ slidingArenaRef.current?.removeEventListener(
+ "mousemove",
+ onMouseMove,
+ );
+ slidingArenaRef.current?.removeEventListener("mouseup", onMouseUp);
scrollParent?.removeEventListener("scroll", onScroll);
- canvasRef.current?.removeEventListener("mouseover", onMouseOver);
- canvasRef.current?.removeEventListener("mouseout", resetCanvasState);
- canvasRef.current?.removeEventListener(
+ slidingArenaRef.current?.removeEventListener(
+ "mouseover",
+ onMouseOver,
+ );
+ slidingArenaRef.current?.removeEventListener(
+ "mouseout",
+ resetCanvasState,
+ );
+ slidingArenaRef.current?.removeEventListener(
"mouseleave",
resetCanvasState,
);
diff --git a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
index 862e6c6d2170..2d8f7018fe9c 100644
--- a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
+++ b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
@@ -1,7 +1,7 @@
import { createImmerReducer } from "utils/AppsmithUtils";
import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
-import { XYCord } from "utils/hooks/useCanvasDragging";
+import { XYCord } from "pages/common/CanvasArenas/hooks/useCanvasDragging";
const initialState: CanvasSelectionState = {
isDraggingForSelection: false,
diff --git a/app/client/src/sagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
similarity index 96%
rename from app/client/src/sagas/DraggingCanvasSagas.ts
rename to app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
index 4e776701eb0a..8ae30c399b66 100644
--- a/app/client/src/sagas/DraggingCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
@@ -9,8 +9,6 @@ import {
FlattenedWidgetProps,
} from "reducers/entityReducers/canvasWidgetsReducer";
import { all, call, put, select, takeLatest } from "redux-saga/effects";
-import { WidgetDraggingUpdateParams } from "utils/hooks/useBlocksToBeDraggedOnCanvas";
-import { getWidget, getWidgets } from "./selectors";
import log from "loglevel";
import { cloneDeep } from "lodash";
import { updateAndSaveLayout, WidgetAddChild } from "actions/pageActions";
@@ -20,7 +18,9 @@ import { WidgetProps } from "widgets/BaseWidget";
import { getOccupiedSpacesSelectorForContainer } from "selectors/editorSelectors";
import { OccupiedSpace } from "constants/CanvasEditorConstants";
import { collisionCheckPostReflow } from "utils/reflowHookUtils";
-import { getUpdateDslAfterCreatingChild } from "./WidgetAdditionSagas";
+import { WidgetDraggingUpdateParams } from "pages/common/CanvasArenas/hooks/useBlocksToBeDraggedOnCanvas";
+import { getWidget, getWidgets } from "sagas/selectors";
+import { getUpdateDslAfterCreatingChild } from "sagas/WidgetAdditionSagas";
export type WidgetMoveParams = {
widgetId: string;
@@ -40,6 +40,7 @@ export type WidgetMoveParams = {
export function* getCanvasSizeAfterWidgetMove(
canvasWidgetId: string,
+ movedWidgetIds: string[],
movedWidgetsBottomRow: number,
) {
const canvasWidget: WidgetProps = yield select(getWidget, canvasWidgetId);
@@ -49,7 +50,7 @@ export function* getCanvasSizeAfterWidgetMove(
);
const canvasMinHeight = canvasWidget.minHeight || 0;
const newRows = calculateDropTargetRows(
- canvasWidgetId,
+ movedWidgetIds,
movedWidgetsBottomRow,
canvasMinHeight / GridDefaults.DEFAULT_GRID_ROW_HEIGHT - 1,
occupiedSpacesByChildren,
@@ -184,10 +185,11 @@ function* moveAndUpdateWidgets(
allWidgets: widgetsObj,
});
}, widgets);
-
+ const movedWidgetIds = draggedBlocksToUpdate.map((a) => a.widgetId);
const updatedCanvasBottomRow: number = yield call(
getCanvasSizeAfterWidgetMove,
canvasId,
+ movedWidgetIds,
bottomMostRowAfterMove,
);
if (updatedCanvasBottomRow) {
diff --git a/app/client/src/sagas/SelectionCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
similarity index 94%
rename from app/client/src/sagas/SelectionCanvasSagas.ts
rename to app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
index 346a05e8976c..ece6aecb12dd 100644
--- a/app/client/src/sagas/SelectionCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
@@ -3,14 +3,14 @@ import { OccupiedSpace } from "constants/CanvasEditorConstants";
import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import { isEqual } from "lodash";
-import { SelectedArenaDimensions } from "pages/common/CanvasSelectionArena";
+import { SelectedArenaDimensions } from "pages/common/CanvasArenas/CanvasSelectionArena";
import { all, cancel, put, select, take, takeLatest } from "redux-saga/effects";
import { getOccupiedSpaces } from "selectors/editorSelectors";
import { getSelectedWidgets } from "selectors/ui";
import { snapToGrid } from "utils/helpers";
import { areIntersecting } from "utils/WidgetPropsUtils";
import { WidgetProps } from "widgets/BaseWidget";
-import { getWidget } from "./selectors";
+import { getWidget } from "../selectors";
interface StartingSelectionState {
lastSelectedWidgets: string[];
@@ -46,7 +46,6 @@ function* selectAllWidgetsInAreaSaga(
snapRowSpace: number;
};
} = action.payload;
-
const { snapColumnSpace, snapRowSpace } = snapSpaces;
// we use snapToNextRow, snapToNextColumn to determine if the selection rectangle is inverted
// so to snap not to the next column or row like we usually do,
@@ -64,11 +63,12 @@ function* selectAllWidgetsInAreaSaga(
selectionArena.top + selectionArena.height,
);
- if (widgetOccupiedSpaces) {
+ if (widgetOccupiedSpaces && mainContainer) {
const mainContainerWidgets = widgetOccupiedSpaces[mainContainer.widgetId];
const widgets = Object.values(mainContainerWidgets || {});
const widgetsToBeSelected = widgets.filter((eachWidget) => {
const { bottom, left, right, top } = eachWidget;
+
return areIntersecting(
{ bottom, left, right, top },
{
@@ -106,7 +106,7 @@ function* startCanvasSelectionSaga(
const widgetId = actionPayload.payload.widgetId || MAIN_CONTAINER_WIDGET_ID;
const mainContainer: WidgetProps = yield select(getWidget, widgetId);
const lastSelectedWidgetsWithoutParent = lastSelectedWidgets.filter(
- (each) => each !== mainContainer.parentId,
+ (each) => mainContainer && each !== mainContainer.parentId,
);
const widgetOccupiedSpaces:
| {
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 824cfcf6cdcb..48e6efb104f1 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -98,7 +98,7 @@ import {
import { getSelectedWidgets } from "selectors/ui";
import { widgetSelectionSagas } from "./WidgetSelectionSagas";
import { DataTree } from "entities/DataTree/dataTreeFactory";
-import { getCanvasSizeAfterWidgetMove } from "./DraggingCanvasSagas";
+import { getCanvasSizeAfterWidgetMove } from "./CanvasSagas/DraggingCanvasSagas";
import widgetAdditionSagas from "./WidgetAdditionSagas";
import widgetDeletionSagas from "./WidgetDeletionSagas";
import { getReflow } from "selectors/widgetReflowSelectors";
@@ -140,6 +140,7 @@ export function* resizeSaga(resizeAction: ReduxAction<WidgetResize>) {
const updatedCanvasBottomRow: number = yield call(
getCanvasSizeAfterWidgetMove,
parentId,
+ [widgetId],
bottomRow,
);
if (updatedCanvasBottomRow) {
diff --git a/app/client/src/sagas/index.tsx b/app/client/src/sagas/index.tsx
index 856327350b8f..78e3b2d486cb 100644
--- a/app/client/src/sagas/index.tsx
+++ b/app/client/src/sagas/index.tsx
@@ -34,9 +34,9 @@ import websocketSagas from "./WebsocketSagas/WebsocketSagas";
import debuggerSagas from "./DebuggerSagas";
import tourSagas from "./TourSagas";
import notificationsSagas from "./NotificationsSagas";
-import selectionCanvasSagas from "./SelectionCanvasSagas";
import replaySaga from "./ReplaySaga";
-import draggingCanvasSagas from "./DraggingCanvasSagas";
+import selectionCanvasSagas from "./CanvasSagas/SelectionCanvasSagas";
+import draggingCanvasSagas from "./CanvasSagas/DraggingCanvasSagas";
import gitSyncSagas from "./GitSyncSagas";
import log from "loglevel";
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index 7882f4a3410f..f1d0e6e9f9d9 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -1,5 +1,4 @@
import { FetchPageResponse } from "api/PageApi";
-import { XYCord } from "utils/hooks/useCanvasDragging";
import { WidgetConfigProps } from "reducers/entityReducers/widgetConfigReducer";
import {
WidgetOperation,
@@ -14,6 +13,7 @@ import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReduc
import { transformDSL } from "./DSLMigrations";
import { WidgetType } from "./WidgetFactory";
import { DSLWidget } from "widgets/constants";
+import { XYCord } from "pages/common/CanvasArenas/hooks/useCanvasDragging";
export type WidgetOperationParams = {
operation: WidgetOperation;
diff --git a/app/client/src/widgets/ContainerWidget/widget/index.tsx b/app/client/src/widgets/ContainerWidget/widget/index.tsx
index 5edca5d1a5ae..8bec8d0ceda8 100644
--- a/app/client/src/widgets/ContainerWidget/widget/index.tsx
+++ b/app/client/src/widgets/ContainerWidget/widget/index.tsx
@@ -14,10 +14,10 @@ import BaseWidget, { WidgetProps, WidgetState } from "widgets/BaseWidget";
import { ValidationTypes } from "constants/WidgetValidation";
import WidgetsMultiSelectBox from "pages/Editor/WidgetsMultiSelectBox";
-import { CanvasSelectionArena } from "pages/common/CanvasSelectionArena";
+import { CanvasSelectionArena } from "pages/common/CanvasArenas/CanvasSelectionArena";
import { compact, map, sortBy } from "lodash";
-import { CanvasDraggingArena } from "pages/common/CanvasDraggingArena";
+import { CanvasDraggingArena } from "pages/common/CanvasArenas/CanvasDraggingArena";
import { getCanvasSnapRows } from "utils/WidgetPropsUtils";
class ContainerWidget extends BaseWidget<
ContainerWidgetProps<WidgetProps>,
diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts
index 6198ab6f883a..a9189f3baa8e 100644
--- a/app/client/test/sagas.ts
+++ b/app/client/test/sagas.ts
@@ -28,8 +28,8 @@ import { watchDatasourcesSagas } from "../src/sagas/DatasourcesSagas";
import { watchJSActionSagas } from "../src/sagas/JSActionSagas";
import tourSagas from "../src/sagas/TourSagas";
import notificationsSagas from "../src/sagas/NotificationsSagas";
-import selectionCanvasSagas from "../src/sagas/SelectionCanvasSagas";
-import draggingCanvasSagas from "../src/sagas/DraggingCanvasSagas";
+import selectionCanvasSagas from "../src/sagas/CanvasSagas/SelectionCanvasSagas";
+import draggingCanvasSagas from "../src/sagas/CanvasSagas/DraggingCanvasSagas";
import formEvaluationChangeListener from "../src/sagas/FormEvaluationSaga";
export const sagasToRunForTests = [
diff --git a/app/client/test/setup.ts b/app/client/test/setup.ts
index 8154e1f86d53..ceac3d56d573 100644
--- a/app/client/test/setup.ts
+++ b/app/client/test/setup.ts
@@ -5,6 +5,15 @@ export const server = setupServer(...handlers);
window.scrollTo = jest.fn();
Element.prototype.scrollIntoView = jest.fn();
Element.prototype.scrollBy = jest.fn();
+const mockObserveFn = () => {
+ return {
+ observe: jest.fn(),
+ unobserve: jest.fn(),
+ disconnect: jest.fn(),
+ };
+};
+
+window.IntersectionObserver = jest.fn().mockImplementation(mockObserveFn);
// establish API mocking before all tests
beforeAll(() => server.listen());
|
57903ec88cd5abd62dd4c705f4df4fdf162b7c00
|
2021-07-16 09:39:51
|
akash-codemonk
|
fix: Increase initial height for bottom tabs in action screen (#5894)
| false
|
Increase initial height for bottom tabs in action screen (#5894)
|
fix
|
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index 67240fc2e104..cfc42e2e6d0e 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -2481,7 +2481,7 @@ export const theme: Theme = {
},
pageContentWidth: 1224,
tabPanelHeight: 34,
- actionsBottomTabInitialHeight: "30%",
+ actionsBottomTabInitialHeight: "40%",
alert: {
info: {
color: Colors.AZURE_RADIANCE,
|
d037ada51d60c4186e4418ab661678da2c731ffa
|
2023-10-17 20:23:54
|
Rohan Arthur
|
feat: change the subtexts for options to profiling questions (#28161)
| false
|
change the subtexts for options to profiling questions (#28161)
|
feat
|
diff --git a/app/client/src/pages/setup/constants.ts b/app/client/src/pages/setup/constants.ts
index f7fd6bdeb726..15746b3297c3 100644
--- a/app/client/src/pages/setup/constants.ts
+++ b/app/client/src/pages/setup/constants.ts
@@ -56,22 +56,22 @@ type OptionTypeWithSubtext = OptionType & {
export const proficiencyOptions: OptionTypeWithSubtext[] = [
{
label: "Brand New",
- subtext: "Just dipping my toes 🌱 (Brand new to this)",
+ subtext: "I've never written code before.",
value: "Brand New",
},
{
label: "Novice",
- subtext: "Novice (Limited to no experience)",
+ subtext: "Learning the ropes. Basic understanding of coding concepts.",
value: "Novice",
},
{
label: "Intermediate",
- subtext: "Intermediate (Some coding adventures)",
+ subtext: "Can tackle moderately complex projects.",
value: "Intermediate",
},
{
label: "Advanced",
- subtext: "Advanced (Comfortable with programming quests)",
+ subtext: "Mastery in development. Experienced with complex coding tasks.",
value: "Advanced",
},
];
|
7a7169e8c3e0556692503a912706a1b1cc03bc6a
|
2022-04-03 22:13:20
|
Aishwarya-U-R
|
test: Cypress tests to include Deploy mode verifications + few flaky fixes (#12444)
| false
|
Cypress tests to include Deploy mode verifications + few flaky fixes (#12444)
|
test
|
diff --git a/app/client/cypress.json b/app/client/cypress.json
index 23ce69fcfea5..c6e54daa6061 100644
--- a/app/client/cypress.json
+++ b/app/client/cypress.json
@@ -1,8 +1,9 @@
{
"baseUrl": "https://dev.appsmith.com/",
- "defaultCommandTimeout": 20000,
+ "defaultCommandTimeout": 30000,
"requestTimeout": 21000,
- "pageLoadTimeout": 20000,
+ "responseTimeout": 30000,
+ "pageLoadTimeout": 40000,
"video": true,
"videoUploadOnPasses": false,
"reporter": "mochawesome",
diff --git a/app/client/cypress/fixtures/Select_table_dsl.json b/app/client/cypress/fixtures/Select_table_dsl.json
index f4b6c51adb68..bfea2d418442 100644
--- a/app/client/cypress/fixtures/Select_table_dsl.json
+++ b/app/client/cypress/fixtures/Select_table_dsl.json
@@ -1,254 +1,240 @@
{
- "dsl": {
- "widgetName": "MainContainer",
- "backgroundColor": "none",
- "rightColumn": 1160,
- "snapColumns": 64,
- "detachFromLayout": true,
- "widgetId": "0",
- "topRow": 0,
- "bottomRow": 1180,
- "containerStyle": "none",
- "snapRows": 128,
- "parentRowSpace": 1,
- "type": "CANVAS_WIDGET",
- "canExtend": true,
- "version": 47,
- "minHeight": 930,
- "parentColumnSpace": 1,
- "dynamicBindingPathList": [],
- "leftColumn": 0,
- "children": [
- {
- "widgetName": "Table2",
- "defaultPageSize": 0,
- "columnOrder": [
- "step",
- "task",
- "status",
- "action"
- ],
- "isVisibleDownload": true,
- "displayName": "Table",
- "iconSVG": "/static/media/icon.db8a9cbd.svg",
- "topRow": 61,
- "bottomRow": 89,
- "isSortable": true,
- "parentRowSpace": 10,
- "type": "TABLE_WIDGET",
- "defaultSelectedRow": "0",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 17.265625,
- "dynamicBindingPathList": [
- {
- "key": "primaryColumns.step.computedValue"
- },
- {
- "key": "primaryColumns.task.computedValue"
- },
- {
- "key": "primaryColumns.status.computedValue"
- },
- {
- "key": "primaryColumns.action.computedValue"
- }
- ],
- "leftColumn": 2,
- "primaryColumns": {
- "step": {
- "index": 0,
- "width": 150,
- "id": "step",
- "horizontalAlignment": "LEFT",
- "verticalAlignment": "CENTER",
- "columnType": "text",
- "textSize": "PARAGRAPH",
- "enableFilter": true,
- "enableSort": true,
- "isVisible": true,
- "isCellVisible": true,
- "isDerived": false,
- "label": "step",
- "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.step))}}",
- "buttonColor": "#03B365",
- "menuColor": "#03B365",
- "labelColor": "#FFFFFF"
- },
- "task": {
- "index": 1,
- "width": 150,
- "id": "task",
- "horizontalAlignment": "LEFT",
- "verticalAlignment": "CENTER",
- "columnType": "text",
- "textSize": "PARAGRAPH",
- "enableFilter": true,
- "enableSort": true,
- "isVisible": true,
- "isCellVisible": true,
- "isDerived": false,
- "label": "task",
- "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.task))}}",
- "buttonColor": "#03B365",
- "menuColor": "#03B365",
- "labelColor": "#FFFFFF"
- },
- "status": {
- "index": 2,
- "width": 150,
- "id": "status",
- "horizontalAlignment": "LEFT",
- "verticalAlignment": "CENTER",
- "columnType": "text",
- "textSize": "PARAGRAPH",
- "enableFilter": true,
- "enableSort": true,
- "isVisible": true,
- "isCellVisible": true,
- "isDerived": false,
- "label": "status",
- "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.status))}}",
- "buttonColor": "#03B365",
- "menuColor": "#03B365",
- "labelColor": "#FFFFFF"
- },
- "action": {
- "index": 3,
- "width": 150,
- "id": "action",
- "horizontalAlignment": "LEFT",
- "verticalAlignment": "CENTER",
- "columnType": "button",
- "textSize": "PARAGRAPH",
- "enableFilter": true,
- "enableSort": true,
- "isVisible": true,
- "isCellVisible": true,
- "isDisabled": false,
- "isDerived": false,
- "label": "action",
- "onClick": "{{currentRow.step === '#1' ? showAlert('Done', 'success') : currentRow.step === '#2' ? navigateTo('https://docs.appsmith.com/core-concepts/connecting-to-data-sources/querying-a-database',undefined,'NEW_WINDOW') : navigateTo('https://docs.appsmith.com/core-concepts/displaying-data-read/display-data-tables',undefined,'NEW_WINDOW')}}",
- "computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.action))}}",
- "buttonColor": "#03B365",
- "menuColor": "#03B365",
- "labelColor": "#FFFFFF"
- }
- },
- "delimiter": ",",
- "key": "wk470tvqt8",
- "derivedColumns": {},
- "rightColumn": 36,
- "textSize": "PARAGRAPH",
- "widgetId": "csw61cbjhr",
- "isVisibleFilters": true,
- "tableData": [
- {
- "step": "#1",
- "task": "Drop a table",
- "status": "✅",
- "action": ""
- },
- {
- "step": "#2",
- "task": "Create a query fetch_users with the Mock DB",
- "status": "--",
- "action": ""
- },
- {
- "step": "#3",
- "task": "Bind the query using => fetch_users.data",
- "status": "--",
- "action": ""
- }
- ],
- "isVisible": true,
- "label": "Data",
- "searchKey": "",
- "enableClientSideSearch": true,
- "version": 3,
- "totalRecordsCount": 0,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "horizontalAlignment": "LEFT",
- "isVisibleSearch": true,
- "isVisiblePagination": true,
- "verticalAlignment": "CENTER",
- "columnSizeMap": {
- "task": 245,
- "step": 62,
- "status": 75
- }
- },
- {
- "widgetName": "Select1",
- "isFilterable": false,
- "displayName": "Select",
- "iconSVG": "/static/media/icon.bd99caba.svg",
- "labelText": "Label",
- "topRow": 80,
- "bottomRow": 86.9,
- "parentRowSpace": 10,
- "type": "SELECT_WIDGET",
- "serverSideFiltering": false,
- "hideCard": false,
- "defaultOptionValue": "{\n \"label\": \"{{Table2.selectedRow.step}}\",\n \"value\": \"{{Table2.selectedRow.step}}\"\n }",
- "selectionType": "SINGLE_SELECT",
- "animateLoading": true,
- "parentColumnSpace": 17.265625,
- "dynamicTriggerPathList": [],
- "leftColumn": 39,
- "dynamicBindingPathList": [
- {
- "key": "defaultOptionValue"
- }
- ],
- "options": "[\n {\n \"label\": \"#1\",\n \"value\": \"#1\"\n },\n {\n \"label\": \"#2\",\n \"value\": \"#2\"\n }\n]",
- "placeholderText": "Select option",
- "isDisabled": false,
- "key": "vzrxeimovl",
- "isRequired": true,
- "rightColumn": 59,
- "widgetId": "ddz5gr36zl",
- "isVisible": true,
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false
- },
- {
- "widgetName": "Text1",
- "displayName": "Text",
- "iconSVG": "/static/media/icon.97c59b52.svg",
- "topRow": 112,
- "bottomRow": 116,
- "parentRowSpace": 10,
- "type": "TEXT_WIDGET",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 17.265625,
- "dynamicTriggerPathList": [],
- "leftColumn": 5,
- "dynamicBindingPathList": [
- {
- "key": "text"
- }
- ],
- "text": "{{Select1.selectedOptionValue}}",
- "key": "5z14mymmyz",
- "rightColumn": 21,
- "textAlign": "LEFT",
- "widgetId": "tvw5xfds57",
- "isVisible": true,
- "fontStyle": "BOLD",
- "textColor": "#231F20",
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "fontSize": "PARAGRAPH"
- }
- ]
- }
+ "dsl": {
+ "widgetName": "MainContainer",
+ "backgroundColor": "none",
+ "rightColumn": 453,
+ "snapColumns": 64,
+ "detachFromLayout": true,
+ "widgetId": "0",
+ "topRow": 0,
+ "bottomRow": 1320,
+ "containerStyle": "none",
+ "snapRows": 125,
+ "parentRowSpace": 1,
+ "type": "CANVAS_WIDGET",
+ "canExtend": true,
+ "version": 54,
+ "minHeight": 1292,
+ "parentColumnSpace": 1,
+ "dynamicBindingPathList": [
+
+ ],
+ "leftColumn": 0,
+ "children": [
+ {
+ "widgetName": "Select1",
+ "isFilterable": true,
+ "displayName": "Select",
+ "iconSVG": "/static/media/icon.bd99caba.svg",
+ "labelText": "",
+ "topRow": 16,
+ "bottomRow": 20,
+ "parentRowSpace": 10,
+ "type": "SELECT_WIDGET",
+ "serverSideFiltering": false,
+ "hideCard": false,
+ "defaultOptionValue": "{\n \"label\": \"{{Table1.selectedRow.step}}\",\n \"value\": \"{{Table1.selectedRow.step}}\"\n }",
+ "animateLoading": true,
+ "parentColumnSpace": 21.203125,
+ "dynamicTriggerPathList": [
+
+ ],
+ "leftColumn": 39,
+ "dynamicBindingPathList": [
+ {
+ "key": "defaultOptionValue"
+ }
+ ],
+ "options": "[\n {\n \"label\": \"#1\",\n \"value\": \"#1\"\n },\n {\n \"label\": \"#2\",\n \"value\": \"#2\"\n }\n]",
+ "placeholderText": "Select option",
+ "isDisabled": false,
+ "key": "2zzcijdy0f",
+ "isRequired": false,
+ "rightColumn": 59,
+ "widgetId": "uiu9bz9s1b",
+ "isVisible": true,
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false
+ },
+ {
+ "isVisible": true,
+ "animateLoading": true,
+ "defaultSelectedRow": "0",
+ "label": "Data",
+ "widgetName": "Table1",
+ "searchKey": "",
+ "textSize": "PARAGRAPH",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "totalRecordsCount": 0,
+ "defaultPageSize": 0,
+ "dynamicBindingPathList": [
+ {
+ "key": "primaryColumns.step.computedValue"
+ },
+ {
+ "key": "primaryColumns.task.computedValue"
+ },
+ {
+ "key": "primaryColumns.status.computedValue"
+ },
+ {
+ "key": "primaryColumns.action.computedValue"
+ }
+ ],
+ "primaryColumns": {
+ "step": {
+ "index": 0,
+ "width": 150,
+ "id": "step",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "PARAGRAPH",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "step",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.step))}}"
+ },
+ "task": {
+ "index": 1,
+ "width": 150,
+ "id": "task",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "PARAGRAPH",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "task",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.task))}}"
+ },
+ "status": {
+ "index": 2,
+ "width": 150,
+ "id": "status",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "PARAGRAPH",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "status",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.status))}}"
+ },
+ "action": {
+ "index": 3,
+ "width": 150,
+ "id": "action",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "PARAGRAPH",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "action",
+ "computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.action))}}"
+ }
+ },
+ "derivedColumns": {
+ },
+ "tableData": "[\n {\n \"step\": \"#1\",\n \"task\": \"Drop a table\",\n \"status\": \"✅\",\n \"action\": \"\"\n },\n {\n \"step\": \"#2\",\n \"task\": \"Create a query fetch_users with the Mock DB\",\n \"status\": \"--\",\n \"action\": \"\"\n },\n {\n \"step\": \"#3\",\n \"task\": \"Bind the query using => fetch_users.data\",\n \"status\": \"--\",\n \"action\": \"\"\n }\n]",
+ "columnSizeMap": {
+ "task": 245,
+ "step": 62,
+ "status": 75
+ },
+ "columnOrder": [
+ "step",
+ "task",
+ "status",
+ "action"
+ ],
+ "enableClientSideSearch": true,
+ "isVisibleSearch": true,
+ "isVisibleFilters": true,
+ "isVisibleDownload": true,
+ "isVisiblePagination": true,
+ "isSortable": true,
+ "delimiter": ",",
+ "version": 3,
+ "type": "TABLE_WIDGET",
+ "hideCard": false,
+ "displayName": "Table",
+ "key": "t22odw8rfj",
+ "iconSVG": "/static/media/icon.db8a9cbd.svg",
+ "widgetId": "f427h0lu92",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "parentColumnSpace": 16.703125,
+ "parentRowSpace": 10,
+ "leftColumn": 6,
+ "rightColumn": 34,
+ "topRow": 9,
+ "bottomRow": 37,
+ "parentId": "0",
+ "dynamicTriggerPathList": [
+
+ ],
+ "dynamicPropertyPathList": [
+
+ ]
+ },
+ {
+ "isVisible": true,
+ "text": "{{Select1.selectedOptionValue}}",
+ "fontSize": "PARAGRAPH",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text1",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "displayName": "Text",
+ "key": "cdb5qeydze",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "widgetId": "5qb4nik2gy",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "parentColumnSpace": 16.703125,
+ "parentRowSpace": 10,
+ "leftColumn": 39,
+ "rightColumn": 59,
+ "topRow": 33,
+ "bottomRow": 37,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "text"
+ }
+ ],
+ "dynamicTriggerPathList": [
+
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/onPageLoadActionsDsl.json b/app/client/cypress/fixtures/onPageLoadActionsDsl.json
index ee4491dd98e1..8d3c4b68dddf 100644
--- a/app/client/cypress/fixtures/onPageLoadActionsDsl.json
+++ b/app/client/cypress/fixtures/onPageLoadActionsDsl.json
@@ -1,166 +1,142 @@
{
"dsl": {
- "widgetName": "MainContainer",
- "backgroundColor": "none",
- "rightColumn": 1091,
- "snapColumns": 64,
- "detachFromLayout": true,
- "widgetId": "0",
- "topRow": 0,
- "bottomRow": 1290,
- "containerStyle": "none",
- "snapRows": 125,
- "parentRowSpace": 1,
- "type": "CANVAS_WIDGET",
- "canExtend": true,
- "version": 47,
- "minHeight": 1292,
- "parentColumnSpace": 1,
- "dynamicBindingPathList": [
-
- ],
- "leftColumn": 0,
- "children": [
- {
- "widgetName": "Image1",
- "displayName": "Image",
- "iconSVG": "/static/media/icon.52d8fb96.svg",
- "topRow": 8,
- "bottomRow": 38,
- "parentRowSpace": 10,
- "type": "IMAGE_WIDGET",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 16.859375,
- "dynamicTriggerPathList": [
-
- ],
- "imageShape": "RECTANGLE",
- "leftColumn": 8,
- "dynamicBindingPathList": [
- {
- "key": "image"
- }
- ],
- "defaultImage": "https://assets.appsmith.com/widgets/default.png",
- "key": "nyx7m0wdr7",
- "image": "{{RandomFlora.data}}",
- "rightColumn": 54,
- "objectFit": "contain",
- "widgetId": "cj15t4i2xj",
- "isVisible": true,
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "maxZoomLevel": 1,
- "enableDownload": false,
- "enableRotation": false
- },
- {
- "widgetName": "Text1",
- "displayName": "Text",
- "iconSVG": "/static/media/icon.97c59b52.svg",
- "topRow": 59,
- "bottomRow": 79,
- "parentRowSpace": 10,
- "type": "TEXT_WIDGET",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 16.859375,
- "dynamicTriggerPathList": [
-
- ],
- "leftColumn": 12,
- "dynamicBindingPathList": [
- {
- "key": "text"
- }
- ],
- "text": "{{InspiringQuotes.data.quote.body}}\n--\n{{InspiringQuotes.data.quote.author}}\n",
- "key": "jd7u8cfobk",
- "rightColumn": 40,
- "textAlign": "LEFT",
- "widgetId": "89gapjd0ab",
- "isVisible": true,
- "fontStyle": "BOLD",
- "textColor": "#231F20",
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "fontSize": "PARAGRAPH"
- },
- {
- "widgetName": "Text2",
- "displayName": "Text",
- "iconSVG": "/static/media/icon.97c59b52.svg",
- "topRow": 39,
- "bottomRow": 59,
- "parentRowSpace": 10,
- "type": "TEXT_WIDGET",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 16.859375,
- "dynamicTriggerPathList": [
-
- ],
- "leftColumn": 30,
- "dynamicBindingPathList": [
- {
- "key": "text"
- }
- ],
- "text": "Hi, here is {{RandomUser.data.results[0].name.first}} & I'm {{RandomUser.data.results[0].dob.age}}'yo\nI live in {{RandomUser.data.results[0].location.country}}\nMy Suggestion : {{Suggestions.data.activity}}\n\nI'm {{Genderize.data.gender}}",
- "key": "s2t8ibck1v",
- "rightColumn": 54,
- "textAlign": "LEFT",
- "widgetId": "lmps8ycnp3",
- "isVisible": true,
- "fontStyle": "BOLD",
- "textColor": "#231F20",
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "fontSize": "PARAGRAPH"
- },
- {
- "widgetName": "Image2",
- "displayName": "Image",
- "iconSVG": "/static/media/icon.52d8fb96.svg",
- "topRow": 40,
- "bottomRow": 59,
- "parentRowSpace": 10,
- "type": "IMAGE_WIDGET",
- "hideCard": false,
- "animateLoading": true,
- "parentColumnSpace": 16.859375,
- "dynamicTriggerPathList": [
-
- ],
- "imageShape": "RECTANGLE",
- "leftColumn": 8,
- "dynamicBindingPathList": [
- {
- "key": "image"
- }
- ],
- "defaultImage": "https://assets.appsmith.com/widgets/default.png",
- "key": "agtoehwrk0",
- "image": "{{RandomUser.data.results[0].picture.large}}",
- "rightColumn": 27,
- "objectFit": "contain",
- "widgetId": "pe4eepcumg",
- "isVisible": true,
- "version": 1,
- "parentId": "0",
- "renderMode": "CANVAS",
- "isLoading": false,
- "maxZoomLevel": 1,
- "enableDownload": false,
- "enableRotation": false
- }
- ]
- }
+ "widgetName": "MainContainer",
+ "backgroundColor": "none",
+ "rightColumn": 374,
+ "snapColumns": 64,
+ "detachFromLayout": true,
+ "widgetId": "0",
+ "topRow": 0,
+ "bottomRow": 1290,
+ "containerStyle": "none",
+ "snapRows": 125,
+ "parentRowSpace": 1,
+ "type": "CANVAS_WIDGET",
+ "canExtend": true,
+ "version": 54,
+ "minHeight": 1292,
+ "parentColumnSpace": 1,
+ "dynamicBindingPathList": [],
+ "leftColumn": 0,
+ "children": [
+ {
+ "widgetName": "Image1",
+ "displayName": "Image",
+ "iconSVG": "/static/media/icon.52d8fb96.svg",
+ "topRow": 8,
+ "bottomRow": 38,
+ "parentRowSpace": 10,
+ "type": "IMAGE_WIDGET",
+ "hideCard": false,
+ "animateLoading": true,
+ "parentColumnSpace": 16.859375,
+ "dynamicTriggerPathList": [],
+ "imageShape": "RECTANGLE",
+ "leftColumn": 8,
+ "dynamicBindingPathList": [],
+ "defaultImage": "https://assets.appsmith.com/widgets/default.png",
+ "key": "nyx7m0wdr7",
+ "image": "",
+ "rightColumn": 54,
+ "objectFit": "contain",
+ "widgetId": "cj15t4i2xj",
+ "isVisible": true,
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "maxZoomLevel": 1,
+ "enableDownload": false,
+ "enableRotation": false
+ },
+ {
+ "widgetName": "Text1",
+ "displayName": "Text",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "topRow": 59,
+ "bottomRow": 79,
+ "parentRowSpace": 10,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "animateLoading": true,
+ "parentColumnSpace": 16.859375,
+ "dynamicTriggerPathList": [],
+ "overflow": "NONE",
+ "leftColumn": 12,
+ "dynamicBindingPathList": [],
+ "text": "",
+ "key": "jd7u8cfobk",
+ "rightColumn": 40,
+ "textAlign": "LEFT",
+ "widgetId": "89gapjd0ab",
+ "isVisible": true,
+ "fontStyle": "BOLD",
+ "textColor": "#231F20",
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "fontSize": "PARAGRAPH"
+ },
+ {
+ "widgetName": "Text2",
+ "displayName": "Text",
+ "iconSVG": "/static/media/icon.97c59b52.svg",
+ "topRow": 39,
+ "bottomRow": 59,
+ "parentRowSpace": 10,
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "animateLoading": true,
+ "parentColumnSpace": 16.859375,
+ "dynamicTriggerPathList": [],
+ "overflow": "NONE",
+ "leftColumn": 30,
+ "dynamicBindingPathList": [],
+ "text": "",
+ "key": "s2t8ibck1v",
+ "rightColumn": 54,
+ "textAlign": "LEFT",
+ "widgetId": "lmps8ycnp3",
+ "isVisible": true,
+ "fontStyle": "BOLD",
+ "textColor": "#231F20",
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "fontSize": "PARAGRAPH"
+ },
+ {
+ "widgetName": "Image2",
+ "displayName": "Image",
+ "iconSVG": "/static/media/icon.52d8fb96.svg",
+ "topRow": 40,
+ "bottomRow": 59,
+ "parentRowSpace": 10,
+ "type": "IMAGE_WIDGET",
+ "hideCard": false,
+ "animateLoading": true,
+ "parentColumnSpace": 16.859375,
+ "dynamicTriggerPathList": [],
+ "imageShape": "RECTANGLE",
+ "leftColumn": 8,
+ "dynamicBindingPathList": [],
+ "defaultImage": "https://assets.appsmith.com/widgets/default.png",
+ "key": "agtoehwrk0",
+ "image": "",
+ "rightColumn": 27,
+ "objectFit": "contain",
+ "widgetId": "pe4eepcumg",
+ "isVisible": true,
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "maxZoomLevel": 1,
+ "enableDownload": false,
+ "enableRotation": false
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/paramsDsl.json b/app/client/cypress/fixtures/paramsDsl.json
index 64da8332bd68..9110d15322c3 100644
--- a/app/client/cypress/fixtures/paramsDsl.json
+++ b/app/client/cypress/fixtures/paramsDsl.json
@@ -168,7 +168,7 @@
"isFilterable": false,
"displayName": "Select",
"iconSVG": "/static/media/icon.bd99caba.svg",
- "labelText": "Label",
+ "labelText": "Select an option to populate its records in Table!",
"topRow": 5,
"bottomRow": 12,
"parentRowSpace": 10,
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/AForceMigration_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/Application/AForceMigration_Spec.ts
index 113008cea3d2..32874f1b69af 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Application/AForceMigration_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/Application/AForceMigration_Spec.ts
@@ -26,8 +26,7 @@ describe("AForce - Community Issues page validations", function () {
});
it("2. Validate table navigation with Server Side pagination enabled with Default selected row", () => {
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Table1")
+ ee.SelectEntityByName("Table1", 'WIDGETS')
agHelper.AssertExistingToggleState("serversidepagination", 'checked')
agHelper.EvaluateExistingPropertyFieldValue("Default Selected Row")
@@ -71,8 +70,7 @@ describe("AForce - Community Issues page validations", function () {
agHelper.NavigateBacktoEditor()
table.WaitUntilTableLoad()
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Table1")
+ ee.SelectEntityByName("Table1", 'WIDGETS')
agHelper.ToggleOnOrOff('serversidepagination', 'Off')
agHelper.DeployApp()
table.WaitUntilTableLoad()
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_MultiPart_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_MultiPart_Spec.ts
index f60173df5654..58524521ca0e 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_MultiPart_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ApiPaneTests/API_MultiPart_Spec.ts
@@ -9,20 +9,20 @@ let agHelper = ObjectsRegistry.AggregateHelper,
describe("Validate API request body panel", () => {
it("1. Check whether input and type dropdown selector exist when multi-part is selected", () => {
apiPage.CreateApi("FirstAPI", 'POST');
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('FORM_URLENCODED')
- apiPage.CheckElementPresence(apiPage._bodyKey(0))
- apiPage.CheckElementPresence(apiPage._bodyValue(0))
+ agHelper.AssertElementPresence(apiPage._bodyKey(0))
+ agHelper.AssertElementPresence(apiPage._bodyValue(0))
apiPage.SelectSubTab('MULTIPART_FORM_DATA')
- apiPage.CheckElementPresence(apiPage._bodyKey(0))
- apiPage.CheckElementPresence(apiPage._bodyTypeDropdown)
- apiPage.CheckElementPresence(apiPage._bodyValue(0))
+ agHelper.AssertElementPresence(apiPage._bodyKey(0))
+ agHelper.AssertElementPresence(apiPage._bodyTypeDropdown)
+ agHelper.AssertElementPresence(apiPage._bodyValue(0))
agHelper.ActionContextMenuWithInPane('Delete')
});
it("2. Checks whether No body error message is shown when None API body content type is selected", function () {
apiPage.CreateApi("FirstAPI", 'GET');
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('NONE')
cy.get(apiPage._noBodyMessageDiv).contains(apiPage._noBodyMessage);
agHelper.ActionContextMenuWithInPane('Delete')
@@ -34,7 +34,7 @@ describe("Validate API request body panel", () => {
key: "content-type",
value: "application/json",
});
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('FORM_URLENCODED')
apiPage.ValidateHeaderParams({
key: "content-type",
@@ -49,7 +49,7 @@ describe("Validate API request body panel", () => {
key: "content-type",
value: "application/json",
});
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('MULTIPART_FORM_DATA')
apiPage.ValidateHeaderParams({
key: "content-type",
@@ -60,7 +60,7 @@ describe("Validate API request body panel", () => {
it("5. Checks whether content type 'FORM_URLENCODED' is preserved when user selects None API body content type", function () {
apiPage.CreateApi("FirstAPI", 'POST');
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('FORM_URLENCODED')
apiPage.SelectSubTab('NONE')
apiPage.ValidateHeaderParams({
@@ -72,7 +72,7 @@ describe("Validate API request body panel", () => {
it("6. Checks whether content type 'MULTIPART_FORM_DATA' is preserved when user selects None API body content type", function () {
apiPage.CreateApi("FirstAPI", 'POST');
- apiPage.SelectAPITab('Body')
+ apiPage.SelectPaneTab('Body')
apiPage.SelectSubTab('MULTIPART_FORM_DATA')
apiPage.SelectSubTab('NONE')
apiPage.ValidateHeaderParams({
@@ -82,7 +82,7 @@ describe("Validate API request body panel", () => {
agHelper.ActionContextMenuWithInPane('Delete')
});
- it("7. Checks MultiPart form data for a File Type upload", () => {
+ it("7. Checks MultiPart form data for a File Type upload + Bug 12476", () => {
let imageNameToUpload = "ConcreteHouse.jpg";
cy.fixture('multiPartFormDataDsl').then((val: any) => {
agHelper.AddDsl(val)
@@ -100,13 +100,17 @@ describe("Validate API request body panel", () => {
}
}`, true, true, false);
- ee.expandCollapseEntity("WIDGETS")//to expand widgets
- ee.SelectEntityByName("FilePicker1");
+ ee.SelectEntityByName("FilePicker1", 'WIDGETS');
jsEditor.EnterJSContext('onfilesselected', `{{JSObject1.upload()}}`, true, true);
ee.SelectEntityByName("Image1");
jsEditor.EnterJSContext('image', '{{CloudinaryUploadApi.data.url}}')
+ ee.SelectEntityByName("CloudinaryUploadApi", 'QUERIES/JS');
+
+ apiPage.DisableOnPageLoadRun()//Bug 12476
+ ee.SelectEntityByName("Page1");
+ agHelper.DeployApp(locator._spanButton('Select Files'))
agHelper.ClickButton('Select Files');
agHelper.UploadFile(imageNameToUpload)
agHelper.ValidateToastMessage("Image uploaded to Cloudinary successfully")
@@ -115,22 +119,24 @@ describe("Validate API request body panel", () => {
.invoke('attr', 'src').then($src => {
expect($src).not.eq("https://assets.appsmith.com/widgets/default.png")
})
- apiPage.CheckElementPresence(locator._spanButton('Select Files'))//verifying if reset!
-
+ agHelper.AssertElementPresence(locator._spanButton('Select Files'))//verifying if reset!
+ agHelper.NavigateBacktoEditor()
});
it("8. Checks MultiPart form data for a Array Type upload results in API error", () => {
let imageNameToUpload = "AAAFlowerVase.jpeg";
- ee.expandCollapseEntity("QUERIES/JS")//to expand widgets
- ee.SelectEntityByName("CloudinaryUploadApi");
+ ee.SelectEntityByName("CloudinaryUploadApi", 'QUERIES/JS');
apiPage.EnterBodyFormData('MULTIPART_FORM_DATA', 'file', '{{FilePicker1.files[0]}}', 'Array', true)
- ee.SelectEntityByName("FilePicker1");
+ ee.SelectEntityByName("FilePicker1", 'WIDGETS');
agHelper.ClickButton('Select Files');
agHelper.UploadFile(imageNameToUpload, false)
- agHelper.ValidateToastMessage("CloudinaryUploadApi failed to execute")
- apiPage.CheckElementPresence(locator._spanButton('Select Files'))//verifying if reset!
agHelper.AssertDebugError("Execution failed with status 400 BAD_REQUEST", '{"error":{"message":"Unsupported source URL: {\\"type\\":\\"image/jpeg\\"')
+ agHelper.DeployApp(locator._spanButton('Select Files'))
+ agHelper.ClickButton('Select Files');
+ agHelper.UploadFile(imageNameToUpload, false)
+ agHelper.ValidateToastMessage("CloudinaryUploadApi failed to execute")
+ agHelper.AssertElementPresence(locator._spanButton('Select Files'))//verifying if reset in case of failure!
});
});
\ No newline at end of file
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 72980b835901..f7331bbaa7f7 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
@@ -6,12 +6,14 @@ describe("Checks for analytics initialization", function() {
it("Should check analytics is not initialised when enableTelemtry is false", function() {
cy.visit("/applications");
cy.reload();
- cy.wait(6000);
- cy.wait("@getUser").should(
- "have.nested.property",
- "response.body.data.enableTelemetry",
- false,
- );
+ cy.wait(3000);
+ cy.wait("@getMe")
+ .wait("@getMe")
+ .should(
+ "have.nested.property",
+ "response.body.data.enableTelemetry",
+ false,
+ );
cy.window().then((window) => {
expect(window.analytics).to.be.equal(undefined);
});
@@ -35,7 +37,7 @@ describe("Checks for analytics initialization", function() {
cy.visit("/applications");
cy.reload();
cy.wait(3000);
- cy.wait("@getUser");
+ cy.wait("@getMe");
cy.window().then((window) => {
expect(window.smartlook).to.be.equal(undefined);
});
@@ -59,7 +61,7 @@ describe("Checks for analytics initialization", function() {
cy.visit("/applications");
cy.reload();
cy.wait(3000);
- cy.wait("@getUser");
+ cy.wait("@getMe");
cy.window().then((window) => {
expect(window.Sentry).to.be.equal(undefined);
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/BindButton_Text_WithRecaptcha_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/BindButton_Text_WithRecaptcha_spec.js
index ae9b194ad397..e83bf12b7fa0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/BindButton_Text_WithRecaptcha_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/BindButton_Text_WithRecaptcha_spec.js
@@ -1,9 +1,4 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-const formWidgetsPage = require("../../../../locators/FormWidgets.json");
const dsl = require("../../../../fixtures/buttonRecaptchaDsl.json");
-const pages = require("../../../../locators/Pages.json");
-const widgetsPage = require("../../../../locators/Widgets.json");
-const publish = require("../../../../locators/publishWidgetspage.json");
const testdata = require("../../../../fixtures/testdata.json");
describe("Binding the Button widget with Text widget using Recpatcha v3", function() {
@@ -11,7 +6,7 @@ describe("Binding the Button widget with Text widget using Recpatcha v3", functi
cy.addDsl(dsl);
});
- it("Validate the Button binding with Text Widget with Recaptcha Token", function() {
+ it("1. Validate the Button binding with Text Widget with Recaptcha token with empty key", function() {
cy.get("button")
.contains("Submit")
.should("be.visible")
@@ -69,7 +64,7 @@ describe("Binding the Button widget with Text widget using Recpatcha v3", functi
})
});
*/
- it("Validate the Button binding with Text Widget with Recaptcha Token with v2Key", function() {
+ it("2. Validate the Button binding with Text Widget with Recaptcha Token with v2Key", function() {
cy.get("button")
.contains("Submit")
.should("be.visible")
@@ -106,7 +101,7 @@ describe("Binding the Button widget with Text widget using Recpatcha v3", functi
});
});
- it("Validate the Button binding with Text Widget with Recaptcha Token with v3Key", function() {
+ it("3. Validate the Button binding with Text Widget with Recaptcha Token with v3Key", function() {
cy.get("button")
.contains("Submit")
.should("be.visible")
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToInput_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToInput_Spec.ts
index 4ba32c21ade0..d96978988d78 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToInput_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToInput_Spec.ts
@@ -1,9 +1,9 @@
import { ObjectsRegistry } from "../../../../support/Objects/Registry"
let agHelper = ObjectsRegistry.AggregateHelper,
- ee = ObjectsRegistry.EntityExplorer,
- jsEditor = ObjectsRegistry.JSEditor,
- locator = ObjectsRegistry.CommonLocators;
+ ee = ObjectsRegistry.EntityExplorer,
+ jsEditor = ObjectsRegistry.JSEditor,
+ locator = ObjectsRegistry.CommonLocators;
describe("Validate Create Api and Bind to Table widget via JSObject", () => {
before(() => {
@@ -12,15 +12,24 @@ describe("Validate Create Api and Bind to Table widget via JSObject", () => {
});
});
+ let jsOjbNameReceived: any;
+
it("1. Bind Input widget with JSObject", function () {
jsEditor.CreateJSObject('return "Success";', false);
ee.expandCollapseEntity("WIDGETS")//to expand widgets
ee.expandCollapseEntity("Form1")
ee.SelectEntityByName("Input2")
+ cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'Hello');//Before mapping JSObject value of input
cy.get("@jsObjName").then((jsObjName) => {
+ jsOjbNameReceived = jsObjName;
jsEditor.EnterJSContext("defaulttext", "{{" + jsObjName + ".myFun1()}}")
});
- cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'Success');
+ cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'Success');//After mapping JSObject value of input
+ agHelper.DeployApp(locator._inputWidgetInDeployed)
+ cy.get(locator._inputWidgetInDeployed).first().should('have.value', 'Hello')
+ cy.get(locator._inputWidgetInDeployed).last().should('have.value', 'Success')
+ agHelper.NavigateBacktoEditor()
+
// cy.get(locator._inputWidget)
// .last()
// .within(() => {
@@ -30,19 +39,25 @@ describe("Validate Create Api and Bind to Table widget via JSObject", () => {
// });
});
- it.skip("2. Bug 10284, 11529 - Verify timeout issue with running JS Objects", function () {
- jsEditor.CreateJSObject('return "Success";', true);
- ee.expandCollapseEntity("Form1")
- ee.SelectEntityByName("Input2")
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext("defaulttext", "{{" + jsObjName + ".myFun1()}}")
- });
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'Success');
+ it.skip("2. Bug 10284, 11529 - Verify autosave while editing JSObj & reference changes when JSObj is mapped", function () {
+ ee.SelectEntityByName(jsOjbNameReceived as string, 'QUERIES/JS')
+ jsEditor.EditJSObj("myFun1", "newName")
+
+ //jsEditor.CreateJSObject('return "Success";', true);
+ // ee.expandCollapseEntity("Form1")
+ // ee.SelectEntityByName("Input2")
+ // cy.get("@jsObjName").then((jsObjName) => {
+ // jsEditor.EnterJSContext("defaulttext", "{{" + jsObjName + ".myFun1()}}")
+ // });
+ // // cy.wait("@updateLayout").should(
+ // // "have.nested.property",
+ // // "response.body.responseMeta.status",
+ // // 200,
+ // // );
+ // cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'Success');
+ // agHelper.DeployApp(locator._inputWidgetInDeployed)
+ // cy.get(locator._inputWidgetInDeployed).first().should('have.value', 'Hello')
+ // cy.get(locator._inputWidgetInDeployed).last().should('have.value', 'Success')
});
});
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToListWidget_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToListWidget_Spec.ts
index ca5351ea341d..b66ef10a320c 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToListWidget_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/JSObjectToListWidget_Spec.ts
@@ -5,10 +5,11 @@ let agHelper = ObjectsRegistry.AggregateHelper,
ee = ObjectsRegistry.EntityExplorer,
jsEditor = ObjectsRegistry.JSEditor,
locator = ObjectsRegistry.CommonLocators,
- apiPage = ObjectsRegistry.ApiPage;
+ apiPage = ObjectsRegistry.ApiPage,
+ table = ObjectsRegistry.Table;
-describe("Validate Create Api and Bind to Table widget via JSObject", () => {
+describe("Validate JSObj binding to Table widget", () => {
before(() => {
cy.fixture('listwidgetdsl').then((val: any) => {
agHelper.AddDsl(val)
@@ -35,47 +36,67 @@ describe("Validate Create Api and Bind to Table widget via JSObject", () => {
})
});
- it("2. Validate the Api data is updated on List widget", function () {
- ee.expandCollapseEntity("WIDGETS")//to expand widgets
- ee.SelectEntityByName("List1");
+ it("2. Validate the Api data is updated on List widget + Bug 12438", function () {
+ ee.SelectEntityByName("List1", 'WIDGETS');
jsEditor.EnterJSContext("items", "{{" + jsName as string + ".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();
- agHelper.WaitUntilEleAppear(locator._textWidgetInDeployed)
- cy.get(locator._textWidgetInDeployed).should("have.length", 8);
+ agHelper.DeployApp(locator._textWidgetInDeployed);
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 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 () {
+ table.AssertPageNumber_List(1)
+ table.NavigateToNextPage_List()
+ table.AssertPageNumber_List(2)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 8)
+ table.NavigateToNextPage_List()
+ table.AssertPageNumber_List(3, true)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 4)
+ table.NavigateToPreviousPage_List()
+ table.AssertPageNumber_List(2)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 8)
+ table.NavigateToPreviousPage_List()
+ table.AssertPageNumber_List(1)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 8)
agHelper.NavigateBacktoEditor()
- ee.expandCollapseEntity("WIDGETS")//to expand widgets
- ee.SelectEntityByName("List1");
+ });
+
+ it("3. Validate the List widget + Bug 12438 ", function () {
+ ee.SelectEntityByName("List1", 'WIDGETS');
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);
+ agHelper.DeployApp(locator._textWidgetInDeployed);
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
cy.get(locator._textWidgetInDeployed).first()
.invoke("text")
.then((text) => {
expect(text).to.equal((valueToTest as string).trimEnd());
});
- agHelper.NavigateBacktoEditor()
+
+ table.AssertPageNumber_List(1)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ table.NavigateToNextPage_List()
+ table.AssertPageNumber_List(2)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ table.NavigateToNextPage_List()
+ table.AssertPageNumber_List(3)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ table.NavigateToNextPage_List()
+ table.AssertPageNumber_List(4, true)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 2)
+ table.NavigateToPreviousPage_List()
+ table.AssertPageNumber_List(3)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ table.NavigateToPreviousPage_List()
+ table.AssertPageNumber_List(2)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ table.NavigateToPreviousPage_List()
+ table.AssertPageNumber_List(1)
+ agHelper.AssertElementLength(locator._textWidgetInDeployed, 6)
+ //agHelper.NavigateBacktoEditor()
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/LoadashBasic_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/LoadashBasic_Spec.ts
index 9c6483ccf08c..7ec2ede7870d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/LoadashBasic_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/LoadashBasic_Spec.ts
@@ -19,8 +19,7 @@ describe("Loadash basic test with input Widget", () => {
});
it("1. Input widget test with default value for atob method", () => {
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Input1")
+ ee.SelectEntityByName("Input1", 'WIDGETS')
jsEditor.EnterJSContext("defaulttext", dataSet.defaultInputBinding + "}}");
agHelper.ValidateNetworkStatus('@updateLayout')
});
@@ -32,7 +31,7 @@ describe("Loadash basic test with input Widget", () => {
});
it("3. Publish and validate the data displayed in input widgets value for aToB and bToa", function () {
- agHelper.DeployApp()
+ agHelper.DeployApp(locator._inputWidgetInDeployed)
cy.get(locator._inputWidgetInDeployed).first().invoke("attr", "value")
.should("contain", "7")
cy.get(locator._inputWidgetInDeployed).last().invoke("attr", "value")
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/MomentBasic_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/MomentBasic_Spec.ts
index 55e064dd5af7..3060dec0ed30 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/MomentBasic_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/MomentBasic_Spec.ts
@@ -19,8 +19,7 @@ describe("Validate basic binding of Input widget to Input widget", () => {
});
it("1. Input widget test with default value from another Input widget", () => {
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Input1")
+ ee.SelectEntityByName("Input1", 'WIDGETS')
jsEditor.EnterJSContext("defaulttext", dataSet.defaultInputBinding + "}}");
agHelper.ValidateNetworkStatus('@updateLayout')
});
@@ -33,7 +32,7 @@ describe("Validate basic binding of Input widget to Input widget", () => {
it("3. Publish widget and validate the data displayed in input widgets", function () {
var currentTime = new Date();
- agHelper.DeployApp()
+ agHelper.DeployApp(locator._inputWidgetInDeployed)
cy.get(locator._inputWidgetInDeployed).first()
.should("contain.value", currentTime.getFullYear());
cy.get(locator._inputWidgetInDeployed).last()
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 d10a93455c95..1aa9ede7f66b 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
@@ -1,32 +1,31 @@
import { ObjectsRegistry } from "../../../../support/Objects/Registry"
let agHelper = ObjectsRegistry.AggregateHelper,
- ee = ObjectsRegistry.EntityExplorer,
- jsEditor = ObjectsRegistry.JSEditor,
- locator = ObjectsRegistry.CommonLocators,
- apiPage = ObjectsRegistry.ApiPage;
+ ee = ObjectsRegistry.EntityExplorer,
+ jsEditor = ObjectsRegistry.JSEditor,
+ locator = ObjectsRegistry.CommonLocators,
+ apiPage = ObjectsRegistry.ApiPage;
describe("Validate basic operations on Entity explorer JSEditor structure", () => {
it("1. Verify storeValue via .then via direct Promises", () => {
let date = new Date().toDateString();
cy.fixture('promisesBtnDsl').then((val: any) => {
- agHelper.AddDsl(val)
+ agHelper.AddDsl(val, locator._spanButton('Submit'))
});
- ee.expandCollapseEntity("WIDGETS")//to expand widgets
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext('onclick', "{{storeValue('date', Date()).then(() => showAlert(appsmith.store.date))}}", true, true);
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
- cy.log("Date is:" + date)
agHelper.ValidateToastMessage(date)
+ agHelper.NavigateBacktoEditor()
});
it("2. Verify resolve & chaining via direct Promises", () => {
cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val);
+ agHelper.AddDsl(val, locator._spanButton('Submit'));
});
- ee.expandCollapseEntity("WIDGETS");
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext(
"onclick",
`{{
@@ -38,13 +37,15 @@ describe("Validate basic operations on Entity explorer JSEditor structure", () =
showAlert(res, 'success')
}).catch(err => { showAlert(err, 'error') });
}}`, true, true);
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
agHelper.ValidateToastMessage('We are on planet Earth')
+ agHelper.NavigateBacktoEditor()
});
it("3. Verify Async Await in direct Promises", () => {
cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val);
+ agHelper.AddDsl(val, locator._spanButton('Submit'));
});
apiPage.CreateAndFillApi("https://randomuser.me/api/", "RandomUser");
apiPage.CreateAndFillApi(
@@ -55,8 +56,7 @@ describe("Validate basic operations on Entity explorer JSEditor structure", () =
key: "name",
value: "{{this.params.country}}",
}); // verifies Bug 10055
- ee.expandCollapseEntity("WIDGETS");
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext(
"onclick",
`{{(async function(){
@@ -69,6 +69,7 @@ describe("Validate basic operations on Entity explorer JSEditor structure", () =
true,
true,
);
+ agHelper.DeployApp()
agHelper.ClickButton("Submit");
cy.get(locator._toastMsg).should("have.length", 2);
cy.get(locator._toastMsg)
@@ -77,18 +78,18 @@ describe("Validate basic operations on Entity explorer JSEditor structure", () =
cy.get(locator._toastMsg)
.last()
.contains(/male|female|null/g);
+ agHelper.NavigateBacktoEditor()
});
it("4. Verify .then & .catch via direct Promises", () => {
cy.fixture("promisesBtnImgDsl").then((val: any) => {
- agHelper.AddDsl(val);
+ agHelper.AddDsl(val, locator._spanButton('Submit'));
});
apiPage.CreateAndFillApi(
"https://source.unsplash.com/collection/8439505",
"Christmas",
);
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext(
"onclick",
`{{
@@ -103,55 +104,55 @@ describe("Validate basic operations on Entity explorer JSEditor structure", () =
);
ee.SelectEntityByName("Image1");
jsEditor.EnterJSContext("image", `{{Christmas.data}}`, true);
- agHelper.WaitUntilEleDisappear(
- locator._toastMsg,
- "will be executed automatically on page load",
- );
+ agHelper.ValidateToastMessage('will be executed automatically on page load')
+ agHelper.DeployApp()
agHelper.ClickButton("Submit");
cy.get(locator._toastMsg)
.should("have.length", 1)
.contains(/You have a beautiful picture|Oops!/g);
+ agHelper.NavigateBacktoEditor()
});
it("5. Verify .then & .catch via JS Objects in Promises", () => {
cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val);
+ agHelper.AddDsl(val, locator._spanButton('Submit'));
});
apiPage.CreateAndFillApi("https://favqs.com/api/qotd", "InspiringQuotes");
jsEditor.CreateJSObject(`const user = 'You';
return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + user + " is " + JSON.stringify(res.quote.body), 'success') }).catch(() => showAlert("Unable to fetch quote for " + user, 'warning'))`);
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
cy.get("@jsObjName").then((jsObjName) => {
jsEditor.EnterJSContext('onclick', "{{" + jsObjName + ".myFun1()}}", true, true);
})
+ agHelper.DeployApp()
agHelper.ClickButton("Submit");
agHelper.ValidateToastMessage("Today's quote for You")
+ agHelper.NavigateBacktoEditor()
});
it("6. Verify Promise.race via direct Promises", () => {
cy.fixture('promisesBtnDsl').then((val: any) => {
- agHelper.AddDsl(val)
+ agHelper.AddDsl(val, locator._spanButton('Submit'))
});
apiPage.CreateAndFillApi("https://api.agify.io?name={{this.params.person}}", "Agify")
apiPage.ValidateQueryParams({ key: "name", value: "{{this.params.person}}" }); // verifies Bug 10055
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext('onclick', `{{ Promise.race([Agify.run({ person: 'Melinda' }), Agify.run({ person: 'Trump' })]).then((res) => { showAlert('Winner is ' + JSON.stringify(res.name), 'success') }) }} `, true, true);
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
cy.get(locator._toastMsg).should("have.length", 1).contains(/Melinda|Trump/g)
+ agHelper.NavigateBacktoEditor()
})
it("7. Verify maintaining context via direct Promises", () => {
cy.fixture("promisesBtnListDsl").then((val: any) => {
- agHelper.AddDsl(val);
+ agHelper.AddDsl(val, locator._spanButton('Submit'));
});
apiPage.CreateAndFillApi(
"https://api.jikan.moe/v3/search/anime?q={{this.params.name}}",
"GetAnime",
);
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("List1");
+ ee.SelectEntityByName("List1", 'WIDGETS');
jsEditor.EnterJSContext(
"items",
`[{
@@ -171,10 +172,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
}]`,
true,
);
- agHelper.WaitUntilEleDisappear(
- locator._toastMsg,
- "will be executed automatically on page load",
- );
+ agHelper.ValidateToastMessage('will be executed automatically on page load')//Validating 'Run API on Page Load' is set once api response is mapped
ee.SelectEntityByName("Button1");
jsEditor.EnterJSContext(
"onclick",
@@ -188,19 +186,20 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
true,
true,
);
+ agHelper.DeployApp()
agHelper.ClickButton("Submit");
agHelper.WaitUntilEleAppear(locator._toastMsg)
cy.get(locator._toastMsg)
//.should("have.length", 1)//covered in WaitUntilEleAppear()
.should("have.text", "Showing results for : fruits basket : the final");
+ agHelper.NavigateBacktoEditor()
});
it("8: Verify Promise.all via direct Promises", () => {
cy.fixture('promisesBtnDsl').then((val: any) => {
- agHelper.AddDsl(val)
+ agHelper.AddDsl(val, locator._spanButton('Submit'))
});
- ee.expandCollapseEntity("WIDGETS")//to expand widgets
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext('onclick', `{{
(function () {
let agifyy = [];
@@ -212,14 +211,16 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
.then((responses) => showAlert(responses.map((res) => res.name).join(',')))
})()
}} `, true, true);
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
agHelper.ValidateToastMessage("cat,dog,camel,rabbit,rat")
+ agHelper.NavigateBacktoEditor()
});
it("9. Bug 10150: Verify Promise.all via JSObjects", () => {
let date = new Date().toDateString();
cy.fixture('promisesBtnDsl').then((val: any) => {
- agHelper.AddDsl(val)
+ agHelper.AddDsl(val, locator._spanButton('Submit'))
});
jsEditor.CreateJSObject(`let allFuncs = [Genderize.run({ country: 'India' }),
RandomUser.run(),
@@ -232,24 +233,24 @@ showAlert("Running all api's", "warning");
return Promise.all(allFuncs).then(() =>
showAlert("Wonderful! all apis executed", "success")).catch(() => showAlert("Please check your api's again", "error")); `)
- ee.expandCollapseEntity("WIDGETS")
-
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
cy.get("@jsObjName").then((jsObjName) => {
jsEditor.EnterJSContext('onclick', "{{storeValue('date', Date()).then(() => { showAlert(appsmith.store.date, 'success'); return " + jsObjName + ".myFun1()})}}", true, true);
});
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
- agHelper.WaitUntilEleAppear(locator._toastMsg)
+ //agHelper.WaitUntilEleAppear(locator._toastMsg)
cy.get(locator._toastMsg).should("have.length", 3)
cy.get(locator._toastMsg).eq(0).should('contain.text', date)
cy.get(locator._toastMsg).eq(1).contains("Running all api's")
agHelper.WaitUntilEleAppear(locator._toastMsg)
cy.get(locator._toastMsg).last().contains(/Wonderful|Please check/g)
+ agHelper.NavigateBacktoEditor()
});
it("10. Verify Promises.any via direct JSObjects", () => {
cy.fixture('promisesBtnDsl').then((val: any) => {
- agHelper.AddDsl(val)
+ agHelper.AddDsl(val, locator._spanButton('Submit'))
});
jsEditor.CreateJSObject(`export default {
func2: async () => {
@@ -267,31 +268,31 @@ showAlert("Wonderful! all apis executed", "success")).catch(() => showAlert("Ple
return Promise.any([this.func2(), this.func3(), this.func1()]).then((value) => showAlert("Resolved promise is:" + value))
}
}`, true, true)
- ee.expandCollapseEntity('WIDGETS')
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
cy.get("@jsObjName").then((jsObjName) => {
jsEditor.EnterJSContext('onclick', "{{" + jsObjName + ".runAny()}}", true, true);
});
+ agHelper.DeployApp()
agHelper.ClickButton('Submit')
cy.get(locator._toastMsg)
.should("have.length", 4)
cy.get(locator._toastMsg).eq(0).contains('Promises reject from func2')
cy.get(locator._toastMsg).last().contains('Resolved promise is:func3')
+ agHelper.NavigateBacktoEditor()
});
it("11. Bug : 11110 - Verify resetWidget via .then direct Promises", () => {
cy.fixture("promisesBtnDsl").then((dsl: any) => {
- agHelper.AddDsl(dsl);
+ agHelper.AddDsl(dsl, locator._spanButton('Submit'));
});
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
jsEditor.EnterJSContext(
"onclick",
"{{resetWidget('Input1').then(() => showAlert(Input1.text))}}",
true,
true,
);
- agHelper.DeployApp();
+ agHelper.DeployApp(locator._inputWidgetInDeployed);
cy.get(locator._inputWidgetInDeployed).type("Update value");
agHelper.ClickButton("Submit");
agHelper.ValidateToastMessage("Test")
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/SelectWidget_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/SelectWidget_Spec.ts
new file mode 100644
index 000000000000..c21d7ef05477
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/SelectWidget_Spec.ts
@@ -0,0 +1,79 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry"
+
+let agHelper = ObjectsRegistry.AggregateHelper,
+ table = ObjectsRegistry.Table;
+
+describe("Validate basic binding of Input widget to Input widget", () => {
+
+ before(() => {
+ cy.fixture('Select_table_dsl').then((val: any) => {
+ agHelper.AddDsl(val)
+ });
+ });
+
+ it("1. Validation of default displayed in Select widget based on row selected", function () {
+ agHelper.DeployApp()
+
+ //Verify Default selected row is selected by default
+ table.ReadTableRowColumnData(0, 0).then($cellData => {
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($cellData).to.eq($selectedValue)
+ })
+ })
+
+ //Verify able to select dropdown before any table selection
+ agHelper.SelectDropDown("#2")
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#2')
+ })
+
+ //Change to an non existing option - by table selecion
+ table.SelectTableRow(2)
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#3')
+ })
+
+ //Change select value now - if below is #2 - it will fail
+ agHelper.SelectDropDown("#1")
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#1')
+ })
+
+ agHelper.SelectDropDown("#2")
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#2')
+ })
+
+ agHelper.SelectDropDown("#1")
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#1')
+ })
+ });
+
+ //Till bug fixed
+ it.skip("2. Validation of default displayed in Select widget based on row selected + Bug 12531", function () {
+ table.SelectTableRow(1)
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#2')
+ })
+
+ //Change select value now - failing here!
+ agHelper.SelectDropDown("#1")
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('#1')
+ })
+
+ table.SelectTableRow(2)//Deselecting here!
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('Select option')
+ })
+ });
+
+ it("3. Verify Selecting the already selected row deselects it", () => {
+ table.SelectTableRow(0)
+ table.SelectTableRow(0)
+ agHelper.ReadSelectedDropDownValue().then($selectedValue => {
+ expect($selectedValue).to.eq('Select option')
+ })
+ })
+});
\ No newline at end of file
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Select_Widget_Value_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Select_Widget_Value_spec.js
deleted file mode 100644
index 1f35f37c1d5a..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Select_Widget_Value_spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const dsl = require("../../../../fixtures/Select_table_dsl.json");
-const widgetsPage = require("../../../../locators/Widgets.json");
-const commonlocators = require("../../../../locators/commonlocators.json");
-const formWidgetsPage = require("../../../../locators/FormWidgets.json");
-const widgetLocators = require("../../../../locators/Widgets.json");
-
-describe("Binding the multiple widgets and validating default data", function() {
- before(() => {
- cy.addDsl(dsl);
- });
-
- it("1. Validation of default displayed in select widget based on row selected", function() {
- cy.isSelectRow(0);
- cy.readTabledataPublish("0", "0").then((tabData) => {
- const tabValue = tabData;
- //expect(tabValue).to.be.equal("#1");
- cy.log("the value is" + tabValue);
- cy.get(widgetsPage.defaultSingleSelectValue)
- .first()
- .invoke("text")
- .then((text) => {
- const someText = text;
- expect(someText)
- .to.equal(tabValue)
- .to.equal("#1");
- });
- });
- });
- it("2. Validation of data displayed in select widget based on row selected", function() {
- cy.isSelectRow(2);
- cy.CheckAndUnfoldEntityItem("WIDGETS");
- cy.wait(2500);
- cy.get(widgetsPage.defaultSingleSelectValue)
- .first()
- .invoke("text")
- .then((text) => {
- const someText = text;
- expect(someText).to.equal("#3");
- });
- cy.get(formWidgetsPage.selectWidget)
- .find(widgetLocators.dropdownSingleSelect)
- .click({ force: true });
- cy.get(commonlocators.singleSelectWidgetMenuItem)
- .contains("#1")
- .click({ force: true });
- cy.get(commonlocators.TextInside).contains("#1");
- });
-});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasic_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasic_Spec.ts
index b1d9e8648647..b4ef01886b72 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasic_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasic_Spec.ts
@@ -19,20 +19,21 @@ describe("Validate basic binding of Input widget to Input widget", () => {
});
it("1. Input widget test with default value for atob method", () => {
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Input1")
+ ee.SelectEntityByName("Input1", 'WIDGETS')
jsEditor.EnterJSContext("defaulttext", dataSet.atobInput + "}}");
agHelper.ValidateNetworkStatus('@updateLayout')
+ cy.get(locator._inputWidget).first().invoke("attr", "value").should("equal", 'A');//Before mapping JSObject value of input
});
it("2. Input widget test with default value for btoa method", function () {
ee.SelectEntityByName("Input2")
jsEditor.EnterJSContext("defaulttext", dataSet.btoaInput + "}}");
agHelper.ValidateNetworkStatus('@updateLayout')
+ cy.get(locator._inputWidget).last().invoke("attr", "value").should("equal", 'QQ==');//Before mapping JSObject value of input
});
it("3. Publish and validate the data displayed in input widgets value for aToB and bToa", function () {
- agHelper.DeployApp()
+ agHelper.DeployApp(locator._inputWidgetInDeployed)
cy.get(locator._inputWidgetInDeployed).first().invoke("attr", "value")
.should("contain", "A")
cy.get(locator._inputWidgetInDeployed).last().invoke("attr", "value")
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/ChartDataPoint_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/ChartDataPoint_Spec.ts
index 0598455a932a..d30f6c43def1 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/ChartDataPoint_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/ChartDataPoint_Spec.ts
@@ -18,29 +18,23 @@ describe("Input widget test with default value from chart datapoint", () => {
});
});
- it("1. Input widget test with default value from another Input widget", () => {
- ee.expandCollapseEntity("WIDGETS")
- ee.SelectEntityByName("Input1")
+ it("1. Chart widget - Input widget test with default value from another Input widget", () => {
+ ee.SelectEntityByName("Input1", 'WIDGETS')
jsEditor.EnterJSContext("defaulttext", dataSet.bindChartData + "}}");
agHelper.ValidateNetworkStatus('@updateLayout')
- });
-
- it("2. Chart with datapoint feature validation", function () {
ee.SelectEntityByName("Chart1")
agHelper.SelectPropertiesDropDown("ondatapointclick", "Show message")
agHelper.EnterActionValue("Message", dataSet.bindingDataPoint)
+ ee.SelectEntityByName("Input2")
+ jsEditor.EnterJSContext("defaulttext", dataSet.bindingSeriesTitle + "}}");
+ agHelper.DeployApp()
+ agHelper.Sleep(1500)//waiting for chart to load!
agHelper.XpathNClick("(//*[local-name()='rect'])[13]")
- cy.get(locator._inputWidget).first().invoke('val').then($value => {
+ cy.get(locator._inputWidgetInDeployed).first().invoke('val').then($value => {
let inputVal = ($value as string).replace(/\s/g, "")
//cy.get(locator._toastMsg).invoke('text').then(toastTxt => expect(toastTxt.trim()).to.eq(inputVal))
cy.get(locator._toastMsg).should('have.text', inputVal)
})
- })
-
- it("3. Chart with seriesTitle feature validation", function () {
- ee.SelectEntityByName("Input2")
- jsEditor.EnterJSContext("defaulttext", dataSet.bindingSeriesTitle + "}}");
- cy.get(locator._inputWidget).last().should("have.value", dsl.dsl.children[0].chartData[0].seriesName);
+ cy.get(locator._inputWidgetInDeployed).last().should("have.value", dsl.dsl.children[0].chartData[0].seriesName);
});
-
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/DocumentViewer_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/DocumentViewer_Spec.ts
index de5c2ee9e5c5..c1cc33c6bf20 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/DocumentViewer_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/DocumentViewer_Spec.ts
@@ -11,8 +11,7 @@ describe("DocumentViewer Widget Functionality", () => {
it("2. Modify visibility & Publish app & verify", () => {
ee.NavigateToSwitcher('explorer')
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("DocumentViewer1");
+ ee.SelectEntityByName("DocumentViewer1", 'WIDGETS');
agHelper.ToggleOnOrOff("visible", 'Off');
agHelper.DeployApp();
cy.get(locator._widgetInDeployed("documentviewerwidget")).should(
@@ -22,8 +21,7 @@ describe("DocumentViewer Widget Functionality", () => {
});
it("3. Change visibility & Publish app & verify again", () => {
- ee.expandCollapseEntity("WIDGETS"); //to expand widgets
- ee.SelectEntityByName("DocumentViewer1");
+ ee.SelectEntityByName("DocumentViewer1", 'WIDGETS');
agHelper.ToggleOnOrOff("visible", 'On');
agHelper.DeployApp();
cy.get(locator._widgetInDeployed("documentviewerwidget")).should("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 bbda807719a1..5f3164d2955f 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
@@ -164,9 +164,7 @@ describe("Migration Validate", function() {
cy.waitUntil(
() =>
cy
- .xpath("//div[contains(@class, ' t--widget-textwidget')][2]", {
- timeout: 50000,
- })
+ .xpath("//div[contains(@class, ' t--widget-textwidget')][2]")
.eq(0)
.contains("State:", { timeout: 30000 })
.should("exist"),
@@ -217,14 +215,11 @@ describe("Migration Validate", function() {
// cy.wait(4000);
// cy.get("div.tableWrap").should("be.visible"); //wait for page load!
- cy.waitUntil(
- () => cy.get("div.tableWrap", { timeout: 50000 }).should("be.visible"),
- {
- errorMsg: "Page is not loaded evn after 10 secs",
- timeout: 30000,
- interval: 2000,
- },
- ).then(() => cy.wait(1000)); //wait for page load!
+ cy.waitUntil(() => cy.get("div.tableWrap").should("be.visible"), {
+ errorMsg: "Page is not loaded evn after 10 secs",
+ timeout: 30000,
+ interval: 2000,
+ }).then(() => cy.wait(1000)); //wait for page load!
cy.isSelectRow(2); //as aft refresh row selection is also gone
cy.getTableDataSelector("2", "18").then((selector) => {
@@ -398,14 +393,11 @@ describe("Migration Validate", function() {
//cy.wait(4000);
//cy.get("div.tableWrap").should("be.visible");
- cy.waitUntil(
- () => cy.get("div.tableWrap", { timeout: 50000 }).should("be.visible"),
- {
- errorMsg: "Page is not loaded evn after 10 secs",
- timeout: 30000,
- interval: 2000,
- },
- ).then(() => cy.wait(1000)); //wait for page load!
+ cy.waitUntil(() => cy.get("div.tableWrap").should("be.visible"), {
+ errorMsg: "Page is not loaded evn after 10 secs",
+ timeout: 30000,
+ interval: 2000,
+ }).then(() => cy.wait(1000)); //wait for page load!
//Manu Btn validation: - 1st menu item
cy.isSelectRow(4); //as aft refresh row selection is also gone
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_tabledata_schema_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_tabledata_schema_spec.js
index 8ab65522e192..b8296dc6c5ba 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_tabledata_schema_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Table_tabledata_schema_spec.js
@@ -25,7 +25,7 @@ describe("Table Widget", function() {
cy.PublishtheApp();
cy.wait(30000);
cy.getTableDataSelector("0", "0").then((element) => {
- cy.get(element, { timeout: 10000 }).should("be.visible");
+ cy.get(element).should("be.visible");
});
cy.readTabledataPublish("0", "0").then((value) => {
expect(value).to.be.equal("joe");
@@ -35,7 +35,7 @@ describe("Table Widget", function() {
.click();
cy.wait(1000);
cy.getTableDataSelector("0", "0").then((element) => {
- cy.get(element, { timeout: 10000 }).should("be.visible");
+ cy.get(element).should("be.visible");
});
cy.readTabledataPublish("0", "0").then((value) => {
expect(value).to.be.equal("john");
@@ -45,7 +45,7 @@ describe("Table Widget", function() {
.click();
cy.wait(1000);
cy.getTableDataSelector("0", "0").then((element) => {
- cy.get(element, { timeout: 10000 }).should("be.visible");
+ cy.get(element).should("be.visible");
});
cy.readTabledataPublish("0", "0").then((value) => {
expect(value).to.be.equal("joe");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GenerateCRUD/S3_Spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GenerateCRUD/S3_Spec.js
index 77b485bbb5a3..eed7dce47564 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GenerateCRUD/S3_Spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GenerateCRUD/S3_Spec.js
@@ -217,7 +217,7 @@ describe("Generate New CRUD Page Inside from entity explorer", function() {
//Post Execute call not happening.. hence commenting it for this case
//cy.wait("@post_Execute").should("have.nested.property", "response.body.responseMeta.status", 200,);
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.isExecutionSuccess).to.eq(true);
});
cy.get("span:contains('GOT IT')").click();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Replay/Replay_Editor_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Replay/Replay_Editor_spec.js
index e0099ecbcab3..0d22effe89ec 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Replay/Replay_Editor_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Replay/Replay_Editor_spec.js
@@ -62,6 +62,7 @@ describe("Undo/Redo functionality", function() {
cy.get("body").click(0, 0);
cy.get("body").type(`{${modifierKey}}z`);
cy.get("body").type(`{${modifierKey}}z`);
+ cy.wait(1000);
cy.get(apiwidget.headers).should("have.class", "react-tabs__tab--selected");
cy.get("body").type(`{${modifierKey}}z`);
cy.get(`${apiwidget.resourceUrl} .CodeMirror-placeholder`).should(
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Bugs_Spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Bugs_Spec.js
index 454ad9504a1b..755dd87b3bee 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Bugs_Spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Bugs_Spec.js
@@ -54,7 +54,7 @@ describe("Rest Bugs tests", function() {
.invoke("attr", "src")
.then(($src) => {
expect($src).not.eq("https://assets.appsmith.com/widgets/default.png");
- expect($src).contains("cat");
+ //expect($src).contains("cat");
});
// cy.wait("@postExecute").then(({ response }) => {
@@ -62,7 +62,7 @@ describe("Rest Bugs tests", function() {
// expect(response.body.data.body[0].url.length).to.be.above(0); //Cat image
// });
- // cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ // cy.wait("@postExecute").then(({ response }) => {
// expect(response.body.data.isExecutionSuccess).to.eq(true);
// expect(response.body.data.body.message.length).to.be.above(0); //Dog Image
// });
@@ -74,10 +74,10 @@ describe("Rest Bugs tests", function() {
.invoke("attr", "src")
.then(($src) => {
expect($src).not.eq("https://assets.appsmith.com/widgets/default.png");
- expect($src).contains("dog");
+ //expect($src).contains("dog");
});
- // cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ // cy.wait("@postExecute").then(({ response }) => {
// expect(response.body.data.isExecutionSuccess).to.eq(true);
// expect(response.body.data.body.length).to.be.above(0); //Number fact
// });
@@ -87,7 +87,7 @@ describe("Rest Bugs tests", function() {
.invoke("text")
.then(($txt) => expect($txt).to.have.length.greaterThan(25));
- // cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ // cy.wait("@postExecute").then(({ response }) => {
// //cy.log("Response is :"+ JSON.stringify(response.body))
// expect(response.body.data.isExecutionSuccess).to.eq(true);
// expect(response.body.data.request.url.length).to.be.above(0); //Cocktail
@@ -101,7 +101,7 @@ describe("Rest Bugs tests", function() {
.invoke("attr", "src")
.then(($src) => {
expect($src).not.eq("https://assets.appsmith.com/widgets/default.png");
- expect($src).contains("cocktail");
+ //expect($src).contains("cocktail");
});
//Spread to check later!
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MySQLNoiseTest_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MySQLNoiseTest_spec.js
index 30a9bae22005..3421c9e9479a 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MySQLNoiseTest_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/MySQLNoiseTest_spec.js
@@ -55,13 +55,13 @@ describe("MySQL noise test", function() {
cy.get(commonlocators.toastmsg).contains(
"UncaughtPromiseRejection: NoiseTestQuery failed to execute",
);
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.statusCode).to.eq("200 OK");
});
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.statusCode).to.eq("200 OK");
});
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.statusCode).to.eq("5004");
expect(response.body.data.title).to.eq(
"Datasource configuration is invalid",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/SMTPDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/SMTPDatasource_spec.js
index b7903d781b1b..5d2328de23e9 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/SMTPDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Datasources/SMTPDatasource_spec.js
@@ -62,7 +62,7 @@ describe("SMTP datasource test cases using ted", function() {
cy.get("span.bp3-button-text:contains('Run query')")
.closest("div")
.click();
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.statusCode).to.eq("5005");
expect(response.body.data.body).to.contain(
"Couldn't find a valid recipient address. Please check your action configuration",
@@ -78,7 +78,7 @@ describe("SMTP datasource test cases using ted", function() {
cy.get("span.bp3-button-text:contains('Run query')")
.closest("div")
.click();
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.statusCode).to.eq("5005");
expect(response.body.data.body).to.contain(
"Couldn't find a valid sender address. Please check your action configuration",
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
index 867be76269bb..48a99c8b3666 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
@@ -94,7 +94,7 @@ describe("Entity explorer datasource structure", function() {
.replace(/[^a-z]+/g, "");
cy.typeValueNValidate(`CREATE TABLE public.${tableName} ( ID int );`);
cy.onlyQueryRun();
- cy.wait("@postExecute", { timeout: 8000 }).then(({ response }) => {
+ cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.request.requestParams.Query.value).to.contain(
tableName,
);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/LayoutOnLoadActions/OnLoadActions_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/LayoutOnLoadActions/OnLoadActions_Spec.ts
index 994196b2af91..e7a8171912d8 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/LayoutOnLoadActions/OnLoadActions_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/LayoutOnLoadActions/OnLoadActions_Spec.ts
@@ -2,18 +2,20 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry"
let dsl: any;
let agHelper = ObjectsRegistry.AggregateHelper,
- homePage = ObjectsRegistry.HomePage,
- ee = ObjectsRegistry.EntityExplorer,
- apiPage = ObjectsRegistry.ApiPage;
+ homePage = ObjectsRegistry.HomePage,
+ ee = ObjectsRegistry.EntityExplorer,
+ apiPage = ObjectsRegistry.ApiPage,
+ jsEditor = ObjectsRegistry.JSEditor,
+ locator = ObjectsRegistry.CommonLocators;
-describe("Layout OnLoad Actions tests", function() {
+describe("Layout OnLoad Actions tests", function () {
before(() => {
cy.fixture("onPageLoadActionsDsl").then((val: any) => {
dsl = val;
});
});
- it("1. Bug 8595: OnPageLoad execution - when No api to run on Pageload", function() {
+ it("1. Bug 8595: OnPageLoad execution - when No api to run on Pageload", function () {
agHelper.AddDsl(dsl);
ee.SelectEntityByName("WIDGETS");
ee.SelectEntityByName("Page1");
@@ -29,98 +31,130 @@ describe("Layout OnLoad Actions tests", function() {
});
});
- it("2. Bug 8595: OnPageLoad execution - when Query Parmas added via Params tab", function() {
- agHelper.AddDsl(dsl);
+ it("2. Bug 8595: OnPageLoad execution - when Query Parmas added via Params tab", function () {
+ agHelper.AddDsl(dsl, locator._imageWidget);
apiPage.CreateAndFillApi(
"https://source.unsplash.com/collection/1599413",
"RandomFlora",
);
- apiPage.RunAPI();
+ //apiPage.RunAPI();
apiPage.CreateAndFillApi("https://randomuser.me/api/", "RandomUser");
- apiPage.RunAPI();
+ //apiPage.RunAPI();
apiPage.CreateAndFillApi("https://favqs.com/api/qotd", "InspiringQuotes");
- apiPage.EnterHeader("dependency", "{{RandomUser.data}}");
- apiPage.RunAPI();
+ apiPage.EnterHeader("dependency", "{{RandomUser.data}}");//via Params tab
+ //apiPage.RunAPI();
apiPage.CreateAndFillApi(
"https://www.boredapi.com/api/activity",
"Suggestions",
);
apiPage.EnterHeader("dependency", "{{InspiringQuotes.data}}");
- apiPage.RunAPI();
+ //apiPage.RunAPI();
apiPage.CreateAndFillApi("https://api.genderize.io", "Genderize");
- apiPage.EnterParams("name", "{{RandomUser.data.results[0].name.first}}");
- apiPage.RunAPI();
- ee.SelectEntityByName("WIDGETS");
- ee.SelectEntityByName("Page1");
-
- cy.url().then((url) => {
- const pageid = url.split("/")[4]?.split("-").pop();
- cy.log(pageid + "page id");
- cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
- const respBody = JSON.stringify(response.body);
+ apiPage.EnterParams("name", "{{RandomUser.data.results[0].name.first}}");//via Params tab
+ //apiPage.RunAPI();
- const _randomFlora = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[0];
- const _randomUser = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[1];
- const _genderize = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[2];
- const _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",
- );
- });
- });
+ //Adding dependency in right order matters!
+ ee.SelectEntityByName("WIDGETS");
+ ee.SelectEntityByName("Image1");
+ jsEditor.EnterJSContext("image", `{{RandomFlora.data}}`, true);
+
+ ee.SelectEntityByName("Image2");
+ jsEditor.EnterJSContext("image", `{{RandomUser.data.results[0].picture.large}}`, true);
+
+ ee.SelectEntityByName("Text1");
+ jsEditor.EnterJSContext("text", `{{InspiringQuotes.data.quote.body}}\n--\n{{InspiringQuotes.data.quote.author}}\n`, true);
+
+ ee.SelectEntityByName("Text2");
+ jsEditor.EnterJSContext("text", `Hi, here is {{RandomUser.data.results[0].name.first}} & I'm {{RandomUser.data.results[0].dob.age}}'yo\nI live in {{RandomUser.data.results[0].location.country}}\nMy Suggestion : {{Suggestions.data.activity}}\n\nI'm {{Genderize.data.gender}}`, true);
+
+ // cy.url().then((url) => {
+ // const pageid = url.split("/")[4]?.split("-").pop();
+ // cy.log(pageid + "page id");
+ // cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
+ // const respBody = JSON.stringify(response.body);
+
+ // const _randomFlora = JSON.parse(respBody).data.layouts[0]
+ // .layoutOnLoadActions[0];
+ // const _randomUser = JSON.parse(respBody).data.layouts[0]
+ // .layoutOnLoadActions[1];
+ // const _genderize = JSON.parse(respBody).data.layouts[0]
+ // .layoutOnLoadActions[2];
+ // const _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",
+ // );
+ // });
+ // });
+
+ agHelper.DeployApp()
+ agHelper.Sleep()//waiting for error toast - incase it wants to appear!
+ agHelper.AssertElementAbsence(locator._toastMsg)
+ agHelper.Sleep(5000)//for all api's to ccomplete call!
+ cy.wait("@viewPage").then(($response) => {
+ const respBody = JSON.stringify($response.response?.body);
+
+ const _randomFlora = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[0];
+ const _randomUser = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[1];
+ const _genderize = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[2];
+ const _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",
+ );
+ })
+
+ agHelper.NavigateBacktoEditor()
});
- it("3. Bug 10049, 10055: Dependency not executed in expected order in layoutOnLoadActions when dependency added via URL", function() {
- homePage.NavigateToHome();
- homePage.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();
+ it("3. Bug 10049, 10055: Dependency not executed in expected order in layoutOnLoadActions when dependency added via URL", function () {
+ ee.SelectEntityByName('Genderize', 'QUERIES/JS')
+ ee.ActionContextMenuByEntityName('Genderize', 'Delete', 'Are you sure?')
apiPage.CreateAndFillApi(
"https://api.genderize.io?name={{RandomUser.data.results[0].name.first}}",
@@ -130,47 +164,39 @@ describe("Layout OnLoad Actions tests", function() {
key: "name",
value: "{{RandomUser.data.results[0].name.first}}",
}); // verifies Bug 10055
- apiPage.RunAPI();
- ee.SelectEntityByName("WIDGETS");
- ee.SelectEntityByName("Page1");
-
- cy.url().then((url) => {
- const pageid = url.split("/")[4]?.split("-").pop();
- cy.log(pageid + "page id");
- cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
- const respBody = JSON.stringify(response.body);
-
- const _randomFlora = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[0];
- const _randomUser = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[1];
- const _genderize = JSON.parse(respBody).data.layouts[0]
- .layoutOnLoadActions[2];
- const _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",
- );
- });
- });
+
+ agHelper.DeployApp()
+ agHelper.Sleep()//waiting for error toast - incase it wants to appear!
+ agHelper.AssertElementAbsence(locator._toastMsg)
+ agHelper.Sleep(5000)//for all api's to ccomplete call!
+ cy.wait("@viewPage").then(($response) => {
+ const respBody = JSON.stringify($response.response?.body);
+ const _randomFlora = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[0];
+ const _randomUser = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[1];
+ const _genderize = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[2];
+ const _suggestions = JSON.parse(respBody).data.layouts[0]
+ .layoutOnLoadActions[3];
+
+ 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",
+ );
+ })
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Params/PassingParams_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Params/PassingParams_Spec.ts
index ab2ef1c76e39..62bf2127e5d3 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Params/PassingParams_Spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/Params/PassingParams_Spec.ts
@@ -1,12 +1,13 @@
import { ObjectsRegistry } from "../../../../support/Objects/Registry"
-let guid: any;
+let guid: any, jsName: any;
let agHelper = ObjectsRegistry.AggregateHelper,
dataSources = ObjectsRegistry.DataSources,
jsEditor = ObjectsRegistry.JSEditor,
locator = ObjectsRegistry.CommonLocators,
ee = ObjectsRegistry.EntityExplorer,
- table = ObjectsRegistry.Table;
+ table = ObjectsRegistry.Table,
+ apiPage = ObjectsRegistry.ApiPage;
describe("[Bug] - 10784 - Passing params from JS to SQL query should not break", () => {
before(() => {
@@ -27,17 +28,17 @@ describe("[Bug] - 10784 - Passing params from JS to SQL query should not break",
cy.log("ds name is :" + guid);
dataSources.NavigateToActiveDSQueryPane(guid);
agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params1");
+ agHelper.RenameWithInPane("ParamsTest");
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{this?.params?.condition || '1=1'}} order by id",
);
jsEditor.CreateJSObject(
- 'Params1.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
+ 'ParamsTest.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})', true, false, false
);
});
- ee.expandCollapseEntity("WIDGETS");
- ee.SelectEntityByName("Button1");
+ ee.SelectEntityByName("Button1", 'WIDGETS');
cy.get("@jsObjName").then((jsObjName) => {
+ jsName = jsObjName;
jsEditor.EnterJSContext(
"onclick",
"{{" + jsObjName + ".myFun1()}}",
@@ -46,368 +47,185 @@ describe("[Bug] - 10784 - Passing params from JS to SQL query should not break",
);
});
ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params1.data}}");
+ jsEditor.EnterJSContext("tabledata", "{{ParamsTest.data}}");
- agHelper.ClickButton("Submit");
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
- });
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
+ apiPage.DisableOnPageLoadRun()//Bug 12476
- agHelper.SelectDropDown("selectwidget", "7");
- agHelper.Sleep(2000);
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("7");
agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("7");
});
+
+ agHelper.NavigateBacktoEditor()
});
it("2. With Optional chaining : {{ (function() { return this?.params?.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params2");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(function() { return this?.params?.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params2.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params2.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("9");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("7");
- });
-
- agHelper.SelectDropDown("selectwidget", "9");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("9");
});
+ agHelper.NavigateBacktoEditor()
});
it("3. With Optional chaining : {{ (() => { return this?.params?.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params3");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(() => { return this?.params?.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params3.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params3.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("7");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("9");
- });
-
- agHelper.SelectDropDown("selectwidget", "8");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
+ expect(cellData).to.be.equal("7");
});
+ agHelper.NavigateBacktoEditor()
});
it("4. With Optional chaining : {{ this?.params.condition }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params4");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{this?.params.condition || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params4.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params4.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("9");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
- });
-
- agHelper.SelectDropDown("selectwidget", "7");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("7");
+ expect(cellData).to.be.equal("9");
});
+ agHelper.NavigateBacktoEditor()
});
it("5. With Optional chaining : {{ (function() { return this?.params.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params5");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(function() { return this?.params.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params5.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params5.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("7");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("7");
});
-
- agHelper.SelectDropDown("selectwidget", "9");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("9");
- });
+ agHelper.NavigateBacktoEditor()
});
it("6. With Optional chaining : {{ (() => { return this?.params.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params6");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(() => { return this?.params.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params6.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params6.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("9");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("9");
});
-
- agHelper.SelectDropDown("selectwidget", "8");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
- });
+ agHelper.NavigateBacktoEditor()
});
it("7. With No Optional chaining : {{ this.params.condition }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params7");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{this.params.condition || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params7.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params7.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("7");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
- });
-
- agHelper.SelectDropDown("selectwidget", "7");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("7");
});
+ agHelper.NavigateBacktoEditor()
});
it("8. With No Optional chaining : {{ (function() { return this.params.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params8");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(function() { return this.params.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params8.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params8.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("8");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("7");
- });
-
- agHelper.SelectDropDown("selectwidget", "9");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("9");
+ expect(cellData).to.be.equal("8");
});
+ agHelper.NavigateBacktoEditor()
});
it("9. With No Optional chaining : {{ (() => { return this.params.condition })() }}", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params9");
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(() => { return this.params.condition })() || '1=1'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params9.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
-
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params9.data}}");
-
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.SelectDropDown("9");
agHelper.ClickButton("Submit");
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("9");
});
-
- agHelper.SelectDropDown("selectwidget", "8");
- agHelper.Sleep(2000);
- agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
- agHelper.ValidateNetworkExecutionSuccess("@postExecute");
- table.ReadTableRowColumnData(0, 0).then((cellData) => {
- expect(cellData).to.be.equal("8");
- });
+ agHelper.NavigateBacktoEditor()
});
- it("10. With Optional chaining : {{ this?.params?.condition }} && no optional paramter passed", function () {
- dataSources.NavigateToActiveDSQueryPane(guid);
- agHelper.GetNClick(dataSources._templateMenu);
- agHelper.RenameWithInPane("Params10");
+ it("10. With Optional chaining : {{ this.params.condition }} && direct paramter passed", function () {
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
agHelper.EnterValue(
"SELECT * FROM public.users where id = {{(() => { return this.params.condition })() || '7'}} order by id",
);
- jsEditor.CreateJSObject(
- 'Params10.run(() => {},() => {},{"condition": selRecordFilter.selectedOptionValue})',
- );
- ee.SelectEntityByName("Button1");
- cy.get("@jsObjName").then((jsObjName) => {
- jsEditor.EnterJSContext(
- "onclick",
- "{{" + jsObjName + ".myFun1()}}",
- true,
- true,
- );
- });
- ee.SelectEntityByName("Table1");
- jsEditor.EnterJSContext("tabledata", "{{Params10.data}}");
-
- //When No selected option passed
- cy.xpath(locator._selectWidgetDropdown("selectwidget")).within(() =>
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ //Verifh when No selected option passed
+ cy.xpath(locator._selectWidgetDropdownInDeployed("selectwidget")).within(() =>
cy.get(locator._crossBtn).click(),
);
agHelper.ClickButton("Submit");
- agHelper.Sleep(2000);
agHelper.ValidateNetworkExecutionSuccess("@postExecute");
table.ReadTableRowColumnData(0, 0).then((cellData) => {
expect(cellData).to.be.equal("7");
});
+ agHelper.NavigateBacktoEditor()
+
+ });
+
+ it("11. With Optional chaining : {{ this.params.condition }} && no optional paramter passed", function () {
+ ee.SelectEntityByName("ParamsTest", 'QUERIES/JS');
+ agHelper.EnterValue(
+ "SELECT * FROM public.users where id = {{(() => { return this.params.condition })()}} order by id",
+ );
+ agHelper.DeployApp(locator._spanButton('Submit'))
+ agHelper.ClickButton("Submit");
+ agHelper.ValidateNetworkExecutionSuccess("@postExecute");
+ table.ReadTableRowColumnData(0, 0).then((cellData) => {
+ expect(cellData).to.be.equal("8");
+ });
+ agHelper.NavigateBacktoEditor()
+ });
+
+ it("12. Delete all entities - Query, JSObjects, Datasource + Bug 12532", () => {
+ ee.expandCollapseEntity('QUERIES/JS')
+ ee.ActionContextMenuByEntityName('ParamsTest', 'Delete', 'Are you sure?')
+ agHelper.ValidateNetworkStatus("@deleteAction", 200)
+ ee.ActionContextMenuByEntityName(jsName as string, 'Delete', 'Are you sure?')
+ agHelper.ValidateNetworkStatus("@deleteJSCollection", 200)
+ // //Bug 12532
+ // ee.expandCollapseEntity('DATASOURCES')
+ // ee.ActionContextMenuByEntityName(guid, 'Delete', 'Are you sure?')
+ // agHelper.ValidateNetworkStatus("@deleteAction", 200)
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js
index 45f925f5ab62..390c9d29472d 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/S3_spec.js
@@ -428,9 +428,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications",
cy.wait("@postExecute").then(({ response }) => {
expect(response.body.data.isExecutionSuccess).to.eq(true);
});
- cy.get("span:contains('CRUDNewPageFile')", { timeout: 10000 }).should(
- "not.exist",
- ); //verify Deletion of file is success from UI also
+ cy.get("span:contains('CRUDNewPageFile')").should("not.exist"); //verify Deletion of file is success from UI also
});
it("6. Validate Deletion of the Newly Created Page", () => {
@@ -543,7 +541,6 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications",
"//div[@data-cy='overlay-comments-wrapper']//span[text()='" +
fixturePath +
"']",
- { timeout: 10000 },
).should("not.exist"); //verify Deletion of file is success from UI also
//Upload: 2 - Bug verification 9201
@@ -609,7 +606,6 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications",
"//div[@data-cy='overlay-comments-wrapper']//span[text()='" +
fixturePath +
"']",
- { timeout: 10000 },
).should("not.exist"); //verify Deletion of file is success from UI also
//Deleting the page:
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index fe6166b562eb..eb842845c9c6 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -65,7 +65,7 @@
"toastMsg": ".Toastify__toast.Toastify__toast--default span",
"callApi": ".t--property-control-onpagechange .t--open-dropdown-Select-Action",
"singleSelectMenuItem": ".bp3-menu-item.single-select div",
- "singleSelectWidgetMenuItem": ".menu-item-link div",
+ "singleSelectWidgetMenuItem": ".menu-item-link",
"singleSelectActiveMenuItem": ".menu-item-active div",
"multiSelectMenuItem": "rc-select-item.rc-select-item-option div",
"selectMenuItem": ".bp3-menu li>a>div",
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index 17b69d12e488..a8403dd780ca 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -15,8 +15,11 @@ export class CommonLocators {
_textWidget = ".t--draggable-textwidget span"
_inputWidget = ".t--draggable-inputwidgetv2 input"
_publishButton = ".t--application-publish-btn"
- _textWidgetInDeployed = ".t--widget-textwidget span"
- _inputWidgetInDeployed = ".t--widget-inputwidgetv2 input"
+ _widgetInCanvas = (widgetType: string) => `.t--draggable-${widgetType}`
+ _widgetInDeployed = (widgetType: string) => `.t--widget-${widgetType}`
+ _textWidgetInDeployed = this._widgetInDeployed("textwidget") + " span"
+ _inputWidgetInDeployed = this._widgetInDeployed("inputwidgetv2") + " input"
+ _imageWidget = ".t--draggable-imagewidget"
_backToEditor = ".t--back-to-editor"
_newPage = ".pages .t--entity-add-btn"
_toastMsg = ".t--toast-action"
@@ -26,7 +29,6 @@ export class CommonLocators {
_openWidget = ".widgets .t--entity-add-btn"
_dropHere = "#comment-overlay-wrapper-0"
_activeTab = "span:contains('Active')"
- _createQuery = ".t--create-query"
_crossBtn = "span.cancel-icon"
_createNew = ".t--entity-add-btn.group.files"
_uploadFiles = "div.uppy-Dashboard-AddFiles input"
@@ -46,15 +48,15 @@ export class CommonLocators {
_selectPropDropdown = (ddName: string) => "//div[contains(@class, 't--property-control-" + ddName + "')]//button[contains(@class, 't--open-dropdown-Select-Action')]"
_dropDownValue = (ddOption: string) => ".single-select:contains('" + ddOption + "')"
_selectOptionValue = (ddOption: string) => ".menu-item-link:contains('" + ddOption + "')"
+ _selectedDropdownValue = "//button[contains(@class, 'select-button')]/span[@class='bp3-button-text']"
_actionTextArea = (actionName: string) => "//label[text()='" + actionName + "']/following-sibling::div//div[contains(@class, 'CodeMirror')]//textarea"
_existingDefaultTextInput = ".t--property-control-defaulttext .CodeMirror-code"
_widgetPageIcon = (widgetType: string) => `.t--widget-card-draggable-${widgetType}`
- _widgetInCanvas = (widgetType: string) => `.t--draggable-${widgetType}`
- _widgetInDeployed = (widgetType: string) => `.t--widget-${widgetType}`
_propertyToggle = (controlToToggle: string) => ".t--property-control-" + controlToToggle + " input[type='checkbox']"
_propertyToggleValue = (controlToToggle: string) => "//div[contains(@class, 't--property-control-" + controlToToggle + "')]//input[@type='checkbox']/parent::label"
_openNavigationTab = (tabToOpen: string) => `#switcher--${tabToOpen}`
- _selectWidgetDropdown = (widgetType: string) => "//div[contains(@class, 't--draggable-" + widgetType + "')]//button"
+ _selectWidgetDropdown = (widgetType: string) => `//div[contains(@class, 't--draggable-${widgetType}')]//button`
+ _selectWidgetDropdownInDeployed = (widgetType: string) => `//div[contains(@class, 't--widget-${widgetType}')]//button`
_inputFieldByName = (fieldName: string) => "//p[text()='" + fieldName + "']/parent::label/following-sibling::div"
_existingFieldValueByName = (fieldName: string) => "//label[text()='" + fieldName + "']/ancestor::div//div[contains(@class,'CodeMirror-code')]"
_evaluatedCurrentValue = "div:last-of-type .t--CodeEditor-evaluatedValue > div:last-of-type pre"
diff --git a/app/client/cypress/support/Objects/Registry.ts b/app/client/cypress/support/Objects/Registry.ts
index 609688621825..4dbf9df67bad 100644
--- a/app/client/cypress/support/Objects/Registry.ts
+++ b/app/client/cypress/support/Objects/Registry.ts
@@ -72,4 +72,12 @@ export class ObjectsRegistry {
}
return ObjectsRegistry.table__;
}
-}
\ No newline at end of file
+}
+
+export const initLocalstorageRegistry = () => {
+ cy.window().then((window) => {
+ window.localStorage.setItem("ShowCommentsButtonToolTip", "");
+ window.localStorage.setItem("updateDismissed", "true");
+ });
+ localStorage.setItem("inDeployedMode", "false");
+};
\ No newline at end of file
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index a54f597ca7ee..db124fec15c9 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -4,7 +4,7 @@ import { ObjectsRegistry } from '../Objects/Registry';
export class AggregateHelper {
private locator = ObjectsRegistry.CommonLocators;
- public AddDsl(dsl: string) {
+ public AddDsl(dsl: string, elementToCheckPresenceaftDslLoad: string | "" = "") {
let currentURL;
let pageid: string;
let layoutId;
@@ -27,7 +27,10 @@ export class AggregateHelper {
});
});
});
- this.Sleep(5000)//settling time for dsl
+
+ if (elementToCheckPresenceaftDslLoad)
+ this.WaitUntilEleAppear(elementToCheckPresenceaftDslLoad)
+ this.Sleep(500)//settling time for dsl
cy.get(this.locator._loading).should("not.exist");//Checks the spinner is gone & dsl loaded!
}
@@ -50,7 +53,7 @@ export class AggregateHelper {
public AssertAutoSave() {
// wait for save query to trigger & n/w call to finish occuring
- cy.get(this.locator._saveStatusSuccess, { timeout: 40000 }).should("exist");
+ cy.get(this.locator._saveStatusSuccess, { timeout: 30000 }).should("exist");//adding timeout since waiting more time is not worth it!
}
public ValidateCodeEditorContent(selector: string, contentToValidate: any) {
@@ -60,7 +63,7 @@ export class AggregateHelper {
}
//refering PublishtheApp from command.js
- public DeployApp() {
+ public DeployApp(eleToCheckInDeployPage: string = this.locator._backToEditor) {
cy.intercept("POST", "/api/v1/applications/publish/*").as("publishApp");
// Wait before publish
this.Sleep(2000)
@@ -75,6 +78,9 @@ export class AggregateHelper {
cy.log("Pagename: " + localStorage.getItem("PageName"));
cy.wait("@publishApp").its("request.url").should("not.contain", "edit")
//cy.wait('@publishApp').wait('@publishApp') //waitng for 2 calls to complete
+
+ this.WaitUntilEleAppear(eleToCheckInDeployPage)
+ localStorage.setItem("inDeployedMode", "true");
}
public AddNewPage() {
@@ -114,22 +120,35 @@ export class AggregateHelper {
});
}
- public WaitUntilEleDisappear(selector: string, msgToCheckforDisappearance: string) {
- cy.waitUntil(() => cy.get(selector).contains(msgToCheckforDisappearance).should("have.length", 0),
+ public WaitUntilEleDisappear(selector: string, msgToCheckforDisappearance: string | "") {
+ cy.waitUntil(() => selector.includes("//") ? cy.xpath(selector) : cy.get(selector),
{
errorMsg: msgToCheckforDisappearance + " did not disappear",
timeout: 5000,
interval: 1000
- }).then(() => this.Sleep())
+ }).then($ele => {
+ cy.wrap($ele).contains(msgToCheckforDisappearance).should("have.length", 0)
+ this.Sleep()
+ })
}
public WaitUntilEleAppear(selector: string) {
- cy.waitUntil(() => cy.get(selector, { timeout: 50000 }).should("have.length.greaterThan", 0),
+ // cy.waitUntil(() => cy.get(selector, { timeout: 50000 }).should("have.length.greaterThan", 0),
+ // {
+ // errorMsg: "Element did not appear",
+ // timeout: 5000,
+ // interval: 1000
+ // }).then(() => this.Sleep(500))
+
+ cy.waitUntil(() => selector.includes("//") ? cy.xpath(selector) : cy.get(selector),
{
errorMsg: "Element did not appear",
timeout: 5000,
interval: 1000
- }).then(() => this.Sleep(500))
+ }).then($ele => {
+ cy.wrap($ele).eq(0).should("be.visible")
+ this.Sleep()
+ })
}
public ValidateNetworkExecutionSuccess(aliasName: string, expectedRes = true) {
@@ -164,13 +183,26 @@ export class AggregateHelper {
cy.get(this.locator._dropDownValue(ddOption)).click()
}
- public SelectDropDown(endp: string, ddOption: string,) {
- cy.xpath(this.locator._selectWidgetDropdown(endp))
- .first()
- .scrollIntoView()
- .click()
+ public SelectDropDown(ddOption: string, endp: string = "selectwidget") {
+ let mode = localStorage.getItem("inDeployedMode");
+ if (mode == "false") {
+ cy.xpath(this.locator._selectWidgetDropdown(endp))
+ .first()
+ .scrollIntoView()
+ .click()
+ }
+ else {
+ cy.xpath(this.locator._selectWidgetDropdownInDeployed(endp))
+ .first()
+ .scrollIntoView()
+ .click()
+ }
cy.get(this.locator._selectOptionValue(ddOption)).click({ force: true })
- this.Sleep(2000)
+ this.Sleep()//for selected value to reflect!
+ }
+
+ public ReadSelectedDropDownValue() {
+ return cy.xpath(this.locator._selectedDropdownValue).first().invoke("text")
}
public EnterActionValue(actionName: string, value: string, paste = true) {
@@ -241,8 +273,9 @@ export class AggregateHelper {
}
public NavigateBacktoEditor() {
- cy.get(this.locator._backToEditor).click({ force: true });
+ cy.get(this.locator._backToEditor).click();
this.Sleep(2000)
+ localStorage.setItem("inDeployedMode", "false");
}
public GenerateUUID() {
@@ -278,14 +311,14 @@ export class AggregateHelper {
this.VerifyEvaluatedValue(valueToType);
}
- public EnterValue(valueToType: string, fieldName = "") {
+ public EnterValue(valueToEnter: string, fieldName = "") {
if (fieldName) {
cy.xpath(this.locator._inputFieldByName(fieldName)).then(($field: any) => {
- this.UpdateCodeInput($field, valueToType);
+ this.UpdateCodeInput($field, valueToEnter);
});
} else {
cy.get(this.locator._codeEditorTarget).then(($field: any) => {
- this.UpdateCodeInput($field, valueToType);
+ this.UpdateCodeInput($field, valueToEnter);
});
}
}
@@ -336,7 +369,7 @@ export class AggregateHelper {
}
public UploadFile(fixtureName: string, execStat = true) {
- cy.get(this.locator._uploadFiles).attachFile(fixtureName).wait(1000);
+ cy.get(this.locator._uploadFiles).attachFile(fixtureName).wait(2000);
cy.get(this.locator._uploadBtn).click().wait(3000);
this.ValidateNetworkExecutionSuccess("@postExecute", execStat);
}
@@ -360,4 +393,47 @@ export class AggregateHelper {
});
}
+
+ public AssertElementAbsence(selector: string) {
+ if (selector.startsWith("//"))
+ cy.xpath(selector).should('not.exist')
+ else
+ cy.get(selector).should('not.exist')
+ }
+
+ public AssertElementPresence(selector: string) {
+ if (selector.startsWith("//"))
+ cy.xpath(selector).should('be.visible')
+ else
+ cy.get(selector).should('be.visible')
+ }
+
+ public AssertElementLength(selector: string, length: number) {
+ if (selector.startsWith("//"))
+ cy.xpath(selector).should("have.length", length)
+ else
+ cy.get(selector).should("have.length", length);
+ }
+
+ //Not used:
+ // private xPathToCss(xpath: string) {
+ // return xpath
+ // .replace(/\[(\d+?)\]/g, function (s, m1) { return '[' + (m1 - 1) + ']'; })
+ // .replace(/\/{2}/g, '')
+ // .replace(/\/+/g, ' > ')
+ // .replace(/@/g, '')
+ // .replace(/\[(\d+)\]/g, ':eq($1)')
+ // .replace(/^\s+/, '');
+ // }
+
+ // Cypress.Commands.add("byXpath", (xpath) => {
+ // const iterator = document.evaluate(xpath, document, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null)
+ // const items = [];
+ // let item = iterator.iterateNext();
+ // while (item) {
+ // items.push(item);
+ // item = iterator.iterateNext();
+ // }
+ // return items;
+ // }, { timeout: 5000 });
}
\ No newline at end of file
diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts
index 2a7081fa5a42..01212f49b530 100644
--- a/app/client/cypress/support/Pages/ApiPage.ts
+++ b/app/client/cypress/support/Pages/ApiPage.ts
@@ -25,6 +25,7 @@ export class ApiPage {
_noBodyMessage = "This request does not have a body"
_imageSrc = "//img/parent::div"
private _trashDelete = "span[name='delete']"
+ private _onPageLoad = "input[name='executeOnLoad'][type='checkbox']"
CreateApi(apiName: string = "", apiVerb: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' = 'GET',) {
@@ -54,72 +55,50 @@ export class ApiPage {
this.CreateApi(apiname, apiVerb)
this.EnterURL(url)
this.agHelper.AssertAutoSave()
- this.agHelper.Sleep(2000);// Added because api name edit takes some time to reflect in api sidebar after the call passes.
+ //this.agHelper.Sleep(2000);// Added because api name edit takes some time to reflect in api sidebar after the call passes.
cy.get(this._apiRunBtn).should("not.be.disabled");
this.SetAPITimeout(queryTimeout)
}
EnterURL(url: string) {
- cy.get(this._resourceUrl)
- .first()
- .click({ force: true })
- .type(url, { parseSpecialCharSequences: false });
+ this.agHelper.UpdateCodeInput(this._resourceUrl, url)
this.agHelper.AssertAutoSave()
}
EnterHeader(hKey: string, hValue: string) {
- this.SelectAPITab('Headers');
- cy.get(this._headerKey(0))
- .first()
- .click({ force: true })
- .type(hKey, { parseSpecialCharSequences: false })
- .type("{esc}");
- cy.get(this._headerValue(0))
- .first()
- .click({ force: true })
- .type(hValue, { parseSpecialCharSequences: false })
- .type("{esc}");
+ this.SelectPaneTab('Headers');
+ this.agHelper.UpdateCodeInput(this._headerKey(0), hKey)
+ cy.get('body').type("{esc}");
+ this.agHelper.UpdateCodeInput(this._headerValue(0), hValue)
+ cy.get('body').type("{esc}");
this.agHelper.AssertAutoSave()
}
EnterParams(pKey: string, pValue: string) {
- this.SelectAPITab('Params')
- cy.get(this._paramKey(0))
- .first()
- .click({ force: true })
- .type(pKey, { parseSpecialCharSequences: false })
- .type("{esc}");
- cy.get(this._paramValue(0))
- .first()
- .click({ force: true })
- .type(pValue, { parseSpecialCharSequences: false })
- .type("{esc}");
+ this.SelectPaneTab('Params')
+ this.agHelper.UpdateCodeInput(this._paramKey(0), pKey)
+ cy.get('body').type("{esc}");
+ this.agHelper.UpdateCodeInput(this._paramValue(0), pValue)
+ cy.get('body').type("{esc}");
this.agHelper.AssertAutoSave()
}
EnterBodyFormData(subTab: 'FORM_URLENCODED' | 'MULTIPART_FORM_DATA', bKey: string, bValue: string, type = "", toTrash = false) {
- this.SelectAPITab('Body')
+ this.SelectPaneTab('Body')
this.SelectSubTab(subTab)
- if (toTrash)
- {
+ if (toTrash) {
cy.get(this._trashDelete).click()
cy.xpath(this._visibleTextSpan('Add more')).click()
}
- cy.get(this._bodyKey(0))
- .first()
- .click({ force: true })
- .type(bKey, { parseSpecialCharSequences: false })
- .type("{esc}");
+ this.agHelper.UpdateCodeInput(this._bodyKey(0), bKey)
+ cy.get('body').type("{esc}");
+
if (type) {
cy.xpath(this._bodyTypeDropdown).eq(0).click()
cy.xpath(this._visibleTextDiv(type)).click()
}
- cy.get(this._bodyValue(0))
- .first()
- .click({ force: true })
- .type(bValue, { parseSpecialCharSequences: false })
- .type("{esc}");
-
+ this.agHelper.UpdateCodeInput(this._bodyValue(0), bValue)
+ cy.get('body').type("{esc}");
this.agHelper.AssertAutoSave()
}
@@ -129,14 +108,22 @@ export class ApiPage {
}
SetAPITimeout(timeout: number) {
- this.SelectAPITab('Settings');
+ this.SelectPaneTab('Settings');
cy.xpath(this._queryTimeout)
.clear()
.type(timeout.toString());
- this.SelectAPITab('Headers');
+ this.agHelper.AssertAutoSave()
+ this.SelectPaneTab('Headers');
}
- SelectAPITab(tabName: 'Headers' | 'Params' | 'Body' | 'Pagination' | 'Authentication' | 'Settings') {
+ DisableOnPageLoadRun() {
+ this.SelectPaneTab('Settings');
+ cy.get(this._onPageLoad).uncheck({
+ force: true,
+ });
+ }
+
+ SelectPaneTab(tabName: 'Headers' | 'Params' | 'Body' | 'Pagination' | 'Authentication' | 'Settings') {
cy.xpath(this._visibleTextSpan(tabName)).should('be.visible').eq(0).click();
}
@@ -144,21 +131,14 @@ export class ApiPage {
cy.get(this._bodySubTab(subTabName)).eq(0).should('be.visible').click();
}
- public CheckElementPresence(selector: string) {
- if (selector.startsWith("//"))
- cy.xpath(selector).should('be.visible')
- else
- cy.get(selector).should('be.visible')
- }
-
ValidateQueryParams(param: { key: string; value: string; }) {
- this.SelectAPITab('Params')
+ this.SelectPaneTab('Params')
this.agHelper.ValidateCodeEditorContent(this._paramKey(0), param.key)
this.agHelper.ValidateCodeEditorContent(this._paramValue(0), param.value)
}
ValidateHeaderParams(header: { key: string; value: string; }) {
- this.SelectAPITab('Headers')
+ this.SelectPaneTab('Headers')
this.agHelper.ValidateCodeEditorContent(this._headerKey(0), header.key)
this.agHelper.ValidateCodeEditorContent(this._headerValue(0), header.value)
}
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index 66d8fc4432af..64efe142fe11 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -4,6 +4,7 @@ export class DataSources {
private agHelper = ObjectsRegistry.AggregateHelper
private locator = ObjectsRegistry.CommonLocators;
+ private ee = ObjectsRegistry.EntityExplorer;
private _dsCreateNewTab = "[data-cy=t--tab-CREATE_NEW]"
private _addNewDataSource = ".datasources .t--entity-add-btn"
@@ -18,6 +19,7 @@ export class DataSources {
private _saveDs = ".t--save-datasource"
private _datasourceCard = ".t--datasource"
_templateMenu = ".t--template-menu"
+ private _createQuery = ".t--create-query"
_visibleTextSpan = (spanText: string) => "//span[contains(text(),'" + spanText + "')]"
_dropdownTitle = (ddTitle: string) => "//p[contains(text(),'" + ddTitle + "')]/parent::label/following-sibling::div/div/div"
_reconnectModal = "div.reconnect-datasource-modal"
@@ -81,11 +83,16 @@ export class DataSources {
.should("be.visible")
.closest(this._datasourceCard)
.within(() => {
- cy.get(this.locator._createQuery).click({ force: true });
+ cy.get(this._createQuery).click({ force: true });
})
this.agHelper.Sleep(2000); //for the CreateQuery page to load
}
+ public NavigateToActiveDSviaEntityExplorer(datasourceName: string) {
+ this.ee.SelectEntityByName(datasourceName, 'DATASOURCES')
+ cy.get(this._createQuery).click({ force: true });
+ }
+
public ValidateNSelectDropdown(ddTitle: string, currentValue = "", newValue = "") {
let toChange = false;
diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts
index ca9614967e8f..513caccc11a2 100644
--- a/app/client/cypress/support/Pages/EntityExplorer.ts
+++ b/app/client/cypress/support/Pages/EntityExplorer.ts
@@ -5,8 +5,10 @@ export class EntityExplorer {
public agHelper = ObjectsRegistry.AggregateHelper
public locator = ObjectsRegistry.CommonLocators;
- public SelectEntityByName(entityNameinLeftSidebar: string) {
- cy.xpath(this.locator._entityNameInExplorer(entityNameinLeftSidebar), { timeout: 30000 })
+ public SelectEntityByName(entityNameinLeftSidebar: string, section: 'WIDGETS' | 'QUERIES/JS' | 'DATASOURCES' | '' = '') {
+ if (section)
+ this.expandCollapseEntity(section)//to expand respective section
+ cy.xpath(this.locator._entityNameInExplorer(entityNameinLeftSidebar))
.last()
.click({ multiple: true })
this.agHelper.Sleep()
@@ -32,7 +34,7 @@ export class EntityExplorer {
else if (!expand && arrow == 'arrow-down')
cy.xpath(this.locator._expandCollapseArrow(entityName)).trigger('click', { multiple: true }).wait(1000);
else
- this.agHelper.Sleep()
+ this.agHelper.Sleep(500)
})
}
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index f2090afa0555..7c4e3bb23ea6 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -175,9 +175,9 @@ export class HomePage {
cy.wait("@postLogout");
cy.visit("/user/login");
cy.get(this._username).should("be.visible").type(uname)
- cy.get(this._password).type(pswd);
+ cy.get(this._password).type(pswd, {log: false});
cy.get(this._submitBtn).click();
- cy.wait("@getUser");
+ cy.wait("@getMe");
this.agHelper.Sleep(3000)
if (role != 'App Viewer')
cy.get(this._homePageAppCreateBtn).should("be.visible").should("be.enabled");
diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts
index a174c4eb0441..97716ed67938 100644
--- a/app/client/cypress/support/Pages/JSEditor.ts
+++ b/app/client/cypress/support/Pages/JSEditor.ts
@@ -20,7 +20,8 @@ export class JSEditor {
cy.get(this._newJSobj).click({ force: true });
//cy.waitUntil(() => cy.get(this.locator._toastMsg).should('not.be.visible')) // fails sometimes
- this.agHelper.WaitUntilEleDisappear(this.locator._toastMsg, 'created successfully')
+ //this.agHelper.WaitUntilEleDisappear(this.locator._toastMsg, 'created successfully')
+ this.agHelper.Sleep()
}
public CreateJSObject(JSCode: string, paste = true, completeReplace = false, toRun = true) {
@@ -67,7 +68,7 @@ export class JSEditor {
});
this.agHelper.AssertAutoSave()//Ample wait due to open bug # 10284
- this.agHelper.Sleep(5000)//Ample wait due to open bug # 10284
+ //this.agHelper.Sleep(5000)//Ample wait due to open bug # 10284
if (toRun) {
//clicking 1 times & waits for 3 second for result to be populated!
@@ -83,6 +84,13 @@ export class JSEditor {
this.GetJSObjectName()
}
+ //Not working - To improve!
+ public EditJSObj(existingTxt: string, newTxt: string) {
+ cy.get(this.locator._codeEditorTarget).contains(existingTxt).dblclick()//.type("{backspace}").type(newTxt)
+ cy.get('body').type("{backspace}").type(newTxt)
+ this.agHelper.AssertAutoSave()//Ample wait due to open bug # 10284
+ }
+
public EnterJSContext(endp: string, value: string, paste = true, toToggleOnJS = false) {
if (toToggleOnJS) {
cy.get(this.locator._jsToggle(endp))
diff --git a/app/client/cypress/support/Pages/Table.ts b/app/client/cypress/support/Pages/Table.ts
index ecb8a2f37ecf..24ab8fd620d6 100644
--- a/app/client/cypress/support/Pages/Table.ts
+++ b/app/client/cypress/support/Pages/Table.ts
@@ -11,9 +11,13 @@ export class Table {
private _previousPage = ".t--widget-tablewidget .t--table-widget-prev-page"
private _pageNumber = ".t--widget-tablewidget .page-item"
private _pageNumberServerSideOff = ".t--widget-tablewidget .t--table-widget-page-input input"
- _tableRowColumn = (rowNum: number, colNum: number) => `.t--widget-tablewidget .tbody .td[data-rowindex=${rowNum}][data-colindex=${colNum}] div div`
+ _tableRow = (rowNum: number, colNum: number) => `.t--widget-tablewidget .tbody .td[data-rowindex=${rowNum}][data-colindex=${colNum}]`
+ _tableRowColumnData = (rowNum: number, colNum: number) => this._tableRow(rowNum, colNum) + ` div div`
_tableEmptyColumnData = `.t--widget-tablewidget .tbody .td` //selected-row
_tableSelectedRow = this._tableWrap + "//div[contains(@class, 'tbody')]//div[contains(@class, 'selected-row')]/div"
+ _liNextPage = "li[title='Next Page']"
+ _liPreviousPage = "li[title='Previous Page']"
+ _liCurrentSelectedPage = "//div[@type='LIST_WIDGET']//ul[contains(@class, 'rc-pagination')]/li[contains(@class, 'rc-pagination-item-active')]/a"
public WaitUntilTableLoad() {
@@ -28,21 +32,28 @@ export class Table {
// expect(cellData).not.empty;
// });
- cy.waitUntil(() => this.ReadTableRowColumnData(0, 0).then(cellData => expect(cellData).not.empty),
+ cy.waitUntil(() => this.ReadTableRowColumnData(0, 0),
{
errorMsg: "Table is not populated",
timeout: 10000,
interval: 2000
- }).then(() => this.agHelper.Sleep(500))
+ }).then(cellData => {
+ expect(cellData).not.empty
+ this.agHelper.Sleep(500)
+ })
}
public WaitForTableEmpty() {
- cy.waitUntil(() => cy.get(this._tableEmptyColumnData).children().should("have.length", 0),
+ cy.waitUntil(() => cy.get(this._tableEmptyColumnData),
{
errorMsg: "Table is populated when not expected",
timeout: 10000,
interval: 2000
- }).then(() => this.agHelper.Sleep(500))
+ }).then($children => {
+ cy.wrap($children).children().should('have.length', 0) //or below
+ //expect($children).to.have.lengthOf(0)
+ this.agHelper.Sleep(500)
+ })
}
public AssertTableHeaderOrder(expectedOrder: string) {
@@ -52,7 +63,8 @@ export class Table {
}
public ReadTableRowColumnData(rowNum: number, colNum: number) {
- return cy.get(this._tableRowColumn(rowNum, colNum), { timeout: 80000 }).invoke("text");
+ this.agHelper.Sleep(2000)//Settling time for table!
+ return cy.get(this._tableRowColumnData(rowNum, colNum)).invoke("text");
}
public AssertHiddenColumns(columnNames: string[]) {
@@ -103,4 +115,43 @@ export class Table {
});
}
+ public SelectTableRow(rowIndex: number) {
+ cy.get(this._tableRow(rowIndex, 0)).first().click({ force: true });
+ this.agHelper.Sleep()//for select to reflect
+ }
+
+ //List methods - keeping it for now!
+ public NavigateToNextPage_List() {
+ let curPageNo: number;
+ cy.xpath(this._liCurrentSelectedPage).invoke('text').then($currentPageNo =>
+ curPageNo = Number($currentPageNo))
+ cy.get(this._liNextPage).click()
+ cy.scrollTo('top', { easing: 'linear' })
+ cy.xpath(this._liCurrentSelectedPage).invoke('text').then($newPageNo =>
+ expect(Number($newPageNo)).to.eq(curPageNo + 1))
+ }
+
+ public NavigateToPreviousPage_List() {
+ let curPageNo: number;
+ cy.xpath(this._liCurrentSelectedPage).invoke('text').then($currentPageNo =>
+ curPageNo = Number($currentPageNo))
+ cy.get(this._liPreviousPage).click()
+ cy.scrollTo('top', { easing: 'linear' })
+ cy.xpath(this._liCurrentSelectedPage).invoke('text').then($newPageNo =>
+ expect(Number($newPageNo)).to.eq(curPageNo - 1))
+ }
+
+ public AssertPageNumber_List(pageNo: number, checkNoNextPage = false) {
+ cy.xpath(this._liCurrentSelectedPage).invoke('text').then($currentPageNo =>
+ expect(Number($currentPageNo)).to.eq(pageNo))
+
+ if (pageNo == 1)
+ cy.get(this._liPreviousPage).should("have.attr", "aria-disabled", 'true')
+
+ if (checkNoNextPage)
+ cy.get(this._liNextPage).should("have.attr", "aria-disabled", 'true')
+ else
+ cy.get(this._liNextPage).should("have.attr", "aria-disabled", 'false')
+
+ }
}
\ No newline at end of file
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 753535b5acc3..1c9d4af8b279 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -384,6 +384,12 @@ Cypress.Commands.add("CreateAppInFirstListedOrg", (appname) => {
200,
);
+ cy.waitUntil(() => cy.get(generatePage.buildFromScratchActionCard), {
+ errorMsg: "Build app from scratch not visible even aft 80 secs",
+ timeout: 20000,
+ interval: 1000,
+ }).then(($ele) => cy.wrap($ele).should("be.visible"));
+
cy.get(generatePage.buildFromScratchActionCard).click();
/* The server created app always has an old dsl so the layout will migrate
@@ -481,7 +487,7 @@ Cypress.Commands.add("LogintoApp", (uname, pword) => {
cy.get(loginPage.username).type(uname);
cy.get(loginPage.password).type(pword, { log: false });
cy.get(loginPage.submitBtn).click();
- cy.wait("@getUser");
+ cy.wait("@getMe");
cy.wait(3000);
cy.get(".t--applications-container .createnew").should("be.visible");
cy.get(".t--applications-container .createnew").should("be.enabled");
@@ -506,7 +512,7 @@ Cypress.Commands.add("Signup", (uname, pword) => {
cy.get(signupPage.dropdownOption).click();
cy.get(signupPage.roleUsecaseSubmit).click();
- cy.wait("@getUser");
+ cy.wait("@getMe");
cy.wait(3000);
initLocalstorage();
});
@@ -526,7 +532,7 @@ Cypress.Commands.add("LoginFromAPI", (uname, pword) => {
},
}).then((response) => {
expect(response.status).equal(302);
- cy.log(response.body);
+ //cy.log(response.body);
});
});
@@ -1330,16 +1336,16 @@ Cypress.Commands.add("createModal", (ModalName) => {
});
Cypress.Commands.add("selectOnClickOption", (option) => {
- cy.get(".bp3-popover-content", { timeout: 10000 }).should("be.visible");
- cy.get("ul.bp3-menu div.bp3-fill", { timeout: 10000 })
+ cy.get(".bp3-popover-content").should("be.visible");
+ cy.get("ul.bp3-menu div.bp3-fill")
.should("be.visible")
.contains(option)
.click({ force: true });
});
Cypress.Commands.add("selectWidgetOnClickOption", (option) => {
- cy.get(".bp3-popover-content", { timeout: 10000 }).should("be.visible");
- cy.get(commonlocators.selectWidgetVirtualList, { timeout: 10000 })
+ cy.get(".bp3-popover-content").should("be.visible");
+ cy.get(commonlocators.selectWidgetVirtualList)
.should("be.visible")
.contains(option)
.click({ force: true });
@@ -2679,10 +2685,12 @@ Cypress.Commands.add(
const selector = `.t--widget-card-draggable-${widgetType}`;
cy.wait(800);
cy.get(selector)
+ .scrollIntoView()
.trigger("dragstart", { force: true })
.trigger("mousemove", x, y, { force: true });
const selector2 = `.t--draggable-${destinationWidget}`;
cy.get(selector2)
+ .scrollIntoView()
.trigger("mousemove", x, y, { eventConstructor: "MouseEvent" })
.trigger("mousemove", x, y, { eventConstructor: "MouseEvent" })
.trigger("mouseup", x, y, { eventConstructor: "MouseEvent" });
@@ -2900,6 +2908,7 @@ Cypress.Commands.add("isSelectRow", (index) => {
cy.get('.tbody .td[data-rowindex="' + index + '"][data-colindex="' + 0 + '"]')
.first()
.click({ force: true });
+ cy.wait(1000); //for selection to show!
});
Cypress.Commands.add("getDate", (date, dateFormate) => {
@@ -2934,11 +2943,11 @@ Cypress.Commands.add("validateDisableWidget", (widgetCss, disableCss) => {
});
Cypress.Commands.add("validateToolbarVisible", (widgetCss, toolbarCss) => {
- cy.get(widgetCss + toolbarCss, { timeout: 10000 }).should("exist");
+ cy.get(widgetCss + toolbarCss).should("exist");
});
Cypress.Commands.add("validateToolbarHidden", (widgetCss, toolbarCss) => {
- cy.get(widgetCss + toolbarCss, { timeout: 10000 }).should("not.exist");
+ cy.get(widgetCss + toolbarCss).should("not.exist");
});
Cypress.Commands.add("validateEnableWidget", (widgetCss, disableCss) => {
@@ -2989,9 +2998,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
"getTemplateCollections",
);
cy.route("PUT", "/api/v1/pages/*").as("updatePage");
- cy.route("DELETE", "/api/v1/actions/*").as("deleteAPI");
cy.route("DELETE", "/api/v1/applications/*").as("deleteApp");
- cy.route("DELETE", "/api/v1/actions/*").as("deleteAction");
cy.route("DELETE", "/api/v1/pages/*").as("deletePage");
cy.route("POST", "/api/v1/datasources").as("createDatasource");
cy.route("DELETE", "/api/v1/datasources/*").as("deleteDatasource");
@@ -3040,7 +3047,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.route("GET", "/api/v1/organizations/roles?organizationId=*").as(
"getRoles",
);
- cy.route("GET", "/api/v1/users/me").as("getUser");
+ 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");
@@ -3271,7 +3278,7 @@ Cypress.Commands.add(
"validateWidgetExists",
{ prevSubject: true },
(selector) => {
- cy.get(selector, { timeout: 5000 }).should("exist");
+ cy.get(selector).should("exist");
},
);
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index beac3774c5bb..a45c718b641e 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -25,6 +25,7 @@ let applicationId;
// Import commands.js using ES2015 syntax:
import "./commands";
import { initLocalstorage } from "./commands";
+import { initLocalstorageRegistry } from "./Objects/Registry";
import * as MESSAGES from "../../../client/src/ce/constants/messages.ts";
Cypress.on("uncaught:exception", (err, runnable) => {
@@ -42,14 +43,15 @@ Cypress.env("MESSAGES", MESSAGES);
before(function() {
//console.warn = () => {};
initLocalstorage();
+ initLocalstorageRegistry();
cy.startServerAndRoutes();
// Clear indexedDB
cy.window().then((window) => {
window.indexedDB.deleteDatabase("Appsmith");
});
-
cy.visit("/setup/welcome");
- cy.wait("@getUser");
+ cy.wait("@getMe");
+ cy.wait(2000);
cy.url().then((url) => {
if (url.indexOf("setup/welcome") > -1) {
cy.createSuperUser();
@@ -75,7 +77,7 @@ before(function() {
const password = Cypress.env("PASSWORD");
cy.LoginFromAPI(username, password);
cy.visit("/applications");
- cy.wait("@getUser");
+ cy.wait("@getMe");
cy.wait(3000);
cy.get(".t--applications-container .createnew").should("be.visible");
cy.get(".t--applications-container .createnew").should("be.enabled");
@@ -91,6 +93,7 @@ before(function() {
beforeEach(function() {
initLocalstorage();
+ initLocalstorageRegistry();
Cypress.Cookies.preserveOnce("SESSION", "remember_token");
cy.startServerAndRoutes();
//-- Delete local storage data of entity explorer
|
17d5d6eb008ea766ef3c54bc3e1bdb9fceafce65
|
2024-10-01 22:12:56
|
Arpit Mohan
|
chore: Upgrading spring to 3.3.3 to resolve vulnerable dependencies (#36266)
| false
|
Upgrading spring to 3.3.3 to resolve vulnerable dependencies (#36266)
|
chore
|
diff --git a/app/client/cypress/fixtures/gitImport.json b/app/client/cypress/fixtures/gitImport.json
index 1e09e17ba447..0e23e769600a 100644
--- a/app/client/cypress/fixtures/gitImport.json
+++ b/app/client/cypress/fixtures/gitImport.json
@@ -743,7 +743,7 @@
"userPermissions": [],
"name": "DEFAULT_REST_DATASOURCE",
"pluginId": "restapi-plugin",
- "datasourceConfiguration": { "url": "hhttp://host.docker.internal:5001/v1/mock-api" },
+ "datasourceConfiguration": { "url": "http://host.docker.internal:5001/v1/mock-api" },
"invalids": [],
"messages": [],
"isValid": true,
diff --git a/app/server/appsmith-interfaces/pom.xml b/app/server/appsmith-interfaces/pom.xml
index 83d43f4e569f..00ac85011d6b 100644
--- a/app/server/appsmith-interfaces/pom.xml
+++ b/app/server/appsmith-interfaces/pom.xml
@@ -65,8 +65,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
- <version>4.0.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -127,7 +126,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.7</version>
+ <version>2.13.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/anthropicPlugin/pom.xml b/app/server/appsmith-plugins/anthropicPlugin/pom.xml
index 5a863b84f775..58b09491e771 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/pom.xml
+++ b/app/server/appsmith-plugins/anthropicPlugin/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml b/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
index aac406577ba0..b32c6ef5a7ac 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/googleAiPlugin/pom.xml b/app/server/appsmith-plugins/googleAiPlugin/pom.xml
index 9c8ba07e5c97..e0465720eca6 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleAiPlugin/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
index c427e9f9409b..18e43347b6d7 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
@@ -107,7 +107,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
diff --git a/app/server/appsmith-plugins/graphqlPlugin/pom.xml b/app/server/appsmith-plugins/graphqlPlugin/pom.xml
index a7959f291eb6..18edfe50df55 100644
--- a/app/server/appsmith-plugins/graphqlPlugin/pom.xml
+++ b/app/server/appsmith-plugins/graphqlPlugin/pom.xml
@@ -133,7 +133,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
index 035b9df192fb..6e5a2cdd0cf1 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java
@@ -17,10 +17,13 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.mongodb.MongoCommandException;
import com.mongodb.MongoSecurityException;
+import com.mongodb.reactivestreams.client.ListCollectionNamesPublisher;
import com.mongodb.reactivestreams.client.MongoClient;
import com.mongodb.reactivestreams.client.MongoDatabase;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
import org.testcontainers.containers.MongoDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -54,6 +57,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -236,8 +240,28 @@ public void testGetStructureReadPermissionError() {
when(mockConnection.getDatabase(any())).thenReturn(mockDatabase);
MongoCommandException mockMongoCmdException = mock(MongoCommandException.class);
- when(mockDatabase.listCollectionNames()).thenReturn(Mono.error(mockMongoCmdException));
+ // Mock the ListCollectionNamesPublisher
+ ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+ // Create a mock subscription
+ Subscription mockSubscription = mock(Subscription.class);
+
+ // Simulate an error when calling listCollectionNames
+ when(mockDatabase.listCollectionNames()).thenReturn(mockPublisher);
when(mockMongoCmdException.getErrorCode()).thenReturn(13);
+ // Mock the subscribe method to simulate an error
+ doAnswer(invocation -> {
+ // Extract the Subscriber passed to the subscribe method
+ Subscriber<?> subscriber = invocation.getArgument(0);
+
+ subscriber.onSubscribe(mockSubscription); // Provide a subscription
+ // Call the Subscriber's onError method to simulate an error
+ subscriber.onError(mockMongoCmdException);
+
+ return null; // Since subscribe returns void
+ })
+ .when(mockPublisher)
+ .subscribe(any());
DatasourceConfiguration dsConfig = createDatasourceConfiguration();
Mono<DatasourceStructure> structureMono = pluginExecutor
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
index accf9e106764..b93f4cebc1e0 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java
@@ -9,10 +9,13 @@
import com.appsmith.external.models.Endpoint;
import com.appsmith.external.models.SSLDetails;
import com.mongodb.MongoSocketWriteException;
+import com.mongodb.reactivestreams.client.ListCollectionNamesPublisher;
import com.mongodb.reactivestreams.client.MongoClient;
import com.mongodb.reactivestreams.client.MongoDatabase;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
import org.testcontainers.containers.MongoDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -30,8 +33,11 @@
import static com.external.plugins.constants.FieldName.SMART_SUBSTITUTION;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
/**
* Unit tests for MongoPlugin
@@ -125,7 +131,27 @@ public void testStaleConnectionOnIllegalStateExceptionOnGetStructure() {
MongoClient spyMongoClient = spy(MongoClient.class);
MongoDatabase spyMongoDatabase = spy(MongoDatabase.class);
doReturn(spyMongoDatabase).when(spyMongoClient).getDatabase(anyString());
- doReturn(Mono.error(new IllegalStateException())).when(spyMongoDatabase).listCollectionNames();
+ // Mock the ListCollectionNamesPublisher
+ ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+ // Create a mock subscription
+ Subscription mockSubscription = mock(Subscription.class);
+
+ // Simulate an error when calling listCollectionNames
+ when(spyMongoDatabase.listCollectionNames()).thenReturn(mockPublisher);
+ // Mock the subscribe method to simulate an error
+ doAnswer(invocation -> {
+ // Extract the Subscriber passed to the subscribe method
+ Subscriber<?> subscriber = invocation.getArgument(0);
+
+ subscriber.onSubscribe(mockSubscription); // Provide a subscription
+ // Call the Subscriber's onError method to simulate an error
+ subscriber.onError(new IllegalStateException());
+
+ return null; // Since subscribe returns void
+ })
+ .when(mockPublisher)
+ .subscribe(any());
DatasourceConfiguration dsConfig = createDatasourceConfiguration();
Mono<DatasourceStructure> structureMono = pluginExecutor.getStructure(spyMongoClient, dsConfig, null);
@@ -139,9 +165,27 @@ public void testStaleConnectionOnMongoSocketWriteExceptionOnGetStructure() {
MongoClient spyMongoClient = spy(MongoClient.class);
MongoDatabase spyMongoDatabase = spy(MongoDatabase.class);
doReturn(spyMongoDatabase).when(spyMongoClient).getDatabase(anyString());
- doReturn(Mono.error(new MongoSocketWriteException("", null, null)))
- .when(spyMongoDatabase)
- .listCollectionNames();
+ // Mock the ListCollectionNamesPublisher
+ ListCollectionNamesPublisher mockPublisher = mock(ListCollectionNamesPublisher.class);
+
+ // Create a mock subscription
+ Subscription mockSubscription = mock(Subscription.class);
+
+ // Simulate an error when calling listCollectionNames
+ when(spyMongoDatabase.listCollectionNames()).thenReturn(mockPublisher);
+ // Mock the subscribe method to simulate an error
+ doAnswer(invocation -> {
+ // Extract the Subscriber passed to the subscribe method
+ Subscriber<?> subscriber = invocation.getArgument(0);
+
+ subscriber.onSubscribe(mockSubscription); // Provide a subscription
+ // Call the Subscriber's onError method to simulate an error
+ subscriber.onError(new MongoSocketWriteException("", null, null));
+
+ return null; // Since subscribe returns void
+ })
+ .when(mockPublisher)
+ .subscribe(any());
DatasourceConfiguration dsConfig = createDatasourceConfiguration();
Mono<DatasourceStructure> structureMono = pluginExecutor.getStructure(spyMongoClient, dsConfig, null);
diff --git a/app/server/appsmith-plugins/openAiPlugin/pom.xml b/app/server/appsmith-plugins/openAiPlugin/pom.xml
index f19ad0b6bf57..ad65e91c1727 100644
--- a/app/server/appsmith-plugins/openAiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/openAiPlugin/pom.xml
@@ -101,7 +101,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index 775003d9ea5d..60e52b9f1284 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/app/server/appsmith-plugins/snowflakePlugin/pom.xml b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
index c545d22dd8c0..679251691988 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/pom.xml
+++ b/app/server/appsmith-plugins/snowflakePlugin/pom.xml
@@ -79,7 +79,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index e9e91196b150..033b93315bbb 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -116,7 +116,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
@@ -202,7 +201,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.7</version>
+ <version>2.13.0</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
@@ -221,13 +220,13 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-tracing-bridge-brave</artifactId>
- <version>1.0.0</version>
+ <version>1.3.4</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
</dependency>
- <!-- Commented oout Loki dependency for now, since we haven't fixed associating logs to traces-->
+ <!-- Commented out Loki dependency for now, since we haven't fixed associating logs to traces-->
<!-- <dependency>-->
<!-- <groupId>com.github.loki4j</groupId>-->
<!-- <artifactId>loki-logback-appender</artifactId>-->
@@ -315,7 +314,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
- <version>2.0.0</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
@@ -368,11 +367,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jgrapht</groupId>
@@ -390,6 +385,12 @@
<version>1.10.0</version>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.17.1</version>
+ </dependency>
+
<dependency>
<groupId>com.appsmith</groupId>
<artifactId>reactiveCaching</artifactId>
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
index 0e150ab57d1e..879780c0bb71 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java
@@ -22,7 +22,7 @@
@Slf4j
@RequiredArgsConstructor
@Component
-@Observed(name = "Server startup")
+@Observed(name = "serverStartup")
public class InstanceConfig implements ApplicationListener<ApplicationReadyEvent> {
private final ConfigService configService;
diff --git a/app/server/pom.xml b/app/server/pom.xml
index ccee774a5e50..1bd3cba3ad89 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.9</version>
+ <version>3.3.3</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -31,7 +31,6 @@
<jackson.version>2.17.0</jackson.version>
<java.version>17</java.version>
<javadoc.disabled>true</javadoc.disabled>
- <logback.version>1.4.14</logback.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>4.4.0</mockito.version>
@@ -48,8 +47,7 @@
<snakeyaml.version>2.0</snakeyaml.version>
<source.disabled>true</source.disabled>
<spotless.version>2.36.0</spotless.version>
- <spring-boot.version>3.0.9</spring-boot.version>
- <testcontainers.version>1.19.3</testcontainers.version>
+ <testcontainers.version>1.20.1</testcontainers.version>
</properties>
<build>
diff --git a/app/server/reactive-caching/pom.xml b/app/server/reactive-caching/pom.xml
index c375907b16cc..3321b759e1cc 100644
--- a/app/server/reactive-caching/pom.xml
+++ b/app/server/reactive-caching/pom.xml
@@ -32,7 +32,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
- <version>${spring-boot.version}</version>
</dependency>
<dependency>
|
8bc1c77a965ec5f2c69efe75f24660cb2916df80
|
2022-12-15 09:47:43
|
Sumit Kumar
|
fix: replace Appsmith's mock server endpoint with MockWebServer (#18943)
| false
|
replace Appsmith's mock server endpoint with MockWebServer (#18943)
|
fix
|
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 70dad8b9e025..0f5c78c1c438 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
@@ -29,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import mockwebserver3.MockResponse;
import mockwebserver3.MockWebServer;
+import mockwebserver3.RecordedRequest;
import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException;
@@ -44,6 +45,7 @@
import javax.crypto.SecretKey;
import java.io.IOException;
import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
@@ -66,6 +68,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.test.util.AssertionErrors.fail;
public class RestApiPluginTest {
@@ -131,17 +134,24 @@ public void testValidJsonApiExecution() {
@Test
- public void testExecuteApiWithPaginationForPreviousUrl() {
+ public void testExecuteApiWithPaginationForPreviousUrl() throws IOException {
+ MockWebServer mockWebServer = new MockWebServer();
+ MockResponse mockRedirectResponse = new MockResponse()
+ .setResponseCode(200);
+ mockWebServer.enqueue(mockRedirectResponse);
+ mockWebServer.start();
+
+ HttpUrl mockHttpUrl = mockWebServer.url("/mock");
- String previousUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=2&mock_filter=abc 11";
- String nextUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=4&mock_filter=abc 11";
+ String previousUrl = mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc 11";
+ String nextUrl = mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc 11";
ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
executeActionDTO.setPaginationField(PaginationField.PREV);
executeActionDTO.setViewMode(Boolean.FALSE);
DatasourceConfiguration dsConfig = new DatasourceConfiguration();
- dsConfig.setUrl("https://mock-api.appsmith.com");
+ dsConfig.setUrl(mockHttpUrl.toString());
final List<Property> headers = List.of();
@@ -174,31 +184,38 @@ public void testExecuteApiWithPaginationForPreviousUrl() {
StepVerifier.create(resultMono)
.assertNext(result -> {
- assertTrue(result.getIsExecutionSuccess());
- assertNotNull(result.getBody());
- JsonNode body = (JsonNode) result.getBody();
- assertEquals(3,body.size());
- String mainUrl = URLDecoder.decode(result.getRequest().getUrl(),StandardCharsets.UTF_8);
- assertEquals(previousUrl,mainUrl);
- final ActionExecutionRequest request = result.getRequest();
- assertEquals(HttpMethod.GET, request.getHttpMethod());
+ try {
+ RecordedRequest recordedRequest = mockWebServer.takeRequest();
+ HttpUrl requestUrl = recordedRequest.getRequestUrl();
+ String encodedPreviousUrl = mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc+11";
+ assertEquals(encodedPreviousUrl, requestUrl.toString());
+ } catch (InterruptedException e) {
+ fail("Mock web server failed to capture request.");
+ }
})
.verifyComplete();
-
}
@Test
- public void testExecuteApiWithPaginationForPreviousEncodedUrl() {
+ public void testExecuteApiWithPaginationForPreviousEncodedUrl() throws IOException {
+ MockWebServer mockWebServer = new MockWebServer();
+ MockResponse mockRedirectResponse = new MockResponse()
+ .setResponseCode(200);
+ mockWebServer.enqueue(mockRedirectResponse);
+ mockWebServer.start();
+
+ HttpUrl mockHttpUrl = mockWebServer.url("/mock");
- String previousUrl = "https%3A%2F%2Fmock-api.appsmith.com%2Fusers%3FpageSize%3D1%26page%3D2%26mock_filter%3Dabc%2011";
- String nextUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=4&mock_filter=abc 11";
+ String previousUrl = URLEncoder.encode(mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc 11",
+ StandardCharsets.UTF_8);
+ String nextUrl = mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc 11";
ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
executeActionDTO.setPaginationField(PaginationField.PREV);
executeActionDTO.setViewMode(Boolean.FALSE);
DatasourceConfiguration dsConfig = new DatasourceConfiguration();
- dsConfig.setUrl("https://mock-api.appsmith.com");
+ dsConfig.setUrl(mockHttpUrl.toString());
final List<Property> headers = List.of();
@@ -231,31 +248,37 @@ public void testExecuteApiWithPaginationForPreviousEncodedUrl() {
StepVerifier.create(resultMono)
.assertNext(result -> {
- assertTrue(result.getIsExecutionSuccess());
- assertNotNull(result.getBody());
- JsonNode body = (JsonNode) result.getBody();
- assertEquals(3,body.size());
- String mainUrl = URLDecoder.decode(result.getRequest().getUrl(),StandardCharsets.UTF_8);
- assertEquals(URLDecoder.decode(previousUrl,StandardCharsets.UTF_8),mainUrl);
- final ActionExecutionRequest request = result.getRequest();
- assertEquals(HttpMethod.GET, request.getHttpMethod());
+ try {
+ RecordedRequest recordedRequest = mockWebServer.takeRequest();
+ HttpUrl requestUrl = recordedRequest.getRequestUrl();
+ String encodedPreviousUrl = mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc+11";
+ assertEquals(encodedPreviousUrl, requestUrl.toString());
+ } catch (InterruptedException e) {
+ fail("Mock web server failed to capture request.");
+ }
})
.verifyComplete();
-
}
@Test
- public void testExecuteApiWithPaginationForNextUrl() {
+ public void testExecuteApiWithPaginationForNextUrl() throws IOException {
+ MockWebServer mockWebServer = new MockWebServer();
+ MockResponse mockRedirectResponse = new MockResponse()
+ .setResponseCode(200);
+ mockWebServer.enqueue(mockRedirectResponse);
+ mockWebServer.start();
+
+ HttpUrl mockHttpUrl = mockWebServer.url("/mock");
- String previousUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=2&mock_filter=abc 11";
- String nextUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=4&mock_filter=abc 11";
+ String previousUrl = mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc 11";
+ String nextUrl = mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc 11";
ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
executeActionDTO.setPaginationField(PaginationField.NEXT);
executeActionDTO.setViewMode(Boolean.FALSE);
DatasourceConfiguration dsConfig = new DatasourceConfiguration();
- dsConfig.setUrl("https://mock-api.appsmith.com");
+ dsConfig.setUrl(mockHttpUrl.toString());
final List<Property> headers = List.of();
@@ -288,31 +311,37 @@ public void testExecuteApiWithPaginationForNextUrl() {
StepVerifier.create(resultMono)
.assertNext(result -> {
- assertTrue(result.getIsExecutionSuccess());
- assertNotNull(result.getBody());
- JsonNode body = (JsonNode) result.getBody();
- assertEquals(3,body.size());
- String mainUrl = URLDecoder.decode(result.getRequest().getUrl(),StandardCharsets.UTF_8);
- assertEquals(nextUrl,mainUrl);
- final ActionExecutionRequest request = result.getRequest();
- assertEquals(HttpMethod.GET, request.getHttpMethod());
+ try {
+ RecordedRequest recordedRequest = mockWebServer.takeRequest();
+ HttpUrl requestUrl = recordedRequest.getRequestUrl();
+ String encodedNextUrl = mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc+11";
+ assertEquals(encodedNextUrl, requestUrl.toString());
+ } catch (InterruptedException e) {
+ fail("Mock web server failed to capture request.");
+ }
})
.verifyComplete();
-
}
@Test
- public void testExecuteApiWithPaginationForNextEncodedUrl() {
+ public void testExecuteApiWithPaginationForNextEncodedUrl() throws IOException {
+ MockWebServer mockWebServer = new MockWebServer();
+ MockResponse mockRedirectResponse = new MockResponse()
+ .setResponseCode(200);
+ mockWebServer.enqueue(mockRedirectResponse);
+ mockWebServer.start();
+
+ HttpUrl mockHttpUrl = mockWebServer.url("/mock");
- String previousUrl = "https://mock-api.appsmith.com/users?pageSize=1&page=2&mock_filter=abc 11";
- String nextUrl = "https%3A%2F%2Fmock-api.appsmith.com%2Fusers%3FpageSize%3D1%26page%3D4%26mock_filter%3Dabc%2011";
+ String previousUrl = mockHttpUrl + "?pageSize=1&page=2&mock_filter=abc 11";
+ String nextUrl = URLEncoder.encode(mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc 11", StandardCharsets.UTF_8);
ExecuteActionDTO executeActionDTO = new ExecuteActionDTO();
executeActionDTO.setPaginationField(PaginationField.NEXT);
executeActionDTO.setViewMode(Boolean.FALSE);
DatasourceConfiguration dsConfig = new DatasourceConfiguration();
- dsConfig.setUrl("https://mock-api.appsmith.com");
+ dsConfig.setUrl(mockHttpUrl.toString());
final List<Property> headers = List.of();
@@ -345,17 +374,16 @@ public void testExecuteApiWithPaginationForNextEncodedUrl() {
StepVerifier.create(resultMono)
.assertNext(result -> {
- assertTrue(result.getIsExecutionSuccess());
- assertNotNull(result.getBody());
- JsonNode body = (JsonNode) result.getBody();
- assertEquals(3,body.size());
- String mainUrl = URLDecoder.decode(result.getRequest().getUrl(),StandardCharsets.UTF_8);
- assertEquals(URLDecoder.decode(nextUrl,StandardCharsets.UTF_8),mainUrl);
- final ActionExecutionRequest request = result.getRequest();
- assertEquals(HttpMethod.GET, request.getHttpMethod());
+ try {
+ RecordedRequest recordedRequest = mockWebServer.takeRequest();
+ HttpUrl requestUrl = recordedRequest.getRequestUrl();
+ String encodedNextUrl = mockHttpUrl + "?pageSize=1&page=4&mock_filter=abc+11";
+ assertEquals(encodedNextUrl, requestUrl.toString());
+ } catch (InterruptedException e) {
+ fail("Mock web server failed to capture request.");
+ }
})
.verifyComplete();
-
}
@Test
|
6b3c9f4dca7ac24a123ea32d332d5fb69340a2ad
|
2024-03-22 12:34:05
|
Anagh Hegde
|
feat: add layout on load actions to import block API response (#31993)
| false
|
add layout on load actions to import block API response (#31993)
|
feat
|
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 0545d5d5204b..bb6e05b5a9f6 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
@@ -15,6 +15,7 @@
import com.appsmith.server.dtos.ApplicationPagesDTO;
import com.appsmith.server.dtos.ArtifactImportDTO;
import com.appsmith.server.dtos.BuildingBlockDTO;
+import com.appsmith.server.dtos.BuildingBlockResponseDTO;
import com.appsmith.server.dtos.GitAuthDTO;
import com.appsmith.server.dtos.PartialExportFileDTO;
import com.appsmith.server.dtos.ReleaseItemsDTO;
@@ -409,7 +410,7 @@ public Mono<ResponseDTO<Application>> importApplicationPartially(
@JsonView(Views.Public.class)
@PostMapping("/import/partial/block")
- public Mono<ResponseDTO<String>> importBlock(
+ public Mono<ResponseDTO<BuildingBlockResponseDTO>> importBlock(
@RequestBody BuildingBlockDTO buildingBlockDTO,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return partialImportService
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
new file mode 100644
index 000000000000..655b6f22b315
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/BuildingBlockResponseDTO.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.dtos;
+
+import com.appsmith.external.dtos.DslExecutableDTO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BuildingBlockResponseDTO {
+ String widgetDsl;
+
+ List<DslExecutableDTO> onPageLoadActions;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCE.java
index 484773a2116f..88635db07701 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCE.java
@@ -2,6 +2,7 @@
import com.appsmith.server.domains.Application;
import com.appsmith.server.dtos.BuildingBlockDTO;
+import com.appsmith.server.dtos.BuildingBlockResponseDTO;
import org.springframework.http.codec.multipart.Part;
import reactor.core.publisher.Mono;
@@ -10,5 +11,5 @@ public interface PartialImportServiceCE {
Mono<Application> importResourceInPage(
String workspaceId, String applicationId, String pageId, String branchName, Part file);
- Mono<String> importBuildingBlock(BuildingBlockDTO buildingBlockDTO, String branchName);
+ Mono<BuildingBlockResponseDTO> importBuildingBlock(BuildingBlockDTO buildingBlockDTO, String branchName);
}
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 a73f324adb6a..dc3c93a0cf98 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
@@ -18,6 +18,7 @@
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.BuildingBlockDTO;
import com.appsmith.server.dtos.BuildingBlockImportDTO;
+import com.appsmith.server.dtos.BuildingBlockResponseDTO;
import com.appsmith.server.dtos.ImportingMetaDTO;
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.exceptions.AppsmithError;
@@ -51,6 +52,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -397,17 +399,69 @@ private Mono<String> paneNameMapForActionAndActionCollectionInAppJson(
}
@Override
- public Mono<String> importBuildingBlock(BuildingBlockDTO buildingBlockDTO, String branchName) {
+ public Mono<BuildingBlockResponseDTO> importBuildingBlock(BuildingBlockDTO buildingBlockDTO, String branchName) {
Mono<ApplicationJson> applicationJsonMono =
applicationTemplateService.getApplicationJsonFromTemplate(buildingBlockDTO.getTemplateId());
- return applicationJsonMono
- .flatMap(applicationJson -> this.importResourceInPage(
- buildingBlockDTO.getWorkspaceId(),
- buildingBlockDTO.getApplicationId(),
- buildingBlockDTO.getPageId(),
- branchName,
- applicationJson))
- .map(BuildingBlockImportDTO::getWidgetDsl);
+ return applicationJsonMono.flatMap(applicationJson -> {
+ return this.importResourceInPage(
+ buildingBlockDTO.getWorkspaceId(),
+ buildingBlockDTO.getApplicationId(),
+ buildingBlockDTO.getPageId(),
+ branchName,
+ applicationJson)
+ .flatMap(buildingBlockImportDTO -> {
+ // Fetch layout and get new onPageLoadActions
+ // This data is not present in a client, since these are created
+ // after importing the block
+ Set<String> newOnPageLoadActionNames = new HashSet<>();
+ applicationJson
+ .getPageList()
+ .get(0)
+ .getPublishedPage()
+ .getLayouts()
+ .get(0)
+ .getLayoutOnLoadActions()
+ .forEach(dslExecutableDTOS -> {
+ dslExecutableDTOS.forEach(dslExecutableDTO -> {
+ if (dslExecutableDTO.getName() != null) {
+ newOnPageLoadActionNames.add(dslExecutableDTO.getName());
+ }
+ });
+ });
+
+ BuildingBlockResponseDTO buildingBlockResponseDTO = new BuildingBlockResponseDTO();
+ buildingBlockResponseDTO.setWidgetDsl(buildingBlockImportDTO.getWidgetDsl());
+ return newPageService
+ .findBranchedPageId(
+ branchName, buildingBlockDTO.getPageId(), AclPermission.MANAGE_PAGES)
+ .flatMap(branchedPageId -> newPageService
+ .findById(branchedPageId, Optional.empty())
+ .map(newPage -> {
+ if (newPage.getUnpublishedPage()
+ .getLayouts()
+ .get(0)
+ .getLayoutOnLoadActions()
+ == null) {
+ return buildingBlockResponseDTO;
+ }
+ newPage.getUnpublishedPage()
+ .getLayouts()
+ .get(0)
+ .getLayoutOnLoadActions()
+ .forEach(dslExecutableDTOS -> {
+ // Filter the onPageLoadActions based on the json file
+ buildingBlockResponseDTO
+ .getOnPageLoadActions()
+ .addAll(dslExecutableDTOS.stream()
+ .filter(dslExecutableDTO ->
+ newOnPageLoadActionNames.contains(
+ dslExecutableDTO.getName()))
+ .toList());
+ });
+ return buildingBlockResponseDTO;
+ }));
+ });
+ });
}
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java
index 7f1face0438b..40ed0ed21982 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java
@@ -18,6 +18,7 @@
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.BuildingBlockDTO;
+import com.appsmith.server.dtos.BuildingBlockResponseDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.helpers.MockPluginExecutor;
import com.appsmith.server.helpers.PluginExecutorHelper;
@@ -495,16 +496,16 @@ public void testPartialImportWithBuildingBlock_nameClash_success() {
buildingBlockDTO1.setWorkspaceId(workspaceId);
buildingBlockDTO1.setTemplateId("templatedId1");
- Mono<String> result = partialImportService
+ Mono<BuildingBlockResponseDTO> result = partialImportService
.importBuildingBlock(buildingBlockDTO, null)
.flatMap(s -> partialImportService.importBuildingBlock(buildingBlockDTO1, null));
StepVerifier.create(result)
- .assertNext(dsl -> {
- assertThat(dsl).isNotNull();
+ .assertNext(BuildingBlockResponseDTO1 -> {
+ assertThat(BuildingBlockResponseDTO1.getWidgetDsl()).isNotNull();
// Compare the json string of widget DSL,
// the binding names will be updated, and hence the json will be different
- assertThat(dsl)
+ assertThat(BuildingBlockResponseDTO1.getWidgetDsl())
.isNotEqualTo(applicationJson
.getPageList()
.get(0)
|
1ee67b7d608c18b2bd592315e5d7f5c9edc29cd5
|
2024-06-27 15:33:07
|
Nilansh Bansal
|
chore: added spans for super user check and fetch user permissions (#34516)
| false
|
added spans for super user check and fetch user permissions (#34516)
|
chore
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/UserSpan.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/UserSpan.java
new file mode 100644
index 000000000000..912f46a2274c
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/UserSpan.java
@@ -0,0 +1,5 @@
+package com.appsmith.external.constants.spans;
+
+import com.appsmith.external.constants.spans.ce.UserSpanCE;
+
+public class UserSpan extends UserSpanCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/TenantSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/TenantSpanCE.java
index cd2cdd165b1a..104561730b0a 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/TenantSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/TenantSpanCE.java
@@ -3,8 +3,9 @@
import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
public class TenantSpanCE {
- public static final String FETCH_DEFAULT_TENANT_SPAN = APPSMITH_SPAN_PREFIX + "fetch_default_tenant";
+ public static final String TENANT_SPAN = APPSMITH_SPAN_PREFIX + "tenant.";
+ public static final String FETCH_DEFAULT_TENANT_SPAN = TENANT_SPAN + "fetch_default_tenant";
public static final String FETCH_TENANT_CACHE_POST_DESERIALIZATION_ERROR_SPAN =
- APPSMITH_SPAN_PREFIX + "fetch_tenant_cache_post_deserialization_error";
- public static final String FETCH_TENANT_FROM_DB_SPAN = APPSMITH_SPAN_PREFIX + "fetch_tenant_from_db";
+ TENANT_SPAN + "fetch_tenant_cache_post_deserialization_error";
+ public static final String FETCH_TENANT_FROM_DB_SPAN = TENANT_SPAN + "fetch_tenant_from_db";
}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/UserSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/UserSpanCE.java
new file mode 100644
index 000000000000..ac910f3a47e3
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/UserSpanCE.java
@@ -0,0 +1,10 @@
+package com.appsmith.external.constants.spans.ce;
+
+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+
+public class UserSpanCE {
+ public static final String USER_SPAN = APPSMITH_SPAN_PREFIX + "user.";
+ public static final String CHECK_SUPER_USER_SPAN = USER_SPAN + "check_super_user";
+ public static final String FETCH_ALL_PERMISSION_GROUPS_OF_USER_SPAN =
+ USER_SPAN + "fetch_all_permission_groups_of_user";
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserUtils.java
index 992e20a9f99f..7bbbfd6ee8cf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserUtils.java
@@ -5,6 +5,7 @@
import com.appsmith.server.repositories.ConfigRepository;
import com.appsmith.server.repositories.PermissionGroupRepository;
import com.appsmith.server.solutions.PermissionGroupPermission;
+import io.micrometer.observation.ObservationRegistry;
import org.springframework.stereotype.Component;
@Component
@@ -13,8 +14,14 @@ public UserUtils(
ConfigRepository configRepository,
PermissionGroupRepository permissionGroupRepository,
CacheableRepositoryHelper cacheableRepositoryHelper,
- PermissionGroupPermission permissionGroupPermission) {
+ PermissionGroupPermission permissionGroupPermission,
+ ObservationRegistry observationRegistry) {
- super(configRepository, permissionGroupRepository, cacheableRepositoryHelper, permissionGroupPermission);
+ super(
+ configRepository,
+ permissionGroupRepository,
+ cacheableRepositoryHelper,
+ permissionGroupPermission,
+ observationRegistry);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
index 14c5f9045c3f..eea297afe722 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
@@ -13,7 +13,9 @@
import com.appsmith.server.repositories.ConfigRepository;
import com.appsmith.server.repositories.PermissionGroupRepository;
import com.appsmith.server.solutions.PermissionGroupPermission;
+import io.micrometer.observation.ObservationRegistry;
import net.minidev.json.JSONObject;
+import reactor.core.observability.micrometer.Micrometer;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;
@@ -24,6 +26,7 @@
import java.util.Set;
import java.util.stream.Collectors;
+import static com.appsmith.external.constants.spans.UserSpan.CHECK_SUPER_USER_SPAN;
import static com.appsmith.server.acl.AclPermission.ASSIGN_PERMISSION_GROUPS;
import static com.appsmith.server.acl.AclPermission.MANAGE_INSTANCE_CONFIGURATION;
import static com.appsmith.server.acl.AclPermission.READ_INSTANCE_CONFIGURATION;
@@ -39,22 +42,27 @@ public class UserUtilsCE {
private final PermissionGroupRepository permissionGroupRepository;
private final PermissionGroupPermission permissionGroupPermission;
+ private final ObservationRegistry observationRegistry;
public UserUtilsCE(
ConfigRepository configRepository,
PermissionGroupRepository permissionGroupRepository,
CacheableRepositoryHelper cacheableRepositoryHelper,
- PermissionGroupPermission permissionGroupPermission) {
+ PermissionGroupPermission permissionGroupPermission,
+ ObservationRegistry observationRegistry) {
this.configRepository = configRepository;
this.permissionGroupRepository = permissionGroupRepository;
this.permissionGroupPermission = permissionGroupPermission;
+ this.observationRegistry = observationRegistry;
}
public Mono<Boolean> isSuperUser(User user) {
return configRepository
.findByNameAsUser(INSTANCE_CONFIG, user, AclPermission.MANAGE_INSTANCE_CONFIGURATION)
.map(config -> Boolean.TRUE)
- .switchIfEmpty(Mono.just(Boolean.FALSE));
+ .switchIfEmpty(Mono.just(Boolean.FALSE))
+ .name(CHECK_SUPER_USER_SPAN)
+ .tap(Micrometer.observation(observationRegistry));
}
public Mono<Boolean> isCurrentUserSuperUser() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomConfigRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomConfigRepositoryImpl.java
index 9486254f04dd..be37ca11117f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomConfigRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomConfigRepositoryImpl.java
@@ -1,7 +1,15 @@
package com.appsmith.server.repositories;
import com.appsmith.server.repositories.ce.CustomConfigRepositoryCEImpl;
+import io.micrometer.observation.ObservationRegistry;
import org.springframework.stereotype.Component;
@Component
-public class CustomConfigRepositoryImpl extends CustomConfigRepositoryCEImpl implements CustomConfigRepository {}
+public class CustomConfigRepositoryImpl extends CustomConfigRepositoryCEImpl implements CustomConfigRepository {
+ private final ObservationRegistry observationRegistry;
+
+ public CustomConfigRepositoryImpl(ObservationRegistry observationRegistry) {
+ super(observationRegistry);
+ this.observationRegistry = observationRegistry;
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomConfigRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomConfigRepositoryCEImpl.java
index ff1ccccefe0b..5ad1ebaf26d3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomConfigRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomConfigRepositoryCEImpl.java
@@ -6,11 +6,21 @@
import com.appsmith.server.helpers.ce.bridge.Bridge;
import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
+import io.micrometer.observation.ObservationRegistry;
+import reactor.core.observability.micrometer.Micrometer;
import reactor.core.publisher.Mono;
+import static com.appsmith.external.constants.spans.UserSpan.FETCH_ALL_PERMISSION_GROUPS_OF_USER_SPAN;
+
public class CustomConfigRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Config>
implements CustomConfigRepositoryCE {
+ private final ObservationRegistry observationRegistry;
+
+ public CustomConfigRepositoryCEImpl(ObservationRegistry observationRegistry) {
+ this.observationRegistry = observationRegistry;
+ }
+
@Override
public Mono<Config> findByName(String name, AclPermission permission) {
BridgeQuery<Config> nameCriteria = Bridge.equal(Config.Fields.name, name);
@@ -19,10 +29,13 @@ public Mono<Config> findByName(String name, AclPermission permission) {
@Override
public Mono<Config> findByNameAsUser(String name, User user, AclPermission permission) {
- return getAllPermissionGroupsForUser(user).flatMap(permissionGroups -> queryBuilder()
- .criteria(Bridge.equal(Config.Fields.name, name))
- .permission(permission)
- .permissionGroups(permissionGroups)
- .one());
+ return getAllPermissionGroupsForUser(user)
+ .name(FETCH_ALL_PERMISSION_GROUPS_OF_USER_SPAN)
+ .tap(Micrometer.observation(observationRegistry))
+ .flatMap(permissionGroups -> queryBuilder()
+ .criteria(Bridge.equal(Config.Fields.name, name))
+ .permission(permission)
+ .permissionGroups(permissionGroups)
+ .one());
}
}
|
aa18a4f46de6a01c281b7f487f43c6db23372e75
|
2024-09-19 13:49:52
|
Rahul Barwal
|
chore: Removes unused feature flag ref (#36416)
| false
|
Removes unused feature flag ref (#36416)
|
chore
|
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index d066f825510e..d75f566697ad 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -12780,7 +12780,6 @@ export const defaultAppState = {
ab_ds_binding_enabled: true,
ask_ai_js: false,
license_connection_pool_size_enabled: false,
- release_widgetdiscovery_enabled: false,
ab_ai_js_function_completion_enabled: true,
release_workflows_enabled: false,
license_scim_enabled: false,
|
194b78b4c4f1005d1a852d1008cc5ccc8d90cfde
|
2022-02-07 09:49:47
|
Snyk bot
|
chore: Upgrade org.springframework:spring-webflux from 5.2.3.RELEASE to 5.3.15 (#4586)
| false
|
Upgrade org.springframework:spring-webflux from 5.2.3.RELEASE to 5.3.15 (#4586)
|
chore
|
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
index bbd2033a6790..628c219df454 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
@@ -32,21 +32,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.15</version>
<exclusions>
<exclusion>
<groupId>io.projectreactor</groupId>
@@ -185,7 +185,8 @@
<configuration>
<minimizeJar>false</minimizeJar>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Plugin-Version>${plugin.version}</Plugin-Version>
<Plugin-Id>${plugin.id}</Plugin-Id>
diff --git a/app/server/pom.xml b/app/server/pom.xml
index c0471836b07e..f58738dd23dc 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.5</version>
+ <version>2.5.9</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
|
c5c97fab8c3939560ad7dda1ce70636ec6af604e
|
2025-03-05 15:15:56
|
Rudraprasad Das
|
chore: fixing dropdown issue with default branch (#39552)
| false
|
fixing dropdown issue with default branch (#39552)
|
chore
|
diff --git a/app/client/src/git/ce/components/DefaultBranch/DefaultBranchView.tsx b/app/client/src/git/ce/components/DefaultBranch/DefaultBranchView.tsx
index 1e76143d2dc5..db99e1f6ed24 100644
--- a/app/client/src/git/ce/components/DefaultBranch/DefaultBranchView.tsx
+++ b/app/client/src/git/ce/components/DefaultBranch/DefaultBranchView.tsx
@@ -39,6 +39,10 @@ const SectionDesc = styled(Text)`
const StyledSelect = styled(Select)`
width: 240px;
margin-right: 12px;
+
+ .rc-virtual-list-holder {
+ max-height: 120px !important;
+ }
`;
const StyledLink = styled(Link)`
diff --git a/app/client/src/git/components/SettingsModal/TabBranch/index.tsx b/app/client/src/git/components/SettingsModal/TabBranch/index.tsx
index 559685801b09..3f10c848d502 100644
--- a/app/client/src/git/components/SettingsModal/TabBranch/index.tsx
+++ b/app/client/src/git/components/SettingsModal/TabBranch/index.tsx
@@ -5,6 +5,7 @@ import DefaultBranch from "git/ee/components/DefaultBranch";
const Container = styled.div`
overflow: auto;
+ min-height: 280px;
`;
interface TabBranchProps {
diff --git a/app/client/src/git/components/SettingsModal/TabGeneral/index.tsx b/app/client/src/git/components/SettingsModal/TabGeneral/index.tsx
index 7a534137669b..ba95a3d4ec06 100644
--- a/app/client/src/git/components/SettingsModal/TabGeneral/index.tsx
+++ b/app/client/src/git/components/SettingsModal/TabGeneral/index.tsx
@@ -5,6 +5,7 @@ import styled from "styled-components";
const Container = styled.div`
overflow: auto;
+ min-height: 280px;
`;
interface TabGeneralProps {
|
bc0325617c444cdb6565dcd140beaa761484f660
|
2022-04-08 22:52:58
|
imgbot[bot]
|
chore: [ImgBot] Optimize images (#12266)
| false
|
[ImgBot] Optimize images (#12266)
|
chore
|
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/EmptyApp.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/EmptyApp.snap.png
index 0273bfeda090..81457cc4899c 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/EmptyApp.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/EmptyApp.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/Profile.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/Profile.snap.png
index 82c2b4d6c798..f217f0e5948a 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/Profile.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/Profile.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/apppage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/apppage.snap.png
index 101d849e7c12..104d8cdd953b 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/apppage.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/apppage.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/emptyAppBuilder.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/emptyAppBuilder.snap.png
index b77f47bfee5b..ecc70ecb3066 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/emptyAppBuilder.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/emptyAppBuilder.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/loginpage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/loginpage.snap.png
index 7fc1101925fd..0ef333c6f8bf 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/loginpage.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/loginpage.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/quickPageWizard.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/quickPageWizard.snap.png
index e9534e8b64c4..3bf1bfbedb92 100644
Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/quickPageWizard.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout_spec.js/quickPageWizard.snap.png differ
diff --git a/app/client/src/assets/gifs/default_text.gif b/app/client/src/assets/gifs/default_text.gif
index 71b15ecca168..484a5bc6c1a9 100644
Binary files a/app/client/src/assets/gifs/default_text.gif and b/app/client/src/assets/gifs/default_text.gif differ
diff --git a/app/client/src/assets/gifs/table_data.gif b/app/client/src/assets/gifs/table_data.gif
index 5f38c3018fd6..ffde74a11d1d 100644
Binary files a/app/client/src/assets/gifs/table_data.gif and b/app/client/src/assets/gifs/table_data.gif differ
diff --git a/app/client/src/assets/icons/ads/fork-2.svg b/app/client/src/assets/icons/ads/fork-2.svg
index 54c7d3643287..650e43f151be 100644
--- a/app/client/src/assets/icons/ads/fork-2.svg
+++ b/app/client/src/assets/icons/ads/fork-2.svg
@@ -1,7 +1 @@
-<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="M12 17C11.4477 17 11 17.4477 11 18C11 18.5523 11.4477 19 12 19C12.5523 19 13 18.5523 13 18C13 17.4477 12.5523 17 12 17ZM9 18C9 16.3431 10.3431 15 12 15C13.6569 15 15 16.3431 15 18C15 19.6569 13.6569 21 12 21C10.3431 21 9 19.6569 9 18Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 5C6.44772 5 6 5.44772 6 6C6 6.55228 6.44772 7 7 7C7.55228 7 8 6.55228 8 6C8 5.44772 7.55228 5 7 5ZM4 6C4 4.34315 5.34315 3 7 3C8.65685 3 10 4.34315 10 6C10 7.65685 8.65685 9 7 9C5.34315 9 4 7.65685 4 6Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 5C16.4477 5 16 5.44772 16 6C16 6.55228 16.4477 7 17 7C17.5523 7 18 6.55228 18 6C18 5.44772 17.5523 5 17 5ZM14 6C14 4.34315 15.3431 3 17 3C18.6569 3 20 4.34315 20 6C20 7.65685 18.6569 9 17 9C15.3431 9 14 7.65685 14 6Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7C7.55228 7 8 7.44772 8 8V10C8 10.5523 8.44772 11 9 11H15C15.5523 11 16 10.5523 16 10V8C16 7.44772 16.4477 7 17 7C17.5523 7 18 7.44772 18 8V10C18 11.6569 16.6569 13 15 13H9C7.34315 13 6 11.6569 6 10V8C6 7.44772 6.44772 7 7 7Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 11C12.5523 11 13 11.4477 13 12V16C13 16.5523 12.5523 17 12 17C11.4477 17 11 16.5523 11 16V12C11 11.4477 11.4477 11 12 11Z" fill="currentColor"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path fill="currentColor" fill-rule="evenodd" d="M12 17C11.4477 17 11 17.4477 11 18C11 18.5523 11.4477 19 12 19C12.5523 19 13 18.5523 13 18C13 17.4477 12.5523 17 12 17ZM9 18C9 16.3431 10.3431 15 12 15C13.6569 15 15 16.3431 15 18C15 19.6569 13.6569 21 12 21C10.3431 21 9 19.6569 9 18Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M7 5C6.44772 5 6 5.44772 6 6C6 6.55228 6.44772 7 7 7C7.55228 7 8 6.55228 8 6C8 5.44772 7.55228 5 7 5ZM4 6C4 4.34315 5.34315 3 7 3C8.65685 3 10 4.34315 10 6C10 7.65685 8.65685 9 7 9C5.34315 9 4 7.65685 4 6Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M17 5C16.4477 5 16 5.44772 16 6C16 6.55228 16.4477 7 17 7C17.5523 7 18 6.55228 18 6C18 5.44772 17.5523 5 17 5ZM14 6C14 4.34315 15.3431 3 17 3C18.6569 3 20 4.34315 20 6C20 7.65685 18.6569 9 17 9C15.3431 9 14 7.65685 14 6Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M7 7C7.55228 7 8 7.44772 8 8V10C8 10.5523 8.44772 11 9 11H15C15.5523 11 16 10.5523 16 10V8C16 7.44772 16.4477 7 17 7C17.5523 7 18 7.44772 18 8V10C18 11.6569 16.6569 13 15 13H9C7.34315 13 6 11.6569 6 10V8C6 7.44772 6.44772 7 7 7Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M12 11C12.5523 11 13 11.4477 13 12V16C13 16.5523 12.5523 17 12 17C11.4477 17 11 16.5523 11 16V12C11 11.4477 11.4477 11 12 11Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/ads/js.svg b/app/client/src/assets/icons/ads/js.svg
index 8dbdbebc9122..62e6456542c1 100644
--- a/app/client/src/assets/icons/ads/js.svg
+++ b/app/client/src/assets/icons/ads/js.svg
@@ -1,5 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M4.8 20.2V3.8H12H15.1686L17.4343 6.06569L19.2 7.83137V12V20.2H4.8Z" fill="#ffffff" stroke="#575757" stroke-width="1.6"/>
- <path d="M7.25391 16.0625C7.25391 17.3672 8.10938 18.1562 9.47656 18.1562C10.8438 18.1562 11.6641 17.4297 11.6641 16.1055V12.3633H10.0078V16.0938C10.0078 16.5352 9.8125 16.7695 9.44922 16.7695C9.07422 16.7695 8.83984 16.5039 8.83984 16.0625H7.25391Z" fill="#575757"/>
- <path d="M12.7227 16.3555C12.7305 17.4727 13.6484 18.1562 15.1445 18.1562C16.6836 18.1562 17.6055 17.4297 17.6055 16.2109C17.6055 15.2969 17.0977 14.7773 16 14.5859L15.2305 14.4531C14.6914 14.3594 14.4609 14.2031 14.4609 13.9336C14.4609 13.6211 14.7422 13.4258 15.1719 13.4258C15.6133 13.4258 15.9609 13.6836 15.9727 14.0234H17.4883C17.4766 12.9414 16.5273 12.207 15.1367 12.207C13.7266 12.207 12.8164 12.9492 12.8164 14.0977C12.8164 15.0078 13.3789 15.6016 14.4141 15.7812L15.1602 15.9141C15.7656 16.0234 15.9766 16.1484 15.9766 16.4102C15.9766 16.7266 15.668 16.9336 15.2031 16.9336C14.6719 16.9336 14.3125 16.707 14.293 16.3555H12.7227Z" fill="#575757"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path fill="#fff" stroke="#575757" stroke-width="1.6" d="M4.8 20.2V3.8H12H15.1686L17.4343 6.06569L19.2 7.83137V12V20.2H4.8Z"/><path fill="#575757" d="M7.25391 16.0625C7.25391 17.3672 8.10938 18.1562 9.47656 18.1562C10.8438 18.1562 11.6641 17.4297 11.6641 16.1055V12.3633H10.0078V16.0938C10.0078 16.5352 9.8125 16.7695 9.44922 16.7695C9.07422 16.7695 8.83984 16.5039 8.83984 16.0625H7.25391Z"/><path fill="#575757" d="M12.7227 16.3555C12.7305 17.4727 13.6484 18.1562 15.1445 18.1562C16.6836 18.1562 17.6055 17.4297 17.6055 16.2109C17.6055 15.2969 17.0977 14.7773 16 14.5859L15.2305 14.4531C14.6914 14.3594 14.4609 14.2031 14.4609 13.9336C14.4609 13.6211 14.7422 13.4258 15.1719 13.4258C15.6133 13.4258 15.9609 13.6836 15.9727 14.0234H17.4883C17.4766 12.9414 16.5273 12.207 15.1367 12.207C13.7266 12.207 12.8164 12.9492 12.8164 14.0977C12.8164 15.0078 13.3789 15.6016 14.4141 15.7812L15.1602 15.9141C15.7656 16.0234 15.9766 16.1484 15.9766 16.4102C15.9766 16.7266 15.668 16.9336 15.2031 16.9336C14.6719 16.9336 14.3125 16.707 14.293 16.3555H12.7227Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/icons/menu/settings.svg b/app/client/src/assets/icons/menu/settings.svg
index 7361abf4b929..534284c35016 100644
--- a/app/client/src/assets/icons/menu/settings.svg
+++ b/app/client/src/assets/icons/menu/settings.svg
@@ -1,3 +1 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.64268 3.03595L5.90731 1.3999H8.09268L8.35731 3.03595C8.92037 3.21109 9.42751 3.49525 9.86401 3.85804L11.4774 3.23537L12.6 5.02199L11.2555 6.07606C11.3262 6.37368 11.3665 6.68187 11.3665 6.9999C11.3665 7.31793 11.3262 7.62611 11.2555 7.92373L12.6 8.97781L11.4774 10.7644L9.86401 10.1418C9.42751 10.5046 8.92037 10.7887 8.35731 10.9639L8.09268 12.5999H5.90731L5.64268 10.9639C5.0796 10.7887 4.57248 10.5046 4.13598 10.1418L2.52255 10.7644L1.39999 8.97781L2.7445 7.92373C2.67379 7.62611 2.63354 7.31793 2.63354 6.9999C2.63354 6.68187 2.67379 6.37368 2.7445 6.07606L1.39999 5.02199L2.52255 3.23537L4.13598 3.85804C4.57249 3.49525 5.0796 3.21109 5.64268 3.03595ZM9.09999 6.9999C9.09999 5.84011 8.1598 4.8999 6.99999 4.8999C5.8402 4.8999 4.89999 5.84011 4.89999 6.9999C4.89999 8.15969 5.8402 9.0999 6.99999 9.0999C8.1598 9.0999 9.09999 8.15969 9.09999 6.9999Z" fill="#F86A2B"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path fill="#F86A2B" fill-rule="evenodd" d="M5.64268 3.03595L5.90731 1.3999H8.09268L8.35731 3.03595C8.92037 3.21109 9.42751 3.49525 9.86401 3.85804L11.4774 3.23537L12.6 5.02199L11.2555 6.07606C11.3262 6.37368 11.3665 6.68187 11.3665 6.9999C11.3665 7.31793 11.3262 7.62611 11.2555 7.92373L12.6 8.97781L11.4774 10.7644L9.86401 10.1418C9.42751 10.5046 8.92037 10.7887 8.35731 10.9639L8.09268 12.5999H5.90731L5.64268 10.9639C5.0796 10.7887 4.57248 10.5046 4.13598 10.1418L2.52255 10.7644L1.39999 8.97781L2.7445 7.92373C2.67379 7.62611 2.63354 7.31793 2.63354 6.9999C2.63354 6.68187 2.67379 6.37368 2.7445 6.07606L1.39999 5.02199L2.52255 3.23537L4.13598 3.85804C4.57249 3.49525 5.0796 3.21109 5.64268 3.03595ZM9.09999 6.9999C9.09999 5.84011 8.1598 4.8999 6.99999 4.8999C5.8402 4.8999 4.89999 5.84011 4.89999 6.9999C4.89999 8.15969 5.8402 9.0999 6.99999 9.0999C8.1598 9.0999 9.09999 8.15969 9.09999 6.9999Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/lock-password-line.svg b/app/client/src/assets/images/lock-password-line.svg
index c38c9c87c35c..49fd472d3311 100644
--- a/app/client/src/assets/images/lock-password-line.svg
+++ b/app/client/src/assets/images/lock-password-line.svg
@@ -1,3 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 8H20C20.2652 8 20.5196 8.10536 20.7071 8.29289C20.8946 8.48043 21 8.73478 21 9V21C21 21.2652 20.8946 21.5196 20.7071 21.7071C20.5196 21.8946 20.2652 22 20 22H4C3.73478 22 3.48043 21.8946 3.29289 21.7071C3.10536 21.5196 3 21.2652 3 21V9C3 8.73478 3.10536 8.48043 3.29289 8.29289C3.48043 8.10536 3.73478 8 4 8H6V7C6 5.4087 6.63214 3.88258 7.75736 2.75736C8.88258 1.63214 10.4087 1 12 1C13.5913 1 15.1174 1.63214 16.2426 2.75736C17.3679 3.88258 18 5.4087 18 7V8ZM5 10V20H19V10H5ZM11 14H13V16H11V14ZM7 14H9V16H7V14ZM15 14H17V16H15V14ZM16 8V7C16 5.93913 15.5786 4.92172 14.8284 4.17157C14.0783 3.42143 13.0609 3 12 3C10.9391 3 9.92172 3.42143 9.17157 4.17157C8.42143 4.92172 8 5.93913 8 7V8H16Z" fill="#858282"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path fill="#858282" d="M18 8H20C20.2652 8 20.5196 8.10536 20.7071 8.29289C20.8946 8.48043 21 8.73478 21 9V21C21 21.2652 20.8946 21.5196 20.7071 21.7071C20.5196 21.8946 20.2652 22 20 22H4C3.73478 22 3.48043 21.8946 3.29289 21.7071C3.10536 21.5196 3 21.2652 3 21V9C3 8.73478 3.10536 8.48043 3.29289 8.29289C3.48043 8.10536 3.73478 8 4 8H6V7C6 5.4087 6.63214 3.88258 7.75736 2.75736C8.88258 1.63214 10.4087 1 12 1C13.5913 1 15.1174 1.63214 16.2426 2.75736C17.3679 3.88258 18 5.4087 18 7V8ZM5 10V20H19V10H5ZM11 14H13V16H11V14ZM7 14H9V16H7V14ZM15 14H17V16H15V14ZM16 8V7C16 5.93913 15.5786 4.92172 14.8284 4.17157C14.0783 3.42143 13.0609 3 12 3C10.9391 3 9.92172 3.42143 9.17157 4.17157C8.42143 4.92172 8 5.93913 8 7V8H16Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/oidc.svg b/app/client/src/assets/images/oidc.svg
index 198adac72857..63e6267adba2 100644
--- a/app/client/src/assets/images/oidc.svg
+++ b/app/client/src/assets/images/oidc.svg
@@ -1,9 +1 @@
-<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect width="24" height="22.1705" fill="url(#pattern0)"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_906_2575" transform="scale(0.00100301)"/>
-</pattern>
-<image id="image0_906_2575" width="997" height="921" xlink:href="data:image/png;base64,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"/>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="23" fill="none" viewBox="0 0 24 23"><rect width="24" height="22.171" fill="url(#pattern0)"/><defs><pattern id="pattern0" width="1" height="1" patternContentUnits="objectBoundingBox"><use transform="scale(0.00100301)" xlink:href="#image0_906_2575"/></pattern><image id="image0_906_2575" width="997" height="921" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+UAAAOZCAYAAAB4I4EwAAA6UUlEQVR42uzdz20b2YL24c7ACbQluBNQCNzPhiEwBIbgCO4QsLVpYADuuSHqElwTmAlAIRCYBLSU+248dTyHfdlqURYpVp1/zwP8MLOYxfd1N2m+rqpTv/wCAAAAAABQo6f7T7f+KQAAAMCoY/xm1rd/+nrz2T8NAAAAGHeMf48Z5QAAADDyGDfKAQAAINEYN8oBAADg2r7//tuHMLa/fb15fGWMG+UAAACQaIwb5QAAAJBojBvlAAAAkGiMG+UAAABwrqf7T7dXGONGOQAAAJw1xu9vllcY4kY5AAAAJBzjRjkAAAAkGuNGOQAAACQa40Y5AAAA/DnGv/w6+fb1dj3SGDfKAQAAIIzxp68fdyOPcaMcAAAAYzzRGDfKAQAAMMaNcgAAABjYH/cfpxmNcaMcAACA+j3d38z69pmNcaMcAAAAY9woBwAAgLbGuFEOAACAMW6UAwAAwAW+//7bh29fb+YFjnGjHAAAgHLHeBi0/SB/LHSMG+UAAAAY40Y5AAAAtDXGjXIAAACMcaMcAAAAjjzdf7p9ur9ZVjrEjXIAAACMcaMcAAAAY7y9MW6UAwAAYIwb5QAAADTlX18+3TU+xo1yAAAAxvX05dfJ09ePO2PcKAcAAMAYN8oBAAAwxo1yAAAAMMaNcgAAAAoc4/c3s29fbx6MbaMcAACAEcd4397INsoBAAAwxo1yAAAAjHEZ5QAAALzT999/+2CMG+UAAACMPcb78fjt682jEW2UAwAAYIwb5QAAABjjMsoBAAAwxo1yAAAAyvJ0/+n225ebhTFulAMAADDiGH+6v1kaxkY5AAAAxrhRDgAAgDEuoxwAAABj3CgHAACgwDH+5dfJ09ePO8PXKAcAAMAYl1EOAABgjMsoBwAAwBg3ygEAACjPH/cfp8a4UQ4AAMCInu5vZn17g9YoBwAAwBiXUQ4AAGCMyygHAADAGJdRDgAAUJbvv//2IQw1Y9woBwAAYOQx/u3rzaOhapQDAABgjMsoBwAAMMZllAMAAPBOT/efbo1xGeUAAABjj/H7m6URKqMcAADAGJdRDgAAYIzLKAcAAMAYl1EOAABQ4Bj/8uvEGJdRDgAAMPYY//pxZ1zKKAcAADDGZZQDAAAY45JRDgAAYIzLKAcAACh0kPfDyXiUUQ4AAGCUyygHAAAwyiWjHAAAwCiXUQ4AAGCUS0Y5AACAUS6jHAAAwCiXjHIAAACjXEY5AACAUS4Z5QAAAEa5jHIAAACjXEY5AAAARrmMcgAAAKNcRjkAAIBRbjzKKAcAADDKZZQDAAAY5ZJRDgAAYJTLKAcAADDKJaMcAADAKJdRDgAAYJRLRjkAAIBRLqMcAADAKJeMcgAAAKNcRjkAAIBRLqMcAAAAo1xGOQAAgFEuoxwAAMAoNyBllAMAABjlMsoBAACMcskoBwAAMMpllAMAABjlklEOAABglMsoBwAAMMoloxwAAMAol1EOAABglEtGOQAAgFEuoxwAAMAol1EOAACAUS6jHAAAwCiXUQ4AAGCUG5AyygEAAIxyGeUAAABGuWSUAwAAGOUyygEAAIxyySgHAAAwymWUAwAAGOWSUQ4AAGCUyygHAAAwyiWjHAAAwCiXUQ4AAGCUyygHAADAKJdRDgAAYJTLKAcAADDKJaMcAADAKJdRDgAAYJRLRjkAAIBRLqMcAADAKJeMcgAAAKNcRjkAAIBRLhnlAAAARrmMcgAAAKNcMsoBAACMchnlAAAARrmMcgAAAIxyGeUAAABGuYxyAAAAo1wyygEAAIxyGeUAAABGuWSUAwAAGOUyygEAAIxyySgHAAAwymWUAwAAGOWSUQ4AAGCUyygHAAAwyiWjHAAAwCiXUQ4AAGCUyygHAADAKJdRDgAAYJTLKAcAADDKJaMcAADAKJdRDgAAYJRLRjkAAIBRLqMcAADAKJeMcgAAAKNcRjkAAIBRLhnlAAAARrmMcgAAAKNcMsoBAACMchnlAAAARrmMcgAAAIxyGeUAAABGuYxyAAAAo1wyygEAAIxyGeUAAABGuWSUAwAAGOUyygEAAIxyySgHAAAwymWUAwAAGOWSUQ4AAGCUyygHAAAwyiWjHAAAwCiXUQ4AAGCUyygHAADAKJdRDgAAYJTLKAcAADDKJaMcAADAKJdRDgAAYJRLRjkAAIBRLqMcAADAKJeMcgAAAKNcRjkAAIBRLhnlAAAARrmMcgAAAKNcRrlPGAAAgFEuoxwAAMAol1EOAACAUS6jHAAAwCiXUQ4AAGCUS0Y5AACAUS6jHAAAwCiXjHIAAACjXEY5AACAUS4Z5QAAAEa5jHIAAACjXDLKAQAAjHIZ5QAAAEa5jHIAAACMchnlAAAARrmMcgAAAIxyGeUAAABGuYxyAAAAo1wyygEAAIxyGeUAAABGuWSUAwAAGOUyygEAAIxyySgHAAAwymWUAwAAGOWSUQ4AAGCUyygHAAAwymWUAwAAYJTLKAcAADDKZZQDAABglMsoBwAAMMpllAMAABjlklEOAABglMsoBwAAMMoloxwAAMAol1EOAABglEtGOQAAgFEuoxwAAMAol4xyAAAAo1xGOQAAgFEuoxwAAACjXEY5AACAUS6jHAAAAKNcRjkAAIBRLqMcAADAKJeMcgAAAKNcRjkAAIBRLhnlAAAARrmMcgAAAKNcMsoBAACMchnlAAAARrlklAMAABjlMsoBAACMchnlAAAAGOUyygEAAIxyGeUAAAAY5TLKAQAAjHIZ5QAAAEa5ZJQDAAAY5TLKAQAAjHLJKAcAADDKZZQDAAAY5ZJRDgAAYJTLKAcAADDKJaMcAADAKJdRDgAAYJTLKAcAAMAol1EOAABglMsoBwAAwCiXUQ4AAGCUyygHAAAwyiWjHAAAwCiXUQ4AAGCUS0Y5AACAUS6jHAAAwCiXjHIAAACjXEY5AACAUS4Z5QAAAEa5jHIAAACjXEY5AAAARrmMcgAAAKNcRjkAAABGuYxyAAAAo1xGOQAAgFEuGeUAAABGuYxyAAAAo1wyygEAAIxyGeUAAABGuWSUAwAAGOUyygEAAIxyySgHAAAwymWUAwAAGOUyygEAAMrwz3/+cxJarVYfjHIZ5T8XPiuHz41vEAAA4FWbzeYujIeu6+b9//65/993se/PGmVgGOUqfZTHQf788/PjcxU+Y+GzFv5vwmfPNxAAADQgjoRpHN3LOBAeXxgOr2WUyyi/fJS/1j5+JpfxMzp1lR0AANoc3ka5jPLxR/lrPRrsAACQicOzqvH210X8sb6/4gAwymWU5zXK33KFfXG4JX6ssx8AAKBq2+32Nj5zenzV+3vijHIZ5XmN8tc6vro+Cd8pvlkBAOCZw5XvzMa3US6jvPxR/qax7so6AADNiLedz45uO3/M+Ie7US6jvM5R/tpz64v4HeWZdQAAyvXs6ve6/5H7UNgPdKNcRnlbo/zF4nfX2lV1AACyFZ/9nh693/uxkgFulMsob3yUv3ZV/XASvGfVAQAwwI1yySg31AEAqEm8Bb3lAW6Uyyg3yg11AADGcfwM+Ijv/TbKjXIZ5S21P35G3Z88AACNCldsDqegV3QIm1EuGeWlHia3DN/J/Vi/8ycUAECFnl0Fdxu6US6j3CjP+7Z3V9MBAEp1eBb86F3gfuQa5ZJRXv7V9IVn0wEAMnR0K/rSs+BGuWSUN/Ns+o9b3o10AAAj3Cg3ymWUG+UZHCDX/9kw91w6AMAwI3zueXCjXDLKdc5z6UY6AMDlI9yVcKPcgJRRrmuPdLe7AwA8Fw5mM8KNcqNcRrk8kw4AMJLD6ejeEW6UG+UyypXT6e7hL4r9KQ0AVCc80xefC/eKMqPcKJdRrtzbhfekex4dACjWs1vSHc5mlBvlMspV8vPobnUHAPIXriiEKwtuSTfKjXIZ5UZ5A7e6T/zJDwAk5Wq4UW6Uyyg3yl1F//9T3T2LDgCM4vBsuKvhRrlRLqPcKNffr6J7Fh0AGOLH5TTequd1ZTLKZZQb5TrjtWvhz1C/JACAsxzdlr52W7qMchnlRrmuktvcAYDTwomy8ZVlaz+cZJTLKDfKNext7uHPXKe5A4Ahfuv5cBnlMsqNcqU/zd1z6ADQiPCHvufDZZTLKDfKle1z6AY6ABjiklEuo9wol4EOABjiMsolo1x6dJI7ABjiklEuo9woVx4D3RV0ADDEZZQb5TLKjXK5xR0AGnT0+jJDXEa5ZJRLBjoAjDXEvb5MRrlklEvegw4AI1itVh/6P1Rn/R+waz8yZJRLRrl04UCfhd8UflkBwNt/zE3jKauPflDIKJeMculKrZ3gDgAnOLBNRrlRLqNcGvMVa54/B6B58fZ0z4nLKDfKZZRLyQ6I8/w5AM2Jt6d7TlxGuVEuo1zK6vb28Py5X2oAVCn8DXS8Pd1z4jLKjXIZ5ZLb2wFgaIfT092eLqPcKJdRLjm9Hd7v8OinfxLAq+KhbU5Pl1FulMsol2pqOdafA/DC9+r0+EBk/0QAV8VllBvlMsqNcjV9OJyr54x4sWv3/L9D/2QAV8VllBvlMsqNcsnVcwYSz2Napv5NArgqLhnlklEuuXpOU7+zN5vN5zdc8DLKofG/sXNVXEa5US6j3CiXnNzOFYWLXsfPjf+kqX9i0N4XxM4ftJJRLqPcKJfOO7ndL0ne8p157h2o4Wq6f3JQuaNbZ/b+YJWMchnlRrl0+dXz8Jsq3HHoFybH4l2o60v+uzLKoWJHB7f5Q1QyymWUG+XSdVt7Fphw8av/72Dx3v+W/JOEyrhFXTLKZZQb5ZJb2xn8N/f8Sucz7fzThEr+ls4t6pJRLqPcKJfc2s7g34vTa/7mDn+x458qFMwp6pJRLqPcKJfye+e5U9urHOOToe5G9U8Xyv1SWPtDTzLKZZQb5VK27bzuqqqLYIP9t+KfMhQkPLN07msWJBnlMsqNcilpe8+dl+fo8dDB70j12AMU8IUQD5LwvLhklEtGuVT4c+fht51fuPlfCBv58VAn+UPrfzsnGeVGuYxyo1wab5yH26FdHc1P+M5LdFeqUQ45GeO5FUlGuYxyo1zK41A44zyb39/JXikcLsT5twDGuGSUG+Uyyo1yKe2hcK6WJrgztf/nvkj9798ohwxuk0n5N3OSUW6Uyyg3yiXjvDWZPSa69G8EjHHJKDfKZZQb5VJG49yJ7YN9r00zPEB5598MGOOSUW6Uyyg3yiWvU/Mb3CiHesVXKxjjklEuGeWSjPORFHJu06N/UzD8GPeOcckol4xyScb5SEp7vbB/Y2CMS0a5US6j3CiXjPOafoc/lvTvNPwlgn9zcL0fMFNjXDLKjXIZ5ZKM89F/h08K/h3u1H240peAZ8Ylf/AZ5TLKJRnnI4rPje/8NgFj3B8Ikj/4jHIZ5ZKSjvNw12Yrv8PDLd8FHOL2prqum1tWYIxLRrlRLqPcKJcqec957VdeSzrE7S2F//9YWNDW7TGSUW6Uyyg3yiXjvDi1HqZslMPbx/jSl7tklBvlMsollTbOw29Zd6nm/e/I4oIT4rMqC1/mklFulMsol1R4y9LGeUMXxoxyeGmM1/asiiSjXEa5US4p/MbN/b3YR7/FmzmkzwKDI/FZFWNcMsqNchnlvi+kWnvM9TnmVn+LW2Hw7x8fe1/SklFulMsoN8qlVq7Q5vKO89Z/i1tjNG2z2dw5UV0yyo1yGeVGudRq/TB/SHVSu7cbjfv7BLLiRHXJH3pGuYxyo1zSX1qPdRhcPFDZb3GjnBY5xE3yh55RLqPcKJf0aouhDoPzW/xkU0uNJsSDIzw3LhnlRrmMcqNc0k8Og+t/O8/9Fh/vVHxrjarFHxaeVZFklMsoN8olnXkY3Hv/7PRb3Cin8VvVPasiySiXUW6USxr/efN4htPaP7u3/fO13qiOZ1UkGeUyyo1ySde/ovuz582Pnhv3z+zt7Sw4artV3bMqkoxyGeVGuaThbmmfnnhufO7C2PmF19JZchTP7TGSjHIZ5Ua5pHGv7h5uaXdh7P1ZdLhVXZJRbpTLKDfKJV10ldc/B6Mct6r7IEsyymWUG+WSVGznHqQHScVT1d2qLskol1FulEuS3ygwJodHSDLKZZQb5ZLkNwqM/9z4XThMwodVklEuo9wol6TaCudkWX1ke6u69xxKMsolo1ySjHIYmYPcJBnlklEuSY20sADJ6up4/x/l0gdTklEuGeWS1Eg7S5Bcro5PHeQmySiXjHJJMsph/KvjXnMm6dqFR2B24Tmtrutm4bvGKJdR/uY/l6fxXJedx8kkafAerUKS8ZozSdeo/y55CI++xO+UyVgD3ChXjaP8laE+iZ+xpbeiSNJ1swwZ3Xa7vfUHuqRLb/EKB6KEq9/hlYm5fb8Z5apxlJ8SPoPhsxg+k/5cl6TLS3lBAVfHJelnV8CzHeBGuVof5Ya6JJV19g2ujrs6Lulnz4D/eQt6qd91RrlaH+WvDPV5/Iw/+L6TJKOckTlZXdJLt6HHg6SmNd2yZZTLKH/7M+pHh8n5jSCp9bsDZ1YjQ/6h62R1SeEq+DpcKSvlNnSjXEZ5uqvpTnyX1FrhLymtR1wdlzTEreiz8OhKS999RrmM8us99hafTXfLuySjHC64Or7w4ZKM8BYZ5TLKB/19MY2HPxrpkqp7rM+S5Gq3nrnlTDLCjXIDUkb5iCPd7e6SjHKIg/yzD5NUbY/xmXAj3CiXUZ797e4en5NU4gUP3+S89w9Bt5FJlZ6OXvvBbEa5jPJ6796LB8ftfJ9LKiHf3FzEYW5Sfbek1/aKMqNcRjlHv1kWbnWXZJRT03NcSx8eqfyr4eFKklvSjXIZ5Q3e5Reuonttq6ScTmB3dyJvvx3M3zJLRT8b7mq4US6jnL9fRXdgnKTUTXwj81Pxb5V9YKSCimc+LPztq1Euo5y3XXwI52k4L0dSgqa+hfnZ7epu8ZLclo5RLqO8tdvcZ34DSRrp9nXf87hdXSq8H68sc1u6US6jnGEuUBwNdIfcSjLKcbu6JEPcKJdRTipHz6Eb6JKu9rvOtytuV5cMcYxyGeUY6JISPX7oGxW3q0uGOEa5jHIMdElGOQlvV5/5Q0QyxDHKZZRztd9V7jyU9OZ8c/qb3aUPgpT+9WXhLAdD3CiXjPJ6HB0St/NnnSSjnL+Jr/vwLk4pXftw2qbXlxnlklHezO+uud9ekl7K78E2r45P3K4uJSl87pbhDAffREa5ZJS3KZ7js/BbTNJRE9+ODfG6Myndc+K+gYxyySjn2YWSqefPJRnljYivO/P8uDTi7enhL8HcjmSUS0Y5b/md5vZ2qd3CI42+Cdv4ovclL43T0t92GuWSUc6l4u3tXq8mGeVU9sXuS11yejpGuYxyyruoMnNhRWqihW+9SsXXcPiPXHJVHKNcRjmunkvKt51vugrFUz39By4N9Ky4q+IY5TLKcfVcklHOi1/WTvGUhjlB3VVxjHIZ5WR0AWbiEF+pntfm+lar629P/c2pdMUvyHDwhhPUMcpllJPz77/wZ1W4k8uf21K5+TargAPdpKsf3Oa94hjlMsopSjxPaOfPcqm8PBpZxxewQS65RR2jXEY5HB8M5892qZz8Bi18kPuPWHrHLerhh4tb1DHKZZRTm/BnW7y13cUbyShnCP4GVHrfKerhh4pbhTDKZZRTu8Op7Z47l7J+fNKjk6V9sRrk0rteaeZLD6NcRjlN8ty5lGfhYpFvqLL+ptMJ69IF73/sm/oWwSiXUQ5/vlLNOJeMcs4RngsyyKWLxrhndDDKZZTDCxwKJ+Xzm9U3UhlfmA7pkN7eMnxufHtglMsoh7dd/DHOJaMcg1y6yhh3kjpGuYxyMM6l0s498g2UKa88k4xxjHIZ5ZBwnLswJI2Ubx6DXDLGwSiXUQ5/EQ4Z9q5zySg3yCUZ4xjlMsoh8Th3W7s0+AnszkPKRf8vZOE/SskYxyiXjHJy45lzadC8MSiTQe5LTnq5tTGOUS6jHIxzqeKmvl0Mcsl7xsEol1EO547ztd8r0lVuX/edb5BLxjgY5TLK4aLfspP4Z7ffMJJRbpBLpb+jMRx06JsBo1wyyilznPd/jj/4PSNddnaSb5GROcVS+kuP/R/ic98MGOWSUU754puE9n7fSOfdKerbY+RB7m8RpX/fqhM+E74ZMMolo5y6fu96x7lklBvkktebgVEuoxwS//Z1d6j0tnxjGOSSQ9zAKJdRDoPYbDZ3DoOTjHKDXEr/3LhD3DDKJaOcRsVT2j1rLp3IXaQDM8jluXHPjWOUS0Y5LfI+c+nNuZt0wL8V9ByNmr1V3d/4YZRLRjltis+TL/wekoxyg1xK8L7xvqlvAIxyySinTU5el87PK4INcsmt6mCUyyiH9/7+nXpuXLr8d7RvEYNccqs6GOUyyuGS374Tp6tL727h28Qgl5yqDka5jHJ4s3iIm9++0pUucvlWuc4gd5iFWmrpVnWMcqNcRjntCX/+e25cMsqzE64W+g9JDR3k5nRIMMpllNPub15jXBrgDlTfMAa55CA3MMpllMOLwl/I9795H/wekobLN83lX1BT/wGpgVc0PPSD/M4nHoxyGeW0JT437hA3ySjPUxgpbt+R1zOAUS4Z5dQm3BnnvCRp9DwiapBLro6DUS6jHL9zHeImGeVl/M2hLyq5Og5GuVEuo5xqxMcy934LSckuinnV8FsHuUMu5Oo4YJTLKKeiMT7x3LjkwlhJX1q+sFRrC59wMMpllNOOeIjb0m8gySgvaZD70pL3jgNGuYxyihbu/IzPjfsdJOXVzjfUK3xxqdLW3jsORrmMctoRnll1NpJklJf65eU/EtXUo4MkwCiXUU474nPjDnGTMj/fybfVy1fI7/wHoto+7OEZMp9uMMpllFO/+Ny4M5GkQvKt9fKXmNt75PAIwCiXUU5R4it8nYckGeVlf5F59Zlqul3dYW5glMsopw3xLCQXlqQyL6J5PfFBOADLfxSq5cAIh7mBUS6jnPrFc5A8Ny6VnQtpcZAv/Mcgt6sDRrmMcgr57Trx3LhUTVN/w+ikdbldHTDKZZRTgHj+kefGJRfV6hFPWvf8jZyuDhjlMsrJVngsLT437rePZJTX9eXmGRxV0NJPFTDKZZRTr3hXp4tIkt/z9fEcjiq4Qj7zUwWMchnlVPtbdeICktTGIc2tfsk52E1FPz/u1QlglMsop07x8UoXjySjvOpBPvUvXiU/P+51Z2CUyyinPvHRSoe4SQ3W1JddPLHSMznyvAlglMsoJ5sxHg9x8xtVMsrr/8ILVxn9S1ehV8jnfraAUS6jnLrEQ9w8Ny41XjNvUnI7kAp+//jUzxYwymWUU9Xv0onnxiUdNWnlbyH9y1Zp7R3oBka5jHLqER+lXPuNI6mpUR5PsPSMjhzoBhjlMspJ4ui5cb9zJLX3qKrnyFXigW4GORjlMsqp5rfo3AUiSa8V/tKu2i9B7yOXE9YBo1xGOYl+h04c4ibpjS1q/SL0PnKVdtvKzE8YMMpllFO2+OikQ9wkndOuui/DcOuv24RkkANGuYxyRv796W0/kozyeJXc306qmFeeOWEdjHLJKC97jMdD3FwQknTxJqjqizEepuFfrAxywCiXUc7QvztnnhuXdI2q+WKMz/D4lyrvIAeMchnlDCYc4uYNP5KM8pf/ttKXo7yDHDDKZZQziO12e9v/Wb72e0bSAE1quEr+2b9IGeSAUS6jnGuLh7h51a4ko/yVQe62dRnkgFEuo5yri+cVOcRNkrcxvfY3l25bl0EOGOUyyrmm/s/vqUPcJI1VuPO75C9MtxLJIAeMchnlDHGFfOnijySj/BVuW5dBDhjlMsoZWnymfBLPMNq5nV3SAO1K/RtMf3MpgxwwymWUM7pwEnt8T/nCb1JJTY5yp63LIAeMchnl5CS+v3weX5vmeXRJZ+2H0ga529ZlkANGuYxysr+aHg6MO7rt3W8lSScr7W8hfanJIAeMchnlFCdcXIq3vTtETlKZozzeEuRfmgxywCiXUU7xnh0it3aInNT0Cex3pXxp+aKSQQ4Y5TLKqdbxIXLuEJWaapL9F1T820P/spRbe4McjHLJKGfg38GHQ+SWDpGTjPJkX0T+JSnDHou4zQQwymWUU5V4B+nUu9Olqm5fz/vPAn8jKIMcMMpllMNpDpGTjPIhv2C8k1xuLwGMchnlcP6FLYfISeW0zPKLJL7f0ReIcjvYbeaPeTDKJaOc0hzene4QOSnLdrn+7d7SvxxlNsjn/kgHo1wyyqlFvO3dIXKSUf7y7Tb+xcgtJYBRLqMcxvPs3ekOkZNGLLsvBAdUKLPW/pgGo9x4lFFOw1fTf7w73W90qZFRHj/0/sUol1vWH7yLHDDKZZTDvx29O33ttnfpOmWzOeItMz7YyubVZ+FQFH/0Aka5jHI47XCI3NFt735HSqW+4ckr0JTZ+wK9ixwwymWUw2W/6/88RM5t71IhozxeJXeYhLz6DDDKZZRDZRwiJxXwpievQFNGLfzRCRjlMsphWOG298Mhcm57l7t0N5+TfyD9i5B3BAJGuYxyaJtD5OTCoKvkaru9k9YBo1xGOeQj3vbuEDm5ODj034b5FyAHuwFGuYxy4C2O3p3uEDkZ5Vca5f7GSw52A4xyGeXAuy70xavpa4fIqdS7dl0lV8st/VEGGOUyyqEeh3enO0ROJeUquVq9Qv7gOXLAKJdRDm1cTT+8O90hcjLKXSVXHj16jhwwymWUQ5teOETObe9K3WTsUe4quVJfJZ/74wgwymWUAwdHh8gtHCKnqke5q+TKoLU/dgCjXEY58JbtcnSInNveVcfh066SK/Vt654jB4xyGeXAJRwipwFf0TzOnwmukqu5ZzUAo1wyyqFq8bb3uXenq5RRvvQPXAlb+GMDMMpllANDiofITRwip+wesY23eviHLa8/A4xyySiHpoQt5BA5/aTd4P8hukquxLeDeP0ZYJTLKAeycfTudIfI6cdFxMH/Zsg/aFX/fAZglEtGOfC+zXT87nS/5Rtr0P/A4n9Y/kGrvr9xAoxyySgHhttRh3enO0TOKL9cPOjA4QZy2zpglEtGOfD+bXX87nQ7y3b5ufg3O/4hy2nrgFEuGeXAlR0fIue2d69vfpFDC5SovdPWAaNcRjnQIofIGeV/+Y/BP1hV9bdMgFEuGeVAYeJt71PvTm/wgOr4NzP+AWvs1r56AaNcRjnAaQ6Ra2CUew2aEvUY/tvzNQsY5TLKAc7jELnkLa/9L3ThH6q8kxwwyiWjHCjT4d3pDpEbrd21R7m/WdHoh7v56gSMchnlAMOJt72HQ+SWDpHLeJR7DZoc7gYY5ZJRDtTv2bvTHSL3zq72L8atDSr+Vg8Ao1xGOcBFjg6RWzhELsEod8CbUuRwN8Aol1EOkK9nh8i57f1E4c6Da/zDdsCbxm7haw4wymWUA5TjcIjc0W3vds21Hsn1tx4a+xVoV/nbJACjXEY5QFLHh8g1fNv7+0Z5PC7fUJRXoAFGuWSUA7xLi4fIhb+UeO8oXxqKcpUcMMoloxxgCOG298MhcjXe9v6ui47xbzEMRY35t0gzX0uAUS6jHKBt4Wp6vO29hkPkLj8vy7vJNXJ7Xz+AUS6jHIDn4gXjUg+Ru/xVz/FvJYxFuUoOGOWSUQ6QlaN3p+d+iNxlo9yt63KVHDDKJaMcoBTPDpFbZ3SI3GVbx63rcpUcMMoloxygZId3p6c+RO7SUf5gLMpVcsAol4xygJocHSK3HOsQuUv/NsFYlKvkgFEuGeUAVXvhELkhbnufnPX/KLeuy3vJAaNcMsoBWnV0iNziSneRnzfKnbqusQp/G+UjDxjlMsoByN2zQ+T2g90d7NR1uUoOGOWSUQ7A6845RO6si5FuXdeILX2UAaNcRjkAtYi3vf/tELmzRrlb1zVW4W+WfGwBo1xGOQC1Orw7/axnyjN6wbrqbucjChjlMsoB4K+DfGIsaqSmPnGAUS6jHAD+OsoXxqJGaO/TBhjlMsoB4JkrvX9N8ho0wCiXUQ4A54jHuRuNGjyvQQOMchnlAPCMV6FppNY+bYBRLqMcAJ6J71EzGuWAN8Aol4xyABKMcq9CkwPeAKNcMsoBGNtms7kzGDVCC582wCiXUQ4Az3RdNzcYNcKp63c+bYBRLqMcAJ4Jh28ZjXLrOmCUS0Y5AGlGuefJNWjhbgyfNMAol1EOAM94nlxjtN1ub33aAKNcRjkAPOP95BrhKvmDTxpglMsoB4AXeD+53LoOGOWSUQ5AIuEqpuEop64DRrlklAMwstVq9cFolFPXAaNcMsoBSKAfTBOjUQO38EkDjHIZ5QDwgs1m89lo1MBNfdIAo1xGOQC8oB9Ma6NRQ+ZTBhjlMsoB4PQo3xuOGrC1TxlglMsoB4AXOORNXoUGGOWSUQ5AIg55k1ehAUa5ZJQDkEi4imk4asAefcoAo1xGOQCc0I+mpeEoz5MDRrlklAOQZpTvDEd5nhwwyiWjHIA0o9x4lOfJAaNcMsoBGNt2u701HOV5csAol4xyABJw8roGbudTBhjlMsoB4AQnr2vgW9f9IAGMchnlAHBKGE3GowZs6lMGGOUyygHgBCeva8jCmQU+ZYBRLqMcAE7ouu7BeJRD3gCjXDLKAUjAcJRD3gCj3ICUUQ5AAqvV6oPhKIe8AUa5ASmjHIAEvA5NQ9Z13cynDDDKZZQDgFGuNE18ygCjXEY5AJzgdWgaMp8wwCiXUQ4ARrmcvA5glMsoByA//XBaG49y8jpglBuQMsoBSDPKd8ajBmrpEwYY5TLKAcAol9ehARjlMsoByHKUG5DyOjTAKDceZZQDYJTL69AAjHIZ5QAY5dI1bl+/8wkDjHIZ5QBwQhhNxqO8oxwwyo1yGeUAJBBuLzYeZZQDRrlRLqMcAKNcdR3y9uATBhjlklEOgFGuNO18wgCjXDLKAXhF13Vz41FGOWCUG+UyygFIYLPZfDYeNVBrnzDAKJeMcgCMcqV5HZofIYBRLhnlABjlMsoBjHIZ5QAY5TLKAYxyGeUAYJTLKAcwymWUA2CUyygHMMpllANglEtGOWCUS0Y5AEa56mjqEwYY5ZJRDoBRrjRNfMIAo1wyygF4RT+c1sajjHLAKDfKZZQDkIAr5TLKAYxyGeUAGOUyygGMchnlABjlktPXAaNcMsoBMMpllAMY5TLKATDKJaMcMMoloxwAo1xGOYBRLqMcAKNcMsoBo1wyygEwymWUAxjlMsoBMMqlo9Y+YYBRLhnlALyi67q58aiB2vmEAUa5ZJQD8Ip+OE2MRxnlgFFulMsoB8AoV0V1XffgEwYY5ZJRDoBRrkT5hAFGuWSUA2CUyygHMMpllAOQ7TA3IDVI2+321icMMMpllAOAUa40TXzCAKNcRjkAGOVK09QnDDDKZZQDwCvCKdnGo4Zos9n4IQIY5TLKAeA14X3SBqQGauETBhjlMsoB4PVRvjYeNVA7nzDAKJdRDgCvCLcYG48aqL1PGGCUyygHAKNc3lUOYJTLKAcgP+GEbONRXosGGOUGpIxyANKM8onhqKHqum7mUwYY5TLKAeCE1Wr1wXiU16IBRrkBKaMcgESMRzmBHTDKDUgZ5QAk0nXdg/EoJ7ADRrlklAOQQLiaaTxqqMIjEj5lgFEuoxwATo/yhfEoJ7ADRrlklAOQgHeVy2FvgFFuQMooByARr0XTwK19ygCjXEY5AJyw3W5vDUcN2KNPGWCUyygHgFcYjhqy8Bc/PmWAUS6jHABOj3InsGuwuq6b+ZQBRrmMcgA4PcqXxqMGbOlTBhjlMsoB4AQnsGvg9j5lgFEuoxwATnACuzxXDhjlklEOQCKr1eqD4SjPlQNGuWSUA5BIuMXYeJT3lQNGuWSUA5BmlDuBXd5XDhjlklEOQAoOe9MITXzSAKNcRjkAvMBhbxqhhU8aYJTLKAeAFzjsTSMc9vbgkwYY5TLKAeAEh73Jq9EAo1wyygFIN8qXhqMGvlo+90kDjHIZ5QDwgjCYDEe5hR0wyiWjHIAENpvNneEot7ADRrlklAOQSHiftOEot7ADRrlklAOQZpSvDUe5hR0wyiWjHIAEPFcut7ADRrlklAOQiOfKNUb9f2d+qABGuYxyAHiJ58o1QnufNMAol1EOAC+Pcs+Va4wmPm2AUS6jHACe8Vy5Rmrp0wYY5TLKAeCZcAiXwagxWq1WH3ziAKNcRjkAPBOe+TUa5Z3lgFEuGeUApBnlC6NRDnwDjHLJKAcgzSifGoxy4BtglEtGOQDphrnBKAe+AUa5ZJQDkGiUezWaRikcLugTBxjlMsoB4EjXdTODUWO02Wz8cAGMchnlAHAsvK7KYNRIPXo9GmCUyygHgGe6rnswGOX1aIBRLhnlAKQZ5XODUV6PBhjlklEOQALhAC5jUSNeLZ/51AFGuYxyADjiFna5Wg4Y5ZJRDkC6Ue4WdrlaDhjlklEOQApuYZer5YBRLhnlACTkFna5Wg4Y5ZJRDkC6UT4zFuVqOWCUS0Y5AAmsVqsPhqJcLQeMcskoByCRfiitjUW5Wg4Y5ZJRDkCaUT41FOVqOWCUS0Y5AOmG+aOxqBF7DI9O+OQBRrmMcgD4/1G+MBQ1ZpvNxo8awCiXUQ4AQT+Q7gxFjX21fLvd3vr0AUa5jHIA+MU7y5WkpU8eYJTLKAeAX7yzXMma+PQBRrmMcgCaF99Z7sA3jd3Opw8wymWUA8AvPw58WxqJ8oo0wCiXjHIAEggHbxmJ8oo0wCiXjHIAEgm3ExuJStDCpw8wymWUA9A8B77JoW+AUS4Z5QAk1I+jvYGoBM+WP/j0AUa5jHIAmtePo7mRqBRtNhs/dgCjXEY5AG3zejSlLBw46FMIGOUyygFomtejybvLAaNcMsoBSMTr0ZT4+fK5TyFglMsoB6BprpYr5bvL3cYOGOUyygFo2mazuTMO5TR2wCiXjHIAEgnP9xqIcho7YJRLRjkAaUb5xDhU4mF+55MIGOUyygFoeZi7Wq6kt7GH1/T5JAJGuYxyAFod5a6WK3VLn0TAKJdRDkDLw9zVcqVu6pMIGOUyygFodZS7Wi6vSQOMchnlAJBwmLtaLq9JA4xyGeUAkGiUu1quHFr4NAJGuYxyAFod5q6Wy/PlgFEuoxwAEo1yV8uVxfPl3l8OGOUyygFodZi7Wi7vLweMchnlAJBCuEJpFMr7ywGjXEY5ACQSxpBBqEyumM99IgGjXEY5AE0J74s2COXgN8Aol1EOAImEV1MZg3LwG2CUyygHgATCIVthDBmEyqS9g98Ao1xGOQBNCc/zGoPK6UR2n0rAKJdRDkBTwhVKg1BOZAeMchnlAJBmlE8MQeXUZrPxowmMcgNSRjkATQ3znTGozG5ln/lkglEuGeUANMEr0pRpE59OMMoloxyAJoRbho1AeVUaYJTLKAeABOIr0hz6JsMcMMpllANACv0AmhqByvFVad5hDka5ZJQD0Mowd+ibDHPAKJdRDgApxEPfHg1BGeaAUS6jHAAScOibch7mPqFglEtGOQDVC+PHCFSmLX1CwSiXjHIAqhbeEW38yTAHjHIZ5QCQbpgvjD8Z5oBRLqMcABLw7nIZ5oBRLqMcABJyG7sMc8Aol1EOAGmHudvYZZgDRrmMcgBIwW3sMswBo1xGOQAk5DZ2GeaAUS6jHADSDnO3sauEduHuDp9YMMoloxyAqriNXaXUdd2DYQ5GuWSUA1Adt7HLMAeMchnlAJDQZrP5bPSplGG+3W5vfWrBKJeMcgCqEsaO0adCetxsNnc+tWCUyyj3CQOgGuHqYxg7Bp8Mc8Aol1EOAAl0XTcz9lTY7ewzn1wwymWUA0A1+qGzNvZkmANGuYxyAEjAa9JUaEufXjDKZZQDQBXCs7pGngps7ZVpYJTLKAeAKnRdNzfy5F3mgFEuoxwAEvF8uZzMDhjlMsoBIBHPl6vkYe4AODDKZZQDQPHi8+XeX64i6//79YMNjHIZ5QBQNu8vlwPgAKNcRjkAJBReOWXcqeQD4Lbb7a1PMhjlMsoBoFhh2Bh4Kvk5876pTzIY5TLKAaBI4Uqj58vlOXPAKJdRDgCJ9KNmYtjJc+aAUS6jHAAScfCbKmnvfeZglMsoB4AiOfhNFR0C533mYJTLKAeA8jj4TRW1dDs7GOUyygGgKGHEhFuADTrV8to0t7ODUS6jHACKEkaME9lV2Tif+2SDUS6jHACKEd79bMzJ6eyAUS6jHAAScSK7KizcATLx6QajXEY5ABTBieyqsc1m40cfGOUyygGgmGG+NuTkEDjAKJdRDgAJhOdwvSpNtd7O7hA4MMpllANAEcPcq9JUcbvtdnvrkw5GuYxyAMiWV6XJVXPAKJdRDgCGueTVaWCUyygHgDZ5h7kauWo+82kHo1xGOQBkyTvM5VlzMMoloxwADHPJs+ZglMsoB4A29YNlabSplavm3msORrmMcgAwzKWE9cPcD0aMcqNcRjkAGOZSwvZ9E598jHLJKAcAw1xK19Lr0zDKJaMcALIQxknXdQ+GmhwEB0a5ZJQDgGEujVb8794t7RjlklEOAIa55JZ2MMpllAOAYW6gyS3tYJRLRjkAGOaSW9rBKJdRDgCGudRe6+12e+sbAaNcMsoBwDCXErXZbD573hyjXDLKAcAwlzxvDka5jHIAMMylZtv3TX0zYJRLRjkAGOZSunYOg8Mol4xyADDMJYfBgVEuoxwAWhnm/QhZGmLS31oa5xjlMsoBgFEY5tLpce6kdoxyGeUAgGEuJTyp3WvUMMpllAMAhrlknINRLqMcAGoW3t1sfEnGOUa5jHIAIN0wnxleknGOUS6jHAAwzCXjHIxyGeUA0J5+aNyFwWF0SW8b530Lr1LDKJdRDgAY5pL3nGOUS0Y5ANQgjIuu6x4MLen8cR7+Ysu3CEa5jHIA4F3C87KGuXRxu76JbxKMchnlAMC7hrl3mUuXF/5iKxyi6NsEo1xGOQBwsXCYlYElvau9E9sxymWUAwAX88o06WontjsUDqNcRjkAcL7wjKyT2aWrtfbcOUa5jHIA4CzxlWl7g0q63q3t4U4Ut7ZjlMsoBwDexMnsklvbMcpllAMAiTmZXRrulWpObccol1EOAPxUPxzmBpQ03NXzcGq7q+cY5TLKAYCT+uEwdQCcNMrBcFPfOEa5ZJQDAH8TDoDznLk0zsFwfQtXz41yySgHAP4iHAAXnoU1mqRxnz13crtRLhnlAMCfwlU8Y0ka/+R27z03yiWjHAD4IVy985y5lOb2dofDGeWSUQ4AeM5ccns7RrmMcgAgpfic+do4kpzejlEuoxwASCTcTmsUSVk9f26gG+WSUQ4ALQmHUHnOXMpuoC/Coya+oYxyGeUAQAPC7eyeM5fyff+5gW6UyygHABrgtWmSgY5RLqMcAEg7zKduZ5c8g45RLqMcAEgkvEvZ7exSWQPda9aMchnlAEBlnM4ulfmatX6gz8NfrvkWM8pllAMAhXM6u1Ru4Y6X8JdrnkM3ymWUAwAFC7fE9j/wd0aO5DZ3jHIZ5QBAIuGWWMNGchUdo1xGOQCQSPgB7xA4qd6r6J5FN8pllAMAmYu3s3unuVTxVfT4GZ+61d0ol1EOAGTKO82lZtrFtzFMfPMZ5TLKAYCMxKvma6NFMtKNcskoBwASiYfAuWouNT7SW7vd3SiXUQ4AZCMcEOXVaZKOn0mv/eA4o1xGOQCQHa9Ok/SsfTzdfV7bK9iMchnlAECWvDpN0s9uea/harpRLqMcAMh9nH82PiS98V3p69KeTTfKZZQDACUMc1fNJV1623vWQ90ol1EOAJQ0zl01l3SNK+qH096nqZ9RN8pllAMApQ3zOye0SxroGfVlPGhytKvqRrmMcgCgSN5rLmmsq+rhQLmhxrpRLqMcACiW95pLSjzWl4fn1S+9Dd4ol1EOABQvPBfqqrmkjA6X+/HM+lsGu1EuoxwAqEK4pTRctTIIJOU+2I+usE//97/+Y2k8yigHAKoRrkrFH74GgKTs+5/VP4xHGeUAQH28Pk2SUS6jHAAgIQfBSTLKZZQDACTmIDhJRrmMcgCAhOJBcAsjQJJRLqMcACCR8Goit7RLMspllAMAJNR13cwt7ZKMchnlAACJhFvandIuySiXUQ4AkJBT2iUZ5TLKAQAS638gT/r2hoIko1xGOQBAIvGWds+bSzLKZZQDAKQQX6G2NBokGeUyygEAEvG8uSSjXEY5AEBinjeXZJTLKAcASMz7zSUZ5TLKAQASOnq/uXEuySiXUQ4AkGqcOwxOklEuoxwAIKF4GJxxLskol1EOAJBKPAzOSe2SjHIZ5QAAxrkko1xGOQBAu+N86jVqkoxyGeUAAAnF16gZ55KMchnlAADGuSSjXEY5AIBxbpRIRrnxqKv37evN4x/3H6f+xAUAMM4lGeUacYyHK+Tff//tgz9lAQCMc0lGucbo/mbfNzPGAQCMc0lGuUYe4/4EBQAwziUZ5RqtjzvPjAMAGOeSjHKNPMafvvw68SckAMD443xnwEhGuZq9TX35dP/p1p+IAAAJ9T/gJ8a5ZJTLGAcAIP04Xxo0klEurzUDACCR7XZ7a5xLRrkqOkndGAcAKHOcbzabz/0P/EcjRzLK5bVmAAAksFqtPnRdN3diu2SUq4jb1B+McQCASoUT2/sejB7JKJfXmgEAkEg8FG5t/EhGuTI4Sd0YBwBoUzwUbuG5c8kol9eaAQCQiOfOJaNc47zW7NuXm4UxDgDASf0gmPbtDCPJKJd3jAMAkMjR+87d2i4Z5brwtWb9IJ8b4wAAXCze2j5za7tklMs7xgEASCie2r40miSjXC+/1uyP+49Tf1oAADCocGv7ZrP57Oq5ZJTLO8YBAEgoHgznneeSUd7ka83+9eXTnT8JAABIztVzySj3jnEAAMiAq+eSUe61ZgAAkFi4et513dzVc8koN8YBACCho5PbvfdcMsq91gwAAFI4vPe878H4kozyDK+MPxjjAAA0Idze3g+QhdvbJaPca80AACCheDic29slo3zkK+O3a2McAACiw+3tTm+XUW4we60ZAAAkdDi93fPnMsp1rZPUv325WRjjAABwps1mc+f5cxnl8lozAADIZ6B7/lxGuV59rVk/yOfGOAAADMQBcTLK5R3jAABgoEtGeQ6vNTPGAQDAQJeMcu8YBwAADHQZ5VW/1uxfXz7d+ZYDAAADXTLKvWMcAAA4Y6BPvGZNRnlZrzUzxgEAoEKH16x1XfdgFMoo945xAAAgke12e9uP83k/jnYGooxyrzUDAAASWa1WH/qBPuuH0tpz6DLKjXEAACAhz6HLKPdaMwAAIANHt7mvDUkZ5Zc+M367NsYBAIB3Cbe5H71uzVV0GeVeawYAAKQSTnN3FV1G+QsnqRvjAADA2OJVdK9cU5Oj3GvNAACAbMRn0WdudVf1o/z+Zt8P8rkxDgAAZOvZre5eu6byR7nXmgEAACWP9L7P/TjbGahGeXGvNTPGAQCAmoR3oxvpRrl3jAMAABjpMsr/+lozYxwAAGh9pHsm3Sj3jnEAAIAMHB0c53R3o/zqrzUzxgEAAM4QXsF2eE+6W96Ncu8YBwAASOzZLe+uphvlJ19rZowDAAAMzNV0o9w7xgEAADISn02fhaHe/88HY7n2Ue61ZgAAAFk7uu19aajXMsqNcQAAgCqGulvfCxrlXmsGAABQp8Ot7/3//ByHuvenZzDKf5ykbowDAAC0Jx4mN4lDfe329/FGudeaAQAA8KIXrqrvjfJ/XO8kdWMcAACAc8Vn1Zsc6+8e5V5rBgAAwFBjPbxT/XAbfI2Hy10+yj/ujHEAAABGd3hmPZwEX/rV9fNHudeaAQAAkKnw3PrhkLnDYM/5oLk3j/JwkroxDgAAQKmOrrAfnl9fpn6N209HudeaAQAA0ILDVfYXRvt+zFEeXmv27cvNwhgHAACAaLVafYiHzx3fHr9+zy3yx6PcO8YBAADgnQ7D/XDF/egwur+N9x+jPL7WzBgHAACAkYRn3P979Z8ObwMA/m90BQCPWfvKVpX2qwAAAABJRU5ErkJggg=="/></defs></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/request-template.svg b/app/client/src/assets/images/request-template.svg
index ebcb5a549d31..5cadec1ed929 100644
--- a/app/client/src/assets/images/request-template.svg
+++ b/app/client/src/assets/images/request-template.svg
@@ -1,11 +1 @@
-<svg width="382" height="177" viewBox="0 0 382 177" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect x="0.5" y="0.5" width="381" height="176" fill="white"/>
-<rect x="0.5" y="0.5" width="381" height="176" fill="url(#pattern0)"/>
-<rect x="0.5" y="0.5" width="381" height="176" stroke="#E7E7E7"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_1526_3643" transform="translate(0 -0.0971402) scale(0.00140449 0.00303117)"/>
-</pattern>
-<image id="image0_1526_3643" width="712" height="394" xlink:href="data:image/png;base64,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"/>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="382" height="177" fill="none" viewBox="0 0 382 177"><rect width="381" height="176" x=".5" y=".5" fill="#fff"/><rect width="381" height="176" x=".5" y=".5" fill="url(#pattern0)"/><rect width="381" height="176" x=".5" y=".5" stroke="#E7E7E7"/><defs><pattern id="pattern0" width="1" height="1" patternContentUnits="objectBoundingBox"><use transform="translate(0 -0.0971402) scale(0.00140449 0.00303117)" xlink:href="#image0_1526_3643"/></pattern><image id="image0_1526_3643" width="712" height="394" xlink:href="data:image/png;base64,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"/></defs></svg>
\ No newline at end of file
diff --git a/app/client/src/assets/images/saml.svg b/app/client/src/assets/images/saml.svg
index 0ec5b11b96d0..eaab1f02ab20 100644
--- a/app/client/src/assets/images/saml.svg
+++ b/app/client/src/assets/images/saml.svg
@@ -1,5 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M23.8354 16.7369C23.8227 16.7367 23.8103 16.7333 23.7993 16.727C23.7883 16.7207 23.779 16.7117 23.7724 16.7009C23.7004 16.5839 16.5214 4.84487 12.3124 5.90087C12.2704 5.90087 8.73343 6.50087 6.95143 14.2499C6.94966 14.2594 6.94597 14.2685 6.94058 14.2766C6.9352 14.2847 6.92823 14.2916 6.9201 14.2969C6.91197 14.3023 6.90285 14.3059 6.89328 14.3076C6.88371 14.3093 6.8739 14.3091 6.86443 14.3069C6.84558 14.3032 6.82884 14.2925 6.81768 14.2768C6.80652 14.2612 6.80178 14.2419 6.80443 14.2229C6.81943 14.1329 8.23243 5.20487 11.4094 0.782874C11.4204 0.766847 11.4372 0.755702 11.4562 0.751785C11.4752 0.747868 11.495 0.751485 11.5114 0.761874C11.5804 0.809874 18.4444 5.48688 23.9044 16.6619C23.9127 16.679 23.9139 16.6987 23.9077 16.7167C23.9015 16.7347 23.8885 16.7495 23.8714 16.7579C23.8578 16.7541 23.8454 16.7469 23.8354 16.7369Z" fill="#ED0000"/>
-<path d="M7.77641 1.50016C7.78299 1.51156 7.78646 1.52449 7.78646 1.53766C7.78646 1.55082 7.78299 1.56376 7.77641 1.57516C7.71041 1.69516 1.13141 13.7822 4.13741 16.9052C4.16441 16.9412 6.45641 19.7012 14.0374 17.3762C14.0465 17.3729 14.0561 17.3714 14.0657 17.3719C14.0753 17.3724 14.0848 17.3748 14.0934 17.379C14.1021 17.3832 14.1098 17.3891 14.1162 17.3963C14.1225 17.4036 14.1274 17.412 14.1304 17.4212C14.1373 17.4395 14.1368 17.4598 14.129 17.4777C14.1211 17.4957 14.1066 17.5098 14.0884 17.5172C14.0014 17.5502 5.56241 20.7902 0.144408 20.2502C0.125033 20.2479 0.107304 20.2382 0.0949826 20.223C0.0826606 20.2079 0.0767154 20.1886 0.0784081 20.1692C0.0964081 20.0792 0.714408 11.7962 7.65041 1.50016C7.66138 1.48413 7.67814 1.47299 7.69717 1.46907C7.71619 1.46515 7.736 1.46877 7.75241 1.47916C7.76216 1.48387 7.77045 1.49112 7.77641 1.50016Z" fill="#ED0000"/>
-<path d="M2.59214 23.022C2.59852 23.0109 2.60771 23.0018 2.61878 22.9954C2.62985 22.9891 2.6424 22.9858 2.65514 22.986C2.79314 22.986 16.5481 22.635 17.7511 18.468C17.7511 18.429 19.0111 15.0629 13.2001 9.65095C13.193 9.64421 13.1873 9.63608 13.1833 9.62705C13.1794 9.61802 13.1774 9.60829 13.1774 9.59845C13.1774 9.58861 13.1794 9.57887 13.1833 9.56984C13.1873 9.56081 13.193 9.55268 13.2001 9.54595C13.2145 9.53288 13.2332 9.52563 13.2526 9.52563C13.2721 9.52563 13.2908 9.53288 13.3051 9.54595C13.3681 9.59995 20.4001 15.2819 22.6351 20.247C22.6434 20.2641 22.6446 20.2838 22.6384 20.3018C22.6323 20.3197 22.6192 20.3346 22.6021 20.343C22.5271 20.379 15.0451 23.988 2.64914 23.133C2.63969 23.1326 2.6304 23.1303 2.62181 23.1263C2.61322 23.1224 2.6055 23.1167 2.59909 23.1098C2.59268 23.1028 2.58771 23.0946 2.58446 23.0857C2.58121 23.0769 2.57974 23.0674 2.58014 23.058C2.58134 23.0452 2.58545 23.0329 2.59214 23.022Z" fill="#ED0000"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path fill="#ED0000" d="M23.8354 16.7369C23.8227 16.7367 23.8103 16.7333 23.7993 16.727C23.7883 16.7207 23.779 16.7117 23.7724 16.7009C23.7004 16.5839 16.5214 4.84487 12.3124 5.90087C12.2704 5.90087 8.73343 6.50087 6.95143 14.2499C6.94966 14.2594 6.94597 14.2685 6.94058 14.2766C6.9352 14.2847 6.92823 14.2916 6.9201 14.2969C6.91197 14.3023 6.90285 14.3059 6.89328 14.3076C6.88371 14.3093 6.8739 14.3091 6.86443 14.3069C6.84558 14.3032 6.82884 14.2925 6.81768 14.2768C6.80652 14.2612 6.80178 14.2419 6.80443 14.2229C6.81943 14.1329 8.23243 5.20487 11.4094 0.782874C11.4204 0.766847 11.4372 0.755702 11.4562 0.751785C11.4752 0.747868 11.495 0.751485 11.5114 0.761874C11.5804 0.809874 18.4444 5.48688 23.9044 16.6619C23.9127 16.679 23.9139 16.6987 23.9077 16.7167C23.9015 16.7347 23.8885 16.7495 23.8714 16.7579C23.8578 16.7541 23.8454 16.7469 23.8354 16.7369Z"/><path fill="#ED0000" d="M7.77641 1.50016C7.78299 1.51156 7.78646 1.52449 7.78646 1.53766C7.78646 1.55082 7.78299 1.56376 7.77641 1.57516C7.71041 1.69516 1.13141 13.7822 4.13741 16.9052C4.16441 16.9412 6.45641 19.7012 14.0374 17.3762C14.0465 17.3729 14.0561 17.3714 14.0657 17.3719C14.0753 17.3724 14.0848 17.3748 14.0934 17.379C14.1021 17.3832 14.1098 17.3891 14.1162 17.3963C14.1225 17.4036 14.1274 17.412 14.1304 17.4212C14.1373 17.4395 14.1368 17.4598 14.129 17.4777C14.1211 17.4957 14.1066 17.5098 14.0884 17.5172C14.0014 17.5502 5.56241 20.7902 0.144408 20.2502C0.125033 20.2479 0.107304 20.2382 0.0949826 20.223C0.0826606 20.2079 0.0767154 20.1886 0.0784081 20.1692C0.0964081 20.0792 0.714408 11.7962 7.65041 1.50016C7.66138 1.48413 7.67814 1.47299 7.69717 1.46907C7.71619 1.46515 7.736 1.46877 7.75241 1.47916C7.76216 1.48387 7.77045 1.49112 7.77641 1.50016Z"/><path fill="#ED0000" d="M2.59214 23.022C2.59852 23.0109 2.60771 23.0018 2.61878 22.9954C2.62985 22.9891 2.6424 22.9858 2.65514 22.986C2.79314 22.986 16.5481 22.635 17.7511 18.468C17.7511 18.429 19.0111 15.0629 13.2001 9.65095C13.193 9.64421 13.1873 9.63608 13.1833 9.62705C13.1794 9.61802 13.1774 9.60829 13.1774 9.59845C13.1774 9.58861 13.1794 9.57887 13.1833 9.56984C13.1873 9.56081 13.193 9.55268 13.2001 9.54595C13.2145 9.53288 13.2332 9.52563 13.2526 9.52563C13.2721 9.52563 13.2908 9.53288 13.3051 9.54595C13.3681 9.59995 20.4001 15.2819 22.6351 20.247C22.6434 20.2641 22.6446 20.2838 22.6384 20.3018C22.6323 20.3197 22.6192 20.3346 22.6021 20.343C22.5271 20.379 15.0451 23.988 2.64914 23.133C2.63969 23.1326 2.6304 23.1303 2.62181 23.1263C2.61322 23.1224 2.6055 23.1167 2.59909 23.1098C2.59268 23.1028 2.58771 23.0946 2.58446 23.0857C2.58121 23.0769 2.57974 23.0674 2.58014 23.058C2.58134 23.0452 2.58545 23.0329 2.59214 23.022Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/CircularProgressWidget/icon.svg b/app/client/src/widgets/CircularProgressWidget/icon.svg
index d50c9e22b197..f3ab69bb81ba 100644
--- a/app/client/src/widgets/CircularProgressWidget/icon.svg
+++ b/app/client/src/widgets/CircularProgressWidget/icon.svg
@@ -1,4 +1 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 22.0195C6.477 22.0195 2 17.5425 2 12.0195C2 7.54154 4.943 3.75154 9 2.47754V4.60154C7.28092 5.29958 5.8578 6.57325 4.97406 8.20465C4.09032 9.83606 3.80088 11.7238 4.15525 13.5451C4.50963 15.3663 5.48579 17.0078 6.91676 18.1889C8.34774 19.3699 10.1446 20.017 12 20.0195C13.5938 20.0195 15.1513 19.5436 16.4728 18.6528C17.7944 17.762 18.82 16.4969 19.418 15.0195H21.542C20.268 19.0765 16.478 22.0195 12 22.0195Z" fill="#858282"/>
-<path d="M15.6027 5.82699C15.6027 6.58113 15.3881 7.16124 14.9589 7.56732C14.5388 7.9734 13.9863 8.17643 13.3014 8.17643C12.9635 8.17643 12.653 8.12671 12.3699 8.02726C12.0868 7.91953 11.8447 7.76621 11.6438 7.56732C11.4429 7.36842 11.2831 7.12395 11.1644 6.83389C11.0548 6.53555 11 6.19991 11 5.82699C11 5.06456 11.21 4.48444 11.6301 4.08665C12.0594 3.68058 12.6164 3.47754 13.3014 3.47754C13.9863 3.47754 14.5388 3.68058 14.9589 4.08665C15.3881 4.48444 15.6027 5.06456 15.6027 5.82699ZM14.3014 5.82699C14.3014 5.38776 14.21 5.06041 14.0274 4.84494C13.8539 4.62119 13.6119 4.50931 13.3014 4.50931C12.9909 4.50931 12.7489 4.62119 12.5753 4.84494C12.4018 5.06041 12.3151 5.38776 12.3151 5.82699C12.3151 6.26621 12.4018 6.5977 12.5753 6.82146C12.7489 7.03693 12.9909 7.14467 13.3014 7.14467C13.6119 7.14467 13.8539 7.03693 14.0274 6.82146C14.21 6.5977 14.3014 6.26621 14.3014 5.82699ZM18.3836 3.664H19.9589L14.6027 12.2786H13.0274L18.3836 3.664ZM22 10.1281C22 10.8822 21.7854 11.4623 21.3562 11.8684C20.9361 12.2745 20.3836 12.4775 19.6986 12.4775C19.3607 12.4775 19.0502 12.4237 18.7671 12.3159C18.484 12.2165 18.242 12.0673 18.0411 11.8684C17.8402 11.6695 17.6804 11.4251 17.5616 11.135C17.4521 10.8367 17.3973 10.501 17.3973 10.1281C17.3973 9.36566 17.6073 8.78555 18.0274 8.38776C18.4566 7.98168 19.0137 7.77864 19.6986 7.77864C20.3836 7.77864 20.9361 7.98168 21.3562 8.38776C21.7854 8.78555 22 9.36566 22 10.1281ZM20.6986 10.1281C20.6986 9.68886 20.6073 9.36152 20.4247 9.14605C20.2511 8.92229 20.0091 8.81041 19.6986 8.81041C19.3881 8.81041 19.1461 8.92229 18.9726 9.14605C18.7991 9.36152 18.7123 9.68886 18.7123 10.1281C18.7123 10.5673 18.7991 10.8988 18.9726 11.1226C19.1461 11.338 19.3881 11.4458 19.6986 11.4458C20.0091 11.4458 20.2511 11.338 20.4247 11.1226C20.6073 10.8988 20.6986 10.5673 20.6986 10.1281Z" fill="#858282"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="25" fill="none" viewBox="0 0 24 25"><path fill="#858282" d="M12 22.0195C6.477 22.0195 2 17.5425 2 12.0195C2 7.54154 4.943 3.75154 9 2.47754V4.60154C7.28092 5.29958 5.8578 6.57325 4.97406 8.20465C4.09032 9.83606 3.80088 11.7238 4.15525 13.5451C4.50963 15.3663 5.48579 17.0078 6.91676 18.1889C8.34774 19.3699 10.1446 20.017 12 20.0195C13.5938 20.0195 15.1513 19.5436 16.4728 18.6528C17.7944 17.762 18.82 16.4969 19.418 15.0195H21.542C20.268 19.0765 16.478 22.0195 12 22.0195Z"/><path fill="#858282" d="M15.6027 5.82699C15.6027 6.58113 15.3881 7.16124 14.9589 7.56732C14.5388 7.9734 13.9863 8.17643 13.3014 8.17643C12.9635 8.17643 12.653 8.12671 12.3699 8.02726C12.0868 7.91953 11.8447 7.76621 11.6438 7.56732C11.4429 7.36842 11.2831 7.12395 11.1644 6.83389C11.0548 6.53555 11 6.19991 11 5.82699C11 5.06456 11.21 4.48444 11.6301 4.08665C12.0594 3.68058 12.6164 3.47754 13.3014 3.47754C13.9863 3.47754 14.5388 3.68058 14.9589 4.08665C15.3881 4.48444 15.6027 5.06456 15.6027 5.82699ZM14.3014 5.82699C14.3014 5.38776 14.21 5.06041 14.0274 4.84494C13.8539 4.62119 13.6119 4.50931 13.3014 4.50931C12.9909 4.50931 12.7489 4.62119 12.5753 4.84494C12.4018 5.06041 12.3151 5.38776 12.3151 5.82699C12.3151 6.26621 12.4018 6.5977 12.5753 6.82146C12.7489 7.03693 12.9909 7.14467 13.3014 7.14467C13.6119 7.14467 13.8539 7.03693 14.0274 6.82146C14.21 6.5977 14.3014 6.26621 14.3014 5.82699ZM18.3836 3.664H19.9589L14.6027 12.2786H13.0274L18.3836 3.664ZM22 10.1281C22 10.8822 21.7854 11.4623 21.3562 11.8684C20.9361 12.2745 20.3836 12.4775 19.6986 12.4775C19.3607 12.4775 19.0502 12.4237 18.7671 12.3159C18.484 12.2165 18.242 12.0673 18.0411 11.8684C17.8402 11.6695 17.6804 11.4251 17.5616 11.135C17.4521 10.8367 17.3973 10.501 17.3973 10.1281C17.3973 9.36566 17.6073 8.78555 18.0274 8.38776C18.4566 7.98168 19.0137 7.77864 19.6986 7.77864C20.3836 7.77864 20.9361 7.98168 21.3562 8.38776C21.7854 8.78555 22 9.36566 22 10.1281ZM20.6986 10.1281C20.6986 9.68886 20.6073 9.36152 20.4247 9.14605C20.2511 8.92229 20.0091 8.81041 19.6986 8.81041C19.3881 8.81041 19.1461 8.92229 18.9726 9.14605C18.7991 9.36152 18.7123 9.68886 18.7123 10.1281C18.7123 10.5673 18.7991 10.8988 18.9726 11.1226C19.1461 11.338 19.3881 11.4458 19.6986 11.4458C20.0091 11.4458 20.2511 11.338 20.4247 11.1226C20.6073 10.8988 20.6986 10.5673 20.6986 10.1281Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/CurrencyInputWidget/icon.svg b/app/client/src/widgets/CurrencyInputWidget/icon.svg
index e6bcd986521e..c9a04b177a9c 100644
--- a/app/client/src/widgets/CurrencyInputWidget/icon.svg
+++ b/app/client/src/widgets/CurrencyInputWidget/icon.svg
@@ -1,4 +1 @@
-<svg width="20" height="12" viewBox="0 0 20 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H20V12H0V0ZM2 10V2H18V10H2Z" fill="#4B4848"/>
-<path d="M4.81348 8.41895H5.15625V7.93262C5.93555 7.87695 6.52441 7.46094 6.52441 6.74023V6.73438C6.52441 6.10156 6.10254 5.78516 5.32031 5.60352L5.15625 5.56543V4.42871C5.50781 4.47852 5.75098 4.68652 5.78906 5.0293L5.79199 5.03516L6.47168 5.03223V5.0293C6.44531 4.3584 5.91797 3.90137 5.15625 3.83984V3.34766H4.81348V3.83984C4.04883 3.89258 3.50098 4.3291 3.50098 5V5.00586C3.50098 5.61523 3.91113 5.95508 4.66406 6.12793L4.81348 6.16309V7.34668C4.37402 7.2998 4.15723 7.07129 4.10742 6.75195L4.10449 6.74609L3.4248 6.74902L3.42188 6.75195C3.44531 7.46094 4.03711 7.88281 4.81348 7.93262V8.41895ZM4.20703 4.95312V4.94727C4.20703 4.69531 4.41504 4.47559 4.81348 4.42871V5.48633C4.37988 5.37207 4.20703 5.19922 4.20703 4.95312ZM5.81836 6.80469V6.81055C5.81836 7.10059 5.61328 7.30859 5.15625 7.34668V6.24219C5.65723 6.36816 5.81836 6.52637 5.81836 6.80469Z" fill="#4B4848"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="12" fill="none" viewBox="0 0 20 12"><path fill="#4B4848" fill-rule="evenodd" d="M0 0H20V12H0V0ZM2 10V2H18V10H2Z" clip-rule="evenodd"/><path fill="#4B4848" d="M4.81348 8.41895H5.15625V7.93262C5.93555 7.87695 6.52441 7.46094 6.52441 6.74023V6.73438C6.52441 6.10156 6.10254 5.78516 5.32031 5.60352L5.15625 5.56543V4.42871C5.50781 4.47852 5.75098 4.68652 5.78906 5.0293L5.79199 5.03516L6.47168 5.03223V5.0293C6.44531 4.3584 5.91797 3.90137 5.15625 3.83984V3.34766H4.81348V3.83984C4.04883 3.89258 3.50098 4.3291 3.50098 5V5.00586C3.50098 5.61523 3.91113 5.95508 4.66406 6.12793L4.81348 6.16309V7.34668C4.37402 7.2998 4.15723 7.07129 4.10742 6.75195L4.10449 6.74609L3.4248 6.74902L3.42188 6.75195C3.44531 7.46094 4.03711 7.88281 4.81348 7.93262V8.41895ZM4.20703 4.95312V4.94727C4.20703 4.69531 4.41504 4.47559 4.81348 4.42871V5.48633C4.37988 5.37207 4.20703 5.19922 4.20703 4.95312ZM5.81836 6.80469V6.81055C5.81836 7.10059 5.61328 7.30859 5.15625 7.34668V6.24219C5.65723 6.36816 5.81836 6.52637 5.81836 6.80469Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/JSONFormWidget/icon.svg b/app/client/src/widgets/JSONFormWidget/icon.svg
index 885be3808818..8630a57ccff6 100644
--- a/app/client/src/widgets/JSONFormWidget/icon.svg
+++ b/app/client/src/widgets/JSONFormWidget/icon.svg
@@ -1,7 +1 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.3335 2.6665V29.3332H26.6668V2.6665H5.3335ZM8.00016 26.6665V5.33317H24.0002V26.6665H8.00016Z" fill="#4B4848"/>
-<path d="M13 18.04V15H20.5V18.04H13Z" fill="#4B4848"/>
-<path d="M17 23V20.2H22V23H17Z" fill="#4B4848"/>
-<path d="M10 11V8H18V11H10Z" fill="#4B4848"/>
-<path d="M13 13V10H20V13H13Z" stroke="#4B4848" stroke-width="0.7"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32"><path fill="#4B4848" fill-rule="evenodd" d="M5.3335 2.6665V29.3332H26.6668V2.6665H5.3335ZM8.00016 26.6665V5.33317H24.0002V26.6665H8.00016Z" clip-rule="evenodd"/><path fill="#4B4848" d="M13 18.04V15H20.5V18.04H13Z"/><path fill="#4B4848" d="M17 23V20.2H22V23H17Z"/><path fill="#4B4848" d="M10 11V8H18V11H10Z"/><path stroke="#4B4848" stroke-width=".7" d="M13 13V10H20V13H13Z"/></svg>
\ No newline at end of file
diff --git a/app/client/src/widgets/PhoneInputWidget/icon.svg b/app/client/src/widgets/PhoneInputWidget/icon.svg
index a3e9f68b0c7c..4ae27b074edd 100644
--- a/app/client/src/widgets/PhoneInputWidget/icon.svg
+++ b/app/client/src/widgets/PhoneInputWidget/icon.svg
@@ -1,4 +1 @@
-<svg width="20" height="12" viewBox="0 0 20 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H20V12H0V0ZM2 10V2H18V10H2Z" fill="#4B4848"/>
-<path d="M4.5915 5.6705C4.82608 6.08262 5.16738 6.42392 5.5795 6.6585L5.8005 6.349C5.83604 6.29923 5.88859 6.26422 5.9482 6.25058C6.00781 6.23695 6.07036 6.24563 6.124 6.275C6.47758 6.46823 6.86805 6.58444 7.26975 6.616C7.33244 6.62097 7.39096 6.64938 7.43364 6.69558C7.47631 6.74178 7.50001 6.80236 7.5 6.86525V7.98075C7.50001 8.04265 7.47706 8.10235 7.43559 8.1483C7.39412 8.19425 7.33708 8.22319 7.2755 8.2295C7.143 8.24325 7.0095 8.25 6.875 8.25C4.735 8.25 3 6.515 3 4.375C3 4.2405 3.00675 4.107 3.0205 3.9745C3.02681 3.91292 3.05575 3.85588 3.1017 3.81441C3.14765 3.77294 3.20735 3.74999 3.26925 3.75H4.38475C4.44764 3.74999 4.50822 3.77369 4.55442 3.81636C4.60062 3.85904 4.62903 3.91756 4.634 3.98025C4.66556 4.38195 4.78177 4.77242 4.975 5.126C5.00437 5.17964 5.01305 5.24219 4.99942 5.3018C4.98578 5.36141 4.95077 5.41396 4.901 5.4495L4.5915 5.6705ZM3.961 5.50625L4.436 5.167C4.3012 4.87602 4.20884 4.56721 4.16175 4.25H3.5025C3.501 4.2915 3.50025 4.33325 3.50025 4.375C3.5 6.239 5.011 7.75 6.875 7.75C6.91675 7.75 6.9585 7.74925 7 7.7475V7.08825C6.68279 7.04116 6.37398 6.9488 6.083 6.814L5.74375 7.289C5.60717 7.23593 5.4745 7.17327 5.34675 7.1015L5.33225 7.09325C4.84189 6.81418 4.43582 6.40811 4.15675 5.91775L4.1485 5.90325C4.07673 5.7755 4.01407 5.64283 3.961 5.50625Z" fill="#4B4848"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="12" fill="none" viewBox="0 0 20 12"><path fill="#4B4848" fill-rule="evenodd" d="M0 0H20V12H0V0ZM2 10V2H18V10H2Z" clip-rule="evenodd"/><path fill="#4B4848" d="M4.5915 5.6705C4.82608 6.08262 5.16738 6.42392 5.5795 6.6585L5.8005 6.349C5.83604 6.29923 5.88859 6.26422 5.9482 6.25058C6.00781 6.23695 6.07036 6.24563 6.124 6.275C6.47758 6.46823 6.86805 6.58444 7.26975 6.616C7.33244 6.62097 7.39096 6.64938 7.43364 6.69558C7.47631 6.74178 7.50001 6.80236 7.5 6.86525V7.98075C7.50001 8.04265 7.47706 8.10235 7.43559 8.1483C7.39412 8.19425 7.33708 8.22319 7.2755 8.2295C7.143 8.24325 7.0095 8.25 6.875 8.25C4.735 8.25 3 6.515 3 4.375C3 4.2405 3.00675 4.107 3.0205 3.9745C3.02681 3.91292 3.05575 3.85588 3.1017 3.81441C3.14765 3.77294 3.20735 3.74999 3.26925 3.75H4.38475C4.44764 3.74999 4.50822 3.77369 4.55442 3.81636C4.60062 3.85904 4.62903 3.91756 4.634 3.98025C4.66556 4.38195 4.78177 4.77242 4.975 5.126C5.00437 5.17964 5.01305 5.24219 4.99942 5.3018C4.98578 5.36141 4.95077 5.41396 4.901 5.4495L4.5915 5.6705ZM3.961 5.50625L4.436 5.167C4.3012 4.87602 4.20884 4.56721 4.16175 4.25H3.5025C3.501 4.2915 3.50025 4.33325 3.50025 4.375C3.5 6.239 5.011 7.75 6.875 7.75C6.91675 7.75 6.9585 7.74925 7 7.7475V7.08825C6.68279 7.04116 6.37398 6.9488 6.083 6.814L5.74375 7.289C5.60717 7.23593 5.4745 7.17327 5.34675 7.1015L5.33225 7.09325C4.84189 6.81418 4.43582 6.40811 4.15675 5.91775L4.1485 5.90325C4.07673 5.7755 4.01407 5.64283 3.961 5.50625Z"/></svg>
\ No newline at end of file
|
ed05814abf628db1458823c49a6ea16a85775f68
|
2022-12-26 17:59:12
|
Anagh Hegde
|
fix: Issue with permission in application publish and importExport flow for git connected app (#19190)
| false
|
Issue with permission in application publish and importExport flow for git connected app (#19190)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
index 2fd30e3e5cc7..a16e84adab37 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
@@ -7,6 +7,7 @@
import com.appsmith.server.solutions.ImportExportApplicationService;
import com.appsmith.server.solutions.ReleaseNotesService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@Service
@@ -14,7 +15,7 @@
public class ApplicationTemplateServiceImpl extends ApplicationTemplateServiceCEImpl implements ApplicationTemplateService {
public ApplicationTemplateServiceImpl(CloudServicesConfig cloudServicesConfig,
ReleaseNotesService releaseNotesService,
- ImportExportApplicationService importExportApplicationService,
+ @Qualifier("importExportServiceCEImplV2") ImportExportApplicationService importExportApplicationService,
AnalyticsService analyticsService,
UserDataService userDataService,
ApplicationService applicationService,
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 7b31e5f9ee30..d0c07fa33558 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
@@ -1023,7 +1023,10 @@ public Mono<Application> publish(String applicationId, boolean isPublishedManual
//In each page, copy each layout's dsl to publishedDsl field
.flatMap(applicationPage -> newPageService
.findById(applicationPage.getId(), pagePermission.getEditPermission())
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, applicationPage.getId())))
+ // For a git connected app if the user does not have permission to edit few pages in master branch
+ // They don't get access to the same resources in feature branch. When they do operations like commit and push we publish the changes automatically
+ // and this will fail due to permission issue. Hence removing the throwing error part and handling it gracefully
+ // Only the pages which the user pocesses permission will be published
.map(page -> {
page.setPublishedPage(page.getUnpublishedPage());
return page;
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 d6c0ca2b815e..1157431e9fdb 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
@@ -13,6 +13,7 @@
import com.appsmith.external.models.DecryptedSensitiveFields;
import com.appsmith.external.models.DefaultResources;
import com.appsmith.external.models.OAuth2;
+import com.appsmith.external.models.Policy;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.constants.ResourceModes;
@@ -236,9 +237,9 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
Set<String> dbNamesUsedInActions = new HashSet<>();
Optional<AclPermission> optionalPermission = isGitSync ? Optional.empty() :
- TRUE.equals(application.getExportWithConfiguration())
- ? Optional.of(pagePermission.getReadPermission())
- : Optional.of(pagePermission.getEditPermission());
+ TRUE.equals(application.getExportWithConfiguration())
+ ? Optional.of(pagePermission.getReadPermission())
+ : Optional.of(pagePermission.getEditPermission());
Flux<NewPage> pageFlux = newPageRepository.findByApplicationId(applicationId, optionalPermission);
return pageFlux
@@ -291,7 +292,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
? Optional.of(datasourcePermission.getReadPermission())
: Optional.of(datasourcePermission.getEditPermission());
- Flux<Datasource> datasourceFlux =
+ Flux<Datasource> datasourceFlux =
datasourceRepository.findAllByWorkspaceId(workspaceId, optionalPermission3);
return datasourceFlux.collectList();
})
@@ -302,8 +303,8 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
Optional<AclPermission> optionalPermission1 = isGitSync ? Optional.empty() :
TRUE.equals(application.getExportWithConfiguration())
- ? Optional.of(actionPermission.getReadPermission())
- : Optional.of(actionPermission.getEditPermission());
+ ? Optional.of(actionPermission.getReadPermission())
+ : Optional.of(actionPermission.getEditPermission());
Flux<ActionCollection> actionCollectionFlux =
actionCollectionRepository.findByApplicationId(applicationId, optionalPermission1, Optional.empty());
return actionCollectionFlux;
@@ -364,7 +365,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
? Optional.of(actionPermission.getReadPermission())
: Optional.of(actionPermission.getEditPermission());
- Flux<NewAction> actionFlux =
+ Flux<NewAction> actionFlux =
newActionRepository.findByApplicationId(applicationId, optionalPermission2, Optional.empty());
return actionFlux;
})
@@ -954,7 +955,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
Iterator<ApplicationPage> publishedPagesItr;
// Remove the newly added pages from merge app flow. Keep only the existing page from the old app
- if(appendToApp) {
+ if (appendToApp) {
List<String> existingPagesId = savedApp.getPublishedPages().stream().map(applicationPage -> applicationPage.getId()).collect(Collectors.toList());
List<ApplicationPage> publishedApplicationPages = publishedPages.stream().filter(applicationPage -> existingPagesId.contains(applicationPage.getId())).collect(Collectors.toList());
applicationPages.replace(VIEW, publishedApplicationPages);
@@ -1283,6 +1284,7 @@ private Flux<NewPage> importAndSavePages(List<NewPage> pages,
if (newPage.getGitSyncId() != null && savedPagesGitIdToPageMap.containsKey(newPage.getGitSyncId())) {
//Since the resource is already present in DB, just update resource
NewPage existingPage = savedPagesGitIdToPageMap.get(newPage.getGitSyncId());
+ Set<Policy> existingPagePolicy = existingPage.getPolicies();
copyNestedNonNullProperties(newPage, existingPage);
// Update branchName
existingPage.getDefaultResources().setBranchName(branchName);
@@ -1290,6 +1292,7 @@ private Flux<NewPage> importAndSavePages(List<NewPage> pages,
existingPage.getUnpublishedPage().setDeletedAt(newPage.getUnpublishedPage().getDeletedAt());
existingPage.setDeletedAt(newPage.getDeletedAt());
existingPage.setDeleted(newPage.getDeleted());
+ existingPage.setPolicies(existingPagePolicy);
return newPageService.save(existingPage);
} else if (application.getGitApplicationMetadata() != null) {
final String defaultApplicationId = application.getGitApplicationMetadata().getDefaultApplicationId();
@@ -1403,6 +1406,7 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
//Since the resource is already present in DB, just update resource
NewAction existingAction = savedActionsGitIdToActionsMap.get(newAction.getGitSyncId());
+ Set<Policy> existingPolicy = existingAction.getPolicies();
copyNestedNonNullProperties(newAction, existingAction);
// Update branchName
existingAction.getDefaultResources().setBranchName(branchName);
@@ -1410,6 +1414,7 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
existingAction.getUnpublishedAction().setDeletedAt(newAction.getUnpublishedAction().getDeletedAt());
existingAction.setDeletedAt(newAction.getDeletedAt());
existingAction.setDeleted(newAction.getDeleted());
+ existingAction.setPolicies(existingPolicy);
return newActionService.save(existingAction);
} else if (importedApplication.getGitApplicationMetadata() != null) {
final String defaultApplicationId = importedApplication.getGitApplicationMetadata().getDefaultApplicationId();
@@ -1556,6 +1561,7 @@ private Flux<Tuple2<String, ActionCollection>> importAndSaveActionCollection(
//Since the resource is already present in DB, just update resource
ActionCollection existingActionCollection = savedActionCollectionGitIdToCollectionsMap.get(actionCollection.getGitSyncId());
+ Set<Policy> existingPolicy = existingActionCollection.getPolicies();
copyNestedNonNullProperties(actionCollection, existingActionCollection);
// Update branchName
existingActionCollection.getDefaultResources().setBranchName(branchName);
@@ -1563,6 +1569,7 @@ private Flux<Tuple2<String, ActionCollection>> importAndSaveActionCollection(
existingActionCollection.getUnpublishedCollection().setDeletedAt(actionCollection.getUnpublishedCollection().getDeletedAt());
existingActionCollection.setDeletedAt(actionCollection.getDeletedAt());
existingActionCollection.setDeleted(actionCollection.getDeleted());
+ existingActionCollection.setPolicies(existingPolicy);
return Mono.zip(
Mono.just(importedActionCollectionId),
actionCollectionService.save(existingActionCollection)
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceV2Tests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceV2Tests.java
index 24b8b215ec6e..e65d94f8e1d7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceV2Tests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceV2Tests.java
@@ -1569,6 +1569,8 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
})
.flatMap(page -> applicationRepository.findById(page.getApplicationId()))
.cache();
+ List<PageDTO> pageListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> newPageService.findByApplicationId(application.getId(), MANAGE_PAGES, false).collectList()).block();
StepVerifier
.create(resultMonoWithoutDiscardOperation
@@ -1643,6 +1645,10 @@ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
assertThat(application.getPublishedPages()).hasSize(1);
assertThat(pageList).hasSize(2);
+ for (PageDTO page : pageList) {
+ PageDTO curentPage = pageListBefore.stream().filter(pageDTO -> pageDTO.getId().equals(page.getId())).collect(Collectors.toList()).get(0);
+ assertThat(page.getPolicies()).isEqualTo(curentPage.getPolicies());
+ }
List<String> pageNames = new ArrayList<>();
pageList.forEach(page -> pageNames.add(page.getName()));
@@ -1684,6 +1690,9 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
.flatMap(newAction -> applicationRepository.findById(newAction.getApplicationId()))
.cache();
+ List<ActionDTO> actionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> getActionsInApplication(application).collectList()).block();
+
StepVerifier
.create(resultMonoWithoutDiscardOperation
.flatMap(application -> Mono.zip(
@@ -1737,6 +1746,10 @@ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
List<String> actionNames = new ArrayList<>();
actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
assertThat(actionNames).doesNotContain("discard-action-test");
+ for (ActionDTO action : actionListBefore) {
+ ActionDTO currentAction = actionListBefore.stream().filter(actionDTO -> actionDTO.getId().equals(action.getId())).collect(Collectors.toList()).get(0);
+ assertThat(action.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
})
.verifyComplete();
}
@@ -1779,6 +1792,11 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
.flatMap(actionCollection -> applicationRepository.findById(actionCollection.getApplicationId()))
.cache();
+ List<ActionCollection> actionCollectionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> actionCollectionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList()).block();
+ List<ActionDTO> actionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> getActionsInApplication(application).collectList()).block();
+
StepVerifier
.create(resultMonoWithoutDiscardOperation
.flatMap(application -> Mono.zip(
@@ -1844,6 +1862,15 @@ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectio
List<String> actionNames = new ArrayList<>();
actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
assertThat(actionNames).doesNotContain("discard-action-collection-test-action");
+ for (ActionDTO action : actionListBefore) {
+ ActionDTO currentAction = actionListBefore.stream().filter(actionDTO -> actionDTO.getId().equals(action.getId())).collect(Collectors.toList()).get(0);
+ assertThat(action.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
+
+ for (ActionCollection actionCollection : actionCollectionListBefore) {
+ ActionCollection currentAction = actionCollectionListBefore.stream().filter(actionDTO -> actionDTO.getId().equals(actionCollection.getId())).collect(Collectors.toList()).get(0);
+ assertThat(actionCollection.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
})
.verifyComplete();
}
|
047385b38c3fdc51263fd55d580bd7503ecad012
|
2024-05-15 21:56:19
|
Nilansh Bansal
|
fix: added serialization for LicenseCE (#33487)
| false
|
added serialization for LicenseCE (#33487)
|
fix
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/LicenseCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/LicenseCE.java
index 4010e91186b5..5250381fbc62 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/LicenseCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/LicenseCE.java
@@ -3,7 +3,9 @@
import com.appsmith.server.constants.LicensePlan;
import lombok.Data;
+import java.io.Serializable;
+
@Data
-public class LicenseCE {
+public class LicenseCE implements Serializable {
LicensePlan plan;
}
|
051967a0730b4f080cf812c05dcdcbccd1abd473
|
2023-08-30 12:57:42
|
Aman Agarwal
|
fix: callouts changed from warning to info for db datasources (#26747)
| false
|
callouts changed from warning to info for db datasources (#26747)
|
fix
|
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
index 10e69e081823..ac69421c027b 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
@@ -134,7 +134,7 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
!viewMode && (
<Callout
className="mt-4"
- kind="warning"
+ kind="info"
links={[
{
children: "Learn more",
|
76266d808a21401fa52c03171c10c3b1c120ccfd
|
2024-04-12 13:04:16
|
sneha122
|
feat: suggest queries query type added in action DTO (#32593)
| false
|
suggest queries query type added in action DTO (#32593)
|
feat
|
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/DatasourceQueryType.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/DatasourceQueryType.java
new file mode 100644
index 000000000000..3ea23758c3ae
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/DatasourceQueryType.java
@@ -0,0 +1,6 @@
+package com.appsmith.external.constants;
+
+public enum DatasourceQueryType {
+ FETCH,
+ UNKNOWN,
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java
index 1fc01c4c05dd..2951450eaa14 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java
@@ -1,6 +1,7 @@
package com.appsmith.external.models.ce;
import com.appsmith.external.constants.ActionCreationSourceTypeEnum;
+import com.appsmith.external.constants.DatasourceQueryType;
import com.appsmith.external.dtos.DslExecutableDTO;
import com.appsmith.external.dtos.LayoutExecutableUpdateDTO;
import com.appsmith.external.exceptions.ErrorDTO;
@@ -178,6 +179,10 @@ public class ActionCE_DTO implements Identifiable, Executable {
@JsonView(Views.Public.class)
ActionCreationSourceTypeEnum source;
+ @Transient
+ @JsonView(Views.Public.class)
+ DatasourceQueryType queryType;
+
@Override
@JsonView(Views.Public.class)
public String getValidName() {
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..1d0f20b83e50 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
@@ -1,5 +1,6 @@
package com.appsmith.external.plugins;
+import com.appsmith.external.constants.DatasourceQueryType;
import com.appsmith.external.dtos.ExecuteActionDTO;
import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
@@ -375,4 +376,13 @@ default Mono<String> getEndpointIdentifierForRateLimit(DatasourceConfiguration d
// wherever applicable.
return Mono.just("");
}
+
+ /*
+ * This method returns query type, query type is used for
+ * suggesting relevant actions to users when binding data
+ */
+ default Mono<DatasourceQueryType> getQueryType(ActionConfiguration actionConfig) {
+ // For all plugins where implementation is unclear right now, we will be returning its type as UNKNOWN
+ return Mono.just(DatasourceQueryType.UNKNOWN);
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
index 232a6454499a..c5f640bdcf53 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
@@ -1,5 +1,6 @@
package com.appsmith.server.newactions.base;
+import com.appsmith.external.constants.DatasourceQueryType;
import com.appsmith.external.dtos.ExecutePluginDTO;
import com.appsmith.external.dtos.RemoteDatasourceDTO;
import com.appsmith.external.helpers.AppsmithBeanUtils;
@@ -675,6 +676,18 @@ private Mono<NewAction> extractAndSetNativeQueryFromFormData(NewAction action) {
});
}
+ private Mono<ActionDTO> setQueryTypeInUnpublishedAction(ActionDTO action) {
+ Mono<Plugin> pluginMono = pluginService.getById(action.getPluginId());
+ Mono<PluginExecutor> pluginExecutorMono = pluginExecutorHelper.getPluginExecutor(pluginMono);
+
+ return pluginExecutorMono.flatMap(pluginExecutor -> pluginExecutor
+ .getQueryType(action.getActionConfiguration())
+ .flatMap(queryType -> {
+ action.setQueryType((DatasourceQueryType) queryType);
+ return Mono.just(action);
+ }));
+ }
+
@Override
public Mono<ActionDTO> findByUnpublishedNameAndPageId(String name, String pageId, AclPermission permission) {
return repository
@@ -999,6 +1012,7 @@ public Flux<ActionDTO> getUnpublishedActions(MultiValueMap<String, String> param
.collectList()
.flatMapMany(this::addMissingPluginDetailsIntoAllActions)
.flatMap(this::setTransientFieldsInUnpublishedAction)
+ .flatMap(this::setQueryTypeInUnpublishedAction)
// this generates four different tags, (ApplicationId, FieldId) *(True, False)
.tag(
"includeJsAction",
|
20d6dfb591feff513ee671ad942d34cd16b4c0bf
|
2024-01-18 17:16:40
|
Manish Kumar
|
chore: Import export application refactor (#29691)
| false
|
Import export application refactor (#29691)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/imports/ActionCollectionImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/imports/ActionCollectionImportableServiceCEImpl.java
index e0dd9efc89c5..f0c541c5e13c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/imports/ActionCollectionImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/imports/ActionCollectionImportableServiceCEImpl.java
@@ -75,12 +75,13 @@ private Mono<ImportActionCollectionResultDTO> createImportActionCollectionMono(
MappedImportableResourcesDTO mappedImportableResourcesDTO) {
Mono<List<ActionCollection>> importedActionCollectionMono = Mono.just(importedActionCollectionList);
- if (importingMetaDTO.getAppendToApp()) {
+ if (importingMetaDTO.getAppendToArtifact()) {
importedActionCollectionMono = importedActionCollectionMono.map(importedActionCollectionList1 -> {
- List<NewPage> importedNewPages = mappedImportableResourcesDTO.getPageNameMap().values().stream()
+ List<NewPage> importedNewPages = mappedImportableResourcesDTO.getPageOrModuleMap().values().stream()
.distinct()
+ .map(branchAwareDomain -> (NewPage) branchAwareDomain)
.toList();
- Map<String, String> newToOldNameMap = mappedImportableResourcesDTO.getNewPageNameToOldPageNameMap();
+ Map<String, String> newToOldNameMap = mappedImportableResourcesDTO.getPageOrModuleNewNameToOldName();
for (NewPage newPage : importedNewPages) {
String newPageName = newPage.getUnpublishedPage().getName();
@@ -194,7 +195,8 @@ private Mono<ImportActionCollectionResultDTO> importActionCollections(
.getPluginMap()
.get(unpublishedCollection.getPluginId()));
parentPage = updatePageInActionCollection(
- unpublishedCollection, mappedImportableResourcesDTO.getPageNameMap());
+ unpublishedCollection, (Map<String, NewPage>)
+ mappedImportableResourcesDTO.getPageOrModuleMap());
}
if (publishedCollection != null && publishedCollection.getName() != null) {
@@ -209,8 +211,9 @@ private Mono<ImportActionCollectionResultDTO> importActionCollections(
if (StringUtils.isEmpty(publishedCollection.getPageId())) {
publishedCollection.setPageId(fallbackParentPageId);
}
- NewPage publishedCollectionPage = updatePageInActionCollection(
- publishedCollection, mappedImportableResourcesDTO.getPageNameMap());
+ NewPage publishedCollectionPage =
+ updatePageInActionCollection(publishedCollection, (Map<String, NewPage>)
+ mappedImportableResourcesDTO.getPageOrModuleMap());
parentPage = parentPage == null ? publishedCollectionPage : parentPage;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceCEImpl.java
new file mode 100644
index 000000000000..0cec2011f0fd
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceCEImpl.java
@@ -0,0 +1,711 @@
+package com.appsmith.server.applications.base;
+
+import com.appsmith.external.constants.AnalyticsEvents;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.DatasourceStorageDTO;
+import com.appsmith.server.applications.imports.ApplicationImportServiceCE;
+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.ApplicationPage;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.ImportableArtifact;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.ApplicationImportDTO;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.ImportingMetaDTO;
+import com.appsmith.server.dtos.MappedImportableResourcesDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
+import com.appsmith.server.imports.importable.ImportableService;
+import com.appsmith.server.migrations.ApplicationVersion;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationPageService;
+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.PagePermission;
+import com.appsmith.server.solutions.WorkspacePermission;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DuplicateKeyException;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+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.stream.Collectors;
+
+import static com.appsmith.server.helpers.ImportExportUtils.setPropertiesToExistingApplication;
+import static com.appsmith.server.helpers.ImportExportUtils.setPublishedApplicationProperties;
+
+/**
+ * This service is currently not in use, however this service will replace ImportApplicationService
+ */
+@Slf4j
+public class ApplicationImportServiceCEImpl implements ApplicationImportServiceCE {
+
+ private final DatasourceService datasourceService;
+ private final WorkspaceService workspaceService;
+ private final ApplicationService applicationService;
+ private final ApplicationPageService applicationPageService;
+ private final NewActionService newActionService;
+ private final AnalyticsService analyticsService;
+ private final DatasourcePermission datasourcePermission;
+ private final WorkspacePermission workspacePermission;
+ private final ApplicationPermission applicationPermission;
+ private final PagePermission pagePermission;
+ private final ActionPermission actionPermission;
+ private final Gson gson;
+ private final ImportableService<Theme> themeImportableService;
+ private final ImportableService<NewPage> newPageImportableService;
+ private final ImportableService<CustomJSLib> customJSLibImportableService;
+ private final ImportableService<NewAction> newActionImportableService;
+ private final ImportableService<ActionCollection> actionCollectionImportableService;
+
+ /**
+ * This map keeps constants which are specific to context of Application, parallel to other Artifacts.
+ * i.e. Artifact --> Application
+ * i.e. ID --> applicationId
+ */
+ protected final Map<String, String> applicationConstantsMap = new HashMap<>();
+
+ public ApplicationImportServiceCEImpl(
+ DatasourceService datasourceService,
+ WorkspaceService workspaceService,
+ ApplicationService applicationService,
+ ApplicationPageService applicationPageService,
+ NewActionService newActionService,
+ AnalyticsService analyticsService,
+ DatasourcePermission datasourcePermission,
+ WorkspacePermission workspacePermission,
+ ApplicationPermission applicationPermission,
+ PagePermission pagePermission,
+ ActionPermission actionPermission,
+ Gson gson,
+ ImportableService<Theme> themeImportableService,
+ ImportableService<NewPage> newPageImportableService,
+ ImportableService<CustomJSLib> customJSLibImportableService,
+ ImportableService<NewAction> newActionImportableService,
+ ImportableService<ActionCollection> actionCollectionImportableService) {
+ this.datasourceService = datasourceService;
+ this.workspaceService = workspaceService;
+ this.applicationService = applicationService;
+ this.applicationPageService = applicationPageService;
+ this.newActionService = newActionService;
+ this.analyticsService = analyticsService;
+ this.datasourcePermission = datasourcePermission;
+ this.workspacePermission = workspacePermission;
+ this.applicationPermission = applicationPermission;
+ this.pagePermission = pagePermission;
+ this.actionPermission = actionPermission;
+ this.gson = gson;
+ this.themeImportableService = themeImportableService;
+ this.newPageImportableService = newPageImportableService;
+ this.customJSLibImportableService = customJSLibImportableService;
+ this.newActionImportableService = newActionImportableService;
+ this.actionCollectionImportableService = actionCollectionImportableService;
+ applicationConstantsMap.putAll(
+ Map.of(FieldName.ARTIFACT_CONTEXT, FieldName.APPLICATION, FieldName.ID, FieldName.APPLICATION_ID));
+ }
+
+ @Override
+ public ApplicationJson extractArtifactExchangeJson(String jsonString) {
+ Type fileType = new TypeToken<ApplicationJson>() {}.getType();
+ return gson.fromJson(jsonString, fileType);
+ }
+
+ @Override
+ public ImportArtifactPermissionProvider getImportArtifactPermissionProviderForImportingArtifact(
+ Set<String> userPermissionGroups) {
+ return ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .requiredPermissionOnTargetWorkspace(workspacePermission.getApplicationCreatePermission())
+ .permissionRequiredToCreateDatasource(true)
+ .permissionRequiredToEditDatasource(true)
+ .currentUserPermissionGroups(userPermissionGroups)
+ .build();
+ }
+
+ @Override
+ public ImportArtifactPermissionProvider getImportArtifactPermissionProviderForUpdatingArtifact(
+ Set<String> userPermissions) {
+ return ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .requiredPermissionOnTargetWorkspace(workspacePermission.getReadPermission())
+ .requiredPermissionOnTargetApplication(applicationPermission.getEditPermission())
+ .allPermissionsRequired()
+ .currentUserPermissionGroups(userPermissions)
+ .build();
+ }
+
+ /**
+ * If the application is connected to git, then the user must have edit permission on the application.
+ * If user is importing application from Git, create application permission is already checked by the
+ * caller method, so it's not required here.
+ * Other permissions are not required because Git is the source of truth for the application and Git
+ * Sync is a system level operation to get the latest code from Git. If the user does not have some
+ * permissions on the Application e.g. create page, that'll be checked when the user tries to create a page.
+ */
+ @Override
+ public ImportArtifactPermissionProvider getImportArtifactPermissionProviderForConnectingToGit(
+ Set<String> userPermissions) {
+ return ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .requiredPermissionOnTargetApplication(applicationPermission.getEditPermission())
+ .currentUserPermissionGroups(userPermissions)
+ .build();
+ }
+
+ @Override
+ public ImportArtifactPermissionProvider getImportArtifactPermissionProviderForRestoringSnapshot(
+ Set<String> userPermissions) {
+ return ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .requiredPermissionOnTargetWorkspace(workspacePermission.getReadPermission())
+ .requiredPermissionOnTargetApplication(applicationPermission.getEditPermission())
+ .currentUserPermissionGroups(userPermissions)
+ .build();
+ }
+
+ @Override
+ public ImportArtifactPermissionProvider getImportArtifactPermissionProviderForMergingJsonWithArtifact(
+ Set<String> userPermissions) {
+ return ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .requiredPermissionOnTargetWorkspace(workspacePermission.getReadPermission())
+ .requiredPermissionOnTargetApplication(applicationPermission.getEditPermission())
+ .allPermissionsRequired()
+ .currentUserPermissionGroups(userPermissions)
+ .build();
+ }
+
+ /**
+ * this method removes the application name from Json file as updating the app-name is not supported via import
+ * this avoids name conflict during import flow within workspace
+ *
+ * @param applicationId : ID of the application which has been saved.
+ * @param artifactExchangeJson : the ArtifactExchangeJSON which is getting imported
+ */
+ @Override
+ public void setJsonArtifactNameToNullBeforeUpdate(String applicationId, ArtifactExchangeJson artifactExchangeJson) {
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+ if (!StringUtils.isEmpty(applicationId) && (applicationJson).getExportedApplication() != null) {
+ applicationJson.getExportedApplication().setName(null);
+ applicationJson.getExportedApplication().setSlug(null);
+ }
+ }
+
+ protected List<Mono<Void>> getPageDependentImportables(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<Application> importedApplicationMono,
+ ApplicationJson applicationJson) {
+
+ // Requires pageNameMap, pageNameToOldNameMap, pluginMap and datasourceNameToIdMap to be present in importable
+ // resources.
+ // Updates actionResultDTO in importable resources.
+ // Also, directly updates required information in DB
+ Mono<Void> importedNewActionsMono = newActionImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedApplicationMono,
+ applicationJson,
+ false);
+
+ // Requires pageNameMap, pageNameToOldNameMap, pluginMap and actionResultDTO to be present in importable
+ // resources.
+ // Updates actionCollectionResultDTO in importable resources.
+ // Also, directly updates required information in DB
+ Mono<Void> importedActionCollectionsMono = actionCollectionImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedApplicationMono,
+ applicationJson,
+ false);
+
+ Mono<Void> combinedActionImportablesMono = importedNewActionsMono.then(importedActionCollectionsMono);
+ return List.of(combinedActionImportablesMono);
+ }
+
+ @Override
+ public Mono<ApplicationImportDTO> getImportableArtifactDTO(
+ String workspaceId, String applicationId, ImportableArtifact importableArtifact) {
+ Application application = (Application) importableArtifact;
+ return findDatasourceByApplicationId(applicationId, workspaceId)
+ .zipWith(workspaceService.getDefaultEnvironmentId(workspaceId, null))
+ .map(tuple2 -> {
+ List<Datasource> datasources = tuple2.getT1();
+ String environmentId = tuple2.getT2();
+ ApplicationImportDTO applicationImportDTO = new ApplicationImportDTO();
+ applicationImportDTO.setApplication(application);
+ Boolean isUnConfiguredDatasource = datasources.stream().anyMatch(datasource -> {
+ DatasourceStorageDTO datasourceStorageDTO =
+ datasource.getDatasourceStorages().get(environmentId);
+ if (datasourceStorageDTO == null) {
+ // If this environment has not been configured,
+ // We do not expect to find a storage, user will have to reconfigure
+ return Boolean.FALSE;
+ }
+ return Boolean.FALSE.equals(datasourceStorageDTO.getIsConfigured());
+ });
+ if (Boolean.TRUE.equals(isUnConfiguredDatasource)) {
+ applicationImportDTO.setIsPartialImport(true);
+ applicationImportDTO.setUnConfiguredDatasourceList(datasources);
+ } else {
+ applicationImportDTO.setIsPartialImport(false);
+ }
+ return applicationImportDTO;
+ });
+ }
+
+ @Override
+ public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String workspaceId) {
+ // TODO: Investigate further why datasourcePermission.getReadPermission() is not being used.
+ Mono<List<Datasource>> listMono = datasourceService
+ .getAllByWorkspaceIdWithStorages(workspaceId, Optional.empty())
+ .collectList();
+ return newActionService
+ .findAllByApplicationIdAndViewMode(applicationId, false, Optional.empty(), Optional.empty())
+ .collectList()
+ .zipWith(listMono)
+ .flatMap(objects -> {
+ List<Datasource> datasourceList = objects.getT2();
+ List<NewAction> actionList = objects.getT1();
+ List<String> usedDatasource = actionList.stream()
+ .map(newAction -> newAction
+ .getUnpublishedAction()
+ .getDatasource()
+ .getId())
+ .toList();
+
+ datasourceList.removeIf(datasource -> !usedDatasource.contains(datasource.getId()));
+
+ return Mono.just(datasourceList);
+ });
+ }
+
+ @Override
+ public void updateArtifactExchangeJsonWithEntitiesToBeConsumed(
+ ArtifactExchangeJson artifactExchangeJson, List<String> entitiesToImport) {
+
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+
+ // Update the application JSON to prepare it for merging inside an existing application
+ if (applicationJson.getExportedApplication() != null) {
+ // setting some properties to null so that target application is not updated by these properties
+ applicationJson.getExportedApplication().setName(null);
+ applicationJson.getExportedApplication().setSlug(null);
+ applicationJson.getExportedApplication().setForkingEnabled(null);
+ applicationJson.getExportedApplication().setForkWithConfiguration(null);
+ applicationJson.getExportedApplication().setClonedFromApplicationId(null);
+ applicationJson.getExportedApplication().setExportWithConfiguration(null);
+ }
+
+ // need to remove git sync id. Also filter pages if pageToImport is not empty
+ if (applicationJson.getPageList() != null) {
+ List<ApplicationPage> applicationPageList =
+ new ArrayList<>(applicationJson.getPageList().size());
+ List<String> pageNames =
+ new ArrayList<>(applicationJson.getPageList().size());
+ List<NewPage> importedNewPageList = applicationJson.getPageList().stream()
+ .filter(newPage -> newPage.getUnpublishedPage() != null
+ && (CollectionUtils.isEmpty(entitiesToImport)
+ || entitiesToImport.contains(
+ newPage.getUnpublishedPage().getName())))
+ .peek(newPage -> {
+ ApplicationPage applicationPage = new ApplicationPage();
+ applicationPage.setId(newPage.getUnpublishedPage().getName());
+ applicationPage.setIsDefault(false);
+ applicationPageList.add(applicationPage);
+ pageNames.add(applicationPage.getId());
+ })
+ .peek(newPage -> newPage.setGitSyncId(null))
+ .collect(Collectors.toList());
+ applicationJson.setPageList(importedNewPageList);
+ // Remove the pages from the exported Application inside the json based on the pagesToImport
+ applicationJson.getExportedApplication().setPages(applicationPageList);
+ applicationJson.getExportedApplication().setPublishedPages(applicationPageList);
+ }
+ if (applicationJson.getActionList() != null) {
+ List<NewAction> importedNewActionList = applicationJson.getActionList().stream()
+ .filter(newAction -> newAction.getUnpublishedAction() != null
+ && (CollectionUtils.isEmpty(entitiesToImport)
+ || entitiesToImport.contains(
+ newAction.getUnpublishedAction().getPageId())))
+ .peek(newAction ->
+ newAction.setGitSyncId(null)) // setting this null so that this action can be imported again
+ .collect(Collectors.toList());
+ applicationJson.setActionList(importedNewActionList);
+ }
+ if (applicationJson.getActionCollectionList() != null) {
+ List<ActionCollection> importedActionCollectionList = applicationJson.getActionCollectionList().stream()
+ .filter(actionCollection -> (CollectionUtils.isEmpty(entitiesToImport)
+ || entitiesToImport.contains(
+ actionCollection.getUnpublishedCollection().getPageId())))
+ .peek(actionCollection -> actionCollection.setGitSyncId(
+ null)) // setting this null so that this action collection can be imported again
+ .collect(Collectors.toList());
+ applicationJson.setActionCollectionList(importedActionCollectionList);
+ }
+ }
+
+ /**
+ * To send analytics event for import and export of application
+ *
+ * @param application Application object imported or exported
+ * @param event AnalyticsEvents event
+ * @return The application which is imported or exported
+ */
+ private Mono<Application> sendImportExportApplicationAnalyticsEvent(
+ Application application, AnalyticsEvents event) {
+ return workspaceService.getById(application.getWorkspaceId()).flatMap(workspace -> {
+ final Map<String, Object> eventData = Map.of(
+ FieldName.APPLICATION, application,
+ FieldName.WORKSPACE, workspace);
+
+ final Map<String, Object> data = Map.of(
+ FieldName.APPLICATION_ID, application.getId(),
+ FieldName.WORKSPACE_ID, workspace.getId(),
+ FieldName.EVENT_DATA, eventData);
+
+ return analyticsService.sendObjectEvent(event, application, data);
+ });
+ }
+
+ /**
+ * To send analytics event for import and export of application
+ *
+ * @param applicationId ID of application being imported or exported
+ * @param event AnalyticsEvents event
+ * @return The application which is imported or exported
+ */
+ private Mono<Application> sendImportExportApplicationAnalyticsEvent(String applicationId, AnalyticsEvents event) {
+ return applicationService
+ .findById(applicationId, Optional.empty())
+ .flatMap(application -> sendImportExportApplicationAnalyticsEvent(application, event));
+ }
+
+ @Override
+ public void syncClientAndSchemaVersion(ArtifactExchangeJson artifactExchangeJson) {
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+ Application importedApplication = applicationJson.getExportedApplication();
+ importedApplication.setServerSchemaVersion(applicationJson.getServerSchemaVersion());
+ importedApplication.setClientSchemaVersion(applicationJson.getClientSchemaVersion());
+ }
+
+ @Override
+ public Mono<Void> generateArtifactSpecificImportableEntities(
+ ArtifactExchangeJson artifactExchangeJson,
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO) {
+
+ // Persists relevant information and updates mapped resources
+ return customJSLibImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ null,
+ null,
+ (ApplicationJson) artifactExchangeJson,
+ false);
+ }
+
+ @Override
+ public Mono<Boolean> isArtifactConnectedToGit(String artifactId) {
+ return applicationService.isApplicationConnectedToGit(artifactId);
+ }
+
+ @Override
+ public Mono<Application> updateAndSaveArtifactInContext(
+ ImportableArtifact importableArtifact,
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<User> currentUserMono) {
+ Mono<Application> importApplicationMono = Mono.just((Application) importableArtifact)
+ .map(application -> {
+ if (application.getApplicationVersion() == null) {
+ application.setApplicationVersion(ApplicationVersion.EARLIEST_VERSION);
+ }
+ application.setViewMode(false);
+ application.setForkWithConfiguration(null);
+ application.setExportWithConfiguration(null);
+ application.setWorkspaceId(importingMetaDTO.getWorkspaceId());
+ application.setIsPublic(null);
+ application.setPolicies(null);
+ Map<String, List<ApplicationPage>> mapOfApplicationPageList = Map.of(
+ FieldName.PUBLISHED,
+ application.getPublishedPages(),
+ FieldName.UNPUBLISHED,
+ application.getPages());
+ mappedImportableResourcesDTO
+ .getResourceStoreFromArtifactExchangeJson()
+ .putAll(mapOfApplicationPageList);
+ application.setPages(null);
+ application.setPublishedPages(null);
+ return application;
+ })
+ .map(application -> {
+ application.setUnpublishedCustomJSLibs(
+ new HashSet<>(mappedImportableResourcesDTO.getInstalledJsLibsList()));
+ return application;
+ });
+
+ importApplicationMono = importApplicationMono.zipWith(currentUserMono).map(objects -> {
+ Application application = objects.getT1();
+ application.setModifiedBy(objects.getT2().getUsername());
+ return application;
+ });
+
+ if (StringUtils.isEmpty(importingMetaDTO.getArtifactId())) {
+ importApplicationMono = importApplicationMono.flatMap(application -> {
+ return applicationPageService.createOrUpdateSuffixedApplication(application, application.getName(), 0);
+ });
+ } else {
+ Mono<Application> existingApplicationMono = applicationService
+ .findById(
+ importingMetaDTO.getArtifactId(),
+ importingMetaDTO.getPermissionProvider().getRequiredPermissionOnTargetApplication())
+ .switchIfEmpty(Mono.defer(() -> {
+ log.error(
+ "No application found with id: {} and permission: {}",
+ importingMetaDTO.getArtifactId(),
+ importingMetaDTO.getPermissionProvider().getRequiredPermissionOnTargetApplication());
+ return Mono.error(new AppsmithException(
+ AppsmithError.ACL_NO_RESOURCE_FOUND,
+ FieldName.APPLICATION,
+ importingMetaDTO.getArtifactId()));
+ }))
+ .cache();
+
+ // this can be a git sync, import page from template, update app with json, restore snapshot
+ if (importingMetaDTO.getAppendToArtifact()) { // we don't need to do anything with the imported application
+ importApplicationMono = existingApplicationMono;
+ } else {
+ importApplicationMono = importApplicationMono
+ .zipWith(existingApplicationMono)
+ .map(objects -> {
+ Application newApplication = objects.getT1();
+ Application existingApplication = objects.getT2();
+ // This method sets the published mode properties in the imported
+ // application.When a user imports an application from the git repo,
+ // since the git only stores the unpublished version, the current
+ // deployed version in the newly imported app is not updated.
+ // This function sets the initial deployed version to the same as the
+ // edit mode one.
+ setPublishedApplicationProperties(newApplication);
+ setPropertiesToExistingApplication(newApplication, existingApplication);
+ return existingApplication;
+ })
+ .flatMap(application -> {
+ Mono<Application> parentApplicationMono;
+ if (application.getGitApplicationMetadata() != null) {
+ parentApplicationMono = applicationService.findById(
+ application.getGitApplicationMetadata().getDefaultApplicationId());
+ } else {
+ parentApplicationMono = Mono.just(application);
+ }
+ return Mono.zip(Mono.just(application), parentApplicationMono);
+ })
+ .flatMap(objects -> {
+ Application application = objects.getT1();
+ Application parentApplication = objects.getT2();
+ application.setPolicies(parentApplication.getPolicies());
+ return applicationService
+ .save(application)
+ .onErrorResume(DuplicateKeyException.class, error -> {
+ if (error.getMessage() != null) {
+ return applicationPageService.createOrUpdateSuffixedApplication(
+ application, application.getName(), 0);
+ }
+ throw error;
+ });
+ });
+ }
+ }
+ return importApplicationMono
+ .elapsed()
+ .map(tuples -> {
+ log.debug("time to create or update application object: {}", tuples.getT1());
+ return tuples.getT2();
+ })
+ .onErrorResume(error -> {
+ log.error("Error while creating or updating application object", error);
+ return Mono.error(error);
+ });
+ }
+
+ @Override
+ public Mono<Application> updateImportableArtifact(ImportableArtifact importableArtifact) {
+ return Mono.just((Application) importableArtifact).flatMap(application -> {
+ log.info("Imported application with id {}", application.getId());
+ // Need to update the application object with updated pages and publishedPages
+ Application updateApplication = new Application();
+ updateApplication.setPages(application.getPages());
+ updateApplication.setPublishedPages(application.getPublishedPages());
+
+ return applicationService.update(application.getId(), updateApplication);
+ });
+ }
+
+ @Override
+ public Mono<Application> updateImportableEntities(
+ ImportableArtifact importableContext,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ ImportingMetaDTO importingMetaDTO) {
+ return Mono.just((Application) importableContext).flatMap(application -> {
+ return newActionImportableService
+ .updateImportedEntities(application, importingMetaDTO, mappedImportableResourcesDTO, false)
+ .then(newPageImportableService.updateImportedEntities(
+ application, importingMetaDTO, mappedImportableResourcesDTO, false))
+ .thenReturn(application);
+ });
+ }
+
+ @Override
+ public Map<String, Object> createImportAnalyticsData(
+ ArtifactExchangeJson artifactExchangeJson, ImportableArtifact importableArtifact) {
+
+ Application application = (Application) importableArtifact;
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+
+ int jsObjectCount = CollectionUtils.isEmpty(applicationJson.getActionCollectionList())
+ ? 0
+ : applicationJson.getActionCollectionList().size();
+ int actionCount = CollectionUtils.isEmpty(applicationJson.getActionList())
+ ? 0
+ : applicationJson.getActionList().size();
+
+ final Map<String, Object> data = Map.of(
+ FieldName.APPLICATION_ID,
+ application.getId(),
+ FieldName.WORKSPACE_ID,
+ application.getWorkspaceId(),
+ "pageCount",
+ applicationJson.getPageList().size(),
+ "actionCount",
+ actionCount,
+ "JSObjectCount",
+ jsObjectCount);
+
+ return data;
+ }
+
+ @Override
+ public Flux<Void> generateArtifactContextIndependentImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importableArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson) {
+ return importableArtifactMono.flatMapMany(importableContext -> {
+ Application application = (Application) importableContext;
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+
+ // Updates pageNametoIdMap and pageNameMap in importable resources.
+ // Also, directly updates required information in DB
+ Mono<Void> importedPagesMono = newPageImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson,
+ false);
+
+ // Directly updates required theme information in DB
+ Mono<Void> importedThemesMono = themeImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson,
+ false,
+ true);
+
+ return Flux.merge(List.of(importedPagesMono, importedThemesMono));
+ });
+ }
+
+ @Override
+ public Flux<Void> generateArtifactContextDependentImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importableArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson) {
+
+ return importableArtifactMono.flatMapMany(importableContext -> {
+ Application application = (Application) importableContext;
+ ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
+
+ List<Mono<Void>> pageDependentImportables = getPageDependentImportables(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson);
+
+ return Flux.merge(pageDependentImportables);
+ });
+ }
+
+ @Override
+ public String validateArtifactSpecificFields(ArtifactExchangeJson artifactExchangeJson) {
+ ApplicationJson importedDoc = (ApplicationJson) artifactExchangeJson;
+ String errorField = "";
+ if (CollectionUtils.isEmpty(importedDoc.getPageList())) {
+ errorField = FieldName.PAGE_LIST;
+ } else if (importedDoc.getActionList() == null) {
+ errorField = FieldName.ACTIONS;
+ } else if (importedDoc.getDatasourceList() == null) {
+ errorField = FieldName.DATASOURCE;
+ }
+
+ return errorField;
+ }
+
+ @Override
+ public Map<String, String> getArtifactSpecificConstantsMap() {
+ return applicationConstantsMap;
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceImpl.java
new file mode 100644
index 000000000000..04dead67bf33
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationImportServiceImpl.java
@@ -0,0 +1,63 @@
+package com.appsmith.server.applications.base;
+
+import com.appsmith.server.applications.imports.ApplicationImportService;
+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;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.imports.importable.ImportableService;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationPageService;
+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.PagePermission;
+import com.appsmith.server.solutions.WorkspacePermission;
+import com.google.gson.Gson;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationImportServiceImpl extends ApplicationImportServiceCEImpl implements ApplicationImportService {
+
+ public ApplicationImportServiceImpl(
+ DatasourceService datasourceService,
+ WorkspaceService workspaceService,
+ ApplicationService applicationService,
+ ApplicationPageService applicationPageService,
+ NewActionService newActionService,
+ AnalyticsService analyticsService,
+ DatasourcePermission datasourcePermission,
+ WorkspacePermission workspacePermission,
+ ApplicationPermission applicationPermission,
+ PagePermission pagePermission,
+ ActionPermission actionPermission,
+ Gson gson,
+ ImportableService<Theme> themeImportableService,
+ ImportableService<NewPage> newPageImportableService,
+ ImportableService<CustomJSLib> customJSLibImportableService,
+ ImportableService<NewAction> newActionImportableService,
+ ImportableService<ActionCollection> actionCollectionImportableService) {
+ super(
+ datasourceService,
+ workspaceService,
+ applicationService,
+ applicationPageService,
+ newActionService,
+ analyticsService,
+ datasourcePermission,
+ workspacePermission,
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ gson,
+ themeImportableService,
+ newPageImportableService,
+ customJSLibImportableService,
+ newActionImportableService,
+ actionCollectionImportableService);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportService.java
new file mode 100644
index 000000000000..8804065eb99e
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.applications.imports;
+
+public interface ApplicationImportService extends ApplicationImportServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportServiceCE.java
new file mode 100644
index 000000000000..99d17d82fc93
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/imports/ApplicationImportServiceCE.java
@@ -0,0 +1,16 @@
+package com.appsmith.server.applications.imports;
+
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.dtos.ApplicationImportDTO;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.imports.internal.ContextBasedImportService;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface ApplicationImportServiceCE
+ extends ContextBasedImportService<Application, ApplicationImportDTO, ApplicationJson> {
+
+ Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String orgId);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ArtifactJsonType.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ArtifactJsonType.java
new file mode 100644
index 000000000000..b26aff45b4af
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ArtifactJsonType.java
@@ -0,0 +1,11 @@
+package com.appsmith.server.constants;
+
+/**
+ * The type of Json which the system deals with, it could be application, packages, or workflows.
+ * Collectively called Artifact
+ */
+public enum ArtifactJsonType {
+ APPLICATION,
+ PACKAGE,
+ WORKFLOW
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java
index 041365f32ca2..c36ec7803f22 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java
@@ -196,4 +196,7 @@ public class FieldNameCE {
public static final String INSTANCE_ID = "instanceId";
public static final String IP_ADDRESS = "ipAddress";
public static final String VERSION = "version";
+ public static final String PUBLISHED = "published";
+ public static final String UNPUBLISHED = "unpublished";
+ public static final String ARTIFACT_CONTEXT = "artifactContext";
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
index b699de97f849..495c0624f497 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
@@ -6,6 +6,7 @@
import com.appsmith.server.exports.internal.ExportApplicationService;
import com.appsmith.server.exports.internal.PartialExportService;
import com.appsmith.server.fork.internal.ApplicationForkingService;
+import com.appsmith.server.imports.importable.ImportService;
import com.appsmith.server.imports.internal.ImportApplicationService;
import com.appsmith.server.imports.internal.PartialImportService;
import com.appsmith.server.services.ApplicationPageService;
@@ -29,7 +30,8 @@ public ApplicationController(
ThemeService themeService,
ApplicationSnapshotService applicationSnapshotService,
PartialExportService partialExportService,
- PartialImportService partialImportService) {
+ PartialImportService partialImportService,
+ ImportService importService) {
super(
service,
applicationPageService,
@@ -40,6 +42,7 @@ public ApplicationController(
themeService,
applicationSnapshotService,
partialExportService,
- partialImportService);
+ partialImportService,
+ importService);
}
}
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 a05ec6e19404..ef798c922872 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
@@ -14,6 +14,7 @@
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.ApplicationPagesDTO;
import com.appsmith.server.dtos.GitAuthDTO;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
import com.appsmith.server.dtos.PartialExportFileDTO;
import com.appsmith.server.dtos.ReleaseItemsDTO;
import com.appsmith.server.dtos.ResponseDTO;
@@ -23,6 +24,7 @@
import com.appsmith.server.exports.internal.ExportApplicationService;
import com.appsmith.server.exports.internal.PartialExportService;
import com.appsmith.server.fork.internal.ApplicationForkingService;
+import com.appsmith.server.imports.importable.ImportService;
import com.appsmith.server.imports.internal.ImportApplicationService;
import com.appsmith.server.imports.internal.PartialImportService;
import com.appsmith.server.services.ApplicationPageService;
@@ -69,6 +71,7 @@ public class ApplicationControllerCE extends BaseController<ApplicationService,
private final ApplicationSnapshotService applicationSnapshotService;
private final PartialExportService partialExportService;
private final PartialImportService partialImportService;
+ private final ImportService importService;
@Autowired
public ApplicationControllerCE(
@@ -81,7 +84,8 @@ public ApplicationControllerCE(
ThemeService themeService,
ApplicationSnapshotService applicationSnapshotService,
PartialExportService partialExportService,
- PartialImportService partialImportService) {
+ PartialImportService partialImportService,
+ ImportService importService) {
super(service);
this.applicationPageService = applicationPageService;
this.applicationFetcher = applicationFetcher;
@@ -92,6 +96,7 @@ public ApplicationControllerCE(
this.applicationSnapshotService = applicationSnapshotService;
this.partialExportService = partialExportService;
this.partialImportService = partialImportService;
+ this.importService = importService;
}
@JsonView(Views.Public.class)
@@ -296,7 +301,7 @@ public Mono<ResponseDTO<Application>> restoreSnapshot(
@JsonView(Views.Public.class)
@PostMapping(value = "/import/{workspaceId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public Mono<ResponseDTO<ApplicationImportDTO>> importApplicationFromFile(
+ public Mono<ResponseDTO<ImportableArtifactDTO>> importApplicationFromFile(
@RequestPart("file") Mono<Part> fileMono,
@PathVariable String workspaceId,
@RequestParam(name = FieldName.APPLICATION_ID, required = false) String applicationId) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/imports/DatasourceImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/imports/DatasourceImportableServiceCEImpl.java
index 24b84c7bb5b7..faa879a7d26e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/imports/DatasourceImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/imports/DatasourceImportableServiceCEImpl.java
@@ -13,13 +13,15 @@
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ImportableArtifact;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.ImportingMetaDTO;
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableServiceCE;
import com.appsmith.server.services.SequenceService;
import com.appsmith.server.services.WorkspaceService;
@@ -54,6 +56,28 @@ public DatasourceImportableServiceCEImpl(
this.sequenceService = sequenceService;
}
+ @Override
+ public Mono<Void> importEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importContextMono,
+ ArtifactExchangeJson importableContextJson,
+ boolean isPartialImport,
+ boolean isContextAgnostic) {
+ return importContextMono.flatMap(importableContext -> {
+ Application application = (Application) importableContext;
+ ApplicationJson applicationJson = (ApplicationJson) importableContextJson;
+ return importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson,
+ isPartialImport);
+ });
+ }
+
// Requires pluginMap to be present in importable resources.
// Updates datasourceNameToIdMap in importable resources.
// Also directly updates required information in DB
@@ -71,7 +95,7 @@ public Mono<Void> importEntities(
.cache();
Mono<List<Datasource>> existingDatasourceMono =
- getExistingDatasourceMono(importingMetaDTO.getApplicationId(), existingDatasourceFlux);
+ getExistingDatasourceMono(importingMetaDTO.getArtifactId(), existingDatasourceFlux);
Mono<Map<String, String>> datasourceMapMono = importDatasources(
applicationJson,
existingDatasourceMono,
@@ -247,7 +271,7 @@ private Mono<Datasource> createUniqueDatasourceIfNotPresent(
DatasourceStorage datasourceStorage,
Workspace workspace,
String environmentId,
- ImportApplicationPermissionProvider permissionProvider) {
+ ImportArtifactPermissionProvider permissionProvider) {
/*
1. If same datasource is present return
2. If unable to find the datasource create a new datasource with unique name and return
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 56b331f6a9f6..a68c9b866742 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
@@ -34,7 +34,7 @@
@NoArgsConstructor
@QueryEntity
@Document
-public class Application extends BaseDomain {
+public class Application extends BaseDomain implements ImportableArtifact {
@NotNull @JsonView(Views.Public.class)
String name;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ImportableArtifact.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ImportableArtifact.java
new file mode 100644
index 000000000000..a744e817b987
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ImportableArtifact.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.server.domains.ce.ImportableArtifactCE;
+
+public interface ImportableArtifact extends ImportableArtifactCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ImportableArtifactCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ImportableArtifactCE.java
new file mode 100644
index 000000000000..0ef4eec4b3aa
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ImportableArtifactCE.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.domains.ce;
+
+public interface ImportableArtifactCE {
+
+ String getId();
+
+ String getWorkspaceId();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationImportDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationImportDTO.java
index 2221d9c166c5..50239c3315da 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationImportDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ApplicationImportDTO.java
@@ -9,7 +9,8 @@
@Getter
@Setter
-public class ApplicationImportDTO {
+public class ApplicationImportDTO extends ImportableArtifactDTO {
+
Application application;
List<Datasource> unConfiguredDatasourceList;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ArtifactExchangeJson.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ArtifactExchangeJson.java
new file mode 100644
index 000000000000..3e5c75c2a5b5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ArtifactExchangeJson.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.dtos;
+
+import com.appsmith.server.dtos.ce.ArtifactExchangeJsonCE;
+
+public interface ArtifactExchangeJson extends ArtifactExchangeJsonCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportableArtifactDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportableArtifactDTO.java
new file mode 100644
index 000000000000..32b8f2606ec2
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportableArtifactDTO.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.dtos;
+
+public abstract class ImportableArtifactDTO {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportingMetaDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportingMetaDTO.java
index 6ea04a37f87b..1cd11b253d64 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportingMetaDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ImportingMetaDTO.java
@@ -1,6 +1,6 @@
package com.appsmith.server.dtos;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -14,9 +14,19 @@
@Builder(toBuilder = true)
public class ImportingMetaDTO {
String workspaceId;
- String applicationId;
+ /**
+ * this represents any parent entity's id which could be imported.
+ * e.g. application, packages, workflows
+ */
+ String artifactId;
+
String branchName;
- Boolean appendToApp;
- ImportApplicationPermissionProvider permissionProvider;
+
+ /**
+ * this flag is for verifying whether the artifact in focus needs to be updated with the given provided json
+ */
+ Boolean appendToArtifact;
+
+ ImportArtifactPermissionProvider permissionProvider;
Set<String> currentUserPermissionGroups;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ApplicationJsonCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ApplicationJsonCE.java
index b366c04c6aaf..81d380131da3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ApplicationJsonCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ApplicationJsonCE.java
@@ -5,16 +5,18 @@
import com.appsmith.external.models.DecryptedSensitiveFields;
import com.appsmith.external.models.InvisibleActionFields;
import com.appsmith.external.views.Views;
+import com.appsmith.server.constants.ArtifactJsonType;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.ImportableArtifact;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.domains.Theme;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.Getter;
import lombok.Setter;
-import org.springframework.data.annotation.Transient;
import java.util.List;
import java.util.Map;
@@ -27,17 +29,15 @@
*/
@Getter
@Setter
-public class ApplicationJsonCE {
+public class ApplicationJsonCE implements ArtifactExchangeJson {
// To convey the schema version of the client and will be used to check if the imported file is compatible with
// current DSL schema
- @Transient
@JsonView({Views.Public.class, Views.Export.class})
Integer clientSchemaVersion;
// To convey the schema version of the server and will be used to check if the imported file is compatible with
// current DB schema
- @Transient
@JsonView({Views.Public.class, Views.Export.class})
Integer serverSchemaVersion;
@@ -114,4 +114,19 @@ public class ApplicationJsonCE {
@JsonView({Views.Public.class, Views.Export.class})
String widgets;
+
+ @Override
+ public ArtifactJsonType getArtifactJsonType() {
+ return ArtifactJsonType.APPLICATION;
+ }
+
+ @Override
+ public ImportableArtifact getImportableArtifact() {
+ return this.getExportedApplication();
+ }
+
+ @Override
+ public List<CustomJSLib> getCustomJsLibFromArtifact() {
+ return this.getCustomJSLibList();
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ArtifactExchangeJsonCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ArtifactExchangeJsonCE.java
new file mode 100644
index 000000000000..520af3f880f5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ArtifactExchangeJsonCE.java
@@ -0,0 +1,24 @@
+package com.appsmith.server.dtos.ce;
+
+import com.appsmith.server.constants.ArtifactJsonType;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.ImportableArtifact;
+
+import java.util.List;
+
+public interface ArtifactExchangeJsonCE {
+
+ Integer getClientSchemaVersion();
+
+ void setClientSchemaVersion(Integer clientSchemaVersion);
+
+ Integer getServerSchemaVersion();
+
+ void setServerSchemaVersion(Integer serverSchemaVersion);
+
+ ArtifactJsonType getArtifactJsonType();
+
+ ImportableArtifact getImportableArtifact();
+
+ List<CustomJSLib> getCustomJsLibFromArtifact();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedImportableResourcesCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedImportableResourcesCE_DTO.java
index 55bec0245f6a..d0d8d015cf29 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedImportableResourcesCE_DTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedImportableResourcesCE_DTO.java
@@ -1,6 +1,6 @@
package com.appsmith.server.dtos.ce;
-import com.appsmith.server.domains.NewPage;
+import com.appsmith.external.models.BranchAwareDomain;
import com.appsmith.server.dtos.CustomJSLibContextDTO;
import com.appsmith.server.dtos.ImportActionCollectionResultDTO;
import com.appsmith.server.dtos.ImportActionResultDTO;
@@ -16,13 +16,27 @@
@Data
public class MappedImportableResourcesCE_DTO {
+ // Artifacts independent entities
Map<String, String> pluginMap = new HashMap<>();
Map<String, String> datasourceNameToIdMap = new HashMap<>();
+ // Artifact dependent
+ // This attribute is re-usable across artifacts according to the needs
+ Map<String, String> pageOrModuleNewNameToOldName;
+
+ /**
+ * Attribute used to carry objects specific to the context of the Artifacts.
+ * In case of application it carries the NewPage entity
+ * In case of packages it would carry modules
+ */
+ Map<String, ? extends BranchAwareDomain> pageOrModuleMap;
+
+ // Artifact dependent and common
List<CustomJSLibContextDTO> installedJsLibsList;
- Map<String, String> newPageNameToOldPageNameMap;
- Map<String, NewPage> pageNameMap;
ImportActionResultDTO actionResultDTO;
ImportActionCollectionResultDTO actionCollectionResultDTO;
ImportedActionAndCollectionMapsDTO actionAndCollectionMapsDTO = new ImportedActionAndCollectionMapsDTO();
+
+ // This is being used to carry the resources from ArtifactExchangeJson
+ Map<String, Object> resourceStoreFromArtifactExchangeJson = new HashMap<>();
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProvider.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProvider.java
similarity index 91%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProvider.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProvider.java
index b4ed7061d06c..2295fdaf34e9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProvider.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProvider.java
@@ -9,6 +9,7 @@
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.solutions.ActionPermission;
import com.appsmith.server.solutions.ApplicationPermission;
+import com.appsmith.server.solutions.ArtifactPermission;
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.PagePermission;
import com.appsmith.server.solutions.WorkspacePermission;
@@ -39,9 +40,9 @@
*/
@AllArgsConstructor
@Getter
-public class ImportApplicationPermissionProvider {
+public class ImportArtifactPermissionProvider {
@Getter(AccessLevel.NONE)
- private final ApplicationPermission applicationPermission;
+ private final ArtifactPermission artifactPermission;
@Getter(AccessLevel.NONE)
private final PagePermission pagePermission;
@@ -124,7 +125,7 @@ public boolean canCreatePage(Application application) {
if (!permissionRequiredToCreatePage) {
return true;
}
- return hasPermission(applicationPermission.getPageCreatePermission(), application);
+ return hasPermission(((ApplicationPermission) artifactPermission).getPageCreatePermission(), application);
}
public boolean canCreateAction(NewPage page) {
@@ -142,19 +143,19 @@ public boolean canCreateDatasource(Workspace workspace) {
}
public static Builder builder(
- ApplicationPermission applicationPermission,
+ ArtifactPermission artifactPermission,
PagePermission pagePermission,
ActionPermission actionPermission,
DatasourcePermission datasourcePermission,
WorkspacePermission workspacePermission) {
return new Builder(
- applicationPermission, pagePermission, actionPermission, datasourcePermission, workspacePermission);
+ artifactPermission, pagePermission, actionPermission, datasourcePermission, workspacePermission);
}
@Setter
@Accessors(chain = true, fluent = true)
public static class Builder {
- private final ApplicationPermission applicationPermission;
+ private final ArtifactPermission artifactPermission;
private final PagePermission pagePermission;
private final ActionPermission actionPermission;
private final DatasourcePermission datasourcePermission;
@@ -173,12 +174,12 @@ public static class Builder {
private boolean permissionRequiredToEditDatasource;
private Builder(
- ApplicationPermission applicationPermission,
+ ArtifactPermission artifactPermission,
PagePermission pagePermission,
ActionPermission actionPermission,
DatasourcePermission datasourcePermission,
WorkspacePermission workspacePermission) {
- this.applicationPermission = applicationPermission;
+ this.artifactPermission = artifactPermission;
this.pagePermission = pagePermission;
this.actionPermission = actionPermission;
this.datasourcePermission = datasourcePermission;
@@ -195,11 +196,11 @@ public Builder allPermissionsRequired() {
return this;
}
- public ImportApplicationPermissionProvider build() {
+ public ImportArtifactPermissionProvider build() {
// IMPORTANT: make sure that we've added unit tests for all the properties.
// Otherwise, we may end up passing value of one attribute of same type to another.
- return new ImportApplicationPermissionProvider(
- applicationPermission,
+ return new ImportArtifactPermissionProvider(
+ artifactPermission,
pagePermission,
actionPermission,
datasourcePermission,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportService.java
new file mode 100644
index 000000000000..ad0d620388d6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.imports.importable;
+
+public interface ImportService extends ImportServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportServiceCE.java
new file mode 100644
index 000000000000..e488c603eab1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportServiceCE.java
@@ -0,0 +1,96 @@
+package com.appsmith.server.imports.importable;
+
+import com.appsmith.server.constants.ArtifactJsonType;
+import com.appsmith.server.domains.ImportableArtifact;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
+import com.appsmith.server.imports.internal.ContextBasedImportService;
+import org.springframework.http.codec.multipart.Part;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface ImportServiceCE {
+
+ /**
+ * This method provides the importService specific to the artifact based on the ArtifactJsonType.
+ * time complexity is O(1), as the map from which the service is being passes is pre-computed
+ * @param artifactExchangeJson : Entity Json which is implementing the artifactExchangeJson
+ * @return import-service which is implementing the ContextBasedServiceInterface
+ */
+ ContextBasedImportService<
+ ? extends ImportableArtifact, ? extends ImportableArtifactDTO, ? extends ArtifactExchangeJson>
+ getContextBasedImportService(ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * This method provides the importService specific to the artifact based on the ArtifactJsonType.
+ * time complexity is O(1), as the map from which the service is being passes is pre-computed
+ * @param artifactJsonType : Type of Json serialisation
+ * @return import-service which is implementing the ContextBasedServiceInterface
+ */
+ ContextBasedImportService<
+ ? extends ImportableArtifact, ? extends ImportableArtifactDTO, ? extends ArtifactExchangeJson>
+ getContextBasedImportService(ArtifactJsonType artifactJsonType);
+
+ /**
+ * This method takes a file part and makes a Json entity which implements the ArtifactExchangeJson interface
+ *
+ * @param filePart : filePart from which the contents would be made
+ * @param artifactJsonType : type of the dataExchangeJson
+ * @return : Json entity which implements ArtifactExchangeJson
+ */
+ Mono<? extends ArtifactExchangeJson> extractArtifactExchangeJson(Part filePart, ArtifactJsonType artifactJsonType);
+
+ /**
+ * Hydrates an ImportableArtifact within the specified workspace by saving the provided JSON file.
+ *
+ * @param filePart The filePart representing the ImportableArtifact object to be saved.
+ * The ImportableArtifact implements the ImportableArtifact interface.
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactId
+ * @param artifactJsonType
+ */
+ Mono<? extends ImportableArtifactDTO> extractArtifactExchangeJsonAndSaveArtifact(
+ Part filePart, String workspaceId, String artifactId, ArtifactJsonType artifactJsonType);
+
+ /**
+ * Saves the provided ArtifactExchangeJson within the specified workspace.
+ *
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactExchangeJson The JSON file representing the ImportableArtifact object to be saved.
+ * The ImportableArtifact implements the ImportableArtifact interface.
+ */
+ Mono<? extends ImportableArtifact> importNewArtifactInWorkspaceFromJson(
+ String workspaceId, ArtifactExchangeJson artifactExchangeJson);
+
+ Mono<? extends ImportableArtifact> updateNonGitConnectedArtifactFromJson(
+ String workspaceId, String artifactId, ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * Updates an existing ImportableArtifact connected to Git within the specified workspace.
+ *
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactId The ImportableArtifact id that needs to be updated with the new resources.
+ * @param artifactExchangeJson The ImportableArtifact JSON containing necessary information to update the ImportableArtifact.
+ * @param branchName The name of the Git branch. Set to null if not connected to Git.
+ * @return The updated ImportableArtifact stored in the database.
+ */
+ Mono<? extends ImportableArtifact> importArtifactInWorkspaceFromGit(
+ String workspaceId, String artifactId, ArtifactExchangeJson artifactExchangeJson, String branchName);
+
+ Mono<? extends ImportableArtifact> mergeArtifactExchangeJsonWithImportableArtifact(
+ String workspaceId,
+ String artifactId,
+ String branchName,
+ ArtifactExchangeJson artifactExchangeJson,
+ List<String> entitiesToImport);
+
+ Mono<? extends ImportableArtifact> restoreSnapshot(
+ String workspaceId, ArtifactExchangeJson artifactExchangeJson, String artifactId, String branchName);
+
+ Mono<? extends ImportableArtifactDTO> getArtifactImportDTO(
+ String workspaceId,
+ String artifactId,
+ ImportableArtifact importableArtifact,
+ ArtifactExchangeJson artifactExchangeJson);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportableServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportableServiceCE.java
index 05ac52dcf681..4397f5f9227a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportableServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/importable/ImportableServiceCE.java
@@ -2,8 +2,10 @@
import com.appsmith.external.models.BaseDomain;
import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ImportableArtifact;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.ImportingMetaDTO;
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import reactor.core.publisher.Mono;
@@ -25,4 +27,15 @@ default Mono<Void> updateImportedEntities(
boolean isPartialImport) {
return null;
}
+
+ default Mono<Void> importEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importContextMono,
+ ArtifactExchangeJson importableContextJson,
+ boolean isPartialImport,
+ boolean isContextAgnostic) {
+ return null;
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportService.java
new file mode 100644
index 000000000000..f3c3fc93c218
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportService.java
@@ -0,0 +1,9 @@
+package com.appsmith.server.imports.internal;
+
+import com.appsmith.server.domains.ImportableArtifact;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
+
+public interface ContextBasedImportService<
+ T extends ImportableArtifact, U extends ImportableArtifactDTO, V extends ArtifactExchangeJson>
+ extends ContextBasedImportServiceCE<T, U, V> {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportServiceCE.java
new file mode 100644
index 000000000000..cfea6521b59d
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ContextBasedImportServiceCE.java
@@ -0,0 +1,153 @@
+package com.appsmith.server.imports.internal;
+
+import com.appsmith.server.domains.ImportableArtifact;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
+import com.appsmith.server.dtos.ImportingMetaDTO;
+import com.appsmith.server.dtos.MappedImportableResourcesDTO;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface ContextBasedImportServiceCE<
+ T extends ImportableArtifact, U extends ImportableArtifactDTO, V extends ArtifactExchangeJson> {
+
+ V extractArtifactExchangeJson(String jsonString);
+
+ ImportArtifactPermissionProvider getImportArtifactPermissionProviderForImportingArtifact(
+ Set<String> userPermissions);
+
+ ImportArtifactPermissionProvider getImportArtifactPermissionProviderForUpdatingArtifact(
+ Set<String> userPermissions);
+
+ ImportArtifactPermissionProvider getImportArtifactPermissionProviderForConnectingToGit(Set<String> userPermissions);
+
+ ImportArtifactPermissionProvider getImportArtifactPermissionProviderForRestoringSnapshot(
+ Set<String> userPermissions);
+
+ ImportArtifactPermissionProvider getImportArtifactPermissionProviderForMergingJsonWithArtifact(
+ Set<String> userPermissions);
+
+ /**
+ * this method creates updates the entities which is to be imported in context to the artifact
+ *
+ * @param artifactExchangeJson : json for the artifact which is going to be imported
+ * @param entitiesToImport : list of names of entities which is going to be imported
+ */
+ default void updateArtifactExchangeJsonWithEntitiesToBeConsumed(
+ ArtifactExchangeJson artifactExchangeJson, List<String> entitiesToImport) {}
+
+ /**
+ * this method sets the names to null before the update to avoid conflict
+ *
+ * @param artifactId
+ * @param artifactExchangeJson
+ */
+ void setJsonArtifactNameToNullBeforeUpdate(String artifactId, ArtifactExchangeJson artifactExchangeJson);
+
+ Mono<U> getImportableArtifactDTO(String workspaceId, String artifactId, ImportableArtifact importableArtifact);
+
+ /**
+ * This method sets the client & server schema version to artifacts which is inside JSON from the clientSchemaVersion
+ * & serverSchemaVersion attribute from ArtifactExchangeJson
+ * @param artifactExchangeJson : ArtifactExchangeJson created from file part while import flow
+ */
+ void syncClientAndSchemaVersion(ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * This method saves the context from the import json for the first time after dehydrating all the details which can cause conflicts
+ *
+ * @param importableArtifact
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @param currentUserMono
+ * @return
+ */
+ Mono<T> updateAndSaveArtifactInContext(
+ ImportableArtifact importableArtifact,
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<User> currentUserMono);
+
+ /**
+ * update importable entities with the context references post creation of context in db
+ * @param importableContext
+ * @param mappedImportableResourcesDTO
+ * @param importingMetaDTO
+ * @return
+ */
+ Mono<T> updateImportableEntities(
+ ImportableArtifact importableContext,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ ImportingMetaDTO importingMetaDTO);
+
+ /**
+ * Update the artifact after the entities has been created
+ * @param importableArtifact : the artifact which has to be updated
+ * @return
+ */
+ Mono<T> updateImportableArtifact(ImportableArtifact importableArtifact);
+
+ Map<String, Object> createImportAnalyticsData(
+ ArtifactExchangeJson artifactExchangeJson, ImportableArtifact importableArtifact);
+
+ /**
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @param workspaceMono
+ * @param importableArtifactMono
+ * @param artifactExchangeJson
+ * @return
+ */
+ Flux<Void> generateArtifactContextIndependentImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importableArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @param workspaceMono
+ * @param importableArtifactMono
+ * @param artifactExchangeJson
+ * @return
+ */
+ Flux<Void> generateArtifactContextDependentImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importableArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * Add entities which are specific to the artifact. i.e. customJsLib
+ * @param artifactExchangeJson
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @return
+ */
+ Mono<Void> generateArtifactSpecificImportableEntities(
+ ArtifactExchangeJson artifactExchangeJson,
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO);
+
+ Mono<Boolean> isArtifactConnectedToGit(String artifactId);
+
+ String validateArtifactSpecificFields(ArtifactExchangeJson artifactExchangeJson);
+
+ /**
+ * This map keeps constants which are specific to the contexts i.e. Application, packages.
+ * which is parallel to other Artifacts.
+ * i.e. Artifact --> Application, Packages
+ * i.e. ID --> applicationId, packageId
+ */
+ Map<String, String> getArtifactSpecificConstantsMap();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java
index a994819a7afd..c833e135a51e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java
@@ -24,7 +24,7 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.ImportExportUtils;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableService;
import com.appsmith.server.layouts.UpdateLayoutService;
import com.appsmith.server.migrations.ApplicationVersion;
@@ -155,9 +155,9 @@ public Mono<ApplicationJson> extractApplicationJson(Part filePart) {
});
}
- private Mono<ImportApplicationPermissionProvider> getPermissionProviderForUpdateNonGitConnectedAppFromJson() {
+ private Mono<ImportArtifactPermissionProvider> getPermissionProviderForUpdateNonGitConnectedAppFromJson() {
return permissionGroupRepository.getCurrentUserPermissionGroups().map(permissionGroups -> {
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -213,7 +213,7 @@ private Mono<Application> updateNonGitConnectedAppFromJson(
return getPermissionProviderForUpdateNonGitConnectedAppFromJson()
.zipWith(permissionGroupIdsMono)
.flatMap(tuple2 -> {
- ImportApplicationPermissionProvider permissionProvider = tuple2.getT1();
+ ImportArtifactPermissionProvider permissionProvider = tuple2.getT1();
Set<String> permissionGroups = tuple2.getT2();
if (!StringUtils.isEmpty(applicationId)
@@ -266,7 +266,7 @@ public Mono<Application> importNewApplicationInWorkspaceFromJson(String workspac
}
return permissionGroupRepository.getCurrentUserPermissionGroups().flatMap(userPermissionGroups -> {
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -304,7 +304,7 @@ public Mono<Application> importApplicationInWorkspaceFromGit(
* Sync is a system level operation to get the latest code from Git. If the user does not have some
* permissions on the Application e.g. create page, that'll be checked when the user tries to create a page.
*/
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -332,7 +332,7 @@ public Mono<Application> restoreSnapshot(
* Only permission required is to edit the application.
*/
return permissionGroupRepository.getCurrentUserPermissionGroups().flatMap(userPermissionGroups -> {
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -406,29 +406,29 @@ private Mono<Application> getImportApplicationMono(
return application;
});
- if (StringUtils.isEmpty(importingMetaDTO.getApplicationId())) {
+ if (StringUtils.isEmpty(importingMetaDTO.getArtifactId())) {
importApplicationMono = importApplicationMono.flatMap(application -> {
return applicationPageService.createOrUpdateSuffixedApplication(application, application.getName(), 0);
});
} else {
Mono<Application> existingApplicationMono = applicationService
.findById(
- importingMetaDTO.getApplicationId(),
+ importingMetaDTO.getArtifactId(),
importingMetaDTO.getPermissionProvider().getRequiredPermissionOnTargetApplication())
.switchIfEmpty(Mono.defer(() -> {
log.error(
"No application found with id: {} and permission: {}",
- importingMetaDTO.getApplicationId(),
+ importingMetaDTO.getArtifactId(),
importingMetaDTO.getPermissionProvider().getRequiredPermissionOnTargetApplication());
return Mono.error(new AppsmithException(
AppsmithError.ACL_NO_RESOURCE_FOUND,
FieldName.APPLICATION,
- importingMetaDTO.getApplicationId()));
+ importingMetaDTO.getArtifactId()));
}))
.cache();
// this can be a git sync, import page from template, update app with json, restore snapshot
- if (importingMetaDTO.getAppendToApp()) { // we don't need to do anything with the imported application
+ if (importingMetaDTO.getAppendToArtifact()) { // we don't need to do anything with the imported application
importApplicationMono = existingApplicationMono;
} else {
importApplicationMono = Mono.zip(importApplicationMono, existingApplicationMono)
@@ -500,7 +500,7 @@ private Mono<Application> importApplicationInWorkspace(
String applicationId,
String branchName,
boolean appendToApp,
- ImportApplicationPermissionProvider permissionProvider,
+ ImportArtifactPermissionProvider permissionProvider,
Set<String> permissionGroups) {
/*
1. Migrate resource to latest schema
@@ -905,7 +905,7 @@ public Mono<Application> mergeApplicationJsonWithApplication(
}
return permissionGroupRepository.getCurrentUserPermissionGroups().flatMap(userPermissionGroups -> {
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
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
new file mode 100644
index 000000000000..7665e2055e7b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java
@@ -0,0 +1,741 @@
+package com.appsmith.server.imports.internal;
+
+import com.appsmith.external.constants.AnalyticsEvents;
+import com.appsmith.external.helpers.Stopwatch;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.applications.imports.ApplicationImportService;
+import com.appsmith.server.constants.ArtifactJsonType;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.ImportableArtifact;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
+import com.appsmith.server.dtos.ImportingMetaDTO;
+import com.appsmith.server.dtos.MappedImportableResourcesDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.ImportExportUtils;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
+import com.appsmith.server.imports.importable.ImportServiceCE;
+import com.appsmith.server.imports.importable.ImportableService;
+import com.appsmith.server.migrations.ArtifactSchemaMigration;
+import com.appsmith.server.repositories.PermissionGroupRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.WorkspaceService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.Part;
+import org.springframework.transaction.reactive.TransactionalOperator;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.server.constants.ArtifactJsonType.APPLICATION;
+
+@Slf4j
+public class ImportServiceCEImpl implements ImportServiceCE {
+
+ public static final Set<MediaType> ALLOWED_CONTENT_TYPES = Set.of(MediaType.APPLICATION_JSON);
+ private static final String INVALID_JSON_FILE = "invalid json file";
+ private final ApplicationImportService applicationImportService;
+ private final SessionUserService sessionUserService;
+ private final WorkspaceService workspaceService;
+ private final ImportableService<CustomJSLib> customJSLibImportableService;
+ private final PermissionGroupRepository permissionGroupRepository;
+ private final TransactionalOperator transactionalOperator;
+ private final AnalyticsService analyticsService;
+ private final ImportableService<Plugin> pluginImportableService;
+ private final ImportableService<Datasource> datasourceImportableService;
+ private final ImportableService<Theme> themeImportableService;
+ private final Map<ArtifactJsonType, ContextBasedImportService<?, ?, ?>> serviceFactory = new HashMap<>();
+
+ public ImportServiceCEImpl(
+ ApplicationImportService applicationImportService,
+ SessionUserService sessionUserService,
+ WorkspaceService workspaceService,
+ ImportableService<CustomJSLib> customJSLibImportableService,
+ PermissionGroupRepository permissionGroupRepository,
+ TransactionalOperator transactionalOperator,
+ AnalyticsService analyticsService,
+ ImportableService<Plugin> pluginImportableService,
+ ImportableService<Datasource> datasourceImportableService,
+ ImportableService<Theme> themeImportableService) {
+ this.applicationImportService = applicationImportService;
+ this.workspaceService = workspaceService;
+ this.sessionUserService = sessionUserService;
+ this.customJSLibImportableService = customJSLibImportableService;
+ this.permissionGroupRepository = permissionGroupRepository;
+ this.transactionalOperator = transactionalOperator;
+ this.analyticsService = analyticsService;
+ this.pluginImportableService = pluginImportableService;
+ this.datasourceImportableService = datasourceImportableService;
+ this.themeImportableService = themeImportableService;
+ serviceFactory.put(APPLICATION, applicationImportService);
+ }
+
+ /**
+ * This method provides the importService specific to the artifact based on the ArtifactJsonType.
+ * time complexity is O(1), as the map from which the service is being passes is pre-computed
+ * @param artifactExchangeJson : Entity Json which is implementing the artifactExchangeJson
+ * @return import-service which is implementing the ContextBasedServiceInterface
+ */
+ @Override
+ public ContextBasedImportService<
+ ? extends ImportableArtifact, ? extends ImportableArtifactDTO, ? extends ArtifactExchangeJson>
+ getContextBasedImportService(ArtifactExchangeJson artifactExchangeJson) {
+ return getContextBasedImportService(artifactExchangeJson.getArtifactJsonType());
+ }
+
+ /**
+ * This method provides the importService specific to the artifact based on the ArtifactJsonType.
+ * time complexity is O(1), as the map from which the service is being passes is pre-computed
+ * @param artifactJsonType : Type of Json serialisation
+ * @return import-service which is implementing the ContextBasedServiceInterface
+ */
+ @Override
+ public ContextBasedImportService<
+ ? extends ImportableArtifact, ? extends ImportableArtifactDTO, ? extends ArtifactExchangeJson>
+ getContextBasedImportService(ArtifactJsonType artifactJsonType) {
+ return serviceFactory.getOrDefault(artifactJsonType, applicationImportService);
+ }
+
+ /**
+ * This method takes a file part and makes a Json entity which implements the ArtifactExchangeJson interface
+ *
+ * @param filePart : filePart from which the contents would be made
+ * @param artifactJsonType : type of the json which is getting imported
+ * @return : Json entity which implements ArtifactExchangeJson
+ */
+ public Mono<? extends ArtifactExchangeJson> extractArtifactExchangeJson(
+ Part filePart, ArtifactJsonType artifactJsonType) {
+
+ final MediaType contentType = filePart.headers().getContentType();
+ 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));
+ }
+
+ return DataBufferUtils.join(filePart.content())
+ .map(dataBuffer -> {
+ byte[] data = new byte[dataBuffer.readableByteCount()];
+ dataBuffer.read(data);
+ DataBufferUtils.release(dataBuffer);
+ return new String(data);
+ })
+ .map(jsonString ->
+ getContextBasedImportService(artifactJsonType).extractArtifactExchangeJson(jsonString));
+ }
+
+ /**
+ * Hydrates an ImportableArtifact within the specified workspace by saving the provided JSON file.
+ *
+ * @param filePart The filePart representing the ImportableArtifact object to be saved.
+ * The ImportableArtifact implements the ImportableArtifact interface.
+ * @param workspaceId The identifier for the destination workspace.
+ */
+ @Override
+ public Mono<? extends ImportableArtifactDTO> extractArtifactExchangeJsonAndSaveArtifact(
+ Part filePart, String workspaceId, String artifactId, ArtifactJsonType artifactJsonType) {
+
+ if (StringUtils.isEmpty(workspaceId)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
+ }
+
+ Mono<ImportableArtifactDTO> importedContextMono = extractArtifactExchangeJson(filePart, artifactJsonType)
+ .zipWhen(contextJson -> {
+ if (StringUtils.isEmpty(artifactId)) {
+ return importNewArtifactInWorkspaceFromJson(workspaceId, contextJson);
+ } else {
+ return updateNonGitConnectedArtifactFromJson(workspaceId, artifactId, contextJson);
+ }
+ })
+ .flatMap(tuple2 -> {
+ ImportableArtifact context = tuple2.getT2();
+ ArtifactExchangeJson artifactExchangeJson = tuple2.getT1();
+ return getArtifactImportDTO(
+ context.getWorkspaceId(), context.getId(), context, artifactExchangeJson);
+ });
+
+ return Mono.create(
+ sink -> importedContextMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+ }
+
+ /**
+ * Saves the provided ArtifactExchangeJson within the specified workspace.
+ *
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactExchangeJson The JSON file representing the ImportableArtifact object to be saved.
+ * The ImportableArtifact implements the ImportableArtifact interface.
+ */
+ @Override
+ public Mono<? extends ImportableArtifact> importNewArtifactInWorkspaceFromJson(
+ String workspaceId, ArtifactExchangeJson artifactExchangeJson) {
+
+ // workspace id must be present and valid
+ if (StringUtils.isEmpty(workspaceId)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
+ }
+
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+ return permissionGroupRepository
+ .getCurrentUserPermissionGroups()
+ .zipWhen(userPermissionGroup -> {
+ return Mono.just(contextBasedImportService.getImportArtifactPermissionProviderForImportingArtifact(
+ userPermissionGroup));
+ })
+ .flatMap(tuple2 -> {
+ Set<String> userPermissionGroup = tuple2.getT1();
+ ImportArtifactPermissionProvider permissionProvider = tuple2.getT2();
+ return importArtifactInWorkspace(
+ workspaceId,
+ artifactExchangeJson,
+ null,
+ null,
+ false,
+ permissionProvider,
+ userPermissionGroup);
+ });
+ }
+
+ @Override
+ public Mono<? extends ImportableArtifact> updateNonGitConnectedArtifactFromJson(
+ String workspaceId, String artifactId, ArtifactExchangeJson artifactExchangeJson) {
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+
+ if (StringUtils.isEmpty(workspaceId)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
+ }
+
+ if (StringUtils.isEmpty(artifactId)) {
+ // error message according to the context
+ return Mono.error(new AppsmithException(
+ AppsmithError.INVALID_PARAMETER,
+ contextBasedImportService.getArtifactSpecificConstantsMap().get(FieldName.ID)));
+ }
+
+ // Check if the application is connected to git and if it's connected throw exception asking user to update
+ // app via git ops like pull, merge etc.
+ Mono<Boolean> isArtifactConnectedToGitMono = Mono.just(Boolean.FALSE);
+ if (!StringUtils.isEmpty(artifactId)) {
+ isArtifactConnectedToGitMono = contextBasedImportService.isArtifactConnectedToGit(artifactId);
+ }
+
+ Mono<ImportableArtifact> importedContextMono = isArtifactConnectedToGitMono.flatMap(isConnectedToGit -> {
+ if (isConnectedToGit) {
+ return Mono.error(new AppsmithException(
+ AppsmithError.UNSUPPORTED_IMPORT_OPERATION_FOR_GIT_CONNECTED_APPLICATION));
+ } else {
+ contextBasedImportService.setJsonArtifactNameToNullBeforeUpdate(artifactId, artifactExchangeJson);
+ return permissionGroupRepository
+ .getCurrentUserPermissionGroups()
+ .zipWhen(userPermissionGroup -> {
+ return Mono.just(
+ contextBasedImportService.getImportArtifactPermissionProviderForUpdatingArtifact(
+ userPermissionGroup));
+ })
+ .flatMap(tuple2 -> {
+ Set<String> userPermissionGroup = tuple2.getT1();
+ ImportArtifactPermissionProvider permissionProvider = tuple2.getT2();
+ return importArtifactInWorkspace(
+ workspaceId,
+ artifactExchangeJson,
+ artifactId,
+ null,
+ false,
+ permissionProvider,
+ userPermissionGroup);
+ })
+ .onErrorResume(error -> {
+ if (error instanceof AppsmithException) {
+ return Mono.error(error);
+ }
+ return Mono.error(new AppsmithException(
+ AppsmithError.GENERIC_JSON_IMPORT_ERROR, workspaceId, error.getMessage()));
+ });
+ }
+ });
+
+ return Mono.create(
+ sink -> importedContextMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+ }
+
+ /**
+ * Updates an existing ImportableArtifact connected to Git within the specified workspace.
+ *
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactId The ImportableArtifact id that needs to be updated with the new resources.
+ * @param artifactExchangeJson The ImportableArtifact JSON containing necessary information to update the ImportableArtifact.
+ * @param branchName The name of the Git branch. Set to null if not connected to Git.
+ * @return The updated ImportableArtifact stored in the database.
+ */
+ @Override
+ public Mono<? extends ImportableArtifact> importArtifactInWorkspaceFromGit(
+ String workspaceId, String artifactId, ArtifactExchangeJson artifactExchangeJson, String branchName) {
+
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+ return permissionGroupRepository
+ .getCurrentUserPermissionGroups()
+ .zipWhen(userPermissionGroups -> {
+ return Mono.just(contextBasedImportService.getImportArtifactPermissionProviderForConnectingToGit(
+ userPermissionGroups));
+ })
+ .flatMap(tuple2 -> {
+ Set<String> userPermissionGroup = tuple2.getT1();
+ ImportArtifactPermissionProvider artifactPermissionProvider = tuple2.getT2();
+ return importArtifactInWorkspace(
+ workspaceId,
+ artifactExchangeJson,
+ artifactId,
+ branchName,
+ false,
+ artifactPermissionProvider,
+ userPermissionGroup);
+ });
+ }
+
+ @Override
+ public Mono<? extends ImportableArtifact> restoreSnapshot(
+ String workspaceId, ArtifactExchangeJson artifactExchangeJson, String artifactId, String branchName) {
+
+ /**
+ * Like Git, restore snapshot is a system level operation. So, we're not checking for any permissions here.
+ * Only permission required is to edit the artifact.
+ */
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+ return permissionGroupRepository
+ .getCurrentUserPermissionGroups()
+ .zipWhen(userPermissionGroups -> {
+ return Mono.just(contextBasedImportService.getImportArtifactPermissionProviderForRestoringSnapshot(
+ userPermissionGroups));
+ })
+ .flatMap(tuple2 -> {
+ Set<String> userPermissionGroup = tuple2.getT1();
+ ImportArtifactPermissionProvider importArtifactPermissionProvider = tuple2.getT2();
+ return importArtifactInWorkspace(
+ workspaceId,
+ artifactExchangeJson,
+ artifactId,
+ branchName,
+ false,
+ importArtifactPermissionProvider,
+ userPermissionGroup);
+ });
+ }
+
+ /**
+ * This function will take the Json filePart and saves the artifact (likely an application) in workspace.
+ * It'll not create a new ImportableArtifact, it'll update the existing ImportableArtifact by appending the pages to the ImportableArtifact.
+ * The destination ImportableArtifact will be as it is, only the pages will be appended.
+ * This method will likely be only applicable for applications
+ *
+ * @param workspaceId ID in which the artifact is to be merged
+ * @param artifactId default ID of the importableArtifact where this artifactExchangeJson is going to get merged with
+ * @param branchName name of the branch of the importableArtifact where this artifactExchangeJson is going to get merged with
+ * @param artifactExchangeJson artifactExchangeJson of the importableArtifact that will be merged to
+ * @param entitiesToImport Name of the pages that should be merged from the artifactExchangeJson.
+ * If null or empty, all pages will be merged.
+ * @return Merged ImportableArtifact
+ */
+ @Override
+ public Mono<? extends ImportableArtifact> mergeArtifactExchangeJsonWithImportableArtifact(
+ String workspaceId,
+ String artifactId,
+ String branchName,
+ ArtifactExchangeJson artifactExchangeJson,
+ List<String> entitiesToImport) {
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+ contextBasedImportService.updateArtifactExchangeJsonWithEntitiesToBeConsumed(
+ artifactExchangeJson, entitiesToImport);
+ return permissionGroupRepository
+ .getCurrentUserPermissionGroups()
+ .zipWhen(userPermissionGroups -> {
+ return Mono.just(
+ contextBasedImportService.getImportArtifactPermissionProviderForMergingJsonWithArtifact(
+ userPermissionGroups));
+ })
+ .flatMap(tuple2 -> {
+ Set<String> userPermissionGroup = tuple2.getT1();
+ ImportArtifactPermissionProvider contextPermissionProvider = tuple2.getT2();
+ return importArtifactInWorkspace(
+ workspaceId,
+ artifactExchangeJson,
+ artifactId,
+ branchName,
+ true,
+ contextPermissionProvider,
+ userPermissionGroup);
+ });
+ }
+
+ /**
+ * @param workspaceId ID in which the context is to be merged
+ * @param artifactId default ID of the artifact where this artifactExchangeJson is going to get merged with
+ * @param importableArtifact the context (i.e. application, packages which is imported)
+ * @param artifactExchangeJson the Json entity from which the import is happening
+ * @return ImportableArtifactDTO
+ */
+ @Override
+ public Mono<? extends ImportableArtifactDTO> getArtifactImportDTO(
+ String workspaceId,
+ String artifactId,
+ ImportableArtifact importableArtifact,
+ ArtifactExchangeJson artifactExchangeJson) {
+ return getContextBasedImportService(artifactExchangeJson)
+ .getImportableArtifactDTO(workspaceId, artifactId, importableArtifact);
+ }
+
+ /**
+ * Imports an application into MongoDB based on the provided application reference object.
+ *
+ * @param workspaceId The identifier for the destination workspace.
+ * @param artifactExchangeJson The application resource containing necessary information for importing the application.
+ * @param artifactId The context identifier of the application that needs to be saved with the updated resources.
+ * @param branchName The name of the branch of the artifact with the specified artifactId.
+ * @param appendToArtifact Indicates whether artifactExchangeJson will be appended to the existing application or not.
+ * @return The updated artifact stored in MongoDB.
+ */
+ private Mono<ImportableArtifact> importArtifactInWorkspace(
+ String workspaceId,
+ ArtifactExchangeJson artifactExchangeJson,
+ String artifactId,
+ String branchName,
+ boolean appendToArtifact,
+ ImportArtifactPermissionProvider permissionProvider,
+ Set<String> permissionGroups) {
+
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+
+ String artifactContextString =
+ contextBasedImportService.getArtifactSpecificConstantsMap().get(FieldName.ARTIFACT_CONTEXT);
+
+ // step 1: Schema Migration
+ ArtifactExchangeJson importedDoc =
+ ArtifactSchemaMigration.migrateArtifactExchangeJsonToLatestSchema(artifactExchangeJson);
+
+ // Step 2: Validation of context Json
+ // check for validation error and raise exception if error found
+ String errorField = validateArtifactExchangeJson(importedDoc);
+ if (!errorField.isEmpty()) {
+ log.error("Error in importing {}. Field {} is missing", artifactContextString, errorField);
+ if (errorField.equals(artifactContextString)) {
+ return Mono.error(
+ new AppsmithException(
+ AppsmithError.VALIDATION_FAILURE,
+ "Field '" + artifactContextString
+ + "' Sorry! Seems like you've imported a page-level json instead of an application. Please use the import within the page."));
+ }
+ return Mono.error(new AppsmithException(
+ AppsmithError.VALIDATION_FAILURE, "Field '" + errorField + "' is missing in the JSON."));
+ }
+
+ ImportingMetaDTO importingMetaDTO = new ImportingMetaDTO(
+ workspaceId, artifactId, branchName, appendToArtifact, permissionProvider, permissionGroups);
+
+ MappedImportableResourcesDTO mappedImportableResourcesDTO = new MappedImportableResourcesDTO();
+ contextBasedImportService.syncClientAndSchemaVersion(importedDoc);
+
+ Mono<Workspace> workspaceMono = workspaceService
+ .findById(workspaceId, permissionProvider.getRequiredPermissionOnTargetWorkspace())
+ .switchIfEmpty(Mono.defer(() -> {
+ log.error(
+ "No workspace found with id: {} and permission: {}",
+ workspaceId,
+ permissionProvider.getRequiredPermissionOnTargetWorkspace());
+ return Mono.error(new AppsmithException(
+ AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.WORKSPACE, workspaceId));
+ }))
+ .cache();
+
+ Mono<User> currUserMono = sessionUserService.getCurrentUser().cache();
+
+ // Start the stopwatch to log the execution time
+ Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.IMPORT.getEventName());
+
+ // this would import customJsLibs for all type of artifacts
+ Mono<Void> artifactSpecificImportableEntities =
+ contextBasedImportService.generateArtifactSpecificImportableEntities(
+ importedDoc, importingMetaDTO, mappedImportableResourcesDTO);
+
+ /*
+ Calling the workspaceMono first to avoid creating multiple mongo transactions.
+ If the first db call inside a transaction is a Flux, then there's a chance of creating multiple mongo
+ transactions which will lead to NoSuchTransaction exception.
+ */
+ final Mono<? extends ImportableArtifact> importedArtifactMono = workspaceMono
+ .then(Mono.defer(() -> artifactSpecificImportableEntities))
+ .then(Mono.defer(() -> contextBasedImportService.updateAndSaveArtifactInContext(
+ importedDoc.getImportableArtifact(),
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ currUserMono)))
+ .cache();
+
+ Mono<? extends ImportableArtifact> importMono = importedArtifactMono
+ .then(Mono.defer(() -> generateImportableEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ importedDoc)))
+ .then(importedArtifactMono)
+ .flatMap(importableArtifact -> updateImportableEntities(
+ contextBasedImportService, importableArtifact, mappedImportableResourcesDTO, importingMetaDTO))
+ .flatMap(importableArtifact -> updateImportableArtifact(contextBasedImportService, importableArtifact))
+ .onErrorResume(throwable -> {
+ String errorMessage = ImportExportUtils.getErrorMessage(throwable);
+ log.error("Error importing {}. Error: {}", artifactContextString, errorMessage, throwable);
+ return Mono.error(
+ new AppsmithException(AppsmithError.GENERIC_JSON_IMPORT_ERROR, workspaceId, errorMessage));
+ })
+ .as(transactionalOperator::transactional);
+
+ final Mono<? extends ImportableArtifact> resultMono = importMono
+ .flatMap(importableArtifact -> sendImportedContextAnalyticsEvent(
+ contextBasedImportService, importableArtifact, AnalyticsEvents.IMPORT))
+ .zipWith(currUserMono)
+ .flatMap(tuple -> {
+ ImportableArtifact importableArtifact = tuple.getT1();
+ User user = tuple.getT2();
+ stopwatch.stopTimer();
+ stopwatch.stopAndLogTimeInMillis();
+ return sendImportRelatedAnalyticsEvent(importedDoc, importableArtifact, stopwatch, user);
+ });
+
+ // Import Context is currently a slow API because it needs to import and create context, pages, actions
+ // and action collection. This process may take time and the client may cancel the request. This leads to the
+ // flow getting stopped midway producing corrupted objects in DB. The following ensures that even though the
+ // client may have refreshes the page, the imported context is available and is in sane state.
+ // To achieve this, we use a synchronous sink which does not take subscription cancellations into account. This
+ // means that even if the subscriber has cancelled its subscription, the create method still generates its
+ // event.
+ return Mono.create(sink -> resultMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+ }
+
+ /**
+ * validates whether an artifactExchangeJson contains the required fields or not.
+ *
+ * @param importedDoc artifactExchangeJson object that needs to be validated
+ * @return Name of the field that have error. Empty string otherwise
+ */
+ private String validateArtifactExchangeJson(ArtifactExchangeJson importedDoc) {
+ // validate common schema things
+ ContextBasedImportService<?, ?, ?> contextBasedImportService = getContextBasedImportService(importedDoc);
+ String errorField = "";
+ if (importedDoc.getImportableArtifact() == null) {
+ // the error field will be either application, packages, or workflows
+ errorField =
+ contextBasedImportService.getArtifactSpecificConstantsMap().get(FieldName.ARTIFACT_CONTEXT);
+ } else {
+ // validate contextSpecific-errors
+ errorField = getContextBasedImportService(importedDoc).validateArtifactSpecificFields(importedDoc);
+ }
+
+ return errorField;
+ }
+
+ /**
+ * Updates importable entities with the contextDetails.
+ *
+ * @param contextBasedImportService
+ * @param importableArtifact
+ * @param mappedImportableResourcesDTO
+ * @param importingMetaDTO
+ * @return
+ */
+ private Mono<? extends ImportableArtifact> updateImportableEntities(
+ ContextBasedImportService<?, ?, ?> contextBasedImportService,
+ ImportableArtifact importableArtifact,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ ImportingMetaDTO importingMetaDTO) {
+ return contextBasedImportService.updateImportableEntities(
+ importableArtifact, mappedImportableResourcesDTO, importingMetaDTO);
+ }
+
+ /**
+ * update the importable context with contextSpecific entities after the entities has been created.
+ *
+ * @param contextBasedImportService
+ * @param importableArtifact
+ * @return
+ */
+ private Mono<? extends ImportableArtifact> updateImportableArtifact(
+ ContextBasedImportService<?, ?, ?> contextBasedImportService, ImportableArtifact importableArtifact) {
+ return contextBasedImportService.updateImportableArtifact(importableArtifact);
+ }
+
+ /**
+ * This method creates the entities which are mentioned in the contextJson, these are imported in mongodb and then
+ * the references are added to context
+ *
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @param workspaceMono
+ * @param importedArtifactMono
+ * @param artifactExchangeJson
+ * @return
+ */
+ private Mono<Void> generateImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importedArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson) {
+
+ ContextBasedImportService<?, ?, ?> contextBasedImportService =
+ getContextBasedImportService(artifactExchangeJson);
+
+ Flux<Void> artifactAgnosticImportables = generateArtifactIndependentImportableEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson);
+
+ Flux<Void> artifactSpecificImportables =
+ contextBasedImportService.generateArtifactContextIndependentImportableEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson);
+
+ Flux<Void> artifactContextDependentImportables =
+ contextBasedImportService.generateArtifactContextDependentImportableEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson);
+
+ return artifactAgnosticImportables
+ .thenMany(artifactSpecificImportables)
+ .thenMany(artifactContextDependentImportables)
+ .then();
+ }
+
+ /**
+ * Generate the entities which should be imported irrespective of the context (be it application or packages).
+ * some of these are plugin and datasource
+ *
+ * @param importingMetaDTO
+ * @param mappedImportableResourcesDTO
+ * @param workspaceMono
+ * @param importedArtifactMono
+ * @param artifactExchangeJson
+ * @return
+ */
+ protected Flux<Void> generateArtifactIndependentImportableEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importedArtifactMono,
+ ArtifactExchangeJson artifactExchangeJson) {
+
+ // Updates plugin map in importable resources
+ Mono<Void> installedPluginsMono = pluginImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson,
+ false,
+ true);
+
+ // Requires pluginMap to be present in importable resources.
+ // Updates datasourceNameToIdMap in importable resources.
+ // Also directly updates required information in DB
+ Mono<Void> importedDatasourcesMono = installedPluginsMono.then(datasourceImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson,
+ false,
+ true));
+
+ // Directly updates required theme information in DB
+ Mono<Void> importedThemesMono = themeImportableService.importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ importedArtifactMono,
+ artifactExchangeJson,
+ false,
+ true);
+
+ return Flux.merge(List.of(importedDatasourcesMono, importedThemesMono));
+ }
+
+ /**
+ * To send analytics event for import and export of ImportableArtifact i.e. application, packages
+ *
+ * @param importableArtifact ImportableArtifact object imported or exported
+ * @param event AnalyticsEvents event
+ * @return The ImportableArtifact which is imported or exported
+ */
+ private Mono<? extends ImportableArtifact> sendImportedContextAnalyticsEvent(
+ ContextBasedImportService<?, ?, ?> contextBasedImportService,
+ ImportableArtifact importableArtifact,
+ AnalyticsEvents event) {
+ // this would result in "application", "packages", or "workflows"
+ String artifactContextString =
+ contextBasedImportService.getArtifactSpecificConstantsMap().get(FieldName.ARTIFACT_CONTEXT);
+ // this would result in "applicationId", "packageId", or "workflowId"
+ String contextIdString =
+ contextBasedImportService.getArtifactSpecificConstantsMap().get(FieldName.ID);
+ return workspaceService.getById(importableArtifact.getWorkspaceId()).flatMap(workspace -> {
+ final Map<String, Object> eventData =
+ Map.of(artifactContextString, importableArtifact, FieldName.WORKSPACE, workspace);
+
+ final Map<String, Object> data = Map.of(
+ contextIdString,
+ importableArtifact.getId(),
+ FieldName.WORKSPACE_ID,
+ workspace.getId(),
+ FieldName.EVENT_DATA,
+ eventData);
+
+ return analyticsService.sendObjectEvent(event, importableArtifact, data);
+ });
+ }
+
+ /**
+ * This method deals in data only pertaining to import flow i.e. time taken, entities size, e.t.c
+ * @param artifactExchangeJson : Json which has been used for importing the artifact
+ * @param importableArtifact: the artifact which is imported
+ * @param stopwatch : stopwatch
+ * @param currentUser : user which has initiated the import
+ */
+ private Mono<ImportableArtifact> sendImportRelatedAnalyticsEvent(
+ ArtifactExchangeJson artifactExchangeJson,
+ ImportableArtifact importableArtifact,
+ Stopwatch stopwatch,
+ User currentUser) {
+
+ Map<String, Object> analyticsData = new HashMap<>(getContextBasedImportService(artifactExchangeJson)
+ .createImportAnalyticsData(artifactExchangeJson, importableArtifact));
+ analyticsData.put(FieldName.FLOW_NAME, stopwatch.getFlow());
+ analyticsData.put("executionTime", stopwatch.getExecutionTime());
+
+ return analyticsService
+ .sendEvent(AnalyticsEvents.UNIT_EXECUTION_TIME.getEventName(), currentUser.getUsername(), analyticsData)
+ .thenReturn(importableArtifact);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceImpl.java
new file mode 100644
index 000000000000..058c871d1098
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceImpl.java
@@ -0,0 +1,43 @@
+package com.appsmith.server.imports.internal;
+
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.applications.imports.ApplicationImportService;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.imports.importable.ImportService;
+import com.appsmith.server.imports.importable.ImportableService;
+import com.appsmith.server.repositories.PermissionGroupRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.WorkspaceService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.reactive.TransactionalOperator;
+
+@Component
+public class ImportServiceImpl extends ImportServiceCEImpl implements ImportService {
+
+ public ImportServiceImpl(
+ ApplicationImportService applicationImportService,
+ SessionUserService sessionUserService,
+ WorkspaceService workspaceService,
+ ImportableService<CustomJSLib> customJSLibImportableService,
+ PermissionGroupRepository permissionGroupRepository,
+ TransactionalOperator transactionalOperator,
+ AnalyticsService analyticsService,
+ ImportableService<Plugin> pluginImportableService,
+ ImportableService<Datasource> datasourceImportableService,
+ ImportableService<Theme> themeImportableService) {
+ super(
+ applicationImportService,
+ sessionUserService,
+ workspaceService,
+ customJSLibImportableService,
+ permissionGroupRepository,
+ transactionalOperator,
+ analyticsService,
+ pluginImportableService,
+ datasourceImportableService,
+ themeImportableService);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/PartialImportServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/PartialImportServiceCEImpl.java
index a5a45caa3106..2b1ffb1e102d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/PartialImportServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/PartialImportServiceCEImpl.java
@@ -18,7 +18,7 @@
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableService;
import com.appsmith.server.newpages.base.NewPageService;
import com.appsmith.server.repositories.PermissionGroupRepository;
@@ -82,7 +82,7 @@ public Mono<Application> importResourceInPage(
.zipWith(getImportApplicationPermissions())
.flatMap(tuple -> {
ApplicationJson applicationJson = tuple.getT1();
- ImportApplicationPermissionProvider permissionProvider = tuple.getT2();
+ ImportArtifactPermissionProvider permissionProvider = tuple.getT2();
// Set Application in App JSON, remove the pages other than the one to be imported in
// Set the current page in the JSON to be imported
// Debug and get the value from getImportApplicationMono method if any difference
@@ -180,9 +180,9 @@ public Mono<Application> importResourceInPage(
});
}
- private Mono<ImportApplicationPermissionProvider> getImportApplicationPermissions() {
+ private Mono<ImportArtifactPermissionProvider> getImportApplicationPermissions() {
return permissionGroupRepository.getCurrentUserPermissionGroups().flatMap(userPermissionGroups -> {
- ImportApplicationPermissionProvider permissionProvider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider permissionProvider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -261,7 +261,7 @@ private Mono<String> paneNameMapForActionAndActionCollectionInAppJson(
// update page name reference with newPage
Map<String, NewPage> pageNameMap = new HashMap<>();
pageNameMap.put(pageName, newPage);
- mappedImportableResourcesDTO.setPageNameMap(pageNameMap);
+ mappedImportableResourcesDTO.setPageOrModuleMap(pageNameMap);
if (applicationJson.getActionList() == null) {
return Mono.just(pageName);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigration.java
new file mode 100644
index 000000000000..d5e9cf642e1d
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigration.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.migrations;
+
+public class ArtifactSchemaMigration extends ArtifactSchemaMigrationCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigrationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigrationCE.java
new file mode 100644
index 000000000000..02ab8fb0fc2f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/ArtifactSchemaMigrationCE.java
@@ -0,0 +1,105 @@
+package com.appsmith.server.migrations;
+
+import com.appsmith.server.constants.ArtifactJsonType;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.CollectionUtils;
+
+public class ArtifactSchemaMigrationCE {
+
+ private static boolean checkCompatibility(ArtifactExchangeJson artifactExchangeJson) {
+ return (artifactExchangeJson.getClientSchemaVersion() <= JsonSchemaVersions.clientVersion)
+ && (artifactExchangeJson.getServerSchemaVersion() <= JsonSchemaVersions.serverVersion);
+ }
+
+ public static ArtifactExchangeJson migrateArtifactExchangeJsonToLatestSchema(
+ ArtifactExchangeJson artifactExchangeJson) {
+ // Check if the schema versions are available and set to initial version if not present
+ Integer serverSchemaVersion = artifactExchangeJson.getServerSchemaVersion() == null
+ ? 0
+ : artifactExchangeJson.getServerSchemaVersion();
+ Integer clientSchemaVersion = artifactExchangeJson.getClientSchemaVersion() == null
+ ? 0
+ : artifactExchangeJson.getClientSchemaVersion();
+
+ artifactExchangeJson.setClientSchemaVersion(clientSchemaVersion);
+ artifactExchangeJson.setServerSchemaVersion(serverSchemaVersion);
+ if (!checkCompatibility(artifactExchangeJson)) {
+ throw new AppsmithException(AppsmithError.INCOMPATIBLE_IMPORTED_JSON);
+ }
+
+ migrateClientAndServerSchemas(artifactExchangeJson);
+ return artifactExchangeJson;
+ }
+
+ /**
+ * This method migrates the client & server schema of artifactExchangeJson after choosing the right method for migration
+ * this will likely be overridden in EE codebase for more choices
+ * @param artifactExchangeJson artifactExchangeJson which is imported
+ */
+ private static void migrateClientAndServerSchemas(ArtifactExchangeJson artifactExchangeJson) {
+ if (ArtifactJsonType.APPLICATION.equals(artifactExchangeJson.getArtifactJsonType())) {
+ migrateApplicationJsonClientSchema((ApplicationJson) artifactExchangeJson);
+ migrateApplicationJsonServerSchema((ApplicationJson) artifactExchangeJson);
+ }
+ }
+
+ private static ApplicationJson migrateApplicationJsonServerSchema(ApplicationJson applicationJson) {
+ if (JsonSchemaVersions.serverVersion.equals(applicationJson.getServerSchemaVersion())) {
+ // No need to run server side migration
+ return applicationJson;
+ }
+ // Run migration linearly
+ // Updating the schema version after each migration is not required as we are not exiting by breaking the switch
+ // cases, but this keeps the version number and the migration in sync
+ switch (applicationJson.getServerSchemaVersion()) {
+ case 0:
+
+ case 1:
+ // Migration for deprecating archivedAt field in ActionDTO
+ if (!CollectionUtils.isNullOrEmpty(applicationJson.getActionList())) {
+ MigrationHelperMethods.updateArchivedAtByDeletedATForActions(applicationJson.getActionList());
+ }
+ applicationJson.setServerSchemaVersion(2);
+ case 2:
+ // Migration for converting formData elements to one that supports viewType
+ MigrationHelperMethods.migrateActionFormDataToObject(applicationJson);
+ applicationJson.setServerSchemaVersion(3);
+ case 3:
+ // File structure migration to update git directory structure
+ applicationJson.setServerSchemaVersion(4);
+ case 4:
+ // Remove unwanted fields from DTO and allow serialization for JsonIgnore fields
+ if (!CollectionUtils.isNullOrEmpty(applicationJson.getPageList())
+ && applicationJson.getExportedApplication() != null) {
+ MigrationHelperMethods.arrangeApplicationPagesAsPerImportedPageOrder(applicationJson);
+ MigrationHelperMethods.updateMongoEscapedWidget(applicationJson);
+ }
+ if (!CollectionUtils.isNullOrEmpty(applicationJson.getActionList())) {
+ MigrationHelperMethods.updateUserSetOnLoadAction(applicationJson);
+ }
+ applicationJson.setServerSchemaVersion(5);
+ case 5:
+ MigrationHelperMethods.migrateGoogleSheetsActionsToUqi(applicationJson);
+ applicationJson.setServerSchemaVersion(6);
+ case 6:
+ MigrationHelperMethods.ensureXmlParserPresenceInCustomJsLibList(applicationJson);
+ applicationJson.setServerSchemaVersion(7);
+ default:
+ // Unable to detect the serverSchema
+ }
+ return applicationJson;
+ }
+
+ private static ApplicationJson migrateApplicationJsonClientSchema(ApplicationJson applicationJson) {
+ if (JsonSchemaVersions.clientVersion.equals(applicationJson.getClientSchemaVersion())) {
+ // No need to run client side migration
+ return applicationJson;
+ }
+ // Today server is not responsible to run the client side DSL migration but this can be useful if we start
+ // supporting this on server side
+ return applicationJson;
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/imports/NewActionImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/imports/NewActionImportableServiceCEImpl.java
index aec0187de26a..1239044154cb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/imports/NewActionImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/imports/NewActionImportableServiceCEImpl.java
@@ -18,7 +18,7 @@
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableServiceCE;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.repositories.NewActionRepository;
@@ -69,12 +69,13 @@ public Mono<Void> importEntities(
List<NewAction> importedNewActionList = applicationJson.getActionList();
Mono<List<NewAction>> importedNewActionMono = Mono.justOrEmpty(importedNewActionList);
- if (TRUE.equals(importingMetaDTO.getAppendToApp())) {
+ if (TRUE.equals(importingMetaDTO.getAppendToArtifact())) {
importedNewActionMono = importedNewActionMono.map(importedNewActionList1 -> {
- List<NewPage> importedNewPages = mappedImportableResourcesDTO.getPageNameMap().values().stream()
+ List<NewPage> importedNewPages = mappedImportableResourcesDTO.getPageOrModuleMap().values().stream()
.distinct()
+ .map(branchAwareDomain -> (NewPage) branchAwareDomain)
.toList();
- Map<String, String> newToOldNameMap = mappedImportableResourcesDTO.getNewPageNameToOldPageNameMap();
+ Map<String, String> newToOldNameMap = mappedImportableResourcesDTO.getPageOrModuleNewNameToOldName();
for (NewPage newPage : importedNewPages) {
String newPageName = newPage.getUnpublishedPage().getName();
@@ -98,8 +99,8 @@ public Mono<Void> importEntities(
// attached to the application:
// Delete the invalid resources (which are not the part of applicationJsonDTO) in
// the git flow only
- if (StringUtils.hasText(importingMetaDTO.getApplicationId())
- && !TRUE.equals(importingMetaDTO.getAppendToApp())
+ if (StringUtils.hasText(importingMetaDTO.getArtifactId())
+ && !TRUE.equals(importingMetaDTO.getAppendToArtifact())
&& CollectionUtils.isNotEmpty(importActionResultDTO.getExistingActions())) {
// Remove unwanted actions
Set<String> invalidActionIds = new HashSet<>();
@@ -159,8 +160,8 @@ public Mono<Void> updateImportedEntities(
// attached to the application:
// Delete the invalid resources (which are not the part of applicationJsonDTO) in
// the git flow only
- if (StringUtils.hasText(importingMetaDTO.getApplicationId())
- && !TRUE.equals(importingMetaDTO.getAppendToApp())
+ if (StringUtils.hasText(importingMetaDTO.getArtifactId())
+ && !TRUE.equals(importingMetaDTO.getAppendToArtifact())
&& Boolean.FALSE.equals(isPartialImport)) {
// Remove unwanted action collections
Set<String> invalidCollectionIds = new HashSet<>();
@@ -273,7 +274,8 @@ private Mono<ImportActionResultDTO> importActions(
unpublishedAction.setId(newAction.getId());
parentPage = updatePageInAction(
unpublishedAction,
- mappedImportableResourcesDTO.getPageNameMap(),
+ (Map<String, NewPage>)
+ mappedImportableResourcesDTO.getPageOrModuleMap(),
importActionResultDTO.getActionIdMap());
sanitizeDatasourceInActionDTO(
unpublishedAction,
@@ -290,7 +292,8 @@ private Mono<ImportActionResultDTO> importActions(
}
NewPage publishedActionPage = updatePageInAction(
publishedAction,
- mappedImportableResourcesDTO.getPageNameMap(),
+ (Map<String, NewPage>)
+ mappedImportableResourcesDTO.getPageOrModuleMap(),
importActionResultDTO.getActionIdMap());
parentPage = parentPage == null ? publishedActionPage : parentPage;
sanitizeDatasourceInActionDTO(
@@ -484,7 +487,7 @@ private void updateExistingAction(
NewAction existingAction,
NewAction actionToImport,
String branchName,
- ImportApplicationPermissionProvider permissionProvider) {
+ ImportArtifactPermissionProvider permissionProvider) {
// Since the resource is already present in DB, just update resource
if (!permissionProvider.hasEditPermission(existingAction)) {
log.error("User does not have permission to edit action with id: {}", existingAction.getId());
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/imports/NewPageImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/imports/NewPageImportableServiceCEImpl.java
index af777672aec8..bf4da75d8826 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/imports/NewPageImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/imports/NewPageImportableServiceCEImpl.java
@@ -17,7 +17,7 @@
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.DefaultResourcesUtils;
import com.appsmith.server.helpers.TextUtils;
-import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.helpers.ce.ImportArtifactPermissionProvider;
import com.appsmith.server.imports.importable.ImportableServiceCE;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
@@ -87,7 +87,7 @@ public Mono<Void> importEntities(
importedNewPageList,
existingPagesMono,
applicationMono,
- importingMetaDTO.getAppendToApp(),
+ importingMetaDTO.getAppendToArtifact(),
importingMetaDTO.getBranchName(),
importingMetaDTO.getPermissionProvider(),
mappedImportableResourcesDTO)
@@ -100,8 +100,8 @@ public Mono<Void> importEntities(
applicationJson.getExportedApplication(),
pageNameMapMono,
applicationMono,
- importingMetaDTO.getAppendToApp(),
- importingMetaDTO.getApplicationId(),
+ importingMetaDTO.getAppendToArtifact(),
+ importingMetaDTO.getArtifactId(),
existingPagesMono,
importedNewPagesMono,
mappedImportableResourcesDTO)
@@ -121,8 +121,9 @@ public Mono<Void> updateImportedEntities(
mappedImportableResourcesDTO.getActionAndCollectionMapsDTO();
ImportActionResultDTO importActionResultDTO = mappedImportableResourcesDTO.getActionResultDTO();
- List<NewPage> newPages = mappedImportableResourcesDTO.getPageNameMap().values().stream()
+ List<NewPage> newPages = mappedImportableResourcesDTO.getPageOrModuleMap().values().stream()
.distinct()
+ .map(branchAwareDomain -> (NewPage) branchAwareDomain)
.toList();
return Flux.fromIterable(newPages)
.flatMap(newPage -> {
@@ -170,7 +171,7 @@ private Mono<Tuple2<List<NewPage>, Map<String, String>>> getImportNewPagesMono(
Mono<Application> importApplicationMono,
boolean appendToApp,
String branchName,
- ImportApplicationPermissionProvider permissionProvider,
+ ImportArtifactPermissionProvider permissionProvider,
MappedImportableResourcesDTO mappedImportableResourcesDTO) {
return Mono.just(importedNewPageList)
.zipWith(existingPagesMono)
@@ -184,7 +185,7 @@ private Mono<Tuple2<List<NewPage>, Map<String, String>>> getImportNewPagesMono(
newToOldNameMap = Map.of();
}
- mappedImportableResourcesDTO.setNewPageNameToOldPageNameMap(newToOldNameMap);
+ mappedImportableResourcesDTO.setPageOrModuleNewNameToOldName(newToOldNameMap);
return Tuples.of(importedNewPages, newToOldNameMap);
})
.zipWith(importApplicationMono)
@@ -218,8 +219,24 @@ Mono<Application> savePagesToApplicationMono(
Mono<Tuple2<List<NewPage>, Map<String, String>>> importedNewPagesMono,
MappedImportableResourcesDTO mappedImportableResourcesDTO) {
- List<ApplicationPage> editModeApplicationPages = importedApplication.getPages();
- List<ApplicationPage> publishedModeApplicationPages = importedApplication.getPublishedPages();
+ // The access source has been changes because the order of execution has changed.
+ List<ApplicationPage> editModeApplicationPages = (List<ApplicationPage>) mappedImportableResourcesDTO
+ .getResourceStoreFromArtifactExchangeJson()
+ .get(FieldName.UNPUBLISHED);
+
+ // this conditional is being placed just for compatibility of the PR #29691
+ if (CollectionUtils.isEmpty(editModeApplicationPages)) {
+ editModeApplicationPages = importedApplication.getPages();
+ }
+
+ List<ApplicationPage> publishedModeApplicationPages = (List<ApplicationPage>) mappedImportableResourcesDTO
+ .getResourceStoreFromArtifactExchangeJson()
+ .get(FieldName.PUBLISHED);
+
+ // this conditional is being placed just for compatibility of the PR #29691
+ if (CollectionUtils.isEmpty(publishedModeApplicationPages)) {
+ publishedModeApplicationPages = importedApplication.getPublishedPages();
+ }
Mono<List<ApplicationPage>> unpublishedPagesMono =
importUnpublishedPages(editModeApplicationPages, appendToApp, applicationMono, importedNewPagesMono);
@@ -234,7 +251,7 @@ Mono<Application> savePagesToApplicationMono(
Map<String, NewPage> pageNameMap = objects.getT3();
Application savedApp = objects.getT4();
- mappedImportableResourcesDTO.setPageNameMap(pageNameMap);
+ mappedImportableResourcesDTO.setPageOrModuleMap(pageNameMap);
log.debug("New pages imported for application: {}", savedApp.getId());
Map<ResourceModes, List<ApplicationPage>> applicationPages = new HashMap<>();
@@ -370,7 +387,7 @@ private Flux<NewPage> importAndSavePages(
Application application,
String branchName,
Mono<List<NewPage>> existingPages,
- ImportApplicationPermissionProvider permissionProvider) {
+ ImportArtifactPermissionProvider permissionProvider) {
Map<String, String> oldToNewLayoutIds = new HashMap<>();
pages.forEach(newPage -> {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/imports/PluginImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/imports/PluginImportableServiceCEImpl.java
index c824ce1df2bc..c7697f4bfdca 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/imports/PluginImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/imports/PluginImportableServiceCEImpl.java
@@ -1,11 +1,13 @@
package com.appsmith.server.plugins.imports;
import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ImportableArtifact;
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.domains.QPlugin;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.domains.WorkspacePlugin;
import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.ImportingMetaDTO;
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.imports.importable.ImportableServiceCE;
@@ -55,4 +57,26 @@ public Mono<Void> importEntities(
.doOnNext(tuples -> log.debug("time to get plugin map: {}", tuples.getT1()))
.then();
}
+
+ @Override
+ public Mono<Void> importEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importContextMono,
+ ArtifactExchangeJson importableContextJson,
+ boolean isPartialImport,
+ boolean isContextAgnostic) {
+ return importContextMono.flatMap(importableContext -> {
+ Application application = (Application) importableContext;
+ ApplicationJson applicationJson = (ApplicationJson) importableContextJson;
+ return importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson,
+ isPartialImport);
+ });
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ArtifactPermission.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ArtifactPermission.java
new file mode 100644
index 000000000000..d6cc0b1dec57
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ArtifactPermission.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.solutions.ce.ArtifactPermissionCE;
+
+public interface ArtifactPermission extends ArtifactPermissionCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCE.java
index 79e6328a2f31..1bf23e8d27bc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCE.java
@@ -1,11 +1,9 @@
package com.appsmith.server.solutions.ce;
import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.solutions.ArtifactPermission;
-public interface ApplicationPermissionCE {
- AclPermission getDeletePermission();
-
- AclPermission getExportPermission();
+public interface ApplicationPermissionCE extends ArtifactPermission {
AclPermission getMakePublicPermission();
@@ -13,8 +11,6 @@ public interface ApplicationPermissionCE {
AclPermission getPageCreatePermission();
- AclPermission getGitConnectPermission();
-
AclPermission getManageProtectedBranchPermission();
AclPermission getManageDefaultBranchPermission();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ArtifactPermissionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ArtifactPermissionCE.java
new file mode 100644
index 000000000000..f2e9b574bbeb
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ArtifactPermissionCE.java
@@ -0,0 +1,12 @@
+package com.appsmith.server.solutions.ce;
+
+import com.appsmith.server.acl.AclPermission;
+
+public interface ArtifactPermissionCE {
+
+ AclPermission getDeletePermission();
+
+ AclPermission getGitConnectPermission();
+
+ AclPermission getExportPermission();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/imports/ThemeImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/imports/ThemeImportableServiceCEImpl.java
index 40949be95251..086f9bc7b7b2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/imports/ThemeImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/imports/ThemeImportableServiceCEImpl.java
@@ -2,9 +2,11 @@
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ImportableArtifact;
import com.appsmith.server.domains.Theme;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.ImportingMetaDTO;
import com.appsmith.server.dtos.MappedImportableResourcesDTO;
import com.appsmith.server.imports.importable.ImportableServiceCE;
@@ -55,7 +57,7 @@ public Mono<Void> importEntities(
Mono<Application> applicationMono,
ApplicationJson applicationJson,
boolean isPartialImport) {
- if (Boolean.TRUE.equals(importingMetaDTO.getAppendToApp())) {
+ if (Boolean.TRUE.equals(importingMetaDTO.getAppendToArtifact())) {
// appending to existing app, theme should not change
return Mono.empty().then();
}
@@ -113,4 +115,26 @@ private Mono<Theme> updateExistingAppThemeFromJSON(
}
});
}
+
+ @Override
+ public Mono<Void> importEntities(
+ ImportingMetaDTO importingMetaDTO,
+ MappedImportableResourcesDTO mappedImportableResourcesDTO,
+ Mono<Workspace> workspaceMono,
+ Mono<? extends ImportableArtifact> importContextMono,
+ ArtifactExchangeJson importableContextJson,
+ boolean isPartialImport,
+ boolean isContextAgnostic) {
+ return importContextMono.flatMap(importableContext -> {
+ Application application = (Application) importableContext;
+ ApplicationJson applicationJson = (ApplicationJson) importableContextJson;
+ return importEntities(
+ importingMetaDTO,
+ mappedImportableResourcesDTO,
+ workspaceMono,
+ Mono.just(application),
+ applicationJson,
+ isPartialImport);
+ });
+ }
}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
index f7c318b961a9..b40f704293e0 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
@@ -12,6 +12,7 @@
import com.appsmith.server.fork.internal.ApplicationForkingService;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.RedisUtils;
+import com.appsmith.server.imports.importable.ImportService;
import com.appsmith.server.imports.internal.ImportApplicationService;
import com.appsmith.server.imports.internal.PartialImportService;
import com.appsmith.server.services.AnalyticsService;
@@ -58,6 +59,9 @@ public class ApplicationControllerTest {
@MockBean
ImportApplicationService importApplicationService;
+ @MockBean
+ ImportService importService;
+
@MockBean
ExportApplicationService exportApplicationService;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProviderTest.java
similarity index 85%
rename from app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java
rename to app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProviderTest.java
index 1930362aaa9e..3bf73e03f7c7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportArtifactPermissionProviderTest.java
@@ -30,7 +30,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest
-class ImportApplicationPermissionProviderTest {
+class ImportArtifactPermissionProviderTest {
@Autowired
ApplicationPermission applicationPermission;
@@ -48,22 +48,21 @@ class ImportApplicationPermissionProviderTest {
@Test
public void testCheckPermissionMethods_WhenNoPermissionProvided_ReturnsTrue() {
- ImportApplicationPermissionProvider importApplicationPermissionProvider =
- ImportApplicationPermissionProvider.builder(
- applicationPermission,
- pagePermission,
- actionPermission,
- datasourcePermission,
- workspacePermission)
- .build();
-
- assertTrue(importApplicationPermissionProvider.hasEditPermission(new NewPage()));
- assertTrue(importApplicationPermissionProvider.hasEditPermission(new NewAction()));
- assertTrue(importApplicationPermissionProvider.hasEditPermission(new Datasource()));
-
- assertTrue(importApplicationPermissionProvider.canCreateDatasource(new Workspace()));
- assertTrue(importApplicationPermissionProvider.canCreateAction(new NewPage()));
- assertTrue(importApplicationPermissionProvider.canCreatePage(new Application()));
+ ImportArtifactPermissionProvider importArtifactPermissionProvider = ImportArtifactPermissionProvider.builder(
+ applicationPermission,
+ pagePermission,
+ actionPermission,
+ datasourcePermission,
+ workspacePermission)
+ .build();
+
+ assertTrue(importArtifactPermissionProvider.hasEditPermission(new NewPage()));
+ assertTrue(importArtifactPermissionProvider.hasEditPermission(new NewAction()));
+ assertTrue(importArtifactPermissionProvider.hasEditPermission(new Datasource()));
+
+ assertTrue(importArtifactPermissionProvider.canCreateDatasource(new Workspace()));
+ assertTrue(importArtifactPermissionProvider.canCreateAction(new NewPage()));
+ assertTrue(importArtifactPermissionProvider.canCreatePage(new Application()));
}
@Test
@@ -81,7 +80,7 @@ public void tesHasEditPermissionOnDomains_WhenPermissionGroupDoesNotMatch_Return
for (Tuple2<BaseDomain, DomainPermission> domainAndPermission : domainAndPermissionList) {
BaseDomain domain = domainAndPermission.getT1();
// create a permission provider that sets edit permission on the domain
- ImportApplicationPermissionProvider provider =
+ ImportArtifactPermissionProvider provider =
createPermissionProviderForDomainEditPermission(domain, domainAndPermission.getT2());
if (domain instanceof NewPage) {
@@ -108,7 +107,7 @@ public void tesHasCreatePermissionOnDomains_WhenPermissionGroupDoesNotMatch_Retu
for (Tuple2<BaseDomain, AclPermission> domainAndPermission : domainAndPermissionList) {
BaseDomain domain = domainAndPermission.getT1();
// create a permission provider that sets edit permission on the domain
- ImportApplicationPermissionProvider provider =
+ ImportArtifactPermissionProvider provider =
createPermissionProviderForDomainCreatePermission(domain, domainAndPermission.getT2());
if (domain instanceof Application) {
@@ -123,7 +122,7 @@ public void tesHasCreatePermissionOnDomains_WhenPermissionGroupDoesNotMatch_Retu
@Test
public void tesBuilderIsSettingTheCorrectParametersToPermissionProvider() {
- ImportApplicationPermissionProvider.Builder builder = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider.Builder builder = ImportArtifactPermissionProvider.builder(
applicationPermission, pagePermission, actionPermission, datasourcePermission, workspacePermission);
assertThat(builder.requiredPermissionOnTargetApplication(applicationPermission.getEditPermission())
@@ -147,7 +146,7 @@ public void tesBuilderIsSettingTheCorrectParametersToPermissionProvider() {
@Test
public void testAllPermissionsRequiredIsSettingAllPermissionsAsRequired() {
- ImportApplicationPermissionProvider provider = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider provider = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -176,11 +175,11 @@ public void testAllPermissionsRequiredIsSettingAllPermissionsAsRequired() {
* @param domainPermission
* @return
*/
- private ImportApplicationPermissionProvider createPermissionProviderForDomainEditPermission(
+ private ImportArtifactPermissionProvider createPermissionProviderForDomainEditPermission(
BaseDomain baseDomain, DomainPermission domainPermission) {
setPoliciesToDomain(baseDomain, domainPermission.getEditPermission());
- ImportApplicationPermissionProvider.Builder builder = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider.Builder builder = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
@@ -210,11 +209,11 @@ private ImportApplicationPermissionProvider createPermissionProviderForDomainEdi
* @param permission
* @return
*/
- private ImportApplicationPermissionProvider createPermissionProviderForDomainCreatePermission(
+ private ImportArtifactPermissionProvider createPermissionProviderForDomainCreatePermission(
BaseDomain baseDomain, AclPermission permission) {
setPoliciesToDomain(baseDomain, permission);
- ImportApplicationPermissionProvider.Builder builder = ImportApplicationPermissionProvider.builder(
+ ImportArtifactPermissionProvider.Builder builder = ImportArtifactPermissionProvider.builder(
applicationPermission,
pagePermission,
actionPermission,
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
new file mode 100644
index 000000000000..c2c64b193c76
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
@@ -0,0 +1,5181 @@
+package com.appsmith.server.imports.internal;
+
+import com.appsmith.external.helpers.AppsmithBeanUtils;
+import com.appsmith.external.models.ActionConfiguration;
+import com.appsmith.external.models.ActionDTO;
+import com.appsmith.external.models.BearerTokenAuth;
+import com.appsmith.external.models.Connection;
+import com.appsmith.external.models.CreatorContextType;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.DatasourceConfiguration;
+import com.appsmith.external.models.DatasourceStorage;
+import com.appsmith.external.models.DatasourceStorageDTO;
+import com.appsmith.external.models.DecryptedSensitiveFields;
+import com.appsmith.external.models.InvisibleActionFields;
+import com.appsmith.external.models.PluginType;
+import com.appsmith.external.models.Policy;
+import com.appsmith.external.models.Property;
+import com.appsmith.external.models.SSLDetails;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.applications.base.ApplicationService;
+import com.appsmith.server.constants.ArtifactJsonType;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.constants.SerialiseApplicationObjective;
+import com.appsmith.server.datasources.base.DatasourceService;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.ApplicationDetail;
+import com.appsmith.server.domains.ApplicationMode;
+import com.appsmith.server.domains.ApplicationPage;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.GitApplicationMetadata;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.ActionCollectionDTO;
+import com.appsmith.server.dtos.ApplicationAccessDTO;
+import com.appsmith.server.dtos.ApplicationImportDTO;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ApplicationPagesDTO;
+import com.appsmith.server.dtos.ImportableArtifactDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.PageNameIdDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.exports.internal.ExportApplicationService;
+import com.appsmith.server.helpers.MockPluginExecutor;
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.imports.importable.ImportService;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
+import com.appsmith.server.layouts.UpdateLayoutService;
+import com.appsmith.server.migrations.ApplicationVersion;
+import com.appsmith.server.migrations.JsonSchemaMigration;
+import com.appsmith.server.migrations.JsonSchemaVersions;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
+import com.appsmith.server.repositories.PermissionGroupRepository;
+import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.repositories.ThemeRepository;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.LayoutActionService;
+import com.appsmith.server.services.LayoutCollectionService;
+import com.appsmith.server.services.PermissionGroupService;
+import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.ApplicationPermission;
+import com.appsmith.server.solutions.EnvironmentPermission;
+import com.appsmith.server.solutions.PagePermission;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+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.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.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.FilePart;
+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 reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import reactor.util.function.Tuple3;
+import reactor.util.function.Tuple4;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static com.appsmith.external.constants.ce.GitConstantsCE.NAME_SEPARATOR;
+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_PAGES;
+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_PAGES;
+import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES;
+import static com.appsmith.server.constants.ce.FieldNameCE.DEFAULT_PAGE_LAYOUT;
+import static com.appsmith.server.dtos.ce.CustomJSLibContextCE_DTO.getDTOFromCustomJSLib;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@Slf4j
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+@DirtiesContext
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ImportServiceTests {
+
+ private static final String INVALID_JSON_FILE = "invalid json file";
+ private static final Map<String, Datasource> datasourceMap = new HashMap<>();
+ private static Plugin installedPlugin;
+ private static String workspaceId;
+ private static String defaultEnvironmentId;
+ private static String testAppId;
+ private static Datasource jsDatasource;
+ private static Plugin installedJsPlugin;
+ private static Boolean isSetupDone = false;
+ private static String exportWithConfigurationAppId;
+
+ @Autowired
+ ImportService importService;
+
+ @Autowired
+ ExportApplicationService exportApplicationService;
+
+ // @Autowired
+ // ImportApplicationService importApplicationService;
+
+ @Autowired
+ Gson gson;
+
+ @Autowired
+ ApplicationPageService applicationPageService;
+
+ @Autowired
+ PluginRepository pluginRepository;
+
+ @Autowired
+ ApplicationRepository applicationRepository;
+
+ @Autowired
+ DatasourceService datasourceService;
+
+ @Autowired
+ NewPageService newPageService;
+
+ @Autowired
+ NewActionService newActionService;
+
+ @Autowired
+ WorkspaceService workspaceService;
+
+ @Autowired
+ LayoutActionService layoutActionService;
+
+ @Autowired
+ UpdateLayoutService updateLayoutService;
+
+ @Autowired
+ LayoutCollectionService layoutCollectionService;
+
+ @Autowired
+ ActionCollectionService actionCollectionService;
+
+ @MockBean
+ PluginExecutorHelper pluginExecutorHelper;
+
+ @Autowired
+ ThemeRepository themeRepository;
+
+ @Autowired
+ ApplicationService applicationService;
+
+ @Autowired
+ PermissionGroupRepository permissionGroupRepository;
+
+ @Autowired
+ PermissionGroupService permissionGroupService;
+
+ @Autowired
+ CustomJSLibService customJSLibService;
+
+ @Autowired
+ EnvironmentPermission environmentPermission;
+
+ @Autowired
+ PagePermission pagePermission;
+
+ @Autowired
+ ApplicationPermission applicationPermission;
+
+ @SpyBean
+ PluginService pluginService;
+
+ @Autowired
+ CacheableRepositoryHelper cacheableRepositoryHelper;
+
+ @Autowired
+ SessionUserService sessionUserService;
+
+ @BeforeEach
+ public void setup() {
+ Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
+ .thenReturn(Mono.just(new MockPluginExecutor()));
+
+ if (Boolean.TRUE.equals(isSetupDone)) {
+ return;
+ }
+ User currentUser = sessionUserService.getCurrentUser().block();
+ Set<String> beforeCreatingWorkspace =
+ cacheableRepositoryHelper.getPermissionGroupsOfUser(currentUser).block();
+ log.info("Permission Groups for User before creating workspace: {}", beforeCreatingWorkspace);
+ installedPlugin = pluginRepository.findByPackageName("installed-plugin").block();
+ Workspace workspace = new Workspace();
+ workspace.setName("Import-Export-Test-Workspace");
+ Workspace savedWorkspace = workspaceService.create(workspace).block();
+ workspaceId = savedWorkspace.getId();
+ defaultEnvironmentId = workspaceService
+ .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+ .block();
+ Set<String> afterCreatingWorkspace =
+ cacheableRepositoryHelper.getPermissionGroupsOfUser(currentUser).block();
+ log.info("Permission Groups for User after creating workspace: {}", afterCreatingWorkspace);
+
+ log.info("Workspace ID: {}", workspaceId);
+ log.info("Workspace Role Ids: {}", workspace.getDefaultPermissionGroups());
+ log.info("Policy for created Workspace: {}", workspace.getPolicies());
+ log.info("Current User ID: {}", currentUser.getId());
+
+ Application testApplication = new Application();
+ testApplication.setName("Export-Application-Test-Application");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+
+ Application.ThemeSetting themeSettings = getThemeSetting();
+ testApplication.setUnpublishedApplicationDetail(new ApplicationDetail());
+ testApplication.getUnpublishedApplicationDetail().setThemeSetting(themeSettings);
+
+ Application savedApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+ testAppId = savedApplication.getId();
+
+ Datasource ds1 = new Datasource();
+ ds1.setName("DS1");
+ ds1.setWorkspaceId(workspaceId);
+ ds1.setPluginId(installedPlugin.getId());
+ final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+ datasourceConfiguration.setUrl("http://example.org/get");
+ datasourceConfiguration.setHeaders(List.of(new Property("X-Answer", "42")));
+
+ HashMap<String, DatasourceStorageDTO> storages1 = new HashMap<>();
+ storages1.put(
+ defaultEnvironmentId, new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration));
+ ds1.setDatasourceStorages(storages1);
+
+ Datasource ds2 = new Datasource();
+ ds2.setName("DS2");
+ ds2.setPluginId(installedPlugin.getId());
+ ds2.setWorkspaceId(workspaceId);
+ DatasourceConfiguration datasourceConfiguration2 = new DatasourceConfiguration();
+ DBAuth auth = new DBAuth();
+ auth.setPassword("awesome-password");
+ datasourceConfiguration2.setAuthentication(auth);
+ HashMap<String, DatasourceStorageDTO> storages2 = new HashMap<>();
+ storages2.put(
+ defaultEnvironmentId, new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration2));
+ ds2.setDatasourceStorages(storages2);
+
+ jsDatasource = new Datasource();
+ jsDatasource.setName("Default JS datasource");
+ jsDatasource.setWorkspaceId(workspaceId);
+ installedJsPlugin =
+ pluginRepository.findByPackageName("installed-js-plugin").block();
+ assert installedJsPlugin != null;
+ jsDatasource.setPluginId(installedJsPlugin.getId());
+
+ ds1 = datasourceService.create(ds1).block();
+ ds2 = datasourceService.create(ds2).block();
+ datasourceMap.put("DS1", ds1);
+ datasourceMap.put("DS2", ds2);
+ isSetupDone = true;
+ }
+
+ private Flux<ActionDTO> getActionsInApplication(Application application) {
+ return newPageService
+ // fetch the unpublished pages
+ .findByApplicationId(application.getId(), READ_PAGES, false)
+ .flatMap(page -> newActionService.getUnpublishedActions(
+ new LinkedMultiValueMap<>(Map.of(FieldName.PAGE_ID, Collections.singletonList(page.getId()))),
+ ""));
+ }
+
+ private FilePart createFilePart(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);
+
+ return filepart;
+ }
+
+ private Mono<ApplicationJson> createAppJson(String filePath) {
+ FilePart filePart = createFilePart(filePath);
+
+ 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 -> {
+ return gson.fromJson(data, ApplicationJson.class);
+ })
+ .map(JsonSchemaMigration::migrateApplicationToLatestSchema);
+ }
+
+ private Workspace createTemplateWorkspace() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+ return workspaceService.create(newWorkspace).block();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplicationById_WhenContainsInternalFields_InternalFieldsNotExported() {
+ Mono<ApplicationJson> resultMono = exportApplicationService.exportApplicationById(testAppId, "");
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationJson -> {
+ Application exportedApplication = applicationJson.getExportedApplication();
+ assertThat(exportedApplication.getModifiedBy()).isNull();
+ assertThat(exportedApplication.getLastUpdateTime()).isNull();
+ assertThat(exportedApplication.getLastEditedAt()).isNull();
+ assertThat(exportedApplication.getLastDeployedAt()).isNull();
+ assertThat(exportedApplication.getGitApplicationMetadata()).isNull();
+ assertThat(exportedApplication.getEditModeThemeId()).isNull();
+ assertThat(exportedApplication.getPublishedModeThemeId()).isNull();
+ assertThat(exportedApplication.getExportWithConfiguration()).isNull();
+ assertThat(exportedApplication.getForkWithConfiguration()).isNull();
+ assertThat(exportedApplication.getForkingEnabled()).isNull();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void createExportAppJsonWithDatasourceButWithoutActionsTest() {
+
+ Application testApplication = new Application();
+ testApplication.setName("Another Export Application");
+
+ final Mono<ApplicationJson> resultMono = workspaceService
+ .getById(workspaceId)
+ .flatMap(workspace -> {
+ final Datasource ds1 = datasourceMap.get("DS1");
+ ds1.setWorkspaceId(workspace.getId());
+
+ final Datasource ds2 = datasourceMap.get("DS2");
+ ds2.setWorkspaceId(workspace.getId());
+
+ return applicationPageService.createApplication(testApplication, workspaceId);
+ })
+ .flatMap(application -> exportApplicationService.exportApplicationById(application.getId(), ""));
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationJson -> {
+ assertThat(applicationJson.getPageList()).hasSize(1);
+ assertThat(applicationJson.getActionList()).isEmpty();
+ assertThat(applicationJson.getDatasourceList()).isEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void createExportAppJsonWithActionAndActionCollectionTest() {
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("template-org-with-ds");
+
+ Application testApplication = new Application();
+ testApplication.setName("ApplicationWithActionCollectionAndDatasource");
+ testApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+
+ assert testApplication != null;
+ final String appName = testApplication.getName();
+ final Mono<ApplicationJson> resultMono = Mono.zip(
+ Mono.just(testApplication),
+ newPageService.findPageById(
+ testApplication.getPages().get(0).getId(), READ_PAGES, false))
+ .flatMap(tuple -> {
+ Application testApp = tuple.getT1();
+ PageDTO testPage = tuple.getT2();
+
+ Layout layout = testPage.getLayouts().get(0);
+ ObjectMapper objectMapper = new ObjectMapper();
+ JSONObject dsl = new JSONObject();
+ try {
+ dsl = new JSONObject(objectMapper.readValue(
+ DEFAULT_PAGE_LAYOUT, new TypeReference<HashMap<String, Object>>() {}));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+
+ ArrayList children = (ArrayList) dsl.get("children");
+ JSONObject testWidget = new JSONObject();
+ testWidget.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.add(new JSONObject(Map.of("key", "testField")));
+ testWidget.put("dynamicBindingPathList", temp);
+ testWidget.put("testField", "{{ validAction.data }}");
+ children.add(testWidget);
+
+ JSONObject tableWidget = new JSONObject();
+ tableWidget.put("widgetName", "Table1");
+ tableWidget.put("type", "TABLE_WIDGET");
+ Map<String, Object> primaryColumns = new HashMap<>();
+ JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+ primaryColumns.put("_id", "{{ PageAction.data }}");
+ primaryColumns.put("_class", jsonObject);
+ tableWidget.put("primaryColumns", primaryColumns);
+ final ArrayList<Object> objects = new ArrayList<>();
+ JSONArray temp2 = new JSONArray();
+ temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+ tableWidget.put("dynamicBindingPathList", temp2);
+ children.add(tableWidget);
+
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(testPage.getId());
+ action.setExecuteOnLoad(true);
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS2"));
+
+ ActionDTO action2 = new ActionDTO();
+ action2.setName("validAction2");
+ action2.setPageId(testPage.getId());
+ action2.setExecuteOnLoad(true);
+ action2.setUserSetOnLoad(true);
+ ActionConfiguration actionConfiguration2 = new ActionConfiguration();
+ actionConfiguration2.setHttpMethod(HttpMethod.GET);
+ action2.setActionConfiguration(actionConfiguration2);
+ action2.setDatasource(datasourceMap.get("DS2"));
+
+ 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("mockBody");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+
+ return layoutCollectionService
+ .createCollection(actionCollectionDTO1, null)
+ .then(layoutActionService.createSingleAction(action, Boolean.FALSE))
+ .then(layoutActionService.createSingleAction(action2, Boolean.FALSE))
+ .then(updateLayoutService.updateLayout(
+ testPage.getId(), testPage.getApplicationId(), layout.getId(), layout))
+ .then(exportApplicationService.exportApplicationById(testApp.getId(), ""));
+ })
+ .cache();
+
+ Mono<List<NewAction>> actionListMono = resultMono.then(newActionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null)
+ .collectList());
+
+ Mono<List<ActionCollection>> collectionListMono = resultMono.then(actionCollectionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null)
+ .collectList());
+
+ Mono<List<NewPage>> pageListMono = resultMono.then(newPageService
+ .findNewPagesByApplicationId(testApplication.getId(), READ_PAGES)
+ .collectList());
+
+ StepVerifier.create(Mono.zip(resultMono, actionListMono, collectionListMono, pageListMono))
+ .assertNext(tuple -> {
+ ApplicationJson applicationJson = tuple.getT1();
+ List<NewAction> DBActions = tuple.getT2();
+ List<ActionCollection> DBCollections = tuple.getT3();
+ List<NewPage> DBPages = tuple.getT4();
+
+ Application exportedApp = applicationJson.getExportedApplication();
+ List<NewPage> pageList = applicationJson.getPageList();
+ List<NewAction> actionList = applicationJson.getActionList();
+ List<ActionCollection> actionCollectionList = applicationJson.getActionCollectionList();
+ List<DatasourceStorage> datasourceList = applicationJson.getDatasourceList();
+
+ List<String> exportedCollectionIds = actionCollectionList.stream()
+ .map(ActionCollection::getId)
+ .collect(Collectors.toList());
+ List<String> exportedActionIds =
+ actionList.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBCollectionIds =
+ DBCollections.stream().map(ActionCollection::getId).collect(Collectors.toList());
+ List<String> DBActionIds =
+ DBActions.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBOnLayoutLoadActionIds = new ArrayList<>();
+ List<String> exportedOnLayoutLoadActionIds = new ArrayList<>();
+
+ assertThat(DBPages).hasSize(1);
+ DBPages.forEach(
+ newPage -> newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(
+ actionDTO -> DBOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ }));
+ pageList.forEach(
+ newPage -> newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(
+ actionDTO -> exportedOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ }));
+
+ NewPage defaultPage = pageList.get(0);
+
+ // Check if the mongo escaped widget names are carried to exported file from DB
+ Layout pageLayout =
+ DBPages.get(0).getUnpublishedPage().getLayouts().get(0);
+ Set<String> mongoEscapedWidgets = pageLayout.getMongoEscapedWidgetNames();
+ Set<String> expectedMongoEscapedWidgets = Set.of("Table1");
+ assertThat(mongoEscapedWidgets).isEqualTo(expectedMongoEscapedWidgets);
+
+ pageLayout =
+ pageList.get(0).getUnpublishedPage().getLayouts().get(0);
+ Set<String> exportedMongoEscapedWidgets = pageLayout.getMongoEscapedWidgetNames();
+ assertThat(exportedMongoEscapedWidgets).isEqualTo(expectedMongoEscapedWidgets);
+
+ assertThat(exportedApp.getName()).isEqualTo(appName);
+ assertThat(exportedApp.getWorkspaceId()).isNull();
+ assertThat(exportedApp.getPages()).hasSize(1);
+ assertThat(exportedApp.getPages().get(0).getId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+
+ assertThat(exportedApp.getPolicies()).isNull();
+
+ assertThat(pageList).hasSize(1);
+ assertThat(defaultPage.getApplicationId()).isNull();
+ assertThat(defaultPage
+ .getUnpublishedPage()
+ .getLayouts()
+ .get(0)
+ .getDsl())
+ .isNotNull();
+ assertThat(defaultPage.getId()).isNull();
+ assertThat(defaultPage.getPolicies()).isNull();
+
+ assertThat(actionList.isEmpty()).isFalse();
+ assertThat(actionList).hasSize(3);
+ NewAction validAction = actionList.stream()
+ .filter(action -> action.getId().equals("Page1_validAction"))
+ .findFirst()
+ .get();
+ assertThat(validAction.getApplicationId()).isNull();
+ assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
+ assertThat(validAction.getWorkspaceId()).isNull();
+ assertThat(validAction.getPolicies()).isNull();
+ assertThat(validAction.getId()).isNotNull();
+ ActionDTO unpublishedAction = validAction.getUnpublishedAction();
+ assertThat(unpublishedAction.getPageId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(unpublishedAction.getDatasource().getPluginId())
+ .isEqualTo(installedPlugin.getPackageName());
+
+ NewAction testAction1 = actionList.stream()
+ .filter(action ->
+ action.getUnpublishedAction().getName().equals("testAction1"))
+ .findFirst()
+ .get();
+ assertThat(testAction1.getId()).isEqualTo("Page1_testCollection1.testAction1");
+
+ assertThat(actionCollectionList.isEmpty()).isFalse();
+ assertThat(actionCollectionList).hasSize(1);
+ final ActionCollection actionCollection = actionCollectionList.get(0);
+ assertThat(actionCollection.getApplicationId()).isNull();
+ assertThat(actionCollection.getWorkspaceId()).isNull();
+ assertThat(actionCollection.getPolicies()).isNull();
+ assertThat(actionCollection.getId()).isNotNull();
+ assertThat(actionCollection.getUnpublishedCollection().getPluginType())
+ .isEqualTo(PluginType.JS);
+ assertThat(actionCollection.getUnpublishedCollection().getPageId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(actionCollection.getUnpublishedCollection().getPluginId())
+ .isEqualTo(installedJsPlugin.getPackageName());
+
+ assertThat(datasourceList).hasSize(1);
+ DatasourceStorage datasource = datasourceList.get(0);
+ assertThat(datasource.getWorkspaceId()).isNull();
+ assertThat(datasource.getId()).isNull();
+ assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(datasource.getDatasourceConfiguration()).isNotNull();
+ assertThat(datasource.getDatasourceConfiguration().getAuthentication())
+ .isNull();
+ assertThat(datasource.getDatasourceConfiguration().getSshProxy())
+ .isNull();
+ assertThat(datasource.getDatasourceConfiguration().getSshProxyEnabled())
+ .isNull();
+ assertThat(datasource.getDatasourceConfiguration().getProperties())
+ .isNull();
+
+ assertThat(applicationJson.getInvisibleActionFields()).isNull();
+ NewAction validAction2 = actionList.stream()
+ .filter(action -> action.getId().equals("Page1_validAction2"))
+ .findFirst()
+ .get();
+ assertEquals(true, validAction2.getUnpublishedAction().getUserSetOnLoad());
+
+ assertThat(applicationJson.getUnpublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ assertThat(applicationJson.getPublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ assertThat(applicationJson.getEditModeTheme()).isNotNull();
+ assertThat(applicationJson.getEditModeTheme().isSystemTheme())
+ .isTrue();
+ assertThat(applicationJson.getEditModeTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(applicationJson.getPublishedTheme()).isNotNull();
+ assertThat(applicationJson.getPublishedTheme().isSystemTheme())
+ .isTrue();
+ assertThat(applicationJson.getPublishedTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(exportedCollectionIds).isNotEmpty();
+ assertThat(exportedCollectionIds).doesNotContain(String.valueOf(DBCollectionIds));
+
+ assertThat(exportedActionIds).isNotEmpty();
+ assertThat(exportedActionIds).doesNotContain(String.valueOf(DBActionIds));
+
+ assertThat(exportedOnLayoutLoadActionIds).isNotEmpty();
+ assertThat(exportedOnLayoutLoadActionIds).doesNotContain(String.valueOf(DBOnLayoutLoadActionIds));
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void createExportAppJsonForGitTest() {
+
+ StringBuilder pageName = new StringBuilder();
+ final Mono<ApplicationJson> resultMono = applicationRepository
+ .findById(testAppId)
+ .flatMap(testApp -> {
+ final String pageId = testApp.getPages().get(0).getId();
+ return Mono.zip(Mono.just(testApp), newPageService.findPageById(pageId, READ_PAGES, false));
+ })
+ .flatMap(tuple -> {
+ Datasource ds1 = datasourceMap.get("DS1");
+ Application testApp = tuple.getT1();
+ PageDTO testPage = tuple.getT2();
+ pageName.append(testPage.getName());
+
+ Layout layout = testPage.getLayouts().get(0);
+ JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
+
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(testPage.getId());
+ action.setExecuteOnLoad(true);
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(ds1);
+
+ return layoutActionService
+ .createAction(action)
+ .then(exportApplicationService.exportApplicationById(
+ testApp.getId(), SerialiseApplicationObjective.VERSION_CONTROL));
+ });
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationJson -> {
+ Application exportedApp = applicationJson.getExportedApplication();
+ List<NewPage> pageList = applicationJson.getPageList();
+ List<NewAction> actionList = applicationJson.getActionList();
+ List<DatasourceStorage> datasourceList = applicationJson.getDatasourceList();
+
+ NewPage newPage = pageList.get(0);
+
+ assertThat(applicationJson.getServerSchemaVersion()).isEqualTo(JsonSchemaVersions.serverVersion);
+ assertThat(applicationJson.getClientSchemaVersion()).isEqualTo(JsonSchemaVersions.clientVersion);
+
+ assertThat(exportedApp.getName()).isNotNull();
+ assertThat(exportedApp.getWorkspaceId()).isNull();
+ assertThat(exportedApp.getPages()).hasSize(1);
+ assertThat(exportedApp.getPages().get(0).getId()).isEqualTo(pageName.toString());
+ assertThat(exportedApp.getGitApplicationMetadata()).isNull();
+
+ assertThat(exportedApp.getApplicationDetail()).isNotNull();
+ assertThat(exportedApp.getApplicationDetail().getThemeSetting())
+ .isNotNull();
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getSizing())
+ .isNotNull();
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getAccentColor())
+ .isEqualTo("#FFFFFF");
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getColorMode())
+ .isEqualTo(Application.ThemeSetting.Type.LIGHT);
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getDensity())
+ .isEqualTo(1);
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getFontFamily())
+ .isEqualTo("#000000");
+ assertThat(exportedApp
+ .getApplicationDetail()
+ .getThemeSetting()
+ .getSizing())
+ .isEqualTo(1);
+
+ assertThat(exportedApp.getPolicies()).isNull();
+ assertThat(exportedApp.getUserPermissions()).isNull();
+
+ assertThat(pageList).hasSize(1);
+ assertThat(newPage.getApplicationId()).isNull();
+ assertThat(newPage.getUnpublishedPage().getLayouts().get(0).getDsl())
+ .isNotNull();
+ assertThat(newPage.getId()).isNull();
+ assertThat(newPage.getPolicies()).isNull();
+
+ assertThat(actionList.isEmpty()).isFalse();
+ NewAction validAction = actionList.get(0);
+ assertThat(validAction.getApplicationId()).isNull();
+ assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
+ assertThat(validAction.getWorkspaceId()).isNull();
+ assertThat(validAction.getPolicies()).isNull();
+ assertThat(validAction.getId()).isNotNull();
+ assertThat(validAction.getUnpublishedAction().getPageId())
+ .isEqualTo(newPage.getUnpublishedPage().getName());
+
+ assertThat(datasourceList).hasSize(1);
+ DatasourceStorage datasource = datasourceList.get(0);
+ assertThat(datasource.getWorkspaceId()).isNull();
+ assertThat(datasource.getId()).isNull();
+ assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(datasource.getDatasourceConfiguration()).isNull();
+ assertThat(applicationJson.getUnpublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ assertThat(applicationJson.getPublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactFromInvalidFileTest() {
+ FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+ Flux<DataBuffer> dataBufferFlux = DataBufferUtils.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);
+
+ Mono<? extends ImportableArtifactDTO> resultMono = importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filepart, workspaceId, null, ArtifactJsonType.APPLICATION);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(error -> error instanceof AppsmithException)
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactWithNullWorkspaceIdTest() {
+ FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+
+ Mono<? extends ImportableArtifactDTO> resultMono = importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filepart, null, null, ArtifactJsonType.APPLICATION);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .equals(AppsmithError.INVALID_PARAMETER.getMessage(FieldName.WORKSPACE_ID)))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactFromInvalidJsonFileWithoutPagesTest() {
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-json-without-pages.json");
+
+ Mono<? extends ImportableArtifactDTO> resultMono = importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, null, ArtifactJsonType.APPLICATION);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .equals(AppsmithError.VALIDATION_FAILURE.getMessage(
+ "Field '" + FieldName.PAGE_LIST + "' is missing in the JSON.")))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactFromInvalidJsonFileWithoutArtifactTest() {
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-json-without-app.json");
+ Mono<? extends ImportableArtifactDTO> resultMono = importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, null, ArtifactJsonType.APPLICATION);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(
+ throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .equals(
+ AppsmithError.VALIDATION_FAILURE.getMessage(
+ "Field '" + FieldName.APPLICATION
+ + "' Sorry! Seems like you've imported a page-level json instead of an application. Please use the import within the page.")))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactFromValidJsonFileTest() {
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ Mono<Workspace> workspaceMono = workspaceService.create(newWorkspace).cache();
+
+ String environmentId = workspaceMono
+ .flatMap(workspace -> workspaceService.getDefaultEnvironmentId(
+ workspace.getId(), environmentPermission.getExecutePermission()))
+ .block();
+
+ final Mono<? extends ImportableArtifactDTO> resultMono =
+ workspaceMono.flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION));
+
+ List<PermissionGroup> permissionGroups = workspaceMono
+ .flatMapMany(savedWorkspace -> {
+ Set<String> defaultPermissionGroups = savedWorkspace.getDefaultPermissionGroups();
+ return permissionGroupRepository.findAllById(defaultPermissionGroups);
+ })
+ .collectList()
+ .block();
+
+ PermissionGroup adminPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.ADMINISTRATOR))
+ .findFirst()
+ .get();
+
+ PermissionGroup developerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.DEVELOPER))
+ .findFirst()
+ .get();
+
+ PermissionGroup viewerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.VIEWER))
+ .findFirst()
+ .get();
+
+ Policy manageAppPolicy = Policy.builder()
+ .permission(MANAGE_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(adminPermissionGroup.getId(), developerPermissionGroup.getId()))
+ .build();
+ Policy readAppPolicy = Policy.builder()
+ .permission(READ_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(
+ adminPermissionGroup.getId(), developerPermissionGroup.getId(), viewerPermissionGroup.getId()))
+ .build();
+
+ StepVerifier.create(resultMono.flatMap(importArtifactDTO -> {
+ ApplicationImportDTO applicationImportDTO = (ApplicationImportDTO) importArtifactDTO;
+ Application application = applicationImportDTO.getApplication();
+ return Mono.zip(
+ Mono.just(applicationImportDTO),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ application.getWorkspaceId(), Optional.of(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(),
+ customJSLibService.getAllJSLibsInContext(
+ application.getId(), CreatorContextType.APPLICATION, null, false));
+ }))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1().getApplication();
+ final List<Datasource> unConfiguredDatasourceList =
+ tuple.getT1().getUnConfiguredDatasourceList();
+ final boolean isPartialImport = tuple.getT1().getIsPartialImport();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+ final List<PageDTO> pageList = tuple.getT4();
+ final List<ActionCollection> actionCollectionList = tuple.getT5();
+ final List<CustomJSLib> importedJSLibList = tuple.getT6();
+
+ // although the imported list had only one jsLib entry, the other entry comes from ensuring an xml
+ // parser entry
+ // for backward compatibility
+ assertEquals(2, importedJSLibList.size());
+ CustomJSLib importedJSLib = (CustomJSLib) importedJSLibList.toArray()[0];
+ CustomJSLib expectedJSLib = new CustomJSLib(
+ "TestLib", Set.of("accessor1"), "url", "docsUrl", "1" + ".0", "defs_string");
+ assertEquals(expectedJSLib.getName(), importedJSLib.getName());
+ assertEquals(expectedJSLib.getAccessor(), importedJSLib.getAccessor());
+ assertEquals(expectedJSLib.getUrl(), importedJSLib.getUrl());
+ assertEquals(expectedJSLib.getDocsUrl(), importedJSLib.getDocsUrl());
+ assertEquals(expectedJSLib.getVersion(), importedJSLib.getVersion());
+ assertEquals(expectedJSLib.getDefs(), importedJSLib.getDefs());
+ // although the imported list had only one jsLib entry, the other entry comes from ensuring an xml
+ // parser entry
+ // for backward compatibility
+ assertEquals(2, application.getUnpublishedCustomJSLibs().size());
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(2);
+ assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
+ assertThat(application.getPublishedPages()).hasSize(1);
+ assertThat(application.getModifiedBy()).isEqualTo("api_user");
+ assertThat(application.getUpdatedAt()).isNotNull();
+ assertThat(application.getEditModeThemeId()).isNotNull();
+ assertThat(application.getPublishedModeThemeId()).isNotNull();
+ assertThat(isPartialImport).isEqualTo(Boolean.TRUE);
+ assertThat(unConfiguredDatasourceList).isNotNull();
+
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
+ DatasourceStorageDTO storageDTO =
+ datasource.getDatasourceStorages().get(environmentId);
+ assertThat(storageDTO.getDatasourceConfiguration()).isNotNull();
+ });
+
+ List<String> collectionIdInAction = new ArrayList<>();
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getPageId())
+ .isNotEqualTo(pageList.get(0).getName());
+
+ if (StringUtils.equals(actionDTO.getName(), "api_wo_auth")) {
+ ActionDTO publishedAction = newAction.getPublishedAction();
+ assertThat(publishedAction).isNotNull();
+ assertThat(publishedAction.getActionConfiguration()).isNotNull();
+ // Test the fallback page ID from the unpublishedAction is copied to published version when
+ // published version does not have pageId
+ assertThat(actionDTO.getPageId()).isEqualTo(publishedAction.getPageId());
+ // check that createAt field is getting populated from JSON
+ assertThat(actionDTO.getCreatedAt()).isEqualTo("2023-12-13T12:10:02Z");
+ }
+
+ if (!StringUtils.isEmpty(actionDTO.getCollectionId())) {
+ collectionIdInAction.add(actionDTO.getCollectionId());
+ assertThat(actionDTO.getDefaultResources().getCollectionId())
+ .isEqualTo(actionDTO.getCollectionId());
+ }
+ });
+
+ assertThat(actionCollectionList).isNotEmpty();
+ actionCollectionList.forEach(actionCollection -> {
+ assertThat(actionCollection.getUnpublishedCollection().getPageId())
+ .isNotEqualTo(pageList.get(0).getName());
+ if (StringUtils.equals(
+ actionCollection.getUnpublishedCollection().getName(), "JSObject2")) {
+ // Check if this action collection is not attached to any action
+ assertThat(collectionIdInAction).doesNotContain(actionCollection.getId());
+ } else {
+ assertThat(collectionIdInAction).contains(actionCollection.getId());
+ }
+ });
+
+ assertThat(pageList).hasSize(2);
+
+ ApplicationPage defaultAppPage = application.getPages().stream()
+ .filter(ApplicationPage::getIsDefault)
+ .findFirst()
+ .orElse(null);
+ assertThat(defaultAppPage).isNotNull();
+
+ PageDTO defaultPageDTO = pageList.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId()))
+ .findFirst()
+ .orElse(null);
+
+ assertThat(defaultPageDTO).isNotNull();
+ assertThat(defaultPageDTO.getLayouts().get(0).getLayoutOnLoadActions())
+ .isNotEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importFromValidJson_cancelledMidway_importSuccess() {
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Midway cancel import app workspace");
+ newWorkspace = workspaceService.create(newWorkspace).block();
+
+ importService
+ .extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, newWorkspace.getId(), null, ArtifactJsonType.APPLICATION)
+ .timeout(Duration.ofMillis(10))
+ .subscribe();
+
+ // Wait for import to complete
+ Mono<Application> importedAppFromDbMono = Mono.just(newWorkspace).flatMap(workspace -> {
+ try {
+ // Before fetching the imported application, sleep for 5 seconds to ensure that the import completes
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ return applicationRepository
+ .findByWorkspaceId(workspace.getId(), READ_APPLICATIONS)
+ .next();
+ });
+
+ StepVerifier.create(importedAppFromDbMono)
+ .assertNext(application -> {
+ assertThat(application.getId()).isNotEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @Disabled
+ @WithUserDetails(value = "api_user")
+ public void importApplicationInWorkspace_WhenCustomizedThemes_ThemesCreated() {
+ FilePart filePart =
+ createFilePart("test_assets/ImportExportServiceTest/valid-application-with-custom-themes.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Import theme test org");
+
+ final Mono<ApplicationImportDTO> resultMono = workspaceService
+ .create(newWorkspace)
+ .flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION))
+ .map(artifactImportDTO -> (ApplicationImportDTO) artifactImportDTO);
+
+ StepVerifier.create(resultMono.flatMap(applicationImportDTO -> Mono.zip(
+ Mono.just(applicationImportDTO),
+ themeRepository.findById(
+ applicationImportDTO.getApplication().getEditModeThemeId()),
+ themeRepository.findById(
+ applicationImportDTO.getApplication().getPublishedModeThemeId()))))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1().getApplication();
+ Theme editTheme = tuple.getT2();
+ Theme publishedTheme = tuple.getT3();
+
+ assertThat(editTheme.isSystemTheme()).isFalse();
+ assertThat(editTheme.getDisplayName()).isEqualTo("Custom edit theme");
+ assertThat(editTheme.getWorkspaceId()).isNull();
+ assertThat(editTheme.getApplicationId()).isNull();
+
+ assertThat(publishedTheme.isSystemTheme()).isFalse();
+ assertThat(publishedTheme.getDisplayName()).isEqualTo("Custom published theme");
+ assertThat(publishedTheme.getWorkspaceId()).isNullOrEmpty();
+ assertThat(publishedTheme.getApplicationId()).isNullOrEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifact_withoutActionCollection_succeedsWithoutError() {
+
+ FilePart filePart =
+ createFilePart("test_assets/ImportExportServiceTest/valid-application-without-action-collection.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ Mono<Workspace> workspaceMono = workspaceService.create(newWorkspace).cache();
+
+ final Mono<ApplicationImportDTO> resultMono = workspaceMono
+ .flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION))
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ List<PermissionGroup> permissionGroups = workspaceMono
+ .flatMapMany(savedWorkspace -> {
+ Set<String> defaultPermissionGroups = savedWorkspace.getDefaultPermissionGroups();
+ return permissionGroupRepository.findAllById(defaultPermissionGroups);
+ })
+ .collectList()
+ .block();
+
+ PermissionGroup adminPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.ADMINISTRATOR))
+ .findFirst()
+ .get();
+
+ PermissionGroup developerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.DEVELOPER))
+ .findFirst()
+ .get();
+
+ PermissionGroup viewerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.VIEWER))
+ .findFirst()
+ .get();
+
+ Policy manageAppPolicy = Policy.builder()
+ .permission(MANAGE_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(adminPermissionGroup.getId(), developerPermissionGroup.getId()))
+ .build();
+ Policy readAppPolicy = Policy.builder()
+ .permission(READ_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(
+ adminPermissionGroup.getId(), developerPermissionGroup.getId(), viewerPermissionGroup.getId()))
+ .build();
+
+ StepVerifier.create(resultMono.flatMap(applicationImportDTO -> Mono.zip(
+ Mono.just(applicationImportDTO),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ applicationImportDTO.getApplication().getWorkspaceId(),
+ Optional.of(MANAGE_DATASOURCES))
+ .collectList(),
+ getActionsInApplication(applicationImportDTO.getApplication())
+ .collectList(),
+ newPageService
+ .findByApplicationId(
+ applicationImportDTO.getApplication().getId(), MANAGE_PAGES, false)
+ .collectList(),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ applicationImportDTO.getApplication().getId(), false, MANAGE_ACTIONS, null)
+ .collectList(),
+ workspaceMono.flatMap(workspace -> workspaceService.getDefaultEnvironmentId(
+ workspace.getId(), environmentPermission.getExecutePermission())))))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1().getApplication();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<ActionDTO> actionDTOS = tuple.getT3();
+ final List<PageDTO> pageList = tuple.getT4();
+ final List<ActionCollection> actionCollectionList = tuple.getT5();
+ String environmentId = tuple.getT6();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(2);
+ assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
+ assertThat(application.getPublishedPages()).hasSize(1);
+ assertThat(application.getModifiedBy()).isEqualTo("api_user");
+ assertThat(application.getUpdatedAt()).isNotNull();
+
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
+ DatasourceStorageDTO storageDTO =
+ datasource.getDatasourceStorages().get(environmentId);
+ assertThat(storageDTO.getDatasourceConfiguration()).isNotNull();
+ });
+
+ assertThat(actionDTOS).isNotEmpty();
+ actionDTOS.forEach(actionDTO -> {
+ assertThat(actionDTO.getPageId())
+ .isNotEqualTo(pageList.get(0).getName());
+ });
+
+ assertThat(actionCollectionList).isEmpty();
+
+ assertThat(pageList).hasSize(2);
+
+ ApplicationPage defaultAppPage = application.getPages().stream()
+ .filter(ApplicationPage::getIsDefault)
+ .findFirst()
+ .orElse(null);
+ assertThat(defaultAppPage).isNotNull();
+
+ PageDTO defaultPageDTO = pageList.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId()))
+ .findFirst()
+ .orElse(null);
+
+ assertThat(defaultPageDTO).isNotNull();
+ assertThat(defaultPageDTO.getLayouts().get(0).getLayoutOnLoadActions())
+ .isNotEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifact_WithoutThemes_LegacyThemesAssigned() {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application-without-theme.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ final Mono<ApplicationImportDTO> resultMono = workspaceService
+ .create(newWorkspace)
+ .flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION))
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationImportDTO -> {
+ assertThat(applicationImportDTO.getApplication().getEditModeThemeId())
+ .isNotEmpty();
+ assertThat(applicationImportDTO.getApplication().getPublishedModeThemeId())
+ .isNotEmpty();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifact_withoutPageIdInActionCollection_succeeds() {
+
+ FilePart filePart = createFilePart(
+ "test_assets/ImportExportServiceTest/invalid-application-without-pageId-action-collection.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ final Mono<ApplicationImportDTO> resultMono = workspaceService
+ .create(newWorkspace)
+ .flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION))
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ StepVerifier.create(resultMono.flatMap(applicationImportDTO -> Mono.zip(
+ Mono.just(applicationImportDTO),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ applicationImportDTO.getApplication().getWorkspaceId(),
+ Optional.of(MANAGE_DATASOURCES))
+ .collectList(),
+ getActionsInApplication(applicationImportDTO.getApplication())
+ .collectList(),
+ newPageService
+ .findByApplicationId(
+ applicationImportDTO.getApplication().getId(), MANAGE_PAGES, false)
+ .collectList(),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ applicationImportDTO.getApplication().getId(), false, MANAGE_ACTIONS, null)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1().getApplication();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<ActionDTO> actionDTOS = tuple.getT3();
+ final List<PageDTO> pageList = tuple.getT4();
+ final List<ActionCollection> actionCollectionList = tuple.getT5();
+
+ assertThat(datasourceList).isNotEmpty();
+
+ assertThat(actionDTOS).hasSize(1);
+ actionDTOS.forEach(actionDTO -> {
+ assertThat(actionDTO.getPageId())
+ .isNotEqualTo(pageList.get(0).getName());
+ });
+
+ assertThat(actionCollectionList).isEmpty();
+ })
+ .verifyComplete();
+ }
+
+ // this test would be re-written post export flow is completed
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportImportApplication_importWithBranchName_updateApplicationResourcesWithBranch() {
+ Application testApplication = new Application();
+ testApplication.setName("Export-Import-Update-Branch_Test-App");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("testBranch");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application savedApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ Mono<Application> result = newPageService
+ .findNewPagesByApplicationId(savedApplication.getId(), READ_PAGES)
+ .collectList()
+ .flatMap(newPages -> {
+ NewPage newPage = newPages.get(0);
+
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(newPage.getId());
+ action.setExecuteOnLoad(true);
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS1"));
+ return layoutActionService
+ .createAction(action)
+ .flatMap(createdAction -> newActionService.findById(createdAction.getId(), READ_ACTIONS));
+ })
+ .then(exportApplicationService
+ .exportApplicationById(savedApplication.getId(), SerialiseApplicationObjective.VERSION_CONTROL)
+ .flatMap(applicationJson -> importService.importArtifactInWorkspaceFromGit(
+ workspaceId, savedApplication.getId(), applicationJson, gitData.getBranchName())))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .cache();
+
+ Mono<List<NewPage>> updatedPagesMono = result.then(newPageService
+ .findNewPagesByApplicationId(savedApplication.getId(), READ_PAGES)
+ .collectList());
+
+ Mono<List<NewAction>> updatedActionsMono = result.then(newActionService
+ .findAllByApplicationIdAndViewMode(savedApplication.getId(), false, READ_PAGES, null)
+ .collectList());
+
+ StepVerifier.create(Mono.zip(result, updatedPagesMono, updatedActionsMono))
+ .assertNext(tuple -> {
+ Application application = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+
+ final String branchName =
+ application.getGitApplicationMetadata().getBranchName();
+ pageList.forEach(page -> {
+ assertThat(page.getDefaultResources()).isNotNull();
+ assertThat(page.getDefaultResources().getBranchName()).isEqualTo(branchName);
+ });
+
+ actionList.forEach(action -> {
+ assertThat(action.getDefaultResources()).isNotNull();
+ assertThat(action.getDefaultResources().getBranchName()).isEqualTo(branchName);
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_incompatibleJsonFile_throwException() {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/incompatible_version.json");
+ Mono<ApplicationImportDTO> resultMono = importService
+ .extractArtifactExchangeJsonAndSaveArtifact(filePart, workspaceId, null, ArtifactJsonType.APPLICATION)
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable.getMessage().equals(AppsmithError.INCOMPATIBLE_IMPORTED_JSON.getMessage()))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ 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 Workspace");
+
+ Mono<Workspace> workspaceMono = workspaceService.create(newWorkspace).cache();
+
+ final Mono<ApplicationImportDTO> resultMono = workspaceMono
+ .flatMap(workspace -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspace.getId(), null, ArtifactJsonType.APPLICATION))
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ List<PermissionGroup> permissionGroups = workspaceMono
+ .flatMapMany(savedWorkspace -> {
+ Set<String> defaultPermissionGroups = savedWorkspace.getDefaultPermissionGroups();
+ return permissionGroupRepository.findAllById(defaultPermissionGroups);
+ })
+ .collectList()
+ .block();
+
+ PermissionGroup adminPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.ADMINISTRATOR))
+ .findFirst()
+ .get();
+
+ PermissionGroup developerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.DEVELOPER))
+ .findFirst()
+ .get();
+
+ PermissionGroup viewerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.VIEWER))
+ .findFirst()
+ .get();
+
+ Policy manageAppPolicy = Policy.builder()
+ .permission(MANAGE_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(adminPermissionGroup.getId(), developerPermissionGroup.getId()))
+ .build();
+ Policy readAppPolicy = Policy.builder()
+ .permission(READ_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(
+ adminPermissionGroup.getId(), developerPermissionGroup.getId(), viewerPermissionGroup.getId()))
+ .build();
+
+ StepVerifier.create(resultMono.flatMap(applicationImportDTO -> {
+ Application application = applicationImportDTO.getApplication();
+ return Mono.zip(
+ Mono.just(applicationImportDTO),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ application.getWorkspaceId(), Optional.of(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());
+ }))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1().getApplication();
+ final List<Datasource> unConfiguredDatasourceList =
+ tuple.getT1().getUnConfiguredDatasourceList();
+ final boolean isPartialImport = tuple.getT1().getIsPartialImport();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+ final List<PageDTO> pageList = tuple.getT4();
+ final List<ActionCollection> actionCollectionList = tuple.getT5();
+
+ assertThat(application.getName()).isEqualTo("importExportTest");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(1);
+ assertThat(application.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
+ assertThat(application.getPublishedPages()).hasSize(1);
+ assertThat(application.getModifiedBy()).isEqualTo("api_user");
+ assertThat(application.getUpdatedAt()).isNotNull();
+ assertThat(application.getEditModeThemeId()).isNotNull();
+ assertThat(application.getPublishedModeThemeId()).isNotNull();
+ assertThat(isPartialImport).isEqualTo(Boolean.TRUE);
+ assertThat(unConfiguredDatasourceList.size()).isNotEqualTo(0);
+
+ assertThat(datasourceList).isNotEmpty();
+ List<String> datasourceNames = unConfiguredDatasourceList.stream()
+ .map(Datasource::getName)
+ .collect(Collectors.toList());
+ assertThat(datasourceNames).contains("mongoDatasource", "postgresTest");
+
+ List<String> collectionIdInAction = new ArrayList<>();
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getPageId())
+ .isNotEqualTo(pageList.get(0).getName());
+ if (!StringUtils.isEmpty(actionDTO.getCollectionId())) {
+ collectionIdInAction.add(actionDTO.getCollectionId());
+ }
+ });
+
+ assertThat(actionCollectionList).isEmpty();
+
+ assertThat(pageList).hasSize(1);
+
+ ApplicationPage defaultAppPage = application.getPages().stream()
+ .filter(ApplicationPage::getIsDefault)
+ .findFirst()
+ .orElse(null);
+ assertThat(defaultAppPage).isNotNull();
+
+ PageDTO defaultPageDTO = pageList.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId()))
+ .findFirst()
+ .orElse(null);
+
+ assertThat(defaultPageDTO).isNotNull();
+ })
+ .verifyComplete();
+ }
+
+ public void importArtifactIntoWorkspace_pageRemovedAndUpdatedDefaultPageNameInBranchApplication_Success() {
+ Application testApplication = new Application();
+ testApplication.setName("importApplicationIntoWorkspace_pageRemovedInBranchApplication_Success");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+ String gitSyncIdBeforeImport = newPageService
+ .findById(application.getPages().get(0).getId(), MANAGE_PAGES)
+ .block()
+ .getGitSyncId();
+
+ PageDTO page = new PageDTO();
+ page.setName("Page 2");
+ page.setApplicationId(application.getId());
+ PageDTO savedPage = applicationPageService.createPage(page).block();
+
+ assert application.getId() != null;
+ Set<String> applicationPageIdsBeforeImport =
+ Objects.requireNonNull(applicationRepository
+ .findById(application.getId())
+ .block())
+ .getPages()
+ .stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toSet());
+
+ ApplicationJson applicationJson = createAppJson(
+ "test_assets/ImportExportServiceTest/valid-application-with-page-removed.json")
+ .block();
+ applicationJson.getPageList().get(0).setGitSyncId(gitSyncIdBeforeImport);
+
+ Application importedApplication = importService
+ .importArtifactInWorkspaceFromGit(workspaceId, application.getId(), applicationJson, "master")
+ .map(artifact -> (Application) artifact)
+ .block();
+
+ assert importedApplication != null;
+ Mono<List<NewPage>> pageList = Flux.fromIterable(importedApplication.getPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList()))
+ .flatMap(s -> newPageService.findById(s, MANAGE_PAGES))
+ .collectList();
+
+ StepVerifier.create(pageList)
+ .assertNext(newPages -> {
+ // Check before import we had both the pages
+ assertThat(applicationPageIdsBeforeImport).hasSize(2);
+ assertThat(applicationPageIdsBeforeImport).contains(savedPage.getId());
+
+ assertThat(newPages.size()).isEqualTo(1);
+ assertThat(importedApplication.getPages().size()).isEqualTo(1);
+ assertThat(importedApplication.getPages().get(0).getId())
+ .isEqualTo(newPages.get(0).getId());
+ assertThat(newPages.get(0).getPublishedPage().getName()).isEqualTo("importedPage");
+ assertThat(newPages.get(0).getGitSyncId()).isEqualTo(gitSyncIdBeforeImport);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importArtifactIntoWorkspace_pageAddedInBranchApplication_Success() {
+ Application testApplication = new Application();
+ testApplication.setName("importApplicationIntoWorkspace_pageAddedInBranchApplication_Success");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ String gitSyncIdBeforeImport = newPageService
+ .findById(application.getPages().get(0).getId(), MANAGE_PAGES)
+ .block()
+ .getGitSyncId();
+
+ assert application.getId() != null;
+ Set<String> applicationPageIdsBeforeImport =
+ Objects.requireNonNull(applicationRepository
+ .findById(application.getId())
+ .block())
+ .getPages()
+ .stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toSet());
+
+ ApplicationJson applicationJson = createAppJson(
+ "test_assets/ImportExportServiceTest/valid-application-with-page-added.json")
+ .block();
+ applicationJson.getPageList().get(0).setGitSyncId(gitSyncIdBeforeImport);
+
+ Application applicationMono = importService
+ .importArtifactInWorkspaceFromGit(workspaceId, application.getId(), applicationJson, "master")
+ .map(artifact -> (Application) artifact)
+ .block();
+
+ Mono<List<NewPage>> pageList = Flux.fromIterable(applicationMono.getPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList()))
+ .flatMap(s -> newPageService.findById(s, MANAGE_PAGES))
+ .collectList();
+
+ StepVerifier.create(pageList)
+ .assertNext(newPages -> {
+ // Check before import we had both the pages
+ assertThat(applicationPageIdsBeforeImport).hasSize(1);
+ assertThat(newPages.size()).isEqualTo(3);
+ List<String> pageNames = newPages.stream()
+ .map(newPage -> newPage.getUnpublishedPage().getName())
+ .collect(Collectors.toList());
+ assertThat(pageNames).contains("Page1");
+ assertThat(pageNames).contains("Page2");
+ assertThat(pageNames).contains("Page3");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importUpdatedApplicationIntoWorkspaceFromFile_publicApplication_visibilityFlagNotReset() {
+ // Create a application and make it public
+ // Now add a page and export the same import it to the app
+ // Check if the policies and visibility flag are not reset
+
+ Mono<Workspace> workspaceResponse = workspaceService.findById(workspaceId, READ_WORKSPACES);
+
+ List<PermissionGroup> permissionGroups = workspaceResponse
+ .flatMapMany(savedWorkspace -> {
+ Set<String> defaultPermissionGroups = savedWorkspace.getDefaultPermissionGroups();
+ return permissionGroupRepository.findAllById(defaultPermissionGroups);
+ })
+ .collectList()
+ .block();
+
+ PermissionGroup adminPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.ADMINISTRATOR))
+ .findFirst()
+ .get();
+
+ PermissionGroup developerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.DEVELOPER))
+ .findFirst()
+ .get();
+
+ PermissionGroup viewerPermissionGroup = permissionGroups.stream()
+ .filter(permissionGroup -> permissionGroup.getName().startsWith(FieldName.VIEWER))
+ .findFirst()
+ .get();
+
+ Application testApplication = new Application();
+ testApplication.setName(
+ "importUpdatedApplicationIntoWorkspaceFromFile_publicApplication_visibilityFlagNotReset");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+ ApplicationAccessDTO applicationAccessDTO = new ApplicationAccessDTO();
+ applicationAccessDTO.setPublicAccess(true);
+ Application newApplication = applicationService
+ .changeViewAccess(application.getId(), "master", applicationAccessDTO)
+ .block();
+
+ PermissionGroup anonymousPermissionGroup =
+ permissionGroupService.getPublicPermissionGroup().block();
+
+ Policy manageAppPolicy = Policy.builder()
+ .permission(MANAGE_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(adminPermissionGroup.getId(), developerPermissionGroup.getId()))
+ .build();
+ Policy readAppPolicy = Policy.builder()
+ .permission(READ_APPLICATIONS.getValue())
+ .permissionGroups(Set.of(
+ adminPermissionGroup.getId(),
+ developerPermissionGroup.getId(),
+ viewerPermissionGroup.getId(),
+ anonymousPermissionGroup.getId()))
+ .build();
+
+ Mono<Application> applicationMono = exportApplicationService
+ .exportApplicationById(application.getId(), "master")
+ .flatMap(applicationJson -> importService
+ .importArtifactInWorkspaceFromGit(workspaceId, application.getId(), applicationJson, "master")
+ .map(artifact -> (Application) artifact));
+
+ StepVerifier.create(applicationMono)
+ .assertNext(application1 -> {
+ assertThat(application1.getIsPublic()).isEqualTo(Boolean.TRUE);
+ assertThat(application1.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy));
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Add new page to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added page will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_addNewPageAfterImport_addedPageRemoved() {
+
+ /*
+ 1. Import application
+ 2. Add single page to imported app
+ 3. Import the application from same JSON with applicationId
+ 4. Added page should be deleted from DB
+ */
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-page-added");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ PageDTO page = new PageDTO();
+ page.setName("discard-page-test");
+ page.setApplicationId(application.getId());
+ return applicationPageService.createPage(page);
+ })
+ .flatMap(page -> applicationRepository.findById(page.getApplicationId()))
+ .cache();
+ List<PageDTO> pageListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())
+ .block();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("discard-change-page-added");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(3);
+ assertThat(application.getPublishedPages()).hasSize(1);
+ assertThat(application.getModifiedBy()).isEqualTo("api_user");
+ assertThat(application.getUpdatedAt()).isNotNull();
+ assertThat(application.getEditModeThemeId()).isNotNull();
+ assertThat(application.getPublishedModeThemeId()).isNotNull();
+
+ assertThat(pageList).hasSize(3);
+
+ ApplicationPage defaultAppPage = application.getPages().stream()
+ .filter(ApplicationPage::getIsDefault)
+ .findFirst()
+ .orElse(null);
+ assertThat(defaultAppPage).isNotNull();
+
+ PageDTO defaultPageDTO = pageList.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId()))
+ .findFirst()
+ .orElse(null);
+
+ assertThat(defaultPageDTO).isNotNull();
+ assertThat(defaultPageDTO.getLayouts().get(0).getLayoutOnLoadActions())
+ .isNotEmpty();
+
+ List<String> pageNames = new ArrayList<>();
+ pageList.forEach(page -> pageNames.add(page.getName()));
+ assertThat(pageNames).contains("discard-page-test");
+ })
+ .verifyComplete();
+
+ // Import the same application again to find if the added page is deleted
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getPages()).hasSize(2);
+ assertThat(application.getPublishedPages()).hasSize(1);
+
+ assertThat(pageList).hasSize(2);
+ for (PageDTO page : pageList) {
+ PageDTO curentPage = pageListBefore.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(page.getId()))
+ .collect(Collectors.toList())
+ .get(0);
+ assertThat(page.getPolicies()).isEqualTo(curentPage.getPolicies());
+ }
+
+ List<String> pageNames = new ArrayList<>();
+ pageList.forEach(page -> pageNames.add(page.getName()));
+ assertThat(pageNames).doesNotContain("discard-page-test");
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Add new action to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added action will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_addNewActionAfterImport_addedActionRemoved() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+ String workspaceId = createTemplateWorkspace().getId();
+
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-action-added");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS1"));
+ action.setName("discard-action-test");
+ action.setPageId(application.getPages().get(0).getId());
+ return layoutActionService.createAction(action);
+ })
+ .flatMap(actionDTO -> newActionService.getById(actionDTO.getId()))
+ .flatMap(newAction -> applicationRepository.findById(newAction.getApplicationId()))
+ .cache();
+
+ List<ActionDTO> actionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> getActionsInApplication(application).collectList())
+ .block();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionDTO> actionList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("discard-change-action-added");
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).contains("discard-action-test");
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionDTO> actionList = tuple.getT2();
+
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getServerSchemaVersion()).isNotNull();
+ assertThat(application.getClientSchemaVersion()).isNotNull();
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).doesNotContain("discard-action-test");
+ for (ActionDTO action : actionListBefore) {
+ ActionDTO currentAction = actionListBefore.stream()
+ .filter(actionDTO -> actionDTO.getId().equals(action.getId()))
+ .collect(Collectors.toList())
+ .get(0);
+ assertThat(action.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Add actionCollection to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added actionCollection will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_addNewActionCollectionAfterImport_addedActionCollectionRemoved() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application-without-action-collection.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-collection-added");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
+ actionCollectionDTO1.setName("discard-action-collection-test");
+ actionCollectionDTO1.setPageId(application.getPages().get(0).getId());
+ actionCollectionDTO1.setApplicationId(application.getId());
+ actionCollectionDTO1.setWorkspaceId(application.getWorkspaceId());
+ actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
+ ActionDTO action1 = new ActionDTO();
+ action1.setName("discard-action-collection-test-action");
+ action1.setActionConfiguration(new ActionConfiguration());
+ action1.getActionConfiguration().setBody("mockBody");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+
+ return layoutCollectionService.createCollection(actionCollectionDTO1, null);
+ })
+ .flatMap(actionCollectionDTO -> actionCollectionService.getById(actionCollectionDTO.getId()))
+ .flatMap(actionCollection -> applicationRepository.findById(actionCollection.getApplicationId()))
+ .cache();
+
+ List<ActionCollection> actionCollectionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList())
+ .block();
+ List<ActionDTO> actionListBefore = resultMonoWithoutDiscardOperation
+ .flatMap(application -> getActionsInApplication(application).collectList())
+ .block();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList(),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionCollection> actionCollectionList = tuple.getT2();
+ final List<ActionDTO> actionList = tuple.getT3();
+
+ assertThat(application.getName()).isEqualTo("discard-change-collection-added");
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionCollectionNames = new ArrayList<>();
+ actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(
+ actionCollection.getUnpublishedCollection().getName()));
+ assertThat(actionCollectionNames).contains("discard-action-collection-test");
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).contains("discard-action-collection-test-action");
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList(),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionCollection> actionCollectionList = tuple.getT2();
+ final List<ActionDTO> actionList = tuple.getT3();
+
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionCollectionNames = new ArrayList<>();
+ actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(
+ actionCollection.getUnpublishedCollection().getName()));
+ assertThat(actionCollectionNames).doesNotContain("discard-action-collection-test");
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).doesNotContain("discard-action-collection-test-action");
+ for (ActionDTO action : actionListBefore) {
+ ActionDTO currentAction = actionListBefore.stream()
+ .filter(actionDTO -> actionDTO.getId().equals(action.getId()))
+ .collect(Collectors.toList())
+ .get(0);
+ assertThat(action.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
+
+ for (ActionCollection actionCollection : actionCollectionListBefore) {
+ ActionCollection currentAction = actionCollectionListBefore.stream()
+ .filter(actionDTO -> actionDTO.getId().equals(actionCollection.getId()))
+ .collect(Collectors.toList())
+ .get(0);
+ assertThat(actionCollection.getPolicies()).isEqualTo(currentAction.getPolicies());
+ }
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Remove existing page from imported application
+ * 3. Import application from same application json file
+ * 4. Removed page will be restored
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_removeNewPageAfterImport_removedPageRestored() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-page-removed");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ Optional<ApplicationPage> applicationPage = application.getPages().stream()
+ .filter(page -> !page.isDefault())
+ .findFirst();
+ return applicationPageService.deleteUnpublishedPage(
+ applicationPage.get().getId());
+ })
+ .flatMap(page -> applicationRepository.findById(page.getApplicationId()))
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("discard-change-page-removed");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(1);
+
+ assertThat(pageList).hasSize(1);
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getPages()).hasSize(2);
+ assertThat(application.getPublishedPages()).hasSize(1);
+
+ assertThat(pageList).hasSize(2);
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Remove existing action from imported application
+ * 3. Import application from same application json file
+ * 4. Removed action will be restored
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_removeNewActionAfterImport_removedActionRestored() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+ 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 importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ return getActionsInApplication(application)
+ .next()
+ .flatMap(actionDTO -> {
+ deletedActionName[0] = actionDTO.getName();
+ return newActionService.deleteUnpublishedAction(actionDTO.getId());
+ })
+ .then(applicationPageService.publish(application.getId(), true));
+ })
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionDTO> actionList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("discard-change-action-removed");
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).doesNotContain(deletedActionName[0]);
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ getActionsInApplication(application).collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionDTO> actionList = tuple.getT2();
+
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionNames = new ArrayList<>();
+ actionList.forEach(actionDTO -> actionNames.add(actionDTO.getName()));
+ assertThat(actionNames).contains(deletedActionName[0]);
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Remove existing actionCollection from imported application
+ * 3. Import application from same application json file
+ * 4. Removed actionCollection along-with actions will be restored
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_removeNewActionCollection_removedActionCollectionRestored() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+ 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 importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ return actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .next()
+ .flatMap(actionCollection -> {
+ deletedActionCollectionNames[0] = actionCollection
+ .getUnpublishedCollection()
+ .getName();
+ return actionCollectionService.deleteUnpublishedActionCollection(
+ actionCollection.getId());
+ })
+ .then(applicationPageService.publish(application.getId(), true));
+ })
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionCollection> actionCollectionList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("discard-change-collection-removed");
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionCollectionNames = new ArrayList<>();
+ actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(
+ actionCollection.getUnpublishedCollection().getName()));
+ assertThat(actionCollectionNames).doesNotContain(deletedActionCollectionNames);
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<ActionCollection> actionCollectionList = tuple.getT2();
+
+ assertThat(application.getWorkspaceId()).isNotNull();
+
+ List<String> actionCollectionNames = new ArrayList<>();
+ actionCollectionList.forEach(actionCollection -> actionCollectionNames.add(
+ actionCollection.getUnpublishedCollection().getName()));
+ assertThat(actionCollectionNames).contains(deletedActionCollectionNames);
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Add Navigation Settings to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added NavigationSetting will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_addNavigationAndThemeSettingAfterImport_addedNavigationAndThemeSettingRemoved() {
+ Mono<ApplicationJson> applicationJsonMono = createAppJson(
+ "test_assets/ImportExportServiceTest/valid-application-without-navigation-theme-setting.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-navsettings-added");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ ApplicationDetail applicationDetail = new ApplicationDetail();
+ Application.NavigationSetting navigationSetting = new Application.NavigationSetting();
+ navigationSetting.setOrientation("top");
+ applicationDetail.setNavigationSetting(navigationSetting);
+
+ Application.ThemeSetting themeSettings = getThemeSetting();
+ applicationDetail.setThemeSetting(themeSettings);
+
+ application.setUnpublishedApplicationDetail(applicationDetail);
+ application.setPublishedApplicationDetail(applicationDetail);
+ return applicationService.save(application);
+ })
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation)
+ .assertNext(initialApplication -> {
+ assertThat(initialApplication.getUnpublishedApplicationDetail())
+ .isNotNull();
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting())
+ .isNotNull();
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation())
+ .isEqualTo("top");
+ assertThat(initialApplication.getPublishedApplicationDetail())
+ .isNotNull();
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getNavigationSetting())
+ .isNotNull();
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation())
+ .isEqualTo("top");
+
+ Application.ThemeSetting themes =
+ initialApplication.getApplicationDetail().getThemeSetting();
+ assertThat(themes.getAccentColor()).isEqualTo("#FFFFFF");
+ assertThat(themes.getBorderRadius()).isEqualTo("#000000");
+ assertThat(themes.getColorMode()).isEqualTo(Application.ThemeSetting.Type.LIGHT);
+ assertThat(themes.getDensity()).isEqualTo(1);
+ assertThat(themes.getFontFamily()).isEqualTo("#000000");
+ assertThat(themes.getSizing()).isEqualTo(1);
+ })
+ .verifyComplete();
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation)
+ .assertNext(application -> {
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getUnpublishedApplicationDetail()).isNull();
+ assertThat(application.getPublishedApplicationDetail()).isNull();
+ })
+ .verifyComplete();
+ }
+
+ @NotNull private static Application.ThemeSetting getThemeSetting() {
+ Application.ThemeSetting themeSettings = new Application.ThemeSetting();
+ themeSettings.setSizing(1);
+ themeSettings.setDensity(1);
+ themeSettings.setBorderRadius("#000000");
+ themeSettings.setAccentColor("#FFFFFF");
+ themeSettings.setFontFamily("#000000");
+ themeSettings.setColorMode(Application.ThemeSetting.Type.LIGHT);
+ return themeSettings;
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org
+ * 2. Updated App Layout Settings to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added App Layout will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void discardChange_addAppLayoutAfterImport_addedAppLayoutRemoved() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application-without-app-layout.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson.getExportedApplication().setName("discard-change-applayout-added");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ application.setUnpublishedAppLayout(new Application.AppLayout(Application.AppLayout.Type.DESKTOP));
+ application.setPublishedAppLayout(new Application.AppLayout(Application.AppLayout.Type.DESKTOP));
+ return applicationService.save(application);
+ })
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation)
+ .assertNext(initialApplication -> {
+ assertThat(initialApplication.getUnpublishedAppLayout()).isNotNull();
+ assertThat(initialApplication.getUnpublishedAppLayout().getType())
+ .isEqualTo(Application.AppLayout.Type.DESKTOP);
+ assertThat(initialApplication.getPublishedAppLayout()).isNotNull();
+ assertThat(initialApplication.getPublishedAppLayout().getType())
+ .isEqualTo(Application.AppLayout.Type.DESKTOP);
+ })
+ .verifyComplete();
+
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation)
+ .assertNext(application -> {
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getUnpublishedAppLayout()).isNull();
+ assertThat(application.getPublishedAppLayout()).isNull();
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for checking the discard changes flow for following events:
+ * 1. Import application in org which has app positioning in applicationDetail already added
+ * 2. Add Navigation Settings to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added NavigationSetting will be removed
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void
+ discardChange_addNavigationSettingAfterAppPositioningAlreadyPresentInImport_addedNavigationSettingRemoved() {
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application-with-app-positioning.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = applicationJsonMono
+ .flatMap(applicationJson -> {
+ applicationJson
+ .getExportedApplication()
+ .setName("discard-change-navsettings-added-appPositioning-present");
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ })
+ .flatMap(application -> {
+ ApplicationDetail applicationDetail = application.getUnpublishedApplicationDetail();
+ Application.NavigationSetting navigationSetting = new Application.NavigationSetting();
+ navigationSetting.setOrientation("top");
+ applicationDetail.setNavigationSetting(navigationSetting);
+ application.setUnpublishedApplicationDetail(applicationDetail);
+ application.setPublishedApplicationDetail(applicationDetail);
+ return applicationService.save(application);
+ })
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation)
+ .assertNext(initialApplication -> {
+ assertThat(initialApplication.getUnpublishedApplicationDetail())
+ .isNotNull();
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting())
+ .isNotNull();
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation())
+ .isEqualTo("top");
+ assertThat(initialApplication.getPublishedApplicationDetail())
+ .isNotNull();
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getNavigationSetting())
+ .isNotNull();
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation())
+ .isEqualTo("top");
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getAppPositioning())
+ .isNotNull();
+ assertThat(initialApplication
+ .getUnpublishedApplicationDetail()
+ .getAppPositioning()
+ .getType())
+ .isEqualTo(Application.AppPositioning.Type.AUTO);
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getAppPositioning())
+ .isNotNull();
+ assertThat(initialApplication
+ .getPublishedApplicationDetail()
+ .getAppPositioning()
+ .getType())
+ .isEqualTo(Application.AppPositioning.Type.AUTO);
+ })
+ .verifyComplete();
+ // Import the same application again
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation.flatMap(
+ importedApplication -> applicationJsonMono.flatMap(applicationJson -> {
+ importedApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ importedApplication
+ .getGitApplicationMetadata()
+ .setDefaultApplicationId(importedApplication.getId());
+ return applicationService
+ .save(importedApplication)
+ .then(importService.importArtifactInWorkspaceFromGit(
+ importedApplication.getWorkspaceId(),
+ importedApplication.getId(),
+ applicationJson,
+ "main"))
+ .map(importableArtifact -> (Application) importableArtifact);
+ }));
+
+ StepVerifier.create(resultMonoWithDiscardOperation)
+ .assertNext(application -> {
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getUnpublishedApplicationDetail()).isNotNull();
+ assertThat(application.getPublishedApplicationDetail()).isNotNull();
+ assertThat(application.getUnpublishedApplicationDetail().getAppPositioning())
+ .isNotNull();
+ assertThat(application
+ .getUnpublishedApplicationDetail()
+ .getAppPositioning()
+ .getType())
+ .isEqualTo(Application.AppPositioning.Type.AUTO);
+ assertThat(application.getUnpublishedApplicationDetail().getNavigationSetting())
+ .isNull();
+ assertThat(application.getPublishedApplicationDetail().getNavigationSetting())
+ .isNull();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void applySchemaMigration_jsonFileWithFirstVersion_migratedToLatestVersionSuccess() {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/file-with-v1.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);
+ });
+ Mono<ApplicationJson> v1ApplicationMono = stringifiedFile
+ .map(data -> {
+ return gson.fromJson(data, ApplicationJson.class);
+ })
+ .cache();
+
+ Mono<ApplicationJson> migratedApplicationMono = v1ApplicationMono.map(applicationJson -> {
+ ApplicationJson applicationJson1 = new ApplicationJson();
+ AppsmithBeanUtils.copyNestedNonNullProperties(applicationJson, applicationJson1);
+ return JsonSchemaMigration.migrateApplicationToLatestSchema(applicationJson1);
+ });
+
+ StepVerifier.create(Mono.zip(v1ApplicationMono, migratedApplicationMono))
+ .assertNext(tuple -> {
+ ApplicationJson v1ApplicationJson = tuple.getT1();
+ ApplicationJson latestApplicationJson = tuple.getT2();
+
+ assertThat(v1ApplicationJson.getServerSchemaVersion()).isEqualTo(1);
+ assertThat(v1ApplicationJson.getClientSchemaVersion()).isEqualTo(1);
+
+ assertThat(latestApplicationJson.getServerSchemaVersion())
+ .isEqualTo(JsonSchemaVersions.serverVersion);
+ assertThat(latestApplicationJson.getClientSchemaVersion())
+ .isEqualTo(JsonSchemaVersions.clientVersion);
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase to check if the application is exported with the datasource configuration object if this setting is
+ * enabled from application object
+ * This can be enabled with exportWithConfiguration: true
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplication_withDatasourceConfig_exportedWithDecryptedFields() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("template-org-with-ds");
+
+ Application testApplication = new Application();
+ testApplication.setName("exportApplication_withCredentialsForSampleApps_SuccessWithDecryptFields");
+ testApplication.setExportWithConfiguration(true);
+ testApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+ assert testApplication != null;
+ exportWithConfigurationAppId = testApplication.getId();
+ ApplicationAccessDTO accessDTO = new ApplicationAccessDTO();
+ accessDTO.setPublicAccess(true);
+ applicationService
+ .changeViewAccess(exportWithConfigurationAppId, accessDTO)
+ .block();
+ final String appName = testApplication.getName();
+ final Mono<ApplicationJson> resultMono = Mono.zip(
+ Mono.just(testApplication),
+ newPageService.findPageById(
+ testApplication.getPages().get(0).getId(), READ_PAGES, false))
+ .flatMap(tuple -> {
+ Application testApp = tuple.getT1();
+ PageDTO testPage = tuple.getT2();
+
+ Layout layout = testPage.getLayouts().get(0);
+ ObjectMapper objectMapper = new ObjectMapper();
+ JSONObject dsl = new JSONObject();
+ try {
+ dsl = new JSONObject(objectMapper.readValue(
+ DEFAULT_PAGE_LAYOUT, new TypeReference<HashMap<String, Object>>() {}));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ ArrayList children = (ArrayList) dsl.get("children");
+ JSONObject testWidget = new JSONObject();
+ testWidget.put("widgetName", "firstWidget");
+ JSONArray temp = new JSONArray();
+ temp.add(new JSONObject(Map.of("key", "testField")));
+ testWidget.put("dynamicBindingPathList", temp);
+ testWidget.put("testField", "{{ validAction.data }}");
+ children.add(testWidget);
+
+ layout.setDsl(dsl);
+ layout.setPublishedDsl(dsl);
+
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(testPage.getId());
+ action.setExecuteOnLoad(true);
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS2"));
+
+ ActionDTO action2 = new ActionDTO();
+ action2.setName("validAction2");
+ action2.setPageId(testPage.getId());
+ action2.setExecuteOnLoad(true);
+ action2.setUserSetOnLoad(true);
+ ActionConfiguration actionConfiguration2 = new ActionConfiguration();
+ actionConfiguration2.setHttpMethod(HttpMethod.GET);
+ action2.setActionConfiguration(actionConfiguration2);
+ action2.setDatasource(datasourceMap.get("DS2"));
+
+ 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("mockBody");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+
+ return layoutCollectionService
+ .createCollection(actionCollectionDTO1, null)
+ .then(layoutActionService.createSingleAction(action, Boolean.FALSE))
+ .then(layoutActionService.createSingleAction(action2, Boolean.FALSE))
+ .then(updateLayoutService.updateLayout(
+ testPage.getId(), testPage.getApplicationId(), layout.getId(), layout))
+ .then(exportApplicationService.exportApplicationById(testApp.getId(), ""));
+ })
+ .cache();
+
+ Mono<List<NewAction>> actionListMono = resultMono.then(newActionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null)
+ .collectList());
+
+ Mono<List<ActionCollection>> collectionListMono = resultMono.then(actionCollectionService
+ .findAllByApplicationIdAndViewMode(testApplication.getId(), false, READ_ACTIONS, null)
+ .collectList());
+
+ Mono<List<NewPage>> pageListMono = resultMono.then(newPageService
+ .findNewPagesByApplicationId(testApplication.getId(), READ_PAGES)
+ .collectList());
+
+ StepVerifier.create(Mono.zip(resultMono, actionListMono, collectionListMono, pageListMono))
+ .assertNext(tuple -> {
+ ApplicationJson applicationJson = tuple.getT1();
+ List<NewAction> DBActions = tuple.getT2();
+ List<ActionCollection> DBCollections = tuple.getT3();
+ List<NewPage> DBPages = tuple.getT4();
+
+ Application exportedApp = applicationJson.getExportedApplication();
+ List<NewPage> pageList = applicationJson.getPageList();
+ List<NewAction> actionList = applicationJson.getActionList();
+ List<ActionCollection> actionCollectionList = applicationJson.getActionCollectionList();
+ List<DatasourceStorage> datasourceList = applicationJson.getDatasourceList();
+
+ List<String> exportedCollectionIds = actionCollectionList.stream()
+ .map(ActionCollection::getId)
+ .collect(Collectors.toList());
+ List<String> exportedActionIds =
+ actionList.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBCollectionIds =
+ DBCollections.stream().map(ActionCollection::getId).collect(Collectors.toList());
+ List<String> DBActionIds =
+ DBActions.stream().map(NewAction::getId).collect(Collectors.toList());
+ List<String> DBOnLayoutLoadActionIds = new ArrayList<>();
+ List<String> exportedOnLayoutLoadActionIds = new ArrayList<>();
+
+ DBPages.forEach(
+ newPage -> newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(
+ actionDTO -> DBOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ }));
+
+ pageList.forEach(
+ newPage -> newPage.getUnpublishedPage().getLayouts().forEach(layout -> {
+ if (layout.getLayoutOnLoadActions() != null) {
+ layout.getLayoutOnLoadActions().forEach(dslActionDTOSet -> {
+ dslActionDTOSet.forEach(
+ actionDTO -> exportedOnLayoutLoadActionIds.add(actionDTO.getId()));
+ });
+ }
+ }));
+
+ NewPage defaultPage = pageList.get(0);
+
+ assertThat(exportedApp.getName()).isEqualTo(appName);
+ assertThat(exportedApp.getWorkspaceId()).isNull();
+ assertThat(exportedApp.getPages()).hasSize(1);
+ ApplicationPage page = exportedApp.getPages().get(0);
+
+ assertThat(page.getId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(page.getIsDefault()).isTrue();
+ assertThat(page.getDefaultPageId()).isNull();
+
+ assertThat(exportedApp.getPolicies()).isNull();
+
+ assertThat(pageList).hasSize(1);
+ assertThat(defaultPage.getApplicationId()).isNull();
+ assertThat(defaultPage
+ .getUnpublishedPage()
+ .getLayouts()
+ .get(0)
+ .getDsl())
+ .isNotNull();
+ assertThat(defaultPage.getId()).isNull();
+ assertThat(defaultPage.getPolicies()).isNull();
+
+ assertThat(actionList.isEmpty()).isFalse();
+ assertThat(actionList).hasSize(3);
+ NewAction validAction = actionList.stream()
+ .filter(action -> action.getId().equals("Page1_validAction"))
+ .findFirst()
+ .get();
+ assertThat(validAction.getApplicationId()).isNull();
+ assertThat(validAction.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(validAction.getPluginType()).isEqualTo(PluginType.API);
+ assertThat(validAction.getWorkspaceId()).isNull();
+ assertThat(validAction.getPolicies()).isNull();
+ assertThat(validAction.getId()).isNotNull();
+ ActionDTO unpublishedAction = validAction.getUnpublishedAction();
+ assertThat(unpublishedAction.getPageId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(unpublishedAction.getDatasource().getPluginId())
+ .isEqualTo(installedPlugin.getPackageName());
+
+ NewAction testAction1 = actionList.stream()
+ .filter(action ->
+ action.getUnpublishedAction().getName().equals("testAction1"))
+ .findFirst()
+ .get();
+ assertThat(testAction1.getId()).isEqualTo("Page1_testCollection1.testAction1");
+
+ assertThat(actionCollectionList.isEmpty()).isFalse();
+ assertThat(actionCollectionList).hasSize(1);
+ final ActionCollection actionCollection = actionCollectionList.get(0);
+ assertThat(actionCollection.getApplicationId()).isNull();
+ assertThat(actionCollection.getWorkspaceId()).isNull();
+ assertThat(actionCollection.getPolicies()).isNull();
+ assertThat(actionCollection.getId()).isNotNull();
+ assertThat(actionCollection.getUnpublishedCollection().getPluginType())
+ .isEqualTo(PluginType.JS);
+ assertThat(actionCollection.getUnpublishedCollection().getPageId())
+ .isEqualTo(defaultPage.getUnpublishedPage().getName());
+ assertThat(actionCollection.getUnpublishedCollection().getPluginId())
+ .isEqualTo(installedJsPlugin.getPackageName());
+
+ assertThat(datasourceList).hasSize(1);
+ DatasourceStorage datasource = datasourceList.get(0);
+ assertThat(datasource.getWorkspaceId()).isNull();
+ assertThat(datasource.getId()).isNull();
+ assertThat(datasource.getPluginId()).isEqualTo(installedPlugin.getPackageName());
+ assertThat(datasource.getDatasourceConfiguration()).isNotNull();
+
+ final Map<String, InvisibleActionFields> invisibleActionFields =
+ applicationJson.getInvisibleActionFields();
+
+ assertThat(invisibleActionFields).isNull();
+ for (NewAction newAction : actionList) {
+ if (newAction.getId().equals("Page1_validAction2")) {
+ assertEquals(true, newAction.getUnpublishedAction().getUserSetOnLoad());
+ } else {
+ assertEquals(false, newAction.getUnpublishedAction().getUserSetOnLoad());
+ }
+ }
+
+ assertThat(applicationJson.getUnpublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ assertThat(applicationJson.getPublishedLayoutmongoEscapedWidgets())
+ .isNull();
+ assertThat(applicationJson.getEditModeTheme()).isNotNull();
+ assertThat(applicationJson.getEditModeTheme().isSystemTheme())
+ .isTrue();
+ assertThat(applicationJson.getEditModeTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(applicationJson.getPublishedTheme()).isNotNull();
+ assertThat(applicationJson.getPublishedTheme().isSystemTheme())
+ .isTrue();
+ assertThat(applicationJson.getPublishedTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+
+ assertThat(exportedCollectionIds).isNotEmpty();
+ assertThat(exportedCollectionIds).doesNotContain(String.valueOf(DBCollectionIds));
+
+ assertThat(exportedActionIds).isNotEmpty();
+ assertThat(exportedActionIds).doesNotContain(String.valueOf(DBActionIds));
+
+ assertThat(exportedOnLayoutLoadActionIds).isNotEmpty();
+ assertThat(exportedOnLayoutLoadActionIds).doesNotContain(String.valueOf(DBOnLayoutLoadActionIds));
+
+ assertThat(applicationJson.getDecryptedFields()).isNotNull();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void
+ importApplication_datasourceWithSameNameAndDifferentPlugin_importedWithValidActionsAndSuffixedDatasource() {
+
+ ApplicationJson applicationJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json")
+ .block();
+
+ Workspace testWorkspace = new Workspace();
+ testWorkspace.setName("Duplicate datasource with different plugin org");
+ testWorkspace = workspaceService.create(testWorkspace).block();
+ String defaultEnvironmentId = workspaceService
+ .getDefaultEnvironmentId(testWorkspace.getId(), environmentPermission.getExecutePermission())
+ .block();
+
+ Datasource testDatasource = new Datasource();
+ // 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.setWorkspaceId(testWorkspace.getId());
+ final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
+ testDatasource.setName(datasourceName);
+
+ HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
+ storages.put(defaultEnvironmentId, new DatasourceStorageDTO(null, defaultEnvironmentId, null));
+ testDatasource.setDatasourceStorages(storages);
+
+ datasourceService.create(testDatasource).block();
+
+ final Mono<Application> resultMono = importService
+ .importNewArtifactInWorkspaceFromJson(testWorkspace.getId(), applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+
+ StepVerifier.create(resultMono.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ application.getWorkspaceId(), Optional.of(MANAGE_DATASOURCES))
+ .collectList(),
+ newActionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+
+ List<String> datasourceNameList = new ArrayList<>();
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ assertThat(datasource.getWorkspaceId()).isEqualTo(application.getWorkspaceId());
+ datasourceNameList.add(datasource.getName());
+ });
+ // Check if both suffixed and newly imported datasource are present
+ assertThat(datasourceNameList).contains(datasourceName, datasourceName + " #1");
+
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getDatasource()).isNotNull();
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_datasourceWithSameNameAndPlugin_importedWithValidActionsWithoutSuffixedDatasource() {
+
+ ApplicationJson applicationJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json")
+ .block();
+
+ Workspace testWorkspace = new Workspace();
+ testWorkspace.setName("Duplicate datasource with same plugin org");
+ testWorkspace = workspaceService.create(testWorkspace).block();
+ String defaultEnvironmentId = workspaceService
+ .getDefaultEnvironmentId(testWorkspace.getId(), environmentPermission.getExecutePermission())
+ .block();
+ Datasource testDatasource = new Datasource();
+ // 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.setWorkspaceId(testWorkspace.getId());
+ final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
+ testDatasource.setName(datasourceName);
+
+ HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
+ storages.put(defaultEnvironmentId, new DatasourceStorageDTO(null, defaultEnvironmentId, null));
+ testDatasource.setDatasourceStorages(storages);
+ datasourceService.create(testDatasource).block();
+
+ final Mono<Application> resultMono = importService
+ .importNewArtifactInWorkspaceFromJson(testWorkspace.getId(), applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+
+ StepVerifier.create(resultMono.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ datasourceService
+ .getAllByWorkspaceIdWithStorages(
+ application.getWorkspaceId(), Optional.of(MANAGE_DATASOURCES))
+ .collectList(),
+ newActionService
+ .findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+
+ List<String> datasourceNameList = new ArrayList<>();
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ 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
+ assertThat(datasourceNameList).contains(datasourceName);
+
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getDatasource()).isNotNull();
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void
+ exportAndImportApplication_withMultiplePagesOrderSameInDeployAndEditMode_PagesOrderIsMaintainedInEditAndViewMode() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("template-org-with-ds");
+
+ Application testApplication = new Application();
+ testApplication.setName(
+ "exportAndImportApplication_withMultiplePagesOrderSameInDeployAndEditMode_PagesOrderIsMaintainedInEditAndViewMode");
+ testApplication.setExportWithConfiguration(true);
+ testApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+ assert testApplication != null;
+
+ PageDTO testPage1 = new PageDTO();
+ testPage1.setName("testPage1");
+ testPage1.setApplicationId(testApplication.getId());
+ testPage1 = applicationPageService.createPage(testPage1).block();
+
+ PageDTO testPage2 = new PageDTO();
+ testPage2.setName("testPage2");
+ testPage2.setApplicationId(testApplication.getId());
+ testPage2 = applicationPageService.createPage(testPage2).block();
+
+ // Set order for the newly created pages
+ applicationPageService
+ .reorderPage(testApplication.getId(), testPage1.getId(), 0, null)
+ .block();
+ applicationPageService
+ .reorderPage(testApplication.getId(), testPage2.getId(), 1, null)
+ .block();
+ // Deploy the current application
+ applicationPageService.publish(testApplication.getId(), true).block();
+
+ Mono<ApplicationJson> applicationJsonMono = exportApplicationService
+ .exportApplicationById(testApplication.getId(), "")
+ .cache();
+
+ StepVerifier.create(applicationJsonMono)
+ .assertNext(applicationJson -> {
+ assertThat(applicationJson.getPageOrder()).isNull();
+ assertThat(applicationJson.getPublishedPageOrder()).isNull();
+ List<String> pageList = applicationJson.getExportedApplication().getPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList());
+
+ assertThat(pageList.get(0)).isEqualTo("testPage1");
+ assertThat(pageList.get(1)).isEqualTo("testPage2");
+ assertThat(pageList.get(2)).isEqualTo("Page1");
+
+ List<String> publishedPageList =
+ applicationJson.getExportedApplication().getPublishedPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList());
+
+ assertThat(publishedPageList.get(0)).isEqualTo("testPage1");
+ assertThat(publishedPageList.get(1)).isEqualTo("testPage2");
+ assertThat(publishedPageList.get(2)).isEqualTo("Page1");
+ })
+ .verifyComplete();
+
+ ApplicationJson applicationJson = applicationJsonMono.block();
+ Application application = importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact)
+ .block();
+
+ // Get the unpublished pages and verify the order
+ List<ApplicationPage> pageDTOS = application.getPages();
+ Mono<NewPage> newPageMono1 = newPageService.findById(pageDTOS.get(0).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPageMono2 = newPageService.findById(pageDTOS.get(1).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPageMono3 = newPageService.findById(pageDTOS.get(2).getId(), MANAGE_PAGES);
+
+ StepVerifier.create(Mono.zip(newPageMono1, newPageMono2, newPageMono3))
+ .assertNext(objects -> {
+ NewPage newPage1 = objects.getT1();
+ NewPage newPage2 = objects.getT2();
+ NewPage newPage3 = objects.getT3();
+ assertThat(newPage1.getUnpublishedPage().getName()).isEqualTo("testPage1");
+ assertThat(newPage2.getUnpublishedPage().getName()).isEqualTo("testPage2");
+ assertThat(newPage3.getUnpublishedPage().getName()).isEqualTo("Page1");
+
+ assertThat(newPage1.getId()).isEqualTo(pageDTOS.get(0).getId());
+ assertThat(newPage2.getId()).isEqualTo(pageDTOS.get(1).getId());
+ assertThat(newPage3.getId()).isEqualTo(pageDTOS.get(2).getId());
+ })
+ .verifyComplete();
+
+ // Get the published pages
+ List<ApplicationPage> publishedPageDTOs = application.getPublishedPages();
+ Mono<NewPage> newPublishedPageMono1 =
+ newPageService.findById(publishedPageDTOs.get(0).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPublishedPageMono2 =
+ newPageService.findById(publishedPageDTOs.get(1).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPublishedPageMono3 =
+ newPageService.findById(publishedPageDTOs.get(2).getId(), MANAGE_PAGES);
+
+ StepVerifier.create(Mono.zip(newPublishedPageMono1, newPublishedPageMono2, newPublishedPageMono3))
+ .assertNext(objects -> {
+ NewPage newPage1 = objects.getT1();
+ NewPage newPage2 = objects.getT2();
+ NewPage newPage3 = objects.getT3();
+ assertThat(newPage1.getPublishedPage().getName()).isEqualTo("testPage1");
+ assertThat(newPage2.getPublishedPage().getName()).isEqualTo("testPage2");
+ assertThat(newPage3.getPublishedPage().getName()).isEqualTo("Page1");
+
+ assertThat(newPage1.getId())
+ .isEqualTo(publishedPageDTOs.get(0).getId());
+ assertThat(newPage2.getId())
+ .isEqualTo(publishedPageDTOs.get(1).getId());
+ assertThat(newPage3.getId())
+ .isEqualTo(publishedPageDTOs.get(2).getId());
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void
+ importApplicationInWorkspaceFromGit_WithNavSettingsInEditMode_ImportedAppHasNavSettingsInEditAndViewMode() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("import-with-navSettings-in-editMode");
+
+ Application testApplication = new Application();
+ testApplication.setName(
+ "importApplicationInWorkspaceFromGit_WithNavSettingsInEditMode_ImportedAppHasNavSettingsInEditAndViewMode");
+ Application.NavigationSetting appNavigationSetting = new Application.NavigationSetting();
+ appNavigationSetting.setOrientation("top");
+ testApplication.setUnpublishedApplicationDetail(new ApplicationDetail());
+ testApplication.getUnpublishedApplicationDetail().setNavigationSetting(appNavigationSetting);
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("testBranch");
+ testApplication.setGitApplicationMetadata(gitData);
+ Application savedApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ Mono<Application> result = exportApplicationService
+ .exportApplicationById(savedApplication.getId(), SerialiseApplicationObjective.VERSION_CONTROL)
+ .flatMap(applicationJson -> {
+ // setting published mode resource as null, similar to the app json exported to git repo
+ applicationJson.getExportedApplication().setPublishedApplicationDetail(null);
+ return importService
+ .importArtifactInWorkspaceFromGit(
+ workspaceId, savedApplication.getId(), applicationJson, gitData.getBranchName())
+ .map(importableArtifact -> (Application) importableArtifact);
+ });
+
+ StepVerifier.create(result)
+ .assertNext(importedApp -> {
+ assertThat(importedApp.getUnpublishedApplicationDetail()).isNotNull();
+ assertThat(importedApp.getPublishedApplicationDetail()).isNotNull();
+ assertThat(importedApp.getUnpublishedApplicationDetail().getNavigationSetting())
+ .isNotNull();
+ assertEquals(
+ importedApp
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation(),
+ "top");
+ assertThat(importedApp.getPublishedApplicationDetail().getNavigationSetting())
+ .isNotNull();
+ assertEquals(
+ importedApp
+ .getPublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation(),
+ "top");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplicationInWorkspaceFromGit_WithAppLayoutInEditMode_ImportedAppHasAppLayoutInEditAndViewMode() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("import-with-appLayout-in-editMode");
+
+ Application testApplication = new Application();
+ testApplication.setName(
+ "importApplicationInWorkspaceFromGit_WithAppLayoutInEditMode_ImportedAppHasAppLayoutInEditAndViewMode");
+ testApplication.setUnpublishedAppLayout(new Application.AppLayout(Application.AppLayout.Type.DESKTOP));
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("testBranch");
+ testApplication.setGitApplicationMetadata(gitData);
+ Application savedApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ Mono<Application> result = exportApplicationService
+ .exportApplicationById(savedApplication.getId(), SerialiseApplicationObjective.VERSION_CONTROL)
+ .flatMap(applicationJson -> {
+ // setting published mode resource as null, similar to the app json exported to git repo
+ applicationJson.getExportedApplication().setPublishedAppLayout(null);
+ return importService
+ .importArtifactInWorkspaceFromGit(
+ workspaceId, savedApplication.getId(), applicationJson, gitData.getBranchName())
+ .map(importableArtifact -> (Application) importableArtifact);
+ });
+
+ StepVerifier.create(result)
+ .assertNext(importedApp -> {
+ assertThat(importedApp.getUnpublishedAppLayout()).isNotNull();
+ assertThat(importedApp.getPublishedAppLayout()).isNotNull();
+ assertThat(importedApp.getUnpublishedAppLayout().getType())
+ .isEqualTo(Application.AppLayout.Type.DESKTOP);
+ assertThat(importedApp.getPublishedAppLayout().getType())
+ .isEqualTo(Application.AppLayout.Type.DESKTOP);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void
+ exportAndImportApplication_withMultiplePagesOrderDifferentInDeployAndEditMode_PagesOrderIsMaintainedInEditAndViewMode() {
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("template-org-with-ds");
+
+ Application testApplication = new Application();
+ testApplication.setName(
+ "exportAndImportApplication_withMultiplePagesOrderDifferentInDeployAndEditMode_PagesOrderIsMaintainedInEditAndViewMode");
+ testApplication.setExportWithConfiguration(true);
+ testApplication = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+ assert testApplication != null;
+
+ PageDTO testPage1 = new PageDTO();
+ testPage1.setName("testPage1");
+ testPage1.setApplicationId(testApplication.getId());
+ testPage1 = applicationPageService.createPage(testPage1).block();
+
+ PageDTO testPage2 = new PageDTO();
+ testPage2.setName("testPage2");
+ testPage2.setApplicationId(testApplication.getId());
+ testPage2 = applicationPageService.createPage(testPage2).block();
+
+ // Deploy the current application so that edit and view mode will have different page order
+ applicationPageService.publish(testApplication.getId(), true).block();
+
+ // Set order for the newly created pages
+ applicationPageService
+ .reorderPage(testApplication.getId(), testPage1.getId(), 0, null)
+ .block();
+ applicationPageService
+ .reorderPage(testApplication.getId(), testPage2.getId(), 1, null)
+ .block();
+
+ Mono<ApplicationJson> applicationJsonMono = exportApplicationService
+ .exportApplicationById(testApplication.getId(), "")
+ .cache();
+
+ StepVerifier.create(applicationJsonMono)
+ .assertNext(applicationJson -> {
+ Application exportedApplication = applicationJson.getExportedApplication();
+ exportedApplication.setViewMode(false);
+ List<String> pageOrder = exportedApplication.getPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList());
+ assertThat(pageOrder.get(0)).isEqualTo("testPage1");
+ assertThat(pageOrder.get(1)).isEqualTo("testPage2");
+ assertThat(pageOrder.get(2)).isEqualTo("Page1");
+
+ pageOrder.clear();
+ pageOrder = exportedApplication.getPublishedPages().stream()
+ .map(ApplicationPage::getId)
+ .collect(Collectors.toList());
+ assertThat(pageOrder.get(0)).isEqualTo("Page1");
+ assertThat(pageOrder.get(1)).isEqualTo("testPage1");
+ assertThat(pageOrder.get(2)).isEqualTo("testPage2");
+ })
+ .verifyComplete();
+
+ ApplicationJson applicationJson = applicationJsonMono.block();
+ Application application = importService
+ .importNewArtifactInWorkspaceFromJson(workspaceId, applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact)
+ .block();
+
+ // Get the unpublished pages and verify the order
+ application.setViewMode(false);
+ List<ApplicationPage> pageDTOS = application.getPages();
+ Mono<NewPage> newPageMono1 = newPageService.findById(pageDTOS.get(0).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPageMono2 = newPageService.findById(pageDTOS.get(1).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPageMono3 = newPageService.findById(pageDTOS.get(2).getId(), MANAGE_PAGES);
+
+ StepVerifier.create(Mono.zip(newPageMono1, newPageMono2, newPageMono3))
+ .assertNext(objects -> {
+ NewPage newPage1 = objects.getT1();
+ NewPage newPage2 = objects.getT2();
+ NewPage newPage3 = objects.getT3();
+ assertThat(newPage1.getUnpublishedPage().getName()).isEqualTo("testPage1");
+ assertThat(newPage2.getUnpublishedPage().getName()).isEqualTo("testPage2");
+ assertThat(newPage3.getUnpublishedPage().getName()).isEqualTo("Page1");
+
+ assertThat(newPage1.getId()).isEqualTo(pageDTOS.get(0).getId());
+ assertThat(newPage2.getId()).isEqualTo(pageDTOS.get(1).getId());
+ assertThat(newPage3.getId()).isEqualTo(pageDTOS.get(2).getId());
+ })
+ .verifyComplete();
+
+ // Get the published pages
+ List<ApplicationPage> publishedPageDTOs = application.getPublishedPages();
+ Mono<NewPage> newPublishedPageMono1 =
+ newPageService.findById(publishedPageDTOs.get(0).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPublishedPageMono2 =
+ newPageService.findById(publishedPageDTOs.get(1).getId(), MANAGE_PAGES);
+ Mono<NewPage> newPublishedPageMono3 =
+ newPageService.findById(publishedPageDTOs.get(2).getId(), MANAGE_PAGES);
+
+ StepVerifier.create(Mono.zip(newPublishedPageMono1, newPublishedPageMono2, newPublishedPageMono3))
+ .assertNext(objects -> {
+ NewPage newPage1 = objects.getT1();
+ NewPage newPage2 = objects.getT2();
+ NewPage newPage3 = objects.getT3();
+ assertThat(newPage1.getPublishedPage().getName()).isEqualTo("Page1");
+ assertThat(newPage2.getPublishedPage().getName()).isEqualTo("testPage1");
+ assertThat(newPage3.getPublishedPage().getName()).isEqualTo("testPage2");
+
+ assertThat(newPage1.getId())
+ .isEqualTo(publishedPageDTOs.get(0).getId());
+ assertThat(newPage2.getId())
+ .isEqualTo(publishedPageDTOs.get(1).getId());
+ assertThat(newPage3.getId())
+ .isEqualTo(publishedPageDTOs.get(2).getId());
+ })
+ .verifyComplete();
+ }
+
+ private ApplicationJson createApplicationJSON(List<String> pageNames) {
+ ApplicationJson applicationJson = new ApplicationJson();
+
+ // set the application data
+ Application application = new Application();
+ application.setName("Template Application");
+ application.setSlug("template-application");
+ application.setForkingEnabled(true);
+ application.setIsPublic(true);
+ application.setApplicationVersion(ApplicationVersion.LATEST_VERSION);
+ applicationJson.setExportedApplication(application);
+
+ DatasourceStorage sampleDatasource = new DatasourceStorage();
+ sampleDatasource.setName("SampleDS");
+ sampleDatasource.setPluginId("restapi-plugin");
+
+ applicationJson.setDatasourceList(List.of(sampleDatasource));
+
+ // add pages and actions
+ List<NewPage> newPageList = new ArrayList<>(pageNames.size());
+ List<NewAction> actionList = new ArrayList<>();
+ List<ActionCollection> actionCollectionList = new ArrayList<>();
+
+ for (String pageName : pageNames) {
+ NewPage newPage = new NewPage();
+ newPage.setUnpublishedPage(new PageDTO());
+ newPage.getUnpublishedPage().setName(pageName);
+ newPage.getUnpublishedPage().setLayouts(List.of());
+ newPageList.add(newPage);
+
+ NewAction action = new NewAction();
+ action.setId(pageName + "_SampleQuery");
+ action.setPluginType(PluginType.API);
+ action.setPluginId("restapi-plugin");
+ action.setUnpublishedAction(new ActionDTO());
+ action.getUnpublishedAction().setName("SampleQuery");
+ action.getUnpublishedAction().setPageId(pageName);
+ action.getUnpublishedAction().setDatasource(new Datasource());
+ action.getUnpublishedAction().getDatasource().setId("SampleDS");
+ action.getUnpublishedAction().getDatasource().setPluginId("restapi-plugin");
+ actionList.add(action);
+
+ ActionCollection actionCollection = new ActionCollection();
+ actionCollection.setId(pageName + "_SampleJS");
+ actionCollection.setUnpublishedCollection(new ActionCollectionDTO());
+ actionCollection.getUnpublishedCollection().setName("SampleJS");
+ actionCollection.getUnpublishedCollection().setPageId(pageName);
+ actionCollection.getUnpublishedCollection().setPluginId("js-plugin");
+ actionCollection.getUnpublishedCollection().setPluginType(PluginType.JS);
+ actionCollection.getUnpublishedCollection().setBody("export default {\\n\\t\\n}");
+ actionCollectionList.add(actionCollection);
+ }
+
+ applicationJson.setPageList(newPageList);
+ applicationJson.setActionList(actionList);
+ applicationJson.setActionCollectionList(actionCollectionList);
+ return applicationJson;
+ }
+
+ @Test
+ @WithUserDetails("api_user")
+ public void mergeApplicationJsonWithApplication_WhenPageNameConflicts_PageNamesRenamed() {
+ String uniqueString = UUID.randomUUID().toString();
+
+ Application destApplication = new Application();
+ destApplication.setName("App_" + uniqueString);
+ destApplication.setSlug("my-slug");
+ destApplication.setIsPublic(false);
+ destApplication.setForkingEnabled(false);
+ Mono<Application> createAppAndPageMono = applicationPageService
+ .createApplication(destApplication, workspaceId)
+ .flatMap(application -> {
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setName("Home");
+ pageDTO.setApplicationId(application.getId());
+ return applicationPageService.createPage(pageDTO).thenReturn(application);
+ });
+
+ // let's create an ApplicationJSON which we'll merge with application created by createAppAndPageMono
+ ApplicationJson applicationJson = createApplicationJSON(List.of("Home", "About"));
+
+ Mono<Tuple3<ApplicationPagesDTO, List<NewAction>, List<ActionCollection>>> tuple2Mono = createAppAndPageMono
+ .flatMap(application ->
+ // merge the application json with the application we've created
+ importService
+ .mergeArtifactExchangeJsonWithImportableArtifact(
+ application.getWorkspaceId(), application.getId(), null, applicationJson, null)
+ .thenReturn(application))
+ .flatMap(application ->
+ // fetch the application pages, this should contain pages from application json
+ Mono.zip(
+ newPageService.findApplicationPages(
+ application.getId(), null, null, ApplicationMode.EDIT),
+ newActionService
+ .findAllByApplicationIdAndViewMode(
+ application.getId(), false, MANAGE_ACTIONS, null)
+ .collectList(),
+ actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ application.getId(), false, MANAGE_ACTIONS, null)
+ .collectList()));
+
+ StepVerifier.create(tuple2Mono)
+ .assertNext(objects -> {
+ ApplicationPagesDTO applicationPagesDTO = objects.getT1();
+ List<NewAction> newActionList = objects.getT2();
+ List<ActionCollection> actionCollectionList = objects.getT3();
+
+ assertThat(applicationPagesDTO.getApplication().getName()).isEqualTo(destApplication.getName());
+ assertThat(applicationPagesDTO.getApplication().getSlug()).isEqualTo(destApplication.getSlug());
+ assertThat(applicationPagesDTO.getApplication().getIsPublic())
+ .isFalse();
+ assertThat(applicationPagesDTO.getApplication().getForkingEnabled())
+ .isFalse();
+ assertThat(applicationPagesDTO.getPages().size()).isEqualTo(4);
+ List<String> pageNames = applicationPagesDTO.getPages().stream()
+ .map(PageNameIdDTO::getName)
+ .collect(Collectors.toList());
+ assertThat(pageNames).contains("Home", "Home2", "About");
+ assertThat(newActionList.size()).isEqualTo(2); // we imported two pages and each page has one action
+ assertThat(actionCollectionList.size())
+ .isEqualTo(2); // we imported two pages and each page has one Collection
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails("api_user")
+ public void mergeApplicationJsonWithApplication_WhenPageListIProvided_OnlyListedPagesAreMerged() {
+ String uniqueString = UUID.randomUUID().toString();
+
+ Application destApplication = new Application();
+ destApplication.setName("App_" + uniqueString);
+ Mono<Application> createAppAndPageMono = applicationPageService
+ .createApplication(destApplication, workspaceId)
+ .flatMap(application -> {
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setName("Home");
+ pageDTO.setApplicationId(application.getId());
+ return applicationPageService.createPage(pageDTO).thenReturn(application);
+ });
+
+ // let's create an ApplicationJSON which we'll merge with application created by createAppAndPageMono
+ ApplicationJson applicationJson = createApplicationJSON(List.of("Profile", "About", "Contact US"));
+
+ Mono<ApplicationPagesDTO> applicationPagesDTOMono = createAppAndPageMono
+ .flatMap(application ->
+ // merge the application json with the application we've created
+ importService
+ .mergeArtifactExchangeJsonWithImportableArtifact(
+ 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
+ newPageService.findApplicationPages(application.getId(), null, null, ApplicationMode.EDIT));
+
+ StepVerifier.create(applicationPagesDTOMono)
+ .assertNext(applicationPagesDTO -> {
+ assertThat(applicationPagesDTO.getPages().size()).isEqualTo(4);
+ List<String> pageNames = applicationPagesDTO.getPages().stream()
+ .map(PageNameIdDTO::getName)
+ .collect(Collectors.toList());
+ assertThat(pageNames).contains("Home", "About", "Contact US");
+ assertThat(pageNames).doesNotContain("Profile");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplicationById_WhenThemeDoesNotExist_ExportedWithDefaultTheme() {
+ Theme customTheme = new Theme();
+ customTheme.setName("my-custom-theme");
+
+ String randomId = UUID.randomUUID().toString();
+ Application testApplication = new Application();
+ testApplication.setName("Application_" + randomId);
+ Mono<ApplicationJson> exportedAppJson = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application -> {
+ application.setEditModeThemeId("invalid-theme-id");
+ application.setPublishedModeThemeId("invalid-theme-id");
+ String branchName = null;
+ return applicationService
+ .save(application)
+ .then(exportApplicationService.exportApplicationById(application.getId(), branchName));
+ });
+
+ StepVerifier.create(exportedAppJson)
+ .assertNext(applicationJson -> {
+ assertThat(applicationJson.getEditModeTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+ assertThat(applicationJson.getPublishedTheme().getName())
+ .isEqualToIgnoringCase(Theme.DEFAULT_THEME_NAME);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_invalidPluginReferenceForDatasource_throwException() {
+ Mockito.when(pluginService.findAllByIdsWithoutPermission(Mockito.any(), Mockito.anyList()))
+ .thenReturn(Flux.fromIterable(List.of(installedPlugin, installedJsPlugin)));
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ ApplicationJson appJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json")
+ .block();
+ assert appJson != null;
+ final String randomId = UUID.randomUUID().toString();
+ appJson.getDatasourceList().get(0).setPluginId(randomId);
+ Workspace createdWorkspace = workspaceService.create(newWorkspace).block();
+ final Mono<Application> resultMono = importService
+ .importNewArtifactInWorkspaceFromJson(createdWorkspace.getId(), appJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .contains(AppsmithError.GENERIC_JSON_IMPORT_ERROR.getMessage(
+ createdWorkspace.getId(), "")))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_importSameApplicationTwice_applicationImportedLaterWithSuffixCount() {
+
+ Mono<ApplicationJson> applicationJsonMono =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application-without-action-collection.json");
+
+ Workspace newWorkspace = new Workspace();
+ newWorkspace.setName("Template Workspace");
+
+ Mono<Workspace> createWorkspaceMono =
+ workspaceService.create(newWorkspace).cache();
+ final Mono<Application> importApplicationMono = createWorkspaceMono
+ .zipWith(applicationJsonMono)
+ .flatMap(tuple -> {
+ Workspace workspace = tuple.getT1();
+ ApplicationJson applicationJson = tuple.getT2();
+ return importService
+ .importNewArtifactInWorkspaceFromJson(workspace.getId(), applicationJson)
+ .map(importableArtifact -> (Application) importableArtifact);
+ });
+
+ StepVerifier.create(importApplicationMono.zipWhen(application -> importApplicationMono))
+ .assertNext(tuple -> {
+ Application firstImportedApplication = tuple.getT1();
+ Application secondImportedApplication = tuple.getT2();
+ assertThat(firstImportedApplication.getName()).isEqualTo("valid_application");
+ assertThat(secondImportedApplication.getName()).isEqualTo("valid_application (1)");
+ assertThat(firstImportedApplication.getWorkspaceId())
+ .isEqualTo(secondImportedApplication.getWorkspaceId());
+ assertThat(firstImportedApplication.getWorkspaceId()).isNotNull();
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_existingApplication_pageAddedSuccessfully() {
+
+ // Create application
+ Application application = new Application();
+ application.setName("mergeApplication_existingApplication_pageAddedSuccessfully");
+ application.setWorkspaceId(workspaceId);
+ application = applicationPageService.createApplication(application).block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, finalApplication.getId(), null, applicationJson1, new ArrayList<>()))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application1 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(application1.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application1), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application1 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application1.getId()).isEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application1.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application1.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12", "Page2");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_gitConnectedApplication_pageAddedSuccessfully() {
+
+ // Create application connected to git
+ Application testApplication = new Application();
+ testApplication.setName("mergeApplication_gitConnectedApplication_pageAddedSuccessfully");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ gitData.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, finalApplication.getId(), "master", applicationJson1, new ArrayList<>()))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application1 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(application1.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application1), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application1 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application1.getId()).isEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application1.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application1.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12", "Page2");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_gitConnectedApplicationChildBranch_pageAddedSuccessfully() {
+
+ // Create application connected to git
+ Application testApplication = new Application();
+ testApplication.setName("mergeApplication_gitConnectedApplicationChildBranch_pageAddedSuccessfully");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ gitData.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ // Create branch for the application
+ testApplication = new Application();
+ testApplication.setName("mergeApplication_gitConnectedApplicationChildBranch_pageAddedSuccessfully1");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData1 = new GitApplicationMetadata();
+ gitData1.setBranchName("feature");
+ gitData1.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData1);
+
+ Application branchApp = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application2 -> {
+ application2.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
+ return applicationService.save(application2);
+ })
+ .block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, branchApp.getId(), "feature", applicationJson1, new ArrayList<>()))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application2 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(branchApp.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application2), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application3 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application3.getId()).isNotEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application3.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application3.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12", "Page2");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_gitConnectedApplicationSelectedSpecificPages_selectedPageAddedSuccessfully() {
+ // Create application connected to git
+ Application testApplication = new Application();
+ testApplication.setName(
+ "mergeApplication_gitConnectedApplicationSelectedSpecificPages_selectedPageAddedSuccessfully");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ gitData.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ // Create branch for the application
+ testApplication = new Application();
+ testApplication.setName(
+ "mergeApplication_gitConnectedApplicationSelectedSpecificPages_selectedPageAddedSuccessfully1");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData1 = new GitApplicationMetadata();
+ gitData1.setBranchName("feature");
+ gitData1.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData1);
+
+ Application branchApp = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application2 -> {
+ application2.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
+ return applicationService.save(application2);
+ })
+ .block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, branchApp.getId(), "feature", applicationJson1, List.of("Page1")))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application2 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(branchApp.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application2), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application3 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application3.getId()).isNotEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application3.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application3.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_gitConnectedApplicationSelectedAllPages_selectedPageAddedSuccessfully() {
+ // Create application connected to git
+ Application testApplication = new Application();
+ testApplication.setName(
+ "mergeApplication_gitConnectedApplicationSelectedAllPages_selectedPageAddedSuccessfully");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setBranchName("master");
+ gitData.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData);
+
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ // Create branch for the application
+ testApplication = new Application();
+ testApplication.setName(
+ "mergeApplication_gitConnectedApplicationSelectedAllPages_selectedPageAddedSuccessfully1");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setModifiedBy("some-user");
+ testApplication.setGitApplicationMetadata(new GitApplicationMetadata());
+ GitApplicationMetadata gitData1 = new GitApplicationMetadata();
+ gitData1.setBranchName("feature");
+ gitData1.setDefaultBranchName("master");
+ testApplication.setGitApplicationMetadata(gitData1);
+
+ Application branchApp = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application2 -> {
+ application2.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
+ return applicationService.save(application2);
+ })
+ .block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, branchApp.getId(), "feature", applicationJson1, List.of("Page1", "Page2")))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application2 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(branchApp.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(branchApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application2), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application3 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application3.getId()).isNotEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application3.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application3.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12", "Page2");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_nonGitConnectedApplicationSelectedSpecificPages_selectedPageAddedSuccessfully() {
+ // Create application
+ Application application = new Application();
+ application.setName(
+ "mergeApplication_nonGitConnectedApplicationSelectedSpecificPages_selectedPageAddedSuccessfully");
+ application.setWorkspaceId(workspaceId);
+ application = applicationPageService.createApplication(application).block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, finalApplication.getId(), null, applicationJson1, List.of("Page1")))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application1 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(application1.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application1), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application1 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application1.getId()).isEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application1.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application1.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplication_nonGitConnectedApplicationSelectedAllPages_selectedPageAddedSuccessfully() {
+ // Create application
+ Application application = new Application();
+ application.setName(
+ "mergeApplication_nonGitConnectedApplicationSelectedAllPages_selectedPageAddedSuccessfully");
+ application.setWorkspaceId(workspaceId);
+ application = applicationPageService.createApplication(application).block();
+
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ Application finalApplication = application;
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationJson
+ .flatMap(applicationJson1 -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId,
+ finalApplication.getId(),
+ null,
+ applicationJson1,
+ List.of("Page1", "Page2")))
+ .map(importableArtifact -> (Application) importableArtifact)
+ .flatMap(application1 -> {
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(application1.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(
+ application1.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(application1), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ Application application1 = tuple.getT1();
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(application1.getId()).isEqualTo(finalApplication.getId());
+ assertThat(finalApplication.getPages().size())
+ .isLessThan(application1.getPages().size());
+ assertThat(finalApplication.getPages().size())
+ .isEqualTo(application1.getPublishedPages().size());
+
+ // Verify the pages after merging the template
+ pageList.forEach(newPage -> {
+ assertThat(newPage.getUnpublishedPage().getName()).containsAnyOf("Page1", "Page12", "Page2");
+ assertThat(newPage.getGitSyncId()).isNotNull();
+ });
+
+ NewPage page = pageList.stream()
+ .filter(newPage ->
+ newPage.getUnpublishedPage().getName().equals("Page12"))
+ .collect(Collectors.toList())
+ .get(0);
+ // Verify the actions after merging the template
+ actionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedAction().getName())
+ .containsAnyOf("api_wo_auth", "get_users", "run");
+ assertThat(newAction.getUnpublishedAction().getPageId()).isEqualTo(page.getId());
+ });
+
+ // Verify the actionCollections after merging the template
+ actionCollectionList.forEach(newAction -> {
+ assertThat(newAction.getUnpublishedCollection().getName())
+ .containsAnyOf("JSObject1", "JSObject2");
+ assertThat(newAction.getUnpublishedCollection().getPageId())
+ .isEqualTo(page.getId());
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_invalidJson_createdAppIsDeleted() {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/invalid-json-without-pages.json");
+
+ List<Application> applicationList = applicationService
+ .findAllApplicationsByWorkspaceId(workspaceId)
+ .collectList()
+ .block();
+
+ Mono<ApplicationImportDTO> resultMono = importService
+ .extractArtifactExchangeJsonAndSaveArtifact(filePart, workspaceId, null, ArtifactJsonType.APPLICATION)
+ .map(artifactImportDTO -> (ApplicationImportDTO) artifactImportDTO);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .equals(AppsmithError.VALIDATION_FAILURE.getMessage(
+ "Field '" + FieldName.PAGE_LIST + "' is missing in the JSON.")))
+ .verify();
+
+ // Verify that the app card is not created
+ StepVerifier.create(applicationService
+ .findAllApplicationsByWorkspaceId(workspaceId)
+ .collectList())
+ .assertNext(applications -> {
+ assertThat(applicationList.size()).isEqualTo(applications.size());
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplication_WithBearerTokenAndExportWithConfig_exportedWithDecryptedFields() {
+ String randomUUID = UUID.randomUUID().toString();
+
+ Workspace testWorkspace = new Workspace();
+ testWorkspace.setName("workspace-" + randomUUID);
+ Workspace workspace = workspaceService.create(testWorkspace).block();
+
+ Application testApplication = new Application();
+ testApplication.setName("application-" + randomUUID);
+ testApplication.setExportWithConfiguration(true);
+ testApplication.setWorkspaceId(workspace.getId());
+
+ Mono<Application> applicationMono = applicationPageService
+ .createApplication(testApplication)
+ .flatMap(application -> {
+ ApplicationAccessDTO accessDTO = new ApplicationAccessDTO();
+ accessDTO.setPublicAccess(true);
+ return applicationService
+ .changeViewAccess(application.getId(), accessDTO)
+ .thenReturn(application);
+ });
+
+ Mono<Datasource> datasourceMono = workspaceService
+ .getDefaultEnvironmentId(workspace.getId(), environmentPermission.getExecutePermission())
+ .zipWith(pluginRepository.findByPackageName("restapi-plugin"))
+ .flatMap(objects -> {
+ String defaultEnvironmentId = objects.getT1();
+ Plugin plugin = objects.getT2();
+
+ Datasource datasource = new Datasource();
+ datasource.setPluginId(plugin.getId());
+ datasource.setName("RestAPIWithBearerToken");
+ datasource.setWorkspaceId(workspace.getId());
+ datasource.setIsConfigured(true);
+
+ BearerTokenAuth bearerTokenAuth = new BearerTokenAuth();
+ bearerTokenAuth.setBearerToken("token_" + randomUUID);
+
+ SSLDetails sslDetails = new SSLDetails();
+ sslDetails.setAuthType(SSLDetails.AuthType.DEFAULT);
+ Connection connection = new Connection();
+ connection.setSsl(sslDetails);
+
+ DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+ datasourceConfiguration.setAuthentication(bearerTokenAuth);
+ datasourceConfiguration.setConnection(connection);
+ datasourceConfiguration.setConnection(new Connection());
+ datasourceConfiguration.setUrl("https://mock-api.appsmith.com");
+
+ HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
+ storages.put(
+ defaultEnvironmentId,
+ new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration));
+ datasource.setDatasourceStorages(storages);
+
+ return datasourceService.create(datasource);
+ });
+
+ Mono<ApplicationJson> exportAppMono = Mono.zip(applicationMono, datasourceMono)
+ .flatMap(objects -> {
+ ApplicationPage applicationPage = objects.getT1().getPages().get(0);
+ ActionDTO action = new ActionDTO();
+ action.setName("validAction");
+ action.setPageId(applicationPage.getId());
+ action.setPluginId(objects.getT2().getPluginId());
+ action.setDatasource(objects.getT2());
+
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ actionConfiguration.setPath("/test/path");
+ action.setActionConfiguration(actionConfiguration);
+
+ return layoutActionService
+ .createSingleAction(action, Boolean.FALSE)
+ .then(exportApplicationService.exportApplicationById(
+ objects.getT1().getId(), ""));
+ });
+
+ StepVerifier.create(exportAppMono)
+ .assertNext(applicationJson -> {
+ assertThat(applicationJson.getDecryptedFields()).isNotEmpty();
+ DecryptedSensitiveFields fields =
+ applicationJson.getDecryptedFields().get("RestAPIWithBearerToken");
+ assertThat(fields.getBearerTokenAuth().getBearerToken()).isEqualTo("token_" + randomUUID);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplicationTest_WithNavigationSettings() {
+
+ Application application = new Application();
+ application.setName("exportNavigationSettingsApplicationTest");
+ Application.NavigationSetting navSetting = new Application.NavigationSetting();
+ navSetting.setOrientation("top");
+ application.setUnpublishedApplicationDetail(new ApplicationDetail());
+ application.getUnpublishedApplicationDetail().setNavigationSetting(navSetting);
+ Application createdApplication = applicationPageService
+ .createApplication(application, workspaceId)
+ .block();
+
+ Mono<ApplicationJson> resultMono =
+ exportApplicationService.exportApplicationById(createdApplication.getId(), "");
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationJson -> {
+ Application exportedApplication = applicationJson.getExportedApplication();
+ assertThat(exportedApplication).isNotNull();
+ assertThat(exportedApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting())
+ .isNotNull();
+ assertThat(exportedApplication
+ .getUnpublishedApplicationDetail()
+ .getNavigationSetting()
+ .getOrientation())
+ .isEqualTo("top");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void exportApplication_WithPageIcon_ValidPageIcon() {
+ String randomId = UUID.randomUUID().toString();
+ Application application = new Application();
+ application.setName("exportPageIconApplicationTest");
+ Application createdApplication = applicationPageService
+ .createApplication(application, workspaceId)
+ .block();
+
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setName("page_" + randomId);
+ pageDTO.setIcon("flight");
+ pageDTO.setApplicationId(createdApplication.getId());
+
+ PageDTO applicationPageDTO = applicationPageService.createPage(pageDTO).block();
+
+ Mono<ApplicationJson> resultMono =
+ exportApplicationService.exportApplicationById(applicationPageDTO.getApplicationId(), "");
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationJson -> {
+ List<NewPage> pages = applicationJson.getPageList();
+ assertThat(pages.size()).isEqualTo(2);
+ assertThat(pages.get(1).getUnpublishedPage().getName()).isEqualTo("page_" + randomId);
+ assertThat(pages.get(1).getUnpublishedPage().getIcon()).isEqualTo("flight");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_existingApplication_ApplicationReplacedWithImportedOne() {
+ String randomUUID = UUID.randomUUID().toString();
+ Mono<ApplicationJson> applicationJson =
+ createAppJson("test_assets/ImportExportServiceTest/valid-application.json");
+
+ // Create the initial application
+ Application application = new Application();
+ application.setName("Application_" + randomUUID);
+ application.setWorkspaceId(workspaceId);
+
+ Mono<Tuple4<Application, List<NewPage>, List<NewAction>, List<ActionCollection>>> importedApplication =
+ applicationPageService
+ .createApplication(application)
+ .flatMap(createdApp -> {
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setApplicationId(application.getId());
+ pageDTO.setName("Home Page");
+ return applicationPageService.createPage(pageDTO).thenReturn(createdApp);
+ })
+ .zipWith(applicationJson)
+ .flatMap(objects -> importService
+ .restoreSnapshot(
+ workspaceId,
+ objects.getT2(),
+ objects.getT1().getId(),
+ null)
+ .map(importableArtifact -> (Application) importableArtifact)
+ .zipWith(Mono.just(objects.getT1())))
+ .flatMap(objects -> {
+ Application newApp = objects.getT1();
+ Application oldApp = objects.getT2();
+ // after import, application id should not change
+ assert Objects.equals(newApp.getId(), oldApp.getId());
+
+ Mono<List<NewPage>> pageList = newPageService
+ .findNewPagesByApplicationId(newApp.getId(), MANAGE_PAGES)
+ .collectList();
+ Mono<List<NewAction>> actionList = newActionService
+ .findAllByApplicationIdAndViewMode(newApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ Mono<List<ActionCollection>> actionCollectionList = actionCollectionService
+ .findAllByApplicationIdAndViewMode(newApp.getId(), false, MANAGE_ACTIONS, null)
+ .collectList();
+ return Mono.zip(Mono.just(newApp), pageList, actionList, actionCollectionList);
+ });
+
+ StepVerifier.create(importedApplication)
+ .assertNext(tuple -> {
+ List<NewPage> pageList = tuple.getT2();
+ List<NewAction> actionList = tuple.getT3();
+ List<ActionCollection> actionCollectionList = tuple.getT4();
+
+ assertThat(pageList.size()).isEqualTo(2);
+ assertThat(actionList.size()).isEqualTo(3);
+
+ List<String> pageNames = pageList.stream()
+ .map(p -> p.getUnpublishedPage().getName())
+ .collect(Collectors.toList());
+
+ List<String> actionNames = actionList.stream()
+ .map(p -> p.getUnpublishedAction().getName())
+ .collect(Collectors.toList());
+
+ List<String> actionCollectionNames = actionCollectionList.stream()
+ .map(p -> p.getUnpublishedCollection().getName())
+ .collect(Collectors.toList());
+
+ // Verify the pages after importing the application
+ assertThat(pageNames).contains("Page1", "Page2");
+
+ // Verify the actions after importing the application
+ assertThat(actionNames).contains("api_wo_auth", "get_users", "run");
+
+ // Verify the actionCollections after importing the application
+ assertThat(actionCollectionNames).contains("JSObject1", "JSObject2");
+ })
+ .verifyComplete();
+ }
+
+ /**
+ * Testcase for updating the existing application:
+ * 1. Import application in org
+ * 2. Add new page to the imported application
+ * 3. User tries to import application from same application json file
+ * 4. Added page will be removed
+ * <p>
+ * We don't have to test all the flows for other resources like actions, JSObjects, themes as these are already
+ * covered as a part of discard functionality
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void extractFileAndUpdateApplication_addNewPageAfterImport_addedPageRemoved() {
+
+ /*
+ 1. Import application
+ 2. Add single page to imported app
+ 3. Import the application from same JSON with applicationId
+ 4. Added page should be deleted from DB
+ */
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+ String workspaceId = createTemplateWorkspace().getId();
+ final Mono<Application> resultMonoWithoutDiscardOperation = importService
+ .extractArtifactExchangeJsonAndSaveArtifact(filePart, workspaceId, null, ArtifactJsonType.APPLICATION)
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO)
+ .flatMap(applicationImportDTO -> {
+ PageDTO page = new PageDTO();
+ page.setName("discard-page-test");
+ page.setApplicationId(applicationImportDTO.getApplication().getId());
+ return applicationPageService.createPage(page);
+ })
+ .flatMap(page -> applicationRepository.findById(page.getApplicationId()))
+ .cache();
+
+ StepVerifier.create(resultMonoWithoutDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+ assertThat(application.getWorkspaceId()).isNotNull();
+ assertThat(application.getPages()).hasSize(3);
+ assertThat(application.getPublishedPages()).hasSize(1);
+ assertThat(application.getModifiedBy()).isEqualTo("api_user");
+ assertThat(application.getUpdatedAt()).isNotNull();
+ assertThat(application.getEditModeThemeId()).isNotNull();
+ assertThat(application.getPublishedModeThemeId()).isNotNull();
+
+ assertThat(pageList).hasSize(3);
+
+ ApplicationPage defaultAppPage = application.getPages().stream()
+ .filter(ApplicationPage::getIsDefault)
+ .findFirst()
+ .orElse(null);
+ assertThat(defaultAppPage).isNotNull();
+
+ PageDTO defaultPageDTO = pageList.stream()
+ .filter(pageDTO -> pageDTO.getId().equals(defaultAppPage.getId()))
+ .findFirst()
+ .orElse(null);
+
+ assertThat(defaultPageDTO).isNotNull();
+ assertThat(defaultPageDTO.getLayouts().get(0).getLayoutOnLoadActions())
+ .isNotEmpty();
+
+ List<String> pageNames = new ArrayList<>();
+ pageList.forEach(page -> pageNames.add(page.getName()));
+ assertThat(pageNames).contains("discard-page-test");
+ })
+ .verifyComplete();
+
+ // Import the same application again to find if the added page is deleted
+ final Mono<Application> resultMonoWithDiscardOperation = resultMonoWithoutDiscardOperation
+ .flatMap(importedApplication -> applicationService.save(importedApplication))
+ .flatMap(savedApplication -> importService.extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, savedApplication.getId(), ArtifactJsonType.APPLICATION))
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO)
+ .map(ApplicationImportDTO::getApplication);
+
+ StepVerifier.create(resultMonoWithDiscardOperation.flatMap(application -> Mono.zip(
+ Mono.just(application),
+ newPageService
+ .findByApplicationId(application.getId(), MANAGE_PAGES, false)
+ .collectList())))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<PageDTO> pageList = tuple.getT2();
+
+ assertThat(application.getPages()).hasSize(2);
+ assertThat(application.getPublishedPages()).hasSize(1);
+
+ assertThat(pageList).hasSize(2);
+
+ List<String> pageNames = new ArrayList<>();
+ pageList.forEach(page -> pageNames.add(page.getName()));
+ assertThat(pageNames).doesNotContain("discard-page-test");
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void extractFileAndUpdateExistingApplication_gitConnectedApplication_throwUnsupportedOperationException() {
+
+ /*
+ 1. Create application and mock git connectivity
+ 2. Import the application from valid JSON with saved applicationId
+ 3. Unsupported operation exception should be thrown
+ */
+
+ // Create application connected to git
+ Application testApplication = new Application();
+ testApplication.setName(
+ "extractFileAndUpdateExistingApplication_gitConnectedApplication_throwUnsupportedOperationException");
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ GitApplicationMetadata gitData = new GitApplicationMetadata();
+ gitData.setRemoteUrl("[email protected]:username/git-repo.git");
+ testApplication.setGitApplicationMetadata(gitData);
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application1 -> {
+ application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+ return applicationService.save(application1);
+ })
+ .block();
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+ final Mono<ApplicationImportDTO> resultMono = importService
+ .extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, application.getId(), ArtifactJsonType.APPLICATION)
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ StepVerifier.create(resultMono)
+ .expectErrorMatches(throwable -> throwable instanceof AppsmithException
+ && throwable
+ .getMessage()
+ .equals(
+ AppsmithError.UNSUPPORTED_IMPORT_OPERATION_FOR_GIT_CONNECTED_APPLICATION
+ .getMessage()))
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void createExportAppJsonWithCustomJSLibTest() {
+ CustomJSLib jsLib = new CustomJSLib("TestLib", Set.of("accessor1"), "url", "docsUrl", "1.0", "defs_string");
+ Mono<Boolean> addJSLibMonoCached = customJSLibService
+ .addJSLibsToContext(testAppId, CreatorContextType.APPLICATION, Set.of(jsLib), null, false)
+ .flatMap(isJSLibAdded ->
+ Mono.zip(Mono.just(isJSLibAdded), applicationPageService.publish(testAppId, true)))
+ .map(tuple2 -> {
+ Boolean isJSLibAdded = tuple2.getT1();
+ Application application = tuple2.getT2();
+ return isJSLibAdded;
+ })
+ .cache();
+ Mono<ApplicationJson> getExportedAppMono =
+ addJSLibMonoCached.then(exportApplicationService.exportApplicationById(testAppId, ""));
+ StepVerifier.create(Mono.zip(addJSLibMonoCached, getExportedAppMono))
+ .assertNext(tuple2 -> {
+ Boolean isJSLibAdded = tuple2.getT1();
+ assertEquals(true, isJSLibAdded);
+ ApplicationJson exportedAppJson = tuple2.getT2();
+ assertEquals(1, exportedAppJson.getCustomJSLibList().size());
+ CustomJSLib exportedJSLib =
+ exportedAppJson.getCustomJSLibList().get(0);
+ assertEquals(jsLib.getName(), exportedJSLib.getName());
+ assertEquals(jsLib.getAccessor(), exportedJSLib.getAccessor());
+ assertEquals(jsLib.getUrl(), exportedJSLib.getUrl());
+ assertEquals(jsLib.getDocsUrl(), exportedJSLib.getDocsUrl());
+ assertEquals(jsLib.getVersion(), exportedJSLib.getVersion());
+ assertEquals(jsLib.getDefs(), exportedJSLib.getDefs());
+ assertEquals(
+ getDTOFromCustomJSLib(jsLib),
+ exportedAppJson
+ .getExportedApplication()
+ .getUnpublishedCustomJSLibs()
+ .toArray()[0]);
+ assertEquals(
+ 1,
+ exportedAppJson
+ .getExportedApplication()
+ .getUnpublishedCustomJSLibs()
+ .size());
+ assertEquals(
+ 0,
+ exportedAppJson
+ .getExportedApplication()
+ .getPublishedCustomJSLibs()
+ .size());
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void extractFileAndUpdateExistingApplication_existingApplication_applicationNameAndSlugRemainsUnchanged() {
+
+ /*
+ 1. Create application
+ 2. Import the application from valid JSON with saved applicationId
+ 3. Name and slug will not be updated by the incoming changes from the json file
+ */
+
+ Application testApplication = new Application();
+ final String appName = UUID.randomUUID().toString();
+ testApplication.setName(appName);
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ Application application = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .block();
+
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+ final Mono<ApplicationImportDTO> resultMono = importService
+ .extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, application.getId(), ArtifactJsonType.APPLICATION)
+ .map(importableArtifactDTO -> (ApplicationImportDTO) importableArtifactDTO);
+
+ StepVerifier.create(resultMono)
+ .assertNext(applicationImportDTO -> {
+ Application application1 = applicationImportDTO.getApplication();
+ assertThat(application1.getName()).isEqualTo(appName);
+ assertThat(application1.getSlug()).isEqualTo(appName);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void mergeApplicationJsonWithApplication_WhenNoPermissionToCreatePage_Fails() {
+ Application testApplication = new Application();
+ final String appName = UUID.randomUUID().toString();
+ testApplication.setName(appName);
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+
+ Mono<Application> applicationImportDTOMono = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application -> {
+ // remove page create permission from this application for current user
+ application.getPolicies().removeIf(policy -> policy.getPermission()
+ .equals(applicationPermission
+ .getPageCreatePermission()
+ .getValue()));
+ return applicationRepository.save(application);
+ })
+ .flatMap(application -> {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+ return importService
+ .extractArtifactExchangeJson(filePart, ArtifactJsonType.APPLICATION)
+ .map(artifactExchangeJson -> (ApplicationJson) artifactExchangeJson)
+ .flatMap(applicationJson -> importService.mergeArtifactExchangeJsonWithImportableArtifact(
+ workspaceId, application.getId(), null, applicationJson, null))
+ .map(importableArtifact -> (Application) importableArtifact);
+ });
+
+ StepVerifier.create(applicationImportDTOMono)
+ .expectError(AppsmithException.class)
+ .verify();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void extractFileAndUpdateNonGitConnectedApplication_WhenNoPermissionToCreatePage_Fails() {
+ Application testApplication = new Application();
+ final String appName = UUID.randomUUID().toString();
+ testApplication.setName(appName);
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+
+ Mono<ApplicationImportDTO> applicationImportDTOMono = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application -> {
+ // remove page create permission from this application for current user
+ application.getPolicies().removeIf(policy -> policy.getPermission()
+ .equals(applicationPermission
+ .getPageCreatePermission()
+ .getValue()));
+ return applicationRepository.save(application);
+ })
+ .flatMap(application -> {
+ FilePart filePart = createFilePart("test_assets/ImportExportServiceTest/valid-application.json");
+ return importService
+ .extractArtifactExchangeJsonAndSaveArtifact(
+ filePart, workspaceId, application.getId(), ArtifactJsonType.APPLICATION)
+ .map(artifactImportDTO -> (ApplicationImportDTO) artifactImportDTO);
+ });
+
+ StepVerifier.create(applicationImportDTOMono)
+ .expectError(AppsmithException.class)
+ .verify();
+ }
+
+ private Mono<ActionDTO> createActionToPage(String actionName, String pageId) {
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasourceMap.get("DS1"));
+ action.setName(actionName);
+ action.setPageId(pageId);
+ return layoutActionService.createAction(action);
+ }
+
+ private Mono<ActionCollectionDTO> createActionCollectionToPage(Application application, int pageIndex) {
+ ActionCollectionDTO actionCollectionDTO1 = new ActionCollectionDTO();
+ actionCollectionDTO1.setName("TestJsObject");
+ actionCollectionDTO1.setPageId(application.getPages().get(pageIndex).getId());
+ actionCollectionDTO1.setApplicationId(application.getId());
+ actionCollectionDTO1.setWorkspaceId(application.getWorkspaceId());
+ actionCollectionDTO1.setPluginId(jsDatasource.getPluginId());
+ ActionDTO action1 = new ActionDTO();
+ action1.setName("testMethod");
+ action1.setActionConfiguration(new ActionConfiguration());
+ action1.getActionConfiguration().setBody("mockBody");
+ actionCollectionDTO1.setActions(List.of(action1));
+ actionCollectionDTO1.setPluginType(PluginType.JS);
+ return layoutCollectionService.createCollection(actionCollectionDTO1, null);
+ }
+
+ @Test
+ @WithUserDetails("api_user")
+ public void exportApplicationByWhen_WhenGitConnectedAndPageRenamed_QueriesAreInUpdatedResources() {
+ String renamedPageName = "Renamed Page";
+ // create an application
+ Application testApplication = new Application();
+ final String appName = UUID.randomUUID().toString();
+ testApplication.setName(appName);
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setClientSchemaVersion(JsonSchemaVersions.clientVersion);
+ testApplication.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
+
+ Mono<ApplicationJson> applicationJsonMono = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application -> {
+ // add another page to the application
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setName("second_page");
+ pageDTO.setApplicationId(application.getId());
+ return applicationPageService
+ .createPage(pageDTO) // get the updated application
+ .then(applicationService.findById(application.getId()));
+ })
+ .flatMap(application -> {
+ assert application.getPages().size() == 2;
+ // add one action to each of the pages
+ return createActionToPage(
+ "first_page_action",
+ application.getPages().get(0).getId())
+ .then(createActionToPage(
+ "second_page_action",
+ application.getPages().get(1).getId()))
+ .thenReturn(application);
+ })
+ .flatMap(application -> {
+ // add one action collection to each of the pages
+ return createActionCollectionToPage(application, 0)
+ .then(createActionCollectionToPage(application, 1))
+ .thenReturn(application);
+ })
+ .flatMap(application -> {
+ // set git meta data for the application and set a last commit date
+ GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
+ // add buffer of 5 seconds so that the last commit date is definitely after the last updated date
+ gitApplicationMetadata.setLastCommittedAt(Instant.now());
+ application.setGitApplicationMetadata(gitApplicationMetadata);
+ return applicationRepository.save(application);
+ })
+ .delayElement(Duration.ofMillis(
+ 100)) // to make sure the last commit date is definitely after the last updated date
+ .flatMap(application -> {
+ // rename the page
+ ApplicationPage applicationPage = application.getPages().get(0);
+ PageDTO pageDTO = new PageDTO();
+ pageDTO.setName(renamedPageName);
+ return newPageService
+ .updatePage(applicationPage.getId(), pageDTO)
+ // export the application
+ .then(exportApplicationService.exportApplicationById(
+ application.getId(), SerialiseApplicationObjective.VERSION_CONTROL));
+ });
+
+ // verify that the exported json has the updated page name, and the queries are in the updated resources
+ StepVerifier.create(applicationJsonMono)
+ .assertNext(applicationJson -> {
+ Map<String, Set<String>> updatedResources = applicationJson.getUpdatedResources();
+ assertThat(updatedResources).isNotNull();
+ Set<String> updatedPageNames = updatedResources.get(FieldName.PAGE_LIST);
+ Set<String> updatedActionNames = updatedResources.get(FieldName.ACTION_LIST);
+ Set<String> updatedActionCollectionNames = updatedResources.get(FieldName.ACTION_COLLECTION_LIST);
+
+ assertThat(updatedPageNames).isNotNull();
+ assertThat(updatedActionNames).isNotNull();
+ assertThat(updatedActionCollectionNames).isNotNull();
+
+ // only the first page should be present in the updated resources
+ assertThat(updatedPageNames.size()).isEqualTo(1);
+ assertThat(updatedPageNames).contains(renamedPageName);
+
+ // only actions from first page should be present in the updated resources
+ // 1 query + 1 method from action collection
+ assertThat(updatedActionNames.size()).isEqualTo(2);
+ assertThat(updatedActionNames).contains("first_page_action" + NAME_SEPARATOR + renamedPageName);
+ assertThat(updatedActionNames)
+ .contains("TestJsObject.testMethod" + NAME_SEPARATOR + renamedPageName);
+
+ // only action collections from first page should be present in the updated resources
+ assertThat(updatedActionCollectionNames.size()).isEqualTo(1);
+ assertThat(updatedActionCollectionNames)
+ .contains("TestJsObject" + NAME_SEPARATOR + renamedPageName);
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails("api_user")
+ public void exportApplicationByWhen_WhenGitConnectedAndDatasourceRenamed_QueriesAreInUpdatedResources() {
+ // create an application
+ Application testApplication = new Application();
+ final String appName = UUID.randomUUID().toString();
+ testApplication.setName(appName);
+ testApplication.setWorkspaceId(workspaceId);
+ testApplication.setUpdatedAt(Instant.now());
+ testApplication.setLastDeployedAt(Instant.now());
+ testApplication.setClientSchemaVersion(JsonSchemaVersions.clientVersion);
+ testApplication.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
+
+ Mono<ApplicationJson> applicationJsonMono = applicationPageService
+ .createApplication(testApplication, workspaceId)
+ .flatMap(application -> {
+ // add a datasource to the workspace
+ Datasource ds1 = new Datasource();
+ ds1.setName("DS_FOR_RENAME_TEST");
+ ds1.setWorkspaceId(workspaceId);
+ ds1.setPluginId(installedPlugin.getId());
+ final DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+ datasourceConfiguration.setUrl("http://example.org/get");
+ datasourceConfiguration.setHeaders(List.of(new Property("X-Answer", "42")));
+
+ HashMap<String, DatasourceStorageDTO> storages1 = new HashMap<>();
+ storages1.put(
+ defaultEnvironmentId,
+ new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration));
+ ds1.setDatasourceStorages(storages1);
+ return datasourceService.create(ds1).zipWith(Mono.just(application));
+ })
+ .flatMap(objects -> {
+ Datasource datasource = objects.getT1();
+ Application application = objects.getT2();
+
+ // create an action with the datasource
+ ActionDTO action = new ActionDTO();
+ ActionConfiguration actionConfiguration = new ActionConfiguration();
+ actionConfiguration.setHttpMethod(HttpMethod.GET);
+ action.setActionConfiguration(actionConfiguration);
+ action.setDatasource(datasource);
+ action.setName("MyAction");
+ action.setPageId(application.getPages().get(0).getId());
+ return layoutActionService.createAction(action).thenReturn(objects);
+ })
+ .flatMap(objects -> {
+ Application application = objects.getT2();
+ // set git meta data for the application and set a last commit date
+ GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
+ // add buffer of 5 seconds so that the last commit date is definitely after the last updated date
+ gitApplicationMetadata.setLastCommittedAt(Instant.now());
+ application.setGitApplicationMetadata(gitApplicationMetadata);
+ return applicationRepository.save(application).thenReturn(objects);
+ })
+ .delayElement(Duration.ofMillis(
+ 100)) // to make sure the last commit date is definitely after the last updated date
+ .flatMap(objects -> {
+ // rename the datasource
+ Datasource datasource = objects.getT1();
+ Application application = objects.getT2();
+ datasource.setName("DS_FOR_RENAME_TEST_RENAMED");
+ return datasourceService
+ .save(datasource)
+ .then(exportApplicationService.exportApplicationById(
+ application.getId(), SerialiseApplicationObjective.VERSION_CONTROL));
+ });
+
+ // verify that the exported json has the updated page name, and the queries are in the updated resources
+ StepVerifier.create(applicationJsonMono)
+ .assertNext(applicationJson -> {
+ Map<String, Set<String>> updatedResources = applicationJson.getUpdatedResources();
+ assertThat(updatedResources).isNotNull();
+ Set<String> updatedActionNames = updatedResources.get(FieldName.ACTION_LIST);
+ assertThat(updatedActionNames).isNotNull();
+
+ // action should be present in the updated resources although action not updated but datasource is
+ assertThat(updatedActionNames.size()).isEqualTo(1);
+ updatedActionNames.forEach(actionName -> {
+ assertThat(actionName).contains("MyAction");
+ });
+ })
+ .verifyComplete();
+ }
+}
|
48738091e57a4fe8e390478dc0108b6f97acfca1
|
2022-06-01 17:43:03
|
Arpit Mohan
|
chore: Removing jest test coverage because of node version mismatch (#14230)
| false
|
Removing jest test coverage because of node version mismatch (#14230)
|
chore
|
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
index 6630ca66f8f9..fc3bba2eff39 100644
--- a/.github/workflows/client-build.yml
+++ b/.github/workflows/client-build.yml
@@ -99,10 +99,7 @@ jobs:
- name: Run the jest tests
if: github.event_name == 'pull_request'
- uses: hetunandu/Jest-Coverage-Diff@feature/better-report-comments
- with:
- fullCoverageDiff: false
- runCommand: cd app/client && REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
+ run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
# We burn React environment & the Segment analytics key into the build itself.
# This is to ensure that we don't need to configure it in each installation
diff --git a/app/client/README.md b/app/client/README.md
index 21ac1b86ee39..5caedc5141ab 100755
--- a/app/client/README.md
+++ b/app/client/README.md
@@ -1,4 +1,4 @@
# Appsmith Client
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
<br><br>
-For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ClientSetup.md)
\ No newline at end of file
+For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ClientSetup.md)
|
a14df58239a8fdf7ac0bffc08cc1b1b36ae3d39a
|
2023-07-12 15:07:05
|
Valera Melnikov
|
fix: pre-commit logic (#25324)
| false
|
pre-commit logic (#25324)
|
fix
|
diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh
index a0c3b1eaec90..1c149d4b8404 100644
--- a/app/client/.husky/check-staged-files.sh
+++ b/app/client/.husky/check-staged-files.sh
@@ -6,7 +6,12 @@ is_client_change=$(git diff --cached --name-only | grep -c "app/client")
if [ "$is_server_change" -ge 1 ]; then
echo "Running Spotless check ..."
pushd app/server > /dev/null
- (mvn spotless:check 1> /dev/null && popd > /dev/null) || (echo "Spotless check failed, please run mvn spotless:apply" && exit 1)
+ if (mvn spotless:check 1> /dev/null && popd > /dev/null) then
+ popd
+ else
+ echo "Spotless check failed, please run mvn spotless:apply"
+ exit 1
+ fi
else
echo "Skipping server side check..."
fi
|
b797ef77c9fd3cd425f1c06a6447311577350c7e
|
2022-06-17 18:19:27
|
subrata
|
fix: Delete js file and keep the ts file for Cypress tests MySQL (#14054)
| false
|
Delete js file and keep the ts file for Cypress tests MySQL (#14054)
|
fix
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MySQL_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MySQL_spec.js
deleted file mode 100644
index 03a45ecfb0dc..000000000000
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/QueryPane/MySQL_spec.js
+++ /dev/null
@@ -1,88 +0,0 @@
-const datasource = require("../../../../locators/DatasourcesEditor.json");
-const queryEditor = require("../../../../locators/QueryEditor.json");
-const datasourceEditor = require("../../../../locators/DatasourcesEditor.json");
-
-let datasourceName;
-
-describe("Validate CRUD queries for MySQL along with UI flow verifications", function() {
- beforeEach(() => {
- cy.startRoutesForDatasource();
- });
- it("1. Describe Table", function() {
- cy.NavigateToDatasourceEditor();
- cy.get(datasourceEditor.MySQL).click();
- cy.generateUUID().then((uid) => {
- datasourceName = uid;
- cy.get(".t--edit-datasource-name").click();
- cy.get(".t--edit-datasource-name input")
- .clear()
- .type(datasourceName, { force: true })
- .should("have.value", datasourceName)
- .blur();
- cy.getPluginFormsAndCreateDatasource();
- cy.fillMySQLDatasourceForm();
- cy.testSaveDatasource();
- cy.NavigateToActiveDSQueryPane(datasourceName);
- });
- cy.get(queryEditor.queryNameField).type("DescribeTableQuery");
- cy.get(queryEditor.templateMenu).click();
- // mySQL query to fetch data
- cy.get(".CodeMirror textarea")
- .first()
- .focus()
- .type("DESCRIBE users", {
- force: true,
- parseSpecialCharSequences: false,
- });
- cy.WaitAutoSave();
- cy.onlyQueryRun();
- cy.wait("@postExecute").then((xhr) => {
- const response = xhr.response;
- expect(response.body.responseMeta.status).to.eq(200);
- const bodyArr = response.body.data.body;
- cy.log(bodyArr);
- expect(bodyArr[0]).to.have.any.keys("Field");
- });
- cy.deleteQueryUsingContext();
- cy.deleteDatasource(datasourceName);
- });
-
- it("2. Desc Table", function() {
- cy.NavigateToDatasourceEditor();
- cy.get(datasourceEditor.MySQL).click();
- cy.generateUUID().then((uid) => {
- datasourceName = uid;
- cy.get(".t--edit-datasource-name").click();
- cy.get(".t--edit-datasource-name input")
- .clear()
- .type(datasourceName, { force: true })
- .should("have.value", datasourceName)
- .blur();
- cy.getPluginFormsAndCreateDatasource();
- cy.fillMySQLDatasourceForm();
- cy.testSaveDatasource();
- cy.NavigateToActiveDSQueryPane(datasourceName);
- });
- cy.get(queryEditor.queryNameField).type("DescTableQuery");
- cy.get(queryEditor.templateMenu).click();
- // mySQL query to fetch data
- cy.get(".CodeMirror textarea")
- .first()
- .focus()
- .type("DESC users", {
- force: true,
- parseSpecialCharSequences: false,
- });
- cy.WaitAutoSave();
- cy.onlyQueryRun();
- cy.wait("@postExecute").then((xhr) => {
- const response = xhr.response;
- expect(response.body.responseMeta.status).to.eq(200);
- const bodyArr = response.body.data.body;
- cy.log(bodyArr);
- expect(bodyArr[0]).to.have.any.keys("Field");
- });
- cy.deleteQueryUsingContext();
- cy.deleteDatasource(datasourceName);
- });
-});
|
e528286b9db6cd271b3a5eea3dc668ca1c5ca09c
|
2022-08-03 21:18:41
|
NandanAnantharamu
|
test: test for default meta feature (#14872)
| false
|
test for default meta feature (#14872)
|
test
|
diff --git a/app/client/cypress/fixtures/defaultMetaDsl.json b/app/client/cypress/fixtures/defaultMetaDsl.json
new file mode 100644
index 000000000000..0789d7e8cf93
--- /dev/null
+++ b/app/client/cypress/fixtures/defaultMetaDsl.json
@@ -0,0 +1,359 @@
+{
+ "dsl": {
+ "widgetName": "MainContainer",
+ "backgroundColor": "none",
+ "rightColumn": 4896,
+ "snapColumns": 64,
+ "detachFromLayout": true,
+ "widgetId": "0",
+ "topRow": 0,
+ "bottomRow": 1320,
+ "containerStyle": "none",
+ "snapRows": 125,
+ "parentRowSpace": 1,
+ "type": "CANVAS_WIDGET",
+ "canExtend": true,
+ "version": 59,
+ "minHeight": 1292,
+ "dynamicTriggerPathList": [],
+ "parentColumnSpace": 1,
+ "dynamicBindingPathList": [],
+ "leftColumn": 0,
+ "children": [
+ {
+ "width": 456,
+ "height": 240,
+ "canEscapeKeyClose": true,
+ "animateLoading": true,
+ "detachFromLayout": true,
+ "canOutsideClickClose": true,
+ "shouldScrollContents": true,
+ "widgetName": "Modal1",
+ "children": [
+ {
+ "isVisible": true,
+ "widgetName": "Canvas1",
+ "version": 1,
+ "detachFromLayout": true,
+ "type": "CANVAS_WIDGET",
+ "hideCard": true,
+ "isDeprecated": false,
+ "displayName": "Canvas",
+ "key": "jyuwbk7rxc",
+ "canExtend": true,
+ "isDisabled": false,
+ "shouldScrollContents": false,
+ "children": [
+ {
+ "isVisible": true,
+ "iconName": "cross",
+ "buttonVariant": "TERTIARY",
+ "isDisabled": false,
+ "widgetName": "IconButton1",
+ "version": 1,
+ "animateLoading": true,
+ "searchTags": [
+ "click",
+ "submit"
+ ],
+ "type": "ICON_BUTTON_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Icon Button",
+ "key": "8tslbabdat",
+ "iconSVG": "/static/media/icon.1a0c634ac75f9fa6b6ae7a8df882a3ba.svg",
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "iconSize": 24,
+ "widgetId": "jaghpce58a",
+ "renderMode": "CANVAS",
+ "boxShadow": "none",
+ "isLoading": false,
+ "leftColumn": 56,
+ "rightColumn": 64,
+ "topRow": 1,
+ "bottomRow": 5,
+ "parentId": "hiweqgq043",
+ "dynamicBindingPathList": [
+ {
+ "key": "buttonColor"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "onClick": "{{closeModal('Modal1')}}"
+ },
+ {
+ "isVisible": true,
+ "text": "Modal Title",
+ "fontSize": "1.5rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text2",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "searchTags": [
+ "typography",
+ "paragraph"
+ ],
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Text",
+ "key": "htowfcx3sq",
+ "iconSVG": "/static/media/icon.97c59b523e6f70ba6f40a10fc2c7c5b5.svg",
+ "widgetId": "n8w1dzjo2q",
+ "renderMode": "CANVAS",
+ "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "leftColumn": 1,
+ "rightColumn": 41,
+ "topRow": 1,
+ "bottomRow": 5,
+ "parentId": "hiweqgq043",
+ "dynamicBindingPathList": [
+ {
+ "key": "fontFamily"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ]
+ },
+ {
+ "isVisible": true,
+ "animateLoading": true,
+ "text": "Close",
+ "buttonVariant": "SECONDARY",
+ "placement": "CENTER",
+ "widgetName": "Button2",
+ "isDisabled": false,
+ "isDefaultClickDisabled": true,
+ "recaptchaType": "V3",
+ "version": 1,
+ "searchTags": [
+ "click",
+ "submit"
+ ],
+ "type": "BUTTON_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Button",
+ "key": "6kf84n6scg",
+ "iconSVG": "/static/media/icon.cca026338f1c8eb6df8ba03d084c2fca.svg",
+ "buttonStyle": "PRIMARY",
+ "widgetId": "de83eo01s8",
+ "renderMode": "CANVAS",
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none",
+ "isLoading": false,
+ "leftColumn": 32,
+ "rightColumn": 48,
+ "topRow": 16,
+ "bottomRow": 20,
+ "parentId": "hiweqgq043",
+ "dynamicBindingPathList": [
+ {
+ "key": "buttonColor"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "onClick": "{{closeModal('Modal1')}}"
+ },
+ {
+ "isVisible": true,
+ "animateLoading": true,
+ "text": "Confirm",
+ "buttonVariant": "PRIMARY",
+ "placement": "CENTER",
+ "widgetName": "Button3",
+ "isDisabled": false,
+ "isDefaultClickDisabled": true,
+ "recaptchaType": "V3",
+ "version": 1,
+ "searchTags": [
+ "click",
+ "submit"
+ ],
+ "type": "BUTTON_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Button",
+ "key": "6kf84n6scg",
+ "iconSVG": "/static/media/icon.cca026338f1c8eb6df8ba03d084c2fca.svg",
+ "buttonStyle": "PRIMARY_BUTTON",
+ "widgetId": "j8vz30zb6l",
+ "renderMode": "CANVAS",
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none",
+ "isLoading": false,
+ "leftColumn": 48,
+ "rightColumn": 64,
+ "topRow": 16,
+ "bottomRow": 20,
+ "parentId": "hiweqgq043",
+ "dynamicBindingPathList": [
+ {
+ "key": "buttonColor"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ]
+ }
+ ],
+ "minHeight": 0,
+ "widgetId": "hiweqgq043",
+ "renderMode": "CANVAS",
+ "boxShadow": "none",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "isLoading": false,
+ "parentColumnSpace": 1,
+ "parentRowSpace": 1,
+ "leftColumn": 0,
+ "rightColumn": 0,
+ "topRow": 0,
+ "bottomRow": 0,
+ "parentId": "8n6wt8geru",
+ "dynamicBindingPathList": [
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "accentColor"
+ }
+ ]
+ }
+ ],
+ "version": 2,
+ "searchTags": [
+ "dialog",
+ "popup",
+ "notification"
+ ],
+ "type": "MODAL_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Modal",
+ "key": "h09qfvojxw",
+ "iconSVG": "/static/media/icon.4975978e9a961fb0bfb4e38de7ecc7c5.svg",
+ "isCanvas": true,
+ "widgetId": "8n6wt8geru",
+ "renderMode": "CANVAS",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none",
+ "isLoading": false,
+ "parentColumnSpace": 1,
+ "parentRowSpace": 1,
+ "leftColumn": 0,
+ "rightColumn": 0,
+ "topRow": 0,
+ "bottomRow": 0,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "borderRadius"
+ }
+ ]
+ },
+ {
+ "isVisible": true,
+ "text": "Label",
+ "fontSize": "1rem",
+ "fontStyle": "BOLD",
+ "textAlign": "LEFT",
+ "textColor": "#231F20",
+ "truncateButtonColor": "#FFC13D",
+ "widgetName": "Text3",
+ "shouldTruncate": false,
+ "overflow": "NONE",
+ "version": 1,
+ "animateLoading": true,
+ "searchTags": [
+ "typography",
+ "paragraph"
+ ],
+ "type": "TEXT_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Text",
+ "key": "htowfcx3sq",
+ "iconSVG": "/static/media/icon.97c59b523e6f70ba6f40a10fc2c7c5b5.svg",
+ "widgetId": "gvzhzfc0o7",
+ "renderMode": "CANVAS",
+ "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "isLoading": false,
+ "parentColumnSpace": 10.0625,
+ "parentRowSpace": 10,
+ "leftColumn": 10,
+ "rightColumn": 26,
+ "topRow": 94,
+ "bottomRow": 98,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "fontFamily"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ]
+ },
+ {
+ "isVisible": true,
+ "animateLoading": true,
+ "text": "Submit",
+ "buttonVariant": "PRIMARY",
+ "placement": "CENTER",
+ "widgetName": "Button4",
+ "isDisabled": false,
+ "isDefaultClickDisabled": true,
+ "recaptchaType": "V3",
+ "version": 1,
+ "searchTags": [
+ "click",
+ "submit"
+ ],
+ "type": "BUTTON_WIDGET",
+ "hideCard": false,
+ "isDeprecated": false,
+ "displayName": "Button",
+ "key": "6kf84n6scg",
+ "iconSVG": "/static/media/icon.cca026338f1c8eb6df8ba03d084c2fca.svg",
+ "widgetId": "llrt6qi12b",
+ "renderMode": "CANVAS",
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none",
+ "isLoading": false,
+ "parentColumnSpace": 10.0625,
+ "parentRowSpace": 10,
+ "leftColumn": 41,
+ "rightColumn": 57,
+ "topRow": 94,
+ "bottomRow": 98,
+ "parentId": "0",
+ "dynamicBindingPathList": [
+ {
+ "key": "buttonColor"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json
index 45c3842a0693..129ee0323e95 100644
--- a/app/client/cypress/fixtures/testdata.json
+++ b/app/client/cypress/fixtures/testdata.json
@@ -143,5 +143,23 @@
"v2Key": "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI",
"v3Key": "6LcnzQgfAAAAAMwMlQLppqx7STvZ6pZJoDMXti8k",
"invalidKey": "abc123",
- "errorMsg": "Google Re-Captcha token generation failed! Please check the Re-captcha site key."
+ "errorMsg": "Google Re-Captcha token generation failed! Please check the Re-captcha site key.",
+ "treeTextBindingValue": "{{TreeSelect1.selectedOptionValue}}",
+ "multiSelectTextBindingValue": "{{MultiSelect1.selectedOptionValues}}",
+ "tabBindingValue": "{{Tabs1.selectedTab}}",
+ "tableBindingValue": "{{Table1.selectedRow.step}}",
+ "switchGroupBindingValue": "{{SwitchGroup1.selectedValues}}",
+ "switchBindingValue": "{{Switch1.selectedValue}}",
+ "selectBindingValue": "{{Select1.selectedOptionValue}}",
+ "currencyBindingValue": "{{CurrencyInput1.value}}",
+ "multitreeselectBindingValue": "{{MultiTreeSelect1.selectedOptionValues}}",
+ "radiogroupselectBindingValue": "{{RadioGroup1.selectedOptionValue}}",
+ "listBindingValue": "{{List1.selectedItem.id}}",
+ "ratingBindingValue": "{{Rating1.value}}",
+ "checkboxGroupBindingValue": "{{CheckboxGroup1.selectedValues}}",
+ "checkboxBindingValue": "{{Checkbox1.isChecked}}",
+ "audioRecorderBindingValue": "{{AudioRecorder1.isVisible}}",
+ "audioBindingValue": "{{Audio1.autoPlay}}",
+ "phoneBindingValue": "{{PhoneInput1.value}}",
+ "fileBindingValue": "{{FilePicker1.isDirty}}"
}
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/AllWidgets_default_meta_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/AllWidgets_default_meta_spec.js
new file mode 100644
index 000000000000..cffb6c2ccf94
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Widgets/AllWidgets_default_meta_spec.js
@@ -0,0 +1,430 @@
+const explorer = require("../../../../locators/explorerlocators.json");
+const testdata = require("../../../../fixtures/testdata.json");
+const apiwidget = require("../../../../locators/apiWidgetslocator.json");
+const dsl = require("../../../../fixtures/defaultMetaDsl.json");
+const commonlocators = require("../../../../locators/commonlocators.json");
+
+import {
+ WIDGET,
+ PROPERTY_SELECTOR,
+ getWidgetSelector,
+ getWidgetInputSelector,
+} from "../../../../locators/WidgetLocators";
+
+const widgetsToTest = {
+ [WIDGET.MULTISELECT_WIDGET]: {
+ widgetName: "MultiSelect",
+ widgetPrefixName: "MultiSelect1",
+ textBindingValue: "{{MultiSelect1.selectedOptionValues}}",
+ assertWidgetReset: () => {
+ chooseColMultiSelectAndReset();
+ },
+ },
+ [WIDGET.TAB]: {
+ widgetName: "Tab",
+ widgetPrefixName: "Tabs1",
+ textBindingValue: testdata.tabBindingValue,
+ assertWidgetReset: () => {
+ selectTabAndReset();
+ },
+ },
+ [WIDGET.TABLE]: {
+ widgetName: "Table",
+ widgetPrefixName: "Table1",
+ textBindingValue: testdata.tableBindingValue,
+ assertWidgetReset: () => {
+ selectTableAndReset();
+ },
+ },
+ [WIDGET.SWITCHGROUP]: {
+ widgetName: "SwitchGroup",
+ widgetPrefixName: "SwitchGroup1",
+ textBindingValue: testdata.switchGroupBindingValue,
+ assertWidgetReset: () => {
+ selectSwitchGroupAndReset();
+ },
+ },
+ [WIDGET.SWITCH]: {
+ widgetName: "Switch",
+ widgetPrefixName: "Switch1",
+ textBindingValue: testdata.switchBindingValue,
+ assertWidgetReset: () => {
+ selectSwitchAndReset();
+ },
+ },
+ [WIDGET.SELECT]: {
+ widgetName: "Select",
+ widgetPrefixName: "Select1",
+ textBindingValue: testdata.selectBindingValue,
+ assertWidgetReset: () => {
+ selectAndReset();
+ },
+ },
+ [WIDGET.CURRENCY_INPUT_WIDGET]: {
+ widgetName: "CurrencyInput",
+ widgetPrefixName: "CurrencyInput1",
+ textBindingValue: testdata.currencyBindingValue,
+ assertWidgetReset: () => {
+ selectCurrencyInputAndReset();
+ },
+ },
+ [WIDGET.MULTITREESELECT]: {
+ widgetName: "MultiTreeSelect",
+ widgetPrefixName: "MultiTreeSelect1",
+ textBindingValue: testdata.multitreeselectBindingValue,
+ assertWidgetReset: () => {
+ multiTreeSelectAndReset();
+ },
+ },
+ [WIDGET.RADIO_GROUP]: {
+ widgetName: "RadioGroup",
+ widgetPrefixName: "RadioGroup1",
+ textBindingValue: testdata.radiogroupselectBindingValue,
+ assertWidgetReset: () => {
+ radiogroupAndReset();
+ },
+ },
+ [WIDGET.LIST]: {
+ widgetName: "List",
+ widgetPrefixName: "List1",
+ textBindingValue: testdata.listBindingValue,
+ assertWidgetReset: () => {
+ listwidgetAndReset();
+ },
+ },
+ [WIDGET.RATING]: {
+ widgetName: "Rating",
+ widgetPrefixName: "Rating1",
+ textBindingValue: testdata.ratingBindingValue,
+ assertWidgetReset: () => {
+ ratingwidgetAndReset();
+ },
+ },
+ [WIDGET.CHECKBOXGROUP]: {
+ widgetName: "CheckboxGroup",
+ widgetPrefixName: "CheckboxGroup1",
+ textBindingValue: testdata.checkboxGroupBindingValue,
+ assertWidgetReset: () => {
+ checkboxGroupAndReset();
+ },
+ },
+ [WIDGET.CHECKBOX]: {
+ widgetName: "Checkbox",
+ widgetPrefixName: "Checkbox1",
+ textBindingValue: testdata.checkboxBindingValue,
+ assertWidgetReset: () => {
+ checkboxAndReset();
+ },
+ },
+ /*
+ [WIDGET.AUDIO]: {
+ widgetName: "Audio",
+ widgetPrefixName: "Audio1",
+ textBindingValue: testdata.audioBindingValue,
+ assertWidgetReset: () => {
+ audioWidgetAndReset();
+ },
+ },
+ [WIDGET.AUDIORECORDER]: {
+ widgetName: "AudioRecorder",
+ widgetPrefixName: "AudioRecorder1",
+ textBindingValue: testdata.audioRecorderBindingValue,
+ assertWidgetReset: () => {
+ audioRecorderWidgetAndReset();
+ },
+ },
+ */
+ [WIDGET.PHONEINPUT]: {
+ widgetName: "PhoneInput",
+ widgetPrefixName: "PhoneInput1",
+ textBindingValue: testdata.phoneBindingValue,
+ assertWidgetReset: () => {
+ phoneInputWidgetAndReset();
+ },
+ },
+ [WIDGET.FILEPICKER]: {
+ widgetName: "FilePicker",
+ widgetPrefixName: "FilePicker1",
+ textBindingValue: testdata.fileBindingValue,
+ assertWidgetReset: () => {
+ filePickerWidgetAndReset();
+ },
+ },
+};
+
+function chooseColMultiSelectAndReset() {
+ cy.get(".rc-select-selection-overflow").click({ force: true });
+ cy.get(".rc-select-item-option-content:contains('Blue')").click({
+ force: true,
+ });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "BLUE");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "BLUE");
+ });
+}
+
+function selectTabAndReset() {
+ cy.get(".t--tabid-tab2").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "Tab 2");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "Tab 2");
+ });
+}
+
+function selectTableAndReset() {
+ cy.isSelectRow(1);
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "#2");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "#1");
+ });
+}
+
+function selectSwitchGroupAndReset() {
+ cy.get(".bp3-control-indicator")
+ .last()
+ .click({ force: true });
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "RED");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "RED");
+ });
+}
+
+function selectSwitchAndReset() {
+ cy.get(".bp3-control-indicator")
+ .last()
+ .click({ force: true });
+ cy.get(".t--switch-widget-active").should("not.exist");
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(".t--toast-action span").contains("success");
+ cy.get(".t--switch-widget-active").should("be.visible");
+}
+
+function selectAndReset() {
+ cy.get(".select-button").click({ force: true });
+ cy.get(".menu-item-text")
+ .contains("Blue")
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "BLUE");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "BLUE");
+ });
+}
+
+function selectCurrencyInputAndReset() {
+ cy.get(".bp3-input")
+ .click({ force: true })
+ .type("123");
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "123");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "123");
+ });
+}
+
+function multiTreeSelectAndReset() {
+ cy.get(".rc-tree-select-selection-overflow").click({ force: true });
+ cy.get(".rc-tree-select-tree-title:contains('Red')").click({
+ force: true,
+ });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "RED");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "GREEN");
+ });
+}
+
+function radiogroupAndReset() {
+ cy.get("input")
+ .last()
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "N");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "Y");
+ });
+}
+
+function listwidgetAndReset() {
+ cy.get(".t--widget-containerwidget")
+ .eq(1)
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", "002");
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", "001");
+}
+
+function ratingwidgetAndReset() {
+ cy.get(".bp3-icon-star svg")
+ .last()
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "3");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "3");
+ });
+}
+
+function checkboxGroupAndReset() {
+ cy.get("input")
+ .last()
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "RED");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("not.contain.text", "RED");
+ });
+}
+
+function checkboxAndReset() {
+ cy.get("input")
+ .last()
+ .click({ force: true });
+ cy.wait(3000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "false");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "true");
+ });
+}
+
+function audioWidgetAndReset() {
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "false");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+}
+
+function audioRecorderWidgetAndReset() {
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "true");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+}
+
+function phoneInputWidgetAndReset() {
+ cy.get(".bp3-input").type("1234");
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "1234");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(".t--toast-action span").contains("success");
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "");
+ });
+}
+
+function filePickerWidgetAndReset() {
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "false");
+ });
+ cy.get(commonlocators.filePickerInput)
+ .first()
+ .attachFile("testFile.mov");
+ //eslint-disable-next-line cypress/no-unnecessary-waiting
+ cy.wait(500);
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "true");
+ });
+ cy.get("button:contains('Submit')").click({ force: true });
+ cy.wait(1000);
+ cy.get(".t--toast-action span").contains("success");
+ cy.get(commonlocators.textWidgetContainer).each((item, index, list) => {
+ cy.wrap(item).should("contain.text", "false");
+ });
+}
+
+Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig]) => {
+ describe(`${testConfig.widgetName} widget test for validating reset assertWidgetReset`, () => {
+ before(() => {
+ cy.addDsl(dsl);
+ });
+
+ it(`1. DragDrop Widget ${testConfig.widgetName}`, () => {
+ cy.get(explorer.addWidget).click();
+ cy.dragAndDropToCanvas(widgetSelector, { x: 300, y: 200 });
+ cy.get(getWidgetSelector(widgetSelector)).should("exist");
+ });
+
+ it("2. Bind Button on click and Text widget content", () => {
+ // Set onClick assertWidgetReset, storing value
+ cy.openPropertyPane(WIDGET.BUTTON_WIDGET);
+
+ cy.get(PROPERTY_SELECTOR.onClick)
+ .find(".t--js-toggle")
+ .click();
+ cy.updateCodeInput(
+ PROPERTY_SELECTOR.onClick,
+ `{{resetWidget("${testConfig.widgetPrefixName}",true).then(() => showAlert("success"))}}`,
+ );
+ // Bind to stored value above
+ cy.openPropertyPane(WIDGET.TEXT);
+ cy.updateCodeInput(PROPERTY_SELECTOR.text, testConfig.textBindingValue);
+ });
+
+ it("3. Publish the app and check the reset assertWidgetReset", () => {
+ // Set onClick assertWidgetReset, storing value
+ cy.PublishtheApp();
+ testConfig.assertWidgetReset();
+ cy.get(".t--toast-action span").contains("success");
+ });
+
+ it("4. Delete all the widgets on canvas", () => {
+ cy.goToEditFromPublish();
+ cy.get(getWidgetSelector(widgetSelector)).click();
+ cy.get("body").type(`{del}`, { force: true });
+ });
+ });
+});
diff --git a/app/client/cypress/locators/WidgetLocators.ts b/app/client/cypress/locators/WidgetLocators.ts
index bc3a41f3166d..e1d4e7222aef 100644
--- a/app/client/cypress/locators/WidgetLocators.ts
+++ b/app/client/cypress/locators/WidgetLocators.ts
@@ -5,6 +5,23 @@ export const WIDGET = {
CURRENCY_INPUT_WIDGET: "currencyinputwidget",
BUTTON_WIDGET: "buttonwidget",
MULTISELECT_WIDGET: "multiselectwidgetv2",
+ TREESELECT_WIDGET: "singleselecttreewidget",
+ TAB: "tabswidget",
+ TABLE: "tablewidgetv2",
+ SWITCHGROUP: "switchgroupwidget",
+ SWITCH: "switchwidget",
+ SELECT: "selectwidget",
+ MULTITREESELECT: "multiselecttreewidget",
+ RADIO_GROUP: "radiogroupwidget",
+ LIST: "listwidget",
+ RATING: "ratewidget",
+ CHECKBOXGROUP: "checkboxgroupwidget",
+ CHECKBOX: "checkboxwidget",
+ AUDIO: "audiowidget",
+ AUDIORECORDER: "audiorecorderwidget",
+ PHONEINPUT: "phoneinputwidget",
+ CAMERA: "camerawidget",
+ FILEPICKER: "filepickerwidgetv2"
} as const;
export const PROPERTY_SELECTOR = {
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index 00fbbfe2502d..674b118d3598 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -182,5 +182,6 @@
"saveThemeBtn": ".t--save-theme-btn",
"selectThemeBackBtn": ".t--theme-select-back-btn",
"themeAppBorderRadiusBtn": ".t--theme-appBorderRadius",
- "codeEditorWrapper": ".unfocused-code-editor"
+ "codeEditorWrapper": ".unfocused-code-editor",
+ "textWidgetContainer": ".t--text-widget-container"
}
\ No newline at end of file
|
a397c558da332cd8a33b9b15f072255fc4c19db9
|
2024-09-17 18:31:36
|
Abhijeet
|
chore: Refer release base image on pg branch (#36322)
| false
|
Refer release base image on pg branch (#36322)
|
chore
|
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index a388a2f4478d..7dbab8525fb5 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -84,11 +84,7 @@ jobs:
id: set_base_tag
run: |
if [[ "${{ inputs.pr }}" != 0 || "${{ github.ref_name }}" != master ]]; then
- if [[ ${{ inputs.is-pg-build }} == 'true' || "${{ github.ref_name }}" == pg ]]; then
- base_tag=pg
- else
- base_tag=release
- fi
+ base_tag=release
else
base_tag=nightly
fi
|
b82ea06aa35744a91e4b986b789852aa949be46a
|
2021-12-24 17:47:22
|
Parthvi12
|
test: Adding visual tests for layout validation (#9857)
| false
|
Adding visual tests for layout validation (#9857)
|
test
|
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index a09d77618e50..f9c5ac84d97b 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -482,6 +482,12 @@ jobs:
name: cypress-screenshots-${{ matrix.job }}
path: app/client/cypress/screenshots/
+ # Upload the snapshots as artifacts for layout validation
+ - uses: actions/upload-artifact@v1
+ with:
+ name: cypress-snapshots-visualRegression
+ path: app/client/cypress/snapshots/
+
# Upload the log artifact so that it can be used by the test & deploy job in the workflow
- name: Upload server logs bundle on failure
uses: actions/upload-artifact@v2
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js
new file mode 100644
index 000000000000..e2853507c932
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js
@@ -0,0 +1,77 @@
+const homePage = require("../../../../locators/HomePage.json");
+
+describe("Visual regression tests", () => {
+ // for any changes in UI, update the screenshot in snapshot folder, to do so:
+ // 1. Delete the required screenshot which you want to update.
+ // 2. Run test in headless mode with any browser except chrome.(to maintain same resolution in CI)
+ // 3. New screenshot will be generated in the snapshot folder.
+
+ it("Layout validation for app page in edit mode", () => {
+ cy.visit("/applications");
+ cy.wait(3000);
+ cy.get(".t--applications-container .createnew").should("be.visible");
+ cy.get(".t--applications-container .createnew")
+ .first()
+ .click();
+ cy.wait(3000);
+ // taking screenshot of app home page in edit mode
+ cy.get("#root").matchImageSnapshot("apppage");
+ });
+
+ it("Layout validation for Quick page wizard", () => {
+ cy.get(".t--GenerateCRUDPage").click();
+ cy.wait(2000);
+ // taking screenshot of generate crud page
+ cy.get("#root").matchImageSnapshot("quickPageWizard");
+ });
+
+ it("Layout Validation for App builder Page", () => {
+ cy.get(".bp3-icon-chevron-left").click();
+ cy.get(".t--BuildFromScratch").click();
+ cy.wait(2000);
+ // taking screenshot of app builder page
+ cy.get("#root").matchImageSnapshot("emptyAppBuilder");
+ });
+
+ it("Layout Validation for Empty deployed app", () => {
+ cy.PublishtheApp();
+ cy.wait(3000);
+ // taking screenshot of empty deployed app
+ cy.get("#root").matchImageSnapshot("EmptyApp");
+ });
+
+ it("Layout Validation for profile page", () => {
+ cy.get(".t--profile-menu-icon").click();
+ cy.get(".t--edit-profile").click();
+ cy.wait(2000);
+ // taking screenshot of profile page
+ cy.get("#root").matchImageSnapshot("Profile");
+ });
+
+ it("Layout validation for login page", () => {
+ cy.get(homePage.profileMenu).click();
+ cy.get(homePage.signOutIcon).click();
+ cy.wait(500);
+ // validating all the fields on login page
+ cy.get(homePage.headerAppSmithLogo).should("be.visible");
+ cy.xpath("//h1").should("have.text", "Sign in to your account");
+ cy.get(".bp3-label")
+ .first()
+ .should("have.text", "Email ");
+ cy.get(".bp3-label")
+ .last()
+ .should("have.text", "Password ");
+ cy.xpath('//span[text()="sign in"]').should("be.visible");
+ cy.get(".bp3-label")
+ .first()
+ .click();
+ /* cy.xpath("//a")
+ .eq(3)
+ .should("have.text", "Privacy Policy");
+ cy.xpath("//a")
+ .eq(4)
+ .should("have.text", "Terms and conditions"); */
+ // taking screenshot of login page
+ cy.matchImageSnapshot("loginpage");
+ });
+});
diff --git a/app/client/cypress/plugins/index.js b/app/client/cypress/plugins/index.js
index c65001ea24a4..4353f59b029b 100644
--- a/app/client/cypress/plugins/index.js
+++ b/app/client/cypress/plugins/index.js
@@ -6,6 +6,9 @@ const dotenv = require("dotenv");
const chalk = require("chalk");
const cypressLogToOutput = require("cypress-log-to-output");
const { isFileExist } = require("cy-verify-downloads");
+const {
+ addMatchImageSnapshotPlugin,
+} = require("cypress-image-snapshot/plugin");
// ***********************************************************
// This example plugins/index.js can be used to load plugins
@@ -127,3 +130,6 @@ module.exports = (on, config) => {
return config;
};
+module.exports = (on, config) => {
+ addMatchImageSnapshotPlugin(on, config);
+};
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/EmptyApp.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/EmptyApp.snap.png
new file mode 100644
index 000000000000..77b3a60cd340
Binary files /dev/null and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/EmptyApp.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/apppage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/apppage.snap.png
new file mode 100644
index 000000000000..9b8cecd39b4c
Binary files /dev/null and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/apppage.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/emptyAppBuilder.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/emptyAppBuilder.snap.png
new file mode 100644
index 000000000000..89fa50c1c4ce
Binary files /dev/null and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/emptyAppBuilder.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/loginpage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/loginpage.snap.png
new file mode 100644
index 000000000000..64efdc16b6ad
Binary files /dev/null and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/loginpage.snap.png differ
diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/quickPageWizard.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/quickPageWizard.snap.png
new file mode 100644
index 000000000000..efe71acec9c3
Binary files /dev/null and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/LayoutValidation/AppPageLayout.spec.js/quickPageWizard.snap.png differ
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index f91ce10ed6b6..efd38ce7cf7b 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -6,7 +6,9 @@ require("cy-verify-downloads").addCustomCommand();
require("cypress-file-upload");
const dayjs = require("dayjs");
-
+const {
+ addMatchImageSnapshotCommand,
+} = require("cypress-image-snapshot/command");
const loginPage = require("../locators/LoginPage.json");
const signupPage = require("../locators/SignupPage.json");
const homePage = require("../locators/HomePage.json");
@@ -3580,3 +3582,7 @@ Cypress.Commands.add("isInViewport", (element) => {
// return originalFn(element, clearedText, options);
// });
+addMatchImageSnapshotCommand({
+ failureThreshold: 0.2, // threshold for entire image
+ failureThresholdType: "percent",
+});
diff --git a/app/client/package.json b/app/client/package.json
index a52663c66de3..c0fb960009e6 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -246,12 +246,13 @@
"babel-plugin-styled-components": "^1.10.7",
"cra-bundle-analyzer": "^0.1.0",
"craco-babel-loader": "^0.1.4",
+ "cy-verify-downloads": "^0.0.5",
"cypress": "7.6.0",
"cypress-file-upload": "^4.1.1",
+ "cypress-image-snapshot": "^4.0.1",
"cypress-multi-reporters": "^1.2.4",
"cypress-real-events": "^1.5.1",
"cypress-xpath": "^1.4.0",
- "cy-verify-downloads": "^0.0.5",
"dotenv": "^8.1.0",
"eslint": "^7.11.0",
"eslint-config-prettier": "^6.12.0",
|
b261efc511f6a34f16c344048247dd378070db75
|
2021-10-01 21:55:55
|
Pranav Kanade
|
fix: skip bot comment when user skips comments tour (#7693)
| false
|
skip bot comment when user skips comments tour (#7693)
|
fix
|
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 7af2a49ac8f3..16390d2e449f 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
@@ -2,35 +2,7 @@ const commentsLocators = require("../../../../locators/commentsLocators.json");
const commonLocators = require("../../../../locators/commonlocators.json");
const homePage = require("../../../../locators/HomePage.json");
const dsl = require("../../../../fixtures/basicDsl.json");
-
-function setFlagForTour() {
- return new Promise((resolve) => {
- const request = indexedDB.open("Appsmith", 2); // had to use version: 2 here, TODO: check why
- request.onerror = function(event) {
- console.log("Error loading database", event);
- };
- request.onsuccess = function(event) {
- const db = request.result;
- const transaction = db.transaction("keyvaluepairs", "readwrite");
- const objectStore = transaction.objectStore("keyvaluepairs");
- objectStore.put(true, "CommentsIntroSeen");
- resolve();
- };
- });
-}
-
-function typeIntoDraftEditor(selector, text) {
- cy.get(selector).then((input) => {
- var textarea = input.get(0);
- textarea.dispatchEvent(new Event("focus"));
-
- var textEvent = document.createEvent("TextEvent");
- textEvent.initTextEvent("textInput", true, true, null, text);
- textarea.dispatchEvent(textEvent);
-
- textarea.dispatchEvent(new Event("blur"));
- });
-}
+const { typeIntoDraftEditor } = require("./utils");
const newCommentText1 = "new comment text 1";
let commentThreadId;
@@ -40,7 +12,6 @@ let orgName;
describe("Comments", function() {
before(() => {
return cy.wrap(null).then(async () => {
- await setFlagForTour();
cy.NavigateToHome();
cy.generateUUID().then((uid) => {
@@ -64,21 +35,77 @@ describe("Comments", function() {
* - check the unread indicator shows due to unread comments
* publish and check if the comment shows up on view mode
*/
+ it("Skipping comments tour also skips bot comments", function() {
+ cy.generateUUID().then((uid) => {
+ cy.Signup(`${uid}@appsmithtest.com`, uid);
+ });
+ cy.wait(1000);
+ cy.NavigateToHome();
+
+ 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);
+ });
+ cy.CreateAppForOrg(orgName, appName);
+ cy.addDsl(dsl);
+ });
+ cy.get(commonLocators.canvas);
+ cy.get(commentsLocators.switchToCommentModeBtn).click({ force: true });
+ cy.contains("SKIP").click({ force: true });
+ cy.get("input[name='displayName']").type("Skip User");
+ cy.get("button[type='submit']").click();
- it("new comments can be created after switching to comment mode", () => {
- return cy.wrap(null).then(async () => {
- // wait for the page to load
- cy.get(commonLocators.canvas);
- cy.get(commentsLocators.switchToCommentModeBtn).click({ force: true });
-
- // wait for comment mode to be set
- cy.wait(1000);
- cy.get(commonLocators.canvas).click(50, 50);
+ // wait for comment mode to be set
+ cy.wait(1000);
+ cy.get(commonLocators.canvas).click(50, 50);
- typeIntoDraftEditor(commentsLocators.mentionsInput, newCommentText1);
- cy.get(commentsLocators.mentionsInput).type("{enter}");
- await cy.wait("@createNewThread");
+ typeIntoDraftEditor(commentsLocators.mentionsInput, newCommentText1);
+ cy.get(commentsLocators.mentionsInput).type("{enter}");
+ // when user adds first comment, following command will count for the headers of the comment card
+ // in case of "Skip Tour" this has to be 2.
+ cy.get("[data-cy=comments-card-header]")
+ .its("length")
+ .should("eq", 2);
+ });
+ it("Completing comments tour adds bot comment in first thread", function() {
+ cy.generateUUID().then((uid) => {
+ cy.Signup(`${uid}@appsmithtest.com`, uid);
});
+ cy.NavigateToHome();
+
+ 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);
+ });
+ cy.CreateAppForOrg(orgName, appName);
+ cy.addDsl(dsl);
+ });
+ cy.get(commonLocators.canvas);
+ cy.get(commentsLocators.switchToCommentModeBtn).click({ force: true });
+ cy.contains("NEXT").click({ force: true });
+ cy.contains("NEXT").click({ force: true });
+ cy.get("input[name='displayName']").type("Touring User");
+ cy.get("button[type='submit']").click();
+
+ // wait for comment mode to be set
+ cy.wait(1000);
+ cy.get(commentsLocators.switchToCommentModeBtn).click({ force: true });
+ cy.get(commonLocators.canvas).click(50, 50);
+
+ typeIntoDraftEditor(commentsLocators.mentionsInput, newCommentText1);
+ cy.get(commentsLocators.mentionsInput).type("{enter}");
+ cy.get("[data-cy=comments-card-header]")
+ .its("length")
+ .should("eq", 3);
+ cy.contains("Appsmith Bot").should("be.visible");
});
// create another comment since the first one is a private bot thread
@@ -121,6 +148,10 @@ describe("Comments", function() {
cy.get(commentsLocators.switchToCommentModeBtn).click({
force: true,
});
+ // this is needed, as on CI we create new users
+ cy.contains("SKIP").click({ force: true });
+ cy.get("input[name='displayName']").type("Skip User");
+ cy.get("button[type='submit']").click();
cy.get(
`${commentsLocators.inlineCommentThreadPin}${commentThreadId}`,
).click({ force: true });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/utils.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/utils.js
new file mode 100644
index 000000000000..799b5e260012
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/utils.js
@@ -0,0 +1,12 @@
+export function typeIntoDraftEditor(selector, text) {
+ cy.get(selector).then((input) => {
+ var textarea = input.get(0);
+ textarea.dispatchEvent(new Event("focus"));
+
+ var textEvent = document.createEvent("TextEvent");
+ textEvent.initTextEvent("textInput", true, true, null, text);
+ textarea.dispatchEvent(textEvent);
+
+ textarea.dispatchEvent(new Event("blur"));
+ });
+}
diff --git a/app/client/cypress/locators/SignupPage.json b/app/client/cypress/locators/SignupPage.json
new file mode 100644
index 000000000000..71b783826a8f
--- /dev/null
+++ b/app/client/cypress/locators/SignupPage.json
@@ -0,0 +1,5 @@
+{
+ "username":"input[name='email']",
+ "password":"input[name='password']",
+ "submitBtn":"button[type='submit']"
+}
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index c549d270624a..33deea218f67 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -6,6 +6,7 @@ require("cypress-file-upload");
const dayjs = require("dayjs");
const loginPage = require("../locators/LoginPage.json");
+const signupPage = require("../locators/SignupPage.json");
const homePage = require("../locators/HomePage.json");
const pages = require("../locators/Pages.json");
const datasourceEditor = require("../locators/DatasourcesEditor.json");
@@ -414,6 +415,26 @@ Cypress.Commands.add("LogintoApp", (uname, pword) => {
initLocalstorage();
});
+Cypress.Commands.add("Signup", (uname, pword) => {
+ cy.window()
+ .its("store")
+ .invoke("dispatch", { type: "LOGOUT_USER_INIT" });
+ cy.wait("@postLogout");
+
+ cy.visit("/user/signup");
+ cy.get(signupPage.username).should("be.visible");
+ cy.get(signupPage.username).type(uname);
+ cy.get(signupPage.password).type(pword);
+ cy.get(signupPage.submitBtn).click();
+ cy.wait("@getUser");
+ cy.wait("@applications").should(
+ "have.nested.property",
+ "response.body.responseMeta.status",
+ 200,
+ );
+ initLocalstorage();
+});
+
Cypress.Commands.add("LoginFromAPI", (uname, pword) => {
cy.request({
method: "POST",
diff --git a/app/client/src/actions/userActions.ts b/app/client/src/actions/userActions.ts
index cac51068d0a9..15254c794d26 100644
--- a/app/client/src/actions/userActions.ts
+++ b/app/client/src/actions/userActions.ts
@@ -2,7 +2,10 @@ import {
ReduxActionErrorTypes,
ReduxActionTypes,
} from "constants/ReduxActionConstants";
-import { CurrentUserDetailsRequestPayload } from "constants/userConstants";
+import {
+ CommentsOnboardingState,
+ CurrentUserDetailsRequestPayload,
+} from "constants/userConstants";
import {
TokenPasswordUpdateRequest,
UpdateUserRequest,
@@ -67,6 +70,13 @@ export const updateUserDetails = (payload: UpdateUserRequest) => ({
payload,
});
+export const updateUsersCommentOnboardingState = (
+ payload: CommentsOnboardingState,
+) => ({
+ type: ReduxActionTypes.UPDATE_USERS_COMMENTS_ONBOARDING_STATE,
+ payload,
+});
+
export const updatePhoto = (payload: {
file: File;
callback?: () => void;
diff --git a/app/client/src/api/UserApi.tsx b/app/client/src/api/UserApi.tsx
index ef6eaf895bd7..87314b591628 100644
--- a/app/client/src/api/UserApi.tsx
+++ b/app/client/src/api/UserApi.tsx
@@ -1,6 +1,7 @@
import { AxiosPromise } from "axios";
import Api from "api/Api";
import { ApiResponse } from "./ApiResponses";
+import { CommentsOnboardingState } from "../constants/userConstants";
export interface LoginUserRequest {
email: string;
@@ -55,6 +56,10 @@ export interface UpdateUserRequest {
email?: string;
}
+export interface CommentsOnboardingStateRequest {
+ commentOnboardingState: CommentsOnboardingState;
+}
+
export interface CreateSuperUserRequest {
email: string;
name: string;
@@ -83,6 +88,7 @@ class UserApi extends Api {
static photoURL = "v1/users/photo";
static featureFlagsURL = "v1/users/features";
static superUserURL = "v1/users/super";
+ static commentsOnboardingStateURL = `${UserApi.usersURL}/comment/state`;
static createUser(
request: CreateUserRequest,
@@ -170,6 +176,12 @@ class UserApi extends Api {
): AxiosPromise<CreateUserResponse> {
return Api.post(UserApi.superUserURL, request);
}
+
+ static updateUsersCommentOnboardingState(
+ request: CommentsOnboardingStateRequest,
+ ): AxiosPromise<ApiResponse> {
+ return Api.patch(UserApi.commentsOnboardingStateURL, request);
+ }
}
export default UserApi;
diff --git a/app/client/src/comments/CommentCard/CommentCard.tsx b/app/client/src/comments/CommentCard/CommentCard.tsx
index 56bcfb77440b..eb9e9a5ad871 100644
--- a/app/client/src/comments/CommentCard/CommentCard.tsx
+++ b/app/client/src/comments/CommentCard/CommentCard.tsx
@@ -442,7 +442,7 @@ function CommentCard({
</Section>
</CommentSubheader>
)}
- <CommentHeader>
+ <CommentHeader data-cy="comments-card-header">
<HeaderSection>
<ProfileImage
side={25}
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
index e781122c6989..370ec0073623 100644
--- a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
+++ b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx
@@ -11,8 +11,7 @@ import ProgressiveImage, {
import styled, { withTheme } from "styled-components";
import { Theme } from "constants/DefaultTheme";
import { useDispatch, useSelector } from "react-redux";
-import { getFormSyncErrors } from "redux-form";
-import { getFormValues } from "redux-form";
+import { getFormSyncErrors, getFormValues } from "redux-form";
import { isIntroCarouselVisibleSelector } from "selectors/commentsSelectors";
import { getCurrentUser } from "selectors/usersSelectors";
@@ -20,9 +19,10 @@ import { getCurrentUser } from "selectors/usersSelectors";
import { setActiveTour } from "actions/tourActions";
import { TourType } from "entities/Tour";
import { hideCommentsIntroCarousel } from "actions/commentActions";
-import { setCommentsIntroSeen } from "utils/storage";
-
-import { updateUserDetails } from "actions/userActions";
+import {
+ updateUserDetails,
+ updateUsersCommentOnboardingState,
+} from "actions/userActions";
import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
@@ -35,6 +35,7 @@ import stepTwoThumbnail from "assets/images/comments-onboarding/thumbnails/step-
import { setCommentModeInUrl } from "pages/Editor/ToggleModeButton";
import AnalyticsUtil from "utils/AnalyticsUtil";
+import { CommentsOnboardingState } from "constants/userConstants";
const getBanner = (step: number) =>
`${ASSETS_CDN_URL}/comments/step-${step}.png`;
@@ -123,6 +124,7 @@ function IntroStep(props: {
<IntroContentContainer>
<div style={{ marginBottom: props.theme.spaces[4] }}>
<Text
+ data-cy="comments-carousel-header"
style={{
color: props.theme.colors.comments.introTitle,
}}
@@ -233,7 +235,13 @@ export default function CommentsShowcaseCarousel() {
skipped: isSkipped,
});
dispatch(hideCommentsIntroCarousel());
- await setCommentsIntroSeen(true);
+ dispatch(
+ updateUsersCommentOnboardingState(
+ isSkipped
+ ? CommentsOnboardingState.SKIPPED
+ : CommentsOnboardingState.ONBOARDED,
+ ),
+ );
if (!isSkipped) {
const tourType = canManage
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
index af0ce91f3b52..dd2194ab8e2f 100644
--- a/app/client/src/constants/ReduxActionConstants.tsx
+++ b/app/client/src/constants/ReduxActionConstants.tsx
@@ -79,6 +79,8 @@ export const ReduxActionTypes = {
REMOVE_COMMENT_REACTION: "REMOVE_COMMENT_REACTION",
UPLOAD_PROFILE_PHOTO: "UPLOAD_PROFILE_PHOTO",
REMOVE_PROFILE_PHOTO: "REMOVE_PROFILE_PHOTO",
+ UPDATE_USERS_COMMENTS_ONBOARDING_STATE:
+ "UPDATE_USERS_COMMENTS_ONBOARDING_STATE",
HIDE_COMMENTS_INTRO_CAROUSEL: "HIDE_COMMENTS_INTRO_CAROUSEL",
SHOW_COMMENTS_INTRO_CAROUSEL: "SHOW_COMMENTS_INTRO_CAROUSEL",
PROCEED_TO_NEXT_TOUR_STEP: "PROCEED_TO_NEXT_TOUR_STEP",
diff --git a/app/client/src/constants/userConstants.ts b/app/client/src/constants/userConstants.ts
index 729e4b0cc567..b73fa1dfef7b 100644
--- a/app/client/src/constants/userConstants.ts
+++ b/app/client/src/constants/userConstants.ts
@@ -2,6 +2,11 @@ export const ANONYMOUS_USERNAME = "anonymousUser";
type Gender = "MALE" | "FEMALE";
+export enum CommentsOnboardingState {
+ ONBOARDED = "ONBOARDED",
+ SKIPPED = "SKIPPED",
+}
+
export type User = {
email: string;
organizationIds: string[];
@@ -9,6 +14,7 @@ export type User = {
name: string;
gender: Gender;
emptyInstance?: boolean;
+ commentOnboardingState?: CommentsOnboardingState | null;
};
export interface UserApplication {
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/IntroductionModal.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/IntroductionModal.tsx
index 85107cef6a80..8975982eaf8d 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/IntroductionModal.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/IntroductionModal.tsx
@@ -146,12 +146,15 @@ export default function IntroductionModal({ close }: IntroductionModalProps) {
<Wrapper>
<CenteredContainer>
<StyledClose
+ className="t--how-appsmith-works-modal-close"
color="#919397"
icon="cross"
iconSize={16}
onClick={onBuildApp}
/>
- <ModalHeader>{createMessage(HOW_APPSMITH_WORKS)}</ModalHeader>
+ <ModalHeader className="t--how-appsmith-works-modal-header">
+ {createMessage(HOW_APPSMITH_WORKS)}
+ </ModalHeader>
<ModalBody>
<ModalImgWrapper>
<StyledImgWrapper>
diff --git a/app/client/src/pages/Editor/ToggleModeButton.tsx b/app/client/src/pages/Editor/ToggleModeButton.tsx
index e0c5ba5c645e..5bab182018a5 100644
--- a/app/client/src/pages/Editor/ToggleModeButton.tsx
+++ b/app/client/src/pages/Editor/ToggleModeButton.tsx
@@ -26,7 +26,6 @@ import { TourType } from "entities/Tour";
import useProceedToNextTourStep, {
useIsTourStepActive,
} from "utils/hooks/useProceedToNextTourStep";
-import { getCommentsIntroSeen } from "utils/storage";
import { ANONYMOUS_USERNAME, User } from "constants/userConstants";
import { AppState } from "reducers";
import { APP_MODE } from "entities/App";
@@ -119,7 +118,6 @@ const useUpdateCommentMode = async (currentUser?: User) => {
const location = useLocation();
const dispatch = useDispatch();
const isCommentMode = useSelector(commentModeSelector);
-
const setCommentModeInStore = useCallback(
(updatedIsCommentMode) =>
dispatch(setCommentModeAction(updatedIsCommentMode)),
@@ -131,7 +129,6 @@ const useUpdateCommentMode = async (currentUser?: User) => {
const searchParams = new URL(window.location.href).searchParams;
const isCommentMode = searchParams.get("isCommentMode");
- const isCommentsIntroSeen = await getCommentsIntroSeen();
const updatedIsCommentMode = isCommentMode === "true";
const notLoggedId = currentUser?.username === ANONYMOUS_USERNAME;
@@ -146,7 +143,7 @@ const useUpdateCommentMode = async (currentUser?: User) => {
return;
}
- if (updatedIsCommentMode && !isCommentsIntroSeen) {
+ if (updatedIsCommentMode && !currentUser?.commentOnboardingState) {
AnalyticsUtil.logEvent("COMMENTS_ONBOARDING_MODAL_TRIGGERED");
dispatch(showCommentsIntroCarousel());
setCommentModeInUrl(false);
diff --git a/app/client/src/reducers/uiReducers/usersReducer.ts b/app/client/src/reducers/uiReducers/usersReducer.ts
index 012ec5611848..6a8db68421d0 100644
--- a/app/client/src/reducers/uiReducers/usersReducer.ts
+++ b/app/client/src/reducers/uiReducers/usersReducer.ts
@@ -6,7 +6,11 @@ import {
ReduxActionErrorTypes,
} from "constants/ReduxActionConstants";
-import { DefaultCurrentUserDetails, User } from "constants/userConstants";
+import {
+ CommentsOnboardingState,
+ DefaultCurrentUserDetails,
+ User,
+} from "constants/userConstants";
const initialState: UsersReduxState = {
loadingStates: {
@@ -80,7 +84,10 @@ const usersReducer = createReducer(initialState, {
fetchingUser: false,
},
users,
- currentUser: action.payload,
+ currentUser: {
+ ...state.currentUser,
+ ...action.payload,
+ },
};
},
[ReduxActionTypes.FETCH_USER_SUCCESS]: (
@@ -148,6 +155,16 @@ const usersReducer = createReducer(initialState, {
...state,
featureFlagFetched: true,
}),
+ [ReduxActionTypes.UPDATE_USERS_COMMENTS_ONBOARDING_STATE]: (
+ state: UsersReduxState,
+ action: ReduxAction<CommentsOnboardingState>,
+ ) => ({
+ ...state,
+ currentUser: {
+ ...state.currentUser,
+ commentOnboardingState: action.payload,
+ },
+ }),
});
export interface PropertyPanePositionConfig {
diff --git a/app/client/src/sagas/userSagas.tsx b/app/client/src/sagas/userSagas.tsx
index 9ef7a3aca039..201fbc70a532 100644
--- a/app/client/src/sagas/userSagas.tsx
+++ b/app/client/src/sagas/userSagas.tsx
@@ -45,7 +45,10 @@ import PerformanceTracker, {
PerformanceTransactionName,
} from "utils/PerformanceTracker";
import { ERROR_CODES } from "constants/ApiConstants";
-import { ANONYMOUS_USERNAME } from "constants/userConstants";
+import {
+ ANONYMOUS_USERNAME,
+ CommentsOnboardingState,
+} from "constants/userConstants";
import { flushErrorsAndRedirect } from "actions/errorActions";
import localStorage from "utils/localStorage";
import { Toaster } from "components/ads/Toast";
@@ -443,6 +446,18 @@ function* updateFirstTimeUserOnboardingSage() {
}
}
+export function* updateUsersCommentsOnboardingState(
+ action: ReduxAction<CommentsOnboardingState>,
+) {
+ try {
+ yield call(UserApi.updateUsersCommentOnboardingState, {
+ commentOnboardingState: action.payload,
+ });
+ } catch (error) {
+ log.error(error);
+ }
+}
+
export default function* userSagas() {
yield all([
takeLatest(ReduxActionTypes.CREATE_USER_INIT, createUserSaga),
@@ -472,6 +487,10 @@ export default function* userSagas() {
ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
updateFirstTimeUserOnboardingSage,
),
+ takeLatest(
+ ReduxActionTypes.UPDATE_USERS_COMMENTS_ONBOARDING_STATE,
+ updateUsersCommentsOnboardingState,
+ ),
]);
}
diff --git a/app/client/src/utils/storage.ts b/app/client/src/utils/storage.ts
index 3e314d9bbe13..db3af9c0cb78 100644
--- a/app/client/src/utils/storage.ts
+++ b/app/client/src/utils/storage.ts
@@ -153,29 +153,6 @@ export const deleteRecentAppEntities = async (appId: string) => {
}
};
-export const setCommentsIntroSeen = async (flag: boolean) => {
- try {
- await store.setItem(STORAGE_KEYS.COMMENTS_INTRO_SEEN, flag);
- return true;
- } catch (error) {
- log.error("An error occurred when setting COMMENTS_INTRO_SEEN");
- log.error(error);
- return false;
- }
-};
-
-export const getCommentsIntroSeen = async () => {
- try {
- const commentsIntroSeen = (await store.getItem(
- STORAGE_KEYS.COMMENTS_INTRO_SEEN,
- )) as boolean;
- return commentsIntroSeen;
- } catch (error) {
- log.error("An error occurred while fetching COMMENTS_INTRO_SEEN");
- log.error(error);
- }
-};
-
export const setOnboardingFormInProgress = async (flag?: boolean) => {
try {
await store.setItem(STORAGE_KEYS.ONBOARDING_FORM_IN_PROGRESS, flag);
|
63e2240eede2bc5725fb35c70afb14b3cb2d8081
|
2022-06-30 10:28:17
|
Aman Agarwal
|
fix: made blinking cursor transparent for switch datasource (#14899)
| false
|
made blinking cursor transparent for switch datasource (#14899)
|
fix
|
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index 55ceb587e404..0ce68f1c036a 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -286,6 +286,15 @@ const DropdownSelect = styled.div`
& > div {
height: 100%;
}
+
+ & .appsmith-select__input > input {
+ position: relative;
+ bottom: 4px;
+ }
+
+ & .appsmith-select__input > input[value=""] {
+ caret-color: transparent;
+ }
}
`;
|
fd4c99ccf2ae1edc31c200fd3b6f21e098c164b1
|
2022-02-15 13:04:17
|
Tolulope Adetula
|
fix: dropdown propert control (#11041)
| false
|
dropdown propert control (#11041)
|
fix
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CurrencyInput_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CurrencyInput_spec.js
index 4d6423c4916d..6912a54e8217 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CurrencyInput_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CurrencyInput_spec.js
@@ -88,6 +88,14 @@ describe("Currency widget - ", () => {
enterAndTest("100.22", "100.22:100.22:true:string:number:GB:GBP");
cy.get(".t--input-currency-change").should("contain", "£");
});
+ it("should accept 0 decimal option", () => {
+ cy.openPropertyPane(widgetName);
+ cy.selectDropdownValue(".t--property-control-decimals", "0");
+ cy.closePropertyPane();
+ cy.wait(500);
+ cy.openPropertyPane(widgetName);
+ cy.get(".t--property-control-decimals .cs-text").should("have.text", "0");
+ });
it("should check that widget input resets on submit", () => {
cy.openPropertyPane(widgetName);
diff --git a/app/client/src/components/propertyControls/DropDownControl.tsx b/app/client/src/components/propertyControls/DropDownControl.tsx
index 9cef1c567d15..ecb1971808b3 100644
--- a/app/client/src/components/propertyControls/DropDownControl.tsx
+++ b/app/client/src/components/propertyControls/DropDownControl.tsx
@@ -2,6 +2,7 @@ import React from "react";
import BaseControl, { ControlProps } from "./BaseControl";
import { StyledDropDown, StyledDropDownContainer } from "./StyledControls";
import { DropdownOption } from "components/ads/Dropdown";
+import { isNil } from "lodash";
class DropDownControl extends BaseControl<DropDownControlProps> {
render() {
@@ -44,7 +45,7 @@ class DropDownControl extends BaseControl<DropDownControlProps> {
}
onItemSelect = (value?: string): void => {
- if (value) {
+ if (!isNil(value)) {
this.updateProperty(this.props.propertyName, value);
}
};
|
6507f90e051cb90a62640c39245c2c966086b497
|
2024-09-20 12:25:23
|
Rahul Barwal
|
fix: Incorrect updation of selctedRowIndex when primary column is set. (#36393)
| false
|
Incorrect updation of selctedRowIndex when primary column is set. (#36393)
|
fix
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.js
deleted file mode 100644
index e3ca472a8bfb..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import EditorNavigation, {
- EntityType,
-} from "../../../../../support/Pages/EditorNavigation";
-
-const widgetsPage = require("../../../../../locators/Widgets.json");
-const commonlocators = require("../../../../../locators/commonlocators.json");
-const publish = require("../../../../../locators/publishWidgetspage.json");
-const dsl = require("../../../../../fixtures/tableV2AndTextDsl.json");
-
-import * as _ from "../../../../../support/Objects/ObjectsCore";
-
-describe(
- "Table Widget V2 Filtered Table data in autocomplete",
- { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
- function () {
- before("Table Widget V2 Functionality", () => {
- _.agHelper.AddDsl("tableV2AndTextDsl");
- cy.openPropertyPane("tablewidgetv2");
- });
-
- it("1. Table Widget V2 Functionality To Filter and search data", function () {
- cy.get(publish.searchInput).first().type("query");
- cy.get(publish.filterBtn).click({ force: true });
- cy.get(publish.attributeDropdown).click({ force: true });
- cy.get(publish.attributeValue).contains("task").click({ force: true });
- cy.get(publish.conditionDropdown).click({ force: true });
- cy.get(publish.attributeValue)
- .contains("contains")
- .click({ force: true });
- cy.get(publish.tableFilterInputValue).type("bind", { force: true });
- cy.wait(500);
- cy.get(widgetsPage.filterApplyBtn).click({ force: true });
- cy.wait(500);
- cy.get(".t--close-filter-btn").click({ force: true });
- });
-
- it("2. Table Widget V2 Functionality to validate filtered table data", function () {
- EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
- cy.testJsontext("text", "{{Table1.filteredTableData[0].task}}");
- cy.readTableV2data("0", "1").then((tabData) => {
- const tableData = tabData;
- cy.get(commonlocators.labelTextStyle).should("have.text", tableData);
- });
-
- //Table Widget V2 Functionality to validate filtered table data with actual table data
- cy.readTableV2data("0", "1").then((tabData) => {
- const tableData = JSON.parse(dsl.dsl.children[0].tableData);
- cy.get(commonlocators.labelTextStyle).should(
- "have.text",
- tableData[2].task,
- );
- });
- });
- },
-);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts
new file mode 100644
index 000000000000..8a0a2cdaba04
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_FilteredTableData_spec.ts
@@ -0,0 +1,114 @@
+import EditorNavigation, {
+ EntityType,
+ PageLeftPane,
+ PagePaneSegment,
+} from "../../../../../support/Pages/EditorNavigation";
+
+import dsl from "../../../../../fixtures/tableV2AndTextDsl.json";
+import widgetsPage from "../../../../../locators/Widgets.json";
+import commonlocators from "../../../../../locators/commonlocators.json";
+import publish from "../../../../../locators/publishWidgetspage.json";
+
+import { tableDataJSObject } from "../../../../../fixtures/tableV2FilteringWithPrimaryColumnJSObjectWidthData";
+import {
+ agHelper,
+ jsEditor,
+ locators,
+ table,
+} from "../../../../../support/Objects/ObjectsCore";
+
+describe(
+ "Table Widget V2 Filtered Table data in autocomplete",
+ { tags: ["@tag.Widget", "@tag.Table", "@tag.Sanity"] },
+ function () {
+ before("Table Widget V2 Functionality", () => {
+ agHelper.AddDsl("tableV2AndTextDsl");
+ agHelper.GetNClick(locators._widgetInCanvas("tablewidgetv2"));
+ });
+
+ it("1. Table Widget V2 Functionality To Filter and search data", function () {
+ table.SearchTable("query");
+ agHelper.GetNClick(publish.filterBtn, 0, true);
+ agHelper.GetNClick(publish.attributeDropdown, 0, true);
+
+ agHelper
+ .GetElement(publish.attributeValue)
+ .contains("task")
+ .click({ force: true });
+ agHelper.GetNClick(publish.conditionDropdown, 0, true);
+ agHelper
+ .GetElement(publish.attributeValue)
+ .contains("contains")
+ .click({ force: true });
+ agHelper.TypeText(publish.tableFilterInputValue, "bind");
+
+ agHelper.GetNClick(widgetsPage.filterApplyBtn, 0, true);
+ table.CloseFilter();
+ });
+
+ it("2. Table Widget V2 Functionality to validate filtered table data", function () {
+ EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);
+ (cy as any).testJsontext("text", "{{Table1.filteredTableData[0].task}}");
+ table.ReadTableRowColumnData(0, 1, "v2").then((tabData: string) => {
+ agHelper.AssertText(
+ commonlocators.labelTextStyle,
+ "text",
+ tabData as string,
+ );
+ });
+
+ //Table Widget V2 Functionality to validate filtered table data with actual table data
+ const tableData = JSON.parse(dsl.dsl.children[0].tableData as string);
+ agHelper.AssertText(
+ commonlocators.labelTextStyle,
+ "text",
+ tableData[1].task as string,
+ );
+ });
+
+ it("3. When primary key is set, selectedRowIndex should not updated after data update", function () {
+ // https://github.com/appsmithorg/appsmith/issues/36080
+ jsEditor.CreateJSObject(tableDataJSObject, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ prettify: true,
+ });
+ jsEditor.CreateJSObject(manipulateDataJSObject, {
+ paste: true,
+ completeReplace: true,
+ toRun: true,
+ shouldCreateNewJSObj: true,
+ prettify: true,
+ });
+ PageLeftPane.switchSegment(PagePaneSegment.UI);
+
+ agHelper.AddDsl("tableV2FilteringWithPrimaryColumn");
+ table.SearchTable("Engineering");
+ table.ReadTableRowColumnData(2, 0, "v2").then((text) => {
+ expect(text).to.equal("Michael Wilson");
+ });
+
+ table.SelectTableRow(2, 0, true, "v2");
+
+ agHelper.GetText(locators._textWidget, "text").then((text) => {
+ agHelper.ClickButton("Submit");
+
+ table.ReadTableRowColumnData(2, 0, "v2").then((text) => {
+ expect(text).to.equal("Michael Wilson1");
+ });
+ agHelper.AssertText(locators._textWidget, "text", text as string);
+ });
+ });
+ },
+);
+
+export const manipulateDataJSObject = `export default {
+ data: JSObject1.initData,
+ makeNewCopy() {
+ const my = _.cloneDeep(this.data);
+ my[5].name =my[5].name+"1";
+ this.data = my;
+ }
+}`;
diff --git a/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumn.json b/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumn.json
new file mode 100644
index 000000000000..68abd3e84741
--- /dev/null
+++ b/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumn.json
@@ -0,0 +1,449 @@
+{
+ "dsl": {
+ "widgetName": "MainContainer",
+ "backgroundColor": "none",
+ "rightColumn": 4896,
+ "snapColumns": 64,
+ "detachFromLayout": true,
+ "widgetId": "0",
+ "topRow": 0,
+ "bottomRow": 1282,
+ "containerStyle": "none",
+ "snapRows": 124,
+ "parentRowSpace": 1,
+ "type": "CANVAS_WIDGET",
+ "canExtend": true,
+ "version": 90,
+ "minHeight": 1292,
+ "dynamicTriggerPathList": [],
+ "parentColumnSpace": 1,
+ "dynamicBindingPathList": [],
+ "leftColumn": 0,
+ "children": [
+ {
+ "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}",
+ "borderColor": "#E0DEDE",
+ "isVisibleDownload": true,
+ "topRow": 1,
+ "isSortable": true,
+ "type": "TABLE_WIDGET_V2",
+ "inlineEditingSaveOption": "ROW_LEVEL",
+ "animateLoading": true,
+ "dynamicBindingPathList": [
+ {
+ "key": "accentColor"
+ },
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "boxShadow"
+ },
+ {
+ "key": "primaryColumns.name.computedValue"
+ },
+ {
+ "key": "primaryColumns.department.computedValue"
+ },
+ {
+ "key": "primaryColumns.location.computedValue"
+ },
+ {
+ "key": "tableData"
+ },
+ {
+ "key": "primaryColumns.employeeId.computedValue"
+ },
+ {
+ "key": "primaryColumns.position.computedValue"
+ },
+ {
+ "key": "primaryColumns.salary.computedValue"
+ }
+ ],
+ "leftColumn": 0,
+ "delimiter": ",",
+ "defaultSelectedRowIndex": 0,
+ "flexVerticalAlignment": "start",
+ "accentColor": "{{appsmith.theme.colors.primaryColor}}",
+ "isVisibleFilters": true,
+ "isVisible": true,
+ "enableClientSideSearch": true,
+ "version": 2,
+ "totalRecordsCount": 0,
+ "isLoading": false,
+ "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": {
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "boxShadow": "none"
+ },
+ "editActions": {
+ "saveButtonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "saveBorderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "discardButtonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "discardBorderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}"
+ }
+ },
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "columnUpdatedAt": 1726719516718,
+ "primaryColumnId": "employeeId",
+ "defaultSelectedRowIndices": [0],
+ "needsErrorInfo": false,
+ "mobileBottomRow": 35,
+ "widgetName": "Table1",
+ "defaultPageSize": 0,
+ "columnOrder": [
+ "name",
+ "department",
+ "location",
+ "employeeId",
+ "position",
+ "salary"
+ ],
+ "dynamicPropertyPathList": [
+ {
+ "key": "tableData"
+ }
+ ],
+ "bottomRow": 29,
+ "columnWidthMap": {},
+ "parentRowSpace": 10,
+ "mobileRightColumn": 46,
+ "parentColumnSpace": 10.546875,
+ "dynamicTriggerPathList": [],
+ "borderWidth": "1",
+ "primaryColumns": {
+ "name": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 1,
+ "width": 150,
+ "originalId": "name",
+ "id": "name",
+ "alias": "name",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "0.875rem",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "name",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"name\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard"
+ },
+ "department": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 4,
+ "width": 150,
+ "originalId": "department",
+ "id": "department",
+ "alias": "department",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "0.875rem",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "department",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"department\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard"
+ },
+ "location": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 5,
+ "width": 150,
+ "originalId": "location",
+ "id": "location",
+ "alias": "location",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textSize": "0.875rem",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "location",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"location\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard"
+ },
+ "employeeId": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 0,
+ "width": 150,
+ "originalId": "employeeId",
+ "id": "employeeId",
+ "alias": "employeeId",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "number",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "employeeId",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"employeeId\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard",
+ "cellBackground": ""
+ },
+ "position": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 3,
+ "width": 150,
+ "originalId": "position",
+ "id": "position",
+ "alias": "position",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "text",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "position",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"position\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard",
+ "cellBackground": ""
+ },
+ "salary": {
+ "allowCellWrapping": false,
+ "allowSameOptionsInNewRow": true,
+ "index": 5,
+ "width": 150,
+ "originalId": "salary",
+ "id": "salary",
+ "alias": "salary",
+ "horizontalAlignment": "LEFT",
+ "verticalAlignment": "CENTER",
+ "columnType": "number",
+ "textColor": "",
+ "textSize": "0.875rem",
+ "fontStyle": "",
+ "enableFilter": true,
+ "enableSort": true,
+ "isVisible": true,
+ "isDisabled": false,
+ "isCellEditable": false,
+ "isEditable": false,
+ "isCellVisible": true,
+ "isDerived": false,
+ "label": "salary",
+ "isSaveVisible": true,
+ "isDiscardVisible": true,
+ "computedValue": "{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"salary\"]))}}",
+ "sticky": "",
+ "validation": {},
+ "currencyCode": "USD",
+ "decimals": 0,
+ "thousandSeparator": true,
+ "notation": "standard",
+ "cellBackground": ""
+ }
+ },
+ "key": "1vnt7cehmt",
+ "canFreezeColumn": true,
+ "rightColumn": 64,
+ "textSize": "0.875rem",
+ "widgetId": "gt19wbzlit",
+ "minWidth": 450,
+ "tableData": "{{JSObject2.data}}",
+ "label": "Data",
+ "searchKey": "",
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "mobileTopRow": 7,
+ "horizontalAlignment": "LEFT",
+ "isVisibleSearch": true,
+ "responsiveBehavior": "fill",
+ "mobileLeftColumn": 12,
+ "isVisiblePagination": true,
+ "verticalAlignment": "CENTER"
+ },
+ {
+ "needsErrorInfo": false,
+ "mobileBottomRow": 44,
+ "widgetName": "Text1",
+ "topRow": 34,
+ "bottomRow": 38,
+ "parentRowSpace": 10,
+ "type": "TEXT_WIDGET",
+ "mobileRightColumn": 18,
+ "animateLoading": true,
+ "overflow": "NONE",
+ "fontFamily": "{{appsmith.theme.fontFamily.appFont}}",
+ "parentColumnSpace": 10.546875,
+ "dynamicTriggerPathList": [],
+ "leftColumn": 2,
+ "dynamicBindingPathList": [
+ {
+ "key": "truncateButtonColor"
+ },
+ {
+ "key": "fontFamily"
+ },
+ {
+ "key": "borderRadius"
+ },
+ {
+ "key": "text"
+ }
+ ],
+ "shouldTruncate": false,
+ "truncateButtonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "text": "{{Table1.selectedRowIndex}}",
+ "key": "dlet8mfjip",
+ "rightColumn": 18,
+ "textAlign": "LEFT",
+ "dynamicHeight": "AUTO_HEIGHT",
+ "widgetId": "irgoh659po",
+ "minWidth": 450,
+ "isVisible": true,
+ "fontStyle": "BOLD",
+ "textColor": "#231F20",
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "mobileTopRow": 40,
+ "responsiveBehavior": "fill",
+ "originalTopRow": 40,
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "mobileLeftColumn": 2,
+ "maxDynamicHeight": 9000,
+ "originalBottomRow": 44,
+ "fontSize": "1rem",
+ "minDynamicHeight": 4
+ },
+ {
+ "resetFormOnClick": false,
+ "needsErrorInfo": false,
+ "boxShadow": "none",
+ "mobileBottomRow": 44,
+ "widgetName": "Button1",
+ "onClick": "{{JSObject2.makeNewCopy();}}",
+ "buttonColor": "{{appsmith.theme.colors.primaryColor}}",
+ "topRow": 34,
+ "bottomRow": 38,
+ "parentRowSpace": 10,
+ "type": "BUTTON_WIDGET",
+ "mobileRightColumn": 55,
+ "animateLoading": true,
+ "parentColumnSpace": 10.546875,
+ "dynamicTriggerPathList": [
+ {
+ "key": "onClick"
+ }
+ ],
+ "leftColumn": 39,
+ "dynamicBindingPathList": [
+ {
+ "key": "buttonColor"
+ },
+ {
+ "key": "borderRadius"
+ }
+ ],
+ "text": "Submit",
+ "isDisabled": false,
+ "key": "mzyu2305os",
+ "rightColumn": 55,
+ "isDefaultClickDisabled": true,
+ "widgetId": "q29byryymd",
+ "minWidth": 120,
+ "isVisible": true,
+ "recaptchaType": "V3",
+ "version": 1,
+ "parentId": "0",
+ "renderMode": "CANVAS",
+ "isLoading": false,
+ "mobileTopRow": 40,
+ "responsiveBehavior": "hug",
+ "disabledWhenInvalid": false,
+ "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}",
+ "mobileLeftColumn": 39,
+ "buttonVariant": "PRIMARY",
+ "placement": "CENTER"
+ }
+ ]
+ }
+}
diff --git a/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumnJSObjectWidthData.ts b/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumnJSObjectWidthData.ts
new file mode 100644
index 000000000000..67bd37f395d9
--- /dev/null
+++ b/app/client/cypress/fixtures/tableV2FilteringWithPrimaryColumnJSObjectWidthData.ts
@@ -0,0 +1,84 @@
+export const tableDataJSObject = `export default {
+ initData :[
+ {
+ "employeeId": 101,
+ "name": "John Doe",
+ "department": "Engineering",
+ "position": "Software Engineer",
+ "location": "San Francisco",
+ "salary": 120000
+ },
+ {
+ "employeeId": 102,
+ "name": "Jane Smith",
+ "department": "Engineering",
+ "position": "DevOps Engineer",
+ "location": "New York",
+ "salary": 115000
+ },
+ {
+ "employeeId": 103,
+ "name": "Alice Johnson",
+ "department": "Marketing",
+ "position": "Marketing Manager",
+ "location": "Chicago",
+ "salary": 90000
+ },
+ {
+ "employeeId": 104,
+ "name": "Robert Brown",
+ "department": "Sales",
+ "position": "Sales Executive",
+ "location": "Los Angeles",
+ "salary": 95000
+ },
+ {
+ "employeeId": 105,
+ "name": "Linda Davis",
+ "department": "HR",
+ "position": "HR Manager",
+ "location": "San Francisco",
+ "salary": 85000
+ },
+ {
+ "employeeId": 106,
+ "name": "Michael Wilson",
+ "department": "Engineering",
+ "position": "Frontend Developer",
+ "location": "San Francisco",
+ "salary": 105000
+ },
+ {
+ "employeeId": 107,
+ "name": "Emily Clark",
+ "department": "Marketing",
+ "position": "Content Specialist",
+ "location": "Chicago",
+ "salary": 75000
+ },
+ {
+ "employeeId": 108,
+ "name": "David Martinez",
+ "department": "Sales",
+ "position": "Sales Manager",
+ "location": "New York",
+ "salary": 110000
+ },
+ {
+ "employeeId": 109,
+ "name": "Sarah Lee",
+ "department": "HR",
+ "position": "Recruiter",
+ "location": "Los Angeles",
+ "salary": 70000
+ },
+ {
+ "employeeId": 110,
+ "name": "James Anderson",
+ "department": "Engineering",
+ "position": "Backend Developer",
+ "location": "New York",
+ "salary": 118000
+ }
+]
+}`;
diff --git a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
index 19bb9dcc8b35..20f5d00561e5 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
@@ -19,7 +19,6 @@ import {
DEFAULT_BUTTON_COLOR,
DEFAULT_COLUMN_WIDTH,
TABLE_COLUMN_ORDER_KEY,
- ORIGINAL_INDEX_KEY,
} from "../constants";
import { SelectColumnOptionsValidations } from "./propertyUtils";
import type { TableWidgetProps } from "../constants";
@@ -65,13 +64,7 @@ export const getOriginalRowIndex = (
}
if (!!primaryKey && tableData) {
- const selectedRow = tableData.find(
- (row) => row[primaryColumnId] === primaryKey,
- );
-
- if (selectedRow) {
- index = selectedRow[ORIGINAL_INDEX_KEY] as number;
- }
+ index = tableData.findIndex((row) => row[primaryColumnId] === primaryKey);
}
return index;
|
2459607a3ff48d1db1315b2909950b525e9fd563
|
2024-05-20 20:39:33
|
Shrikant Sharat Kandula
|
ci: Move check for new JS Cypress tests to GitHub script (#33560)
| false
|
Move check for new JS Cypress tests to GitHub script (#33560)
|
ci
|
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
index 5619806f78c3..8533c26c6039 100644
--- a/.github/workflows/client-build.yml
+++ b/.github/workflows/client-build.yml
@@ -12,11 +12,6 @@ on:
required: false
type: string
default: "false"
- check-test-files:
- description: "This is a boolean value in case the workflow is being called in build deploy-preview"
- required: false
- type: string
- default: "false"
branch:
description: "This is the branch to be used for the build."
required: false
@@ -27,10 +22,15 @@ on:
type: string
default: "true"
-# Change the working directory for all the jobs in this workflow
+permissions:
+ contents: read
+ pull-requests: write
+
+# Change the working directory for all "run" steps in this workflow
defaults:
run:
working-directory: app/client
+ shell: bash
jobs:
client-build:
@@ -42,10 +42,6 @@ jobs:
github.event_name == 'workflow_dispatch' ||
github.event_name == 'repository_dispatch' ||
github.event_name == 'schedule'
- defaults:
- run:
- working-directory: app/client
- shell: bash
steps:
# The checkout steps MUST happen first because the default directory is set according to the code base.
@@ -90,41 +86,13 @@ jobs:
# get all the files changes in the cypress/e2e folder
- name: Get added files in cypress/e2e folder
- if: inputs.pr != 0 && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
- id: files
- uses: umani/[email protected]
- with:
- repo-token: ${{ secrets.APPSMITH_CI_TEST_PAT }}
- pattern: "app/client/cypress/e2e/.*"
- pr-number: ${{ inputs.pr }}
-
- # Check all the newly added files are in ts
- - name: Check the newly added files are written in ts
- if: inputs.check-test-files == 'true' && inputs.pr != 0 && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
- id: check_files
- run: |
- files=(${{steps.files.outputs.files_created}})
- non_ts_files=()
- for file in "${files[@]}"; do
- if [[ $file != *.ts ]]; then
- non_ts_files+=("<li>$file")
- fi
- done
- echo "non_ts_files=${non_ts_files[@]}" >> $GITHUB_OUTPUT
- echo "non_ts_files_count=${#non_ts_files[@]}" >> $GITHUB_OUTPUT
-
- # Comment in PR if test files are not written in ts and fail the workflow
- - name: Comment in PR if test files are not written in ts
- if: steps.check_files.outputs.non_ts_files_count != 0 && inputs.check-test-files == 'true' && inputs.pr != 0 && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
- uses: peter-evans/create-or-update-comment@v3
+ if: inputs.pr != 0 && steps.changed-files-specific.outputs.any_changed == 'true'
+ uses: actions/github-script@v7
+ env:
+ NODE_PATH: "${{ github.workspace }}/.github/workflows/scripts"
with:
- issue-number: ${{ inputs.pr }}
- body: |
- <b>Below new test files are written in js 🔴 </b>
- <b>Expected format ts. Please fix and retrigger ok-to-test:</b>
- <ol>${{ steps.check_files.outputs.non_ts_files }}</ol>
- - if: steps.check_files.outputs.non_ts_files_count != 0 && inputs.check-test-files == 'true' && inputs.pr != 0 && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
- run: exit 1
+ script: |
+ await require("client-build-compliance.js")({core, github, context})
- name: Get all the added or changed files in client/src folder
if: inputs.ads-compliant-check == 'true' && inputs.pr != 0 && github.pull_request.base.ref == 'release' && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
diff --git a/.github/workflows/pr-cypress.yml b/.github/workflows/pr-cypress.yml
index fb1fa8f50289..5148ca6ca3b2 100644
--- a/.github/workflows/pr-cypress.yml
+++ b/.github/workflows/pr-cypress.yml
@@ -27,7 +27,6 @@ jobs:
secrets: inherit
with:
pr: ${{ github.event.number }}
- check-test-files: "true"
rts-build:
if: success()
diff --git a/.github/workflows/scripts/client-build-compliance.js b/.github/workflows/scripts/client-build-compliance.js
new file mode 100644
index 000000000000..7531ad103720
--- /dev/null
+++ b/.github/workflows/scripts/client-build-compliance.js
@@ -0,0 +1,28 @@
+module.exports = async ({core, github, context}) => {
+ const prNumber = context.payload.inputs.pr;
+
+ const affectedFiles = await github.paginate(github.rest.pulls.listFiles, {
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ pull_number: prNumber,
+ per_page: 100,
+ });
+ console.log(affectedFiles);
+
+ const nonTsFiles = affectedFiles.filter(f => f.status === "added" && f.filename.startsWith("app/client/cypress/e2e/") && !f.filename.endsWith(".ts"));
+ console.log(nonTsFiles);
+
+ if (nonTsFiles.length > 0) {
+ const body = [
+ "🔴 There's new test files in JS, please port to TS and re-trigger Cypress tests:",
+ `1. ${nonTsFiles.map(f => f.filename).join("\n1. ")}`,
+ ].join("\n");
+ github.rest.issues.createComment({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ issue_number: prNumber,
+ body,
+ });
+ core.setFailed("There's new test files in JS\n" + body);
+ }
+};
|
18f3c8765a2cc9c00ad8202a2baea2c2d524e563
|
2023-08-01 19:49:42
|
NandanAnantharamu
|
test: cypress - Flaky fix ListV2_nested_List_widget_spec.js (#25887)
| false
|
cypress - Flaky fix ListV2_nested_List_widget_spec.js (#25887)
|
test
|
diff --git a/app/client/cypress/e2e/GSheet/Misc_Spec.ts b/app/client/cypress/e2e/GSheet/Misc_Spec.ts
index 0ebaf238b715..ced4cb19edb6 100644
--- a/app/client/cypress/e2e/GSheet/Misc_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/Misc_Spec.ts
@@ -123,7 +123,7 @@ describe("GSheet Miscellaneous Tests", function () {
assertHelper.AssertNetworkStatus("@updateLayout", 200);
//deploy the app and verify the table data
- deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE_V1));
+ deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE_V1));
const data = GSHEET_DATA.filter((item) => item.rowIndex === "0")[0];
table.ReadTableRowColumnData(0, 0, "v1").then((cellData) => {
expect(cellData).to.eq(data.uniq_id);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
index c1bb60260f25..b4fb328d7aec 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/ListV2_nested_List_widget_spec.js
@@ -1,5 +1,10 @@
const commonlocators = require("../../../../../locators/commonlocators.json");
-import { agHelper, propPane } from "../../../../../support/Objects/ObjectsCore";
+import {
+ agHelper,
+ assertHelper,
+ entityExplorer,
+ propPane,
+} from "../../../../../support/Objects/ObjectsCore";
const widgetsPage = require("../../../../../locators/Widgets.json");
const widgetSelector = (name) => `[data-widgetname-cy="${name}"]`;
@@ -73,9 +78,8 @@ describe(" Nested List Widgets ", function () {
y: 50,
},
);
- cy.openPropertyPane("textwidget");
-
- cy.updateCodeInput(".t--property-control-text", `{{currentItem.name}}`);
+ entityExplorer.SelectEntityByName("Text1");
+ propPane.UpdatePropertyFieldValue("Text", "{{currentItem.name}}");
cy.dragAndDropToWidgetBySelector(
"textwidget",
@@ -111,7 +115,7 @@ describe(" Nested List Widgets ", function () {
});
agHelper.GetNClickByContains(".CodeMirror-hints", "pageNo", 0, true);
-
+ assertHelper.AssertNetworkStatus("updateLayout");
cy.get(`${widgetSelector("Text2")} .bp3-ui-text span`).should(
"have.text",
"1",
|
a7d31b518e8ba6cfca4ff7d3998e6f4c02291105
|
2025-02-03 18:58:57
|
Apeksha Bhosale
|
chore: added buckets for all appsmith metrics (#38962)
| false
|
added buckets for all appsmith metrics (#38962)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/resources/application.properties b/app/server/appsmith-server/src/main/resources/application.properties
index 9a5be44783a5..ee5af36ee784 100644
--- a/app/server/appsmith-server/src/main/resources/application.properties
+++ b/app/server/appsmith-server/src/main/resources/application.properties
@@ -96,6 +96,7 @@ management.opentelemetry.resource-attributes.deployment.name=${APPSMITH_DEPLOYME
management.tracing.sampling.probability=${APPSMITH_SAMPLING_PROBABILITY:0.1}
management.prometheus.metrics.export.descriptions=true
management.metrics.distribution.slo.http.server.requests=100,200,500,1000,2000,5000,10000,20000,30000
+management.metrics.distribution.slo.appsmith=100,200,500,1000,2000,5000,10000,20000,30000
# Observability and Micrometer related configs
# Keeping this license key around, until later
|
3b45db6df67b7b10a9670eabd5141d56a728e583
|
2024-04-19 10:16:32
|
Nidhi
|
fix: Make git push operation atomic (#32777)
| false
|
Make git push operation atomic (#32777)
|
fix
|
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
index ad0373928cf4..a7a22b4a0ebd 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
@@ -225,6 +225,7 @@ public Mono<String> pushApplication(
StringBuilder result = new StringBuilder("Pushed successfully with status : ");
git.push()
+ .setAtomic(true)
.setTransportConfigCallback(transportConfigCallback)
.setRemote(remoteUrl)
.call()
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 c8aeee333c52..97ef9f8639da 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
@@ -3077,11 +3077,11 @@ private Mono<String> commitAndPushWithDefaultCommit(
auth.getPublicKey(),
auth.getPrivateKey(),
gitArtifactMetadata.getBranchName())
- .map(pushResult -> {
+ .flatMap(pushResult -> {
if (pushResult.contains("REJECTED")) {
- throw new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES);
+ return Mono.error(new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES));
}
- return pushResult;
+ return Mono.just(pushResult);
}));
}
|
4cd14d6286e0b03045063aa31863382fa824cc6a
|
2023-05-10 15:25:26
|
Nilansh Bansal
|
fix: advanced filetype validation (#22808)
| false
|
advanced filetype validation (#22808)
|
fix
|
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index fa8b6c26c91f..ed34c5844300 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -984,6 +984,7 @@ export const ReduxActionErrorTypes = {
INSTALL_LIBRARY_FAILED: "INSTALL_LIBRARY_FAILED",
UNINSTALL_LIBRARY_FAILED: "UNINSTALL_LIBRARY_FAILED",
FETCH_JS_LIBRARIES_FAILED: "FETCH_JS_LIBRARIES_FAILED",
+ USER_PROFILE_PICTURE_UPLOAD_FAILED: "USER_PROFILE_PICTURE_UPLOAD_FAILED",
USER_IMAGE_INVALID_FILE_CONTENT: "USER_IMAGE_INVALID_FILE_CONTENT",
};
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 9104c8f2f201..6cbebdf9811b 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -171,6 +171,8 @@ export const USERS_HAVE_ACCESS_TO_ONLY_THIS_APP = () =>
"Users will only have access to this application";
export const NO_USERS_INVITED = () => "You haven't invited any users yet";
+export const USER_PROFILE_PICTURE_UPLOAD_FAILED = () =>
+ "Unable to upload display picture.";
export const UPDATE_USER_DETAILS_FAILED = () =>
"Unable to update user details.";
export const USER_DISPLAY_PICTURE_FILE_INVALID = () =>
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 70f2ce04a32e..d779835bd52c 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -73,6 +73,7 @@ import type { SegmentState } from "reducers/uiReducers/analyticsReducer";
import type FeatureFlags from "entities/FeatureFlags";
import UsagePulse from "usagePulse";
import { isAirgapped } from "@appsmith/utils/airgapHelpers";
+import { USER_PROFILE_PICTURE_UPLOAD_FAILED } from "ce/constants/messages";
import { UPDATE_USER_DETAILS_FAILED } from "ce/constants/messages";
import { createMessage } from "design-system-old/build/constants/messages";
@@ -486,11 +487,27 @@ export function* updatePhoto(
const response: ApiResponse = yield call(UserApi.uploadPhoto, {
file: action.payload.file,
});
+ if (!response.responseMeta.success) {
+ throw response.responseMeta.error;
+ }
//@ts-expect-error: response is of type unknown
const photoId = response.data?.profilePhotoAssetId; //get updated photo id of iploaded image
if (action.payload.callback) action.payload.callback(photoId);
} catch (error) {
log.error(error);
+
+ const payload: ErrorActionPayload = {
+ show: true,
+ error: {
+ message:
+ (error as any).message ??
+ createMessage(USER_PROFILE_PICTURE_UPLOAD_FAILED),
+ },
+ };
+ yield put({
+ type: ReduxActionErrorTypes.USER_PROFILE_PICTURE_UPLOAD_FAILED,
+ payload,
+ });
}
}
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 a75a412200cd..409cc08f19a2 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
@@ -46,11 +46,32 @@ public class AssetServiceCEImpl implements AssetServiceCE {
MediaType.valueOf("image/vnd.microsoft.icon")
);
+ private static final Set<String> ALLOWED_CONTENT_TYPES_STR = Set.of(
+ MediaType.IMAGE_JPEG_VALUE,
+ MediaType.IMAGE_PNG_VALUE
+ );
+
@Override
public Mono<Asset> getById(String id) {
return repository.findById(id);
}
+ private Boolean checkImageTypeValidation(DataBuffer dataBuffer, MediaType contentType) throws IOException {
+ BufferedImage bufferedImage = ImageIO.read(dataBuffer.asInputStream());
+ if (bufferedImage == null) {
+ /*
+ This is true for SVG and ICO images.
+ If ImageIO.read returns bufferedImage as null and the contentType file extension is .png or .jpeg which
+ means the file is not an image type file rather any other corrupted file but the extension has been
+ changed to .png or .jpeg to upload the flawed file. This is a security vulnerability hence reject
+ */
+ if (ALLOWED_CONTENT_TYPES_STR.contains(contentType.toString())){
+ return false;
+ }
+ }
+ return true;
+ }
+
@Override
public Mono<Asset> upload(List<Part> fileParts, int maxFileSizeKB, boolean isThumbnail) {
fileParts = fileParts.stream().filter(Objects::nonNull).collect(Collectors.toList());
@@ -111,8 +132,13 @@ public Mono<Void> remove(String assetId) {
}
private Asset createAsset(DataBuffer dataBuffer, MediaType srcContentType, boolean createThumbnail) throws IOException {
- byte[] imageData = null;
MediaType contentType = srcContentType;
+ Boolean isValidImage = checkImageTypeValidation(dataBuffer, contentType);
+ if (isValidImage != true) {
+ throw new AppsmithException(AppsmithError.VALIDATION_FAILURE, "Please upload a valid image. Only JPEG, PNG, SVG and ICO are allowed.");
+ }
+
+ byte[] imageData = null;
if (createThumbnail) {
try {
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 d1a93a9497bc..50ca8c824482 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
@@ -176,6 +176,24 @@ public void testUploadProfilePhoto_invalidImageFormat() {
.expectErrorMatches(error -> error instanceof AppsmithException)
.verify();
}
+ /*
+ This test uploads an invalid image (json file for which extension has been changed to .png) and validates the upload failure
+ */
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void testUploadProfilePhoto_invalidImageContent() {
+ FilePart filepart = Mockito.mock(FilePart.class, Mockito.RETURNS_DEEP_STUBS);
+ Flux<DataBuffer> dataBufferFlux = DataBufferUtils
+ .read(new ClassPathResource("test_assets/WorkspaceServiceTest/json_file_to_png.png"), new DefaultDataBufferFactory(), 4096).cache();
+ Mockito.when(filepart.content()).thenReturn(dataBufferFlux);
+ Mockito.when(filepart.headers().getContentType()).thenReturn(MediaType.IMAGE_PNG);
+
+ final Mono<UserData> saveMono = userDataService.saveProfilePhoto(filepart).cache();
+
+ StepVerifier.create(saveMono)
+ .expectErrorMatches(error -> error instanceof AppsmithException)
+ .verify();
+ }
@Test
@WithUserDetails(value = "api_user")
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/json_file_to_png.png b/app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/json_file_to_png.png
new file mode 100644
index 000000000000..96d09a9515a4
--- /dev/null
+++ b/app/server/appsmith-server/src/test/resources/test_assets/WorkspaceServiceTest/json_file_to_png.png
@@ -0,0 +1,166 @@
+{
+ "newPage": {
+ "id": "testPageId",
+ "applicationId": "testApplicationId",
+ "defaultResources": {
+ "pageId" : "testPageId"
+ },
+ "unpublishedPage": {
+ "name": "TestPage",
+ "layouts": [
+ {
+ "id": "testLayoutId",
+ "viewMode": false,
+ "dsl": {
+ "widgetName": "MainContainer",
+ "children": []
+ },
+ "layoutOnLoadActions": [],
+ "widgetNames": [
+ "MainContainer"
+ ],
+ "allOnPageLoadActionNames": [],
+ "actionsUsedInDynamicBindings": [],
+ "deleted": false,
+ "policies": []
+ }
+ ]
+ },
+ "publishedPage": {
+ "name": "TestPage",
+ "layouts": [
+ {
+ "id": "testLayoutId",
+ "viewMode": false,
+ "dsl": {
+ "widgetName": "MainContainer",
+ "children": []
+ },
+ "widgetNames": [
+ "MainContainer"
+ ],
+ "deleted": false,
+ "policies": []
+ }
+ ]
+ }
+ },
+ "actionCollectionWithAction": {
+ "id": "testCollectionId",
+ "applicationId": "testApplicationId",
+ "workspaceId": "testWorkspaceId",
+ "unpublishedCollection": {
+ "name": "testCollection",
+ "pageId": "testPageId",
+ "pluginId": "testPluginId",
+ "defaultToBranchedActionIdsMap": [
+ {
+ "defaultTestActionId1": "testActionId1"
+ },
+ {
+ "defaultTestActionId2": "testActionId2"
+ }
+ ],
+ "actions": [
+ {
+ "id": "testActionId1"
+ },
+ {
+ "id": "testActionId2"
+ }
+ ]
+ },
+ "publishedCollection": {
+ "name": "testCollection",
+ "pageId": "testPageId",
+ "pluginId": "testPluginId",
+ "defaultToBranchedActionIdsMap": [
+ {
+ "defaultTestActionId1": "testActionId1"
+ }
+ ]
+ }
+ },
+ "actionCollectionDTOWithModifiedActions": {
+ "id": "testCollectionId",
+ "applicationId": "testApplicationId",
+ "workspaceId": "testWorkspaceId",
+ "name": "testCollection",
+ "pageId": "testPageId",
+ "pluginId": "testPluginId",
+ "defaultToBranchedActionIdsMap": [
+ {
+ "defaultTestActionId1": "testActionId1"
+ },
+ {
+ "defaultTestActionId3": "testActionId3"
+ }
+ ],
+ "defaultToBranchedArchivedActionIdsMap": [
+ {
+ "defaultTestActionId2": "testActionId2"
+ }
+ ],
+ "actions": [
+ {
+ "id": "testActionId1"
+ },
+ {
+ "id": "testActionId3"
+ }
+ ],
+ "archivedActions": [
+ {
+ "id": "testActionId2"
+ }
+ ]
+ },
+ "actionCollectionAfterModifiedActions": {
+ "id": "testCollectionId",
+ "applicationId": "testApplicationId",
+ "workspaceId": "testWorkspaceId",
+ "unpublishedCollection": {
+ "id": "testCollectionId",
+ "workspaceId": "testWorkspaceId",
+ "name": "testCollection",
+ "pageId": "testPageId",
+ "pluginId": "testPluginId",
+ "defaultToBranchedActionIdsMap": [
+ {
+ "defaultTestActionId1": "testActionId1"
+ },
+ {
+ "defaultTestActionId3": "testActionId3"
+ }
+ ],
+ "defaultToBranchedArchivedActionIdsMap": [
+ {
+ "defaultTestActionId2": "testActionId2"
+ }
+ ],
+ "actions": [
+ {
+ "id": "testActionId1"
+ },
+ {
+ "id": "testActionId3"
+ }
+ ],
+ "archivedActions": [
+ {
+ "id": "testActionId2"
+ }
+ ]
+ },
+ "publishedCollection": {
+ "name": "testCollection",
+ "pageId": "testPageId",
+ "pluginId": "testPluginId",
+ "defaultToBranchedActionIdsMap": [
+ {
+ "defaultTestActionId1": "testActionId1"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
|
9304a568d5471e610ecd4374cc434e66b4d8fe9c
|
2023-07-07 12:22:06
|
NandanAnantharamu
|
test: Cypress- js to ts migration tests for Dynamic Height feature (#24328)
| false
|
Cypress- js to ts migration tests for Dynamic Height feature (#24328)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
similarity index 66%
rename from app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
index 31bdc7c57ab8..c6bd9d115abb 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Error_handling_spec.ts
@@ -1,4 +1,3 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
import {
agHelper,
entityExplorer,
@@ -6,6 +5,8 @@ import {
deployMode,
apiPage,
draggableWidgets,
+ assertHelper,
+ locators,
} from "../../../../support/Objects/ObjectsCore";
describe("Test Create Api and Bind to Button widget", function () {
@@ -21,28 +22,19 @@ describe("Test Create Api and Bind to Button widget", function () {
entityExplorer.SelectEntityByName("Button1");
propPane.EnterJSContext("onClick", "{{Api1.run()}}");
deployMode.DeployApp();
-
- cy.wait(2000);
+ agHelper.Sleep(2000);
agHelper.ClickButton("Submit");
- cy.wait("@postExecute")
- .its("response.body.responseMeta.status")
- .should("eq", 200);
-
- cy.get(commonlocators.toastAction)
- .should("have.length", 1)
- .should("contain.text", "failed to execute");
+ assertHelper.AssertNetworkStatus("@postExecute", 200);
+ agHelper.ValidateToastMessage("failed to execute", 0, 1);
deployMode.NavigateBacktoEditor();
//With Error handling
entityExplorer.SelectEntityByName("Button1");
propPane.EnterJSContext("onClick", "{{Api1.run(() => {}, () => {})}}");
deployMode.DeployApp();
-
- cy.wait(2000);
+ agHelper.Sleep(2000);
agHelper.ClickButton("Submit");
- cy.wait("@postExecute")
- .its("response.body.responseMeta.status")
- .should("eq", 200);
- cy.get(commonlocators.toastAction).should("not.exist");
+ assertHelper.AssertNetworkStatus("@postExecute", 200);
+ agHelper.AssertElementAbsence(locators._toastMsg);
});
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.js
deleted file mode 100644
index fa8f5f7e3c62..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation with limits", function () {
- it("1. Validate change in auto height with limits width for widgets and highlight section validation", function () {
- agHelper.AddDsl("dynamicHeightContainerdsl");
- entityExplorer.SelectEntityByName("Container1");
- cy.get(commonlocators.generalSectionHeight).should("be.visible");
- cy.changeLayoutHeight(commonlocators.autoHeightWithLimits);
- cy.wait(3000);
- //cy.checkMinDefaultValue(commonlocators.minHeight,"4")
- //cy.testJsontext(commonlocators.minHeight, "5");
- //cy.get(commonlocators.overlayMin).should("be.visible");
- cy.get("[data-testid='t--auto-height-overlay-handles-min']").trigger(
- "mouseover",
- );
- cy.contains("Min-Height: 10 rows");
- cy.get("[data-testid='t--auto-height-overlay-handles-min']").should(
- "be.visible",
- );
- cy.get("[data-testid='t--auto-height-overlay-handles-min'] div")
- .eq(0)
- .should("have.css", "background-color", "rgb(243, 43, 139)");
- /*cy.get(commonlocators.overlayMin).should(
- "have.css",
- "background-color",
- "rgba(243, 43, 139, 0.1)",
- );*/
- cy.get("[data-testid='t--auto-height-overlay-handles-max']").trigger(
- "mouseover",
- );
- cy.contains("Max-Height: 12 rows");
- //cy.checkMaxDefaultValue(commonlocators.maxHeight,"40")
- //cy.testJsontext(commonlocators.maxHeight, "60");
- cy.get("[data-testid='t--auto-height-overlay-handles-max']").should(
- "be.visible",
- );
- cy.get("[data-testid='t--auto-height-overlay-handles-max'] div")
- .eq(0)
- .should("have.css", "background-color", "rgb(243, 43, 139)");
- //cy.contains("Max-Height: 60 rows");
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.changeLayoutHeight(commonlocators.autoHeightWithLimits);
- //cy.contains("Min-Height: 5 rows");
- //cy.checkMinDefaultValue(commonlocators.minHeight,"5")
- // cy.checkMaxDefaultValue(commonlocators.maxHeight,"60")
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.ts
new file mode 100644
index 000000000000..08c6172322a2
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_Limit_spec.ts
@@ -0,0 +1,26 @@
+import {
+ entityExplorer,
+ agHelper,
+ propPane,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation with limits", function () {
+ it("1. Validate change in auto height with limits width for widgets and highlight section validation", function () {
+ agHelper.AddDsl("dynamicHeightContainerdsl");
+
+ entityExplorer.SelectEntityByName("Container1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height with limits");
+ agHelper.HoverElement(propPane._autoHeightLimitMin);
+ agHelper.AssertContains("Min-Height: 10 rows");
+ agHelper.AssertCSS(
+ propPane._autoHeightLimitMin_div,
+ "background-color",
+ "rgb(243, 43, 139)",
+ 0,
+ );
+ agHelper.HoverElement(propPane._autoHeightLimitMax);
+ agHelper.AssertContains("Max-Height: 12 rows");
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ propPane.SelectPropertiesDropDown("height", "Auto Height with limits");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.js
deleted file mode 100644
index 626388a23505..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.js
+++ /dev/null
@@ -1,128 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- afterEach(() => {
- agHelper.SaveLocalStorageCache();
- });
-
- beforeEach(() => {
- agHelper.RestoreLocalStorageCache();
- });
-
- it("1. Validate change with auto height width for widgets", function () {
- agHelper.AddDsl("dynamicHeightContainerCheckboxdsl");
- entityExplorer.SelectEntityByName("Container1", "Widgets");
- //cy.changeLayoutHeight(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("CheckboxGroup1", "Container1");
- cy.moveToStyleTab();
- cy.get(".t--property-control-fontsize .rc-select")
- .invoke("css", "font-size")
- .then((dropdownFont) => {
- cy.get(".t--property-control-fontsize input").last().click({
- force: true,
- });
- cy.get(".rc-select-item-option-content")
- .should("have.length.greaterThan", 2)
- .its("length")
- .then((n) => {
- for (let i = 0; i < n; i++) {
- cy.get(".rc-select-item-option-content")
- .eq(i)
- .invoke("css", "font-size")
- .then((selectedFont) => {
- expect(dropdownFont).to.equal(selectedFont);
- });
- }
- });
- });
- cy.get(".t--property-control-fontsize .rc-select")
- .invoke("css", "font-family")
- .then((dropdownFont) => {
- //cy.get(".t--property-control-fontsize .remixicon-icon").click({ force: true })
- cy.get(".t--dropdown-option span")
- .should("have.length.greaterThan", 2)
- .its("length")
- .then((n) => {
- for (let i = 0; i < n; i++) {
- cy.get(".t--dropdown-option span")
- .eq(i)
- .invoke("css", "font-family")
- .then((selectedFont) => {
- expect(dropdownFont).to.equal(selectedFont);
- });
- }
- });
- });
- cy.moveToContentTab();
- //cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((height) => {
- cy.get(".t--widget-checkboxgroupwidget")
- .invoke("css", "height")
- .then((checkboxheight) => {
- cy.get(commonlocators.addOption).click();
- cy.wait(200);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(3000);
- cy.get(".t--widget-checkboxgroupwidget")
- .invoke("css", "height")
- .then((newcheckboxheight) => {
- expect(checkboxheight).to.not.equal(newcheckboxheight);
- });
- });
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((newheight) => {
- expect(height).to.not.equal(newheight);
- });
- });
- });
- it("2. Validates checkbox bounding box is the same as the space it occupies", function () {
- cy.get(".t--widget-checkboxwidget")
- .invoke("css", "height")
- .then((newcheckboxheight) => {
- expect("40px").to.equal(newcheckboxheight);
- });
- cy.get(".t--widget-checkboxwidget .resize-wrapper")
- .invoke("css", "height")
- .then((resizeHeight) => expect("36px").to.equal(resizeHeight));
- });
-
- it("3. Validate container with auto height and child widgets with fixed height", function () {
- agHelper.AddDsl("dynamicHeigthContainerFixedDsl");
- //cy.openPropertyPane("containerwidget");
- //cy.changeLayoutHeight(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("CheckboxGroup1", "Container1");
- cy.get(commonlocators.generalSectionHeight)
- .scrollIntoView()
- .should("be.visible");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("Input1");
- cy.get(commonlocators.generalSectionHeight)
- .scrollIntoView()
- .should("be.visible");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((height) => {
- entityExplorer.SelectEntityByName("Container1", "Widgets");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(4000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((newheight) => {
- expect(height).to.not.equal(newheight);
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.ts
new file mode 100644
index 000000000000..72219999edd5
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Auto_Height_spec.ts
@@ -0,0 +1,141 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ afterEach(() => {
+ agHelper.SaveLocalStorageCache();
+ });
+
+ beforeEach(() => {
+ agHelper.RestoreLocalStorageCache();
+ });
+
+ it("1. Validate change with auto height width for widgets", function () {
+ agHelper.AddDsl("dynamicHeightContainerCheckboxdsl");
+
+ entityExplorer.SelectEntityByName("Container1", "Widgets");
+ entityExplorer.SelectEntityByName("CheckboxGroup1", "Container1");
+ propPane.MoveToTab("Style");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ `${locators._propertyControl}${locators._fontSelect}`,
+ "font-size",
+ )
+ .then((dropdownFont) => {
+ agHelper
+ .GetElement(`${locators._propertyControl}${locators._fontInput}`)
+ .last()
+ .click({
+ force: true,
+ });
+ agHelper
+ .GetElement(propPane._optionContent)
+ .should("have.length.greaterThan", 2)
+ .its("length")
+ .then((n) => {
+ for (let i = 0; i < n; i++) {
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ propPane._optionContent,
+ "font-size",
+ i,
+ )
+ .then((selectedFont) => {
+ expect(dropdownFont).to.equal(selectedFont);
+ });
+ }
+ });
+ });
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ `${locators._propertyControl}${locators._fontSelect}`,
+ "font-family",
+ )
+ .then((dropdownFont) => {
+ agHelper
+ .GetElement(propPane._dropdownOptionSpan)
+ .should("have.length.greaterThan", 2)
+ .its("length")
+ .then((n) => {
+ for (let i = 0; i < n; i++) {
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ propPane._dropdownOptionSpan,
+ "font-family",
+ i,
+ )
+ .then((selectedFont) => {
+ expect(dropdownFont).to.equal(selectedFont);
+ });
+ }
+ });
+ });
+ propPane.MoveToTab("Content");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((currentContainerHeight) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+ )
+ .then((currentCheckboxheight) => {
+ agHelper.GetNClick(propPane._addOptionProperty);
+ agHelper.Sleep(200);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ agHelper.Sleep(3000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+ )
+ .then((updatedCheckboxheight) => {
+ expect(currentCheckboxheight).to.not.equal(
+ updatedCheckboxheight,
+ );
+ });
+ });
+ agHelper.Sleep(2000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedContainerHeight) => {
+ expect(currentContainerHeight).to.not.equal(updatedContainerHeight);
+ });
+ });
+ });
+
+ it("2. Validate container with auto height and child widgets with fixed height", function () {
+ agHelper.AddDsl("dynamicHeigthContainerFixedDsl");
+
+ entityExplorer.SelectEntityByName("CheckboxGroup1", "Container1");
+ agHelper.AssertElementVisible(propPane._propertyPaneHeightLabel);
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Input1");
+ agHelper.AssertElementVisible(propPane._propertyPaneHeightLabel);
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((currentHeight: number) => {
+ entityExplorer.SelectEntityByName("Container1", "Widgets");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.Sleep(4000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedHeight: number) => {
+ expect(currentHeight).to.not.equal(updatedHeight);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.js
deleted file mode 100644
index 0f9896536511..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.js
+++ /dev/null
@@ -1,69 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation with multiple containers and text widget", function () {
- it("1. Validate change with auto height width for widgets", function () {
- const textMsg =
- "Dynamic panel validation for text widget wrt height Dynamic panel validation for text widget wrt height Dynamic panel validation for text widget wrt height";
- agHelper.AddDsl("dynamicHeightCanvasResizeDsl");
- cy.get(".t--widget-containerwidget")
- .eq(0)
- .invoke("css", "height")
- .then((oheight) => {
- cy.get(".t--widget-textwidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- entityExplorer.SelectEntityByName("Text1", "Container1");
- cy.get(".t--widget-textwidget")
- .invoke("css", "height")
- .then((theight) => {
- //Changing the text label
- cy.testCodeMirror(textMsg);
- cy.moveToStyleTab();
- cy.ChangeTextStyle(
- this.dataSet.TextHeading,
- commonlocators.headingTextStyle,
- textMsg,
- );
- cy.wait("@updateLayout");
- cy.get(".t--widget-textwidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- cy.get(".t--widget-containerwidget")
- .eq(0)
- .invoke("css", "height")
- .then((newcheight) => {
- expect(oheight).to.not.equal(newcheight);
- cy.moveToContentTab();
- const modifierKey =
- Cypress.platform === "darwin" ? "meta" : "ctrl";
- cy.get(".CodeMirror textarea")
- .first()
- .focus()
- .type(`{${modifierKey}}a`)
- .then(($cm) => {
- if ($cm.val() !== "") {
- cy.get(".CodeMirror textarea").first().clear({
- force: true,
- });
- }
- });
- cy.wait("@updateLayout");
- cy.wait(4000);
- cy.get(".t--widget-containerwidget")
- .eq(0)
- .invoke("css", "height")
- .then((updatedcheight) => {
- expect(oheight).to.equal(updatedcheight);
- });
- });
- });
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.ts
new file mode 100644
index 000000000000..18f0df3b51a2
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/CanvasHeight_resize_spec.ts
@@ -0,0 +1,77 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation with multiple containers and text widget", function () {
+ it("1. Validate change with auto height width for widgets", function () {
+ let textMsg =
+ "Dynamic panel validation for text widget wrt height Dynamic panel validation for text widget wrt height Dynamic panel validation for text widget wrt height";
+ agHelper.AddDsl("dynamicHeightCanvasResizeDsl");
+
+ // Select the Outer container and capture initial height
+ entityExplorer.SelectEntityByName("Container1");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((initialContainerHeight: number) => {
+ // Select the Text Widget and capture its initial height
+ entityExplorer.SelectEntityByName("Text1", "Container1");
+ agHelper.Sleep(1000);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TEXT))
+ .then((initialTextWidgetHeight: number) => {
+ // Change the text label based on the textMsg above
+ propPane.UpdatePropertyFieldValue("Text", textMsg);
+ propPane.MoveToTab("Style");
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ // Select the Text Widget and capture its updated height post change of text label
+ entityExplorer.SelectEntityByName("Text1");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ )
+ .then((updatedTextWidgetHeight: number) => {
+ // Asserts the change in height from initial height of text widget wrt updated height
+ expect(initialTextWidgetHeight).to.not.equal(
+ updatedTextWidgetHeight,
+ );
+ // Select the outer Container Widget and capture its updated height post change of text label
+ entityExplorer.SelectEntityByName("Container1");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedContainerHeight: number) => {
+ // Asserts the change in height from initial height of container widget wrt updated height
+ expect(initialContainerHeight).to.not.equal(
+ updatedContainerHeight,
+ );
+ entityExplorer.SelectEntityByName("Text1");
+ propPane.MoveToTab("Content");
+ // Clear Text Label
+ propPane.RemoveText("Text");
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ entityExplorer.SelectEntityByName("Container1");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((revertedContainerHeight: number) => {
+ // Asserts the change in height from updated height of container widget wrt current height
+ // As the text label is cleared the reverted height should be equal to initial height
+ expect(initialContainerHeight).to.equal(
+ revertedContainerHeight,
+ );
+ });
+ });
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.js
deleted file mode 100644
index be98656c54d0..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- it("1. Validate change with auto height width for widgets", function () {
- const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
- agHelper.AddDsl("DynamicHeightDefaultHeightdsl");
- entityExplorer.SelectEntityByName("Container1");
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((height) => {
- entityExplorer.SelectEntityByName("Button1", "Container1");
- cy.get("body").type("{del}", { force: true });
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((newheight) => {
- expect(height).to.not.equal(newheight);
- expect(newheight).to.equal("100px");
- cy.get("body").type(`{${modifierKey}}z`);
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((oheight) => {
- expect(oheight).to.equal(height);
- expect(oheight).to.not.equal(newheight);
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.ts
new file mode 100644
index 000000000000..be984217c67e
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Container_collapse_undo_redoSpec.ts
@@ -0,0 +1,42 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ it("1. Validate change with auto height width for widgets", function () {
+ const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+ agHelper.AddDsl("DynamicHeightDefaultHeightdsl");
+
+ entityExplorer.SelectEntityByName("Container1");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((initialContainerHeight: number) => {
+ // Select the Text Widget and capture its initial height
+ entityExplorer.SelectEntityByName("Button1", "Container1");
+ agHelper.PressDelete();
+ agHelper.WaitUntilAllToastsDisappear();
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedContainerHeight: number) => {
+ expect(initialContainerHeight).to.not.equal(updatedContainerHeight);
+ expect(updatedContainerHeight).to.equal("100px");
+ agHelper.TypeText(locators._body, `{${modifierKey}}z`, 0, true);
+ agHelper.Sleep(2000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((CurrentContainerHeight: number) => {
+ expect(CurrentContainerHeight).to.equal(initialContainerHeight);
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.js
deleted file mode 100644
index 1189f6ed4c44..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- deployMode,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation for Visibility", function () {
- before(() => {
- agHelper.AddDsl("invisibleWidgetdsl");
- });
- it("1. Validating visbility/invisiblity of widget with dynamic height feature", function () {
- //changing the Text Name and verifying
- cy.wait(3000);
- entityExplorer.SelectEntityByName("Container1", "Widgets");
- cy.changeLayoutHeightWithoutWait(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("Input1", "Container1");
- cy.changeLayoutHeightWithoutWait(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("Input2", "Container1");
- cy.changeLayoutHeightWithoutWait(commonlocators.autoHeight);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(commonlocators.checkboxIndicator).click({ force: true });
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.equal(tnewheight);
- cy.get("label:Contains('On')").should("not.be.enabled");
- });
- });
- deployMode.DeployApp();
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(".bp3-control-indicator").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- cy.get("label:Contains('On')").should("not.exist");
- cy.get("label:Contains('Off')").should("be.visible");
- cy.get(".bp3-control-indicator").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .invoke("css", "height")
- .then((tonheight) => {
- expect(tonheight).to.not.equal(tnewheight);
- cy.get("label:Contains('Off')").should("not.exist");
- cy.get("label:Contains('On')").should("be.visible");
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.ts
new file mode 100644
index 000000000000..e000c388c4a0
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/DynamicHeight_Visibility_spec.ts
@@ -0,0 +1,76 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ deployMode,
+ propPane,
+ pageSettings,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation for Visibility", function () {
+ before(() => {
+ agHelper.AddDsl("invisibleWidgetdsl");
+ });
+ it("1. Validating visbility/invisiblity of widget with dynamic height feature", function () {
+ //changing the Text Name and verifying
+ entityExplorer.SelectEntityByName("Container1", "Widgets");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Input1", "Container1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Input2", "Container1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.Sleep(2000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((currentContainerHeight: number) => {
+ agHelper.GetNClick(locators._widgetInCanvas("checkboxwidget"));
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedContainerHeight: number) => {
+ expect(currentContainerHeight).to.equal(updatedContainerHeight);
+ agHelper
+ .GetElement(propPane._labelContains("On"))
+ .should("not.be.enabled");
+ // agHelper.AssertElementEnabledDisabled(
+ // locators._labelContains("On"),0,true
+ //);
+ });
+ });
+ deployMode.DeployApp();
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((currentContainerHeight: number) => {
+ agHelper.GetNClick(pageSettings.locators._setHomePageToggle);
+ agHelper.Sleep(2000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((updatedContainerHeight: number) => {
+ expect(currentContainerHeight).to.not.equal(updatedContainerHeight);
+ agHelper.AssertElementAbsence(propPane._labelContains("On"));
+ agHelper.AssertElementVisible(propPane._labelContains("Off"));
+ agHelper.GetNClick(pageSettings.locators._setHomePageToggle);
+ agHelper.Sleep(2000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((currentContainerHeight: number) => {
+ expect(currentContainerHeight).to.not.equal(
+ updatedContainerHeight,
+ );
+ agHelper.AssertElementAbsence(propPane._labelContains("Off"));
+ agHelper.AssertElementVisible(propPane._labelContains("On"));
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.js
deleted file mode 100644
index 4c0e352b6eef..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- it("1. Validate change with auto height width for Form/Switch", function () {
- agHelper.AddDsl("dynamicHeightFormSwitchdsl");
- entityExplorer.SelectEntityByName("Form1", "Widgets");
- cy.get(".t--widget-formwidget")
- .invoke("css", "height")
- .then((formheight) => {
- cy.changeLayoutHeight(commonlocators.autoHeight);
- entityExplorer.SelectEntityByName("SwitchGroup1", "Form1");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.get(".t--widget-switchgroupwidget")
- .invoke("css", "height")
- .then((switchheight) => {
- cy.get(".t--widget-formwidget")
- .invoke("css", "height")
- .then((newformheight) => {
- //expect(formheight).to.not.equal(newformheight)
- cy.updateCodeInput(
- ".t--property-control-options",
- `[
- {
- "label": "Blue",
- "value": "BLUE"
- },
- {
- "label": "Green",
- "value": "GREEN"
- },
- {
- "label": "Red",
- "value": "RED"
- },
- {
- "label": "Yellow",
- "value": "YELLOW"
- },
- {
- "label": "Purple",
- "value": "PURPLE"
- },
- {
- "label": "Pink",
- "value": "PINK"
- },
- {
- "label": "Black",
- "value": "BLACK"
- },
- {
- "label": "Grey",
- "value": "GREY"
- },
- {
- "label": "Orange",
- "value": "ORANGE"
- },
- {
- "label": "Cream",
- "value": "CREAM"
- }
- ]`,
- );
- cy.get(".t--widget-switchgroupwidget")
- .invoke("css", "height")
- .then((newswitchheight) => {
- cy.get(".t--widget-formwidget")
- .invoke("css", "height")
- .then((updatedformheight) => {
- expect(newformheight).to.not.equal(updatedformheight);
- expect(switchheight).to.not.equal(newswitchheight);
- });
- });
- });
- });
- });
- cy.get(".t--draggable-switchgroupwidget .bp3-control-indicator")
- .first()
- .click({ force: true });
- cy.wait(3000);
- cy.get(".t--modal-widget").should("have.length", 1);
- cy.get(".t--widget-propertypane-toggle").last().click({ force: true });
- //cy.changeLayoutHeight(commonlocators.autoHeightWithLimits);
- //cy.checkMinDefaultValue(commonlocators.minHeight,"4")
- //cy.checkMaxDefaultValue(commonlocators.maxHeight,"24")
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(3000);
- cy.get("button:contains('Close')").click({ force: true });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.ts
new file mode 100644
index 000000000000..dbeb14859de4
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Form_With_SwitchGroup_spec.ts
@@ -0,0 +1,79 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ pageSettings,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ it("1. Validate change with auto height width for Form/Switch", function () {
+ agHelper.AddDsl("dynamicHeightFormSwitchdsl");
+
+ entityExplorer.SelectEntityByName("Form1", "Widgets");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.FORM))
+ .then((formheight) => {
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("SwitchGroup1", "Form1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.SWITCHGROUP),
+ )
+ .then((CurrentSwitchHeight) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.FORM),
+ )
+ .then((CurrentFormHeight) => {
+ agHelper.UpdateCodeInput(
+ locators._controlOption,
+ `[
+ {"label": "Blue","value": "BLUE"},
+ { "label": "Green","value": "GREEN"},
+ {"label": "Red","value": "RED"},
+ { "label": "Yellow","value": "YELLOW"},
+ {"label": "Purple","value": "PURPLE"},
+ {"label": "Pink","value": "PINK"},
+ {"label": "Black","value": "BLACK"},
+ {"label": "Grey","value": "GREY"},
+ {"label": "Orange","value": "ORANGE"},
+ {"label": "Cream","value": "CREAM"}
+ ]`,
+ );
+ agHelper.Sleep(3000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.SWITCHGROUP),
+ )
+ .then((UpdatedSwitchHeight: number) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.FORM),
+ )
+ .then((UpdatedFormHeight: number) => {
+ expect(CurrentFormHeight).to.not.equal(
+ UpdatedFormHeight,
+ );
+ expect(CurrentSwitchHeight).to.not.equal(
+ UpdatedSwitchHeight,
+ );
+ });
+ });
+ });
+ });
+ });
+ agHelper.GetNClick(
+ `${locators._widgetInDeployed(draggableWidgets.SWITCHGROUP)} ${
+ pageSettings.locators._setHomePageToggle
+ }`,
+ );
+ agHelper.AssertElementLength(locators._modal, 1);
+ //propPane.TogglePropertyState("Switch","On");
+ entityExplorer.SelectEntityByName("Modal1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.GetNClick(locators._closeModal, 0, true);
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Invisible_Widgets_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Invisible_Widgets_spec.ts
index 9da79c1dffd8..d274bccd6e94 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Invisible_Widgets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Invisible_Widgets_spec.ts
@@ -1,71 +1,79 @@
-import { ObjectsRegistry } from "../../../../support/Objects/Registry";
-
-const { AggregateHelper, CommonLocators, DeployMode } = ObjectsRegistry;
+import {
+ locators,
+ agHelper,
+ deployMode,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
describe("Fixed Invisible widgets and auto height containers", () => {
before(() => {
// Create a page with a divider below a button widget and a checkbox widget below a filepicker widget
// Button widget and filepicker widgets are fixed height widgets
- AggregateHelper.AddDsl("autoHeightInvisibleWidgetsDSL");
+ agHelper.AddDsl("autoHeightInvisibleWidgetsDSL");
});
it("1. Divider should be below Button Widget in edit mode", () => {
// This test checks for the height of the button widget and the filepicker widget
// As well as the top value for the widgets below button and filepicker (divider and checkbox respectively)
- cy.get(CommonLocators._widgetInDeployed("buttonwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.BUTTON),
"height",
"230px",
+ 0,
);
- cy.get(CommonLocators._widgetInDeployed("filepickerwidgetv2")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.FILEPICKER),
"height",
"90px",
+ 0,
);
-
- cy.get(CommonLocators._widgetInDeployed("dividerwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.DIVIDER),
"top",
"246px",
+ 0,
);
- cy.get(CommonLocators._widgetInDeployed("checkboxwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOX),
"top",
"96px",
+ 0,
);
});
it("2. Divider should move up by the height of the button widget in preview mode", () => {
// This tests if the divider and checkbox widget move up by an appropriate amount in preview mode.
- AggregateHelper.AssertElementVisible(
- CommonLocators._previewModeToggle("edit"),
- );
- AggregateHelper.GetNClick(CommonLocators._previewModeToggle("edit"));
+ agHelper.AssertElementVisible(locators._previewModeToggle("edit"));
+ agHelper.GetNClick(locators._previewModeToggle("edit"));
- cy.get(CommonLocators._widgetInDeployed("dividerwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.DIVIDER),
"top",
"16px",
+ 0,
);
- cy.get(CommonLocators._widgetInDeployed("checkboxwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOX),
"top",
"6px",
+ 0,
);
});
it("3. Divider should move up by the height of the button widget in view mode", () => {
// This tests if the divider and checkbox widget move up by an appropriate amount in view mode.
- DeployMode.DeployApp();
- cy.get(CommonLocators._widgetInDeployed("dividerwidget")).should(
- "have.css",
+ deployMode.DeployApp();
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.DIVIDER),
"top",
"16px",
+ 0,
);
- cy.get(CommonLocators._widgetInDeployed("checkboxwidget")).should(
- "have.css",
+ agHelper.AssertCSS(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOX),
"top",
"6px",
+ 0,
);
});
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.js
deleted file mode 100644
index c1ef0be534c6..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.js
+++ /dev/null
@@ -1,54 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- it("1. Validate change with auto height width for JsonForm", function () {
- agHelper.AddDsl("jsonFormDynamicHeightDsl");
- entityExplorer.SelectEntityByName("JSONForm1", "Widgets");
- cy.get(".t--widget-jsonformwidget")
- .invoke("css", "height")
- .then((formheight) => {
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(5000);
- cy.get(".t--widget-jsonformwidget")
- .invoke("css", "height")
- .then((newformheight) => {
- expect(formheight).to.not.equal(newformheight);
- cy.get(".t--show-column-btn").eq(0).click({ force: true });
- cy.get(".t--show-column-btn").eq(1).click({ force: true });
- cy.get(".t--show-column-btn").eq(2).click({ force: true });
- // cy.get("[data-testid='t--resizable-handle-TOP']")
- // .within(($el) => {
- // cy.window().then((win) => {
- // const after = win.getComputedStyle($el[0], "::after");
- // expect(after).not.to.exist
- // });
- // });
- // cy.get("[data-testid='t--resizable-handle-BOTTOM']").should("not.exist");
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.wait(5000);
- cy.get(".t--widget-jsonformwidget")
- .invoke("css", "height")
- .then((updatedformheight) => {
- expect(newformheight).to.not.equal(updatedformheight);
- cy.get(".t--show-column-btn").eq(2).click({ force: true });
- cy.get(".t--show-column-btn").eq(1).click({ force: true });
- // cy.get("[data-testid='t--resizable-handle-TOP']").should("exist");
- // cy.get("[data-testid='t--resizable-handle-BOTTOM']").should("exist");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(5000);
- cy.get(".t--widget-jsonformwidget")
- .invoke("css", "height")
- .then((newupdatedformheight) => {
- expect(updatedformheight).to.not.equal(
- newupdatedformheight,
- );
- });
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
new file mode 100644
index 000000000000..0f72dfe11476
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/JsonForm_spec.ts
@@ -0,0 +1,51 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ it("1. Validate change with auto height width for JsonForm", function () {
+ agHelper.AddDsl("jsonFormDynamicHeightDsl");
+
+ entityExplorer.SelectEntityByName("JSONForm1", "Widgets");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.JSONFORM))
+ .then((initialFormheight: number) => {
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.Sleep(5000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.JSONFORM),
+ )
+ .then((updatedFormheight: number) => {
+ expect(initialFormheight).to.not.equal(updatedFormheight);
+ agHelper.GetNClick(propPane._showColumnButton, 0);
+ agHelper.GetNClick(propPane._showColumnButton, 1);
+ agHelper.GetNClick(propPane._showColumnButton, 2);
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ agHelper.Sleep(5000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.JSONFORM),
+ )
+ .then((reUpdatedFormheight: number) => {
+ expect(updatedFormheight).to.not.equal(reUpdatedFormheight);
+ agHelper.GetNClick(propPane._showColumnButton, 2);
+ agHelper.GetNClick(propPane._showColumnButton, 1);
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.Sleep(5000);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.JSONFORM),
+ )
+ .then((currentformheight: number) => {
+ expect(reUpdatedFormheight).to.not.equal(currentformheight);
+ });
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.js
deleted file mode 100644
index c1c071747c75..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- it("1. Validate change with auto height width for List widgets", function () {
- agHelper.AddDsl("ResizeListDsl");
-
- entityExplorer.SelectEntityByName("Tab 1", "Tabs1");
- entityExplorer.SelectEntityByName("List1", "Tab 1");
- cy.get(".t--widget-listwidgetv2")
- .invoke("css", "height")
- .then((lheight) => {
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.moveToStyleTab();
- cy.testJsontext("itemspacing\\(px\\)", "16");
- cy.get(".t--widget-listwidgetv2")
- .invoke("css", "height")
- .then((newheight) => {
- expect(lheight).to.equal(newheight);
- cy.get(".rc-pagination:contains('5')").should("exist");
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.ts
new file mode 100644
index 000000000000..66ffa3c4f290
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_Resizing_spec.ts
@@ -0,0 +1,30 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ it("1. Validate change with auto height width for List widgets", function () {
+ agHelper.AddDsl("ResizeListDsl");
+
+ entityExplorer.SelectEntityByName("Tab 1", "Tabs1");
+ entityExplorer.SelectEntityByName("List1", "Tab 1");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.LIST_V2))
+ .then((currentListHeight: number) => {
+ propPane.MoveToTab("Style");
+ propPane.UpdatePropertyFieldValue("Item Spacing (px)", "16");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.LIST_V2),
+ )
+ .then((updatedListHeight: number) => {
+ expect(currentListHeight).to.equal(updatedListHeight);
+ agHelper.GetNAssertContains(locators._pagination, "5");
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.js
deleted file mode 100644
index b5b982f2d374..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.js
+++ /dev/null
@@ -1,147 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-const explorer = require("../../../../locators/explorerlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation list widget", function () {
- it("1. Validate change with auto height width for list widgets", function () {
- const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
- const textMsg = "Dynamic panel validation for text widget wrt height";
- agHelper.AddDsl("DynamicHeightListTextDsl");
- cy.get(explorer.addWidget).click();
- cy.dragAndDropToCanvas("multiselecttreewidget", { x: 300, y: 500 });
- entityExplorer.SelectEntityByName("List1", "Widgets");
- //Widgets which were not possible to be added to list widget cannot be pasted/moved into the list widget with multitreeselect
- entityExplorer.SelectEntityByName("MultiTreeSelect1", "Widgets");
- cy.get("body").type(`{${modifierKey}}c`);
- cy.get(".Toastify__toast-body span").should("not.exist");
- entityExplorer.SelectEntityByName("List1", "Widgets");
- cy.moveToStyleTab();
- cy.get("body").type(`{${modifierKey}}v`);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(".Toastify__toast-body span").should(
- "contain.text",
- "This widget cannot be used inside the list widget.",
- );
- cy.get(".t--widget-listwidget")
- .invoke("css", "height")
- .then((lheight) => {
- //Widgets within list widget have no dynamic height
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- //Widgets within list widget in existing applications have no dynamic height
- entityExplorer.SelectEntityByName("Container1", "List1");
- entityExplorer.SelectEntityByName("Text1", "Container1");
-
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.testCodeMirror(textMsg);
- entityExplorer.SelectEntityByName("Container1", "List1");
- entityExplorer.SelectEntityByName("Text2", "Container1");
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.testCodeMirror(textMsg);
- cy.get(".t--widget-listwidget")
- .invoke("css", "height")
- .then((newheight) => {
- expect(lheight).to.equal(newheight);
- });
- cy.get(
- ".t--entity-item:contains('List1') .t--entity-collapse-toggle",
- ).click({ force: true });
- entityExplorer.SelectEntityByName("Container1", "List1");
-
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- //Widgets when moved into the list widget have no dynamic height
- entityExplorer.SelectEntityByName("Text3", "Widgets");
- cy.moveToStyleTab();
-
- cy.get("body").type(`{${modifierKey}}c`);
- entityExplorer.SelectEntityByName("List1", "Widgets");
- cy.moveToStyleTab();
- cy.wait(500);
- cy.get("body").type(`{${modifierKey}}v`);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(2000);
- entityExplorer.NavigateToSwitcher("Explorer");
- cy.selectEntityByName("Text3Copy");
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.get("body").type(`{${modifierKey}}c`);
- cy.get("[data-testid='div-selection-0']").click({ force: true });
- cy.get("body").type(`{${modifierKey}}v`);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- //Widgets when moved out of the list widget have dynamic height in property pane
- entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
- cy.wait(2000);
- cy.get(commonlocators.generalSectionHeight).should("be.visible");
- cy.get(".t--widget-textwidget").first().click({ force: true });
- cy.get(".t--widget-textwidget")
- .first()
- .invoke("css", "height")
- .then((height) => {
- cy.log("height", height);
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(3000);
- cy.get(".t--widget-textwidget").first().click({ force: true });
- cy.get(".t--widget-textwidget")
- .first()
- .wait(1000)
- .invoke("css", "height")
- .then((newheight) => {
- cy.log("newheight", newheight);
- expect(height).to.not.equal(newheight);
- });
- });
- entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
- cy.wait(2000);
- cy.get("body").type(`{${modifierKey}}c`);
- entityExplorer.SelectEntityByName("List1", "Widgets");
- cy.moveToStyleTab();
- cy.wait(500);
- cy.get("body").type(`{${modifierKey}}v`);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(2000);
-
- //Widgets when copied and pasted into the list widget no longer have dynamic height
- entityExplorer.SelectEntityByName("Text3CopyCopyCopy", "Container1");
- cy.wait(2000);
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- entityExplorer.SelectEntityByName("Text3CopyCopy");
- cy.wait(2000);
- cy.get("body").type(`{${modifierKey}}x`);
- entityExplorer.SelectEntityByName("List1");
- cy.moveToStyleTab();
- cy.wait(500);
- cy.get("body").type(`{${modifierKey}}v`);
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(2000);
- entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
- cy.wait(2000);
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.ts
new file mode 100644
index 000000000000..e4d77b605ad2
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_TextWidget_Spec.ts
@@ -0,0 +1,111 @@
+import {
+ entityExplorer,
+ agHelper,
+ locators,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation list widget", function () {
+ it("1. Validate change with auto height width for list widgets", function () {
+ const modifierKey = Cypress.platform === "darwin" ? "meta" : "ctrl";
+ const textMsg = "Dynamic panel validation for text widget wrt height";
+ agHelper.AddDsl("DynamicHeightListTextDsl");
+
+ entityExplorer.DragDropWidgetNVerify("multiselecttreewidget", 300, 500);
+ entityExplorer.SelectEntityByName("List1", "Widgets");
+ //Widgets which were not possible to be added to list widget cannot be pasted/moved into the list widget with multitreeselect
+ entityExplorer.SelectEntityByName("MultiTreeSelect1", "List1");
+ agHelper.TypeText(locators._body, `{${modifierKey}}c`, 0, true);
+ agHelper.WaitUntilAllToastsDisappear();
+ agHelper.Sleep(2000);
+ entityExplorer.SelectEntityByName("List1", "Widgets");
+ propPane.MoveToTab("Style");
+ agHelper.TypeText(locators._body, `{${modifierKey}}v`, 0, true);
+ agHelper.ValidateToastMessage(
+ "This widget cannot be used inside the list widget.",
+ 0,
+ 1,
+ );
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.LIST))
+ .then((currentListHeight: number) => {
+ //Widgets within list widget have no dynamic height
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ //Widgets within list widget in existing applications have no dynamic height
+ entityExplorer.SelectEntityByName("Container1", "List1");
+ entityExplorer.SelectEntityByName("Text1", "Container1");
+
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ propPane.UpdatePropertyFieldValue("Text", textMsg, true);
+ entityExplorer.SelectEntityByName("Container1", "List1");
+ entityExplorer.SelectEntityByName("Text2", "Container1");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ propPane.UpdatePropertyFieldValue("Text", textMsg, true);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.LIST))
+ .then((updatedListHeight: number) => {
+ expect(currentListHeight).to.equal(updatedListHeight);
+ });
+ entityExplorer.SelectEntityByName("Container1", "List1");
+
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ //Widgets when moved into the list widget have no dynamic height
+ entityExplorer.SelectEntityByName("Text3", "Widgets");
+ propPane.MoveToTab("Style");
+ agHelper.TypeText(locators._body, `{${modifierKey}}c`, 0, true);
+ entityExplorer.SelectEntityByName("List1", "Widgets");
+ propPane.MoveToTab("Style");
+ agHelper.TypeText(locators._body, `{${modifierKey}}v`, 0, true);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ entityExplorer.NavigateToSwitcher("Explorer");
+ entityExplorer.SelectEntityByName("Text3Copy");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ agHelper.TypeText(locators._body, `{${modifierKey}}c`, 0, true);
+ //agHelper.GetElement(locators._body).click({ force: true });
+ agHelper.GetElement(locators._canvasBody).click({ force: true });
+ agHelper.TypeText(locators._body, `{${modifierKey}}v`, 0, true);
+ assertHelper.AssertNetworkStatus("@updateLayout");
+ //Widgets when moved out of the list widget have dynamic height in property pane
+ entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
+ agHelper.AssertElementVisible(propPane._propertyPaneHeightLabel);
+ agHelper.GetNClick(locators._widgetInDeployed(draggableWidgets.TEXT));
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TEXT))
+ .then((height: number) => {
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ agHelper.GetNClick(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ );
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ )
+ .wait(1000)
+ .then((updatedListHeight: number) => {
+ expect(height).to.not.equal(updatedListHeight);
+ });
+ });
+ entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
+ agHelper.TypeText(locators._body, `{${modifierKey}}c`, 0, true);
+ entityExplorer.SelectEntityByName("List1", "Widgets");
+ propPane.MoveToTab("Style");
+ agHelper.TypeText(locators._body, `{${modifierKey}}v`, 0, true);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ //Widgets when copied and pasted into the list widget no longer have dynamic height
+ entityExplorer.SelectEntityByName("Text3CopyCopyCopy", "Container1");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ entityExplorer.SelectEntityByName("Text3CopyCopy");
+ agHelper.TypeText(locators._body, `{${modifierKey}}x`, 0, true);
+ entityExplorer.SelectEntityByName("List1");
+ propPane.MoveToTab("Style");
+ agHelper.Sleep(500);
+ agHelper.TypeText(locators._body, `{${modifierKey}}v`, 0, true);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ entityExplorer.SelectEntityByName("Text3CopyCopy", "Widgets");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.js
deleted file mode 100644
index 599f2a8a9e3b..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- it("1. Validate change with auto height width for widgets", function () {
- const textMsg = "Dynamic panel validation for text widget wrt height";
- agHelper.AddDsl("dynamicHeightListDsl");
- entityExplorer.SelectEntityByName("List1");
- cy.get(".t--widget-listwidget")
- .invoke("css", "height")
- .then((lheight) => {
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- entityExplorer.SelectEntityByName("Container1", "List1");
- entityExplorer.SelectEntityByName("Text1", "Container1");
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.testCodeMirror(textMsg);
- entityExplorer.SelectEntityByName("Text2");
- cy.get(commonlocators.generalSectionHeight).should("not.exist");
- cy.testCodeMirror(textMsg);
- cy.get(".t--widget-listwidget")
- .invoke("css", "height")
- .then((newheight) => {
- expect(lheight).to.equal(newheight);
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.ts
new file mode 100644
index 000000000000..782d0f987f8f
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/List_spec.ts
@@ -0,0 +1,33 @@
+import {
+ entityExplorer,
+ locators,
+ agHelper,
+ propPane,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ it("1. Validate change with auto height width for widgets", function () {
+ const textMsg = "Dynamic panel validation for text widget wrt height";
+ agHelper.AddDsl("dynamicHeightListDsl");
+
+ entityExplorer.SelectEntityByName("List1");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.LIST))
+ .then((currentListHeight: number) => {
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ entityExplorer.SelectEntityByName("Container1", "List1");
+ entityExplorer.SelectEntityByName("Text1", "Container1");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ propPane.UpdatePropertyFieldValue("Text", textMsg, true);
+ entityExplorer.SelectEntityByName("Text2");
+ agHelper.AssertElementAbsence(propPane._propertyPaneHeightLabel);
+ propPane.UpdatePropertyFieldValue("Text", textMsg, true);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.LIST))
+ .then((updatedListHeight: number) => {
+ expect(currentListHeight).to.equal(updatedListHeight);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.js
deleted file mode 100644
index d408347d596b..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import {
- entityExplorer,
- agHelper,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation with limits", function () {
- it("1. Validate change in auto height with limits width for widgets and highlight section validation", function () {
- const textMsg =
- "Dynamic panel validation for text widget wrt heightDynamic panel validation for text widget wrt heightDynamic panel validation for text widget wrt height Dynamic panel validation for text widget Dynamic panel validation for text widget Dynamic panel validation for text widget";
- agHelper.AddDsl("DynamicHeightModalDsl");
- entityExplorer.SelectEntityByName("Modal1", "Widgets");
- cy.get(".t--modal-widget")
- .invoke("css", "height")
- .then((mheight) => {
- entityExplorer.SelectEntityByName("Text1", "Modal1");
- cy.get(commonlocators.generalSectionHeight).should("be.visible");
- cy.changeLayoutHeightWithoutWait(commonlocators.autoHeight);
- cy.openPropertyPaneFromModal("textwidget");
- cy.get(".t--widget-textwidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.testCodeMirror(textMsg);
- cy.wait("@updateLayout");
- cy.get(".t--widget-textwidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- });
- cy.selectEntityByName("Modal1");
- cy.changeLayoutHeightWithoutWait(commonlocators.autoHeight);
- cy.wait(3000);
- cy.get(".t--modal-widget")
- .invoke("css", "height")
- .then((mnewheight) => {
- expect(mheight).to.not.equal(mnewheight);
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.ts
new file mode 100644
index 000000000000..45f6c2dc240d
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Modal_Widget_spec.ts
@@ -0,0 +1,52 @@
+import {
+ entityExplorer,
+ agHelper,
+ locators,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation with limits", function () {
+ it("1. Validate change in auto height with limits width for widgets and highlight section validation", function () {
+ const textMsg =
+ "Dynamic panel validation for text widget wrt heightDynamic panel validation for text widget wrt heightDynamic panel validation for text widget wrt height Dynamic panel validation for text widget Dynamic panel validation for text widget Dynamic panel validation for text widget";
+ agHelper.AddDsl("DynamicHeightModalDsl");
+
+ entityExplorer.SelectEntityByName("Modal1", "Widgets");
+
+ agHelper
+ .GetWidgetCSSFrAttribute(locators._modal, "height")
+
+ // agHelper.GetWidgetCSSHeight(locators._widgetInDeployed("modal"))
+ .then((currentModalHeight: number) => {
+ entityExplorer.SelectEntityByName("Text1", "Modal1");
+ agHelper.AssertElementVisible(propPane._propertyPaneHeightLabel);
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Text1");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TEXT))
+ .then((currentTextWidgetHeight: number) => {
+ propPane.UpdatePropertyFieldValue("Text", textMsg, true);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ )
+ .then((updatedTextWidgetHeight: number) => {
+ expect(currentTextWidgetHeight).to.not.equal(
+ updatedTextWidgetHeight,
+ );
+ });
+ entityExplorer.SelectEntityByName("Modal1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper
+ .GetWidgetCSSFrAttribute(locators._modal, "height")
+ // agHelper.GetWidgetCSSHeight(locators._widgetInDeployed("widget"))
+ .then((updatedModalHeight: number) => {
+ expect(currentModalHeight).to.not.equal(updatedModalHeight);
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.js
deleted file mode 100644
index 322f833f9daf..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation for multiple container", function () {
- before(() => {
- _.agHelper.AddDsl("multipleContainerdsl");
- });
- it("1. Validate change in auto height width with multiple containers", function () {
- cy.openPropertyPaneWithIndex("containerwidget", 0);
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.openPropertyPaneWithIndex("containerwidget", 1);
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.openPropertyPane("checkboxgroupwidget");
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .eq(0)
- .invoke("css", "height")
- .then((oheight) => {
- cy.get(".t--widget-containerwidget")
- .eq(1)
- .invoke("css", "height")
- .then((mheight) => {
- cy.get(".t--widget-containerwidget")
- .eq(2)
- .invoke("css", "height")
- .then((iheight) => {
- cy.get(".t--widget-checkboxgroupwidget")
- .invoke("css", "height")
- .then((checkboxheight) => {
- cy.get(commonlocators.addOption).click({ force: true });
- cy.get(commonlocators.addOption).click({ force: true });
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.wait(3000);
- cy.get(".t--widget-checkboxgroupwidget")
- .invoke("css", "height")
- .then((newcheckboxheight) => {
- expect(checkboxheight).to.not.equal(newcheckboxheight);
- });
- });
- cy.wait(2000);
- cy.get(".t--widget-containerwidget")
- .eq(0)
- .invoke("css", "height")
- .then((onewheight) => {
- expect(oheight).to.not.equal(onewheight);
- });
- cy.get(".t--widget-containerwidget")
- .eq(1)
- .invoke("css", "height")
- .then((mnewheight) => {
- expect(mheight).to.not.equal(mnewheight);
- });
- cy.get(".t--widget-containerwidget")
- .eq(2)
- .invoke("css", "height")
- .then((inewheight) => {
- expect(iheight).to.not.equal(inewheight);
- });
- });
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.ts
new file mode 100644
index 000000000000..2ace8d234b27
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Multiple_Container_spec.ts
@@ -0,0 +1,93 @@
+import {
+ entityExplorer,
+ agHelper,
+ locators,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation for multiple container", function () {
+ before(() => {
+ agHelper.AddDsl("multipleContainerdsl");
+ });
+ it("1. Validate change in auto height width with multiple containers", function () {
+ entityExplorer.SelectEntityByName("Container1");
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Container2", "Container1");
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ entityExplorer.SelectEntityByName("Container3", "Container2");
+ entityExplorer.SelectEntityByName("CheckboxGroup1", "Container3");
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((outerContainerHeight: number) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ 1,
+ )
+ .then((middleContainerHeight: number) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ 2,
+ )
+ .then((innerContainerHeight: number) => {
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CHECKBOXGROUP),
+ )
+ .then((checkboxheight: number) => {
+ agHelper.GetNClick(propPane._addOptionProperty);
+ agHelper.GetNClick(propPane._addOptionProperty);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(
+ draggableWidgets.CHECKBOXGROUP,
+ ),
+ )
+ .then((newcheckboxheight: number) => {
+ expect(checkboxheight).to.not.equal(newcheckboxheight);
+ });
+ });
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ )
+ .then((outerContainerUpdatedHeight: number) => {
+ expect(outerContainerHeight).to.not.equal(
+ outerContainerUpdatedHeight,
+ );
+ });
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ 1,
+ )
+ .then((middleContainerUpdatedHeight: number) => {
+ expect(middleContainerHeight).to.not.equal(
+ middleContainerUpdatedHeight,
+ );
+ });
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.CONTAINER),
+ 2,
+ )
+ .then((innerContainerUpdatedHeight: number) => {
+ expect(innerContainerHeight).to.not.equal(
+ innerContainerUpdatedHeight,
+ );
+ });
+ });
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.js
deleted file mode 100644
index 43671992ff03..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.js
+++ /dev/null
@@ -1,110 +0,0 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation for Tab widget", function () {
- before(() => {
- _.agHelper.AddDsl("dynamicTabWidgetdsl");
- });
-
- function validateHeight() {
- cy.wait(2000);
- cy.get(".t--tabid-tab1").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(".t--tabid-tab2").click({ force: true });
- cy.wait(2000);
- //cy.get(".t--draggable-checkboxwidget .bp3-control-indicator").click({ force: true })
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- });
- });
- }
- it("1. Tab widget validation of height with dynamic height feature with publish mode", function () {
- //changing the Text Name and verifying
- cy.wait(3000);
- cy.openPropertyPane("tabswidget");
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.get(".t--tabid-tab1").click({ force: true });
- validateHeight();
- _.deployMode.DeployApp();
- validateHeight();
- _.deployMode.NavigateBacktoEditor();
- _.agHelper.AssertElementVisible(_.locators._previewModeToggle("edit"));
- _.agHelper.GetNClick(_.locators._previewModeToggle("edit"));
- cy.wait(2000);
- cy.get(".t--tabid-tab1").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(".t--tabid-tab2").click({ force: true });
- cy.wait(1000);
- //cy.get(".t--draggable-checkboxwidget .bp3-control-indicator").click({ force: true })
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- });
- });
- // it("Tab widget validation of height with preview mode", function() {
- _.agHelper.AssertElementVisible(_.locators._previewModeToggle("preview"));
- _.agHelper.GetNClick(_.locators._previewModeToggle("preview"));
- cy.wait(2000);
- cy.openPropertyPane("tabswidget");
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.get(".t--tabid-tab1").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(".t--tabid-tab2").click({ force: true });
- cy.wait(2000);
- //cy.get(".t--draggable-checkboxwidget .bp3-control-indicator").click({ force: true })
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.equal(tnewheight);
- cy.get(commonlocators.showTabsControl).click({ force: true });
- cy.wait("@updateLayout").should(
- "have.nested.property",
- "response.body.responseMeta.status",
- 200,
- );
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((upheight) => {
- expect(tnewheight).to.equal(upheight);
- cy.get(".t--tabid-tab1").should("not.exist");
- cy.get(".t--tabid-tab2").should("not.exist");
- });
- });
- });
- //it("Tab widget validation of height with reload", function() {
- cy.wait(2000);
- cy.openPropertyPane("tabswidget");
- cy.get(commonlocators.generalSectionHeight).should("be.visible");
- cy.get(commonlocators.showTabsControl).click({ force: true });
- cy.changeLayoutHeight(commonlocators.autoHeight);
- cy.wait(2000);
- cy.get(".t--tabid-tab1").click({ force: true });
- cy.wait(2000);
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((theight) => {
- cy.get(".t--tabid-tab2").click({ force: true });
- cy.changeLayoutHeight(commonlocators.fixed);
- cy.wait(2000);
- _.agHelper.RefreshPage();
- cy.openPropertyPane("tabswidget");
- cy.get(".t--widget-tabswidget")
- .invoke("css", "height")
- .then((tnewheight) => {
- expect(theight).to.not.equal(tnewheight);
- });
- });
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.ts
new file mode 100644
index 000000000000..3505810e905f
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Tab_spec.ts
@@ -0,0 +1,98 @@
+import {
+ entityExplorer,
+ agHelper,
+ locators,
+ deployMode,
+ propPane,
+ assertHelper,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation for Tab widget", function () {
+ before(() => {
+ agHelper.AddDsl("dynamicTabWidgetdsl");
+ });
+
+ function validateHeight() {
+ agHelper.GetNClick(propPane._tabId1);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((currentHeight: number) => {
+ agHelper.GetNClick(propPane._tabId2);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((updatedHeight: number) => {
+ expect(currentHeight).to.not.equal(updatedHeight);
+ });
+ });
+ }
+ it("1. Tab widget validation of height with dynamic height feature with publish mode", function () {
+ //changing the Text Name and verifying
+ entityExplorer.SelectEntityByName("Tabs1");
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.GetNClick(propPane._tabId1);
+ validateHeight();
+ deployMode.DeployApp();
+ validateHeight();
+ deployMode.NavigateBacktoEditor();
+ agHelper.AssertElementVisible(locators._previewModeToggle("edit"));
+ agHelper.GetNClick(locators._previewModeToggle("edit"));
+ agHelper.GetNClick(propPane._tabId1);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((currentHeight) => {
+ agHelper.GetNClick(propPane._tabId2);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((updatedHeight: number) => {
+ expect(currentHeight).to.not.equal(updatedHeight);
+ });
+ });
+ // it("Tab widget validation of height with preview mode", function() {
+ agHelper.AssertElementVisible(locators._previewModeToggle("preview"));
+ agHelper.GetNClick(locators._previewModeToggle("preview"));
+ entityExplorer.SelectEntityByName("Tabs1");
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ agHelper.GetNClick(propPane._tabId1);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((currentHeight: number) => {
+ agHelper.GetNClick(propPane._tabId2);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((updatedHeight: number) => {
+ expect(currentHeight).to.equal(updatedHeight);
+ agHelper.GetNClick(propPane._showTabsProperty);
+ assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ agHelper
+ .GetWidgetCSSHeight(
+ locators._widgetInDeployed(draggableWidgets.TAB),
+ )
+ .then((upheight: number) => {
+ expect(updatedHeight).to.equal(upheight);
+ agHelper.AssertElementAbsence(propPane._tabId1);
+ agHelper.AssertElementAbsence(propPane._tabId2);
+ });
+ });
+ });
+ //it("Tab widget validation of height with reload", function() {
+ entityExplorer.SelectEntityByName("Tabs1");
+ agHelper.AssertElementVisible(propPane._propertyPaneHeightLabel);
+ agHelper.GetNClick(propPane._showTabsProperty);
+ propPane.SelectPropertiesDropDown("height", "Auto Height");
+ agHelper.GetNClick(propPane._tabId1);
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((currentHeight: number) => {
+ agHelper.GetNClick(propPane._tabId2);
+ propPane.SelectPropertiesDropDown("height", "Fixed");
+ agHelper.RefreshPage();
+ entityExplorer.SelectEntityByName("Tabs1");
+ agHelper
+ .GetWidgetCSSHeight(locators._widgetInDeployed(draggableWidgets.TAB))
+ .then((updatedHeight: number) => {
+ expect(currentHeight).to.not.equal(updatedHeight);
+ });
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/TextWidget_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/TextWidget_Spec.ts
index 364c234134ed..2866518d4e19 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/TextWidget_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/TextWidget_Spec.ts
@@ -16,7 +16,7 @@ describe("Dynamic Height Width validation for text widget", function () {
_.propPane.UpdatePropertyFieldValue("Text", textMsg);
_.propPane.MoveToTab("Style");
_.propPane.SelectPropertiesDropDown("Font size", "L");
- _.assertHelper.AssertNetworkStatus("@updateLayout"); //for textMsg update
+ _.assertHelper.AssertNetworkStatus("@updateLayout", 200); //for textMsg update
_.agHelper.GetHeight(
_.locators._widgetInDeployed(_.draggableWidgets.TEXT),
);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.js b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.js
deleted file mode 100644
index 4997d8f1db21..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import * as _ from "../../../../support/Objects/ObjectsCore";
-
-describe("Dynamic Height Width validation", function () {
- function validateCssProperties(property) {
- cy.get("button:contains('Small')").click({ force: true });
- cy.wait(3000);
- cy.selectEntityByName("Text1");
- cy.get(".t--widget-textwidget")
- .eq(0)
- .invoke("css", property)
- .then((firstText) => {
- cy.selectEntityByName("Text2");
- cy.get(".t--widget-textwidget")
- .eq(1)
- .invoke("css", property)
- .then((secondText) => {
- cy.selectEntityByName("Text3");
- cy.get(".t--widget-textwidget")
- .eq(2)
- .invoke("css", property)
- .then((thirdText) => {
- cy.selectEntityByName("Text4");
- cy.get(".t--widget-textwidget")
- .eq(3)
- .invoke("css", property)
- .then((fourthText) => {
- cy.get("button:contains('Large')").click({ force: true });
- cy.selectEntityByName("Text1");
- cy.get(".t--widget-textwidget")
- .eq(0)
- .invoke("css", property)
- .then((largefirstText) => {
- cy.selectEntityByName("Text2");
- cy.get(".t--widget-textwidget")
- .eq(1)
- .invoke("css", property)
- .then((largesecondText) => {
- cy.selectEntityByName("Text3");
- cy.get(".t--widget-textwidget")
- .eq(2)
- .invoke("css", property)
- .then((largethirdText) => {
- cy.selectEntityByName("Text4");
- cy.get(".t--widget-textwidget")
- .eq(3)
- .invoke("css", property)
- .then((largefourthText) => {
- if (property == "left") {
- expect(firstText).to.equal(
- largefirstText,
- );
- expect(secondText).to.equal(
- largesecondText,
- );
- expect(thirdText).to.equal(
- largethirdText,
- );
- expect(fourthText).to.equal(
- largefourthText,
- );
- } else {
- expect(firstText).to.not.equal(
- largefirstText,
- );
- expect(secondText).to.not.equal(
- largesecondText,
- );
- expect(thirdText).to.not.equal(
- largethirdText,
- );
- expect(fourthText).to.not.equal(
- largefourthText,
- );
- }
- cy.get("button:contains('Small')").click({
- force: true,
- });
- cy.wait(3000);
- cy.selectEntityByName("Text1");
- cy.get(".t--widget-textwidget")
- .eq(0)
- .invoke("css", property)
- .then((updatelargefirstText) => {
- cy.selectEntityByName("Text2");
- cy.get(".t--widget-textwidget")
- .eq(1)
- .invoke("css", property)
- .then((updatelargesecondText) => {
- cy.selectEntityByName("Text3");
- cy.get(".t--widget-textwidget")
- .eq(2)
- .invoke("css", property)
- .then((updatelargethirdText) => {
- cy.selectEntityByName("Text4");
- cy.get(".t--widget-textwidget")
- .eq(3)
- .invoke("css", property)
- .then(
- (updatelargefourthText) => {
- //expect(firstText).to.equal(updatelargefirstText);
- expect(
- secondText,
- ).to.equal(
- updatelargesecondText,
- );
- expect(
- thirdText,
- ).to.equal(
- updatelargethirdText,
- );
- expect(
- fourthText,
- ).to.equal(
- updatelargefourthText,
- );
- },
- );
- });
- });
- });
- });
- });
- });
- });
- });
- });
- });
- });
- }
- it("1. Validate change with auto height width for text widgets", function () {
- _.agHelper.AddDsl("alignmentWithDynamicHeightDsl");
- validateCssProperties("height");
- //validateCssProperties("top");
- validateCssProperties("left");
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.ts
new file mode 100644
index 000000000000..c23976e81bd9
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/DynamicHeight/Text_With_Different_Size_spec.ts
@@ -0,0 +1,218 @@
+import {
+ entityExplorer,
+ agHelper,
+ locators,
+ draggableWidgets,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("Dynamic Height Width validation", function () {
+ function validateCssProperties(property) {
+ agHelper.GetNClickByContains("button", "Small", 0, true);
+ agHelper.Sleep(3000);
+ entityExplorer.SelectEntityByName("Text1");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 0,
+ )
+ .then((CurrentValueOfFirstText) => {
+ entityExplorer.SelectEntityByName("Text2");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 1,
+ )
+ .then((CurrentValueOfSecondText) => {
+ entityExplorer.SelectEntityByName("Text3");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 2,
+ )
+ .then((CurrentValueOfThirdText) => {
+ entityExplorer.SelectEntityByName("Text4");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 3,
+ )
+ .then((CurrentValueOfFourthText) => {
+ agHelper.GetNClickByContains("button", "Large", 0, true);
+ agHelper.Sleep(3000);
+ entityExplorer.SelectEntityByName("Text1");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 0,
+ )
+ .then((UpdatedLargeValueOfFirstText) => {
+ entityExplorer.SelectEntityByName("Text2");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(draggableWidgets.TEXT),
+ property,
+ 1,
+ )
+ .then((UpdatedLargeValueOfSecondText) => {
+ entityExplorer.SelectEntityByName("Text3");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 2,
+ )
+ .then((UpdatedLargeValueOfThirdText) => {
+ entityExplorer.SelectEntityByName("Text4");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 3,
+ )
+ .then((UpdatedLargeValueOfFourthText) => {
+ if (property == "left") {
+ expect(CurrentValueOfFirstText).to.equal(
+ UpdatedLargeValueOfFirstText,
+ );
+ expect(CurrentValueOfSecondText).to.equal(
+ UpdatedLargeValueOfSecondText,
+ );
+ expect(CurrentValueOfThirdText).to.equal(
+ UpdatedLargeValueOfThirdText,
+ );
+ expect(CurrentValueOfFourthText).to.equal(
+ UpdatedLargeValueOfFourthText,
+ );
+ } else {
+ expect(
+ CurrentValueOfFirstText,
+ ).to.not.equal(
+ UpdatedLargeValueOfFirstText,
+ );
+ expect(
+ CurrentValueOfSecondText,
+ ).to.not.equal(
+ UpdatedLargeValueOfSecondText,
+ );
+ expect(
+ CurrentValueOfThirdText,
+ ).to.not.equal(
+ UpdatedLargeValueOfThirdText,
+ );
+ expect(
+ CurrentValueOfFourthText,
+ ).to.not.equal(
+ UpdatedLargeValueOfFourthText,
+ );
+ }
+ agHelper.GetNClickByContains(
+ "button",
+ "Small",
+ 0,
+ true,
+ );
+ agHelper.Sleep(3000);
+ entityExplorer.SelectEntityByName("Text1");
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 0,
+ )
+ .then((UpdatedSmallValueOfFirstText) => {
+ entityExplorer.SelectEntityByName(
+ "Text2",
+ );
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 1,
+ )
+ .then(
+ (UpdatedSmallValueOfSecondText) => {
+ entityExplorer.SelectEntityByName(
+ "Text3",
+ );
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 2,
+ )
+ .then(
+ (
+ UpdatedSmallValueOfThirdText,
+ ) => {
+ entityExplorer.SelectEntityByName(
+ "Text4",
+ );
+ agHelper
+ .GetWidgetCSSFrAttribute(
+ locators._widgetInDeployed(
+ draggableWidgets.TEXT,
+ ),
+ property,
+ 3,
+ )
+ .then(
+ (
+ UpdatedSmallValueOfFourthText,
+ ) => {
+ expect(
+ CurrentValueOfFirstText,
+ ).to.equal(
+ UpdatedSmallValueOfFirstText,
+ );
+ expect(
+ CurrentValueOfSecondText,
+ ).to.equal(
+ UpdatedSmallValueOfSecondText,
+ );
+ expect(
+ CurrentValueOfThirdText,
+ ).to.equal(
+ UpdatedSmallValueOfThirdText,
+ );
+ expect(
+ CurrentValueOfFourthText,
+ ).to.equal(
+ UpdatedSmallValueOfFourthText,
+ );
+ },
+ );
+ },
+ );
+ },
+ );
+ });
+ });
+ });
+ });
+ });
+ });
+ });
+ });
+ });
+ }
+ it("1. Validate change with auto height width for text widgets", function () {
+ agHelper.AddDsl("alignmentWithDynamicHeightDsl");
+ validateCssProperties("height");
+ validateCssProperties("left");
+ });
+});
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index 34bf19bb7206..4e43a96dcfa4 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -250,4 +250,11 @@ export class CommonLocators {
_gitStatusChanges = "[data-testid='t--git-change-statuses']";
_appNavigationSettings = "#t--navigation-settings-header";
_appNavigationSettingsShowTitle = "#t--navigation-settings-application-title";
+ _switchGroupControl =
+ ".t--draggable-switchgroupwidget .bp3-control-indicator";
+ _fontSelect = "fontsize .rc-select";
+ _fontInput = "fontsize input";
+ _pagination = ".rc-pagination";
+ _controlOption = ".t--property-control-options";
+ _canvasBody = "[data-testid='div-selection-0']";
}
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 10a3bd71721b..ea479913b7ab 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -620,6 +620,20 @@ export class AggregateHelper extends ReusableHelper {
.wait(waitTimeInterval);
}
+ public GetClosestNClick(
+ selector: string,
+ closestSelector: string,
+ index = 0,
+ force = false,
+ waitTimeInterval = 500,
+ ctrlKey = false,
+ ) {
+ return this.ScrollIntoView(selector, index)
+ .closest(closestSelector)
+ .click({ force: force, ctrlKey: ctrlKey })
+ .wait(waitTimeInterval);
+ }
+
public GetHoverNClick(
selector: string,
index = 0,
@@ -1360,8 +1374,16 @@ export class AggregateHelper extends ReusableHelper {
});
}
- GetWidgetCSSHeight(widgetSelector: string) {
- return this.GetElement(widgetSelector).invoke("css", "height");
+ public GetWidgetCSSHeight(widgetSelector: string, index = 0) {
+ return this.GetElement(widgetSelector).eq(index).invoke("css", "height");
+ }
+
+ public GetWidgetCSSFrAttribute(
+ widgetSelector: string,
+ attribute: string,
+ index = 0,
+ ) {
+ return this.GetElement(widgetSelector).eq(index).invoke("css", attribute);
}
GetWidgetByName(widgetName: string) {
diff --git a/app/client/cypress/support/Pages/AppSettings/AppSettings.ts b/app/client/cypress/support/Pages/AppSettings/AppSettings.ts
index fdc8e2a271e1..20cf1ee8a3a3 100644
--- a/app/client/cypress/support/Pages/AppSettings/AppSettings.ts
+++ b/app/client/cypress/support/Pages/AppSettings/AppSettings.ts
@@ -27,6 +27,39 @@ export class AppSettings {
_getPageSettingsHeader: (pageName: string) =>
`#t--page-settings-${pageName}`,
_updateStatus: ".ads-v2-icon.rotate",
+ _header: ".t--app-viewer-navigation-header",
+ _topStacked: ".t--app-viewer-navigation-top-stacked",
+ _applicationName: ".t--app-viewer-application-name",
+ _shareButton: ".t--app-viewer-share-button",
+ _editButton: ".t--back-to-editor",
+ _userProfileDropdownButton: ".t--profile-menu-icon",
+ _modal: "div[role=dialog]",
+ _modalClose: "div[role=dialog] button[aria-label='Close']",
+ _canvas: ".t--canvas-artboard",
+ _userProfileDropdownMenu: ".ads-v2-menu",
+ _navigationPreview: ".t--navigation-preview",
+ _navStyleOptions: {
+ _stacked:
+ ".t--navigation-settings-navStyle .ads-v2-segmented-control-value-stacked",
+ _inline:
+ ".t--navigation-settings-navStyle .ads-v2-segmented-control-value-inline",
+ },
+ _colorStyleOptions: {
+ _light:
+ ".t--navigation-settings-colorStyle .ads-v2-segmented-control-value-light",
+ _theme:
+ ".t--navigation-settings-colorStyle .ads-v2-segmented-control-value-theme",
+ },
+ _topInline: ".t--app-viewer-navigation-top-inline",
+ _sidebarCollapseButton: ".t--app-viewer-navigation-sidebar-collapse",
+ _topStackedScrollableContainer:
+ ".t--app-viewer-navigation-top-stacked .hidden-scrollbar",
+ _topInlineMoreButton: ".t--app-viewer-navigation-top-inline-more-button",
+ _topInlineMoreDropdown:
+ ".t--app-viewer-navigation-top-inline-more-dropdown",
+ _topInlineMoreDropdownItem:
+ ".t--app-viewer-navigation-top-inline-more-dropdown-item",
+ _scrollArrows: ".scroll-arrows",
};
public errorMessageSelector = (fieldId: string) => {
diff --git a/app/client/cypress/support/Pages/AppSettings/PageSettings.ts b/app/client/cypress/support/Pages/AppSettings/PageSettings.ts
index 704862c851bc..8264ed1e4fc9 100644
--- a/app/client/cypress/support/Pages/AppSettings/PageSettings.ts
+++ b/app/client/cypress/support/Pages/AppSettings/PageSettings.ts
@@ -6,7 +6,7 @@ export class PageSettings {
private appSettings = ObjectsRegistry.AppSettings;
private assertHelper = ObjectsRegistry.AssertHelper;
- private locators = {
+ public locators = {
_pageNameField: "#t--page-settings-name",
_customSlugField: "#t--page-settings-custom-slug",
_showPageNavSwitch: "#t--page-settings-show-nav-control",
diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts
index 4abb97cb2fec..1c71a727ee5b 100644
--- a/app/client/cypress/support/Pages/PropertyPane.ts
+++ b/app/client/cypress/support/Pages/PropertyPane.ts
@@ -107,6 +107,20 @@ export class PropertyPane {
}`;
private _propPaneSelectedItem = (option: string) =>
`.t--property-control-${option} span.rc-select-selection-item span`;
+ _autoHeightLimitMin = "[data-testid='t--auto-height-overlay-handles-min']";
+ _autoHeightLimitMin_div =
+ "[data-testid='t--auto-height-overlay-handles-min'] div";
+ _autoHeightLimitMax = "[data-testid='t--auto-height-overlay-handles-max']";
+ _labelContains = (value: string) => `label:Contains('${value}')`;
+ _showColumnButton = ".t--show-column-btn";
+ _propertyPaneHeightLabel =
+ ".t--property-pane-section-general .t--property-control-label:contains('Height')";
+ _tabId1 = ".t--tabid-tab1";
+ _tabId2 = ".t--tabid-tab2";
+ _showTabsProperty = ".t--property-control-showtabs input";
+ _addOptionProperty = ".t--property-control-options-add";
+ _optionContent = ".rc-select-item-option-content";
+ _dropdownOptionSpan = ".t--dropdown-option span";
public OpenJsonFormFieldSettings(fieldName: string) {
this.agHelper.GetNClick(this._jsonFieldEdit(fieldName));
|
132abdaa54d65487d2de6b7b4e3d30044698ee82
|
2021-06-29 19:00:14
|
Tolulope Adetula
|
feat: add object fit control (#4986)
| false
|
add object fit control (#4986)
|
feat
|
diff --git a/app/client/src/components/designSystems/appsmith/ImageComponent.tsx b/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
index ee3ea08429e8..7d8974ff4438 100644
--- a/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ImageComponent.tsx
@@ -8,6 +8,7 @@ export interface StyledImageProps {
imageUrl?: string;
backgroundColor?: string;
showHoverPointer?: boolean;
+ objectFit: string;
onClick?: (event: React.MouseEvent<HTMLElement>) => void;
}
@@ -17,16 +18,16 @@ export const StyledImage = styled.div<
}
>`
position: relative;
- display: flex;
+ display: flex;
flex-direction: "row";
+ background-size: ${(props) => props.objectFit ?? "cover"};
cursor: ${(props) =>
props.showHoverPointer && props.onClick ? "pointer" : "inherit"};
background: ${(props) => props.backgroundColor};
- background-image: url("${(props) =>
- props.imageError ? props.defaultImageUrl : props.imageUrl}");
+ background-image: ${(props) =>
+ `url(${props.imageError ? props.defaultImageUrl : props.imageUrl})`};
background-position: center;
background-repeat: no-repeat;
- background-size: contain;
height: 100%;
width: 100%;
`;
@@ -142,6 +143,7 @@ class ImageComponent extends React.Component<
cursor,
}}
>
+ {/* Used for running onImageError and onImageLoad Functions since Background Image doesn't have the functionality */}
<img
alt={this.props.widgetName}
onError={this.onImageError}
@@ -178,6 +180,7 @@ export interface ImageComponentProps extends ComponentProps {
isLoading: boolean;
showHoverPointer?: boolean;
maxZoomLevel: number;
+ objectFit: string;
disableDrag: (disabled: boolean) => void;
onClick?: (event: React.MouseEvent<HTMLElement>) => void;
}
diff --git a/app/client/src/mockResponses/WidgetConfigResponse.tsx b/app/client/src/mockResponses/WidgetConfigResponse.tsx
index 1609b5ea807c..7dca03b71b31 100644
--- a/app/client/src/mockResponses/WidgetConfigResponse.tsx
+++ b/app/client/src/mockResponses/WidgetConfigResponse.tsx
@@ -57,6 +57,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
imageShape: "RECTANGLE",
maxZoomLevel: 1,
+ objectFit: "cover",
image: "",
rows: 3 * GRID_DENSITY_MIGRATION_V1,
columns: 4 * GRID_DENSITY_MIGRATION_V1,
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index 08ed18fb541b..7f92d81fb82b 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -791,6 +791,23 @@ const transformDSL = (currentDSL: ContainerWidgetProps<WidgetProps>) => {
return currentDSL;
};
+export const migrateObjectFitToImageWidget = (
+ dsl: ContainerWidgetProps<WidgetProps>,
+) => {
+ const addObjectFitProperty = (widgetProps: WidgetProps) => {
+ widgetProps.objectFit = "cover";
+ if (widgetProps.children && widgetProps.children.length) {
+ widgetProps.children.forEach((eachWidgetProp: WidgetProps) => {
+ if (widgetProps.type === "IMAGE_WIDGET") {
+ addObjectFitProperty(eachWidgetProp);
+ }
+ });
+ }
+ };
+ addObjectFitProperty(dsl);
+ return dsl;
+};
+
const migrateOverFlowingTabsWidgets = (
currentDSL: ContainerWidgetProps<WidgetProps>,
canvasWidgets: any,
diff --git a/app/client/src/widgets/ImageWidget.tsx b/app/client/src/widgets/ImageWidget.tsx
index 02d97e606527..d6571cbe1253 100644
--- a/app/client/src/widgets/ImageWidget.tsx
+++ b/app/client/src/widgets/ImageWidget.tsx
@@ -78,6 +78,32 @@ class ImageWidget extends BaseWidget<ImageWidgetProps, WidgetState> {
isTriggerProperty: false,
validation: VALIDATION_TYPES.NUMBER,
},
+ {
+ helpText:
+ "Sets how the Image should be resized to fit its container.",
+ propertyName: "objectFit",
+ label: "Object Fit",
+ controlType: "DROP_DOWN",
+ defaultValue: "cover",
+ options: [
+ {
+ label: "Contain",
+ value: "contain",
+ },
+ {
+ label: "Cover",
+ value: "cover",
+ },
+ {
+ label: "Auto",
+ value: "auto",
+ },
+ ],
+ isJSConvertible: true,
+ isBindProperty: true,
+ isTriggerProperty: false,
+ validation: VALIDATION_TYPES.TEXT,
+ },
],
},
{
@@ -99,7 +125,7 @@ class ImageWidget extends BaseWidget<ImageWidgetProps, WidgetState> {
}
getPageView() {
- const { maxZoomLevel } = this.props;
+ const { maxZoomLevel, objectFit } = this.props;
return (
<ImageComponent
defaultImageUrl={this.props.defaultImage}
@@ -109,6 +135,7 @@ class ImageWidget extends BaseWidget<ImageWidgetProps, WidgetState> {
imageUrl={this.props.image}
isLoading={this.props.isLoading}
maxZoomLevel={maxZoomLevel}
+ objectFit={objectFit}
onClick={this.props.onClick ? this.onImageClick : undefined}
showHoverPointer={this.props.renderMode === RenderModes.PAGE}
widgetId={this.props.widgetId}
@@ -140,6 +167,7 @@ export interface ImageWidgetProps extends WidgetProps {
imageShape: ImageShape;
defaultImage: string;
maxZoomLevel: number;
+ objectFit: string;
onClick?: string;
}
|
ea655a6485656859a56f173f08e35084ecb48779
|
2023-06-21 12:50:11
|
Vijetha-Kaja
|
test: Cypress - Split Long Cypress Specs (#24682)
| false
|
Cypress - Split Long Cypress Specs (#24682)
|
test
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts
new file mode 100644
index 000000000000..ab7c28a885f8
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_1_spec.ts
@@ -0,0 +1,556 @@
+import {
+ agHelper,
+ locators,
+ entityExplorer,
+ jsEditor,
+ propPane,
+ apiPage,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("JS to non-JS mode in Action Selector", () => {
+ it("1. should not show any fields with a blank JS field", () => {
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locators._spanButton("Submit"));
+ });
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext("onClick", `{{}}`, true, false);
+ propPane.ToggleJSMode("onClick", false);
+ agHelper.AssertElementAbsence(".action");
+ });
+
+ it("2. should show Api fields when Api1.run is entered", () => {
+ apiPage.CreateApi("Api1");
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext("onClick", `{{Api1.run()}}`, true, false);
+ propPane.ToggleJSMode("onClick", false);
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run",
+ );
+ propPane.SelectActionByTitleAndValue("Execute a query", "Api1.run");
+ agHelper.Sleep(200);
+ propPane.AssertSelectValue("Api1.run");
+ });
+
+ it("3. should show Api fields when an Api with then/catch is entered", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ `{{Api1.run().then(() => {}).catch(() => {});}}`,
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run",
+ );
+ });
+
+ it("4. should show Api fields when an Api with then/catch is entered", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ `{{Api1.run().then(() => { showAlert(); }).catch(() => { showModal(); });}}`,
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run+2",
+ );
+ agHelper.GetNClick(propPane._actionCard);
+ agHelper.GetNClick(propPane._actionTreeCollapse);
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On success",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show alertAdd message",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On failure",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show modalnone",
+ "have.text",
+ 2,
+ );
+ });
+
+ it("5. should show Api fields when an Api with then/catch is entered", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal('Modal1'); });}}`,
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run+3",
+ );
+ agHelper.GetNClick(propPane._actionCard);
+ agHelper.GetNClick(propPane._actionTreeCollapse);
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On success",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show alertHello world!",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On failure",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Store valuea",
+ "have.text",
+ 2,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show modalModal1",
+ "have.text",
+ 3,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 1);
+ agHelper.ValidateCodeEditorContent(propPane._textView, "Hello world!");
+ agHelper.GetNAssertElementText(propPane._selectorViewButton, "Info");
+
+ agHelper.GetNClick(propPane._actionCard, 2);
+ agHelper.ValidateCodeEditorContent(propPane._textView, "a{{18}}");
+
+ agHelper.GetNClick(propPane._actionCard, 3);
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Select modal",
+ );
+ });
+
+ it("6. should show Api related fields appropriately with platform functions with callbacks", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ `{{Api1.run().then(() => {
+ appsmith.geolocation.getCurrentPosition(location => {
+ showAlert(location);
+ });
+ }).catch(() => {
+ setInterval(() => {
+ showAlert('hi');
+ }, 5000, '1');
+ });}}`,
+ true,
+ true,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run+2",
+ );
+
+ agHelper.GetNClick(propPane._actionCard);
+ agHelper.GetNClick(propPane._actionTreeCollapse);
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On success",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On failure",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Set interval5000ms",
+ "have.text",
+ 2,
+ );
+ });
+
+ it("7. should show Api related fields appropriately with platform functions with catch callback", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ "{{Api1.run().catch(() => copyToClipboard('hi'))}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run+1",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard);
+ agHelper.GetNClick(propPane._actionTreeCollapse);
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On failure",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Copy to clipboardhi",
+ "have.text",
+ 1,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 1);
+ agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
+ });
+
+ it("8. should show Api related fields appropriately with platform functions with catch callback", () => {
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ "{{Api1.run().then(() => clearStore())}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "GETExecute a queryApi1.run+1",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard);
+ agHelper.GetNClick(propPane._actionTreeCollapse);
+ agHelper.GetNAssertElementText(
+ propPane._actionCallbackTitle,
+ "On success",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Clear store",
+ "have.text",
+ 1,
+ );
+ });
+
+ it("9. shows fields appropriately for JS Object functions with/without arguments", () => {
+ const JS_OBJECT_BODY = `export default {
+ funcWithoutArgsSync: () => {
+ console.log("hi");
+ },
+ funcWithArgsSync: (a,b) => {
+ return a+b;
+ },
+ funcWithoutArgsAsync: async () => {
+ await console.log("hi");
+ },
+ funcWithArgsAsync: async (a,b) => {
+ await console.log(a+b);
+ }
+ }`;
+
+ jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ });
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{JSObject1.funcWithoutArgsSync()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject1.funcWithoutArgsSync()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{JSObject1.funcWithArgsSync(18,26)}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject1.funcWithArgsSync(18, 26)",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.ValidateCodeEditorContent(propPane._textView, "{{18}}{{26}}");
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "a",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "b",
+ "have.text",
+ 1,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{JSObject1.funcWithoutArgsAsync()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject1.funcWithoutArgsAsync()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{JSObject1.funcWithArgsAsync()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject1.funcWithArgsAsync()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "a",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "b",
+ "have.text",
+ 1,
+ );
+ });
+
+ it("10. shows fields appropriately for JS Object functions with/without arguments and then/catch blocks", () => {
+ const JS_OBJECT_BODY = `export default {
+ promiseFuncNoArgs: () => {
+ return new Promise((resolve) => {
+ resolve("hi");
+ });
+ },
+ promiseFuncWithArgs: (a) => {
+ return new Promise((resolve, reject) => {
+ if (a === "hi") {
+ resolve("hi");
+ } else {
+ reject("bye");
+ }
+ });
+ },
+ }`;
+
+ jsEditor.CreateJSObject(JS_OBJECT_BODY, {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ });
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then"))}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch"))}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then")).catch(() => showAlert("catch"));}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch")).then(() => showAlert("then"));}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncNoArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncWithArgs("hi").then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ 'Execute a JS functionJSObject2.promiseFuncWithArgs("hi")',
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "a",
+ "have.text",
+ 0,
+ );
+ agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncWithArgs().catch(() => showAlert("catch"));}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncWithArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "a",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{JSObject2.promiseFuncWithArgs().then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Execute a JS functionJSObject2.promiseFuncWithArgs()",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "a",
+ "have.text",
+ 0,
+ );
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
new file mode 100644
index 000000000000..a4a826c2ca76
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_2_spec.ts
@@ -0,0 +1,651 @@
+import {
+ agHelper,
+ entityExplorer,
+ locators,
+ propPane,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("JS to non-JS mode in Action Selector", () => {
+ before(() => {
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locators._spanButton("Submit"));
+ });
+ });
+
+ it("1. shows fields for navigate to from js to non-js mode", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{navigateTo()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Navigate toSelect page",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementVisible(propPane._navigateToType("Page name"));
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectPage,
+ "Select page",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Query params",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._sameWindowDropdownOption,
+ "Same window",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{navigateTo('Page1', {a:1}, 'NEW_WINDOW')}}",
+ true,
+ true,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Navigate toPage1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementVisible(propPane._navigateToType("Page name"));
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectPage,
+ "Page1",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Query params",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._sameWindowDropdownOption,
+ "New window",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{navigateTo('google.com', {a:1}, 'SAME_WINDOW')}}",
+ true,
+ true,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Navigate togoogle.com",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementVisible(propPane._navigateToType("URL"));
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Enter URL",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Query params",
+ "have.text",
+ 1,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._sameWindowDropdownOption,
+ "Same window",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("2. shows fields for show alert from js to non-js mode", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{showAlert()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show alertAdd message",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Message",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._dropdownSelectType,
+ "Select type",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{showAlert('hello', 'info')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show alerthello",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Message",
+ "have.text",
+ 0,
+ );
+ agHelper.ValidateCodeEditorContent(propPane._textView, "hello");
+
+ agHelper.GetNAssertElementText(
+ propPane._dropdownSelectType,
+ "Info",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("3. shows fields for show modal from js to non-js mode", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+
+ entityExplorer.DragDropWidgetNVerify("modalwidget", 50, 50);
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{showModal()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show modalnone",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectModal,
+ "Select modal",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext("onClick", "{{showModal('Modal1')}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Show modalModal1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectModal,
+ "Modal1",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("4. shows fields for remove modal from js to non-js mode", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{closeModal()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Close modalnone",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectModal,
+ "Select modal",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext("onClick", "{{closeModal('Modal1')}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Close modalModal1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionOpenDropdownSelectModal,
+ "Modal1",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("5. should shows appropriate fields for store value", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{storeValue()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Store valueAdd key",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Key",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Value",
+ "have.text",
+ 1,
+ );
+
+ propPane.EnterJSContext("onClick", "{{storeValue('a', '')}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Store valuea",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ propPane.EnterJSContext("onClick", "{{storeValue('a', 1)}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Store valuea",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.ValidateCodeEditorContent(propPane._textView, "a{{1}}");
+
+ propPane.EnterJSContext("onClick", "{{storeValue('', 1)}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Store valueAdd key",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+ });
+
+ it("6. shows fields for remove value appropriately", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{removeValue()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Remove valueAdd key",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Key",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext("onClick", "{{removeValue('a')}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Remove valuea",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.ValidateCodeEditorContent(propPane._textView, "a");
+ });
+
+ it("7. shows fields appropriately for the download function", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{download()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "DownloadAdd data to download",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Data to download",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "File name with extension",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewLabel,
+ "Type",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Select file type (optional)",
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{download('a', '', '')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "DownloadAdd data to download",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{download('a', 'b', '')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Downloadb",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{download('a', 'b', 'image/png')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Downloadb",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+ agHelper.ValidateCodeEditorContent(propPane._textView, "ab");
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "PNG",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("8. shows fields for copyToClipboard appropriately", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{copyToClipboard()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Copy to clipboardAdd text",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Text to be copied to clipboard",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext("onClick", "{{copyToClipboard('a')}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Copy to clipboarda",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.ValidateCodeEditorContent(propPane._textView, "a");
+ agHelper.TypeText(
+ propPane._actionSelectorFieldByLabel("Text to be copied to clipboard"),
+ "line1{enter}line2{enter}line3",
+ 0,
+ true,
+ );
+ propPane.ToggleJSMode("onClick");
+ propPane.ValidatePropertyFieldValue(
+ "onClick",
+ `{{copyToClipboard('line1\\nline2\\nline3a');}}`,
+ );
+ });
+
+ it("9. shows fields for reset widget appropriately", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{resetWidget()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Reset widgetSelect widget",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewLabel,
+ "Widget",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewLabel,
+ "Reset Children",
+ "have.text",
+ 1,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Select widget",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "true",
+ "have.text",
+ 1,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{resetWidget("Modal1", false)}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Reset widgetModal1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Modal1",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "false",
+ "have.text",
+ 1,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ '{{resetWidget("Modal1")}}',
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Reset widgetModal1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Modal1",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "true",
+ "have.text",
+ 1,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{resetWidget('', false)}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Reset widgetSelect widget",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "Select widget",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._selectorViewButton,
+ "false",
+ "have.text",
+ 1,
+ );
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts
new file mode 100644
index 000000000000..536b173667d3
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_3_spec.ts
@@ -0,0 +1,286 @@
+import {
+ agHelper,
+ locators,
+ entityExplorer,
+ propPane,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe("JS to non-JS mode in Action Selector", () => {
+ before(() => {
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locators._spanButton("Submit"));
+ });
+ });
+
+ it("1. should show fields appropriately for setinterval", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{setInterval()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Set intervalms",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Callback function",
+ "have.text",
+ 0,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Delay (ms)",
+ "have.text",
+ 1,
+ );
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Id",
+ "have.text",
+ 2,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{setInterval(() => {}, 200, '')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Set interval200ms",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{setInterval(() => {showAlert('hi')}, 200, 'id1')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Set interval200ms",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+ });
+
+ it("2. should show fields appropriately for clearInterval", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{clearInterval()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Clear intervalAdd Id",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Id",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext("onClick", "{{clearInterval('Id1')}}", true, true);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Clear intervalId1",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.ValidateCodeEditorContent(propPane._textView, "Id1");
+ });
+
+ it("3. should show no fields for clear store", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{clearStore()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Clear store",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementAbsence(propPane._textView);
+ agHelper.AssertElementAbsence(propPane._selectorView);
+ });
+
+ it("4. should show no fields for watch geolocation position", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{appsmith.geolocation.watchPosition()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Watch geolocation",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementAbsence(propPane._textView);
+ agHelper.AssertElementAbsence(propPane._selectorView);
+ });
+
+ it("5. should show no fields for stop watching geolocation position", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{appsmith.geolocation.clearWatch()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Stop watching geolocation",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.AssertElementAbsence(propPane._textView);
+ agHelper.AssertElementAbsence(propPane._selectorView);
+ });
+
+ it("6. should show appropriate fields for get geolocation", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{appsmith.geolocation.getCurrentPosition()}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Get geolocationAdd callback",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Callback function",
+ "have.text",
+ 0,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ `{{appsmith.geolocation.getCurrentPosition((location) => {
+ // add code here
+ });}}`,
+ true,
+ true,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Callback function",
+ "have.text",
+ 0,
+ );
+ });
+
+ it("7. should show post message fields appropriately", () => {
+ entityExplorer.SelectEntityByName("Page1", "Pages");
+ entityExplorer.SelectEntityByName("Button1", "Widgets");
+
+ propPane.EnterJSContext("onClick", "{{postWindowMessage()}}", true, false);
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Post messageAdd message",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Message",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Target iframe",
+ "have.text",
+ 1,
+ );
+ agHelper.GetNAssertElementText(
+ propPane._actionPopupTextLabel,
+ "Allowed origins",
+ "have.text",
+ 2,
+ );
+
+ propPane.EnterJSContext(
+ "onClick",
+ "{{postWindowMessage('hello', 'window', '*')}}",
+ true,
+ false,
+ );
+ propPane.ToggleJSMode("onClick", false);
+
+ agHelper.GetNAssertElementText(
+ propPane._actionCard,
+ "Post messagehello",
+ "have.text",
+ 0,
+ );
+ agHelper.GetNClick(propPane._actionCard, 0);
+
+ agHelper.ValidateCodeEditorContent(propPane._textView, "hellowindow*");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_spec.ts
deleted file mode 100644
index 2c0b8c0a6fe4..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelector_JsToNonJSMode_spec.ts
+++ /dev/null
@@ -1,1465 +0,0 @@
-import {
- agHelper,
- locators,
- entityExplorer,
- jsEditor,
- propPane,
- apiPage,
-} from "../../../../support/Objects/ObjectsCore";
-
-describe("JS to non-JS mode in Action Selector", () => {
- it("1. should not show any fields with a blank JS field", () => {
- cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val, locators._spanButton("Submit"));
- });
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext("onClick", `{{}}`, true, false);
- propPane.ToggleJSMode("onClick", false);
- agHelper.AssertElementAbsence(".action");
- });
-
- it("2. should show Api fields when Api1.run is entered", () => {
- apiPage.CreateApi("Api1");
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext("onClick", `{{Api1.run()}}`, true, false);
- propPane.ToggleJSMode("onClick", false);
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run",
- );
- propPane.SelectActionByTitleAndValue("Execute a query", "Api1.run");
- agHelper.Sleep(200);
- propPane.AssertSelectValue("Api1.run");
- });
-
- it("3. should show Api fields when an Api with then/catch is entered", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- `{{Api1.run().then(() => {}).catch(() => {});}}`,
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run",
- );
- });
-
- it("4. should show Api fields when an Api with then/catch is entered", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- `{{Api1.run().then(() => { showAlert(); }).catch(() => { showModal(); });}}`,
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run+2",
- );
- agHelper.GetNClick(propPane._actionCard);
- agHelper.GetNClick(propPane._actionTreeCollapse);
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On success",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show alertAdd message",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On failure",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show modalnone",
- "have.text",
- 2,
- );
- });
-
- it("5. should show Api fields when an Api with then/catch is entered", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- `{{Api1.run().then(() => { showAlert('Hello world!', 'info'); storeValue('a', 18); }).catch(() => { showModal('Modal1'); });}}`,
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run+3",
- );
- agHelper.GetNClick(propPane._actionCard);
- agHelper.GetNClick(propPane._actionTreeCollapse);
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On success",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show alertHello world!",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On failure",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Store valuea",
- "have.text",
- 2,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show modalModal1",
- "have.text",
- 3,
- );
-
- agHelper.GetNClick(propPane._actionCard, 1);
- agHelper.ValidateCodeEditorContent(propPane._textView, "Hello world!");
- agHelper.GetNAssertElementText(propPane._selectorViewButton, "Info");
-
- agHelper.GetNClick(propPane._actionCard, 2);
- agHelper.ValidateCodeEditorContent(propPane._textView, "a{{18}}");
-
- agHelper.GetNClick(propPane._actionCard, 3);
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Select modal",
- );
- });
-
- it("6. should show Api related fields appropriately with platform functions with callbacks", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- `{{Api1.run().then(() => {
- appsmith.geolocation.getCurrentPosition(location => {
- showAlert(location);
- });
- }).catch(() => {
- setInterval(() => {
- showAlert('hi');
- }, 5000, '1');
- });}}`,
- true,
- true,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run+2",
- );
-
- agHelper.GetNClick(propPane._actionCard);
- agHelper.GetNClick(propPane._actionTreeCollapse);
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On success",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On failure",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Set interval5000ms",
- "have.text",
- 2,
- );
- });
-
- it("7. should show Api related fields appropriately with platform functions with catch callback", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- "{{Api1.run().catch(() => copyToClipboard('hi'))}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run+1",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard);
- agHelper.GetNClick(propPane._actionTreeCollapse);
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On failure",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Copy to clipboardhi",
- "have.text",
- 1,
- );
-
- agHelper.GetNClick(propPane._actionCard, 1);
- agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
- });
-
- it("8. should show Api related fields appropriately with platform functions with catch callback", () => {
- entityExplorer.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- "{{Api1.run().then(() => clearStore())}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "GETExecute a queryApi1.run+1",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard);
- agHelper.GetNClick(propPane._actionTreeCollapse);
- agHelper.GetNAssertElementText(
- propPane._actionCallbackTitle,
- "On success",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Clear store",
- "have.text",
- 1,
- );
- });
-
- it("9. shows fields appropriately for JS Object functions with/without arguments", () => {
- const JS_OBJECT_BODY = `export default {
- funcWithoutArgsSync: () => {
- console.log("hi");
- },
- funcWithArgsSync: (a,b) => {
- return a+b;
- },
- funcWithoutArgsAsync: async () => {
- await console.log("hi");
- },
- funcWithArgsAsync: async (a,b) => {
- await console.log(a+b);
- }
- }`;
-
- jsEditor.CreateJSObject(JS_OBJECT_BODY, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- });
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext(
- "onClick",
- "{{JSObject1.funcWithoutArgsSync()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject1.funcWithoutArgsSync()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- "{{JSObject1.funcWithArgsSync(18,26)}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject1.funcWithArgsSync(18, 26)",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.ValidateCodeEditorContent(propPane._textView, "{{18}}{{26}}");
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "a",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "b",
- "have.text",
- 1,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{JSObject1.funcWithoutArgsAsync()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject1.funcWithoutArgsAsync()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- "{{JSObject1.funcWithArgsAsync()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject1.funcWithArgsAsync()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "a",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "b",
- "have.text",
- 1,
- );
- });
-
- it("10. shows fields appropriately for JS Object functions with/without arguments and then/catch blocks", () => {
- const JS_OBJECT_BODY = `export default {
- promiseFuncNoArgs: () => {
- return new Promise((resolve) => {
- resolve("hi");
- });
- },
- promiseFuncWithArgs: (a) => {
- return new Promise((resolve, reject) => {
- if (a === "hi") {
- resolve("hi");
- } else {
- reject("bye");
- }
- });
- },
- }`;
-
- jsEditor.CreateJSObject(JS_OBJECT_BODY, {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- });
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then"))}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncNoArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch"))}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncNoArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncNoArgs().then(() => showAlert("then")).catch(() => showAlert("catch"));}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncNoArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncNoArgs().catch(() => showAlert("catch")).then(() => showAlert("then"));}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncNoArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.AssertElementAbsence(propPane._actionPopupTextLabel, 0);
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncWithArgs("hi").then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- 'Execute a JS functionJSObject2.promiseFuncWithArgs("hi")',
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "a",
- "have.text",
- 0,
- );
- agHelper.ValidateCodeEditorContent(propPane._textView, "hi");
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncWithArgs().catch(() => showAlert("catch"));}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncWithArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "a",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- '{{JSObject2.promiseFuncWithArgs().then(() => showAlert("hi")).catch(() => showAlert("bye"));}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Execute a JS functionJSObject2.promiseFuncWithArgs()",
- "have.text",
- 0,
- );
-
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "a",
- "have.text",
- 0,
- );
- });
-
- it("11. shows fields for navigate to from js to non-js mode", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{navigateTo()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Navigate toSelect page",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementVisible(propPane._navigateToType("Page name"));
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectPage,
- "Select page",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Query params",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._sameWindowDropdownOption,
- "Same window",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{navigateTo('Page1', {a:1}, 'NEW_WINDOW')}}",
- true,
- true,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Navigate toPage1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementVisible(propPane._navigateToType("Page name"));
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectPage,
- "Page1",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Query params",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._sameWindowDropdownOption,
- "New window",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{navigateTo('google.com', {a:1}, 'SAME_WINDOW')}}",
- true,
- true,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Navigate togoogle.com",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementVisible(propPane._navigateToType("URL"));
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Enter URL",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Query params",
- "have.text",
- 1,
- );
-
- agHelper.GetNAssertElementText(
- propPane._sameWindowDropdownOption,
- "Same window",
- "have.text",
- 0,
- );
- });
-
- it("12. shows fields for show alert from js to non-js mode", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{showAlert()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show alertAdd message",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Message",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._dropdownSelectType,
- "Select type",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{showAlert('hello', 'info')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show alerthello",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Message",
- "have.text",
- 0,
- );
- agHelper.ValidateCodeEditorContent(propPane._textView, "hello");
-
- agHelper.GetNAssertElementText(
- propPane._dropdownSelectType,
- "Info",
- "have.text",
- 0,
- );
- });
-
- it("13. shows fields for show modal from js to non-js mode", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
-
- entityExplorer.DragDropWidgetNVerify("modalwidget", 50, 50);
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{showModal()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show modalnone",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectModal,
- "Select modal",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext("onClick", "{{showModal('Modal1')}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Show modalModal1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectModal,
- "Modal1",
- "have.text",
- 0,
- );
- });
-
- it("14. shows fields for remove modal from js to non-js mode", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{closeModal()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Close modalnone",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectModal,
- "Select modal",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext("onClick", "{{closeModal('Modal1')}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Close modalModal1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionOpenDropdownSelectModal,
- "Modal1",
- "have.text",
- 0,
- );
- });
-
- it("15. should shows appropriate fields for store value", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{storeValue()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Store valueAdd key",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Key",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Value",
- "have.text",
- 1,
- );
-
- propPane.EnterJSContext("onClick", "{{storeValue('a', '')}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Store valuea",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- propPane.EnterJSContext("onClick", "{{storeValue('a', 1)}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Store valuea",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.ValidateCodeEditorContent(propPane._textView, "a{{1}}");
-
- propPane.EnterJSContext("onClick", "{{storeValue('', 1)}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Store valueAdd key",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
- });
-
- it("16. shows fields for remove value appropriately", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{removeValue()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Remove valueAdd key",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Key",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext("onClick", "{{removeValue('a')}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Remove valuea",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.ValidateCodeEditorContent(propPane._textView, "a");
- });
-
- it("17. shows fields appropriately for the download function", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{download()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "DownloadAdd data to download",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Data to download",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "File name with extension",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._selectorViewLabel,
- "Type",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Select file type (optional)",
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{download('a', '', '')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "DownloadAdd data to download",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{download('a', 'b', '')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Downloadb",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{download('a', 'b', 'image/png')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Downloadb",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
- agHelper.ValidateCodeEditorContent(propPane._textView, "ab");
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "PNG",
- "have.text",
- 0,
- );
- });
-
- it("18. shows fields for copyToClipboard appropriately", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{copyToClipboard()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Copy to clipboardAdd text",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Text to be copied to clipboard",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext("onClick", "{{copyToClipboard('a')}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Copy to clipboarda",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.ValidateCodeEditorContent(propPane._textView, "a");
- agHelper.TypeText(
- propPane._actionSelectorFieldByLabel("Text to be copied to clipboard"),
- "line1{enter}line2{enter}line3",
- 0,
- true,
- );
- propPane.ToggleJSMode("onClick");
- propPane.ValidatePropertyFieldValue(
- "onClick",
- `{{copyToClipboard('line1\\nline2\\nline3a');}}`,
- );
- });
-
- it("19. shows fields for reset widget appropriately", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{resetWidget()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Reset widgetSelect widget",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewLabel,
- "Widget",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewLabel,
- "Reset Children",
- "have.text",
- 1,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Select widget",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "true",
- "have.text",
- 1,
- );
-
- propPane.EnterJSContext(
- "onClick",
- '{{resetWidget("Modal1", false)}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Reset widgetModal1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Modal1",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "false",
- "have.text",
- 1,
- );
-
- propPane.EnterJSContext(
- "onClick",
- '{{resetWidget("Modal1")}}',
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Reset widgetModal1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Modal1",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "true",
- "have.text",
- 1,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{resetWidget('', false)}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Reset widgetSelect widget",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "Select widget",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._selectorViewButton,
- "false",
- "have.text",
- 1,
- );
- });
-
- it("20. should show fields appropriately for setinterval", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{setInterval()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Set intervalms",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Callback function",
- "have.text",
- 0,
- );
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Delay (ms)",
- "have.text",
- 1,
- );
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Id",
- "have.text",
- 2,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{setInterval(() => {}, 200, '')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Set interval200ms",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- propPane.EnterJSContext(
- "onClick",
- "{{setInterval(() => {showAlert('hi')}, 200, 'id1')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Set interval200ms",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
- });
-
- it("21. should show fields appropriately for clearInterval", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{clearInterval()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Clear intervalAdd Id",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Id",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext("onClick", "{{clearInterval('Id1')}}", true, true);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Clear intervalId1",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.ValidateCodeEditorContent(propPane._textView, "Id1");
- });
-
- it("22. should show no fields for clear store", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{clearStore()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Clear store",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementAbsence(propPane._textView);
- agHelper.AssertElementAbsence(propPane._selectorView);
- });
-
- it("23. should show no fields for watch geolocation position", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext(
- "onClick",
- "{{appsmith.geolocation.watchPosition()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Watch geolocation",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementAbsence(propPane._textView);
- agHelper.AssertElementAbsence(propPane._selectorView);
- });
-
- it("24. should show no fields for stop watching geolocation position", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext(
- "onClick",
- "{{appsmith.geolocation.clearWatch()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Stop watching geolocation",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.AssertElementAbsence(propPane._textView);
- agHelper.AssertElementAbsence(propPane._selectorView);
- });
-
- it("25. should show appropriate fields for get geolocation", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext(
- "onClick",
- "{{appsmith.geolocation.getCurrentPosition()}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Get geolocationAdd callback",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Callback function",
- "have.text",
- 0,
- );
-
- propPane.EnterJSContext(
- "onClick",
- `{{appsmith.geolocation.getCurrentPosition((location) => {
- // add code here
- });}}`,
- true,
- true,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Callback function",
- "have.text",
- 0,
- );
- });
-
- it("26. should show post message fields appropriately", () => {
- entityExplorer.SelectEntityByName("Page1", "Pages");
- entityExplorer.SelectEntityByName("Button1", "Widgets");
-
- propPane.EnterJSContext("onClick", "{{postWindowMessage()}}", true, false);
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Post messageAdd message",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Message",
- "have.text",
- 0,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Target iframe",
- "have.text",
- 1,
- );
- agHelper.GetNAssertElementText(
- propPane._actionPopupTextLabel,
- "Allowed origins",
- "have.text",
- 2,
- );
-
- propPane.EnterJSContext(
- "onClick",
- "{{postWindowMessage('hello', 'window', '*')}}",
- true,
- false,
- );
- propPane.ToggleJSMode("onClick", false);
-
- agHelper.GetNAssertElementText(
- propPane._actionCard,
- "Post messagehello",
- "have.text",
- 0,
- );
- agHelper.GetNClick(propPane._actionCard, 0);
-
- agHelper.ValidateCodeEditorContent(propPane._textView, "hellowindow*");
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
similarity index 70%
rename from app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
index 6ea56f1f4440..728b8eda1a27 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
@@ -17,46 +17,7 @@ describe("Validate basic Promises", () => {
agHelper.SaveLocalStorageCache();
});
- it("1. Verify storeValue via .then via direct Promises", () => {
- const date = new Date().toDateString();
- cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val, locator._spanButton("Submit"));
- });
- ee.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- "{{storeValue('date', Date()).then(() => showAlert(appsmith.store.date))}}",
- );
- deployMode.DeployApp();
- agHelper.ClickButton("Submit");
- agHelper.ValidateToastMessage(date);
- deployMode.NavigateBacktoEditor();
- });
-
- it("2. Verify resolve & chaining via direct Promises", () => {
- cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val, locator._spanButton("Submit"));
- });
- ee.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- `{{
- new Promise((resolve) => {
- resolve("We are on planet")
- }).then((res) => {
- return res + " Earth"
- }).then((res) => {
- showAlert(res, 'success')
- }).catch(err => { showAlert(err, 'error') });
- }}`,
- );
- deployMode.DeployApp();
- agHelper.ClickButton("Submit");
- agHelper.ValidateToastMessage("We are on planet Earth");
- deployMode.NavigateBacktoEditor();
- });
-
- it("3. Verify Async Await in direct Promises", () => {
+ it("1. Verify Async Await in direct Promises", () => {
cy.fixture("promisesBtnDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
});
@@ -94,7 +55,7 @@ describe("Validate basic Promises", () => {
// .contains(/male|female|null/g);
});
- it("4. Verify .then & .catch via direct Promises", () => {
+ it("2. Verify .then & .catch via direct Promises", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnImgDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
@@ -128,7 +89,7 @@ describe("Validate basic Promises", () => {
);
});
- it("5. Verify .then & .catch via JS Objects in Promises", () => {
+ it("3. Verify .then & .catch via JS Objects in Promises", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
@@ -157,7 +118,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
);
});
- it("6. Verify Promise.race via direct Promises", () => {
+ it("4. Verify Promise.race via direct Promises", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
@@ -185,7 +146,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
);
});
- it("7. Verify maintaining context via direct Promises", () => {
+ it("5. Verify maintaining context via direct Promises", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnListDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
@@ -235,7 +196,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
);
});
- it("8: Verify Promise.all via direct Promises", () => {
+ it("6: Verify Promise.all via direct Promises", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnDsl").then((val: any) => {
agHelper.AddDsl(val, locator._spanButton("Submit"));
@@ -260,7 +221,7 @@ return InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + us
agHelper.ValidateToastMessage("cat,dog,camel,rabbit,rat");
});
- it("9. Bug 10150: Verify Promise.all via JSObjects", () => {
+ it("7. Bug 10150: Verify Promise.all via JSObjects", () => {
deployMode.NavigateBacktoEditor();
const date = new Date().toDateString();
cy.fixture("promisesBtnDsl").then((val: any) => {
@@ -294,66 +255,7 @@ showAlert("Wonderful! all apis executed", "success")).catch(() => showAlert("Ple
agHelper.AssertContains(/Wonderful|Please check/g);
});
- it("10. Verify Promises.any via direct JSObjects", () => {
- deployMode.NavigateBacktoEditor();
- cy.fixture("promisesBtnDsl").then((val: any) => {
- agHelper.AddDsl(val, locator._spanButton("Submit"));
- });
- jsEditor.CreateJSObject(
- `export default {
- func2: async () => {
- return Promise.reject(new Error('fail')).then(showAlert("Promises reject from func2"));
- },
- func1: async () => {
- showAlert("In func1")
- return "func1"
- },
- func3: async () => {
- showAlert("In func3")
- return "func3"
- },
- runAny: async () => {
- return Promise.any([this.func2(), this.func3(), this.func1()]).then((value) => showAlert("Resolved promise is:" + value))
- }
- }`,
- {
- paste: true,
- completeReplace: true,
- toRun: false,
- shouldCreateNewJSObj: true,
- },
- );
- ee.SelectEntityByName("Button1", "Widgets");
- cy.get("@jsObjName").then((jsObjName) => {
- propPane.EnterJSContext("onClick", "{{" + jsObjName + ".runAny()}}");
- });
- deployMode.DeployApp();
- agHelper.ClickButton("Submit");
- agHelper.AssertElementLength(locator._toastMsg, 4);
- agHelper.ValidateToastMessage("Promises reject from func2", 0);
- agHelper.ValidateToastMessage("Resolved promise is:func3", 3); //Validating last index
- });
-
- it("11. Bug : 11110 - Verify resetWidget via .then direct Promises", () => {
- deployMode.NavigateBacktoEditor();
- cy.fixture("promisesBtnDsl").then((dsl: any) => {
- agHelper.AddDsl(dsl, locator._spanButton("Submit"));
- });
- ee.SelectEntityByName("Button1", "Widgets");
- propPane.EnterJSContext(
- "onClick",
- "{{resetWidget('Input1').then(() => showAlert(Input1.text))}}",
- );
- deployMode.DeployApp(locator._widgetInputSelector("inputwidgetv2"));
- agHelper.TypeText(
- locator._widgetInputSelector("inputwidgetv2"),
- "Update value",
- );
- agHelper.ClickButton("Submit");
- agHelper.ValidateToastMessage("Test");
- });
-
- it("12. Bug 9782: Verify .then & .catch (show alert should trigger) via JS Objects without return keyword", () => {
+ it("8. Bug 9782: Verify .then & .catch (show alert should trigger) via JS Objects without return keyword", () => {
deployMode.NavigateBacktoEditor();
cy.fixture("promisesBtnDsl").then((val: any) => {
agHelper.AddDsl(val);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_2_Spec.ts
new file mode 100644
index 000000000000..96e9531727f0
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_2_Spec.ts
@@ -0,0 +1,116 @@
+import { ObjectsRegistry } from "../../../../support/Objects/Registry";
+
+const agHelper = ObjectsRegistry.AggregateHelper,
+ ee = ObjectsRegistry.EntityExplorer,
+ jsEditor = ObjectsRegistry.JSEditor,
+ locator = ObjectsRegistry.CommonLocators,
+ apiPage = ObjectsRegistry.ApiPage,
+ deployMode = ObjectsRegistry.DeployMode,
+ propPane = ObjectsRegistry.PropertyPane;
+
+describe("Validate basic Promises", () => {
+ beforeEach(() => {
+ agHelper.RestoreLocalStorageCache();
+ });
+
+ afterEach(() => {
+ agHelper.SaveLocalStorageCache();
+ });
+
+ it("1. Verify storeValue via .then via direct Promises", () => {
+ const date = new Date().toDateString();
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locator._spanButton("Submit"));
+ });
+ ee.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ "{{storeValue('date', Date()).then(() => showAlert(appsmith.store.date))}}",
+ );
+ deployMode.DeployApp();
+ agHelper.ClickButton("Submit");
+ agHelper.ValidateToastMessage(date);
+ deployMode.NavigateBacktoEditor();
+ });
+
+ it("2. Verify resolve & chaining via direct Promises", () => {
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locator._spanButton("Submit"));
+ });
+ ee.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ `{{
+ new Promise((resolve) => {
+ resolve("We are on planet")
+ }).then((res) => {
+ return res + " Earth"
+ }).then((res) => {
+ showAlert(res, 'success')
+ }).catch(err => { showAlert(err, 'error') });
+ }}`,
+ );
+ deployMode.DeployApp();
+ agHelper.ClickButton("Submit");
+ agHelper.ValidateToastMessage("We are on planet Earth");
+ deployMode.NavigateBacktoEditor();
+ });
+
+ it("3. Verify Promises.any via direct JSObjects", () => {
+ cy.fixture("promisesBtnDsl").then((val: any) => {
+ agHelper.AddDsl(val, locator._spanButton("Submit"));
+ });
+ jsEditor.CreateJSObject(
+ `export default {
+ func2: async () => {
+ return Promise.reject(new Error('fail')).then(showAlert("Promises reject from func2"));
+ },
+ func1: async () => {
+ showAlert("In func1")
+ return "func1"
+ },
+ func3: async () => {
+ showAlert("In func3")
+ return "func3"
+ },
+ runAny: async () => {
+ return Promise.any([this.func2(), this.func3(), this.func1()]).then((value) => showAlert("Resolved promise is:" + value))
+ }
+ }`,
+ {
+ paste: true,
+ completeReplace: true,
+ toRun: false,
+ shouldCreateNewJSObj: true,
+ },
+ );
+ ee.SelectEntityByName("Button1", "Widgets");
+ cy.get("@jsObjName").then((jsObjName) => {
+ propPane.EnterJSContext("onClick", "{{" + jsObjName + ".runAny()}}");
+ });
+ deployMode.DeployApp();
+ agHelper.ClickButton("Submit");
+ agHelper.AssertElementLength(locator._toastMsg, 4);
+ agHelper.ValidateToastMessage("Promises reject from func2", 0);
+ agHelper.ValidateToastMessage("Resolved promise is:func3", 3); //Validating last index
+ });
+
+ it("4. Bug : 11110 - Verify resetWidget via .then direct Promises", () => {
+ deployMode.NavigateBacktoEditor();
+ cy.fixture("promisesBtnDsl").then((dsl: any) => {
+ agHelper.AddDsl(dsl, locator._spanButton("Submit"));
+ });
+ ee.SelectEntityByName("Button1", "Widgets");
+ propPane.EnterJSContext(
+ "onClick",
+ "{{resetWidget('Input1').then(() => showAlert(Input1.text))}}",
+ );
+ deployMode.DeployApp(locator._widgetInputSelector("inputwidgetv2"));
+ agHelper.TypeText(
+ locator._widgetInputSelector("inputwidgetv2"),
+ "Update value",
+ );
+ agHelper.ClickButton("Submit");
+ agHelper.ValidateToastMessage("Test");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
similarity index 62%
rename from app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
index 6d326107a8c2..8982e8becd4c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
@@ -193,136 +193,4 @@ describe("Admin settings page", function () {
cy.get(adminsSettings.instanceName).should("be.visible");
cy.get(adminsSettings.adminEmails).should("be.visible");
});
-
- it("10. should test that configure link redirects to google maps setup doc", () => {
- cy.visit(routes.GOOGLE_MAPS);
- cy.get(adminsSettings.readMoreLink).within(() => {
- cy.get("a")
- .should("have.attr", "target", "_blank")
- .invoke("removeAttr", "target")
- .click()
- .wait(3000); //for page to load fully;
- cy.url().should("contain", GOOGLE_MAPS_SETUP_DOC);
- });
- });
-
- it(
- "excludeForAirgap",
- "11. should test that authentication page redirects",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.googleButton).click();
- cy.url().should("contain", routes.GOOGLEAUTH);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.githubButton).click();
- cy.url().should("contain", routes.GITHUBAUTH);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.formloginButton).click();
- cy.url().should("contain", routes.FORMLOGIN);
- },
- );
-
- it(
- "airgap",
- "11. should test that authentication page redirects and google and github auth doesn't exist - airgap",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.googleButton).should("not.exist");
- cy.get(adminsSettings.githubButton).should("not.exist");
- cy.get(adminsSettings.formloginButton).click();
- cy.url().should("contain", routes.FORMLOGIN);
- },
- );
-
- it(
- "excludeForAirgap",
- "12. should test that configure link redirects to google signup setup doc",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.googleButton).click();
- cy.url().should("contain", routes.GOOGLEAUTH);
- cy.get(adminsSettings.readMoreLink).within(() => {
- cy.get("a")
- .should("have.attr", "target", "_blank")
- .invoke("removeAttr", "target")
- .click()
- .wait(3000); //for page to load fully;
- cy.url().should("contain", GOOGLE_SIGNUP_SETUP_DOC);
- });
- },
- );
-
- it(
- "excludeForAirgap",
- "13. should test that configure link redirects to github signup setup doc",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.authenticationTab).click();
- cy.url().should("contain", routes.AUTHENTICATION);
- cy.get(adminsSettings.githubButton).click();
- cy.url().should("contain", routes.GITHUBAUTH);
- cy.get(adminsSettings.readMoreLink).within(() => {
- cy.get("a")
- .should("have.attr", "target", "_blank")
- .invoke("removeAttr", "target")
- .click()
- .wait(3000); //for page to load fully
- cy.url().should("contain", GITHUB_SIGNUP_SETUP_DOC);
- });
- },
- );
-
- it(
- "excludeForAirgap",
- "14. should test that read more on version opens up release notes",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.versionTab).click();
- cy.url().should("contain", routes.VERSION);
- cy.get(adminsSettings.readMoreLink).within(() => {
- cy.get("a").click();
- });
- cy.wait(2000);
- cy.get(".ads-v2-modal__content").should("be.visible");
- cy.get(".ads-v2-modal__content-header").should("be.visible");
- cy.get(".ads-v2-modal__content-header").should(
- "contain",
- "Product updates",
- );
- cy.get(".ads-v2-button__content-icon-start").should("be.visible");
- cy.get(".ads-v2-button__content-icon-start").click();
- cy.wait(2000);
- cy.get(".ads-v2-modal__content").should("not.exist");
- },
- );
-
- it(
- "airgap",
- "14. should test that read more on version is hidden for airgap",
- () => {
- cy.visit(routes.GENERAL);
- cy.get(adminsSettings.versionTab).click();
- cy.url().should("contain", routes.VERSION);
- cy.get(adminsSettings.readMoreLink).should("not.exist");
- },
- );
-
- it("15. should test that settings page is not accessible to normal users", () => {
- cy.LogOut();
- cy.wait(2000);
- cy.LoginFromAPI(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
- cy.get(".admin-settings-menu-option").should("not.exist");
- cy.visit(routes.GENERAL);
- // non super users are redirected to home page
- cy.url().should("contain", routes.APPLICATIONS);
- cy.LogOut();
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
new file mode 100644
index 000000000000..bf704991b4f2
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
@@ -0,0 +1,156 @@
+/// <reference types="cypress-tags" />
+import adminsSettings from "../../../../locators/AdminsSettings";
+
+const {
+ GITHUB_SIGNUP_SETUP_DOC,
+ GOOGLE_MAPS_SETUP_DOC,
+ GOOGLE_SIGNUP_SETUP_DOC,
+} = require("../../../../../src/constants/ThirdPartyConstants");
+
+const routes = {
+ APPLICATIONS: "/applications",
+ SETTINGS: "/settings",
+ GENERAL: "/settings/general",
+ EMAIL: "/settings/email",
+ GOOGLE_MAPS: "/settings/google-maps",
+ AUTHENTICATION: "/settings/authentication",
+ GOOGLEAUTH: "/settings/authentication/google-auth",
+ GITHUBAUTH: "/settings/authentication/github-auth",
+ FORMLOGIN: "/settings/authentication/form-login",
+ ADVANCED: "/settings/advanced",
+ VERSION: "/settings/version",
+};
+
+describe("Admin settings page", function () {
+ it("1. should test that configure link redirects to google maps setup doc", () => {
+ cy.visit(routes.GOOGLE_MAPS);
+ cy.get(adminsSettings.readMoreLink).within(() => {
+ cy.get("a")
+ .should("have.attr", "target", "_blank")
+ .invoke("removeAttr", "target")
+ .click()
+ .wait(3000); //for page to load fully;
+ cy.url().should("contain", GOOGLE_MAPS_SETUP_DOC);
+ });
+ });
+
+ it(
+ "excludeForAirgap",
+ "2. should test that authentication page redirects",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.googleButton).click();
+ cy.url().should("contain", routes.GOOGLEAUTH);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.githubButton).click();
+ cy.url().should("contain", routes.GITHUBAUTH);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.formloginButton).click();
+ cy.url().should("contain", routes.FORMLOGIN);
+ },
+ );
+
+ it(
+ "airgap",
+ "2. should test that authentication page redirects and google and github auth doesn't exist - airgap",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.googleButton).should("not.exist");
+ cy.get(adminsSettings.githubButton).should("not.exist");
+ cy.get(adminsSettings.formloginButton).click();
+ cy.url().should("contain", routes.FORMLOGIN);
+ },
+ );
+
+ it(
+ "excludeForAirgap",
+ "3. should test that configure link redirects to google signup setup doc",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.googleButton).click();
+ cy.url().should("contain", routes.GOOGLEAUTH);
+ cy.get(adminsSettings.readMoreLink).within(() => {
+ cy.get("a")
+ .should("have.attr", "target", "_blank")
+ .invoke("removeAttr", "target")
+ .click()
+ .wait(3000); //for page to load fully;
+ cy.url().should("contain", GOOGLE_SIGNUP_SETUP_DOC);
+ });
+ },
+ );
+
+ it(
+ "excludeForAirgap",
+ "4. should test that configure link redirects to github signup setup doc",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.authenticationTab).click();
+ cy.url().should("contain", routes.AUTHENTICATION);
+ cy.get(adminsSettings.githubButton).click();
+ cy.url().should("contain", routes.GITHUBAUTH);
+ cy.get(adminsSettings.readMoreLink).within(() => {
+ cy.get("a")
+ .should("have.attr", "target", "_blank")
+ .invoke("removeAttr", "target")
+ .click()
+ .wait(3000); //for page to load fully
+ cy.url().should("contain", GITHUB_SIGNUP_SETUP_DOC);
+ });
+ },
+ );
+
+ it(
+ "excludeForAirgap",
+ "5. should test that read more on version opens up release notes",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.versionTab).click();
+ cy.url().should("contain", routes.VERSION);
+ cy.get(adminsSettings.readMoreLink).within(() => {
+ cy.get("a").click();
+ });
+ cy.wait(2000);
+ cy.get(".ads-v2-modal__content").should("be.visible");
+ cy.get(".ads-v2-modal__content-header").should("be.visible");
+ cy.get(".ads-v2-modal__content-header").should(
+ "contain",
+ "Product updates",
+ );
+ cy.get(".ads-v2-button__content-icon-start").should("be.visible");
+ cy.get(".ads-v2-button__content-icon-start").click();
+ cy.wait(2000);
+ cy.get(".ads-v2-modal__content").should("not.exist");
+ },
+ );
+
+ it(
+ "airgap",
+ "5. should test that read more on version is hidden for airgap",
+ () => {
+ cy.visit(routes.GENERAL);
+ cy.get(adminsSettings.versionTab).click();
+ cy.url().should("contain", routes.VERSION);
+ cy.get(adminsSettings.readMoreLink).should("not.exist");
+ },
+ );
+
+ it("6. should test that settings page is not accessible to normal users", () => {
+ cy.LogOut();
+ cy.wait(2000);
+ cy.LoginFromAPI(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
+ cy.get(".admin-settings-menu-option").should("not.exist");
+ cy.visit(routes.GENERAL);
+ // non super users are redirected to home page
+ cy.url().should("contain", routes.APPLICATIONS);
+ cy.LogOut();
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
similarity index 65%
rename from app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
index 92725477a354..6bfd41a09f64 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js
@@ -180,147 +180,6 @@ describe("Canvas context Property Pane", function () {
cy.get(propPaneBack).click();
cy.get(".t--property-pane-title").should("contain", "Table1");
});
-
- it("10. Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
- let propertySectionState = {
- data: false,
- general: true,
- };
-
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("step");
- setPropertyPaneSectionState(propertySectionState);
- },
- () => {
- cy.wait(500);
- verifyPropertyPaneSectionState(propertySectionState);
- },
- "Table1",
- );
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
-
- it("11. Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
- propertySectionState = {
- textformatting: true,
- color: false,
- };
-
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("step");
- cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
- setPropertyPaneSectionState(propertySectionState);
- },
- () => {
- verifyPropertyPaneSectionState(propertySectionState);
- },
- "Table1",
- );
-
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
-
- it("12. Multi Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
- let propertyControlSelector = ".t--property-control-text";
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("status");
- cy.editColumn("menuIteme63irwbvnd", false);
- cy.focusCodeInput(propertyControlSelector);
- },
- () => {
- cy.assertSoftFocusOnCodeInput(propertyControlSelector);
- },
- "Table1",
- );
-
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "status");
-
- cy.wait(500);
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
-
- it("13. Multi Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", () => {
- propertyControlSelector = `.t--property-control-visible input[type="checkbox"]`;
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("status");
- cy.editColumn("menuIteme63irwbvnd", false);
- cy.get(propertyControlSelector).click({ force: true });
- },
- () => {
- cy.get(propertyControlSelector).should("be.focused");
- },
- "Table1",
- );
-
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "status");
-
- cy.wait(500);
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
-
- it("14. Multi Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
- let propertySectionState = {
- basic: false,
- general: true,
- };
-
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("status");
- cy.editColumn("menuIteme63irwbvnd", false);
- setPropertyPaneSectionState(propertySectionState);
- },
- () => {
- cy.wait(500);
- verifyPropertyPaneSectionState(propertySectionState);
- },
- "Table1",
- );
-
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "status");
-
- cy.wait(500);
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
-
- it("15. Multi Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
- propertySectionState = {
- icon: true,
- color: false,
- };
-
- verifyPropertyPaneContext(
- () => {
- cy.editColumn("status");
- cy.editColumn("menuIteme63irwbvnd", false);
- cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
- setPropertyPaneSectionState(propertySectionState);
- },
- () => {
- verifyPropertyPaneSectionState(propertySectionState);
- },
- "Table1",
- );
-
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "status");
-
- cy.wait(500);
- cy.get(propPaneBack).click();
- cy.get(".t--property-pane-title").should("contain", "Table1");
- });
});
let propertySectionClass = (section) =>
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js
new file mode 100644
index 000000000000..fa528bc2dce5
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_2_spec.js
@@ -0,0 +1,253 @@
+import * as _ from "../../../../support/Objects/ObjectsCore";
+
+let propertyControlSelector,
+ propertyControlClickSelector,
+ propertyControlVerifySelector,
+ propertySectionState;
+const page1 = "Page1";
+const page2 = "Page2";
+const api1 = "API1";
+
+describe("Canvas context Property Pane", function () {
+ before(() => {
+ cy.fixture("editorContextdsl").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ _.entityExplorer.AddNewPage("New blank page");
+ cy.dragAndDropToCanvas("textwidget", { x: 300, y: 200 });
+ _.entityExplorer.SelectEntityByName(page1, "Pages");
+ _.apiPage.CreateApi(api1);
+ _.entityExplorer.NavigateToSwitcher("Widgets");
+ });
+
+ beforeEach(() => {
+ _.agHelper.RefreshPage();
+ });
+
+ let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+ it("1. Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+ let propertySectionState = {
+ data: false,
+ general: true,
+ };
+
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("step");
+ setPropertyPaneSectionState(propertySectionState);
+ },
+ () => {
+ cy.wait(500);
+ verifyPropertyPaneSectionState(propertySectionState);
+ },
+ "Table1",
+ );
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+
+ it("2. Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+ propertySectionState = {
+ textformatting: true,
+ color: false,
+ };
+
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("step");
+ cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+ setPropertyPaneSectionState(propertySectionState);
+ },
+ () => {
+ verifyPropertyPaneSectionState(propertySectionState);
+ },
+ "Table1",
+ );
+
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+
+ it("3. Multi Layered PropertyPane - Code Editor should have focus while switching between widgets, pages and Editor Panes", function () {
+ let propertyControlSelector = ".t--property-control-text";
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("status");
+ cy.editColumn("menuIteme63irwbvnd", false);
+ cy.focusCodeInput(propertyControlSelector);
+ },
+ () => {
+ cy.assertSoftFocusOnCodeInput(propertyControlSelector);
+ },
+ "Table1",
+ );
+
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "status");
+
+ cy.wait(500);
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+
+ it("4. Multi Layered PropertyPane - Toggle Property controls should have focus while switching between widgets, pages and Editor Panes", () => {
+ propertyControlSelector = `.t--property-control-visible input[type="checkbox"]`;
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("status");
+ cy.editColumn("menuIteme63irwbvnd", false);
+ cy.get(propertyControlSelector).click({ force: true });
+ },
+ () => {
+ cy.get(propertyControlSelector).should("be.focused");
+ },
+ "Table1",
+ );
+
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "status");
+
+ cy.wait(500);
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+
+ it("5. Multi Layered PropertyPane - Property Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+ let propertySectionState = {
+ basic: false,
+ general: true,
+ };
+
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("status");
+ cy.editColumn("menuIteme63irwbvnd", false);
+ setPropertyPaneSectionState(propertySectionState);
+ },
+ () => {
+ cy.wait(500);
+ verifyPropertyPaneSectionState(propertySectionState);
+ },
+ "Table1",
+ );
+
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "status");
+
+ cy.wait(500);
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+
+ it("6. Multi Layered PropertyPane - Property Tabs and Sections should retain state while switching between widgets, pages and Editor Panes", () => {
+ propertySectionState = {
+ icon: true,
+ color: false,
+ };
+
+ verifyPropertyPaneContext(
+ () => {
+ cy.editColumn("status");
+ cy.editColumn("menuIteme63irwbvnd", false);
+ cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+ setPropertyPaneSectionState(propertySectionState);
+ },
+ () => {
+ verifyPropertyPaneSectionState(propertySectionState);
+ },
+ "Table1",
+ );
+
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "status");
+
+ cy.wait(500);
+ cy.get(propPaneBack).click();
+ cy.get(".t--property-pane-title").should("contain", "Table1");
+ });
+});
+
+let propertySectionClass = (section) =>
+ `.t--property-pane-section-collapse-${section}`;
+
+function setPropertyPaneSectionState(propertySectionState) {
+ for (const [sectionName, shouldSectionOpen] of Object.entries(
+ propertySectionState,
+ )) {
+ cy.get("body").then(($body) => {
+ if (
+ $body.find(
+ `${propertySectionClass(sectionName)} .t--chevron-icon.rotate-180`,
+ ).length >
+ 0 !==
+ shouldSectionOpen
+ ) {
+ cy.get(propertySectionClass(sectionName)).click();
+ }
+ });
+ }
+}
+
+function verifyPropertyPaneSectionState(propertySectionState) {
+ for (const [sectionName, shouldSectionOpen] of Object.entries(
+ propertySectionState,
+ )) {
+ cy.get("body").then(($body) => {
+ const isSectionOpen =
+ $body.find(
+ `${propertySectionClass(sectionName)} .t--chevron-icon.rotate-180`,
+ ).length > 0;
+ expect(isSectionOpen).to.equal(shouldSectionOpen);
+ });
+ }
+}
+
+function verifyPropertyPaneContext(
+ focusCallback,
+ assertCallback,
+ widgetName,
+ isStyleTab = false,
+) {
+ //select Button1 widget in page1
+ _.entityExplorer.SelectEntityByName(widgetName, "Widgets");
+
+ //verify the Button1 is selected in page1
+ cy.get(".t--property-pane-title").should("contain", widgetName);
+
+ if (isStyleTab) {
+ cy.get(`.ads-v2-tabs__list-tab:contains("Style")`).eq(0).click();
+ }
+
+ //Focus Callback
+ focusCallback();
+
+ //Select Camera1 widget
+ _.entityExplorer.SelectEntityByName("Camera1", "Widgets");
+ cy.get(".t--property-pane-title").should("contain", "Camera1");
+
+ //Switch back to Button1 widget
+ _.entityExplorer.SelectEntityByName(widgetName, "Widgets");
+ cy.wait(500);
+
+ //assert Callback
+ assertCallback();
+
+ //switch to page2 and back
+ _.entityExplorer.SelectEntityByName(page2, "Pages");
+ _.entityExplorer.SelectEntityByName("Text1", "Widgets");
+ cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+ _.entityExplorer.SelectEntityByName(page1, "Pages");
+ cy.wait(500);
+
+ //assert Callback
+ assertCallback();
+
+ //Navigate to API1 Pane and back
+ _.entityExplorer.SelectEntityByName(api1, "Queries/JS");
+ cy.get(".t--close-editor").click();
+ cy.wait(500);
+
+ //assert Callback
+ assertCallback();
+}
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_1_spec.js
similarity index 82%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_1_spec.js
index f7c350a1af6a..dc715584d317 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_1_spec.js
@@ -233,59 +233,7 @@ describe("Chart Widget Functionality", function () {
_.deployMode.DeployApp();
});
- it("12. Chart - Modal", function () {
- //creating the Modal and verify Modal name
- cy.createModal(this.dataSet.ModalName, "onDataPointClick");
- _.deployMode.DeployApp();
- cy.get(widgetsPage.chartPlotGroup).children().first().click();
- cy.get(modalWidgetPage.modelTextField).should(
- "have.text",
- this.dataSet.ModalName,
- );
- });
-
- it("13. Chart-Unckeck Visible field Validation", function () {
- // Making the widget invisible
- cy.togglebarDisable(commonlocators.visibleCheckbox);
- _.deployMode.DeployApp();
- cy.get(publish.chartWidget).should("not.exist");
- });
-
- it("14. Chart-Check Visible field Validation", function () {
- // Making the widget visible
- cy.togglebar(commonlocators.visibleCheckbox);
- _.deployMode.DeployApp();
- cy.get(publish.chartWidget).should("be.visible");
- });
-
- it("15. Toggle JS - Chart-Unckeck Visible field Validation", function () {
- //Uncheck the disabled checkbox using JS and validate
- cy.get(widgetsPage.toggleVisible).click({ force: true });
- cy.testJsontext("visible", "false");
- _.deployMode.DeployApp();
- cy.get(publish.chartWidget).should("not.exist");
- });
-
- it("16. Toggle JS - Chart-Check Visible field Validation", function () {
- //Check the disabled checkbox using JS and Validate
- cy.testJsontext("visible", "true");
- _.deployMode.DeployApp();
- cy.get(publish.chartWidget).should("be.visible");
- });
-
- it("17. Chart Widget Functionality To Uncheck Horizontal Scroll Visible", function () {
- cy.togglebarDisable(commonlocators.allowScroll);
- _.deployMode.DeployApp();
- cy.get(publish.horizontalTab).should("not.exist");
- });
-
- it("18. Chart Widget Functionality To Check Horizontal Scroll Visible", function () {
- cy.togglebar(commonlocators.allowScroll);
- _.deployMode.DeployApp();
- cy.get(publish.horizontalTab).eq(1).should("exist");
- });
-
- it("19. Check Chart widget reskinning config", function () {
+ it("12. Check Chart widget reskinning config", function () {
cy.get(widgetsPage.toggleChartType).click({ force: true });
cy.UpdateChartType("Column chart");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_2_spec.js
new file mode 100644
index 000000000000..eec396d14286
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Chart/Chart_2_spec.js
@@ -0,0 +1,126 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const viewWidgetsPage = require("../../../../../locators/ViewWidgets.json");
+const publish = require("../../../../../locators/publishWidgetspage.json");
+const modalWidgetPage = require("../../../../../locators/ModalWidget.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Chart Widget Functionality", function () {
+ before(() => {
+ cy.fixture("chartUpdatedDsl").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ beforeEach(() => {
+ cy.openPropertyPane("chartwidget");
+ });
+
+ it("1. Fill the Chart Widget Properties.", function () {
+ //changing the Chart Name
+ /**
+ * @param{Text} Random Text
+ * @param{ChartWidget}Mouseover
+ * @param{ChartPre Css} Assertion
+ */
+ cy.widgetText(
+ "Test",
+ viewWidgetsPage.chartWidget,
+ widgetsPage.widgetNameSpan,
+ );
+ cy.EnableAllCodeEditors();
+ //changing the Chart Title
+ /**
+ * @param{Text} Random Input Value
+ */
+ cy.testJsontext("title", this.dataSet.chartIndata);
+ cy.get(viewWidgetsPage.chartInnerText)
+ .click()
+ .contains("App Sign Up")
+ .should("have.text", "App Sign Up");
+
+ //Entering the Chart data
+ cy.testJsontext(
+ "chart-series-data-control",
+ JSON.stringify(this.dataSet.chartInput),
+ );
+ cy.get(".t--propertypane").click("right");
+
+ // Asserting Chart Height
+ cy.get(viewWidgetsPage.chartWidget)
+ .should("be.visible")
+ .and((chart) => {
+ expect(chart.height()).to.be.greaterThan(200);
+ });
+
+ //Entring the label of x-axis
+ cy.get(viewWidgetsPage.xlabel)
+ .click({ force: true })
+ .type(this.dataSet.command)
+ .type(this.dataSet.plan);
+ //Entring the label of y-axis
+ cy.get(viewWidgetsPage.ylabel)
+ .click({ force: true })
+ .type(this.dataSet.command)
+ .click({ force: true })
+ .type(this.dataSet.ylabel);
+
+ _.deployMode.DeployApp();
+ });
+
+ it("2. Chart - Modal", function () {
+ //creating the Modal and verify Modal name
+ cy.createModal(this.dataSet.ModalName, "onDataPointClick");
+ _.deployMode.DeployApp();
+ cy.get(widgetsPage.chartPlotGroup).children().first().click();
+ cy.get(modalWidgetPage.modelTextField).should(
+ "have.text",
+ this.dataSet.ModalName,
+ );
+ });
+
+ it("3. Chart-Unckeck Visible field Validation", function () {
+ // Making the widget invisible
+ cy.togglebarDisable(commonlocators.visibleCheckbox);
+ _.deployMode.DeployApp();
+ cy.get(publish.chartWidget).should("not.exist");
+ });
+
+ it("4. Chart-Check Visible field Validation", function () {
+ // Making the widget visible
+ cy.togglebar(commonlocators.visibleCheckbox);
+ _.deployMode.DeployApp();
+ cy.get(publish.chartWidget).should("be.visible");
+ });
+
+ it("5. Toggle JS - Chart-Unckeck Visible field Validation", function () {
+ //Uncheck the disabled checkbox using JS and validate
+ cy.get(widgetsPage.toggleVisible).click({ force: true });
+ cy.testJsontext("visible", "false");
+ _.deployMode.DeployApp();
+ cy.get(publish.chartWidget).should("not.exist");
+ });
+
+ it("6. Toggle JS - Chart-Check Visible field Validation", function () {
+ //Check the disabled checkbox using JS and Validate
+ cy.testJsontext("visible", "true");
+ _.deployMode.DeployApp();
+ cy.get(publish.chartWidget).should("be.visible");
+ });
+
+ it("7. Chart Widget Functionality To Uncheck Horizontal Scroll Visible", function () {
+ cy.togglebarDisable(commonlocators.allowScroll);
+ _.deployMode.DeployApp();
+ cy.get(publish.horizontalTab).should("not.exist");
+ });
+
+ it("8. Chart Widget Functionality To Check Horizontal Scroll Visible", function () {
+ cy.togglebar(commonlocators.allowScroll);
+ _.deployMode.DeployApp();
+ cy.get(publish.horizontalTab).eq(1).should("exist");
+ });
+
+ afterEach(() => {
+ _.deployMode.NavigateBacktoEditor();
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
similarity index 62%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
index bcbd3db3395e..5dc35b660603 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_1_spec.js
@@ -155,99 +155,4 @@ describe("Radio Group Field", () => {
// Check for alert
cy.get(commonlocators.toastmsg).contains("John Doe");
});
-
- it("9. Checkbox Field - pre condition", () => {
- const schema = {
- agree: true,
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.openFieldConfiguration("agree");
- cy.selectDropdownValue(commonlocators.jsonFormFieldType, /^Checkbox/);
- cy.closePropertyPane();
- });
-
- it("10. Shows updated formData values in onChange binding", () => {
- cy.openPropertyPane("jsonformwidget");
- cy.openFieldConfiguration("agree");
-
- // Enable JS mode for onCheckChange
- cy.get(toggleJSButton("oncheckchange")).click({ force: true });
-
- // Add onCheckChange action
- cy.testJsontext(
- "oncheckchange",
- "{{showAlert(formData.agree.toString())}}",
- );
-
- // Click on select field
- cy.get(`${fieldPrefix}-agree input`).click({ force: true });
-
- // Check for alert
- cy.get(commonlocators.toastmsg).contains("false");
- });
-
- it("11. Switch Field - pre condition", () => {
- const schema = {
- agree: true,
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.closePropertyPane();
- });
-
- it("12. Shows updated formData values in onChange binding", () => {
- cy.openPropertyPane("jsonformwidget");
- cy.openFieldConfiguration("agree");
-
- // Enable JS mode for onChange
- cy.get(toggleJSButton("onchange")).click({ force: true });
-
- // Add onChange action
- cy.testJsontext("onchange", "{{showAlert(formData.agree.toString())}}");
-
- // Click on select field
- cy.get(`${fieldPrefix}-agree input`).click({ force: true });
-
- // Check for alert
- cy.get(commonlocators.toastmsg).contains("false");
- });
-
- it("13. Date Field - pre condition", () => {
- const schema = {
- dob: "20/12/1992",
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.closePropertyPane();
- });
-
- it("14. shows updated formData values in onDateSelected binding", () => {
- cy.openPropertyPane("jsonformwidget");
- cy.openFieldConfiguration("dob");
-
- // Enable JS mode for onDateSelected
- cy.get(toggleJSButton("ondateselected")).click({ force: true });
-
- // Add onDateSelected action
- cy.testJsontext("ondateselected", "{{showAlert(formData.dob)}}");
-
- // Click on select field
- cy.get(`${fieldPrefix}-dob .bp3-input`).click();
- cy.get(`${fieldPrefix}-dob .bp3-input`)
- .clear({ force: true })
- .type("10/08/2010");
-
- // Check for alert
- cy.contains("10/08/2010").should("be.visible");
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js
new file mode 100644
index 000000000000..99d717f1d226
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldEvents_2_spec.js
@@ -0,0 +1,115 @@
+/**
+ * Spec to test the events made available by each field type
+ */
+
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetLocators = require("../../../../../locators/Widgets.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+const fieldPrefix = ".t--jsonformfield";
+const toggleJSButton = (name) => `.t--property-control-${name} .t--js-toggle`;
+
+describe("Radio Group Field", () => {
+ beforeEach(() => {
+ _.agHelper.RestoreLocalStorageCache();
+ });
+
+ afterEach(() => {
+ _.agHelper.SaveLocalStorageCache();
+ });
+
+ it("1. Checkbox Field - pre condition", () => {
+ const schema = {
+ agree: true,
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.openFieldConfiguration("agree");
+ cy.selectDropdownValue(commonlocators.jsonFormFieldType, /^Checkbox/);
+ cy.closePropertyPane();
+ });
+
+ it("2. Shows updated formData values in onChange binding", () => {
+ cy.openPropertyPane("jsonformwidget");
+ cy.openFieldConfiguration("agree");
+
+ // Enable JS mode for onCheckChange
+ cy.get(toggleJSButton("oncheckchange")).click({ force: true });
+
+ // Add onCheckChange action
+ cy.testJsontext(
+ "oncheckchange",
+ "{{showAlert(formData.agree.toString())}}",
+ );
+
+ // Click on select field
+ cy.get(`${fieldPrefix}-agree input`).click({ force: true });
+
+ // Check for alert
+ cy.get(commonlocators.toastmsg).contains("false");
+ });
+
+ it("3. Switch Field - pre condition", () => {
+ const schema = {
+ agree: true,
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.closePropertyPane();
+ });
+
+ it("4. Shows updated formData values in onChange binding", () => {
+ cy.openPropertyPane("jsonformwidget");
+ cy.openFieldConfiguration("agree");
+
+ // Enable JS mode for onChange
+ cy.get(toggleJSButton("onchange")).click({ force: true });
+
+ // Add onChange action
+ cy.testJsontext("onchange", "{{showAlert(formData.agree.toString())}}");
+
+ // Click on select field
+ cy.get(`${fieldPrefix}-agree input`).click({ force: true });
+
+ // Check for alert
+ cy.get(commonlocators.toastmsg).contains("false");
+ });
+
+ it("5. Date Field - pre condition", () => {
+ const schema = {
+ dob: "20/12/1992",
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.closePropertyPane();
+ });
+
+ it("6. shows updated formData values in onDateSelected binding", () => {
+ cy.openPropertyPane("jsonformwidget");
+ cy.openFieldConfiguration("dob");
+
+ // Enable JS mode for onDateSelected
+ cy.get(toggleJSButton("ondateselected")).click({ force: true });
+
+ // Add onDateSelected action
+ cy.testJsontext("ondateselected", "{{showAlert(formData.dob)}}");
+
+ // Click on select field
+ cy.get(`${fieldPrefix}-dob .bp3-input`).click();
+ cy.get(`${fieldPrefix}-dob .bp3-input`)
+ .clear({ force: true })
+ .type("10/08/2010");
+
+ // Check for alert
+ cy.contains("10/08/2010").should("be.visible");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
similarity index 50%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
index 575ee1ad4bdd..b7c2ab620b66 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_1_spec.js
@@ -146,196 +146,6 @@ describe("Text Field Property Control", () => {
cy.togglebarDisable(`.t--property-control-disabled input`);
});
-
- it("15. Switch Field Property Control - pre condition", () => {
- const schema = {
- switch: true,
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.openFieldConfiguration("switch");
- });
-
- it("16. has default property", () => {
- cy.get(".t--property-control-defaultselected").contains(
- "{{sourceData.switch}}",
- );
- });
-
- it("17. should update field checked state when default selected changed", () => {
- cy.testJsontext("defaultselected", "{{false}}");
- cy.get(`${fieldPrefix}-switch label.bp3-control.bp3-switch`).should(
- "have.class",
- "t--switch-widget-inactive",
- );
- });
-
- it("18. hides field when visible switched off", () => {
- cy.togglebarDisable(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-switch`).should("not.exist");
- cy.wait(500);
- cy.togglebar(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-switch`).should("exist");
- });
-
- it("19. disables field when disabled switched on", () => {
- cy.togglebar(`.t--property-control-disabled input`);
- cy.get(`${fieldPrefix}-switch input`).each(($el) => {
- cy.wrap($el).should("have.attr", "disabled");
- });
-
- cy.togglebarDisable(`.t--property-control-disabled input`);
- });
-
- it("20. Select Field Property Control - pre condition", () => {
- const schema = {
- state: "Karnataka",
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.openFieldConfiguration("state");
- cy.selectDropdownValue(commonlocators.jsonFormFieldType, /^Select/);
- });
-
- it("21. has valid default value", () => {
- cy.get(".t--property-control-defaultselectedvalue").contains(
- "{{sourceData.state}}",
- );
- });
-
- it("22. makes select filterable", () => {
- // click select field and filter input should not exist
- cy.get(`${fieldPrefix}-state .bp3-control-group`).click({ force: true });
- cy.get(`.bp3-select-popover .bp3-input-group`).should("not.exist");
-
- // toggle filterable -> true in property pane
- cy.togglebar(`.t--property-control-allowsearching input`);
-
- // click select field and filter input should exist
- cy.get(`${fieldPrefix}-state .bp3-control-group`).click({ force: true });
- cy.get(`.bp3-select-popover .bp3-input-group`).should("exist");
- });
-
- it("23. hides field when visible switched off", () => {
- cy.togglebarDisable(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-state`).should("not.exist");
- cy.wait(500);
- cy.togglebar(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-state`).should("exist");
- });
-
- it("24. disables field when disabled switched on", () => {
- cy.togglebar(`.t--property-control-disabled input`);
- cy.get(`${fieldPrefix}-state button.bp3-button`).should(
- "have.class",
- "bp3-disabled",
- );
-
- cy.togglebarDisable(`.t--property-control-disabled input`);
- });
-
- it("25. Multi Field Property Control - pre condition", () => {
- const schema = {
- hobbies: [],
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(schema));
- cy.openFieldConfiguration("hobbies");
- });
-
- it("26. has valid default value", () => {
- cy.get(".t--property-control-defaultselectedvalues").contains(
- "{{sourceData.hobbies}}",
- );
- cy.closePropertyPane();
- });
-
- it("27. adds placeholder text", () => {
- cy.openPropertyPane("jsonformwidget");
- cy.openFieldConfiguration("hobbies");
-
- cy.testJsontext("placeholder", "Select placeholder");
- cy.wait(2000);
- cy.get(`.rc-select-selection-placeholder`).contains("Select placeholder");
- });
-
- it("28. hides field when visible switched off", () => {
- cy.togglebarDisable(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-hobbies`).should("not.exist");
- cy.wait(500);
- cy.togglebar(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-hobbies`).should("exist");
- });
-
- it("29. disables field when disabled switched on", () => {
- cy.togglebar(`.t--property-control-disabled input`);
- cy.get(`${fieldPrefix}-hobbies .rc-select-multiple`).should(
- "have.class",
- "rc-select-disabled",
- );
-
- cy.togglebarDisable(`.t--property-control-disabled input`);
- });
-
- it("30. Invalid options should not crash the widget", () => {
- // clear Options
- cy.testJsonTextClearMultiline("options");
- // enter invalid options
- cy.testJsontext("options", '{{[{ label: "asd", value: "zxc"}, null ]}}');
-
- // wait for eval to update
- cy.wait(2000);
- // Check if the multiselect field exist
- cy.get(`${fieldPrefix}-hobbies`).should("exist");
-
- // clear Default Selected Values
- cy.testJsonTextClearMultiline("defaultselectedvalues");
- // enter default value
- cy.testJsontext("defaultselectedvalues", '["zxc"]');
-
- // wait for eval to update
- cy.wait(2000);
- // Check if the multiselect field exist
- cy.get(`${fieldPrefix}-hobbies`).should("exist");
- });
-
- it("31. Radio group Field Property Control - pre condition", () => {
- const sourceData = {
- radio: "Y",
- };
- cy.fixture("jsonFormDslWithoutSchema").then((val) => {
- _.agHelper.AddDsl(val);
- });
- cy.openPropertyPane("jsonformwidget");
- cy.testJsontext("sourcedata", JSON.stringify(sourceData));
- cy.openFieldConfiguration("radio");
- cy.selectDropdownValue(commonlocators.jsonFormFieldType, "Radio Group");
- });
-
- it("32. has valid default value", () => {
- cy.get(".t--property-control-defaultselectedvalue").contains(
- "{{sourceData.radio}}",
- );
-
- cy.get(`${fieldPrefix}-radio input`).should("have.value", "Y");
- });
-
- it("33. hides field when visible switched off", () => {
- cy.togglebarDisable(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-radio`).should("not.exist");
- cy.wait(500);
- cy.togglebar(`.t--property-control-visible input`);
- cy.get(`${fieldPrefix}-radio`).should("exist");
- });
});
function validateAutocompleteAttributeInJSONForm() {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js
new file mode 100644
index 000000000000..b630f8a364da
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FieldProperties_2_spec.js
@@ -0,0 +1,215 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+const fieldPrefix = ".t--jsonformfield";
+
+describe("Text Field Property Control", () => {
+ beforeEach(() => {
+ _.agHelper.RestoreLocalStorageCache();
+ });
+
+ afterEach(() => {
+ _.agHelper.SaveLocalStorageCache();
+ });
+
+ before(() => {
+ const schema = {
+ name: "John",
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ });
+
+ it("1. Switch Field Property Control - pre condition", () => {
+ const schema = {
+ switch: true,
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.openFieldConfiguration("switch");
+ });
+
+ it("2. has default property", () => {
+ cy.get(".t--property-control-defaultselected").contains(
+ "{{sourceData.switch}}",
+ );
+ });
+
+ it("3. should update field checked state when default selected changed", () => {
+ cy.testJsontext("defaultselected", "{{false}}");
+ cy.get(`${fieldPrefix}-switch label.bp3-control.bp3-switch`).should(
+ "have.class",
+ "t--switch-widget-inactive",
+ );
+ });
+
+ it("4. hides field when visible switched off", () => {
+ cy.togglebarDisable(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-switch`).should("not.exist");
+ cy.wait(500);
+ cy.togglebar(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-switch`).should("exist");
+ });
+
+ it("5. disables field when disabled switched on", () => {
+ cy.togglebar(`.t--property-control-disabled input`);
+ cy.get(`${fieldPrefix}-switch input`).each(($el) => {
+ cy.wrap($el).should("have.attr", "disabled");
+ });
+
+ cy.togglebarDisable(`.t--property-control-disabled input`);
+ });
+
+ it("6. Select Field Property Control - pre condition", () => {
+ const schema = {
+ state: "Karnataka",
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.openFieldConfiguration("state");
+ cy.selectDropdownValue(commonlocators.jsonFormFieldType, /^Select/);
+ });
+
+ it("7. has valid default value", () => {
+ cy.get(".t--property-control-defaultselectedvalue").contains(
+ "{{sourceData.state}}",
+ );
+ });
+
+ it("8. makes select filterable", () => {
+ // click select field and filter input should not exist
+ cy.get(`${fieldPrefix}-state .bp3-control-group`).click({ force: true });
+ cy.get(`.bp3-select-popover .bp3-input-group`).should("not.exist");
+
+ // toggle filterable -> true in property pane
+ cy.togglebar(`.t--property-control-allowsearching input`);
+
+ // click select field and filter input should exist
+ cy.get(`${fieldPrefix}-state .bp3-control-group`).click({ force: true });
+ cy.get(`.bp3-select-popover .bp3-input-group`).should("exist");
+ });
+
+ it("9. hides field when visible switched off", () => {
+ cy.togglebarDisable(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-state`).should("not.exist");
+ cy.wait(500);
+ cy.togglebar(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-state`).should("exist");
+ });
+
+ it("10. disables field when disabled switched on", () => {
+ cy.togglebar(`.t--property-control-disabled input`);
+ cy.get(`${fieldPrefix}-state button.bp3-button`).should(
+ "have.class",
+ "bp3-disabled",
+ );
+
+ cy.togglebarDisable(`.t--property-control-disabled input`);
+ });
+
+ it("11. Multi Field Property Control - pre condition", () => {
+ const schema = {
+ hobbies: [],
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(schema));
+ cy.openFieldConfiguration("hobbies");
+ });
+
+ it("12. has valid default value", () => {
+ cy.get(".t--property-control-defaultselectedvalues").contains(
+ "{{sourceData.hobbies}}",
+ );
+ cy.closePropertyPane();
+ });
+
+ it("13. adds placeholder text", () => {
+ cy.openPropertyPane("jsonformwidget");
+ cy.openFieldConfiguration("hobbies");
+
+ cy.testJsontext("placeholder", "Select placeholder");
+ cy.wait(2000);
+ cy.get(`.rc-select-selection-placeholder`).contains("Select placeholder");
+ });
+
+ it("14. hides field when visible switched off", () => {
+ cy.togglebarDisable(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-hobbies`).should("not.exist");
+ cy.wait(500);
+ cy.togglebar(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-hobbies`).should("exist");
+ });
+
+ it("15. disables field when disabled switched on", () => {
+ cy.togglebar(`.t--property-control-disabled input`);
+ cy.get(`${fieldPrefix}-hobbies .rc-select-multiple`).should(
+ "have.class",
+ "rc-select-disabled",
+ );
+
+ cy.togglebarDisable(`.t--property-control-disabled input`);
+ });
+
+ it("16. Invalid options should not crash the widget", () => {
+ // clear Options
+ cy.testJsonTextClearMultiline("options");
+ // enter invalid options
+ cy.testJsontext("options", '{{[{ label: "asd", value: "zxc"}, null ]}}');
+
+ // wait for eval to update
+ cy.wait(2000);
+ // Check if the multiselect field exist
+ cy.get(`${fieldPrefix}-hobbies`).should("exist");
+
+ // clear Default Selected Values
+ cy.testJsonTextClearMultiline("defaultselectedvalues");
+ // enter default value
+ cy.testJsontext("defaultselectedvalues", '["zxc"]');
+
+ // wait for eval to update
+ cy.wait(2000);
+ // Check if the multiselect field exist
+ cy.get(`${fieldPrefix}-hobbies`).should("exist");
+ });
+
+ it("17. Radio group Field Property Control - pre condition", () => {
+ const sourceData = {
+ radio: "Y",
+ };
+ cy.fixture("jsonFormDslWithoutSchema").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("jsonformwidget");
+ cy.testJsontext("sourcedata", JSON.stringify(sourceData));
+ cy.openFieldConfiguration("radio");
+ cy.selectDropdownValue(commonlocators.jsonFormFieldType, "Radio Group");
+ });
+
+ it("18. has valid default value", () => {
+ cy.get(".t--property-control-defaultselectedvalue").contains(
+ "{{sourceData.radio}}",
+ );
+
+ cy.get(`${fieldPrefix}-radio input`).should("have.value", "Y");
+ });
+
+ it("19. hides field when visible switched off", () => {
+ cy.togglebarDisable(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-radio`).should("not.exist");
+ cy.wait(500);
+ cy.togglebar(`.t--property-control-visible input`);
+ cy.get(`${fieldPrefix}-radio`).should("exist");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
similarity index 70%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
index 25400ee6c446..5b93c717188e 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_1_spec.js
@@ -164,78 +164,4 @@ describe("JSON Form Hidden fields", () => {
city: "Bangalore",
});
});
-
- it("9. can hide Phone Number Input Field", () => {
- const defaultValue = "1000";
- // Add new custom field
- addCustomField("Phone Number Input");
-
- cy.testJsontext("defaultvalue", defaultValue);
-
- hideAndVerifyProperties("customField1", defaultValue);
-
- removeCustomField();
- });
-
- it("10. can hide Radio Group Field", () => {
- const defaultValue = "Y";
- // Add new custom field
- addCustomField("Phone Number Input");
-
- cy.testJsontext("defaultvalue", defaultValue);
-
- hideAndVerifyProperties("customField1", defaultValue);
-
- removeCustomField();
- });
-
- it("11. can hide Select Field", () => {
- const defaultValue = "BLUE";
- // Add new custom field
- addCustomField(/^Select/);
-
- cy.testJsontext("defaultselectedvalue", defaultValue);
-
- hideAndVerifyProperties("customField1", defaultValue);
-
- removeCustomField();
- });
-
- it("12. can hide Switch Field", () => {
- // Add new custom field
- addCustomField("Switch");
-
- hideAndVerifyProperties("customField1", true);
-
- removeCustomField();
- });
-
- it("13. hides fields on first load", () => {
- cy.openPropertyPane("jsonformwidget");
-
- // hide education field
- cy.openFieldConfiguration("education");
- cy.togglebarDisable(".t--property-control-visible input");
- cy.get(backBtn).click({ force: true }).wait(500);
- // hide name field
- cy.openFieldConfiguration("name");
- cy.togglebarDisable(".t--property-control-visible input");
-
- // publish the app
- deployMode.DeployApp();
- cy.wait(4000);
-
- // Check if name is hidden
- cy.get(`${fieldPrefix}-name`).should("not.exist");
- // Check if education is hidden
- cy.get(`${fieldPrefix}-education`).should("not.exist");
-
- // check if name and education are not present in form data
- cy.get(".t--widget-textwidget .bp3-ui-text").then(($el) => {
- const formData = JSON.parse($el.text());
-
- cy.wrap(formData.name).should("deep.equal", undefined);
- cy.wrap(formData.education).should("deep.equal", undefined);
- });
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js
new file mode 100644
index 000000000000..ac8ffa3e0419
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_HiddenFields_2_spec.js
@@ -0,0 +1,170 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+
+import {
+ agHelper,
+ entityExplorer,
+ deployMode,
+ propPane,
+} from "../../../../../support/Objects/ObjectsCore";
+
+const fieldPrefix = ".t--jsonformfield";
+const backBtn = "[data-testid='t--property-pane-back-btn']";
+
+function hideAndVerifyProperties(fieldName, fieldValue, resolveFieldValue) {
+ // Check if visible
+ cy.get(`${fieldPrefix}-${fieldName}`).should("exist");
+
+ // Hide field
+ propPane.TogglePropertyState("Visible", "Off");
+
+ /**
+ * When the field is hidden, post that we check if the formData has appropriate
+ * changes. This checking happens immediately after the field is hidden (cy.togglebarDisable(".t--property-control-visible input")).
+ * This doesn't give the widget and evaluation a chance to set the correct value.
+ * cy.wait(2000) gives sufficient amount for the appropriates changes to take place.
+ */
+ cy.wait(3000); //wait for text field to alter
+
+ // Check if hidden
+ cy.get(`${fieldPrefix}-${fieldName}`).should("not.exist");
+
+ // Check if key in formData is also hidden
+ cy.get(`${widgetsPage.textWidget} .bp3-ui-text`).then(($el) => {
+ const formData = JSON.parse($el.text());
+ const formDataValue = resolveFieldValue
+ ? resolveFieldValue(formData)
+ : formData[fieldName];
+
+ cy.wrap(formDataValue).should("be.undefined");
+ });
+
+ // Show field
+ cy.togglebar(".t--property-control-visible input");
+
+ // Check if visible
+ cy.get(`${fieldPrefix}-${fieldName}`).should("exist");
+
+ cy.wait(3000); //wait for text field to alter
+
+ // Check if key in formData is also hidden
+ cy.get(`${widgetsPage.textWidget} .bp3-ui-text`).then(($el) => {
+ const formData = JSON.parse($el.text());
+ const formDataValue = resolveFieldValue
+ ? resolveFieldValue(formData)
+ : formData[fieldName];
+
+ cy.wrap(formDataValue).should("deep.equal", fieldValue);
+ });
+
+ cy.closePropertyPane();
+}
+
+function changeFieldType(fieldName, fieldType) {
+ cy.openFieldConfiguration(fieldName);
+ cy.selectDropdownValue(commonlocators.jsonFormFieldType, fieldType);
+}
+
+function addCustomField(fieldType) {
+ cy.openPropertyPane("jsonformwidget");
+ cy.backFromPropertyPanel();
+
+ // Add new field
+ cy.get(commonlocators.jsonFormAddNewCustomFieldBtn).click({
+ force: true,
+ });
+
+ changeFieldType("customField1", fieldType);
+}
+
+function removeCustomField() {
+ cy.openPropertyPane("jsonformwidget");
+ cy.deleteJSONFormField("customField1");
+}
+
+describe("JSON Form Hidden fields", () => {
+ before(() => {
+ cy.fixture("jsonFormDslWithSchema").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ entityExplorer.SelectEntityByName("Text1");
+ propPane.UpdatePropertyFieldValue(
+ "Text",
+ "{{JSON.stringify(JSONForm1.formData)}}",
+ );
+ });
+
+ it("1. can hide Phone Number Input Field", () => {
+ const defaultValue = "1000";
+ // Add new custom field
+ addCustomField("Phone Number Input");
+
+ cy.testJsontext("defaultvalue", defaultValue);
+
+ hideAndVerifyProperties("customField1", defaultValue);
+
+ removeCustomField();
+ });
+
+ it("2. can hide Radio Group Field", () => {
+ const defaultValue = "Y";
+ // Add new custom field
+ addCustomField("Phone Number Input");
+
+ cy.testJsontext("defaultvalue", defaultValue);
+
+ hideAndVerifyProperties("customField1", defaultValue);
+
+ removeCustomField();
+ });
+
+ it("3. can hide Select Field", () => {
+ const defaultValue = "BLUE";
+ // Add new custom field
+ addCustomField(/^Select/);
+
+ cy.testJsontext("defaultselectedvalue", defaultValue);
+
+ hideAndVerifyProperties("customField1", defaultValue);
+
+ removeCustomField();
+ });
+
+ it("4. can hide Switch Field", () => {
+ // Add new custom field
+ addCustomField("Switch");
+
+ hideAndVerifyProperties("customField1", true);
+
+ removeCustomField();
+ });
+
+ it("5. hides fields on first load", () => {
+ cy.openPropertyPane("jsonformwidget");
+
+ // hide education field
+ cy.openFieldConfiguration("education");
+ cy.togglebarDisable(".t--property-control-visible input");
+ cy.get(backBtn).click({ force: true }).wait(500);
+ // hide name field
+ cy.openFieldConfiguration("name");
+ cy.togglebarDisable(".t--property-control-visible input");
+
+ // publish the app
+ deployMode.DeployApp();
+ cy.wait(4000);
+
+ // Check if name is hidden
+ cy.get(`${fieldPrefix}-name`).should("not.exist");
+ // Check if education is hidden
+ cy.get(`${fieldPrefix}-education`).should("not.exist");
+
+ // check if name and education are not present in form data
+ cy.get(".t--widget-textwidget .bp3-ui-text").then(($el) => {
+ const formData = JSON.parse($el.text());
+
+ cy.wrap(formData.name).should("deep.equal", undefined);
+ cy.wrap(formData.education).should("deep.equal", undefined);
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.js
similarity index 82%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.js
index 397280a1ae8d..7b2b9ec496ac 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_1_spec.js
@@ -210,57 +210,4 @@ describe("Container Widget Functionality", function () {
);
_.deployMode.NavigateBacktoEditor();
});
-
- it("11. Add new item in the list widget array object", function () {
- // Open Property pane
- _.entityExplorer.SelectEntityByName("List1", "Widgets");
-
- //Add the new item in the list
- _.propPane.UpdatePropertyFieldValue(
- "Items",
- JSON.stringify(this.dataSet.ListItems),
- );
- cy.wait(2000);
- _.deployMode.DeployApp();
- _.deployMode.NavigateBacktoEditor();
- });
-
- it("12. Adding large item Spacing for item card", function () {
- // Open Property pane
- _.entityExplorer.SelectEntityByName("List1", "Widgets");
- _.propPane.MoveToTab("Style");
- // Scroll down to Styles and Add item spacing for item card
- cy.testJsontext("itemspacing\\(" + "px" + "\\)", 12);
- cy.wait(2000);
- // Click on Deploy and ensure it is deployed appropriately
- _.deployMode.DeployApp();
- _.deployMode.NavigateBacktoEditor();
- });
-
- it("13. Renaming the widget from Property pane and Entity explorer ", function () {
- // Open Property pane
- _.entityExplorer.SelectEntityByName("List1", "Widgets");
-
- // Change the list widget name from property pane and Verify it
- cy.widgetText(
- "List2",
- widgetsPage.listWidgetName,
- widgetsPage.widgetNameSpan,
- );
- // Change the list widget name from Entity Explorer
- cy.renameEntity("List2", "List1");
- // Mouse over to list name
- _.entityExplorer.SelectEntityByName("List1");
-
- cy.get(widgetsPage.listWidgetName)
- .first()
- .trigger("mouseover", { force: true });
- // Verify the list name is changed
- cy.contains(
- widgetsPage.listWidgetName + " " + commonlocators.listWidgetNameTag,
- "List1",
- );
- _.deployMode.DeployApp();
- _.deployMode.NavigateBacktoEditor();
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js
new file mode 100644
index 000000000000..303dd42731e7
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/List/List4_2_spec.js
@@ -0,0 +1,133 @@
+/// <reference types="Cypress" />
+
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+const dsl = require("../../../../../fixtures/listdsl.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Container Widget Functionality", function () {
+ const items = JSON.parse(dsl.dsl.children[0].listData);
+
+ before(() => {
+ cy.fixture("listdsl").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ it("1. ListWidget-Copy & Delete Verification", function () {
+ //Copy Chart and verify all properties
+ _.propPane.CopyWidgetFromPropertyPane("List1");
+ _.propPane.DeleteWidgetFromPropertyPane("List1Copy");
+ _.deployMode.DeployApp();
+ // Verify the copied list widget is deleted
+ cy.get(commonlocators.containerWidget).should("have.length", 2);
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("2. List widget background colour and deploy ", function () {
+ // Open Property pane
+ _.entityExplorer.SelectEntityByName("List1", "Widgets");
+
+ cy.moveToStyleTab();
+ // Scroll down to Styles and Add background colour
+ cy.selectColor("backgroundcolor");
+ cy.wait(1000);
+ cy.selectColor("itembackgroundcolor");
+ // Click on Deploy and ensure it is deployed appropriately
+ _.deployMode.DeployApp();
+ // Ensure List Background Color
+ cy.get(widgetsPage.listWidget).should(
+ "have.css",
+ "background-color",
+ "rgb(126, 34, 206)",
+ );
+ // Verify List Item Background Color
+ cy.get(widgetsPage.itemContainerWidget).should(
+ "have.css",
+ "background-color",
+ "rgb(126, 34, 206)",
+ );
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("3. Toggle JS - List widget background colour and deploy ", function () {
+ // Open Property pane
+ _.entityExplorer.SelectEntityByName("List1", "Widgets");
+
+ cy.moveToStyleTab();
+ // Scroll down to Styles and Add background colour
+ cy.get(widgetsPage.backgroundColorToggleNew).click({ force: true });
+ cy.testJsontext("backgroundcolor", "#FFC13D");
+ cy.wait(1000);
+ cy.get(widgetsPage.itemBackgroundColorToggle).click({ force: true });
+ cy.testJsontext("itembackgroundcolor", "#38AFF4");
+ // Click on Deploy and ensure it is deployed appropriately
+ _.deployMode.DeployApp();
+ // Ensure List Background Color
+ cy.get(widgetsPage.listWidget).should(
+ "have.css",
+ "background-color",
+ "rgb(255, 193, 61)",
+ );
+ // Verify List Item Background Color
+ cy.get(widgetsPage.itemContainerWidget).should(
+ "have.css",
+ "background-color",
+ "rgb(56, 175, 244)",
+ );
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("4. Add new item in the list widget array object", function () {
+ // Open Property pane
+ _.entityExplorer.SelectEntityByName("List1", "Widgets");
+
+ //Add the new item in the list
+ _.propPane.UpdatePropertyFieldValue(
+ "Items",
+ JSON.stringify(this.dataSet.ListItems),
+ );
+ cy.wait(2000);
+ _.deployMode.DeployApp();
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("5. Adding large item Spacing for item card", function () {
+ // Open Property pane
+ _.entityExplorer.SelectEntityByName("List1", "Widgets");
+ _.propPane.MoveToTab("Style");
+ // Scroll down to Styles and Add item spacing for item card
+ cy.testJsontext("itemspacing\\(" + "px" + "\\)", 12);
+ cy.wait(2000);
+ // Click on Deploy and ensure it is deployed appropriately
+ _.deployMode.DeployApp();
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("6. Renaming the widget from Property pane and Entity explorer ", function () {
+ // Open Property pane
+ _.entityExplorer.SelectEntityByName("List1", "Widgets");
+
+ // Change the list widget name from property pane and Verify it
+ cy.widgetText(
+ "List2",
+ widgetsPage.listWidgetName,
+ widgetsPage.widgetNameSpan,
+ );
+ // Change the list widget name from Entity Explorer
+ cy.renameEntity("List2", "List1");
+ // Mouse over to list name
+ _.entityExplorer.SelectEntityByName("List1");
+
+ cy.get(widgetsPage.listWidgetName)
+ .first()
+ .trigger("mouseover", { force: true });
+ // Verify the list name is changed
+ cy.contains(
+ widgetsPage.listWidgetName + " " + commonlocators.listWidgetNameTag,
+ "List1",
+ );
+ _.deployMode.DeployApp();
+ _.deployMode.NavigateBacktoEditor();
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
similarity index 60%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
index 6daad1c87b94..284395e0e510 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
@@ -202,122 +202,4 @@ describe("RichTextEditor Widget Functionality", function () {
cy.testJsontext("defaultvalue", "c");
cy.get(".t--widget-textwidget").should("contain", "false");
});
-
- it("7. Check if the binding is getting removed from the text and the RTE widget", function () {
- cy.openPropertyPane("textwidget");
- cy.updateCodeInput(".t--property-control-text", `{{RichtextEditor.text}}`);
- // Change defaultText of the RTE
- cy.openPropertyPane("richtexteditorwidget");
- cy.testJsontext("defaultvalue", "Test Content");
-
- //Check if the text widget has the defaultText of RTE
- cy.get(".t--widget-textwidget").should("contain", "Test Content");
-
- //Clear the default text from RTE
- cy.openPropertyPane("richtexteditorwidget");
- cy.testJsontext("defaultvalue", "");
-
- //Check if text widget and RTE widget does not have any text in it.
- cy.get(".t--widget-richtexteditorwidget").should("contain", "");
- cy.get(".t--widget-textwidget").should("contain", "");
- });
-
- it("8. Check if text does not re-appear when cut, inside the RTE widget", function () {
- cy.window().then((win) => {
- const tinyMceId = "rte-6h8j08u7ea";
-
- const editor = win.tinymce.editors[tinyMceId];
-
- //Set the content
- editor.setContent("Test Content");
-
- //Check the content:
- expect(editor.getContent({ format: "text" })).to.be.equal("Test Content");
-
- //Set the content
- editor.setContent("");
-
- //Check the content:
- expect(editor.getContent({ format: "text" })).to.be.equal("");
- });
- });
-
- it("9. Check if the cursor position is at the end for the RTE widget", function () {
- const tinyMceId = "rte-6h8j08u7ea";
- const testString = "Test Content";
- const testStringLen = testString.length;
-
- // Check if the cursor is at the end when input Type is HTML
- setRTEContent(testString);
- testCursorPoistion(testStringLen, tinyMceId);
- setRTEContent("{selectAll}");
- setRTEContent("{backspace}");
-
- // Changing the input type to markdown and again testing the cursor position
- cy.openPropertyPane("richtexteditorwidget");
- cy.get("span:contains('Markdown')").eq(0).click({ force: true });
- setRTEContent(testString);
- testCursorPoistion(testStringLen, tinyMceId);
- });
-
- it("10. Check if different font size texts are supported inside the RTE widget", function () {
- const tinyMceId = "rte-6h8j08u7ea";
- const testString = "Test Content";
-
- // Set the content inside RTE widget by typing
- setRTEContent(`${testString} {enter} ${testString} 1`);
-
- cy.get(".tox-tbtn--bespoke").click({ force: true });
- cy.contains("Heading 1").click({ force: true });
-
- cy.window().then((win) => {
- const editor = win.tinymce.editors[tinyMceId];
-
- // Get the current editor text
- const getCurrentHtmlContent = editor.getContent();
-
- // Check if the editor contains text of font sizes h1 and p;
- expect(getCurrentHtmlContent).contains("<h1>");
- expect(getCurrentHtmlContent).contains("<p>");
- });
- });
-
- it("11. Check if button for Underline exists within the Toolbar of RTE widget", () => {
- cy.get('[aria-label="Underline"]').should("exist");
-
- //Check if button for Background Color is rendered only once within the Toolbar of RTE widget
- cy.get('[aria-label="Background color"]').should("have.length", 1);
-
- //Check if button for Text Color is rendered only once within the Toolbar of RTE widget
- cy.get('[aria-label="Text color"]').should("have.length", 1);
- });
-
- it("12. Check if able to add an emoji through toolbar", () => {
- cy.get('[aria-label="More..."]').click({ force: true });
- cy.wait(500);
- cy.get('[aria-label="Emoticons"]').click({ force: true });
- cy.wait(500);
- cy.get('[aria-label="grinning"]').click({ force: true });
- const getEditorContent = (win) => {
- const tinyMceId = "rte-6h8j08u7ea";
- const editor = win.tinymce.editors[tinyMceId];
- return editor.getContent();
- };
-
- //contains emoji
- cy.window().then((win) => {
- expect(getEditorContent(win)).contains("😀");
- });
-
- //trigger a backspace
- cy.get(formWidgetsPage.richTextEditorWidget + " iframe").then(($iframe) => {
- const $body = $iframe.contents().find("body");
- cy.get($body).type("{backspace}", { force: true });
- });
-
- // after backspace the emoji should not be present
- cy.window().then((win) => {
- expect(getEditorContent(win)).not.contains("😀");
- });
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
new file mode 100644
index 000000000000..447d6cf32c3b
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
@@ -0,0 +1,164 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const formWidgetsPage = require("../../../../../locators/FormWidgets.json");
+const publishPage = require("../../../../../locators/publishWidgetspage.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+/**
+ * A function to set the content inside an RTE widget
+ * @param textValue
+ */
+const setRTEContent = (textValue) => {
+ // Set the content inside RTE widget
+ cy.get(formWidgetsPage.richTextEditorWidget + " iframe").then(($iframe) => {
+ const $body = $iframe.contents().find("body");
+ cy.wrap($body).type(textValue, { force: true });
+ });
+};
+
+/**
+ * A function to test if the cursor position is at the end of the string.
+ * @param textValueLen
+ */
+const testCursorPoistion = (textValueLen, tinyMceId) => {
+ cy.window().then((win) => {
+ const editor = win.tinymce.editors[tinyMceId];
+
+ // Get the current cursor location
+ const getCurrentCursorLocation = editor.selection.getSel().anchorOffset;
+
+ // Check if the cursor is at the end.
+ expect(getCurrentCursorLocation).to.be.equal(textValueLen);
+ });
+};
+
+describe("RichTextEditor Widget Functionality", function () {
+ before(() => {
+ cy.fixture("formdsl1").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ beforeEach(() => {
+ cy.wait(3000);
+ cy.openPropertyPane("richtexteditorwidget");
+ });
+
+ it("1. Check if the binding is getting removed from the text and the RTE widget", function () {
+ cy.openPropertyPane("textwidget");
+ cy.updateCodeInput(".t--property-control-text", `{{RichTextEditor1.text}}`);
+ // Change defaultText of the RTE
+ cy.openPropertyPane("richtexteditorwidget");
+ cy.testJsontext("defaultvalue", "Test Content");
+
+ //Check if the text widget has the defaultText of RTE
+ cy.get(".t--widget-textwidget").should("contain", "Test Content");
+
+ //Clear the default text from RTE
+ cy.openPropertyPane("richtexteditorwidget");
+ cy.testJsontext("defaultvalue", "");
+
+ //Check if text widget and RTE widget does not have any text in it.
+ cy.get(".t--widget-richtexteditorwidget").should("contain", "");
+ cy.get(".t--widget-textwidget").should("contain", "");
+ });
+
+ it("2. Check if text does not re-appear when cut, inside the RTE widget", function () {
+ cy.window().then((win) => {
+ const tinyMceId = "rte-6h8j08u7ea";
+
+ const editor = win.tinymce.editors[tinyMceId];
+
+ //Set the content
+ editor.setContent("Test Content");
+
+ //Check the content:
+ expect(editor.getContent({ format: "text" })).to.be.equal("Test Content");
+
+ //Set the content
+ editor.setContent("");
+
+ //Check the content:
+ expect(editor.getContent({ format: "text" })).to.be.equal("");
+ });
+ });
+
+ it("3. Check if the cursor position is at the end for the RTE widget", function () {
+ const tinyMceId = "rte-6h8j08u7ea";
+ const testString = "Test Content";
+ const testStringLen = testString.length;
+
+ // Check if the cursor is at the end when input Type is HTML
+ setRTEContent(testString);
+ testCursorPoistion(testStringLen, tinyMceId);
+ setRTEContent("{selectAll}");
+ setRTEContent("{backspace}");
+
+ // Changing the input type to markdown and again testing the cursor position
+ cy.openPropertyPane("richtexteditorwidget");
+ cy.get("span:contains('Markdown')").eq(0).click({ force: true });
+ setRTEContent(testString);
+ testCursorPoistion(testStringLen, tinyMceId);
+ });
+
+ it("4. Check if different font size texts are supported inside the RTE widget", function () {
+ const tinyMceId = "rte-6h8j08u7ea";
+ const testString = "Test Content";
+
+ // Set the content inside RTE widget by typing
+ setRTEContent(`${testString} {enter} ${testString} 1`);
+
+ cy.get(".tox-tbtn--bespoke").click({ force: true });
+ cy.contains("Heading 1").click({ force: true });
+
+ cy.window().then((win) => {
+ const editor = win.tinymce.editors[tinyMceId];
+
+ // Get the current editor text
+ const getCurrentHtmlContent = editor.getContent();
+
+ // Check if the editor contains text of font sizes h1 and p;
+ expect(getCurrentHtmlContent).contains("<h1>");
+ expect(getCurrentHtmlContent).contains("<p>");
+ });
+ });
+
+ it("5. Check if button for Underline exists within the Toolbar of RTE widget", () => {
+ cy.get('[aria-label="Underline"]').should("exist");
+
+ //Check if button for Background Color is rendered only once within the Toolbar of RTE widget
+ cy.get('[aria-label="Background color"]').should("have.length", 1);
+
+ //Check if button for Text Color is rendered only once within the Toolbar of RTE widget
+ cy.get('[aria-label="Text color"]').should("have.length", 1);
+ });
+
+ it("6. Check if able to add an emoji through toolbar", () => {
+ cy.get('[aria-label="More..."]').click({ force: true });
+ cy.wait(500);
+ cy.get('[aria-label="Emoticons"]').click({ force: true });
+ cy.wait(500);
+ cy.get('[aria-label="grinning"]').click({ force: true });
+ const getEditorContent = (win) => {
+ const tinyMceId = "rte-6h8j08u7ea";
+ const editor = win.tinymce.editors[tinyMceId];
+ return editor.getContent();
+ };
+
+ //contains emoji
+ cy.window().then((win) => {
+ expect(getEditorContent(win)).contains("😀");
+ });
+
+ //trigger a backspace
+ cy.get(formWidgetsPage.richTextEditorWidget + " iframe").then(($iframe) => {
+ const $body = $iframe.contents().find("body");
+ cy.get($body).type("{backspace}", { force: true });
+ });
+
+ // after backspace the emoji should not be present
+ cy.window().then((win) => {
+ expect(getEditorContent(win)).not.contains("😀");
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts
new file mode 100644
index 000000000000..dee0d8251619
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_1_Spec.ts
@@ -0,0 +1,118 @@
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Verify various Table_Filter combinations", function () {
+ before(() => {
+ cy.fixture("tablev1NewDsl").then((val: any) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ it("1. Adding Data to Table Widget", function () {
+ _.entityExplorer.SelectEntityByName("Table1");
+ _.propPane.UpdatePropertyFieldValue(
+ "Table data",
+ JSON.stringify(this.dataSet.TableInput),
+ );
+ _.assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ _.agHelper.PressEscape();
+ _.deployMode.DeployApp();
+ });
+
+ it("2. Table Widget Search Functionality", function () {
+ _.table.ReadTableRowColumnData(1, 3, "v1", 2000).then((cellData) => {
+ expect(cellData).to.eq("Lindsay Ferguson");
+ _.table.SearchTable(cellData);
+ _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
+ expect(afterSearch).to.eq("Lindsay Ferguson");
+ });
+ });
+ _.table.RemoveSearchTextNVerify("2381224");
+
+ _.table.SearchTable("7434532");
+ _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
+ expect(afterSearch).to.eq("Byron Fields");
+ });
+ _.table.RemoveSearchTextNVerify("2381224");
+ });
+
+ it("3. Verify Table Filter for 'contain'", function () {
+ _.table.OpenNFilterTable("userName", "contains", "Lindsay");
+ _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
+ expect($cellData).to.eq("Lindsay Ferguson");
+ });
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("4. Verify Table Filter for 'does not contain'", function () {
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "does not contain", "Tuna");
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("5. Verify Table Filter for 'starts with'", function () {
+ _.table.ReadTableRowColumnData(4, 4).then(($cellData) => {
+ expect($cellData).to.eq("Avocado Panini");
+ });
+ _.table.OpenNFilterTable("productName", "starts with", "Avo");
+ _.table.ReadTableRowColumnData(0, 4).then(($cellData) => {
+ expect($cellData).to.eq("Avocado Panini");
+ });
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("6. Verify Table Filter for 'ends with' - case sensitive", function () {
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "ends with", "wich");
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Chicken Sandwich");
+ });
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("7. Verify Table Filter for 'ends with' - case insenstive", function () {
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "ends with", "WICH");
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Chicken Sandwich");
+ });
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("8. Verify Table Filter for 'ends with' - on wrong column", function () {
+ _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("userName", "ends with", "WICH");
+ _.table.WaitForTableEmpty();
+ _.table.RemoveFilterNVerify("2381224");
+ });
+
+ it("9. Verify Table Filter for 'is exactly' - case sensitive", function () {
+ _.table.ReadTableRowColumnData(2, 4).then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.OpenNFilterTable("productName", "is exactly", "Beef steak");
+ _.table.ReadTableRowColumnData(0, 4).then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.RemoveFilterNVerify("2381224", true);
+ });
+
+ it("10. Verify Table Filter for 'is exactly' - case insensitive", function () {
+ _.table.ReadTableRowColumnData(2, 4).then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.OpenNFilterTable("productName", "is exactly", "Beef STEAK");
+ _.table.WaitForTableEmpty();
+ _.table.RemoveFilterNVerify("2381224", true);
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
similarity index 62%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
index 447ca711919a..52e1eb55b485 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter1_2_Spec.ts
@@ -7,7 +7,7 @@ describe("Verify various Table_Filter combinations", function () {
});
});
- it("1. Adding Data to Table Widget", function () {
+ it("1. Verify Table Filter for 'empty'", function () {
_.entityExplorer.SelectEntityByName("Table1");
_.propPane.UpdatePropertyFieldValue(
"Table data",
@@ -16,113 +16,13 @@ describe("Verify various Table_Filter combinations", function () {
_.assertHelper.AssertNetworkStatus("@updateLayout", 200);
_.agHelper.PressEscape();
_.deployMode.DeployApp();
- });
-
- it("2. Table Widget Search Functionality", function () {
- _.table.ReadTableRowColumnData(1, 3, "v1", 2000).then((cellData) => {
- expect(cellData).to.eq("Lindsay Ferguson");
- _.table.SearchTable(cellData);
- _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
- expect(afterSearch).to.eq("Lindsay Ferguson");
- });
- });
- _.table.RemoveSearchTextNVerify("2381224");
-
- _.table.SearchTable("7434532");
- _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
- expect(afterSearch).to.eq("Byron Fields");
- });
- _.table.RemoveSearchTextNVerify("2381224");
- });
-
- it("3. Verify Table Filter for 'contain'", function () {
- _.table.OpenNFilterTable("userName", "contains", "Lindsay");
- _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
- expect($cellData).to.eq("Lindsay Ferguson");
- });
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("4. Verify Table Filter for 'does not contain'", function () {
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "does not contain", "Tuna");
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("5. Verify Table Filter for 'starts with'", function () {
- _.table.ReadTableRowColumnData(4, 4).then(($cellData) => {
- expect($cellData).to.eq("Avocado Panini");
- });
- _.table.OpenNFilterTable("productName", "starts with", "Avo");
- _.table.ReadTableRowColumnData(0, 4).then(($cellData) => {
- expect($cellData).to.eq("Avocado Panini");
- });
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("6. Verify Table Filter for 'ends with' - case sensitive", function () {
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "ends with", "wich");
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Chicken Sandwich");
- });
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("7. Verify Table Filter for 'ends with' - case insenstive", function () {
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "ends with", "WICH");
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Chicken Sandwich");
- });
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("8. Verify Table Filter for 'ends with' - on wrong column", function () {
- _.table.ReadTableRowColumnData(1, 4).then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("userName", "ends with", "WICH");
- _.table.WaitForTableEmpty();
- _.table.RemoveFilterNVerify("2381224");
- });
-
- it("9. Verify Table Filter for 'is exactly' - case sensitive", function () {
- _.table.ReadTableRowColumnData(2, 4).then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.OpenNFilterTable("productName", "is exactly", "Beef steak");
- _.table.ReadTableRowColumnData(0, 4).then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.RemoveFilterNVerify("2381224", true);
- });
-
- it("10. Verify Table Filter for 'is exactly' - case insensitive", function () {
- _.table.ReadTableRowColumnData(2, 4).then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.OpenNFilterTable("productName", "is exactly", "Beef STEAK");
- _.table.WaitForTableEmpty();
- _.table.RemoveFilterNVerify("2381224", true);
- });
- it("11. Verify Table Filter for 'empty'", function () {
_.table.OpenNFilterTable("email", "empty");
_.table.WaitForTableEmpty();
_.table.RemoveFilterNVerify("2381224");
});
- it("12. Verify Table Filter for 'not empty'", function () {
+ it("2. Verify Table Filter for 'not empty'", function () {
_.table.ReadTableRowColumnData(4, 5).then(($cellData) => {
expect($cellData).to.eq("7.99");
});
@@ -133,7 +33,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224");
});
- it("13. Verify Table Filter - Where Edit - Change condition along with input value", function () {
+ it("3. Verify Table Filter - Where Edit - Change condition along with input value", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -160,7 +60,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("14. Verify Table Filter - Where Edit - Single Column, Condition & input value", function () {
+ it("4. Verify Table Filter - Where Edit - Single Column, Condition & input value", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -209,7 +109,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("15. Verify Table Filter for OR operator - different row match", function () {
+ it("5. Verify Table Filter for OR operator - different row match", function () {
_.table.ReadTableRowColumnData(2, 3).then(($cellData) => {
expect($cellData).to.eq("Tobias Funke");
});
@@ -225,7 +125,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("16. Verify Table Filter for OR operator - same row match", function () {
+ it("6. Verify Table Filter for OR operator - same row match", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -240,7 +140,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("17. Verify Table Filter for OR operator - two 'ORs'", function () {
+ it("7. Verify Table Filter for OR operator - two 'ORs'", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -259,7 +159,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("18. Verify Table Filter for AND operator - different row match", function () {
+ it("8. Verify Table Filter for AND operator - different row match", function () {
_.table.ReadTableRowColumnData(3, 3).then(($cellData) => {
expect($cellData).to.eq("Byron Fields");
});
@@ -278,7 +178,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("19. Verify Table Filter for AND operator - same row match", function () {
+ it("9. Verify Table Filter for AND operator - same row match", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -293,7 +193,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false);
});
- it("20. Verify Table Filter for AND operator - same row match - edit input text value", function () {
+ it("10. Verify Table Filter for AND operator - same row match - edit input text value", function () {
_.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
similarity index 64%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
index 5f5e875fa33a..a40df110a25c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_1_Spec.ts
@@ -254,156 +254,4 @@ describe("Verify various Table_Filter combinations", function () {
});
_.table.RemoveFilterNVerify("2381224", true, false);
});
-
- it("9. Verify Full table data - download csv and download Excel", function () {
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "Michael Lawson");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Michael Lawson");
- });
-
- it("10. Verify Searched data - download csv and download Excel", function () {
- _.table.SearchTable("7434532");
- _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
- expect(afterSearch).to.eq("Byron Fields");
- });
-
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "[email protected]");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Ryan Holmes");
-
- _.table.RemoveSearchTextNVerify("2381224");
-
- _.table.DownloadFromTable("Download as CSV");
- _.table.ValidateDownloadNVerify("Table1.csv", "2736212");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Beef steak");
- });
-
- it("11. Verify Filtered data - download csv and download Excel", function () {
- _.table.OpenNFilterTable("id", "starts with", "6");
- _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
- expect($cellData).to.eq("Tobias Funke");
- });
- _.table.CloseFilter();
-
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "Beef steak");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "[email protected]");
-
- _.agHelper.GetNClick(_.table._filterBtn);
- _.table.RemoveFilterNVerify("2381224", true, false);
-
- _.table.DownloadFromTable("Download as CSV");
- _.table.ValidateDownloadNVerify("Table1.csv", "Tuna Salad");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Avocado Panini");
- });
-
- it("12. Import TableFilter application & verify all filters for same FirstName (one word column) + Bug 13334", () => {
- _.deployMode.NavigateBacktoEditor();
- _.table.WaitUntilTableLoad();
- _.homePage.NavigateToHome();
- _.homePage.ImportApp("TableFilterImportApp.json");
- _.homePage.AssertImportToast();
- _.deployMode.DeployApp();
- _.table.WaitUntilTableLoad();
-
- //Contains
- _.table.OpenNFilterTable("FirstName", "contains", "Della");
- _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
- expect($cellData).to.eq("Alvarado");
- });
-
- filterOnlyCondition("does not contain", "49");
- filterOnlyCondition("starts with", "1");
-
- //Ends with - Open Bug 13334
- filterOnlyCondition("ends with", "1");
-
- filterOnlyCondition("is exactly", "1");
- filterOnlyCondition("empty", "0");
- filterOnlyCondition("not empty", "50");
- filterOnlyCondition("starts with", "3", "ge");
- _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
- expect($cellData).to.eq("Chandler");
- });
-
- _.table.OpenNFilterTable("FullName", "ends with", "ross", "OR", 1);
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("4"));
- _.table.CloseFilter();
- _.agHelper
- .GetText(_.table._filtersCount)
- .then(($count) => expect($count).contain("2"));
-
- _.table.OpenFilter();
- _.table.RemoveFilterNVerify("1", true, false);
- });
-
- it("13. Verify all filters for same FullName (two word column) + Bug 13334", () => {
- //Contains
- _.table.OpenNFilterTable("FullName", "contains", "torres");
- _.table.ReadTableRowColumnData(0, 2).then(($cellData) => {
- expect($cellData).to.eq("Virgie");
- });
-
- filterOnlyCondition("does not contain", "49");
- filterOnlyCondition("starts with", "0");
- filterOnlyCondition("ends with", "1");
- filterOnlyCondition("is exactly", "0");
- filterOnlyCondition("empty", "0");
- filterOnlyCondition("not empty", "50");
- filterOnlyCondition("contains", "1", "wolf");
- _.table.ReadTableRowColumnData(0, 2).then(($cellData) => {
- expect($cellData).to.eq("Teresa");
- });
-
- _.table.OpenNFilterTable("FirstName", "starts with", "wa", "OR", 1);
- _.agHelper.Sleep();
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("3"));
-
- _.table.OpenNFilterTable("LastName", "ends with", "son", "OR", 2);
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("10"));
- _.table.CloseFilter();
- _.agHelper
- .GetText(_.table._filtersCount)
- .then(($count) => expect($count).contain("3"));
-
- _.table.OpenFilter();
- _.table.RemoveFilterNVerify("1", true, false);
- });
-
- function filterOnlyCondition(
- condition: string,
- expectedCount: string,
- input: string | "" = "",
- ) {
- _.agHelper.GetNClick(_.table._filterConditionDropdown);
- cy.get(_.table._dropdownText).contains(condition).click();
- if (input)
- _.agHelper.GetNClick(_.table._filterInputValue, 0).type(input).wait(500);
- _.agHelper.ClickButton("APPLY");
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain(expectedCount));
- }
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts
new file mode 100644
index 000000000000..2f1388406c9a
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/TableFilter2_2_Spec.ts
@@ -0,0 +1,170 @@
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Verify various Table_Filter combinations", function () {
+ before(() => {
+ cy.fixture("tablev1NewDsl").then((val: any) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ it("1. Verify Full table data - download csv and download Excel", function () {
+ _.entityExplorer.SelectEntityByName("Table1");
+ _.propPane.UpdatePropertyFieldValue(
+ "Table data",
+ JSON.stringify(this.dataSet.TableInput),
+ );
+ _.assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ _.agHelper.PressEscape();
+ _.deployMode.DeployApp();
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "Michael Lawson");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Michael Lawson");
+ });
+
+ it("2. Verify Searched data - download csv and download Excel", function () {
+ _.table.SearchTable("7434532");
+ _.table.ReadTableRowColumnData(0, 3).then((afterSearch) => {
+ expect(afterSearch).to.eq("Byron Fields");
+ });
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "[email protected]");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Ryan Holmes");
+
+ _.table.RemoveSearchTextNVerify("2381224");
+
+ _.table.DownloadFromTable("Download as CSV");
+ _.table.ValidateDownloadNVerify("Table1.csv", "2736212");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Beef steak");
+ });
+
+ it("3. Verify Filtered data - download csv and download Excel", function () {
+ _.table.OpenNFilterTable("id", "starts with", "6");
+ _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
+ expect($cellData).to.eq("Tobias Funke");
+ });
+ _.table.CloseFilter();
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "Beef steak");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "[email protected]");
+
+ _.agHelper.GetNClick(_.table._filterBtn);
+ _.table.RemoveFilterNVerify("2381224", true, false);
+
+ _.table.DownloadFromTable("Download as CSV");
+ _.table.ValidateDownloadNVerify("Table1.csv", "Tuna Salad");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Avocado Panini");
+ });
+
+ it("4. Import TableFilter application & verify all filters for same FirstName (one word column) + Bug 13334", () => {
+ _.deployMode.NavigateBacktoEditor();
+ _.table.WaitUntilTableLoad();
+ _.homePage.NavigateToHome();
+ _.homePage.ImportApp("TableFilterImportApp.json");
+ _.homePage.AssertImportToast();
+ _.deployMode.DeployApp();
+ _.table.WaitUntilTableLoad();
+
+ //Contains
+ _.table.OpenNFilterTable("FirstName", "contains", "Della");
+ _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
+ expect($cellData).to.eq("Alvarado");
+ });
+
+ filterOnlyCondition("does not contain", "49");
+ filterOnlyCondition("starts with", "1");
+
+ //Ends with - Open Bug 13334
+ filterOnlyCondition("ends with", "1");
+
+ filterOnlyCondition("is exactly", "1");
+ filterOnlyCondition("empty", "0");
+ filterOnlyCondition("not empty", "50");
+ filterOnlyCondition("starts with", "3", "ge");
+ _.table.ReadTableRowColumnData(0, 3).then(($cellData) => {
+ expect($cellData).to.eq("Chandler");
+ });
+
+ _.table.OpenNFilterTable("FullName", "ends with", "ross", "OR", 1);
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("4"));
+ _.table.CloseFilter();
+ _.agHelper
+ .GetText(_.table._filtersCount)
+ .then(($count) => expect($count).contain("2"));
+
+ _.table.OpenFilter();
+ _.table.RemoveFilterNVerify("1", true, false);
+ });
+
+ it("5. Verify all filters for same FullName (two word column) + Bug 13334", () => {
+ //Contains
+ _.table.OpenNFilterTable("FullName", "contains", "torres");
+ _.table.ReadTableRowColumnData(0, 2).then(($cellData) => {
+ expect($cellData).to.eq("Virgie");
+ });
+
+ filterOnlyCondition("does not contain", "49");
+ filterOnlyCondition("starts with", "0");
+ filterOnlyCondition("ends with", "1");
+ filterOnlyCondition("is exactly", "0");
+ filterOnlyCondition("empty", "0");
+ filterOnlyCondition("not empty", "50");
+ filterOnlyCondition("contains", "1", "wolf");
+ _.table.ReadTableRowColumnData(0, 2).then(($cellData) => {
+ expect($cellData).to.eq("Teresa");
+ });
+
+ _.table.OpenNFilterTable("FirstName", "starts with", "wa", "OR", 1);
+ _.agHelper.Sleep();
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("3"));
+
+ _.table.OpenNFilterTable("LastName", "ends with", "son", "OR", 2);
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("10"));
+ _.table.CloseFilter();
+ _.agHelper
+ .GetText(_.table._filtersCount)
+ .then(($count) => expect($count).contain("3"));
+
+ _.table.OpenFilter();
+ _.table.RemoveFilterNVerify("1", true, false);
+ });
+
+ function filterOnlyCondition(
+ condition: string,
+ expectedCount: string,
+ input: string | "" = "",
+ ) {
+ _.agHelper.GetNClick(_.table._filterConditionDropdown);
+ cy.get(_.table._dropdownText).contains(condition).click();
+ if (input)
+ _.agHelper.GetNClick(_.table._filterInputValue, 0).type(input).wait(500);
+ _.agHelper.ClickButton("APPLY");
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain(expectedCount));
+ }
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
similarity index 54%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
index 2332183cb3c8..1a5fee0b60a8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_1_spec.js
@@ -12,53 +12,7 @@ describe("Table Widget property pane feature validation", function () {
// To be done:
// Column Data type: Video
-
- it("1. Verify On Row Selected Action", function () {
- // Open property pane
- cy.openPropertyPane("tablewidget");
- // Select show message in the "on selected row" dropdown
- cy.getAlert("onRowSelected", "Row is selected");
- _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
- _.table.WaitUntilTableLoad(0, 0, "v1");
- // Select 1st row
- cy.isSelectRow(2);
- cy.wait(2000);
- // Verify Row is selected by showing the message
- cy.get(commonlocators.toastmsg).contains("Row is selected");
- _.deployMode.NavigateBacktoEditor();
- });
-
- it("2. Check On Page Change Action", function () {
- // Open property pane
- cy.openPropertyPane("tablewidget");
- // Select show message in the "on selected row" dropdown
- cy.getAlert("onPageChange", "Page Changed");
- _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
- _.table.WaitUntilTableLoad(0, 0, "v1");
- cy.wait(2000);
- // Change the page
- cy.get(widgetsPage.nextPageButton).click({ force: true });
- // Verify the page is changed
- cy.get(commonlocators.toastmsg).contains("Page Changed");
- _.deployMode.NavigateBacktoEditor();
- });
-
- it("3. Verify On Search Text Change Action", function () {
- // Open property pane
- cy.openPropertyPane("tablewidget");
- // Show Message on Search text change Action
- cy.getAlert("onSearchTextChanged", "Search Text Changed");
- _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
- _.table.WaitUntilTableLoad(0, 0, "v1");
- // Change the Search text
- cy.get(widgetsPage.searchField).type("Hello");
- cy.wait(2000);
- // Verify the search text is changed
- cy.get(commonlocators.toastmsg).contains("Search Text Changed");
- _.deployMode.NavigateBacktoEditor();
- });
-
- it("4. Check open section and column data in property pane", function () {
+ it("1. Check open section and column data in property pane", function () {
cy.openPropertyPane("tablewidget");
// Validate the columns are visible in the property pane
@@ -86,7 +40,7 @@ describe("Table Widget property pane feature validation", function () {
cy.get(".draggable-header:contains('CustomColumn')").should("be.visible");
});
- it("5. Column Detail - Edit column name and validate test for computed value based on column type selected", function () {
+ it("2. Column Detail - Edit column name and validate test for computed value based on column type selected (Email, Number, Date)", function () {
cy.wait(1000);
cy.makeColumnVisible("email");
cy.makeColumnVisible("userName");
@@ -146,7 +100,9 @@ describe("Table Widget property pane feature validation", function () {
cy.readTableLinkPublish("1", "1").then((hrefVal) => {
expect(hrefVal).to.be.equal(videoVal);
});*/
+ });
+ it("3. Column Detail - Edit column name and validate test for computed value based on column type selected (image, button , url)", function () {
// Changing Column data type from "Date" to "Image"
const imageVal =
"https://images.pexels.com/photos/736230/pexels-photo-736230.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500";
@@ -182,7 +138,7 @@ describe("Table Widget property pane feature validation", function () {
});
});
- it("6. Test to validate text allignment", function () {
+ it("4. Test to validate text alignment", function () {
// Verifying Center Alignment
cy.xpath(widgetsPage.textCenterAlign).first().click({ force: true });
cy.readTabledataValidateCSS("1", "0", "justify-content", "center", true);
@@ -202,18 +158,7 @@ describe("Table Widget property pane feature validation", function () {
);
});
- it("7. Test to validate text format", function () {
- // Validate Bold text
- cy.get(widgetsPage.bold).click({ force: true });
- cy.wait(2000);
- cy.reload();
- cy.readTabledataValidateCSS("1", "0", "font-weight", "700");
- // Validate Italic text
- cy.get(widgetsPage.italics).click({ force: true });
- cy.readTabledataValidateCSS("0", "0", "font-style", "italic");
- });
-
- it("8. Test to validate vertical allignment", function () {
+ it("5. Test to validate vertical alignment", function () {
// Validate vertical alignemnt of Cell text to TOP
cy.get(widgetsPage.verticalTop).click({ force: true });
cy.readTabledataValidateCSS("1", "0", "align-items", "flex-start", true);
@@ -225,7 +170,7 @@ describe("Table Widget property pane feature validation", function () {
cy.readTabledataValidateCSS("0", "0", "align-items", "flex-end", true);
});
- it("11. Test to validate text color and text background", function () {
+ it("6. Test to validate text color and text background", function () {
cy.openPropertyPane("tablewidget");
// Changing text color to rgb(126, 34, 206) and validate
@@ -241,7 +186,7 @@ describe("Table Widget property pane feature validation", function () {
cy.testCodeMirrorLast("purple");
cy.wait("@updateLayout");
cy.readTabledataValidateCSS("1", "0", "color", "rgb(128, 0, 128)");
-
+ cy.get(commonlocators.editPropBackButton).click();
// Changing Cell backgroud color to rgb(126, 34, 206) and validate
cy.selectColor("cellbackgroundcolor");
cy.readTabledataValidateCSS(
@@ -265,119 +210,13 @@ describe("Table Widget property pane feature validation", function () {
cy.closePropertyPane();
});
- it("12. Verify default search text", function () {
+ it("7. Table-Delete Verification", function () {
// Open property pane
cy.openPropertyPane("tablewidget");
- cy.backFromPropertyPanel();
- // Chage deat search text value to "data"
- cy.testJsontext("defaultsearchtext", "data");
- _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
- _.table.WaitUntilTableLoad(0, 0, "v1");
- // Verify the deaullt search text
- cy.get(widgetsPage.searchField).should("have.value", "data");
- _.deployMode.NavigateBacktoEditor();
+ // Delete the Table widget
+ cy.deleteWidget(widgetsPage.tableWidget);
+ _.deployMode.DeployApp();
+ // Verify the Table widget is deleted
+ cy.get(widgetsPage.tableWidget).should("not.exist");
});
-
- it("13. Verify default selected row", function () {
- // Open property pane
- cy.openPropertyPane("tablewidget");
- cy.backFromPropertyPanel();
- cy.testJsontext("defaultsearchtext", "");
- // Change default selected row value to 1
- cy.get(widgetsPage.defaultSelectedRowField).type("1");
- cy.wait(2000);
- _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
- _.table.WaitUntilTableLoad(0, 0, "v1");
- // Verify the default selected row
- cy.get(widgetsPage.selectedRow).should(
- "have.css",
- "background-color",
- "rgb(227, 223, 251)",
- );
- _.deployMode.NavigateBacktoEditor();
- });
-
- // it("14. Verify table column type button with button variant", function() {
- // // Open property pane
- // cy.openPropertyPane("tablewidget");
- // // Add new column in the table with name "CustomColumn"
- // cy.addColumn("CustomColumn");
-
- // cy.tableColumnDataValidation("customColumn2"); //To be updated later
-
- // cy.editColumn("customColumn2");
- // cy.changeColumnType("Button", false);
- // // default selected opts
- // cy.get(commonlocators.tableButtonVariant + " span[type='p1']").should(
- // "have.text",
- // "Primary",
- // );
- // cy.getTableDataSelector("1", "6").then((selector) => {
- // cy.get(selector + " button").should(
- // "have.css",
- // "background-color",
- // "rgb(59, 130, 246)",
- // );
- // cy.get(selector + " button > span").should(
- // "have.css",
- // "color",
- // "rgb(255, 255, 255)",
- // );
- // });
- // cy.selectDropdownValue(commonlocators.tableButtonVariant, "Secondary");
- // cy.get(commonlocators.tableButtonVariant + " span[type='p1']").should(
- // "have.text",
- // "Secondary",
- // );
- // cy.getTableDataSelector("1", "6").then((selector) => {
- // cy.get(selector + " button").should(
- // "have.css",
- // "background-color",
- // "rgba(0, 0, 0, 0)",
- // );
- // cy.get(selector + " button > span").should(
- // "have.css",
- // "color",
- // "rgb(59, 130, 246)",
- // );
- // cy.get(selector + " button").should(
- // "have.css",
- // "border",
- // `1px solid rgb(59, 130, 246)`,
- // );
- // });
- // cy.selectDropdownValue(commonlocators.tableButtonVariant, "Tertiary");
- // cy.get(commonlocators.tableButtonVariant + " span[type='p1']").should(
- // "have.text",
- // "Tertiary",
- // );
- // cy.getTableDataSelector("1", "6").then((selector) => {
- // cy.get(selector + " button").should(
- // "have.css",
- // "background-color",
- // "rgba(0, 0, 0, 0)",
- // );
- // cy.get(selector + " button > span").should(
- // "have.css",
- // "color",
- // "rgb(59, 130, 246)",
- // );
- // cy.get(selector + " button").should(
- // "have.css",
- // "border",
- // "0px none rgb(24, 32, 38)",
- // );
- // });
- // cy.closePropertyPane();
- // });
-
- // it("15. Table-Delete Verification", function() {
- // // Open property pane
- // cy.openPropertyPane("tablewidget");
- // // Delete the Table widget
- // cy.deleteWidget(widgetsPage.tableWidget);
- // _.deployMode.DeployApp();
- // // Verify the Table widget is deleted
- // cy.get(widgetsPage.tableWidget).should("not.exist");
- // });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js
new file mode 100644
index 000000000000..3b2982313ba8
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV1/Table_PropertyPane_2_spec.js
@@ -0,0 +1,185 @@
+const widgetsPage = require("../../../../../locators/Widgets.json");
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const testdata = require("../../../../../fixtures/testdata.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Table Widget property pane feature validation", function () {
+ before(() => {
+ cy.fixture("tableNewDslWithPagination").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ // To be done:
+ // Column Data type: Video
+
+ it("1. Verify On Row Selected Action", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ // Select show message in the "on selected row" dropdown
+ cy.getAlert("onRowSelected", "Row is selected");
+ _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
+ _.table.WaitUntilTableLoad(0, 0, "v1");
+ // Select 1st row
+ cy.isSelectRow(2);
+ cy.wait(2000);
+ // Verify Row is selected by showing the message
+ cy.get(commonlocators.toastmsg).contains("Row is selected");
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("2. Check On Page Change Action", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ // Select show message in the "on selected row" dropdown
+ cy.getAlert("onPageChange", "Page Changed");
+ _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
+ _.table.WaitUntilTableLoad(0, 0, "v1");
+ cy.wait(2000);
+ // Change the page
+ cy.get(widgetsPage.nextPageButton).click({ force: true });
+ // Verify the page is changed
+ cy.get(commonlocators.toastmsg).contains("Page Changed");
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("3. Verify On Search Text Change Action", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ // Show Message on Search text change Action
+ cy.getAlert("onSearchTextChanged", "Search Text Changed");
+ _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
+ _.table.WaitUntilTableLoad(0, 0, "v1");
+ // Change the Search text
+ cy.get(widgetsPage.searchField).type("Hello");
+ cy.wait(2000);
+ // Verify the search text is changed
+ cy.get(commonlocators.toastmsg).contains("Search Text Changed");
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("4. Test to validate text format", function () {
+ cy.openPropertyPane("tablewidget");
+ cy.editColumn("id");
+ // Validate Bold text
+ cy.get(widgetsPage.bold).click({ force: true });
+ cy.wait(2000);
+ cy.reload();
+ cy.readTabledataValidateCSS("1", "0", "font-weight", "700");
+ // Validate Italic text
+ cy.get(widgetsPage.italics).click({ force: true });
+ cy.readTabledataValidateCSS("0", "0", "font-style", "italic");
+ });
+
+ it("5. Verify default search text", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ cy.backFromPropertyPanel();
+ // Chage deat search text value to "data"
+ cy.testJsontext("defaultsearchtext", "data");
+ _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
+ _.table.WaitUntilTableLoad(0, 0, "v1");
+ // Verify the deaullt search text
+ cy.get(widgetsPage.searchField).should("have.value", "data");
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("6. Verify default selected row", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ cy.backFromPropertyPanel();
+ cy.testJsontext("defaultsearchtext", "");
+ // Change default selected row value to 1
+ cy.get(widgetsPage.defaultSelectedRowField).type("1");
+ cy.wait(2000);
+ _.deployMode.DeployApp(_.locators._widgetInDeployed("tablewidget"));
+ _.table.WaitUntilTableLoad(0, 0, "v1");
+ // Verify the default selected row
+ cy.get(widgetsPage.selectedRow).should(
+ "have.css",
+ "background-color",
+ "rgb(227, 223, 251)",
+ );
+ _.deployMode.NavigateBacktoEditor();
+ });
+
+ it("7. Verify table column type button with button variant", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidget");
+ // Add new column in the table with name "CustomColumn"
+ cy.addColumn("CustomColumn");
+
+ cy.tableColumnDataValidation("customColumn1"); //To be updated later
+
+ cy.editColumn("customColumn1");
+ cy.changeColumnType("Button", false);
+ // default selected opts
+ cy.get(commonlocators.tableButtonVariant + " span span").should(
+ "have.text",
+ "Primary",
+ );
+ cy.getTableDataSelector("1", "5").then((selector) => {
+ cy.get(selector + " button").should(
+ "have.css",
+ "background-color",
+ "rgb(85, 61, 233)",
+ );
+ cy.get(selector + " button > span").should(
+ "have.css",
+ "color",
+ "rgb(255, 255, 255)",
+ );
+ });
+ cy.selectDropdownValue(
+ commonlocators.tableButtonVariant + " input",
+ "Secondary",
+ );
+ cy.get(commonlocators.tableButtonVariant + " span span").should(
+ "have.text",
+ "Secondary",
+ );
+ cy.getTableDataSelector("1", "5").then((selector) => {
+ cy.get(selector + " button").should(
+ "have.css",
+ "background-color",
+ "rgba(0, 0, 0, 0)",
+ );
+ cy.get(selector + " button > span").should(
+ "have.css",
+ "color",
+ "rgb(85, 61, 233)",
+ );
+ cy.get(selector + " button").should(
+ "have.css",
+ "border",
+ `1px solid rgb(85, 61, 233)`,
+ );
+ });
+ cy.selectDropdownValue(
+ commonlocators.tableButtonVariant + " input",
+ "Tertiary",
+ );
+ cy.get(commonlocators.tableButtonVariant + " span span").should(
+ "have.text",
+ "Tertiary",
+ );
+ cy.getTableDataSelector("1", "5").then((selector) => {
+ cy.get(selector + " button").should(
+ "have.css",
+ "background-color",
+ "rgba(0, 0, 0, 0)",
+ );
+ cy.get(selector + " button > span").should(
+ "have.css",
+ "color",
+ "rgb(85, 61, 233)",
+ );
+ cy.get(selector + " button").should(
+ "have.css",
+ "border",
+ "0px none rgb(24, 32, 38)",
+ );
+ });
+ cy.closePropertyPane();
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.js
similarity index 59%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.js
index 39b4c7f2f810..7689bf49c86c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_1_spec.js
@@ -118,77 +118,7 @@ describe("Table widget date column inline editing functionality", () => {
).should("contain", "Fr");
});
- it.skip("6. should check that changing property pane time precision changes the date picker time precision", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(".t--property-control-timeprecision .bp3-popover-target")
- .last()
- .click();
- cy.get(".t--dropdown-option").children().contains("Minute").click();
- cy.get(
- `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
- ).dblclick({
- force: true,
- });
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-hour").should("exist");
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-minute").should("exist");
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-second").should(
- "not.exist",
- );
-
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(".t--property-control-timeprecision .bp3-popover-target")
- .last()
- .click();
- cy.get(".t--dropdown-option").children().contains("None").click();
- cy.get(
- `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
- ).dblclick({
- force: true,
- });
- cy.get(".bp3-timepicker-input-row").should("not.exist");
-
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(".t--property-control-timeprecision .bp3-popover-target")
- .last()
- .click();
- cy.get(".t--dropdown-option").children().contains("Second").click();
- cy.get(
- `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
- ).dblclick({
- force: true,
- });
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-hour").should("exist");
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-minute").should("exist");
- cy.get(".bp3-timepicker-input-row .bp3-timepicker-second").should("exist");
- });
-
- it("7. should check visible property control functionality", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(
- ".t--property-pane-section-general .t--property-control-visible",
- ).should("exist");
- cy.get(
- ".t--property-pane-section-general .t--property-control-visible input[type=checkbox]",
- ).click();
- cy.get(
- `${commonlocators.TableV2Head} [data-header="release_date"] .hidden-header`,
- ).should("exist");
-
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(
- ".t--property-pane-section-general .t--property-control-visible input[type=checkbox]",
- ).click();
- cy.get(
- `${commonlocators.TableV2Head} [data-header="release_date"] .draggable-header`,
- ).should("exist");
- });
-
- it("8. should check Show Shortcuts property control functionality", () => {
+ it("6. should check Show Shortcuts property control functionality", () => {
cy.openPropertyPane("tablewidgetv2");
cy.editColumn("release_date");
cy.get(
@@ -223,55 +153,8 @@ describe("Table widget date column inline editing functionality", () => {
"exist",
);
});
- // ADS changes to date input property causes this test to fail
- // skipping it temporarily.
- it.skip("9. should check min date and max date property control functionality", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("release_date");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-mindate",
- ).should("exist");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-maxdate",
- ).should("exist");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-mindate div:last-child .react-datepicker-wrapper",
- )
- .click()
- .clear()
- .type("2022-05-05T00:00:10.1010+05:30{enter}");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-maxdate div:last-child .react-datepicker-wrapper",
- )
- .click()
- .clear()
- .type("2022-05-30T00:00:10.1010+05:30{enter}");
-
- cy.get(
- `${commonlocators.TableV2Row} .tr:nth-child(1) .td:nth-child(3)`,
- ).realHover();
- cy.get(`.t--editable-cell-icon`).first().click({
- force: true,
- });
- cy.get(
- ".bp3-transition-container .bp3-popover .bp3-popover-content",
- ).should("contain", "Date out of range");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-mindate div:last-child .react-datepicker-wrapper",
- )
- .click()
- .clear()
- .type("{enter}");
- cy.get(
- ".t--property-pane-section-validation .t--property-control-maxdate div:last-child .react-datepicker-wrapper",
- )
- .click()
- .clear()
- .type("{enter}");
- });
-
- it("10. should check property pane Required toggle functionality", () => {
+ it("7. should check property pane Required toggle functionality", () => {
cy.openPropertyPane("tablewidgetv2");
cy.editColumn("release_date");
cy.get(
@@ -304,7 +187,7 @@ describe("Table widget date column inline editing functionality", () => {
).should("not.exist");
});
- it("11. should check date cells behave as expected when adding a new row to table", () => {
+ it("8. should check date cells behave as expected when adding a new row to table", () => {
cy.openPropertyPane("tablewidgetv2");
cy.get("[data-testid='t--property-pane-back-btn']").click();
cy.get(
@@ -333,38 +216,4 @@ describe("Table widget date column inline editing functionality", () => {
`${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3) input`,
).should("not.have.value", "");
});
- it("11. should allow ISO 8601 format date and not throw a disallowed validation error", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.get(".t--property-control-tabledata").then(($el) => {
- cy.updateCodeInput(
- $el,
- '[{ "dateValue": "2023-02-02T13:39:38.367857Z" }]',
- );
- });
- cy.wait(500);
-
- cy.editColumn("dateValue");
- //change format of column to date
- cy.changeColumnType("Date");
-
- cy.get(".t--property-control-dateformat").click();
- cy.contains("ISO 8601").click();
- // we should not see an error after selecting the ISO 8061 format
- cy.get(".t--property-control-dateformat .t--codemirror-has-error").should(
- "not.exist",
- );
- cy.get(".t--property-control-dateformat").find(".t--js-toggle").click();
- //check the selected format value
- cy.get(".t--property-control-dateformat").contains(
- "YYYY-MM-DDTHH:mm:ss.SSSZ",
- );
- cy.get(".t--property-control-dateformat").then(($el) => {
- //give a corrupted date format
- cy.updateCodeInput($el, "YYYY-MM-DDTHH:mm:ss.SSSsZ");
- });
- //we should now see an error when an incorrect date format
- cy.get(".t--property-control-dateformat .t--codemirror-has-error").should(
- "exist",
- );
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.js
new file mode 100644
index 000000000000..a4e74b5acc5f
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Date_column_editing_2_spec.js
@@ -0,0 +1,164 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Table widget date column inline editing functionality", () => {
+ before(() => {
+ cy.fixture("Table/DateCellEditingDSL").then((val) => {
+ _.agHelper.AddDsl(val);
+ });
+ });
+
+ it.skip("1. should check that changing property pane time precision changes the date picker time precision", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(".t--property-control-timeprecision .bp3-popover-target")
+ .last()
+ .click();
+ cy.get(".t--dropdown-option").children().contains("Minute").click();
+ cy.get(
+ `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
+ ).dblclick({
+ force: true,
+ });
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-hour").should("exist");
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-minute").should("exist");
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-second").should(
+ "not.exist",
+ );
+
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(".t--property-control-timeprecision .bp3-popover-target")
+ .last()
+ .click();
+ cy.get(".t--dropdown-option").children().contains("None").click();
+ cy.get(
+ `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
+ ).dblclick({
+ force: true,
+ });
+ cy.get(".bp3-timepicker-input-row").should("not.exist");
+
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(".t--property-control-timeprecision .bp3-popover-target")
+ .last()
+ .click();
+ cy.get(".t--dropdown-option").children().contains("Second").click();
+ cy.get(
+ `${commonlocators.TableV2Row} .tr:nth-child(1) div:nth-child(3)`,
+ ).dblclick({
+ force: true,
+ });
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-hour").should("exist");
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-minute").should("exist");
+ cy.get(".bp3-timepicker-input-row .bp3-timepicker-second").should("exist");
+ });
+
+ it("2. should check visible property control functionality", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(
+ ".t--property-pane-section-general .t--property-control-visible",
+ ).should("exist");
+ cy.get(
+ ".t--property-pane-section-general .t--property-control-visible input[type=checkbox]",
+ ).click();
+ cy.get(
+ `${commonlocators.TableV2Head} [data-header="release_date"] .hidden-header`,
+ ).should("exist");
+
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(
+ ".t--property-pane-section-general .t--property-control-visible input[type=checkbox]",
+ ).click();
+ cy.get(
+ `${commonlocators.TableV2Head} [data-header="release_date"] .draggable-header`,
+ ).should("exist");
+ });
+
+ // ADS changes to date input property causes this test to fail
+ // skipping it temporarily.
+ it.skip("3. should check min date and max date property control functionality", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("release_date");
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-mindate",
+ ).should("exist");
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-maxdate",
+ ).should("exist");
+
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-mindate div:last-child .react-datepicker-wrapper",
+ )
+ .click()
+ .clear()
+ .type("2022-05-05T00:00:10.1010+05:30{enter}");
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-maxdate div:last-child .react-datepicker-wrapper",
+ )
+ .click()
+ .clear()
+ .type("2022-05-30T00:00:10.1010+05:30{enter}");
+
+ cy.get(
+ `${commonlocators.TableV2Row} .tr:nth-child(1) .td:nth-child(3)`,
+ ).realHover();
+ cy.get(`.t--editable-cell-icon`).first().click({
+ force: true,
+ });
+ cy.get(
+ ".bp3-transition-container .bp3-popover .bp3-popover-content",
+ ).should("contain", "Date out of range");
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-mindate div:last-child .react-datepicker-wrapper",
+ )
+ .click()
+ .clear()
+ .type("{enter}");
+ cy.get(
+ ".t--property-pane-section-validation .t--property-control-maxdate div:last-child .react-datepicker-wrapper",
+ )
+ .click()
+ .clear()
+ .type("{enter}");
+ });
+
+ it("4. should allow ISO 8601 format date and not throw a disallowed validation error", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(commonlocators.editPropBackButton).click();
+ cy.get(".t--property-control-tabledata").then(($el) => {
+ cy.updateCodeInput(
+ $el,
+ '[{ "dateValue": "2023-02-02T13:39:38.367857Z" }]',
+ );
+ });
+ cy.wait(500);
+
+ cy.editColumn("dateValue");
+ //change format of column to date
+ cy.changeColumnType("Date");
+
+ cy.get(".t--property-control-dateformat").click();
+ cy.contains("ISO 8601").click();
+ // we should not see an error after selecting the ISO 8061 format
+ cy.get(".t--property-control-dateformat .t--codemirror-has-error").should(
+ "not.exist",
+ );
+ cy.get(".t--property-control-dateformat").find(".t--js-toggle").click();
+ //check the selected format value
+ cy.get(".t--property-control-dateformat").contains(
+ "YYYY-MM-DDTHH:mm:ss.SSSZ",
+ );
+ cy.get(".t--property-control-dateformat").then(($el) => {
+ //give a corrupted date format
+ cy.updateCodeInput($el, "YYYY-MM-DDTHH:mm:ss.SSSsZ");
+ });
+ //we should now see an error when an incorrect date format
+ cy.get(".t--property-control-dateformat .t--codemirror-has-error").should(
+ "exist",
+ );
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js
new file mode 100644
index 000000000000..09f9049c9cc5
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_1_spec.js
@@ -0,0 +1,301 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+import { agHelper } from "../../../../../support/Objects/ObjectsCore";
+
+describe("Table widget inline editing functionality", () => {
+ afterEach(() => {
+ agHelper.SaveLocalStorageCache();
+ });
+
+ beforeEach(() => {
+ agHelper.RestoreLocalStorageCache();
+ cy.fixture("Table/InlineEditingDSL").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ });
+
+ let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+ it("1. should check that edit check box is present in the columns list", () => {
+ cy.openPropertyPane("tablewidgetv2");
+
+ ["step", "task", "status", "action"].forEach((column) => {
+ cy.get(
+ `[data-rbd-draggable-id="${column}"] .t--card-checkbox input[type="checkbox"]`,
+ ).should("exist");
+ });
+ });
+
+ it("2. should check that editablity checkbox is preset top of the list", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(`.t--property-control-columns .t--uber-editable-checkbox`).should(
+ "exist",
+ );
+ });
+
+ it("3. should check that turning on editablity turns on edit in all the editable column in the list", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ function checkEditableCheckbox(expected) {
+ ["step", "task", "status"].forEach((column) => {
+ cy.get(
+ `[data-rbd-draggable-id="${column}"] .t--card-checkbox.t--checked`,
+ ).should(expected);
+ });
+ }
+
+ checkEditableCheckbox("not.exist");
+
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+
+ checkEditableCheckbox("exist");
+
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+
+ checkEditableCheckbox("not.exist");
+ });
+
+ it("4. should check that turning on editablity DOESN'T turn on edit in the non editable column in the list", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(
+ '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
+ ).should("not.exist");
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+ cy.get(
+ '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
+ ).should("not.exist");
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+ cy.get(
+ '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
+ ).should("not.exist");
+ });
+
+ it("5. should check that checkbox in the column list and checkbox inside the column settings ARE in sync", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(
+ '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
+ ).should("not.exist");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .ads-v2-switch.checked").should(
+ "not.exist",
+ );
+ cy.get(propPaneBack).click();
+ cy.get(
+ '[data-rbd-draggable-id="step"] .t--card-checkbox input+span',
+ ).click();
+ cy.get(
+ '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
+ ).should("exist");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable")
+ .find("input")
+ .should("have.attr", "checked");
+ cy.get(propPaneBack).click();
+ cy.get(
+ '[data-rbd-draggable-id="step"] .t--card-checkbox input+span',
+ ).click();
+ cy.get(
+ '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
+ ).should("not.exist");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .ads-v2-switch.checked").should(
+ "not.exist",
+ );
+ });
+
+ it("6. should check that checkbox in the column list and checkbox inside the column settings ARE NOT in sync when there is js expression", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .t--js-toggle").click();
+ cy.updateCodeInput(".t--property-control-editable", `{{true === true}}`);
+ cy.get(propPaneBack).click();
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .CodeMirror .CodeMirror-code").should(
+ "contain",
+ "{{true === true}}",
+ );
+ cy.get(propPaneBack).click();
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .CodeMirror .CodeMirror-code").should(
+ "contain",
+ "{{true === true}}",
+ );
+ });
+
+ it("7. should check that editable checkbox is disabled for columns that are not editable", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ [
+ {
+ columnType: "URL",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Number",
+ expected: "not.be.disabled",
+ },
+ {
+ columnType: "Date",
+ expected: "not.be.disabled",
+ },
+ {
+ columnType: "Image",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Video",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Button",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Menu button",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Icon button",
+ expected: "be.disabled",
+ },
+ {
+ columnType: "Plain text",
+ expected: "not.be.disabled",
+ },
+ ].forEach((data) => {
+ cy.editColumn("step");
+ cy.get(commonlocators.changeColType).last().click();
+ cy.get(".t--dropdown-option")
+ .children()
+ .contains(data.columnType)
+ .click();
+ cy.wait("@updateLayout");
+ cy.get(propPaneBack).click();
+ cy.get(`[data-rbd-draggable-id="step"] .t--card-checkbox input`).should(
+ data.expected,
+ );
+ });
+ });
+
+ it("8. should check that editable property is only available for Plain text & number columns", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("step");
+ [
+ {
+ columnType: "URL",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Number",
+ expected: "exist",
+ },
+ {
+ columnType: "Date",
+ expected: "exist",
+ },
+ {
+ columnType: "Image",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Video",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Menu button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Icon button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Plain text",
+ expected: "exist",
+ },
+ ].forEach((data) => {
+ cy.get(commonlocators.changeColType).last().click();
+ cy.get(".t--dropdown-option")
+ .children()
+ .contains(data.columnType)
+ .click();
+ cy.wait("@updateLayout");
+ cy.get(".t--property-control-editable").should(data.expected);
+ });
+ });
+
+ it("9. should check that inline save option is shown only when a column is made editable", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(".t--property-control-updatemode").should("not.exist");
+ cy.makeColumnEditable("step");
+ cy.get(".t--property-control-updatemode").should("exist");
+ cy.makeColumnEditable("step");
+ cy.get(".t--property-control-updatemode").should("exist");
+
+ cy.dragAndDropToCanvas("textwidget", { x: 300, y: 600 });
+ cy.openPropertyPane("textwidget");
+ cy.updateCodeInput(
+ ".t--property-control-text",
+ `{{Table1.inlineEditingSaveOption}}`,
+ );
+ cy.get(".t--widget-textwidget .bp3-ui-text").should("contain", "ROW_LEVEL");
+ });
+
+ it("10. should check that save/discard column is added when a column is made editable and removed when made uneditable", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
+ cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
+ "contain.value",
+ "Save / Discard",
+ );
+ cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
+ "be.disabled",
+ );
+ cy.makeColumnEditable("step");
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
+ cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
+ "contain.value",
+ "Save / Discard",
+ );
+ cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
+ "be.disabled",
+ );
+ cy.get(
+ `.t--property-control-columns .t--uber-editable-checkbox input+span`,
+ ).click();
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .ads-v2-switch").click();
+ cy.get(propPaneBack).click();
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
+ cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
+ "contain.value",
+ "Save / Discard",
+ );
+ cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
+ "be.disabled",
+ );
+ cy.editColumn("step");
+ cy.get(".t--property-control-editable .ads-v2-switch").click();
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js
new file mode 100644
index 000000000000..6a9e31ee05d8
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js
@@ -0,0 +1,199 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+import {
+ agHelper,
+ entityExplorer,
+ propPane,
+ table,
+ draggableWidgets,
+} from "../../../../../support/Objects/ObjectsCore";
+import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
+
+describe("Table widget inline editing functionality", () => {
+ afterEach(() => {
+ agHelper.SaveLocalStorageCache();
+ });
+
+ beforeEach(() => {
+ agHelper.RestoreLocalStorageCache();
+ cy.fixture("Table/InlineEditingDSL").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ });
+
+ let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+ it("1. should check that onDiscard event is working", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("EditActions1");
+ cy.get(".t--property-pane-section-collapse-savebutton").click();
+ //cy.get(".t--property-pane-section-collapse-discardbutton").click();
+ cy.getAlert("onDiscard", "discarded!!");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "NewValue");
+ cy.openPropertyPane("tablewidgetv2");
+ cy.discardTableRow(4, 0);
+ cy.get(widgetsPage.toastAction).should("be.visible");
+ cy.get(widgetsPage.toastActionText)
+ .last()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal("discarded!!");
+ });
+ });
+
+ it("2. should check that inline editing works with text wrapping disabled", () => {
+ cy.fixture("Table/InlineEditingDSL").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editTableCell(0, 0);
+ cy.get(
+ "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
+ ).should("not.be.disabled");
+ });
+
+ it("3. should check that inline editing works with text wrapping enabled", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+ cy.get(".t--property-control-cellwrapping .ads-v2-switch")
+ .first()
+ .click({ force: true });
+ cy.editTableCell(0, 0);
+ cy.get(
+ "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
+ ).should("not.be.disabled");
+ });
+
+ it("4. should check that doesn't grow taller when text wrapping is disabled", () => {
+ entityExplorer.SelectEntityByName("Table1");
+ table.EnableEditableOfColumn("step");
+ table.EditTableCell(0, 0, "", false);
+ agHelper.GetHeight(table._editCellEditor);
+ cy.get("@eleHeight").then(($initiaHeight) => {
+ expect(Number($initiaHeight)).to.eq(28);
+ table.EditTableCell(
+ 1,
+ 0,
+ "this is a very long cell value to check the height of the cell is growing accordingly",
+ false,
+ );
+ agHelper.GetHeight(table._editCellEditor);
+ cy.get("@eleHeight").then(($newHeight) => {
+ expect(Number($newHeight)).to.eq(Number($initiaHeight));
+ });
+ });
+ });
+
+ it("5. should check that grows taller when text wrapping is enabled", () => {
+ entityExplorer.SelectEntityByName("Table1");
+ table.EnableEditableOfColumn("step");
+ table.EditColumn("step");
+ propPane.TogglePropertyState("Cell Wrapping", "On");
+ table.EditTableCell(
+ 0,
+ 0,
+ "this is a very long cell value to check the height of the cell is growing accordingly",
+ false,
+ );
+ agHelper.GetHeight(table._editCellEditor);
+ cy.get("@eleHeight").then(($newHeight) => {
+ expect(Number($newHeight)).to.be.greaterThan(34);
+ });
+ });
+
+ it("6. should check if updatedRowIndex is getting updated for single row update mode", () => {
+ cy.dragAndDropToCanvas("textwidget", { x: 400, y: 400 });
+ cy.get(".t--widget-textwidget").should("exist");
+ cy.updateCodeInput(
+ ".t--property-control-text",
+ `{{Table1.updatedRowIndex}}`,
+ );
+
+ cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 300 });
+ cy.get(".t--widget-buttonwidget").should("exist");
+ cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
+ cy.updateCodeInput(".t--property-control-label", "Reset");
+ cy.updateCodeInput(
+ PROPERTY_SELECTOR.onClick,
+ `{{resetWidget("Table1",true)}}`,
+ );
+
+ // case 1: check if updatedRowIndex has -1 as the default value:
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+
+ cy.openPropertyPane("tablewidgetv2");
+
+ cy.makeColumnEditable("step");
+ cy.wait(1000);
+
+ // case 2: check if updatedRowIndex is 0, when cell at row 0 is updated.
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "#12").type("{enter}");
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", 0);
+
+ // case 3: check if updatedRowIndex is -1 when changes are discarded.
+ cy.discardTableRow(4, 0);
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+
+ // case 4: check if the updateRowIndex is -1 when widget is reset
+ cy.editTableCell(0, 1);
+ cy.enterTableCellValue(0, 1, "#13").type("{enter}");
+ cy.contains("Reset").click({ force: true });
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+
+ // case 5: check if the updatedRowIndex changes to -1 when the table data changes.
+ cy.wait(1000);
+ cy.editTableCell(0, 2);
+ cy.enterTableCellValue(0, 2, "#14").type("{enter}");
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(widgetsPage.tabedataField).type("{backspace}");
+ cy.wait(300);
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+ });
+
+ it("7. should check if updatedRowIndex is getting updated for multi row update mode", () => {
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 400, 400);
+ cy.get(".t--widget-textwidget").should("exist");
+ cy.updateCodeInput(
+ ".t--property-control-text",
+ `{{Table1.updatedRowIndex}}`,
+ );
+ entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
+ cy.get(".t--widget-buttonwidget").should("exist");
+ cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
+ cy.updateCodeInput(".t--property-control-label", "Reset");
+ cy.updateCodeInput(
+ PROPERTY_SELECTOR.onClick,
+ `{{resetWidget("Table1",true)}}`,
+ );
+
+ entityExplorer.NavigateToSwitcher("Explorer");
+ entityExplorer.SelectEntityByName("Table1");
+ table.EnableEditableOfColumn("step");
+ agHelper.GetNClick(table._updateMode("Multi"), 0, false, 1000);
+
+ // case 1: check if updatedRowIndex is 0, when cell at row 0 is updated.
+ table.EditTableCell(0, 0, "#12");
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", 0);
+
+ // case 2: check if the updateRowIndex is -1 when widget is reset
+ table.EditTableCell(1, 0, "#13");
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", 1);
+
+ cy.contains("Reset").click({ force: true });
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+
+ // case 3: check if the updatedRowIndex changes to -1 when the table data changes.
+ cy.wait(1000);
+ table.EditTableCell(2, 0, "#14");
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", 2);
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(widgetsPage.tabedataField).type("{backspace}");
+ cy.wait(300);
+ cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
new file mode 100644
index 000000000000..efaeacaa814e
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_3_spec.js
@@ -0,0 +1,340 @@
+const commonlocators = require("../../../../../locators/commonlocators.json");
+const widgetsPage = require("../../../../../locators/Widgets.json");
+import {
+ agHelper,
+ entityExplorer,
+ propPane,
+ table,
+ draggableWidgets,
+} from "../../../../../support/Objects/ObjectsCore";
+import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
+
+describe("Table widget inline editing functionality", () => {
+ afterEach(() => {
+ agHelper.SaveLocalStorageCache();
+ });
+
+ beforeEach(() => {
+ agHelper.RestoreLocalStorageCache();
+ cy.fixture("Table/InlineEditingDSL").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ });
+
+ let propPaneBack = "[data-testid='t--property-pane-back-btn']";
+
+ it("1. should check that save/discard column is added/removed when inline save option is changed", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
+ cy.get(".t--property-control-updatemode .t--property-control-label")
+ .last()
+ .click();
+ cy.get(".ads-v2-segmented-control-value-CUSTOM").click({ force: true });
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+ cy.makeColumnEditable("task");
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+ cy.get(".t--property-control-updatemode .t--property-control-label")
+ .last()
+ .click();
+ cy.get(".ads-v2-segmented-control-value-ROW_LEVEL").click({ force: true });
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
+ cy.get(".t--property-control-updatemode .t--property-control-label")
+ .last()
+ .click();
+ cy.get(".ads-v2-segmented-control-value-CUSTOM").click({ force: true });
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+ cy.makeColumnEditable("step");
+ cy.makeColumnEditable("task");
+ cy.get(".t--property-control-updatemode .t--property-control-label")
+ .last()
+ .click();
+ cy.get(".ads-v2-segmented-control-value-ROW_LEVEL").click({ force: true });
+ cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
+ });
+
+ it("2. should check that cell of an editable column is editable", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ // click the edit icon
+ cy.editTableCell(0, 0);
+ cy.get(
+ "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
+ ).should("not.be.disabled");
+
+ //double click the cell
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(
+ `[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input`,
+ ).should("not.exist");
+ cy.get(`[data-colindex=0][data-rowindex=0] .t--table-text-cell`).trigger(
+ "dblclick",
+ );
+ cy.get(
+ `[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input`,
+ ).should("exist");
+ cy.get(
+ "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
+ ).should("not.be.disabled");
+ });
+
+ it("3. should check that changes can be discarded by clicking escape", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ let value;
+ cy.readTableV2data(0, 0).then((val) => {
+ value = val;
+ });
+ cy.makeColumnEditable("step");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "newValue");
+ cy.discardTableCellValue(0, 0);
+ cy.get(
+ `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
+ ).should("not.exist");
+ cy.readTableV2data(0, 0).then((val) => {
+ expect(val).to.equal(value);
+ });
+ });
+
+ it("4. should check that changes can be saved by pressing enter or clicking outside", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ let value;
+ cy.readTableV2data(0, 0).then((val) => {
+ value = val;
+ });
+ cy.makeColumnEditable("step");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "newValue");
+ cy.saveTableCellValue(0, 0);
+ cy.get(
+ `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
+ ).should("not.exist");
+ cy.wait(1000);
+ cy.readTableV2data(0, 0).then((val) => {
+ expect(val).to.not.equal(value);
+ value = val;
+ });
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "someOtherNewValue");
+ cy.openPropertyPane("tablewidgetv2");
+ cy.get(
+ `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
+ ).should("not.exist");
+ cy.wait(1000);
+ cy.readTableV2data(0, 0).then((val) => {
+ expect(val).to.not.equal(value);
+ });
+ });
+
+ it("5. should check that updatedRows and updatedRowIndices have correct values", () => {
+ cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
+ cy.openPropertyPane("textwidget");
+ cy.updateCodeInput(".t--property-control-text", `{{Table1.updatedRows}}`);
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "newValue");
+ cy.saveTableCellValue(0, 0);
+ cy.get(".t--widget-textwidget .bp3-ui-text").should(
+ "contain",
+ `[ { "index": 0, "updatedFields": { "step": "newValue" }, "allFields": { "step": "newValue", "task": "Drop a table", "status": "✅" } }]`,
+ );
+ cy.openPropertyPane("textwidget");
+ cy.updateCodeInput(
+ ".t--property-control-text",
+ `{{Table1.updatedRowIndices}}`,
+ );
+ cy.get(".t--widget-textwidget .bp3-ui-text").should("contain", "[ 0]");
+ });
+
+ it("6. should check that onsubmit event is available for the columns that are editable", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("step");
+ [
+ {
+ columnType: "URL",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Number",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Date",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Image",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Video",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Menu button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Icon button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Plain text",
+ expected: "not.exist",
+ },
+ ].forEach((data) => {
+ cy.get(commonlocators.changeColType).last().click();
+ cy.get(".t--dropdown-option")
+ .children()
+ .contains(data.columnType)
+ .click();
+ cy.wait("@updateLayout");
+ cy.wait(500);
+ cy.get(".t--property-control-onsubmit").should(data.expected);
+ });
+
+ cy.get(propPaneBack).click();
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+
+ [
+ {
+ columnType: "URL",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Number",
+ expected: "exist",
+ },
+ {
+ columnType: "Date",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Image",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Video",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Menu button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Icon button",
+ expected: "not.exist",
+ },
+ {
+ columnType: "Plain text",
+ expected: "exist",
+ },
+ ].forEach((data) => {
+ cy.get(commonlocators.changeColType).last().click();
+ cy.get(".t--dropdown-option")
+ .children()
+ .contains(data.columnType)
+ .click();
+ cy.wait("@updateLayout");
+ cy.wait(500);
+ cy.get(".t--property-control-onsubmit").should(data.expected);
+ });
+ });
+
+ it("7. should check that onsubmit event is triggered when changes are saved", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+ cy.getAlert("onSubmit", "Submitted!!");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "NewValue");
+ cy.saveTableCellValue(0, 0);
+
+ cy.get(widgetsPage.toastAction).should("be.visible");
+ cy.get(widgetsPage.toastActionText)
+ .last()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal("Submitted!!");
+ });
+ });
+
+ it("8. should check that onSubmit events has access to edit values through triggeredRow", () => {
+ const value = "newCellValue";
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("step");
+ cy.getAlert("onSubmit", "{{Table1.triggeredRow.step}}");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, value);
+ cy.saveTableCellValue(0, 0);
+
+ cy.get(widgetsPage.toastAction).should("be.visible");
+ cy.get(widgetsPage.toastActionText)
+ .last()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal(value);
+ });
+ });
+
+ it("9. should check that onSave is working", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("EditActions1");
+ //cy.get(".t--property-pane-section-collapse-savebutton").click({force:true});
+ cy.get(".t--property-pane-section-collapse-discardbutton").click({
+ force: true,
+ });
+ cy.getAlert("onSave", "Saved!!");
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "NewValue");
+ cy.openPropertyPane("tablewidgetv2");
+ cy.saveTableRow(4, 0);
+ cy.get(widgetsPage.toastAction).should("be.visible");
+ cy.get(widgetsPage.toastActionText)
+ .last()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal("Saved!!");
+ });
+ });
+
+ it("10. should check that onSave events has access to edit values through triggeredRow", () => {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("step");
+ cy.editColumn("EditActions1");
+ //cy.get(".t--property-pane-section-collapse-savebutton").click({force:true});
+ cy.get(".t--property-pane-section-collapse-discardbutton").click({
+ force: true,
+ });
+ cy.getAlert("onSave", "{{Table1.triggeredRow.step}}");
+ /*
+ cy.addSuccessMessage(
+ "{{Table1.triggeredRow.step}}",
+ ".t--property-control-onsave",
+ );
+ */
+ cy.editTableCell(0, 0);
+ cy.enterTableCellValue(0, 0, "NewValue");
+ cy.openPropertyPane("tablewidgetv2");
+ cy.saveTableRow(4, 0);
+ cy.get(widgetsPage.toastAction).should("be.visible");
+ cy.get(widgetsPage.toastActionText)
+ .last()
+ .invoke("text")
+ .then((text) => {
+ expect(text).to.equal("NewValue");
+ });
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_spec.js
deleted file mode 100644
index 78c8bdf886ea..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_spec.js
+++ /dev/null
@@ -1,797 +0,0 @@
-const commonlocators = require("../../../../../locators/commonlocators.json");
-const widgetsPage = require("../../../../../locators/Widgets.json");
-import {
- agHelper,
- entityExplorer,
- propPane,
- table,
- draggableWidgets,
-} from "../../../../../support/Objects/ObjectsCore";
-import { PROPERTY_SELECTOR } from "../../../../../locators/WidgetLocators";
-
-describe("Table widget inline editing functionality", () => {
- afterEach(() => {
- agHelper.SaveLocalStorageCache();
- });
-
- beforeEach(() => {
- agHelper.RestoreLocalStorageCache();
- cy.fixture("Table/InlineEditingDSL").then((val) => {
- agHelper.AddDsl(val);
- });
- });
-
- let propPaneBack = "[data-testid='t--property-pane-back-btn']";
-
- it("1. should check that edit check box is present in the columns list", () => {
- cy.openPropertyPane("tablewidgetv2");
-
- ["step", "task", "status", "action"].forEach((column) => {
- cy.get(
- `[data-rbd-draggable-id="${column}"] .t--card-checkbox input[type="checkbox"]`,
- ).should("exist");
- });
- });
-
- it("2. should check that editablity checkbox is preset top of the list", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.get(`.t--property-control-columns .t--uber-editable-checkbox`).should(
- "exist",
- );
- });
-
- it("3. should check that turning on editablity turns on edit in all the editable column in the list", () => {
- cy.openPropertyPane("tablewidgetv2");
- function checkEditableCheckbox(expected) {
- ["step", "task", "status"].forEach((column) => {
- cy.get(
- `[data-rbd-draggable-id="${column}"] .t--card-checkbox.t--checked`,
- ).should(expected);
- });
- }
-
- checkEditableCheckbox("not.exist");
-
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
-
- checkEditableCheckbox("exist");
-
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
-
- checkEditableCheckbox("not.exist");
- });
-
- it("4. should check that turning on editablity DOESN'T turn on edit in the non editable column in the list", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.get(
- '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
- ).should("not.exist");
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
- cy.get(
- '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
- ).should("not.exist");
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
- cy.get(
- '[data-rbd-draggable-id="action"] .t--card-checkbox.t--checked',
- ).should("not.exist");
- });
-
- it("5. should check that checkbox in the column list and checkbox inside the column settings ARE in sync", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.get(
- '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
- ).should("not.exist");
- cy.editColumn("step");
- cy.get(".t--property-control-editable .ads-v2-switch.checked").should(
- "not.exist",
- );
- cy.get(propPaneBack).click();
- cy.get(
- '[data-rbd-draggable-id="step"] .t--card-checkbox input+span',
- ).click();
- cy.get(
- '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
- ).should("exist");
- cy.editColumn("step");
- cy.get(".t--property-control-editable")
- .find("input")
- .should("have.attr", "checked");
- cy.get(propPaneBack).click();
- cy.get(
- '[data-rbd-draggable-id="step"] .t--card-checkbox input+span',
- ).click();
- cy.get(
- '[data-rbd-draggable-id="step"] .t--card-checkbox.t--checked',
- ).should("not.exist");
- cy.editColumn("step");
- cy.get(".t--property-control-editable .ads-v2-switch.checked").should(
- "not.exist",
- );
- });
-
- it("6. should check that checkbox in the column list and checkbox inside the column settings ARE NOT in sync when there is js expression", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("step");
- cy.get(".t--property-control-editable .t--js-toggle").click();
- cy.updateCodeInput(".t--property-control-editable", `{{true === true}}`);
- cy.get(propPaneBack).click();
- cy.makeColumnEditable("step");
- cy.editColumn("step");
- cy.get(".t--property-control-editable .CodeMirror .CodeMirror-code").should(
- "contain",
- "{{true === true}}",
- );
- cy.get(propPaneBack).click();
- cy.makeColumnEditable("step");
- cy.editColumn("step");
- cy.get(".t--property-control-editable .CodeMirror .CodeMirror-code").should(
- "contain",
- "{{true === true}}",
- );
- });
-
- it("7. should check that editable checkbox is disabled for columns that are not editable", () => {
- cy.openPropertyPane("tablewidgetv2");
- [
- {
- columnType: "URL",
- expected: "be.disabled",
- },
- {
- columnType: "Number",
- expected: "not.be.disabled",
- },
- {
- columnType: "Date",
- expected: "not.be.disabled",
- },
- {
- columnType: "Image",
- expected: "be.disabled",
- },
- {
- columnType: "Video",
- expected: "be.disabled",
- },
- {
- columnType: "Button",
- expected: "be.disabled",
- },
- {
- columnType: "Menu button",
- expected: "be.disabled",
- },
- {
- columnType: "Icon button",
- expected: "be.disabled",
- },
- {
- columnType: "Plain text",
- expected: "not.be.disabled",
- },
- ].forEach((data) => {
- cy.editColumn("step");
- cy.get(commonlocators.changeColType).last().click();
- cy.get(".t--dropdown-option")
- .children()
- .contains(data.columnType)
- .click();
- cy.wait("@updateLayout");
- cy.get(propPaneBack).click();
- cy.get(`[data-rbd-draggable-id="step"] .t--card-checkbox input`).should(
- data.expected,
- );
- });
- });
-
- it("8. should check that editable property is only available for Plain text & number columns", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("step");
- [
- {
- columnType: "URL",
- expected: "not.exist",
- },
- {
- columnType: "Number",
- expected: "exist",
- },
- {
- columnType: "Date",
- expected: "exist",
- },
- {
- columnType: "Image",
- expected: "not.exist",
- },
- {
- columnType: "Video",
- expected: "not.exist",
- },
- {
- columnType: "Button",
- expected: "not.exist",
- },
- {
- columnType: "Menu button",
- expected: "not.exist",
- },
- {
- columnType: "Icon button",
- expected: "not.exist",
- },
- {
- columnType: "Plain text",
- expected: "exist",
- },
- ].forEach((data) => {
- cy.get(commonlocators.changeColType).last().click();
- cy.get(".t--dropdown-option")
- .children()
- .contains(data.columnType)
- .click();
- cy.wait("@updateLayout");
- cy.get(".t--property-control-editable").should(data.expected);
- });
- });
-
- it("9. should check that inline save option is shown only when a column is made editable", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.get(".t--property-control-updatemode").should("not.exist");
- cy.makeColumnEditable("step");
- cy.get(".t--property-control-updatemode").should("exist");
- cy.makeColumnEditable("step");
- cy.get(".t--property-control-updatemode").should("exist");
-
- cy.dragAndDropToCanvas("textwidget", { x: 300, y: 600 });
- cy.openPropertyPane("textwidget");
- cy.updateCodeInput(
- ".t--property-control-text",
- `{{Table1.inlineEditingSaveOption}}`,
- );
- cy.get(".t--widget-textwidget .bp3-ui-text").should("contain", "ROW_LEVEL");
- });
-
- it("10. should check that save/discard column is added when a column is made editable and removed when made uneditable", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
- cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
- "contain.value",
- "Save / Discard",
- );
- cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
- "be.disabled",
- );
- cy.makeColumnEditable("step");
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
-
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
- cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
- cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
- "contain.value",
- "Save / Discard",
- );
- cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
- "be.disabled",
- );
- cy.get(
- `.t--property-control-columns .t--uber-editable-checkbox input+span`,
- ).click();
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
-
- cy.editColumn("step");
- cy.get(".t--property-control-editable .ads-v2-switch").click();
- cy.get(propPaneBack).click();
- cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
- cy.get("[data-rbd-draggable-id='EditActions1'] input[type='text']").should(
- "contain.value",
- "Save / Discard",
- );
- cy.get("[data-colindex='4'][data-rowindex='0'] button").should(
- "be.disabled",
- );
- cy.editColumn("step");
- cy.get(".t--property-control-editable .ads-v2-switch").click();
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
- });
-
- it("11. should check that save/discard column is added/removed when inline save option is changed", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
- cy.get(".t--property-control-updatemode .t--property-control-label")
- .last()
- .click();
- cy.get(".ads-v2-segmented-control-value-CUSTOM").click({ force: true });
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
- cy.makeColumnEditable("task");
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
- cy.get(".t--property-control-updatemode .t--property-control-label")
- .last()
- .click();
- cy.get(".ads-v2-segmented-control-value-ROW_LEVEL").click({ force: true });
- cy.get("[data-rbd-draggable-id='EditActions1']").should("exist");
- cy.get(".t--property-control-updatemode .t--property-control-label")
- .last()
- .click();
- cy.get(".ads-v2-segmented-control-value-CUSTOM").click({ force: true });
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
- cy.makeColumnEditable("step");
- cy.makeColumnEditable("task");
- cy.get(".t--property-control-updatemode .t--property-control-label")
- .last()
- .click();
- cy.get(".ads-v2-segmented-control-value-ROW_LEVEL").click({ force: true });
- cy.get("[data-rbd-draggable-id='EditActions1']").should("not.exist");
- });
-
- it("12. should check that cell of an editable column is editable", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- // click the edit icon
- cy.editTableCell(0, 0);
- cy.get(
- "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
- ).should("not.be.disabled");
-
- //double click the cell
- cy.openPropertyPane("tablewidgetv2");
- cy.get(
- `[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input`,
- ).should("not.exist");
- cy.get(`[data-colindex=0][data-rowindex=0] .t--table-text-cell`).trigger(
- "dblclick",
- );
- cy.get(
- `[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input`,
- ).should("exist");
- cy.get(
- "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
- ).should("not.be.disabled");
- });
-
- it("13. should check that changes can be discarded by clicking escape", () => {
- cy.openPropertyPane("tablewidgetv2");
- let value;
- cy.readTableV2data(0, 0).then((val) => {
- value = val;
- });
- cy.makeColumnEditable("step");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "newValue");
- cy.discardTableCellValue(0, 0);
- cy.get(
- `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
- ).should("not.exist");
- cy.readTableV2data(0, 0).then((val) => {
- expect(val).to.equal(value);
- });
- });
-
- it("14. should check that changes can be saved by pressing enter or clicking outside", () => {
- cy.openPropertyPane("tablewidgetv2");
- let value;
- cy.readTableV2data(0, 0).then((val) => {
- value = val;
- });
- cy.makeColumnEditable("step");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "newValue");
- cy.saveTableCellValue(0, 0);
- cy.get(
- `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
- ).should("not.exist");
- cy.wait(1000);
- cy.readTableV2data(0, 0).then((val) => {
- expect(val).to.not.equal(value);
- value = val;
- });
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "someOtherNewValue");
- cy.openPropertyPane("tablewidgetv2");
- cy.get(
- `[data-colindex="0"][data-rowindex="0"] .t--inlined-cell-editor input.bp3-input`,
- ).should("not.exist");
- cy.wait(1000);
- cy.readTableV2data(0, 0).then((val) => {
- expect(val).to.not.equal(value);
- });
- });
-
- it("15. should check that updatedRows and updatedRowIndices have correct values", () => {
- cy.dragAndDropToCanvas("textwidget", { x: 300, y: 500 });
- cy.openPropertyPane("textwidget");
- cy.updateCodeInput(".t--property-control-text", `{{Table1.updatedRows}}`);
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "newValue");
- cy.saveTableCellValue(0, 0);
- cy.get(".t--widget-textwidget .bp3-ui-text").should(
- "contain",
- `[ { "index": 0, "updatedFields": { "step": "newValue" }, "allFields": { "step": "newValue", "task": "Drop a table", "status": "✅" } }]`,
- );
- cy.openPropertyPane("textwidget");
- cy.updateCodeInput(
- ".t--property-control-text",
- `{{Table1.updatedRowIndices}}`,
- );
- cy.get(".t--widget-textwidget .bp3-ui-text").should("contain", "[ 0]");
- });
-
- it("16. should check that onsubmit event is available for the columns that are editable", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.editColumn("step");
- [
- {
- columnType: "URL",
- expected: "not.exist",
- },
- {
- columnType: "Number",
- expected: "not.exist",
- },
- {
- columnType: "Date",
- expected: "not.exist",
- },
- {
- columnType: "Image",
- expected: "not.exist",
- },
- {
- columnType: "Video",
- expected: "not.exist",
- },
- {
- columnType: "Button",
- expected: "not.exist",
- },
- {
- columnType: "Menu button",
- expected: "not.exist",
- },
- {
- columnType: "Icon button",
- expected: "not.exist",
- },
- {
- columnType: "Plain text",
- expected: "not.exist",
- },
- ].forEach((data) => {
- cy.get(commonlocators.changeColType).last().click();
- cy.get(".t--dropdown-option")
- .children()
- .contains(data.columnType)
- .click();
- cy.wait("@updateLayout");
- cy.wait(500);
- cy.get(".t--property-control-onsubmit").should(data.expected);
- });
-
- cy.get(propPaneBack).click();
- cy.makeColumnEditable("step");
- cy.editColumn("step");
-
- [
- {
- columnType: "URL",
- expected: "not.exist",
- },
- {
- columnType: "Number",
- expected: "exist",
- },
- {
- columnType: "Date",
- expected: "not.exist",
- },
- {
- columnType: "Image",
- expected: "not.exist",
- },
- {
- columnType: "Video",
- expected: "not.exist",
- },
- {
- columnType: "Button",
- expected: "not.exist",
- },
- {
- columnType: "Menu button",
- expected: "not.exist",
- },
- {
- columnType: "Icon button",
- expected: "not.exist",
- },
- {
- columnType: "Plain text",
- expected: "exist",
- },
- ].forEach((data) => {
- cy.get(commonlocators.changeColType).last().click();
- cy.get(".t--dropdown-option")
- .children()
- .contains(data.columnType)
- .click();
- cy.wait("@updateLayout");
- cy.wait(500);
- cy.get(".t--property-control-onsubmit").should(data.expected);
- });
- });
-
- it("17. should check that onsubmit event is triggered when changes are saved", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("step");
- cy.getAlert("onSubmit", "Submitted!!");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "NewValue");
- cy.saveTableCellValue(0, 0);
-
- cy.get(widgetsPage.toastAction).should("be.visible");
- cy.get(widgetsPage.toastActionText)
- .last()
- .invoke("text")
- .then((text) => {
- expect(text).to.equal("Submitted!!");
- });
- });
-
- it("18. should check that onSubmit events has access to edit values through triggeredRow", () => {
- const value = "newCellValue";
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("step");
- cy.getAlert("onSubmit", "{{Table1.triggeredRow.step}}");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, value);
- cy.saveTableCellValue(0, 0);
-
- cy.get(widgetsPage.toastAction).should("be.visible");
- cy.get(widgetsPage.toastActionText)
- .last()
- .invoke("text")
- .then((text) => {
- expect(text).to.equal(value);
- });
- });
-
- it("19. should check that onSave is working", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("EditActions1");
- //cy.get(".t--property-pane-section-collapse-savebutton").click({force:true});
- cy.get(".t--property-pane-section-collapse-discardbutton").click({
- force: true,
- });
- cy.getAlert("onSave", "Saved!!");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "NewValue");
- cy.openPropertyPane("tablewidgetv2");
- cy.saveTableRow(4, 0);
- cy.get(widgetsPage.toastAction).should("be.visible");
- cy.get(widgetsPage.toastActionText)
- .last()
- .invoke("text")
- .then((text) => {
- expect(text).to.equal("Saved!!");
- });
- });
-
- it("20. should check that onSave events has access to edit values through triggeredRow", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("EditActions1");
- //cy.get(".t--property-pane-section-collapse-savebutton").click({force:true});
- cy.get(".t--property-pane-section-collapse-discardbutton").click({
- force: true,
- });
- cy.getAlert("onSave", "{{Table1.triggeredRow.step}}");
- /*
- cy.addSuccessMessage(
- "{{Table1.triggeredRow.step}}",
- ".t--property-control-onsave",
- );
- */
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "NewValue");
- cy.openPropertyPane("tablewidgetv2");
- cy.saveTableRow(4, 0);
- cy.get(widgetsPage.toastAction).should("be.visible");
- cy.get(widgetsPage.toastActionText)
- .last()
- .invoke("text")
- .then((text) => {
- expect(text).to.equal("NewValue");
- });
- });
-
- it("21. should check that onDiscard event is working", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("EditActions1");
- cy.get(".t--property-pane-section-collapse-savebutton").click();
- //cy.get(".t--property-pane-section-collapse-discardbutton").click();
- cy.getAlert("onDiscard", "discarded!!");
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "NewValue");
- cy.openPropertyPane("tablewidgetv2");
- cy.discardTableRow(4, 0);
- cy.get(widgetsPage.toastAction).should("be.visible");
- cy.get(widgetsPage.toastActionText)
- .last()
- .invoke("text")
- .then((text) => {
- expect(text).to.equal("discarded!!");
- });
- });
-
- it("22. should check that inline editing works with text wrapping disabled", () => {
- cy.fixture("Table/InlineEditingDSL").then((val) => {
- agHelper.AddDsl(val);
- });
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editTableCell(0, 0);
- cy.get(
- "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
- ).should("not.be.disabled");
- });
-
- it("23. should check that inline editing works with text wrapping enabled", () => {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("step");
- cy.editColumn("step");
- cy.get(".t--property-control-cellwrapping .ads-v2-switch")
- .first()
- .click({ force: true });
- cy.editTableCell(0, 0);
- cy.get(
- "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input",
- ).should("not.be.disabled");
- });
-
- it("24. should check that doesn't grow taller when text wrapping is disabled", () => {
- entityExplorer.SelectEntityByName("Table1");
- table.EnableEditableOfColumn("step");
- table.EditTableCell(0, 0, "", false);
- agHelper.GetHeight(table._editCellEditor);
- cy.get("@eleHeight").then(($initiaHeight) => {
- expect(Number($initiaHeight)).to.eq(28);
- table.EditTableCell(
- 1,
- 0,
- "this is a very long cell value to check the height of the cell is growing accordingly",
- false,
- );
- agHelper.GetHeight(table._editCellEditor);
- cy.get("@eleHeight").then(($newHeight) => {
- expect(Number($newHeight)).to.eq(Number($initiaHeight));
- });
- });
- });
-
- it("25. should check that grows taller when text wrapping is enabled", () => {
- entityExplorer.SelectEntityByName("Table1");
- table.EnableEditableOfColumn("step");
- table.EditColumn("step");
- propPane.TogglePropertyState("Cell Wrapping", "On");
- table.EditTableCell(
- 0,
- 0,
- "this is a very long cell value to check the height of the cell is growing accordingly",
- false,
- );
- agHelper.GetHeight(table._editCellEditor);
- cy.get("@eleHeight").then(($newHeight) => {
- expect(Number($newHeight)).to.be.greaterThan(34);
- });
- });
-
- it("26. should check if updatedRowIndex is getting updated for single row update mode", () => {
- cy.dragAndDropToCanvas("textwidget", { x: 400, y: 400 });
- cy.get(".t--widget-textwidget").should("exist");
- cy.updateCodeInput(
- ".t--property-control-text",
- `{{Table1.updatedRowIndex}}`,
- );
-
- cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 300 });
- cy.get(".t--widget-buttonwidget").should("exist");
- cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
- cy.updateCodeInput(".t--property-control-label", "Reset");
- cy.updateCodeInput(
- PROPERTY_SELECTOR.onClick,
- `{{resetWidget("Table1",true)}}`,
- );
-
- // case 1: check if updatedRowIndex has -1 as the default value:
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
-
- cy.openPropertyPane("tablewidgetv2");
-
- cy.makeColumnEditable("step");
- cy.wait(1000);
-
- // case 2: check if updatedRowIndex is 0, when cell at row 0 is updated.
- cy.editTableCell(0, 0);
- cy.enterTableCellValue(0, 0, "#12").type("{enter}");
- cy.get(commonlocators.textWidgetContainer).should("contain.text", 0);
-
- // case 3: check if updatedRowIndex is -1 when changes are discarded.
- cy.discardTableRow(4, 0);
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
-
- // case 4: check if the updateRowIndex is -1 when widget is reset
- cy.editTableCell(0, 1);
- cy.enterTableCellValue(0, 1, "#13").type("{enter}");
- cy.contains("Reset").click({ force: true });
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
-
- // case 5: check if the updatedRowIndex changes to -1 when the table data changes.
- cy.wait(1000);
- cy.editTableCell(0, 2);
- cy.enterTableCellValue(0, 2, "#14").type("{enter}");
- cy.openPropertyPane("tablewidgetv2");
- cy.get(widgetsPage.tabedataField).type("{backspace}");
- cy.wait(300);
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
- });
-
- it("27. should check if updatedRowIndex is getting updated for multi row update mode", () => {
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 400, 400);
- cy.get(".t--widget-textwidget").should("exist");
- cy.updateCodeInput(
- ".t--property-control-text",
- `{{Table1.updatedRowIndex}}`,
- );
- entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300);
- cy.get(".t--widget-buttonwidget").should("exist");
- cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click();
- cy.updateCodeInput(".t--property-control-label", "Reset");
- cy.updateCodeInput(
- PROPERTY_SELECTOR.onClick,
- `{{resetWidget("Table1",true)}}`,
- );
-
- entityExplorer.NavigateToSwitcher("Explorer");
- entityExplorer.SelectEntityByName("Table1");
- table.EnableEditableOfColumn("step");
- agHelper.GetNClick(table._updateMode("Multi"), 0, false, 1000);
-
- // case 1: check if updatedRowIndex is 0, when cell at row 0 is updated.
- table.EditTableCell(0, 0, "#12");
- cy.get(commonlocators.textWidgetContainer).should("contain.text", 0);
-
- // case 2: check if the updateRowIndex is -1 when widget is reset
- table.EditTableCell(1, 0, "#13");
- cy.get(commonlocators.textWidgetContainer).should("contain.text", 1);
-
- cy.contains("Reset").click({ force: true });
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
-
- // case 3: check if the updatedRowIndex changes to -1 when the table data changes.
- cy.wait(1000);
- table.EditTableCell(2, 0, "#14");
- cy.get(commonlocators.textWidgetContainer).should("contain.text", 2);
- cy.openPropertyPane("tablewidgetv2");
- cy.get(widgetsPage.tabedataField).type("{backspace}");
- cy.wait(300);
- cy.get(commonlocators.textWidgetContainer).should("contain.text", -1);
- });
-});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
new file mode 100644
index 000000000000..78828522a930
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_1_Spec.ts
@@ -0,0 +1,125 @@
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Verify various Table_Filter combinations", function () {
+ it("1. Adding Data to Table Widget", function () {
+ _.entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
+ //_.propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
+ _.table.AddSampleTableData();
+ //_.propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));
+ _.propPane.UpdatePropertyFieldValue(
+ "Table data",
+ JSON.stringify(this.dataSet.TableInput),
+ );
+ _.assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ cy.get("body").type("{esc}");
+ /*
+ Changing id and orderAmount to "Plain text" column type
+ so that the tests that depend on id and orderAmount
+ being "Plain text" type do not fail.
+ From this PR onwards columns with number data (like id and orderAmount here)
+ will be auto-assigned as "NUMBER" type column
+ */
+ _.table.ChangeColumnType("id", "Plain text", "v2");
+ _.table.ChangeColumnType("orderAmount", "Plain text", "v2");
+
+ _.deployMode.DeployApp();
+ });
+
+ it("2. Table Widget Search Functionality", function () {
+ _.table.ReadTableRowColumnData(1, 3, "v2").then((cellData) => {
+ expect(cellData).to.eq("Lindsay Ferguson");
+ _.table.SearchTable(cellData);
+ _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
+ expect(afterSearch).to.eq("Lindsay Ferguson");
+ });
+ });
+ _.table.RemoveSearchTextNVerify("2381224", "v2");
+
+ _.table.SearchTable("7434532");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
+ expect(afterSearch).to.eq("Byron Fields");
+ });
+ _.table.RemoveSearchTextNVerify("2381224", "v2");
+ });
+
+ it("3. Verify Table Filter for 'contain'", function () {
+ _.table.OpenNFilterTable("userName", "contains", "Lindsay");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Lindsay Ferguson");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("4. Verify Table Filter for 'does not contain'", function () {
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "does not contain", "Tuna");
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("5. Verify Table Filter for 'starts with'", function () {
+ _.table.ReadTableRowColumnData(4, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Avocado Panini");
+ });
+ _.table.OpenNFilterTable("productName", "starts with", "Avo");
+ _.table.ReadTableRowColumnData(0, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Avocado Panini");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("6. Verify Table Filter for 'ends with' - case sensitive", function () {
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "ends with", "wich");
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Chicken Sandwich");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("7. Verify Table Filter for 'ends with' - case insenstive", function () {
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("productName", "ends with", "WICH");
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Chicken Sandwich");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("8. Verify Table Filter for 'ends with' - on wrong column", function () {
+ _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Tuna Salad");
+ });
+ _.table.OpenNFilterTable("userName", "ends with", "WICH");
+ _.table.WaitForTableEmpty("v2");
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("9. Verify Table Filter for 'is exactly' - case sensitive", function () {
+ _.table.ReadTableRowColumnData(2, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.OpenNFilterTable("productName", "is exactly", "Beef steak");
+ _.table.ReadTableRowColumnData(0, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+
+ it("10. Verify Table Filter for 'is exactly' - case insensitive", function () {
+ _.table.ReadTableRowColumnData(2, 4, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Beef steak");
+ });
+ _.table.OpenNFilterTable("productName", "is exactly", "Beef STEAK");
+ _.table.WaitForTableEmpty("v2");
+ _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
+ });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
similarity index 59%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
index cdf3099263c8..ca3a20e5e445 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter1_2_Spec.ts
@@ -1,135 +1,25 @@
import * as _ from "../../../../../support/Objects/ObjectsCore";
describe("Verify various Table_Filter combinations", function () {
- it("1. Adding Data to Table Widget", function () {
+ it("1. Verify Table Filter for 'empty'", function () {
_.entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
- //_.propPane.EnterJSContext("Table data", JSON.stringify(this.dataSet.TableInput));
_.table.AddSampleTableData();
- //_.propPane.EnterJSContext("Table Data", JSON.stringify(this.dataSet.TableInput));
_.propPane.UpdatePropertyFieldValue(
"Table data",
JSON.stringify(this.dataSet.TableInput),
);
_.assertHelper.AssertNetworkStatus("@updateLayout", 200);
cy.get("body").type("{esc}");
- /*
- Changing id and orderAmount to "Plain text" column type
- so that the tests that depend on id and orderAmount
- being "Plain text" type do not fail.
- From this PR onwards columns with number data (like id and orderAmount here)
- will be auto-assigned as "NUMBER" type column
- */
_.table.ChangeColumnType("id", "Plain text", "v2");
_.table.ChangeColumnType("orderAmount", "Plain text", "v2");
_.deployMode.DeployApp();
- });
-
- it("2. Table Widget Search Functionality", function () {
- _.table.ReadTableRowColumnData(1, 3, "v2").then((cellData) => {
- expect(cellData).to.eq("Lindsay Ferguson");
- _.table.SearchTable(cellData);
- _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
- expect(afterSearch).to.eq("Lindsay Ferguson");
- });
- });
- _.table.RemoveSearchTextNVerify("2381224", "v2");
-
- _.table.SearchTable("7434532");
- _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
- expect(afterSearch).to.eq("Byron Fields");
- });
- _.table.RemoveSearchTextNVerify("2381224", "v2");
- });
-
- it("3. Verify Table Filter for 'contain'", function () {
- _.table.OpenNFilterTable("userName", "contains", "Lindsay");
- _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
- expect($cellData).to.eq("Lindsay Ferguson");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("4. Verify Table Filter for 'does not contain'", function () {
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "does not contain", "Tuna");
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("5. Verify Table Filter for 'starts with'", function () {
- _.table.ReadTableRowColumnData(4, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Avocado Panini");
- });
- _.table.OpenNFilterTable("productName", "starts with", "Avo");
- _.table.ReadTableRowColumnData(0, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Avocado Panini");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("6. Verify Table Filter for 'ends with' - case sensitive", function () {
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "ends with", "wich");
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Chicken Sandwich");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("7. Verify Table Filter for 'ends with' - case insenstive", function () {
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("productName", "ends with", "WICH");
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Chicken Sandwich");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("8. Verify Table Filter for 'ends with' - on wrong column", function () {
- _.table.ReadTableRowColumnData(1, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Tuna Salad");
- });
- _.table.OpenNFilterTable("userName", "ends with", "WICH");
- _.table.WaitForTableEmpty("v2");
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("9. Verify Table Filter for 'is exactly' - case sensitive", function () {
- _.table.ReadTableRowColumnData(2, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.OpenNFilterTable("productName", "is exactly", "Beef steak");
- _.table.ReadTableRowColumnData(0, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("10. Verify Table Filter for 'is exactly' - case insensitive", function () {
- _.table.ReadTableRowColumnData(2, 4, "v2").then(($cellData) => {
- expect($cellData).to.eq("Beef steak");
- });
- _.table.OpenNFilterTable("productName", "is exactly", "Beef STEAK");
- _.table.WaitForTableEmpty("v2");
- _.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
- });
-
- it("11. Verify Table Filter for 'empty'", function () {
_.table.OpenNFilterTable("email", "empty");
_.table.WaitForTableEmpty("v2");
_.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
});
- it("12. Verify Table Filter for 'not empty'", function () {
+ it("2. Verify Table Filter for 'not empty'", function () {
_.table.ReadTableRowColumnData(4, 5, "v2").then(($cellData) => {
expect($cellData).to.eq("7.99");
});
@@ -140,7 +30,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, true, 0, "v2");
});
- it("13. Verify Table Filter - Where Edit - Change condition along with input value", function () {
+ it("3. Verify Table Filter - Where Edit - Change condition along with input value", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -167,7 +57,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("14. Verify Table Filter - Where Edit - Single Column, Condition & input value", function () {
+ it("4. Verify Table Filter - Where Edit - Single Column, Condition & input value", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -216,7 +106,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("15. Verify Table Filter for OR operator - different row match", function () {
+ it("5. Verify Table Filter for OR operator - different row match", function () {
_.table.ReadTableRowColumnData(2, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Tobias Funke");
});
@@ -232,7 +122,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("16. Verify Table Filter for OR operator - same row match", function () {
+ it("6. Verify Table Filter for OR operator - same row match", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -247,7 +137,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("17. Verify Table Filter for OR operator - two 'ORs'", function () {
+ it("7. Verify Table Filter for OR operator - two 'ORs'", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -266,7 +156,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("18. Verify Table Filter for AND operator - different row match", function () {
+ it("8. Verify Table Filter for AND operator - different row match", function () {
_.table.ReadTableRowColumnData(3, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Byron Fields");
});
@@ -285,7 +175,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("19. Verify Table Filter for AND operator - same row match", function () {
+ it("9. Verify Table Filter for AND operator - same row match", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
@@ -300,7 +190,7 @@ describe("Verify various Table_Filter combinations", function () {
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
- it("20. Verify Table Filter for AND operator - same row match - edit input text value", function () {
+ it("10. Verify Table Filter for AND operator - same row match - edit input text value", function () {
_.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
expect($cellData).to.eq("Michael Lawson");
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
similarity index 61%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_Spec.ts
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
index 0343b54b316e..c2549fdbce74 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_1_Spec.ts
@@ -261,187 +261,4 @@ describe("Verify various Table_Filter combinations", function () {
});
_.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
});
-
- it("9. Verify Full table data - download csv and download Excel", function () {
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "Michael Lawson");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Michael Lawson");
- });
-
- it("10. Verify Searched data - download csv and download Excel", function () {
- _.table.SearchTable("7434532");
- _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
- expect(afterSearch).to.eq("Byron Fields");
- });
-
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "[email protected]");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Ryan Holmes");
-
- _.table.RemoveSearchTextNVerify("2381224", "v2");
-
- _.table.DownloadFromTable("Download as CSV");
- _.table.ValidateDownloadNVerify("Table1.csv", "2736212");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Beef steak");
- });
-
- it("11. Verify Filtered data - download csv and download Excel", function () {
- _.table.OpenNFilterTable("id", "starts with", "6");
- _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
- expect($cellData).to.eq("Tobias Funke");
- });
- _.table.CloseFilter();
-
- _.table.DownloadFromTable("Download as CSV");
- //This plugin works only from cypress ^9.2
- //cy.verifyDownload("Table1.csv")
- _.table.ValidateDownloadNVerify("Table1.csv", "Beef steak");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "[email protected]");
-
- _.agHelper.GetNClick(_.table._filterBtn);
- _.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
-
- _.table.DownloadFromTable("Download as CSV");
- _.table.ValidateDownloadNVerify("Table1.csv", "Tuna Salad");
-
- _.table.DownloadFromTable("Download as Excel");
- _.table.ValidateDownloadNVerify("Table1.xlsx", "Avocado Panini");
- });
-
- it("12. Import TableFilter application & verify all filters for same FirstName (one word column) + Bug 13334", () => {
- _.deployMode.NavigateBacktoEditor();
- _.table.WaitUntilTableLoad(0, 0, "v2");
- _.homePage.NavigateToHome();
- _.homePage.ImportApp("Table/TableFilterImportApp.json");
- _.homePage.AssertImportToast();
- _.deployMode.DeployApp();
- _.table.WaitUntilTableLoad(0, 0, "v2");
-
- //Contains
- _.table.OpenNFilterTable("FirstName", "contains", "Della");
- _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
- expect($cellData).to.eq("Alvarado");
- });
-
- filterOnlyCondition("does not contain", "49");
- filterOnlyCondition("starts with", "1");
-
- // Ends with - Open Bug 13334
- filterOnlyCondition("ends with", "1");
-
- filterOnlyCondition("is exactly", "1");
- filterOnlyCondition("empty", "0");
- filterOnlyCondition("not empty", "50");
- filterOnlyCondition("starts with", "3", "ge");
- _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
- expect($cellData).to.eq("Chandler");
- });
-
- _.table.OpenNFilterTable("FullName", "ends with", "ross", "OR", 1);
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("4"));
- _.table.CloseFilter();
- _.agHelper
- .GetText(_.table._filtersCount)
- .then(($count) => expect($count).contain("2"));
-
- _.table.OpenFilter();
- _.table.RemoveFilterNVerify("1", true, false, 0, "v2");
- });
-
- it("13. Verify all filters for same FullName (two word column) + Bug 13334", () => {
- //Contains
- _.table.OpenNFilterTable("FullName", "contains", "torres");
- _.table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
- expect($cellData).to.eq("Virgie");
- });
-
- filterOnlyCondition("does not contain", "49");
- filterOnlyCondition("starts with", "0");
- filterOnlyCondition("ends with", "1");
- filterOnlyCondition("is exactly", "0");
- filterOnlyCondition("empty", "0");
- filterOnlyCondition("not empty", "50");
- filterOnlyCondition("contains", "1", "wolf");
- _.table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
- expect($cellData).to.eq("Teresa");
- });
-
- _.table.OpenNFilterTable("FirstName", "starts with", "wa", "OR", 1);
- _.agHelper.Sleep();
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("3"));
-
- _.table.OpenNFilterTable("LastName", "ends with", "son", "OR", 2);
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain("10"));
- _.table.CloseFilter();
- _.agHelper
- .GetText(_.table._filtersCount)
- .then(($count) => expect($count).contain("3"));
-
- _.table.OpenFilter();
- _.table.RemoveFilterNVerify("1", true, false, 0, "v2");
- });
-
- it("14. Verify Table Filter for correct value in filter value input after removing second filter - Bug 12638", function () {
- _.table.OpenNFilterTable("seq", "greater than", "5");
-
- _.table.OpenNFilterTable("FirstName", "contains", "r", "AND", 1);
-
- _.table.OpenNFilterTable("LastName", "contains", "son", "AND", 2);
- _.agHelper.GetNClick(".t--table-filter-remove-btn", 1);
- cy.wait(500);
- cy.get(
- ".t--table-filter:nth-child(2) .t--table-filter-value-input input[type=text]",
- ).should("have.value", "son");
- _.agHelper.GetNClick(".t--clear-all-filter-btn");
- _.agHelper.GetNClick(".t--close-filter-btn");
- });
-
- it("15. Verify Table Filter operator for correct value after removing where clause condition - Bug 12642", function () {
- _.table.OpenNFilterTable("seq", "greater than", "5");
-
- _.table.OpenNFilterTable("FirstName", "contains", "r", "AND", 1);
-
- _.table.OpenNFilterTable("LastName", "contains", "son", "AND", 2);
- _.agHelper.GetNClick(".t--table-filter-operators-dropdown");
- cy.get(".t--dropdown-option").contains("OR").click();
- _.agHelper.GetNClick(".t--table-filter-remove-btn", 0);
- cy.get(".t--table-filter-operators-dropdown div div span").should(
- "contain",
- "OR",
- );
- _.agHelper.GetNClick(".t--clear-all-filter-btn");
- });
-
- function filterOnlyCondition(
- condition: string,
- expectedCount: string,
- input: string | "" = "",
- ) {
- _.agHelper.GetNClick(_.table._filterConditionDropdown);
- cy.get(_.table._dropdownText).contains(condition).click();
- if (input)
- _.agHelper.GetNClick(_.table._filterInputValue, 0).type(input).wait(500);
- _.agHelper.ClickButton("APPLY");
- _.agHelper
- .GetText(_.table._showPageItemsCount)
- .then(($count) => expect($count).contain(expectedCount));
- }
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
new file mode 100644
index 000000000000..951f1bd9ea96
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2Filter2_2_Spec.ts
@@ -0,0 +1,198 @@
+import * as _ from "../../../../../support/Objects/ObjectsCore";
+
+describe("Verify various Table_Filter combinations", function () {
+ it("1. Verify Full table data - download csv and download Excel", function () {
+ _.entityExplorer.DragDropWidgetNVerify("tablewidgetv2", 650, 250);
+ _.table.AddSampleTableData();
+ _.propPane.UpdatePropertyFieldValue(
+ "Table data",
+ JSON.stringify(this.dataSet.TableInput),
+ );
+ _.assertHelper.AssertNetworkStatus("@updateLayout", 200);
+ _.agHelper.PressEscape();
+ _.table.ChangeColumnType("id", "Plain text", "v2");
+ _.table.ChangeColumnType("orderAmount", "Plain text", "v2");
+ _.deployMode.DeployApp();
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "Michael Lawson");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Michael Lawson");
+ });
+
+ it("2. Verify Searched data - download csv and download Excel", function () {
+ _.table.SearchTable("7434532");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then((afterSearch) => {
+ expect(afterSearch).to.eq("Byron Fields");
+ });
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "[email protected]");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Ryan Holmes");
+
+ _.table.RemoveSearchTextNVerify("2381224", "v2");
+
+ _.table.DownloadFromTable("Download as CSV");
+ _.table.ValidateDownloadNVerify("Table1.csv", "2736212");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Beef steak");
+ });
+
+ it("3. Verify Filtered data - download csv and download Excel", function () {
+ _.table.OpenNFilterTable("id", "starts with", "6");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Tobias Funke");
+ });
+ _.table.CloseFilter();
+
+ _.table.DownloadFromTable("Download as CSV");
+ //This plugin works only from cypress ^9.2
+ //cy.verifyDownload("Table1.csv")
+ _.table.ValidateDownloadNVerify("Table1.csv", "Beef steak");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "[email protected]");
+
+ _.agHelper.GetNClick(_.table._filterBtn);
+ _.table.RemoveFilterNVerify("2381224", true, false, 0, "v2");
+
+ _.table.DownloadFromTable("Download as CSV");
+ _.table.ValidateDownloadNVerify("Table1.csv", "Tuna Salad");
+
+ _.table.DownloadFromTable("Download as Excel");
+ _.table.ValidateDownloadNVerify("Table1.xlsx", "Avocado Panini");
+ });
+
+ it("4. Import TableFilter application & verify all filters for same FirstName (one word column) + Bug 13334", () => {
+ _.deployMode.NavigateBacktoEditor();
+ _.table.WaitUntilTableLoad(0, 0, "v2");
+ _.homePage.NavigateToHome();
+ _.homePage.ImportApp("Table/TableFilterImportApp.json");
+ _.homePage.AssertImportToast();
+ _.deployMode.DeployApp();
+ _.table.WaitUntilTableLoad(0, 0, "v2");
+
+ //Contains
+ _.table.OpenNFilterTable("FirstName", "contains", "Della");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Alvarado");
+ });
+
+ filterOnlyCondition("does not contain", "49");
+ filterOnlyCondition("starts with", "1");
+
+ // Ends with - Open Bug 13334
+ filterOnlyCondition("ends with", "1");
+
+ filterOnlyCondition("is exactly", "1");
+ filterOnlyCondition("empty", "0");
+ filterOnlyCondition("not empty", "50");
+ filterOnlyCondition("starts with", "3", "ge");
+ _.table.ReadTableRowColumnData(0, 3, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Chandler");
+ });
+
+ _.table.OpenNFilterTable("FullName", "ends with", "ross", "OR", 1);
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("4"));
+ _.table.CloseFilter();
+ _.agHelper
+ .GetText(_.table._filtersCount)
+ .then(($count) => expect($count).contain("2"));
+
+ _.table.OpenFilter();
+ _.table.RemoveFilterNVerify("1", true, false, 0, "v2");
+ });
+
+ it("5. Verify all filters for same FullName (two word column) + Bug 13334", () => {
+ //Contains
+ _.table.OpenNFilterTable("FullName", "contains", "torres");
+ _.table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Virgie");
+ });
+
+ filterOnlyCondition("does not contain", "49");
+ filterOnlyCondition("starts with", "0");
+ filterOnlyCondition("ends with", "1");
+ filterOnlyCondition("is exactly", "0");
+ filterOnlyCondition("empty", "0");
+ filterOnlyCondition("not empty", "50");
+ filterOnlyCondition("contains", "1", "wolf");
+ _.table.ReadTableRowColumnData(0, 2, "v2").then(($cellData) => {
+ expect($cellData).to.eq("Teresa");
+ });
+
+ _.table.OpenNFilterTable("FirstName", "starts with", "wa", "OR", 1);
+ _.agHelper.Sleep();
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("3"));
+
+ _.table.OpenNFilterTable("LastName", "ends with", "son", "OR", 2);
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain("0"));
+ _.table.CloseFilter();
+ _.agHelper
+ .GetText(_.table._filtersCount)
+ .then(($count) => expect($count).contain("3"));
+
+ _.table.OpenFilter();
+ _.table.RemoveFilterNVerify("1", true, false, 0, "v2");
+ });
+
+ it("6. Verify Table Filter for correct value in filter value input after removing second filter - Bug 12638", function () {
+ _.table.OpenNFilterTable("seq", "greater than", "5");
+
+ _.table.OpenNFilterTable("FirstName", "contains", "r", "AND", 1);
+
+ _.table.OpenNFilterTable("LastName", "contains", "son", "AND", 2);
+ _.agHelper.GetNClick(".t--table-filter-remove-btn", 1);
+ cy.wait(500);
+ cy.get(
+ ".t--table-filter:nth-child(2) .t--table-filter-value-input input[type=text]",
+ ).should("have.value", "son");
+ _.agHelper.GetNClick(".t--clear-all-filter-btn");
+ _.agHelper.GetNClick(".t--close-filter-btn");
+ });
+
+ it("7. Verify Table Filter operator for correct value after removing where clause condition - Bug 12642", function () {
+ _.table.OpenNFilterTable("seq", "greater than", "5");
+
+ _.table.OpenNFilterTable("FirstName", "contains", "r", "AND", 1);
+
+ _.table.OpenNFilterTable("LastName", "contains", "son", "AND", 2);
+ _.agHelper.GetNClick(".t--table-filter-operators-dropdown");
+ cy.get(".t--dropdown-option").contains("OR").click();
+ _.agHelper.GetNClick(".t--table-filter-remove-btn", 0);
+ cy.get(".t--table-filter-operators-dropdown div div span").should(
+ "contain",
+ "OR",
+ );
+ _.agHelper.GetNClick(".t--clear-all-filter-btn");
+ });
+
+ function filterOnlyCondition(
+ condition: string,
+ expectedCount: string,
+ input: string | "" = "",
+ ) {
+ _.agHelper.GetNClick(_.table._filterConditionDropdown);
+ cy.get(_.table._dropdownText).contains(condition).click();
+ if (input)
+ _.agHelper.GetNClick(_.table._filterInputValue, 0).type(input).wait(500);
+ _.agHelper.ClickButton("APPLY");
+ _.agHelper
+ .GetText(_.table._showPageItemsCount)
+ .then(($count) => expect($count).contain(expectedCount));
+ }
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
similarity index 55%
rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_spec.js
rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
index baf423232145..0ee7ae340fba 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_1_spec.js
@@ -290,244 +290,4 @@ describe("Table Widget V2 property pane feature validation", function () {
cy.get(widgetsPage.verticalBottom).last().click({ force: true });
cy.readTableV2dataValidateCSS("0", "0", "align-items", "flex-end", true);
});
-
- it("11. Test to validate text color and text background", function () {
- cy.openPropertyPane("tablewidgetv2");
-
- // Changing text color to rgb(126, 34, 206) and validate
- cy.selectColor("textcolor");
- // eslint-disable-next-line cypress/no-unnecessary-waiting
- cy.wait(5000);
- cy.wait("@updateLayout");
- cy.readTableV2dataValidateCSS("1", "0", "color", "rgb(126, 34, 206)");
-
- // Changing text color to PURPLE and validate using JS
- cy.get(widgetsPage.toggleJsColor).click();
- cy.testCodeMirrorLast("purple");
- cy.wait("@updateLayout");
- cy.readTableV2dataValidateCSS("1", "0", "color", "rgb(128, 0, 128)");
-
- // Changing Cell backgroud color to rgb(126, 34, 206) and validate
- cy.selectColor("cellbackground");
- cy.readTableV2dataValidateCSS(
- "0",
- "0",
- "background",
- "rgb(113, 30, 184) none repeat scroll 0% 0% / auto padding-box border-box",
- true,
- );
- // Changing Cell backgroud color to PURPLE and validate using JS
- propPane.EnterJSContext("Cell Background", "purple");
- cy.wait("@updateLayout");
- cy.readTableV2dataValidateCSS(
- "0",
- "0",
- "background",
- "rgb(102, 0, 102) none repeat scroll 0% 0% / auto padding-box border-box",
- true,
- );
- // close property pane
- cy.closePropertyPane();
- });
-
- it("12. Verify default search text", function () {
- // Open property pane
- cy.openPropertyPane("tablewidgetv2");
- cy.moveToContentTab();
- // Chage deat search text value to "data"
- cy.backFromPropertyPanel();
- cy.testJsontext("defaultsearchtext", "data");
- deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
- table.WaitForTableEmpty("v2");
- // Verify the deaullt search text
- cy.get(widgetsPage.searchField).should("have.value", "data");
- deployMode.NavigateBacktoEditor();
- });
-
- it("13. Verify custom column property name changes with change in column name ([FEATURE]: #17142)", function () {
- // Open property pane
- cy.openPropertyPane("tablewidgetv2");
- cy.moveToContentTab();
- cy.addColumnV2("customColumn18");
- cy.editColumn("customColumn1");
- cy.get(".t--property-control-propertyname pre span span").should(
- "have.text",
- "customColumn18",
- );
- cy.editColName("customColumn00");
- cy.get(".t--property-control-propertyname pre span span").should(
- "have.text",
- "customColumn00",
- );
- cy.get("[data-testid='t--property-pane-back-btn']").click();
- cy.get('[data-rbd-draggable-id="customColumn1"] input').should(
- "have.value",
- "customColumn00",
- );
- cy.get("[data-rbd-draggable-id='customColumn1'] input[type='text']").clear({
- force: true,
- });
- cy.get("[data-rbd-draggable-id='customColumn1'] input[type='text']").type(
- "customColumn99",
- {
- force: true,
- },
- );
- cy.editColumn("customColumn1");
- cy.get(".t--property-control-propertyname pre span span").should(
- "have.text",
- "customColumn99",
- );
- cy.backFromPropertyPanel();
- cy.deleteColumn("customColumn1");
- });
-
- it("14. It provides currentRow and currentIndex properties in min validation field", function () {
- cy.fixture("tableV2NewDslWithPagination").then((val) => {
- agHelper.AddDsl(val);
- });
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("orderAmount");
- cy.editColumn("orderAmount");
-
- propPane.UpdatePropertyFieldValue("Computed value", "{{currentIndex}}");
- cy.changeColumnType("Number");
-
- propPane.UpdatePropertyFieldValue("Min", "{{currentIndex}}");
- cy.get(".t--evaluatedPopup-error").should("not.exist");
-
- // Update cell with row : 1, column : orderAmount
-
- table.EditTableCell(1, 4, -1, false);
- cy.get(".bp3-popover-content").contains("Invalid input");
- table.UpdateTableCell(1, 4, 0);
- cy.get(".bp3-popover-content").contains("Invalid input");
- table.UpdateTableCell(1, 4, 3);
- cy.get(".bp3-popover-content").should("not.exist");
-
- // Check if currentRow works
- propPane.NavigateBackToPropertyPane();
- table.EditColumn("orderAmount");
- propPane.UpdatePropertyFieldValue("Min", "{{currentRow.id}}");
- propPane.UpdatePropertyFieldValue(
- "Error message",
- "Row at index {{currentIndex}} is not valid",
- );
- cy.get(".t--evaluatedPopup-error").should("not.exist");
-
- // Update cell with row : 0, column : orderAmount. The min is set to 7 (i.e value of cell in id column)
- table.EditTableCell(1, 4, 8, false);
- cy.get(".bp3-popover-content").should("not.exist");
-
- table.UpdateTableCell(1, 4, 6);
- cy.get(".bp3-popover-content").contains("Row at index 1 is not valid");
-
- table.UpdateTableCell(1, 4, 8);
- cy.get(".bp3-popover-content").should("not.exist");
-
- propPane.UpdatePropertyFieldValue(
- "Error message",
- "Row with id {{currentRow.id}} is not valid",
- );
-
- table.EditTableCell(1, 4, 5, false);
- cy.get(".bp3-popover-content").contains("Row with id 7 is not valid");
-
- propPane.UpdatePropertyFieldValue("Min", "");
- propPane.UpdatePropertyFieldValue("Error message", "");
-
- // Check for currentIndex property on Regex field
- cy.changeColumnType("Plain text");
- propPane.UpdatePropertyFieldValue("Regex", "{{currentIndex}}2");
-
- cy.get(".t--evaluatedPopup-error").should("not.exist");
- table.EditTableCell(1, 4, 3, false);
-
- cy.get(".bp3-popover-content").contains("Invalid input");
- table.UpdateTableCell(1, 4, 12);
- cy.get(".bp3-popover-content").should("not.exist");
-
- // Check for currentRow property on Regex field
- propPane.UpdatePropertyFieldValue("Regex", "{{currentRow.id}}");
- table.EditTableCell(1, 4, 7, false);
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(1, 4, 8);
- cy.get(".bp3-popover-content").contains("Invalid input");
- table.UpdateTableCell(1, 4, 7);
- cy.get(".bp3-popover-content").should("not.exist");
- propPane.UpdatePropertyFieldValue("Regex", "");
-
- propPane.EnterJSContext("Required", "{{currentIndex == 1}}");
- table.EditTableCell(1, 4, "", false);
- cy.get(".bp3-popover-content").contains("This field is required");
- table.UpdateTableCell(1, 4, 1, true);
- cy.get(".bp3-popover-content").should("not.exist");
-
- cy.wait(1500);
- cy.discardTableRow(5, 1);
- cy.wait(1500);
-
- // Value isn't required in Row Index 2
- table.EditTableCell(2, 4, "", false);
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(2, 4, "11");
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(2, 4, "", true);
- cy.get(".bp3-popover-content").should("not.exist");
-
- cy.wait(1500);
- cy.discardTableRow(5, 2);
-
- // Check for Required property using currentRow, row with index 1 has id 7
- propPane.UpdatePropertyFieldValue("Required", "{{currentRow.id == 7}}");
-
- table.EditTableCell(1, 4, "", false);
- cy.get(".bp3-popover-content").contains("This field is required");
- table.UpdateTableCell(1, 4, 1);
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(1, 4, "");
- cy.get(".bp3-popover-content").contains("This field is required");
-
- table.UpdateTableCell(1, 4, "1", true);
- cy.get(".bp3-popover-content").should("not.exist");
-
- cy.wait(1500);
- cy.discardTableRow(5, 1);
- cy.wait(1500);
-
- // Value isn't required in Row Index 2
- table.EditTableCell(2, 4, "", false);
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(2, 4, 10);
- cy.get(".bp3-popover-content").should("not.exist");
- table.UpdateTableCell(2, 4, "", true);
- cy.get(".bp3-popover-content").should("not.exist");
-
- cy.wait(1500);
- cy.discardTableRow(5, 2);
-
- // Cleanup
- propPane.UpdatePropertyFieldValue(
- "Computed value",
- '{{currentRow["orderAmount"]}}',
- );
- cy.changeColumnType("Plain text");
- cy.backFromPropertyPanel();
- cy.makeColumnEditable("orderAmount");
- });
-
- it("15. Verify default prompt message for min field", function () {
- cy.openPropertyPane("tablewidgetv2");
- cy.makeColumnEditable("orderAmount");
- cy.editColumn("orderAmount");
- cy.changeColumnType("Number");
- propPane.UpdatePropertyFieldValue("Min", "test");
- cy.get(".t--property-control-min .t--no-binding-prompt > span").should(
- "have.text",
- "Access the current cell using {{currentRow.columnName}}",
- );
- cy.changeColumnType("Plain text");
- cy.backFromPropertyPanel();
- cy.makeColumnEditable("orderAmount");
- });
});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
new file mode 100644
index 000000000000..310999d9703f
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_PropertyPane_2_spec.js
@@ -0,0 +1,259 @@
+import {
+ entityExplorer,
+ table,
+ propPane,
+ agHelper,
+ deployMode,
+ draggableWidgets,
+ locators,
+} from "../../../../../support/Objects/ObjectsCore";
+const widgetsPage = require("../../../../../locators/Widgets.json");
+
+describe("Table Widget V2 property pane feature validation", function () {
+ before(() => {
+ cy.fixture("tableV2NewDslWithPagination").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ });
+
+ it("1. Test to validate text color and text background", function () {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.editColumn("id");
+ cy.moveToStyleTab();
+ // Changing text color to rgb(126, 34, 206) and validate
+ cy.selectColor("textcolor");
+ // eslint-disable-next-line cypress/no-unnecessary-waiting
+ cy.wait(5000);
+ cy.wait("@updateLayout");
+ cy.readTableV2dataValidateCSS("1", "0", "color", "rgb(126, 34, 206)");
+
+ // Changing text color to PURPLE and validate using JS
+ cy.get(widgetsPage.toggleJsColor).click();
+ cy.testCodeMirrorLast("purple");
+ cy.wait("@updateLayout");
+ cy.readTableV2dataValidateCSS("1", "0", "color", "rgb(128, 0, 128)");
+
+ // Changing Cell backgroud color to rgb(126, 34, 206) and validate
+ cy.selectColor("cellbackground");
+ cy.readTableV2dataValidateCSS(
+ "0",
+ "0",
+ "background",
+ "rgb(113, 30, 184) none repeat scroll 0% 0% / auto padding-box border-box",
+ true,
+ );
+ // Changing Cell backgroud color to PURPLE and validate using JS
+ propPane.EnterJSContext("Cell Background", "purple");
+ cy.wait("@updateLayout");
+ cy.readTableV2dataValidateCSS(
+ "0",
+ "0",
+ "background",
+ "rgb(102, 0, 102) none repeat scroll 0% 0% / auto padding-box border-box",
+ true,
+ );
+ // close property pane
+ cy.closePropertyPane();
+ });
+
+ it("2. Verify default search text", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidgetv2");
+ cy.moveToContentTab();
+ // Chage deat search text value to "data"
+ cy.backFromPropertyPanel();
+ cy.testJsontext("defaultsearchtext", "data");
+ deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE));
+ table.WaitForTableEmpty("v2");
+ // Verify the deaullt search text
+ cy.get(widgetsPage.searchField).should("have.value", "data");
+ deployMode.NavigateBacktoEditor();
+ });
+
+ it("3. Verify custom column property name changes with change in column name ([FEATURE]: #17142)", function () {
+ // Open property pane
+ cy.openPropertyPane("tablewidgetv2");
+ cy.moveToContentTab();
+ cy.addColumnV2("customColumn18");
+ cy.editColumn("customColumn1");
+ cy.get(".t--property-control-propertyname pre span span").should(
+ "have.text",
+ "customColumn18",
+ );
+ cy.editColName("customColumn00");
+ cy.get(".t--property-control-propertyname pre span span").should(
+ "have.text",
+ "customColumn00",
+ );
+ cy.get("[data-testid='t--property-pane-back-btn']").click();
+ cy.get('[data-rbd-draggable-id="customColumn1"] input').should(
+ "have.value",
+ "customColumn00",
+ );
+ cy.get("[data-rbd-draggable-id='customColumn1'] input[type='text']").clear({
+ force: true,
+ });
+ cy.get("[data-rbd-draggable-id='customColumn1'] input[type='text']").type(
+ "customColumn99",
+ {
+ force: true,
+ },
+ );
+ cy.editColumn("customColumn1");
+ cy.get(".t--property-control-propertyname pre span span").should(
+ "have.text",
+ "customColumn99",
+ );
+ cy.backFromPropertyPanel();
+ cy.deleteColumn("customColumn1");
+ });
+
+ it("4. It provides currentRow and currentIndex properties in min validation field", function () {
+ cy.fixture("tableV2NewDslWithPagination").then((val) => {
+ agHelper.AddDsl(val);
+ });
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("orderAmount");
+ cy.editColumn("orderAmount");
+
+ propPane.UpdatePropertyFieldValue("Computed value", "{{currentIndex}}");
+ cy.changeColumnType("Number");
+
+ propPane.UpdatePropertyFieldValue("Min", "{{currentIndex}}");
+ cy.get(".t--evaluatedPopup-error").should("not.exist");
+
+ // Update cell with row : 1, column : orderAmount
+
+ table.EditTableCell(1, 4, -1, false);
+ cy.get(".bp3-popover-content").contains("Invalid input");
+ table.UpdateTableCell(1, 4, 0);
+ cy.get(".bp3-popover-content").contains("Invalid input");
+ table.UpdateTableCell(1, 4, 3);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ // Check if currentRow works
+ propPane.NavigateBackToPropertyPane();
+ table.EditColumn("orderAmount");
+ propPane.UpdatePropertyFieldValue("Min", "{{currentRow.id}}");
+ propPane.UpdatePropertyFieldValue(
+ "Error message",
+ "Row at index {{currentIndex}} is not valid",
+ );
+ cy.get(".t--evaluatedPopup-error").should("not.exist");
+
+ // Update cell with row : 0, column : orderAmount. The min is set to 7 (i.e value of cell in id column)
+ table.EditTableCell(1, 4, 8, false);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ table.UpdateTableCell(1, 4, 6);
+ cy.get(".bp3-popover-content").contains("Row at index 1 is not valid");
+
+ table.UpdateTableCell(1, 4, 8);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ propPane.UpdatePropertyFieldValue(
+ "Error message",
+ "Row with id {{currentRow.id}} is not valid",
+ );
+
+ table.EditTableCell(1, 4, 5, false);
+ cy.get(".bp3-popover-content").contains("Row with id 7 is not valid");
+
+ propPane.UpdatePropertyFieldValue("Min", "");
+ propPane.UpdatePropertyFieldValue("Error message", "");
+
+ // Check for currentIndex property on Regex field
+ cy.changeColumnType("Plain text");
+ propPane.UpdatePropertyFieldValue("Regex", "{{currentIndex}}2");
+
+ cy.get(".t--evaluatedPopup-error").should("not.exist");
+ table.EditTableCell(1, 4, 3, false);
+
+ cy.get(".bp3-popover-content").contains("Invalid input");
+ table.UpdateTableCell(1, 4, 12);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ // Check for currentRow property on Regex field
+ propPane.UpdatePropertyFieldValue("Regex", "{{currentRow.id}}");
+ table.EditTableCell(1, 4, 7, false);
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(1, 4, 8);
+ cy.get(".bp3-popover-content").contains("Invalid input");
+ table.UpdateTableCell(1, 4, 7);
+ cy.get(".bp3-popover-content").should("not.exist");
+ propPane.UpdatePropertyFieldValue("Regex", "");
+
+ propPane.EnterJSContext("Required", "{{currentIndex == 1}}");
+ table.EditTableCell(1, 4, "", false);
+ cy.get(".bp3-popover-content").contains("This field is required");
+ table.UpdateTableCell(1, 4, 1, true);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ cy.wait(1500);
+ cy.discardTableRow(5, 1);
+ cy.wait(1500);
+
+ // Value isn't required in Row Index 2
+ table.EditTableCell(2, 4, "", false);
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(2, 4, "11");
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(2, 4, "", true);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ cy.wait(1500);
+ cy.discardTableRow(5, 2);
+
+ // Check for Required property using currentRow, row with index 1 has id 7
+ propPane.UpdatePropertyFieldValue("Required", "{{currentRow.id == 7}}");
+
+ table.EditTableCell(1, 4, "", false);
+ cy.get(".bp3-popover-content").contains("This field is required");
+ table.UpdateTableCell(1, 4, 1);
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(1, 4, "");
+ cy.get(".bp3-popover-content").contains("This field is required");
+
+ table.UpdateTableCell(1, 4, "1", true);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ cy.wait(1500);
+ cy.discardTableRow(5, 1);
+ cy.wait(1500);
+
+ // Value isn't required in Row Index 2
+ table.EditTableCell(2, 4, "", false);
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(2, 4, 10);
+ cy.get(".bp3-popover-content").should("not.exist");
+ table.UpdateTableCell(2, 4, "", true);
+ cy.get(".bp3-popover-content").should("not.exist");
+
+ cy.wait(1500);
+ cy.discardTableRow(5, 2);
+
+ // Cleanup
+ propPane.UpdatePropertyFieldValue(
+ "Computed value",
+ '{{currentRow["orderAmount"]}}',
+ );
+ cy.changeColumnType("Plain text");
+ cy.backFromPropertyPanel();
+ cy.makeColumnEditable("orderAmount");
+ });
+
+ it("5. Verify default prompt message for min field", function () {
+ cy.openPropertyPane("tablewidgetv2");
+ cy.makeColumnEditable("orderAmount");
+ cy.editColumn("orderAmount");
+ cy.changeColumnType("Number");
+ propPane.UpdatePropertyFieldValue("Min", "test");
+ cy.get(".t--property-control-min .t--no-binding-prompt > span").should(
+ "have.text",
+ "Access the current cell using {{currentRow.columnName}}",
+ );
+ cy.changeColumnType("Plain text");
+ cy.backFromPropertyPanel();
+ cy.makeColumnEditable("orderAmount");
+ });
+});
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
index f857892abfba..26a1c46d7d1c 100644
--- a/app/client/cypress/locators/commonlocators.json
+++ b/app/client/cypress/locators/commonlocators.json
@@ -168,7 +168,7 @@
"debugger": ".t--debugger-count",
"errorTab": "[data-testid=t--tab-ERROR]",
"debugErrorMsg": "[data-testid=t--debugger-log-message]",
- "tableButtonVariant": ".t--property-control-buttonvariant input",
+ "tableButtonVariant": ".t--property-control-buttonvariant",
"debuggerLabel": "span.debugger-label",
"debuggerToggle": "[data-testid=t--debugger-toggle]",
"debuggerDownStreamErrMsg": "[data-testid=t--debugger-downStreamErrorMsg]",
|
7e13fcbe7f35337890a09a1082e9a321a42df357
|
2024-11-19 21:33:09
|
Aman Agarwal
|
fix: getQueryParamsFromString function updated to use URLSearchParams (#37559)
| false
|
getQueryParamsFromString function updated to use URLSearchParams (#37559)
|
fix
|
diff --git a/app/client/src/utils/getQueryParamsObject.test.ts b/app/client/src/utils/getQueryParamsObject.test.ts
new file mode 100644
index 000000000000..7d75c49c3a6a
--- /dev/null
+++ b/app/client/src/utils/getQueryParamsObject.test.ts
@@ -0,0 +1,12 @@
+import { getQueryParamsFromString } from "./getQueryParamsObject";
+
+describe("getQueryParamsObject test", () => {
+ it("Check whether getQueryParamsFromString returns object with input string containing new lines", () => {
+ const output = getQueryParamsFromString(
+ "branch=new&text=%3Cp%3EHello%3C%2Fp%3E%0A%3Cp%3EWorld!%3C%2Fp%3E",
+ );
+
+ expect(output.text).toEqual("<p>Hello</p>\n<p>World!</p>");
+ expect(output.branch).toEqual("new");
+ });
+});
diff --git a/app/client/src/utils/getQueryParamsObject.ts b/app/client/src/utils/getQueryParamsObject.ts
index a52dba162484..76413de9d8d1 100644
--- a/app/client/src/utils/getQueryParamsObject.ts
+++ b/app/client/src/utils/getQueryParamsObject.ts
@@ -8,14 +8,7 @@ export const getQueryParamsFromString = (search: string | undefined) => {
if (!search) return {};
try {
- return JSON.parse(
- '{"' +
- decodeURI(search)
- .replace(/"/g, '\\"')
- .replace(/&/g, '","')
- .replace(/=/g, '":"') +
- '"}',
- );
+ return Object.fromEntries(new URLSearchParams(search).entries());
} catch (e) {
log.error(e, "error parsing search string");
|
ffd0595330d8f526d48e18635891f1dcd8402c55
|
2022-04-04 13:23:00
|
Abhijeet
|
fix: Fix importing datasource with same name but different plugin issue (#12512)
| false
|
Fix importing datasource with same name but different plugin issue (#12512)
|
fix
|
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 da9412dc4a74..90e800d91fff 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
@@ -591,9 +591,9 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
/**
* This function will take the application reference object to hydrate the application in mongoDB
*
- * @param organizationId organization to which application is going to be stored
- * @param applicationJson application resource which contains necessary information to save the application
- * @param applicationId application which needs to be saved with the updated resources
+ * @param organizationId organization to which application is going to be stored
+ * @param applicationJson application resource which contains necessary information to import the application
+ * @param applicationId application which needs to be saved with the updated resources
* @return Updated application
*/
public Mono<Application> importApplicationInOrganization(String organizationId,
@@ -689,6 +689,7 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
// Check for duplicate datasources to avoid duplicates in target organization
.flatMap(datasource -> {
+ final String importedDatasourceName = datasource.getName();
// Check if the datasource has gitSyncId and if it's already in DB
if (datasource.getGitSyncId() != null
&& savedDatasourcesGitIdToDatasourceMap.containsKey(datasource.getGitSyncId())) {
@@ -702,7 +703,11 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
datasource.setPluginId(null);
AppsmithBeanUtils.copyNestedNonNullProperties(datasource, existingDatasource);
existingDatasource.setStructure(null);
- return datasourceService.update(existingDatasource.getId(), existingDatasource);
+ return datasourceService.update(existingDatasource.getId(), existingDatasource)
+ .map(datasource1 -> {
+ datasourceMap.put(importedDatasourceName, datasource1.getId());
+ return datasource1;
+ });
}
// This is explicitly copied over from the map we created before
@@ -719,11 +724,11 @@ public Mono<Application> importApplicationInOrganization(String organizationId,
updateAuthenticationDTO(datasource, decryptedFields);
}
- return createUniqueDatasourceIfNotPresent(existingDatasourceFlux, datasource, organizationId, applicationId);
- })
- .map(datasource -> {
- datasourceMap.put(datasource.getName(), datasource.getId());
- return datasource;
+ return createUniqueDatasourceIfNotPresent(existingDatasourceFlux, datasource, organizationId)
+ .map(datasource1 -> {
+ datasourceMap.put(importedDatasourceName, datasource1.getId());
+ return datasource1;
+ });
})
.collectList();
})
@@ -1726,9 +1731,7 @@ private Mono<NewPage> mapActionAndCollectionIdWithPageLayout(NewPage page,
*/
private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> existingDatasourceFlux,
Datasource datasource,
- String organizationId,
- String applicationId) {
-
+ String organizationId) {
/*
1. If same datasource is present return
2. If unable to find the datasource create a new datasource with unique name and return
@@ -1743,16 +1746,8 @@ private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> exi
}
return existingDatasourceFlux
- .map(ds -> {
- final DatasourceConfiguration dsAuthConfig = ds.getDatasourceConfiguration();
- if (dsAuthConfig != null && dsAuthConfig.getAuthentication() != null) {
- dsAuthConfig.getAuthentication().setAuthenticationResponse(null);
- dsAuthConfig.getAuthentication().setAuthenticationType(null);
- }
- return ds;
- })
// For git import exclude datasource configuration
- .filter(ds -> applicationId != null ? ds.getName().equals(datasource.getName()) : ds.softEquals(datasource))
+ .filter(ds -> ds.getName().equals(datasource.getName()) && datasource.getPluginId().equals(ds.getPluginId()))
.next() // Get the first matching datasource, we don't need more than one here.
.switchIfEmpty(Mono.defer(() -> {
if (datasourceConfig != null && datasourceConfig.getAuthentication() != null) {
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 f6d32b84bd95..00bd79ff3b8f 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
@@ -1702,7 +1702,7 @@ public void checkoutRemoteBranch_presentInLocal_throwError() {
StepVerifier
.create(applicationMono)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException
- && throwable.getMessage().equals(AppsmithError.GIT_ACTION_FAILED.getMessage("checkout", "origin/branchInLocal already exists in remote")))
+ && throwable.getMessage().equals(AppsmithError.GIT_ACTION_FAILED.getMessage("checkout", "origin/branchInLocal already exists in local - branchInLocal")))
.verify();
}
@@ -2486,7 +2486,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
@Test
@WithUserDetails(value = "api_user")
- public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTypeCancelledMidway_Success() throws GitAPIException, IOException {
+ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTypeCancelledMidway_Success() {
Organization organization = new Organization();
organization.setName("gitImportOrgCancelledMidway");
final String testOrgId = organizationService.create(organization)
@@ -2497,6 +2497,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
GitAuth gitAuth = gitService.generateSSHKey().block();
ApplicationJson applicationJson = createAppJson(filePath).block();
+ applicationJson.getExportedApplication().setName(null);
applicationJson.getDatasourceList().get(0).setName("db-auth-testGitImportRepo");
String pluginId = pluginRepository.findByPackageName("mongo-plugin").block().getId();
@@ -2521,7 +2522,7 @@ public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfSameTy
// Wait for git clone to complete
Mono<Application> gitConnectedAppFromDbMono = Mono.just(testOrgId)
- .flatMap(application -> {
+ .flatMap(ignore -> {
try {
// Before fetching the git connected application, sleep for 5 seconds to ensure that the clone
// completes
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 3d2068df891f..962faf40cfe2 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
@@ -2182,5 +2182,111 @@ public void test2_exportApplication_withReadOnlyAccess_exportedWithDecryptedFiel
})
.verifyComplete();
}
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_datasourceWithSameNameAndDifferentPlugin_importedWithValidActionsAndSuffixedDatasource() {
+
+ ApplicationJson applicationJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json").block();
+
+ Organization testOrganization = new Organization();
+ testOrganization.setName("Duplicate datasource with different plugin org");
+ testOrganization = organizationService.create(testOrganization).block();
+
+ Datasource testDatasource = new Datasource();
+ // 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(testOrganization.getId());
+ final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
+ testDatasource.setName(datasourceName);
+ datasourceService.create(testDatasource).block();
+
+ final Mono<Application> resultMono = importExportApplicationService.importApplicationInOrganization(testOrganization.getId(), applicationJson);
+
+ StepVerifier
+ .create(resultMono
+ .flatMap(application -> Mono.zip(
+ Mono.just(application),
+ datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList()
+ )))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+
+ List<String> datasourceNameList = new ArrayList<>();
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ datasourceNameList.add(datasource.getName());
+ });
+ // Check if both suffixed and newly imported datasource are present
+ assertThat(datasourceNameList).contains(datasourceName, datasourceName + " #1");
+
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getDatasource()).isNotNull();
+ });
+ })
+ .verifyComplete();
+ }
+
+ @Test
+ @WithUserDetails(value = "api_user")
+ public void importApplication_datasourceWithSameNameAndPlugin_importedWithValidActionsWithoutSuffixedDatasource() {
+
+ ApplicationJson applicationJson = createAppJson("test_assets/ImportExportServiceTest/valid-application.json").block();
+
+ Organization testOrganization = new Organization();
+ testOrganization.setName("Duplicate datasource with same plugin org");
+ testOrganization = organizationService.create(testOrganization).block();
+
+ Datasource testDatasource = new Datasource();
+ // 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(testOrganization.getId());
+ final String datasourceName = applicationJson.getDatasourceList().get(0).getName();
+ testDatasource.setName(datasourceName);
+ datasourceService.create(testDatasource).block();
+
+ final Mono<Application> resultMono = importExportApplicationService.importApplicationInOrganization(testOrganization.getId(), applicationJson);
+
+ StepVerifier
+ .create(resultMono
+ .flatMap(application -> Mono.zip(
+ Mono.just(application),
+ datasourceService.findAllByOrganizationId(application.getOrganizationId(), MANAGE_DATASOURCES).collectList(),
+ newActionService.findAllByApplicationIdAndViewMode(application.getId(), false, READ_ACTIONS, null).collectList()
+ )))
+ .assertNext(tuple -> {
+ final Application application = tuple.getT1();
+ final List<Datasource> datasourceList = tuple.getT2();
+ final List<NewAction> actionList = tuple.getT3();
+
+ assertThat(application.getName()).isEqualTo("valid_application");
+
+ List<String> datasourceNameList = new ArrayList<>();
+ assertThat(datasourceList).isNotEmpty();
+ datasourceList.forEach(datasource -> {
+ assertThat(datasource.getOrganizationId()).isEqualTo(application.getOrganizationId());
+ datasourceNameList.add(datasource.getName());
+ });
+ // Check that there are no datasources are created with suffix names as datasource's are of same plugin
+ assertThat(datasourceNameList).contains(datasourceName);
+
+ assertThat(actionList).isNotEmpty();
+ actionList.forEach(newAction -> {
+ ActionDTO actionDTO = newAction.getUnpublishedAction();
+ assertThat(actionDTO.getDatasource()).isNotNull();
+ });
+ })
+ .verifyComplete();
+ }
}
|
309a16d41c91b5a1117faefda480b5e378a55e8a
|
2023-02-07 21:44:07
|
Aishwarya-U-R
|
test: TED support for GITEA (#20451)
| false
|
TED support for GITEA (#20451)
|
test
|
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 2a2f442b93a2..917f1d7221ae 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -187,8 +187,8 @@ jobs:
run: |
mkdir -p ~/git-server/keys
mkdir -p ~/git-server/repos
- docker run --name test-event-driver -d -p 2222:22 -p 5001:5001 -p 3306:3306 \
- -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+ docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
+ -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3000:3000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
-v ~/git-server/repos:/git-server/repos appsmith/test-event-driver:latest
cd cicontainerlocal
docker run -d --name appsmith -p 80:80 -p 9001:9001 \
@@ -473,4 +473,4 @@ jobs:
# Set status = success
- name: Save the status of the run
- run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
+ run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
\ No newline at end of file
diff --git a/.github/workflows/fat-migration.yml b/.github/workflows/fat-migration.yml
index ab6763efd2ee..a89d5d1508e8 100644
--- a/.github/workflows/fat-migration.yml
+++ b/.github/workflows/fat-migration.yml
@@ -128,8 +128,8 @@ jobs:
mkdir -p `pwd`/git-server/keys
mkdir -p `pwd`/git-server/repos
docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
- -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 --volume /:/host \
- -v `pwd`/git-server/repos:/git-server/repos appsmith/test-event-driver:nightly
+ -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3000:3000 --volume /:/host \
+ -v ~/git-server/repos:/git-server/repos appsmith/test-event-driver:latest
cd cicontainerlocal
docker run -d --name appsmith -p 80:80 -p 9001:9001 --add-host=host.docker.internal:host-gateway \
-v "$PWD/stacks:/appsmith-stacks" -e APPSMITH_LICENSE_KEY=$APPSMITH_LICENSE_KEY \
@@ -380,4 +380,4 @@ jobs:
path: app/server/server-logs.log
# Set status = success
- - run: echo "::set-output name=run_result::success" > ~/run_result
+ - run: echo "::set-output name=run_result::success" > ~/run_result
\ No newline at end of file
diff --git a/.github/workflows/perf-test.yml b/.github/workflows/perf-test.yml
index 49dc16205831..175ea22ff88c 100644
--- a/.github/workflows/perf-test.yml
+++ b/.github/workflows/perf-test.yml
@@ -186,8 +186,8 @@ jobs:
run: |
mkdir -p ~/git-server/keys
mkdir -p ~/git-server/repos
- docker run --name test-event-driver -d -p 2222:22 -p 5001:5001 -p 3306:3306 \
- -p 5432:5432 -p 28017:27017 -p 25:25 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+ docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
+ -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3000:3000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
-v ~/git-server/repos:/git-server/repos appsmith/test-event-driver:latest
cd cicontainerlocal
docker run -d --name appsmith -p 80:80 -p 9001:9001 \
@@ -300,4 +300,4 @@ jobs:
# Set status = success
- name: Save the status of the run
- run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
+ run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
\ No newline at end of file
|
5f2e1f06bc4645b4e72e256978ced5bc79b1701c
|
2023-07-28 10:24:12
|
balajisoundar
|
chore: remove stale property from select and multi select widget dyna… (#25799)
| false
|
remove stale property from select and multi select widget dyna… (#25799)
|
chore
|
diff --git a/app/client/src/constants/WidgetConstants.tsx b/app/client/src/constants/WidgetConstants.tsx
index c44f3cb0b03b..9b8e4a9709a7 100644
--- a/app/client/src/constants/WidgetConstants.tsx
+++ b/app/client/src/constants/WidgetConstants.tsx
@@ -71,7 +71,7 @@ export const layoutConfigurations: LayoutConfigurations = {
FLUID: { minWidth: -1, maxWidth: -1 },
};
-export const LATEST_PAGE_VERSION = 81;
+export const LATEST_PAGE_VERSION = 82;
export const GridDefaults = {
DEFAULT_CELL_SIZE: 1,
diff --git a/app/client/src/utils/DSLMigration.test.ts b/app/client/src/utils/DSLMigration.test.ts
index 8f4353e10611..f5edb144dcbe 100644
--- a/app/client/src/utils/DSLMigration.test.ts
+++ b/app/client/src/utils/DSLMigration.test.ts
@@ -782,6 +782,15 @@ const migrations: Migration[] = [
],
version: 80,
},
+ {
+ functionLookup: [
+ {
+ moduleObj: selectWidgetMigration,
+ functionName: "migrateSelectWidgetSourceDataBindingPathList",
+ },
+ ],
+ version: 81,
+ },
];
const mockFnObj: Record<number, any> = {};
diff --git a/app/client/src/utils/DSLMigrations.ts b/app/client/src/utils/DSLMigrations.ts
index cb315bb89963..36534ca5d308 100644
--- a/app/client/src/utils/DSLMigrations.ts
+++ b/app/client/src/utils/DSLMigrations.ts
@@ -76,6 +76,7 @@ import { migrateChartWidgetReskinningData } from "./migrations/ChartWidgetReskin
import {
MigrateSelectTypeWidgetDefaultValue,
migrateSelectWidgetOptionToSourceData,
+ migrateSelectWidgetSourceDataBindingPathList,
} from "./migrations/SelectWidget";
import { migrateMapChartWidgetReskinningData } from "./migrations/MapChartReskinningMigrations";
@@ -1194,6 +1195,11 @@ export const transformDSL = (currentDSL: DSLWidget, newPage = false) => {
if (currentDSL.version === 80) {
currentDSL = migrateSelectWidgetOptionToSourceData(currentDSL);
+ currentDSL.version = 81;
+ }
+
+ if (currentDSL.version === 81) {
+ currentDSL = migrateSelectWidgetSourceDataBindingPathList(currentDSL);
currentDSL.version = LATEST_PAGE_VERSION;
}
diff --git a/app/client/src/utils/migrations/SelectWidget.test.ts b/app/client/src/utils/migrations/SelectWidget.test.ts
index 572a23412f9b..6a5ff3606fe9 100644
--- a/app/client/src/utils/migrations/SelectWidget.test.ts
+++ b/app/client/src/utils/migrations/SelectWidget.test.ts
@@ -1,5 +1,8 @@
import type { DSLWidget } from "widgets/constants";
-import { MigrateSelectTypeWidgetDefaultValue } from "./SelectWidget";
+import {
+ MigrateSelectTypeWidgetDefaultValue,
+ migrateSelectWidgetSourceDataBindingPathList,
+} from "./SelectWidget";
describe("MigrateSelectTypeWidgetDefaultValue", () => {
describe("Select widget", () => {
@@ -1834,3 +1837,131 @@ describe("MigrateSelectTypeWidgetDefaultValue", () => {
).toEqual(output);
});
});
+
+describe("migrateSelectWidgetSourceDataBindingPathList", () => {
+ test("should test that options in dynamicBindingPathList is getting replaced with sourceData", () => {
+ const result = migrateSelectWidgetSourceDataBindingPathList({
+ children: [
+ {
+ type: "TABLE_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionValue",
+ },
+ {
+ key: "options",
+ },
+ {
+ key: "optionLabel",
+ },
+ ],
+ },
+ {
+ type: "SELECT_WIDGET",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionValue",
+ },
+ {
+ key: "options",
+ },
+ {
+ key: "optionLabel",
+ },
+ ],
+ },
+ {
+ type: "MULTI_SELECT_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionLabel",
+ },
+ {
+ key: "optionValue",
+ },
+ {
+ key: "options",
+ },
+ ],
+ },
+ {
+ type: "MULTI_SELECT_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionLabel",
+ },
+ {
+ key: "optionValue",
+ },
+ ],
+ },
+ ],
+ } as any as DSLWidget);
+
+ expect(result).toEqual({
+ children: [
+ {
+ type: "TABLE_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionValue",
+ },
+ {
+ key: "options",
+ },
+ {
+ key: "optionLabel",
+ },
+ ],
+ },
+ {
+ type: "SELECT_WIDGET",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionValue",
+ },
+ {
+ key: "sourceData",
+ },
+ {
+ key: "optionLabel",
+ },
+ ],
+ },
+ {
+ type: "MULTI_SELECT_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionLabel",
+ },
+ {
+ key: "optionValue",
+ },
+ {
+ key: "sourceData",
+ },
+ ],
+ },
+ {
+ type: "MULTI_SELECT_WIDGET_V2",
+ options: [],
+ dynamicBindingPathList: [
+ {
+ key: "optionLabel",
+ },
+ {
+ key: "optionValue",
+ },
+ ],
+ },
+ ],
+ });
+ });
+});
diff --git a/app/client/src/utils/migrations/SelectWidget.ts b/app/client/src/utils/migrations/SelectWidget.ts
index 23a4d194631a..c983a43829ff 100644
--- a/app/client/src/utils/migrations/SelectWidget.ts
+++ b/app/client/src/utils/migrations/SelectWidget.ts
@@ -50,3 +50,27 @@ export function migrateSelectWidgetOptionToSourceData(currentDSL: DSLWidget) {
}
});
}
+
+/*
+ * Migration to remove the options from dynamicBindingPathList and replace it with
+ * sourceData
+ */
+export function migrateSelectWidgetSourceDataBindingPathList(
+ currentDSL: DSLWidget,
+) {
+ return traverseDSLAndMigrate(currentDSL, (widget: WidgetProps) => {
+ if (["SELECT_WIDGET", "MULTI_SELECT_WIDGET_V2"].includes(widget.type)) {
+ const dynamicBindingPathList = widget.dynamicBindingPathList;
+
+ const optionsIndex = dynamicBindingPathList
+ ?.map((d) => d.key)
+ .indexOf("options");
+
+ if (optionsIndex && optionsIndex > -1) {
+ dynamicBindingPathList?.splice(optionsIndex, 1, {
+ key: "sourceData",
+ });
+ }
+ }
+ });
+}
|
7c93d81c504e3b746135b33907d434e84a1b3036
|
2023-08-31 11:59:28
|
Shrikant Sharat Kandula
|
chore(deps): Update certbot from v0.40 to v2.6 (#26809)
| false
|
Update certbot from v0.40 to v2.6 (#26809)
|
chore
|
diff --git a/Dockerfile b/Dockerfile
index 651a26bf9aa0..6b63a3bf0e21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,14 +13,17 @@ ENV LC_ALL C.UTF-8
RUN apt-get update \
&& apt-get upgrade --yes \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
- supervisor curl cron nfs-common certbot nginx nginx-extras gnupg wget netcat openssh-client \
+ supervisor curl cron nfs-common nginx nginx-extras gnupg wget netcat openssh-client \
software-properties-common gettext \
- python3-pip python3-requests python-setuptools git ca-certificates-java \
+ python3-pip python3-venv python3-requests python-setuptools git ca-certificates-java \
&& wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
&& apt-get update && apt-get install --no-install-recommends --yes temurin-17-jdk \
&& pip install --no-cache-dir git+https://github.com/coderanger/supervisor-stdout@973ba19967cdaf46d9c1634d1675fc65b9574f6e \
- && apt-get remove --yes git python3-pip
+ && python3 -m venv --prompt certbot /opt/certbot/venv \
+ && /opt/certbot/venv/bin/pip install certbot \
+ && ln -s /opt/certbot/venv/bin/certbot /usr/local/bin \
+ && apt-get remove --yes git python3-pip python3-venv
# Install MongoDB v5.0.14, Redis, NodeJS - Service Layer, PostgreSQL v13
RUN curl --silent --show-error --location https://www.mongodb.org/static/pgp/server-5.0.asc | apt-key add - \
|
eec7b74c3506e852fdb887058f500acf23f84c83
|
2024-08-28 11:40:24
|
NandanAnantharamu
|
test: common code change for Workflow tests (#35886)
| false
|
common code change for Workflow tests (#35886)
|
test
|
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 0d7569aa63d7..b482db49d58b 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -306,6 +306,7 @@ export class HomePage {
this.agHelper.GetNClick(this._newButtonCreateApplication, 0, true);
this.AssertApplicationCreated();
if (skipSignposting) {
+ this.agHelper.WaitUntilEleDisappear(this.locator._btnSpinner);
AppSidebar.assertVisible();
this.agHelper.AssertElementVisibility(PageLeftPane.locators.selector);
this.onboarding.skipSignposting();
|
f0bccc627b7bee94578dcb85d5274f6cc50ec270
|
2024-08-08 15:27:22
|
Abhijeet
|
chore: Flaky test in `AuthenticationServiceTest` (#35538)
| false
|
Flaky test in `AuthenticationServiceTest` (#35538)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
index b78a62992390..eec29d9169db 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
@@ -140,8 +140,8 @@ public Mono<String> getAuthorizationCodeURLForGenericOAuth2(
})
.switchIfEmpty(Mono.error(
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.DATASOURCE, datasourceId)))
- .flatMap(this::validateRequiredFieldsForGenericOAuth2)
- .zipWith(Mono.zip(workspaceIdMono, trueEnvironmentIdCached, newPageMono))
+ .flatMap(ds -> this.validateRequiredFieldsForGenericOAuth2(ds)
+ .zipWith(Mono.zip(workspaceIdMono, trueEnvironmentIdCached, newPageMono)))
.flatMap(tuple2 -> {
DatasourceStorage datasourceStorage = tuple2.getT1();
String workspaceId = tuple2.getT2().getT1();
|
1a60eaaf8982fb6b3dfc5d3d8883487373b808cc
|
2025-02-14 18:26:31
|
Hetu Nandu
|
fix: Reduce cycle deps by removing wrong exports (#39268)
| false
|
Reduce cycle deps by removing wrong exports (#39268)
|
fix
|
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
index 89d6ada7e90d..8fc55c585c5b 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/EmbeddedDatasourcePathField.tsx
@@ -34,7 +34,7 @@ import { Indices } from "constants/Layers";
import { getExpectedValue } from "utils/validation/common";
import { ValidationTypes } from "constants/WidgetValidation";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { getDataTree } from "selectors/dataTreeSelectors";
import type { KeyValuePair } from "entities/Action";
import equal from "fast-deep-equal/es6";
@@ -93,11 +93,14 @@ const DatasourceContainer = styled.div`
align-items: center;
height: 36px;
gap: var(--ads-v2-spaces-4);
+
.t--datasource-editor {
background-color: var(--ads-v2-color-bg);
+
.cm-s-duotone-light.CodeMirror {
background: var(--ads-v2-color-bg);
}
+
.CodeEditorTarget {
z-index: ${Indices.Layer5};
}
diff --git a/app/client/src/ce/components/editorComponents/Debugger/ErrorLogs/getLogIconForEntity.tsx b/app/client/src/ce/components/editorComponents/Debugger/ErrorLogs/getLogIconForEntity.tsx
index f38fdf9832b5..bf0c22839891 100644
--- a/app/client/src/ce/components/editorComponents/Debugger/ErrorLogs/getLogIconForEntity.tsx
+++ b/app/client/src/ce/components/editorComponents/Debugger/ErrorLogs/getLogIconForEntity.tsx
@@ -9,7 +9,7 @@ import {
JsFileIconV2,
} from "pages/Editor/Explorer/ExplorerIcons";
import { getAssetUrl } from "ee/utils/airgapHelpers";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
type IconProps = LogItemProps & {
pluginImages: Record<string, string>;
diff --git a/app/client/src/ce/entities/DataTree/dataTreeAction.ts b/app/client/src/ce/entities/DataTree/dataTreeAction.ts
index 7ff835726367..6bd3dc3a0e8e 100644
--- a/app/client/src/ce/entities/DataTree/dataTreeAction.ts
+++ b/app/client/src/ce/entities/DataTree/dataTreeAction.ts
@@ -1,5 +1,5 @@
import type { DependencyMap, DynamicPath } from "utils/DynamicBindingUtils";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
import {
getBindingAndReactivePathsOfAction,
diff --git a/app/client/src/ce/entities/DataTree/dataTreeJSAction.ts b/app/client/src/ce/entities/DataTree/dataTreeJSAction.ts
index 1cf8fe1c92e5..105ac925153b 100644
--- a/app/client/src/ce/entities/DataTree/dataTreeJSAction.ts
+++ b/app/client/src/ce/entities/DataTree/dataTreeJSAction.ts
@@ -1,6 +1,6 @@
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { DependencyMap } from "utils/DynamicBindingUtils";
import type {
JSActionEntity,
diff --git a/app/client/src/ce/entities/DataTree/isDynamicEntity.ts b/app/client/src/ce/entities/DataTree/isDynamicEntity.ts
index 593096b47abe..b721d5025b9b 100644
--- a/app/client/src/ce/entities/DataTree/isDynamicEntity.ts
+++ b/app/client/src/ce/entities/DataTree/isDynamicEntity.ts
@@ -4,10 +4,7 @@ import type {
JSActionEntity,
WidgetEntity,
} from "ee/entities/DataTree/types";
-import {
- type EntityTypeValue,
- ENTITY_TYPE,
-} from "entities/DataTree/dataTreeFactory";
+import { type EntityTypeValue, ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
export type DynamicEntityType = JSActionEntity | WidgetEntity | ActionEntity;
diff --git a/app/client/src/ce/reducers/uiReducers/explorerReducer.ts b/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
index 7b7867c70ab0..29eaba889116 100644
--- a/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
+++ b/app/client/src/ce/reducers/uiReducers/explorerReducer.ts
@@ -5,7 +5,7 @@ import {
ReduxActionErrorTypes,
} from "ee/constants/ReduxActionConstants";
import get from "lodash/get";
-import type { EntityTypeValue } from "entities/DataTree/dataTreeFactory";
+import type { EntityTypeValue } from "ee/entities/DataTree/types";
import { DEFAULT_ENTITY_EXPLORER_WIDTH } from "constants/AppConstants";
export enum ExplorerPinnedState {
diff --git a/app/client/src/ce/utils/FilterInternalProperties/getEntityPeekData.ts b/app/client/src/ce/utils/FilterInternalProperties/getEntityPeekData.ts
index 539d1e42a0c6..db61328900f9 100644
--- a/app/client/src/ce/utils/FilterInternalProperties/getEntityPeekData.ts
+++ b/app/client/src/ce/utils/FilterInternalProperties/getEntityPeekData.ts
@@ -1,4 +1,4 @@
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { ActionEntity, WidgetEntity } from "ee/entities/DataTree/types";
import { getActionChildrenPeekData } from "utils/FilterInternalProperties/Action";
import { getAppsmithPeekData } from "utils/FilterInternalProperties/Appsmith";
diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
index b28429e7b866..8627dc1780dc 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
@@ -8,7 +8,7 @@ import type { FieldEntityInformation } from "components/editorComponents/CodeEdi
import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
import type { Placement } from "popper.js";
import { EvaluatedValueDebugButton } from "components/editorComponents/Debugger/DebugCTA";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { IPopoverSharedProps } from "@blueprintjs/core";
import { Classes, Collapse } from "@blueprintjs/core";
import { UNDEFINED_VALIDATION } from "utils/validation/common";
diff --git a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
index f4f65dd649f3..1ccbb28876b9 100644
--- a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
@@ -8,7 +8,7 @@ import { generateQuickCommands } from "./generateQuickCommands";
import type { Datasource } from "entities/Datasource";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import log from "loglevel";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import {
checkIfCursorInsideBinding,
shouldShowSlashCommandMenu,
diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
index 308b84f2ab17..6168325f06b6 100644
--- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
@@ -5,7 +5,7 @@ import type { CommandsCompletion } from "utils/autocomplete/CodemirrorTernServic
import ReactDOM from "react-dom";
import type { SlashCommandPayload } from "entities/Action";
import { SlashCommand } from "entities/Action";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { EntityIcon, JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons";
import { getAssetUrl } from "ee/utils/airgapHelpers";
import type { FeatureFlags } from "ee/entities/FeatureFlag";
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 0885844b753a..9c4719c0d0a0 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -33,7 +33,7 @@ import type { WrappedFieldInputProps } from "redux-form";
import _, { debounce, isEqual, isNumber } from "lodash";
import scrollIntoView from "scroll-into-view-if-needed";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
import { Skin } from "constants/DefaultTheme";
diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
index b4386cdd1af8..6f6225cdcb4a 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
@@ -8,7 +8,7 @@ import type { ValidationTypes } from "constants/WidgetValidation";
import type { Datasource } from "entities/Datasource";
import { PluginPackageName, PluginType } from "entities/Plugin";
import type { WidgetType } from "constants/WidgetConstants";
-import type { EntityTypeValue } from "entities/DataTree/dataTreeFactory";
+import type { EntityTypeValue } from "ee/entities/DataTree/types";
import { getPluginByPackageName } from "ee/selectors/entitiesSelector";
import type { AppState } from "ee/reducers";
import WidgetFactory from "WidgetProvider/factory";
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
index da59dceb1bcb..6dbae17ef222 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
@@ -18,7 +18,7 @@ import {
getPluginNameFromId,
} from "ee/selectors/entitiesSelector";
import { actionPathFromName } from "components/formControls/utils";
-import type { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import type { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { getSqlEditorModeFromPluginName } from "components/editorComponents/CodeEditor/sql/config";
import { Flex } from "@appsmith/ads";
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index d0be46a027e9..50b5964f86cf 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -3,7 +3,7 @@ import type {
ValidationResponse,
ValidationTypes,
} from "constants/WidgetValidation";
-import type { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import type { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { CodeEditorExpected } from "components/editorComponents/CodeEditor";
import type { UpdateWidgetPropertyPayload } from "actions/controlActions";
import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator";
diff --git a/app/client/src/entities/Action/actionProperties.test.ts b/app/client/src/entities/Action/actionProperties.test.ts
index 67f83025132c..d153be3ba400 100644
--- a/app/client/src/entities/Action/actionProperties.test.ts
+++ b/app/client/src/entities/Action/actionProperties.test.ts
@@ -1,7 +1,7 @@
import type { Action } from "entities/Action";
import { PluginType } from "entities/Plugin";
import { getBindingAndReactivePathsOfAction } from "entities/Action/actionProperties";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
const DEFAULT_ACTION: Action = {
actionConfiguration: {},
diff --git a/app/client/src/entities/Action/actionProperties.ts b/app/client/src/entities/Action/actionProperties.ts
index c328eb45d6f8..34b6bb8d58f6 100644
--- a/app/client/src/entities/Action/actionProperties.ts
+++ b/app/client/src/entities/Action/actionProperties.ts
@@ -1,6 +1,6 @@
import type { Action } from "entities/Action/index";
import _ from "lodash";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import {
alternateViewTypeInputConfig,
isHidden,
diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts
index 9220066be211..23d4bd89f311 100644
--- a/app/client/src/entities/DataTree/dataTreeFactory.ts
+++ b/app/client/src/entities/DataTree/dataTreeFactory.ts
@@ -1,12 +1,7 @@
import { generateDataTreeAction } from "ee/entities/DataTree/dataTreeAction";
import { generateDataTreeJSAction } from "ee/entities/DataTree/dataTreeJSAction";
import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
-import {
- ENTITY_TYPE,
- EvaluationSubstitutionType,
-} from "ee/entities/DataTree/types";
import { generateDataTreeModuleInputs } from "ee/entities/DataTree/utils";
-import type { EntityTypeValue } from "ee/entities/DataTree/types";
import type { ConfigTree, UnEvalTree } from "entities/DataTree/dataTreeTypes";
import { isEmpty } from "lodash";
import { generateModuleInstance } from "ee/entities/DataTree/dataTreeModuleInstance";
@@ -160,6 +155,3 @@ export class DataTreeFactory {
};
}
}
-
-export { ENTITY_TYPE, EvaluationSubstitutionType };
-export type { EntityTypeValue };
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.test.ts b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
index 36d78901d407..1dc835e3ed19 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.test.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.test.ts
@@ -6,7 +6,7 @@ import {
import {
ENTITY_TYPE,
EvaluationSubstitutionType,
-} from "entities/DataTree/dataTreeFactory";
+} from "ee/entities/DataTree/types";
import WidgetFactory from "WidgetProvider/factory";
import { ValidationTypes } from "constants/WidgetValidation";
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.ts b/app/client/src/entities/DataTree/dataTreeWidget.ts
index c909e682ffa9..290e88529c29 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.ts
@@ -7,13 +7,13 @@ import { getEntityDynamicBindingPathList } from "utils/DynamicBindingUtils";
import type {
WidgetEntityConfig,
WidgetEntity,
-} from "ee/entities/DataTree/types";
-import { ENTITY_TYPE } from "./dataTreeFactory";
-import type {
OverridingPropertyPaths,
PropertyOverrideDependency,
} from "ee/entities/DataTree/types";
-import { OverridingPropertyType } from "ee/entities/DataTree/types";
+import {
+ OverridingPropertyType,
+ ENTITY_TYPE,
+} from "ee/entities/DataTree/types";
import { setOverridingProperty } from "ee/entities/DataTree/utils";
import { error } from "loglevel";
@@ -28,42 +28,42 @@ import { WIDGET_PROPS_TO_SKIP_FROM_EVAL } from "constants/WidgetConstants";
* Example of setterConfig
*
* {
- WIDGET: {
- TABLE_WIDGET_V2: {
- __setters: {
- setIsRequired: {
- path: "isRequired"
- },
- },
- "text": {
- __setters:{
- setIsRequired: {
- path: "primaryColumns.$columnId.isRequired"
- }
- }
- }
- pathToSetters: [{ path: "primaryColumns.$columnId", property: "columnType" }]
- }
- }
- }
-
- columnId = action
-
- Expected output
-
- {
- Table2: {
- isRequired: true,
- __setters: {
- setIsRequired: {
- path: "Table2.isRequired"
- },
- "primaryColumns.action.setIsRequired": {
- path: "Table2.primaryColumns.action.isRequired"
- }
- },
- }
- }
+ WIDGET: {
+ TABLE_WIDGET_V2: {
+ __setters: {
+ setIsRequired: {
+ path: "isRequired"
+ },
+ },
+ "text": {
+ __setters:{
+ setIsRequired: {
+ path: "primaryColumns.$columnId.isRequired"
+ }
+ }
+ }
+ pathToSetters: [{ path: "primaryColumns.$columnId", property: "columnType" }]
+ }
+ }
+ }
+
+ columnId = action
+
+ Expected output
+
+ {
+ Table2: {
+ isRequired: true,
+ __setters: {
+ setIsRequired: {
+ path: "Table2.isRequired"
+ },
+ "primaryColumns.action.setIsRequired": {
+ path: "Table2.primaryColumns.action.isRequired"
+ }
+ },
+ }
+ }
*/
export function getSetterConfig(
diff --git a/app/client/src/entities/Widget/utils.test.ts b/app/client/src/entities/Widget/utils.test.ts
index 8ae7211d7513..934872978ef0 100644
--- a/app/client/src/entities/Widget/utils.test.ts
+++ b/app/client/src/entities/Widget/utils.test.ts
@@ -5,7 +5,7 @@ import {
contentConfig,
styleConfig,
} from "widgets/ChartWidget/widget/propertyConfig";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { ValidationTypes } from "constants/WidgetValidation";
describe("getAllPathsFromPropertyConfig", () => {
diff --git a/app/client/src/entities/Widget/utils.ts b/app/client/src/entities/Widget/utils.ts
index 475e070f0bb4..286b7d7e6c32 100644
--- a/app/client/src/entities/Widget/utils.ts
+++ b/app/client/src/entities/Widget/utils.ts
@@ -2,7 +2,7 @@ import type {
PropertyPaneConfig,
ValidationConfig,
} from "constants/PropertyControlConstants";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { get, isObject, isUndefined, omitBy } from "lodash";
import memoize from "micro-memoize";
import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
index 74ed6e89c030..9de9c11a83b7 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -1,5 +1,5 @@
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { defaultSelectedValuesValidation } from "./validations";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
index 633649ebabb7..dd5b5d1fbc6c 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
@@ -1,6 +1,6 @@
import { ValidationTypes } from "constants/WidgetValidation";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { sourceDataArrayValidation } from "./validations";
import { configureMenuItemsConfig, menuItemsConfig } from "./childPanels";
import type { MenuButtonWidgetProps } from "../../widget/types";
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
index 6d20b7827dbb..cb70b888d948 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -5,7 +5,7 @@ import {
defaultOptionValidation,
optionsCustomValidation,
} from "./validations";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
export const propertyPaneContentConfig = [
{
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.tsx
index b0f2c003de97..c23b8c04aaa6 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.tsx
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { WDSSelectWidgetProps } from "../../widget/types";
import { defaultOptionValueValidation } from "./validations";
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
index e7176e538703..485ffb2f72b8 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts
@@ -1,5 +1,5 @@
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
export const propertyPaneContentConfig = [
{
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts
index 866ee8e5501e..50dc5233e1af 100644
--- a/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts
@@ -1,6 +1,6 @@
import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants";
import { InlineEditingSaveOptions } from "modules/ui-builder/ui/wds/WDSTableWidget/constants";
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
index b93afb615693..c54d1a8a74c9 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
@@ -10,7 +10,7 @@ import { useDispatch, useSelector } from "react-redux";
import { getPageListAsOptions } from "ee/selectors/entitiesSelector";
import history from "utils/history";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import {
CONTEXT_COPY,
CONTEXT_DELETE,
@@ -44,6 +44,7 @@ export interface EntityContextMenuProps {
canDeleteAction: boolean;
pluginType: PluginType;
}
+
export function ActionEntityContextMenu(props: EntityContextMenuProps) {
// Import the context
const context = useContext(FilesContext);
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
index 06293abfd904..a25f9402264f 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
@@ -12,7 +12,7 @@ import { EntityClassNames } from ".";
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 { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { getIDEViewMode } from "selectors/ideSelectors";
import { EditorViewMode } from "IDE/Interfaces/EditorTypes";
import { DEFAULT_EXPLORER_PANE_WIDTH } from "constants/AppConstants";
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
index 8d918e79792d..86bf1f6f3a1f 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
@@ -8,7 +8,7 @@ import {
import noop from "lodash/noop";
import { initExplorerEntityNameEdit } from "actions/explorerActions";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import {
CONTEXT_COPY,
CONTEXT_DELETE,
@@ -36,6 +36,7 @@ interface EntityContextMenuProps {
canDelete: boolean;
hideMenuItems: boolean;
}
+
export function JSCollectionEntityContextMenu(props: EntityContextMenuProps) {
// Import the context
const context = useContext(FilesContext);
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
index 921bfd15a228..d954b302d9ad 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux";
import { initExplorerEntityNameEdit } from "actions/explorerActions";
import type { AppState } from "ee/reducers";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";
import ContextMenu from "pages/Editor/Explorer/ContextMenu";
import { useDeleteWidget } from "pages/Editor/IDE/EditorPane/UI/UIEntityListTree/hooks/useDeleteWidget";
diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index 850d54415e5e..46091d14187b 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -42,7 +42,7 @@ import { profileFn } from "instrumentation/generateWebWorkerTraces";
import { WorkerEnv } from "workers/Evaluation/handlers/workerEnv";
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
import { Linter } from "eslint-linter-browserify";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
import type { AppsmithEntity } from "ee/entities/DataTree/types";
import { getIDETypeByUrl } from "ee/entities/IDE/utils";
diff --git a/app/client/src/selectors/dataTreeSelectors.ts b/app/client/src/selectors/dataTreeSelectors.ts
index 2d08d684946d..bb2caa276fa6 100644
--- a/app/client/src/selectors/dataTreeSelectors.ts
+++ b/app/client/src/selectors/dataTreeSelectors.ts
@@ -17,10 +17,8 @@ import type {
DataTree,
UnEvalTree,
} from "entities/DataTree/dataTreeTypes";
-import {
- DataTreeFactory,
- ENTITY_TYPE,
-} from "entities/DataTree/dataTreeFactory";
+import { DataTreeFactory } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import {
getIsMobileBreakPoint,
getMetaWidgets,
diff --git a/app/client/src/selectors/navigationSelectors.ts b/app/client/src/selectors/navigationSelectors.ts
index c20f12816eab..b2044437785d 100644
--- a/app/client/src/selectors/navigationSelectors.ts
+++ b/app/client/src/selectors/navigationSelectors.ts
@@ -1,7 +1,10 @@
import type { EntityTypeValue } from "ee/entities/DataTree/types";
-import { ACTION_TYPE, JSACTION_TYPE } from "ee/entities/DataTree/types";
+import {
+ ACTION_TYPE,
+ JSACTION_TYPE,
+ ENTITY_TYPE,
+} from "ee/entities/DataTree/types";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import { createSelector } from "reselect";
import {
getCurrentActions,
@@ -49,6 +52,7 @@ export interface NavigationData {
widgetType?: string;
value?: boolean | string;
}
+
export type EntityNavigationData = Record<string, NavigationData>;
export const getModulesData = createSelector(
diff --git a/app/client/src/utils/FilterInternalProperties/__tests__/index.test.ts b/app/client/src/utils/FilterInternalProperties/__tests__/index.test.ts
index 458c5e109c8c..40c5c8e6f6f5 100644
--- a/app/client/src/utils/FilterInternalProperties/__tests__/index.test.ts
+++ b/app/client/src/utils/FilterInternalProperties/__tests__/index.test.ts
@@ -2,7 +2,7 @@ import { filterInternalProperties } from "..";
import {
ENTITY_TYPE,
EvaluationSubstitutionType,
-} from "entities/DataTree/dataTreeFactory";
+} from "ee/entities/DataTree/types";
import type {
DataTreeEntityConfig,
DataTreeEntityObject,
diff --git a/app/client/src/utils/NavigationSelector/JsChildren.ts b/app/client/src/utils/NavigationSelector/JsChildren.ts
index 7a1cd2d32936..cae3630a2e58 100644
--- a/app/client/src/utils/NavigationSelector/JsChildren.ts
+++ b/app/client/src/utils/NavigationSelector/JsChildren.ts
@@ -1,6 +1,6 @@
import type { JSActionEntity } from "ee/entities/DataTree/types";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { keyBy } from "lodash";
import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer";
import { jsCollectionIdURL } from "ee/RouteBuilder";
diff --git a/app/client/src/utils/NavigationSelector/WidgetChildren.ts b/app/client/src/utils/NavigationSelector/WidgetChildren.ts
index 4bd07e3f358d..2a337993ff11 100644
--- a/app/client/src/utils/NavigationSelector/WidgetChildren.ts
+++ b/app/client/src/utils/NavigationSelector/WidgetChildren.ts
@@ -1,6 +1,6 @@
import type { WidgetEntity } from "ee/entities/DataTree/types";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { builderURL } from "ee/RouteBuilder";
import type { EntityNavigationData } from "selectors/navigationSelectors";
import { createNavData } from "./common";
diff --git a/app/client/src/utils/WidgetLoadingStateUtils.test.ts b/app/client/src/utils/WidgetLoadingStateUtils.test.ts
index 4e13d16d4a35..c704da14157c 100644
--- a/app/client/src/utils/WidgetLoadingStateUtils.test.ts
+++ b/app/client/src/utils/WidgetLoadingStateUtils.test.ts
@@ -4,7 +4,7 @@ import type {
ActionEntity,
JSActionEntity,
} from "ee/entities/DataTree/types";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import {
findLoadingEntities,
getEntityDependantPaths,
diff --git a/app/client/src/utils/autocomplete/AutocompleteSortRules.ts b/app/client/src/utils/autocomplete/AutocompleteSortRules.ts
index cf32316fb6c3..a9eba4f9f11b 100644
--- a/app/client/src/utils/autocomplete/AutocompleteSortRules.ts
+++ b/app/client/src/utils/autocomplete/AutocompleteSortRules.ts
@@ -11,7 +11,7 @@ import type {
} from "./CodemirrorTernService";
import { createCompletionHeader } from "./CodemirrorTernService";
import { AutocompleteDataType } from "./AutocompleteDataType";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
interface AutocompleteRule {
computeScore(
diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
index 748ae7e27bcf..0792838fc84c 100644
--- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts
+++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
@@ -8,7 +8,7 @@ import {
isDynamicValue,
} from "utils/DynamicBindingUtils";
import type { FieldEntityInformation } from "components/editorComponents/CodeEditor/EditorConfig";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import type { EntityTypeValue } from "ee/entities/DataTree/types";
import { AutocompleteSorter } from "./AutocompleteSortRules";
import { getCompletionsForKeyword } from "./keywordCompletion";
@@ -1397,6 +1397,7 @@ class CodeMirrorTernService {
return query;
}
+
updateRecentEntities(recentEntities: string[]) {
this.recentEntities = recentEntities;
}
diff --git a/app/client/src/utils/autocomplete/__tests__/AutocompleteSortRules.test.ts b/app/client/src/utils/autocomplete/__tests__/AutocompleteSortRules.test.ts
index 0c7e176c3c74..103b1a93c8a1 100644
--- a/app/client/src/utils/autocomplete/__tests__/AutocompleteSortRules.test.ts
+++ b/app/client/src/utils/autocomplete/__tests__/AutocompleteSortRules.test.ts
@@ -5,7 +5,7 @@ import type {
DataTreeDefEntityInformation,
TernCompletionResult,
} from "../CodemirrorTernService";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
describe("Autocomplete Ranking", () => {
it("Blocks platform functions in data fields", () => {
diff --git a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts
index 9b3fcbe6d82c..7398cff8e6d9 100644
--- a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts
+++ b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts
@@ -7,8 +7,8 @@ import CodemirrorTernService, {
extractFinalObjectPath,
} from "../CodemirrorTernService";
import { AutocompleteDataType } from "../AutocompleteDataType";
-import { MockCodemirrorEditor } from "../../../../test/__mocks__/CodeMirrorEditorMock";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { MockCodemirrorEditor } from "test/__mocks__/CodeMirrorEditorMock";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import _ from "lodash";
import { AutocompleteSorter, ScoredCompletion } from "../AutocompleteSortRules";
import type CodeMirror from "codemirror";
diff --git a/app/client/src/utils/autocomplete/__tests__/dataTreeTypeDefCreator.test.ts b/app/client/src/utils/autocomplete/__tests__/dataTreeTypeDefCreator.test.ts
index d00192a0d1d9..3e88d0e260d8 100644
--- a/app/client/src/utils/autocomplete/__tests__/dataTreeTypeDefCreator.test.ts
+++ b/app/client/src/utils/autocomplete/__tests__/dataTreeTypeDefCreator.test.ts
@@ -6,7 +6,7 @@ import type {
import {
ENTITY_TYPE,
EvaluationSubstitutionType,
-} from "entities/DataTree/dataTreeFactory";
+} from "ee/entities/DataTree/types";
import InputWidget from "widgets/InputWidgetV2";
import { registerWidgets } from "WidgetProvider/factory/registrationHelper";
diff --git a/app/client/src/utils/editor/EditorBindingPaths.ts b/app/client/src/utils/editor/EditorBindingPaths.ts
index 70370959b693..ea2e012dab53 100644
--- a/app/client/src/utils/editor/EditorBindingPaths.ts
+++ b/app/client/src/utils/editor/EditorBindingPaths.ts
@@ -1,5 +1,5 @@
import { PaginationSubComponent } from "components/formControls/utils";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
/*
We kept the graphql constants in this file because we were facing an error : Uncaught TypeError: Cannot read properties of undefined (reading 'register'). So we kept these variables at one place in this file to make sure this is not present in different files.
@@ -11,10 +11,10 @@ export const CURSORBASED_PREFIX = "cursorBased";
export const CURSOR_PREVIOUS_PREFIX = "previous";
export const CURSOR_NEXT_PREFIX = "next";
-/*
+/*
Getting All Graphql Pagination Binding Paths
--------------------------------------------
- The need to add graphql binding paths was because there was no such control type present in the Form Registry that handles such scenario. If we wanted to add such control type in Form Control types then there has to be a separate Component present for such control type as well. But there is no need for a new control type to handle graphql pagination. So to tackle the similar problem, a new control types i.e. Editor Control Types are added which should have E_ as a prefix for every control type to indicate that it is an editor control type.
+ The need to add graphql binding paths was because there was no such control type present in the Form Registry that handles such scenario. If we wanted to add such control type in Form Control types then there has to be a separate Component present for such control type as well. But there is no need for a new control type to handle graphql pagination. So to tackle the similar problem, a new control types i.e. Editor Control Types are added which should have E_ as a prefix for every control type to indicate that it is an editor control type.
*/
export const getAllBindingPathsForGraphqlPagination = (
configProperty: string,
diff --git a/app/client/src/utils/helpers.test.ts b/app/client/src/utils/helpers.test.ts
index 62f3996cc2f2..cb615e1128eb 100644
--- a/app/client/src/utils/helpers.test.ts
+++ b/app/client/src/utils/helpers.test.ts
@@ -1,6 +1,6 @@
import { RenderModes } from "constants/WidgetConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { CanvasWidgetsReduxState } from "../reducers/entityReducers/canvasWidgetsReducer";
import { AutocompleteDataType } from "./autocomplete/AutocompleteDataType";
import {
diff --git a/app/client/src/utils/widgetRenderUtils.tsx b/app/client/src/utils/widgetRenderUtils.tsx
index e0e0780c54f8..b5a841107d4c 100644
--- a/app/client/src/utils/widgetRenderUtils.tsx
+++ b/app/client/src/utils/widgetRenderUtils.tsx
@@ -7,7 +7,7 @@ import type {
WidgetEntityConfig,
} from "ee/entities/DataTree/types";
import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
-import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
+import { ENTITY_TYPE } from "ee/entities/DataTree/types";
import { pick } from "lodash";
import {
WIDGET_DSL_STRUCTURE_PROPS,
@@ -58,8 +58,8 @@ export function widgetErrorsFromStaticProps(props: Record<string, unknown>) {
/**
* Evaluation Error Map
* {
- widgetPropertyName : DataTreeError[]
- }
+ widgetPropertyName : DataTreeError[]
+ }
*/
const evaluationErrorMap = get(props, EVAL_ERROR_PATH, {}) as Record<
diff --git a/app/client/src/widgets/CategorySliderWidget/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/CategorySliderWidget/widget/propertyConfig/contentConfig.ts
index 347a93272e5b..2a4f3c60df75 100644
--- a/app/client/src/widgets/CategorySliderWidget/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/CategorySliderWidget/widget/propertyConfig/contentConfig.ts
@@ -1,7 +1,7 @@
import { Alignment } from "@blueprintjs/core";
import { LabelPosition } from "components/constants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import { isAutoLayout } from "layoutSystems/autolayout/utils/flexWidgetUtils";
import type { CategorySliderWidgetProps } from "..";
diff --git a/app/client/src/widgets/ChartWidget/widget/propertyConfig.ts b/app/client/src/widgets/ChartWidget/widget/propertyConfig.ts
index a96f1bc5aef3..ce0021e76fd6 100644
--- a/app/client/src/widgets/ChartWidget/widget/propertyConfig.ts
+++ b/app/client/src/widgets/ChartWidget/widget/propertyConfig.ts
@@ -1,5 +1,5 @@
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { ChartWidgetProps } from "widgets/ChartWidget/widget";
import {
CUSTOM_CHART_TYPES,
diff --git a/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
index d88a0aedad72..15c63759219e 100644
--- a/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/CheckboxGroupWidget/widget/index.tsx
@@ -8,7 +8,7 @@ import type { TextSize } from "constants/WidgetConstants";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { compact, xor } from "lodash";
import { default as React } from "react";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
diff --git a/app/client/src/widgets/DropdownWidget/widget/index.tsx b/app/client/src/widgets/DropdownWidget/widget/index.tsx
index 9fc1ccfe539b..4c548b568933 100644
--- a/app/client/src/widgets/DropdownWidget/widget/index.tsx
+++ b/app/client/src/widgets/DropdownWidget/widget/index.tsx
@@ -12,7 +12,7 @@ import { WIDGET_TAGS, layoutConfigurations } from "constants/WidgetConstants";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import _ from "lodash";
import { buildDeprecationWidgetMessage } from "pages/Editor/utils";
import React from "react";
@@ -487,6 +487,7 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
componentDidMount() {
this.changeSelectedOption();
}
+
componentDidUpdate(prevProps: DropdownWidgetProps): void {
// removing selectedOptionValue if defaultValueChanges
if (
diff --git a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
index 77132c74987f..3a554a3de1f3 100644
--- a/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/FilePickerWidgetV2/widget/index.tsx
@@ -5,7 +5,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { FILE_SIZE_LIMIT_FOR_BLOBS } from "constants/WidgetConstants";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import _, { findIndex } from "lodash";
import log from "loglevel";
diff --git a/app/client/src/widgets/FilepickerWidget/widget/index.tsx b/app/client/src/widgets/FilepickerWidget/widget/index.tsx
index 04db4cd1683a..1c1db0c0399c 100644
--- a/app/client/src/widgets/FilepickerWidget/widget/index.tsx
+++ b/app/client/src/widgets/FilepickerWidget/widget/index.tsx
@@ -11,7 +11,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { WIDGET_TAGS } from "constants/WidgetConstants";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import _ from "lodash";
import log from "loglevel";
import { buildDeprecationWidgetMessage } from "pages/Editor/utils";
@@ -298,9 +298,11 @@ class FilePickerWidget extends BaseWidget<
},
];
}
+
static getDefaultPropertiesMap(): Record<string, string> {
return {};
}
+
static getDerivedPropertiesMap(): DerivedPropertiesMap {
return {
isValid: `{{ this.isRequired ? this.files.length > 0 : true }}`,
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig.ts
index 5dff41b480e0..b526a6789689 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig.ts
@@ -3,7 +3,7 @@ import { ButtonPlacementTypes, ButtonVariantTypes } from "components/constants";
import type { OnButtonClickProps } from "components/propertyControls/ButtonControl";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { EVALUATION_PATH } from "utils/DynamicBindingUtils";
import type { ButtonWidgetProps } from "widgets/ButtonWidget/widget";
import type { JSONFormWidgetProps } from ".";
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/common.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/common.ts
index 2f6d8f29065e..ab0d1b96160c 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/common.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/common.ts
@@ -1,6 +1,6 @@
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { get } from "lodash";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { SchemaItem } from "widgets/JSONFormWidget/constants";
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/multiSelect.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/multiSelect.ts
index 500e12379123..7c561c7264a6 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/multiSelect.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/multiSelect.ts
@@ -1,4 +1,4 @@
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { FieldType } from "widgets/JSONFormWidget/constants";
import type { HiddenFnParams } from "../helper";
import { getSchemaItem, getAutocompleteProperties } from "../helper";
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/radioGroup.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/radioGroup.ts
index b5561baf84ab..b1ab2662ce91 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/radioGroup.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/radioGroup.ts
@@ -1,6 +1,6 @@
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import { FieldType } from "widgets/JSONFormWidget/constants";
import { optionsCustomValidation } from "widgets/RadioGroupWidget/widget";
diff --git a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
index d1c7285c7afb..525e8dfd66b4 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/propertyConfig/properties/select.ts
@@ -5,7 +5,7 @@ import type { JSONFormWidgetProps } from "../..";
import type { SelectFieldProps } from "widgets/JSONFormWidget/fields/SelectField";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { LoDashStatic } from "lodash";
diff --git a/app/client/src/widgets/ListWidget/widget/propertyConfig.ts b/app/client/src/widgets/ListWidget/widget/propertyConfig.ts
index cb6655f482c3..96ccb54e18bd 100644
--- a/app/client/src/widgets/ListWidget/widget/propertyConfig.ts
+++ b/app/client/src/widgets/ListWidget/widget/propertyConfig.ts
@@ -3,9 +3,10 @@ import type { WidgetProps } from "widgets/BaseWidget";
import type { ListWidgetProps } from "../constants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import { EVAL_VALUE_PATH } from "utils/DynamicBindingUtils";
+
export const PropertyPaneContentConfig = [
{
sectionName: "Data",
diff --git a/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts b/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
index 3ef7344e589e..ecb90d10ef09 100644
--- a/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
+++ b/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
@@ -2,7 +2,7 @@ import { get, isPlainObject } from "lodash";
import log from "loglevel";
import { EVALUATION_PATH, EVAL_VALUE_PATH } from "utils/DynamicBindingUtils";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { WidgetProps } from "widgets/BaseWidget";
diff --git a/app/client/src/widgets/MapChartWidget/widget/index.tsx b/app/client/src/widgets/MapChartWidget/widget/index.tsx
index 5f68d654afb3..8c70267de3a5 100644
--- a/app/client/src/widgets/MapChartWidget/widget/index.tsx
+++ b/app/client/src/widgets/MapChartWidget/widget/index.tsx
@@ -2,7 +2,7 @@ import React, { Suspense, lazy } from "react";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { retryPromise } from "utils/AppsmithUtils";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
diff --git a/app/client/src/widgets/MapWidget/widget/index.tsx b/app/client/src/widgets/MapWidget/widget/index.tsx
index 4ea6674c395a..8241f7db2b9a 100644
--- a/app/client/src/widgets/MapWidget/widget/index.tsx
+++ b/app/client/src/widgets/MapWidget/widget/index.tsx
@@ -7,7 +7,7 @@ import MapComponent from "../component";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import styled from "styled-components";
import type { DerivedPropertiesMap } from "WidgetProvider/factory";
import type { MarkerProps } from "../constants";
@@ -429,6 +429,7 @@ class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
},
];
}
+
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
static getDefaultPropertiesMap(): Record<string, any> {
@@ -447,6 +448,7 @@ class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
selectedMarker: undefined,
};
}
+
static getDerivedPropertiesMap(): DerivedPropertiesMap {
return {};
}
diff --git a/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
index 78121c0f731a..004fa9b4c3ca 100644
--- a/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
@@ -1,6 +1,6 @@
import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import { sourceDataArrayValidation } from "widgets/MenuButtonWidget/validations";
import type { MenuButtonWidgetProps } from "../../constants";
@@ -8,6 +8,7 @@ import { MenuItemsSource } from "../../constants";
import configureMenuItemsConfig from "./childPanels/configureMenuItemsConfig";
import menuItemsConfig from "./childPanels/menuItemsConfig";
import { updateMenuItemsSource } from "./propertyUtils";
+
export default [
{
sectionName: "Basic",
diff --git a/app/client/src/widgets/MultiSelectTreeWidget/widget/index.tsx b/app/client/src/widgets/MultiSelectTreeWidget/widget/index.tsx
index d8f9bc639292..b413d6ac52e8 100644
--- a/app/client/src/widgets/MultiSelectTreeWidget/widget/index.tsx
+++ b/app/client/src/widgets/MultiSelectTreeWidget/widget/index.tsx
@@ -6,7 +6,7 @@ import type { TextSize } from "constants/WidgetConstants";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { isArray, xor } from "lodash";
import type { DefaultValueType } from "rc-tree-select/lib/interface";
import type { CheckedStrategy } from "rc-tree-select/lib/utils/strategyUtil";
diff --git a/app/client/src/widgets/MultiSelectWidget/widget/index.tsx b/app/client/src/widgets/MultiSelectWidget/widget/index.tsx
index b1af305aa64d..b05cd77e4918 100644
--- a/app/client/src/widgets/MultiSelectWidget/widget/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidget/widget/index.tsx
@@ -17,7 +17,7 @@ import { Layers } from "constants/Layers";
import { WIDGET_TAGS, layoutConfigurations } from "constants/WidgetConstants";
import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
import { buildDeprecationWidgetMessage } from "pages/Editor/utils";
import type { DraftValueType } from "rc-select/lib/Select";
diff --git a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
index e604d111beaf..f370f76a772d 100644
--- a/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidgetV2/widget/index.tsx
@@ -4,7 +4,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { Layers } from "constants/Layers";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import equal from "fast-deep-equal/es6";
import { isArray, isFinite, isString, xorWith } from "lodash";
import type { DraftValueType, LabelInValueType } from "rc-select/lib/Select";
@@ -953,10 +953,12 @@ class MultiSelectWidget extends BaseWidget<
}
};
}
+
export interface OptionValue {
label: string;
value: string;
}
+
export interface DropdownOption extends OptionValue {
disabled?: boolean;
}
diff --git a/app/client/src/widgets/RadioGroupWidget/widget/index.tsx b/app/client/src/widgets/RadioGroupWidget/widget/index.tsx
index 8dd2c75e28cf..c251e5a0fc80 100644
--- a/app/client/src/widgets/RadioGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/RadioGroupWidget/widget/index.tsx
@@ -8,7 +8,7 @@ import type { TextSize } from "constants/WidgetConstants";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import {
isAutoHeightEnabledForWidget,
diff --git a/app/client/src/widgets/SelectWidget/widget/index.tsx b/app/client/src/widgets/SelectWidget/widget/index.tsx
index 8bf1cf42ef96..576d1b3053ba 100644
--- a/app/client/src/widgets/SelectWidget/widget/index.tsx
+++ b/app/client/src/widgets/SelectWidget/widget/index.tsx
@@ -3,7 +3,7 @@ import { LabelPosition } from "components/constants";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import equal from "fast-deep-equal/es6";
import { findIndex, isArray, isNil, isNumber, isString } from "lodash";
import React from "react";
@@ -61,6 +61,7 @@ class SelectWidget extends BaseWidget<SelectWidgetProps, WidgetState> {
constructor(props: SelectWidgetProps) {
super(props);
}
+
static type = "SELECT_WIDGET";
static getConfig() {
diff --git a/app/client/src/widgets/SingleSelectTreeWidget/widget/index.tsx b/app/client/src/widgets/SingleSelectTreeWidget/widget/index.tsx
index 01dbea386435..95b049c75e8d 100644
--- a/app/client/src/widgets/SingleSelectTreeWidget/widget/index.tsx
+++ b/app/client/src/widgets/SingleSelectTreeWidget/widget/index.tsx
@@ -6,7 +6,7 @@ import type { TextSize } from "constants/WidgetConstants";
import type { ValidationResponse } from "constants/WidgetValidation";
import { ValidationTypes } from "constants/WidgetValidation";
import type { SetterConfig, Stylesheet } from "entities/AppTheming";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { isArray } from "lodash";
import type { DefaultValueType } from "rc-tree-select/lib/interface";
import type { ReactNode } from "react";
diff --git a/app/client/src/widgets/SwitchGroupWidget/widget/index.tsx b/app/client/src/widgets/SwitchGroupWidget/widget/index.tsx
index 44758c0c20fd..45d733dafe56 100644
--- a/app/client/src/widgets/SwitchGroupWidget/widget/index.tsx
+++ b/app/client/src/widgets/SwitchGroupWidget/widget/index.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { Alignment } from "@blueprintjs/core";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { isString, xor } from "lodash";
import type { DerivedPropertiesMap } from "WidgetProvider/factory";
import type { WidgetProps, WidgetState } from "widgets/BaseWidget";
diff --git a/app/client/src/widgets/TableWidget/widget/propertyConfig.ts b/app/client/src/widgets/TableWidget/widget/propertyConfig.ts
index 6d4c39af24c2..1fbe63cc2a6a 100644
--- a/app/client/src/widgets/TableWidget/widget/propertyConfig.ts
+++ b/app/client/src/widgets/TableWidget/widget/propertyConfig.ts
@@ -1,7 +1,7 @@
import { get } from "lodash";
import type { TableWidgetProps } from "../constants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
import { ButtonVariantTypes } from "components/constants";
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
index ba370ac0ff61..1cbe7b3fa600 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
@@ -10,7 +10,7 @@ import {
} from "../../propertyUtils";
import { IconNames } from "@blueprintjs/icons";
import { MenuItemsSource } from "widgets/MenuButtonWidget/constants";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import configureMenuItemsConfig from "./childPanels/configureMenuItemsConfig";
export default {
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
index d605b23ee992..ef50ccc4ed5f 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
@@ -4,7 +4,7 @@ import {
} from "ee/constants/messages";
import type { PropertyPaneConfig } from "constants/PropertyControlConstants";
import { ValidationTypes } from "constants/WidgetValidation";
-import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
+import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import type { TableWidgetProps } from "widgets/TableWidgetV2/constants";
import { ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING } from "../../constants";
|
c036087379cffed2cb99002d0496e97ffb293f8b
|
2022-09-29 14:39:19
|
Arpit Mohan
|
chore: Import template application to a git branch in application (#17032)
| false
|
Import template application to a git branch in application (#17032)
|
chore
|
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/StoreValue_spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/StoreValue_spec.ts
index 6c0792896cfc..bb69b24c1c53 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/StoreValue_spec.ts
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/StoreValue_spec.ts
@@ -43,6 +43,7 @@ describe("storeValue Action test", () => {
});
ee.SelectEntityByName("Button1", "Widgets");
+ propPane.UpdatePropertyFieldValue("Label", "");
propPane.TypeTextIntoField("Label", "StoreTest");
cy.get("@jsObjName").then((jsObj: any) => {
propPane.SelectJSFunctionToExecute(
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 e85fc94ace54..6d0279a45351 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
@@ -355,6 +355,13 @@ InspiringQuotes.run().then((res) => { showAlert("Today's quote for " + user + "
propPane.EnterJSContext("onClick", "{{" + jsObjName + ".myFun1()}}");
});
agHelper.ClickButton("Submit");
- agHelper.ValidateToastMessage("Today's quote for You");
+ agHelper
+ .GetNAssertContains(
+ locator._toastMsg,
+ /Today's quote for You|Unable to fetch quote for/g,
+ )
+ .then(($ele: string | JQuery<HTMLElement>) =>
+ agHelper.AssertElementLength($ele, 1),
+ );
});
});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
index c2f6539ed827..f489cd17eb5b 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js
@@ -119,7 +119,6 @@ describe("Omnibar functionality test cases", () => {
cy.get(".t--js-action-name-edit-field")
.type(jsObjectName)
.wait(1000);
- agHelper.AssertContains("created successfully");
cy.get(omnibar.globalSearch).click({ force: true });
cy.get(omnibar.categoryTitle)
.eq(1)
diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts
index 4e20ed319011..bf465bf94962 100644
--- a/app/client/cypress/support/Pages/JSEditor.ts
+++ b/app/client/cypress/support/Pages/JSEditor.ts
@@ -119,7 +119,10 @@ export class JSEditor {
cy.get(this._jsObjTxt).should("not.exist");
//cy.waitUntil(() => cy.get(this.locator._toastMsg).should('not.be.visible')) // fails sometimes
- this.agHelper.AssertContains("created successfully");
+ // this.agHelper.AssertContains("created successfully"); //this check commented as toast check is removed
+ //Checking JS object was created successfully
+ this.agHelper.ValidateNetworkStatus("@createNewJSCollection", 201);
+
this.agHelper.Sleep();
}
@@ -209,7 +212,7 @@ export class JSEditor {
public RunJSObj() {
this.agHelper.GetNClick(this._runButton);
- this.agHelper.Sleep();//for function to run
+ this.agHelper.Sleep(); //for function to run
this.agHelper.AssertElementAbsence(this.locator._empty, 5000);
}
diff --git a/app/client/src/ce/constants/messages.test.ts b/app/client/src/ce/constants/messages.test.ts
index 5f824ac571b9..d84457fdd4dc 100644
--- a/app/client/src/ce/constants/messages.test.ts
+++ b/app/client/src/ce/constants/messages.test.ts
@@ -144,7 +144,7 @@ describe("messages without input", () => {
},
{
key: "REMOTE_URL_INPUT_PLACEHOLDER",
- value: "[email protected]:user/repo.git",
+ value: "[email protected]:user/repository.git",
},
{ key: "COPIED_SSH_KEY", value: "Copied SSH key" },
{
@@ -262,11 +262,11 @@ describe("messages without input", () => {
{
key: "ERROR_GIT_AUTH_FAIL",
value:
- "Please make sure that regenerated SSH key is added and has write access to the repo.",
+ "Please make sure that regenerated SSH key is added and has write access to the repository.",
},
{
key: "ERROR_GIT_INVALID_REMOTE",
- value: "Remote repo doesn't exist or is unreachable.",
+ value: "Either the remote repository doesn't exist or is unreachable.",
},
{
key: "CHANGES_ONLY_USER",
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index e779b640aa40..bfdcd8bbf6a4 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -407,8 +407,6 @@ export const ERROR_JS_ACTION_COPY_FAIL = (actionName: string) =>
`Error while copying ${actionName}`;
export const JS_ACTION_DELETE_SUCCESS = (actionName: string) =>
`${actionName} deleted successfully`;
-export const JS_ACTION_CREATED_SUCCESS = (actionName: string) =>
- `${actionName} created successfully`;
export const JS_ACTION_MOVE_SUCCESS = (actionName: string, pageName: string) =>
`${actionName} moved to page ${pageName} successfully`;
export const ERROR_JS_ACTION_MOVE_FAIL = (actionName: string) =>
@@ -456,7 +454,8 @@ export const IMPORT_APPLICATION_MODAL_LABEL = () =>
export const IMPORT_APP_FROM_FILE_TITLE = () => "Import from file";
export const UPLOADING_JSON = () => "Uploading JSON file";
export const UPLOADING_APPLICATION = () => "Uploading application";
-export const IMPORT_APP_FROM_GIT_TITLE = () => "Import from a Git repo (Beta)";
+export const IMPORT_APP_FROM_GIT_TITLE = () =>
+ "Import from Git repository (Beta)";
export const IMPORT_APP_FROM_FILE_MESSAGE = () =>
"Drag and drop your file or upload from your computer";
export const IMPORT_APP_FROM_GIT_MESSAGE = () =>
@@ -644,7 +643,7 @@ export const SUBMIT = () => "SUBMIT";
export const GIT_USER_UPDATED_SUCCESSFULLY = () =>
"Git user updated successfully";
export const REMOTE_URL_INPUT_PLACEHOLDER = () =>
- "[email protected]:user/repo.git";
+ "[email protected]:user/repository.git";
export const GIT_COMMIT_MESSAGE_PLACEHOLDER = () => "Your commit message here";
export const COPIED_SSH_KEY = () => "Copied SSH key";
export const INVALID_USER_DETAILS_MSG = () => "Please enter valid user details";
@@ -708,8 +707,8 @@ export const GIT_REVOKE_ACCESS = (name: string) => `Revoke Access To ${name}`;
export const GIT_TYPE_REPO_NAME_FOR_REVOKING_ACCESS = (name: string) =>
`Type “${name}” in the input box to revoke access.`;
export const APPLICATION_NAME = () => "Application name";
-export const OPEN_REPO = () => "OPEN REPO";
-export const CONNECTING_REPO = () => "Connecting to Git repo";
+export const OPEN_REPO = () => "OPEN REPOSITORY";
+export const CONNECTING_REPO = () => "Connecting to Git repository";
export const IMPORTING_APP_FROM_GIT = () => "Importing application from Git";
export const CONFIRM_SSH_KEY = () =>
"Please make sure your SSH key has write access.";
@@ -779,9 +778,9 @@ export const DELETE_BRANCH_WARNING_DEFAULT = (defaultBranchName: string) =>
// GIT ERRORS begin
export const ERROR_GIT_AUTH_FAIL = () =>
- "Please make sure that regenerated SSH key is added and has write access to the repo.";
+ "Please make sure that regenerated SSH key is added and has write access to the repository.";
export const ERROR_GIT_INVALID_REMOTE = () =>
- "Remote repo doesn't exist or is unreachable.";
+ "Either the remote repository doesn't exist or is unreachable.";
// GIT ERRORS end
// JS Snippets
@@ -831,7 +830,8 @@ export const ONBOARDING_CHECKLIST_BANNER_HEADER = () =>
export const ONBOARDING_CHECKLIST_BANNER_BODY = () =>
"You can carry on here, or explore the homepage to see how your projects are stored.";
export const ONBOARDING_CHECKLIST_BANNER_BUTTON = () => "Explore homepage";
-
+export const ONBOARDING_SKIPPED_FIRST_TIME_USER = () =>
+ "Skipped onboarding tour";
export const ONBOARDING_CHECKLIST_HEADER = () => "👋 Welcome to Appsmith!";
export const ONBOARDING_CHECKLIST_BODY = () =>
"Let’s get you started on your first application, explore Appsmith yourself or follow our guide below to discover what Appsmith can do.";
diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/sagas/JSActionSagas.ts
index 5d5c29947e60..23f85bad2d62 100644
--- a/app/client/src/sagas/JSActionSagas.ts
+++ b/app/client/src/sagas/JSActionSagas.ts
@@ -39,7 +39,6 @@ import {
JS_ACTION_COPY_SUCCESS,
ERROR_JS_ACTION_COPY_FAIL,
JS_ACTION_DELETE_SUCCESS,
- JS_ACTION_CREATED_SUCCESS,
JS_ACTION_MOVE_SUCCESS,
ERROR_JS_ACTION_MOVE_FAIL,
ERROR_JS_COLLECTION_RENAME_FAIL,
@@ -96,10 +95,6 @@ export function* createJSCollectionSaga(
name: actionName,
from: actionPayload.payload.from,
});
- Toaster.show({
- text: createMessage(JS_ACTION_CREATED_SUCCESS, actionName),
- variant: Variant.success,
- });
AppsmithConsole.info({
text: `JS Object created`,
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index fb1c4c02c75f..f691f4c228b9 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -78,6 +78,10 @@ import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/utils";
import { shouldBeDefined } from "utils/helpers";
import { GuidedTourState } from "reducers/uiReducers/guidedTourReducer";
import { sessionStorage } from "utils/localStorage";
+import {
+ createMessage,
+ ONBOARDING_SKIPPED_FIRST_TIME_USER,
+} from "@appsmith/constants/messages";
const GUIDED_TOUR_STORAGE_KEY = "GUIDED_TOUR_STORAGE_KEY";
@@ -402,7 +406,7 @@ function* endFirstTimeUserOnboardingSaga() {
payload: "",
});
Toaster.show({
- text: "Skipped First time user experience",
+ text: createMessage(ONBOARDING_SKIPPED_FIRST_TIME_USER),
hideProgressBar: false,
variant: Variant.success,
dispatchableAction: {
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 78d679ccc07a..4cf339350e28 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
@@ -25,9 +25,9 @@ public enum AppsmithError {
USER_DOESNT_BELONG_TO_WORKSPACE(400, 4010, "User {0} does not belong to the workspace with id {1}",
AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.INTERNAL_ERROR, null),
NO_CONFIGURATION_FOUND_IN_DATASOURCE(400, 4011, "No datasource configuration found. Please configure it and try again.",
- AppsmithErrorAction.DEFAULT, "Datasource configuration is invalid", ErrorType.DATASOURCE_CONFIGURATION_ERROR, null),
+ AppsmithErrorAction.DEFAULT, "Datasource configuration is invalid", ErrorType.DATASOURCE_CONFIGURATION_ERROR, null),
INVALID_ACTION_COLLECTION(400, 4038, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}",
- AppsmithErrorAction.DEFAULT, "Collection configuration is invalid", ErrorType.CONFIGURATION_ERROR, null),
+ AppsmithErrorAction.DEFAULT, "Collection configuration is invalid", ErrorType.CONFIGURATION_ERROR, null),
INVALID_ACTION(400, 4012, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}",
AppsmithErrorAction.DEFAULT, "Action configuration is invalid", ErrorType.CONFIGURATION_ERROR, null),
INVALID_DATASOURCE(400, 4013, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}",
@@ -61,11 +61,11 @@ public enum AppsmithError {
AppsmithErrorAction.DEFAULT, null, ErrorType.AUTHENTICATION_ERROR, null),
INVALID_PASSWORD_RESET(400, 4020, "Cannot find an outstanding reset password request for this email. Please initiate a request via 'forgot password' " +
"button to reset your password", AppsmithErrorAction.DEFAULT, null, null, null),
- INVALID_PASSWORD_LENGTH(400, 4037, "Password length should be between {0} and {1}" , AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
+ INVALID_PASSWORD_LENGTH(400, 4037, "Password length should be between {0} and {1}", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
JSON_PROCESSING_ERROR(400, 4022, "Json processing error with error {0}", AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.INTERNAL_ERROR, null),
INVALID_CREDENTIALS(200, 4023, "Invalid credentials provided. Did you input the credentials correctly?", AppsmithErrorAction.DEFAULT, null, ErrorType.AUTHENTICATION_ERROR, null),
UNAUTHORIZED_ACCESS(403, 4025, "Unauthorized access", AppsmithErrorAction.DEFAULT, null, ErrorType.AUTHENTICATION_ERROR, null),
- DUPLICATE_KEY(409, 4024, "Unexpected state : Duplicate key error. Message : {0}. Please reach out to Appsmith customer support to report this",
+ DUPLICATE_KEY(409, 4024, "Unexpected state: Duplicate key error. Message: {0}. Please reach out to Appsmith customer support to report this",
AppsmithErrorAction.DEFAULT, null, ErrorType.BAD_REQUEST, null),
USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in instead.",
AppsmithErrorAction.DEFAULT, null, ErrorType.BAD_REQUEST, null),
@@ -79,22 +79,22 @@ public enum AppsmithError {
INVALID_CURL_COMMAND(400, 4029, "Invalid cURL command, couldn't import.", AppsmithErrorAction.DEFAULT, null, ErrorType.ARGUMENT_ERROR, null),
INVALID_LOGIN_METHOD(401, 4030, "Please use {0} authentication to login to Appsmith", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
INVALID_GIT_CONFIGURATION(400, 4031, "Git configuration is invalid. Details: {0}", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, null),
- INVALID_GIT_SSH_CONFIGURATION(400, 4032, "SSH Key is not configured properly. Did you forget to add SSH key to remote? Can you please try again by reconfiguring the SSH key with write access", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, ErrorReferenceDocUrl.GIT_DEPLOY_KEY.getDocUrl()),
- INVALID_GIT_REPO(400, 4033, "The remote repo is not empty. Please create a new empty repo and configure the SSH keys. " +
- "If you want to clone from remote repo and build application, please use import application from git option.", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, null),
+ INVALID_GIT_SSH_CONFIGURATION(400, 4032, "SSH key is not configured correctly. Did you forget to add the SSH key to your remote repository? Please try again by reconfiguring the SSH key with write access.", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, ErrorReferenceDocUrl.GIT_DEPLOY_KEY.getDocUrl()),
+ INVALID_GIT_REPO(400, 4033, "The remote repository is not empty. Please create a new empty repository and configure the SSH keys. " +
+ "If you wish to clone and build an application from an existing remote repository, please use the \"Import from a Git repository\" option in the home page.", AppsmithErrorAction.DEFAULT, null, ErrorType.GIT_CONFIGURATION_ERROR, null),
DEFAULT_RESOURCES_UNAVAILABLE(400, 4034, "Unexpected state. Default resources are unavailable for {0} with id {1}. Please reach out to Appsmith customer support to resolve this.",
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.getDocUrl()),
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_WORKSPACE_ADMIN_ERROR(400, 4038, "The last admin can not be removed from the workspace", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
+ REMOVE_LAST_WORKSPACE_ADMIN_ERROR(400, 4038, "The last admin cannot be removed from the workspace", 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),
- REPOSITORY_SAVE_FAILED(500, 5001, "Failed to save the repository. Try again.", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
+ REPOSITORY_SAVE_FAILED(500, 5001, "Failed to save the repository. Please try again later.", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
PLUGIN_INSTALLATION_FAILED_DOWNLOAD_ERROR(500, 5002, "Plugin installation failed due to an error while " +
"downloading it. Check the jar location & try again.", AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.INTERNAL_ERROR, null),
PLUGIN_RUN_FAILED(500, 5003, "Plugin execution failed with error {0}", AppsmithErrorAction.DEFAULT, null, ErrorType.INTERNAL_ERROR, null),
- PLUGIN_EXECUTION_TIMEOUT(504, 5040, "Plugin Execution exceeded the maximum allowed time. Please increase the timeout in your action settings or check your backend action endpoint",
+ PLUGIN_EXECUTION_TIMEOUT(504, 5040, "Plugin execution exceeded the maximum allowed time. Please increase the timeout in your action settings or check your backend action endpoint",
AppsmithErrorAction.DEFAULT, null, ErrorType.CONNECTIVITY_ERROR, null),
PLUGIN_LOAD_FORM_JSON_FAIL(500, 5004, "[{0}] Unable to load datasource form configuration. Details: {1}.",
AppsmithErrorAction.LOG_EXTERNALLY, null, ErrorType.INTERNAL_ERROR, null),
@@ -174,5 +174,7 @@ public AppsmithErrorAction getErrorAction() {
return this.errorAction;
}
- public String getErrorType() { return this.errorType.toString(); }
+ public String getErrorType() {
+ return this.errorType.toString();
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
index aa99f5a84a84..c4d5dac1f825 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
@@ -214,7 +214,7 @@ public Mono<ApplicationImportDTO> importApplicationFromTemplate(String templateI
public Mono<List<ApplicationTemplate>> getRecentlyUsedTemplates() {
return userDataService.getForCurrentUser().flatMap(userData -> {
List<String> templateIds = userData.getRecentlyUsedTemplateIds();
- if(!CollectionUtils.isEmpty(templateIds)) {
+ if (!CollectionUtils.isEmpty(templateIds)) {
return getActiveTemplates(templateIds);
}
return Mono.empty();
@@ -247,10 +247,14 @@ public NoEncodingUriBuilderFactory(String baseUriTemplate) {
}
@Override
- public Mono<ApplicationImportDTO> mergeTemplateWithApplication(String templateId, String applicationId, String organizationId, String branchName, List<String> pagesToImport) {
+ public Mono<ApplicationImportDTO> mergeTemplateWithApplication(String templateId,
+ String applicationId,
+ String organizationId,
+ String branchName,
+ List<String> pagesToImport) {
return getApplicationJsonFromTemplate(templateId)
.flatMap(applicationJson -> importExportApplicationService.mergeApplicationJsonWithApplication(
- organizationId, applicationId, null, applicationJson, pagesToImport)
+ organizationId, applicationId, branchName, applicationJson, pagesToImport)
)
.flatMap(application -> importExportApplicationService.getApplicationImportDTO(
application.getId(), application.getWorkspaceId(), application)
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 5ed08053a634..298853b3e59c 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
@@ -1,5 +1,6 @@
package com.appsmith.server.services.ce;
+import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.constants.ErrorReferenceDocUrl;
import com.appsmith.external.dtos.GitBranchDTO;
import com.appsmith.external.dtos.GitLogDTO;
@@ -10,7 +11,6 @@
import com.appsmith.git.service.GitExecutorImpl;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.configurations.EmailConfig;
-import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.server.constants.Assets;
import com.appsmith.server.constants.Entity;
import com.appsmith.server.constants.FieldName;
@@ -26,6 +26,7 @@
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.domains.UserData;
import com.appsmith.server.dtos.ApplicationImportDTO;
+import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.GitCommitDTO;
import com.appsmith.server.dtos.GitConnectDTO;
import com.appsmith.server.dtos.GitDocsDTO;
@@ -72,8 +73,8 @@
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayList;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -105,7 +106,6 @@
* proceed uninterrupted and whenever the user refreshes the page, we will have the sane state. synchronous sink does
* not take subscription cancellations into account. This means that even if the subscriber has cancelled its
* subscription, the create method still generates its event.
- *
*/
@Slf4j
@@ -184,14 +184,14 @@ public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitP
// 2. Updating or creating repo specific profile and user want to use repo specific profile but provided empty
// values for authorName and email
- if((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile()))
+ if ((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile()))
&& StringUtils.isEmptyOrNull(gitProfile.getAuthorName())
) {
- return Mono.error( new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Name"));
- } else if((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile()))
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Name"));
+ } else if ((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile()))
&& StringUtils.isEmptyOrNull(gitProfile.getAuthorEmail())
) {
- return Mono.error( new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Email"));
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Email"));
} else if (StringUtils.isEmptyOrNull(defaultApplicationId)) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
}
@@ -344,7 +344,7 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
}
boolean isSystemGeneratedTemp = false;
- if(commitDTO.getCommitMessage().contains(DEFAULT_COMMIT_MESSAGE)) {
+ if (commitDTO.getCommitMessage().contains(DEFAULT_COMMIT_MESSAGE)) {
isSystemGeneratedTemp = true;
}
@@ -388,7 +388,7 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
.flatMap(isPrivate -> {
defaultGitMetadata.setIsRepoPrivate(isPrivate);
if (!isPrivate.equals(defaultGitMetadata.getIsRepoPrivate())) {
- return applicationService.save(defaultApplication);
+ return applicationService.save(defaultApplication);
} else {
return Mono.just(defaultApplication);
}
@@ -402,7 +402,7 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
return applicationMono
.then(isRepoLimitReached(workspaceId, false))
.flatMap(isRepoLimitReached -> {
- if(Boolean.FALSE.equals(isRepoLimitReached)) {
+ if (Boolean.FALSE.equals(isRepoLimitReached)) {
return Mono.just(defaultApplication);
}
throw new AppsmithException(AppsmithError.GIT_APPLICATION_LIMIT_ERROR);
@@ -492,9 +492,9 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl
AppsmithError.INVALID_GIT_CONFIGURATION.getMessage(errorMessage),
childApplication.getGitApplicationMetadata().getIsRepoPrivate()
)
- .flatMap(user -> Mono.error(
- new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, errorMessage))
- );
+ .flatMap(user -> Mono.error(
+ new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, errorMessage))
+ );
}
result.append("Commit Result : ");
Mono<String> gitCommitMono = gitExecutor
@@ -643,19 +643,19 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
Mono<Boolean> isPrivateRepoMono = GitUtils.isRepoPrivate(browserSupportedUrl).cache();
- Mono<Application> connectApplicationMono = profileMono
+ Mono<Application> connectApplicationMono = profileMono
.then(getApplicationById(defaultApplicationId).zipWith(isPrivateRepoMono))
.flatMap(tuple -> {
Application application = tuple.getT1();
boolean isRepoPrivate = tuple.getT2();
// Check if the repo is public
- if(!isRepoPrivate) {
+ if (!isRepoPrivate) {
return Mono.just(application);
}
//Check the limit for number of private repo
return isRepoLimitReached(application.getWorkspaceId(), true)
.flatMap(isRepoLimitReached -> {
- if(Boolean.FALSE.equals(isRepoLimitReached)) {
+ if (Boolean.FALSE.equals(isRepoLimitReached)) {
return Mono.just(application);
}
return addAnalyticsForGitOperation(
@@ -675,39 +675,40 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
String repoName = GitUtils.getRepoName(gitConnectDTO.getRemoteUrl());
Path repoSuffix = Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName);
Mono<String> defaultBranchMono = gitExecutor.cloneApplication(
- repoSuffix,
- gitConnectDTO.getRemoteUrl(),
- gitApplicationMetadata.getGitAuth().getPrivateKey(),
- gitApplicationMetadata.getGitAuth().getPublicKey()
- )
- .onErrorResume(error -> {
- log.error("Error while cloning the remote repo, ", error);
- return fileUtils.deleteLocalRepo(repoSuffix)
- .then(addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_CONNECT.getEventName(),
- application,
- error.getClass().getName(),
- error.getMessage(),
- application.getGitApplicationMetadata().getIsRepoPrivate()
- ))
- .flatMap(app -> {
- if (error instanceof TransportException) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
- }
- if (error instanceof InvalidRemoteException) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, error.getMessage()));
- }
- 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()));
- });
- });
+ repoSuffix,
+ gitConnectDTO.getRemoteUrl(),
+ gitApplicationMetadata.getGitAuth().getPrivateKey(),
+ gitApplicationMetadata.getGitAuth().getPublicKey()
+ )
+ .onErrorResume(error -> {
+ log.error("Error while cloning the remote repo, ", error);
+ return fileUtils.deleteLocalRepo(repoSuffix)
+ .then(addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_CONNECT.getEventName(),
+ application,
+ error.getClass().getName(),
+ error.getMessage(),
+ application.getGitApplicationMetadata().getIsRepoPrivate()
+ ))
+ .flatMap(app -> {
+ if (error instanceof TransportException) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+ }
+ if (error instanceof InvalidRemoteException) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, error.getMessage()));
+ }
+ 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()));
+ });
+ });
return Mono.zip(
Mono.just(application),
defaultBranchMono,
@@ -736,7 +737,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
AppsmithError.INVALID_GIT_REPO.getMessage(),
application.getGitApplicationMetadata().getIsRepoPrivate()
)
- .then(Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_REPO)));
+ .then(Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_REPO)));
} else {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
gitApplicationMetadata.setDefaultApplicationId(applicationId);
@@ -786,10 +787,10 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
//Initialize the repo with readme file
try {
return Mono.zip(
- fileUtils.initializeReadme(
- Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName, "README.md"),
- originHeader + viewModeUrl,
- originHeader + editModeUrl
+ fileUtils.initializeReadme(
+ Paths.get(application.getWorkspaceId(), defaultApplicationId, repoName, "README.md"),
+ originHeader + viewModeUrl,
+ originHeader + editModeUrl
).onErrorMap(throwable -> {
log.error("Error while initialising git repo, {0}", throwable);
return new AppsmithException(
@@ -827,23 +828,23 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi
return this.commitApplication(commitDTO, defaultApplicationId, application.getGitApplicationMetadata().getBranchName(), true)
.onErrorResume(error ->
- // If the push fails remove all the cloned files from local repo
- this.detachRemote(defaultApplicationId)
- .flatMap(isDeleted -> {
- if (error instanceof TransportException) {
- return addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_CONNECT.getEventName(),
- application,
- error.getClass().getName(),
- error.getMessage(),
- application.getGitApplicationMetadata().getIsRepoPrivate()
- )
- .then(Mono.error(new AppsmithException(
- AppsmithError.INVALID_GIT_SSH_CONFIGURATION, error.getMessage()))
- );
- }
- return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "push", error.getMessage()));
- })
+ // If the push fails remove all the cloned files from local repo
+ this.detachRemote(defaultApplicationId)
+ .flatMap(isDeleted -> {
+ if (error instanceof TransportException) {
+ return addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_CONNECT.getEventName(),
+ application,
+ error.getClass().getName(),
+ error.getMessage(),
+ application.getGitApplicationMetadata().getIsRepoPrivate()
+ )
+ .then(Mono.error(new AppsmithException(
+ AppsmithError.INVALID_GIT_SSH_CONFIGURATION, error.getMessage()))
+ );
+ }
+ return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "push", error.getMessage()));
+ })
);
})
.then(addAnalyticsForGitOperation(
@@ -908,28 +909,28 @@ private Mono<String> pushApplication(String applicationId, boolean doPublish) {
GitAuth gitAuth = gitData.getGitAuth();
return gitExecutor.checkoutToBranch(baseRepoSuffix, application.getGitApplicationMetadata().getBranchName())
.then(gitExecutor.pushApplication(
- baseRepoSuffix,
- gitData.getRemoteUrl(),
- gitAuth.getPublicKey(),
- gitAuth.getPrivateKey(),
- gitData.getBranchName()
- )
- .zipWith(Mono.just(application))
+ baseRepoSuffix,
+ gitData.getRemoteUrl(),
+ gitAuth.getPublicKey(),
+ gitAuth.getPrivateKey(),
+ gitData.getBranchName()
+ )
+ .zipWith(Mono.just(application))
)
.onErrorResume(error ->
- addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_PUSH.getEventName(),
- application,
- error.getClass().getName(),
- error.getMessage(),
- application.getGitApplicationMetadata().getIsRepoPrivate()
- )
- .flatMap(application1 -> {
- if (error instanceof TransportException) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
- }
- return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "push", error.getMessage()));
- })
+ addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_PUSH.getEventName(),
+ application,
+ error.getClass().getName(),
+ error.getMessage(),
+ application.getGitApplicationMetadata().getIsRepoPrivate()
+ )
+ .flatMap(application1 -> {
+ if (error instanceof TransportException) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+ }
+ return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "push", error.getMessage()));
+ })
);
})
.flatMap(tuple -> {
@@ -944,7 +945,7 @@ private Mono<String> pushApplication(String applicationId, boolean doPublish) {
AppsmithError.GIT_UPSTREAM_CHANGES.getMessage(),
application.getGitApplicationMetadata().getIsRepoPrivate()
)
- .flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES)));
+ .flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES)));
}
return Mono.just(pushResult).zipWith(Mono.just(tuple.getT2()));
})
@@ -957,7 +958,7 @@ private Mono<String> pushApplication(String applicationId, boolean doPublish) {
application,
application.getGitApplicationMetadata().getIsRepoPrivate()
)
- .thenReturn(pushStatus);
+ .thenReturn(pushStatus);
});
return Mono.create(sink -> pushStatusMono
@@ -1028,45 +1029,45 @@ public Mono<Application> detachRemote(String defaultApplicationId) {
.then(applicationService.save(defaultApplication)));
})
.flatMap(application ->
- // Update all the resources to replace defaultResource Ids with the resource Ids as branchName
- // will be deleted
- Flux.fromIterable(application.getPages())
- .flatMap(page -> newPageService.findById(page.getId(), MANAGE_PAGES))
- .map(newPage -> {
- newPage.setDefaultResources(null);
- return createDefaultIdsOrUpdateWithGivenResourceIds(newPage, null);
- })
- .collectList()
- .flatMapMany(newPageService::saveAll)
- .flatMap(newPage -> newActionService.findByPageId(newPage.getId(), MANAGE_ACTIONS)
- .map(newAction -> {
- newAction.setDefaultResources(null);
- if (newAction.getUnpublishedAction() != null) {
- newAction.getUnpublishedAction().setDefaultResources(null);
- }
- if (newAction.getPublishedAction() != null) {
- newAction.getPublishedAction().setDefaultResources(null);
- }
- return createDefaultIdsOrUpdateWithGivenResourceIds(newAction, null);
- })
- .collectList()
- .flatMapMany(newActionService::saveAll)
- .thenMany(actionCollectionService.findByPageId(newPage.getId()))
- .map(actionCollection -> {
- actionCollection.setDefaultResources(null);
- if (actionCollection.getUnpublishedCollection() != null) {
- actionCollection.getUnpublishedCollection().setDefaultResources(null);
- }
- if (actionCollection.getPublishedCollection() != null) {
- actionCollection.getPublishedCollection().setDefaultResources(null);
- }
- return createDefaultIdsOrUpdateWithGivenResourceIds(actionCollection, null);
- })
- .collectList()
- .flatMapMany(actionCollectionService::saveAll)
- )
- .then(addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCONNECT.getEventName(), application, false))
- .map(responseUtils::updateApplicationWithDefaultResources)
+ // Update all the resources to replace defaultResource Ids with the resource Ids as branchName
+ // will be deleted
+ Flux.fromIterable(application.getPages())
+ .flatMap(page -> newPageService.findById(page.getId(), MANAGE_PAGES))
+ .map(newPage -> {
+ newPage.setDefaultResources(null);
+ return createDefaultIdsOrUpdateWithGivenResourceIds(newPage, null);
+ })
+ .collectList()
+ .flatMapMany(newPageService::saveAll)
+ .flatMap(newPage -> newActionService.findByPageId(newPage.getId(), MANAGE_ACTIONS)
+ .map(newAction -> {
+ newAction.setDefaultResources(null);
+ if (newAction.getUnpublishedAction() != null) {
+ newAction.getUnpublishedAction().setDefaultResources(null);
+ }
+ if (newAction.getPublishedAction() != null) {
+ newAction.getPublishedAction().setDefaultResources(null);
+ }
+ return createDefaultIdsOrUpdateWithGivenResourceIds(newAction, null);
+ })
+ .collectList()
+ .flatMapMany(newActionService::saveAll)
+ .thenMany(actionCollectionService.findByPageId(newPage.getId()))
+ .map(actionCollection -> {
+ actionCollection.setDefaultResources(null);
+ if (actionCollection.getUnpublishedCollection() != null) {
+ actionCollection.getUnpublishedCollection().setDefaultResources(null);
+ }
+ if (actionCollection.getPublishedCollection() != null) {
+ actionCollection.getPublishedCollection().setDefaultResources(null);
+ }
+ return createDefaultIdsOrUpdateWithGivenResourceIds(actionCollection, null);
+ })
+ .collectList()
+ .flatMapMany(actionCollectionService::saveAll)
+ )
+ .then(addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCONNECT.getEventName(), application, false))
+ .map(responseUtils::updateApplicationWithDefaultResources)
);
return Mono.create(sink -> disconnectMono
@@ -1161,21 +1162,21 @@ public Mono<Application> createBranch(String defaultApplicationId, GitBranchDTO
.flatMap(tuple -> {
Application savedApplication = tuple.getT1();
return importExportApplicationService.importApplicationInWorkspace(
- savedApplication.getWorkspaceId(),
- tuple.getT2(),
- savedApplication.getId(),
- branchDTO.getBranchName()
- )
- .flatMap(application -> {
- // Commit and push for new branch created this is to avoid issues when user tries to create a
- // new branch from uncommitted branch
- GitApplicationMetadata gitData = application.getGitApplicationMetadata();
- GitCommitDTO commitDTO = new GitCommitDTO();
- commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE + GitDefaultCommitMessage.BRANCH_CREATED.getReason() + gitData.getBranchName());
- commitDTO.setDoPush(true);
- return commitApplication(commitDTO, gitData.getDefaultApplicationId(), gitData.getBranchName())
- .thenReturn(application);
- });
+ savedApplication.getWorkspaceId(),
+ tuple.getT2(),
+ savedApplication.getId(),
+ branchDTO.getBranchName()
+ )
+ .flatMap(application -> {
+ // Commit and push for new branch created this is to avoid issues when user tries to create a
+ // new branch from uncommitted branch
+ GitApplicationMetadata gitData = application.getGitApplicationMetadata();
+ GitCommitDTO commitDTO = new GitCommitDTO();
+ commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE + GitDefaultCommitMessage.BRANCH_CREATED.getReason() + gitData.getBranchName());
+ commitDTO.setDoPush(true);
+ return commitApplication(commitDTO, gitData.getDefaultApplicationId(), gitData.getBranchName())
+ .thenReturn(application);
+ });
})
.flatMap(application -> addAnalyticsForGitOperation(
AnalyticsEvents.GIT_CREATE_BRANCH.getEventName(),
@@ -1204,7 +1205,7 @@ public Mono<Application> checkoutBranch(String defaultApplicationId, String bran
.stream()
.filter(gitBranchDTO -> gitBranchDTO.getBranchName()
.equals(finalBranchName)).count();
- if(branchMatchCount == 0) {
+ if (branchMatchCount == 0) {
return checkoutRemoteBranch(defaultApplicationId, finalBranchName);
} else {
return Mono.error(
@@ -1244,7 +1245,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
branchName,
true
).flatMap(fetchStatus -> gitExecutor.checkoutRemoteBranch(repoPath, branchName).zipWith(Mono.just(application))
- .onErrorResume(error -> Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout branch", error.getMessage()))));
+ .onErrorResume(error -> Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout branch", error.getMessage()))));
})
.flatMap(tuple -> {
/*
@@ -1325,7 +1326,7 @@ Mono<Application> getApplicationById(String applicationId) {
* make a system commit to remote repo
*
* @param defaultApplicationId application for which we want to pull remote changes and merge
- * @param branchName remoteBranch from which the changes will be pulled and merged
+ * @param branchName remoteBranch from which the changes will be pulled and merged
* @return return the status of pull operation
*/
@Override
@@ -1376,14 +1377,14 @@ public Mono<List<GitBranchDTO>> listBranchForApplication(String defaultApplicati
Mono<List<GitBranchDTO>> gitBranchDTOMono;
// Fetch remote first if the prune branch is valid
- if(Boolean.TRUE.equals(pruneBranches)) {
+ if (Boolean.TRUE.equals(pruneBranches)) {
gitBranchDTOMono = gitExecutor.fetchRemote(
- repoPath,
- gitApplicationMetadata.getGitAuth().getPublicKey(),
- gitApplicationMetadata.getGitAuth().getPrivateKey(),
- false,
- currentBranch,
- true)
+ repoPath,
+ gitApplicationMetadata.getGitAuth().getPublicKey(),
+ gitApplicationMetadata.getGitAuth().getPrivateKey(),
+ false,
+ currentBranch,
+ true)
.flatMap(s -> gitExecutor.listBranches(
repoPath,
gitApplicationMetadata.getRemoteUrl(),
@@ -1401,16 +1402,16 @@ public Mono<List<GitBranchDTO>> listBranchForApplication(String defaultApplicati
}
return Mono.zip(gitBranchDTOMono, Mono.just(application))
.onErrorResume(error -> {
- if (error instanceof RepositoryNotFoundException) {
- Mono<List<GitBranchDTO>> branchListMono = handleRepoNotFoundException(defaultApplicationId);
- return Mono.zip(branchListMono, Mono.just(application), Mono.just(repoPath));
- }
- return Mono.error(new AppsmithException(
- AppsmithError.GIT_ACTION_FAILED,
- "branch --list",
- error.getMessage()));
- }
- );
+ if (error instanceof RepositoryNotFoundException) {
+ Mono<List<GitBranchDTO>> branchListMono = handleRepoNotFoundException(defaultApplicationId);
+ return Mono.zip(branchListMono, Mono.just(application), Mono.just(repoPath));
+ }
+ return Mono.error(new AppsmithException(
+ AppsmithError.GIT_ACTION_FAILED,
+ "branch --list",
+ error.getMessage()));
+ }
+ );
})
.flatMap(tuple -> {
@@ -1429,7 +1430,7 @@ public Mono<List<GitBranchDTO>> listBranchForApplication(String defaultApplicati
.findFirst()
.orElse(dbDefaultBranch);
- if(defaultBranchRemote.equals(dbDefaultBranch)) {
+ if (defaultBranchRemote.equals(dbDefaultBranch)) {
return Mono.just(gitBranchListDTOS).zipWith(Mono.just(application));
} else {
// Get the application from DB by new defaultBranch name
@@ -1461,10 +1462,10 @@ public Mono<List<GitBranchDTO>> listBranchForApplication(String defaultApplicati
return Boolean.FALSE.equals(pruneBranches)
? Mono.just(gitBranchDTOList)
: addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_PRUNE.getEventName(),
- application,
- application.getGitApplicationMetadata().getIsRepoPrivate()
- )
+ AnalyticsEvents.GIT_PRUNE.getEventName(),
+ application,
+ application.getGitApplicationMetadata().getIsRepoPrivate()
+ )
.thenReturn(gitBranchDTOList);
});
@@ -1493,13 +1494,13 @@ public Mono<GitStatusDTO> getStatus(String defaultApplicationId, String branchNa
Mono<GitStatusDTO> statusMono = Mono.zip(
- getGitApplicationMetadata(defaultApplicationId),
- applicationService.findByBranchNameAndDefaultApplicationId(finalBranchName, defaultApplicationId, MANAGE_APPLICATIONS)
- .onErrorResume(error -> {
- //if the branch does not exist in local, checkout remote branch
- return checkoutBranch(defaultApplicationId, finalBranchName);
- })
- .zipWhen(application -> importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL)))
+ getGitApplicationMetadata(defaultApplicationId),
+ applicationService.findByBranchNameAndDefaultApplicationId(finalBranchName, defaultApplicationId, MANAGE_APPLICATIONS)
+ .onErrorResume(error -> {
+ //if the branch does not exist in local, checkout remote branch
+ return checkoutBranch(defaultApplicationId, finalBranchName);
+ })
+ .zipWhen(application -> importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL)))
.flatMap(tuple -> {
GitApplicationMetadata defaultApplicationMetadata = tuple.getT1();
Application application = tuple.getT2().getT1();
@@ -1590,16 +1591,16 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
.thenReturn(repoSuffix);
return Mono.zip(
- Mono.just(defaultApplication),
- pathToFile
- )
- .onErrorResume(error -> {
- log.error("Error in repo status check application " + defaultApplicationId, error);
- if (error instanceof AppsmithException) {
- return Mono.error(error);
- }
- return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "status", error));
- });
+ Mono.just(defaultApplication),
+ pathToFile
+ )
+ .onErrorResume(error -> {
+ log.error("Error in repo status check application " + defaultApplicationId, error);
+ if (error instanceof AppsmithException) {
+ return Mono.error(error);
+ }
+ return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "status", error));
+ });
})
.flatMap(tuple -> {
Application defaultApplication = tuple.getT1();
@@ -1607,23 +1608,23 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
// 2. git checkout destinationBranch ---> git merge sourceBranch
return Mono.zip(
- gitExecutor.mergeBranch(repoSuffix, sourceBranch, destinationBranch),
- Mono.just(defaultApplication)
- )
- .onErrorResume(error -> addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_MERGE.getEventName(),
- defaultApplication,
- error.getClass().getName(),
- error.getMessage(),
- defaultApplication.getGitApplicationMetadata().getIsRepoPrivate()
- )
- .flatMap(application -> {
- if (error instanceof GitAPIException) {
- return Mono.error(new AppsmithException(AppsmithError.GIT_MERGE_CONFLICTS, error.getMessage()));
- }
- return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "merge", error.getMessage()));
- })
- );
+ gitExecutor.mergeBranch(repoSuffix, sourceBranch, destinationBranch),
+ Mono.just(defaultApplication)
+ )
+ .onErrorResume(error -> addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE.getEventName(),
+ defaultApplication,
+ error.getClass().getName(),
+ error.getMessage(),
+ defaultApplication.getGitApplicationMetadata().getIsRepoPrivate()
+ )
+ .flatMap(application -> {
+ if (error instanceof GitAPIException) {
+ return Mono.error(new AppsmithException(AppsmithError.GIT_MERGE_CONFLICTS, error.getMessage()));
+ }
+ return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "merge", error.getMessage()));
+ })
+ );
})
.flatMap(mergeStatusTuple -> {
Application defaultApplication = mergeStatusTuple.getT2();
@@ -1670,7 +1671,7 @@ public Mono<MergeStatusDTO> mergeBranch(String defaultApplicationId, GitMergeDTO
application,
application.getGitApplicationMetadata().getIsRepoPrivate()
)
- .thenReturn(mergeStatusDTO);
+ .thenReturn(mergeStatusDTO);
});
return Mono.create(sink -> mergeMono
@@ -1762,9 +1763,9 @@ public Mono<String> createConflictedBranch(String defaultApplicationId, String b
}
Mono<String> conflictedBranchMono = Mono.zip(
- getGitApplicationMetadata(defaultApplicationId),
- applicationService.findByBranchNameAndDefaultApplicationId(branchName, defaultApplicationId, MANAGE_APPLICATIONS)
- .zipWhen(application -> importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL)))
+ getGitApplicationMetadata(defaultApplicationId),
+ applicationService.findByBranchNameAndDefaultApplicationId(branchName, defaultApplicationId, MANAGE_APPLICATIONS)
+ .zipWhen(application -> importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL)))
.flatMap(tuple -> {
GitApplicationMetadata defaultApplicationMetadata = tuple.getT1();
Application application = tuple.getT2().getT1();
@@ -1835,12 +1836,12 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
boolean isRepoPrivate = tuple.getT2();
Mono<Application> applicationMono = applicationPageService
.createOrUpdateSuffixedApplication(newApplication, newApplication.getName(), 0);
- if(!isRepoPrivate) {
+ if (!isRepoPrivate) {
return Mono.just(gitAuth).zipWith(applicationMono);
}
return isRepoLimitReached(workspaceId, true)
.flatMap(isRepoLimitReached -> {
- if(Boolean.FALSE.equals(isRepoLimitReached)) {
+ if (Boolean.FALSE.equals(isRepoLimitReached)) {
return Mono.just(gitAuth).zipWith(applicationMono);
}
return addAnalyticsForGitOperation(
@@ -1929,14 +1930,14 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
List<Datasource> datasourceList = data.getT2();
List<Plugin> pluginList = data.getT3();
- if(Optional.ofNullable(applicationJson.getExportedApplication()).isEmpty()
+ if (Optional.ofNullable(applicationJson.getExportedApplication()).isEmpty()
|| applicationJson.getPageList().isEmpty()) {
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)) {
+ if (checkIsDatasourceNameConflict(datasourceList, applicationJson.getDatasourceList(), pluginList)) {
return deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
.then(Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED,
"import",
@@ -1949,7 +1950,7 @@ public Mono<ApplicationImportDTO> importApplicationFromGit(String workspaceId, G
.importApplicationInWorkspace(workspaceId, applicationJson, application.getId(), defaultBranch)
.onErrorResume(throwable ->
deleteApplicationCreatedFromGitImport(application.getId(), application.getWorkspaceId(), gitApplicationMetadata.getRepoName())
- .flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, throwable.getMessage())))
+ .flatMap(application1 -> Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, throwable.getMessage())))
);
});
})
@@ -2003,10 +2004,10 @@ public Mono<Boolean> testConnection(String defaultApplicationId) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
}
return gitExecutor.testConnection(
- gitApplicationMetadata.getGitAuth().getPublicKey(),
- gitApplicationMetadata.getGitAuth().getPrivateKey(),
- gitApplicationMetadata.getRemoteUrl()
- ).zipWith(Mono.just(application))
+ gitApplicationMetadata.getGitAuth().getPublicKey(),
+ gitApplicationMetadata.getGitAuth().getPrivateKey(),
+ gitApplicationMetadata.getRemoteUrl()
+ ).zipWith(Mono.just(application))
.onErrorResume(error -> {
log.error("Error while testing the connection to th remote repo " + gitApplicationMetadata.getRemoteUrl() + " ", error);
return addAnalyticsForGitOperation(
@@ -2046,24 +2047,24 @@ public Mono<Application> deleteBranch(String defaultApplicationId, String branch
.flatMap(application -> {
GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
Path repoPath = Paths.get(application.getWorkspaceId(), defaultApplicationId, gitApplicationMetadata.getRepoName());
- if(branchName.equals(gitApplicationMetadata.getDefaultBranchName())) {
+ if (branchName.equals(gitApplicationMetadata.getDefaultBranchName())) {
return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "delete branch", " Cannot delete default branch"));
}
return gitExecutor.deleteBranch(repoPath, branchName)
.onErrorResume(throwable -> {
log.error("Delete branch failed {}", throwable.getMessage());
- if(throwable instanceof CannotDeleteCurrentBranchException) {
+ if (throwable instanceof CannotDeleteCurrentBranchException) {
return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "delete branch", "Cannot delete current checked out branch"));
}
return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "delete branch", throwable.getMessage()));
})
.flatMap(isBranchDeleted -> {
- if(Boolean.FALSE.equals(isBranchDeleted)) {
+ if (Boolean.FALSE.equals(isBranchDeleted)) {
return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, " delete branch. Branch does not exists in the repo"));
}
return applicationService.findByBranchNameAndDefaultApplicationId(branchName, defaultApplicationId, MANAGE_APPLICATIONS)
.flatMap(application1 -> {
- if(application1.getId().equals(application1.getGitApplicationMetadata().getDefaultApplicationId())) {
+ if (application1.getId().equals(application1.getGitApplicationMetadata().getDefaultApplicationId())) {
return Mono.just(application1);
}
return applicationPageService.deleteApplicationByResource(application1);
@@ -2116,15 +2117,15 @@ public Mono<Application> discardChanges(String defaultApplicationId, String bran
}
Path repoSuffix = Paths.get(branchedApplication.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
return gitExecutor.checkoutToBranch(repoSuffix, branchName)
- .then(fileUtils.reconstructApplicationJsonFromGitRepo(
- branchedApplication.getWorkspaceId(),
- branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
- branchedApplication.getGitApplicationMetadata().getRepoName(),
- branchName)
- )
+ .then(fileUtils.reconstructApplicationJsonFromGitRepo(
+ branchedApplication.getWorkspaceId(),
+ branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
+ branchedApplication.getGitApplicationMetadata().getRepoName(),
+ branchName)
+ )
.flatMap(applicationJson ->
- importExportApplicationService
- .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
+ importExportApplicationService
+ .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
);
})
.flatMap(application -> this.addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCARD_CHANGES.getEventName(), application, null))
@@ -2140,13 +2141,14 @@ public Mono<Application> discardChanges(String defaultApplicationId, String bran
* In some scenarios:
* connect: after loading the modal, keyTypes is not available, so a network call has to be made to ssh-keypair.
* import: cannot make a ssh-keypair call because application Id doesn’t exist yet, so API fails.
+ *
* @return Git docs urls for all the scenarios, client will cache this data and use it
*/
@Override
public Mono<List<GitDocsDTO>> getGitDocUrls() {
ErrorReferenceDocUrl[] docSet = ErrorReferenceDocUrl.values();
List<GitDocsDTO> gitDocsDTOList = new ArrayList<>();
- for(ErrorReferenceDocUrl docUrl : docSet ) {
+ for (ErrorReferenceDocUrl docUrl : docSet) {
GitDocsDTO gitDocsDTO = new GitDocsDTO();
gitDocsDTO.setDocKey(docUrl);
gitDocsDTO.setDocUrl(docUrl.getDocUrl());
@@ -2172,29 +2174,29 @@ private boolean checkIsDatasourceNameConflict(List<Datasource> existingDatasourc
List<Datasource> importedDatasources,
List<Plugin> pluginList) {
// If we have an existing datasource with the same name but a different type from that in the repo, the import api should fail
- for( Datasource datasource : importedDatasources) {
+ for (Datasource datasource : importedDatasources) {
// Collect the datasource(existing in workspace) which has same as of imported datasource
// As names are unique we will need filter first element to check if the plugin id is matched
- Datasource filteredDatasource = existingDatasources
- .stream()
- .filter(datasource1 -> datasource1.getName().equals(datasource.getName()))
- .findFirst()
- .orElse(null);
-
- // Check if both of the datasource's are of the same plugin type
- if (filteredDatasource != null) {
- long matchCount = pluginList.stream()
- .filter(plugin -> {
- final String pluginReference = plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName();
-
- return plugin.getId().equals(filteredDatasource.getPluginId())
- && !datasource.getPluginId().equals(pluginReference);
- })
- .count();
- if (matchCount > 0) {
- return true;
- }
- }
+ Datasource filteredDatasource = existingDatasources
+ .stream()
+ .filter(datasource1 -> datasource1.getName().equals(datasource.getName()))
+ .findFirst()
+ .orElse(null);
+
+ // Check if both of the datasource's are of the same plugin type
+ if (filteredDatasource != null) {
+ long matchCount = pluginList.stream()
+ .filter(plugin -> {
+ final String pluginReference = plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName();
+
+ return plugin.getId().equals(filteredDatasource.getPluginId())
+ && !datasource.getPluginId().equals(pluginReference);
+ })
+ .count();
+ if (matchCount > 0) {
+ return true;
+ }
+ }
}
return false;
@@ -2220,11 +2222,11 @@ private Mono<String> commitAndPushWithDefaultCommit(Path repoSuffix,
})
.flatMap(commitMessage ->
gitExecutor.pushApplication(
- repoSuffix,
- gitApplicationMetadata.getRemoteUrl(),
- auth.getPublicKey(),
- auth.getPrivateKey(),
- gitApplicationMetadata.getBranchName())
+ repoSuffix,
+ gitApplicationMetadata.getRemoteUrl(),
+ auth.getPublicKey(),
+ auth.getPrivateKey(),
+ gitApplicationMetadata.getBranchName())
.map(pushResult -> {
if (pushResult.contains("REJECTED")) {
throw new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES);
@@ -2300,7 +2302,7 @@ public Mono<Long> getApplicationCountWithPrivateRepo(String workspaceId) {
*
* @param defaultApplication application which acts as the root for the concerned branch
* @param branchName branch for which the pull is required
- * @return pull DTO with updated application
+ * @return pull DTO with updated application
*/
private Mono<GitPullDTO> pullAndRehydrateApplication(Application defaultApplication, String branchName) {
@@ -2321,77 +2323,76 @@ private Mono<GitPullDTO> pullAndRehydrateApplication(Application defaultApplicat
.findByBranchNameAndDefaultApplicationId(branchName, defaultApplication.getId(), MANAGE_APPLICATIONS);
return branchedApplicationMono
- .flatMap(branchedApplication -> {
-
- // git checkout and pull origin branchName
- try {
- Mono<MergeStatusDTO> pullStatusMono = gitExecutor.checkoutToBranch(repoSuffix, branchName)
- .then(gitExecutor.pullApplication(
- repoSuffix,
- gitData.getRemoteUrl(),
- branchName,
- gitData.getGitAuth().getPrivateKey(),
- gitData.getGitAuth().getPublicKey()
- ))
- .onErrorResume(error -> {
- if(error.getMessage().contains("conflict")) {
- return Mono.error(new AppsmithException(AppsmithError.GIT_PULL_CONFLICTS, error.getMessage()));
- }
- else if (error.getMessage().contains("Nothing to fetch")) {
- MergeStatusDTO mergeStatus = new MergeStatusDTO();
- mergeStatus.setStatus("Nothing to fetch from remote. All changes are up to date.");
- mergeStatus.setMergeAble(true);
- return Mono.just(mergeStatus);
- }
- return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "pull", error.getMessage()));
- })
- .cache();
- // Rehydrate the application from file system
- Mono<ApplicationJson> applicationJsonMono = pullStatusMono
- .flatMap(status ->
- fileUtils.reconstructApplicationJsonFromGitRepo(
- branchedApplication.getWorkspaceId(),
- branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
- branchedApplication.getGitApplicationMetadata().getRepoName(),
- branchName
- )
- );
+ .flatMap(branchedApplication -> {
- return Mono.zip(pullStatusMono, Mono.just(branchedApplication), applicationJsonMono);
- } catch (IOException e) {
- return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, e.getMessage()));
- }
- })
- .flatMap(tuple -> {
- MergeStatusDTO status = tuple.getT1();
- Application branchedApplication = tuple.getT2();
- ApplicationJson applicationJson = tuple.getT3();
-
- // Get the latest application with all the changes
- // Commit and push changes to sync with remote
- return importExportApplicationService
- .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
- .flatMap(application -> addAnalyticsForGitOperation(
- AnalyticsEvents.GIT_PULL.getEventName(),
- application,
- application.getGitApplicationMetadata().getIsRepoPrivate()
+ // git checkout and pull origin branchName
+ try {
+ Mono<MergeStatusDTO> pullStatusMono = gitExecutor.checkoutToBranch(repoSuffix, branchName)
+ .then(gitExecutor.pullApplication(
+ repoSuffix,
+ gitData.getRemoteUrl(),
+ branchName,
+ gitData.getGitAuth().getPrivateKey(),
+ gitData.getGitAuth().getPublicKey()
+ ))
+ .onErrorResume(error -> {
+ if (error.getMessage().contains("conflict")) {
+ return Mono.error(new AppsmithException(AppsmithError.GIT_PULL_CONFLICTS, error.getMessage()));
+ } else if (error.getMessage().contains("Nothing to fetch")) {
+ MergeStatusDTO mergeStatus = new MergeStatusDTO();
+ mergeStatus.setStatus("Nothing to fetch from remote. All changes are up to date.");
+ mergeStatus.setMergeAble(true);
+ return Mono.just(mergeStatus);
+ }
+ return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "pull", error.getMessage()));
+ })
+ .cache();
+ // Rehydrate the application from file system
+ Mono<ApplicationJson> applicationJsonMono = pullStatusMono
+ .flatMap(status ->
+ fileUtils.reconstructApplicationJsonFromGitRepo(
+ branchedApplication.getWorkspaceId(),
+ branchedApplication.getGitApplicationMetadata().getDefaultApplicationId(),
+ branchedApplication.getGitApplicationMetadata().getRepoName(),
+ branchName
+ )
+ );
+
+ return Mono.zip(pullStatusMono, Mono.just(branchedApplication), applicationJsonMono);
+ } catch (IOException e) {
+ return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, e.getMessage()));
+ }
+ })
+ .flatMap(tuple -> {
+ MergeStatusDTO status = tuple.getT1();
+ Application branchedApplication = tuple.getT2();
+ ApplicationJson applicationJson = tuple.getT3();
+
+ // Get the latest application with all the changes
+ // Commit and push changes to sync with remote
+ return importExportApplicationService
+ .importApplicationInWorkspace(branchedApplication.getWorkspaceId(), applicationJson, branchedApplication.getId(), branchName)
+ .flatMap(application -> addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_PULL.getEventName(),
+ application,
+ application.getGitApplicationMetadata().getIsRepoPrivate()
)
- .thenReturn(application)
- )
- .flatMap(application -> {
- GitCommitDTO commitDTO = new GitCommitDTO();
- commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE + GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
- commitDTO.setDoPush(true);
-
- GitPullDTO gitPullDTO = new GitPullDTO();
- gitPullDTO.setMergeStatus(status);
- gitPullDTO.setApplication(responseUtils.updateApplicationWithDefaultResources(application));
-
- // Make commit and push after pull is successful to have a clean repo
- return this.commitApplication(commitDTO, application.getGitApplicationMetadata().getDefaultApplicationId(), branchName)
- .thenReturn(gitPullDTO);
- });
- });
+ .thenReturn(application)
+ )
+ .flatMap(application -> {
+ GitCommitDTO commitDTO = new GitCommitDTO();
+ commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE + GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
+ commitDTO.setDoPush(true);
+
+ GitPullDTO gitPullDTO = new GitPullDTO();
+ gitPullDTO.setMergeStatus(status);
+ gitPullDTO.setApplication(responseUtils.updateApplicationWithDefaultResources(application));
+
+ // Make commit and push after pull is successful to have a clean repo
+ return this.commitApplication(commitDTO, application.getGitApplicationMetadata().getDefaultApplicationId(), branchName)
+ .thenReturn(gitPullDTO);
+ });
+ });
}
private Mono<Application> addAnalyticsForGitOperation(String eventName, Application application, Boolean isRepoPrivate) {
@@ -2420,7 +2421,7 @@ private Mono<Application> addAnalyticsForGitOperation(String eventName,
analyticsProps.put("gitHostingProvider", GitUtils.getGitProviderName(gitData.getRemoteUrl()));
}
// Do not include the error data points in the map for success states
- if(!StringUtils.isEmptyOrNull(errorMessage) || !StringUtils.isEmptyOrNull(errorType)) {
+ if (!StringUtils.isEmptyOrNull(errorMessage) || !StringUtils.isEmptyOrNull(errorType)) {
analyticsProps.put("errorMessage", errorMessage);
analyticsProps.put("errorType", errorType);
}
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 f3604aab001a..a6efa251f7ec 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
@@ -59,14 +59,14 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
@Autowired
public NewPageServiceCEImpl(Scheduler scheduler,
- Validator validator,
- MongoConverter mongoConverter,
- ReactiveMongoTemplate reactiveMongoTemplate,
- NewPageRepository repository,
- AnalyticsService analyticsService,
- ApplicationService applicationService,
- UserDataService userDataService,
- ResponseUtils responseUtils) {
+ Validator validator,
+ MongoConverter mongoConverter,
+ ReactiveMongoTemplate reactiveMongoTemplate,
+ NewPageRepository repository,
+ AnalyticsService analyticsService,
+ ApplicationService applicationService,
+ UserDataService userDataService,
+ ResponseUtils responseUtils) {
super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
this.applicationService = applicationService;
this.userDataService = userDataService;
@@ -223,7 +223,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
}
return Mono.just(application);
}).flatMap(application -> {
- if(markApplicationAsRecentlyAccessed) {
+ if (markApplicationAsRecentlyAccessed) {
// add this application and workspace id to the recently used list in UserData
return userDataService.updateLastUsedAppAndWorkspaceList(application)
.thenReturn(application);
@@ -243,8 +243,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
applicationPages = application.getPages();
}
- for (ApplicationPage applicationPage:applicationPages)
- {
+ for (ApplicationPage applicationPage : applicationPages) {
if (Boolean.TRUE.equals(applicationPage.getIsDefault())) {
defaultPageId = applicationPage.getId();
}
@@ -264,7 +263,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
})
.flatMapMany(pageIds -> repository.findAllByIds(pageIds, READ_PAGES))
.collectList()
- .flatMap( pagesFromDb -> Mono.zip(
+ .flatMap(pagesFromDb -> Mono.zip(
Mono.just(pagesFromDb),
defaultPageIdMono,
applicationMono
@@ -278,14 +277,12 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
Map<String, Integer> pagesOrder = new HashMap<>();
Map<String, Integer> publishedPagesOrder = new HashMap<>();
- if(Boolean.TRUE.equals(view)) {
- for (int i = 0; i < publishedPages.size(); i++)
- {
+ if (Boolean.TRUE.equals(view)) {
+ for (int i = 0; i < publishedPages.size(); i++) {
publishedPagesOrder.put(publishedPages.get(i).getId(), i);
}
} else {
- for (int i = 0; i < pages.size(); i++)
- {
+ for (int i = 0; i < pages.size(); i++) {
pagesOrder.put(pages.get(i).getId(), i);
}
}
@@ -323,7 +320,7 @@ public Mono<ApplicationPagesDTO> findApplicationPagesByApplicationIdViewMode(Str
}
pageNameIdDTOList.add(pageNameIdDTO);
}
- if(Boolean.TRUE.equals(view)) {
+ if (Boolean.TRUE.equals(view)) {
Collections.sort(pageNameIdDTOList,
Comparator.comparing(item -> publishedPagesOrder.get(item.getId())));
} else {
@@ -445,7 +442,7 @@ public Mono<PageDTO> updatePage(String pageId, PageDTO page) {
.switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, pageId)))
.flatMap(dbPage -> {
copyNewFieldValuesIntoOldObject(page, dbPage.getUnpublishedPage());
- if(!StringUtils.isEmpty(page.getName())) {
+ if (!StringUtils.isEmpty(page.getName())) {
dbPage.getUnpublishedPage().setSlug(TextUtils.makeSlug(page.getName()));
}
return this.update(pageId, dbPage);
@@ -502,9 +499,9 @@ public Mono<String> getNameByPageId(String pageId, boolean isPublishedName) {
@Override
public Mono<NewPage> findByBranchNameAndDefaultPageId(String branchName, String defaultPageId, AclPermission permission) {
- if (StringUtils.isEmpty(defaultPageId)) {
+ if (!StringUtils.hasText(defaultPageId)) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
- } else if (StringUtils.isEmpty(branchName)) {
+ } else if (!StringUtils.hasText(branchName)) {
return this.findById(defaultPageId, permission)
.switchIfEmpty(Mono.error(
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, defaultPageId))
@@ -518,8 +515,8 @@ public Mono<NewPage> findByBranchNameAndDefaultPageId(String branchName, String
@Override
public Mono<String> findBranchedPageId(String branchName, String defaultPageId, AclPermission permission) {
- if (StringUtils.isEmpty(branchName)) {
- if (StringUtils.isEmpty(defaultPageId)) {
+ if (!StringUtils.hasText(branchName)) {
+ if (!StringUtils.hasText(defaultPageId)) {
return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID, defaultPageId));
}
return Mono.just(defaultPageId);
@@ -547,7 +544,7 @@ public Mono<String> findRootApplicationIdFromNewPage(String branchName, String d
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, defaultPageId + ", " + branchName))
)
.map(newPage -> {
- if(newPage.getDefaultResources() != null) {
+ if (newPage.getDefaultResources() != null) {
return newPage.getDefaultResources().getApplicationId();
} else {
return newPage.getApplicationId();
@@ -570,18 +567,19 @@ public Flux<NewPage> findPageSlugsByApplicationIds(List<String> applicationIds,
* If Application ID is present, it'll fetch all pages of that application in the provided mode.
* if Page ID is present, it'll fetch all pages of the corresponding Application.
* If both IDs are present, it'll use the Application ID only and ignore the Page ID
+ *
* @param applicationId Id of the application
- * @param pageId id of a page
- * @param branchName name of the current branch
- * @param mode In which mode it's in
+ * @param pageId id of a page
+ * @param branchName name of the current branch
+ * @param mode In which mode it's in
* @return List of ApplicationPagesDTO
*/
@Override
public Mono<ApplicationPagesDTO> findApplicationPages(String applicationId, String pageId, String branchName, ApplicationMode mode) {
boolean isViewMode = (mode == ApplicationMode.PUBLISHED);
- if(StringUtils.hasLength(applicationId)) {
+ if (StringUtils.hasLength(applicationId)) {
return findApplicationPagesByApplicationIdViewModeAndBranch(applicationId, branchName, isViewMode, true);
- } else if(StringUtils.hasLength(pageId)) {
+ } else if (StringUtils.hasLength(pageId)) {
return findRootApplicationIdFromNewPage(branchName, pageId)
.flatMap(rootApplicationId -> findApplicationPagesByApplicationIdViewModeAndBranch(rootApplicationId, branchName, isViewMode, true))
;
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 617679d986d7..75eb7a749910 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
@@ -82,6 +82,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -172,19 +173,19 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
Mono<Application> applicationMono =
// Find the application with appropriate permission
applicationService.findById(applicationId, permission)
- // Find the application without permissions if it is a template application
- .switchIfEmpty(applicationService.findByIdAndExportWithConfiguration(applicationId, TRUE))
- .switchIfEmpty(Mono.error(
- new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId))
- )
- .map(application -> {
- if (!TRUE.equals(application.getExportWithConfiguration())) {
- // Explicitly setting the boolean to avoid NPE for future checks
- application.setExportWithConfiguration(false);
- }
+ // Find the application without permissions if it is a template application
+ .switchIfEmpty(applicationService.findByIdAndExportWithConfiguration(applicationId, TRUE))
+ .switchIfEmpty(Mono.error(
+ new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId))
+ )
+ .map(application -> {
+ if (!TRUE.equals(application.getExportWithConfiguration())) {
+ // Explicitly setting the boolean to avoid NPE for future checks
+ application.setExportWithConfiguration(false);
+ }
- return application;
- });
+ return application;
+ });
// Set json schema version which will be used to check the compatibility while importing the JSON
applicationJson.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
@@ -270,8 +271,8 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
// Including updated pages list for git file storage
Instant newPageUpdatedAt = newPage.getUpdatedAt();
boolean isNewPageUpdated = isClientSchemaMigrated || isServerSchemaMigrated || applicationLastCommittedAt == null || newPageUpdatedAt == null || applicationLastCommittedAt.isBefore(newPageUpdatedAt);
- String newPageName = newPage.getUnpublishedPage() != null ? newPage.getUnpublishedPage().getName() : newPage.getPublishedPage() != null ? newPage.getPublishedPage().getName() : null;
- if(isNewPageUpdated && newPageName != null){
+ String newPageName = newPage.getUnpublishedPage() != null ? newPage.getUnpublishedPage().getName() : newPage.getPublishedPage() != null ? newPage.getPublishedPage().getName() : null;
+ if (isNewPageUpdated && newPageName != null) {
updatedPageSet.add(newPageName);
}
newPage.sanitiseToExportDBObject();
@@ -339,7 +340,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
String actionCollectionName = actionCollectionDTO != null ? actionCollectionDTO.getName() + NAME_SEPARATOR + actionCollectionDTO.getPageId() : null;
Instant actionCollectionUpdatedAt = actionCollection.getUpdatedAt();
boolean isActionCollectionUpdated = isClientSchemaMigrated || isServerSchemaMigrated || applicationLastCommittedAt == null || actionCollectionUpdatedAt == null || applicationLastCommittedAt.isBefore(actionCollectionUpdatedAt);
- if(isActionCollectionUpdated && actionCollectionName != null){
+ if (isActionCollectionUpdated && actionCollectionName != null) {
updatedActionCollectionSet.add(actionCollectionName);
}
actionCollection.sanitiseToExportDBObject();
@@ -407,7 +408,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
String newActionName = actionDTO != null ? actionDTO.getValidName() + NAME_SEPARATOR + actionDTO.getPageId() : null;
Instant newActionUpdatedAt = newAction.getUpdatedAt();
boolean isNewActionUpdated = isClientSchemaMigrated || isServerSchemaMigrated || applicationLastCommittedAt == null || newActionUpdatedAt == null || applicationLastCommittedAt.isBefore(newActionUpdatedAt);
- if(isNewActionUpdated && newActionName != null){
+ if (isNewActionUpdated && newActionName != null) {
updatedActionSet.add(newActionName);
}
newAction.sanitiseToExportDBObject();
@@ -421,7 +422,7 @@ public Mono<ApplicationJson> exportApplicationById(String applicationId, Seriali
// Save decrypted fields for datasources for internally used sample apps and templates only
// when serialising for file sharing
- if(TRUE.equals(application.getExportWithConfiguration()) && SerialiseApplicationObjective.SHARE.equals(serialiseFor)) {
+ if (TRUE.equals(application.getExportWithConfiguration()) && SerialiseApplicationObjective.SHARE.equals(serialiseFor)) {
// Save decrypted fields for datasources
Map<String, DecryptedSensitiveFields> decryptedFields = new HashMap<>();
applicationJson.getDatasourceList().forEach(datasource -> {
@@ -522,8 +523,8 @@ public Mono<ExportFileDTO> getApplicationFile(String applicationId, String branc
/**
* This function will take the Json filepart and saves the application in workspace
*
- * @param workspaceId workspace to which the application needs to be hydrated
- * @param filePart Json file which contains the entire application object
+ * @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
*/
public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspaceId, Part filePart) {
@@ -567,7 +568,8 @@ public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspace
((JsonArray) json.get("pageList"))
*/
- Type fileType = new TypeToken<ApplicationJson>() {}.getType();
+ Type fileType = new TypeToken<ApplicationJson>() {
+ }.getType();
ApplicationJson jsonFile = gson.fromJson(data, fileType);
return importApplicationInWorkspace(workspaceId, jsonFile)
.onErrorResume(error -> {
@@ -589,7 +591,7 @@ public Mono<ApplicationImportDTO> extractFileAndSaveApplication(String workspace
* This function will save the application to workspace from the application resource
*
* @param workspaceId workspace to which application is going to be stored
- * @param importedDoc application resource which contains necessary information to save the application
+ * @param importedDoc application resource which contains necessary information to save the application
* @return saved application in DB
*/
public Mono<Application> importApplicationInWorkspace(String workspaceId, ApplicationJson importedDoc) {
@@ -597,14 +599,15 @@ public Mono<Application> importApplicationInWorkspace(String workspaceId, Applic
}
public Mono<Application> importApplicationInWorkspace(String workspaceId,
- ApplicationJson applicationJson,
- String applicationId,
- String branchName) {
+ ApplicationJson applicationJson,
+ String applicationId,
+ String branchName) {
return importApplicationInWorkspace(workspaceId, applicationJson, applicationId, branchName, false);
}
/**
* validates whether a ApplicationJSON contains the required fields or not.
+ *
* @param importedDoc ApplicationJSON object that needs to be validated
* @return Name of the field that have error. Empty string otherwise
*/
@@ -626,11 +629,11 @@ private String validateApplicationJson(ApplicationJson importedDoc) {
/**
* This function will take the application reference object to hydrate the application in mongoDB
*
- * @param workspaceId workspace to which application is going to be stored
- * @param applicationJson application resource which contains necessary information to import the application
- * @param applicationId application which needs to be saved with the updated resources
- * @param branchName name of the branch of application with applicationId
- * @param appendToApp whether applicationJson will be appended to the existing app or not
+ * @param workspaceId workspace to which application is going to be stored
+ * @param applicationJson application resource which contains necessary information to import the application
+ * @param applicationId application which needs to be saved with the updated resources
+ * @param branchName name of the branch of application with applicationId
+ * @param appendToApp whether applicationJson will be appended to the existing app or not
* @return Updated application
*/
private Mono<Application> importApplicationInWorkspace(String workspaceId,
@@ -680,8 +683,8 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
.findAllByWorkspaceId(workspaceId, MANAGE_DATASOURCES)
.cache();
- assert importedApplication != null: "Received invalid application object!";
- if(importedApplication.getApplicationVersion() == null) {
+ assert importedApplication != null : "Received invalid application object!";
+ if (importedApplication.getApplicationVersion() == null) {
importedApplication.setApplicationVersion(ApplicationVersion.EARLIEST_VERSION);
}
@@ -760,7 +763,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
datasource.setWorkspaceId(workspaceId);
// Check if any decrypted fields are present for datasource
- if (importedDoc.getDecryptedFields()!= null
+ if (importedDoc.getDecryptedFields() != null
&& importedDoc.getDecryptedFields().get(datasource.getName()) != null) {
DecryptedSensitiveFields decryptedFields =
@@ -800,7 +803,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
applicationId))
)
.flatMap(existingApplication -> {
- if(appendToApp) {
+ if (appendToApp) {
// When we are appending the pages to the existing application
// e.g. import template we are only importing this in unpublished
// version. At the same time we want to keep the existing page ref
@@ -850,9 +853,9 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
}
// Import and save pages, also update the pages related fields in saved application
- assert importedNewPageList != null: "Unable to find pages in the imported application";
+ assert importedNewPageList != null : "Unable to find pages in the imported application";
- if(appendToApp) {
+ if (appendToApp) {
// add existing pages to importedApplication so that they are not lost
// when we update application from importedApplication
importedApplication.setPages(savedApp.getPages());
@@ -872,27 +875,27 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
);
Flux<NewPage> importedNewPagesMono;
- if(appendToApp) {
+ if (appendToApp) {
// we need to rename page if there is a conflict
// also need to remap the renamed page
importedNewPagesMono = updateNewPagesBeforeMerge(existingPagesMono, importedNewPageList)
- .flatMapMany(newToOldNameMap->
- importNewPageFlux.map(newPage -> {
- // we need to map the newly created page with old name
- // because other related resources e.g. actions will refer the page with old name
- String newPageName = newPage.getUnpublishedPage().getName();
- String oldPageName = newToOldNameMap.get(newPageName);
- if(!newPageName.equals(oldPageName)) {
- renamePageInActions(importedNewActionList, oldPageName, newPageName);
- renamePageInActionCollections(importedActionCollectionList, oldPageName, newPageName);
- unpublishedPages.stream()
- .filter(applicationPage -> oldPageName.equals(applicationPage.getId()))
- .findAny()
- .ifPresent(applicationPage -> applicationPage.setId(newPageName));
- }
- return newPage;
- })
- );
+ .flatMapMany(newToOldNameMap ->
+ importNewPageFlux.map(newPage -> {
+ // we need to map the newly created page with old name
+ // because other related resources e.g. actions will refer the page with old name
+ String newPageName = newPage.getUnpublishedPage().getName();
+ String oldPageName = newToOldNameMap.get(newPageName);
+ if (!newPageName.equals(oldPageName)) {
+ renamePageInActions(importedNewActionList, oldPageName, newPageName);
+ renamePageInActionCollections(importedActionCollectionList, oldPageName, newPageName);
+ unpublishedPages.stream()
+ .filter(applicationPage -> oldPageName.equals(applicationPage.getId()))
+ .findAny()
+ .ifPresent(applicationPage -> applicationPage.setId(newPageName));
+ }
+ return newPage;
+ })
+ );
} else {
importedNewPagesMono = importNewPageFlux;
}
@@ -915,7 +918,9 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
EDIT, unpublishedPages,
VIEW, publishedPages
);
- for(ApplicationPage applicationPage : unpublishedPages) {
+ Iterator<ApplicationPage> unpublishedPageItr = unpublishedPages.iterator();
+ while (unpublishedPageItr.hasNext()) {
+ ApplicationPage applicationPage = unpublishedPageItr.next();
NewPage newPage = pageNameMap.get(applicationPage.getId());
if (newPage == null) {
if (appendToApp) {
@@ -924,7 +929,7 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
continue;
}
log.debug("Unable to find the page during import for appId {}, with name {}", applicationId, applicationPage.getId());
- unpublishedPages.remove(applicationPage);
+ unpublishedPageItr.remove();
} else {
applicationPage.setId(newPage.getId());
applicationPage.setDefaultPageId(newPage.getDefaultResources().getPageId());
@@ -935,12 +940,14 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
}
}
- for(ApplicationPage applicationPage : publishedPages) {
+ Iterator<ApplicationPage> publishedPagesItr = publishedPages.iterator();
+ while (publishedPagesItr.hasNext()) {
+ ApplicationPage applicationPage = publishedPagesItr.next();
NewPage newPage = pageNameMap.get(applicationPage.getId());
if (newPage == null) {
log.debug("Unable to find the page during import for appId {}, with name {}", applicationId, applicationPage.getId());
if (!appendToApp) {
- publishedPages.remove(applicationPage);
+ publishedPagesItr.remove();
}
} else {
applicationPage.setId(newPage.getId());
@@ -1156,16 +1163,16 @@ private Mono<Application> importApplicationInWorkspace(String workspaceId,
}
private void renamePageInActions(List<NewAction> newActionList, String oldPageName, String newPageName) {
- for(NewAction newAction : newActionList) {
- if(newAction.getUnpublishedAction().getPageId().equals(oldPageName)) {
+ for (NewAction newAction : newActionList) {
+ if (newAction.getUnpublishedAction().getPageId().equals(oldPageName)) {
newAction.getUnpublishedAction().setPageId(newPageName);
}
}
}
private void renamePageInActionCollections(List<ActionCollection> actionCollectionList, String oldPageName, String newPageName) {
- for(ActionCollection actionCollection : actionCollectionList) {
- if(actionCollection.getUnpublishedCollection().getPageId().equals(oldPageName)) {
+ for (ActionCollection actionCollection : actionCollectionList) {
+ if (actionCollection.getUnpublishedCollection().getPageId().equals(oldPageName)) {
actionCollection.getUnpublishedCollection().setPageId(newPageName);
}
}
@@ -1175,7 +1182,7 @@ private void renamePageInActionCollections(List<ActionCollection> actionCollecti
* This function will respond with unique suffixed number for the entity to avoid duplicate names
*
* @param sourceEntity for which the suffixed number is required to avoid duplication
- * @param workspaceId workspace in which entity should be searched
+ * @param workspaceId workspace in which entity should be searched
* @return next possible number in case of duplication
*/
private Mono<String> getUniqueSuffixForDuplicateNameEntity(BaseDomain sourceEntity, String workspaceId) {
@@ -1197,11 +1204,11 @@ private Mono<String> getUniqueSuffixForDuplicateNameEntity(BaseDomain sourceEnti
* - set the policies for the page
* - update default resource ids along with branch-name if the application is connected to git
*
- * @param pages pagelist extracted from the imported JSON file
- * @param application saved application where pages needs to be added
- * @param branchName to which branch pages should be imported if application is connected to git
- * @param existingPages existing pages in DB if the application is connected to git
- * @return flux of saved pages in DB
+ * @param pages pagelist extracted from the imported JSON file
+ * @param application saved application where pages needs to be added
+ * @param branchName to which branch pages should be imported if application is connected to git
+ * @param existingPages existing pages in DB if the application is connected to git
+ * @return flux of saved pages in DB
*/
private Flux<NewPage> importAndSavePages(List<NewPage> pages,
Application application,
@@ -1253,7 +1260,7 @@ private Flux<NewPage> importAndSavePages(List<NewPage> pages,
existingPage.setDeletedAt(newPage.getDeletedAt());
existingPage.setDeleted(newPage.getDeleted());
return newPageService.save(existingPage);
- } else if(application.getGitApplicationMetadata() != null) {
+ } else if (application.getGitApplicationMetadata() != null) {
final String defaultApplicationId = application.getGitApplicationMetadata().getDefaultApplicationId();
return newPageService.findByGitSyncIdAndDefaultApplicationId(defaultApplicationId, newPage.getGitSyncId(), MANAGE_PAGES)
.switchIfEmpty(Mono.defer(() -> {
@@ -1286,24 +1293,22 @@ private Flux<NewPage> importAndSavePages(List<NewPage> pages,
* - update default resource ids along with branch-name if the application is connected to git
* - update the map of imported collectionIds to the actionIds in saved in DB
*
- * @param importedNewActionList action list extracted from the imported JSON file
- * @param existingActions actions already present in DB connected to the application
- * @param importedApplication imported and saved application in DB
- * @param branchName branch to which the actions needs to be saved if the application is connected to git
- * @param pageNameMap map of page name to saved page in DB
- * @param actionIdMap empty map which will be used to store actionIds from imported file to actual actionIds from DB
- * this will eventually be used to update on page load actions
- * @param pluginMap map of plugin name to saved plugin id in DB
- * @param datasourceMap map of plugin name to saved datasource id in DB
- * @param unpublishedCollectionIdToActionIdsMap
- * empty map which will be used to store unpublished collectionId from imported file to
- * actual actionIds from DB, format for value will be <defaultActionId, actionId>
- * for more details please check defaultToBranchedActionIdsMap {@link ActionCollectionDTO}
- * @param publishedCollectionIdToActionIdsMap
- * empty map which will be used to store published collectionId from imported file to
- * actual actionIds from DB, format for value will be <defaultActionId, actionId>
- * for more details please check defaultToBranchedActionIdsMap{@link ActionCollectionDTO}
- * @return saved actions in DB
+ * @param importedNewActionList action list extracted from the imported JSON file
+ * @param existingActions actions already present in DB connected to the application
+ * @param importedApplication imported and saved application in DB
+ * @param branchName branch to which the actions needs to be saved if the application is connected to git
+ * @param pageNameMap map of page name to saved page in DB
+ * @param actionIdMap empty map which will be used to store actionIds from imported file to actual actionIds from DB
+ * this will eventually be used to update on page load actions
+ * @param pluginMap map of plugin name to saved plugin id in DB
+ * @param datasourceMap map of plugin name to saved datasource id in DB
+ * @param unpublishedCollectionIdToActionIdsMap empty map which will be used to store unpublished collectionId from imported file to
+ * actual actionIds from DB, format for value will be <defaultActionId, actionId>
+ * for more details please check defaultToBranchedActionIdsMap {@link ActionCollectionDTO}
+ * @param publishedCollectionIdToActionIdsMap empty map which will be used to store published collectionId from imported file to
+ * actual actionIds from DB, format for value will be <defaultActionId, actionId>
+ * for more details please check defaultToBranchedActionIdsMap{@link ActionCollectionDTO}
+ * @return saved actions in DB
*/
private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionList,
List<NewAction> existingActions,
@@ -1373,7 +1378,7 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
existingAction.setDeletedAt(newAction.getDeletedAt());
existingAction.setDeleted(newAction.getDeleted());
return newActionService.save(existingAction);
- } else if(importedApplication.getGitApplicationMetadata() != null) {
+ } else if (importedApplication.getGitApplicationMetadata() != null) {
final String defaultApplicationId = importedApplication.getGitApplicationMetadata().getDefaultApplicationId();
return newActionRepository.findByGitSyncIdAndDefaultApplicationId(defaultApplicationId, newAction.getGitSyncId(), MANAGE_ACTIONS)
.switchIfEmpty(Mono.defer(() -> {
@@ -1448,18 +1453,17 @@ private Flux<NewAction> importAndSaveAction(List<NewAction> importedNewActionLis
* - save imported actionCollections with updated policies
* - update default resource ids along with branch-name if the application is connected to git
*
- * @param importedActionCollectionList action list extracted from the imported JSON file
- * @param existingActionCollections actions already present in DB connected to the application
- * @param importedApplication imported and saved application in DB
- * @param branchName branch to which the actions needs to be saved if the application is connected to git
- * @param pageNameMap map of page name to saved page in DB
- * @param pluginMap map of plugin name to saved plugin id in DB
+ * @param importedActionCollectionList action list extracted from the imported JSON file
+ * @param existingActionCollections actions already present in DB connected to the application
+ * @param importedApplication imported and saved application in DB
+ * @param branchName branch to which the actions needs to be saved if the application is connected to git
+ * @param pageNameMap map of page name to saved page in DB
+ * @param pluginMap map of plugin name to saved plugin id in DB
* @param unpublishedCollectionIdToActionIdsMap
- * @param publishedCollectionIdToActionIdsMap
- * map of importedCollectionId to saved actions in DB
- * <defaultActionId, actionId> for more details please check
- * defaultToBranchedActionIdsMap {@link ActionCollectionDTO}
- * @return tuple of imported actionCollectionId and saved actionCollection in DB
+ * @param publishedCollectionIdToActionIdsMap map of importedCollectionId to saved actions in DB
+ * <defaultActionId, actionId> for more details please check
+ * defaultToBranchedActionIdsMap {@link ActionCollectionDTO}
+ * @return tuple of imported actionCollectionId and saved actionCollection in DB
*/
private Flux<Tuple2<String, ActionCollection>> importAndSaveActionCollection(
List<ActionCollection> importedActionCollectionList,
@@ -1709,10 +1713,10 @@ private NewPage updatePageInActionCollection(ActionCollectionDTO collectionDTO,
/**
* This function will be used to sanitise datasource within the actionDTO
*
- * @param actionDTO for which the datasource needs to be sanitised as per import format expected
- * @param datasourceMap datasource id to name map
- * @param pluginMap plugin id to name map
- * @param workspaceId workspace in which the application supposed to be imported
+ * @param actionDTO for which the datasource needs to be sanitised as per import format expected
+ * @param datasourceMap datasource id to name map
+ * @param pluginMap plugin id to name map
+ * @param workspaceId workspace in which the application supposed to be imported
* @return
*/
private String sanitizeDatasourceInActionDTO(ActionDTO actionDTO,
@@ -1839,7 +1843,7 @@ private Mono<NewPage> mapActionAndCollectionIdWithPageLayout(NewPage page,
*
* @param existingDatasourceFlux already present datasource in the workspace
* @param datasource which will be checked against existing datasources
- * @param workspaceId workspace where duplicate datasource should be checked
+ * @param workspaceId workspace where duplicate datasource should be checked
* @return already present or brand new datasource depending upon the equality check
*/
private Mono<Datasource> createUniqueDatasourceIfNotPresent(Flux<Datasource> existingDatasourceFlux,
@@ -1919,7 +1923,7 @@ private Datasource updateAuthenticationDTO(Datasource datasource, DecryptedSensi
}
private Mono<Application> importThemes(Application application, ApplicationJson importedApplicationJson, boolean appendToApp) {
- if(appendToApp) {
+ if (appendToApp) {
// appending to existing app, theme should not change
return Mono.just(application);
}
@@ -1997,12 +2001,11 @@ public Mono<ApplicationImportDTO> getApplicationImportDTO(String applicationId,
}
/**
- *
- * @param applicationId default ID of the application where this ApplicationJSON is going to get merged with
- * @param branchName name of the branch of the application where this ApplicationJSON is going to get merged with
+ * @param applicationId default ID of the application where this ApplicationJSON is going to get merged with
+ * @param branchName name of the branch of the application where this ApplicationJSON is going to get merged with
* @param applicationJson ApplicationJSON of the application that will be merged to
- * @param pagesToImport Name of the pages that should be merged from the ApplicationJSON.
- * If null or empty, all pages will be merged.
+ * @param pagesToImport Name of the pages that should be merged from the ApplicationJSON.
+ * If null or empty, all pages will be merged.
* @return Merged Application
*/
@Override
@@ -2012,7 +2015,7 @@ public Mono<Application> mergeApplicationJsonWithApplication(String workspaceId,
ApplicationJson applicationJson,
List<String> pagesToImport) {
// Update the application JSON to prepare it for merging inside an existing application
- if(applicationJson.getExportedApplication() != null) {
+ if (applicationJson.getExportedApplication() != null) {
// setting some properties to null so that target application is not updated by these properties
applicationJson.getExportedApplication().setName(null);
applicationJson.getExportedApplication().setSlug(null);
@@ -2022,13 +2025,13 @@ public Mono<Application> mergeApplicationJsonWithApplication(String workspaceId,
}
// need to remove git sync id. Also filter pages if pageToImport is not empty
- if(applicationJson.getPageList() != null) {
+ if (applicationJson.getPageList() != null) {
List<ApplicationPage> applicationPageList = new ArrayList<>(applicationJson.getPageList().size());
List<String> pageNames = new ArrayList<>(applicationJson.getPageList().size());
List<NewPage> importedNewPageList = applicationJson.getPageList().stream()
.filter(newPage -> newPage.getUnpublishedPage() != null &&
- (CollectionUtils.isEmpty(pagesToImport) ||
- pagesToImport.contains(newPage.getUnpublishedPage().getName()))
+ (CollectionUtils.isEmpty(pagesToImport) ||
+ pagesToImport.contains(newPage.getUnpublishedPage().getName()))
)
.peek(newPage -> {
ApplicationPage applicationPage = new ApplicationPage();
@@ -2048,7 +2051,7 @@ public Mono<Application> mergeApplicationJsonWithApplication(String workspaceId,
// applicationJson.getPageOrder().addAll(pageNames);
// }
}
- if(applicationJson.getActionList() != null) {
+ if (applicationJson.getActionList() != null) {
List<NewAction> importedNewActionList = applicationJson.getActionList().stream()
.filter(newAction ->
newAction.getUnpublishedAction() != null &&
@@ -2058,7 +2061,7 @@ public Mono<Application> mergeApplicationJsonWithApplication(String workspaceId,
.collect(Collectors.toList());
applicationJson.setActionList(importedNewActionList);
}
- if(applicationJson.getActionCollectionList() != null) {
+ if (applicationJson.getActionCollectionList() != null) {
List<ActionCollection> importedActionCollectionList = applicationJson.getActionCollectionList().stream()
.filter(actionCollection ->
(CollectionUtils.isEmpty(pagesToImport) ||
@@ -2104,8 +2107,9 @@ private Mono<Map<String, String>> updateNewPagesBeforeMerge(Mono<List<NewPage>>
/**
* To send analytics event for import and export of application
+ *
* @param applicationId Id of application being imported or exported
- * @param event AnalyticsEvents event
+ * @param event AnalyticsEvents event
* @return The application which is imported or exported
*/
private Mono<Application> sendImportExportApplicationAnalyticsEvent(String applicationId, AnalyticsEvents event) {
|
7d8fca9545b6e5f8cabbeb5eb866e9c2745f21e4
|
2022-07-30 00:34:23
|
Vishnu Gp
|
chore: Fixed flaky ApplicationForkingServiceTests (#15550)
| false
|
Fixed flaky ApplicationForkingServiceTests (#15550)
|
chore
|
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 777a649add2d..f7689c08f2fa 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
@@ -999,12 +999,8 @@ public Mono<Application> publish(String applicationId, boolean isPublishedManual
.flatMap(actionCollectionService::save)
.collectList();
- return Mono.when(
- publishApplicationAndPages,
- publishedActionsListMono,
- publishedActionCollectionsListMono,
- publishThemeMono
- )
+ return publishApplicationAndPages
+ .flatMap(newPages -> Mono.zip(publishedActionsListMono, publishedActionCollectionsListMono, publishThemeMono))
.then(sendApplicationPublishedEvent(publishApplicationAndPages, publishedActionsListMono, publishedActionCollectionsListMono, applicationId, isPublishedManually));
}
|
2ec6610399df0966d9a772f37b43a35ff2f532a5
|
2023-05-20 06:19:33
|
Ankita Kinger
|
chore: Updating locators for EE tests (#23563)
| false
|
Updating locators for EE tests (#23563)
|
chore
|
diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json
index 9f2873427b05..d54ea5211fba 100644
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@@ -193,6 +193,7 @@
"selectedTextSize": ".t--property-control-textsize .bp3-popover-target .sub-text",
"colorPickerV2Popover": ".t--colorpicker-v2-popover",
"colorPickerV2Color": ".t--colorpicker-v2-color",
+ "colorPickerV2PopoverContent": "[data-testid=\"color-picker\"]",
"colorPickerV2TailwindColor": ".t--tailwind-colors .t--colorpicker-v2-color",
"modalCloseButton": ".t--draggable-iconbuttonwidget .bp3-button",
"filepickerwidgetv2": ".t--widget-filepickerwidgetv2",
diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js
index 6dc65532a41a..99804d54ba6e 100644
--- a/app/client/cypress/support/WorkspaceCommands.js
+++ b/app/client/cypress/support/WorkspaceCommands.js
@@ -160,7 +160,7 @@ Cypress.Commands.add("deleteUserFromWorkspace", (workspaceName) => {
cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.closest(homePage.workspaceCompleteSection)
- .find(homePage.workspaceNamePopover)
+ .scrollIntoView()
.find(homePage.optionsIcon)
.click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true });
@@ -191,7 +191,7 @@ Cypress.Commands.add(
cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
.closest(homePage.workspaceCompleteSection)
- .find(homePage.workspaceNamePopover)
+ .scrollIntoView()
.find(homePage.optionsIcon)
.click({ force: true });
cy.xpath(homePage.MemberSettings).click({ force: true });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 47d1f6ab5439..b300978d0cd0 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -200,7 +200,7 @@ Cypress.Commands.add("DeleteApp", (appName) => {
cy.get('button span[icon="chevron-down"]').should("be.visible");
cy.get(homePage.searchInput).clear().type(appName, { force: true });
cy.get(homePage.applicationCard).trigger("mouseover");
- cy.get(homePage.appMoreIcon)
+ cy.get("[data-testid=t--application-card-context-menu]")
.should("have.length", 1)
.first()
.click({ force: true });
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index fca8c32e5139..65072fe86ef1 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -580,6 +580,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
<MenuTrigger>
<Button
className="m-0.5"
+ data-testid="t--application-card-context-menu"
isIconButton
kind="tertiary"
size="sm"
|
d96fcae0d8a5d57e6f7524d2a013527c4e1a0b8b
|
2025-03-19 10:45:47
|
Abhijeet
|
chore: Remove hostname param from controller (#39768)
| false
|
Remove hostname param from controller (#39768)
|
chore
|
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 a2a3688a80a4..a7ad0f6967be 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
@@ -105,10 +105,9 @@ public Mono<ResponseDTO<Workspace>> deleteLogo(@PathVariable String workspaceId)
@JsonView(Views.Public.class)
@GetMapping("/home")
- public Mono<ResponseDTO<List<Workspace>>> workspacesForHome(
- @RequestHeader(name = "Host", required = false) String hostname) {
+ public Mono<ResponseDTO<List<Workspace>>> workspacesForHome() {
return userWorkspaceService
- .getUserWorkspacesByRecentlyUsedOrder(hostname)
+ .getUserWorkspacesByRecentlyUsedOrder()
.map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces));
}
}
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 e3e44ea8e48c..f336b8d28562 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
@@ -24,5 +24,5 @@ Mono<MemberInfoDTO> updatePermissionGroupForMember(
Mono<Boolean> isLastAdminRoleEntity(PermissionGroup permissionGroup);
- Mono<List<Workspace>> getUserWorkspacesByRecentlyUsedOrder(String hostname);
+ Mono<List<Workspace>> getUserWorkspacesByRecentlyUsedOrder();
}
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 a26bc14352ce..973b2ae25011 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
@@ -398,7 +398,7 @@ public Mono<Boolean> isLastAdminRoleEntity(PermissionGroup permissionGroup) {
* @return Mono of list of workspaces
*/
@Override
- public Mono<List<Workspace>> getUserWorkspacesByRecentlyUsedOrder(String hostname) {
+ public Mono<List<Workspace>> getUserWorkspacesByRecentlyUsedOrder() {
Mono<List<String>> workspaceIdsMono = userDataService
.getForCurrentUser()
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
index 90367c0fd3a4..2b03505764dc 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
@@ -248,7 +248,7 @@ public void getUserWorkspacesByRecentlyUsedOrder_noRecentWorkspaces_allEntriesAr
cleanup();
createDummyWorkspaces().blockLast();
- StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null))
+ StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder())
.assertNext(workspaces -> {
assertThat(workspaces).hasSize(4);
workspaces.forEach(workspace -> {
@@ -275,7 +275,7 @@ public void getUserWorkspacesByRecentlyUsedOrder_withRecentlyUsedWorkspaces_allE
userData.setRecentlyUsedEntityIds(recentlyUsedEntityDTOs);
doReturn(Mono.just(userData)).when(userDataService).getForCurrentUser();
- StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null))
+ StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder())
.assertNext(workspaces -> {
assertThat(workspaces).hasSize(4);
List<String> fetchedWorkspaceIds = new ArrayList<>();
|
eea5c0d3132627f41c8a557844deb397dc7fe4e7
|
2021-11-19 10:33:07
|
dependabot[bot]
|
chore: deps bump jackson-databind from 2.10.4 to 2.10.5.1 in googleSheetsPlugin(#9235)
| false
|
deps bump jackson-databind from 2.10.4 to 2.10.5.1 in googleSheetsPlugin(#9235)
|
chore
|
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
index 82fb4edce8a5..3182b97b0c14 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.4</version>
+ <version>2.10.5.1</version>
<scope>provided</scope>
</dependency>
|
0b0b978245e36329e5f24d5cdc2c42e89b5c70bd
|
2021-12-21 19:34:37
|
Nikhil Nandagopal
|
chore: Updated Template for CRUD DB template (#9913)
| false
|
Updated Template for CRUD DB template (#9913)
|
chore
|
diff --git a/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json
index 05f6f6501e9e..9e001b73b6b9 100644
--- a/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json
+++ b/app/server/appsmith-server/src/main/resources/CRUD-DB-Table-Template-Application.json
@@ -1 +1 @@
-{"unpublishedDefaultPageName":"PostgreSQL","datasourceList":[{"new":true,"invalids":[],"pluginId":"amazons3-plugin","isValid":true,"name":"AmazonS3 CRUD","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"host":""}],"properties":[{"value":"ap-south-1"},{"value":"amazon-s3","key":"s3Provider"},{"value":"","key":"customRegion"}]},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.215899Z","structure":{}},{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"Appsmith Prod","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; [email protected]; ajs_anonymous_id=13c846f6-970b-41e1-925f-f8f4a92ea315; [email protected]; ajs_anonymous_id=13c846f6-970b-41e1-925f-f8f4a92ea315; SESSION=274a44e7-9a92-4040-89b7-94b535fdb4ce; _gid=GA1.2.587330254.1634460265; _ga=GA1.2.572027528.1599035590; _ga_0JZ9C3M56S=GS1.1.1634882690.27.0.1634882690.0; _hjAbsoluteSessionInProgress=1; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNDg5MzAwODg3NiwibGFzdEV2ZW50VGltZSI6MTYzNDg5MzAwOTI0NCwiZXZlbnRJZCI6MTIwLCJpZGVudGlmeUlkIjo1LCJzZXF1ZW5jZU51bWJlciI6MTI1fQ==; _gat_UA-145062826-1=1; _hjIncludedInPageviewSample=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c0cf04a2f536-0ed498887bbbcb-1f3f6756-1aeaa0-17c0cf04a30de8%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22Nandagopal%22%2C%22%24name%22%3A%20%22Nikhil%20Nandagopal%22%2C%22%24search_engine%22%3A%20%22google%22%7D; intercom-session-y10e7138=eElubUVPbThWR3dsblFxZTZsNm01eUJNMHBSOVZocFRRay9xTVlNK00xSzd1d2gvWWlCSUVwMjJ2OHFJbmhVLy0tWXVuZmFxbGVZRStMRzljdXpkblhYUT09--46c8844c3b2d5b8f185a26da21b858fbbbba03e7","key":"Cookie"}],"properties":[{"value":"N","key":"isSendSessionEnabled"},{"value":"","key":"sessionSignatureKey"}],"url":"https://app.appsmith.com"},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.216545Z","structure":{}},{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"Appsmith Release","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"headers":[{"value":"_hjid=41cedd95-19f9-438a-8b6e-f2c4d7fb086b; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; SL_C_23361dd035530_VID=P3kBR7eMjg; ajs_anonymous_id=e6ef9c9b-3407-4374-81ab-6bafef26a4d1; [email protected]; intercom-id-y10e7138=50e190b7-b24e-4bef-b320-3c47a3c91006; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjIxNWJlMWRkLTNjMGQtNDY5NS05YzRmLTFjYTM4MjNhNzM5NlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNjI1ODEwMjkyNCwibGFzdEV2ZW50VGltZSI6MTYzNjI1ODEwMzE3MywiZXZlbnRJZCI6NSwiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjZ9; _ga=GA1.2.526957763.1633412376; _gid=GA1.2.1610516593.1636258104; _ga_0JZ9C3M56S=GS1.1.1636258103.3.1.1636258646.0; SESSION=09ae7c78-ca84-4a38-916a-f282893efb40; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c91e75170277-051d4ff86c77bb-1d3b6650-168000-17c91e75171dc2%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nidhi%40appsmith.com%22%2C%22userId%22%3A%20%22nidhi%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24email%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nidhi%22%2C%22%24last_name%22%3A%20%22Nair%22%2C%22%24name%22%3A%20%22Nidhi%20Nair%22%7D; SL_C_23361dd035530_SID=3VIjO5jKCt; intercom-session-y10e7138=WnhwMVl4VmVIUDFPVkgxUDVidm8wOXUzNjZ2elJ0OWx2a21Qc3NCYk1zenNEa0dzMkswWFlpanM4YXNxY2pQYi0taFpkWkR6K0xLUFJyUVFRSkMwZ3pUUT09--376a7fef0d7774b3284b94fb4c1ea1c8e2305afe; _hjAbsoluteSessionInProgress=1","key":"Cookie"}],"properties":[{"value":"N","key":"isSendSessionEnabled"},{"value":"","key":"sessionSignatureKey"}],"url":"https://release.app.appsmith.com"},"gitSyncId":"6171a062b7de236aa183ee0e_2021-11-10T11:51:27.577298Z","structure":{}},{"new":true,"invalids":[],"pluginId":"firestore-plugin","isValid":true,"name":"FBTemplateDB","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"url":"https://firebase-crud-template.firebaseio.com"},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.217138Z","structure":{}},{"new":true,"invalids":[],"pluginId":"google-sheets-plugin","isValid":true,"name":"Google Sheet","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.217600Z","structure":{}},{"new":true,"invalids":[],"pluginId":"postgres-plugin","isValid":true,"name":"Internal DB","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"port":5432,"host":"mockdb.internal.appsmith.com"}],"connection":{"mode":"READ_WRITE","ssl":{"authType":"DEFAULT"}}},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:32:49.762688Z","structure":{"tables":[{"schema":"public","columns":[{"defaultValue":"nextval('active_app_report_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"active_app","type":"text","isAutogenerated":false},{"name":"num_api_calls","type":"int8","isAutogenerated":false},{"name":"date","type":"text","isAutogenerated":false},{"name":"report_type","type":"text","isAutogenerated":false},{"name":"app_id","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"active_app_report_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"active_app_report\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"active_app_report\" (\"active_app\", \"num_api_calls\", \"date\", \"report_type\", \"app_id\")\n VALUES ('', 1, '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"active_app_report\" SET\n \"active_app\" = '',\n \"num_api_calls\" = 1,\n \"date\" = '',\n \"report_type\" = '',\n \"app_id\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"active_app_report\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.active_app_report","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('audit_logs_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"date","type":"timestamptz","isAutogenerated":false},{"name":"appId","type":"text","isAutogenerated":false},{"name":"appName","type":"text","isAutogenerated":false},{"name":"orgId","type":"text","isAutogenerated":false},{"name":"actionName","type":"text","isAutogenerated":false},{"name":"userId","type":"text","isAutogenerated":false},{"name":"pageId","type":"text","isAutogenerated":false},{"name":"insert_id","type":"text","isAutogenerated":false},{"name":"pageName","type":"text","isAutogenerated":false},{"name":"req","type":"json","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"audit_logs_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"audit_logs\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"audit_logs\" (\"date\", \"appId\", \"appName\", \"orgId\", \"actionName\", \"userId\", \"pageId\", \"insert_id\", \"pageName\", \"req\")\n VALUES (TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '', '', '', '', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"audit_logs\" SET\n \"date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"appId\" = '',\n \"appName\" = '',\n \"orgId\" = '',\n \"actionName\" = '',\n \"userId\" = '',\n \"pageId\" = '',\n \"insert_id\" = '',\n \"pageName\" = '',\n \"req\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"audit_logs\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.audit_logs","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('discord_messages_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"msg_id","type":"text","isAutogenerated":false},{"name":"created_at","type":"date","isAutogenerated":false},{"name":"author","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"discord_messages_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"discord_messages\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"discord_messages\" (\"msg_id\", \"created_at\", \"author\")\n VALUES ('', '2019-07-01', '');"},{"title":"UPDATE","body":"UPDATE public.\"discord_messages\" SET\n \"msg_id\" = '',\n \"created_at\" = '2019-07-01',\n \"author\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"discord_messages\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.discord_messages","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('email_issues_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"from","type":"text","isAutogenerated":false},{"name":"body","type":"text","isAutogenerated":false},{"name":"created_at","type":"timestamptz","isAutogenerated":false},{"name":"subject","type":"text","isAutogenerated":false},{"name":"is_tagged","type":"bool","isAutogenerated":false},{"name":"assignee","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"email_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"email_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"email_issues\" (\"from\", \"body\", \"created_at\", \"subject\", \"is_tagged\", \"assignee\")\n VALUES ('', '', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"email_issues\" SET\n \"from\" = '',\n \"body\" = '',\n \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"subject\" = '',\n \"is_tagged\" = '',\n \"assignee\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"email_issues\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.email_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_issues_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"issue_id","type":"text","isAutogenerated":false},{"name":"order","type":"int4","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"github_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_issues\" (\"issue_id\", \"order\")\n VALUES ('', 1);"},{"title":"UPDATE","body":"UPDATE public.\"github_issues\" SET\n \"issue_id\" = '',\n \"order\" = 1\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_issues\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_projects_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"github_id","type":"text","isAutogenerated":false},{"name":"due_date","type":"timestamptz","isAutogenerated":false},{"name":"tag","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"github_projects_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_projects\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_projects\" (\"github_id\", \"due_date\", \"tag\")\n VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '');"},{"title":"UPDATE","body":"UPDATE public.\"github_projects\" SET\n \"github_id\" = '',\n \"due_date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"tag\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_projects\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_projects","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('standup_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"name","type":"text","isAutogenerated":false},{"name":"yesterday","type":"text","isAutogenerated":false},{"name":"today","type":"text","isAutogenerated":false},{"name":"blocked","type":"text","isAutogenerated":false},{"name":"date","type":"date","isAutogenerated":false},{"name":"pod","type":"text","isAutogenerated":false},{"name":"dayrating","type":"int4","isAutogenerated":false},{"name":"restrating","type":"int4","isAutogenerated":false},{"name":"focusrating","type":"int4","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"standup_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"standup\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"standup\" (\"name\", \"yesterday\", \"today\", \"blocked\", \"date\", \"pod\", \"dayrating\", \"restrating\", \"focusrating\")\n VALUES ('', '', '', '', '2019-07-01', '', 1, 1, 1);"},{"title":"UPDATE","body":"UPDATE public.\"standup\" SET\n \"name\" = '',\n \"yesterday\" = '',\n \"today\" = '',\n \"blocked\" = '',\n \"date\" = '2019-07-01',\n \"pod\" = '',\n \"dayrating\" = 1,\n \"restrating\" = 1,\n \"focusrating\" = 1\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"standup\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.standup","type":"TABLE"},{"schema":"public","columns":[{"name":"id","type":"text","isAutogenerated":false},{"name":"assignee","type":"text","isAutogenerated":false},{"name":"state","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"support_email_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_email\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_email\" (\"id\", \"assignee\", \"state\")\n VALUES ('', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_email\" SET\n \"id\" = '',\n \"assignee\" = '',\n \"state\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_email\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_email","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('support_tickets_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"description","type":"varchar","isAutogenerated":false},{"name":"created_at","type":"timestamptz","isAutogenerated":false},{"name":"author","type":"text","isAutogenerated":false},{"name":"user","type":"text","isAutogenerated":false},{"name":"comments","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"support_tickets_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_tickets\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_tickets\" (\"description\", \"created_at\", \"author\", \"user\", \"comments\")\n VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_tickets\" SET\n \"description\" = '',\n \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"author\" = '',\n \"user\" = '',\n \"comments\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_tickets\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_tickets","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('template_table_col1_seq'::regclass)","name":"col1","type":"int4","isAutogenerated":true},{"name":"col3","type":"text","isAutogenerated":false},{"name":"col4","type":"int4","isAutogenerated":false},{"name":"col5","type":"bool","isAutogenerated":false},{"name":"col2","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["col1"],"name":"template_table_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"template_table\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"template_table\" (\"col3\", \"col4\", \"col5\", \"col2\")\n VALUES ('', 1, '', '');"},{"title":"UPDATE","body":"UPDATE public.\"template_table\" SET\n \"col3\" = '',\n \"col4\" = 1,\n \"col5\" = '',\n \"col2\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"template_table\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.template_table","type":"TABLE"},{"schema":"public","columns":[{"name":"age","type":"int4","isAutogenerated":false},{"name":"username","type":"varchar","isAutogenerated":false},{"name":"password","type":"varchar","isAutogenerated":false},{"name":"email","type":"varchar","isAutogenerated":false},{"name":"created_on","type":"timestamp","isAutogenerated":false},{"name":"last_login","type":"timestamp","isAutogenerated":false}],"keys":[],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"testuser\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"testuser\" (\"age\", \"username\", \"password\", \"email\", \"created_on\", \"last_login\")\n VALUES (1, '', '', '', TIMESTAMP '2019-07-01 10:00:00', TIMESTAMP '2019-07-01 10:00:00');"},{"title":"UPDATE","body":"UPDATE public.\"testuser\" SET\n \"age\" = 1,\n \"username\" = '',\n \"password\" = '',\n \"email\" = '',\n \"created_on\" = TIMESTAMP '2019-07-01 10:00:00',\n \"last_login\" = TIMESTAMP '2019-07-01 10:00:00'\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"testuser\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.testuser","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('ticket_tags_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"ticket_id","type":"int4","isAutogenerated":false},{"name":"github_tag_id","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"ticket_tags_pkey","type":"primary key"},{"fromColumns":["ticket_id"],"name":"ticket_id_fk","toColumns":["support_tickets.id"],"type":"foreign key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"ticket_tags\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"ticket_tags\" (\"ticket_id\", \"github_tag_id\")\n VALUES (1, '');"},{"title":"UPDATE","body":"UPDATE public.\"ticket_tags\" SET\n \"ticket_id\" = 1,\n \"github_tag_id\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"ticket_tags\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.ticket_tags","type":"TABLE"}]}},{"new":true,"invalids":[],"pluginId":"mongo-plugin","isValid":true,"name":"Mock Mongo","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[],"connection":{"mode":"READ_WRITE","type":"DIRECT","ssl":{"authType":"DEFAULT"}},"properties":[{"value":"Yes","key":"Use Mongo Connection String URI"},{"value":"mongodb+srv://mockdb-admin:****@mockdb.swrsq.mongodb.net/admin_db?retryWrites=true&w=majority","key":"Connection String URI"}]},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.219586Z","structure":{"tables":[{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"col1","type":"String","isAutogenerated":false},{"name":"col2","type":"String","isAutogenerated":false},{"name":"col3","type":"String","isAutogenerated":false},{"name":"col4","type":"String","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"col1\": \"test\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"template_table","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"template_table\",\n \"filter\": {\n \"col1\": \"test\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"template_table","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"template_table\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"col1\": \"new value\",\n \"col2\": \"new value\",\n \"col3\": \"new value\",\n \"col4\": \"new value\",\n}]"},"collection":"template_table","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"template_table\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"col1\": \"new value\",\n \"col2\": \"new value\",\n \"col3\": \"new value\",\n \"col4\": \"new value\",\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"col1\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"template_table","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"template_table\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"col1\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"template_table","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"template_table\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"template_table","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"email","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"role","type":"String","isAutogenerated":false},{"name":"status","type":"Object","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"email\": \"[email protected]\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"users","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"users\",\n \"filter\": {\n \"email\": \"[email protected]\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"users","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"users\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"email\": \"new value\",\n \"name\": \"new value\",\n \"role\": \"new value\",\n \"status\": {},\n}]"},"collection":"users","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"users\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"email\": \"new value\",\n \"name\": \"new value\",\n \"role\": \"new value\",\n \"status\": {},\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"email\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"users","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"users\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"email\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"users","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"users\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"users","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"currentLimit","type":"Integer","isAutogenerated":false},{"name":"featureName","type":"String","isAutogenerated":false},{"name":"key","type":"Integer","isAutogenerated":false},{"name":"limit","type":"Integer","isAutogenerated":false},{"name":"subscriptionId","type":"ObjectId","isAutogenerated":true}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"featureName\": \"Okuneva Inc\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"orgs","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"orgs\",\n \"filter\": {\n \"featureName\": \"Okuneva Inc\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"orgs","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"orgs\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currentLimit\": 1,\n \"featureName\": \"new value\",\n \"key\": 1,\n \"limit\": 1,\n \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},"collection":"orgs","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"orgs\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currentLimit\": 1,\n \"featureName\": \"new value\",\n \"key\": 1,\n \"limit\": 1,\n \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"featureName\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"orgs","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"orgs\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"featureName\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"orgs","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"orgs\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"orgs","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"createdBy","type":"ObjectId","isAutogenerated":true},{"name":"domain","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"numUsers","type":"Integer","isAutogenerated":false},{"name":"orgId","type":"ObjectId","isAutogenerated":true}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"domain\": \"adolph.biz\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"apps","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"apps\",\n \"filter\": {\n \"domain\": \"adolph.biz\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"apps","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"apps\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n \"domain\": \"new value\",\n \"name\": \"new value\",\n \"numUsers\": 1,\n \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},"collection":"apps","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"apps\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n \"domain\": \"new value\",\n \"name\": \"new value\",\n \"numUsers\": 1,\n \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"domain\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"apps","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"apps\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"domain\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"apps","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"apps\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"apps","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"currency","type":"String","isAutogenerated":false},{"name":"mrr","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"renewalDate","type":"Date","isAutogenerated":false},{"name":"status","type":"String","isAutogenerated":false},{"name":"statusOfApp","type":"Object","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"currency\": \"RUB\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"subscriptions","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"subscriptions\",\n \"filter\": {\n \"currency\": \"RUB\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"subscriptions","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"subscriptions\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currency\": \"new value\",\n \"mrr\": \"new value\",\n \"name\": \"new value\",\n \"renewalDate\": new Date(\"2019-07-01\"),\n \"status\": \"new value\",\n \"statusOfApp\": {},\n}]"},"collection":"subscriptions","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"subscriptions\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currency\": \"new value\",\n \"mrr\": \"new value\",\n \"name\": \"new value\",\n \"renewalDate\": new Date(\"2019-07-01\"),\n \"status\": \"new value\",\n \"statusOfApp\": {},\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"currency\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"subscriptions","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"subscriptions\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"currency\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"subscriptions","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"subscriptions\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"subscriptions","type":"COLLECTION"}]}},{"new":true,"invalids":[],"pluginId":"redis-plugin","isValid":true,"name":"RedisTemplateApps","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"datasourceConfiguration":{"endpoints":[{"port":10339,"host":"redis-10339.c278.us-east-1-4.ec2.cloud.redislabs.com"}]},"gitSyncId":"6171a062b7de236aa183ee0e_2021-10-25T06:33:34.231499Z","structure":{}}],"actionList":[{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE col2 like '%{{Table1.searchText || \"\"}}%'\nORDER BY {{col_select.selectedOptionValue}} {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3644","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE col2 like '%{{Table1.searchText || \"\"}}%'\nORDER BY {{col_select.selectedOptionValue}} {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596618Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\tcol1,\n\tcol2, \n\tcol3,\n\tcol4, \n\tcol5\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3647","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\tcol1,\n\tcol2, \n\tcol3,\n\tcol4, \n\tcol5\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596646Z"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc364a","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596652Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name}}","paginationType":"NONE","timeoutInMillisecond":100000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{{FilePicker.files[this.params.fileIndex]}}"},"userPermissions":[],"pageId":"S3","invalids":["'Query timeout' field must be an integer between 0 and 60000"],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name","FilePicker.files[this.params.fileIndex]"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"CreateFile","name":"CreateFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc364c","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name}}","paginationType":"NONE","timeoutInMillisecond":100000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{{FilePicker.files[this.params.fileIndex]}}"},"userPermissions":[],"pageId":"S3","invalids":["'Query timeout' field must be an integer between 0 and 60000"],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name","FilePicker.files[this.params.fileIndex]"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"CreateFile","name":"CreateFile","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596656Z"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc364b","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596654Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) } }},\n\t\"branch\": \"{{branch_input.text}}\"\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"validName":"update_template","name":"update_template","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc364e","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) } }},\n\t\"branch\": \"{{branch_input.text}}\"\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"validName":"update_template","name":"update_template","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596660Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"{{search_input.text}}","where":{"condition":"AND","children":[{"condition":"EQ"}]},"expiry":"{{ 60 * 24 }}","signedUrl":"YES","unSignedUrl":"YES"},"delete":{"expiry":"5"},"command":"LIST"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"formData.list.prefix"},{"key":"formData.list.expiry"}],"confirmBeforeExecute":false,"jsonPathKeys":["60 * 24","search_input.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ListFiles","name":"ListFiles","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc364d","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"{{search_input.text}}","where":{"condition":"AND","children":[{"condition":"EQ"}]},"expiry":"{{ 60 * 24 }}","signedUrl":"YES","unSignedUrl":"YES"},"delete":{"expiry":"5"},"command":"LIST"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"formData.list.prefix"},{"key":"formData.list.expiry"}],"confirmBeforeExecute":false,"jsonPathKeys":["60 * 24","search_input.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ListFiles","name":"ListFiles","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596658Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"/api/v1/applications/export/61764fbeba7e887d03bc3631","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"get_exported_app","name":"get_exported_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc364f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"/api/v1/applications/export/61764fbeba7e887d03bc3631","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"get_exported_app","name":"get_exported_app","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596662Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Prod","userPermissions":[]},"validName":"get_datasource_structure","name":"get_datasource_structure","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3650","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Prod","userPermissions":[]},"validName":"get_datasource_structure","name":"get_datasource_structure","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596664Z"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"},{"value":[{}],"key":"where"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc3648","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"},{"value":[{}],"key":"where"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596649Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE col1 = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3645","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE col1 = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596641Z"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.triggeredRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","data_table.triggeredRow.rowIndex","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc3649","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.triggeredRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","data_table.triggeredRow.rowIndex","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596650Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{tableName_input.text}}\",\n \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_sql_app","name":"generate_sql_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3651","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{tableName_input.text}}\",\n \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_sql_app","name":"generate_sql_app","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596666Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\tcol2 = '{{update_col_2.text}}',\n col3 = '{{update_col_3.text}}',\n col4 = '{{update_col_4.text}}',\n col5 = '{{update_col_5.text}}'\n WHERE col1 = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3646","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\tcol2 = '{{update_col_2.text}}',\n col3 = '{{update_col_3.text}}',\n col4 = '{{update_col_4.text}}',\n col5 = '{{update_col_5.text}}'\n WHERE col1 = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596644Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"find":{"query":"{ col2: /{{data_table.searchText||\"\"}}/i }","limit":"{{data_table.pageSize}}","skip":"{{(data_table.pageNo - 1) * data_table.pageSize}}","sort":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"FIND","smartSubstitution":false}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.find.sort"},{"key":"formData.find.skip"},{"key":"formData.find.limit"},{"key":"formData.find.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"FindQuery","name":"FindQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3652","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"find":{"query":"{ col2: /{{data_table.searchText||\"\"}}/i }","limit":"{{data_table.pageSize}}","skip":"{{(data_table.pageNo - 1) * data_table.pageSize}}","sort":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"FIND","smartSubstitution":false}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.find.sort"},{"key":"formData.find.skip"},{"key":"formData.find.limit"},{"key":"formData.find.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"FindQuery","name":"FindQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596668Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table/{{data_table.selectedRow._ref}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"collection":"template_table","delete":{"query":"{ _id: ObjectId('{{data_table.triggeredRow._id}}') }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.delete.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._ref","data_table.triggeredRow._id"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3653","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table/{{data_table.selectedRow._ref}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"collection":"template_table","delete":{"query":"{ _id: ObjectId('{{data_table.triggeredRow._id}}') }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.delete.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._ref","data_table.triggeredRow._id"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596669Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"query":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }","limit":"SINGLE","update":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"UPDATE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.updateMany.query"},{"key":"formData.updateMany.update"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3654","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"query":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }","limit":"SINGLE","update":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"UPDATE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.updateMany.query"},{"key":"formData.updateMany.update"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596671Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"insert":{"documents":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"INSERT","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.insert.documents"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3655","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"insert":{"documents":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"INSERT","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.insert.documents"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596673Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_mongo_app","name":"generate_mongo_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3656","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_mongo_app","name":"generate_mongo_app","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596675Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_gsheet_app","name":"generate_gsheet_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3657","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_gsheet_app","name":"generate_gsheet_app","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596677Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","command":"DELETE_FILE"},"body":"{\n\t\"data\": \"null\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"DeleteFile","name":"DeleteFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc3658","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","command":"DELETE_FILE"},"body":"{\n\t\"data\": \"null\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"DeleteFile","name":"DeleteFile","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596679Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{update_file_name.text}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","where":{"children":[{"condition":"EQ"}]},"expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{\n\t\"data\": \"{{update_file_picker.files.length ? update_file_picker.files[0].data : \"\" }}\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_file_picker.files.length ? update_file_picker.files[0].data : \"\"","update_file_name.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"UpdateFile","name":"UpdateFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc365a","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{update_file_name.text}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","where":{"children":[{"condition":"EQ"}]},"expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{\n\t\"data\": \"{{update_file_picker.files.length ? update_file_picker.files[0].data : \"\" }}\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_file_picker.files.length ? update_file_picker.files[0].data : \"\"","update_file_name.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"UpdateFile","name":"UpdateFile","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596688Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"READ_FILE"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ReadFile","name":"ReadFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc3659","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"READ_FILE"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ReadFile","name":"ReadFile","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596686Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{data_table.selectedRow._ref.path}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"col1\": \"{{update_col_1.text}}\",\n\t\"col2\": \"{{update_col_2.text}}\",\n\t\"col3\": \"{{update_col_3.text}}\",\n\t\"col4\": \"{{update_col_4.text}}\",\n\t\"col5\": \"{{update_col_5.text}}\"\n}","pluginSpecifiedTemplates":[{"value":"UPDATE_DOCUMENT"},{"value":"FORM"},{"value":"UPDATE"},null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},{"value":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._ref.path","update_col_1.text","update_col_5.text","data_table.selectedRow._id","update_col_4.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365b","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{data_table.selectedRow._ref.path}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"col1\": \"{{update_col_1.text}}\",\n\t\"col2\": \"{{update_col_2.text}}\",\n\t\"col3\": \"{{update_col_3.text}}\",\n\t\"col4\": \"{{update_col_4.text}}\",\n\t\"col5\": \"{{update_col_5.text}}\"\n}","pluginSpecifiedTemplates":[{"value":"UPDATE_DOCUMENT"},{"value":"FORM"},{"value":"UPDATE"},null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},{"value":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},null,null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._ref.path","update_col_1.text","update_col_5.text","data_table.selectedRow._id","update_col_4.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596690Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{data_table.triggeredRow._ref.path}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_DOCUMENT"},{"value":"FORM"},{"value":"DELETE"},null,null,null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow._ref.path","data_table.selectedRow._id"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365c","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{data_table.triggeredRow._ref.path}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_DOCUMENT"},{"value":"FORM"},{"value":"DELETE"},null,null,null,null,null,null,null,null,null,null,{"value":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }"},null,null,null,null,null,{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow._ref.path","data_table.selectedRow._id"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596692Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"col1\": \"{{insert_col_input1.text}}\",\n\t\"col2\": \"{{insert_col_input2.text}}\",\n\t\"col3\": \"{{insert_col_input3.text}}\",\n\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\"col5\": \"{{insert_col_input5.text}}\"\n}","pluginSpecifiedTemplates":[{"value":"ADD_TO_COLLECTION"},{"value":"FORM"},{"value":"INSERT"},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,{"value":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365d","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"col1\": \"{{insert_col_input1.text}}\",\n\t\"col2\": \"{{insert_col_input2.text}}\",\n\t\"col3\": \"{{insert_col_input3.text}}\",\n\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\"col5\": \"{{insert_col_input5.text}}\"\n}","pluginSpecifiedTemplates":[{"value":"ADD_TO_COLLECTION"},{"value":"FORM"},{"value":"INSERT"},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,{"value":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},{"value":"template_table"},{"value":"SINGLE"},{"value":"SINGLE"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596714Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"keys *"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchKeys","name":"FetchKeys","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc365f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"keys *"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchKeys","name":"FetchKeys","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596722Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"template_table","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET_COLLECTION","key":"method"},{"value":"[\"{{order_select.selectedOptionValue + key_select.selectedOptionValue}}\"]","key":"orderBy"},{"value":"1","key":"limit"},{"key":"whereConditionTuples"},null,null,{"value":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","key":"limit"},{"value":"{{SelectQuery.data[0]}}","key":"limit"},{"value":"","key":"timestampValuePath"},{"value":"","key":"deleteKeyValuePairPath"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[7].value"},{"key":"pluginSpecifiedTemplates[1].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365e","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"template_table","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET_COLLECTION","key":"method"},{"value":"[\"{{order_select.selectedOptionValue + key_select.selectedOptionValue}}\"]","key":"orderBy"},{"value":"1","key":"limit"},{"key":"whereConditionTuples"},null,null,{"value":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","key":"limit"},{"value":"{{SelectQuery.data[0]}}","key":"limit"},{"value":"","key":"timestampValuePath"},{"value":"","key":"deleteKeyValuePairPath"}]},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[7].value"},{"key":"pluginSpecifiedTemplates[1].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596720Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{insert_key_input.text}} \"{{insert_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_key_input.text","insert_value_input.text"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"InsertKey","name":"InsertKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3660","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{insert_key_input.text}} \"{{insert_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_key_input.text","insert_value_input.text"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"InsertKey","name":"InsertKey","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596725Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{data_table.selectedRow.result}} \"{{update_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_value_input.text","data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"UpdateKey","name":"UpdateKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3661","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{data_table.selectedRow.result}} \"{{update_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_value_input.text","data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"UpdateKey","name":"UpdateKey","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596728Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"del {{data_table.triggeredRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"DeleteKey","name":"DeleteKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3662","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"del {{data_table.triggeredRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"DeleteKey","name":"DeleteKey","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596730Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"GET {{data_table.selectedRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchValue","name":"FetchValue","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3663","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"GET {{data_table.selectedRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchValue","name":"FetchValue","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596733Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE \"col1\" = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3664","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE \"col1\" = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596735Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n \"col3\" = '{{update_col_3.text}}',\n \"col4\" = '{{update_col_4.text}}',\n \"col5\" = '{{update_col_5.text}}'\n WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3665","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n \"col3\" = '{{update_col_3.text}}',\n \"col4\" = '{{update_col_4.text}}',\n \"col5\" = '{{update_col_5.text}}'\n WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596737Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col2\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3666","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col2\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596740Z"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3667","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.596742Z"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/users/me","headers":[{"value":"_hjid=41cedd95-19f9-438a-8b6e-f2c4d7fb086b; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; SL_C_23361dd035530_VID=P3kBR7eMjg; ajs_anonymous_id=e6ef9c9b-3407-4374-81ab-6bafef26a4d1; [email protected]; intercom-id-y10e7138=50e190b7-b24e-4bef-b320-3c47a3c91006; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjIxNWJlMWRkLTNjMGQtNDY5NS05YzRmLTFjYTM4MjNhNzM5NlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNjI1ODEwMjkyNCwibGFzdEV2ZW50VGltZSI6MTYzNjI1ODEwMzE3MywiZXZlbnRJZCI6NSwiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjZ9; _ga=GA1.2.526957763.1633412376; _gid=GA1.2.1610516593.1636258104; _ga_0JZ9C3M56S=GS1.1.1636258103.3.1.1636258646.0; SESSION=09ae7c78-ca84-4a38-916a-f282893efb40; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c91e75170277-051d4ff86c77bb-1d3b6650-168000-17c91e75171dc2%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nidhi%40appsmith.com%22%2C%22userId%22%3A%20%22nidhi%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24email%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nidhi%22%2C%22%24last_name%22%3A%20%22Nair%22%2C%22%24name%22%3A%20%22Nidhi%20Nair%22%7D; SL_C_23361dd035530_SID=3VIjO5jKCt; intercom-session-y10e7138=WnhwMVl4VmVIUDFPVkgxUDVidm8wOXUzNjZ2elJ0OWx2a21Qc3NCYk1zenNEa0dzMkswWFlpanM4YXNxY2pQYi0taFpkWkR6K0xLUFJyUVFRSkMwZ3pUUT09--376a7fef0d7774b3284b94fb4c1ea1c8e2305afe; _hjAbsoluteSessionInProgress=1","key":"Cookie"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"Api1","name":"Api1","messages":[]},"pluginId":"restapi-plugin","id":"618bb2fe4c4b7031f0bf5f0f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/users/me","headers":[{"value":"_hjid=41cedd95-19f9-438a-8b6e-f2c4d7fb086b; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; SL_C_23361dd035530_VID=P3kBR7eMjg; ajs_anonymous_id=e6ef9c9b-3407-4374-81ab-6bafef26a4d1; [email protected]; intercom-id-y10e7138=50e190b7-b24e-4bef-b320-3c47a3c91006; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjIxNWJlMWRkLTNjMGQtNDY5NS05YzRmLTFjYTM4MjNhNzM5NlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNjI1ODEwMjkyNCwibGFzdEV2ZW50VGltZSI6MTYzNjI1ODEwMzE3MywiZXZlbnRJZCI6NSwiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjZ9; _ga=GA1.2.526957763.1633412376; _gid=GA1.2.1610516593.1636258104; _ga_0JZ9C3M56S=GS1.1.1636258103.3.1.1636258646.0; SESSION=09ae7c78-ca84-4a38-916a-f282893efb40; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c91e75170277-051d4ff86c77bb-1d3b6650-168000-17c91e75171dc2%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nidhi%40appsmith.com%22%2C%22userId%22%3A%20%22nidhi%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24email%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nidhi%22%2C%22%24last_name%22%3A%20%22Nair%22%2C%22%24name%22%3A%20%22Nidhi%20Nair%22%7D; SL_C_23361dd035530_SID=3VIjO5jKCt; intercom-session-y10e7138=WnhwMVl4VmVIUDFPVkgxUDVidm8wOXUzNjZ2elJ0OWx2a21Qc3NCYk1zenNEa0dzMkswWFlpanM4YXNxY2pQYi0taFpkWkR6K0xLUFJyUVFRSkMwZ3pUUT09--376a7fef0d7774b3284b94fb4c1ea1c8e2305afe; _hjAbsoluteSessionInProgress=1","key":"Cookie"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"Api1","name":"Api1","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_2021-11-10T11:54:38.475593Z"}],"unpublishedLayoutmongoEscapedWidgets":{"61764fbeba7e887d03bc3637":["data_table"]},"pageList":[{"publishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3632","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3644"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"2jj0197tff","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"kby34l9nbb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":42,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03b365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"sql","isHidden":false},"new":true,"unpublishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3632","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3644"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"2jj0197tff","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"kby34l9nbb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":42,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03b365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"sql","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T17:58:43.998501Z"},{"publishedPage":{"name":"Google Sheets","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3633","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3648"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":44,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"tableData"},{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.rowIndex))}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"typ9jslblf","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"8b67sbqskr","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() =>{ showAlert('Row successfully deleted!','success');\tSelectQuery.run();\n}, () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"s2jtkzz2ub","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"396envygmb","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":18,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":18,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":18,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRowIndex >= 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":62,"widgetId":"in8e51pg3y","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput2","rightColumn":62,"widgetId":"mlhvfasf31","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput3","rightColumn":62,"widgetId":"0lz9vhcnr0","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput4","rightColumn":62,"widgetId":"m4esf7fww5","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":17,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":17,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":17,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":17,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"google-sheets","isHidden":false},"new":true,"unpublishedPage":{"name":"Google Sheets","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3633","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3648"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":44,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"tableData"},{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.rowIndex))}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"typ9jslblf","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"8b67sbqskr","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() =>{ showAlert('Row successfully deleted!','success');\tSelectQuery.run();\n}, () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"s2jtkzz2ub","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"396envygmb","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":18,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":18,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":18,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRowIndex >= 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":62,"widgetId":"in8e51pg3y","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput2","rightColumn":62,"widgetId":"mlhvfasf31","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput3","rightColumn":62,"widgetId":"0lz9vhcnr0","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput4","rightColumn":62,"widgetId":"m4esf7fww5","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":17,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":17,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":17,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":17,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"google-sheets","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:02:35.596549Z"},{"publishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3635","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"API","jsonPathKeys":[],"name":"get_exported_app","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364f"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":910,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":800,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":53,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n get_exported_app.run(() => {\n \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n storeValue(params.name, res); \n },undefined, row)\n })\n })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2vtg0qdlqv","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated','success'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"jg23u09rwk","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"update-crud-template","isDisabled":false,"validation":"true"},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"},{"widgetName":"Text4","rightColumn":63,"backgroundColor":"#DD4B34","textAlign":"LEFT","widgetId":"fanskapltd","topRow":67,"bottomRow":71,"parentRowSpace":10,"isVisible":true,"fontStyle":"","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Note : Please use update-crud-template branch to avoid TCs failing in release"}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}\n]"}]}}],"slug":"admin","isHidden":false},"new":true,"unpublishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3635","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"API","jsonPathKeys":[],"name":"get_exported_app","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364f"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":910,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":800,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":53,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n get_exported_app.run(() => {\n \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n storeValue(params.name, res); \n },undefined, row)\n })\n })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2vtg0qdlqv","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated','success'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"jg23u09rwk","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"update-crud-template","isDisabled":false,"validation":"true"},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"},{"widgetName":"Text4","rightColumn":63,"backgroundColor":"#DD4B34","textAlign":"LEFT","widgetId":"fanskapltd","topRow":67,"bottomRow":71,"parentRowSpace":10,"isVisible":true,"fontStyle":"","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Note : Please use update-crud-template branch to avoid TCs failing in release"}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}\n]"}]}}],"slug":"admin","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.635289Z"},{"publishedPage":{"name":"S3","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3634","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["60 * 24","search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364d"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1300,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Zoom_Modal2","rightColumn":0,"detachFromLayout":true,"widgetId":"kqxoe40pg6","topRow":89,"bottomRow":89,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9Copy","rightColumn":0,"detachFromLayout":true,"widgetId":"80wzwajsst","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"kqxoe40pg6","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3Copy","rightColumn":64,"onClick":"{{closeModal('Zoom_Modal2')}}","color":"#040627","iconName":"cross","widgetId":"8kw9kfcd5y","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text15Copy","rightColumn":41,"textAlign":"LEFT","widgetId":"vk710q1v3s","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13Copy","rightColumn":63,"onClick":"{{closeModal('Zoom_Modal2')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lfiwss1u3w","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Close","isDisabled":false},{"image":"{{selected_files.selectedItem.base64}}","widgetName":"Image3Copy","rightColumn":64,"objectFit":"contain","widgetId":"2bewgakjx9","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png"}],"isDisabled":false}],"width":532,"height":600},{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":37,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":40,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false,"validation":"true"},{"template":{"DownloadIcon":{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"CopyURLIcon":{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"EditIcon":{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"Text21":{"widgetName":"Text21","rightColumn":24,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"nu44q8kd9p","topRow":4,"bottomRow":8,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.id)}}","textStyle":"BODY","key":"xvmvdekk3s"},"Text20":{"widgetName":"Text20","rightColumn":28,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"thgbdemmiw","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.name)}}","textStyle":"HEADING","key":"xvmvdekk3s"},"Image3":{"widgetName":"Image3","displayName":"Image","iconSVG":"/static/media/icon.52d8fb96.svg","topRow":0,"bottomRow":8.4,"type":"IMAGE_WIDGET","hideCard":false,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://assets.appsmith.com/widgets/default.png","key":"lsc53q139g","image":"{{File_List.listData.map((currentItem) => currentItem.img)}}","rightColumn":16,"objectFit":"contain","widgetId":"2rrg354q8i","isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemImage":{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":1,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.signedUrl;\n })();\n })}}","rightColumn":20,"objectFit":"contain","widgetId":"lh1sjszc93","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemName":{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"qyqv89mu1c","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":1,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.fileName;\n })();\n })}}"},"DeleteIcon":{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"}},"widgetName":"File_List","listData":"{{ListFiles.data}}","isCanvas":true,"displayName":"List","iconSVG":"/static/media/icon.9925ee17.svg","topRow":7,"bottomRow":80,"parentRowSpace":10,"type":"LIST_WIDGET","hideCard":false,"gridGap":0,"parentColumnSpace":9.67822265625,"dynamicTriggerPathList":[{"key":"template.DownloadIcon.onClick"},{"key":"template.CopyURLIcon.onClick"}],"leftColumn":1,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.FileListItemImage.image"},{"key":"template.FileListItemName.text"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas14","displayName":"Canvas","topRow":0,"bottomRow":390,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":false,"hideCard":true,"dropDisabled":true,"openParentPropertyPane":true,"minHeight":400,"noPad":true,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"Container7","borderColor":"transparent","disallowCopy":true,"isCanvas":true,"displayName":"Container","iconSVG":"/static/media/icon.1977dca3.svg","topRow":0,"bottomRow":17,"dragDisabled":true,"type":"CONTAINER_WIDGET","hideCard":false,"openParentPropertyPane":true,"isDeletable":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas15","detachFromLayout":true,"displayName":"Canvas","widgetId":"lcz0rhije8","containerStyle":"none","topRow":0,"bottomRow":160,"parentRowSpace":1,"isVisible":true,"type":"CANVAS_WIDGET","canExtend":false,"version":1,"hideCard":true,"parentId":"66oc53smx3","renderMode":"CANVAS","isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"kmwv6dap5n","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":0,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{currentItem.fileName}}"},{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":0,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{currentItem.signedUrl}}","rightColumn":20,"objectFit":"contain","widgetId":"4laf7e6wer","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false}],"key":"29vrztch46"}],"borderWidth":"0","key":"cw0dtdoe0g","disablePropertyPane":true,"backgroundColor":"white","rightColumn":64,"widgetId":"66oc53smx3","containerStyle":"card","isVisible":true,"version":1,"parentId":"sh1yahe7kl","renderMode":"CANVAS","isLoading":false,"borderRadius":"0"}],"key":"29vrztch46","rightColumn":232.27734375,"detachFromLayout":true,"widgetId":"sh1yahe7kl","containerStyle":"none","isVisible":true,"version":1,"parentId":"cjgg2thzom","renderMode":"CANVAS","isLoading":false}],"key":"x51ms5k6q9","backgroundColor":"transparent","rightColumn":63,"itemBackgroundColor":"#FFFFFF","widgetId":"cjgg2thzom","isVisible":true,"parentId":"6tz2s7ivi5","renderMode":"CANVAS","isLoading":false}]}]},{"widgetName":"Text6","rightColumn":64,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":0,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[],"isDisabled":false}],"width":532,"height":600},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"pi0t67rnwh","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{\nDeleteFile.run(() => {closeModal('delete_modal'); \nListFiles.run();\n});\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"hp22uj3dra","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Edit_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"usealgbtyj","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas10","rightColumn":0,"detachFromLayout":true,"widgetId":"6i7m9kpuky","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"usealgbtyj","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon4","rightColumn":64,"onClick":"{{closeModal('Edit_Modal')}}","color":"#040627","iconName":"cross","widgetId":"pstfdcc1e4","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text17","rightColumn":41,"textAlign":"LEFT","widgetId":"z64z3l112n","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update File"},{"widgetName":"Button15","rightColumn":44,"onClick":"{{closeModal('Edit_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"trc4e6ylcz","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateFile.run(() => {ListFiles.run();resetWidget('update_file_picker');closeModal('Edit_Modal');})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"8lbthc9dml","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":44,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Update","isDisabled":"{{update_file_picker.files.length == 0}}"},{"widgetName":"Text18","rightColumn":17,"textAlign":"RIGHT","widgetId":"qb26g34etr","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"File Name"},{"isRequired":false,"widgetName":"update_file_name","rightColumn":64,"widgetId":"je0ea8ma5d","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{File_List.selectedItem.fileName}}","isDisabled":true,"validation":"true"},{"widgetName":"update_file_picker","topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"isRequired":false,"rightColumn":64,"isDefaultClickDisabled":true,"widgetId":"mioot5pcs5","defaultSelectedFiles":[],"isVisible":true,"label":"Select File","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"6i7m9kpuky","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":1}],"isDisabled":false}],"width":456,"height":240},{"backgroundColor":"#FFFFFF","widgetName":"Container6","rightColumn":64,"widgetId":"yg1iyxq9kd","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":37,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas13","rightColumn":634,"detachFromLayout":true,"widgetId":"xv97g6rzgq","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"yg1iyxq9kd","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Button8","rightColumn":46,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"bx8wok3aut","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":31,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"template":{"Canvas7":{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":340,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["u3nvgafsdo"]},"update_files_name":{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.name;\n })();\n })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => currentItem.base64)}}","widgetName":"Image2","rightColumn":10,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'contain';\n })();\n })}}","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Container4":{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":["romgsruzxz"],"disablePropertyPane":true},"Canvas8":{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["vu7fb0dbt8","7zziet357m","ql8qs2xelx"]},"Text14":{"widgetName":"Text14","rightColumn":23,"textAlign":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'LEFT';\n })();\n })}}","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"0n30419eso","topRow":21,"bottomRow":73,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"xv97g6rzgq","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[{"key":"template.Image2.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"},{"key":"listData"},{"key":"template.update_files_name.defaultText"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":510,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":520,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":13,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":120,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":31,"textAlign":"LEFT","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":19,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":4,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false,"validation":"true"},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":18,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"contain","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"fjh7zgcdmh","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":15,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":14,"textAlign":"LEFT","widgetId":"jc21bnjh92","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"widgetName":"Text7","rightColumn":52,"textAlign":"LEFT","widgetId":"364shivyaz","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload New Files"},{"widgetName":"upload_button","rightColumn":63,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=> { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => {closeModal('Upload_Files_Modal'); resetWidget('Container6', true)})\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].update_files_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"1uava20nxi","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Upload","isDisabled":"{{ selected_files.items.length == 0 || selected_files.items.map((file) => file.update_files_name.text).includes(\"\") }}"},{"widgetName":"Text19","rightColumn":52,"textAlign":"LEFT","dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"9wh2ereoy9","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8.0458984375,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"}],"fontSize":"HEADING3","text":"Selected Files"},{"widgetName":"FilePicker","displayName":"FilePicker","iconSVG":"/static/media/icon.7c5ad9c3.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"allowedFileTypes":[],"type":"FILE_PICKER_WIDGET_V2","hideCard":false,"parentColumnSpace":8.0458984375,"leftColumn":39,"isDisabled":false,"key":"rew2q0dlgd","isRequired":false,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"xc1dun5wkl","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":5,"version":1,"fileDataType":"Base64","parentId":"xv97g6rzgq","selectedFiles":[],"renderMode":"CANVAS","isLoading":false,"files":[],"maxNumFiles":1}]}]}]}}],"slug":"s3","isHidden":false},"new":true,"unpublishedPage":{"name":"S3","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3634","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["60 * 24","search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364d"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1300,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Zoom_Modal2","rightColumn":0,"detachFromLayout":true,"widgetId":"kqxoe40pg6","topRow":89,"bottomRow":89,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9Copy","rightColumn":0,"detachFromLayout":true,"widgetId":"80wzwajsst","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"kqxoe40pg6","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3Copy","rightColumn":64,"onClick":"{{closeModal('Zoom_Modal2')}}","color":"#040627","iconName":"cross","widgetId":"8kw9kfcd5y","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text15Copy","rightColumn":41,"textAlign":"LEFT","widgetId":"vk710q1v3s","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13Copy","rightColumn":63,"onClick":"{{closeModal('Zoom_Modal2')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lfiwss1u3w","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Close","isDisabled":false},{"image":"{{selected_files.selectedItem.base64}}","widgetName":"Image3Copy","rightColumn":64,"objectFit":"contain","widgetId":"2bewgakjx9","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png"}],"isDisabled":false}],"width":532,"height":600},{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":37,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":40,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false,"validation":"true"},{"template":{"DownloadIcon":{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"CopyURLIcon":{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"EditIcon":{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"Text21":{"widgetName":"Text21","rightColumn":24,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"nu44q8kd9p","topRow":4,"bottomRow":8,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.id)}}","textStyle":"BODY","key":"xvmvdekk3s"},"Text20":{"widgetName":"Text20","rightColumn":28,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"thgbdemmiw","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.name)}}","textStyle":"HEADING","key":"xvmvdekk3s"},"Image3":{"widgetName":"Image3","displayName":"Image","iconSVG":"/static/media/icon.52d8fb96.svg","topRow":0,"bottomRow":8.4,"type":"IMAGE_WIDGET","hideCard":false,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://assets.appsmith.com/widgets/default.png","key":"lsc53q139g","image":"{{File_List.listData.map((currentItem) => currentItem.img)}}","rightColumn":16,"objectFit":"contain","widgetId":"2rrg354q8i","isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemImage":{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":1,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.signedUrl;\n })();\n })}}","rightColumn":20,"objectFit":"contain","widgetId":"lh1sjszc93","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemName":{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"qyqv89mu1c","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":1,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.fileName;\n })();\n })}}"},"DeleteIcon":{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"}},"widgetName":"File_List","listData":"{{ListFiles.data}}","isCanvas":true,"displayName":"List","iconSVG":"/static/media/icon.9925ee17.svg","topRow":7,"bottomRow":80,"parentRowSpace":10,"type":"LIST_WIDGET","hideCard":false,"gridGap":0,"parentColumnSpace":9.67822265625,"dynamicTriggerPathList":[{"key":"template.DownloadIcon.onClick"},{"key":"template.CopyURLIcon.onClick"}],"leftColumn":1,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.FileListItemImage.image"},{"key":"template.FileListItemName.text"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas14","displayName":"Canvas","topRow":0,"bottomRow":390,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":false,"hideCard":true,"dropDisabled":true,"openParentPropertyPane":true,"minHeight":400,"noPad":true,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"Container7","borderColor":"transparent","disallowCopy":true,"isCanvas":true,"displayName":"Container","iconSVG":"/static/media/icon.1977dca3.svg","topRow":0,"bottomRow":17,"dragDisabled":true,"type":"CONTAINER_WIDGET","hideCard":false,"openParentPropertyPane":true,"isDeletable":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas15","detachFromLayout":true,"displayName":"Canvas","widgetId":"lcz0rhije8","containerStyle":"none","topRow":0,"bottomRow":160,"parentRowSpace":1,"isVisible":true,"type":"CANVAS_WIDGET","canExtend":false,"version":1,"hideCard":true,"parentId":"66oc53smx3","renderMode":"CANVAS","isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"kmwv6dap5n","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":0,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{currentItem.fileName}}"},{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":0,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{currentItem.signedUrl}}","rightColumn":20,"objectFit":"contain","widgetId":"4laf7e6wer","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false}],"key":"29vrztch46"}],"borderWidth":"0","key":"cw0dtdoe0g","disablePropertyPane":true,"backgroundColor":"white","rightColumn":64,"widgetId":"66oc53smx3","containerStyle":"card","isVisible":true,"version":1,"parentId":"sh1yahe7kl","renderMode":"CANVAS","isLoading":false,"borderRadius":"0"}],"key":"29vrztch46","rightColumn":232.27734375,"detachFromLayout":true,"widgetId":"sh1yahe7kl","containerStyle":"none","isVisible":true,"version":1,"parentId":"cjgg2thzom","renderMode":"CANVAS","isLoading":false}],"key":"x51ms5k6q9","backgroundColor":"transparent","rightColumn":63,"itemBackgroundColor":"#FFFFFF","widgetId":"cjgg2thzom","isVisible":true,"parentId":"6tz2s7ivi5","renderMode":"CANVAS","isLoading":false}]}]},{"widgetName":"Text6","rightColumn":64,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":0,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[],"isDisabled":false}],"width":532,"height":600},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"pi0t67rnwh","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{\nDeleteFile.run(() => {closeModal('delete_modal'); \nListFiles.run();\n});\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"hp22uj3dra","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Edit_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"usealgbtyj","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas10","rightColumn":0,"detachFromLayout":true,"widgetId":"6i7m9kpuky","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"usealgbtyj","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon4","rightColumn":64,"onClick":"{{closeModal('Edit_Modal')}}","color":"#040627","iconName":"cross","widgetId":"pstfdcc1e4","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text17","rightColumn":41,"textAlign":"LEFT","widgetId":"z64z3l112n","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update File"},{"widgetName":"Button15","rightColumn":44,"onClick":"{{closeModal('Edit_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"trc4e6ylcz","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateFile.run(() => {ListFiles.run();resetWidget('update_file_picker');closeModal('Edit_Modal');})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"8lbthc9dml","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":44,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Update","isDisabled":"{{update_file_picker.files.length == 0}}"},{"widgetName":"Text18","rightColumn":17,"textAlign":"RIGHT","widgetId":"qb26g34etr","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"File Name"},{"isRequired":false,"widgetName":"update_file_name","rightColumn":64,"widgetId":"je0ea8ma5d","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{File_List.selectedItem.fileName}}","isDisabled":true,"validation":"true"},{"widgetName":"update_file_picker","topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"isRequired":false,"rightColumn":64,"isDefaultClickDisabled":true,"widgetId":"mioot5pcs5","defaultSelectedFiles":[],"isVisible":true,"label":"Select File","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"6i7m9kpuky","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":1}],"isDisabled":false}],"width":456,"height":240},{"backgroundColor":"#FFFFFF","widgetName":"Container6","rightColumn":64,"widgetId":"yg1iyxq9kd","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":37,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas13","rightColumn":634,"detachFromLayout":true,"widgetId":"xv97g6rzgq","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"yg1iyxq9kd","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Button8","rightColumn":46,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"bx8wok3aut","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":31,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"template":{"Canvas7":{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":340,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["u3nvgafsdo"]},"update_files_name":{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.name;\n })();\n })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => currentItem.base64)}}","widgetName":"Image2","rightColumn":10,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'contain';\n })();\n })}}","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Container4":{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":["romgsruzxz"],"disablePropertyPane":true},"Canvas8":{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["vu7fb0dbt8","7zziet357m","ql8qs2xelx"]},"Text14":{"widgetName":"Text14","rightColumn":23,"textAlign":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'LEFT';\n })();\n })}}","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"0n30419eso","topRow":21,"bottomRow":73,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"xv97g6rzgq","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[{"key":"template.Image2.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"},{"key":"listData"},{"key":"template.update_files_name.defaultText"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":510,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":520,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":13,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":120,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":31,"textAlign":"LEFT","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":19,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":4,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false,"validation":"true"},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":18,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"contain","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"fjh7zgcdmh","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":15,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":14,"textAlign":"LEFT","widgetId":"jc21bnjh92","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"widgetName":"Text7","rightColumn":52,"textAlign":"LEFT","widgetId":"364shivyaz","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload New Files"},{"widgetName":"upload_button","rightColumn":63,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=> { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => {closeModal('Upload_Files_Modal'); resetWidget('Container6', true)})\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].update_files_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"1uava20nxi","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Upload","isDisabled":"{{ selected_files.items.length == 0 || selected_files.items.map((file) => file.update_files_name.text).includes(\"\") }}"},{"widgetName":"Text19","rightColumn":52,"textAlign":"LEFT","dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"9wh2ereoy9","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8.0458984375,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"}],"fontSize":"HEADING3","text":"Selected Files"},{"widgetName":"FilePicker","displayName":"FilePicker","iconSVG":"/static/media/icon.7c5ad9c3.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"allowedFileTypes":[],"type":"FILE_PICKER_WIDGET_V2","hideCard":false,"parentColumnSpace":8.0458984375,"leftColumn":39,"isDisabled":false,"key":"rew2q0dlgd","isRequired":false,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"xc1dun5wkl","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":5,"version":1,"fileDataType":"Base64","parentId":"xv97g6rzgq","selectedFiles":[],"renderMode":"CANVAS","isLoading":false,"files":[],"maxNumFiles":1}]}]}]}}],"slug":"s3","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:04:11.828654Z"},{"publishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3636","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":45,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"n6220hgzzs","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"zzsh2d5rns","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"6ui5kmqebf","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]}]}]}}],"slug":"page-generator","isHidden":false},"new":true,"unpublishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3636","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":45,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"n6220hgzzs","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"zzsh2d5rns","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"6ui5kmqebf","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]}]}]}}],"slug":"page-generator","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.635312Z"},{"publishedPage":{"name":"MongoDB","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3637","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3652"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["customColumn1","_id","col4","col2","col3","col1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":41,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{FindQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"nj85l57r47","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"atgojamsmw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update Selected Row"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"mongodb","isHidden":false},"new":true,"unpublishedPage":{"name":"MongoDB","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3637","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3652"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["customColumn1","_id","col4","col2","col3","col1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":41,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{FindQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"nj85l57r47","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"atgojamsmw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update Selected Row"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"mongodb","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:07:31.442160Z"},{"publishedPage":{"name":"Firestore","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3638","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365e"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_ref","col4","col5","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns._ref.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"_ref":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._ref))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"_ref","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_ref","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":5,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":6,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":7,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":8,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"aiy9e38won","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"qykn04gnsw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":63,"widgetId":"hdw7qt67dg","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":22,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"yy4u8kzs8p","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":50,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._ref}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":490,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":500,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"25okoeayc8","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text20Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"kv1pqyhxvs","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"},{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":48,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"slug":"firestore","isHidden":false},"new":true,"unpublishedPage":{"name":"Firestore","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3638","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365e"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_ref","col4","col5","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns._ref.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"_ref":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._ref))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"_ref","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_ref","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":5,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":6,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":7,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":8,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"aiy9e38won","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"qykn04gnsw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":63,"widgetId":"hdw7qt67dg","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":22,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"yy4u8kzs8p","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":50,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._ref}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":490,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":500,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"25okoeayc8","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text20Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"kv1pqyhxvs","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"},{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":48,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"slug":"firestore","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:08:56.416406Z"},{"publishedPage":{"name":"Redis","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3639","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":[],"name":"FetchKeys","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365f"},{"pluginType":"DB","jsonPathKeys":["data_table.selectedRow.result"],"name":"FetchValue","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3663"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":5160,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"eer73khglm","topRow":1,"bottomRow":47,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.result}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"9nvn3gfw6q","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"eer73khglm","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateKey.run(() => FetchKeys.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"3apd2wkt91","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"hhh0296qfj","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_value_input","rightColumn":63,"widgetId":"07ker1hdod","topRow":8,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{FetchValue.data[0].result}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"uawwds1z0r","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Key: {{data_table.selectedRow.result}}"}]}]},{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"v8nfulwuy0","containerStyle":"card","topRow":1,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"erkvdsolhu","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"v8nfulwuy0","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["result","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":5,"bottomRow":86,"parentRowSpace":10,"onPageChange":"","type":"TABLE_WIDGET","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"},{"key":"onRowSelected"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.result.computedValue"}],"leftColumn":0,"primaryColumns":{"result":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.result))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"result","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"result","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"delimiter":",","onRowSelected":"{{FetchValue.run()}}","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"tefed053r1","isVisibleFilters":true,"tableData":"{{FetchKeys.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"erkvdsolhu","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"result":503,"task":245,"deliveryAddress":170,"step":62,"id":228,"customColumn2":174,"status":75}},{"widgetName":"new_key_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"2rlp4irwh0","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Key","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FetchKeys.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o9t8fslxdi","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"nt181ks4ci","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Redis Data"}]}]},{"widgetName":"Insert_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"c8fg4ubw52","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":0,"detachFromLayout":true,"widgetId":"re60vbuakz","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"c8fg4ubw52","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Insert_Modal')}}","color":"#040627","iconName":"cross","widgetId":"3tk445loxa","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text21","rightColumn":41,"textAlign":"LEFT","widgetId":"fgi9qp4uwr","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"New Key"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"xnh96plcyo","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false},{"widgetName":"Button2","rightColumn":64,"onClick":"{{InsertKey.run(() => FetchKeys.run(() => closeModal('Insert_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"ix2dralfal","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Insert","isDisabled":false},{"isRequired":false,"widgetName":"insert_key_input","rightColumn":64,"widgetId":"ozz6gi7zmm","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":17,"textAlign":"RIGHT","widgetId":"kotk4wa6pe","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key"},{"widgetName":"Text23","rightColumn":17,"textAlign":"RIGHT","widgetId":"y2dlumuetl","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Value"},{"isRequired":false,"widgetName":"insert_value_input","rightColumn":64,"widgetId":"pevr27mh87","topRow":16,"bottomRow":50,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"value_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"fh14k9y353","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":0,"detachFromLayout":true,"widgetId":"v8n3d5aecd","topRow":0,"bottomRow":260,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"fh14k9y353","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","color":"#040627","iconName":"cross","widgetId":"jqaazpo3zy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text24","rightColumn":41,"textAlign":"LEFT","widgetId":"hvb3xnk1u8","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Value for Key: {{data_table.selectedRow.result}}"},{"widgetName":"Button4","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"yka7b6k706","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"widgetName":"Text25","rightColumn":64,"textAlign":"LEFT","widgetId":"j9315vzr13","topRow":6,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"v8n3d5aecd","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{FetchValue.data[0].result}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Delete_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"0skbil3ntd","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"lwsyaz55ll","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"0skbil3ntd","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Delete_Modal')}}","color":"#040627","iconName":"cross","widgetId":"dtuc8ag2of","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text26","rightColumn":41,"textAlign":"LEFT","widgetId":"d9ap4dp300","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Key"},{"widgetName":"Button6","rightColumn":64,"onClick":"{{DeleteKey.run(() => FetchKeys.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2kg6lmim5m","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text27","rightColumn":64,"textAlign":"LEFT","widgetId":"c698jgkzjg","topRow":7,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the key?\n\n{{data_table.selectedRow.result}}"},{"widgetName":"Button7","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lsvqrab5v2","topRow":18,"bottomRow":22,"recaptchaV2":false,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false}],"isDisabled":false}],"width":456,"height":240}]}}],"slug":"redis","isHidden":false},"new":true,"unpublishedPage":{"name":"Redis","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc3639","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":[],"name":"FetchKeys","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365f"},{"pluginType":"DB","jsonPathKeys":["data_table.selectedRow.result"],"name":"FetchValue","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3663"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":5160,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"eer73khglm","topRow":1,"bottomRow":47,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.result}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"9nvn3gfw6q","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"eer73khglm","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateKey.run(() => FetchKeys.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"3apd2wkt91","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"hhh0296qfj","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_value_input","rightColumn":63,"widgetId":"07ker1hdod","topRow":8,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{FetchValue.data[0].result}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"uawwds1z0r","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Key: {{data_table.selectedRow.result}}"}]}]},{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"v8nfulwuy0","containerStyle":"card","topRow":1,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"erkvdsolhu","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"v8nfulwuy0","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["result","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":5,"bottomRow":86,"parentRowSpace":10,"onPageChange":"","type":"TABLE_WIDGET","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"},{"key":"onRowSelected"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.result.computedValue"}],"leftColumn":0,"primaryColumns":{"result":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.result))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"result","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"result","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"delimiter":",","onRowSelected":"{{FetchValue.run()}}","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"tefed053r1","isVisibleFilters":true,"tableData":"{{FetchKeys.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"erkvdsolhu","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"result":503,"task":245,"deliveryAddress":170,"step":62,"id":228,"customColumn2":174,"status":75}},{"widgetName":"new_key_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"2rlp4irwh0","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Key","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FetchKeys.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o9t8fslxdi","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"nt181ks4ci","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Redis Data"}]}]},{"widgetName":"Insert_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"c8fg4ubw52","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":0,"detachFromLayout":true,"widgetId":"re60vbuakz","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"c8fg4ubw52","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Insert_Modal')}}","color":"#040627","iconName":"cross","widgetId":"3tk445loxa","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text21","rightColumn":41,"textAlign":"LEFT","widgetId":"fgi9qp4uwr","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"New Key"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"xnh96plcyo","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false},{"widgetName":"Button2","rightColumn":64,"onClick":"{{InsertKey.run(() => FetchKeys.run(() => closeModal('Insert_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"ix2dralfal","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Insert","isDisabled":false},{"isRequired":false,"widgetName":"insert_key_input","rightColumn":64,"widgetId":"ozz6gi7zmm","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":17,"textAlign":"RIGHT","widgetId":"kotk4wa6pe","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key"},{"widgetName":"Text23","rightColumn":17,"textAlign":"RIGHT","widgetId":"y2dlumuetl","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Value"},{"isRequired":false,"widgetName":"insert_value_input","rightColumn":64,"widgetId":"pevr27mh87","topRow":16,"bottomRow":50,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"value_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"fh14k9y353","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":0,"detachFromLayout":true,"widgetId":"v8n3d5aecd","topRow":0,"bottomRow":260,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"fh14k9y353","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","color":"#040627","iconName":"cross","widgetId":"jqaazpo3zy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text24","rightColumn":41,"textAlign":"LEFT","widgetId":"hvb3xnk1u8","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Value for Key: {{data_table.selectedRow.result}}"},{"widgetName":"Button4","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"yka7b6k706","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"widgetName":"Text25","rightColumn":64,"textAlign":"LEFT","widgetId":"j9315vzr13","topRow":6,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"v8n3d5aecd","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{FetchValue.data[0].result}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Delete_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"0skbil3ntd","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"lwsyaz55ll","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"0skbil3ntd","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Delete_Modal')}}","color":"#040627","iconName":"cross","widgetId":"dtuc8ag2of","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text26","rightColumn":41,"textAlign":"LEFT","widgetId":"d9ap4dp300","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Key"},{"widgetName":"Button6","rightColumn":64,"onClick":"{{DeleteKey.run(() => FetchKeys.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2kg6lmim5m","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text27","rightColumn":64,"textAlign":"LEFT","widgetId":"c698jgkzjg","topRow":7,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the key?\n\n{{data_table.selectedRow.result}}"},{"widgetName":"Button7","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lsvqrab5v2","topRow":18,"bottomRow":22,"recaptchaV2":false,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false}],"isDisabled":false}],"width":456,"height":240}]}}],"slug":"redis","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T18:10:37.635314Z"},{"publishedPage":{"name":"PostgreSQL","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc363a","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3666"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col3","col4","col5","col2","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"xp5u9a9nzq","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"nh3cu4lb1g","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":604,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":59,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":604},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5.toString()}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"postgresql","isHidden":false},"new":true,"unpublishedPage":{"name":"PostgreSQL","userPermissions":[],"layouts":[{"new":false,"id":"61764fbeba7e887d03bc363a","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3666"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col3","col4","col5","col2","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"xp5u9a9nzq","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"nh3cu4lb1g","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":604,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":59,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":604},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5.toString()}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"postgresql","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"60d4559cee9aa1792c5bec3d_2021-09-10T17:58:28.130835Z"}],"publishedLayoutmongoEscapedWidgets":{"61764fbeba7e887d03bc3637":["data_table"]},"actionCollectionList":[],"exportedApplication":{"new":true,"color":"#D9E7FF","name":"CRUD App Templates","appIsExample":false,"icon":"bag","isPublic":false,"userPermissions":["canComment:applications","manage:applications","export:applications","read:applications","publish:applications","makePublic:applications"],"unreadCommentThreads":0,"slug":"crud-app-templates"},"publishedDefaultPageName":"PostgreSQL"}
\ No newline at end of file
+{"unpublishedDefaultPageName":"PostgreSQL","datasourceList":[{"new":true,"invalids":[],"pluginId":"amazons3-plugin","isValid":true,"name":"AmazonS3 CRUD","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528942","datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"host":""}],"properties":[{"value":"ap-south-1"},{"value":"amazon-s3","key":"s3Provider"},{"value":"","key":"customRegion"}]},"structure":{}},{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"Appsmith Prod","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528940","datasourceConfiguration":{"sshProxyEnabled":false,"headers":[{"value":"_hjIncludedInSample=1; _hjSessionTooLarge=1; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; ajs_user_id=%22nikhil%40appsmith.com%22; ajs_anonymous_id=%2213c846f6-970b-41e1-925f-f8f4a92ea315%22; SL_C_23361dd035530_SID=laR0iYdLzA-; SL_C_23361dd035530_VID=EDGoRechnrX; _hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; [email protected]; ajs_anonymous_id=13c846f6-970b-41e1-925f-f8f4a92ea315; [email protected]; ajs_anonymous_id=13c846f6-970b-41e1-925f-f8f4a92ea315; SESSION=274a44e7-9a92-4040-89b7-94b535fdb4ce; _gid=GA1.2.587330254.1634460265; _ga=GA1.2.572027528.1599035590; _ga_0JZ9C3M56S=GS1.1.1634882690.27.0.1634882690.0; _hjAbsoluteSessionInProgress=1; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNDg5MzAwODg3NiwibGFzdEV2ZW50VGltZSI6MTYzNDg5MzAwOTI0NCwiZXZlbnRJZCI6MTIwLCJpZGVudGlmeUlkIjo1LCJzZXF1ZW5jZU51bWJlciI6MTI1fQ==; _gat_UA-145062826-1=1; _hjIncludedInPageviewSample=1; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c0cf04a2f536-0ed498887bbbcb-1f3f6756-1aeaa0-17c0cf04a30de8%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22Nandagopal%22%2C%22%24name%22%3A%20%22Nikhil%20Nandagopal%22%2C%22%24search_engine%22%3A%20%22google%22%7D; intercom-session-y10e7138=eElubUVPbThWR3dsblFxZTZsNm01eUJNMHBSOVZocFRRay9xTVlNK00xSzd1d2gvWWlCSUVwMjJ2OHFJbmhVLy0tWXVuZmFxbGVZRStMRzljdXpkblhYUT09--46c8844c3b2d5b8f185a26da21b858fbbbba03e7","key":"Cookie"}],"properties":[{"value":"N","key":"isSendSessionEnabled"},{"value":"","key":"sessionSignatureKey"}],"url":"https://app.appsmith.com"},"structure":{}},{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"Appsmith Release","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528a53","datasourceConfiguration":{"sshProxyEnabled":false,"headers":[{"value":"_hjid=da2ef5e3-4ea5-42dc-b892-7962b7564098; _hjSessionUser_2240640=eyJpZCI6IjBlMTBmNjIzLWVkOTctNTUxZi05MTdiLTY4ODVkYTZmYTk3YyIsImNyZWF0ZWQiOjE2Mzk2NDY4OTYyMjQsImV4aXN0aW5nIjp0cnVlfQ==; SESSION=2c9b76dd-3782-49a5-b7d4-0e1a3437f328; _gid=GA1.2.2089842993.1639981141; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjU5ZjhhZTJlLTgzYjQtNDY5My1hZjA4LTM2ZGRkZjBjNGJiYlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzOTk4MTU4ODg2NywibGFzdEV2ZW50VGltZSI6MTYzOTk4MTU4OTIyNiwiZXZlbnRJZCI6Mjc5LCJpZGVudGlmeUlkIjoxOCwic2VxdWVuY2VOdW1iZXIiOjI5N30=; _ga=GA1.2.1102478328.1639646896; _ga_0JZ9C3M56S=GS1.1.1639981589.96.1.1639981592.0; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217dc2ba5b95100b-0c6940d1bc82d9-133e6453-1aeaa0-17dc2ba5b96f47%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24initial_referrer%22%3A%20%22https%3A%2F%2Fapp.appsmith.com%2Fapplications%2F6139b6c7dd7786286ddd4f04%2Fpages%2F6139b6c7dd7786286ddd4f0c%3Fbranch%3Dmaster%22%2C%22%24initial_referring_domain%22%3A%20%22app.appsmith.com%22%2C%22%24user_id%22%3A%20%22nikhil%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nikhil%40appsmith.com%22%2C%22userId%22%3A%20%22nikhil%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24email%22%3A%20%22nikhil%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nikhil%22%2C%22%24last_name%22%3A%20%22Nandagopal%22%2C%22%24name%22%3A%20%22Nikhil%20Nandagopal%22%7D; ajs_anonymous_id=%22b87870e1-d510-4512-9bc9-8eb17beadf38%22; ajs_user_id=%22nikhil%40appsmith.com%22; _hjSession_2240640=eyJpZCI6IjQ4OTNkOTdkLWNhZTItNDU0Mi1iYzVmLTNmMDMyNzRmNzcwOSIsImNyZWF0ZWQiOjE2NDAwNjk4NzM1ODF9; _hjAbsoluteSessionInProgress=1; _gat_UA-145062826-1=1; intercom-session-y10e7138=blNYb2tDZ3hPak5zWS9tSU1vVFdtWnFWcTRaajlOd3E5S0hwVGFnUFFxVW92ZEdKVVorWWVza0xzbHZkRmwxUS0tWWhDOHRpdHpDaU44WS9HOEdXUVE3Zz09--07c20fc364abb002140fafe7c2905c6034ee43cf","key":"Cookie"}],"queryParameters":[],"properties":[{"value":"N","key":"isSendSessionEnabled"},{"value":"","key":"sessionSignatureKey"}],"url":"https://release.app.appsmith.com"},"structure":{}},{"new":true,"invalids":[],"pluginId":"firestore-plugin","isValid":true,"name":"FBTemplateDB","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d70450952893f","datasourceConfiguration":{"sshProxyEnabled":false,"url":"https://firebase-crud-template.firebaseio.com"},"structure":{}},{"new":true,"invalids":[],"pluginId":"google-sheets-plugin","isValid":true,"name":"Google Sheet","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528941","datasourceConfiguration":{"sshProxyEnabled":false},"structure":{}},{"new":true,"invalids":[],"pluginId":"postgres-plugin","isValid":true,"name":"Internal DB","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d70450952893c","datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[{"port":5432,"host":"mockdb.internal.appsmith.com"}],"connection":{"mode":"READ_WRITE","ssl":{"authType":"DEFAULT"}}},"structure":{"tables":[{"schema":"public","columns":[{"defaultValue":"nextval('active_app_report_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"active_app","type":"text","isAutogenerated":false},{"name":"num_api_calls","type":"int8","isAutogenerated":false},{"name":"date","type":"text","isAutogenerated":false},{"name":"report_type","type":"text","isAutogenerated":false},{"name":"app_id","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"active_app_report_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"active_app_report\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"active_app_report\" (\"active_app\", \"num_api_calls\", \"date\", \"report_type\", \"app_id\")\n VALUES ('', 1, '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"active_app_report\" SET\n \"active_app\" = '',\n \"num_api_calls\" = 1,\n \"date\" = '',\n \"report_type\" = '',\n \"app_id\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"active_app_report\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.active_app_report","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('audit_logs_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"date","type":"timestamptz","isAutogenerated":false},{"name":"appId","type":"text","isAutogenerated":false},{"name":"appName","type":"text","isAutogenerated":false},{"name":"orgId","type":"text","isAutogenerated":false},{"name":"actionName","type":"text","isAutogenerated":false},{"name":"userId","type":"text","isAutogenerated":false},{"name":"pageId","type":"text","isAutogenerated":false},{"name":"insert_id","type":"text","isAutogenerated":false},{"name":"pageName","type":"text","isAutogenerated":false},{"name":"req","type":"json","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"audit_logs_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"audit_logs\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"audit_logs\" (\"date\", \"appId\", \"appName\", \"orgId\", \"actionName\", \"userId\", \"pageId\", \"insert_id\", \"pageName\", \"req\")\n VALUES (TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '', '', '', '', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"audit_logs\" SET\n \"date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"appId\" = '',\n \"appName\" = '',\n \"orgId\" = '',\n \"actionName\" = '',\n \"userId\" = '',\n \"pageId\" = '',\n \"insert_id\" = '',\n \"pageName\" = '',\n \"req\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"audit_logs\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.audit_logs","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('discord_messages_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"msg_id","type":"text","isAutogenerated":false},{"name":"created_at","type":"date","isAutogenerated":false},{"name":"author","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"discord_messages_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"discord_messages\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"discord_messages\" (\"msg_id\", \"created_at\", \"author\")\n VALUES ('', '2019-07-01', '');"},{"title":"UPDATE","body":"UPDATE public.\"discord_messages\" SET\n \"msg_id\" = '',\n \"created_at\" = '2019-07-01',\n \"author\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"discord_messages\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.discord_messages","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('email_issues_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"from","type":"text","isAutogenerated":false},{"name":"body","type":"text","isAutogenerated":false},{"name":"created_at","type":"timestamptz","isAutogenerated":false},{"name":"subject","type":"text","isAutogenerated":false},{"name":"is_tagged","type":"bool","isAutogenerated":false},{"name":"assignee","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"email_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"email_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"email_issues\" (\"from\", \"body\", \"created_at\", \"subject\", \"is_tagged\", \"assignee\")\n VALUES ('', '', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"email_issues\" SET\n \"from\" = '',\n \"body\" = '',\n \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"subject\" = '',\n \"is_tagged\" = '',\n \"assignee\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"email_issues\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.email_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_issues_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"issue_id","type":"text","isAutogenerated":false},{"name":"order","type":"int4","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"github_issues_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_issues\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_issues\" (\"issue_id\", \"order\")\n VALUES ('', 1);"},{"title":"UPDATE","body":"UPDATE public.\"github_issues\" SET\n \"issue_id\" = '',\n \"order\" = 1\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_issues\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_issues","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('github_projects_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"github_id","type":"text","isAutogenerated":false},{"name":"due_date","type":"timestamptz","isAutogenerated":false},{"name":"tag","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"github_projects_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"github_projects\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"github_projects\" (\"github_id\", \"due_date\", \"tag\")\n VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '');"},{"title":"UPDATE","body":"UPDATE public.\"github_projects\" SET\n \"github_id\" = '',\n \"due_date\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"tag\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"github_projects\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.github_projects","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('standup_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"name","type":"text","isAutogenerated":false},{"name":"yesterday","type":"text","isAutogenerated":false},{"name":"today","type":"text","isAutogenerated":false},{"name":"blocked","type":"text","isAutogenerated":false},{"name":"date","type":"date","isAutogenerated":false},{"name":"pod","type":"text","isAutogenerated":false},{"name":"dayrating","type":"int4","isAutogenerated":false},{"name":"restrating","type":"int4","isAutogenerated":false},{"name":"focusrating","type":"int4","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"standup_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"standup\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"standup\" (\"name\", \"yesterday\", \"today\", \"blocked\", \"date\", \"pod\", \"dayrating\", \"restrating\", \"focusrating\")\n VALUES ('', '', '', '', '2019-07-01', '', 1, 1, 1);"},{"title":"UPDATE","body":"UPDATE public.\"standup\" SET\n \"name\" = '',\n \"yesterday\" = '',\n \"today\" = '',\n \"blocked\" = '',\n \"date\" = '2019-07-01',\n \"pod\" = '',\n \"dayrating\" = 1,\n \"restrating\" = 1,\n \"focusrating\" = 1\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"standup\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.standup","type":"TABLE"},{"schema":"public","columns":[{"name":"id","type":"text","isAutogenerated":false},{"name":"assignee","type":"text","isAutogenerated":false},{"name":"state","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"support_email_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_email\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_email\" (\"id\", \"assignee\", \"state\")\n VALUES ('', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_email\" SET\n \"id\" = '',\n \"assignee\" = '',\n \"state\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_email\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_email","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('support_tickets_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"description","type":"varchar","isAutogenerated":false},{"name":"created_at","type":"timestamptz","isAutogenerated":false},{"name":"author","type":"text","isAutogenerated":false},{"name":"user","type":"text","isAutogenerated":false},{"name":"comments","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"support_tickets_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"support_tickets\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"support_tickets\" (\"description\", \"created_at\", \"author\", \"user\", \"comments\")\n VALUES ('', TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET', '', '', '');"},{"title":"UPDATE","body":"UPDATE public.\"support_tickets\" SET\n \"description\" = '',\n \"created_at\" = TIMESTAMP WITH TIME ZONE '2019-07-01 06:30:00 CET',\n \"author\" = '',\n \"user\" = '',\n \"comments\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"support_tickets\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.support_tickets","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('template_table_col1_seq'::regclass)","name":"col1","type":"int4","isAutogenerated":true},{"name":"col3","type":"text","isAutogenerated":false},{"name":"col4","type":"int4","isAutogenerated":false},{"name":"col5","type":"bool","isAutogenerated":false},{"name":"col2","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["col1"],"name":"template_table_pkey","type":"primary key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"template_table\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"template_table\" (\"col3\", \"col4\", \"col5\", \"col2\")\n VALUES ('', 1, '', '');"},{"title":"UPDATE","body":"UPDATE public.\"template_table\" SET\n \"col3\" = '',\n \"col4\" = 1,\n \"col5\" = '',\n \"col2\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"template_table\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.template_table","type":"TABLE"},{"schema":"public","columns":[{"name":"age","type":"int4","isAutogenerated":false},{"name":"username","type":"varchar","isAutogenerated":false},{"name":"password","type":"varchar","isAutogenerated":false},{"name":"email","type":"varchar","isAutogenerated":false},{"name":"created_on","type":"timestamp","isAutogenerated":false},{"name":"last_login","type":"timestamp","isAutogenerated":false}],"keys":[],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"testuser\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"testuser\" (\"age\", \"username\", \"password\", \"email\", \"created_on\", \"last_login\")\n VALUES (1, '', '', '', TIMESTAMP '2019-07-01 10:00:00', TIMESTAMP '2019-07-01 10:00:00');"},{"title":"UPDATE","body":"UPDATE public.\"testuser\" SET\n \"age\" = 1,\n \"username\" = '',\n \"password\" = '',\n \"email\" = '',\n \"created_on\" = TIMESTAMP '2019-07-01 10:00:00',\n \"last_login\" = TIMESTAMP '2019-07-01 10:00:00'\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"testuser\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.testuser","type":"TABLE"},{"schema":"public","columns":[{"defaultValue":"nextval('ticket_tags_id_seq'::regclass)","name":"id","type":"int4","isAutogenerated":true},{"name":"ticket_id","type":"int4","isAutogenerated":false},{"name":"github_tag_id","type":"text","isAutogenerated":false}],"keys":[{"columnNames":["id"],"name":"ticket_tags_pkey","type":"primary key"},{"fromColumns":["ticket_id"],"name":"ticket_id_fk","toColumns":["support_tickets.id"],"type":"foreign key"}],"templates":[{"title":"SELECT","body":"SELECT * FROM public.\"ticket_tags\" LIMIT 10;"},{"title":"INSERT","body":"INSERT INTO public.\"ticket_tags\" (\"ticket_id\", \"github_tag_id\")\n VALUES (1, '');"},{"title":"UPDATE","body":"UPDATE public.\"ticket_tags\" SET\n \"ticket_id\" = 1,\n \"github_tag_id\" = ''\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may update every row in the table!"},{"title":"DELETE","body":"DELETE FROM public.\"ticket_tags\"\n WHERE 1 = 0; -- Specify a valid condition here. Removing the condition may delete everything in the table!"}],"name":"public.ticket_tags","type":"TABLE"}]}},{"new":true,"invalids":[],"pluginId":"mongo-plugin","isValid":true,"name":"Mock Mongo","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528944","datasourceConfiguration":{"sshProxyEnabled":false,"endpoints":[],"connection":{"mode":"READ_WRITE","type":"DIRECT","ssl":{"authType":"DEFAULT"}},"properties":[{"value":"Yes","key":"Use Mongo Connection String URI"},{"value":"mongodb+srv://mockdb-admin:****@mockdb.kce5o.mongodb.net/movies","key":"Connection String URI"}]},"structure":{"tables":[{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"col1","type":"String","isAutogenerated":false},{"name":"col2","type":"String","isAutogenerated":false},{"name":"col3","type":"String","isAutogenerated":false},{"name":"col4","type":"String","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"col1\": \"test\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"template_table","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"template_table\",\n \"filter\": {\n \"col1\": \"test\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"template_table","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"template_table\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"col1\": \"new value\",\n \"col2\": \"new value\",\n \"col3\": \"new value\",\n \"col4\": \"new value\",\n}]"},"collection":"template_table","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"template_table\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"col1\": \"new value\",\n \"col2\": \"new value\",\n \"col3\": \"new value\",\n \"col4\": \"new value\",\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"col1\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"template_table","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"template_table\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"col1\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"template_table","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"template_table\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"template_table","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"email","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"role","type":"String","isAutogenerated":false},{"name":"status","type":"Object","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"email\": \"[email protected]\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"users","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"users\",\n \"filter\": {\n \"email\": \"[email protected]\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"users","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"users\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"email\": \"new value\",\n \"name\": \"new value\",\n \"role\": \"new value\",\n \"status\": {},\n}]"},"collection":"users","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"users\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"email\": \"new value\",\n \"name\": \"new value\",\n \"role\": \"new value\",\n \"status\": {},\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"email\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"users","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"users\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"email\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"users","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"users\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"users","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"currentLimit","type":"Integer","isAutogenerated":false},{"name":"featureName","type":"String","isAutogenerated":false},{"name":"key","type":"Integer","isAutogenerated":false},{"name":"limit","type":"Integer","isAutogenerated":false},{"name":"subscriptionId","type":"ObjectId","isAutogenerated":true}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"featureName\": \"Okuneva Inc\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"orgs","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"orgs\",\n \"filter\": {\n \"featureName\": \"Okuneva Inc\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"orgs","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"orgs\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currentLimit\": 1,\n \"featureName\": \"new value\",\n \"key\": 1,\n \"limit\": 1,\n \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},"collection":"orgs","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"orgs\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currentLimit\": 1,\n \"featureName\": \"new value\",\n \"key\": 1,\n \"limit\": 1,\n \"subscriptionId\": ObjectId(\"a_valid_object_id_hex\"),\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"featureName\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"orgs","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"orgs\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"featureName\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"orgs","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"orgs\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"orgs","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"createdBy","type":"ObjectId","isAutogenerated":true},{"name":"domain","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"numUsers","type":"Integer","isAutogenerated":false},{"name":"orgId","type":"ObjectId","isAutogenerated":true}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"domain\": \"adolph.biz\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"apps","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"apps\",\n \"filter\": {\n \"domain\": \"adolph.biz\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"apps","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"apps\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n \"domain\": \"new value\",\n \"name\": \"new value\",\n \"numUsers\": 1,\n \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n}]"},"collection":"apps","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"apps\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"createdBy\": ObjectId(\"a_valid_object_id_hex\"),\n \"domain\": \"new value\",\n \"name\": \"new value\",\n \"numUsers\": 1,\n \"orgId\": ObjectId(\"a_valid_object_id_hex\"),\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"domain\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"apps","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"apps\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"domain\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"apps","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"apps\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"apps","type":"COLLECTION"},{"columns":[{"name":"_id","type":"ObjectId","isAutogenerated":true},{"name":"createdAt","type":"Date","isAutogenerated":false},{"name":"currency","type":"String","isAutogenerated":false},{"name":"mrr","type":"String","isAutogenerated":false},{"name":"name","type":"String","isAutogenerated":false},{"name":"renewalDate","type":"Date","isAutogenerated":false},{"name":"status","type":"String","isAutogenerated":false},{"name":"statusOfApp","type":"Object","isAutogenerated":false}],"keys":[],"templates":[{"configuration":{"find":{"query":"{ \"currency\": \"RUB\"}","limit":"10","sort":"{\"_id\": 1}"},"collection":"subscriptions","command":"FIND","smartSubstitution":true},"title":"Find","body":"{\n \"find\": \"subscriptions\",\n \"filter\": {\n \"currency\": \"RUB\"\n },\n \"sort\": {\n \"_id\": 1\n },\n \"limit\": 10\n}\n"},{"configuration":{"find":{"query":"{\"_id\": ObjectId(\"id_to_query_with\")}"},"collection":"subscriptions","command":"FIND","smartSubstitution":true},"title":"Find by ID","body":"{\n \"find\": \"subscriptions\",\n \"filter\": {\n \"_id\": ObjectId(\"id_to_query_with\")\n }\n}\n"},{"configuration":{"insert":{"documents":"[{ \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currency\": \"new value\",\n \"mrr\": \"new value\",\n \"name\": \"new value\",\n \"renewalDate\": new Date(\"2019-07-01\"),\n \"status\": \"new value\",\n \"statusOfApp\": {},\n}]"},"collection":"subscriptions","command":"INSERT","smartSubstitution":true},"title":"Insert","body":"{\n \"insert\": \"subscriptions\",\n \"documents\": [\n {\n \"_id\": ObjectId(\"a_valid_object_id_hex\"),\n \"createdAt\": new Date(\"2019-07-01\"),\n \"currency\": \"new value\",\n \"mrr\": \"new value\",\n \"name\": \"new value\",\n \"renewalDate\": new Date(\"2019-07-01\"),\n \"status\": \"new value\",\n \"statusOfApp\": {},\n }\n ]\n}\n"},{"configuration":{"updateMany":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_update\") }","update":"{ \"$set\": { \"currency\": \"new value\" } }"},"update":{"limit":"ALL"},"collection":"subscriptions","command":"UPDATE","smartSubstitution":true},"title":"Update","body":"{\n \"update\": \"subscriptions\",\n \"updates\": [\n {\n \"q\": {\n \"_id\": ObjectId(\"id_of_document_to_update\")\n },\n \"u\": { \"$set\": { \"currency\": \"new value\" } }\n }\n ]\n}\n"},{"configuration":{"collection":"subscriptions","delete":{"query":"{ \"_id\": ObjectId(\"id_of_document_to_delete\") }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true},"title":"Delete","body":"{\n \"delete\": \"subscriptions\",\n \"deletes\": [\n {\n \"q\": {\n \"_id\": \"id_of_document_to_delete\"\n },\n \"limit\": 1\n }\n ]\n}\n"}],"name":"subscriptions","type":"COLLECTION"}]}},{"new":true,"invalids":[],"pluginId":"redis-plugin","isValid":true,"name":"RedisTemplateApps","messages":[],"userPermissions":["execute:datasources","manage:datasources","read:datasources"],"gitSyncId":"6171a062b7de236aa183ee0e_61bb76c8cd5d704509528943","datasourceConfiguration":{"endpoints":[{"port":10339,"host":"redis-10339.c278.us-east-1-4.ec2.cloud.redislabs.com"}]},"structure":{}}],"actionList":[{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE col2 like '%{{Table1.searchText || \"\"}}%'\nORDER BY {{col_select.selectedOptionValue}} {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3644","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE col2 like '%{{Table1.searchText || \"\"}}%'\nORDER BY {{col_select.selectedOptionValue}} {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531ef8"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\tcol1,\n\tcol2, \n\tcol3,\n\tcol4, \n\tcol5\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3647","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\tcol1,\n\tcol2, \n\tcol3,\n\tcol4, \n\tcol5\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531ef9"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc364a","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"UPDATE","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{\n\t \"rowIndex\": {{data_table.selectedRow.rowIndex}}, \n\t\t\"col1\": \"{{colInput1.text}}\", \n\t\t\"col2\": \"{{colInput2.text}}\", \n\t\t\"col3\": \"{{colInput3.text}}\", \n\t\t\"col4\": \"{{colInput4.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["colInput1.text","colInput4.text","data_table.selectedRow.rowIndex","colInput2.text","colInput3.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531efa"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc364b","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"APPEND","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"","key":"rowOffset"},{"value":"{ \n\t\t\"col1\": \"{{insert_col_input1.text}}\", \n\t\t\"col2\": \"{{insert_col_input2.text}}\", \n\t\t\"col3\": \"{{insert_col_input3.text}}\", \n\t\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\t\"col5\": \"{{insert_col_input5.text}}\"\n}","key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[9].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531efb"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name}}","paginationType":"NONE","timeoutInMillisecond":100000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{{FilePicker.files[this.params.fileIndex]}}"},"userPermissions":[],"pageId":"S3","invalids":["'Query timeout' field must be an integer between 0 and 60000"],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name","FilePicker.files[this.params.fileIndex]"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"CreateFile","name":"CreateFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc364c","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name}}","paginationType":"NONE","timeoutInMillisecond":100000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{{FilePicker.files[this.params.fileIndex]}}"},"userPermissions":[],"pageId":"S3","invalids":["'Query timeout' field must be an integer between 0 and 60000"],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["(!!folder_name.text ? folder_name.text + \"/\" : \"\") + this.params.name","FilePicker.files[this.params.fileIndex]"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"CreateFile","name":"CreateFile","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531efc"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"{{search_input.text}}","where":{"condition":"AND","children":[{"condition":"EQ"}]},"expiry":"{{ 60 * 24 }}","signedUrl":"YES","unSignedUrl":"YES"},"delete":{"expiry":"5"},"command":"LIST"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"formData.list.prefix"},{"key":"formData.list.expiry"}],"confirmBeforeExecute":false,"jsonPathKeys":["60 * 24","search_input.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ListFiles","name":"ListFiles","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc364d","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"{{search_input.text}}","where":{"condition":"AND","children":[{"condition":"EQ"}]},"expiry":"{{ 60 * 24 }}","signedUrl":"YES","unSignedUrl":"YES"},"delete":{"expiry":"5"},"command":"LIST"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"formData.list.prefix"},{"key":"formData.list.expiry"}],"confirmBeforeExecute":false,"jsonPathKeys":["60 * 24","search_input.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ListFiles","name":"ListFiles","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531efd"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) } }},\n\t\"branch\": \"{{branch_input.text}}\"\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"validName":"update_template","name":"update_template","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc364e","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/uepsj7o6a0hmiodonjr7xrcqj9pixe0s","headers":[{"value":"application/json","key":"content-type"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n\t\"app\": {{ {...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) } }},\n\t\"branch\": \"{{branch_input.text}}\"\n}","httpMethod":"POST","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":true,"jsonPathKeys":["{...get_exported_app.data, decryptedFields: undefined, datasourceList: get_exported_app.data.datasourceList.map((source) => { return {...source, structure: appsmith.store[source.pluginId] == undefined ? {}: appsmith.store[source.pluginId].data} } ) }","branch_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://hook.integromat.com"}},"validName":"update_template","name":"update_template","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531efe"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"/api/v1/applications/export/61764fbeba7e887d03bc3631","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"get_exported_app","name":"get_exported_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc364f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"path":"/api/v1/applications/export/61764fbeba7e887d03bc3631","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"get_exported_app","name":"get_exported_app","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531eff"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Prod","userPermissions":[]},"validName":"get_datasource_structure","name":"get_datasource_structure","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3650","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/datasources/{{this.params.id}}/structure","headers":[],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["this.params.id"],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Prod","userPermissions":[]},"validName":"get_datasource_structure","name":"get_datasource_structure","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f00"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE col1 = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3645","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE col1 = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f01"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"},{"value":[{}],"key":"where"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc3648","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"GET","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"},{"value":[{}],"key":"where"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f02"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\tcol2 = '{{update_col_2.text}}',\n col3 = '{{update_col_3.text}}',\n col4 = '{{update_col_4.text}}',\n col5 = '{{update_col_5.text}}'\n WHERE col1 = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3646","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\tcol2 = '{{update_col_2.text}}',\n col3 = '{{update_col_3.text}}',\n col4 = '{{update_col_4.text}}',\n col5 = '{{update_col_5.text}}'\n WHERE col1 = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"SQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f03"},{"new":false,"pluginType":"SAAS","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.triggeredRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","data_table.triggeredRow.rowIndex","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"google-sheets-plugin","id":"61764fbeba7e887d03bc3649","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"pluginSpecifiedTemplates":[{"value":"DELETE_ROW","key":"method"},{"value":"https://docs.google.com/spreadsheets/d/1P6or_F8UZ9sJX3JRAsX_kQDMRRnXqrnRgRIiml8Gjl0/edit#gid=0","key":"sheetUrl"},{"value":"","key":"range"},{"value":"","key":"spreadsheetName"},{"value":"1","key":"tableHeaderIndex"},{"value":"ROWS","key":"queryFormat"},{"value":"{{data_table.pageSize}}","key":"rowLimit"},{"value":"template_table","key":"sheetName"},{"value":"{{(data_table.pageNo - 1) * data_table.pageSize}}","key":"rowOffset"},{"key":"rowObject"},{"key":"rowObjects"},{"value":"{{data_table.triggeredRow.rowIndex}}","key":"rowIndex"},{"value":"SHEET","key":"deleteFormat"},{"value":false,"key":"smartSubstitution"}]},"userPermissions":[],"pageId":"Google Sheets","invalids":[],"dynamicBindingPathList":[{"key":"pluginSpecifiedTemplates[6].value"},{"key":"pluginSpecifiedTemplates[8].value"},{"key":"pluginSpecifiedTemplates[11].value"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.pageSize","data_table.triggeredRow.rowIndex","(data_table.pageNo - 1) * data_table.pageSize"],"datasource":{"new":false,"pluginId":"google-sheets-plugin","isValid":true,"messages":[],"id":"Google Sheet","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f04"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{tableName_input.text}}\",\n \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_sql_app","name":"generate_sql_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3651","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{tableName_input.text}}\",\n \"datasourceId\": \"{{datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\": \"{{search_col_input.text}}\",\n\t\t\"columns\": \"{{select_cols_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["select_cols_input.text","datasource_input.text.split(\"applications/\")[1].split(\"/\")[0]","datasource_input.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","search_col_input.text","tableName_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_sql_app","name":"generate_sql_app","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f05"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"find":{"query":"{ col2: /{{data_table.searchText||\"\"}}/i }","limit":"{{data_table.pageSize}}","skip":"{{(data_table.pageNo - 1) * data_table.pageSize}}","sort":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"FIND","smartSubstitution":false}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.find.sort"},{"key":"formData.find.skip"},{"key":"formData.find.limit"},{"key":"formData.find.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"FindQuery","name":"FindQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3652","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"find":{"query":"{ col2: /{{data_table.searchText||\"\"}}/i }","limit":"{{data_table.pageSize}}","skip":"{{(data_table.pageNo - 1) * data_table.pageSize}}","sort":"{ \n{{key_select.selectedOptionValue}}: {{order_select.selectedOptionValue}} \n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"FIND","smartSubstitution":false}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.find.sort"},{"key":"formData.find.skip"},{"key":"formData.find.limit"},{"key":"formData.find.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"FindQuery","name":"FindQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f06"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table/{{data_table.selectedRow._ref}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"collection":"template_table","delete":{"query":"{ _id: ObjectId('{{data_table.triggeredRow._id}}') }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.delete.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._ref","data_table.triggeredRow._id"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3653","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"template_table/{{data_table.selectedRow._ref}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"collection":"template_table","delete":{"query":"{ _id: ObjectId('{{data_table.triggeredRow._id}}') }","limit":"SINGLE"},"command":"DELETE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.delete.query"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow._ref","data_table.triggeredRow._id"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f07"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"query":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }","limit":"SINGLE","update":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"UPDATE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.updateMany.query"},{"key":"formData.updateMany.update"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3654","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"query":"{ _id: ObjectId('{{data_table.selectedRow._id}}') }","limit":"SINGLE","update":"{\n \"col1\" : {{update_col_1.text}},\n\t\"col2\" : {{update_col_2.text}},\n \"col3\" : {{update_col_3.text}},\n \"col4\" : {{update_col_4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"UPDATE","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.updateMany.query"},{"key":"formData.updateMany.update"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._id","update_col_1.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f08"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"insert":{"documents":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"INSERT","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.insert.documents"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"mongo-plugin","id":"61764fbeba7e887d03bc3655","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"updateMany":{"limit":"SINGLE"},"insert":{"documents":"{\n \"col1\": {{insert_col_input1.text}}, \n \"col2\": {{insert_col_input2.text}}, \n \"col3\": {{insert_col_input3.text}}, \n \"col4\": {{insert_col_input4.text}}\n}"},"collection":"template_table","delete":{"limit":"SINGLE"},"command":"INSERT","smartSubstitution":true}},"userPermissions":[],"pageId":"MongoDB","invalids":[],"dynamicBindingPathList":[{"key":"formData.insert.documents"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"mongo-plugin","isValid":true,"messages":[],"id":"Mock Mongo","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f09"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_mongo_app","name":"generate_mongo_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3656","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]}}\",\n \"applicationId\" : \"{{mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]}}\",\n\t\t\"searchColumn\" : \"{{search_keys_input.text}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["mongo_ds_url.text.split(\"datasource/\")[1].split(\"?\" || \"/\")[0]","collection_input.text","search_keys_input.text","mongo_ds_url.text.split(\"applications/\")[1].split(\"/\")[0]"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_mongo_app","name":"generate_mongo_app","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0a"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_gsheet_app","name":"generate_gsheet_app","messages":[]},"pluginId":"restapi-plugin","id":"61764fbeba7e887d03bc3657","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/pages/crud-page","headers":[{"value":"application/json","key":"Content-Type"},{"value":"SESSION=691d7061-6eb8-4483-af91-b6e5de0692cc","key":"Cookie"}],"paginationType":"PAGE_NO","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"{\n \"tableName\": \"{{collection_input.text}}\",\n \"datasourceId\": \"{{gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]}}\",\n \"applicationId\" : \"{{gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]}}\"\n}","httpMethod":"POST"},"userPermissions":[],"pageId":"Page Generator","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["gsheet_ds_input.text.split(\"datasources/\")[1].split(\"/\" || \"?\")[0]","gsheet_ds_input.text.split(\"applications/\")[1].split(\"/\")[0]","collection_input.text"],"datasource":{"new":true,"invalids":[],"pluginId":"restapi-plugin","isValid":true,"name":"DEFAULT_REST_DATASOURCE","messages":[],"userPermissions":[],"datasourceConfiguration":{"url":"https://release.app.appsmith.com"}},"validName":"generate_gsheet_app","name":"generate_gsheet_app","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0b"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","command":"DELETE_FILE"},"body":"{\n\t\"data\": \"null\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"DeleteFile","name":"DeleteFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc3658","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","command":"DELETE_FILE"},"body":"{\n\t\"data\": \"null\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"DeleteFile","name":"DeleteFile","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0c"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"READ_FILE"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ReadFile","name":"ReadFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc3659","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{File_List.selectedItem.fileName}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"READ_FILE"},"body":"{\n\t\"data\": \"\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["File_List.selectedItem.fileName"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"ReadFile","name":"ReadFile","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0d"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{update_file_name.text}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","where":{"children":[{"condition":"EQ"}]},"expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{\n\t\"data\": \"{{update_file_picker.files.length ? update_file_picker.files[0].data : \"\" }}\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_file_picker.files.length ? update_file_picker.files[0].data : \"\"","update_file_name.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"UpdateFile","name":"UpdateFile","messages":[]},"pluginId":"amazons3-plugin","id":"61764fbeba7e887d03bc365a","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"{{update_file_name.text}}","paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"bucket":"assets-test.appsmith.com","read":{"usingBase64Encoding":"YES","dataType":"YES","expiry":"5"},"create":{"dataType":"YES","expiry":"5"},"list":{"prefix":"","where":{"children":[{"condition":"EQ"}]},"expiry":"5","signedUrl":"NO"},"delete":{"expiry":"5"},"command":"UPLOAD_FILE_FROM_BODY"},"body":"{\n\t\"data\": \"{{update_file_picker.files.length ? update_file_picker.files[0].data : \"\" }}\"\n}"},"userPermissions":[],"pageId":"S3","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_file_picker.files.length ? update_file_picker.files[0].data : \"\"","update_file_name.text"],"datasource":{"new":false,"pluginId":"amazons3-plugin","isValid":true,"messages":[],"id":"AmazonS3 CRUD","userPermissions":[]},"validName":"UpdateFile","name":"UpdateFile","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0e"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"{{data_table.selectedRow._ref.path}}","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"UPDATE","command":"UPDATE_DOCUMENT"},"body":"{\n\t\"col1\": \"{{update_col_1.text}}\",\n\t\"col2\": \"{{update_col_2.text}}\",\n\t\"col3\": \"{{update_col_3.text}}\",\n\t\"col4\": \"{{update_col_4.text}}\",\n\t\"col5\": \"{{update_col_5.text}}\"\n}"},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._ref.path","update_col_1.text","update_col_5.text","data_table.selectedRow._id","update_col_4.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365b","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"{{data_table.selectedRow._ref.path}}","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"UPDATE","command":"UPDATE_DOCUMENT"},"body":"{\n\t\"col1\": \"{{update_col_1.text}}\",\n\t\"col2\": \"{{update_col_2.text}}\",\n\t\"col3\": \"{{update_col_3.text}}\",\n\t\"col4\": \"{{update_col_4.text}}\",\n\t\"col5\": \"{{update_col_5.text}}\"\n}"},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"},{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","update_col_2.text","data_table.selectedRow._ref.path","update_col_1.text","update_col_5.text","data_table.selectedRow._id","update_col_4.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f0f"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"{{data_table.triggeredRow._ref.path}}","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"DELETE","command":"DELETE_DOCUMENT"}},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow._ref.path","data_table.selectedRow._id"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365c","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"{{data_table.triggeredRow._ref.path}}","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"DELETE","command":"DELETE_DOCUMENT"}},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"path"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow._ref.path","data_table.selectedRow._id"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f10"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"template_table","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"INSERT","command":"ADD_TO_COLLECTION"},"body":"{\n\t\"col1\": \"{{insert_col_input1.text}}\",\n\t\"col2\": \"{{insert_col_input2.text}}\",\n\t\"col3\": \"{{insert_col_input3.text}}\",\n\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\"col5\": \"{{insert_col_input5.text}}\"\n}"},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365d","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"next":"{}","path":"template_table","paginationType":"NONE","prev":"{}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"orderBy":"FORM","limitDocuments":"INSERT","command":"ADD_TO_COLLECTION"},"body":"{\n\t\"col1\": \"{{insert_col_input1.text}}\",\n\t\"col2\": \"{{insert_col_input2.text}}\",\n\t\"col3\": \"{{insert_col_input3.text}}\",\n\t\"col4\": \"{{insert_col_input4.text}}\",\n\t\"col5\": \"{{insert_col_input5.text}}\"\n}"},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f11"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"next":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","path":"template_table","paginationType":"NONE","prev":"{{SelectQuery.data[0]}}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"timestampValuePath":"","startAfter":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","endBefore":"{{SelectQuery.data[0]}}","deleteKeyPath":"","orderBy":"[\"{{order_select.selectedOptionValue + key_select.selectedOptionValue}}\"]","limitDocuments":"1","command":"GET_COLLECTION"}},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"formData.startAfter"},{"key":"formData.endBefore"},{"key":"formData.orderBy"}],"confirmBeforeExecute":false,"jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"firestore-plugin","id":"61764fbeba7e887d03bc365e","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"next":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","path":"template_table","paginationType":"NONE","prev":"{{SelectQuery.data[0]}}","timeoutInMillisecond":10000,"encodeParamsToggle":true,"formData":{"timestampValuePath":"","startAfter":"{{SelectQuery.data[SelectQuery.data.length - 1]}}","endBefore":"{{SelectQuery.data[0]}}","deleteKeyPath":"","orderBy":"[\"{{order_select.selectedOptionValue + key_select.selectedOptionValue}}\"]","limitDocuments":"1","command":"GET_COLLECTION"}},"userPermissions":[],"pageId":"Firestore","invalids":[],"dynamicBindingPathList":[{"key":"formData.startAfter"},{"key":"formData.endBefore"},{"key":"formData.orderBy"}],"confirmBeforeExecute":false,"jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"datasource":{"new":false,"pluginId":"firestore-plugin","isValid":true,"messages":[],"id":"FBTemplateDB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f12"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"keys *"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchKeys","name":"FetchKeys","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc365f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"keys *"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchKeys","name":"FetchKeys","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f13"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{insert_key_input.text}} \"{{insert_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_key_input.text","insert_value_input.text"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"InsertKey","name":"InsertKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3660","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{insert_key_input.text}} \"{{insert_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_key_input.text","insert_value_input.text"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"InsertKey","name":"InsertKey","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f14"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{data_table.selectedRow.result}} \"{{update_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_value_input.text","data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"UpdateKey","name":"UpdateKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3661","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"set {{data_table.selectedRow.result}} \"{{update_value_input.text}}\""},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_value_input.text","data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"UpdateKey","name":"UpdateKey","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f15"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"del {{data_table.triggeredRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"DeleteKey","name":"DeleteKey","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3662","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"del {{data_table.triggeredRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.triggeredRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"DeleteKey","name":"DeleteKey","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f16"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"GET {{data_table.selectedRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchValue","name":"FetchValue","messages":[]},"pluginId":"redis-plugin","id":"61764fbeba7e887d03bc3663","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"GET {{data_table.selectedRow.result}}"},"userPermissions":[],"pageId":"Redis","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["data_table.selectedRow.result"],"datasource":{"new":false,"pluginId":"redis-plugin","isValid":true,"messages":[],"id":"RedisTemplateApps","userPermissions":[]},"validName":"FetchValue","name":"FetchValue","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f17"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE \"col1\" = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3664","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"DELETE FROM public.template_table\n WHERE \"col1\" = {{Table1.triggeredRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["Table1.triggeredRow.col1"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"DeleteQuery","name":"DeleteQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f18"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n \"col3\" = '{{update_col_3.text}}',\n \"col4\" = '{{update_col_4.text}}',\n \"col5\" = '{{update_col_5.text}}'\n WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3665","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"UPDATE public.template_table SET\n\t\t\"col2\" = '{{update_col_2.text}}',\n \"col3\" = '{{update_col_3.text}}',\n \"col4\" = '{{update_col_4.text}}',\n \"col5\" = '{{update_col_5.text}}'\n WHERE \"col1\" = {{Table1.selectedRow.col1}};","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["update_col_3.text","Table1.selectedRow.col1","update_col_2.text","update_col_5.text","update_col_4.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"UpdateQuery","name":"UpdateQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f19"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col2\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3666","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":true,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"SELECT * FROM public.template_table\nWHERE \"col2\" ilike '%{{Table1.searchText || \"\"}}%'\nORDER BY \"{{col_select.selectedOptionValue}}\" {{order_select.selectedOptionValue}}\nLIMIT {{Table1.pageSize}}\nOFFSET {{(Table1.pageNo - 1) * Table1.pageSize}};","pluginSpecifiedTemplates":[{"value":false}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"SelectQuery","name":"SelectQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f1a"},{"new":false,"pluginType":"DB","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"pluginId":"postgres-plugin","id":"61764fbeba7e887d03bc3667","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"paginationType":"NONE","timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"INSERT INTO public.template_table (\n\t\"col1\",\n\t\"col2\", \n\t\"col3\",\n\t\"col4\", \n\t\"col5\"\n)\nVALUES (\n\t\t\t\t{{insert_col_input1.text}}, \n\t\t\t\t{{insert_col_input2.text}}, \n\t\t\t\t{{insert_col_input3.text}}, \n\t\t\t\t{{insert_col_input4.text}}, \n\t\t\t\t{{insert_col_input5.text}}\n);","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"PostgreSQL","invalids":[],"dynamicBindingPathList":[{"key":"body"}],"confirmBeforeExecute":false,"jsonPathKeys":["insert_col_input1.text","insert_col_input5.text","insert_col_input4.text","insert_col_input3.text","insert_col_input2.text"],"datasource":{"new":false,"pluginId":"postgres-plugin","isValid":true,"messages":[],"id":"Internal DB","userPermissions":[]},"validName":"InsertQuery","name":"InsertQuery","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb7738cd5d704509531f1b"},{"new":false,"pluginType":"API","unpublishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/users/me","headers":[{"value":"_hjid=41cedd95-19f9-438a-8b6e-f2c4d7fb086b; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; SL_C_23361dd035530_VID=P3kBR7eMjg; ajs_anonymous_id=e6ef9c9b-3407-4374-81ab-6bafef26a4d1; [email protected]; intercom-id-y10e7138=50e190b7-b24e-4bef-b320-3c47a3c91006; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjIxNWJlMWRkLTNjMGQtNDY5NS05YzRmLTFjYTM4MjNhNzM5NlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNjI1ODEwMjkyNCwibGFzdEV2ZW50VGltZSI6MTYzNjI1ODEwMzE3MywiZXZlbnRJZCI6NSwiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjZ9; _ga=GA1.2.526957763.1633412376; _gid=GA1.2.1610516593.1636258104; _ga_0JZ9C3M56S=GS1.1.1636258103.3.1.1636258646.0; SESSION=09ae7c78-ca84-4a38-916a-f282893efb40; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c91e75170277-051d4ff86c77bb-1d3b6650-168000-17c91e75171dc2%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nidhi%40appsmith.com%22%2C%22userId%22%3A%20%22nidhi%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24email%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nidhi%22%2C%22%24last_name%22%3A%20%22Nair%22%2C%22%24name%22%3A%20%22Nidhi%20Nair%22%7D; SL_C_23361dd035530_SID=3VIjO5jKCt; intercom-session-y10e7138=WnhwMVl4VmVIUDFPVkgxUDVidm8wOXUzNjZ2elJ0OWx2a21Qc3NCYk1zenNEa0dzMkswWFlpanM4YXNxY2pQYi0taFpkWkR6K0xLUFJyUVFRSkMwZ3pUUT09--376a7fef0d7774b3284b94fb4c1ea1c8e2305afe; _hjAbsoluteSessionInProgress=1","key":"Cookie"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"Api1","name":"Api1","messages":[]},"pluginId":"restapi-plugin","id":"618bb2fe4c4b7031f0bf5f0f","userPermissions":["read:actions","execute:actions","manage:actions"],"publishedAction":{"executeOnLoad":false,"isValid":true,"actionConfiguration":{"path":"/api/v1/users/me","headers":[{"value":"_hjid=41cedd95-19f9-438a-8b6e-f2c4d7fb086b; SL_C_23361dd035530_KEY=c370af0df0edf38360adbefbdc47d2b42ea137c9; SL_C_23361dd035530_VID=P3kBR7eMjg; ajs_anonymous_id=e6ef9c9b-3407-4374-81ab-6bafef26a4d1; [email protected]; intercom-id-y10e7138=50e190b7-b24e-4bef-b320-3c47a3c91006; amplitude_id_fef1e872c952688acd962d30aa545b9eappsmith.com=eyJkZXZpY2VJZCI6IjIxNWJlMWRkLTNjMGQtNDY5NS05YzRmLTFjYTM4MjNhNzM5NlIiLCJ1c2VySWQiOm51bGwsIm9wdE91dCI6ZmFsc2UsInNlc3Npb25JZCI6MTYzNjI1ODEwMjkyNCwibGFzdEV2ZW50VGltZSI6MTYzNjI1ODEwMzE3MywiZXZlbnRJZCI6NSwiaWRlbnRpZnlJZCI6MSwic2VxdWVuY2VOdW1iZXIiOjZ9; _ga=GA1.2.526957763.1633412376; _gid=GA1.2.1610516593.1636258104; _ga_0JZ9C3M56S=GS1.1.1636258103.3.1.1636258646.0; SESSION=09ae7c78-ca84-4a38-916a-f282893efb40; mp_70b8ea94d623dd857fb555a76d11f944_mixpanel=%7B%22distinct_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24device_id%22%3A%20%2217c91e75170277-051d4ff86c77bb-1d3b6650-168000-17c91e75171dc2%22%2C%22%24initial_referrer%22%3A%20%22%24direct%22%2C%22%24initial_referring_domain%22%3A%20%22%24direct%22%2C%22mp_lib%22%3A%20%22Segment%3A%20web%22%2C%22%24user_id%22%3A%20%22nidhi%40appsmith.com%22%2C%22mp_name_tag%22%3A%20%22nidhi%40appsmith.com%22%2C%22userId%22%3A%20%22nidhi%40appsmith.com%22%2C%22source%22%3A%20%22cloud%22%2C%22id%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24email%22%3A%20%22nidhi%40appsmith.com%22%2C%22%24first_name%22%3A%20%22Nidhi%22%2C%22%24last_name%22%3A%20%22Nair%22%2C%22%24name%22%3A%20%22Nidhi%20Nair%22%7D; SL_C_23361dd035530_SID=3VIjO5jKCt; intercom-session-y10e7138=WnhwMVl4VmVIUDFPVkgxUDVidm8wOXUzNjZ2elJ0OWx2a21Qc3NCYk1zenNEa0dzMkswWFlpanM4YXNxY2pQYi0taFpkWkR6K0xLUFJyUVFRSkMwZ3pUUT09--376a7fef0d7774b3284b94fb4c1ea1c8e2305afe; _hjAbsoluteSessionInProgress=1","key":"Cookie"}],"paginationType":"NONE","queryParameters":[],"timeoutInMillisecond":10000,"encodeParamsToggle":true,"body":"","httpMethod":"GET","pluginSpecifiedTemplates":[{"value":true}]},"userPermissions":[],"pageId":"Admin","invalids":[],"dynamicBindingPathList":[],"confirmBeforeExecute":false,"jsonPathKeys":[],"datasource":{"new":false,"pluginId":"restapi-plugin","isValid":true,"messages":[],"id":"Appsmith Release","userPermissions":[]},"validName":"Api1","name":"Api1","messages":[]},"gitSyncId":"61764fbeba7e887d03bc3631_61bb773acd5d7045095322ff"}],"unpublishedLayoutmongoEscapedWidgets":{"MongoDB":["data_table"]},"pageList":[{"publishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"SQL","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3644"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"2jj0197tff","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"kby34l9nbb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":42,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03b365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"sql","isHidden":false},"new":true,"unpublishedPage":{"name":"SQL","userPermissions":[],"layouts":[{"new":false,"id":"SQL","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3644"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col2","col3","col4","col5","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","fontStyle":"","textColor":"","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"2jj0197tff","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"kby34l9nbb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":42,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03b365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"sql","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc0"},{"publishedPage":{"name":"Google Sheets","userPermissions":[],"layouts":[{"new":false,"id":"Google Sheets","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3648"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":44,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"tableData"},{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.rowIndex))}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"typ9jslblf","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"8b67sbqskr","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() =>{ showAlert('Row successfully deleted!','success');\tSelectQuery.run();\n}, () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"s2jtkzz2ub","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"396envygmb","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":18,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":18,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":18,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRowIndex >= 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":62,"widgetId":"in8e51pg3y","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput2","rightColumn":62,"widgetId":"mlhvfasf31","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput3","rightColumn":62,"widgetId":"0lz9vhcnr0","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput4","rightColumn":62,"widgetId":"m4esf7fww5","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":17,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":17,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":17,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":17,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"google-sheets","isHidden":false},"new":true,"unpublishedPage":{"name":"Google Sheets","userPermissions":[],"layouts":[{"new":false,"id":"Google Sheets","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"SAAS","jsonPathKeys":["data_table.pageSize","(data_table.pageNo - 1) * data_table.pageSize"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3648"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":44,"minHeight":900,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["col1","col2","col3","col4","rowIndex","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":6,"bottomRow":84,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"}],"dynamicBindingPathList":[{"key":"tableData"},{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"primaryColumns.rowIndex.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"rowIndex":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.rowIndex))}}","textSize":"PARAGRAPH","index":4,"isVisible":false,"label":"rowIndex","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"rowIndex","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{deleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"step":62,"status":75,"col1":140}},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"typ9jslblf","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"8b67sbqskr","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":18.8828125,"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text11","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Alert"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"delete_button","rightColumn":64,"onClick":"{{(function () {\nDeleteQuery.run(() =>{ showAlert('Row successfully deleted!','success');\tSelectQuery.run();\n}, () => showAlert('Something went wrong! Please check debugger for more info.','error'));\ncloseModal('Delete_Modal');\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":16,"bottomRow":20,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":60,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"hqtpvn9ut2","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"ipc9o3ksyi","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hqtpvn9ut2","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{(function () {\nInsertQuery.run(() =>{ \t\tshowAlert('Item successfully inserted!','success');\ncloseModal('Insert_Modal');\nSelectQuery.run();\n}, (error) => showAlert(error,'error'));\n})()}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"s2jtkzz2ub","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"FormButton2","rightColumn":45,"isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"396envygmb","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"widgetName":"Text21","rightColumn":18,"textAlign":"RIGHT","widgetId":"vwgogtczul","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"cbz2r2wizv","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col1}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":18,"textAlign":"RIGHT","widgetId":"t2a63abehn","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"tjrktjwn9c","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","defaultText":"","placeholderText":"{{data_table.tableData[0].col2}}","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":18,"textAlign":"RIGHT","widgetId":"0xqhj661rj","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"et0p9va1yw","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col3}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":18,"textAlign":"RIGHT","widgetId":"mxztke60bg","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"wp3nuhaz7m","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col4}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":18,"textAlign":"RIGHT","widgetId":"2xn45kukrz","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"lqhw4zvrts","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"ipc9o3ksyi","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":20,"dynamicBindingPathList":[{"key":"placeholderText"}],"inputType":"TEXT","placeholderText":"{{data_table.tableData[0].col5}}","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":35,"textAlign":"LEFT","widgetId":"iuydklwdo3","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"ipc9o3ksyi","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{data_table.selectedRowIndex >= 0}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":42,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"isRequired":false,"widgetName":"colInput1","rightColumn":62,"widgetId":"in8e51pg3y","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput2","rightColumn":62,"widgetId":"mlhvfasf31","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput3","rightColumn":62,"widgetId":"0lz9vhcnr0","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"colInput4","rightColumn":62,"widgetId":"m4esf7fww5","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":18,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row Index: {{data_table.selectedRow.rowIndex}}"},{"widgetName":"col_text_1","rightColumn":17,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":7,"bottomRow":11,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"col_text_2","rightColumn":17,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":14,"bottomRow":18,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"col_text_3","rightColumn":17,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":21,"bottomRow":25,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"col_text_4","rightColumn":17,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":28,"bottomRow":32,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"google-sheets","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc1"},{"publishedPage":{"name":"S3","userPermissions":[],"layouts":[{"new":false,"id":"S3","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["60 * 24","search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364d"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1300,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Zoom_Modal2","rightColumn":0,"detachFromLayout":true,"widgetId":"kqxoe40pg6","topRow":89,"bottomRow":89,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9Copy","rightColumn":0,"detachFromLayout":true,"widgetId":"80wzwajsst","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"kqxoe40pg6","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3Copy","rightColumn":64,"onClick":"{{closeModal('Zoom_Modal2')}}","color":"#040627","iconName":"cross","widgetId":"8kw9kfcd5y","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text15Copy","rightColumn":41,"textAlign":"LEFT","widgetId":"vk710q1v3s","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13Copy","rightColumn":63,"onClick":"{{closeModal('Zoom_Modal2')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lfiwss1u3w","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Close","isDisabled":false},{"image":"{{selected_files.selectedItem.base64}}","widgetName":"Image3Copy","rightColumn":64,"objectFit":"contain","widgetId":"2bewgakjx9","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png"}],"isDisabled":false}],"width":532,"height":600},{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":37,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":40,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false,"validation":"true"},{"template":{"DownloadIcon":{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"CopyURLIcon":{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"EditIcon":{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"Text21":{"widgetName":"Text21","rightColumn":24,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"nu44q8kd9p","topRow":4,"bottomRow":8,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.id)}}","textStyle":"BODY","key":"xvmvdekk3s"},"Text20":{"widgetName":"Text20","rightColumn":28,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"thgbdemmiw","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.name)}}","textStyle":"HEADING","key":"xvmvdekk3s"},"Image3":{"widgetName":"Image3","displayName":"Image","iconSVG":"/static/media/icon.52d8fb96.svg","topRow":0,"bottomRow":8.4,"type":"IMAGE_WIDGET","hideCard":false,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://assets.appsmith.com/widgets/default.png","key":"lsc53q139g","image":"{{File_List.listData.map((currentItem) => currentItem.img)}}","rightColumn":16,"objectFit":"contain","widgetId":"2rrg354q8i","isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemImage":{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":1,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.signedUrl;\n })();\n })}}","rightColumn":20,"objectFit":"contain","widgetId":"lh1sjszc93","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemName":{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"qyqv89mu1c","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":1,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.fileName;\n })();\n })}}"},"DeleteIcon":{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"}},"widgetName":"File_List","listData":"{{ListFiles.data}}","isCanvas":true,"displayName":"List","iconSVG":"/static/media/icon.9925ee17.svg","topRow":7,"bottomRow":80,"parentRowSpace":10,"type":"LIST_WIDGET","hideCard":false,"gridGap":0,"parentColumnSpace":9.67822265625,"dynamicTriggerPathList":[{"key":"template.DownloadIcon.onClick"},{"key":"template.CopyURLIcon.onClick"}],"leftColumn":1,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.FileListItemImage.image"},{"key":"template.FileListItemName.text"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas14","displayName":"Canvas","topRow":0,"bottomRow":390,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":false,"hideCard":true,"dropDisabled":true,"openParentPropertyPane":true,"minHeight":400,"noPad":true,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"Container7","borderColor":"transparent","disallowCopy":true,"isCanvas":true,"displayName":"Container","iconSVG":"/static/media/icon.1977dca3.svg","topRow":0,"bottomRow":17,"dragDisabled":true,"type":"CONTAINER_WIDGET","hideCard":false,"openParentPropertyPane":true,"isDeletable":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas15","detachFromLayout":true,"displayName":"Canvas","widgetId":"lcz0rhije8","containerStyle":"none","topRow":0,"bottomRow":160,"parentRowSpace":1,"isVisible":true,"type":"CANVAS_WIDGET","canExtend":false,"version":1,"hideCard":true,"parentId":"66oc53smx3","renderMode":"CANVAS","isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"kmwv6dap5n","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":0,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{currentItem.fileName}}"},{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":0,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{currentItem.signedUrl}}","rightColumn":20,"objectFit":"contain","widgetId":"4laf7e6wer","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false}],"key":"29vrztch46"}],"borderWidth":"0","key":"cw0dtdoe0g","disablePropertyPane":true,"backgroundColor":"white","rightColumn":64,"widgetId":"66oc53smx3","containerStyle":"card","isVisible":true,"version":1,"parentId":"sh1yahe7kl","renderMode":"CANVAS","isLoading":false,"borderRadius":"0"}],"key":"29vrztch46","rightColumn":232.27734375,"detachFromLayout":true,"widgetId":"sh1yahe7kl","containerStyle":"none","isVisible":true,"version":1,"parentId":"cjgg2thzom","renderMode":"CANVAS","isLoading":false}],"key":"x51ms5k6q9","backgroundColor":"transparent","rightColumn":63,"itemBackgroundColor":"#FFFFFF","widgetId":"cjgg2thzom","isVisible":true,"parentId":"6tz2s7ivi5","renderMode":"CANVAS","isLoading":false}]}]},{"widgetName":"Text6","rightColumn":64,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":0,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[],"isDisabled":false}],"width":532,"height":600},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"pi0t67rnwh","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{\nDeleteFile.run(() => {closeModal('delete_modal'); \nListFiles.run();\n});\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"hp22uj3dra","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Edit_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"usealgbtyj","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas10","rightColumn":0,"detachFromLayout":true,"widgetId":"6i7m9kpuky","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"usealgbtyj","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon4","rightColumn":64,"onClick":"{{closeModal('Edit_Modal')}}","color":"#040627","iconName":"cross","widgetId":"pstfdcc1e4","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text17","rightColumn":41,"textAlign":"LEFT","widgetId":"z64z3l112n","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update File"},{"widgetName":"Button15","rightColumn":44,"onClick":"{{closeModal('Edit_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"trc4e6ylcz","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateFile.run(() => {ListFiles.run();resetWidget('update_file_picker');closeModal('Edit_Modal');})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"8lbthc9dml","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":44,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Update","isDisabled":"{{update_file_picker.files.length == 0}}"},{"widgetName":"Text18","rightColumn":17,"textAlign":"RIGHT","widgetId":"qb26g34etr","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"File Name"},{"isRequired":false,"widgetName":"update_file_name","rightColumn":64,"widgetId":"je0ea8ma5d","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{File_List.selectedItem.fileName}}","isDisabled":true,"validation":"true"},{"widgetName":"update_file_picker","topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"isRequired":false,"rightColumn":64,"isDefaultClickDisabled":true,"widgetId":"mioot5pcs5","defaultSelectedFiles":[],"isVisible":true,"label":"Select File","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"6i7m9kpuky","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":1}],"isDisabled":false}],"width":456,"height":240},{"backgroundColor":"#FFFFFF","widgetName":"Container6","rightColumn":64,"widgetId":"yg1iyxq9kd","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":37,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas13","rightColumn":634,"detachFromLayout":true,"widgetId":"xv97g6rzgq","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"yg1iyxq9kd","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Button8","rightColumn":46,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"bx8wok3aut","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":31,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"template":{"Canvas7":{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":340,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["u3nvgafsdo"]},"update_files_name":{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.name;\n })();\n })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => currentItem.base64)}}","widgetName":"Image2","rightColumn":10,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'contain';\n })();\n })}}","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Container4":{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":["romgsruzxz"],"disablePropertyPane":true},"Canvas8":{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["vu7fb0dbt8","7zziet357m","ql8qs2xelx"]},"Text14":{"widgetName":"Text14","rightColumn":23,"textAlign":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'LEFT';\n })();\n })}}","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"0n30419eso","topRow":21,"bottomRow":73,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"xv97g6rzgq","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[{"key":"template.Image2.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"},{"key":"listData"},{"key":"template.update_files_name.defaultText"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":510,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":520,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":13,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":120,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":31,"textAlign":"LEFT","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":19,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":4,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false,"validation":"true"},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":18,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"contain","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"fjh7zgcdmh","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":15,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":14,"textAlign":"LEFT","widgetId":"jc21bnjh92","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"widgetName":"Text7","rightColumn":52,"textAlign":"LEFT","widgetId":"364shivyaz","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload New Files"},{"widgetName":"upload_button","rightColumn":63,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=> { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => {closeModal('Upload_Files_Modal'); resetWidget('Container6', true)})\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].update_files_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"1uava20nxi","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Upload","isDisabled":"{{ selected_files.items.length == 0 || selected_files.items.map((file) => file.update_files_name.text).includes(\"\") }}"},{"widgetName":"Text19","rightColumn":52,"textAlign":"LEFT","dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"9wh2ereoy9","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8.0458984375,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"}],"fontSize":"HEADING3","text":"Selected Files"},{"widgetName":"FilePicker","displayName":"FilePicker","iconSVG":"/static/media/icon.7c5ad9c3.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"allowedFileTypes":[],"type":"FILE_PICKER_WIDGET_V2","hideCard":false,"parentColumnSpace":8.0458984375,"leftColumn":39,"isDisabled":false,"key":"rew2q0dlgd","isRequired":false,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"xc1dun5wkl","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":5,"version":1,"fileDataType":"Base64","parentId":"xv97g6rzgq","selectedFiles":[],"renderMode":"CANVAS","isLoading":false,"files":[],"maxNumFiles":1}]}]}]}}],"slug":"s3","isHidden":false},"new":true,"unpublishedPage":{"name":"S3","userPermissions":[],"layouts":[{"new":false,"id":"S3","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["60 * 24","search_input.text"],"name":"ListFiles","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364d"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1174,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":1300,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":46,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Zoom_Modal2","rightColumn":0,"detachFromLayout":true,"widgetId":"kqxoe40pg6","topRow":89,"bottomRow":89,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas9Copy","rightColumn":0,"detachFromLayout":true,"widgetId":"80wzwajsst","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"kqxoe40pg6","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3Copy","rightColumn":64,"onClick":"{{closeModal('Zoom_Modal2')}}","color":"#040627","iconName":"cross","widgetId":"8kw9kfcd5y","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text15Copy","rightColumn":41,"textAlign":"LEFT","widgetId":"vk710q1v3s","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Zoom Image"},{"widgetName":"Button13Copy","rightColumn":63,"onClick":"{{closeModal('Zoom_Modal2')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lfiwss1u3w","topRow":53,"bottomRow":57,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Close","isDisabled":false},{"image":"{{selected_files.selectedItem.base64}}","widgetName":"Image3Copy","rightColumn":64,"objectFit":"contain","widgetId":"2bewgakjx9","topRow":6,"bottomRow":51,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"80wzwajsst","isLoading":false,"maxZoomLevel":8,"parentColumnSpace":8,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png"}],"isDisabled":false}],"width":532,"height":600},{"backgroundColor":"#FFFFFF","widgetName":"Container3","rightColumn":37,"widgetId":"th4d9oxy8z","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":634,"detachFromLayout":true,"widgetId":"6tz2s7ivi5","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"th4d9oxy8z","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"onTextChanged":"{{ListFiles.run()}}","widgetName":"search_input","rightColumn":40,"widgetId":"0llmlojupa","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6tz2s7ivi5","isLoading":false,"parentColumnSpace":19.5,"dynamicTriggerPathList":[{"key":"onTextChanged"}],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Search File Prefix","defaultText":"","isDisabled":false,"validation":"true"},{"template":{"DownloadIcon":{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"CopyURLIcon":{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"EditIcon":{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},"Text21":{"widgetName":"Text21","rightColumn":24,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"nu44q8kd9p","topRow":4,"bottomRow":8,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.id)}}","textStyle":"BODY","key":"xvmvdekk3s"},"Text20":{"widgetName":"Text20","rightColumn":28,"textAlign":"LEFT","displayName":"Text","iconSVG":"/static/media/icon.e6c93592.svg","widgetId":"thgbdemmiw","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"hideCard":false,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[{"key":"text"}],"leftColumn":16,"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem) => currentItem.name)}}","textStyle":"HEADING","key":"xvmvdekk3s"},"Image3":{"widgetName":"Image3","displayName":"Image","iconSVG":"/static/media/icon.52d8fb96.svg","topRow":0,"bottomRow":8.4,"type":"IMAGE_WIDGET","hideCard":false,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","dynamicBindingPathList":[{"key":"image"}],"leftColumn":0,"defaultImage":"https://assets.appsmith.com/widgets/default.png","key":"lsc53q139g","image":"{{File_List.listData.map((currentItem) => currentItem.img)}}","rightColumn":16,"objectFit":"contain","widgetId":"2rrg354q8i","isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemImage":{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":1,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.signedUrl;\n })();\n })}}","rightColumn":20,"objectFit":"contain","widgetId":"lh1sjszc93","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false},"FileListItemName":{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"qyqv89mu1c","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":1,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{File_List.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.fileName;\n })();\n })}}"},"DeleteIcon":{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":9,"bottomRow":13,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"}},"widgetName":"File_List","listData":"{{ListFiles.data}}","isCanvas":true,"displayName":"List","iconSVG":"/static/media/icon.9925ee17.svg","topRow":7,"bottomRow":80,"parentRowSpace":10,"type":"LIST_WIDGET","hideCard":false,"gridGap":0,"parentColumnSpace":9.67822265625,"dynamicTriggerPathList":[{"key":"template.DownloadIcon.onClick"},{"key":"template.CopyURLIcon.onClick"}],"leftColumn":1,"dynamicBindingPathList":[{"key":"listData"},{"key":"template.FileListItemImage.image"},{"key":"template.FileListItemName.text"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas14","displayName":"Canvas","topRow":0,"bottomRow":390,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":false,"hideCard":true,"dropDisabled":true,"openParentPropertyPane":true,"minHeight":400,"noPad":true,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"Container7","borderColor":"transparent","disallowCopy":true,"isCanvas":true,"displayName":"Container","iconSVG":"/static/media/icon.1977dca3.svg","topRow":0,"bottomRow":17,"dragDisabled":true,"type":"CONTAINER_WIDGET","hideCard":false,"openParentPropertyPane":true,"isDeletable":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas15","detachFromLayout":true,"displayName":"Canvas","widgetId":"lcz0rhije8","containerStyle":"none","topRow":0,"bottomRow":160,"parentRowSpace":1,"isVisible":true,"type":"CANVAS_WIDGET","canExtend":false,"version":1,"hideCard":true,"parentId":"66oc53smx3","renderMode":"CANVAS","isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"boxShadow":"NONE","widgetName":"EditIcon","onClick":"{{showModal('Edit_Modal')}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":39,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":45,"iconName":"edit","widgetId":"x5bft8h9vd","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"CopyURLIcon","onClick":"{{copyToClipboard(currentItem.signedUrl)}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":45,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":51,"iconName":"link","widgetId":"d2z5zj56j9","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DownloadIcon","onClick":"{{navigateTo(currentItem.signedUrl, {})}}","buttonColor":"#03B365","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":57,"iconName":"download","widgetId":"ljk8fj5jc1","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"boxShadow":"NONE","widgetName":"DeleteIcon","onClick":"{{showModal('delete_modal')}}","buttonColor":"#DD4B34","dynamicPropertyPathList":[{"key":"onClick"}],"displayName":"Icon Button","iconSVG":"/static/media/icon.bff4eac0.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"type":"ICON_BUTTON_WIDGET","hideCard":false,"parentColumnSpace":9.4658203125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":57,"dynamicBindingPathList":[],"isDisabled":false,"key":"8akz850h7z","rightColumn":63,"iconName":"trash","widgetId":"f8ipd8gbls","logBlackList":{"boxShadow":true,"widgetName":true,"buttonColor":true,"isCanvas":true,"displayName":true,"iconSVG":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"type":true,"hideCard":true,"minHeight":true,"parentColumnSpace":true,"leftColumn":true,"isDisabled":true,"key":true,"rightColumn":true,"iconName":true,"widgetId":true,"isVisible":true,"version":true,"parentId":true,"renderMode":true,"isLoading":true,"borderRadius":true,"buttonVariant":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","renderMode":"CANVAS","isLoading":false,"borderRadius":"CIRCLE","buttonVariant":"TERTIARY"},{"widgetName":"FileListItemName","rightColumn":63,"textAlign":"LEFT","widgetId":"kmwv6dap5n","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"leftColumn":true,"fontSize":true,"text":true},"topRow":0,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lcz0rhije8","isLoading":false,"parentColumnSpace":19.0625,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{currentItem.fileName}}"},{"widgetName":"FileListItemImage","onClick":"{{showModal('Zoom_Modal')}}","dynamicPropertyPathList":[],"topRow":0,"bottomRow":13,"parentRowSpace":10,"type":"IMAGE_WIDGET","parentColumnSpace":19.0625,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":1,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://cdn3.iconfinder.com/data/icons/brands-applications/512/File-512.png","image":"{{currentItem.signedUrl}}","rightColumn":20,"objectFit":"contain","widgetId":"4laf7e6wer","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"enableDownload":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"enableRotation":true,"defaultImage":true},"isVisible":true,"version":1,"parentId":"lcz0rhije8","isLoading":false,"maxZoomLevel":1,"enableDownload":false,"enableRotation":false}],"key":"29vrztch46"}],"borderWidth":"0","key":"cw0dtdoe0g","disablePropertyPane":true,"backgroundColor":"white","rightColumn":64,"widgetId":"66oc53smx3","containerStyle":"card","isVisible":true,"version":1,"parentId":"sh1yahe7kl","renderMode":"CANVAS","isLoading":false,"borderRadius":"0"}],"key":"29vrztch46","rightColumn":232.27734375,"detachFromLayout":true,"widgetId":"sh1yahe7kl","containerStyle":"none","isVisible":true,"version":1,"parentId":"cjgg2thzom","renderMode":"CANVAS","isLoading":false}],"key":"x51ms5k6q9","backgroundColor":"transparent","rightColumn":63,"itemBackgroundColor":"#FFFFFF","widgetId":"cjgg2thzom","isVisible":true,"parentId":"6tz2s7ivi5","renderMode":"CANVAS","isLoading":false}]}]},{"widgetName":"Text6","rightColumn":64,"backgroundColor":"","textAlign":"LEFT","widgetId":"t54ituq472","topRow":0,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#2E3D49","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Bucket"},{"widgetName":"Upload_Files_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"1fxorj7v97","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"d8io5ijwj4","topRow":0,"bottomRow":620,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"1fxorj7v97","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[],"isDisabled":false}],"width":532,"height":600},{"widgetName":"delete_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"9g0cw9adf8","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas6","rightColumn":0,"detachFromLayout":true,"widgetId":"ozvpoudxz2","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"9g0cw9adf8","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('delete_modal')}}","color":"#040627","iconName":"cross","widgetId":"xkyh49z71e","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text12","rightColumn":41,"textAlign":"LEFT","widgetId":"s1y44xm547","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete File"},{"widgetName":"Button10","rightColumn":48,"onClick":"{{closeModal('delete_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"pi0t67rnwh","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"Button11","rightColumn":64,"onClick":"{{\nDeleteFile.run(() => {closeModal('delete_modal'); \nListFiles.run();\n});\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"hp22uj3dra","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"ozvpoudxz2","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text13","rightColumn":64,"textAlign":"LEFT","widgetId":"oypa9ad1tg","topRow":5,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"ozvpoudxz2","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the file?\n\n{{File_List.selectedItem.fileName}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Edit_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"usealgbtyj","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas10","rightColumn":0,"detachFromLayout":true,"widgetId":"6i7m9kpuky","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"usealgbtyj","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon4","rightColumn":64,"onClick":"{{closeModal('Edit_Modal')}}","color":"#040627","iconName":"cross","widgetId":"pstfdcc1e4","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"leftColumn":56,"dynamicBindingPathList":[],"iconSize":24},{"widgetName":"Text17","rightColumn":41,"textAlign":"LEFT","widgetId":"z64z3l112n","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update File"},{"widgetName":"Button15","rightColumn":44,"onClick":"{{closeModal('Edit_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"trc4e6ylcz","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateFile.run(() => {ListFiles.run();resetWidget('update_file_picker');closeModal('Edit_Modal');})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"8lbthc9dml","topRow":18,"bottomRow":22,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":44,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Update","isDisabled":"{{update_file_picker.files.length == 0}}"},{"widgetName":"Text18","rightColumn":17,"textAlign":"RIGHT","widgetId":"qb26g34etr","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"File Name"},{"isRequired":false,"widgetName":"update_file_name","rightColumn":64,"widgetId":"je0ea8ma5d","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"6i7m9kpuky","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":17,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{File_List.selectedItem.fileName}}","isDisabled":true,"validation":"true"},{"widgetName":"update_file_picker","topRow":11,"bottomRow":15,"parentRowSpace":10,"allowedFileTypes":["*","image/*","video/*","audio/*","text/*",".doc","image/jpeg",".png"],"type":"FILE_PICKER_WIDGET","parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"isDisabled":false,"isRequired":false,"rightColumn":64,"isDefaultClickDisabled":true,"widgetId":"mioot5pcs5","defaultSelectedFiles":[],"isVisible":true,"label":"Select File","maxFileSize":"10","version":1,"fileDataType":"Base64","parentId":"6i7m9kpuky","selectedFiles":[],"isLoading":false,"files":[],"maxNumFiles":1}],"isDisabled":false}],"width":456,"height":240},{"backgroundColor":"#FFFFFF","widgetName":"Container6","rightColumn":64,"widgetId":"yg1iyxq9kd","containerStyle":"card","topRow":5,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"leftColumn":37,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas13","rightColumn":634,"detachFromLayout":true,"widgetId":"xv97g6rzgq","containerStyle":"none","topRow":0,"bottomRow":820,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"yg1iyxq9kd","minHeight":830,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Button8","rightColumn":46,"onClick":"{{closeModal('Upload_Files_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"bx8wok3aut","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":31,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Cancel","isDisabled":false},{"template":{"Canvas7":{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":340,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["u3nvgafsdo"]},"update_files_name":{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":23,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return currentItem.name;\n })();\n })}}","isDisabled":false},"Image2":{"image":"{{selected_files.listData.map((currentItem) => currentItem.base64)}}","widgetName":"Image2","rightColumn":10,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'contain';\n })();\n })}}","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"},"Container4":{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":8,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"children":["romgsruzxz"],"disablePropertyPane":true},"Canvas8":{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":80,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":["vu7fb0dbt8","7zziet357m","ql8qs2xelx"]},"Text14":{"widgetName":"Text14","rightColumn":23,"textAlign":"{{selected_files.listData.map((currentItem, currentIndex) => {\n return (function(){\n return 'LEFT';\n })();\n })}}","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":11,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"}},"childAutoComplete":{"currentItem":{"data":"","base64":"","name":"","raw":"","id":"","text":"","type":""}},"widgetName":"selected_files","backgroundColor":"","rightColumn":64,"listData":"{{FilePicker.files}}","dynamicPropertyPathList":[{"key":"isVisible"}],"itemBackgroundColor":"#FFFFFF","widgetId":"0n30419eso","topRow":21,"bottomRow":73,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","type":"LIST_WIDGET","parentId":"xv97g6rzgq","gridGap":0,"isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[{"key":"template.Image2.onClick"}],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"},{"key":"listData"},{"key":"template.update_files_name.defaultText"}],"gridType":"vertical","enhancements":true,"children":[{"widgetName":"Canvas7","rightColumn":256,"detachFromLayout":true,"widgetId":"oqhzaygncs","containerStyle":"none","topRow":0,"bottomRow":510,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"dropDisabled":true,"parentId":"0n30419eso","openParentPropertyPane":true,"minHeight":520,"isLoading":false,"noPad":true,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"backgroundColor":"white","widgetName":"Container4","rightColumn":64,"disallowCopy":true,"widgetId":"u3nvgafsdo","containerStyle":"card","topRow":0,"bottomRow":13,"dragDisabled":true,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"oqhzaygncs","openParentPropertyPane":true,"isDeletable":false,"isLoading":false,"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas8","detachFromLayout":true,"widgetId":"romgsruzxz","containerStyle":"none","topRow":0,"bottomRow":180,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"u3nvgafsdo","minHeight":120,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text14","rightColumn":31,"textAlign":"LEFT","widgetId":"vu7fb0dbt8","logBlackList":{"widgetName":true,"rightColumn":true,"textAlign":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"fontStyle":true,"type":true,"textColor":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"dynamicTriggerPathList":true,"parentColumnSpace":true,"dynamicBindingPathList":true,"leftColumn":true,"fontSize":true,"text":true,"textStyle":true},"topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"romgsruzxz","isLoading":false,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":19,"fontSize":"PARAGRAPH","text":"File Name","textStyle":"HEADING"},{"isRequired":false,"widgetName":"update_files_name","rightColumn":63,"widgetId":"7zziet357m","logBlackList":{"isRequired":true,"widgetName":true,"rightColumn":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"label":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"parentColumnSpace":true,"resetOnSubmit":true,"leftColumn":true,"inputType":true,"isDisabled":true},"topRow":4,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{currentItem.name}}","isDisabled":false,"validation":"true"},{"image":"{{currentItem.base64}}","widgetName":"Image2","rightColumn":18,"onClick":"{{showModal('Zoom_Modal2')}}","objectFit":"contain","widgetId":"ql8qs2xelx","logBlackList":{"image":true,"widgetName":true,"rightColumn":true,"objectFit":true,"widgetId":true,"topRow":true,"bottomRow":true,"parentRowSpace":true,"isVisible":true,"type":true,"version":true,"parentId":true,"minHeight":true,"isLoading":true,"maxZoomLevel":true,"parentColumnSpace":true,"imageShape":true,"leftColumn":true,"defaultImage":true},"topRow":0,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"IMAGE_WIDGET","version":1,"parentId":"romgsruzxz","isLoading":false,"maxZoomLevel":1,"parentColumnSpace":7.3125,"dynamicTriggerPathList":[{"key":"onClick"}],"imageShape":"RECTANGLE","leftColumn":0,"dynamicBindingPathList":[{"key":"image"}],"defaultImage":"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png"}]}],"disablePropertyPane":true}]}]},{"isRequired":false,"widgetName":"folder_name","rightColumn":63,"widgetId":"fjh7zgcdmh","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":15,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"folder/sub-folder","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":14,"textAlign":"LEFT","widgetId":"jc21bnjh92","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Upload Folder"},{"widgetName":"Text7","rightColumn":52,"textAlign":"LEFT","widgetId":"364shivyaz","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Upload New Files"},{"widgetName":"upload_button","rightColumn":63,"onClick":"{{\nFilePicker.files.forEach((file, index) => {\n\tCreateFile.run((response, params)=> { showAlert('File Uploaded','success'); \nif (params.isLastFile) {\n\tListFiles.run(() => {closeModal('Upload_Files_Modal'); resetWidget('Container6', true)})\t\n}\n}\n\t, () => showAlert('File Upload Failed','error')\t\n\t, {fileIndex: index, name: selected_files.items[index].update_files_name.text, isLastFile: index == (FilePicker.files.length - 1), });\n\treturn true;\n})\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"},{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"1uava20nxi","topRow":75,"bottomRow":79,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"xv97g6rzgq","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Upload","isDisabled":"{{ selected_files.items.length == 0 || selected_files.items.map((file) => file.update_files_name.text).includes(\"\") }}"},{"widgetName":"Text19","rightColumn":52,"textAlign":"LEFT","dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"9wh2ereoy9","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":"{{FilePicker.files.length > 0}}","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"xv97g6rzgq","isLoading":false,"parentColumnSpace":8.0458984375,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[{"key":"isVisible"}],"fontSize":"HEADING3","text":"Selected Files"},{"widgetName":"FilePicker","displayName":"FilePicker","iconSVG":"/static/media/icon.7c5ad9c3.svg","topRow":10,"bottomRow":14,"parentRowSpace":10,"allowedFileTypes":[],"type":"FILE_PICKER_WIDGET_V2","hideCard":false,"parentColumnSpace":8.0458984375,"leftColumn":39,"isDisabled":false,"key":"rew2q0dlgd","isRequired":false,"rightColumn":63,"isDefaultClickDisabled":true,"widgetId":"xc1dun5wkl","defaultSelectedFiles":[],"isVisible":true,"label":"Select Files","maxFileSize":5,"version":1,"fileDataType":"Base64","parentId":"xv97g6rzgq","selectedFiles":[],"renderMode":"CANVAS","isLoading":false,"files":[],"maxNumFiles":1}]}]}]}}],"slug":"s3","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc2"},{"publishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"Admin","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"API","jsonPathKeys":[],"name":"get_exported_app","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364f"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":910,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":800,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":53,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n get_exported_app.run(() => {\n \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n storeValue(params.name, res); \n },undefined, row)\n })\n })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2vtg0qdlqv","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated','success'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"jg23u09rwk","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"update-crud-template","isDisabled":false,"validation":"true"},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"},{"widgetName":"Text4","rightColumn":63,"backgroundColor":"#DD4B34","textAlign":"LEFT","widgetId":"fanskapltd","topRow":67,"bottomRow":71,"parentRowSpace":10,"isVisible":true,"fontStyle":"","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Note : Please use update-crud-template branch to avoid TCs failing in release"}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}\n]"}]}}],"slug":"admin","isHidden":false},"new":true,"unpublishedPage":{"name":"Admin","userPermissions":[],"layouts":[{"new":false,"id":"Admin","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"API","jsonPathKeys":[],"name":"get_exported_app","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc364f"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":910,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"#2E3D49","rightColumn":45,"widgetId":"hdpwx2szs0","topRow":5,"bottomRow":86,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas1","rightColumn":554.75,"detachFromLayout":true,"widgetId":"kwx6oz4fub","containerStyle":"none","topRow":0,"bottomRow":800,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"hdpwx2szs0","minHeight":810,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text1","rightColumn":53,"textAlign":"LEFT","widgetId":"7fqtlu52np","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update App Template"},{"widgetName":"Text2","rightColumn":61,"textAlign":"LEFT","widgetId":"w2l08fshj2","topRow":10,"bottomRow":62,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"shouldScroll":true,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{\"<pre>\" + JSON.stringify(get_exported_app.data, null, 2) + \"</pre>\" || \"Fetch The App\"}}"},{"widgetName":"Button1","rightColumn":21,"onClick":"{{\n get_exported_app.run(() => {\n \tconst arr = JSON.parse(datasource_arr.text);\n\t\tarr.map((row) => { get_datasource_structure.run((res, params) => {\n storeValue(params.name, res); \n },undefined, row)\n })\n })\n}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2vtg0qdlqv","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":3,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Fetch App","isDisabled":false},{"widgetName":"Button2","rightColumn":63,"onClick":"{{update_template.run(() => showAlert('Template Updated','success'), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"isDisabled"}],"buttonColor":"#03B365","widgetId":"jg23u09rwk","topRow":72,"bottomRow":76,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":4,"dynamicBindingPathList":[{"key":"isDisabled"}],"buttonVariant":"PRIMARY","text":"Deploy","isDisabled":"{{get_exported_app.data.exportedApplication === undefined}}"},{"isRequired":false,"widgetName":"branch_input","rightColumn":49,"widgetId":"d6shlon0z2","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":12,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"Branch name","defaultText":"update-crud-template","isDisabled":false,"validation":"true"},{"widgetName":"Text3","rightColumn":12,"textAlign":"LEFT","widgetId":"y57v1yp7vb","topRow":63,"bottomRow":67,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"HEADING3","text":"Branch"},{"widgetName":"Text4","rightColumn":63,"backgroundColor":"#DD4B34","textAlign":"LEFT","widgetId":"fanskapltd","topRow":67,"bottomRow":71,"parentRowSpace":10,"isVisible":true,"fontStyle":"","type":"TEXT_WIDGET","textColor":"#FFFFFF","version":1,"parentId":"kwx6oz4fub","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Note : Please use update-crud-template branch to avoid TCs failing in release"}]}]},{"widgetName":"datasource_arr","rightColumn":16,"textAlign":"LEFT","widgetId":"znji9afu2q","topRow":1,"bottomRow":35,"parentRowSpace":10,"isVisible":false,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"[\n{ \"name\":\"mongo-plugin\",\n\"id\": \"60dafedaee9aa1792c5bf773\"\n},\n{ \"name\":\"postgres-plugin\",\n\"id\": \"5fcdd652b0e807468e3b493b\"\n}\n]"}]}}],"slug":"admin","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc3"},{"publishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"Page Generator","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":45,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"n6220hgzzs","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"zzsh2d5rns","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"6ui5kmqebf","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]}]}]}}],"slug":"page-generator","isHidden":false},"new":true,"unpublishedPage":{"name":"Page Generator","userPermissions":[],"layouts":[{"new":false,"id":"Page Generator","userPermissions":[],"layoutOnLoadActions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":880,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":45,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Tabs1","rightColumn":44,"widgetId":"jalvzswyyk","defaultTab":"SQL","topRow":13,"bottomRow":54,"shouldShowTabs":true,"parentRowSpace":10,"tabsObj":{"tab1":{"widgetId":"nyka98xqpv","index":0,"label":"SQL","id":"tab1","isVisible":true},"tab2":{"widgetId":"neexe4fljs","index":1,"label":"GSheet","id":"tab2","isVisible":true},"tab7qxuerb9p7":{"widgetId":"4yqoh4fjmv","id":"tab7qxuerb9p7","label":"Mongo","isVisible":true}},"isVisible":true,"type":"TABS_WIDGET","version":3,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":19.8125,"dynamicTriggerPathList":[],"leftColumn":15,"dynamicBindingPathList":[],"children":[{"tabId":"tab1","tabName":"SQL","rightColumn":634,"widgetName":"Canvas2","detachFromLayout":true,"widgetId":"nyka98xqpv","topRow":0,"bottomRow":430,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":false,"widgetName":"tableName_input","rightColumn":63,"widgetId":"f8k5jt9mjm","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"isRequired":false,"widgetName":"datasource_input","rightColumn":63,"widgetId":"4j1xd4hih9","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text2","rightColumn":14,"textAlign":"RIGHT","widgetId":"957c72jpan","topRow":3,"bottomRow":7,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"widgetName":"Text4","rightColumn":14,"textAlign":"RIGHT","widgetId":"nz74xi3ae3","topRow":10,"bottomRow":14,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Name"},{"widgetName":"Text6","rightColumn":14,"textAlign":"RIGHT","widgetId":"s1i89k31f5","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Columns to Select"},{"isRequired":false,"widgetName":"select_cols_input","rightColumn":63,"widgetId":"pwt5ybili3","topRow":17,"bottomRow":21,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text7","rightColumn":14,"textAlign":"RIGHT","widgetId":"rbacxz6brz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Column to Search"},{"isRequired":false,"widgetName":"search_col_input","rightColumn":63,"widgetId":"bnro1si5sz","topRow":25,"bottomRow":29,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"parentColumnSpace":8.35546875,"resetOnSubmit":true,"leftColumn":14,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"resetFormOnClick":false,"widgetName":"FormButton1","rightColumn":63,"onClick":"{{generate_sql_app.run(() => showAlert('Page Created!','success'), () => {})}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"n6220hgzzs","topRow":31,"bottomRow":35,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"nyka98xqpv","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate"}]},{"tabId":"tab2","tabName":"GSheet","rightColumn":634,"widgetName":"Canvas3","detachFromLayout":true,"widgetId":"neexe4fljs","topRow":0,"bottomRow":400,"parentRowSpace":1,"type":"CANVAS_WIDGET","parentId":"jalvzswyyk","isLoading":false,"renderMode":"CANVAS","minHeight":410,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text8","rightColumn":16,"textAlign":"RIGHT","widgetId":"3ghywz6tk6","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"DataSource URL"},{"isRequired":false,"widgetName":"gsheet_ds_input","rightColumn":62,"widgetId":"a8kpjqdp59","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":16,"textAlign":"RIGHT","widgetId":"r6o12im1qd","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"SpreadSheet URL"},{"isRequired":false,"widgetName":"spreadsheet_input","rightColumn":62,"widgetId":"80kk95t99i","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text10","rightColumn":16,"textAlign":"RIGHT","widgetId":"k0ul3uaoph","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Sheet Name"},{"isRequired":false,"widgetName":"sheet_input","rightColumn":62,"widgetId":"a35cwuivq7","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text11","rightColumn":16,"textAlign":"RIGHT","widgetId":"l1r1tfbx6y","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Table Header Index"},{"isRequired":false,"widgetName":"header_input","rightColumn":62,"widgetId":"jrhp3pwzll","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":16,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button1","rightColumn":62,"onClick":"{{generate_gsheet_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"zzsh2d5rns","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"neexe4fljs","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]},{"tabId":"tab7qxuerb9p7","widgetName":"Canvas4","tabName":"Mongo","rightColumn":574.5625,"detachFromLayout":true,"widgetId":"4yqoh4fjmv","containerStyle":"none","topRow":1,"bottomRow":400,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"jalvzswyyk","minHeight":410,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Text12","rightColumn":17,"textAlign":"RIGHT","widgetId":"4l1uqhf2au","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Datasource URL"},{"isRequired":false,"widgetName":"mongo_ds_url","rightColumn":61,"widgetId":"r8yvmt103v","topRow":1,"bottomRow":5,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text13","rightColumn":17,"textAlign":"RIGHT","widgetId":"0y3rz6ufib","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Collection Name"},{"isRequired":false,"widgetName":"collection_input","rightColumn":61,"widgetId":"sbe7jfnafu","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":17,"textAlign":"RIGHT","widgetId":"s1fhjft9to","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Keys to Fetch"},{"isRequired":false,"widgetName":"fetch_keys_input","rightColumn":61,"widgetId":"74tjl0q7x3","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text15","rightColumn":17,"textAlign":"RIGHT","widgetId":"rwi67ouhe1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key to Search"},{"isRequired":false,"widgetName":"search_keys_input","rightColumn":61,"widgetId":"ie4mp16js1","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"resetOnSubmit":true,"leftColumn":17,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Button2","rightColumn":62,"onClick":"{{generate_mongo_app.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"6ui5kmqebf","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"4yqoh4fjmv","isLoading":false,"parentColumnSpace":8.6650390625,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Generate","isDisabled":false}]}]}]}}],"slug":"page-generator","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc4"},{"publishedPage":{"name":"MongoDB","userPermissions":[],"layouts":[{"new":false,"id":"MongoDB","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3652"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["customColumn1","_id","col4","col2","col3","col1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":41,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{FindQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"nj85l57r47","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"atgojamsmw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update Selected Row"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"mongodb","isHidden":false},"new":true,"unpublishedPage":{"name":"MongoDB","userPermissions":[],"layouts":[{"new":false,"id":"MongoDB","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"name":"FindQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3652"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1056,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["customColumn1","_id","col4","col2","col3","col1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"appsmith_mongo_escape_id":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":41,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{FindQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"nj85l57r47","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"atgojamsmw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update Selected Row"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"}]}]}]}}],"slug":"mongodb","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc5"},{"publishedPage":{"name":"Redis","userPermissions":[],"layouts":[{"new":false,"id":"Redis","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":[],"name":"FetchKeys","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365f"},{"pluginType":"DB","jsonPathKeys":["data_table.selectedRow.result"],"name":"FetchValue","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3663"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":5160,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"eer73khglm","topRow":1,"bottomRow":47,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.result}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"9nvn3gfw6q","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"eer73khglm","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateKey.run(() => FetchKeys.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"3apd2wkt91","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"hhh0296qfj","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_value_input","rightColumn":63,"widgetId":"07ker1hdod","topRow":8,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{FetchValue.data[0].result}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"uawwds1z0r","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Key: {{data_table.selectedRow.result}}"}]}]},{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"v8nfulwuy0","containerStyle":"card","topRow":1,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"erkvdsolhu","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"v8nfulwuy0","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["result","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":5,"bottomRow":86,"parentRowSpace":10,"onPageChange":"","type":"TABLE_WIDGET","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"},{"key":"onRowSelected"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.result.computedValue"}],"leftColumn":0,"primaryColumns":{"result":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.result))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"result","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"result","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"delimiter":",","onRowSelected":"{{FetchValue.run()}}","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"tefed053r1","isVisibleFilters":true,"tableData":"{{FetchKeys.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"erkvdsolhu","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"result":503,"task":245,"deliveryAddress":170,"step":62,"id":228,"customColumn2":174,"status":75}},{"widgetName":"new_key_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"2rlp4irwh0","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Key","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FetchKeys.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o9t8fslxdi","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"nt181ks4ci","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Redis Data"}]}]},{"widgetName":"Insert_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"c8fg4ubw52","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":0,"detachFromLayout":true,"widgetId":"re60vbuakz","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"c8fg4ubw52","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Insert_Modal')}}","color":"#040627","iconName":"cross","widgetId":"3tk445loxa","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text21","rightColumn":41,"textAlign":"LEFT","widgetId":"fgi9qp4uwr","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"New Key"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"xnh96plcyo","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false},{"widgetName":"Button2","rightColumn":64,"onClick":"{{InsertKey.run(() => FetchKeys.run(() => closeModal('Insert_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"ix2dralfal","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Insert","isDisabled":false},{"isRequired":false,"widgetName":"insert_key_input","rightColumn":64,"widgetId":"ozz6gi7zmm","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":17,"textAlign":"RIGHT","widgetId":"kotk4wa6pe","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key"},{"widgetName":"Text23","rightColumn":17,"textAlign":"RIGHT","widgetId":"y2dlumuetl","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Value"},{"isRequired":false,"widgetName":"insert_value_input","rightColumn":64,"widgetId":"pevr27mh87","topRow":16,"bottomRow":50,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"value_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"fh14k9y353","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":0,"detachFromLayout":true,"widgetId":"v8n3d5aecd","topRow":0,"bottomRow":260,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"fh14k9y353","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","color":"#040627","iconName":"cross","widgetId":"jqaazpo3zy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text24","rightColumn":41,"textAlign":"LEFT","widgetId":"hvb3xnk1u8","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Value for Key: {{data_table.selectedRow.result}}"},{"widgetName":"Button4","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"yka7b6k706","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"widgetName":"Text25","rightColumn":64,"textAlign":"LEFT","widgetId":"j9315vzr13","topRow":6,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"v8n3d5aecd","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{FetchValue.data[0].result}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Delete_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"0skbil3ntd","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"lwsyaz55ll","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"0skbil3ntd","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Delete_Modal')}}","color":"#040627","iconName":"cross","widgetId":"dtuc8ag2of","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text26","rightColumn":41,"textAlign":"LEFT","widgetId":"d9ap4dp300","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Key"},{"widgetName":"Button6","rightColumn":64,"onClick":"{{DeleteKey.run(() => FetchKeys.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2kg6lmim5m","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text27","rightColumn":64,"textAlign":"LEFT","widgetId":"c698jgkzjg","topRow":7,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the key?\n\n{{data_table.selectedRow.result}}"},{"widgetName":"Button7","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lsvqrab5v2","topRow":18,"bottomRow":22,"recaptchaV2":false,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false}],"isDisabled":false}],"width":456,"height":240}]}}],"slug":"redis","isHidden":false},"new":true,"unpublishedPage":{"name":"Redis","userPermissions":[],"layouts":[{"new":false,"id":"Redis","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":[],"name":"FetchKeys","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365f"},{"pluginType":"DB","jsonPathKeys":["data_table.selectedRow.result"],"name":"FetchValue","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3663"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":5160,"containerStyle":"none","snapRows":129,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"eer73khglm","topRow":1,"bottomRow":47,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow.result}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"9nvn3gfw6q","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"eer73khglm","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateKey.run(() => FetchKeys.run(), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"3apd2wkt91","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"hhh0296qfj","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_value_input","rightColumn":63,"widgetId":"07ker1hdod","topRow":8,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":1,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{FetchValue.data[0].result}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"uawwds1z0r","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"9nvn3gfw6q","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Key: {{data_table.selectedRow.result}}"}]}]},{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"v8nfulwuy0","containerStyle":"card","topRow":1,"bottomRow":88,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"erkvdsolhu","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"v8nfulwuy0","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["result","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":5,"bottomRow":86,"parentRowSpace":10,"onPageChange":"","type":"TABLE_WIDGET","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"},{"key":"onRowSelected"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.result.computedValue"}],"leftColumn":0,"primaryColumns":{"result":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.result))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"result","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"result","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"delimiter":",","onRowSelected":"{{FetchValue.run()}}","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"tefed053r1","isVisibleFilters":true,"tableData":"{{FetchKeys.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"erkvdsolhu","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"result":503,"task":245,"deliveryAddress":170,"step":62,"id":228,"customColumn2":174,"status":75}},{"widgetName":"new_key_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"2rlp4irwh0","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Key","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{FetchKeys.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o9t8fslxdi","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":39,"textAlign":"LEFT","widgetId":"nt181ks4ci","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"erkvdsolhu","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Redis Data"}]}]},{"widgetName":"Insert_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"c8fg4ubw52","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":0,"detachFromLayout":true,"widgetId":"re60vbuakz","topRow":0,"bottomRow":590,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"c8fg4ubw52","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon1","rightColumn":64,"onClick":"{{closeModal('Insert_Modal')}}","color":"#040627","iconName":"cross","widgetId":"3tk445loxa","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text21","rightColumn":41,"textAlign":"LEFT","widgetId":"fgi9qp4uwr","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"New Key"},{"widgetName":"Button1","rightColumn":48,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"xnh96plcyo","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":36,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false},{"widgetName":"Button2","rightColumn":64,"onClick":"{{InsertKey.run(() => FetchKeys.run(() => closeModal('Insert_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"ix2dralfal","topRow":53,"bottomRow":57,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Insert","isDisabled":false},{"isRequired":false,"widgetName":"insert_key_input","rightColumn":64,"widgetId":"ozz6gi7zmm","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":17,"textAlign":"RIGHT","widgetId":"kotk4wa6pe","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Key"},{"widgetName":"Text23","rightColumn":17,"textAlign":"RIGHT","widgetId":"y2dlumuetl","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Value"},{"isRequired":false,"widgetName":"insert_value_input","rightColumn":64,"widgetId":"pevr27mh87","topRow":16,"bottomRow":50,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"re60vbuakz","isLoading":false,"parentColumnSpace":8,"resetOnSubmit":true,"leftColumn":19,"inputType":"TEXT","isDisabled":false,"validation":"true"}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"value_modal","rightColumn":0,"detachFromLayout":true,"widgetId":"fh14k9y353","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas4","rightColumn":0,"detachFromLayout":true,"widgetId":"v8n3d5aecd","topRow":0,"bottomRow":260,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"fh14k9y353","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon2","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","color":"#040627","iconName":"cross","widgetId":"jqaazpo3zy","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text24","rightColumn":41,"textAlign":"LEFT","widgetId":"hvb3xnk1u8","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Value for Key: {{data_table.selectedRow.result}}"},{"widgetName":"Button4","rightColumn":64,"onClick":"{{closeModal('value_modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"yka7b6k706","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"v8n3d5aecd","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Close","isDisabled":false},{"widgetName":"Text25","rightColumn":64,"textAlign":"LEFT","widgetId":"j9315vzr13","topRow":6,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"v8n3d5aecd","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"{{FetchValue.data[0].result}}"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Delete_Modal","rightColumn":0,"detachFromLayout":true,"widgetId":"0skbil3ntd","topRow":0,"bottomRow":0,"parentRowSpace":1,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":true,"isLoading":false,"parentColumnSpace":1,"leftColumn":0,"children":[{"widgetName":"Canvas5","rightColumn":0,"detachFromLayout":true,"widgetId":"lwsyaz55ll","topRow":0,"bottomRow":240,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"0skbil3ntd","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Icon3","rightColumn":64,"onClick":"{{closeModal('Delete_Modal')}}","color":"#040627","iconName":"cross","widgetId":"dtuc8ag2of","topRow":1,"bottomRow":5,"isVisible":true,"type":"ICON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"leftColumn":56,"iconSize":24},{"widgetName":"Text26","rightColumn":41,"textAlign":"LEFT","widgetId":"d9ap4dp300","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Key"},{"widgetName":"Button6","rightColumn":64,"onClick":"{{DeleteKey.run(() => FetchKeys.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"2kg6lmim5m","topRow":18,"bottomRow":22,"recaptchaV2":false,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":46,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text27","rightColumn":64,"textAlign":"LEFT","widgetId":"c698jgkzjg","topRow":7,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":true,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete the key?\n\n{{data_table.selectedRow.result}}"},{"widgetName":"Button7","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"lsvqrab5v2","topRow":18,"bottomRow":22,"recaptchaV2":false,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"lwsyaz55ll","isLoading":false,"parentColumnSpace":6.8125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":32,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Cancel","isDisabled":false}],"isDisabled":false}],"width":456,"height":240}]}}],"slug":"redis","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc6"},{"publishedPage":{"name":"Firestore","userPermissions":[],"layouts":[{"new":false,"id":"Firestore","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365e"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_ref","col4","col5","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns._ref.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"_ref":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._ref))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"_ref","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_ref","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":5,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":6,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":7,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":8,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"aiy9e38won","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"qykn04gnsw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":63,"widgetId":"hdw7qt67dg","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":22,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"yy4u8kzs8p","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":50,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._ref}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":490,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":500,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"25okoeayc8","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text20Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"kv1pqyhxvs","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"},{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":48,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"slug":"firestore","isHidden":false},"new":true,"unpublishedPage":{"name":"Firestore","userPermissions":[],"layouts":[{"new":false,"id":"Firestore","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["SelectQuery.data[SelectQuery.data.length - 1]","order_select.selectedOptionValue + key_select.selectedOptionValue","SelectQuery.data[0]"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc365e"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":890,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":720,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["_ref","col4","col5","col2","col3","col1","customColumn1"],"dynamicPropertyPathList":[],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns._ref.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col1.computedValue"}],"leftColumn":0,"primaryColumns":{"_ref":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._ref))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"_ref","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_ref","verticalAlignment":"CENTER"},"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":5,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":6,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":7,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":8,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"widgetName":"new_row_button","rightColumn":64,"onClick":"{{showModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"aiy9e38won","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":6.8310546875,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":51,"dynamicBindingPathList":[],"text":"New Row","isDisabled":false},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t},\n\t{\n\t\t\"label\": \"col4\",\n\t\t\"value\": \"col4\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"refresh_button","rightColumn":51,"onClick":"{{SelectQuery.run()}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"qykn04gnsw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":40,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Refresh","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":63,"widgetId":"hdw7qt67dg","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":22,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"yy4u8kzs8p","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":50,"parentRowSpace":10,"isVisible":"{{data_table.selectedRow._ref}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":490,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":500,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"25okoeayc8","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col5}}","isDisabled":false,"validation":"true"},{"widgetName":"Text20Copy","rightColumn":19,"textAlign":"RIGHT","widgetId":"kv1pqyhxvs","topRow":37,"bottomRow":41,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5 :"},{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":64,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":48,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":43,"bottomRow":47,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col1}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col2}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col3}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.col4}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":8,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row ID: {{data_table.selectedRow._id}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":9,"bottomRow":13,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1 :"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":16,"bottomRow":20,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2 :"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":23,"bottomRow":27,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3 :"},{"widgetName":"Text20","rightColumn":19,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":30,"bottomRow":34,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4 :"}]}]}]}}],"slug":"firestore","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc7"},{"publishedPage":{"name":"PostgreSQL","userPermissions":[],"layouts":[{"new":false,"id":"PostgreSQL","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3666"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col3","col4","col5","col2","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"xp5u9a9nzq","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"nh3cu4lb1g","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":604,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":59,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":604},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5.toString()}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"postgresql","isHidden":false},"new":true,"unpublishedPage":{"name":"PostgreSQL","userPermissions":[],"layouts":[{"new":false,"id":"PostgreSQL","userPermissions":[],"layoutOnLoadActions":[[{"pluginType":"DB","jsonPathKeys":["(Table1.pageNo - 1) * Table1.pageSize","Table1.searchText || \"\"","col_select.selectedOptionValue","Table1.pageSize","order_select.selectedOptionValue"],"name":"SelectQuery","timeoutInMillisecond":10000,"id":"61764fbeba7e887d03bc3666"}]],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":47,"minHeight":890,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":true,"type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Table1","columnOrder":["col1","col3","col4","col5","col2","customColumn1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{SelectQuery.run()}}","isSortable":true,"type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns.col5.computedValue"},{"key":"primaryColumns.col2.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"col5":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col5))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col5","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col5","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":4,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{Table1.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{SelectQuery.data}}","isVisible":true,"label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{SelectQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"col_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"col1","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n\t{\n\t\t\"label\": \"col1\",\n\t\t\"value\": \"col1\"\n\t},\n\t{\n\t\t\"label\": \"col2\",\n\t\t\"value\": \"col2\"\n\t},\n\t{\n\t\t\"label\": \"col3\",\n\t\t\"value\": \"col3\"\n\t}\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":33,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{SelectQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"ASC","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"Ascending\",\n \"value\": \"ASC\"\n },\n {\n \"label\": \"Descending\",\n \"value\": \"DESC\"\n }\n]","onOptionChange":"{{SelectQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":64,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"template_table Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{SelectQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"xp5u9a9nzq","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"nh3cu4lb1g","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"TERTIARY","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => SelectQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":true,"type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":true,"canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":604,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":59,"parentRowSpace":10,"isVisible":true,"type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => SelectQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","buttonVariant":"PRIMARY","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col1:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col1","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"col2","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col3","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col4","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text24","rightColumn":19,"textAlign":"RIGHT","widgetId":"9t3vdjd5xj","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"},{"isRequired":true,"widgetName":"insert_col_input5","rightColumn":62,"widgetId":"5rfqxgj0vm","topRow":33,"bottomRow":37,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"col5","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":604},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!Table1.selectedRow.col1}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":true,"canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => SelectQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"buttonVariant":"PRIMARY","text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":true,"type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"SECONDARY","text":"Reset"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"in8e51pg3y","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col2.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"mlhvfasf31","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col3.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col4.toString()}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_5","rightColumn":63,"widgetId":"m4esf7fww5","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"label":"","type":"INPUT_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{Table1.selectedRow.col5.toString()}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[{"key":"text"}],"fontSize":"HEADING1","text":"Update Row: {{Table1.selectedRow.col1}}"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":6,"bottomRow":10,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col2:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":13,"bottomRow":17,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col3:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":20,"bottomRow":24,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col4:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":27,"bottomRow":31,"parentRowSpace":10,"isVisible":true,"fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"col5:"}]}]}]}}],"slug":"postgresql","isHidden":false},"userPermissions":["read:pages","manage:pages"],"gitSyncId":"61764fbeba7e887d03bc3631_61bb770ecd5d70450952ccc8"}],"publishedLayoutmongoEscapedWidgets":{"MongoDB":["data_table"]},"actionCollectionList":[],"exportedApplication":{"new":true,"color":"#D9E7FF","name":"CRUD App Templates","appIsExample":false,"icon":"bag","isPublic":false,"unreadCommentThreads":0,"slug":"crud-app-templates"},"publishedDefaultPageName":"PostgreSQL"}
\ No newline at end of file
|
aab77b8ebb14bcae9cc86248b5ee1c28e7e2fc11
|
2022-01-27 14:09:21
|
Aman Agarwal
|
fix: Memoized the Form Control Component reducing unwanted re-rendering (#10553)
| false
|
Memoized the Form Control Component reducing unwanted re-rendering (#10553)
|
fix
|
diff --git a/app/client/src/pages/Editor/FormControl.tsx b/app/client/src/pages/Editor/FormControl.tsx
index 0712ca1f859d..bfbe4d07309a 100644
--- a/app/client/src/pages/Editor/FormControl.tsx
+++ b/app/client/src/pages/Editor/FormControl.tsx
@@ -1,7 +1,7 @@
-import React from "react";
+import React, { memo, useMemo } from "react";
import { ControlProps } from "components/formControls/BaseControl";
import { isHidden } from "components/formControls/utils";
-import { useSelector } from "react-redux";
+import { useSelector, shallowEqual } from "react-redux";
import { getFormValues } from "redux-form";
import FormControlFactory from "utils/FormControlFactory";
import Tooltip from "components/ads/Tooltip";
@@ -17,11 +17,11 @@ import {
import { FormIcons } from "icons/FormIcons";
import { AppState } from "reducers";
import { Action } from "entities/Action";
-import _ from "lodash";
import {
EvaluationError,
PropertyEvaluationErrorType,
} from "utils/DynamicBindingUtils";
+import { getConfigErrors } from "selectors/formSelectors";
interface FormControlProps {
config: ControlProps;
formName: string;
@@ -33,38 +33,25 @@ function FormControl(props: FormControlProps) {
getFormValues(props.formName)(state),
);
- // get the datatree from the state
- const dataTree = useSelector((state: AppState) => state.evaluations.tree);
-
- // action that corresponds to this form control
- let action: any;
- let configErrors: EvaluationError[] = [];
-
- // if form value exists, use the name of the form(which is the action's name) to get the action details
- // from the data tree, then store it in the action variable
- if (formValues && formValues.name) {
- if (formValues.name in dataTree) {
- // get action details from data tree
- action = dataTree[formValues.name];
-
- // extract the error object from the action's details object.
- const actionError = action && action?.__evaluation__?.errors;
-
- // get the configProperty for this form control and format it to resemble the format used in the action details errors object.
- const formattedConfig = _.replace(
- props?.config?.configProperty,
- "actionConfiguration",
- "config",
- );
-
- // grab the errors specific to this configProperty and store it in configErrors.
- if (actionError && formattedConfig in actionError) {
- configErrors = actionError[formattedConfig];
- }
- }
- }
-
const hidden = isHidden(formValues, props.config.hidden);
+ const configErrors: EvaluationError[] = useSelector(
+ (state: AppState) =>
+ getConfigErrors(state, {
+ configProperty: props?.config?.configProperty,
+ formName: props.formName,
+ }),
+ shallowEqual,
+ );
+
+ const FormConfigMemoizedValue = useMemo(
+ () =>
+ FormControlFactory.createControl(
+ props.config,
+ props.formName,
+ props?.multipleConfig,
+ ),
+ [],
+ );
if (hidden) return null;
@@ -76,11 +63,7 @@ function FormControl(props: FormControlProps) {
multipleConfig={props?.multipleConfig}
>
<div className={`t--form-control-${props.config.controlType}`}>
- {FormControlFactory.createControl(
- props.config,
- props.formName,
- props?.multipleConfig,
- )}
+ {FormConfigMemoizedValue}
</div>
</FormConfig>
);
@@ -149,7 +132,7 @@ function FormConfig(props: FormConfigProps) {
);
}
-export default FormControl;
+export default memo(FormControl);
function renderFormConfigTop(props: { config: ControlProps }) {
const {
diff --git a/app/client/src/pages/Editor/QueryEditor/helpers.tsx b/app/client/src/pages/Editor/QueryEditor/helpers.tsx
new file mode 100644
index 000000000000..ed9b90a8b8dc
--- /dev/null
+++ b/app/client/src/pages/Editor/QueryEditor/helpers.tsx
@@ -0,0 +1,17 @@
+import { UIComponentTypes, Plugin } from "api/PluginApi";
+
+export const getUIComponent = (pluginId: string, allPlugins: Plugin[]) => {
+ let uiComponent = UIComponentTypes.DbEditorForm;
+
+ if (!!pluginId) {
+ // Adding uiComponent field to switch form type to UQI or allow for backward compatibility
+ const plugin = allPlugins.find((plugin: Plugin) =>
+ !!pluginId ? plugin.id === pluginId : false,
+ );
+ // Defaults to old value, new value can be DBEditorForm or UQIDBEditorForm
+ if (plugin) {
+ uiComponent = plugin.uiComponent;
+ }
+ }
+ return uiComponent;
+};
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index d05d86bd41f8..bc0d53dbfba8 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -40,7 +40,7 @@ import {
initFormEvaluations,
startFormEvaluations,
} from "actions/evaluationActions";
-import { getUIComponent } from "selectors/formSelectors";
+import { getUIComponent } from "./helpers";
import { diff } from "deep-diff";
import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
diff --git a/app/client/src/selectors/formSelectors.ts b/app/client/src/selectors/formSelectors.ts
index 917f81007869..5a7bcd5b7926 100644
--- a/app/client/src/selectors/formSelectors.ts
+++ b/app/client/src/selectors/formSelectors.ts
@@ -1,9 +1,13 @@
import { getFormValues, isValid, getFormInitialValues } from "redux-form";
import { AppState } from "reducers";
import { ActionData } from "reducers/entityReducers/actionsReducer";
-import { UIComponentTypes } from "../api/PluginApi";
-import { Plugin } from "api/PluginApi";
import { FormEvaluationState } from "reducers/evaluationReducers/formEvaluationReducer";
+import { createSelector } from "reselect";
+import _ from "lodash";
+import { getDataTree } from "./dataTreeSelectors";
+import { DataTree } from "entities/DataTree/dataTreeFactory";
+import { Action } from "entities/Action";
+import { EvaluationError } from "utils/DynamicBindingUtils";
type GetFormData = (
state: AppState,
@@ -26,19 +30,42 @@ export const getApiName = (state: AppState, id: string) => {
export const getFormEvaluationState = (state: AppState): FormEvaluationState =>
state.evaluations.formEvaluation;
-// Selector to get UIComponent type from the redux state
-export const getUIComponent = (pluginId: string, allPlugins: Plugin[]) => {
- let uiComponent = UIComponentTypes.DbEditorForm;
-
- if (!!pluginId) {
- // Adding uiComponent field to switch form type to UQI or allow for backward compatibility
- const plugin = allPlugins.find((plugin: Plugin) =>
- !!pluginId ? plugin.id === pluginId : false,
- );
- // Defaults to old value, new value can be DBEditorForm or UQIDBEditorForm
- if (plugin) {
- uiComponent = plugin.uiComponent;
+type ConfigErrorProps = { configProperty: string; formName: string };
+
+export const getConfigErrors = createSelector(
+ getDataTree,
+ (state: AppState, props: ConfigErrorProps) =>
+ getFormValues(props.formName)(state),
+ (_: AppState, props: ConfigErrorProps) => props.configProperty,
+ (dataTree: DataTree, formValues: Partial<Action>, configProperty: string) => {
+ // action that corresponds to this form control
+ let action: any;
+ let configErrors: EvaluationError[] = [];
+
+ // if form value exists, use the name of the form(which is the action's name) to get the action details
+ // from the data tree, then store it in the action variable
+ if (formValues && formValues.name) {
+ if (formValues.name in dataTree) {
+ // get action details from data tree
+ action = dataTree[formValues.name];
+
+ // extract the error object from the action's details object.
+ const actionError = action && action?.__evaluation__?.errors;
+
+ // get the configProperty for this form control and format it to resemble the format used in the action details errors object.
+ const formattedConfig = _.replace(
+ configProperty,
+ "actionConfiguration",
+ "config",
+ );
+
+ // grab the errors specific to this configProperty and store it in configErrors.
+ if (actionError && formattedConfig in actionError) {
+ configErrors = actionError[formattedConfig];
+ }
+ }
}
- }
- return uiComponent;
-};
+
+ return configErrors;
+ },
+);
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.