Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new dropdown and added service list for test suite #64

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ services:
- POSTGRES_USER=root
- POSTGRES_PASSWORD=root
- POSTGRES_DB=orca
# - PGDATA=/var/lib/postgresql/data/some_name/
ports:
- "5433:5432"
volumes:
- ./data:/var/lib/postgresql/data
- ./data/pg-data:/var/lib/postgresql/data
container_name: postgres-ser

### Redis ################################################
Expand Down
100 changes: 100 additions & 0 deletions web/src/core/components/dropdown/dropdown.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.dropdown {
position: relative;
color: #333;
cursor: default;
}

.dropdown .arrow {
border-color: #999 transparent transparent;
border-style: solid;
border-width: 5px 5px 0;
content: " ";
display: block;
height: 0;
margin-top: 0.3rem;
position: absolute;
right: 10px;
top: 14px;
width: 0;
}

.dropdown .arrow.open {
border-color: transparent transparent #999;
border-width: 0 5px 5px;
}

.input {
line-height: 1.5;
font-size: 1rem;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 2px;
box-sizing: border-box;
cursor: default;
outline: none;
padding: 8px 52px 8px 10px;
transition: all 200ms ease;
width: 100%;
}

.dropdown .options {
display: none;
background-color: #fff;
border: 1px solid #ccc;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06);
box-sizing: border-box;
margin-top: -1px;
max-height: 200px;
overflow-y: auto;
position: absolute;
top: 100%;
width: 100%;
z-index: 1000;
-webkit-overflow-scrolling: touch;
}

.dropdown .options.open {
display: block;
}

.dropdown .option {
box-sizing: border-box;
color: rgba(51, 51, 51, 0.8);
cursor: pointer;
display: block;
padding: 8px 10px;
}

.dropdown .option.selected,
.dropdown .option:hover {
background-color: #f2f9fc;
color: #333;
}

.close {
position: absolute;
right: 40px;
top: 14px;
width: 16px;
height: 16px;
opacity: 0.3;
}
.close:hover {
opacity: 1;
}
.close:before, .close:after {
position: absolute;
left: 15px;
content: ' ';
height: 16px;
width: 2px;
background-color: #333;
}
.close:before {
transform: rotate(45deg);
}
.close:after {
transform: rotate(-45deg);
}


98 changes: 98 additions & 0 deletions web/src/core/components/dropdown/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import { useEffect, useRef, useState } from "react";
import PropTypes from "prop-types";
import "./dropdown.css";



const SearchableDropdown = ({
options,
label,
id,
selectedValue,
handleChange
}) => {
const [query, setQuery] = useState("");
const [isOpen, setIsOpen] = useState(false);

const inputRef = useRef(null);

useEffect(() => {
document.addEventListener("click", toggle);
return () => document.removeEventListener("click", toggle);
}, []);

const selectOption = (option) => {
setQuery(() => "");
handleChange(option);
setIsOpen((isOpen) => !isOpen);
};

function toggle(e) {
setIsOpen(e && e.target === inputRef.current);
}

const getDisplayValue = () => {
if (query) return query;
if (selectedValue) return selectedValue[label] || "";

return "";
};

const filter = (options) => {
return options.filter(
(option) => option[label].toLowerCase().indexOf(query.toLowerCase()) > -1
);
};

return (
<div className="dropdown">
<div className="control">
<div className="selected-value">
<input
ref={inputRef}
className="input"
type="text"
value={getDisplayValue()}
name="searchTerm"
onChange={(e) => {
setQuery(e.target.value);
handleChange(null);
}}
onClick={toggle}
/>
</div>
{selectedValue[label] && <div className="close" onClick={() => handleChange({})}/>}
<div className={`arrow ${isOpen ? "open" : ""}`}></div>
</div>

<div className={`options ${isOpen ? "open" : ""}`}>
{filter(options).map((option, index) => {
return (
<div
role="option"
onClick={() => selectOption(option)}
className={`option ${
option === selectedValue ? "selected" : ""
}`}
key={`${id}-${index}`}
>
{option[label]}
</div>
);
})}
</div>
</div>
);
};

SearchableDropdown.propTypes = {
options: PropTypes.arrayOf(PropTypes.object),
label: PropTypes.string,
id: PropTypes.string,
selectedValue: PropTypes.object,
handleChange: PropTypes.func
};

export default SearchableDropdown;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SearchableDropdown component is well-implemented, with clear handling of state and events. Consider adding accessibility attributes (e.g., aria-labels) to improve accessibility. Also, ensure that the handleChange function is robust and handles all necessary cases for updating the parent component's state.



30 changes: 15 additions & 15 deletions web/src/core/components/flow/components/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ import { shallow } from "zustand/shallow";

