@oneuptime/common 7.0.2976 → 7.0.2986

package/Types/BaseDatabase/QueryOperator.ts

@@ -0,0 +1,11 @@
+import GenericObject from "../GenericObject";
+import { JSONObject } from "../JSON";
+import SerializableObject from "../SerializableObject";
+
+export default class QueryOperator<
+  T extends GenericObject,
+> extends SerializableObject {
+  public override fromJSON(json: JSONObject): QueryOperator<T> {
+    return SerializableObject.fromJSON(json) as QueryOperator<T>;
+  }
+}

package/Types/BaseDatabase/Search.ts

@@ -1,37 +1,39 @@
 import BadDataException from "../Exception/BadDataException";
 import { JSONObject, ObjectType } from "../JSON";
-import SerializableObject from "../SerializableObject";
+import QueryOperator from "./QueryOperator";
 
-export default class Search extends SerializableObject {
-  private _searchValue!: string;
+export default class Search<T extends string> extends QueryOperator<T> {
+  private _searchValue!: T;
 
-  public get value(): string {
+  public get value(): T {
     return this._searchValue;
   }
 
-  public set value(v: string) {
+  public set value(v: T) {
     this._searchValue = v;
   }
 
-  public constructor(value: string) {
+  public constructor(value: T) {
     super();
     this.value = value;
   }
 
-  public override toString(): string {
+  public override toString(): T {
     return this.value;
   }
 
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.Search,
-      value: (this as Search).toString(),
+      value: (this as Search<T>).toString(),
     };
   }
 
-  public static override fromJSON(json: JSONObject): Search {
+  public static override fromJSON<T extends string>(
+    json: JSONObject,
+  ): Search<T> {
     if (json["_type"] === ObjectType.Search) {
-      return new Search((json["value"] as string) || "");
+      return new Search<T>((json["value"] as T) || ("" as T));
     }
 
     throw new BadDataException("Invalid JSON: " + JSON.stringify(json));

package/Types/BrandColors.ts

@@ -65,3 +65,11 @@ export const BrightColors: Color[] = [
   Lime500,
   Amber500,
 ];
+
+export const ChartColors: Color[] = [
+  Indigo500,
+  Rose500,
+  Green500,
+  Cyan500,
+  Gray500,
+];

package/Types/Database/CompareBase.ts

@@ -1,17 +1,21 @@
+import QueryOperator from "../BaseDatabase/QueryOperator";
 import BadDataException from "../Exception/BadDataException";
-import SerializableObject from "../SerializableObject";
 import Typeof from "../Typeof";
 
-export default class CompareBase extends SerializableObject {
-  private _value!: number | Date;
-  public get value(): number | Date {
+export type CompareType = number | Date | string;
+
+export default class CompareBase<
+  T extends CompareType,
+> extends QueryOperator<T> {
+  private _value!: T;
+  public get value(): T {
     return this._value;
   }
-  public set value(v: number | Date) {
+  public set value(v: T) {
     this._value = v;
   }
 
-  public constructor(value: number | Date) {
+  public constructor(value: T) {
     super();
     this.value = value;
   }

package/Types/Database/Date.ts

@@ -4,7 +4,7 @@ import OneUptimeDate from "../Date";
 export default class DatabaseDate {
   public static asDateStartOfTheDayEndOfTheDayForDatabaseQuery(
     date: string | Date,
-  ): InBetween {
+  ): InBetween<string> {
     let startValue: string | Date = date;
 
     if (!(startValue instanceof Date)) {

package/Types/Date.ts

@@ -1127,7 +1127,9 @@ export default class OneUptimeDate {
     return moment(date).local().format(formatstring);
   }
 
-  public static asFilterDateForDatabaseQuery(date: string | Date): InBetween {
+  public static asFilterDateForDatabaseQuery(
+    date: string | Date,
+  ): InBetween<Date> {
     date = this.fromString(date);
     const formattedDate: Date = moment(date).toDate();
     return new InBetween(

package/Types/Domain.ts

@@ -26,7 +26,7 @@ export default class Domain extends DatabaseProperty {
         "|",
       );
     const secondTLDs: Array<string> =
-      "ac|academy|accountant|accountants|actor|adult|aero|ag|agency|ai|airforce|am|amsterdam|apartments|app|archi|army|art|asia|associates|at|attorney|au|auction|auto|autos|baby|band|bar|barcelona|bargains|basketball|bayern|be|beauty|beer|berlin|best|bet|bid|bike|bingo|bio|biz|biz.pl|black|blog|blue|boats|boston|boutique|broker|build|builders|business|buzz|bz|ca|cab|cafe|camera|camp|capital|car|cards|care|careers|cars|casa|cash|casino|catering|cc|center|ceo|ch|charity|chat|cheap|church|city|cl|claims|cleaning|clinic|clothing|cloud|club|cn|co|co.in|co.jp|co.kr|co.nz|co.uk|co.za|coach|codes|coffee|college|com|com.ag|com.au|com.br|com.bz|com.cn|com.co|com.es|com.ky|com.mx|com.pe|com.ph|com.pl|com.ru|com.tw|community|company|computer|condos|construction|consulting|contact|contractors|cooking|cool|country|coupons|courses|credit|creditcard|cricket|cruises|cymru|cz|dance|date|dating|de|deals|degree|delivery|democrat|dental|dentist|design|dev|diamonds|digital|direct|directory|discount|dk|doctor|dog|domains|download|earth|education|email|energy|engineer|engineering|enterprises|equipment|es|estate|eu|events|exchange|expert|exposed|express|fail|faith|family|fan|fans|farm|fashion|film|finance|financial|firm.in|fish|fishing|fit|fitness|flights|florist|fm|football|forsale|foundation|fr|fun|fund|furniture|futbol|fyi|gallery|games|garden|gay|gen.in|gg|gifts|gives|giving|glass|global|gmbh|gold|golf|graphics|gratis|green|gripe|group|gs|guide|guru|hair|haus|health|healthcare|hockey|holdings|holiday|homes|horse|hospital|host|house|idv.tw|immo|immobilien|in|inc|ind.in|industries|info|info.pl|ink|institute|insure|international|investments|io|irish|ist|istanbul|it|jetzt|jewelry|jobs|jp|kaufen|kids|kim|kitchen|kiwi|kr|ky|la|land|lat|law|lawyer|lease|legal|lgbt|life|lighting|limited|limo|live|llc|llp|loan|loans|london|love|ltd|ltda|luxury|maison|makeup|management|market|marketing|mba|me|me.uk|media|melbourne|memorial|men|menu|miami|mobi|moda|moe|money|monster|mortgage|motorcycles|movie|ms|music|mx|nagoya|name|navy|ne.kr|net|net.ag|net.au|net.br|net.bz|net.cn|net.co|net.in|net.ky|net.nz|net.pe|net.ph|net.pl|net.ru|network|news|ninja|nl|no|nom.co|nom.es|nom.pe|nrw|nyc|okinawa|one|onl|online|org|org.ag|org.au|org.cn|org.es|org.in|org.ky|org.nz|org.pe|org.ph|org.pl|org.ru|org.uk|organic|page|paris|partners|parts|party|pe|pet|ph|photography|photos|pictures|pink|pizza|pl|place|plumbing|plus|poker|porn|press|pro|productions|promo|properties|protection|pub|pw|quebec|quest|racing|re.kr|realestate|recipes|red|rehab|reise|reisen|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|rip|rocks|rodeo|rugby|run|ryukyu|sale|salon|sarl|school|schule|science|se|security|services|sex|sg|sh|shiksha|shoes|shop|shopping|show|singles|site|ski|skin|soccer|social|software|solar|solutions|space|storage|store|stream|studio|study|style|supplies|supply|support|surf|surgery|sydney|systems|tax|taxi|team|tech|technology|tel|tennis|theater|theatre|tickets|tienda|tips|tires|today|tokyo|tools|tours|town|toys|trade|trading|training|travel|tube|tv|tw|uk|university|uno|us|vacations|vc|vegas|ventures|vet|viajes|video|villas|vin|vip|vision|vodka|vote|voto|voyage|wales|watch|web|webcam|website|wedding|wiki|win|wine|work|works|world|ws|wtf|xxx|xyz|yachts|yoga|yokohama|zone|移动|dev|com|edu|gov|net|mil|org|nom|sch|sbs|caa|res|off|gob|int|tur|ip6|uri|urn|asn|act|nsw|qld|tas|vic|pro|biz|adm|adv|agr|arq|art|ato|bio|bmd|cim|cng|cnt|ecn|eco|emp|eng|esp|etc|eti|far|fnd|fot|fst|g12|ggf|imb|ind|inf|jor|jus|leg|lel|mat|med|mus|not|ntr|odo|ppg|psc|psi|qsl|rec|slg|srv|teo|tmp|trd|vet|zlg|web|ltd|sld|pol|fin|k12|lib|pri|aip|fie|eun|sci|prd|cci|pvt|mod|idv|rel|sex|gen|nic|abr|bas|cal|cam|emr|fvg|laz|lig|lom|mar|mol|pmn|pug|sar|sic|taa|tos|umb|vao|vda|ven|mie|北海道|和歌山|神奈川|鹿児島|ass|rep|tra|per|ngo|soc|grp|plc|its|air|and|bus|can|ddr|jfk|mad|nrw|nyc|ski|spy|tcm|ulm|usa|war|fhs|vgs|dep|eid|fet|fla|flå|gol|hof|hol|sel|vik|cri|iwi|ing|abo|fam|gok|gon|gop|gos|aid|atm|gsm|sos|elk|waw|est|aca|bar|cpa|jur|law|sec|plo|www|bir|cbg|jar|khv|msk|nov|nsk|ptz|rnd|spb|stv|tom|tsk|udm|vrn|cmw|kms|nkz|snz|pub|fhv|red|ens|nat|rns|rnu|bbs|tel|bel|kep|nhs|dni|fed|isa|nsn|gub|e12|tec|орг|обр|упр|alt|nis|jpn|mex|ath|iki|nid|gda|inc|za|ovh|lol".split(
+      "ac|academy|accountant|accountants|actor|adult|aero|ag|agency|ai|airforce|am|amsterdam|apartments|app|archi|army|art|asia|associates|at|attorney|au|auction|auto|autos|baby|band|bar|barcelona|bargains|basketball|bayern|be|beauty|beer|berlin|best|bet|bid|bike|bingo|bio|biz|biz.pl|black|blog|blue|boats|boston|boutique|broker|build|builders|business|buzz|bz|ca|cab|cafe|camera|camp|capital|car|cards|care|careers|cars|casa|cash|casino|catering|cc|center|ceo|ch|charity|chat|cheap|church|city|cl|claims|cleaning|clinic|clothing|cloud|club|cn|co|co.in|co.jp|co.kr|co.nz|co.uk|co.za|coach|codes|coffee|college|com|com.ag|com.au|com.br|com.bz|com.cn|com.co|com.es|com.ky|com.mx|com.pe|com.ph|com.pl|com.ru|com.tw|community|company|computer|condos|construction|consulting|contact|contractors|cooking|cool|country|coupons|courses|credit|creditcard|cricket|cruises|cymru|cz|dance|date|dating|de|deals|degree|delivery|democrat|dental|dentist|design|dev|diamonds|digital|direct|directory|discount|dk|doctor|dog|domains|download|earth|education|email|energy|engineer|engineering|enterprises|equipment|es|estate|eu|events|exchange|expert|exposed|express|fail|faith|family|fan|fans|farm|fashion|film|finance|financial|firm.in|fish|fishing|fit|fitness|flights|florist|fm|football|forsale|foundation|fr|fun|fund|furniture|futbol|fyi|gallery|games|garden|gay|gen.in|gg|gifts|gives|giving|glass|global|gmbh|gold|golf|graphics|gratis|green|gripe|group|gs|guide|guru|hair|haus|health|healthcare|hockey|holdings|holiday|homes|horse|hospital|host|house|idv.tw|immo|immobilien|in|inc|ind.in|industries|info|info.pl|ink|institute|insure|international|investments|io|irish|ist|istanbul|it|jetzt|jewelry|jobs|jp|kaufen|kids|kim|kitchen|kiwi|kr|ky|la|land|lat|law|lawyer|lease|legal|lgbt|life|lighting|limited|limo|live|llc|llp|loan|loans|london|love|ltd|ltda|luxury|maison|makeup|management|market|marketing|mba|me|me.uk|media|melbourne|memorial|men|menu|miami|mobi|moda|moe|money|monster|mortgage|motorcycles|movie|ms|music|mx|nagoya|name|navy|ne.kr|net|net.ag|net.au|net.br|net.bz|net.cn|net.co|net.in|net.ky|net.nz|net.pe|net.ph|net.pl|net.ru|network|news|ninja|nl|no|nom.co|nom.es|nom.pe|nrw|nyc|okinawa|one|onl|online|org|org.ag|org.au|org.cn|org.es|org.in|org.ky|org.nz|org.pe|org.ph|org.pl|org.ru|org.uk|organic|page|paris|partners|parts|party|pe|pet|ph|photography|photos|pictures|pink|pizza|pl|place|plumbing|plus|poker|porn|press|pro|productions|promo|properties|protection|pub|pw|quebec|quest|racing|re.kr|realestate|recipes|red|rehab|reise|reisen|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|rip|rocks|rodeo|rugby|run|ryukyu|sale|salon|sarl|school|schule|science|se|security|services|sex|sg|sh|shiksha|shoes|shop|shopping|show|singles|site|ski|skin|soccer|social|software|solar|solutions|space|storage|store|stream|studio|study|style|supplies|supply|support|surf|surgery|sydney|systems|tax|taxi|team|tech|technology|tel|tennis|theater|theatre|tickets|tienda|tips|tires|today|tokyo|tools|tours|town|toys|trade|trading|training|travel|tube|tv|tw|uk|university|uno|us|vacations|vc|vegas|ventures|vet|viajes|video|villas|vin|vip|vision|vodka|vote|voto|voyage|wales|watch|web|webcam|website|wedding|wiki|win|wine|work|works|world|ws|wtf|xxx|xyz|yachts|yoga|yokohama|zone|移动|dev|com|edu|gov|net|mil|org|nom|sch|sbs|caa|res|off|gob|int|tur|ip6|uri|urn|asn|act|nsw|qld|tas|vic|pro|biz|adm|adv|agr|arq|art|ato|bio|bmd|cim|cng|cnt|ecn|eco|emp|eng|esp|etc|eti|far|fnd|fot|fst|g12|ggf|imb|ind|inf|jor|jus|leg|lel|mat|med|mus|not|ntr|odo|ppg|psc|psi|qsl|rec|slg|srv|teo|tmp|trd|vet|zlg|web|ltd|sld|pol|fin|k12|lib|pri|aip|fie|eun|sci|prd|cci|pvt|mod|idv|rel|sex|gen|nic|abr|bas|cal|cam|emr|fvg|laz|lig|lom|mar|mol|pmn|pug|sar|sic|taa|tos|umb|vao|vda|ven|mie|北海道|和歌山|神奈川|鹿児島|ass|rep|tra|per|ngo|soc|grp|plc|its|air|and|bus|can|ddr|jfk|mad|nrw|nyc|ski|spy|tcm|ulm|usa|war|fhs|vgs|dep|eid|fet|fla|flå|gol|hof|hol|sel|vik|cri|iwi|ing|abo|fam|gok|gon|gop|gos|aid|atm|gsm|sos|elk|waw|est|aca|bar|cpa|jur|law|sec|plo|www|bir|cbg|jar|khv|msk|nov|nsk|ptz|rnd|spb|stv|tom|tsk|udm|vrn|cmw|kms|nkz|snz|pub|fhv|red|ens|nat|rns|rnu|bbs|tel|bel|kep|nhs|dni|fed|isa|nsn|gub|e12|tec|орг|обр|упр|alt|nis|jpn|mex|ath|iki|nid|gda|inc|za|ovh|lol|africa".split(
         "|",
       );
 

package/Types/JSON.ts

@@ -13,6 +13,7 @@ import NotNull from "./BaseDatabase/NotNull";
 import Search from "./BaseDatabase/Search";
 import CallRequest from "./Call/CallRequest";
 import Color from "./Color";
+import { CompareType } from "./Database/CompareBase";
 import Domain from "./Domain";
 import Email from "./Email";
 import HashedString from "./HashedString";
@@ -102,28 +103,28 @@ export type JSONValue =
   | Array<CheckOn>
   | FilterType
   | Array<FilterType>
-  | Search
+  | Search<string>
   | Domain
   | Array<Domain>
-  | Array<Search>
-  | EqualToOrNull
-  | Array<EqualToOrNull>
-  | NotEqual
-  | Array<NotEqual>
-  | GreaterThan
-  | Array<GreaterThan>
-  | GreaterThanOrEqual
-  | Array<GreaterThanOrEqual>
+  | Array<Search<string>>
+  | EqualToOrNull<CompareType>
+  | Array<EqualToOrNull<CompareType>>
+  | NotEqual<CompareType>
+  | Array<NotEqual<CompareType>>
+  | GreaterThan<CompareType>
+  | Array<GreaterThan<CompareType>>
+  | GreaterThanOrEqual<CompareType>
+  | Array<GreaterThanOrEqual<CompareType>>
   | PositiveNumber
   | Array<PositiveNumber>
-  | LessThan
-  | Array<LessThan>
-  | InBetween
-  | Array<InBetween>
+  | LessThan<CompareType>
+  | Array<LessThan<CompareType>>
+  | InBetween<CompareType>
+  | Array<InBetween<CompareType>>
   | NotNull
   | Array<NotNull>
-  | LessThanOrEqual
-  | Array<LessThanOrEqual>
+  | LessThanOrEqual<CompareType>
+  | Array<LessThanOrEqual<CompareType>>
   | Port
   | Array<Port>
   | HashedString

package/Types/JSONFunctions.ts

@@ -2,6 +2,7 @@ import BaseModel from "../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseMo
 import DatabaseProperty from "./Database/DatabaseProperty";
 import OneUptimeDate from "./Date";
 import DiskSize from "./DiskSize";
+import GenericObject from "./GenericObject";
 import { JSONArray, JSONObject, JSONValue, ObjectType } from "./JSON";
 import SerializableObject from "./SerializableObject";
 import SerializableObjectDictionary from "./SerializableObjectDictionary";
@@ -16,8 +17,8 @@ export default class JSONFunctions {
   }
 
   public static isJSONObjectDifferent(
-    obj1: JSONObject,
-    obj2: JSONObject,
+    obj1: GenericObject,
+    obj2: GenericObject,
   ): boolean {
     return JSON.stringify(obj1) !== JSON.stringify(obj2);
   }

package/Types/Workflow/Components/Condition.ts

@@ -5,6 +5,19 @@ import ComponentMetadata, {
   ComponentType,
 } from "./../Component";
 
+export enum ConditionOperator {
+  EqualTo = "==",
+  NotEqualTo = "!=",
+  GreaterThan = ">",
+  GreaterThanOrEqualTo = ">=",
+  LessThan = "<",
+  LessThanOrEqualTo = "<=",
+  Contains = "contains",
+  DoesNotContain = "does not contain",
+  StartsWith = "starts with",
+  EndsWith = "ends with",
+}
+
 const components: Array<ComponentMetadata> = [
   {
     id: ComponentID.IfElse,
@@ -33,7 +46,8 @@ const components: Array<ComponentMetadata> = [
       {
         type: ComponentInputType.Text,
         name: "Input 2",
-        description: "Input 2",
+        description:
+          "This fields takes number, text, boolean, null, undefined as values.",
         placeholder: "x",
         required: true,
         id: "input-2",

package/UI/Components/Charts/Line/LineChart.tsx

@@ -1,7 +1,7 @@
 import { Box, CartesianMarkerProps } from "@nivo/core";
 import { LegendProps } from "@nivo/legends";
 import { Point, ResponsiveLine } from "@nivo/line";
-import { BrightColors } from "Common/Types/BrandColors";
+import { ChartColors } from "Common/Types/BrandColors";
 import Color from "Common/Types/Color";
 import OneUptimeDate from "Common/Types/Date";
 import React, { FunctionComponent, ReactElement } from "react";
@@ -228,7 +228,7 @@ const LineChart: FunctionComponent<ComponentProps> = (
             }),
           });
         }}
-        colors={BrightColors.map((item: Color) => {
+        colors={ChartColors.map((item: Color) => {
           return item.toString();
         })}
         legends={legends}

package/UI/Components/Date/StartAndEndDate.tsx

@@ -10,8 +10,8 @@ export enum StartAndEndDateType {
 }
 
 export interface ComponentProps {
-  initialValue?: InBetween | undefined;
-  onValueChanged: (value: InBetween | null) => void;
+  initialValue?: InBetween<Date> | undefined;
+  onValueChanged: (value: InBetween<Date> | null) => void;
   type: StartAndEndDateType;
 }
 
@@ -41,16 +41,14 @@ const StartAndEndDate: DateFilterFunction = (
     // prefill the date filter if it is already set
 
     if (!didSetInitialValue && props.initialValue instanceof InBetween) {
-      const inBetween: InBetween = props.initialValue as InBetween;
+      const inBetween: InBetween<Date> = props.initialValue as InBetween<Date>;
 
       if (inBetween.startValue) {
-        setStartDateTime(
-          OneUptimeDate.fromString(inBetween.startValue as string),
-        );
+        setStartDateTime(OneUptimeDate.fromString(inBetween.startValue));
       }
 
       if (inBetween.endValue) {
-        setEndDateTime(OneUptimeDate.fromString(inBetween.endValue as string));
+        setEndDateTime(OneUptimeDate.fromString(inBetween.endValue));
       }
 
       setDidSetInitialValue(true);
@@ -70,7 +68,7 @@ const StartAndEndDate: DateFilterFunction = (
         return;
       }
 
-      const value: InBetween = new InBetween(startDateTime, endDateTime);
+      const value: InBetween<Date> = new InBetween(startDateTime, endDateTime);
       props.onValueChanged && props.onValueChanged(value);
 
       return;

package/UI/Components/Filters/DateFilter.tsx

@@ -1,3 +1,4 @@
+import { FindWhereProperty } from "../../../Types/BaseDatabase/Query";
 import StartAndEndDate, { StartAndEndDateType } from "../Date/StartAndEndDate";
 import FieldType from "../Types/FieldType";
 import Filter from "./Types/Filter";
@@ -28,9 +29,11 @@ const DateFilter: DateFilterFunction = <T extends GenericObject>(
 
   return (
     <StartAndEndDate
-      initialValue={filterData[filter.key] as InBetween}
-      onValueChanged={(inBetween: InBetween | null) => {
-        filterData[filter.key] = inBetween;
+      initialValue={filterData[filter.key] as InBetween<Date>}
+      onValueChanged={(inBetween: InBetween<Date> | null) => {
+        filterData[filter.key] = inBetween as FindWhereProperty<
+          NonNullable<T[keyof T]>
+        >;
 
         if (!filterData[filter.key]) {
           delete filterData[filter.key];

package/UI/Components/Filters/FilterViewer.tsx

@@ -204,7 +204,9 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
     ) {
       const key: keyof T = data.filter.key;
 
-      const startAndEndDates: InBetween = data.filterData[key] as InBetween;
+      const startAndEndDates: InBetween<Date> = data.filterData[
+        key
+      ] as InBetween<Date>;
 
       const shouldOnlyShowDate: boolean = data.filter.type === FieldType.Date;
 

package/UI/Components/Filters/JSONFilter.tsx

@@ -1,3 +1,4 @@
+import { FindWhereProperty } from "../../../Types/BaseDatabase/Query";
 import DictionaryForm from "../Dictionary/Dictionary";
 import FieldType from "../Types/FieldType";
 import Filter from "./Types/Filter";
@@ -36,7 +37,9 @@ const JSONFilter: JSONFilterFunction = <T extends GenericObject>(
           // if no keys in the dictionary, remove the filter
 
           if (Object.keys(value).length > 0) {
-            filterData[filter.key] = value;
+            filterData[filter.key] = value as FindWhereProperty<
+              NonNullable<T[keyof T]>
+            >;
           } else {
             delete filterData[filter.key];
           }

package/UI/Components/Filters/Types/FilterData.ts

@@ -1,5 +1,5 @@
-import Query from "../../../Utils/BaseDatabase/Query";
 import GenericObject from "Common/Types/GenericObject";
+import Query from "../../../../Types/BaseDatabase/Query";
 
 type FillterData<T extends GenericObject> = Query<T>; // this is bascially a Query object
 

package/UI/Components/HeaderAlert/HeaderModelAlert.tsx

@@ -1,5 +1,5 @@
 import API from "../../Utils/API/API";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import ModelAPI, { RequestOptions } from "../../Utils/ModelAPI/ModelAPI";
 import HeaderAlert from "./HeaderAlert";
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";

package/UI/Components/ModelFilter/Filter.ts

@@ -1,5 +1,5 @@
 import SelectEntityField from "../../Types/SelectEntityField";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import { DropdownOption } from "../Dropdown/Dropdown";
 import FieldType from "../Types/FieldType";
 import AnalyticsBaseModel, {

package/UI/Components/ModelList/ModelList.tsx

@@ -1,5 +1,5 @@
 import API from "../../Utils/API/API";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import Select from "../../Utils/BaseDatabase/Select";
 import ModelAPI, {
   ListResult,

package/UI/Components/ModelListModal/ModelListModal.tsx

@@ -1,4 +1,4 @@
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import Select from "../../Utils/BaseDatabase/Select";
 import Modal from "../Modal/Modal";
 import ModelList from "../ModelList/ModelList";

package/UI/Components/ModelProgress/ModelProgress.tsx

@@ -1,5 +1,5 @@
 import API from "../../Utils/API/API";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import ModelAPI from "../../Utils/ModelAPI/ModelAPI";
 import Card from "../Card/Card";
 import ComponentLoader from "../ComponentLoader/ComponentLoader";

package/UI/Components/ModelTable/AnalyticsModelTable.tsx

@@ -1,6 +1,6 @@
 import ModelAPI from "../../Utils/AnalyticsModelAPI/AnalyticsModelAPI";
 import GroupBy from "../../Utils/BaseDatabase/GroupBy";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import RequestOptions from "../../Utils/BaseDatabase/RequestOptions";
 import Select from "../../Utils/BaseDatabase/Select";
 import Sort from "../../Utils/BaseDatabase/Sort";

package/UI/Components/ModelTable/BaseModelTable.tsx

@@ -5,7 +5,7 @@ import SelectEntityField from "../../Types/SelectEntityField";
 import API from "../../Utils/API/API";
 import GroupBy from "../../Utils/BaseDatabase/GroupBy";
 import ListResult from "../../Utils/BaseDatabase/ListResult";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import RequestOptions from "../../Utils/BaseDatabase/RequestOptions";
 import Select from "../../Utils/BaseDatabase/Select";
 import Sort from "../../Utils/BaseDatabase/Sort";

package/UI/Components/ModelTable/ModelTable.tsx

@@ -1,5 +1,5 @@
 import GroupBy from "../../Utils/BaseDatabase/GroupBy";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import Select from "../../Utils/BaseDatabase/Select";
 import Sort from "../../Utils/BaseDatabase/Sort";
 import ModelAPI, { RequestOptions } from "../../Utils/ModelAPI/ModelAPI";

package/UI/Components/SideMenu/CountModelSideMenuItem.tsx

@@ -1,5 +1,5 @@
 import API from "../../Utils/API/API";
-import Query from "../../Utils/BaseDatabase/Query";
+import Query from "../../../Types/BaseDatabase/Query";
 import ModelAPI, { RequestOptions } from "../../Utils/ModelAPI/ModelAPI";
 import { BadgeType } from "../Badge/Badge";
 import SideMenuItem from "./SideMenuItem";

package/UI/Components/Workflow/Utils.ts

@@ -9,6 +9,7 @@ import ComponentMetadata, {
 import Components, { Categories } from "Common/Types/Workflow/Components";
 import BaseModelComponentFactory from "Common/Types/Workflow/Components/BaseModel";
 import Entities from "Common/Models/DatabaseModels/Index";
+import { ConditionOperator } from "../../../Types/Workflow/Components/Condition";
 
 type LoadComponentsAndCategoriesFunction = () => {
   components: Array<ComponentMetadata>;
@@ -192,27 +193,43 @@ export const componentInputTypeToFormFieldType: ComponentInputTypeToFormFieldTyp
         dropdownOptions: [
           {
             label: "Equal To",
-            value: "==",
+            value: ConditionOperator.EqualTo,
           },
           {
             label: "Not Equal To",
-            value: "!=",
+            value: ConditionOperator.NotEqualTo,
           },
           {
             label: "Greater Than",
-            value: ">",
+            value: ConditionOperator.GreaterThan,
           },
           {
             label: "Less Than",
-            value: "<",
+            value: ConditionOperator.LessThan,
           },
           {
             label: "Greater Than or Equal",
-            value: ">=",
+            value: ConditionOperator.GreaterThanOrEqualTo,
           },
           {
             label: "Less Than or Equal",
-            value: "<=",
+            value: ConditionOperator.LessThanOrEqualTo,
+          },
+          {
+            label: "Contains",
+            value: ConditionOperator.Contains,
+          },
+          {
+            label: "Does Not Contain",
+            value: ConditionOperator.DoesNotContain,
+          },
+          {
+            label: "Starts With",
+            value: ConditionOperator.StartsWith,
+          },
+          {
+            label: "Ends With",
+            value: ConditionOperator.EndsWith,
           },
         ],
       };

package/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts

@@ -3,7 +3,6 @@ import { APP_API_URL } from "../../Config";
 import API from "../API/API";
 import GroupBy from "../BaseDatabase/GroupBy";
 import BaseListResult from "../BaseDatabase/ListResult";
-import Query from "../BaseDatabase/Query";
 import RequestOptions from "../BaseDatabase/RequestOptions";
 import Select from "../BaseDatabase/Select";
 import Sort from "../BaseDatabase/Sort";
@@ -23,6 +22,7 @@ import ObjectID from "Common/Types/ObjectID";
 import Project from "Common/Models/DatabaseModels/Project";
 import AggregateBy from "Common/Types/BaseDatabase/AggregateBy";
 import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult";
+import Query from "../../../Types/BaseDatabase/Query";
 
 export interface ListResult<TAnalyticsBaseModel extends AnalyticsBaseModel>
   extends BaseListResult<TAnalyticsBaseModel> {}

package/UI/Utils/ModelAPI/ModelAPI.ts

@@ -3,7 +3,6 @@ import { APP_API_URL } from "../../Config";
 import API from "../../Utils/API/API";
 import GroupBy from "../BaseDatabase/GroupBy";
 import BaseListResult from "../BaseDatabase/ListResult";
-import Query from "../BaseDatabase/Query";
 import BaseRequestOptions from "../BaseDatabase/RequestOptions";
 import Select from "../BaseDatabase/Select";
 import Sort from "../BaseDatabase/Sort";
@@ -21,6 +20,7 @@ import { JSONArray, JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import Project from "Common/Models/DatabaseModels/Project";
+import Query from "../../../Types/BaseDatabase/Query";
 
 export class ModelAPIHttpResponse<
   TBaseModel extends BaseModel,

package/UI/Utils/Realtime.ts

@@ -1,5 +1,4 @@
 import { HOST, HTTP_PROTOCOL } from "../Config";
-import Query from "./BaseDatabase/Query";
 import Select from "./BaseDatabase/Select";
 import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
@@ -15,6 +14,7 @@ import RealtimeUtil, {
   ModelEventType,
 } from "Common/Utils/Realtime";
 import SocketIO, { Socket } from "socket.io-client";
+import Query from "../../Types/BaseDatabase/Query";
 
 export interface ListenToModelEvent<
   Model extends AnalyticsBaseModel | BaseModel,

package/Utils/CronTime.ts

@@ -5,3 +5,4 @@ export const EVERY_FIVE_MINUTE: string = "*/5 * * * *";
 export const EVERY_FIVE_SECONDS: string = "*/5 * * * * *";
 export const EVERY_WEEK: string = "0 0 * * 0";
 export const EVERY_FIFTEEN_MINUTE: string = "*/15 * * * *";
+export const EVERY_THIRTY_SECONDS: string = "*/30 * * * * *";

package/build/dist/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommonModel.js","sourceRoot":"","sources":["../../../../../Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommonModel.js","sourceRoot":"","sources":["../../../../../Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts"],"names":[],"mappings":"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"}

package/build/dist/Models/DatabaseModels/Monitor.js

@@ -54,6 +54,7 @@ let Monitor = class Monitor extends BaseModel {
         this.isOwnerNotifiedOfResourceCreation = undefined;
         this.disableActiveMonitoring = undefined;
         this.incomingRequestReceivedAt = undefined;
+        this.incomingRequestMonitorHeartbeatCheckedAt = undefined;
         this.telemetryMonitorNextMonitorAt = undefined;
         this.telemetryMonitorLastMonitorAt = undefined;
         this.disableActiveMonitoringBecauseOfScheduledMaintenanceEvent = undefined;
@@ -691,6 +692,41 @@ __decorate([
     }),
     __metadata("design:type", Date)
 ], Monitor.prototype, "incomingRequestReceivedAt", void 0);
+__decorate([
+    ColumnAccessControl({
+        create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectMonitor,
+        ],
+        read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.ReadProjectMonitor,
+        ],
+        update: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectMonitor,
+        ],
+    }),
+    Index(),
+    TableColumn({
+        type: TableColumnType.Date,
+        required: false,
+        isDefaultValueColumn: false,
+        title: "When was the last time we checked the heartbeat for incoming request?",
+        description: "This field is for Incoming Request monitor only. When was the last time we checked the heartbeat?",
+    }),
+    Column({
+        type: ColumnType.Date,
+        nullable: true,
+    }),
+    __metadata("design:type", Date)
+], Monitor.prototype, "incomingRequestMonitorHeartbeatCheckedAt", void 0);
 __decorate([
     ColumnAccessControl({
         create: [