Merge branch 'dev' into ic/fixTweaksTab

This commit is contained in:
anovazzi1 2024-06-28 17:08:24 -03:00 • committed by GitHub
commit 324ad666d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 146 additions and 64 deletions

View file

@ -26,7 +26,7 @@ import useFlowStore from "../../stores/flowStore";
import useFlowsManagerStore from "../../stores/flowsManagerStore";
import { useShortcutsStore } from "../../stores/shortcuts";
import { useTypesStore } from "../../stores/typesStore";
import { VertexBuildTypeAPI } from "../../types/api";
import { OutputFieldType, VertexBuildTypeAPI } from "../../types/api";
import { NodeDataType } from "../../types/flow";
import { handleKeyDown, scapedJSONStringfy } from "../../utils/reactflowUtils";
import { nodeColors, nodeIconsLucide } from "../../utils/styleUtils";
@ -279,7 +279,7 @@ export default function GenericNode({
const shortcuts = useShortcutsStore((state) => state.shortcuts);
const renderOutputParameter = (output, idx) => {
const renderOutputParameter = (output: OutputFieldType, idx: number) => {
return (
<ParameterComponent
index={idx}

View file

@ -1,6 +1,10 @@
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
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;

View file

@ -1,6 +1,12 @@
import { OutputFieldType } from "../../types/api";
import { NodeDataType } from "../../types/flow";
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
const getColorByType = (type) => nodeColors[type] ?? nodeColors.unknown;

View file

@ -9,7 +9,10 @@ const useIconStatus = (
buildStatus: BuildStatus | undefined,
validationStatus: VertexBuildTypeAPI | null,
) => {
const conditionSuccess = validationStatus && validationStatus.valid;
const conditionSuccess =
!(!buildStatus || buildStatus === BuildStatus.TO_BUILD) &&
validationStatus &&
validationStatus.valid;
const conditionError = buildStatus === BuildStatus.ERROR;
const conditionInactive = buildStatus === BuildStatus.INACTIVE;

View file

@ -6,7 +6,7 @@ import useAlertStore from "../../stores/alertStore";
import ForwardedIconComponent from "../genericIconComponent";
import { Separator } from "../ui/separator";
export default function ImageViewer({ image }) {
export default function ImageViewer({ image }: { image: string }) {
const viewerRef = useRef(null);
const [errorDownloading, setErrordownloading] = useState(false);
const setErrorList = useAlertStore((state) => state.setErrorData);

View file

@ -3,6 +3,9 @@ import { useEffect, useRef, useState } from "react";
export default function HorizontalScrollFadeComponent({
children,
isFolder = true,
}: {
children: JSX.Element | JSX.Element[];
isFolder?: boolean;
}) {
const scrollContainerRef = useRef<HTMLDivElement>(null);
const fadeContainerRef = useRef<HTMLDivElement>(null);

View file

@ -1,8 +1,12 @@
import { FolderType } from "../../../pages/MainPage/entities";
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
import useAlertStore from "../../../stores/alertStore";
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 setErrorData = useAlertStore((state) => state.setErrorData);
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);

View file

@ -1,9 +1,13 @@
import { useNavigate } from "react-router-dom";
import { FolderType } from "../../../pages/MainPage/entities";
import { addFolder, updateFolder } from "../../../pages/MainPage/services";
import useAlertStore from "../../../stores/alertStore";
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 setErrorData = useAlertStore((state) => state.setErrorData);
const getFoldersApi = useFolderStore((state) => state.getFoldersApi);

View file

@ -99,6 +99,10 @@ export async function updateVerticesOrder(
const runId = orderResponse.data.run_id;
const verticesToRun = orderResponse.data.vertices_to_run;
useFlowStore
.getState()
.updateBuildStatus(verticesToRun, BuildStatus.TO_BUILD);
const verticesIds = orderResponse.data.ids;
useFlowStore.getState().updateVerticesBuild({
verticesLayers,