diff --git a/public/locales/en.json b/public/locales/en.json
index c9f218d8..da0ebcc7 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -580,7 +580,7 @@
"buttons": {
"stop": "Stop"
},
- "loading": "Loading data...",
+ "loading": "Extracting data...",
"empty_output": "No output data available",
"captured_data": {
"title": "Captured Data",
diff --git a/src/api/storage.ts b/src/api/storage.ts
index e584c36f..b5dc32de 100644
--- a/src/api/storage.ts
+++ b/src/api/storage.ts
@@ -1,7 +1,7 @@
import { default as axios } from "axios";
import { WorkflowFile } from "maxun-core";
import { RunSettings } from "../components/run/RunSettings";
-import { ScheduleSettings } from "../components/robot/ScheduleSettings";
+import { ScheduleSettings } from "../components/robot/pages/ScheduleSettingsPage";
import { CreateRunResponse, ScheduleRunResponse } from "../pages/MainPage";
import { apiUrl } from "../apiConfig";
diff --git a/src/components/api/ApiKey.tsx b/src/components/api/ApiKey.tsx
index 9feb9551..27897169 100644
--- a/src/components/api/ApiKey.tsx
+++ b/src/components/api/ApiKey.tsx
@@ -26,7 +26,8 @@ const Container = styled(Box)`
flex-direction: column;
align-items: center;
margin-top: 50px;
- margin-left: 50px;
+ margin-left: 70px;
+ margin-right: 70px;
`;
const ApiKeyManager = () => {
@@ -108,7 +109,7 @@ const ApiKeyManager = () => {
return (
-
+
Start by creating an API key below. Then,
test your API
@@ -139,7 +140,7 @@ const ApiKeyManager = () => {
{apiKeyName}
-
+
{showKey ? `${apiKey?.substring(0, 10)}...` : '**********'}
@@ -174,6 +175,5 @@ const ApiKeyManager = () => {
)}
);
-};
-
+}
export default ApiKeyManager;
\ No newline at end of file
diff --git a/src/components/dashboard/MainMenu.tsx b/src/components/dashboard/MainMenu.tsx
index 8b500d62..cd98ef21 100644
--- a/src/components/dashboard/MainMenu.tsx
+++ b/src/components/dashboard/MainMenu.tsx
@@ -72,7 +72,7 @@ export const MainMenu = ({ value = 'robots', handleChangeContent }: MainMenuProp
{
}, []);
return (
- <>
-
-
+
+
+
{t('proxy.title')}
-
+
{tabIndex === 0 && (
isProxyConfigured ? (
-
-
+
+
@@ -187,13 +198,13 @@ const ProxyForm: React.FC = () => {
-
)}
@@ -197,4 +190,4 @@ export const RobotConfigPage: React.FC = ({
)}
);
-};
+}
diff --git a/src/components/robot/pages/ScheduleSettingsPage.tsx b/src/components/robot/pages/ScheduleSettingsPage.tsx
index e386cfec..8933044b 100644
--- a/src/components/robot/pages/ScheduleSettingsPage.tsx
+++ b/src/components/robot/pages/ScheduleSettingsPage.tsx
@@ -7,7 +7,6 @@ import {
Box,
Button,
} from "@mui/material";
-import { Schedule } from "@mui/icons-material";
import { Dropdown } from "../../ui/DropdownMui";
import { validMomentTimezones } from "../../../constants/const";
import { useGlobalInfoStore } from "../../../context/globalInfo";
@@ -188,8 +187,8 @@ export const ScheduleSettingsPage = ({
display: "flex",
flexDirection: "column",
alignItems: "flex-start",
- "& > *": { marginBottom: "20px" },
- marginTop: "-20px",
+ gap: 3,
+ width: "100%",
}}
>
<>
@@ -215,7 +214,7 @@ export const ScheduleSettingsPage = ({
{t("schedule_settings.at_around")}: {schedule.atTimeStart},{" "}
{schedule.timezone} {t("schedule_settings.timezone")}
-
+
{captureTextData.map((textStep: any, index) => {
- const isEditing = editingTextLabel === textStep.id;
+ const isEditing = editing.stepId === textStep.id && editing.type === 'text';
return (
= ({ isOpen, se
{isEditing ? (
setEditingTextLabelValue(e.target.value)}
- onBlur={handleSaveTextLabel}
+ value={editing.value}
+ onChange={(e) => setEditing({ ...editing, value: e.target.value })}
+ onBlur={saveEdit}
onKeyDown={(e) => {
- if (e.key === 'Enter') handleSaveTextLabel();
- if (e.key === 'Escape') handleCancelTextLabel();
+ if (e.key === 'Enter') saveEdit();
+ if (e.key === 'Escape') cancelEdit();
}}
autoFocus
size="small"
@@ -1102,7 +1044,7 @@ export const InterpretationLog: React.FC = ({ isOpen, se
/>
= ({ isOpen, se
textDecoration: 'underline'
}
}}
- onClick={() => handleStartEditTextLabel(textStep.id, textStep.label)}
+ onClick={() => startEdit(textStep.id, 'text', textStep.label)}
>
{textStep.label}
diff --git a/src/components/run/RunContent.tsx b/src/components/run/RunContent.tsx
index 4cc787d1..197f4b1f 100644
--- a/src/components/run/RunContent.tsx
+++ b/src/components/run/RunContent.tsx
@@ -615,7 +615,7 @@ export const RunContent = ({ row, currentLog, interpretationInProgress, logEndRe
return (
-
+
{row.status === 'running' || row.status === 'queued' ? (
diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx
index 86178117..4f302135 100644
--- a/src/pages/MainPage.tsx
+++ b/src/pages/MainPage.tsx
@@ -1,7 +1,7 @@
import React, { useCallback, useContext, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { MainMenu } from "../components/dashboard/MainMenu";
-import { Stack } from "@mui/material";
+import { Stack, Box } from "@mui/material";
import { Recordings } from "../components/robot/Recordings";
import { Runs } from "../components/run/Runs";
import ProxyForm from '../components/proxy/ProxyForm';
@@ -11,7 +11,7 @@ import { createAndRunRecording, createRunForStoredRecording, CreateRunResponseWi
import { io, Socket } from "socket.io-client";
import { stopRecording } from "../api/recording";
import { RunSettings } from "../components/run/RunSettings";
-import { ScheduleSettings } from "../components/robot/ScheduleSettings";
+import { ScheduleSettings } from "../components/robot/pages/ScheduleSettingsPage";
import { apiUrl } from "../apiConfig";
import { useNavigate } from 'react-router-dom';
import { AuthContext } from '../context/auth';
@@ -318,12 +318,29 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)
}
}
- return (
-
-
+return (
+
+
-
+
+
+
{DisplayContent()}
-
- );
-};
+
+
+)
+}
diff --git a/src/pages/PageWrapper.tsx b/src/pages/PageWrapper.tsx
index 85bf311f..ea676300 100644
--- a/src/pages/PageWrapper.tsx
+++ b/src/pages/PageWrapper.tsx
@@ -13,6 +13,7 @@ import UserRoute from '../routes/userRoute';
import { Routes, Route, useNavigate, Navigate } from 'react-router-dom';
import { NotFoundPage } from '../components/dashboard/NotFound';
import RobotCreate from '../components/robot/pages/RobotCreate';
+import { Box } from '@mui/material';
export const PageWrapper = () => {
const [open, setOpen] = useState(false);
@@ -84,44 +85,61 @@ export const PageWrapper = () => {
}
}
}, [location.pathname, navigate, setBrowserId, setRecordingId, setRecordingName, setRecordingUrl]);
+
+ const isAuthPage = location.pathname === '/login' || location.pathname === '/register';
+ const isRecordingPage = location.pathname === '/recording';
return (
- {/* {!browserId && location.pathname !== '/recording' && } */}
- {location.pathname !== '/recording' && }
-
- }>
- } />
- } />
- } />
- } />
- } />
- } />
-
- }>
-
-
-
- } />
-
- }
- />
- }
- />
- }
- />
- } />
-
+ {/* Show NavBar only for main app pages, not for recording pages */}
+ {!isRecordingPage && (
+
+
+
+ )}
+
+
+ }>
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+
+ }>
+
+
+
+ } />
+
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+
+