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-14 11:05:44 +00:00
commit 96d4e2b787
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/pages/Editor/Explorer/hooks.ts
View File

@ -19,7 +19,7 @@ import { Datasource } from "api/DatasourcesApi";
import { debounce } from "lodash";
import { WidgetProps } from "widgets/BaseWidget";
import { evaluateDataTreeWithFunctions } from "selectors/dataTreeSelectors";
import { ActionData } from "@appsmith/reducers/entityReducers/actionsReducer";
import { ActionData } from "reducers/entityReducers/actionsReducer";
import log from "loglevel";
const findWidgets = (widgets: WidgetProps, keyword: string) => {

4
app/client/src/pages/Editor/index.tsx
View File

@ -98,7 +98,7 @@ class Editor extends Component<Props> {
if (applicationId && pageId) {
this.props.initEditor(applicationId, pageId);
}
if (cloudHosting) {
if (cloudHosting && intercomAppID) {
window.Intercom("boot", {
// eslint-disable-next-line @typescript-eslint/camelcase
app_id: intercomAppID,
@ -110,7 +110,7 @@ class Editor extends Component<Props> {
}
}
componentDidUpdate(previously: Props) {
if (cloudHosting) window.Intercom("update");
if (cloudHosting && intercomAppID) window.Intercom("update");
if (
previously.isPublishing &&
!(this.props.isPublishing || this.props.errorPublishing)