export const New: React.FC<any> = () => {
let options = [
{
key: "loop",
label: "Loop",
icon: <ArrowPathRoundedSquareIcon className="h-5 w-5 text-gray-400" />
},
{
key: "ifcondition",
label: "If Condidion",
icon: <HashtagIcon className="h-5 w-5 text-gray-400" />
},
{
key: "block",
label: "Block",
icon: <CodeBracketSquareIcon className="h-5 w-5 text-gray-400" />
},
// {
// key: "loop",
// label: "Loop",
// icon: <ArrowPathRoundedSquareIcon className="h-5 w-5 text-gray-400" />
// },
// {
// key: "ifcondition",
// label: "If Condidion",
// icon: <HashtagIcon className="h-5 w-5 text-gray-400" />
// },
// {
// key: "block",
// label: "Block",
// icon: <CodeBracketSquareIcon className="h-5 w-5 text-gray-400" />
// },
{
key: "action_group",
label: "Action group",
Expand Down
46 changes: 13 additions & 33 deletions web/src/core/components/flow/form.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { Service } from "service";
import { Select as OSelect } from "core/components/select";
import { Endpoint } from "service/endpoint";
import { useEffect, useState } from "react";
import { useFlowStore } from "stores/flow.store";
import { shallow } from "zustand/shallow";
import { useParams } from "react-router-dom";
import { SearchSelect } from "core/components/select/search";
import SearchableDropdown from "core/components/dropdown/index.jsx";

export interface WorkflowFormParm {
title: string;
Expand All @@ -15,6 +14,7 @@ export const WorkflowForm: React.FC<WorkflowFormParm> = ({ title }) => {
const [obj, setObject] = useState({} as any);
const { appId = "" } = useParams();
const [dataSource, setDataSource] = useState([] as any);
const [actionGroup, setActionGroup] = useState({});
const { nodes, edges, currentNode } = useFlowStore(
(state: any) => ({
nodes: state.nodes,
Expand Down Expand Up @@ -55,37 +55,17 @@ export const WorkflowForm: React.FC<WorkflowFormParm> = ({ title }) => {
</h2>
</div>
</div>
<div className="flex w-full">
<OSelect
buttonClassName="relative w-full cursor-default bg-transparent py-1.5 pl-3 pr-10 text-left text-gray-900 ring-inset focus:outline-none focus:ring-2 focus:ring-indigo-500 sm:text-sm sm:leading-6"
options={dataSource || []}
dataIndex="id"
defaultValue={obj["id"]}
onSelect={(value: any) => {
console.log(value);
// row["kind"] = value["key"];
}}
render={(row: any) => {
return <span className="ml-3 block truncate">{row["name"]}</span>;
}}
></OSelect>
{/* <SearchSelect /> */}
{/* <select defaultValue={obj.id}>
<option value="">Select Option</option>
{(dataSource || []).map((item: any) => {
return <option key={item.id}>{item.name}</option>;
})}
</select> */}
{/* <Flex gap="3">
<Select.Root defaultValue={obj.id} key={"selectId"}>
<Select.Trigger />
<Select.Content>
{(dataSource || []).map((item: any) => {
return <Select.Item value={item.id}>{item.name}</Select.Item>;
})}
</Select.Content>
</Select.Root>
</Flex> */}
<div className="">
<div className="font-bold p-4 text-gray-900"> Select action group</div>
<SearchableDropdown
options={dataSource || []}
label="name"
id="id"
selectedValue={actionGroup}
handleChange={(val: any) => {
setActionGroup(val)
}}
/>
</div>
</>
);
Expand Down
30 changes: 15 additions & 15 deletions web/src/core/components/flow/node/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ type MyObject = { [key: string]: () => any };

export const NewNode: React.FC<NodeProps> = ({ data, xPos, yPos }) => {
const options: Array<Option> = [
{
key: "loop",
label: "Loop",
icon: <ArrowPathRoundedSquareIcon className="h-5 w-5 text-gray-400" />
},
{
key: "ifcondition",
label: "If Condidion",
icon: <HashtagIcon className="h-5 w-5 text-gray-400" />
},
{
key: "assertion",
label: "Assertion",
icon: <CodeBracketSquareIcon className="h-5 w-5 text-gray-400" />
},
// {
// key: "loop",
// label: "Loop",
// icon: <ArrowPathRoundedSquareIcon className="h-5 w-5 text-gray-400" />
// },
// {
// key: "ifcondition",
// label: "If Condidion",
// icon: <HashtagIcon className="h-5 w-5 text-gray-400" />
// },
// {
// key: "assertion",
// label: "Assertion",
// icon: <CodeBracketSquareIcon className="h-5 w-5 text-gray-400" />
// },
{
key: "action_group",
label: "Action group",
Expand Down
3 changes: 0 additions & 3 deletions web/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const root = ReactDOM.createRoot(
document.getElementById("root") as HTMLElement
);
root.render(
<React.StrictMode>
<Theme accentColor="blue" appearance="light" radius="medium">
{/* <ThemeProvider defaultTheme="system" storageKey="ui-theme">
<Theme
Expand All @@ -25,8 +24,6 @@ root.render(
{/* <ThemePanel /> */}
<App />
</Theme>
{/* </ThemeProvider> */}
</React.StrictMode>
);

// If you want to start measuring performance in your app, pass a function
Expand Down
Loading