diff --git a/APIReference/Service/Model.ts b/APIReference/Service/Model.ts index 2b42f06253..14ae900223 100644 --- a/APIReference/Service/Model.ts +++ b/APIReference/Service/Model.ts @@ -3,7 +3,10 @@ import ResourceUtil, { ModelDocumentation } from "../Utils/Resources"; import PageNotFoundServiceHandler from "./PageNotFound"; import { AppApiRoute } from "Common/ServiceRoute"; import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl"; -import { getTableColumns, TableColumnMetadata } from "Common/Types/Database/TableColumn"; +import { + getTableColumns, + TableColumnMetadata, +} from "Common/Types/Database/TableColumn"; import Dictionary from "Common/Types/Dictionary"; import ObjectID from "Common/Types/ObjectID"; import Permission, { @@ -56,7 +59,9 @@ export default class ServiceHandler { page = "model"; // Get table columns for current resource - const tableColumns: Dictionary = getTableColumns(currentResource.model); + const tableColumns: Dictionary = getTableColumns( + currentResource.model, + ); // Filter out columns with no access for (const key in tableColumns) { diff --git a/Common/Server/Utils/Monitor/MonitorTemplateUtil.ts b/Common/Server/Utils/Monitor/MonitorTemplateUtil.ts index aa95638352..02ae384363 100644 --- a/Common/Server/Utils/Monitor/MonitorTemplateUtil.ts +++ b/Common/Server/Utils/Monitor/MonitorTemplateUtil.ts @@ -96,8 +96,8 @@ export default class MonitorTemplateUtil { replaced = replaced !== undefined && replaced !== null ? `${replaced}` : ""; - logger.debug(`Original Value: ${data.value}`); - logger.debug(`Replaced Value: ${replaced}`); + logger.debug(`Original Value: ${data.value}`); + logger.debug(`Replaced Value: ${replaced}`); return replaced; } catch (err) { diff --git a/Common/Server/Utils/VM/VMAPI.ts b/Common/Server/Utils/VM/VMAPI.ts index aaf3741f99..cd0b6f7b09 100644 --- a/Common/Server/Utils/VM/VMAPI.ts +++ b/Common/Server/Utils/VM/VMAPI.ts @@ -88,7 +88,7 @@ export default class VMUtil { ); let valueToReplaceInPlace: string; - + // Properly serialize objects to JSON strings if (typeof foundValue === "object" && foundValue !== null) { valueToReplaceInPlace = JSON.stringify(foundValue, null, 2); diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaAlertForm.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaAlertForm.tsx index ea00b7f14a..cc84b42daf 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaAlertForm.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaAlertForm.tsx @@ -55,13 +55,13 @@ const MonitorCriteriaAlertForm: FunctionComponent = ( }, description: (

- You can use dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information. for more information.

@@ -78,16 +78,14 @@ const MonitorCriteriaAlertForm: FunctionComponent = ( placeholder: "Description", description: (

- You can use dynamic templates here. + You can use dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information. -

), }, @@ -138,13 +136,13 @@ const MonitorCriteriaAlertForm: FunctionComponent = ( stepId: "alert-details", description: (

- You can use dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information.

), diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx index f52fce7d56..43493d9bf8 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx @@ -54,13 +54,13 @@ const MonitorCriteriaIncidentForm: FunctionComponent = ( }, description: (

- You can use dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information.

), @@ -76,13 +76,13 @@ const MonitorCriteriaIncidentForm: FunctionComponent = ( placeholder: "Description", description: (

- You can use dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information.

), @@ -133,13 +133,13 @@ const MonitorCriteriaIncidentForm: FunctionComponent = ( description: (

Notes for on-call engineer to resolve this incident. You can use - dynamic templates here. - Please refer to the - documentation for more information. + Please refer to the documentation for more information.

), diff --git a/Dashboard/src/Pages/Settings/Probes.tsx b/Dashboard/src/Pages/Settings/Probes.tsx index 04719b6be9..3bd0785338 100644 --- a/Dashboard/src/Pages/Settings/Probes.tsx +++ b/Dashboard/src/Pages/Settings/Probes.tsx @@ -110,8 +110,6 @@ const ProbePage: FunctionComponent = (): ReactElement => { hideOnMobile={true} /> - - modelType={Probe} query={{ @@ -357,51 +355,57 @@ const ProbePage: FunctionComponent = (): ReactElement => { { - return item.doNotAddGlobalProbesByDefaultOnNewMonitors ? ( - Global probes disabled for new monitors. New monitors will not have Global Probes assigned by default. - ) : ( - Global probes enabled for new monitors. New monitors will have Global Probes assigned by default. - ); - } + placeholder: "New Monitors will have Global Probes by default", + getElement: (item: Project): ReactElement => { + return item.doNotAddGlobalProbesByDefaultOnNewMonitors ? ( + + Global probes disabled for new monitors. New monitors will + not have Global Probes assigned by default. + + ) : ( + + Global probes enabled for new monitors. New monitors will + have Global Probes assigned by default. + + ); }, - ], - modelId: ProjectUtil.getCurrentProjectId()!, - }} - /> + }, + ], + modelId: ProjectUtil.getCurrentProjectId()!, + }} + /> ); };