@trackunit/filters-graphql-hook 2.6.16 → 2.6.18

package/index.cjs.js

@@ -347,6 +347,27 @@ const deviceHealthIssueType = {
     OPERATING_HOURS_REPORTING_24_HOURS_PER_DAY: "OPERATING_HOURS_REPORTING_24_HOURS_PER_DAY",
     UNUSUAL_OPERATING_HOURS: "UNUSUAL_OPERATING_HOURS",
 };
+const inspectionLastPerformed = {
+    MORE_THAN_LAST_2_HOURS: "MORE_THAN_LAST_2_HOURS",
+    MORE_THAN_LAST_7_DAYS: "MORE_THAN_LAST_7_DAYS",
+    MORE_THAN_LAST_8_HOURS: "MORE_THAN_LAST_8_HOURS",
+    MORE_THAN_LAST_12_HOURS: "MORE_THAN_LAST_12_HOURS",
+    MORE_THAN_LAST_24_HOURS: "MORE_THAN_LAST_24_HOURS",
+    WITHIN_LAST_2_HOURS: "WITHIN_LAST_2_HOURS",
+    WITHIN_LAST_7_DAYS: "WITHIN_LAST_7_DAYS",
+    WITHIN_LAST_8_HOURS: "WITHIN_LAST_8_HOURS",
+    WITHIN_LAST_12_HOURS: "WITHIN_LAST_12_HOURS",
+    WITHIN_LAST_24_HOURS: "WITHIN_LAST_24_HOURS"};
+const inspectionResponseStatus = {
+    FAILED_CRITICAL: "FAILED_CRITICAL",
+    FAILED_LOW: "FAILED_LOW",
+    PASSED: "PASSED",
+    SKIPPED: "SKIPPED",
+};
+const inspectionTemplateAssigned = {
+    HAS_TEMPLATE: "HAS_TEMPLATE",
+    NO_TEMPLATE: "NO_TEMPLATE",
+};
 const metadataCompleteness = {
     COMPLETE: "COMPLETE",
     PARTIAL: "PARTIAL",
@@ -455,6 +476,60 @@ const useCustomFieldFilters = (filters) => {
  */
 const CustomFieldPrefix = "cf__";
 
+/**
+ * Sentinel value used by the "last inspection result" filter bar to represent assets that have no
+ * last inspection. It is not an `InspectionResponseStatus`; it is translated to
+ * `inspectionLastFilters.includeNeverInspected` at this boundary.
+ */
+const NO_LAST_INSPECTION = "NO_LAST_INSPECTION";
+/**
+ * Sentinel value used by the "last performed inspection" filter bar to represent assets that have
+ * never been inspected. Translated to `inspectionLastFilters.includeNeverInspected`.
+ */
+const NEVER_PERFORMED = "NEVER";
+/**
+ * Maps the "last performed inspection" filter bar option values (UI/URL state) to the schema's
+ * `InspectionLastPerformed` enum. `ALL` and `NEVER` are handled separately and intentionally absent.
+ */
+const lastPerformedInspectionToPerformedEnum = {
+    WITHIN_2_HOURS: inspectionLastPerformed.WITHIN_LAST_2_HOURS,
+    WITHIN_8_HOURS: inspectionLastPerformed.WITHIN_LAST_8_HOURS,
+    WITHIN_12_HOURS: inspectionLastPerformed.WITHIN_LAST_12_HOURS,
+    WITHIN_24_HOURS: inspectionLastPerformed.WITHIN_LAST_24_HOURS,
+    WITHIN_7_DAYS: inspectionLastPerformed.WITHIN_LAST_7_DAYS,
+    MORE_THAN_2_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_2_HOURS,
+    MORE_THAN_8_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_8_HOURS,
+    MORE_THAN_12_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_12_HOURS,
+    MORE_THAN_24_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_24_HOURS,
+    MORE_THAN_7_DAYS_AGO: inspectionLastPerformed.MORE_THAN_LAST_7_DAYS,
+};
+/**
+ * Builds the `inspectionLastFilters` GraphQL input from the "last inspection result" (checkbox) and
+ * "last performed inspection" (radio) filter bar values.
+ *
+ * - `lastInspectionResult` supplies `statuses` (PASSED / FAILED_LOW / FAILED_CRITICAL / SKIPPED) and,
+ *   via the `NO_LAST_INSPECTION` sentinel, `includeNeverInspected`.
+ * - `lastPerformedInspection` supplies `performed` (relative time bucket) and, via the `NEVER`
+ *   sentinel, `includeNeverInspected`.
+ *
+ * @param filters - Filter bar values
+ * @returns {InspectionLastFilters | undefined} The combined input, or undefined when nothing is set
+ */
+const buildInspectionLastFilters = (filters) => {
+    const lastInspectionResultValues = stringArrayOrUndefined(filters.lastInspectionResult) ?? [];
+    const statuses = fixTypes(lastInspectionResultValues.filter(value => value !== NO_LAST_INSPECTION), inspectionResponseStatus);
+    const lastPerformedInspectionValue = valueNameOrUndefined(filters.lastPerformedInspection)?.value;
+    const performed = lastPerformedInspectionValue
+        ? lastPerformedInspectionToPerformedEnum[lastPerformedInspectionValue]
+        : undefined;
+    const includeNeverInspected = lastInspectionResultValues.includes(NO_LAST_INSPECTION) || lastPerformedInspectionValue === NEVER_PERFORMED
+        ? true
+        : undefined;
+    if (!statuses && !performed && !includeNeverInspected) {
+        return undefined;
+    }
+    return { statuses, performed, includeNeverInspected };
+};
 /**
  * Converts field filters to a format that can be used by the GraphQL API for AssetFiltersInput
  *
@@ -494,6 +569,13 @@ const useActiveAssetFilters = (filters) => {
                 valueNameOrUndefined(filters.metadataCompleteness)?.value === "ALL"
                 ? undefined
                 : fixType(valueNameOrUndefined(filters.metadataCompleteness)?.value, metadataCompleteness),
+            // Combines the "last inspection result" (statuses) and "last performed inspection" (time bucket)
+            // filter bar values into the single `inspectionLastFilters` input.
+            inspectionLastFilters: buildInspectionLastFilters(filters),
+            inspectionTemplateAssigned: !valueNameOrUndefined(filters.inspectionTemplateAssigned) ||
+                valueNameOrUndefined(filters.inspectionTemplateAssigned)?.value === "ALL"
+                ? undefined
+                : fixType(valueNameOrUndefined(filters.inspectionTemplateAssigned)?.value, inspectionTemplateAssigned),
             serviceBooked: parsedServiceBooked.success ? parsedServiceBooked.data : undefined,
             servicePlanAssignments: fixTypes(filters.servicePlanStatus, servicePlanStatus),
             servicePlanIds: valueNameArrayOrUndefined(filters.servicePlan),

package/index.esm.js

@@ -345,6 +345,27 @@ const deviceHealthIssueType = {
     OPERATING_HOURS_REPORTING_24_HOURS_PER_DAY: "OPERATING_HOURS_REPORTING_24_HOURS_PER_DAY",
     UNUSUAL_OPERATING_HOURS: "UNUSUAL_OPERATING_HOURS",
 };
+const inspectionLastPerformed = {
+    MORE_THAN_LAST_2_HOURS: "MORE_THAN_LAST_2_HOURS",
+    MORE_THAN_LAST_7_DAYS: "MORE_THAN_LAST_7_DAYS",
+    MORE_THAN_LAST_8_HOURS: "MORE_THAN_LAST_8_HOURS",
+    MORE_THAN_LAST_12_HOURS: "MORE_THAN_LAST_12_HOURS",
+    MORE_THAN_LAST_24_HOURS: "MORE_THAN_LAST_24_HOURS",
+    WITHIN_LAST_2_HOURS: "WITHIN_LAST_2_HOURS",
+    WITHIN_LAST_7_DAYS: "WITHIN_LAST_7_DAYS",
+    WITHIN_LAST_8_HOURS: "WITHIN_LAST_8_HOURS",
+    WITHIN_LAST_12_HOURS: "WITHIN_LAST_12_HOURS",
+    WITHIN_LAST_24_HOURS: "WITHIN_LAST_24_HOURS"};
+const inspectionResponseStatus = {
+    FAILED_CRITICAL: "FAILED_CRITICAL",
+    FAILED_LOW: "FAILED_LOW",
+    PASSED: "PASSED",
+    SKIPPED: "SKIPPED",
+};
+const inspectionTemplateAssigned = {
+    HAS_TEMPLATE: "HAS_TEMPLATE",
+    NO_TEMPLATE: "NO_TEMPLATE",
+};
 const metadataCompleteness = {
     COMPLETE: "COMPLETE",
     PARTIAL: "PARTIAL",
@@ -453,6 +474,60 @@ const useCustomFieldFilters = (filters) => {
  */
 const CustomFieldPrefix = "cf__";
 
+/**
+ * Sentinel value used by the "last inspection result" filter bar to represent assets that have no
+ * last inspection. It is not an `InspectionResponseStatus`; it is translated to
+ * `inspectionLastFilters.includeNeverInspected` at this boundary.
+ */
+const NO_LAST_INSPECTION = "NO_LAST_INSPECTION";
+/**
+ * Sentinel value used by the "last performed inspection" filter bar to represent assets that have
+ * never been inspected. Translated to `inspectionLastFilters.includeNeverInspected`.
+ */
+const NEVER_PERFORMED = "NEVER";
+/**
+ * Maps the "last performed inspection" filter bar option values (UI/URL state) to the schema's
+ * `InspectionLastPerformed` enum. `ALL` and `NEVER` are handled separately and intentionally absent.
+ */
+const lastPerformedInspectionToPerformedEnum = {
+    WITHIN_2_HOURS: inspectionLastPerformed.WITHIN_LAST_2_HOURS,
+    WITHIN_8_HOURS: inspectionLastPerformed.WITHIN_LAST_8_HOURS,
+    WITHIN_12_HOURS: inspectionLastPerformed.WITHIN_LAST_12_HOURS,
+    WITHIN_24_HOURS: inspectionLastPerformed.WITHIN_LAST_24_HOURS,
+    WITHIN_7_DAYS: inspectionLastPerformed.WITHIN_LAST_7_DAYS,
+    MORE_THAN_2_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_2_HOURS,
+    MORE_THAN_8_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_8_HOURS,
+    MORE_THAN_12_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_12_HOURS,
+    MORE_THAN_24_HOURS_AGO: inspectionLastPerformed.MORE_THAN_LAST_24_HOURS,
+    MORE_THAN_7_DAYS_AGO: inspectionLastPerformed.MORE_THAN_LAST_7_DAYS,
+};
+/**
+ * Builds the `inspectionLastFilters` GraphQL input from the "last inspection result" (checkbox) and
+ * "last performed inspection" (radio) filter bar values.
+ *
+ * - `lastInspectionResult` supplies `statuses` (PASSED / FAILED_LOW / FAILED_CRITICAL / SKIPPED) and,
+ *   via the `NO_LAST_INSPECTION` sentinel, `includeNeverInspected`.
+ * - `lastPerformedInspection` supplies `performed` (relative time bucket) and, via the `NEVER`
+ *   sentinel, `includeNeverInspected`.
+ *
+ * @param filters - Filter bar values
+ * @returns {InspectionLastFilters | undefined} The combined input, or undefined when nothing is set
+ */
+const buildInspectionLastFilters = (filters) => {
+    const lastInspectionResultValues = stringArrayOrUndefined(filters.lastInspectionResult) ?? [];
+    const statuses = fixTypes(lastInspectionResultValues.filter(value => value !== NO_LAST_INSPECTION), inspectionResponseStatus);
+    const lastPerformedInspectionValue = valueNameOrUndefined(filters.lastPerformedInspection)?.value;
+    const performed = lastPerformedInspectionValue
+        ? lastPerformedInspectionToPerformedEnum[lastPerformedInspectionValue]
+        : undefined;
+    const includeNeverInspected = lastInspectionResultValues.includes(NO_LAST_INSPECTION) || lastPerformedInspectionValue === NEVER_PERFORMED
+        ? true
+        : undefined;
+    if (!statuses && !performed && !includeNeverInspected) {
+        return undefined;
+    }
+    return { statuses, performed, includeNeverInspected };
+};
 /**
  * Converts field filters to a format that can be used by the GraphQL API for AssetFiltersInput
  *
@@ -492,6 +567,13 @@ const useActiveAssetFilters = (filters) => {
                 valueNameOrUndefined(filters.metadataCompleteness)?.value === "ALL"
                 ? undefined
                 : fixType(valueNameOrUndefined(filters.metadataCompleteness)?.value, metadataCompleteness),
+            // Combines the "last inspection result" (statuses) and "last performed inspection" (time bucket)
+            // filter bar values into the single `inspectionLastFilters` input.
+            inspectionLastFilters: buildInspectionLastFilters(filters),
+            inspectionTemplateAssigned: !valueNameOrUndefined(filters.inspectionTemplateAssigned) ||
+                valueNameOrUndefined(filters.inspectionTemplateAssigned)?.value === "ALL"
+                ? undefined
+                : fixType(valueNameOrUndefined(filters.inspectionTemplateAssigned)?.value, inspectionTemplateAssigned),
             serviceBooked: parsedServiceBooked.success ? parsedServiceBooked.data : undefined,
             servicePlanAssignments: fixTypes(filters.servicePlanStatus, servicePlanStatus),
             servicePlanIds: valueNameArrayOrUndefined(filters.servicePlan),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-graphql-hook",
-  "version": "2.6.16",
+  "version": "2.6.18",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -10,14 +10,14 @@
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-typed-document-node/core": "^3.2.0",
     "zod": "^3.25.76",
-    "@trackunit/iris-app-build-utilities": "2.3.5",
-    "@trackunit/filters-filter-bar": "2.4.10",
+    "@trackunit/iris-app-build-utilities": "2.3.6",
+    "@trackunit/filters-filter-bar": "2.4.11",
     "@trackunit/shared-utils": "1.16.4",
-    "@trackunit/iris-app-api": "2.3.5",
+    "@trackunit/iris-app-api": "2.3.6",
     "@trackunit/react-core-contexts-test": "1.18.4",
-    "@trackunit/i18n-library-translation": "2.3.5",
+    "@trackunit/i18n-library-translation": "2.3.6",
     "@trackunit/iris-app-runtime-core-api": "1.17.4",
-    "@trackunit/react-core-hooks": "1.20.5"
+    "@trackunit/react-core-hooks": "1.20.6"
   },
   "peerDependencies": {
     "@apollo/client": "^3.13.8",