@oneuptime/common 10.0.68 → 10.0.70

package/UI/Components/Filters/FilterViewer.tsx

@@ -1,4 +1,18 @@
+import Icon from "../Icon/Icon";
 import Includes from "../../../Types/BaseDatabase/Includes";
+import IncludesAll from "../../../Types/BaseDatabase/IncludesAll";
+import IncludesNone from "../../../Types/BaseDatabase/IncludesNone";
+import StartsWith from "../../../Types/BaseDatabase/StartsWith";
+import EndsWith from "../../../Types/BaseDatabase/EndsWith";
+import NotContains from "../../../Types/BaseDatabase/NotContains";
+import EqualTo from "../../../Types/BaseDatabase/EqualTo";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
+import GreaterThan from "../../../Types/BaseDatabase/GreaterThan";
+import LessThan from "../../../Types/BaseDatabase/LessThan";
+import GreaterThanOrEqual from "../../../Types/BaseDatabase/GreaterThanOrEqual";
+import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
+import IsNull from "../../../Types/BaseDatabase/IsNull";
+import NotNull from "../../../Types/BaseDatabase/NotNull";
 import Button, { ButtonStyleType } from "../Button/Button";
 import { DropdownOption } from "../Dropdown/Dropdown";
 import ErrorMessage from "../ErrorMessage/ErrorMessage";
@@ -151,13 +165,12 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
 
     if (data.filter.type === FieldType.Boolean) {
       filterText = (
-        <div>
-          {" "}
+        <span>
           <span className="font-medium">{data.filter.title}</span> is{" "}
           <span className="font-medium">
             {data.filterData[data.filter.key] ? "Yes" : "No"}
-          </span>{" "}
-        </div>
+          </span>
+        </span>
       );
       return filterText;
     }
@@ -168,34 +181,82 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
       data.filter.type === FieldType.Email ||
       data.filter.type === FieldType.Phone ||
       data.filter.type === FieldType.URL ||
-      data.filter.type === FieldType.Hostname
+      data.filter.type === FieldType.Hostname ||
+      data.filter.type === FieldType.LongText ||
+      data.filter.type === FieldType.Name ||
+      data.filter.type === FieldType.Port ||
+      data.filter.type === FieldType.ObjectID
     ) {
       const key: keyof T = data.filter.key;
+      const value: unknown = data.filterData[key];
 
-      if (data.filterData[key] && data.filterData[key] instanceof Search) {
-        filterText = (
-          <div>
-            {" "}
-            <span className="font-medium">
-              {data.filter.title}
-            </span> contains{" "}
-            <span className="font-medium">
-              {data.filterData[data.filter.key]?.toString()}
-            </span>{" "}
-          </div>
+      type RenderFunction = (verb: string, display: string) => ReactElement;
+      const render: RenderFunction = (
+        verb: string,
+        display: string,
+      ): ReactElement => {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> {verb}{" "}
+            <span className="font-medium">{display}</span>
+          </span>
         );
-      } else if (data.filterData[key]) {
-        filterText = (
-          <div>
-            {" "}
-            <span className="font-medium">{data.filter.title}</span> is{" "}
-            <span className="font-medium">
-              {data.filterData[data.filter.key]?.toString()}
-            </span>{" "}
-          </div>
+      };
+
+      if (value instanceof IsNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is empty
+          </span>
         );
       }
-      return filterText;
+      if (value instanceof NotNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is not empty
+          </span>
+        );
+      }
+      if (value instanceof Search) {
+        return render("contains", value.toString());
+      }
+      if (value instanceof NotContains) {
+        return render("does not contain", value.toString());
+      }
+      if (value instanceof StartsWith) {
+        return render("starts with", value.toString());
+      }
+      if (value instanceof EndsWith) {
+        return render("ends with", value.toString());
+      }
+      if (value instanceof InBetween) {
+        return render(
+          "is between",
+          `${value.startValue} and ${value.endValue}`,
+        );
+      }
+      if (value instanceof GreaterThanOrEqual) {
+        return render("is ≥", value.toString());
+      }
+      if (value instanceof LessThanOrEqual) {
+        return render("is ≤", value.toString());
+      }
+      if (value instanceof GreaterThan) {
+        return render("is greater than", value.toString());
+      }
+      if (value instanceof LessThan) {
+        return render("is less than", value.toString());
+      }
+      if (value instanceof NotEqual) {
+        return render("does not equal", value.toString());
+      }
+      if (value instanceof EqualTo) {
+        return render("equals", value.toString());
+      }
+      if (value !== undefined && value !== null && value !== "") {
+        return render("is", (value as any).toString());
+      }
+      return null;
     }
 
     if (
@@ -203,62 +264,66 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
       data.filter.type === FieldType.DateTime
     ) {
       const key: keyof T = data.filter.key;
-
-      const startAndEndDates: InBetween<Date> = data.filterData[
-        key
-      ] as InBetween<Date>;
+      const value: unknown = data.filterData[key];
 
       const shouldOnlyShowDate: boolean = data.filter.type === FieldType.Date;
       const shouldShowSeconds: boolean =
         data.filter.type === FieldType.DateTime;
 
-      if (
-        OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
-          startAndEndDates.startValue as Date,
+      type FormatFunction = (d: Date) => string;
+      const format: FormatFunction = (d: Date): string => {
+        return OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
+          d,
           shouldOnlyShowDate,
           shouldShowSeconds,
-        ) ===
-        OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
-          startAndEndDates.endValue as Date,
-          shouldOnlyShowDate,
-          shouldShowSeconds,
-        )
-      ) {
+        );
+      };
+
+      type RenderFunction = (verb: string, display: string) => ReactElement;
+      const render: RenderFunction = (
+        verb: string,
+        display: string,
+      ): ReactElement => {
         return (
-          <div>
-            {" "}
-            <span className="font-medium">{data.filter.title}</span> at{" "}
-            <span className="font-medium">
-              {OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
-                startAndEndDates.startValue as Date,
-                data.filter.type === FieldType.Date,
-                shouldShowSeconds,
-              )}
-            </span>{" "}
-          </div>
+          <span>
+            <span className="font-medium">{data.filter.title}</span> {verb}{" "}
+            <span className="font-medium">{display}</span>
+          </span>
+        );
+      };
+
+      if (value instanceof IsNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is empty
+          </span>
         );
       }
