* temp commit
* using onsubmit to continue using action on form
* added recaptcha site key to env example file
* moved the recaptcha lib loading logic to signup page
* removed unnecessary edit
* handle the case where the recaptcha token is not provided as env var
* added proper env var config for client
* recaptcha config for ansible
* recaptcha config for heroku
* recaptcha config for k8s
* updated app.json
* fixed the typos
* added more description for env vars
* removed api key
* minor typo fix
* added new integration button
* updated the add int default link
* added active and create new tabs
* added the empty components to tabs. will control the section manually.
* added proper grid for integrations page
* added vertical tabs
* Added secondary tabs to integrations page
* added separate page for new apis
* classname changes
* added new components for active queries, new queries etc.
* added a separate component for data source list
* adding screen component conditionally, to be showing upon user's choice
* 1. Added grid styling to datasource home
2. Added connect buttons to em
* fixed data source security banner
* updated the styling for new api page
* added tertiary menu for active integrations
* updated styling for active connections
* updated collapse component to work properly
* added show more option to active data sources
* Slash commands feature init commit
* Added more commands
* Introduced JSX to render custom commands
* Merge conflict fix
* Spacing changes
* removed apis/db tabs and replaced em with integrations tab
* removed the unnecessary + integrations btn
* Added slash commands button
* Adjust styles for better ui
* Ordered the action entries under integrations
* Added new datasource command
* updated the getURL with proper params
* updated the link of create datasource btn
* updated the back btn link from data source editor
* Show connect data cta in property pane
* Styling fixes
* Fix margin
* added scrollable content to create new
* added on click scroll to create new page
* fixed a bug, creating new datasource twice
* added new action creator for integrations.
* Minor changes to add new bindings command.
Changed ui behaviour of / button
* UI style change
* updated the query editor to match the over all theme
* updated the query editor tabs
* Added the run btn to empty response screens
* minor fix
* updated the bg color of api type drop down
* updated the url being visited after delete api/query
* removed log
* Insert binding command UI change
* More UI changes
* removed unnecessary junk from integrations editor index
* clean up, removed unnecessary files
* removed useless routes
* for debugger only checking if integrations editor
* Removed all the links for api/query home pages
* Move command actions to a saga
Added support to binding the data back to the widget when are new API is created from widget
* Added reverse binding for DB queries
* Show / button only on hover
* not routing to integrations on create query/api
* Hide actions from suggestions in action pages
* removed the query/datasource/api home pages
* Changes widget.data to widget in slash commands
* Show dependencies in property pane
* Fix warning
* fixed scrolling issue
* will show a list of queries and apis for action picker
* showing icons for each action under integrations
* Fix dropdown not showing up
* Minor refactoring.
Changed commands
* added a way to list data sources in action creators
* Update query page url
* cam show icons for datasources
* Removed unused code
* Feature/slash commands (#5002)
* Slash commands feature init commit
* Added more commands
* Introduced JSX to render custom commands
* Merge conflict fix
* Spacing changes
* Added slash commands button
* Adjust styles for better ui
* Added new datasource command
* Minor changes to add new bindings command.
Changed ui behaviour of / button
* UI style change
* Insert binding command UI change
* More UI changes
* Move command actions to a saga
Added support to binding the data back to the widget when are new API is created from widget
* Added reverse binding for DB queries
* Show / button only on hover
* Hide actions from suggestions in action pages
* Changes widget.data to widget in slash commands
* Minor refactoring.
Changed commands
* Removed unused code
* remove more unusued code
* Added support to generate new api from a datasource in quick commands
* Code correction to use types
* Refactored commands code
* Minor bug fixes
* Remove new integrations command for actions.
Fixed autocomplete not showing up
* Changes to prevent autocomplete trigger for navigation commands
* Prevent hinter execution when show hint is open already.
* Show hinter on focus
* Update text to be called in the omnibar
* updated the copy for empty active datasources
* Update url
* Fix text decoration
* updated the redirection for back btns
* Use themes
* Add cypress test
* fixed back btn nav
* fetching form configs for datasources
* a callback fixed
* Fix slash command not executed on click (#5540)
* Replace the value if not a string else append
* Log commands menu events
* updated mock data base navigation
* updated mock data base navigation
* updated the close editors and back buttons
* All back btns from editors will go back to data sources and back from data source will go back to canvas
* fixed bg colors
* minor styled updates
* removed margin from header of generic datasource
* warnings fixes
* If user is already on the location not redirecting em
* when editing, will check if the coming from data source and redirect accordingly
* updated redirection for newly created api/queries
* updated back btn for newly created datasources
* back for new curl goes to data sources
* Revert "[Fix] revert new nav (#5533)"
This reverts commit 1647815d
* remaining original reverted chagnes
* fixed the width of incoming/outgoing entity bar in property pane
* removing residue from resolved merge conflicts
* Fix widget icons not visible in dropdown menu
* minor fix to use proper integration URL
* updated the URLs for unified datasources
* converted back and close to btns from banners
* on accessing data source from sidebar, it'll always go to view mode
* updated the edit path for saas editors
* Added saved state for google sheet
* on google sheet delete redirecting to create new
* minor fix
* fixed the redirection call on saving a datasource
* removed save and test cmd as it wasn't needed
* Removing test cases to be fixed by Arun
* commenting more tests to be fixed by Arun
* updated call api cy command
* Fix extra margin issue
* fixed the update datasource saga
* fixed video spec
* Revert "commenting more tests to be fixed by Arun"
This reverts commit 42087a95ad77107401a1619e4c2d4c541a81d6c3.
* Revert "Removing test cases to be fixed by Arun"
This reverts commit f6fad67e558d22045114a90409428ef9b737478f.
* fixed the entity explorer query datasource spec
* cautious fix
* update widget locators
* fixed leave org test
* fixes for FormWidgets
* updated the image spec
* Use memo
* Fix debugger url checks
* for copy and delete widget pointing directly to svgs
* Fix entity text
* Fix styling and show tooltip for property pane dependencies
* removed the unnecessary callback
* added a separate saga to to redirect to new integrations using onSuccess
* Bug Fixes - New nav (#5629)
* will show scrollbar only on hover
* made mock data cards clickable
* fixed the grid view
* fixed the cursor position when clicking on / btn
* updated the hint for `/` command
* binding prompt will close on focus change
* hiding / command for api body
* hiding / command for query pane
* Added 2 new icons
* Fix cursor position on selecting a binding and clicking on the slash menu button
* trying out fix to copyWidget cy command
* removing zero width space characters from the property pane text
Co-authored-by: arunvjn <arun@appsmith.com>
Co-authored-by: Akash N <akash@codemonk.in>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Rishabh Saxena <rishabh.robben@gmail.com>
242 lines
6.5 KiB
TypeScript
242 lines
6.5 KiB
TypeScript
import React, { useState } from "react";
|
|
import { find, noop } from "lodash";
|
|
import { DropdownOption } from "widgets/DropdownWidget";
|
|
import {
|
|
PopoverInteractionKind,
|
|
PopoverPosition,
|
|
IPopoverSharedProps,
|
|
MenuItem,
|
|
Popover,
|
|
Menu,
|
|
Button,
|
|
Classes,
|
|
} from "@blueprintjs/core";
|
|
import styled from "styled-components";
|
|
import { IconNames } from "@blueprintjs/icons";
|
|
|
|
export type TreeDropdownOption = DropdownOption & {
|
|
onSelect?: (value: TreeDropdownOption, setter?: Setter) => void;
|
|
children?: TreeDropdownOption[];
|
|
className?: string;
|
|
type?: string;
|
|
icon?: React.ReactNode;
|
|
};
|
|
|
|
type Setter = (value: TreeDropdownOption, defaultVal?: string) => void;
|
|
|
|
type TreeDropdownProps = {
|
|
optionTree: TreeDropdownOption[];
|
|
selectedValue: string;
|
|
getDefaults?: (value: any) => any;
|
|
defaultText: string;
|
|
onSelect: Setter;
|
|
selectedLabelModifier?: (
|
|
option: TreeDropdownOption,
|
|
displayValue?: string,
|
|
) => React.ReactNode;
|
|
displayValue?: string;
|
|
toggle?: React.ReactNode;
|
|
className?: string;
|
|
modifiers?: IPopoverSharedProps["modifiers"];
|
|
onMenuToggle?: (isOpen: boolean) => void;
|
|
};
|
|
|
|
const StyledMenu = styled(Menu)`
|
|
min-width: 220px;
|
|
padding: 0px;
|
|
border-radius: 0px;
|
|
background-color: ${(props) => props.theme.colors.treeDropdown.menuBg.normal};
|
|
.${Classes.MENU} {
|
|
min-width: 220px;
|
|
padding: 0px;
|
|
border-radius: 0px;
|
|
background-color: ${(props) =>
|
|
props.theme.colors.treeDropdown.menuBg.normal};
|
|
}
|
|
.${Classes.MENU_ITEM} {
|
|
border-radius: 0px;
|
|
font-size: 14px;
|
|
line-height: 14px;
|
|
display: flex;
|
|
align-items: center;
|
|
height: 30px;
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.normal};
|
|
.${Classes.ICON} > svg:not([fill]) {
|
|
margin-top: 0px;
|
|
fill: #9f9f9f;
|
|
}
|
|
|
|
&:hover {
|
|
background-color: ${(props) =>
|
|
props.theme.colors.treeDropdown.menuBg.hover};
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.hover};
|
|
.${Classes.ICON} > svg:not([fill]) {
|
|
fill: ${(props) => props.theme.colors.treeDropdown.menuText.hover};
|
|
}
|
|
}
|
|
|
|
&.${Classes.ACTIVE} {
|
|
background-color: ${(props) =>
|
|
props.theme.colors.treeDropdown.menuBg.selected};
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.selected};
|
|
.${Classes.ICON} > svg:not([fill]) {
|
|
fill: ${(props) => props.theme.colors.treeDropdown.menuText.selected};
|
|
}
|
|
}
|
|
}
|
|
.${Classes.MENU_SUBMENU}
|
|
.${Classes.POPOVER_TARGET}.${Classes.POPOVER_OPEN}
|
|
> .${Classes.MENU_ITEM} {
|
|
background-color: ${(props) =>
|
|
props.theme.colors.treeDropdown.menuBg.hover};
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.hover};
|
|
}
|
|
`;
|
|
|
|
const DropdownTarget = styled.div`
|
|
&&&& .${Classes.BUTTON} {
|
|
width: 100%;
|
|
box-shadow: none;
|
|
border-radius: 0px;
|
|
background-color: ${(props) => props.theme.colors.treeDropdown.targetBg};
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.normal};
|
|
background-image: none;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
padding: 5px 12px;
|
|
}
|
|
&&&& .${Classes.ICON} {
|
|
color: ${(props) => props.theme.colors.treeDropdown.menuText.normal};
|
|
}
|
|
`;
|
|
|
|
function getSelectedOption(
|
|
selectedValue: string,
|
|
defaultText: string,
|
|
options: TreeDropdownOption[],
|
|
) {
|
|
let selectedOption: TreeDropdownOption = {
|
|
label: defaultText,
|
|
value: "",
|
|
};
|
|
options.length > 0 &&
|
|
options.forEach((option) => {
|
|
// Find the selected option in the OptionsTree
|
|
if (option.value === selectedValue) {
|
|
selectedOption = option;
|
|
} else {
|
|
const childOption = find(option.children, {
|
|
value: selectedValue,
|
|
});
|
|
if (childOption) {
|
|
selectedOption = childOption;
|
|
}
|
|
}
|
|
});
|
|
return selectedOption;
|
|
}
|
|
|
|
export default function TreeDropdown(props: TreeDropdownProps) {
|
|
const {
|
|
defaultText,
|
|
displayValue,
|
|
getDefaults,
|
|
onSelect,
|
|
optionTree,
|
|
selectedLabelModifier,
|
|
selectedValue,
|
|
toggle,
|
|
} = props;
|
|
const selectedOption = getSelectedOption(
|
|
selectedValue,
|
|
defaultText,
|
|
optionTree,
|
|
);
|
|
|
|
const [isOpen, setIsOpen] = useState<boolean>(false);
|
|
|
|
const handleSelect = (option: TreeDropdownOption) => {
|
|
if (option.onSelect) {
|
|
option.onSelect(option, props.onSelect);
|
|
} else {
|
|
const defaultVal = getDefaults ? getDefaults(option.value) : undefined;
|
|
onSelect(option, defaultVal);
|
|
}
|
|
};
|
|
|
|
function renderTreeOption(option: TreeDropdownOption) {
|
|
const isSelected =
|
|
selectedOption.value === option.value ||
|
|
selectedOption.type === option.value;
|
|
return (
|
|
<MenuItem
|
|
active={isSelected}
|
|
className={option.className || "single-select"}
|
|
icon={option.icon}
|
|
intent={option.intent}
|
|
key={option.value}
|
|
onClick={
|
|
option.children
|
|
? noop
|
|
: (e: any) => {
|
|
handleSelect(option);
|
|
setIsOpen(false);
|
|
props.onMenuToggle && props.onMenuToggle(false);
|
|
e.stopPropagation();
|
|
}
|
|
}
|
|
popoverProps={{
|
|
minimal: true,
|
|
interactionKind: PopoverInteractionKind.CLICK,
|
|
position: PopoverPosition.LEFT,
|
|
targetProps: { onClick: (e: any) => e.stopPropagation() },
|
|
}}
|
|
text={option.label}
|
|
>
|
|
{option.children && option.children.map(renderTreeOption)}
|
|
</MenuItem>
|
|
);
|
|
}
|
|
|
|
const list = optionTree.map(renderTreeOption);
|
|
const menuItems = <StyledMenu>{list}</StyledMenu>;
|
|
const defaultToggle = (
|
|
<DropdownTarget>
|
|
<Button
|
|
className={`t--open-dropdown-${defaultText.split(" ").join("-")} ${
|
|
selectedLabelModifier ? "code-highlight" : ""
|
|
}`}
|
|
rightIcon={IconNames.CHEVRON_DOWN}
|
|
text={
|
|
selectedLabelModifier
|
|
? selectedLabelModifier(selectedOption, displayValue)
|
|
: selectedOption.label
|
|
}
|
|
/>
|
|
</DropdownTarget>
|
|
);
|
|
return (
|
|
<Popover
|
|
className="wrapper-popover"
|
|
content={menuItems}
|
|
isOpen={isOpen}
|
|
minimal
|
|
modifiers={props.modifiers}
|
|
onClose={() => {
|
|
setIsOpen(false);
|
|
props.onMenuToggle && props.onMenuToggle(false);
|
|
}}
|
|
position={PopoverPosition.LEFT}
|
|
targetProps={{
|
|
onClick: (e: any) => {
|
|
setIsOpen(true);
|
|
props.onMenuToggle && props.onMenuToggle(true);
|
|
e.stopPropagation();
|
|
},
|
|
}}
|
|
>
|
|
{toggle ? toggle : defaultToggle}
|
|
</Popover>
|
|
);
|
|
}
|