diff --git a/README.md b/README.md index 71a29d46..5e0ec665 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ node - release + release language diff --git a/package.json b/package.json index 409e0ce9..6b2e81c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "0.14.2", + "version": "0.14.4", "private": true, "dependencies": { "@emotion/css": "^11.10.6", diff --git a/src/components/CreateForms/CreateEnvironmentFormStep1.tsx b/src/components/CreateForms/CreateEnvironmentFormStep1.tsx index 63584fe5..d8f7c1f8 100644 --- a/src/components/CreateForms/CreateEnvironmentFormStep1.tsx +++ b/src/components/CreateForms/CreateEnvironmentFormStep1.tsx @@ -49,12 +49,12 @@ export default function CreateEnvironmentFormStep1({ instanceId: selectedState?.instance?.instanceId, region: selectedState?.roboticsCloud?.region!, fleetName: selectedState?.fleet?.name, - environmentName: robotData?.step1?.robotName || url?.robotName, + environmentName: url?.robotName!, }, { - ifErrorNavigateTo404: false, + ifErrorNavigateTo404: !responseRobot, setResponse: setResponseRobot, - setRobotData: setRobotData, + setRobotData: true, } ); } @@ -159,7 +159,10 @@ export default function CreateEnvironmentFormStep1({ {/* RobotName */} {/* Environment Selector */} - + {/* Environment Selector */} {formik.values.application?.name && } diff --git a/src/components/CreateForms/CreateRobotFormStep2.tsx b/src/components/CreateForms/CreateRobotFormStep2.tsx index c0f86374..72fc276b 100644 --- a/src/components/CreateForms/CreateRobotFormStep2.tsx +++ b/src/components/CreateForms/CreateRobotFormStep2.tsx @@ -292,44 +292,44 @@ export default function CreateRobotFormStep2({ onClick={() => handleAddWorkspaceStep(formik)} /> - {/* Buttons */} -
- {!isImportRobot && ( - - )} -
- {/* Buttons */} + } + /> + + )} ); diff --git a/src/components/EnvironmentSelector/EnvironmentSelector.tsx b/src/components/EnvironmentSelector/EnvironmentSelector.tsx index c3a41d9d..950fc167 100644 --- a/src/components/EnvironmentSelector/EnvironmentSelector.tsx +++ b/src/components/EnvironmentSelector/EnvironmentSelector.tsx @@ -7,7 +7,7 @@ import InfoTip from "../InfoTip/InfoTip"; interface IEnvironmentSelector { formik: any; - isImportRobot: boolean; + isImportRobot?: boolean; } export default function EnvironmentSelector({ @@ -26,7 +26,7 @@ export default function EnvironmentSelector({ }, [dispatch]); useEffect(() => { - if (formik.values?.domainName) { + if (formik.initialValues?.domainName !== formik.values?.domainName) { formik.setFieldValue("application", { name: undefined, version: undefined, @@ -38,7 +38,7 @@ export default function EnvironmentSelector({ }); } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [formik.values?.domainName]); + }, [formik?.values?.domainName, formik?.initialValues?.domainName]); return ( diff --git a/src/components/TableActionCells/InstanceActionCells.tsx b/src/components/TableActionCells/InstanceActionCells.tsx index 160f3e67..bd1cff12 100644 --- a/src/components/TableActionCells/InstanceActionCells.tsx +++ b/src/components/TableActionCells/InstanceActionCells.tsx @@ -3,7 +3,10 @@ import Button from "../Button/Button"; import { BiTrash, BiStopCircle, BiPlayCircle } from "react-icons/bi"; import ChangeStateInstanceModal from "../../modals/ChangeStateInstanceModal"; import TerminateInstanceModal from "../../modals/TerminateInstanceModal"; -import { envOnPremiseRobot } from "../../helpers/envProvider"; +import { + envOnPremiseFleet, + envOnPremiseRobot, +} from "../../helpers/envProvider"; interface IInstanceActionCells { data: any; @@ -19,6 +22,8 @@ export default function InstanceActionCells({ const [isTerminateModalVisible, setIsTerminateModalVisible] = useState(false); + console.log(data); + return (
@@ -29,7 +34,9 @@ export default function InstanceActionCells({ : "!border-layer-dark-100" }`} text={ - data?.state === "running" ? ( + data?.state === "running" || + envOnPremiseRobot || + envOnPremiseFleet ? ( ([]); useEffect(() => { + const workspacesData = workspaces; + setGithubWorkspaces([]); - workspaces?.forEach(async (workspace: any) => { + workspacesData?.forEach(async (workspace: any) => { try { const response = await axios.get( workspace?.url.replace( @@ -32,11 +34,11 @@ export default function WorkspacesCell({ }, ]); } catch (error) { - // Hata durumunda işlemi burada yönetebilirsiniz console.error("Error:", error); } }); - }, [workspaces]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); return (
@@ -59,7 +61,6 @@ export default function WorkspacesCell({ src="/svg/apps/github.svg" alt="github" /> - {workspace?.full_name}
diff --git a/src/contexts/FunctionsContext.tsx b/src/contexts/FunctionsContext.tsx index 7f86cd4b..e0337b98 100644 --- a/src/contexts/FunctionsContext.tsx +++ b/src/contexts/FunctionsContext.tsx @@ -1041,10 +1041,6 @@ export default ({ children }: any) => { responseEnvironment?.payload?.data[0].roboticsClouds[0] ?.cloudInstances[0]?.environments ) { - console.log( - responseEnvironment?.payload?.data[0].roboticsClouds[0] - ?.cloudInstances[0]?.environments - ); parameters?.setRobotData && setRobotData((prevState: any) => { return {