-      return (
-        <div>
-          {" "}
-          <span className="font-medium">{data.filter.title}</span> is in between{" "}
-          <span className="font-medium">
-            {OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
-              startAndEndDates.startValue as Date,
-              shouldOnlyShowDate,
-              shouldShowSeconds,
-            )}
-          </span>{" "}
-          and{" "}
-          <span className="font-medium">
-            {OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(
-              startAndEndDates.endValue as Date,
-              shouldOnlyShowDate,
-              shouldShowSeconds,
-            )}
-          </span>{" "}
-        </div>
-      );
+      if (value instanceof NotNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is not empty
+          </span>
+        );
+      }
+      if (value instanceof InBetween) {
+        const start: Date = value.startValue as unknown as Date;
+        const end: Date = value.endValue as unknown as Date;
+        if (format(start) === format(end)) {
+          return render("is", format(start));
+        }
+        return render("is between", `${format(start)} and ${format(end)}`);
+      }
+      if (value instanceof GreaterThan) {
+        return render("is after", format(value.value as unknown as Date));
+      }
+      if (value instanceof LessThan) {
+        return render("is before", format(value.value as unknown as Date));
+      }
+      if (value instanceof EqualTo) {
+        return render("is", format(value.value as unknown as Date));
+      }
+      return null;
     }
 
     if (data.filter.type === FieldType.JSON) {
@@ -277,14 +342,11 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
       const isPlural: boolean = Object.keys(json).length > 1;
 
       return (
-        <div className="flex space-x-1">
-          {" "}
-          <div className="font-medium">{data.filter.title}</div>{" "}
-          <div>
-            {isPlural ? "are" : "is"} {""}
-          </div>
-          <div className="font-medium">{formatJson(json)}</div>{" "}
-        </div>
+        <span className="inline-flex items-center space-x-1">
+          <span className="font-medium">{data.filter.title}</span>
+          <span>{isPlural ? "are" : "is"}</span>
+          <span className="font-medium">{formatJson(json)}</span>
+        </span>
       );
     }
 
