@trackunit/filters-graphql-hook 0.0.343 → 0.0.345

package/index.cjs.js

@@ -6,6 +6,7 @@ var filtersFilterBar = require('@trackunit/filters-filter-bar');
 var sharedUtils = require('@trackunit/shared-utils');
 var reactCoreHooks = require('@trackunit/react-core-hooks');
 var react = require('react');
+var zod = require('zod');
 
 var defaultTranslations = {
 	
@@ -318,11 +319,13 @@ const useActiveAssetFilters = (filters) => {
             return {};
         }
         const followExist = filters.followed === "ALL" ? undefined : true;
+        const parsedBoundingBox = boundingBoxSchema.optional().safeParse(filters.boundingBox);
+        const parsedServiceBooked = booleanArraySchema.safeParse(filters.serviceBooked);
         return {
             assetIds: stringArrayOrUndefined(filters.assetIds),
             searchQuery: typeof filters.search === "string" && filters.search !== "" ? filters.search : undefined,
             activities: fixTypes(filters.activity, assetActivityState),
-            boundingBox: isBoundingBox(filters.boundingBox) ? filters.boundingBox : undefined,
+            boundingBox: parsedBoundingBox.success ? parsedBoundingBox.data : undefined,
             brands: stringArrayOrUndefined(filters.brands),
             types: stringArrayOrUndefined(filters.types),
             criticalities: fixTypes(filters.criticality, assetCriticalityState),
@@ -335,7 +338,7 @@ const useActiveAssetFilters = (filters) => {
             metadataCompleteness: ((_b = valueNameArrayOrUndefined(filters.metadataCompleteness)) === null || _b === void 0 ? void 0 : _b[0]) === "ALL"
                 ? undefined
                 : (_c = fixTypes(valueNameArrayOrUndefined(filters.metadataCompleteness), metadataCompleteness)) === null || _c === void 0 ? void 0 : _c[0],
-            serviceBooked: filters.serviceBooked,
+            serviceBooked: parsedServiceBooked.success ? parsedServiceBooked.data : undefined,
             servicePlanAssignments: fixTypes(filters.servicePlanStatus, servicePlanStatus),
             servicePlanIds: valueNameArrayOrUndefined(filters.servicePlan),
             servicePlanStatuses: fixTypes(filters.serviceStatus, servicePlanStatus),
@@ -356,12 +359,14 @@ const useActiveAssetFilters = (filters) => {
     }, [filters, customFields, systemOfMeasurement]);
     return filter;
 };
-const isBoundingBox = (value) => {
-    return value
-        ? // eslint-disable-next-line no-autofix/local-rules/prefer-custom-object-keys
-            typeof value === "object" && Object.keys(value).includes("nw") && Object.keys(value).includes("se")
-        : false;
-};
+const latitudeSchema = zod.z.number().min(-90).max(90);
+const longitudeSchema = zod.z.number().min(-180).max(180);
+const coordinateSchema = zod.z.object({ latitude: latitudeSchema, longitude: longitudeSchema });
+const boundingBoxSchema = zod.z.object({
+    nw: coordinateSchema,
+    se: coordinateSchema,
+});
+const booleanArraySchema = zod.z.array(zod.z.boolean());
 
 /**
  * This hook is used to convert the sorting state from the AssetSortingContext to the AssetSortInput used by the GraphQL API

package/index.esm.js

@@ -4,6 +4,7 @@ import { isStringArrayFilterValue, isMinMaxFilterValue, isDateRangeValue, isBool
 import { truthy } from '@trackunit/shared-utils';
 import { useCurrentUserSystemOfMeasurement, useAssetSorting } from '@trackunit/react-core-hooks';
 import { useMemo } from 'react';
+import { z } from 'zod';
 
 var defaultTranslations = {
 	
@@ -316,11 +317,13 @@ const useActiveAssetFilters = (filters) => {
             return {};
         }
         const followExist = filters.followed === "ALL" ? undefined : true;
+        const parsedBoundingBox = boundingBoxSchema.optional().safeParse(filters.boundingBox);
+        const parsedServiceBooked = booleanArraySchema.safeParse(filters.serviceBooked);
         return {
             assetIds: stringArrayOrUndefined(filters.assetIds),
             searchQuery: typeof filters.search === "string" && filters.search !== "" ? filters.search : undefined,
             activities: fixTypes(filters.activity, assetActivityState),
-            boundingBox: isBoundingBox(filters.boundingBox) ? filters.boundingBox : undefined,
+            boundingBox: parsedBoundingBox.success ? parsedBoundingBox.data : undefined,
             brands: stringArrayOrUndefined(filters.brands),
             types: stringArrayOrUndefined(filters.types),
             criticalities: fixTypes(filters.criticality, assetCriticalityState),
@@ -333,7 +336,7 @@ const useActiveAssetFilters = (filters) => {
             metadataCompleteness: ((_b = valueNameArrayOrUndefined(filters.metadataCompleteness)) === null || _b === void 0 ? void 0 : _b[0]) === "ALL"
                 ? undefined
                 : (_c = fixTypes(valueNameArrayOrUndefined(filters.metadataCompleteness), metadataCompleteness)) === null || _c === void 0 ? void 0 : _c[0],
-            serviceBooked: filters.serviceBooked,
+            serviceBooked: parsedServiceBooked.success ? parsedServiceBooked.data : undefined,
             servicePlanAssignments: fixTypes(filters.servicePlanStatus, servicePlanStatus),
             servicePlanIds: valueNameArrayOrUndefined(filters.servicePlan),
             servicePlanStatuses: fixTypes(filters.serviceStatus, servicePlanStatus),
@@ -354,12 +357,14 @@ const useActiveAssetFilters = (filters) => {
     }, [filters, customFields, systemOfMeasurement]);
     return filter;
 };
-const isBoundingBox = (value) => {
-    return value
-        ? // eslint-disable-next-line no-autofix/local-rules/prefer-custom-object-keys
-            typeof value === "object" && Object.keys(value).includes("nw") && Object.keys(value).includes("se")
-        : false;
-};
+const latitudeSchema = z.number().min(-90).max(90);
+const longitudeSchema = z.number().min(-180).max(180);
+const coordinateSchema = z.object({ latitude: latitudeSchema, longitude: longitudeSchema });
+const boundingBoxSchema = z.object({
+    nw: coordinateSchema,
+    se: coordinateSchema,
+});
+const booleanArraySchema = z.array(z.boolean());
 
 /**
  * This hook is used to convert the sorting state from the AssetSortingContext to the AssetSortInput used by the GraphQL API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-graphql-hook",
-  "version": "0.0.343",
+  "version": "0.0.345",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -19,7 +19,8 @@
     "graphql": "^15.8.0",
     "@apollo/client": "3.10.4",
     "@trackunit/react-core-contexts-test": "*",
-    "@trackunit/iris-app-api": "*"
+    "@trackunit/iris-app-api": "*",
+    "zod": "3.22.4"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",