diff --git a/Common/Types/BrowserType.ts b/Common/Types/BrowserType.ts new file mode 100644 index 0000000000..2926512d9c --- /dev/null +++ b/Common/Types/BrowserType.ts @@ -0,0 +1,7 @@ +export enum BrowserType { + Chrome = 'Chrome', + Firefox = 'Firefox', + Safari = 'Safari', +} + +export default BrowserType; \ No newline at end of file diff --git a/Common/Types/Monitor/SyntheticMonitors/BrowserType.ts b/Common/Types/Monitor/SyntheticMonitors/BrowserType.ts new file mode 100644 index 0000000000..fa148d12d8 --- /dev/null +++ b/Common/Types/Monitor/SyntheticMonitors/BrowserType.ts @@ -0,0 +1,3 @@ +import BrowserType from "../../BrowserType"; + +export default BrowserType; \ No newline at end of file diff --git a/Common/Types/Monitor/SyntheticMonitors/ScreenSizeType.ts b/Common/Types/Monitor/SyntheticMonitors/ScreenSizeType.ts new file mode 100644 index 0000000000..74bd9567a7 --- /dev/null +++ b/Common/Types/Monitor/SyntheticMonitors/ScreenSizeType.ts @@ -0,0 +1,3 @@ +import ScreenSizeType from "../../ScreenSizeType"; + +export default ScreenSizeType; \ No newline at end of file diff --git a/Common/Types/ScreenSizeType.ts b/Common/Types/ScreenSizeType.ts new file mode 100644 index 0000000000..d6afa8d012 --- /dev/null +++ b/Common/Types/ScreenSizeType.ts @@ -0,0 +1,7 @@ +enum ScreenSizeType { + Mobile = 'Mobile', + Tablet = 'Tablet', + Desktop = 'Desktop' +} + +export default ScreenSizeType; \ No newline at end of file diff --git a/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx b/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx index 727decabdd..da56d2180b 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx @@ -27,6 +27,7 @@ import HorizontalRule from 'CommonUI/src/Components/HorizontalRule/HorizontalRul import Exception from 'Common/Types/Exception/Exception'; import Hostname from 'Common/Types/API/Hostname'; import Port from 'Common/Types/Port'; +import CheckBoxList from 'CommonUI/src/Components/CategoryCheckbox/CheckboxList'; export interface ComponentProps { monitorStatusDropdownOptions: Array; @@ -274,7 +275,7 @@ const MonitorStepElement: FunctionComponent = ( ) => { monitorStep.setRequestType( (value?.toString() as HTTPMethod) || - HTTPMethod.GET + HTTPMethod.GET ); setMonitorStep( MonitorStep.clone(monitorStep) @@ -345,7 +346,7 @@ const MonitorStepElement: FunctionComponent = ( }} error={ touched['requestBody'] && - errors['requestBody'] + errors['requestBody'] ? errors['requestBody'] : undefined } @@ -382,13 +383,13 @@ const MonitorStepElement: FunctionComponent = ( = ( )} + + {props.monitorType === MonitorType.SyntheticMonitor && ( +
+ +
+ +
+
+ )} + + + {props.monitorType === MonitorType.SyntheticMonitor && ( +
+ +
+ +
+
+ )} +
{props.monitorType !== MonitorType.IncomingRequest && (