@trackunit/filters-graphql-hook 0.0.440 → 0.0.441

package/index.cjs.js

@@ -4,9 +4,9 @@ require('react/jsx-runtime');
 var i18nLibraryTranslation = require('@trackunit/i18n-library-translation');
 var filtersFilterBar = require('@trackunit/filters-filter-bar');
 var sharedUtils = require('@trackunit/shared-utils');
+var zod = require('zod');
 var reactCoreHooks = require('@trackunit/react-core-hooks');
 var react = require('react');
-var zod = require('zod');
 
 var defaultTranslations = {
 	
@@ -181,6 +181,10 @@ input) => {
     }
     return null;
 };
+const geoJsonSimplifiedPolygonSchema = zod.z.strictObject({
+    type: zod.z.literal("Polygon"),
+    coordinates: zod.z.array(zod.z.array(zod.z.tuple([zod.z.number(), zod.z.number()]))),
+});
 
 const assetActivityState = {
     IDLING: "IDLING",
@@ -330,13 +334,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);
+        const parsedArea = geoJsonSimplifiedPolygonSchema.safeParse(filters.area);
         return {
             assetIds: stringArrayOrUndefined(filters.assetIds),
             searchQuery: typeof filters.search === "string" && filters.search !== "" ? filters.search : undefined,
             activities: fixTypes(filters.activity, assetActivityState),
-            boundingBox: parsedBoundingBox.success ? parsedBoundingBox.data : undefined,
+            area: parsedArea.success ? parsedArea.data : undefined,
             brands: stringArrayOrUndefined(filters.brands),
             types: stringArrayOrUndefined(filters.types),
             criticalities: fixTypes(filters.criticality, assetCriticalityState),
@@ -371,13 +375,6 @@ const useActiveAssetFilters = (filters) => {
     }, [filters, customFields, systemOfMeasurement]);
     return filter;
 };
-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());
 
 /**
@@ -442,6 +439,7 @@ exports.CustomFieldPrefix = CustomFieldPrefix;
 exports.convertToAssetSortInput = convertToAssetSortInput;
 exports.fixType = fixType;
 exports.fixTypes = fixTypes;
+exports.geoJsonSimplifiedPolygonSchema = geoJsonSimplifiedPolygonSchema;
 exports.isStringArrayValue = isStringArrayValue;
 exports.isValueName = isValueName;
 exports.positiveValueBooleanOrNull = positiveValueBooleanOrNull;

package/index.esm.js

@@ -2,9 +2,9 @@ import 'react/jsx-runtime';
 import { registerTranslations } from '@trackunit/i18n-library-translation';
 import { isStringArrayFilterValue, isMinMaxFilterValue, isDateRangeValue, isBooleanValue } from '@trackunit/filters-filter-bar';
 import { truthy } from '@trackunit/shared-utils';
+import { z } from 'zod';
 import { useCurrentUserSystemOfMeasurement, useAssetSorting } from '@trackunit/react-core-hooks';
 import { useMemo } from 'react';
-import { z } from 'zod';
 
 var defaultTranslations = {
 	
@@ -179,6 +179,10 @@ input) => {
     }
     return null;
 };
+const geoJsonSimplifiedPolygonSchema = z.strictObject({
+    type: z.literal("Polygon"),
+    coordinates: z.array(z.array(z.tuple([z.number(), z.number()]))),
+});
 
 const assetActivityState = {
     IDLING: "IDLING",
@@ -328,13 +332,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);
+        const parsedArea = geoJsonSimplifiedPolygonSchema.safeParse(filters.area);
         return {
             assetIds: stringArrayOrUndefined(filters.assetIds),
             searchQuery: typeof filters.search === "string" && filters.search !== "" ? filters.search : undefined,
             activities: fixTypes(filters.activity, assetActivityState),
-            boundingBox: parsedBoundingBox.success ? parsedBoundingBox.data : undefined,
+            area: parsedArea.success ? parsedArea.data : undefined,
             brands: stringArrayOrUndefined(filters.brands),
             types: stringArrayOrUndefined(filters.types),
             criticalities: fixTypes(filters.criticality, assetCriticalityState),
@@ -369,13 +373,6 @@ const useActiveAssetFilters = (filters) => {
     }, [filters, customFields, systemOfMeasurement]);
     return filter;
 };
-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());
 
 /**
@@ -436,4 +433,4 @@ const useAssetQueryFilters = (props) => {
  */
 setupLibraryTranslations();
 
