Adds detail sub pages and side nav

cspell.json

@@ -18,5 +18,19 @@
     "/.spelling.dic",
     "/pnpm-lock.yaml"
   ],
-  "useGitignore": true
+  "useGitignore": true,
+  "words": [
+    "eeej",
+    "EPSG",
+    "FEMP",
+    "falsey",
+    "greenbutton",
+    "movened",
+    "overlaycontainer",
+    "SRID",
+    "ubids",
+    "unpair",
+    "Unpair",
+    "unpairing",
+  ]
 }

src/@seed/api/audit-template/audit-template.service.ts

@@ -2,7 +2,7 @@ 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, map, ReplaySubject, Subject, takeUntil } from 'rxjs'
+import { catchError, map, ReplaySubject } from 'rxjs'
 import { ErrorService } from '@seed/services/error/error.service'
 import { UserService } from '../user'
 import type {
@@ -17,7 +17,6 @@ export class AuditTemplateService {
   private _httpClient = inject(HttpClient)
   private _userService = inject(UserService)
   private _errorService = inject(ErrorService)
-  private readonly _unsubscribeAll$ = new Subject<void>()
   private _reportTypes = new ReplaySubject<AuditTemplateReportType[]>(1)
   private _auditTemplateConfig = new ReplaySubject<AuditTemplateConfig>(1)
   reportTypes$ = this._reportTypes.asObservable()
@@ -48,7 +47,7 @@ export class AuditTemplateService {
       { name: 'WA Commerce Clean Buildings - Form D Report' },
       { name: 'WA Commerce Grants Report' },
     ])
-    this._userService.currentOrganizationId$.pipe(takeUntil(this._unsubscribeAll$)).subscribe((organizationId) => {
+    this._userService.currentOrganizationId$.subscribe((organizationId) => {
       this.getConfigs(organizationId).subscribe()
     })
   }

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

@@ -2,7 +2,7 @@ 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, map, ReplaySubject, Subject, takeUntil } from 'rxjs'
+import { catchError, map, ReplaySubject } from 'rxjs'
 import type { ProgressResponse } from '@seed/api/progress'
 import { ErrorService } from '@seed/services/error/error.service'
 import { UserService } from '../user'
@@ -16,14 +16,13 @@ export class ColumnService {
 
   private _propertyColumns = new ReplaySubject<Column[]>(1)
   private _taxLotColumns = new ReplaySubject<Column[]>(1)
-  private readonly _unsubscribeAll$ = new Subject<void>()
 
   propertyColumns$ = this._propertyColumns.asObservable()
   taxLotColumns$ = this._taxLotColumns.asObservable()
 
   constructor() {
     // Fetch current org data whenever user org id changes
-    this._userService.currentOrganizationId$.pipe(takeUntil(this._unsubscribeAll$)).subscribe((organizationId) => {
+    this._userService.currentOrganizationId$.subscribe((organizationId) => {
       this.getPropertyColumns(organizationId).subscribe()
       this.getTaxLotColumns(organizationId).subscribe()
     })

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

@@ -2,7 +2,7 @@ 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, map, ReplaySubject, Subject, takeUntil } from 'rxjs'
+import { catchError, map, ReplaySubject } from 'rxjs'
 import { ErrorService } from '@seed/services'
 import { UserService } from '../user'
 import type { ColumnMapping, ColumnMappingProfile, ColumnMappingProfileDeleteResponse, ColumnMappingProfilesRequest, ColumnMappingProfileUpdateResponse, ColumnMappingSuggestionResponse } from './column_mapping_profile.types'
@@ -13,13 +13,12 @@ export class ColumnMappingProfileService {
   private _userService = inject(UserService)
   private _profiles = new ReplaySubject<ColumnMappingProfile[]>(1)
   private _errorService = inject(ErrorService)
-  private readonly _unsubscribeAll$ = new Subject<void>()
 
   profiles$ = this._profiles.asObservable()
 
   constructor() {
     // Fetch current org data whenever user org id changes
-    this._userService.currentOrganizationId$.pipe(takeUntil(this._unsubscribeAll$)).subscribe((organizationId) => {
+    this._userService.currentOrganizationId$.subscribe((organizationId) => {
       this.getProfiles(organizationId).subscribe()
     })
   }

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

@@ -2,7 +2,7 @@ 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 { BehaviorSubject, catchError, map, Subject, switchMap, takeUntil, tap } from 'rxjs'
+import { BehaviorSubject, catchError, map, take, tap } from 'rxjs'
 import { OrganizationService } from '@seed/api/organization'
 import { ErrorService } from '@seed/services'
 import { SnackBarService } from 'app/core/snack-bar/snack-bar.service'
@@ -15,38 +15,34 @@ export class CycleService {
   private _snackBar = inject(SnackBarService)
   private _errorService = inject(ErrorService)
   private _cycles = new BehaviorSubject<Cycle[]>([])
-  private readonly _unsubscribeAll$ = new Subject<void>()
   orgId: number
 
   cycles$ = this._cycles.asObservable()
 
   constructor() {
-    this._organizationService.currentOrganization$
-      .pipe(
-        takeUntil(this._unsubscribeAll$),
-        switchMap(({ org_id }) => this.get(org_id)),
-      )
-      .subscribe()
+    this._organizationService.currentOrganization$.pipe(
+      tap(({ org_id }) => { this.get(org_id) }),
+    ).subscribe()
   }
 
-  get(orgId: number): Observable<Cycle[]> {
+  get(orgId: number) {
     const url = `/api/v3/cycles/?organization_id=${orgId}`
-    return this._httpClient.get<CyclesResponse>(url).pipe(
+    this._httpClient.get<CyclesResponse>(url).pipe(
+      take(1),
       map(({ cycles }) => cycles),
-      tap((cycles) => {
-        this._cycles.next(cycles)
-      }),
+      tap((cycles) => { this._cycles.next(cycles) }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error fetching cycles')
       }),
-    )
+    ).subscribe()
   }
 
   post({ data, orgId }): Observable<CycleResponse | null> {
     const url = `/api/v3/cycles/?organization_id=${orgId}`
     return this._httpClient.post<CycleResponse>(url, data).pipe(
       tap((response) => {
         this._snackBar.success(`Created Cycle ${response.cycles.name}`)
+        this.get(orgId as number)
       }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error creating cycle')
@@ -59,6 +55,7 @@ export class CycleService {
     return this._httpClient.put<CycleResponse>(url, data).pipe(
       tap((response) => {
         this._snackBar.success(`Updated Cycle ${response.cycles.name}`)
+        this.get(orgId as number)
       }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error updating cycle')
@@ -69,6 +66,7 @@ export class CycleService {
   delete(id: number, orgId: number) {
     const url = `/api/v3/cycles/${id}/?organization_id=${orgId}`
     return this._httpClient.delete(url).pipe(
+      tap(() => { this.get(orgId) }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error deleting cycle')
       }),

src/@seed/api/data-quality/data-quality.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient, type HttpErrorResponse } from '@angular/common/http'
 import { inject, Injectable } from '@angular/core'
-import { catchError, type Observable, ReplaySubject, Subject, switchMap, takeUntil, tap } from 'rxjs'
+import { catchError, type Observable, ReplaySubject, switchMap, tap } from 'rxjs'
 import { OrganizationService } from '@seed/api/organization'
 import { ErrorService } from '@seed/services'
 import { SnackBarService } from 'app/core/snack-bar/snack-bar.service'
@@ -13,17 +13,13 @@ export class DataQualityService {
   private _snackBar = inject(SnackBarService)
   private _errorService = inject(ErrorService)
   private _rules = new ReplaySubject<Rule[]>()
-  private readonly _unsubscribeAll$ = new Subject<void>()
   orgId: number
   rules$ = this._rules.asObservable()
 
   constructor() {
-    this._organizationService.currentOrganization$
-      .pipe(
-        takeUntil(this._unsubscribeAll$),
-        switchMap(({ org_id }) => this.getRules(org_id)),
-      )
-      .subscribe()
+    this._organizationService.currentOrganization$.pipe(
+      switchMap(({ org_id }) => this.getRules(org_id)),
+    ).subscribe()
   }
 
   getRules(orgId: number): Observable<Rule[]> {

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

@@ -2,7 +2,7 @@ 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, map, of, ReplaySubject, Subject, takeUntil } from 'rxjs'
+import { catchError, map, of, ReplaySubject } from 'rxjs'
 import { UserService } from '../user'
 import type { CountDatasetsResponse, Dataset, ListDatasetsResponse } from './dataset.types'
 
@@ -11,13 +11,12 @@ export class DatasetService {
   private _httpClient = inject(HttpClient)
   private _userService = inject(UserService)
 
-  private readonly _unsubscribeAll$ = new Subject<void>()
   private _datasetCount = new ReplaySubject<number>(1)
   datasetCount$ = this._datasetCount.asObservable()
 
   constructor() {
     // Refresh dataset count only when the organization ID changes
-    this._userService.currentOrganizationId$.pipe(takeUntil(this._unsubscribeAll$)).subscribe((organizationId) => {
+    this._userService.currentOrganizationId$.subscribe((organizationId) => {
       this.countDatasets(organizationId).subscribe()
     })
   }

src/@seed/api/derived-column/derived-column.service.ts

@@ -1,7 +1,7 @@
 import type { HttpErrorResponse } from '@angular/common/http'
 import { HttpClient } from '@angular/common/http'
 import { inject, Injectable } from '@angular/core'
-import { catchError, map, type Observable, ReplaySubject, Subject, switchMap, takeUntil, tap } from 'rxjs'
+import { catchError, map, type Observable, ReplaySubject, switchMap, tap } from 'rxjs'
 import { ErrorService } from '@seed/services/error/error.service'
 import { SnackBarService } from 'app/core/snack-bar/snack-bar.service'
 import { OrganizationService } from '../organization'
@@ -14,19 +14,13 @@ export class DerivedColumnService {
   private _snackBar = inject(SnackBarService)
   private _errorService = inject(ErrorService)
   private _derivedColumns = new ReplaySubject<DerivedColumn[]>()
-  private readonly _unsubscribeAll$ = new Subject<void>()
 
   orgId: number
 
   derivedColumns$ = this._derivedColumns.asObservable()
 
   constructor() {
-    this._organizationService.currentOrganization$
-      .pipe(
-        takeUntil(this._unsubscribeAll$),
-        switchMap(({ org_id }) => this.get(org_id)),
-      )
-      .subscribe()
+    this._organizationService.currentOrganization$.pipe(switchMap(({ org_id }) => this.get(org_id))).subscribe()
   }
 
   get(orgId: number): Observable<DerivedColumn[]> {

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

@@ -1,7 +1,7 @@
 import type { HttpErrorResponse } from '@angular/common/http'
 import { HttpClient } from '@angular/common/http'
 import { inject, Injectable } from '@angular/core'
-import { BehaviorSubject, catchError, map, type Observable, Subject, takeUntil, tap } from 'rxjs'
+import { BehaviorSubject, catchError, map, type Observable, take, tap } from 'rxjs'
 import { ErrorService } from '@seed/services'
 import { SnackBarService } from 'app/core/snack-bar/snack-bar.service'
 import { OrganizationService } from '../organization'
@@ -10,39 +10,48 @@ import type { InventoryGroup, InventoryGroupResponse, InventoryGroupsResponse }
 @Injectable({ providedIn: 'root' })
 export class GroupsService {
   private _errorService = inject(ErrorService)
-  private _groups = new BehaviorSubject<unknown>([])
+  private _groups = new BehaviorSubject<InventoryGroup[]>([])
   private _httpClient = inject(HttpClient)
   private _organizationService = inject(OrganizationService)
   private _snackBar = inject(SnackBarService)
-  private readonly _unsubscribeAll$ = new Subject<void>()
 
   groups$ = this._groups.asObservable()
-  orgId: number
 
-  constructor() {
-    this._organizationService.currentOrganization$
-      .pipe(takeUntil(this._unsubscribeAll$))
-      .subscribe(({ org_id }) => this.orgId = org_id)
-  }
-
-  list(orgId: number): Observable<InventoryGroup[]> {
+  list(orgId: number) {
     const url = `/api/v3/inventory_groups/?organization_id=${orgId}`
-    return this._httpClient.get<InventoryGroupsResponse>(url).pipe(
+    this._httpClient.get<InventoryGroupsResponse>(url).pipe(
+      take(1),
       map(({ data }) => {
         this._groups.next(data)
         return data
       }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error fetching groups')
       }),
-    )
+    ).subscribe()
+  }
+
+  listForInventory(orgId: number, inventoryIds: number[]) {
+    const url = `/api/v3/inventory_groups/filter/?organization_id=${orgId}&inventory_type=properties`
+    const body = { selected: inventoryIds }
+    this._httpClient.post<InventoryGroupsResponse>(url, body).pipe(
+      take(1),
+      map(({ data }) => {
+        this._groups.next(data)
+        return data
+      }),
+      catchError((error: HttpErrorResponse) => {
+        return this._errorService.handleError(error, 'Error fetching groups for inventory')
+      }),
+    ).subscribe()
   }
 
   create(orgId: number, data: InventoryGroup): Observable<InventoryGroup> {
     const url = `/api/v3/inventory_groups/?organization_id=${orgId}`
     return this._httpClient.post<InventoryGroupResponse>(url, data).pipe(
       map(({ data }) => {
         this._snackBar.success('Group created successfully')
+        this.list(orgId)
         return data
       }),
       catchError((error: HttpErrorResponse) => {
@@ -56,6 +65,7 @@ export class GroupsService {
     return this._httpClient.put<InventoryGroupResponse>(url, data).pipe(
       map(({ data }) => {
         this._snackBar.success('Group updated successfully')
+        this.list(orgId)
         return data
       }),
       catchError((error: HttpErrorResponse) => {
@@ -67,7 +77,10 @@ export class GroupsService {
   delete(orgId: number, id: number): Observable<unknown> {
     const url = `/api/v3/inventory_groups/${id}/?organization_id=${orgId}`
     return this._httpClient.delete(url).pipe(
-      tap(() => { this._snackBar.success('Group deleted successfully') }),
+      tap(() => {
+        this._snackBar.success('Group deleted successfully')
+        this.list(orgId)
+      }),
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error deleting group')
       }),

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

@@ -18,6 +18,26 @@ export type InventoryGroup = {
   inventory_type: InventoryDisplayType;
   name: string;
   organization: number;
-  systems: Record<string, unknown>[];
+  systems: GroupSystem[];
   views_list: number[];
 }
+
+export type GroupSystem = {
+  cooling_capacity: number | null;
+  count: number;
+  des_type: string;
+  group_id: number;
+  heating_capacity: number | null;
+  id: number;
+  mode: string;
+  name: string;
+  services: GroupService[];
+  type: string;
+}
+
+export type GroupService = {
+  emission_factor: number;
+  id: number;
+  name: string;
+  properties: number[];
+}