fix: Correct spelling of 'evaluateOverTime' in multiple criteria files

2026-04-06 00:32:12 +02:00 · 2026-01-29 08:38:35 +00:00
parent 2a6003e78f
commit 83993fc2a4
12 changed files with 24 additions and 21 deletions
--- a/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts
@@ -27,7 +27,7 @@ export default class APIRequestCriteria {
      undefined;

    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      try {
--- a/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts
@@ -553,7 +553,7 @@ export default class CompareCriteria {
    }

    if (
-      data.criteriaFilter.eveluateOverTime &&
+      data.criteriaFilter.evaluateOverTime &&
      data.criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes
    ) {
      message += ` over the last ${data.criteriaFilter.evaluateOverTimeOptions.timeValueInMinutes} minutes`;
--- a/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts
@@ -41,7 +41,7 @@ export default class IncomingRequestCriteria {
      undefined;

    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      try {
--- a/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts
@@ -31,7 +31,7 @@ export default class ServerMonitorCriteria {
      undefined;

    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      try {
--- a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts
@@ -29,7 +29,7 @@ export default class ServerMonitorCriteria {
      undefined;

    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      try {
@@ -69,7 +69,7 @@ export default class ServerMonitorCriteria {

    // check evaluate  over time.
    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      offlineIfNotCheckedInMinutes =
--- a/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts
+++ b/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts
@@ -32,7 +32,7 @@ export default class SnmpMonitorCriteria {
      undefined;

    if (
-      input.criteriaFilter.eveluateOverTime &&
+      input.criteriaFilter.evaluateOverTime &&
      input.criteriaFilter.evaluateOverTimeOptions
    ) {
      try {
--- a/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts
+++ b/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts
@@ -116,7 +116,7 @@ export default class MonitorCriteriaExpectationBuilder {
    const parts: Array<string> = [];

    if (
-      criteriaFilter.eveluateOverTime &&
+      criteriaFilter.evaluateOverTime &&
      criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes
    ) {
      parts.push(
--- a/Common/Types/Monitor/CriteriaFilter.ts
+++ b/Common/Types/Monitor/CriteriaFilter.ts
@@ -108,7 +108,7 @@ export interface CriteriaFilter {
  snmpMonitorOptions?: SnmpMonitorOptions | undefined;
  filterType: FilterType | undefined;
  value: string | number | undefined;
-  eveluateOverTime?: boolean | undefined;
+  evaluateOverTime?: boolean | undefined;
  evaluateOverTimeOptions?: EvaluateOverTimeOptions | undefined;
 }

@@ -223,7 +223,7 @@ export const CriteriaFilterSchema: ZodSchema = Zod.object({
  }).optional(),
  filterType: Zod.string().optional(),
  value: Zod.union([Zod.string(), Zod.number()]).optional(),
-  eveluateOverTime: Zod.boolean().optional(),
+  evaluateOverTime: Zod.boolean().optional(),
  evaluateOverTimeOptions: Zod.object({
    timeValueInMinutes: Zod.number().optional(),
    evaluateOverTimeType: Zod.string().optional(),
--- a/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx
+++ b/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx
@@ -180,7 +180,7 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (
                checkOn: value?.toString() as CheckOn,
                filterType: undefined,
                value: undefined,
-                eveluateOverTime: false,
+                evaluateOverTime: false,
                evaluateOverTimeOptions: undefined,
              });
            }}
@@ -260,12 +260,12 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (
          ) && (
            <div className="mt-3">
              <CheckboxElement
-                value={criteriaFilter?.eveluateOverTime}
+                value={criteriaFilter?.evaluateOverTime}
                title={"Evaluate this criteria over a period of time"}
                onChange={(value: boolean) => {
                  props.onChange?.({
                    ...criteriaFilter,
-                    eveluateOverTime: value,
+                    evaluateOverTime: value,
                  });
                }}
              />
@@ -275,7 +275,7 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (
        {criteriaFilter?.checkOn &&
        criteriaFilter?.checkOn &&
        CriteriaFilterUtil.isEvaluateOverTimeFilter(criteriaFilter?.checkOn) &&
-        criteriaFilter.eveluateOverTime ? (
+        criteriaFilter.evaluateOverTime ? (
          <div className="mt-1">
            <FieldLabelElement title="Evaluate" />
            <Dropdown
@@ -296,7 +296,7 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (

                props.onChange?.({
                  ...criteriaFilter,
-                  eveluateOverTime: true,
+                  evaluateOverTime: true,
                  evaluateOverTimeOptions: {
                    ...evaluateOverTimeOption,
                    evaluateOverTimeType:
@@ -313,7 +313,7 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (
        {criteriaFilter?.checkOn &&
        criteriaFilter?.checkOn &&
        CriteriaFilterUtil.isEvaluateOverTimeFilter(criteriaFilter?.checkOn) &&
-        criteriaFilter.eveluateOverTime ? (
+        criteriaFilter.evaluateOverTime ? (
          <div className="mt-1">
            <FieldLabelElement title="For the last (in minutes)" />
            <Dropdown
@@ -334,7 +334,7 @@ const CriteriaFilterElement: FunctionComponent<ComponentProps> = (

                props.onChange?.({
                  ...criteriaFilter,
-                  eveluateOverTime: true,
+                  evaluateOverTime: true,
                  evaluateOverTimeOptions: {
                    ...evaluateOverTimeOption,
                    timeValueInMinutes: value as number,
--- a/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts
+++ b/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts
@@ -46,7 +46,7 @@ export default class CriteriaFilterUtil {

    // check evaluation over time values.
    if (
-      criteriaFilter?.eveluateOverTime &&
+      criteriaFilter?.evaluateOverTime &&
      criteriaFilter.evaluateOverTimeOptions?.evaluateOverTimeType
    ) {
      if (
@@ -96,7 +96,7 @@ export default class CriteriaFilterUtil {

      // add minutes if evaluate over time is true
      if (
-        criteriaFilter?.eveluateOverTime &&
+        criteriaFilter?.evaluateOverTime &&
        criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes
      ) {
        text +=
--- a/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts
@@ -103,7 +103,7 @@ export default class SnmpMonitor {

      if (isTimeout) {
        return {
-          isOnline: true,
+          isOnline: false,
          isTimeout: true,
          responseTimeInMs: responseTimeInMs,
          failureCause:
--- a/ProbeIngest/Utils/Monitor.ts
+++ b/ProbeIngest/Utils/Monitor.ts
@@ -42,7 +42,7 @@ export default class MonitorUtil {
    monitorType: MonitorType;
    monitorId: ObjectID;
  }): Promise<MonitorSteps> {
-    const isSecretsLoaded: boolean = false;
+    let isSecretsLoaded: boolean = false;
    let monitorSecrets: MonitorSecret[] = [];

    const monitorSteps: MonitorSteps = data.monitorSteps;
@@ -148,6 +148,7 @@ export default class MonitorUtil {
        ) {
          if (!isSecretsLoaded) {
            monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId);
+            isSecretsLoaded = true;
          }

          monitorStep.data.snmpMonitor.communityString =
@@ -164,6 +165,7 @@ export default class MonitorUtil {
        ) {
          if (!isSecretsLoaded) {
            monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId);
+            isSecretsLoaded = true;
          }

          monitorStep.data.snmpMonitor.snmpV3Auth.authKey =
@@ -181,6 +183,7 @@ export default class MonitorUtil {
        ) {
          if (!isSecretsLoaded) {
            monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId);
+            isSecretsLoaded = true;
          }

          monitorStep.data.snmpMonitor.snmpV3Auth.privKey =