From 59c8eba1326310406ad7c371fd9ef470b80f93d4 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 09:58:44 -0300 Subject: [PATCH 01/15] Fixed Button classes to allow loading --- src/frontend/src/components/ui/button.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index 5fee364b4..d84f8f9c9 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -4,8 +4,11 @@ import * as React from "react"; import { cn } from "../../utils/utils"; import ForwardedIconComponent from "../genericIconComponent"; +const buttonChildrenClasses = + "inline-flex items-center justify-center text-sm font-medium"; + const buttonVariants = cva( - "inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background", + "inline-flex items-center justify-center text-sm font-medium relative rounded-md transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background", { variants: { variant: { @@ -61,7 +64,7 @@ const Button = React.forwardRef( newChildren = toTitleCase(children); } return ( - +
(
{newChildren} From b5d9e0608d8b5bbcfcba951a0e089d5df95c3915 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 10:15:02 -0300 Subject: [PATCH 02/15] Fixed classes on Button to work with all of the current buttons --- src/frontend/src/components/ui/button.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index d84f8f9c9..33a8e8ba0 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -23,6 +23,7 @@ const buttonVariants = cva( "border border-muted bg-muted text-secondary-foreground hover:bg-secondary-foreground/5", ghost: "hover:bg-accent hover:text-accent-foreground", link: "underline-offset-4 hover:underline text-primary", + none: "", }, size: { default: "h-10 py-2 px-4", @@ -30,6 +31,7 @@ const buttonVariants = cva( xs: "py-0.5 px-3 rounded-md", lg: "h-11 px-8 rounded-md", icon: "py-1 px-1 rounded-md", + none: "", }, }, defaultVariants: { @@ -64,7 +66,11 @@ const Button = React.forwardRef( newChildren = toTitleCase(children); } return ( - +
(
{newChildren} From 9eacd3f9d6cb06f086461a85902e342f5ce310d4 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 10:15:24 -0300 Subject: [PATCH 03/15] Fixed sidebar button to not look strange with the new Button classes --- .../sidebarComponent/components/sideBarFolderButtons/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx index 18b67068e..dcdefe060 100644 --- a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx +++ b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx @@ -304,7 +304,8 @@ const SideBarFoldersButtonsComponent = ({ e.stopPropagation(); e.preventDefault(); }} - variant={"ghost"} + size="none" + variant="none" > Date: Tue, 4 Jun 2024 10:26:52 -0300 Subject: [PATCH 04/15] Fixed button not being able to handle multiple children when asChild is done --- src/frontend/src/components/ui/button.tsx | 49 ++++++++++++----------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index 33a8e8ba0..ed0abc120 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -66,30 +66,31 @@ const Button = React.forwardRef( newChildren = toTitleCase(children); } return ( - -
- -
-
- {newChildren} + +
+
+ +
+
+ {newChildren} +
); From f1aaa162e2dd68f2cd896d2542aa5c2c564c093d Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 10:49:36 -0300 Subject: [PATCH 05/15] Changed strategy to not have to apply classes to different div elements, not breaking the other buttons. --- src/frontend/src/components/ui/button.tsx | 68 ++++++++++++----------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index ed0abc120..6107b78a3 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -4,11 +4,8 @@ import * as React from "react"; import { cn } from "../../utils/utils"; import ForwardedIconComponent from "../genericIconComponent"; -const buttonChildrenClasses = - "inline-flex items-center justify-center text-sm font-medium"; - const buttonVariants = cva( - "inline-flex items-center justify-center text-sm font-medium relative rounded-md transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background", + "inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background", { variants: { variant: { @@ -23,7 +20,6 @@ const buttonVariants = cva( "border border-muted bg-muted text-secondary-foreground hover:bg-secondary-foreground/5", ghost: "hover:bg-accent hover:text-accent-foreground", link: "underline-offset-4 hover:underline text-primary", - none: "", }, size: { default: "h-10 py-2 px-4", @@ -31,7 +27,6 @@ const buttonVariants = cva( xs: "py-0.5 px-3 rounded-md", lg: "h-11 px-8 rounded-md", icon: "py-1 px-1 rounded-md", - none: "", }, }, defaultVariants: { @@ -65,34 +60,45 @@ const Button = React.forwardRef( if (typeof children === "string") { newChildren = toTitleCase(children); } + const [width, setWidth] = React.useState(null); + const hiddenRef = React.useRef(null); + + React.useEffect(() => { + if (hiddenRef.current) { + setWidth(hiddenRef.current.offsetWidth); + } + }, [children, hiddenRef]); return ( - -
-
+ + <> + {loading ? ( +
+ +
+ ) : ( + children )} - > - -
-
- {newChildren} -
+ + +
+ {children}
- + ); }, ); From 2c851a9d5c50be96abff1c2cba68d794de868439 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 11:09:00 -0300 Subject: [PATCH 06/15] Fix naming of endpoint --- src/frontend/src/components/editFlowSettingsComponent/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/components/editFlowSettingsComponent/index.tsx b/src/frontend/src/components/editFlowSettingsComponent/index.tsx index 4794ad802..26bc138e3 100644 --- a/src/frontend/src/components/editFlowSettingsComponent/index.tsx +++ b/src/frontend/src/components/editFlowSettingsComponent/index.tsx @@ -123,7 +123,7 @@ export const EditFlowSettings: React.FC = ({ type="text" name="endpoint_name" value={endpointName ?? ""} - placeholder="An alternative name for the run endpoint" + placeholder="An alternative name to run the endpoint" maxLength={maxLength} id="endpoint_name" onDoubleClickCapture={(event) => { From 5b83bde64e1a6365bd82e9ad226a350ab82f3ef9 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 11:17:17 -0300 Subject: [PATCH 07/15] Returned loader to default, fixed buttons not working with asChild --- src/frontend/src/components/ui/button.tsx | 38 +++++------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index 6107b78a3..ca3001511 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -60,14 +60,6 @@ const Button = React.forwardRef( if (typeof children === "string") { newChildren = toTitleCase(children); } - const [width, setWidth] = React.useState(null); - const hiddenRef = React.useRef(null); - - React.useEffect(() => { - if (hiddenRef.current) { - setWidth(hiddenRef.current.offsetWidth); - } - }, [children, hiddenRef]); return ( <> ( ref={ref} {...props} > - <> - {loading ? ( -
- -
- ) : ( - children - )} - + {loading ? ( + + ) : ( + newChildren + )} -
- {children} -
); }, From cad4c508a9f405e69fb2549a36768c895cf6ca45 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 11:35:37 -0300 Subject: [PATCH 08/15] Fixed button layout to have loading the same size as the original button --- src/frontend/src/components/ui/button.tsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index ca3001511..d81c31f31 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -68,10 +68,17 @@ const Button = React.forwardRef( {...props} > {loading ? ( - + + + {newChildren} + + + + + ) : ( newChildren )} From fedbf906d9c95927bf961244bad16c8e05adcb64 Mon Sep 17 00:00:00 2001 From: Mendon Kissling <59585235+mendonk@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:37:30 -0400 Subject: [PATCH 09/15] update-gif --- docs/docs/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/index.mdx b/docs/docs/index.mdx index 7fb912e98..54960502b 100644 --- a/docs/docs/index.mdx +++ b/docs/docs/index.mdx @@ -14,8 +14,8 @@ Its intuitive interface allows for easy manipulation of AI building blocks, enab From 98e40f25e68c5ec88c629a50c04588bcb25942fe Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 11:52:08 -0300 Subject: [PATCH 10/15] Fixed id scrolling when clicking from Store --- .../SettingsPage/pages/GeneralPage/index.tsx | 15 +++++++-- src/frontend/src/pages/StorePage/index.tsx | 31 +++++++++---------- src/frontend/src/routes.tsx | 21 ++++++------- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx index d10c450c1..52966ac9c 100644 --- a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx @@ -41,12 +41,23 @@ import { } from "../../../../types/components"; import { gradients } from "../../../../utils/styleUtils"; import { useStoreStore } from "../../../../stores/storeStore"; +import { useParams } from "react-router-dom"; export default function GeneralPage() { const setCurrentFlowId = useFlowsManagerStore( (state) => state.setCurrentFlowId, ); + const { scrollId } = useParams(); + + useEffect(() => { + const element = document.getElementById(scrollId ?? "null"); + if (element) { + // 👇 Will scroll smoothly to the top of the next section + element.scrollIntoView({ behavior: "smooth" }); + } + }, [scrollId]); + const [inputState, setInputState] = useState( CONTROL_PATCH_USER_STATE, ); @@ -272,9 +283,9 @@ export default function GeneralPage() { handleSaveKey(); }} > - + - API Key + Store API Key {(hasApiKey && !validApiKey ? INVALID_API_KEY diff --git a/src/frontend/src/pages/StorePage/index.tsx b/src/frontend/src/pages/StorePage/index.tsx index 3b4612281..f105c8c86 100644 --- a/src/frontend/src/pages/StorePage/index.tsx +++ b/src/frontend/src/pages/StorePage/index.tsx @@ -180,24 +180,21 @@ export default function StorePage(): JSX.Element { title={STORE_TITLE} description={STORE_DESC} button={ - <> - {StoreApiKeyModal && ( - - - + } >
diff --git a/src/frontend/src/routes.tsx b/src/frontend/src/routes.tsx index 49b905f41..d49e035f7 100644 --- a/src/frontend/src/routes.tsx +++ b/src/frontend/src/routes.tsx @@ -56,7 +56,7 @@ const Router = () => { > } /> } /> - } /> + } /> } /> { } /> - element= - { - - - - } - /> - } + + + + } + /> Date: Tue, 4 Jun 2024 11:54:32 -0300 Subject: [PATCH 11/15] Added icons --- .../sidebarComponent/components/sideBarButtons/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx b/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx index 3509c396a..21584c041 100644 --- a/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx +++ b/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx @@ -1,6 +1,7 @@ import { Link } from "react-router-dom"; import { cn } from "../../../../utils/utils"; import { buttonVariants } from "../../../ui/button"; +import ForwardedIconComponent from "../../../genericIconComponent"; type SideBarButtonsComponentProps = { items: { @@ -27,9 +28,10 @@ const SideBarButtonsComponent = ({ pathname === item.href ? "border border-border bg-muted hover:bg-muted" : "border border-transparent hover:border-border hover:bg-transparent", - "w-full justify-start gap-2", + "w-full justify-start gap-3", )} > + {item.icon} {item.title}
From 22a7b7e75f6fb36e219674ab9831ada909e96980 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 4 Jun 2024 08:59:02 -0700 Subject: [PATCH 12/15] (refactor) Update pytest arguments in Makefile for better test execution (#2063) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: Update pytest arguments in Makefile for better test execution The Makefile has been modified to update the pytest arguments in the `tests` target. The `--instafail` flag has been replaced with `-ra -n auto -m "not api_key_required"`. This change allows for better test execution by including additional options for reporting, parallelization, and test selection. Note: The commit message has been generated based on the provided code changes and recent commits. * ✨ (test_endpoints.py): add pytest marker 'api_key_required' to mark tests that require an API key for authorization. This helps in easily identifying and managing tests that need special permissions. --- Makefile | 4 ++-- pyproject.toml | 2 +- tests/test_endpoints.py | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f62ecb411..878eeca80 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,8 @@ coverage: # allow passing arguments to pytest tests: - poetry run pytest tests --instafail $(args) -# Use like: + poetry run pytest tests --instafail -ra -n auto -m "not api_key_required" $(args) + format: poetry run ruff check . --fix diff --git a/pyproject.toml b/pyproject.toml index bec91ee97..8c7f6c237 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -140,7 +140,7 @@ testpaths = ["tests", "integration"] console_output_style = "progress" filterwarnings = ["ignore::DeprecationWarning"] log_cli = true -markers = ["async_test"] +markers = ["async_test", "api_key_required"] [tool.ruff] diff --git a/tests/test_endpoints.py b/tests/test_endpoints.py index d23cfd06e..0a7d60069 100644 --- a/tests/test_endpoints.py +++ b/tests/test_endpoints.py @@ -4,6 +4,7 @@ from uuid import UUID, uuid4 import pytest from fastapi import status from fastapi.testclient import TestClient + from langflow.custom.directory_reader.directory_reader import DirectoryReader from langflow.services.deps import get_settings_service @@ -632,6 +633,7 @@ def test_successful_run_with_input_type_any(client, starter_project, created_api assert all([output.get("results").get("result") == "value1" for output in any_input_outputs]), any_input_outputs +@pytest.mark.api_key_required def test_run_with_inputs_and_outputs(client, starter_project, created_api_key): headers = {"x-api-key": created_api_key.api_key} flow_id = starter_project["id"] @@ -659,6 +661,7 @@ def test_invalid_flow_id(client, created_api_key): # Check if the error detail is as expected +@pytest.mark.api_key_required def test_run_flow_with_caching_success(client: TestClient, starter_project, created_api_key): flow_id = starter_project["id"] headers = {"x-api-key": created_api_key.api_key} @@ -676,6 +679,7 @@ def test_run_flow_with_caching_success(client: TestClient, starter_project, crea assert "session_id" in data +@pytest.mark.api_key_required def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_key): invalid_flow_id = uuid4() headers = {"x-api-key": created_api_key.api_key} @@ -687,6 +691,7 @@ def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_k assert f"Flow identifier {invalid_flow_id} not found" in data["detail"] +@pytest.mark.api_key_required def test_run_flow_with_caching_invalid_input_format(client: TestClient, starter_project, created_api_key): flow_id = starter_project["id"] headers = {"x-api-key": created_api_key.api_key} @@ -695,6 +700,7 @@ def test_run_flow_with_caching_invalid_input_format(client: TestClient, starter_ assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY +@pytest.mark.api_key_required def test_run_flow_with_session_id(client, starter_project, created_api_key): headers = {"x-api-key": created_api_key.api_key} flow_id = starter_project["id"] @@ -726,6 +732,7 @@ def test_run_flow_with_invalid_session_id(client, starter_project, created_api_k assert f"Session {payload['session_id']} not found" in data["detail"] +@pytest.mark.api_key_required def test_run_flow_with_invalid_tweaks(client, starter_project, created_api_key): headers = {"x-api-key": created_api_key.api_key} flow_id = starter_project["id"] From 82a3733ed7dbc017124a6fd8a0da269d1da39ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Tue, 4 Jun 2024 18:36:52 +0200 Subject: [PATCH 13/15] setting fallback_to_env_var should be respected in api calls (#2058) --- src/backend/base/langflow/helpers/flow.py | 6 ++++-- src/backend/base/langflow/processing/process.py | 4 ++++ src/backend/base/langflow/services/settings/base.py | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/backend/base/langflow/helpers/flow.py b/src/backend/base/langflow/helpers/flow.py index 0f2a1e170..9a8a7c3b5 100644 --- a/src/backend/base/langflow/helpers/flow.py +++ b/src/backend/base/langflow/helpers/flow.py @@ -8,7 +8,7 @@ from sqlmodel import Session, select from langflow.graph.schema import RunOutputs from langflow.schema.schema import INPUT_FIELD_NAME, Record from langflow.services.database.models.flow import Flow -from langflow.services.deps import get_session, session_scope +from langflow.services.deps import get_session, get_settings_service, session_scope if TYPE_CHECKING: from langflow.graph.graph.base import Graph @@ -88,7 +88,9 @@ async def run_flow( inputs_components.append(input_dict.get("components", [])) types.append(input_dict.get("type", "chat")) - return await graph.arun(inputs_list, inputs_components=inputs_components, types=types) + fallback_to_env_vars = get_settings_service().settings.fallback_to_env_var + + return await graph.arun(inputs_list, inputs_components=inputs_components, types=types, fallback_to_env_vars=fallback_to_env_vars) def generate_function_for_flow( diff --git a/src/backend/base/langflow/processing/process.py b/src/backend/base/langflow/processing/process.py index d53b5e25f..aeff0f1a4 100644 --- a/src/backend/base/langflow/processing/process.py +++ b/src/backend/base/langflow/processing/process.py @@ -8,6 +8,7 @@ from langflow.graph.schema import RunOutputs from langflow.graph.vertex.base import Vertex from langflow.schema.graph import InputValue, Tweaks from langflow.schema.schema import INPUT_FIELD_NAME +from langflow.services.deps import get_settings_service from langflow.services.session.service import SessionService if TYPE_CHECKING: @@ -49,6 +50,8 @@ async def run_graph_internal( inputs_list.append({INPUT_FIELD_NAME: input_value_request.input_value}) types.append(input_value_request.type) + fallback_to_env_vars = get_settings_service().settings.fallback_to_env_var + run_outputs = await graph.arun( inputs_list, components, @@ -56,6 +59,7 @@ async def run_graph_internal( outputs or [], stream=stream, session_id=session_id_str or "", + fallback_to_env_vars=fallback_to_env_vars ) if session_id_str and session_service: await session_service.update_session(session_id_str, (graph, artifacts)) diff --git a/src/backend/base/langflow/services/settings/base.py b/src/backend/base/langflow/services/settings/base.py index 4f50cb756..259e10170 100644 --- a/src/backend/base/langflow/services/settings/base.py +++ b/src/backend/base/langflow/services/settings/base.py @@ -78,6 +78,7 @@ class Settings(BaseSettings): langchain_cache: str = "InMemoryCache" load_flows_path: Optional[str] = None + # Redis redis_host: str = "localhost" redis_port: int = 6379 From bb6578e0a5771856fd40874552a85fee46ed97f2 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 4 Jun 2024 14:21:12 -0300 Subject: [PATCH 14/15] Fixed classes of sidebar to make it more like the main page --- .../components/sideBarButtons/index.tsx | 10 ++++---- .../components/sideBarFolderButtons/index.tsx | 4 ++-- .../src/components/sidebarComponent/index.tsx | 24 +++++++++++-------- src/frontend/src/components/ui/button.tsx | 2 ++ src/frontend/src/pages/SettingsPage/index.tsx | 11 +++++---- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx b/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx index 21584c041..10f3cd54d 100644 --- a/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx +++ b/src/frontend/src/components/sidebarComponent/components/sideBarButtons/index.tsx @@ -17,7 +17,7 @@ const SideBarButtonsComponent = ({ pathname, }: SideBarButtonsComponentProps) => { return ( - <> +
{items.map((item) => (
{item.icon} - {item.title} + + {item.title} +
))} - +
); }; export default SideBarButtonsComponent; diff --git a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx index dcdefe060..e7ae65b05 100644 --- a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx +++ b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx @@ -175,11 +175,11 @@ const SideBarFoldersButtonsComponent = ({ event.stopPropagation(); event.preventDefault(); }} - className="flex w-full items-center gap-2" + className="flex w-full items-center gap-4" > {editFolderName?.edit ? (
diff --git a/src/frontend/src/components/sidebarComponent/index.tsx b/src/frontend/src/components/sidebarComponent/index.tsx index 396373705..b4fbf11b3 100644 --- a/src/frontend/src/components/sidebarComponent/index.tsx +++ b/src/frontend/src/components/sidebarComponent/index.tsx @@ -41,16 +41,20 @@ export default function SidebarNav({ return ( diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index d81c31f31..faab61370 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -20,6 +20,7 @@ const buttonVariants = cva( "border border-muted bg-muted text-secondary-foreground hover:bg-secondary-foreground/5", ghost: "hover:bg-accent hover:text-accent-foreground", link: "underline-offset-4 hover:underline text-primary", + none: "", }, size: { default: "h-10 py-2 px-4", @@ -27,6 +28,7 @@ const buttonVariants = cva( xs: "py-0.5 px-3 rounded-md", lg: "h-11 px-8 rounded-md", icon: "py-1 px-1 rounded-md", + none: "", }, }, defaultVariants: { diff --git a/src/frontend/src/pages/SettingsPage/index.tsx b/src/frontend/src/pages/SettingsPage/index.tsx index 385c38cb6..0abab2aec 100644 --- a/src/frontend/src/pages/SettingsPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/index.tsx @@ -21,7 +21,7 @@ export default function SettingsPage(): JSX.Element { icon: ( ), }, @@ -32,7 +32,7 @@ export default function SettingsPage(): JSX.Element { icon: ( ), }, @@ -40,7 +40,10 @@ export default function SettingsPage(): JSX.Element { title: "Shortcuts", href: "/settings/shortcuts", icon: ( - + ), }, ]; @@ -50,7 +53,7 @@ export default function SettingsPage(): JSX.Element { description="Manage the general settings for Langflow." >
-