- {_.map(section.children, (propertyControlOrSection: ControlProps) => {
- if ("children" in propertyControlOrSection) {
- return this.renderEachConfig(propertyControlOrSection);
- } else {
- try {
- const {
- controlType,
- isRequired,
- configProperty,
- } = propertyControlOrSection;
- const config = { ...propertyControlOrSection };
- const multipleConfig = keyValueItems;
-
- this.configDetails[configProperty] = controlType;
-
- if (isRequired) {
- this.requiredFields[
- configProperty
- ] = propertyControlOrSection;
- }
-
- if (
- controlType === "KEYVALUE_ARRAY" &&
- keyValueItems.length < 2
- ) {
- keyValueItems.push(config);
-
- if (keyValueItems.length < 2) return undefined;
- }
-
- return (
-
-
-
- );
- } catch (e) {
- console.log(e);
- }
- }
- })}
+ renderSingleConfig = (
+ config: ControlProps,
+ multipleConfig?: ControlProps[],
+ ) => {
+ multipleConfig = multipleConfig || [];
+ try {
+ this.setupConfig(config);
+ return (
+
+
+ );
+ } catch (e) {
+ log.error(e);
+ }
+ };
+
+ setupConfig = (config: ControlProps) => {
+ const { controlType, isRequired, configProperty } = config;
+ this.configDetails[configProperty] = controlType;
+
+ if (isRequired) {
+ this.requiredFields[configProperty] = config;
+ }
+ };
+
+ isKVArray = (children: Array
) => {
+ if (!Array.isArray(children) || children.length < 2) return false;
+ return (
+ children[0].controlType && children[0].controlType === "KEYVALUE_ARRAY"
+ );
+ };
+
+ renderKVArray = (children: Array) => {
+ try {
+ // setup config for each child
+ children.forEach((c) => this.setupConfig(c));
+ // We pass last child for legacy reasons, to keep the logic here exactly same as before.
+ return this.renderSingleConfig(children[children.length - 1], children);
+ } catch (e) {
+ log.error(e);
+ }
+ };
+
+ renderEachConfig = (section: any) => {
+ return (
+
+ {_.map(section.children, (propertyControlOrSection: ControlProps) => {
+ // If the section is hidden, skip rendering
+ if (isHidden(this.props.formData, section.hidden)) return null;
+ if ("children" in propertyControlOrSection) {
+ const { children } = propertyControlOrSection;
+ if (this.isKVArray(children)) {
+ return this.renderKVArray(children);
+ }
+ return this.renderEachConfig(propertyControlOrSection);
+ } else {
+ return this.renderSingleConfig(propertyControlOrSection);
+ }
+ })}
);
- }
+ };
}
export default reduxForm({
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
index e8f7c6db6e..0f3dc8a558 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
@@ -3,6 +3,8 @@ import React from "react";
import { map, get } from "lodash";
import { Colors } from "constants/Colors";
import styled from "styled-components";
+import { isHidden } from "components/formControls/utils";
+import log from "loglevel";
const Key = styled.div`
color: ${Colors.DOVE_GRAY};
@@ -14,7 +16,6 @@ const Value = styled.div`
font-size: 14px;
font-weight: 500;
display: inline-block;
- text-transform: uppercase;
margin-left: 5px;
`;
@@ -34,6 +35,7 @@ export const renderDatasourceSection = (
return (
{map(config.children, (section) => {
+ if (isHidden(datasource, section.hidden)) return null;
if ("children" in section) {
return renderDatasourceSection(section, datasource);
} else {
@@ -85,12 +87,25 @@ export const renderDatasourceSection = (
);
}
+ if (controlType === "DROP_DOWN") {
+ if (Array.isArray(section.options)) {
+ const option = section.options.find(
+ (el: any) => el.value === value,
+ );
+ if (option && option.label) {
+ value = option.label;
+ }
+ }
+ }
+
return (
{label}: {value}
);
- } catch (e) {}
+ } catch (e) {
+ log.error(e);
+ }
}
})}
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 6f47d53974..89616cf9d0 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -21,6 +21,7 @@ import DatasourceHome from "./DatasourceHome";
import DataSourceEditorForm from "./DBForm";
import { Datasource } from "entities/Datasource";
import { RouteComponentProps } from "react-router";
+import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
interface ReduxStateProps {
formData: Datasource;
@@ -88,7 +89,9 @@ class DataSourceEditor extends React.Component {
setDatasourceEditorMode,
pluginType,
} = this.props;
-
+ if (!pluginId && datasourceId) {
+ return ;
+ }
return (
{datasourceId ? (
diff --git a/app/client/src/pages/Editor/EntityNotFoundPane.tsx b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
new file mode 100644
index 0000000000..94703ee6d6
--- /dev/null
+++ b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
@@ -0,0 +1,71 @@
+import React from "react";
+import styled from "styled-components";
+import Button, { Size, Category } from "components/ads/Button";
+import PageUnavailableImage from "assets/images/invalid-page.png";
+import { PAGE_NOT_FOUND_ERROR, INVALID_URL_ERROR } from "constants/messages";
+import { useHistory } from "react-router-dom";
+
+const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ align-items: center;
+ justify-content: flex-start;
+ padding-top: 15%;
+ background: #fcfcfc;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ .page-details {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 450px;
+ }
+ .bold-text {
+ font-weight: ${(props) => props.theme.fontWeights[3]};
+ font-size: 24px;
+ margin-top: 20px;
+ }
+ .page-message {
+ margin-top: 14px;
+ color: #716e6e;
+ font-size: 14px;
+ line-height: 17px;
+ letter-spacing: 0.733333px;
+ }
+ .page-unavailable-img {
+ width: 72px;
+ }
+ .button-position {
+ margin-top: 14px;
+ }
+`;
+
+const EntityNotFoundPane = () => {
+ const history = useHistory();
+ return (
+
+ 
+
+
{INVALID_URL_ERROR}
+
{PAGE_NOT_FOUND_ERROR}
+
+
{FORGOT_PASSWORD_PAGE_TITLE}
- {FORGOT_PASSWORD_PAGE_SUBTITLE}
-
-
+ return (
+ <>
+
+ {FORGOT_PASSWORD_PAGE_TITLE}
+
+
+
+
+ {FORGOT_PASSWORD_PAGE_LOGIN_LINK}
+
+
{LOGIN_PAGE_TITLE}
+
+
+ {NEW_TO_APPSMITH}
+
+ {LOGIN_PAGE_SIGN_UP_LINK_TEXT}
+
+
{showError && (
{
]}
/>
)}
-
- {LOGIN_PAGE_TITLE}
- {LOGIN_PAGE_SUBTITLE}
-
-
-
-
-
-
-
-
-
- {LOGIN_PAGE_FORGOT_PASSWORD_TEXT}
-
-
-
- {SocialLoginList.length > 0 && (
- <>
-
-
-
- )}
-
-
- {LOGIN_PAGE_SIGN_UP_LINK_TEXT}
-
-
-
-
-
+ {SocialLoginList.length > 0 && (
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+ {LOGIN_PAGE_FORGOT_PASSWORD_TEXT}
+
+
);
};
@@ -190,5 +188,5 @@ export default connect((state) => ({
validate,
touchOnBlur: true,
form: LOGIN_FORM_NAME,
- })(Login),
+ })(withTheme(Login)),
);
diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx
index 9051027b3c..02e7e1a12c 100644
--- a/app/client/src/pages/UserAuth/ResetPassword.tsx
+++ b/app/client/src/pages/UserAuth/ResetPassword.tsx
@@ -7,33 +7,32 @@ import { RESET_PASSWORD_FORM_NAME } from "constants/forms";
import { ReduxActionTypes } from "constants/ReduxActionConstants";
import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
import { Icon } from "@blueprintjs/core";
-import FormTextField from "components/editorComponents/form/fields/TextField";
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
import FormMessage, {
- FormMessageProps,
MessageAction,
-} from "components/editorComponents/form/FormMessage";
+ FormMessageProps,
+} from "components/ads/formFields/FormMessage";
import Spinner from "components/editorComponents/Spinner";
-import Button from "components/editorComponents/Button";
-import FormGroup from "components/editorComponents/form/FormGroup";
+import Button, { Size } from "components/ads/Button";
+
import StyledForm from "components/editorComponents/Form";
import { isEmptyString, isStrongPassword } from "utils/formhelpers";
import { ResetPasswordFormValues, resetPasswordSubmitHandler } from "./helpers";
import {
AuthCardHeader,
- AuthCardFooter,
- AuthCardContainer,
- AuthCardBody,
AuthCardNavLink,
FormActions,
} from "./StyledComponents";
import { AUTH_LOGIN_URL, FORGOT_PASSWORD_URL } from "constants/routes";
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
import {
RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL,
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
RESET_PASSWORD_LOGIN_LINK_TEXT,
RESET_PASSWORD_SUBMIT_BUTTON_TEXT,
- RESET_PASSWORD_PAGE_SUBTITLE,
RESET_PASSWORD_PAGE_TITLE,
FORM_VALIDATION_INVALID_PASSWORD,
FORM_VALIDATION_EMPTY_PASSWORD,
@@ -43,7 +42,6 @@ import {
RESET_PASSWORD_RESET_SUCCESS,
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
} from "constants/messages";
-import { TncPPLinks } from "./SignUp";
const validate = (values: ResetPasswordFormValues) => {
const errors: ResetPasswordFormValues = {};
@@ -66,6 +64,7 @@ type ResetPasswordProps = InjectedFormProps<
verifyToken: (token: string, email: string) => void;
isTokenValid: boolean;
validatingToken: boolean;
+ theme: Theme;
} & RouteComponentProps<{ email: string; token: string }>;
export const ResetPassword = (props: ResetPasswordProps) => {
@@ -154,50 +153,49 @@ export const ResetPassword = (props: ResetPasswordProps) => {
return ;
}
return (
-
+ <>
+
+ {RESET_PASSWORD_PAGE_TITLE}
+
+
+
+
+ {RESET_PASSWORD_LOGIN_LINK_TEXT}
+
+
{RESET_PASSWORD_PAGE_TITLE}
- {RESET_PASSWORD_PAGE_SUBTITLE}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {RESET_PASSWORD_LOGIN_LINK_TEXT}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
);
};
@@ -232,5 +230,5 @@ export default connect(
validate,
form: RESET_PASSWORD_FORM_NAME,
touchOnBlur: true,
- })(withRouter(ResetPassword)),
+ })(withRouter(withTheme(ResetPassword))),
);
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index 364fd9a986..11f3dab7b4 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -1,45 +1,33 @@
import React from "react";
-import { reduxForm, InjectedFormProps } from "redux-form";
+import { reduxForm, InjectedFormProps, formValueSelector } from "redux-form";
import { AUTH_LOGIN_URL } from "constants/routes";
import { SIGNUP_FORM_NAME } from "constants/forms";
-import {
- Link,
- RouteComponentProps,
- useLocation,
- withRouter,
-} from "react-router-dom";
-import Divider from "components/editorComponents/Divider";
+import { RouteComponentProps, useLocation, withRouter } from "react-router-dom";
import {
AuthCardHeader,
- AuthCardBody,
- AuthCardFooter,
AuthCardNavLink,
SpacedSubmitForm,
FormActions,
- AuthCardContainer,
+ SignUpLinkSection,
} from "./StyledComponents";
import {
SIGNUP_PAGE_TITLE,
- SIGNUP_PAGE_SUBTITLE,
SIGNUP_PAGE_EMAIL_INPUT_LABEL,
SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER,
SIGNUP_PAGE_PASSWORD_INPUT_LABEL,
SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER,
SIGNUP_PAGE_LOGIN_LINK_TEXT,
- FORM_VALIDATION_EMPTY_EMAIL,
FORM_VALIDATION_EMPTY_PASSWORD,
FORM_VALIDATION_INVALID_EMAIL,
FORM_VALIDATION_INVALID_PASSWORD,
SIGNUP_PAGE_SUBMIT_BUTTON_TEXT,
- PRIVACY_POLICY_LINK,
- TERMS_AND_CONDITIONS_LINK,
- FORM_VALIDATION_PASSWORD_RULE,
+ ALREADY_HAVE_AN_ACCOUNT,
} from "constants/messages";
-import FormMessage from "components/editorComponents/form/FormMessage";
-import FormGroup from "components/editorComponents/form/FormGroup";
-import FormTextField from "components/editorComponents/form/FormTextField";
+import FormMessage from "components/ads/formFields/FormMessage";
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
import ThirdPartyAuth, { SocialLoginTypes } from "./ThirdPartyAuth";
-import Button from "components/editorComponents/Button";
+import Button, { Size } from "components/ads/Button";
import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers";
@@ -54,28 +42,16 @@ import PerformanceTracker, {
PerformanceTransactionName,
} from "utils/PerformanceTracker";
import { setOnboardingState } from "utils/storage";
-const {
- enableGithubOAuth,
- enableGoogleOAuth,
- enableTNCPP,
-} = getAppsmithConfigs();
+
+import { SIGNUP_FORM_EMAIL_FIELD_NAME } from "constants/forms";
+
+const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
const SocialLoginList: string[] = [];
if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
if (enableGoogleOAuth) SocialLoginList.push(SocialLoginTypes.GOOGLE);
-export const TncPPLinks = () => {
- if (!enableTNCPP) return null;
- return (
- <>
-
- {PRIVACY_POLICY_LINK}
-
-
- {TERMS_AND_CONDITIONS_LINK}
-
-
- );
-};
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
const validate = (values: SignupFormValues) => {
const errors: SignupFormValues = {};
@@ -84,19 +60,24 @@ const validate = (values: SignupFormValues) => {
} else if (!isStrongPassword(values.password)) {
errors.password = FORM_VALIDATION_INVALID_PASSWORD;
}
- if (!values.email || isEmptyString(values.email)) {
- errors.email = FORM_VALIDATION_EMPTY_EMAIL;
- } else if (!isEmail(values.email)) {
+
+ const email = values.email || "";
+ if (!isEmptyString(email) && !isEmail(email)) {
errors.email = FORM_VALIDATION_INVALID_EMAIL;
}
return errors;
};
-type SignUpFormProps = InjectedFormProps &
- RouteComponentProps<{ email: string }>;
+type SignUpFormProps = InjectedFormProps<
+ SignupFormValues,
+ { emailValue: string }
+> &
+ RouteComponentProps<{ email: string }> & { theme: Theme; emailValue: string };
export const SignUp = (props: SignUpFormProps) => {
- const { error, submitting, pristine, valid } = props;
+ const { error, submitting, pristine, valid, emailValue: email } = props;
+ const isFormValid = valid && email && !isEmptyString(email);
+
const location = useLocation();
let showError = false;
@@ -115,85 +96,84 @@ export const SignUp = (props: SignUpFormProps) => {
}
return (
-
+ <>
{showError && }
{SIGNUP_PAGE_TITLE}
- {SIGNUP_PAGE_SUBTITLE}
-
-
-
-
-
-
-
-
-
-
-
- {SocialLoginList.length > 0 && (
- <>
-
-
-
- )}
-
-
-
-
-
- {SIGNUP_PAGE_LOGIN_LINK_TEXT}
-
-
+
+ {ALREADY_HAVE_AN_ACCOUNT}
+
+ {SIGNUP_PAGE_LOGIN_LINK_TEXT}
+
+
+ {SocialLoginList.length > 0 && (
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
);
};
+const selector = formValueSelector(SIGNUP_FORM_NAME);
export default connect((state: AppState, props: SignUpFormProps) => {
const queryParams = new URLSearchParams(props.location.search);
return {
initialValues: {
email: queryParams.get("email"),
},
+ emailValue: selector(state, SIGNUP_FORM_EMAIL_FIELD_NAME),
};
}, null)(
- reduxForm({
+ reduxForm({
validate,
form: SIGNUP_FORM_NAME,
touchOnBlur: true,
- })(withRouter(SignUp)),
+ })(withRouter(withTheme(SignUp))),
);
diff --git a/app/client/src/pages/UserAuth/StyledComponents.tsx b/app/client/src/pages/UserAuth/StyledComponents.tsx
index 84fee636fb..a1a0818a96 100644
--- a/app/client/src/pages/UserAuth/StyledComponents.tsx
+++ b/app/client/src/pages/UserAuth/StyledComponents.tsx
@@ -1,38 +1,69 @@
-import styled, { css } from "styled-components";
+import styled from "styled-components";
import { Link } from "react-router-dom";
import Form from "components/editorComponents/Form";
import { Card } from "@blueprintjs/core";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import { Classes } from "@blueprintjs/core";
export const AuthContainer = styled.section`
position: absolute;
width: 100%;
- height: 100vh;
- will-change: transform, opacity;
-`;
+ height: ${(props) => `calc(100vh - ${props.theme.headerHeight})`};
+ background-color: ${(props) => props.theme.colors.auth.background};
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ overflow: auto;
-export const AuthCard = styled(Card)`
- && {
- width: ${(props) => props.theme.authCard.width}px;
- background: ${(props) => props.theme.authCard.background};
- border-radius: ${(props) => props.theme.authCard.borderRadius}px;
- padding: ${(props) => props.theme.authCard.padding}px;
- box-shadow: ${(props) => props.theme.authCard.shadow};
- border: none;
- & h1,
- h5 {
- padding: 0;
- margin: 0;
- font-weight: ${(props) => props.theme.fontWeights[1]};
- }
+ & .${Classes.FORM_GROUP} {
+ margin: 0 0 ${(props) => props.theme.spaces[2]}px;
}
`;
-export const AuthCardContainer = styled.div``;
+export const AuthCardContainer = styled.div`
+ display: flex;
+ flex-grow: 1;
+ flex-direction: column;
+ justify-content: center;
+ padding: ${(props) => props.theme.authCard.padding}px 0;
+`;
+
+export const AuthCard = styled(Card)`
+ display: flex;
+ flex-direction: column;
+ background-color: ${(props) => props.theme.colors.auth.cardBackground};
+ padding: ${(props) => props.theme.spaces[15]}px 64px;
+ width: ${(props) => props.theme.authCard.width}px;
+ border: none;
+ h1 {
+ text-align: center;
+ padding: 0;
+ margin: 0;
+ ${(props) => getTypographyByKey(props, "authCardHeader")}
+ color: ${(props) => props.theme.colors.auth.headingText};
+ }
+ & .form-message-container {
+ width: ${(props) => props.theme.authCard.formMessageWidth}px;
+ align-self: center;
+ text-align: center;
+ }
+ .form-message-container ~ .form-message-container {
+ margin-top: ${(props) => props.theme.spaces[4]}px;
+ }
+ & > div {
+ margin-bottom: ${(props) => props.theme.spaces[14]}px;
+ }
+ & > div:last-child,
+ & > div:empty {
+ margin-bottom: 0;
+ }
+`;
export const AuthCardHeader = styled.header`
& {
h1 {
font-size: ${(props) => props.theme.fontSizes[6]}px;
+ white-space: nowrap;
}
h5 {
font-size: ${(props) => props.theme.fontSizes[4]}px;
@@ -42,12 +73,10 @@ export const AuthCardHeader = styled.header`
`;
export const AuthCardNavLink = styled(Link)`
- text-align: center;
- margin: 0 auto;
- display: block;
- margin-top: ${(props) => props.theme.spaces[12]}px;
- & span {
- margin-left: ${(props) => props.theme.spaces[4]}px;
+ border-bottom: 1px solid transparent;
+ &:hover {
+ border-bottom: 1px solid ${(props) => props.theme.colors.auth.link};
+ text-decoration: none;
}
`;
@@ -60,26 +89,15 @@ export const AuthCardFooter = styled.footer`
`;
export const AuthCardBody = styled.div`
- display: flex;
- justify-content: flex-start;
- align-items: stretch;
& a {
margin-top: ${(props) => props.theme.spaces[8]}px;
font-size: ${(props) => props.theme.fontSizes[2]}px;
}
`;
-const formSpacing = css`
- flex-grow: 1;
- margin-right: ${(props) => props.theme.authCard.dividerSpacing}px;
-`;
-
-export const SpacedForm = styled(Form)`
- ${formSpacing}
-`;
+export const SpacedForm = styled(Form)``;
export const SpacedSubmitForm = styled.form`
- ${formSpacing}
& a {
font-size: ${(props) => props.theme.fontSizes[3]}px;
}
@@ -95,8 +113,29 @@ export const FormActions = styled.div`
}
justify-content: space-between;
align-items: baseline;
- margin-top: ${(props) => props.theme.spaces[2]}px;
+ margin-top: ${(props) => props.theme.spaces[5]}px;
& > label {
margin-right: ${(props) => props.theme.spaces[11]}px;
}
`;
+
+export const SignUpLinkSection = styled.div`
+ ${(props) => getTypographyByKey(props, "authCardSubheader")}
+ color: ${(props) => props.theme.colors.auth.text};
+ text-align: center;
+`;
+
+export const ForgotPasswordLink = styled.div`
+ ${(props) => getTypographyByKey(props, "authCardSubheader")}
+ color: ${(props) => props.theme.colors.auth.text};
+ text-align: center;
+ margin-top: ${(props) => props.theme.spaces[11]}px;
+ & a {
+ color: ${(props) => props.theme.colors.auth.text};
+ }
+`;
+
+export const FormMessagesContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+`;
diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
index 30cbfb01db..a608d9e778 100644
--- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
+++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
@@ -4,7 +4,7 @@ import {
getSocialLoginButtonProps,
SocialLoginType,
} from "constants/SocialLogin";
-import { IntentColors, getBorderCSSShorthand } from "constants/DefaultTheme";
+import { getTypographyByKey } from "constants/DefaultTheme";
import AnalyticsUtil, { EventName } from "utils/AnalyticsUtil";
import { useLocation } from "react-router-dom";
import PerformanceTracker, {
@@ -15,52 +15,42 @@ import { setOnboardingState } from "utils/storage";
const ThirdPartyAuthWrapper = styled.div`
display: flex;
flex-direction: column;
- justify-content: flex-start;
- align-items: flex-end;
- margin-left: ${(props) => props.theme.authCard.dividerSpacing}px;
`;
//TODO(abhinav): Port this to use themes.
const StyledSocialLoginButton = styled.a`
- width: 200px;
display: flex;
align-items: center;
- border: ${(props) => getBorderCSSShorthand(props.theme.borders[2])};
- padding: 8px;
- color: ${(props) => props.theme.colors.textDefault};
- border-radius: ${(props) => props.theme.radii[1]}px;
- position: relative;
- height: 42px;
+ justify-content: center;
+ border: solid 1px ${(props) => props.theme.colors.auth.socialBtnBorder};
+ padding: ${(props) => props.theme.spaces[2]}px;
+
+ &:first-child {
+ margin-bottom: ${(props) => props.theme.spaces[4]}px;
+ }
+
+ &:only-child {
+ margin-bottom: 0;
+ }
&:hover {
text-decoration: none;
- background: ${IntentColors.success};
- color: ${(props) => props.theme.colors.textOnDarkBG};
+ background-color: ${(props) => props.theme.colors.auth.socialBtnHighlight};
}
- & > div {
- width: 36px;
- height: 36px;
- padding: ${(props) => props.theme.radii[1]}px;
- position: absolute;
- left: 2px;
- top: 2px;
- background: white;
- display: flex;
- justify-content: center;
- align-items: center;
- & img {
- width: 80%;
- height: 80%;
- }
- }
- & p {
- display: block;
- margin: 0 0 0 36px;
- font-size: ${(props) => props.theme.fontSizes[3]}px;
- font-weight: ${(props) => props.theme.fontWeights[3]};
+
+ & .login-method {
+ ${(props) => getTypographyByKey(props, "btnLarge")}
+ color: ${(props) => props.theme.colors.auth.socialBtnText};
+ text-transform: uppercase;
}
`;
+const ButtonLogo = styled.img`
+ margin: ${(props) => props.theme.spaces[2]}px;
+ width: 14px;
+ height: 14px;
+`;
+
export const SocialLoginTypes: Record = {
GOOGLE: "google",
GITHUB: "github",
@@ -102,10 +92,8 @@ const SocialLoginButton = (props: {
});
}}
>
-
-
-
{`Sign in with ${props.name}`}
+
+ {`continue with ${props.name}`}
);
};
diff --git a/app/client/src/pages/UserAuth/index.tsx b/app/client/src/pages/UserAuth/index.tsx
index a2ea945f90..2a9aa79df2 100644
--- a/app/client/src/pages/UserAuth/index.tsx
+++ b/app/client/src/pages/UserAuth/index.tsx
@@ -1,52 +1,43 @@
import React from "react";
import { Switch, useRouteMatch, useLocation, Route } from "react-router-dom";
import Login from "./Login";
-import Centered from "components/designSystems/appsmith/CenteredWrapper";
-import { animated, useTransition } from "react-spring";
-import { AuthContainer, AuthCard } from "./StyledComponents";
+import { AuthContainer, AuthCard, AuthCardContainer } from "./StyledComponents";
import SignUp from "./SignUp";
import ForgotPassword from "./ForgotPassword";
import ResetPassword from "./ResetPassword";
import PageNotFound from "pages/common/PageNotFound";
+import FooterLinks from "./FooterLinks";
import * as Sentry from "@sentry/react";
const SentryRoute = Sentry.withSentryRouting(Route);
-const AnimatedAuthCard = animated(AuthContainer);
export const UserAuth = () => {
const { path } = useRouteMatch();
const location = useLocation();
- const transitions = useTransition(location, (location) => location.pathname, {
- from: { opacity: 0, transform: "translate3d(50%,0,0)" },
- enter: { opacity: 1, transform: "translate3d(0%,0,0)" },
- leave: { opacity: 0, transform: "translate3d(-50%,0,0)" },
- reset: true,
- });
- const renderTransitions = transitions.map(
- ({ item: location, props, key }) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
- ),
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
- return {renderTransitions};
};
export default UserAuth;
diff --git a/app/client/src/pages/common/LoginHeader.tsx b/app/client/src/pages/common/LoginHeader.tsx
index 3e3e38d87a..36ac879ded 100644
--- a/app/client/src/pages/common/LoginHeader.tsx
+++ b/app/client/src/pages/common/LoginHeader.tsx
@@ -14,7 +14,7 @@ const StyledPageHeader = styled(StyledHeader)`
height: 48px;
background: ${Colors.BALTIC_SEA};
display: flex;
- justify-content: space-between;
+ justify-content: center;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.05);
padding: 0px ${(props) => props.theme.spaces[12]};
`;
diff --git a/app/client/src/pages/organization/Members.tsx b/app/client/src/pages/organization/Members.tsx
index abdc1c20ed..80303eec0f 100644
--- a/app/client/src/pages/organization/Members.tsx
+++ b/app/client/src/pages/organization/Members.tsx
@@ -128,6 +128,7 @@ export default function MemberSettings(props: PageProps) {
{
Header: "Delete",
accessor: "delete",
+ disableSortBy: true,
Cell: function DeleteCell(cellProps: any) {
if (
cellProps.cell.row.values.username ===
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
index fa01e3eb7f..ed42e46d6d 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
@@ -6,6 +6,7 @@ import {
} from "constants/ReduxActionConstants";
import { WidgetProps } from "widgets/BaseWidget";
import { UpdateWidgetPropertyPayload } from "actions/controlActions";
+import _ from "lodash";
const initialState: CanvasWidgetsReduxState = {};
@@ -14,8 +15,7 @@ export type FlattenedWidgetProps = WidgetProps & {
};
const canvasWidgetsReducer = createImmerReducer(initialState, {
- // TODO Rename to INIT_LAYOUT
- [ReduxActionTypes.UPDATE_CANVAS]: (
+ [ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
state: CanvasWidgetsReduxState,
action: ReduxAction,
) => {
@@ -31,8 +31,13 @@ const canvasWidgetsReducer = createImmerReducer(initialState, {
state: CanvasWidgetsReduxState,
action: ReduxAction,
) => {
- state[action.payload.widgetId][action.payload.propertyName] =
- action.payload.propertyValue;
+ // We loop over all updates
+ Object.entries(action.payload.updates).forEach(
+ ([propertyPath, propertyValue]) => {
+ // since property paths could be nested, we use lodash set method
+ _.set(state[action.payload.widgetId], propertyPath, propertyValue);
+ },
+ );
},
});
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index 0c5550b771..f5ade60ca1 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -93,7 +93,7 @@ const editorReducer = createReducer(initialState, {
state.loadingStates.savingError = true;
return { ...state };
},
- [ReduxActionTypes.UPDATE_CANVAS]: (
+ [ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
state: EditorReduxState,
action: ReduxAction,
) => {
diff --git a/app/client/src/sagas/ActionExecutionSagas.ts b/app/client/src/sagas/ActionExecutionSagas.ts
index 05c6e0ee78..cc9436c698 100644
--- a/app/client/src/sagas/ActionExecutionSagas.ts
+++ b/app/client/src/sagas/ActionExecutionSagas.ts
@@ -38,6 +38,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
import history from "utils/history";
import {
BUILDER_PAGE_URL,
+ convertToQueryParams,
getApplicationViewerPageURL,
} from "constants/routes";
import {
@@ -86,42 +87,61 @@ import {
} from "./EvaluationsSaga";
import copy from "copy-to-clipboard";
+export enum NavigationTargetType {
+ SAME_WINDOW = "SAME_WINDOW",
+ NEW_WINDOW = "NEW_WINDOW",
+}
+
function* navigateActionSaga(
- action: { pageNameOrUrl: string; params: Record },
+ action: {
+ pageNameOrUrl: string;
+ params: Record;
+ target?: NavigationTargetType;
+ },
event: ExecuteActionPayloadEvent,
) {
const pageList = yield select(getPageList);
const applicationId = yield select(getCurrentApplicationId);
+ const {
+ pageNameOrUrl,
+ params,
+ target = NavigationTargetType.SAME_WINDOW,
+ } = action;
const page = _.find(
pageList,
- (page: Page) => page.pageName === action.pageNameOrUrl,
+ (page: Page) => page.pageName === pageNameOrUrl,
);
if (page) {
AnalyticsUtil.logEvent("NAVIGATE", {
- pageName: action.pageNameOrUrl,
- pageParams: action.params,
+ pageName: pageNameOrUrl,
+ pageParams: params,
});
- // TODO need to make this check via RENDER_MODE;
+ const appMode = yield select(getAppMode);
const path =
- history.location.pathname.indexOf("/edit") !== -1
- ? BUILDER_PAGE_URL(applicationId, page.pageId, action.params)
- : getApplicationViewerPageURL(
- applicationId,
- page.pageId,
- action.params,
- );
- history.push(path);
+ appMode === APP_MODE.EDIT
+ ? BUILDER_PAGE_URL(applicationId, page.pageId, params)
+ : getApplicationViewerPageURL(applicationId, page.pageId, params);
+ if (target === NavigationTargetType.SAME_WINDOW) {
+ history.push(path);
+ } else if (target === NavigationTargetType.NEW_WINDOW) {
+ window.open(path, "_blank");
+ }
if (event.callback) event.callback({ success: true });
} else {
AnalyticsUtil.logEvent("NAVIGATE", {
- navUrl: action.pageNameOrUrl,
+ navUrl: pageNameOrUrl,
});
// Add a default protocol if it doesn't exist.
- let url = action.pageNameOrUrl;
+ let url = pageNameOrUrl + convertToQueryParams(params);
if (url.indexOf("://") === -1) {
url = "https://" + url;
}
- window.location.assign(url);
+ if (target === NavigationTargetType.SAME_WINDOW) {
+ window.location.assign(url);
+ } else if (target === NavigationTargetType.NEW_WINDOW) {
+ window.open(url, "_blank");
+ }
+ if (event.callback) event.callback({ success: true });
}
}
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index c1a3b5e18d..5bc35771f8 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -44,7 +44,7 @@ import {
} from "selectors/editorSelectors";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { QUERY_CONSTANT } from "constants/QueryEditorConstants";
-import { Action } from "entities/Action";
+import { Action, ActionViewMode } from "entities/Action";
import { ActionData } from "reducers/entityReducers/actionsReducer";
import {
getAction,
@@ -145,14 +145,22 @@ export function* fetchActionsForViewModeSaga(
{ mode: "VIEWER", appId: applicationId },
);
try {
- const response: GenericApiResponse = yield ActionAPI.fetchActionsForViewMode(
+ const response: GenericApiResponse = yield ActionAPI.fetchActionsForViewMode(
applicationId,
);
+ const correctFormatResponse = response.data.map((action) => {
+ return {
+ ...action,
+ actionConfiguration: {
+ timeoutInMillisecond: action.timeoutInMillisecond,
+ },
+ };
+ });
const isValidResponse = yield validateResponse(response);
if (isValidResponse) {
yield put({
type: ReduxActionTypes.FETCH_ACTIONS_VIEW_MODE_SUCCESS,
- payload: response.data,
+ payload: correctFormatResponse,
});
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.FETCH_ACTIONS_API,
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index bf087f866d..7de41029cf 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -390,7 +390,9 @@ function* switchDatasourceSaga(action: ReduxAction<{ datasourceId: string }>) {
(datasource: Datasource) => datasource.id === datasourceId,
),
);
- yield put(changeDatasource(datasource));
+ if (datasource) {
+ yield put(changeDatasource(datasource));
+ }
}
function* formValueChangeSaga(
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index b65aa962bb..015497b38f 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -43,6 +43,7 @@ import {
} from "constants/OnboardingConstants";
import AnalyticsUtil from "../utils/AnalyticsUtil";
import { get } from "lodash";
+import { updateWidgetProperty } from "../actions/controlActions";
export const getCurrentStep = (state: AppState) =>
state.ui.onBoarding.currentStep;
@@ -85,14 +86,9 @@ function* listenForWidgetAdditions() {
canvasWidgets[selectedWidget.widgetId]
) {
if (selectedWidget.tableData === initialTableData) {
- yield put({
- type: "UPDATE_WIDGET_PROPERTY",
- payload: {
- widgetId: selectedWidget.widgetId,
- propertyName: "tableData",
- propertyValue: [],
- },
- });
+ yield put(
+ updateWidgetProperty(selectedWidget.widgetId, { tableData: [] }),
+ );
}
AnalyticsUtil.logEvent("ONBOARDING_ADD_WIDGET");
@@ -107,11 +103,11 @@ function* listenForWidgetAdditions() {
}
}
-function* listenForSuccessfullBinding() {
+function* listenForSuccessfulBinding() {
while (true) {
yield take();
- let bindSuccessfull = true;
+ let bindSuccessful = true;
const selectedWidget = yield select(getSelectedWidget);
if (selectedWidget && selectedWidget.type === "TABLE_WIDGET") {
const dataTree = yield select(getDataTree);
@@ -124,19 +120,19 @@ function* listenForSuccessfullBinding() {
const hasBinding =
dynamicBindingPathList && !!dynamicBindingPathList.length;
- bindSuccessfull =
- bindSuccessfull && hasBinding && tableHasData && tableHasData.length;
+ bindSuccessful =
+ bindSuccessful && hasBinding && tableHasData && tableHasData.length;
if (widgetProperties.invalidProps) {
- bindSuccessfull =
- bindSuccessfull &&
+ bindSuccessful =
+ bindSuccessful &&
!(
"tableData" in widgetProperties.invalidProps &&
widgetProperties.invalidProps.tableData
);
}
- if (bindSuccessfull) {
+ if (bindSuccessful) {
yield put(showTooltip(OnboardingStep.NONE));
AnalyticsUtil.logEvent("ONBOARDING_SUCCESSFUL_BINDING");
yield put(setCurrentStep(OnboardingStep.SUCCESSFUL_BINDING));
@@ -320,7 +316,7 @@ export default function* onboardingSagas() {
takeEvery(ReduxActionTypes.LISTEN_FOR_ADD_WIDGET, listenForWidgetAdditions),
takeEvery(
ReduxActionTypes.LISTEN_FOR_TABLE_WIDGET_BINDING,
- listenForSuccessfullBinding,
+ listenForSuccessfulBinding,
),
takeEvery(ReduxActionTypes.SET_CURRENT_STEP, setupOnboardingStep),
takeEvery(ReduxActionTypes.LISTEN_FOR_DEPLOY, listenForDeploySaga),
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index cf0a194798..36a2c4a686 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -16,7 +16,7 @@ import {
fetchPublishedPageSuccess,
savePageSuccess,
setUrlData,
- updateCanvas,
+ initCanvasLayout,
updateCurrentPage,
updateWidgetNameSuccess,
} from "actions/pageActions";
@@ -179,7 +179,7 @@ export function* fetchPageSaga(
// Get Canvas payload
const canvasWidgetsPayload = getCanvasWidgetsPayload(fetchPageResponse);
// Update the canvas
- yield put(updateCanvas(canvasWidgetsPayload));
+ yield put(initCanvasLayout(canvasWidgetsPayload));
// set current page
yield put(updateCurrentPage(id));
// dispatch fetch page success
@@ -242,7 +242,7 @@ export function* fetchPublishedPageSaga(
// Get Canvas payload
const canvasWidgetsPayload = getCanvasWidgetsPayload(response);
// Update the canvas
- yield put(updateCanvas(canvasWidgetsPayload));
+ yield put(initCanvasLayout(canvasWidgetsPayload));
// set current page
yield put(updateCurrentPage(pageId));
// dispatch fetch page success
@@ -613,7 +613,7 @@ export function* updateCanvasWithDSL(
pageActions: data.layoutOnLoadActions,
widgets: normalizedWidgets.entities.canvasWidgets,
};
- yield put(updateCanvas(canvasWidgetsPayload));
+ yield put(initCanvasLayout(canvasWidgetsPayload));
yield put(fetchActionsForPage(pageId));
}
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 043ec44edb..320ed8072d 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -1,42 +1,44 @@
import {
- ReduxActionTypes,
- ReduxActionErrorTypes,
ReduxAction,
+ ReduxActionErrorTypes,
+ ReduxActionTypes,
} from "constants/ReduxActionConstants";
import {
- WidgetAddChild,
- WidgetResize,
- WidgetMove,
- WidgetDelete,
updateAndSaveLayout,
+ WidgetAddChild,
WidgetAddChildren,
+ WidgetDelete,
+ WidgetMove,
+ WidgetResize,
} from "actions/pageActions";
import {
- FlattenedWidgetProps,
CanvasWidgetsReduxState,
+ FlattenedWidgetProps,
} from "reducers/entityReducers/canvasWidgetsReducer";
import {
- getWidgets,
- getWidget,
getSelectedWidget,
+ getWidget,
getWidgetMetaProps,
+ getWidgets,
} from "./selectors";
import {
generateWidgetProps,
updateWidgetPosition,
} from "utils/WidgetPropsUtils";
import {
+ all,
call,
put,
select,
takeEvery,
takeLatest,
- all,
} from "redux-saga/effects";
import { convertToString, getNextEntityName } from "utils/AppsmithUtils";
import {
+ DeleteWidgetPropertyPayload,
SetWidgetDynamicPropertyPayload,
updateWidgetProperty,
+ UpdateWidgetPropertyPayload,
UpdateWidgetPropertyRequestPayload,
} from "actions/controlActions";
import {
@@ -44,12 +46,13 @@ import {
getEntityDynamicBindingPathList,
getWidgetDynamicPropertyPathList,
getWidgetDynamicTriggerPathList,
+ isChildPropertyPath,
isDynamicValue,
isPathADynamicBinding,
isPathADynamicTrigger,
} from "utils/DynamicBindingUtils";
import { WidgetProps } from "widgets/BaseWidget";
-import _ from "lodash";
+import _, { cloneDeep } from "lodash";
import WidgetFactory from "utils/WidgetFactory";
import {
buildWidgetBlueprint,
@@ -58,24 +61,23 @@ import {
import { resetWidgetMetaProperty } from "actions/metaActions";
import {
GridDefaults,
- WidgetTypes,
MAIN_CONTAINER_WIDGET_ID,
- WIDGET_DELETE_UNDO_TIMEOUT,
RenderModes,
+ WIDGET_DELETE_UNDO_TIMEOUT,
WidgetType,
+ WidgetTypes,
} from "constants/WidgetConstants";
import WidgetConfigResponse from "mockResponses/WidgetConfigResponse";
import {
+ flushDeletedWidgets,
+ getCopiedWidgets,
+ getDeletedWidgets,
saveCopiedWidgets,
saveDeletedWidgets,
- flushDeletedWidgets,
- getDeletedWidgets,
- getCopiedWidgets,
} from "utils/storage";
import { generateReactKey } from "utils/generators";
import { flashElementById } from "utils/helpers";
import AnalyticsUtil from "utils/AnalyticsUtil";
-import { cloneDeep } from "lodash";
import log from "loglevel";
import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/WidgetEntity";
import {
@@ -86,8 +88,8 @@ import { forceOpenPropertyPane } from "actions/widgetActions";
import { getDataTree } from "selectors/dataTreeSelectors";
import { DataTreeWidget } from "entities/DataTree/dataTreeFactory";
import {
- validateProperty,
clearEvalPropertyCacheOfWidget,
+ validateProperty,
} from "./EvaluationsSaga";
import { WidgetBlueprint } from "reducers/entityReducers/widgetConfigReducer";
import { Toaster } from "components/ads/Toast";
@@ -221,7 +223,7 @@ function* generateChildWidgets(
// Add the parentId prop to this widget
widget.parentId = parent.widgetId;
// Remove the blueprint from the widget (if any)
- // as blueprints are not useful beyont this point.
+ // as blueprints are not useful beyond this point.
delete widget.blueprint;
return { widgetId: widget.widgetId, widgets };
}
@@ -461,21 +463,21 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
const deletedWidgets: FlattenedWidgetProps[] = yield getDeletedWidgets(
action.payload.widgetId,
);
- // Find the parent in the list of deleted widgets
- const deletedWidget = deletedWidgets.find(
- (widget) => widget.widgetId === action.payload.widgetId,
- );
+ if (deletedWidgets && Array.isArray(deletedWidgets)) {
+ // Find the parent in the list of deleted widgets
+ const deletedWidget = deletedWidgets.find(
+ (widget) => widget.widgetId === action.payload.widgetId,
+ );
- // If the deleted widget is infact available.
- if (deletedWidget) {
- // Log an undo event
- AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
- widgetName: deletedWidget.widgetName,
- widgetType: deletedWidget.type,
- });
- }
+ // If the deleted widget is in fact available.
+ if (deletedWidget) {
+ // Log an undo event
+ AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
+ widgetName: deletedWidget.widgetName,
+ widgetType: deletedWidget.type,
+ });
+ }
- if (deletedWidgets) {
// Get the current list of widgets from reducer
const stateWidgets = yield select(getWidgets);
let widgets = { ...stateWidgets };
@@ -522,7 +524,7 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
}
let newChildren = [widget.widgetId];
if (widgets[widget.parentId].children) {
- // Concatenate the list of paren't children with the current widgetId
+ // Concatenate the list of parents children with the current widgetId
newChildren = newChildren.concat(widgets[widget.parentId].children);
}
widgets = {
@@ -636,79 +638,86 @@ export function* resizeSaga(resizeAction: ReduxAction) {
}
}
-function* updateDynamicTriggers(
+enum DynamicPathUpdateEffectEnum {
+ ADD = "ADD",
+ REMOVE = "REMOVE",
+ NOOP = "NOOP",
+}
+
+type DynamicPathUpdate = {
+ propertyPath: string;
+ effect: DynamicPathUpdateEffectEnum;
+};
+
+function getDynamicTriggerPathListUpdate(
widget: WidgetProps,
propertyPath: string,
propertyValue: string,
-) {
- // TODO WIDGETFACTORY
- const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
- widget.type,
- );
- if (propertyPath in triggerProperties) {
- let dynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
- widget,
- );
- if (propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
- dynamicTriggerPathList.push({
- key: propertyPath,
- });
- }
- if (!propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
- dynamicTriggerPathList = _.reject(dynamicTriggerPathList, {
- key: propertyValue,
- });
- }
- yield put(
- updateWidgetProperty(
- widget.widgetId,
- "dynamicTriggerPathList",
- dynamicTriggerPathList,
- ),
- );
- return true;
+): DynamicPathUpdate {
+ if (propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.ADD,
+ };
+ } else if (!propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.REMOVE,
+ };
}
- return false;
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.NOOP,
+ };
}
-function* updateDynamicBindings(
+function getDynamicBindingPathListUpdate(
widget: WidgetProps,
- propertyName: string,
+ propertyPath: string,
propertyValue: any,
-) {
+): DynamicPathUpdate {
let stringProp = propertyValue;
if (_.isObject(propertyValue)) {
// Stringify this because composite controls may have bindings in the sub controls
stringProp = JSON.stringify(propertyValue);
}
const isDynamic = isDynamicValue(stringProp);
- let dynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
- widget,
- );
- if (!isDynamic && isPathADynamicBinding(widget, propertyName)) {
- dynamicBindingPathList = _.reject(dynamicBindingPathList, {
- key: propertyName,
- });
+ if (!isDynamic && isPathADynamicBinding(widget, propertyPath)) {
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.REMOVE,
+ };
+ } else if (isDynamic && !isPathADynamicBinding(widget, propertyPath)) {
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.ADD,
+ };
}
- if (isDynamic && !isPathADynamicBinding(widget, propertyName)) {
- dynamicBindingPathList.push({
- key: propertyName,
+ return {
+ propertyPath,
+ effect: DynamicPathUpdateEffectEnum.NOOP,
+ };
+}
+
+function applyDynamicPathUpdates(
+ currentList: DynamicPath[],
+ update: DynamicPathUpdate,
+): DynamicPath[] {
+ if (update.effect === DynamicPathUpdateEffectEnum.ADD) {
+ currentList.push({
+ key: update.propertyPath,
});
+ } else if (update.effect === DynamicPathUpdateEffectEnum.REMOVE) {
+ _.reject(currentList, { key: update.propertyPath });
}
- yield put(
- updateWidgetProperty(
- widget.widgetId,
- "dynamicBindingPathList",
- dynamicBindingPathList,
- ),
- );
+ return currentList;
}
function* updateWidgetPropertySaga(
updateAction: ReduxAction,
) {
const {
- payload: { propertyValue, propertyName, widgetId },
+ payload: { propertyValue, propertyPath, widgetId },
} = updateAction;
if (!widgetId) {
// Handling the case where sometimes widget id is not passed through here
@@ -717,55 +726,190 @@ function* updateWidgetPropertySaga(
const stateWidget: WidgetProps = yield select(getWidget, widgetId);
const widget = { ...stateWidget };
- const dynamicTriggersUpdated = yield updateDynamicTriggers(
- widget,
- propertyName,
- propertyValue,
+ // Holder object to collect all updates
+ const updates: Record = {
+ [propertyPath]: propertyValue,
+ };
+
+ // Check if the path is a of a dynamic trigger property
+ const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
+ widget.type,
);
- if (!dynamicTriggersUpdated) {
- yield updateDynamicBindings(widget, propertyName, propertyValue);
+ const isTriggerProperty = propertyPath in triggerProperties;
+ // If it is a trigger property, it will go in a different list than the general
+ // dynamicBindingPathList.
+ if (isTriggerProperty) {
+ const currentDynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+ widget,
+ );
+ const effect = getDynamicTriggerPathListUpdate(
+ widget,
+ propertyPath,
+ propertyValue,
+ );
+ updates.dynamicTriggerPathList = applyDynamicPathUpdates(
+ currentDynamicTriggerPathList,
+ effect,
+ );
+ } else {
+ const currentDynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+ widget,
+ );
+ const effect = getDynamicBindingPathListUpdate(
+ widget,
+ propertyPath,
+ propertyValue,
+ );
+ updates.dynamicBindingPathList = applyDynamicPathUpdates(
+ currentDynamicBindingPathList,
+ effect,
+ );
}
- yield put(updateWidgetProperty(widgetId, propertyName, propertyValue));
+ // Send the updates
+ yield put(updateWidgetProperty(widgetId, updates));
+
const stateWidgets = yield select(getWidgets);
const widgets = { ...stateWidgets, [widgetId]: widget };
+
+ // Save the layout
yield put(updateAndSaveLayout(widgets));
}
function* setWidgetDynamicPropertySaga(
action: ReduxAction,
) {
- const { isDynamic, propertyName, widgetId } = action.payload;
+ const { isDynamic, propertyPath, widgetId } = action.payload;
const widget: WidgetProps = yield select(getWidget, widgetId);
- // const tree = yield select(evaluateDataTree);
- const propertyValue = _.get(widget, propertyName);
+ const propertyValue = _.get(widget, propertyPath);
let dynamicPropertyPathList = getWidgetDynamicPropertyPathList(widget);
+ const propertyUpdates: Record = {};
if (isDynamic) {
dynamicPropertyPathList.push({
- key: propertyName,
+ key: propertyPath,
});
- const value = convertToString(propertyValue);
- yield put(updateWidgetProperty(widgetId, propertyName, value));
+ propertyUpdates[propertyPath] = convertToString(propertyValue);
} else {
dynamicPropertyPathList = _.reject(dynamicPropertyPathList, {
- key: propertyName,
+ key: propertyPath,
});
const { parsed } = yield call(
validateProperty,
widget.type,
- propertyName,
+ propertyPath,
propertyValue,
widget,
);
- yield put(updateWidgetProperty(widgetId, propertyName, parsed));
+ propertyUpdates[propertyPath] = parsed;
}
- yield put(
- updateWidgetProperty(
- widgetId,
- "dynamicPropertyPathList",
- dynamicPropertyPathList,
- ),
+ propertyUpdates.dynamicPropertyPathList = dynamicPropertyPathList;
+
+ yield put(updateWidgetProperty(widgetId, propertyUpdates));
+
+ const stateWidgets = yield select(getWidgets);
+ const widgets = { ...stateWidgets, [widgetId]: widget };
+
+ // Save the layout
+ yield put(updateAndSaveLayout(widgets));
+}
+
+function* batchUpdateWidgetPropertySaga(
+ action: ReduxAction,
+) {
+ const { updates, widgetId } = action.payload;
+ if (!widgetId) {
+ // Handling the case where sometimes widget id is not passed through here
+ return;
+ }
+ const widget: WidgetProps = yield select(getWidget, widgetId);
+ const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
+ widget.type,
);
+ const propertyUpdates: Record = {};
+ const currentDynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+ widget,
+ );
+ const currentDynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+ widget,
+ );
+ const dynamicTriggerPathListUpdates: DynamicPathUpdate[] = [];
+ const dynamicBindingPathListUpdates: DynamicPathUpdate[] = [];
+ Object.entries(updates).forEach(([propertyPath, propertyValue]) => {
+ // Set the actual property update
+ propertyUpdates[propertyPath] = propertyValue;
+
+ // Check if the path is a of a dynamic trigger property
+ const isTriggerProperty = propertyPath in triggerProperties;
+ // If it is a trigger property, it will go in a different list than the general
+ // dynamicBindingPathList.
+ if (isTriggerProperty && _.isString(propertyValue)) {
+ dynamicTriggerPathListUpdates.push(
+ getDynamicTriggerPathListUpdate(widget, propertyPath, propertyValue),
+ );
+ } else {
+ dynamicBindingPathListUpdates.push(
+ getDynamicBindingPathListUpdate(widget, propertyPath, propertyValue),
+ );
+ }
+ });
+
+ propertyUpdates.dynamicTriggerPathList = dynamicTriggerPathListUpdates.reduce(
+ applyDynamicPathUpdates,
+ currentDynamicTriggerPathList,
+ );
+ propertyUpdates.dynamicBindingPathList = dynamicBindingPathListUpdates.reduce(
+ applyDynamicPathUpdates,
+ currentDynamicBindingPathList,
+ );
+
+ // Send the updates
+ yield put(updateWidgetProperty(widgetId, updates));
+
+ const stateWidgets = yield select(getWidgets);
+ const widgets = { ...stateWidgets, [widgetId]: widget };
+
+ // Save the layout
+ yield put(updateAndSaveLayout(widgets));
+}
+
+function* deleteWidgetPropertySaga(
+ action: ReduxAction,
+) {
+ const { widgetId, propertyPath } = action.payload;
+ if (!widgetId) {
+ // Handling the case where sometimes widget id is not passed through here
+ return;
+ }
+ const stateWidget: WidgetProps = yield select(getWidget, widgetId);
+ const dynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+ stateWidget,
+ );
+ const dynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+ stateWidget,
+ );
+
+ dynamicTriggerPathList.filter((dynamicPath) => {
+ return !isChildPropertyPath(propertyPath, dynamicPath.key);
+ });
+
+ dynamicBindingPathList.forEach((dynamicPath) => {
+ return !isChildPropertyPath(propertyPath, dynamicPath.key);
+ });
+
+ yield put(
+ updateWidgetProperty(widgetId, {
+ dynamicTriggerPathList,
+ dynamicBindingPathList,
+ }),
+ );
+
+ const stateWidgets = yield select(getWidgets);
+ const widget = { ...stateWidget };
+ _.unset(widget, propertyPath);
+ const widgets = { ...stateWidgets, [widgetId]: widget };
+
+ // Save the layout
+ yield put(updateAndSaveLayout(widgets));
}
function* getWidgetChildren(widgetId: string): any {
@@ -774,11 +918,13 @@ function* getWidgetChildren(widgetId: string): any {
const { children } = widget;
if (children && children.length) {
for (const childIndex in children) {
- const child = children[childIndex];
- childrenIds.push(child);
- const grandChildren = yield call(getWidgetChildren, child);
- if (grandChildren.length) {
- childrenIds.push(...grandChildren);
+ if (children.hasOwnProperty(childIndex)) {
+ const child = children[childIndex];
+ childrenIds.push(child);
+ const grandChildren = yield call(getWidgetChildren, child);
+ if (grandChildren.length) {
+ childrenIds.push(...grandChildren);
+ }
}
}
}
@@ -803,6 +949,10 @@ function* resetEvaluatedWidgetMetaProperties(widgetIds: string[]) {
for (const index in widgetIds) {
const widgetId = widgetIds[index];
const widget = _.find(evaluatedDataTree, { widgetId }) as DataTreeWidget;
+
+ // the widget was not found in the data tree, so don't do anything
+ if (!widget) continue;
+
const widgetToUpdate = { ...widget };
const metaPropsMap = WidgetFactory.getWidgetMetaPropertiesMap(widget.type);
const defaultPropertiesMap = WidgetFactory.getWidgetDefaultPropertiesMap(
@@ -843,7 +993,9 @@ function* updateCanvasSize(
// TODO(abhinav): This considers that the topRow will always be zero
// Check this out when non canvas widgets are updating snapRows
// erstwhile: Math.round((rows * props.snapRowSpace) / props.parentRowSpace),
- yield put(updateWidgetProperty(canvasWidgetId, "bottomRow", newBottomRow));
+ yield put(
+ updateWidgetProperty(canvasWidgetId, { bottomRow: newBottomRow }),
+ );
}
}
@@ -852,11 +1004,9 @@ function* createWidgetCopy() {
if (!selectedWidget) return;
const widgets = yield select(getWidgets);
const widgetsToStore = getAllWidgetsInTree(selectedWidget.widgetId, widgets);
- const saveResult = yield saveCopiedWidgets(
+ return yield saveCopiedWidgets(
JSON.stringify({ widgetId: selectedWidget.widgetId, list: widgetsToStore }),
);
-
- return saveResult;
}
function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
@@ -1232,7 +1382,7 @@ function* addTableWidgetFromQuerySaga(action: ReduxAction) {
// The following is computed to be used in the entity explorer
// Every time a widget is selected, we need to expand widget entities
// in the entity explorer so that the selected widget is visible
-function* selectedWidgetAncestorySaga(
+function* selectedWidgetAncestrySaga(
action: ReduxAction<{ widgetId: string }>,
) {
try {
@@ -1259,7 +1409,7 @@ function* selectedWidgetAncestorySaga(
payload: widgetIdsExpandList,
});
} catch (error) {
- log.debug("Could not compute selected widget's ancestory", error);
+ log.debug("Could not compute selected widget's ancestry", error);
}
}
@@ -1285,12 +1435,20 @@ export default function* widgetOperationSagas() {
ReduxActionTypes.RESET_CHILDREN_WIDGET_META,
resetChildrenMetaSaga,
),
+ takeEvery(
+ ReduxActionTypes.BATCH_UPDATE_WIDGET_PROPERTY,
+ batchUpdateWidgetPropertySaga,
+ ),
+ takeEvery(
+ ReduxActionTypes.DELETE_WIDGET_PROPERTY,
+ deleteWidgetPropertySaga,
+ ),
takeLatest(ReduxActionTypes.UPDATE_CANVAS_SIZE, updateCanvasSize),
takeLatest(ReduxActionTypes.COPY_SELECTED_WIDGET_INIT, copyWidgetSaga),
takeEvery(ReduxActionTypes.PASTE_COPIED_WIDGET_INIT, pasteWidgetSaga),
takeEvery(ReduxActionTypes.UNDO_DELETE_WIDGET, undoDeleteSaga),
takeEvery(ReduxActionTypes.CUT_SELECTED_WIDGET, cutWidgetSaga),
takeEvery(ReduxActionTypes.WIDGET_ADD_CHILDREN, addChildrenSaga),
- takeLatest(ReduxActionTypes.SELECT_WIDGET, selectedWidgetAncestorySaga),
+ takeLatest(ReduxActionTypes.SELECT_WIDGET, selectedWidgetAncestrySaga),
]);
}
diff --git a/app/client/src/selectors/themeSelectors.tsx b/app/client/src/selectors/themeSelectors.tsx
index f42a41cdcc..6f7c8b7596 100644
--- a/app/client/src/selectors/themeSelectors.tsx
+++ b/app/client/src/selectors/themeSelectors.tsx
@@ -1,6 +1,33 @@
import { AppState } from "reducers";
+import {
+ AUTH_LOGIN_URL,
+ SIGN_UP_URL,
+ RESET_PASSWORD_URL,
+ FORGOT_PASSWORD_URL,
+} from "constants/routes";
+import { theme, dark } from "constants/DefaultTheme";
+
+const enforceDarkThemeRoutes = [
+ AUTH_LOGIN_URL,
+ SIGN_UP_URL,
+ RESET_PASSWORD_URL,
+ FORGOT_PASSWORD_URL,
+];
+const getShouldEnforceDarkTheme = () => {
+ const currentPath = window.location.pathname;
+ return enforceDarkThemeRoutes.some(
+ (path: string) => currentPath.indexOf(path) !== -1,
+ );
+};
export const getThemeDetails = (state: AppState) => {
+ if (getShouldEnforceDarkTheme()) {
+ return {
+ mode: state.ui.theme.mode,
+ theme: { ...theme, colors: { ...theme.colors, ...dark } },
+ };
+ }
+
return {
theme: state.ui.theme.theme,
mode: state.ui.theme.mode,
diff --git a/app/client/src/utils/DynamicBindingUtils.ts b/app/client/src/utils/DynamicBindingUtils.ts
index a7e87c2096..705fbbb9a7 100644
--- a/app/client/src/utils/DynamicBindingUtils.ts
+++ b/app/client/src/utils/DynamicBindingUtils.ts
@@ -249,3 +249,12 @@ export const unsafeFunctionForEval = [
"setInterval",
"Promise",
];
+export const isChildPropertyPath = (
+ parentPropertyPath: string,
+ childPropertyPath: string,
+): boolean => {
+ const regexTest = new RegExp(
+ `^${parentPropertyPath.replace(".", "\\.")}(\\.\\S+)?$`,
+ );
+ return regexTest.test(childPropertyPath);
+};
diff --git a/app/client/src/utils/DynamicBindingsUtil.test.ts b/app/client/src/utils/DynamicBindingsUtil.test.ts
index ef0bea5619..b319780940 100644
--- a/app/client/src/utils/DynamicBindingsUtil.test.ts
+++ b/app/client/src/utils/DynamicBindingsUtil.test.ts
@@ -1,4 +1,7 @@
-import { getDynamicStringSegments } from "./DynamicBindingUtils";
+import {
+ getDynamicStringSegments,
+ isChildPropertyPath,
+} from "./DynamicBindingUtils";
describe.each([
["{{A}}", ["{{A}}"]],
@@ -30,3 +33,20 @@ describe.each([
);
});
});
+
+describe("isChildPropertyPath function", () => {
+ it("works", () => {
+ const cases: Array<[string, string, boolean]> = [
+ ["Table1.selectedRow", "Table1.selectedRow", true],
+ ["Table1.selectedRow", "Table1.selectedRows", false],
+ ["Table1.selectedRow", "Table1.selectedRow.email", true],
+ ["Table1.selectedRow", "1Table1.selectedRow", false],
+ ["Table1.selectedRow", "Table11selectedRow", false],
+ ["Table1.selectedRow", "Table1.selectedRow", true],
+ ];
+ cases.forEach((testCase) => {
+ const result = isChildPropertyPath(testCase[0], testCase[1]);
+ expect(result).toBe(testCase[2]);
+ });
+ });
+});
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.ts b/app/client/src/utils/autocomplete/EntityDefinitions.ts
index a0cecf10e9..01428c5270 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.ts
@@ -231,7 +231,7 @@ export const GLOBAL_DEFS = {
export const GLOBAL_FUNCTIONS = {
navigateTo: {
"!doc": "Action to navigate the user to another page or url",
- "!type": "fn(pageNameOrUrl: string, params: {}) -> void",
+ "!type": "fn(pageNameOrUrl: string, params: {}, target?: string) -> void",
},
showAlert: {
"!doc": "Show a temporary notification style message to the user",
diff --git a/app/client/src/widgets/InputWidget.tsx b/app/client/src/widgets/InputWidget.tsx
index f186283381..90427ccd2e 100644
--- a/app/client/src/widgets/InputWidget.tsx
+++ b/app/client/src/widgets/InputWidget.tsx
@@ -44,6 +44,7 @@ class InputWidget extends BaseWidget {
static getTriggerPropertyMap(): TriggerPropertiesMap {
return {
onTextChanged: true,
+ onSubmit: true,
};
}
@@ -136,6 +137,22 @@ class InputWidget extends BaseWidget {
this.props.updateWidgetMetaProperty("isFocused", focusState);
};
+ handleKeyDown = (
+ e:
+ | React.KeyboardEvent
+ | React.KeyboardEvent,
+ ) => {
+ const isEnterKey = e.key === "Enter" || e.keyCode === 13;
+ if (isEnterKey && this.props.onSubmit) {
+ super.executeAction({
+ dynamicString: this.props.onSubmit,
+ event: {
+ type: EventType.ON_SUBMIT,
+ },
+ });
+ }
+ };
+
getPageView() {
const value = this.props.text || "";
const isInvalid =
@@ -149,6 +166,7 @@ class InputWidget extends BaseWidget {
if (this.props.maxChars) conditionalProps.maxChars = this.props.maxChars;
if (this.props.maxNum) conditionalProps.maxNum = this.props.maxNum;
if (this.props.minNum) conditionalProps.minNum = this.props.minNum;
+
return (
{
stepSize={1}
onFocusChange={this.handleFocusChange}
showError={!!this.props.isFocused}
+ disableNewLineOnPressEnterKey={!!this.props.onSubmit}
+ onKeyDown={this.handleKeyDown}
{...conditionalProps}
/>
);
@@ -215,6 +235,7 @@ export interface InputWidgetProps extends WidgetProps, WithMeta {
isRequired?: boolean;
isFocused?: boolean;
isDirty?: boolean;
+ onSubmit?: string;
}
export default InputWidget;
diff --git a/app/client/src/widgets/MapWidget.tsx b/app/client/src/widgets/MapWidget.tsx
index ba35a190a5..ddc72df2e0 100644
--- a/app/client/src/widgets/MapWidget.tsx
+++ b/app/client/src/widgets/MapWidget.tsx
@@ -132,6 +132,16 @@ class MapWidget extends BaseWidget {
return this.props.center || this.props.mapCenter || DefaultCenter;
}
+ componentDidUpdate(prevProps: MapWidgetProps) {
+ //remove selectedMarker when map initial location is updated
+ if (
+ JSON.stringify(prevProps.center) !== JSON.stringify(this.props.center) &&
+ this.props.selectedMarker
+ ) {
+ this.unselectMarker();
+ }
+ }
+
getPageView() {
return (
<>
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index dd86f8f347..026ed95bf5 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -90,13 +90,13 @@ class TableWidget extends BaseWidget {
searchText: VALIDATION_TYPES.TEXT,
defaultSearchText: VALIDATION_TYPES.TEXT,
defaultSelectedRow: VALIDATION_TYPES.DEFAULT_SELECTED_ROW,
+ pageSize: VALIDATION_TYPES.NUMBER,
};
}
static getMetaPropertiesMap(): Record {
return {
pageNo: 1,
- pageSize: undefined,
selectedRowIndex: undefined,
selectedRowIndices: undefined,
searchText: undefined,
@@ -120,10 +120,54 @@ class TableWidget extends BaseWidget {
onRowSelected: true,
onPageChange: true,
onSearchTextChanged: true,
+ onPageSizeChange: true,
columnActions: true,
};
}
+ static getDerivedPropertiesMap() {
+ return {
+ pageSize: `{{function() {
+ const TABLE_SIZES = {
+ ${CompactModeTypes.DEFAULT}: {
+ COLUMN_HEADER_HEIGHT: 38,
+ TABLE_HEADER_HEIGHT: 42,
+ ROW_HEIGHT: 40,
+ ROW_FONT_SIZE: 14,
+ },
+ ${CompactModeTypes.SHORT}: {
+ COLUMN_HEADER_HEIGHT: 38,
+ TABLE_HEADER_HEIGHT: 42,
+ ROW_HEIGHT: 20,
+ ROW_FONT_SIZE: 12,
+ },
+ ${CompactModeTypes.TALL}: {
+ COLUMN_HEADER_HEIGHT: 38,
+ TABLE_HEADER_HEIGHT: 42,
+ ROW_HEIGHT: 60,
+ ROW_FONT_SIZE: 18,
+ },
+ };
+ const compactMode = this.compactMode || "${CompactModeTypes.DEFAULT}";
+ const componentHeight = (this.bottomRow - this.topRow) * this.parentRowSpace;
+ const tableSizes = TABLE_SIZES[compactMode];
+ let pageSize= Math.floor((componentHeight - tableSizes.TABLE_HEADER_HEIGHT - tableSizes.COLUMN_HEADER_HEIGHT) / tableSizes.ROW_HEIGHT);
+ if (
+ componentHeight -
+ (tableSizes.TABLE_HEADER_HEIGHT +
+ tableSizes.COLUMN_HEADER_HEIGHT +
+ tableSizes.ROW_HEIGHT * pageSize) >
+ 0
+ ) {
+ pageSize += 1;
+ }
+ return pageSize;
+ }()
+ }}`,
+ triggerRowSelection: "{{!!this.onRowSelected}}",
+ };
+ }
+
getTableColumns = (tableData: Array>) => {
let columns: ReactTableColumnProps[] = [];
const hiddenColumns: ReactTableColumnProps[] = [];
@@ -135,6 +179,7 @@ class TableWidget extends BaseWidget {
} = this.props;
if (tableData.length) {
const columnKeys: string[] = getAllTableColumnKeys(tableData);
+ const { componentWidth } = this.getComponentDimensions();
const sortedColumn = this.props.sortedColumn;
for (let index = 0; index < columnKeys.length; index++) {
const i = columnKeys[index];
@@ -170,7 +215,12 @@ class TableWidget extends BaseWidget {
inputFormat: columnType.inputFormat,
},
Cell: (props: any) => {
- return renderCell(props.cell.value, columnType.type, isHidden);
+ return renderCell(
+ props.cell.value,
+ columnType.type,
+ isHidden,
+ componentWidth,
+ );
},
};
if (isHidden) {
@@ -361,7 +411,7 @@ class TableWidget extends BaseWidget {
const columnKeys: string[] = getAllTableColumnKeys(this.props.tableData);
const selectedRow: { [key: string]: any } = {};
for (let i = 0; i < columnKeys.length; i++) {
- selectedRow[columnKeys[i]] = undefined;
+ selectedRow[columnKeys[i]] = "";
}
return selectedRow;
}
@@ -493,6 +543,14 @@ class TableWidget extends BaseWidget {
);
}
}
+ if (this.props.pageSize !== prevProps.pageSize) {
+ super.executeAction({
+ dynamicString: this.props.onPageSizeChange,
+ event: {
+ type: EventType.ON_PAGE_SIZE_CHANGE,
+ },
+ });
+ }
}
getSelectedRowIndexes = (selectedRowIndices: string) => {
@@ -502,7 +560,12 @@ class TableWidget extends BaseWidget {
};
getPageView() {
- const { tableData, hiddenColumns, filteredTableData } = this.props;
+ const {
+ tableData,
+ hiddenColumns,
+ filteredTableData,
+ pageSize,
+ } = this.props;
const computedSelectedRowIndices = Array.isArray(
this.props.selectedRowIndices,
)
@@ -524,28 +587,6 @@ class TableWidget extends BaseWidget {
this.props.updateWidgetMetaProperty("pageNo", pageNo);
}
const { componentWidth, componentHeight } = this.getComponentDimensions();
- const tableSizes =
- TABLE_SIZES[this.props.compactMode || CompactModeTypes.DEFAULT];
- let pageSize = Math.floor(
- (componentHeight -
- tableSizes.TABLE_HEADER_HEIGHT -
- tableSizes.COLUMN_HEADER_HEIGHT) /
- tableSizes.ROW_HEIGHT,
- );
-
- if (
- componentHeight -
- (tableSizes.TABLE_HEADER_HEIGHT +
- tableSizes.COLUMN_HEADER_HEIGHT +
- tableSizes.ROW_HEIGHT * pageSize) >
- 0
- )
- pageSize += 1;
-
- if (pageSize !== this.props.pageSize) {
- this.props.updateWidgetMetaProperty("pageSize", pageSize);
- }
-
return (
}>
{
columnNameMap={this.props.columnNameMap}
columnTypeMap={this.props.columnTypeMap}
columnOrder={this.props.columnOrder}
+ triggerRowSelection={this.props.triggerRowSelection}
pageSize={Math.max(1, pageSize)}
onCommandClick={this.onCommandClick}
selectedRowIndex={
@@ -590,7 +632,14 @@ class TableWidget extends BaseWidget {
super.updateWidgetProperty("columnNameMap", columnNameMap);
}}
handleResizeColumn={(columnSizeMap: { [key: string]: number }) => {
- super.updateWidgetProperty("columnSizeMap", columnSizeMap);
+ if (this.props.renderMode === RenderModes.CANVAS) {
+ super.updateWidgetProperty("columnSizeMap", columnSizeMap);
+ } else {
+ this.props.updateWidgetMetaProperty(
+ "columnSizeMap",
+ columnSizeMap,
+ );
+ }
}}
handleReorderColumn={(columnOrder: string[]) => {
super.updateWidgetProperty("columnOrder", columnOrder);
@@ -607,11 +656,7 @@ class TableWidget extends BaseWidget {
}}
compactMode={this.props.compactMode || CompactModeTypes.DEFAULT}
updateCompactMode={(compactMode: CompactMode) => {
- if (this.props.renderMode === RenderModes.CANVAS) {
- this.props.updateWidgetMetaProperty("compactMode", compactMode);
- } else {
- this.props.updateWidgetMetaProperty("compactMode", compactMode);
- }
+ this.props.updateWidgetMetaProperty("compactMode", compactMode);
}}
sortTableColumn={this.handleColumnSorting}
/>
diff --git a/app/client/src/workers/evaluation.worker.ts b/app/client/src/workers/evaluation.worker.ts
index 78c036fe17..43ffa95e42 100644
--- a/app/client/src/workers/evaluation.worker.ts
+++ b/app/client/src/workers/evaluation.worker.ts
@@ -15,6 +15,7 @@ import {
extraLibraries,
getDynamicBindings,
getEntityDynamicBindingPathList,
+ isChildPropertyPath,
isPathADynamicBinding,
isPathADynamicTrigger,
unsafeFunctionForEval,
@@ -33,7 +34,6 @@ import {
CrashingError,
DataTreeDiffEvent,
getValidatedTree,
- isChildPropertyPath,
makeParentsDependOnChildren,
removeFunctions,
removeFunctionsFromDataTree,
@@ -148,9 +148,10 @@ ctx.addEventListener(
true,
callbackData,
);
+ const cleanTriggers = removeFunctions(triggers);
const errors = dataTreeEvaluator.errors;
dataTreeEvaluator.clearErrors();
- return { triggers, errors };
+ return { triggers: cleanTriggers, errors };
}
case EVAL_WORKER_ACTIONS.CLEAR_CACHE: {
dataTreeEvaluator = undefined;
@@ -180,12 +181,14 @@ ctx.addEventListener(
value,
props,
} = requestData;
- return validateWidgetProperty(
- widgetTypeConfigMap,
- widgetType,
- property,
- value,
- props,
+ return removeFunctions(
+ validateWidgetProperty(
+ widgetTypeConfigMap,
+ widgetType,
+ property,
+ value,
+ props,
+ ),
);
}
default: {
@@ -1373,10 +1376,11 @@ const addFunctions = (dataTree: Readonly): DataTree => {
withFunction.navigateTo = function(
pageNameOrUrl: string,
params: Record,
+ target?: string,
) {
return {
type: "NAVIGATE_TO",
- payload: { pageNameOrUrl, params },
+ payload: { pageNameOrUrl, params, target },
};
};
withFunction.actionPaths.push("navigateTo");
diff --git a/app/client/src/workers/evaluationUtils.test.ts b/app/client/src/workers/evaluationUtils.test.ts
deleted file mode 100644
index 0419fb5ada..0000000000
--- a/app/client/src/workers/evaluationUtils.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { isChildPropertyPath } from "./evaluationUtils";
-
-describe("isChildPropertyPath function", () => {
- it("works", () => {
- const cases: Array<[string, string, boolean]> = [
- ["Table1.selectedRow", "Table1.selectedRows", false],
- ["Table1.selectedRow", "Table1.selectedRow.email", true],
- ["Table1.selectedRow", "1Table1.selectedRow", false],
- ["Table1.selectedRow", "Table11selectedRow", false],
- ["Table1.selectedRow", "Table1.selectedRow", true],
- ];
- cases.forEach((testCase) => {
- const result = isChildPropertyPath(testCase[0], testCase[1]);
- expect(result).toBe(testCase[2]);
- });
- });
-});
diff --git a/app/client/src/workers/evaluationUtils.ts b/app/client/src/workers/evaluationUtils.ts
index 3a94668c83..6f05837929 100644
--- a/app/client/src/workers/evaluationUtils.ts
+++ b/app/client/src/workers/evaluationUtils.ts
@@ -169,7 +169,7 @@ export function isAction(entity: DataTreeEntity): boolean {
export const removeFunctions = (value: any) => {
if (_.isFunction(value)) {
return "Function call";
- } else if (_.isObject(value) && _.some(value, _.isFunction)) {
+ } else if (_.isObject(value)) {
return JSON.parse(JSON.stringify(value));
} else {
return value;
@@ -297,13 +297,3 @@ export function getValidatedTree(
return { ...tree, [entityKey]: parsedEntity };
}, tree);
}
-
-export const isChildPropertyPath = (
- parentPropertyPath: string,
- childPropertyPath: string,
-): boolean => {
- const regexTest = new RegExp(
- `^${parentPropertyPath.replace(".", "\\.")}(\\.\\S+)?$`,
- );
- return regexTest.test(childPropertyPath);
-};
diff --git a/app/client/start-https.sh b/app/client/start-https.sh
index 626bafb919..f8fa9d0c06 100755
--- a/app/client/start-https.sh
+++ b/app/client/start-https.sh
@@ -63,24 +63,18 @@ client_proxy_pass="${default_client_proxy}"
network_mode="bridge"
case "${uname_out}" in
Linux*) machine=Linux
-
- proc_version="$(cat /proc/version)"
- case "$proc_version" in
- *icrosoft*)
+
+ source ../util/is_wsl.sh
+ if [ $IS_WSL ]; then
# ignore to continue using host.docker.internal
- ;;
- *WSL*)
- # ignore to continue using host.docker.internal
- ;;
- *)
+ else
network_mode="host"
client_proxy_pass=$default_linux_client_proxy
# if no server was passed
if [[ -z $1 ]]; then
server_proxy_pass=$default_linux_server_proxy
fi
- ;;
- esac
+ fi
echo "
Starting nginx for Linux...
"
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
index 49d0f0fc3a..b3a7b2b360 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
@@ -7,9 +7,9 @@ import java.text.MessageFormat;
@Getter
public enum AppsmithPluginError {
- PLUGIN_ERROR(500, 5000, "PluginExecution failed with error {0}"),
- PLUGIN_STRUCTURE_ERROR(500, 5001, "Plugin failed to get structure with error {0}"),
- PLUGIN_TIMEOUT_ERROR(504, 5002, "Plugin execution for query \"{0}\" timed out in {1}ms. Please increase timeout duration in your action settings or check your backend action endpoint."),
+ PLUGIN_ERROR(500, 5000, "{0}"),
+ PLUGIN_STRUCTURE_ERROR(500, 5001, "Failed to get database structure with error {0}"),
+ PLUGIN_TIMEOUT_ERROR(504, 5002, "{0} timed out in {1} milliseconds. Please increase timeout. This can be found in Settings tab of {0}."),
;
private final Integer httpErrorCode;
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 76e0ebe7f5..0d931ff897 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
@@ -359,6 +359,10 @@ public class FirestorePlugin extends BasePlugin {
}
private Object resultToMap(Object objResult) throws AppsmithPluginException {
+ return resultToMap(objResult, true);
+ }
+
+ private Object resultToMap(Object objResult, boolean isRoot) throws AppsmithPluginException {
if (objResult instanceof WriteResult) {
WriteResult writeResult = (WriteResult) objResult;
Map resultMap = new HashMap<>();
@@ -377,7 +381,11 @@ public class FirestorePlugin extends BasePlugin {
QuerySnapshot querySnapshot = (QuerySnapshot) objResult;
List> documents = new ArrayList<>();
for (QueryDocumentSnapshot documentSnapshot : querySnapshot.getDocuments()) {
- documents.add(documentSnapshot.getData());
+ final Map data = documentSnapshot.getData();
+ for (final Map.Entry entry : data.entrySet()) {
+ data.put(entry.getKey(), resultToMap(entry.getValue(), false));
+ }
+ documents.add(data);
}
return documents;
@@ -388,13 +396,15 @@ public class FirestorePlugin extends BasePlugin {
resultMap.put("path", documentReference.getPath());
return resultMap;
- } else {
+ } else if (isRoot) {
throw new AppsmithPluginException(
AppsmithPluginError.PLUGIN_ERROR,
"Unable to serialize object of type " + objResult.getClass().getName() + "."
);
}
+
+ return objResult;
}
@Override
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 386d38ae9a..d242e783b0 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
@@ -19,6 +19,7 @@ import org.testcontainers.utility.DockerImageName;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@@ -56,7 +57,12 @@ public class FirestorePluginTest {
.getService();
firestoreConnection.document("initial/one").set(Map.of("value", 1, "name", "one", "isPlural", false)).get();
- firestoreConnection.document("initial/two").set(Map.of("value", 2, "name", "two", "isPlural", true)).get();
+ firestoreConnection.document("initial/two").set(Map.of(
+ "value", 2,
+ "name", "two",
+ "isPlural", true,
+ "ref", firestoreConnection.document("initial/one")
+ )).get();
firestoreConnection.document("changing/to-update").set(Map.of("value", 1)).get();
firestoreConnection.document("changing/to-delete").set(Map.of("value", 1)).get();
@@ -79,19 +85,11 @@ public class FirestorePluginTest {
StepVerifier.create(resultMono)
.assertNext(result -> {
assertTrue(result.getIsExecutionSuccess());
- assertTrue(((Map) result.getBody()).entrySet().stream().allMatch(entry -> {
- Object value = entry.getValue();
- switch (entry.getKey()) {
- case "name":
- return "one".equals(value);
- case "isPlural":
- return Boolean.FALSE.equals(value);
- case "value":
- return value.equals(1L);
- default:
- return false;
- }
- }));
+ final Map first = (Map) result.getBody();
+ assertEquals("one", first.remove("name"));
+ assertFalse((Boolean) first.remove("isPlural"));
+ assertEquals(1L, first.remove("value"));
+ assertEquals(Collections.emptyMap(), first);
})
.verifyComplete();
}
@@ -108,7 +106,22 @@ public class FirestorePluginTest {
StepVerifier.create(resultMono)
.assertNext(result -> {
assertTrue(result.getIsExecutionSuccess());
- assertEquals(2, ((List) result.getBody()).size());
+
+ List> results = (List) result.getBody();
+ assertEquals(2, results.size());
+
+ final Map first = results.get(0);
+ assertEquals("one", first.remove("name"));
+ assertFalse((Boolean) first.remove("isPlural"));
+ assertEquals(1L, first.remove("value"));
+ assertEquals(Collections.emptyMap(), first);
+
+ final Map second = results.get(1);
+ assertEquals("two", second.remove("name"));
+ assertTrue((Boolean) second.remove("isPlural"));
+ assertEquals(2L, second.remove("value"));
+ assertEquals(Map.of("path", "initial/one", "id", "one"), second.remove("ref"));
+ assertEquals(Collections.emptyMap(), second);
})
.verifyComplete();
}
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
index a6f4eb44eb..f2b6162dd4 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
@@ -111,41 +111,6 @@
]
}
]
- },
- {
- "sectionName": "SSL (optional)",
- "children": [
- {
- "label": "Authentication Mechanism",
- "configProperty": "datasourceConfiguration.connection.ssl.authType",
- "controlType": "DROP_DOWN",
- "initialValue": "NO_SSL",
- "options": [
- {
- "label": "No SSL",
- "value": "NO_SSL"
- },
- {
- "label": "CA Certificate",
- "value": "CA_CERTIFICATE"
- },
- {
- "label": "Self Signed Certificate",
- "value": "SELF_SIGNED_CERTIFICATE"
- }
- ]
- },
- {
- "label": "CA Certificate",
- "configProperty": "datasourceConfiguration.connection.ssl.caCertificate",
- "controlType": "FILE_PICKER"
- },
- {
- "label": "PEM Certificate",
- "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate",
- "controlType": "FILE_PICKER"
- }
- ]
}
]
}
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
index f6d7b7b59e..a79f41571e 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
@@ -313,7 +313,9 @@ public class MySqlPlugin extends BasePlugin {
invalids.add("Missing endpoint and url");
} else if (!CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
for (final Endpoint endpoint : datasourceConfiguration.getEndpoints()) {
- if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
+ if (endpoint.getHost() == null || endpoint.getHost().isBlank()) {
+ invalids.add("Host value cannot be empty");
+ } else if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
invalids.add("Host value cannot contain `/` or `:` characters. Found `" + endpoint.getHost() + "`.");
}
}
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
index a5f12cb1da..aedbac198c 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
@@ -29,6 +29,7 @@ import reactor.test.StepVerifier;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
+
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -257,6 +258,18 @@ public class MySqlPluginTest {
assertTrue(output.contains("Missing endpoint and url"));
}
+ @Test
+ public void testValidateDatasource_NullHost() {
+ dsConfig.setEndpoints(List.of(new Endpoint()));
+ Set output = pluginExecutor.validateDatasource(dsConfig);
+ assertEquals(output.size(), 1);
+ assertTrue(output.contains("Host value cannot be empty"));
+ Endpoint endpoint = new Endpoint();
+ endpoint.setHost(address);
+ endpoint.setPort(port.longValue());
+ dsConfig.setEndpoints(List.of(endpoint));
+ }
+
@Test
public void testValidateDatasourceInvalidEndpoint() {
String hostname = "r2dbc:mysql://localhost";
@@ -344,8 +357,8 @@ public class MySqlPluginTest {
* 1. Add a test to check that mysql driver can interpret and read all the regular data types used in mysql.
* 2. List of the data types is taken is from https://dev.mysql.com/doc/refman/8.0/en/data-types.html
* 3. Data types tested here are: INTEGER, SMALLINT, TINYINT, MEDIUMINT, BIGINT, DECIMAL, FLOAT, DOUBLE, BIT,
- * DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
- * TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT
+ * DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
+ * TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT
*/
@Test
public void testExecuteDataTypesExtensive() {
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
index eb58eb62e8..3793b58cd7 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
@@ -111,43 +111,6 @@
"value": "VERIFY_FULL"
}
]
- },
- {
- "sectionName": null,
- "children": [
- {
- "label": "Key File",
- "configProperty": "datasourceConfiguration.connection.ssl.keyFile",
- "controlType": "FILE_PICKER"
- },
- {
- "label": "Certificate",
- "configProperty": "datasourceConfiguration.connection.ssl.certificateFile",
- "controlType": "FILE_PICKER"
- }
- ]
- },
- {
- "sectionName": null,
- "children": [
- {
- "label": "CA Certificate",
- "configProperty": "datasourceConfiguration.connection.ssl.caCertificateFile",
- "controlType": "FILE_PICKER"
- },
- {
- "label": "PEM Certificate",
- "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate.file",
- "controlType": "FILE_PICKER"
- },
- {
- "label": "PEM Passphrase",
- "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate.password",
- "dataType": "PASSWORD",
- "controlType": "INPUT_TEXT",
- "placeholderText": "PEM Passphrase"
- }
- ]
}
]
}
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index be3c723a2a..6b8d17dbb3 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -203,7 +203,7 @@
org.jgrapht
jgrapht-core
- 1.3.0
+ 1.5.0
org.apache.httpcomponents
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
index 0a4fd930b6..83b1281655 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
@@ -84,7 +84,7 @@ public class ClientUserRepository implements ServerOAuth2AuthorizedClientReposit
DefaultOidcUser userPrincipal = (DefaultOidcUser) principal.getPrincipal();
domain = (String) userPrincipal.getAttributes().getOrDefault("hd", "");
if (!commonConfig.getAllowedDomains().contains(domain)) {
- return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_DOMAIN));
+ return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_DOMAIN, domain));
}
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
index a95abf7555..6fec4982c8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
@@ -6,6 +6,7 @@ public class FieldName {
public static final String DELETED = "deleted";
public static final String CREATED_AT = "createdAt";
public static final String DELETED_AT = "deletedAt";
+ public static final String CURL_CODE = "curlCode";
public static String ORGANIZATION = "organization";
public static String ID = "id";
public static final String NAME = "name";
@@ -59,4 +60,5 @@ public class FieldName {
public static String ASSET = "asset";
public static String APPLICATION = "application";
public static String PUBLISHED_APPLICATION = "deployed application";
+ public static final String TOKEN = "token";
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
index 32ec045d0e..d526ce33a2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
@@ -41,7 +41,7 @@ public class RestApiImportController {
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
- public Mono> create(@Valid @RequestBody Object input,
+ public Mono> create(@RequestBody(required = false) Object input,
@RequestParam RestApiImporterType type,
@RequestParam String pageId,
@RequestParam String name,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java
new file mode 100644
index 0000000000..6689529c92
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.domains;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class ActionDependencyEdge {
+ String source;
+ String target;
+}
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 a81878e4c8..c4f79f2056 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
@@ -44,6 +44,15 @@ public class Layout extends BaseDomain {
@JsonIgnore
Set widgetNames;
+ @JsonIgnore
+ Set allOnPageLoadActionNames;
+
+ @JsonIgnore
+ Set allOnPageLoadActionEdges;
+
+ @JsonIgnore
+ Set actionsUsedInDynamicBindings;
+
/**
* If view mode, the dsl returned should be the publishedDSL, else if the edit mode is on (view mode = false)
* the dsl returned should be JSONObject dsl
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 c573a72f4b..05dc0648a6 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
@@ -23,33 +23,31 @@ public enum AppsmithError {
USER_DOESNT_BELONG_TO_ORGANIZATION(400, 4010, "User {0} does not belong to an organization with id {1}",
AppsmithErrorAction.LOG_EXTERNALLY),
NO_CONFIGURATION_FOUND_IN_DATASOURCE(400, 4011, "No datasource configuration found. Please configure it and try again.", AppsmithErrorAction.DEFAULT),
- INVALID_ACTION(400, 4012, "Action {0} with id {1} is invalid: {2}", AppsmithErrorAction.DEFAULT),
- INVALID_DATASOURCE(400, 4013, "Datasource is invalid. Please edit to make it valid. Details: {0}", AppsmithErrorAction.DEFAULT),
- INVALID_ACTION_NAME(400, 4014, "Action name is invalid. Please input syntactically correct name", AppsmithErrorAction.DEFAULT),
- INVALID_DATASOURCE_CONFIGURATION(400, 4015, "Datasource configuration is invalid", AppsmithErrorAction.DEFAULT),
- NO_CONFIGURATION_FOUND_IN_ACTION(400, 4016, "No action configuration found. Please configure it and try again.", AppsmithErrorAction.DEFAULT),
+ INVALID_ACTION(400, 4012, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}", AppsmithErrorAction.DEFAULT),
+ INVALID_DATASOURCE(400, 4013, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}", AppsmithErrorAction.DEFAULT),
+ INVALID_ACTION_NAME(400, 4014, "Appsmith expects the action naming to follow variable naming conventions. "
+ + "It must be a single word contain any alphabets, numbers, or \"_\". Hyphen (\"-\") symbol is not allowed. "
+ + "Please change the name.", AppsmithErrorAction.DEFAULT),
+ NO_CONFIGURATION_FOUND_IN_ACTION(400, 4016, "No configurations found in this action", AppsmithErrorAction.DEFAULT),
NAME_CLASH_NOT_ALLOWED_IN_REFACTOR(400, 4017, "The new name {1} already exists in the current page. Choose another name.", AppsmithErrorAction.DEFAULT),
- PAGE_DOESNT_BELONG_TO_APPLICATION(400, 4018, "Page {0} does not belong to the application {1}",
+ PAGE_DOESNT_BELONG_TO_APPLICATION(400, 4018, "Unexpected state. Page {0} does not seem belong to the application {1}. Please reach out to Appsmith customer support to resolve this.",
AppsmithErrorAction.LOG_EXTERNALLY),
- NO_DSL_FOUND_IN_PAGE(400, 4020, "The page {0} doesn't have a DSL. This is an unexpected state", AppsmithErrorAction.DEFAULT),
- INVALID_DYNAMIC_BINDING_REFERENCE(400, 4022, "The dynamically bounded key {0} you are referring to was not found.", AppsmithErrorAction.LOG_EXTERNALLY),
- USER_ALREADY_EXISTS_IN_ORGANIZATION(400, 4021, "The user {0} has already been added to the organization with role {1}", AppsmithErrorAction.DEFAULT),
- UNAUTHORIZED_DOMAIN(401, 4019, "Invalid email domain provided. Please sign in with a valid work email ID", AppsmithErrorAction.DEFAULT),
- USER_NOT_SIGNED_IN(401, 4020, "User is not logged in. Please sign in with the registered email ID or sign up",
+ INVALID_DYNAMIC_BINDING_REFERENCE(400, 4022, "Unexpected state. The dynamically bounded key {0} referred was not found. Please reach out to Appsmith customer support to resolve this.", AppsmithErrorAction.LOG_EXTERNALLY),
+ USER_ALREADY_EXISTS_IN_ORGANIZATION(400, 4021, "The user {0} has already been added to the organization with role {1}. To change the role, please navigate to `Manage Users` page.", AppsmithErrorAction.DEFAULT),
+ UNAUTHORIZED_DOMAIN(401, 4019, "Invalid email domain {0} used for sign in/sign up. Please contact the administrator to configure this domain if this is unexpected.", AppsmithErrorAction.DEFAULT),
+ USER_NOT_SIGNED_IN(401, 4020, "You are not logged in. Please sign in with the registered email ID or sign up",
AppsmithErrorAction.DEFAULT),
- INVALID_PASSWORD_RESET(400, 4020, "Unable to reset the password. Please initiate a request via 'forgot password' " +
+ 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),
- LOGIN_INTERNAL_ERROR(401, 4021, "Internal error while trying to login", AppsmithErrorAction.LOG_EXTERNALLY),
JSON_PROCESSING_ERROR(400, 4022, "Json processing error with error {0}", AppsmithErrorAction.LOG_EXTERNALLY),
INVALID_CREDENTIALS(200, 4023, "Invalid credentials provided. Did you input the credentials correctly?", AppsmithErrorAction.DEFAULT),
- DUPLICATE_KEY(409, 4024, "Duplicate key error", AppsmithErrorAction.DEFAULT),
- USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in.", AppsmithErrorAction.DEFAULT),
UNAUTHORIZED_ACCESS(403, 4025, "Unauthorized access", AppsmithErrorAction.DEFAULT),
- ACTION_IS_NOT_AUTHORIZED(403, 4026, "Sorry. You do not have permissions to perform this action", AppsmithErrorAction.DEFAULT),
- INVALID_DATASOURCE_NAME(400, 4026, "Invalid datasource name. Check again.", AppsmithErrorAction.DEFAULT),
- NO_RESOURCE_FOUND(404, 4027, "Unable to find {0} with id {1}", AppsmithErrorAction.DEFAULT),
+ DUPLICATE_KEY(409, 4024, "Unexpected state : Duplicate key error. Please reach out to Appsmith customer support to report this", AppsmithErrorAction.DEFAULT),
+ USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in instead.", AppsmithErrorAction.DEFAULT),
+ ACTION_IS_NOT_AUTHORIZED(403, 4026, "Uh oh! You do not have permissions to do : {0}", AppsmithErrorAction.DEFAULT),
+ NO_RESOURCE_FOUND(404, 4027, "Unable to find {0} {1}", AppsmithErrorAction.DEFAULT),
USER_NOT_FOUND(404, 4027, "Unable to find user with email {0}", AppsmithErrorAction.DEFAULT),
- ACL_NO_RESOURCE_FOUND(404, 4028, "Unable to find {0} with id {1}. Either the asset doesn't exist or you don't have required permissions", AppsmithErrorAction.DEFAULT),
+ ACL_NO_RESOURCE_FOUND(404, 4028, "Unable to find {0} {1}. Either the asset doesn't exist or you don't have required permissions", AppsmithErrorAction.DEFAULT),
GENERIC_BAD_REQUEST(400, 4028, "Bad Request: {0}", AppsmithErrorAction.DEFAULT),
VALIDATION_FAILURE(400, 4028, "Validation Failure(s): {0}", AppsmithErrorAction.DEFAULT),
INVALID_CURL_COMMAND(400, 4029, "Invalid cURL command, couldn't import.", AppsmithErrorAction.DEFAULT),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
index e2a7ddc1ec..6079f1dbb7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
@@ -10,6 +10,7 @@ import org.springframework.security.access.AccessDeniedException;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.support.WebExchangeBindException;
import org.springframework.web.server.ServerWebExchange;
@@ -30,7 +31,8 @@ import java.util.Map;
@Slf4j
public class GlobalExceptionHandler {
- public GlobalExceptionHandler() {}
+ public GlobalExceptionHandler() {
+ }
private void doLog(Throwable error) {
log.error("", error);
@@ -52,11 +54,10 @@ public class GlobalExceptionHandler {
);
if (error instanceof AppsmithException) {
- if (((AppsmithException)error).getErrorAction() == AppsmithErrorAction.LOG_EXTERNALLY) {
+ if (((AppsmithException) error).getErrorAction() == AppsmithErrorAction.LOG_EXTERNALLY) {
Sentry.captureException(error);
}
- }
- else {
+ } else {
Sentry.captureException(error);
}
}
@@ -124,8 +125,15 @@ public class GlobalExceptionHandler {
AppsmithError appsmithError = AppsmithError.GENERIC_BAD_REQUEST;
exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
doLog(e);
+ String errorMessage = e.getReason();
+ if (e.getMethodParameter() != null) {
+ errorMessage = "Malformed parameter '" + e.getMethodParameter().getParameterName()
+ + "' for " + e.getMethodParameter().getContainingClass().getSimpleName()
+ + (e.getMethodParameter().getMethod() != null ? "." + e.getMethodParameter().getMethod().getName() : "");
+ }
+
return Mono.just(new ResponseDTO<>(appsmithError.getHttpErrorCode(), new ErrorDTO(appsmithError.getAppErrorCode(),
- appsmithError.getMessage(e.getReason()))));
+ appsmithError.getMessage(errorMessage))));
}
@ExceptionHandler
@@ -135,7 +143,7 @@ public class GlobalExceptionHandler {
exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
doLog(e);
return Mono.just(new ResponseDTO<>(appsmithError.getHttpErrorCode(), new ErrorDTO(appsmithError.getAppErrorCode(),
- e.getLocalizedMessage())));
+ e.getMessage())));
}
@ExceptionHandler
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
index 78b6ddebd3..349ff4e16c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
@@ -15,12 +15,23 @@ import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import static com.appsmith.server.helpers.BeanCopyUtils.isDomainModel;
@Slf4j
public class MustacheHelper {
+ /*
+ * This pattern finds all the String which have been extracted from the mustache dynamic bindings.
+ * e.g. for the given JS function using action with name "fetchUsers"
+ * {{JSON.stringify(fetchUsers)}}
+ * This pattern should return ["JSON.stringify", "fetchUsers"]
+ */
+ private final static Pattern pattern = Pattern.compile("[a-zA-Z_][a-zA-Z0-9._]*");
+
+
/**
* Tokenize a Mustache template string into a list of plain text and Mustache interpolations.
*
@@ -288,4 +299,21 @@ public class MustacheHelper {
return StringEscapeUtils.unescapeHtml4(rendered.toString());
}
+ public static void extractWordsAndAddToSet(Set bindingNames, String mustacheKey) {
+ String key = mustacheKey.trim();
+
+ // Extract all the words in the dynamic bindings
+ Matcher matcher = pattern.matcher(key);
+
+ while (matcher.find()) {
+ String word = matcher.group();
+
+ String[] subStrings = word.split(Pattern.quote("."));
+ if (subStrings.length > 0) {
+ // We are only interested in the top level. e.g. if its Input1.text, we want just Input1
+ bindingNames.add(subStrings[0]);
+ }
+ }
+ }
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
index 8c04b55885..3d80001be8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
@@ -14,4 +14,6 @@ public interface CustomOrganizationRepository extends AppsmithRepository findByIdsIn(Set orgIds, AclPermission aclPermission, Sort sort);
+ Mono nextSlugNumber(String slugPrefix);
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
index a295a8b87e..9b45fa8d70 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
@@ -8,14 +8,17 @@ import org.springframework.data.domain.Sort;
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.stereotype.Component;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
@Component
@Slf4j
@@ -39,4 +42,28 @@ public class CustomOrganizationRepositoryImpl extends BaseAppsmithRepositoryImpl
return queryAll(List.of(orgIdsCriteria), aclPermission, sort);
}
+
+ @Override
+ public Mono nextSlugNumber(String slugPrefix) {
+ final String slugField = fieldName(QOrganization.organization.slug);
+ final Query slugPrefixQuery = query(where(slugField).regex("^" + slugPrefix + "\\d*$"));
+ slugPrefixQuery.fields().include(slugField);
+ return mongoOperations
+ .find(slugPrefixQuery, Organization.class)
+ .map(Organization::getSlug)
+ .collect(Collectors.toSet())
+ .map(slugs -> {
+ if (slugs.isEmpty() || !slugs.contains(slugPrefix)) {
+ return 0L;
+ }
+
+ long number = 1L;
+ while (slugs.contains(slugPrefix + number)) {
+ ++number;
+ }
+
+ return number;
+ });
+ }
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
index 8114a37f61..6d2224f775 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
@@ -1,7 +1,6 @@
package com.appsmith.server.repositories;
import com.appsmith.server.domains.Organization;
-import org.springframework.data.mongodb.repository.Query;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Mono;
@@ -10,10 +9,8 @@ public interface OrganizationRepository extends BaseRepository findBySlug(String slug);
- @Query(value = "{slug: {$regex: ?0}}", count = true)
- Mono countSlugsByPrefix(String keyword);
-
Mono findByIdAndPluginsPluginId(String organizationId, String pluginId);
Mono findByName(String name);
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java
deleted file mode 100644
index 885849633d..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.domains.Action;
-import com.appsmith.server.dtos.ActionViewDTO;
-import com.appsmith.server.dtos.ExecuteActionDTO;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-import java.util.Set;
-
-public interface ActionService extends CrudService {
-
- Mono executeAction(ExecuteActionDTO executeActionDTO);
-
- Mono save(Action action);
-
- Mono findByNameAndPageId(String name, String pageId, AclPermission permission);
-
- Flux findOnLoadActionsInPage(Set names, String pageId);
-
- Mono validateAndSaveActionToRepository(Action action);
-
- Action extractAndSetJsonPathKeys(Action action);
-
- T variableSubstitution(T configuration, Map replaceParamsMap);
-
- Mono findById(String id);
-
- Flux findByPageId(String pageId, AclPermission permission);
-
- Flux getActionsForViewMode(String applicationId);
-
- Mono findById(String id, AclPermission aclPermission);
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
deleted file mode 100644
index 17d3478f54..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
+++ /dev/null
@@ -1,721 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.external.models.ActionConfiguration;
-import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.external.models.DatasourceConfiguration;
-import com.appsmith.external.models.PaginationField;
-import com.appsmith.external.models.PaginationType;
-import com.appsmith.external.models.Param;
-import com.appsmith.external.models.Policy;
-import com.appsmith.external.models.Property;
-import com.appsmith.external.models.Provider;
-import com.appsmith.external.pluginExceptions.AppsmithPluginError;
-import com.appsmith.external.pluginExceptions.AppsmithPluginException;
-import com.appsmith.external.pluginExceptions.StaleConnectionException;
-import com.appsmith.external.plugins.PluginExecutor;
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.acl.PolicyGenerator;
-import com.appsmith.server.constants.FieldName;
-import com.appsmith.server.domains.Action;
-import com.appsmith.server.domains.ActionProvider;
-import com.appsmith.server.domains.Datasource;
-import com.appsmith.server.domains.NewPage;
-import com.appsmith.server.domains.Page;
-import com.appsmith.server.domains.Plugin;
-import com.appsmith.server.domains.PluginType;
-import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.ActionViewDTO;
-import com.appsmith.server.dtos.ExecuteActionDTO;
-import com.appsmith.server.exceptions.AppsmithError;
-import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.MustacheHelper;
-import com.appsmith.server.helpers.PluginExecutorHelper;
-import com.appsmith.server.repositories.ActionRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Scheduler;
-
-import javax.lang.model.SourceVersion;
-import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
-import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
-import static com.appsmith.server.acl.AclPermission.READ_PAGES;
-
-@Slf4j
-@Service
-public class ActionServiceImpl extends BaseService implements ActionService {
-
- private final ActionRepository repository;
- private final DatasourceService datasourceService;
- private final PluginService pluginService;
- private final DatasourceContextService datasourceContextService;
- private final PluginExecutorHelper pluginExecutorHelper;
- private final SessionUserService sessionUserService;
- private final MarketplaceService marketplaceService;
- private final PolicyGenerator policyGenerator;
- private final NewPageService newPageService;
-
- @Autowired
- public ActionServiceImpl(Scheduler scheduler,
- Validator validator,
- MongoConverter mongoConverter,
- ReactiveMongoTemplate reactiveMongoTemplate,
- ActionRepository repository,
- DatasourceService datasourceService,
- PluginService pluginService,
- AnalyticsService analyticsService,
- DatasourceContextService datasourceContextService,
- PluginExecutorHelper pluginExecutorHelper,
- SessionUserService sessionUserService,
- MarketplaceService marketplaceService,
- PolicyGenerator policyGenerator,
- NewPageService newPageService) {
- super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
- this.repository = repository;
- this.datasourceService = datasourceService;
- this.pluginService = pluginService;
- this.datasourceContextService = datasourceContextService;
- this.pluginExecutorHelper = pluginExecutorHelper;
- this.sessionUserService = sessionUserService;
- this.marketplaceService = marketplaceService;
- this.policyGenerator = policyGenerator;
- this.newPageService = newPageService;
- }
-
- private Boolean validateActionName(String name) {
- boolean isValidName = SourceVersion.isName(name);
- String pattern = "^((?=[A-Za-z0-9_])(?![\\\\-]).)*$";
- boolean doesPatternMatch = name.matches(pattern);
- return (isValidName && doesPatternMatch);
- }
-
- @Override
- public Mono create(@NotNull Action action) {
- if (action.getId() != null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "id"));
- }
-
- if (action.getPageId() == null || action.getPageId().isBlank()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
- }
-
- Mono userMono = sessionUserService
- .getCurrentUser()
- .cache();
-
- return newPageService
- .findById(action.getPageId(), READ_PAGES)
- .switchIfEmpty(Mono.error(
- new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page", action.getPageId())))
- .zipWith(userMono)
- .flatMap(tuple -> {
- NewPage page = tuple.getT1();
- User user = tuple.getT2();
-
- // Inherit the action policies from the page.
- generateAndSetActionPolicies(page, action);
-
- // If the datasource is embedded, check for organizationId and set it in action
- if (action.getDatasource() != null &&
- action.getDatasource().getId() == null) {
- Datasource datasource = action.getDatasource();
- if (datasource.getOrganizationId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
- }
- action.setOrganizationId(datasource.getOrganizationId());
- }
-
- return Mono.just(action);
- })
- .flatMap(this::validateAndSaveActionToRepository);
- }
-
- @Override
- public Mono validateAndSaveActionToRepository(Action action) {
- //Default the validity to true and invalids to be an empty set.
- Set invalids = new HashSet<>();
- action.setIsValid(true);
-
- if (action.getName() == null || action.getName().trim().isEmpty()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
- }
-
- if (action.getPageId() == null || action.getPageId().isBlank()) {
- return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
- }
-
- if (!validateActionName(action.getName())) {
- action.setIsValid(false);
- invalids.add(AppsmithError.INVALID_ACTION_NAME.getMessage());
- }
-
- if (action.getActionConfiguration() == null) {
- action.setIsValid(false);
- invalids.add(AppsmithError.NO_CONFIGURATION_FOUND_IN_ACTION.getMessage());
- }
-
- if (action.getDatasource() == null || action.getDatasource().getIsAutoGenerated()) {
- if (action.getPluginType() != PluginType.JS) {
- // This action isn't of type JS functions which requires that the pluginType be set by the client. Hence,
- // datasource is very much required for such an action.
- action.setIsValid(false);
- invalids.add(AppsmithError.DATASOURCE_NOT_GIVEN.getMessage());
- }
- action.setInvalids(invalids);
- return super.create(action);
- }
-
- Mono datasourceMono;
- if (action.getDatasource().getId() == null) {
- datasourceMono = Mono.just(action.getDatasource())
- .flatMap(datasourceService::validateDatasource);
- } else {
- //Data source already exists. Find the same.
- datasourceMono = datasourceService.findById(action.getDatasource().getId(), MANAGE_DATASOURCES)
- .switchIfEmpty(Mono.defer(() -> {
- action.setIsValid(false);
- invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.DATASOURCE, action.getDatasource().getId()));
- return Mono.just(action.getDatasource());
- }))
- .map(datasource -> {
- // datasource is found. Update the action.
- action.setOrganizationId(datasource.getOrganizationId());
- return datasource;
- });
- }
-
- Mono pluginMono = datasourceMono.flatMap(datasource -> {
- if (datasource.getPluginId() == null) {
- return Mono.error(new AppsmithException(AppsmithError.PLUGIN_ID_NOT_GIVEN));
- }
- return pluginService.findById(datasource.getPluginId())
- .switchIfEmpty(Mono.defer(() -> {
- action.setIsValid(false);
- invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.PLUGIN, datasource.getPluginId()));
- return Mono.just(new Plugin());
- }));
- });
-
- return pluginMono
- .zipWith(datasourceMono)
- //Set plugin in the action before saving.
- .map(tuple -> {
- Plugin plugin = tuple.getT1();
- Datasource datasource = tuple.getT2();
- action.setDatasource(datasource);
- action.setInvalids(invalids);
- action.setPluginType(plugin.getType());
- return action;
- }).map(act -> extractAndSetJsonPathKeys(act))
- .flatMap(super::create)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.REPOSITORY_SAVE_FAILED)))
- .flatMap(this::setTransientFieldsInAction);
- }
-
- /**
- * This function extracts all the mustache template keys (as per the regex) and returns them to the calling fxn
- * This set of keys is stored separately in the field `jsonPathKeys` in the action object. The client
- * uses the set `jsonPathKeys` to simplify it's value substitution.
- *
- * @param action
- * @return
- */
- private Set extractKeysFromAction(Action action) {
- if (action.getActionConfiguration() == null) {
- return new HashSet<>();
- }
-
- return MustacheHelper.extractMustacheKeysFromFields(action.getActionConfiguration());
- }
-
- /**
- * This function extracts the mustache keys and sets them in the field jsonPathKeys in the action object
- *
- * @param action
- * @return
- */
- public Action extractAndSetJsonPathKeys(Action action) {
- Set actionKeys = extractKeysFromAction(action);
- Set datasourceKeys = datasourceService.extractKeysFromDatasource(action.getDatasource());
- Set keys = new HashSet() {{
- addAll(actionKeys);
- addAll(datasourceKeys);
- }};
- action.setJsonPathKeys(keys);
- return action;
- }
-
- @Override
- public Mono executeAction(ExecuteActionDTO executeActionDTO) {
- Action actionFromDto = executeActionDTO.getAction();
-
- // 1. Validate input parameters which are required for mustache replacements
- List params = executeActionDTO.getParams();
- if (!CollectionUtils.isEmpty(params)) {
- for (Param param : params) {
- // In case the parameter values turn out to be null, set it to empty string instead to allow the
- // the execution to go through no matter what.
- if (!StringUtils.isEmpty(param.getKey()) && param.getValue() == null) {
- param.setValue("");
- }
- }
- }
-
- // 2. Fetch the query from the DB/from dto to get the type
- Mono actionMono;
- if (actionFromDto.getId() != null) {
- actionMono = repository.findById(actionFromDto.getId(), EXECUTE_ACTIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "action", actionFromDto.getId())))
- .flatMap(action -> {
- // This is separately done instead of fetching from the repository using id and isValid. This is
- // because we want to error out with two different statuses -> Wrong action id OR Invalid action
- if (Boolean.FALSE.equals(action.getIsValid())) {
- return Mono.error(new AppsmithException(
- AppsmithError.INVALID_ACTION,
- action.getName(),
- action.getId(),
- ArrayUtils.toString(action.getInvalids().toArray())
- ));
- }
- return Mono.just(action);
- })
- .cache();
- } else {
- actionMono = Mono.just(actionFromDto).cache();
- }
-
- // 3. Instantiate the implementation class based on the query type
-
- Mono datasourceMono = actionMono
- .flatMap(action -> {
- if (action.getPluginType() == PluginType.JS) {
- return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
- }
- if (action.getDatasource() != null && action.getDatasource().getId() != null) {
- return datasourceService.findById(action.getDatasource().getId(), EXECUTE_DATASOURCES)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.DATASOURCE)));
- }
- //The data source in the action has not been persisted.
- if (action.getDatasource() != null) {
- return Mono.just(action.getDatasource());
- } else {
- return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "Valid action"));
- }
- })
- .cache();
-
- Mono pluginMono = datasourceMono
- .flatMap(datasource -> {
- // For embedded datasources/dry runs, validate the datasource for each execution
- if (datasource.getId() == null) {
- return datasourceService.validateDatasource(datasource);
- }
-
- return Mono.just(datasource);
- })
- .flatMap(datasource -> {
- Set invalids = datasource.getInvalids();
- if (!CollectionUtils.isEmpty(invalids)) {
- log.error("Unable to execute actionId: {} because it's datasource is not valid. Cause: {}",
- actionFromDto.getId(), ArrayUtils.toString(invalids));
- return Mono.error(new AppsmithException(AppsmithError.INVALID_DATASOURCE, ArrayUtils.toString(invalids)));
- }
- return pluginService.findById(datasource.getPluginId());
- })
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "plugin")));
-
- Mono pluginExecutorMono = pluginExecutorHelper.getPluginExecutor(pluginMono);
-
- // 4. Execute the query
- Mono actionExecutionResultMono = Mono
- .zip(
- actionMono,
- datasourceMono,
- pluginExecutorMono
- )
- .flatMap(tuple -> {
- final Action action = tuple.getT1();
- final Datasource datasource = tuple.getT2();
- final PluginExecutor pluginExecutor = tuple.getT3();
-
- DatasourceConfiguration datasourceConfigurationTemp;
- ActionConfiguration actionConfigurationTemp;
- //Do variable substitution before invoking the plugin
- //Do this only if params have been provided in the execute command
- if (executeActionDTO.getParams() != null && !executeActionDTO.getParams().isEmpty()) {
- Map replaceParamsMap = executeActionDTO
- .getParams()
- .stream()
- .collect(Collectors.toMap(
- // Trimming here for good measure. If the keys have space on either side,
- // Mustache won't be able to find the key.
- // We also add a backslash before every double-quote or backslash character
- // because we apply the template replacing in a JSON-stringified version of
- // these properties, where these two characters are escaped.
- p -> p.getKey().trim(), // .replaceAll("[\"\n\\\\]", "\\\\$0"),
- Param::getValue,
- // In case of a conflict, we pick the older value
- (oldValue, newValue) -> oldValue)
- );
-
- datasourceConfigurationTemp = variableSubstitution(datasource.getDatasourceConfiguration(), replaceParamsMap);
- actionConfigurationTemp = variableSubstitution(action.getActionConfiguration(), replaceParamsMap);
- } else {
- datasourceConfigurationTemp = datasource.getDatasourceConfiguration();
- actionConfigurationTemp = action.getActionConfiguration();
- }
-
- DatasourceConfiguration datasourceConfiguration;
- ActionConfiguration actionConfiguration;
-
- // If the action is paginated, update the configurations to update the correct URL.
- if (action.getActionConfiguration() != null &&
- action.getActionConfiguration().getPaginationType() != null &&
- PaginationType.URL.equals(action.getActionConfiguration().getPaginationType()) &&
- executeActionDTO.getPaginationField() != null) {
- datasourceConfiguration = updateDatasourceConfigurationForPagination(actionConfigurationTemp, datasourceConfigurationTemp, executeActionDTO.getPaginationField());
- actionConfiguration = updateActionConfigurationForPagination(actionConfigurationTemp, executeActionDTO.getPaginationField());
- } else {
- datasourceConfiguration = datasourceConfigurationTemp;
- actionConfiguration = actionConfigurationTemp;
- }
-
- // Filter out any empty headers
- if (actionConfiguration.getHeaders() != null && !actionConfiguration.getHeaders().isEmpty()) {
- List headerList = actionConfiguration.getHeaders().stream()
- .filter(header -> !StringUtils.isEmpty(header.getKey()))
- .collect(Collectors.toList());
- actionConfiguration.setHeaders(headerList);
- }
-
- Integer timeoutDuration = actionConfiguration.getTimeoutInMillisecond();
-
- log.debug("Execute Action called in Page {}, for action id : {} action name : {}, {}, {}",
- action.getPageId(), action.getId(), action.getName(), datasourceConfiguration,
- actionConfiguration);
-
- Mono executionMono = Mono.just(datasource)
- .flatMap(datasourceContextService::getDatasourceContext)
- // Now that we have the context (connection details), execute the action.
- .flatMap(
- resourceContext -> pluginExecutor.execute(
- resourceContext.getConnection(),
- datasourceConfiguration,
- actionConfiguration
- )
- );
-
- return executionMono
- .onErrorResume(StaleConnectionException.class, error -> {
- log.info("Looks like the connection is stale. Retrying with a fresh context.");
- return datasourceContextService
- .deleteDatasourceContext(datasource.getId())
- .then(executionMono);
- })
- .timeout(Duration.ofMillis(timeoutDuration))
- .onErrorMap(
- StaleConnectionException.class,
- error -> new AppsmithPluginException(
- AppsmithPluginError.PLUGIN_ERROR,
- "Secondary stale connection error."
- )
- )
- .onErrorResume(e -> {
- log.debug("In the action execution error mode.", e);
- ActionExecutionResult result = new ActionExecutionResult();
- result.setBody(e.getMessage());
- result.setIsExecutionSuccess(false);
- // Set the status code for Appsmith plugin errors
- if (e instanceof AppsmithPluginException) {
- result.setStatusCode(((AppsmithPluginException) e).getAppErrorCode().toString());
- } else {
- result.setStatusCode(AppsmithPluginError.PLUGIN_ERROR.getAppErrorCode().toString());
- }
- return Mono.just(result);
- });
- });
-
- // Populate the actionExecution result by setting the cached response and saving it to the DB
- return actionExecutionResultMono
- .flatMap(result -> {
- Mono resultMono = Mono.just(result);
- if (actionFromDto.getId() == null) {
- // This is a dry-run. We shouldn't query the db because it'll throw NPE on null IDs
- return resultMono;
- }
-
- Mono actionFromDbMono = repository.findById(actionFromDto.getId())
- //If the action is found in the db (i.e. it is not a dry run, save the cached response
- .flatMap(action -> {
- // If the plugin execution result is successful, then cache response body in
- // the action and save it.
- if (Boolean.TRUE.equals(result.getIsExecutionSuccess())) {
- // Save the result only if body exists in the body. e.g. Even though 204
- // is an execution success, there would be no body expected.
- if (result.getBody() != null) {
- action.setCacheResponse(result.getBody().toString());
- return repository.save(action);
- }
- // No result body exists. Return the action as is.
- return Mono.just(action);
- }
- log.debug("Action execution resulted in failure beyond the proxy with the result of {}", result);
- return Mono.just(action);
- });
-
- return actionFromDbMono.then(resultMono);
- })
- .onErrorResume(AppsmithException.class, error -> {
- ActionExecutionResult result = new ActionExecutionResult();
- result.setIsExecutionSuccess(false);
- result.setStatusCode(error.getAppErrorCode().toString());
- result.setBody(error.getMessage());
- return Mono.just(result);
- });
- }
-
- @Override
- public Mono save(Action action) {
- return repository.save(action);
- }
-
- @Override
- public Mono findByNameAndPageId(String name, String pageId, AclPermission permission) {
- return repository.findByNameAndPageId(name, pageId, permission);
- }
-
- /**
- * Given a list of names of actions and pageId, find all the actions matching this criteria of name, pageId, http
- * method 'GET' (for API actions only) or have isExecuteOnLoad be true.
- *
- * @param names Set of Action names. The returned list of actions will be a subset of the actioned named in this set.
- * @param pageId Id of the Page within which to look for Actions.
- * @return A Flux of Actions that are identified to be executed on page-load.
- */
- public Flux findOnLoadActionsInPage(Set names, String pageId) {
- final Flux getApiActions = repository
- .findDistinctActionsByNameInAndPageIdAndActionConfiguration_HttpMethodAndUserSetOnLoad(names, pageId, "GET", false);
-
- final Flux explicitOnLoadActions = repository
- .findDistinctActionsByNameInAndPageIdAndExecuteOnLoadTrue(names, pageId);
-
- return getApiActions.concatWith(explicitOnLoadActions);
- }
-
- /**
- * This function replaces the variables in the Object with the actual params
- */
- @Override
- public T variableSubstitution(T configuration, Map replaceParamsMap) {
- return MustacheHelper.renderFieldValues(configuration, replaceParamsMap);
- }
-
- @Override
- public Mono findById(String id) {
- return repository.findById(id);
- }
-
- @Override
- public Flux findByPageId(String pageId, AclPermission permission) {
- return repository.findByPageId(pageId, permission);
- }
-
- @Override
- public Flux getActionsForViewMode(String applicationId) {
- Sort sort = Sort.by(FieldName.NAME);
- if (applicationId == null || applicationId.isEmpty()) {
- return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
- }
-
- // fetch the published pages by application
- return newPageService
- .findApplicationPagesByApplicationIdAndViewMode(applicationId, true)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.NO_RESOURCE_FOUND, "pages for application", applicationId))
- )
- .map(applicationPagesDTO -> applicationPagesDTO.getPages())
- .flatMapMany(Flux::fromIterable)
- .map(pageNameIdDTO -> pageNameIdDTO.getId())
- .collectList()
- // Since this is to fetch actions just for execution, instead of reading actions with READ_ACTIONS permission
- // read actions with EXECUTE_ACTIONS permission only
- .flatMapMany(pages -> repository.findAllActionsByNameAndPageIds(null, pages, EXECUTE_ACTIONS, sort))
- .map(action -> {
- ActionViewDTO actionViewDTO = new ActionViewDTO();
- actionViewDTO.setId(action.getId());
- actionViewDTO.setName(action.getName());
- actionViewDTO.setPageId(action.getPageId());
- actionViewDTO.setConfirmBeforeExecute(action.getConfirmBeforeExecute());
- if (action.getJsonPathKeys() != null && !action.getJsonPathKeys().isEmpty()) {
- Set jsonPathKeys;
- jsonPathKeys = new HashSet<>();
- jsonPathKeys.addAll(action.getJsonPathKeys());
- actionViewDTO.setJsonPathKeys(jsonPathKeys);
- }
- if (action.getActionConfiguration() != null) {
- actionViewDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
- }
- return actionViewDTO;
- });
- }
-
- @Override
- public Mono findById(String id, AclPermission aclPermission) {
- return repository.findById(id, aclPermission);
- }
-
- @Override
- public Mono delete(String id) {
- Mono actionMono = repository.findById(id)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ACTION, id)));
- return actionMono
- .flatMap(toDelete -> repository.delete(toDelete).thenReturn(toDelete))
- .flatMap(analyticsService::sendDeleteEvent);
- }
-
- @Override
- public Flux get(MultiValueMap params) {
- String name = null;
- List pageIds = new ArrayList<>();
- Sort sort = Sort.by(FieldName.NAME);
-
- if (params.getFirst(FieldName.NAME) != null) {
- name = params.getFirst(FieldName.NAME);
- }
-
- if (params.getFirst(FieldName.PAGE_ID) != null) {
- pageIds.add(params.getFirst(FieldName.PAGE_ID));
- }
-
- if (params.getFirst(FieldName.APPLICATION_ID) != null) {
- String finalName = name;
- // Fetch unpublished pages because GET actions is only called during edit mode. For view mode, different
- // function call is made which takes care of returning only the essential fields of an action
- return newPageService
- .findApplicationPagesByApplicationIdAndViewMode(params.getFirst(FieldName.APPLICATION_ID), false)
- .switchIfEmpty(Mono.error(new AppsmithException(
- AppsmithError.NO_RESOURCE_FOUND, "pages for application", params.getFirst(FieldName.APPLICATION_ID)))
- )
- .map(applicationPagesDTO -> applicationPagesDTO.getPages())
- .flatMapMany(Flux::fromIterable)
- .map(pageNameIdDTO -> pageNameIdDTO.getId())
- .collectList()
- .flatMapMany(pages -> {
- pageIds.addAll(pages);
- return repository.findAllActionsByNameAndPageIds(finalName, pageIds, READ_ACTIONS, sort);
- })
- .flatMap(this::setTransientFieldsInAction);
- }
- return repository.findAllActionsByNameAndPageIds(name, pageIds, READ_ACTIONS, sort)
- .flatMap(this::setTransientFieldsInAction);
- }
-
- private ActionConfiguration updateActionConfigurationForPagination(ActionConfiguration actionConfiguration,
- PaginationField paginationField) {
- if (PaginationField.NEXT.equals(paginationField) || PaginationField.PREV.equals(paginationField)) {
- actionConfiguration.setPath("");
- actionConfiguration.setQueryParameters(null);
- }
- return actionConfiguration;
- }
-
- private DatasourceConfiguration updateDatasourceConfigurationForPagination(ActionConfiguration actionConfiguration,
- DatasourceConfiguration datasourceConfiguration,
- PaginationField paginationField) {
- if (PaginationField.NEXT.equals(paginationField)) {
- try {
- datasourceConfiguration.setUrl(URLDecoder.decode(actionConfiguration.getNext(), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- } else if (PaginationField.PREV.equals(paginationField)) {
- datasourceConfiguration.setUrl(actionConfiguration.getPrev());
- }
- return datasourceConfiguration;
- }
-
- private Mono setTransientFieldsInAction(Action action) {
-
- // Set the plugin id in the action object fetching it from the datasource.
-
- Mono pluginIdUpdateMono = null;
- Datasource datasource = action.getDatasource();
- if (datasource != null) {
- if (datasource.getId() != null) {
- // its a global datasource. Get the datasource from the collection
- pluginIdUpdateMono = datasourceService
- .findById(datasource.getId())
- .map(datasource1 -> {
- action.setPluginId(datasource1.getPluginId());
- return action;
- });
- } else {
- // Its a nested datasource. Pick up the pluginId from here
- pluginIdUpdateMono = Mono.just(action)
- .map(action1 -> {
- action1.setPluginId(datasource.getPluginId());
- return action1;
- });
- }
- }
-
- // In case of an action which was imported from a 3P API, fill in the extra information of the provider required by the front end UI.
- Mono providerUpdateMono = null;
- if ((action.getTemplateId() != null) && (action.getProviderId() != null)) {
-
- providerUpdateMono = marketplaceService
- .getProviderById(action.getProviderId())
- .switchIfEmpty(Mono.just(new Provider()))
- .map(provider -> {
- ActionProvider actionProvider = new ActionProvider();
- actionProvider.setName(provider.getName());
- actionProvider.setCredentialSteps(provider.getCredentialSteps());
- actionProvider.setDescription(provider.getDescription());
- actionProvider.setImageUrl(provider.getImageUrl());
- actionProvider.setUrl(provider.getUrl());
-
- action.setProvider(actionProvider);
- return action;
- });
- } else {
- providerUpdateMono = Mono.just(action);
- }
-
- return Mono.zip(pluginIdUpdateMono, providerUpdateMono)
- .map(tuple -> {
- Action pluginIdUpdatedAction = tuple.getT1();
- Action providerUpdatedAction = tuple.getT2();
-
- providerUpdatedAction.setPluginId(pluginIdUpdatedAction.getPluginId());
- return providerUpdatedAction;
- });
- }
-
- private void generateAndSetActionPolicies(NewPage page, Action action) {
- Set documentPolicies = policyGenerator.getAllChildPolicies(page.getPolicies(), Page.class, Action.class);
- action.setPolicies(documentPolicies);
- }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index a1f02c79ca..6a3dca428e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -97,7 +97,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
}
Mono applicationMono = applicationService.findById(page.getApplicationId(), AclPermission.MANAGE_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, page.getApplicationId())))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, page.getApplicationId())))
.cache();
Mono pageMono = applicationMono
@@ -158,9 +158,9 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
return applicationService
.findByName(applicationName, appPermission)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by application name", applicationName)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by application name", applicationName)))
.flatMap(application -> newPageService.findByNameAndApplicationIdAndViewMode(pageName, application.getId(), pagePermission, viewMode))
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by page name", pageName)));
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by page name", pageName)));
}
@Override
@@ -182,7 +182,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
return Mono.error(new AppsmithException(AppsmithError.PAGE_DOESNT_BELONG_TO_APPLICATION, page.getName(), applicationId));
})
.then(applicationService.findById(applicationId, MANAGE_APPLICATIONS))
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)))
.flatMap(application ->
applicationRepository
.setDefaultPage(applicationId, pageId)
@@ -291,7 +291,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
log.debug("Archiving application with id: {}", id);
Mono applicationMono = applicationService.findById(id, MANAGE_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application", id)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
.flatMap(application -> {
log.debug("Archiving pages for applicationId: {}", id);
return newPageService.archivePagesByApplicationId(id, MANAGE_PAGES)
@@ -307,7 +307,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
public Mono clonePage(String pageId) {
return newPageService.findById(pageId, MANAGE_PAGES)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Clone Page")))
.flatMap(page -> clonePageGivenApplicationId(pageId, page.getApplicationId(), " Copy"));
}
@@ -413,7 +413,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
public Mono cloneApplication(String applicationId) {
Mono applicationMono = applicationService.findById(applicationId, MANAGE_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Clone Application")))
.cache();
// Find the name for the cloned application which wouldn't lead to duplicate key exception
@@ -496,7 +496,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
public Mono deleteUnpublishedPage(String id) {
return newPageService.findById(id, AclPermission.MANAGE_PAGES)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, id)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, id)))
.flatMap(page -> {
log.debug("Going to archive pageId: {} for applicationId: {}", page.getId(), page.getApplicationId());
Mono applicationMono = applicationService.getById(page.getApplicationId())
@@ -549,7 +549,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
@Override
public Mono publish(String applicationId) {
Mono applicationMono = applicationService.findById(applicationId, MANAGE_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application", applicationId)));
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)));
Flux publishApplicationAndPages = applicationMono
//Return all the pages in the Application
@@ -600,7 +600,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
//In each page, copy each layout's dsl to publishedDsl field
.flatMap(applicationPage -> newPageService
.findById(applicationPage.getId(), MANAGE_PAGES)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page", applicationPage.getId())))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, applicationPage.getId())))
.map(page -> {
page.setPublishedPage(page.getUnpublishedPage());
return page;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
index bd3117b0c3..7607d78eb0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
@@ -70,7 +70,7 @@ public class ApplicationServiceImpl extends BaseService changeViewAccess(String id, ApplicationAccessDTO applicationAccessDTO) {
return repository
.findById(id, MAKE_PUBLIC_APPLICATIONS)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, id)))
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
.flatMap(application -> {
if (application.getIsPublic().equals(applicationAccessDTO.getPublicAccess())) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
index 8971b7eecb..0c1541a055 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
@@ -3,6 +3,7 @@ package com.appsmith.server.services;
import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.Property;
+import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Datasource;
import com.appsmith.server.domains.Plugin;
import com.appsmith.server.dtos.ActionDTO;
@@ -53,6 +54,9 @@ public class CurlImporterService extends BaseApiImporter {
ActionDTO action;
try {
+ if (input == null) {
+ throw new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.CURL_CODE);
+ }
action = curlToAction((String) input, pageId, name);
} catch (AppsmithException e) {
return Mono.error(e);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
index 0d0b388088..3929aadeba 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
@@ -7,15 +7,15 @@ import com.appsmith.server.dtos.RefactorNameDTO;
import reactor.core.publisher.Mono;
public interface LayoutActionService {
- public Mono updateLayout(String pageId, String layoutId, Layout layout);
+ Mono updateLayout(String pageId, String layoutId, Layout layout);
- public Mono moveAction(ActionMoveDTO actionMoveDTO);
+ Mono moveAction(ActionMoveDTO actionMoveDTO);
- public Mono refactorWidgetName(RefactorNameDTO refactorNameDTO);
+ Mono refactorWidgetName(RefactorNameDTO refactorNameDTO);
- public Mono refactorActionName(RefactorNameDTO refactorNameDTO);
+ Mono refactorActionName(RefactorNameDTO refactorNameDTO);
- public Mono updateAction(String id, ActionDTO action);
+ Mono updateAction(String id, ActionDTO action);
Mono setExecuteOnLoad(String id, Boolean isExecuteOnLoad);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
index 819e7c0722..e0430617ff 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
@@ -2,6 +2,7 @@ package com.appsmith.server.services;
import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.ActionDependencyEdge;
import com.appsmith.server.domains.Layout;
import com.appsmith.server.dtos.ActionDTO;
import com.appsmith.server.dtos.ActionMoveDTO;
@@ -11,6 +12,7 @@ import com.appsmith.server.dtos.RefactorNameDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.helpers.MustacheHelper;
+import com.appsmith.server.solutions.PageLoadActionsUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +24,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
-import reactor.core.Exceptions;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -35,10 +36,10 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
+import static com.appsmith.server.helpers.MustacheHelper.extractWordsAndAddToSet;
import static java.util.stream.Collectors.toSet;
@Service
@@ -49,13 +50,7 @@ public class LayoutActionServiceImpl implements LayoutActionService {
private final AnalyticsService analyticsService;
private final NewPageService newPageService;
private final NewActionService newActionService;
- /*
- * This pattern finds all the String which have been extracted from the mustache dynamic bindings.
- * e.g. for the given JS function using action with name "fetchUsers"
- * {{JSON.stringify(fetchUsers)}}
- * This pattern should return ["JSON.stringify", "fetchUsers"]
- */
- private final Pattern pattern = Pattern.compile("[a-zA-Z_][a-zA-Z0-9._]*");
+ private final PageLoadActionsUtil pageLoadActionsUtil;
/*
* To replace fetchUsers in `{{JSON.stringify(fetchUsers)}}` with getUsers, the following regex is required :
@@ -68,182 +63,12 @@ public class LayoutActionServiceImpl implements LayoutActionService {
public LayoutActionServiceImpl(ObjectMapper objectMapper,
AnalyticsService analyticsService,
NewPageService newPageService,
- NewActionService newActionService) {
+ NewActionService newActionService, PageLoadActionsUtil pageLoadActionsUtil) {
this.objectMapper = objectMapper;
this.analyticsService = analyticsService;
this.newPageService = newPageService;
this.newActionService = newActionService;
- }
-
- @Override
- public Mono updateLayout(String pageId, String layoutId, Layout layout) {
- JSONObject dsl = layout.getDsl();
- if (dsl == null) {
- // There is no DSL here. No need to process anything. Return as is.
- return Mono.just(layout);
- }
-
- return Mono.fromSupplier(() -> {
- Set widgetNames = new HashSet<>();
- Set dynamicBindings = new HashSet<>();
- try {
- extractAllWidgetNamesAndDynamicBindingsFromDSL(dsl, widgetNames, dynamicBindings);
- } catch (Throwable t) {
- throw Exceptions.propagate(t);
- }
- layout.setWidgetNames(widgetNames);
-
- // dynamicBindingNames is a set of all words extracted from mustaches which would also contain the names
- // of the actions being used to read data from into the widget fields
- Set dynamicBindingNames = new HashSet<>();
- if (!CollectionUtils.isEmpty(dynamicBindings)) {
- for (String mustacheKey : dynamicBindings) {
- // Extract all the words in the dynamic bindings
- extractWordsAndAddToSet(dynamicBindingNames, mustacheKey);
- }
- }
- return dynamicBindingNames;
- })
- .flatMap(dynamicBindingNames -> {
- // Update these actions to be executed on load, unless the user has touched the executeOnLoad setting for this
- Mono>> onLoadActionsMono = findAndUpdateOnLoadActionsInPage(dynamicBindingNames, pageId);
- return onLoadActionsMono;
- })
- .zipWith(
- // Update the list of actions to be executed on load in the layout as well
- newPageService.findByIdAndLayoutsId(pageId, layoutId, MANAGE_PAGES, false)
- .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND,
- FieldName.PAGE_ID + " or " + FieldName.LAYOUT_ID, pageId + ", " + layoutId))))
- .map(tuple -> {
- PageDTO page = tuple.getT2();
- List> onLoadActions = tuple.getT1();
- List layoutList = page.getLayouts();
- //Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
- for (Layout storedLayout : layoutList) {
- if (storedLayout.getId().equals(layoutId)) {
- //Update
- layout.setLayoutOnLoadActions(onLoadActions);
- BeanUtils.copyProperties(layout, storedLayout);
- storedLayout.setId(layoutId);
-
- break;
- }
- }
- page.setLayouts(layoutList);
- return page;
- })
- .flatMap(newPageService::saveUnpublishedPage)
- .flatMap(page -> {
- List layoutList = page.getLayouts();
- for (Layout storedLayout : layoutList) {
- if (storedLayout.getId().equals(layoutId)) {
- return Mono.just(storedLayout);
- }
- }
- return Mono.empty();
- });
- }
-
- public Mono>> findAndUpdateOnLoadActionsInPage(Set dynamicBindingNames, String pageId) {
- Mono>> referencedActions = findAndUpdateOnLoadActionsInPage(new ArrayList<>(), dynamicBindingNames, pageId);
- return referencedActions
- // Currently, we do not pick action dependencies for actions that users have set to run
- // on page load but haven't used on their application page.
- // If such actions exist, they will inevitably fail because these actions are executed before any other
- .zipWith(newActionService.findUnpublishedOnLoadActionsInPage(pageId)
- .flatMap(newAction -> {
- ActionDTO action = newAction.getUnpublishedAction();
- DslActionDTO actionDTO = new DslActionDTO();
- actionDTO.setId(newAction.getId());
- actionDTO.setPluginType(newAction.getPluginType());
- actionDTO.setJsonPathKeys(action.getJsonPathKeys());
- actionDTO.setName(action.getName());
- if (action.getActionConfiguration() != null) {
- actionDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
- }
- return Mono.just(actionDTO);
- })
- .collect(Collectors.toCollection(HashSet::new)))
- .map(tuple -> {
- List> actionList = tuple.getT1();
- if (!tuple.getT2().isEmpty()) {
- actionList.add(0, tuple.getT2());
- }
- return actionList;
- });
- }
-
- private Mono>> findAndUpdateOnLoadActionsInPage(List> onLoadActions,
- Set dynamicBindingNames,
- String pageId) {
- if (dynamicBindingNames == null || dynamicBindingNames.isEmpty()) {
- return Mono.just(onLoadActions);
- }
- Set bindingNames = new HashSet<>();
- // First fetch all the actions in the page whose name matches the words found in all the dynamic bindings
- return newActionService.findUnpublishedActionsInPageByNames(dynamicBindingNames, pageId)
- .flatMap(newAction -> {
- ActionDTO action = newAction.getUnpublishedAction();
- if (!CollectionUtils.isEmpty(action.getJsonPathKeys())) {
- for (String mustacheKey : action.getJsonPathKeys()) {
- extractWordsAndAddToSet(bindingNames, mustacheKey);
- }
- // If the action refers to itself in the json path keys, remove the same to circumvent
- // supposed circular dependency. This is possible in case of pagination with response url
- // where the action refers to its own data to find the next and previous URLs.
- bindingNames.remove(action.getName());
- }
- DslActionDTO actionDTO = new DslActionDTO();
- actionDTO.setId(newAction.getId());
- actionDTO.setPluginType(newAction.getPluginType());
- actionDTO.setJsonPathKeys(action.getJsonPathKeys());
- actionDTO.setName(action.getName());
- if (action.getActionConfiguration() != null) {
- actionDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
- }
-
- // If the executeOnLoad field isn't true and the user hasn't explicitly set it so, set it to true at this point
- // This ensures that when the user opens the action settings, the user would know that this action
- // executes on page load
- if (!Boolean.TRUE.equals(action.getUserSetOnLoad()) && !Boolean.TRUE.equals(action.getExecuteOnLoad())) {
- action.setExecuteOnLoad(true);
-
- return newActionService.updateUnpublishedAction(newAction.getId(), action)
- .thenReturn(actionDTO);
- }
- // For all others, only pick ones where the execution on load was already set by the user
- if (Boolean.TRUE.equals(action.getExecuteOnLoad())) {
- return Mono.just(actionDTO);
- } else {
- return Mono.empty();
- }
- })
- .collect(toSet())
- .flatMap(actions -> {
- HashSet onLoadSet = new HashSet<>(actions);
- // If the resultant set of actions is empty, don't add it to the array list.
- if (!onLoadSet.isEmpty()) {
- onLoadActions.add(0, onLoadSet);
- }
- return findAndUpdateOnLoadActionsInPage(onLoadActions, bindingNames, pageId);
- });
- }
-
- private void extractWordsAndAddToSet(Set bindingNames, String mustacheKey) {
- String key = mustacheKey.trim();
-
- // Extract all the words in the dynamic bindings
- Matcher matcher = pattern.matcher(key);
-
- while (matcher.find()) {
- String word = matcher.group();
-
- String[] subStrings = word.split(Pattern.quote("."));
- if (subStrings.length > 0) {
- // We are only interested in the top level. e.g. if its Input1.text, we want just Input1
- bindingNames.add(subStrings[0]);
- }
- }
+ this.pageLoadActionsUtil = pageLoadActionsUtil;
}
@Override
@@ -549,8 +374,8 @@ public class LayoutActionServiceImpl implements LayoutActionService {
if (layout.getWidgetNames() != null && layout.getWidgetNames().size() > 0) {
return Mono.just(layout.getWidgetNames());
}
- // In case of no widget names (which implies that there is no DSL), return an error.
- return Mono.error(new AppsmithException(AppsmithError.NO_DSL_FOUND_IN_PAGE, pageId));
+ // In case of no widget names (which implies that there is no DSL), return an empty set.
+ return Mono.just(new HashSet<>());
}
}
return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.LAYOUT_ID, layoutId));
@@ -639,4 +464,87 @@ public class LayoutActionServiceImpl implements LayoutActionService {
.collectList()
.then(Mono.just(pageId));
}
+
+ @Override
+ public Mono updateLayout(String pageId, String layoutId, Layout layout) {
+ JSONObject dsl = layout.getDsl();
+ if (dsl == null) {
+ // There is no DSL here. No need to process anything. Return as is.
+ return Mono.just(layout);
+ }
+
+ Set widgetNames = new HashSet<>();
+ Set jsSnippetsInDynamicBindings = new HashSet<>();
+ try {
+ extractAllWidgetNamesAndDynamicBindingsFromDSL(dsl, widgetNames, jsSnippetsInDynamicBindings);
+ } catch (Throwable t) {
+ return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, t.getMessage()));
+ }
+ layout.setWidgetNames(widgetNames);
+
+ // dynamicBindingNames is a set of all words extracted from js snippets which could also contain the names
+ // of the actions
+ Set dynamicBindingNames = new HashSet<>();
+ if (!CollectionUtils.isEmpty(jsSnippetsInDynamicBindings)) {
+ for (String mustacheKey : jsSnippetsInDynamicBindings) {
+ // Extract all the words in the dynamic bindings
+ extractWordsAndAddToSet(dynamicBindingNames, mustacheKey);
+ }
+ }
+
+ Set actionNames = new HashSet<>();
+ Set edges = new HashSet<>();
+ Set actionsUsedInDSL = new HashSet<>();
+ List flatmapPageLoadActions = new ArrayList<>();
+
+ Mono>> allOnLoadActionsMono = pageLoadActionsUtil
+ .findAllOnLoadActions(dynamicBindingNames, actionNames, pageId, edges, actionsUsedInDSL, flatmapPageLoadActions)
+ .cache();
+
+ // Update these actions to be executed on load, unless the user has touched the executeOnLoad setting for this
+ Mono actionsUpdatedMono = allOnLoadActionsMono
+ .then(newActionService.setOnLoad(flatmapPageLoadActions));
+
+ // First update the actions and set execute on load to true
+ return actionsUpdatedMono
+ .then(allOnLoadActionsMono)
+ .zipWith(newPageService.findByIdAndLayoutsId(pageId, layoutId, MANAGE_PAGES, false)
+ .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND,
+ FieldName.PAGE_ID + " or " + FieldName.LAYOUT_ID, pageId + ", " + layoutId))))
+ // Now update the page layout with the page load actions and the graph.
+ .flatMap(tuple -> {
+ List> onLoadActions = tuple.getT1();
+ PageDTO page = tuple.getT2();
+
+ List layoutList = page.getLayouts();
+ //Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
+ for (Layout storedLayout : layoutList) {
+ if (storedLayout.getId().equals(layoutId)) {
+ // Now that all the on load actions have been computed, set the vertices, edges, actions in DSL
+ // in the layout for re-use to avoid computing DAG unnecessarily.
+ layout.setLayoutOnLoadActions(onLoadActions);
+ layout.setAllOnPageLoadActionNames(actionNames);
+ layout.setAllOnPageLoadActionEdges(edges);
+ layout.setActionsUsedInDynamicBindings(actionsUsedInDSL);
+
+ BeanUtils.copyProperties(layout, storedLayout);
+ storedLayout.setId(layoutId);
+
+ break;
+ }
+ }
+ page.setLayouts(layoutList);
+ return newPageService.saveUnpublishedPage(page);
+ })
+ .flatMap(page -> {
+ List layoutList = page.getLayouts();
+ for (Layout storedLayout : layoutList) {
+ if (storedLayout.getId().equals(layoutId)) {
+ return Mono.just(storedLayout);
+ }
+ }
+ return Mono.empty();
+ });
+ }
+
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
index 70175c4587..64a6204d1d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
@@ -31,7 +31,7 @@ public interface NewActionService extends CrudService {
Mono findByUnpublishedNameAndPageId(String name, String pageId, AclPermission permission);
- Flux findUnpublishedOnLoadActionsInPage(String pageId);
+ Flux findUnpublishedOnLoadActionsExplicitSetByUserInPage(String pageId);
Flux findUnpublishedActionsInPageByNames(Set names, String pageId);
@@ -56,4 +56,6 @@ public interface NewActionService extends CrudService {
Flux saveAll(List actions);
Flux findByPageId(String pageId);
+
+ Mono setOnLoad(List actions);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
index e8af9f603e..9913d561eb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
@@ -67,6 +67,7 @@ import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_PAGES;
import static com.appsmith.server.helpers.BeanCopyUtils.copyNewFieldValuesIntoOldObject;
+import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
@Service
@@ -184,7 +185,7 @@ public class NewActionServiceImpl extends BaseService {
// Inherit the action policies from the page.
@@ -472,11 +473,10 @@ public class NewActionServiceImpl extends BaseService findUnpublishedOnLoadActionsInPage(String pageId) {
+ public Flux findUnpublishedOnLoadActionsExplicitSetByUserInPage(String pageId) {
return repository
.findUnpublishedActionsByPageIdAndExecuteOnLoadSetByUserTrue(pageId, MANAGE_ACTIONS);
}
@@ -868,6 +870,28 @@ public class NewActionServiceImpl extends BaseService setOnLoad(List actions) {
+ if (actions == null) {
+ return Mono.just(FALSE);
+ }
+
+ List toUpdateActions = new ArrayList<>();
+
+ for (ActionDTO action : actions) {
+ // If a user has ever set execute on load, this field can not be changed automatically. It has to be
+ // explicitly changed by the user again. Add the action to update only if this condition is false.
+ if (FALSE.equals(action.getUserSetOnLoad())) {
+ action.setExecuteOnLoad(TRUE);
+ toUpdateActions.add(action);
+ }
+ }
+
+ return Flux.fromIterable(toUpdateActions)
+ .flatMap(actionDTO -> updateUnpublishedAction(actionDTO.getId(), actionDTO))
+ .then(Mono.just(TRUE));
+ }
+
@Override
public Mono delete(String id) {
Mono