@@ -295,56 +357,82 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
       data.filter.type === FieldType.EntityArray
     ) {
       const key: keyof T = data.filter.key;
+      const rawValue: unknown = data.filterData[key];
 
-      let items: Array<string> = data.filterData[key] as Array<string>;
-
-      if (typeof items === "string") {
-        items = [items];
+      if (rawValue instanceof IsNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is empty
+          </span>
+        );
       }
-
-      if (items instanceof Includes) {
-        items = items.values as Array<string>;
+      if (rawValue instanceof NotNull) {
+        return (
+          <span>
+            <span className="font-medium">{data.filter.title}</span> is not empty
+          </span>
+        );
       }
 
-      const isMoreItems: boolean = items.length > 1;
-
-      if (items && items instanceof Array) {
-        const entityNames: string = (items as Array<string>)
-          .map((item: string) => {
-            // item is the id of the entity. We need to find the name of the entity from the list of entities.
-
-            const entity: DropdownOption | undefined =
-              data.filter.filterDropdownOptions?.find(
-                (entity: DropdownOption | undefined) => {
-                  return entity?.value.toString() === item.toString();
-                },
-              );
-
-            if (entity) {
-              return entity.label.toString();
-            }
-
-            return null;
-          })
-          .filter((item: string | null) => {
-            return item !== null;
-          })
-          .join(", ");
+      let items: Array<string> = [];
+      type MatchMode = "any" | "all" | "none";
+      let matchMode: MatchMode = "any";
+
+      if (rawValue instanceof IncludesAll) {
+        items = rawValue.values as Array<string>;
+        matchMode = "all";
+      } else if (rawValue instanceof IncludesNone) {
+        items = rawValue.values as Array<string>;
+        matchMode = "none";
+      } else if (rawValue instanceof Includes) {
+        items = rawValue.values as Array<string>;
+      } else if (Array.isArray(rawValue)) {
+        items = rawValue as Array<string>;
+      } else if (typeof rawValue === "string") {
+        items = [rawValue];
+      }
 
-        if (!entityNames) {
+      const entityNames: string = items
+        .map((item: string) => {
+          const entity: DropdownOption | undefined =
+            data.filter.filterDropdownOptions?.find(
+              (e: DropdownOption | undefined) => {
+                return e?.value.toString() === item.toString();
+              },
+            );
+          if (entity) {
+            return entity.label.toString();
+          }
           return null;
-        }
+        })
+        .filter((name: string | null) => {
+          return name !== null;
+        })
+        .join(", ");
 
-        return (
-          <div>
-            <span className="font-medium">{data.filter.title}</span>
-            {isMoreItems ? " is any of these values: " : " is "}
-            <span className="font-medium">{entityNames}</span>
-          </div>
-        );
+      if (!entityNames) {
+        return null;
       }
 
-      return filterText;
+      const isMoreItems: boolean = items.length > 1;
+      let joiner: string;
+      if (matchMode === "all") {
+        joiner = " has all of: ";
+      } else if (matchMode === "none") {
+        joiner = " has none of: ";
+      } else if (isMoreItems) {
+        joiner = " is any of: ";
+      } else {
+        joiner = " is ";
+      }
+
+      return (
+        <span>
+          <span className="font-medium">{data.filter.title}</span>
+          {joiner}
+          <span className="font-medium">{entityNames}</span>
+        </span>
+      );
     }
 
     return filterText;
@@ -365,36 +453,30 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
     <div>
       {showViewer && (
         <div>
-          <div className="mt-5 mb-5 bg-gray-50 rounded-xl p-5 border-2 border-gray-100">
-            <div className="flex mt-1 mb-2">
-              <div className="flex-auto py-0.5 text-sm leading-5">
+          <div className="mt-4 mb-4 bg-gray-50 rounded-xl p-4 border border-gray-200">
+            <div className="flex items-center justify-between mb-3">
+              <div className="flex items-center gap-2 text-sm text-gray-700">
+                <Icon icon={IconProp.Filter} size={SizeProp.Smaller} />
                 <span className="font-semibold">
-                  Filter {props.pluralLabel + " " || ""}
-                  by the following criteria:
-                </span>{" "}
+                  Showing {props.pluralLabel || "results"} that match
+                </span>
               </div>
             </div>
 
-            <ul role="list" className="space-y-3">
+            <div className="flex flex-wrap gap-2">
               {filterTexts.map((filterText: ReactElement, index: number) => {
-                const isLastItem: boolean = index === filterTexts.length - 1;
                 return (
-                  <li className="relative flex gap-x-2" key={index}>
-                    {!isLastItem && (
-                      <div className="absolute left-0 top-0 flex w-6 justify-center -bottom-6">
-                        <div className="w-px bg-gray-200"></div>
-                      </div>
-                    )}
-                    <div className="relative flex h-6 w-6  flex-none items-center justify-center bg-gray-50">
-                      <div className="h-1.5 w-1.5 rounded-full bg-gray-100 ring-1 ring-gray-300"></div>
-                    </div>
-                    <FilterViewerItem key={index} text={filterText} />{" "}
-                  </li>
+                  <div
+                    key={index}
+                    className="inline-flex items-center rounded-full bg-white border border-gray-200 px-3 py-1 text-sm text-gray-700 shadow-sm whitespace-nowrap"
+                  >
+                    <FilterViewerItem key={index} text={filterText} />
+                  </div>
                 );
               })}
-            </ul>
+            </div>
 
-            <div className="flex -ml-3 mt-3 -mb-2">
+            <div className="flex -ml-3 mt-3 -mb-1">
               {/** Edit Filter Button */}
               <Button
                 className="font-medium text-gray-900"
@@ -425,10 +507,10 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
         <Modal
           modalWidth={ModalWidth.Large}
           isLoading={props.isModalLoading}
-          title={`${props.singularLabel + " " || ""}Filters`}
-          description={`Filter ${
-            props.pluralLabel || ""
-          } by the following criteria:`}
+          title={`Filter ${props.pluralLabel || props.singularLabel || "results"}`}
+          description={`Narrow down ${
+            props.pluralLabel || "results"
+          } by one or more criteria below.`}
           submitButtonText={`Apply Filters`}
           onClose={() => {
             props.onFilterModalClose?.();

package/UI/Components/Filters/FilterViewerItem.tsx

@@ -11,17 +11,7 @@ type FilterViewerItemComponentFunction = (
 const FilterViewerItem: FilterViewerItemComponentFunction = (
   props: ComponentProps,
 ): ReactElement => {
-  const { text } = props;
-
-  return (
-    <div className="flex w-full -ml-3">
-      <div className="flex">
-        <div className="ml-1 flex-auto py-0.5 text-sm leading-5 text-gray-500">
-          <span className="text-gray-900">{text}</span>{" "}
-        </div>
-      </div>
-    </div>
-  );
+  return <span className="text-gray-800 leading-5">{props.text}</span>;
 };
 
 export default FilterViewerItem;