Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Automated Github Action 2020-08-19 05:05:13 +00:00
commit e544d228e0
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx
View File

@ -54,7 +54,7 @@ const FormTitle = (props: FormTitleProps) => {
} }
return false; return false;
}, },
[currentDatasource, hasNameConflict], [hasNameConflict],
); );
return ( return (

9
app/client/src/pages/Editor/QueryEditor/index.tsx
View File

@ -19,6 +19,7 @@ import {
getPluginImages, getPluginImages,
getDBDatasources, getDBDatasources,
getAction, getAction,
getActionResponses,
} from "selectors/entitiesSelector"; } from "selectors/entitiesSelector";
import { PLUGIN_PACKAGE_DBS } from "constants/QueryEditorConstants"; import { PLUGIN_PACKAGE_DBS } from "constants/QueryEditorConstants";
import { QueryAction } from "entities/Action"; import { QueryAction } from "entities/Action";
@ -49,7 +50,7 @@ type ReduxStateProps = {
formData: QueryAction; formData: QueryAction;
runErrorMessage: Record<string, string>; runErrorMessage: Record<string, string>;
pluginIds: Array<string> | undefined; pluginIds: Array<string> | undefined;
executedQueryData: any; responses: any;
isCreating: boolean; isCreating: boolean;
pluginImages: Record<string, string>; pluginImages: Record<string, string>;
editorConfig: []; editorConfig: [];
@ -91,7 +92,7 @@ class QueryEditor extends React.Component<Props> {
}, },
pluginImages, pluginImages,
pluginIds, pluginIds,
executedQueryData, responses,
isCreating, isCreating,
runErrorMessage, runErrorMessage,
loadingFormConfigs, loadingFormConfigs,
@ -135,7 +136,7 @@ class QueryEditor extends React.Component<Props> {
editorConfig={editorConfig} editorConfig={editorConfig}
loadingFormConfigs={loadingFormConfigs} loadingFormConfigs={loadingFormConfigs}
DATASOURCES_OPTIONS={DATASOURCES_OPTIONS} DATASOURCES_OPTIONS={DATASOURCES_OPTIONS}
executedQueryData={executedQueryData[queryId]} executedQueryData={responses[queryId]}
runErrorMessage={runErrorMessage[queryId]} runErrorMessage={runErrorMessage[queryId]}
/> />
) : ( ) : (
@ -166,7 +167,7 @@ const mapStateToProps = (state: AppState, props: any): ReduxStateProps => {
runErrorMessage, runErrorMessage,
pluginIds: getPluginIdsOfPackageNames(state, PLUGIN_PACKAGE_DBS), pluginIds: getPluginIdsOfPackageNames(state, PLUGIN_PACKAGE_DBS),
dataSources: getDBDatasources(state), dataSources: getDBDatasources(state),
executedQueryData: state.ui.queryPane.runQuerySuccessData, responses: getActionResponses(state),
queryPane: state.ui.queryPane, queryPane: state.ui.queryPane,
formData, formData,
editorConfig: queryAction?.pluginId editorConfig: queryAction?.pluginId

11
app/client/src/reducers/uiReducers/queryPaneReducer.ts
View File

@ -14,7 +14,6 @@ const initialState: QueryPaneReduxState = {
isRunning: {}, isRunning: {},
isSaving: {}, isSaving: {},
isDeleting: {}, isDeleting: {},
runQuerySuccessData: {},
runErrorMessage: {}, runErrorMessage: {},
lastUsed: "", // NR lastUsed: "", // NR
}; };
@ -24,7 +23,6 @@ export interface QueryPaneReduxState {
isRunning: Record<string, boolean>; isRunning: Record<string, boolean>;
isSaving: Record<string, boolean>; // RR isSaving: Record<string, boolean>; // RR
isDeleting: Record<string, boolean>; isDeleting: Record<string, boolean>;
runQuerySuccessData: {};
runErrorMessage: Record<string, string>; runErrorMessage: Record<string, string>;
lastUsed: string; // NR lastUsed: string; // NR
isCreating: boolean; // RR isCreating: boolean; // RR
@ -126,13 +124,8 @@ const queryPaneReducer = createReducer(initialState, {
...state.isRunning, ...state.isRunning,
[action.payload.id]: true, [action.payload.id]: true,
}, },
runQuerySuccessData: [],
}; };
}, },
[ReduxActionTypes.CLEAR_PREVIOUSLY_EXECUTED_QUERY]: (state: any) => ({
...state,
runQuerySuccessData: [],
}),
[ReduxActionTypes.RUN_ACTION_SUCCESS]: ( [ReduxActionTypes.RUN_ACTION_SUCCESS]: (
state: any, state: any,
@ -145,10 +138,6 @@ const queryPaneReducer = createReducer(initialState, {
...state.isRunning, ...state.isRunning,
[actionId]: false, [actionId]: false,
}, },
runQuerySuccessData: {
...state.runQuerySuccessData,
...action.payload,
},
runErrorMessage: _.omit(state.runErrorMessage, [actionId]), runErrorMessage: _.omit(state.runErrorMessage, [actionId]),
}; };
}, },

2
app/client/src/utils/formhelpers.ts
View File

@ -14,6 +14,6 @@ export const isStrongPassword = (value: string) => {
// TODO (abhinav): Use a regex which adheres to standards RFC5322 // TODO (abhinav): Use a regex which adheres to standards RFC5322
export const isEmail = (value: string) => { export const isEmail = (value: string) => {
const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(value); return re.test(value);
}; };

2
app/client/src/widgets/DropdownWidget.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget"; import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
import { WidgetType, WIDGET_PADDING } from "constants/WidgetConstants"; import { WidgetType } from "constants/WidgetConstants";
import { EventType } from "constants/ActionConstants"; import { EventType } from "constants/ActionConstants";
import DropDownComponent from "components/designSystems/blueprint/DropdownComponent"; import DropDownComponent from "components/designSystems/blueprint/DropdownComponent";
import _ from "lodash"; import _ from "lodash";