Merge branch 'main' into feat/inv-list-actions-pt2

# Conflicts:
#	src/@seed/api/mapping/mapping.service.ts
#	src/@seed/api/organization/organization.types.ts
#	src/@seed/api/user/user.service.ts
#	src/app/modules/datasets/data-mappings/data-mapping.component.ts
#	src/app/modules/inventory-list/list/grid/actions.component.ts
#	src/app/modules/inventory-list/list/inventory.component.ts
#	src/app/modules/inventory/actions/export-modal.component.ts
#	src/app/modules/organizations/email-templates/email-templates.component.ts
#	src/styles/styles.scss

Author: axelstudios

package.json

@@ -51,6 +51,9 @@
     "@jsverse/transloco": "^7.5.1",
     "ag-grid-angular": "^33.1.1",
     "ag-grid-community": "^33.1.1",
+    "chart.js": "^4.5.0",
+    "chartjs-plugin-annotation": "^3.1.0",
+    "chartjs-plugin-zoom": "^2.2.0",
     "crypto-es": "^2.1.0",
     "cspell": "^8.17.3",
     "file-saver": "^2.0.5",

pnpm-lock.yaml

@@ -0,0 +1,21 @@
+import type { HttpErrorResponse } from '@angular/common/http'
+import { HttpClient } from '@angular/common/http'
+import { inject, Injectable } from '@angular/core'
+import type { Observable } from 'rxjs'
+import { catchError } from 'rxjs'
+import { ErrorService } from '@seed/services'
+
+@Injectable({ providedIn: 'root' })
+export class CacheService {
+  private _errorService = inject(ErrorService)
+  private _httpClient = inject(HttpClient)
+
+  getCacheEntry(orgId: number, uniqueId: number): Observable<unknown> {
+    const url = `/api/v3/cache_entries/${uniqueId}/?organization_id=${orgId}`
+    return this._httpClient.get<unknown>(url).pipe(
+      catchError((error: HttpErrorResponse) => {
+        return this._errorService.handleError(error, 'Error fetching cache entry')
+      }),
+    )
+  }
+}

src/@seed/api/cache/cache.service.ts

@@ -0,0 +1 @@
+export * from './cache.service'

src/@seed/api/cache/index.ts

@@ -67,6 +67,7 @@ export type DataMappingRow = {
   omit?: boolean; // optional, used for omitting columns
   isExtraData?: boolean; // used internally, not part of the API
   isNewColumn?: boolean; // used internally, not part of the API
+  hasDuplicate?: boolean; // used internally, not part of the API
 }
 
 export type MappedData = {

src/@seed/api/dataset/dataset.types.ts

@@ -0,0 +1,46 @@
+import type { HttpErrorResponse } from '@angular/common/http'
+import { HttpClient } from '@angular/common/http'
+import { inject, Injectable } from '@angular/core'
+import { BehaviorSubject, catchError, map, take, tap } from 'rxjs'
+import { ErrorService } from '@seed/services'
+import { naturalSort } from '@seed/utils'
+import { UserService } from '../user'
+import type { FilterGroup, FilterGroupInventoryType, FilterGroupsResponse } from './filter-group.types'
+
+@Injectable({ providedIn: 'root' })
+export class FilterGroupService {
+  private _errorService = inject(ErrorService)
+  private _filterGroups = new BehaviorSubject<FilterGroup[]>([])
+  private _httpClient = inject(HttpClient)
+  private _userService = inject(UserService)
+
+  filterGroups$ = this._filterGroups.asObservable()
+
+  constructor() {
+    this._userService.currentOrganizationId$
+      .pipe(
+        tap((orgId) => {
+          this.list(orgId, 'Property')
+        }),
+      )
+      .subscribe()
+  }
+
+  list(orgId: number, inventoryType: FilterGroupInventoryType = 'Property') {
+    const url = `/api/v3/filter_groups/?organization_id=${orgId}&inventory_type=${inventoryType}`
+    this._httpClient
+      .get<FilterGroupsResponse>(url)
+      .pipe(
+        take(1),
+        map(({ data }) => {
+          const filterGroups = data.toSorted((a, b) => naturalSort(a.name, b.name))
+          this._filterGroups.next(filterGroups)
+          return filterGroups
+        }),
+        catchError((error: HttpErrorResponse) => {
+          return this._errorService.handleError(error, 'Error fetching filter groups')
+        }),
+      )
+      .subscribe()
+  }
+}

src/@seed/api/filter-group/filter-group.service.ts

@@ -0,0 +1,15 @@
+export type FilterGroupInventoryType = 'Property' | 'Tax Lot'
+
+// TODO there are more fields returned that could be added here
+export type FilterGroup = {
+  id: number;
+  name: string;
+  organization_id: number;
+  inventory_type: FilterGroupInventoryType;
+}
+
+// TODO this has unhandled pagination
+export type FilterGroupsResponse = {
+  status: string;
+  data: FilterGroup[];
+}

src/@seed/api/filter-group/filter-group.types.ts

@@ -0,0 +1,2 @@
+export * from './filter-group.service'
+export * from './filter-group.types'

src/@seed/api/filter-group/index.ts

@@ -1,5 +1,6 @@
 export * from './analysis'
 export * from './audit-template'
+export * from './cache'
 export * from './column'
 export * from './column-mapping-profile'
 export * from './config'
@@ -8,6 +9,7 @@ export * from './data-quality'
 export * from './dataset'
 export * from './derived-column'
 export * from './geocode'
+export * from './filter-group'
 export * from './groups'
 export * from './inventory'
 export * from './label'
@@ -18,6 +20,7 @@ export * from './notes'
 export * from './organization'
 export * from './pairing'
 export * from './postoffice'
+export * from './program'
 export * from './progress'
 export * from './salesforce'
 export * from './scenario'

src/@seed/api/index.ts

@@ -354,19 +354,9 @@ export class InventoryService {
     )
   }
 
-  startInventoryExport(orgId: number): Observable<ProgressResponse> {
+  startInventoryExport(orgId: number, data: InventoryExportData): Observable<ProgressResponse> {
     const url = `/api/v3/tax_lot_properties/start_export/?organization_id=${orgId}`
-    return this._httpClient.get<ProgressResponse>(url).pipe(
-      take(1),
-      catchError((error: HttpErrorResponse) => {
-        return this._errorService.handleError(error, 'Error starting export')
-      }),
-    )
-  }
-
-  exportInventory(orgId: number, type: InventoryType, data: InventoryExportData): Observable<Blob> {
-    const url = `/api/v3/tax_lot_properties/export/?inventory_type=${type}&organization_id=${orgId}`
-    return this._httpClient.post(url, data, { responseType: 'blob' }).pipe(
+    return this._httpClient.post<ProgressResponse>(url, data).pipe(
       take(1),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error starting export')