2019-10-18 08:16:26 +00:00
|
|
|
import React, { Component } from "react";
|
2019-12-03 09:21:06 +00:00
|
|
|
import { Helmet } from "react-helmet";
|
2019-09-09 10:30:22 +00:00
|
|
|
import { connect } from "react-redux";
|
2019-11-22 14:02:55 +00:00
|
|
|
import { withRouter, RouteComponentProps } from "react-router-dom";
|
|
|
|
|
import {
|
|
|
|
|
BuilderRouteParams,
|
|
|
|
|
getApplicationViewerPageURL,
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
BUILDER_PAGE_URL,
|
2019-11-22 14:02:55 +00:00
|
|
|
} from "constants/routes";
|
2019-11-25 05:07:27 +00:00
|
|
|
import { AppState } from "reducers";
|
2019-10-29 12:02:58 +00:00
|
|
|
import MainContainer from "./MainContainer";
|
2020-04-16 11:56:36 +00:00
|
|
|
import { DndProvider } from "react-dnd";
|
2020-04-21 14:19:12 +00:00
|
|
|
import TouchBackend from "react-dnd-touch-backend";
|
2019-10-24 09:23:50 +00:00
|
|
|
import {
|
|
|
|
|
getCurrentApplicationId,
|
|
|
|
|
getCurrentPageId,
|
2019-10-31 08:36:04 +00:00
|
|
|
getPublishingError,
|
2019-11-22 14:02:55 +00:00
|
|
|
getIsEditorLoading,
|
2020-01-24 09:54:40 +00:00
|
|
|
getIsEditorInitialized,
|
2020-08-07 06:56:47 +00:00
|
|
|
getIsPublishingApplication,
|
2019-11-22 14:02:55 +00:00
|
|
|
} from "selectors/editorSelectors";
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
import {
|
|
|
|
|
Dialog,
|
|
|
|
|
Classes,
|
|
|
|
|
AnchorButton,
|
|
|
|
|
Hotkey,
|
|
|
|
|
Hotkeys,
|
|
|
|
|
HotkeysTarget,
|
|
|
|
|
Spinner,
|
|
|
|
|
} from "@blueprintjs/core";
|
2019-11-22 14:02:55 +00:00
|
|
|
import { initEditor } from "actions/initActions";
|
2020-04-16 11:56:36 +00:00
|
|
|
import { editorInitializer } from "utils/EditorUtils";
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
import {
|
|
|
|
|
ENTITY_EXPLORER_SEARCH_ID,
|
|
|
|
|
ENTITY_EXPLORER_SEARCH_LOCATION_HASH,
|
|
|
|
|
} from "constants/Explorer";
|
|
|
|
|
import history from "utils/history";
|
|
|
|
|
import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
|
2020-08-14 09:47:47 +00:00
|
|
|
import { getAppsmithConfigs } from "configs";
|
|
|
|
|
import { getCurrentUser } from "selectors/usersSelectors";
|
|
|
|
|
import { User } from "constants/userConstants";
|
|
|
|
|
|
|
|
|
|
const { cloudHosting, intercomAppID } = getAppsmithConfigs();
|
2019-08-20 13:19:19 +00:00
|
|
|
|
2019-08-29 11:22:09 +00:00
|
|
|
type EditorProps = {
|
2019-10-24 09:23:50 +00:00
|
|
|
currentApplicationId?: string;
|
2019-11-22 14:02:55 +00:00
|
|
|
currentPageId?: string;
|
2019-11-08 11:02:00 +00:00
|
|
|
initEditor: Function;
|
2019-10-31 08:36:04 +00:00
|
|
|
isPublishing: boolean;
|
2019-11-22 14:02:55 +00:00
|
|
|
isEditorLoading: boolean;
|
2020-01-24 09:54:40 +00:00
|
|
|
isEditorInitialized: boolean;
|
2019-10-31 08:36:04 +00:00
|
|
|
errorPublishing: boolean;
|
2020-08-14 09:47:47 +00:00
|
|
|
user?: User;
|
2020-08-07 06:56:47 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
type Props = EditorProps & RouteComponentProps<BuilderRouteParams>;
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
@HotkeysTarget
|
2020-08-07 06:56:47 +00:00
|
|
|
class Editor extends Component<Props> {
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
public renderHotkeys() {
|
|
|
|
|
return (
|
|
|
|
|
<Hotkeys>
|
|
|
|
|
<Hotkey
|
|
|
|
|
global={true}
|
|
|
|
|
combo="meta + f"
|
|
|
|
|
label="Search entities"
|
|
|
|
|
onKeyDown={(e: any) => {
|
|
|
|
|
//TODO(abhinav): make this id into a constant.
|
|
|
|
|
const el = document.getElementById(ENTITY_EXPLORER_SEARCH_ID);
|
|
|
|
|
if (!el) {
|
|
|
|
|
history.push(
|
|
|
|
|
`${BUILDER_PAGE_URL(
|
|
|
|
|
this.props.currentApplicationId,
|
|
|
|
|
this.props.currentPageId,
|
|
|
|
|
)}${ENTITY_EXPLORER_SEARCH_LOCATION_HASH}`,
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
el?.focus();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
e.stopPropagation();
|
|
|
|
|
}}
|
|
|
|
|
/>
|
|
|
|
|
</Hotkeys>
|
|
|
|
|
);
|
|
|
|
|
}
|
2019-10-31 08:36:04 +00:00
|
|
|
public state = {
|
|
|
|
|
isDialogOpen: false,
|
2020-04-16 11:56:36 +00:00
|
|
|
registered: false,
|
2019-10-31 08:36:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
componentDidMount() {
|
2020-08-14 09:47:47 +00:00
|
|
|
const { user } = this.props;
|
2020-04-16 11:56:36 +00:00
|
|
|
editorInitializer().then(() => {
|
|
|
|
|
this.setState({ registered: true });
|
|
|
|
|
});
|
2020-03-24 14:05:19 +00:00
|
|
|
const { applicationId, pageId } = this.props.match.params;
|
|
|
|
|
if (applicationId && pageId) {
|
|
|
|
|
this.props.initEditor(applicationId, pageId);
|
2019-10-31 08:36:04 +00:00
|
|
|
}
|
2020-08-14 09:47:47 +00:00
|
|
|
if (cloudHosting) {
|
|
|
|
|
window.Intercom("boot", {
|
|
|
|
|
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
|
|
|
app_id: intercomAppID,
|
|
|
|
|
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
|
|
|
custom_launcher_selector: "#intercom-trigger",
|
|
|
|
|
name: user?.username,
|
|
|
|
|
email: user?.email,
|
|
|
|
|
});
|
|
|
|
|
}
|
2019-10-31 08:36:04 +00:00
|
|
|
}
|
2020-08-07 06:56:47 +00:00
|
|
|
componentDidUpdate(previously: Props) {
|
2020-08-14 09:47:47 +00:00
|
|
|
if (cloudHosting) window.Intercom("update");
|
2019-11-26 10:45:46 +00:00
|
|
|
if (
|
|
|
|
|
previously.isPublishing &&
|
2020-04-05 06:34:14 +00:00
|
|
|
!(this.props.isPublishing || this.props.errorPublishing)
|
2019-11-26 10:45:46 +00:00
|
|
|
) {
|
|
|
|
|
this.setState({
|
|
|
|
|
isDialogOpen: true,
|
|
|
|
|
});
|
|
|
|
|
}
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
shouldComponentUpdate(
|
|
|
|
|
nextProps: Props,
|
|
|
|
|
nextState: { isDialogOpen: boolean; registered: boolean },
|
|
|
|
|
) {
|
|
|
|
|
return (
|
|
|
|
|
nextProps.currentPageId !== this.props.currentPageId ||
|
|
|
|
|
nextProps.currentApplicationId !== this.props.currentApplicationId ||
|
|
|
|
|
nextProps.isEditorInitialized !== this.props.isEditorInitialized ||
|
|
|
|
|
nextProps.isPublishing !== this.props.isPublishing ||
|
|
|
|
|
nextProps.isEditorLoading !== this.props.isEditorLoading ||
|
|
|
|
|
nextProps.errorPublishing !== this.props.errorPublishing ||
|
|
|
|
|
nextState.isDialogOpen !== this.state.isDialogOpen ||
|
|
|
|
|
nextState.registered !== this.state.registered
|
|
|
|
|
);
|
2019-11-22 14:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
2019-10-31 08:36:04 +00:00
|
|
|
handleDialogClose = () => {
|
|
|
|
|
this.setState({
|
|
|
|
|
isDialogOpen: false,
|
|
|
|
|
});
|
|
|
|
|
};
|
2019-08-29 11:22:09 +00:00
|
|
|
public render() {
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
if (!this.props.isEditorInitialized || !this.state.registered) {
|
|
|
|
|
return (
|
|
|
|
|
<CenteredWrapper style={{ height: "calc(100vh - 48px)" }}>
|
|
|
|
|
<Spinner />
|
|
|
|
|
</CenteredWrapper>
|
|
|
|
|
);
|
2019-11-22 14:02:55 +00:00
|
|
|
}
|
2019-02-07 05:07:09 +00:00
|
|
|
return (
|
2020-04-16 11:56:36 +00:00
|
|
|
<DndProvider
|
2020-04-21 14:19:12 +00:00
|
|
|
backend={TouchBackend}
|
|
|
|
|
options={{
|
|
|
|
|
enableMouseEvents: true,
|
|
|
|
|
}}
|
2020-04-16 11:56:36 +00:00
|
|
|
>
|
|
|
|
|
<div>
|
|
|
|
|
<Helmet>
|
|
|
|
|
<meta charSet="utf-8" />
|
|
|
|
|
<title>Editor | Appsmith</title>
|
|
|
|
|
</Helmet>
|
|
|
|
|
<MainContainer />
|
|
|
|
|
<Dialog
|
|
|
|
|
isOpen={this.state.isDialogOpen}
|
|
|
|
|
canOutsideClickClose={true}
|
|
|
|
|
canEscapeKeyClose={true}
|
|
|
|
|
title="Application Published"
|
|
|
|
|
onClose={this.handleDialogClose}
|
|
|
|
|
icon="tick-circle"
|
|
|
|
|
>
|
|
|
|
|
<div className={Classes.DIALOG_BODY}>
|
|
|
|
|
<p>
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
{"Your application is now published with the current changes!"}
|
2020-04-16 11:56:36 +00:00
|
|
|
</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div className={Classes.DIALOG_FOOTER}>
|
|
|
|
|
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
|
|
|
|
|
<AnchorButton
|
|
|
|
|
target={this.props.currentApplicationId}
|
|
|
|
|
href={getApplicationViewerPageURL(
|
|
|
|
|
this.props.currentApplicationId,
|
|
|
|
|
this.props.currentPageId,
|
|
|
|
|
)}
|
|
|
|
|
text="View Application"
|
|
|
|
|
/>
|
|
|
|
|
</div>
|
2019-10-31 08:36:04 +00:00
|
|
|
</div>
|
2020-04-16 11:56:36 +00:00
|
|
|
</Dialog>
|
|
|
|
|
</div>
|
|
|
|
|
</DndProvider>
|
2019-09-09 10:30:22 +00:00
|
|
|
);
|
2019-02-07 05:07:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-24 09:23:50 +00:00
|
|
|
const mapStateToProps = (state: AppState) => ({
|
|
|
|
|
currentApplicationId: getCurrentApplicationId(state),
|
|
|
|
|
currentPageId: getCurrentPageId(state),
|
2020-08-07 06:56:47 +00:00
|
|
|
errorPublishing: getPublishingError(state),
|
Feature/entity browse (#220)
# New Feature: Entity Explorer
- Entities are actions (apis and queries), datasources, pages, and widgets
- With this new feature, all entities in the application will be available
to view in the new entity explorer sidebar
- All existing application features from the api sidebar, query sidebar, datasource sidebar and pages sidebar
now are avialable on the entity explorer sidebar
- Users are now able to quickly switch to any entity in the application from the entity explorer sidebar.
- Users can also search all entities in the application from the new sidebar. Use cmd + f or ctrl + f to focus on the search input
- Users can rename entities from the new sidebar
- Users can also perform contextual actions on these entities like set a page as home page, copy/move actions, delete entity, etc from the context menu available alongside the entities in the sidebar
- Users can view the properties of the entities in the sidebar, as well as copy bindings to use in the application.
2020-08-10 08:52:45 +00:00
|
|
|
isPublishing: getIsPublishingApplication(state),
|
2019-11-22 14:02:55 +00:00
|
|
|
isEditorLoading: getIsEditorLoading(state),
|
2020-01-24 09:54:40 +00:00
|
|
|
isEditorInitialized: getIsEditorInitialized(state),
|
2020-08-14 09:47:47 +00:00
|
|
|
user: getCurrentUser(state),
|
2019-10-18 08:16:26 +00:00
|
|
|
});
|
2019-08-26 12:41:21 +00:00
|
|
|
|
2019-10-24 09:23:50 +00:00
|
|
|
const mapDispatchToProps = (dispatch: any) => {
|
|
|
|
|
return {
|
2020-03-24 14:05:19 +00:00
|
|
|
initEditor: (applicationId: string, pageId: string) =>
|
|
|
|
|
dispatch(initEditor(applicationId, pageId)),
|
2019-10-24 09:23:50 +00:00
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
2019-11-22 14:02:55 +00:00
|
|
|
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Editor));
|