-export { CustomFieldPrefix, convertToAssetSortInput, fixType, fixTypes, isStringArrayValue, isValueName, positiveValueBooleanOrNull, stringArrayOrUndefined, useActiveAssetFilters, useAssetQueryFilters, useAssetSortInput, useCustomFieldFilters, valueBooleanOrUndefined, valueNameArrayOrUndefined, valuesIfNotEmpty };
+export { CustomFieldPrefix, convertToAssetSortInput, fixType, fixTypes, geoJsonSimplifiedPolygonSchema, isStringArrayValue, isValueName, positiveValueBooleanOrNull, stringArrayOrUndefined, useActiveAssetFilters, useAssetQueryFilters, useAssetSortInput, useCustomFieldFilters, valueBooleanOrUndefined, valueNameArrayOrUndefined, valuesIfNotEmpty };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-graphql-hook",
-  "version": "0.0.440",
+  "version": "0.0.441",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {

package/src/fixTypes.d.ts

@@ -1,4 +1,5 @@
 import { ValueName } from "@trackunit/filters-filter-bar";
+import { z } from "zod";
 /**
  * Fix types for filter values
  *
@@ -43,3 +44,13 @@ export declare const valueBooleanOrUndefined: (input: any) => boolean | undefine
  *
  */
 export declare const positiveValueBooleanOrNull: (input: any) => boolean | null;
+export declare const geoJsonSimplifiedPolygonSchema: z.ZodObject<{
+    type: z.ZodLiteral<"Polygon">;
+    coordinates: z.ZodArray<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, "many">;
+}, "strict", z.ZodTypeAny, {
+    type: "Polygon";
+    coordinates: [number, number][][];
+}, {
+    type: "Polygon";
+    coordinates: [number, number][][];
+}>;

package/src/generated/graphql-api/graphql.d.ts

@@ -129,6 +129,10 @@ export type Scalars = {
         output: any;
     };
 };
+export declare const areaFilterGeoJsonGeometryType: {
+    readonly Polygon: "Polygon";
+};
+export type AreaFilterGeoJsonGeometryType = (typeof areaFilterGeoJsonGeometryType)[keyof typeof areaFilterGeoJsonGeometryType];
 export declare const assetActivityState: {
     readonly IDLING: "IDLING";
     readonly STOPPED: "STOPPED";
@@ -432,18 +436,32 @@ export declare const systemOfMeasurement: {
     readonly US_CUSTOMARY: "US_CUSTOMARY";
 };
 export type SystemOfMeasurement = (typeof systemOfMeasurement)[keyof typeof systemOfMeasurement];
+export type AreaInput = {
+    /** The coordinates of the GeoJSON geometry see [the GeoJSON RFC](https://www.rfc-editor.org/rfc/rfc7946.html#section-3.1) for details. */
+    coordinates: Array<Scalars["GeoJSONCoordinates"]["input"]>;
+    /** The type of the GeoJSON object. */
+    type: AreaFilterGeoJsonGeometryType;
+};
 export type AssetFiltersInput = {
     /** Filter by if the asset is active */
     activeFilter?: InputMaybe<Scalars["Boolean"]["input"]>;
     /** List of activities */
     activities?: InputMaybe<Array<AssetActivityState>>;
+    /** Filter by area */
+    area?: InputMaybe<AreaInput>;
     /** A list of asset ID's to do a bulk lookup for. */
     assetIds?: InputMaybe<Array<Scalars["ID"]["input"]>>;
     /** List of asset types */
     assetTypes?: InputMaybe<Array<AssetType>>;
-    /** Filter by bounding box */
+    /**
+     * Filter by bounding box
+     * @deprecated Use area filter instead
+     */
     boundingBox?: InputMaybe<BoundingBoxInput>;
-    /** Filter by bounding shape */
+    /**
+     * Filter by bounding shape
+     * @deprecated Use area filter instead
+     */
     boundingShape?: InputMaybe<BoundingShapeInput>;
     /** Filter to only include this list of brands */
     brands?: InputMaybe<Array<Scalars["String"]["input"]>>;