feat(asset): add resolved due date filter for list assets (#102)

ni · Oct 24, 2024 · d4ad953 · d4ad953
1 parent 36e981e
commit d4ad953
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/datasources/asset/components/editors/list-assets/query-builder/AssetQueryBuilder.tsx b/src/datasources/asset/components/editors/list-assets/query-builder/AssetQueryBuilder.tsx
@@ -113,6 +113,10 @@ export const AssetQueryBuilder: React.FC<AssetCalibrationQueryBuilderProps> = ({
       },
       QueryBuilderOperations.CONTAINS,
       QueryBuilderOperations.DOES_NOT_CONTAIN,
+      QueryBuilderOperations.LESS_THAN,
+      QueryBuilderOperations.LESS_THAN_OR_EQUAL_TO,
+      QueryBuilderOperations.GREATER_THAN,
+      QueryBuilderOperations.GREATER_THAN_OR_EQUAL_TO
     ]);
   }, [workspaceField, locationField, areDependenciesLoaded, globalVariableOptions]);
 

diff --git a/src/datasources/asset/constants/ListAssets.constants.ts b/src/datasources/asset/constants/ListAssets.constants.ts
@@ -1,6 +1,6 @@
 import { QueryBuilderOperations } from "../../../core/query-builder.constants";
 import { QBField } from "../types/CalibrationForecastQuery.types";
-import { AssetTypeOptions, BusTypeOptions } from "../types/types";
+import { AssetTypeOptions, BusTypeOptions, ResolvedDueDateOptions } from "../types/types";
 
 export enum ListAssetsFieldNames {
     LOCATION = 'Location',
@@ -9,6 +9,7 @@ export enum ListAssetsFieldNames {
     VENDOR_NAME = 'VendorName',
     BUS_TYPE = 'BusType',
     ASSET_TYPE = 'AssetType',
+    CALIBRATION_DUE_DATE = 'ExternalCalibration.NextRecommendedDate'
 }
 
 export const ListAssetsFields: Record<string, QBField> = {
@@ -72,11 +73,25 @@ export const ListAssetsFields: Record<string, QBField> = {
             dataSource: AssetTypeOptions,
         },
     },
+    CALIBRATION_DUE_DATE: {
+        label: 'Calibration Due Date',
+        dataField: ListAssetsFieldNames.CALIBRATION_DUE_DATE,
+        filterOperations: [
+            QueryBuilderOperations.LESS_THAN.name,
+            QueryBuilderOperations.LESS_THAN_OR_EQUAL_TO.name,
+            QueryBuilderOperations.GREATER_THAN.name,
+            QueryBuilderOperations.GREATER_THAN_OR_EQUAL_TO.name
+        ],
+        lookup: {
+            dataSource: ResolvedDueDateOptions
+        }
+    }
 };
 
 export const ListAssetsStaticFields = [
     ListAssetsFields.MODEL_NAME,
     ListAssetsFields.VENDOR_NAME,
     ListAssetsFields.ASSET_TYPE,
-    ListAssetsFields.BUS_TYPE
+    ListAssetsFields.BUS_TYPE,
+    ListAssetsFields.CALIBRATION_DUE_DATE
 ];
diff --git a/src/datasources/asset/types/types.ts b/src/datasources/asset/types/types.ts
@@ -82,3 +82,8 @@ export const AssetTypeOptions = [
   { label: 'Fixture', value: AssetType.FIXTURE },
   { label: 'System', value: AssetType.SYSTEM },
 ];
+
+export const ResolvedDueDateOptions = [
+  { label: '${__from:date}', value: '${__from:date}' },
+  { label: '${__to:date}', value: '${__to:date}' }
+];