jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: update LANGFLOW_COMPONENTS_PATH env variable behavior (#5700)

Browse source 
* Refactor directory_reader.py to simplify file filtering logic

* Refactor flowSidebarComponent to filter out bundles and custom components in CategoryGroup

* [autofix.ci] apply automated fixes

* refactor: Improve file filtering in DirectoryReader

This commit improves the file filtering logic in the DirectoryReader class. Previously, it only excluded files that started with "__" and included all files that were not in a "deactivated" directory. Now, it also considers the depth of the file relative to the safe path. Only files that are one or two levels deep are included in the file list.

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org>
This commit is contained in:
anovazzi1 2025-01-20 22:47:19 -03:00 • committed by GitHub
commit dbd2bd9375
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 63 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/frontend/src/pages/FlowPage/components/flowSidebarComponent/components/categoryGroup/index.tsx
View file

@ -3,6 +3,7 @@ import {
SidebarGroupContent,
SidebarMenu,
} from "@/components/ui/sidebar";
import { SIDEBAR_BUNDLES } from "@/utils/styleUtils";
import { memo } from "react";
import { CategoryGroupProps } from "../../types";
import { CategoryDisclosure } from "../categoryDisclouse";
@ -23,20 +24,42 @@ export const CategoryGroup = memo(function CategoryGroup({
<SidebarGroup className="p-3">
<SidebarGroupContent>
<SidebarMenu>
{CATEGORIES.toSorted(
(a, b) =>
(search !== "" ? sortedCategories : CATEGORIES).findIndex(
(value) => value === a.name,
) -
(search !== "" ? sortedCategories : CATEGORIES).findIndex(
(value) => value === b.name,
),
).map(
(item) =>
dataFilter[item.name] &&
Object.keys(dataFilter[item.name]).length > 0 && (
{Object.entries(dataFilter)
.filter(
([categoryName, items]) =>
// filter out bundles
!SIDEBAR_BUNDLES.some((cat) => cat.name === categoryName) &&
categoryName !== "custom_component" &&
Object.keys(items).length > 0,
)
.sort(([aName], [bName]) => {
const categoryList =
search !== ""
? sortedCategories
: CATEGORIES.map((c) => c.name);
const aIndex = categoryList.indexOf(aName);
const bIndex = categoryList.indexOf(bName);
// If neither is in CATEGORIES, keep their relative order
if (aIndex === -1 && bIndex === -1) return 0;
// If only a is not in CATEGORIES, put it after b
if (aIndex === -1) return 1;
// If only b is not in CATEGORIES, put it after a
if (bIndex === -1) return -1;
// If both are in CATEGORIES, sort by their index
return aIndex - bIndex;
})
.map(([categoryName]) => {
const item = CATEGORIES.find(
(cat) => cat.name === categoryName,
) ?? {
name: categoryName,
icon: "folder",
display_name: categoryName,
};
return (
<CategoryDisclosure
key={item.name}
key={categoryName}
item={item}
openCategories={openCategories}
setOpenCategories={setOpenCategories}
@ -46,8 +69,8 @@ export const CategoryGroup = memo(function CategoryGroup({
onDragStart={onDragStart}
sensitiveSort={sensitiveSort}
/>
),
)}
);
})}
</SidebarMenu>
</SidebarGroupContent>
</SidebarGroup>

55
src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
View file

@ -120,19 +120,12 @@ export function FlowSidebarComponent() {
const sortedCategories = useMemo(() => {
if (!searchResults || !searchFilteredData) return [];
return Object.keys(searchFilteredData)
.filter(
(category) =>
Object.keys(searchFilteredData[category]).length > 0 &&
(CATEGORIES.find((c) => c.name === category) ||
BUNDLES.find((b) => b.name === category)),
)
.toSorted((a, b) =>
searchResults.fuseCategories.indexOf(b) <
searchResults.fuseCategories.indexOf(a)
? 1
: -1,
);
return Object.keys(searchFilteredData).toSorted((a, b) =>
searchResults.fuseCategories.indexOf(b) <
searchResults.fuseCategories.indexOf(a)
? 1
: -1,
);
}, [searchResults, searchFilteredData, CATEGORIES, BUNDLES]);
const finalFilteredData = useMemo(() => {
@ -305,16 +298,6 @@ export function FlowSidebarComponent() {
[dataFilter],
);
const hasCategoryItems = useMemo(
() =>
CATEGORIES.some(
(item) =>
dataFilter[item.name] &&
Object.keys(dataFilter[item.name]).length > 0,
),
[dataFilter],
);
return (
<Sidebar
collapsible="offcanvas"
@ -342,20 +325,18 @@ export function FlowSidebarComponent() {
<SidebarContent>
{hasResults ? (
<>
{hasCategoryItems && (
<CategoryGroup
dataFilter={dataFilter}
sortedCategories={sortedCategories}
CATEGORIES={CATEGORIES}
openCategories={openCategories}
setOpenCategories={setOpenCategories}
search={search}
nodeColors={nodeColors}
chatInputAdded={chatInputAdded}
onDragStart={onDragStart}
sensitiveSort={sensitiveSort}
/>
)}
<CategoryGroup
dataFilter={dataFilter}
sortedCategories={sortedCategories}
CATEGORIES={CATEGORIES}
openCategories={openCategories}
setOpenCategories={setOpenCategories}
search={search}
nodeColors={nodeColors}
chatInputAdded={chatInputAdded}
onDragStart={onDragStart}
sensitiveSort={sensitiveSort}
/>
{hasBundleItems && (
<MemoizedSidebarGroup
BUNDLES={BUNDLES}