Merge branch 'dev' into fixGroupLogs
This commit is contained in:
commit
c5779d087a
7 changed files with 28 additions and 7 deletions
|
|
@ -26,7 +26,7 @@ import useFlowStore from "../../stores/flowStore";
|
||||||
import useFlowsManagerStore from "../../stores/flowsManagerStore";
|
import useFlowsManagerStore from "../../stores/flowsManagerStore";
|
||||||
import { useShortcutsStore } from "../../stores/shortcuts";
|
import { useShortcutsStore } from "../../stores/shortcuts";
|
||||||
import { useTypesStore } from "../../stores/typesStore";
|
import { useTypesStore } from "../../stores/typesStore";
|
||||||
import { VertexBuildTypeAPI } from "../../types/api";
|
import { OutputFieldType, VertexBuildTypeAPI } from "../../types/api";
|
||||||
import { NodeDataType } from "../../types/flow";
|
import { NodeDataType } from "../../types/flow";
|
||||||
import { handleKeyDown, scapedJSONStringfy } from "../../utils/reactflowUtils";
|
import { handleKeyDown, scapedJSONStringfy } from "../../utils/reactflowUtils";
|
||||||
import { nodeColors, nodeIconsLucide } from "../../utils/styleUtils";
|
import { nodeColors, nodeIconsLucide } from "../../utils/styleUtils";
|
||||||
|
|
@ -279,7 +279,7 @@ export default function GenericNode({
|
||||||
|
|
||||||
const shortcuts = useShortcutsStore((state) => state.shortcuts);
|
const shortcuts = useShortcutsStore((state) => state.shortcuts);
|
||||||
|
|
||||||
const renderOutputParameter = (output, idx) => {
|
const renderOutputParameter = (output: OutputFieldType, idx: number) => {
|
||||||
return (
|
return (
|
||||||
<ParameterComponent
|
<ParameterComponent
|
||||||
index={idx}
|
index={idx}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
import { nodeColors } from "../../utils/styleUtils";
|
import { nodeColors } from "../../utils/styleUtils";
|
||||||
|
|
||||||
export function getNodeInputColors(input_types, type, types) {
|
export function getNodeInputColors(
|
||||||
|
input_types: string[] | undefined,
|
||||||
|
type: string | undefined,
|
||||||
|
types: { [char: string]: string },
|
||||||
|
) {
|
||||||
// Helper function to get the color based on type
|
// Helper function to get the color based on type
|
||||||
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;
|
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,12 @@
|
||||||
|
import { OutputFieldType } from "../../types/api";
|
||||||
|
import { NodeDataType } from "../../types/flow";
|
||||||
import { nodeColors } from "../../utils/styleUtils";
|
import { nodeColors } from "../../utils/styleUtils";
|
||||||
|
|
||||||
export function getNodeOutputColors(output, data, types): string[] {
|
export function getNodeOutputColors(
|
||||||
|
output: OutputFieldType,
|
||||||
|
data: NodeDataType,
|
||||||
|
types: { [char: string]: string },
|
||||||
|
): string[] {
|
||||||
// Helper function to get the color based on type
|
// Helper function to get the color based on type
|
||||||
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;
|
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import useAlertStore from "../../stores/alertStore";
|
||||||
import ForwardedIconComponent from "../genericIconComponent";
|
import ForwardedIconComponent from "../genericIconComponent";
|
||||||
import { Separator } from "../ui/separator";
|
import { Separator } from "../ui/separator";
|
||||||
|
|
||||||
export default function ImageViewer({ image }) {
|
export default function ImageViewer({ image }: { image: string }) {
|
||||||
const viewerRef = useRef(null);
|
const viewerRef = useRef(null);
|
||||||
const [errorDownloading, setErrordownloading] = useState(false);
|
const [errorDownloading, setErrordownloading] = useState(false);
|
||||||
const setErrorList = useAlertStore((state) => state.setErrorData);
|
const setErrorList = useAlertStore((state) => state.setErrorData);
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,9 @@ import { useEffect, useRef, useState } from "react";
|
||||||
export default function HorizontalScrollFadeComponent({
|
export default function HorizontalScrollFadeComponent({
|
||||||
children,
|
children,
|
||||||
isFolder = true,
|
isFolder = true,
|
||||||
|
}: {
|
||||||
|
children: JSX.Element | JSX.Element[];
|
||||||
|
isFolder?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const scrollContainerRef = useRef<HTMLDivElement>(null);
|
const scrollContainerRef = useRef<HTMLDivElement>(null);
|
||||||
const fadeContainerRef = useRef<HTMLDivElement>(null);
|
const fadeContainerRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,12 @@
|
||||||
|
import { FolderType } from "../../../pages/MainPage/entities";
|
||||||
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
|
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
|
||||||
import useAlertStore from "../../../stores/alertStore";
|
import useAlertStore from "../../../stores/alertStore";
|
||||||
import { useFolderStore } from "../../../stores/foldersStore";
|
import { useFolderStore } from "../../../stores/foldersStore";
|
||||||
|
|
||||||
const useFolderSubmit = (setOpen, folderToEdit) => {
|
const useFolderSubmit = (
|
||||||
|
setOpen: (a: boolean) => void,
|
||||||
|
folderToEdit: FolderType | null,
|
||||||
|
) => {
|
||||||
const setSuccessData = useAlertStore((state) => state.setSuccessData);
|
const setSuccessData = useAlertStore((state) => state.setSuccessData);
|
||||||
const setErrorData = useAlertStore((state) => state.setErrorData);
|
const setErrorData = useAlertStore((state) => state.setErrorData);
|
||||||
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
|
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,13 @@
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
|
import { FolderType } from "../../../pages/MainPage/entities";
|
||||||
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
|
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
|
||||||
import useAlertStore from "../../../stores/alertStore";
|
import useAlertStore from "../../../stores/alertStore";
|
||||||
import { useFolderStore } from "../../../stores/foldersStore";
|
import { useFolderStore } from "../../../stores/foldersStore";
|
||||||
|
|
||||||
const useFolderSubmit = (setOpen, folderToEdit) => {
|
const useFolderSubmit = (
|
||||||
|
setOpen: (a: boolean) => void,
|
||||||
|
folderToEdit: FolderType | null,
|
||||||
|
) => {
|
||||||
const setSuccessData = useAlertStore((state) => state.setSuccessData);
|
const setSuccessData = useAlertStore((state) => state.setSuccessData);
|
||||||
const setErrorData = useAlertStore((state) => state.setErrorData);
|
const setErrorData = useAlertStore((state) => state.setErrorData);
|
||||||
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
|
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue