chore: Move Sidebar to IDE/Components #34487
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { render } from "test/testUtils"; | ||
| import React from "react"; | ||
| import SidebarButton, { type SidebarButtonProps } from "./SidebarButton"; | ||
| import { Condition } from "../../Interfaces/Condition"; | ||
|
|
||
| const sidebarButtonProps: SidebarButtonProps = { | ||
| icon: "down-arrow", | ||
| onClick: () => {}, | ||
| selected: false, | ||
| title: "Test", | ||
| }; | ||
|
|
||
| describe("SidebarButton", () => { | ||
| it("should render the warning icon in case the datasource list is empty", () => { | ||
| const withWarningCondition = { | ||
| ...sidebarButtonProps, | ||
| condition: Condition.Warn, | ||
| }; | ||
|
|
||
| const { container } = render(<SidebarButton {...withWarningCondition} />); | ||
|
|
||
| const svgs = container.querySelectorAll("svg"); | ||
| expect(svgs).toHaveLength(2); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
alex-golovanov marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import React, { useCallback } from "react"; | ||
| import styled from "styled-components"; | ||
| import SidebarButton from "./SidebarButton"; | ||
| import type { EditorState } from "@appsmith/entities/IDE/constants"; | ||
| import type { ISidebarButton } from "../../Interfaces/ISidebarButton"; | ||
|
|
||
| const Container = styled.div` | ||
| width: 50px; | ||
| border-right: 1px solid var(--ads-v2-color-border); | ||
| height: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-between; | ||
| background-color: var(--ads-v2-color-bg); | ||
| position: relative; | ||
| `; | ||
|
|
||
| interface IDESidebarProps { | ||
| id?: string; | ||
| topButtons: ISidebarButton[]; | ||
| bottomButtons: ISidebarButton[]; | ||
| appState: EditorState; | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
| onClick: (suffix: string) => void; | ||
| } | ||
|
|
||
| function IDESidebar(props: IDESidebarProps) { | ||
| const { appState, bottomButtons, onClick, topButtons } = props; | ||
|
|
||
| const handleOnClick = useCallback( | ||
| (button: ISidebarButton) => { | ||
| if (appState !== button.state) { | ||
| onClick(button.urlSuffix); | ||
| } | ||
| }, | ||
| [appState], | ||
| ); | ||
|
|
||
| return ( | ||
| <Container className="t--sidebar" id={props.id}> | ||
| <div> | ||
| {topButtons.map((b) => ( | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
| <SidebarButton | ||
| icon={b.icon} | ||
| key={b.state} | ||
| onClick={() => { | ||
| handleOnClick(b); | ||
| }} | ||
| selected={appState === b.state} | ||
| title={b.title} | ||
| tooltip={b.tooltip} | ||
| /> | ||
| ))} | ||
| </div> | ||
| <div> | ||
| {bottomButtons.map((b) => ( | ||
| <SidebarButton | ||
| icon={b.icon} | ||
| key={b.state} | ||
| onClick={() => { | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
| handleOnClick(b); | ||
| }} | ||
| selected={appState === b.state} | ||
| title={b.title} | ||
| tooltip={b.tooltip} | ||
| /> | ||
| ))} | ||
| </div> | ||
| </Container> | ||
| ); | ||
| } | ||
|
|
||
| export default IDESidebar; | ||
|
alex-golovanov marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| export enum Condition { | ||
| Warn = "Warn", | ||
| // Error = "Error", | ||
| // Success = "Success", | ||
| } |
|
alex-golovanov marked this conversation as resolved.
Outdated
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import type { EditorState } from "@appsmith/entities/IDE/constants"; | ||
|
|
||
| import type { Condition } from "./Condition"; | ||
|
|
||
| export interface ISidebarButton { | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
| state: EditorState; | ||
| icon: string; | ||
| title?: string; | ||
| urlSuffix: string; | ||
| condition?: Condition; | ||
| tooltip?: string; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import React, { useCallback, useEffect, useState } from "react"; | ||
| import { useDispatch, useSelector } from "react-redux"; | ||
| import { builderURL } from "@appsmith/RouteBuilder"; | ||
| import { getCurrentPageId } from "selectors/editorSelectors"; | ||
| import history, { NavigationMethod } from "utils/history"; | ||
| import { useCurrentAppState } from "./hooks"; | ||
| import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; | ||
| import { fetchWorkspace } from "@appsmith/actions/workspaceActions"; | ||
| import { IDESidebar, Condition } from "IDE"; | ||
| import { | ||
| BottomButtons, | ||
| EditorState, | ||
| TopButtons, | ||
| } from "@appsmith/entities/IDE/constants"; | ||
| import { getDatasources } from "@appsmith/selectors/entitiesSelector"; | ||
| import { | ||
| createMessage, | ||
| EMPTY_DATASOURCE_TOOLTIP_SIDEBUTTON, | ||
| } from "@appsmith/constants/messages"; | ||
|
|
||
| function Sidebar() { | ||
| const [topButtons, setTopButtons] = useState(TopButtons); | ||
| const dispatch = useDispatch(); | ||
| const appState = useCurrentAppState(); | ||
| const pageId = useSelector(getCurrentPageId); | ||
| const currentWorkspaceId = useSelector(getCurrentWorkspaceId); | ||
| const datasources = useSelector(getDatasources); | ||
|
|
||
| useEffect(() => { | ||
|
Contributor
There was a problem hiding this comment. There is no need for Something like this: const topButtons = React.useMemo(() => {
return datasourcesExist
? TopButtons
: TopButtons.map((button) => {
if (button.state === EditorState.DATA) {
return {
...button,
condition: Condition.Warn,
tooltip: createMessage(EMPTY_DATASOURCE_TOOLTIP_SIDEBUTTON),
};
}
return button;
});
}, [datasourcesExist]); |
||
| if (datasources.length === 0) { | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
| setTopButtons( | ||
| TopButtons.map((button) => { | ||
|
Contributor
There was a problem hiding this comment. The casing here |
||
| if (button.state === EditorState.DATA) { | ||
| return { | ||
| ...button, | ||
| condition: Condition.Warn, | ||
| tooltip: createMessage(EMPTY_DATASOURCE_TOOLTIP_SIDEBUTTON), | ||
| }; | ||
| } | ||
| return button; | ||
| }), | ||
| ); | ||
| } else { | ||
| setTopButtons(TopButtons); | ||
| } | ||
| }, [datasources]); | ||
|
|
||
| useEffect(() => { | ||
| dispatch(fetchWorkspace(currentWorkspaceId)); | ||
| }, [currentWorkspaceId]); | ||
|
alex-golovanov marked this conversation as resolved.
Outdated
|
||
|
|
||
| const onClick = useCallback( | ||
| (suffix) => { | ||
| history.push( | ||
| builderURL({ | ||
| pageId, | ||
| suffix, | ||
| }), | ||
| { | ||
| invokedBy: NavigationMethod.AppSidebar, | ||
| }, | ||
| ); | ||
| }, | ||
| [pageId], | ||
| ); | ||
|
|
||
| return ( | ||
| <IDESidebar | ||
| appState={appState} | ||
| bottomButtons={BottomButtons} | ||
| id={"t--app-sidebar"} | ||
| onClick={onClick} | ||
| topButtons={topButtons} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export default Sidebar; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not critical by any means, but it would be more appropriate for constants to be in a separate file.