Analysis Functionality Parity (#61)

* analysis parity

* Update public/i18n/en_US.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update public/i18n/fr_CA.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update public/i18n/es.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/@seed/components/analyses/analyses-grid.component.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/app/modules/inventory-detail/analyses/analyses.component.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix: replace setTimeout with ChangeDetectorRef.markForCheck in analyses.component.ts

Agent-Logs-Url: https://github.com/SEED-platform/seed-angular/sessions/58ed9bda-03a0-42bd-893f-7380bc268cee

Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com>

* fix: use ReplaySubject(1) for _unsubscribeAll$ to guard late setTimeout subscriptions

Agent-Logs-Url: https://github.com/SEED-platform/seed-angular/sessions/d0093f52-622c-4515-a220-3164a6cf5983

Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com>

* lint

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: 3 people

public/i18n/en_US.json

@@ -126,6 +126,7 @@
   "Analysis Name": "Analysis Name",
   "Analysis Name (User Defined)": "Analysis Name (User Defined)",
   "Analysis State": "Analysis State",
+  "Analysis View": "Analysis View",
   "Apply Profile": "Apply Profile",
   "Are you absolutely sure you want to delete the organization": "Are you absolutely sure you want to delete the organization",
   "Are you absolutely sure you want to delete the sub-organization": "Are you absolutely sure you want to delete the sub-organization",
@@ -251,6 +252,7 @@
   "Collapse Tabs": "Collapse Tabs",
   "Column": "Column",
   "Column Description": "Column Description",
+  "Column Detail Profiles": "Column Detail Profiles",
   "Column List Profile": "Column List Profile",
   "Column List Profiles": "Column List Profiles",
   "Column Mapping Profile": "Column Mapping Profile",
@@ -344,6 +346,7 @@
   "Create new label": "Create new label",
   "Create new sub-organization": "Create new sub-organization",
   "Created": "Created",
+  "Cross Cycles": "Cross Cycles",
   "Cross-Cycles": "Cross-Cycles",
   "Current Column Mapping Profile": "Current Column Mapping Profile",
   "Current Cycle": "Current Cycle",
@@ -436,6 +439,7 @@
   "Designates whether the user can log into this admin site.": "Designates whether the user can log into this admin site.",
   "Designates whether this user should be treated as active. Unselect this instead of deleting accounts.": "Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
   "Desired Name": "Desired Name",
+  "Detail": "Detail",
   "Detail Column List Profile": "Detail Column List Profile",
   "Determine Time Period from Field:": "Determine Time Period from Field:",
   "Developer": "Developer",
@@ -1431,6 +1435,7 @@
   "UBID already exists": "UBID already exists",
   "UBID comparison result:": "UBID comparison result:",
   "UBID thresholds are between 0.0 and 1.0": "UBID thresholds are between 0.0 and 1.0",
+  "UBIDs": "UBIDs",
   "UNMERGE_PROPERTIES_MODAL": "Are you sure you want to unmerge these properties? The unmerge action will keep meter data on both properties. Review meter data on both properties once they are unmerged.",
   "UPDATE_DERIVED_DATA_TEXT_1": "Press the 'Begin Update' button below to begin the process of recalculating the data stored in derived columns for the selected properties and tax lots. The derived columns will appear yellow to indicate that the update is in progress.",
   "UPDATE_DERIVED_DATA_TEXT_2": "Note that while the columns are yellow, the data may not be up to date. Refresh the page to refresh the columns status.",

public/i18n/es.json

@@ -126,6 +126,7 @@
   "Analysis Name": "Análisis Nombre",
   "Analysis Name (User Defined)": "Nombre del análisis (definido por el usuario)",
   "Analysis State": "Análisis Estado",
+  "Analysis View": "Vista de análisis",
   "Apply Profile": "Aplicar perfil",
   "Are you absolutely sure you want to delete the organization": "¿Está seguro de que desea eliminar la organización?",
   "Are you absolutely sure you want to delete the sub-organization": "¿Está seguro de que desea eliminar la suborganización?",
@@ -251,6 +252,7 @@
   "Collapse Tabs": "Contraer pestañas",
   "Column": "Columna",
   "Column Description": "Descripción de la columna",
+  "Column Detail Profiles": "Perfiles de detalle de columnas",
   "Column List Profile": "Perfil de Column List",
   "Column List Profiles": "Perfiles de listas de columnas",
   "Column Mapping Profile": "Perfil de asignación de columnas",
@@ -344,6 +346,7 @@
   "Create new label": "Crear nueva etiqueta",
   "Create new sub-organization": "Crear una nueva suborganización",
   "Created": "Creado",
+  "Cross Cycles": "Ciclos cruzados",
   "Cross-Cycles": "Ciclos cruzados",
   "Current Column Mapping Profile": "Perfil actual de asignación de columnas",
   "Current Cycle": "Ciclo actual",
@@ -436,6 +439,7 @@
   "Designates whether the user can log into this admin site.": "Indica si el usuario puede iniciar sesión en este sitio de administración.",
   "Designates whether this user should be treated as active. Unselect this instead of deleting accounts.": "Designa si este usuario debe ser tratado como activo. Deseleccione esta opción en lugar de eliminar cuentas.",
   "Desired Name": "Nombre deseado",
+  "Detail": "Detalle",
   "Detail Column List Profile": "Perfil detallado de la lista de columnas",
   "Determine Time Period from Field:": "Determinar el periodo de tiempo a partir del campo:",
   "Developer": "Desarrollador",
@@ -1431,6 +1435,7 @@
   "UBID already exists": "El UBID ya existe",
   "UBID comparison result:": "Resultado de la comparación de UBID:",
   "UBID thresholds are between 0.0 and 1.0": "Los umbrales UBID se sitúan entre 0,0 y 1,0",
+  "UBIDs": "UBIDs",
   "UNMERGE_PROPERTIES_MODAL": "¿Está seguro de que desea desvincular estas propiedades? La acción de desvincular conservará los datos del medidor en ambas propiedades. Revise los datos del medidor en ambas propiedades una vez que se hayan desvinculado.",
   "UPDATE_DERIVED_DATA_TEXT_1": "Pulse el botón \"Iniciar actualización\" para iniciar el proceso de recálculo de los datos almacenados en las columnas derivadas para las propiedades y lotes fiscales seleccionados. Las columnas derivadas aparecerán en amarillo para indicar que la actualización está en curso.",
   "UPDATE_DERIVED_DATA_TEXT_2": "Tenga en cuenta que mientras las columnas estén en amarillo, los datos pueden no estar actualizados. Actualice la página para actualizar el estado de las columnas.",

public/i18n/fr_CA.json

@@ -126,6 +126,7 @@
   "Analysis Name": "Nom de l'analyse",
   "Analysis Name (User Defined)": "Nom de l'analyse (défini par l'utilisateur)",
   "Analysis State": "État d'analyse",
+  "Analysis View": "Vue d'analyse",
   "Apply Profile": "Appliquer le profil",
   "Are you absolutely sure you want to delete the organization": "Êtes-vous absolument sûr de vouloir supprimer l'organisation",
   "Are you absolutely sure you want to delete the sub-organization": "Êtes-vous absolument sûr de vouloir supprimer la sous-organisation",
@@ -251,6 +252,7 @@
   "Collapse Tabs": "Réduire les onglets",
   "Column": "Colonne",
   "Column Description": "Description de la colonne",
+  "Column Detail Profiles": "Profils détaillés des colonnes",
   "Column List Profile": "Profil de liste de colonnes",
   "Column List Profiles": "Paramètres de la liste",
   "Column Mapping Profile": "Profil de mappage de colonne",
@@ -344,6 +346,7 @@
   "Create new label": "Créer une nouvelle étiquette",
   "Create new sub-organization": "Créer une nouvelle sous-organisation",
   "Created": "Créé",
+  "Cross Cycles": "Cross Cycles",
   "Cross-Cycles": "Entre les Cycles",
   "Current Column Mapping Profile": "Profil de mappage de colonne actuel",
   "Current Cycle": "Cycle actuel",
@@ -436,6 +439,7 @@
   "Designates whether the user can log into this admin site.": "Désigne si l'utilisateur peut se connecter à ce site d'administration.",
   "Designates whether this user should be treated as active. Unselect this instead of deleting accounts.": "Indique si cet utilisateur doit être traité comme actif. Désélectionnez ceci au lieu de supprimer des comptes.",
   "Desired Name": "Nom Désiré",
+  "Detail": "Détail",
   "Detail Column List Profile": "Profil de liste de colonnes de détail",
   "Determine Time Period from Field:": "Déterminer la durée du champ:",
   "Developer": "Développeur",
@@ -1431,6 +1435,7 @@
   "UBID already exists": "UBID existe déjà",
   "UBID comparison result:": "Résultat de la comparaison UBID :",
   "UBID thresholds are between 0.0 and 1.0": "Les seuils UBID sont compris entre 0,0 et 1,0",
+  "UBIDs": "UBID",
   "UNMERGE_PROPERTIES_MODAL": "Êtes-vous sûr de vouloir dissocier ces propriétés? L'action de dissociation conservera les données de compteur sur les deux propriétés. Vérifiez les données de compteur sur les deux propriétés une fois qu'elles sont dissociées.",
   "UPDATE_DERIVED_DATA_TEXT_1": "Appuyez sur le bouton « Démarrer la mise à jour » ci-dessous pour commencer le processus de recalcul des données stockées dans les colonnes dérivées pour les propriétés et les lots fiscaux sélectionnés. Les colonnes dérivées apparaîtront en jaune pour indiquer que la mise à jour est en cours.",
   "UPDATE_DERIVED_DATA_TEXT_2": "Notez que pendant que les colonnes sont jaunes, les données peuvent ne pas être à jour. Actualisez la page pour actualiser l'état des colonnes.",

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

@@ -259,6 +259,8 @@ export class AnalysisService {
       EUI: "The EUI analysis will sum the property's meter readings for the last twelve months to calculate the energy use per square footage per year. If there are missing meter readings, then the analysis will return a less that 100% coverage to alert the user that there is a missing meter reading.",
       'Element Statistics':
         "The Element Statistics analysis looks through a property's element data (if any) to count the number of elements of type 'D.D.C. Control Panel'. It also generates the aggregated (average) condition index values for scope 1 emission elements and saves those quantities to the property.",
+      'HVAC Metrics':
+        'The HVAC Metrics analysis calculates HVAC-related metrics for the property based on floor area and available meter data.',
     }
     return descriptionMap[analysis.service] ?? 'No description available for this analysis.'
   }

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

@@ -33,7 +33,15 @@ export type AnalysisCreateData = {
   access_level_instance_id: number;
 }
 
-export type AnalysisServiceType = 'BSyncr' | 'BETTER' | 'EUI' | 'CO2' | 'EEEJ' | 'Element Statistics' | 'Building Upgrade Recommendation'
+export type AnalysisServiceType
+  = | 'BSyncr'
+    | 'BETTER'
+    | 'EUI'
+    | 'CO2'
+    | 'EEEJ'
+    | 'Element Statistics'
+    | 'Building Upgrade Recommendation'
+    | 'HVAC Metrics'
 
 // Analysis by View type
 export type View = {

src/@seed/components/analyses/analyses-grid.component.ts

@@ -6,8 +6,8 @@ import { Router } from '@angular/router'
 import { AgGridAngular } from 'ag-grid-angular'
 import type { CellClickedEvent, ColDef, GridApi, GridReadyEvent } from 'ag-grid-community'
 import { filter, switchMap, take } from 'rxjs'
-import type { Analysis, Cycle, Highlight } from '@seed/api'
-import { AnalysisService } from '@seed/api'
+import type { Analysis, CurrentUser, Cycle, Highlight } from '@seed/api'
+import { AnalysisService, UserService } from '@seed/api'
 import { DeleteModalComponent } from '@seed/components'
 import { MaterialImports } from '@seed/materials'
 import { ConfigService } from '@seed/services'
@@ -25,15 +25,22 @@ export class AnalysesGridComponent implements AfterViewInit, OnChanges {
   @Input() highlights = false
   private _analysisService = inject(AnalysisService)
   private _configService = inject(ConfigService)
+  private _userService = inject(UserService)
   private _router = inject(Router)
   private _dialog = inject(MatDialog)
+  currentUser: CurrentUser
 
   gridApi: GridApi
   gridTheme$ = this._configService.gridTheme$
   gridHeight = 0
   columnDefs: ColDef[] = []
 
   ngAfterViewInit(): void {
+    this._userService.currentUser$.pipe(take(1)).subscribe((user) => {
+      this.currentUser = user
+      this.setColumnDefs()
+      this.gridApi?.refreshCells({ force: true })
+    })
     this._analysisService.pollStatuses(this.orgId)
   }
 
@@ -93,14 +100,21 @@ export class AnalysesGridComponent implements AfterViewInit, OnChanges {
   }
 
   statusRenderer = ({ value }: { value: string }) => {
-    const styleMap = {
-      Completed: 'bg-green-900 text-white',
-      Failed: 'bg-red-900 text-white',
+    const styleMap: Record<string, string> = {
+      Completed: 'background-color: #198754; color: white;',
+      Failed: 'background-color: #dc3545; color: white;',
+      Running: '',
+      Creating: '',
+    }
+    const classMap: Record<string, string> = {
       Running: 'bg-primary text-white animate-pulse',
       Creating: 'bg-primary text-white animate-pulse',
     }
 
-    return `<div class="overflow-hidden ${styleMap[value]} px-2">${value}</div>`
+    const style = styleMap[value] ?? ''
+    const classes = classMap[value] ?? ''
+
+    return `<div class="overflow-hidden ${classes} px-2" style="${style}">${value}</div>`
   }
 
   resultsRenderer = ({ data }: { data: Analysis }) => {
@@ -134,6 +148,8 @@ export class AnalysesGridComponent implements AfterViewInit, OnChanges {
   }
 
   actionRenderer = ({ data }: { data: Analysis }) => {
+    if (this.currentUser?.org_role === 'viewer') return ''
+
     const runningStatuses = new Set(['Pending Creation', 'Creating', 'Queued', 'Running'])
     const isRunning = runningStatuses.has(data.status)
 

src/app/modules/analyses/analysis/analysis.component.ts

@@ -134,8 +134,13 @@ export class AnalysisComponent implements OnDestroy, OnInit {
   }
 
   statusRenderer = ({ value }: { value: string }) => {
-    const bgColor = value === 'Completed' ? 'bg-green-900 text-white' : value === 'Failed' ? 'bg-red-900 text-white' : ''
-    return `<div class="overflow-hidden ${bgColor} px-2">${value}</div>`
+    const style
+      = value === 'Completed'
+        ? 'background-color: #198754; color: white;'
+        : value === 'Failed'
+          ? 'background-color: #dc3545; color: white;'
+          : ''
+    return `<div class="overflow-hidden px-2" style="${style}">${value}</div>`
   }
 
   getCycle(params: { value: number[] }): string {

src/app/modules/inventory-detail/analyses/analyses.component.html

@@ -5,9 +5,9 @@
     titleIcon: 'fa-solid:chart-simple',
     breadcrumbs: ['Property', 'Analyses'],
     sideNavToggle: true,
-    action: createAnalysis,
-    actionIcon: 'fa-solid:plus',
-    actionText: 'Create Analysis',
+    action: isViewer ? undefined : createAnalysis,
+    actionIcon: isViewer ? undefined : 'fa-solid:plus',
+    actionText: isViewer ? undefined : 'Create Analysis',
   }"
 >
   <div class="h-full-page-tabs p-5" id="content" #parentDiv>

src/app/modules/inventory-detail/analyses/analyses.component.ts

@@ -1,30 +1,35 @@
 import { CommonModule } from '@angular/common'
-import type { OnInit } from '@angular/core'
-import { Component, inject } from '@angular/core'
+import type { OnDestroy, OnInit } from '@angular/core'
+import { ChangeDetectorRef, Component, inject } from '@angular/core'
+import { MatDialog } from '@angular/material/dialog'
 import { ActivatedRoute } from '@angular/router'
 import type { Observable } from 'rxjs'
-import { Subject, switchMap, takeUntil, tap } from 'rxjs'
-import type { Analysis, Cycle } from '@seed/api'
+import { filter, ReplaySubject, switchMap, takeUntil, tap } from 'rxjs'
+import type { Analysis, CurrentUser, Cycle } from '@seed/api'
 import { AnalysisService, CycleService, InventoryService, OrganizationService, UserService } from '@seed/api'
 import { AnalysesGridComponent, NotFoundComponent, PageComponent } from '@seed/components'
 import { SharedImports } from '@seed/directives'
+import { AnalysisRunModalComponent } from 'app/modules/inventory/actions/analysis-run-modal.component'
 import type { InventoryType, ViewResponse } from 'app/modules/inventory/inventory.types'
 
 @Component({
   selector: 'seed-inventory-detail-analyses',
   templateUrl: './analyses.component.html',
   imports: [AnalysesGridComponent, CommonModule, NotFoundComponent, PageComponent, SharedImports],
 })
-export class AnalysesComponent implements OnInit {
+export class AnalysesComponent implements OnInit, OnDestroy {
   private _analysisService = inject(AnalysisService)
   private _cycleService = inject(CycleService)
   private _userService = inject(UserService)
   private _organizationService = inject(OrganizationService)
   private _inventoryService = inject(InventoryService)
   private _route = inject(ActivatedRoute)
-  private readonly _unsubscribeAll$ = new Subject<void>()
+  private _dialog = inject(MatDialog)
+  private _cdr = inject(ChangeDetectorRef)
+  private readonly _unsubscribeAll$ = new ReplaySubject<void>(1)
   analyses: Analysis[] = []
   cycles: Cycle[] = []
+  currentUser: CurrentUser
   orgId: number
   viewDisplayField$: Observable<string>
   viewId: number
@@ -39,6 +44,10 @@ export class AnalysesComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this._userService.currentUser$.pipe(takeUntil(this._unsubscribeAll$)).subscribe((user) => {
+      this.currentUser = user
+    })
+
     this.getParams()
       .pipe(
         switchMap(() => this._userService.currentOrganizationId$),
@@ -50,8 +59,12 @@ export class AnalysesComponent implements OnInit {
           this.cycles = cycles
         }),
         tap(() => {
-          this.watchAnalyses()
+          // Defer to avoid ExpressionChangedAfterItHasBeenCheckedError in LoadingBarComponent
+          setTimeout(() => {
+            this.watchAnalyses()
+          })
         }),
+        takeUntil(this._unsubscribeAll$),
       )
       .subscribe()
   }
@@ -77,6 +90,7 @@ export class AnalysesComponent implements OnInit {
       }),
       tap((analyses) => {
         this.analyses = analyses
+        this._cdr.markForCheck()
       }),
     )
   }
@@ -90,7 +104,27 @@ export class AnalysesComponent implements OnInit {
       .subscribe()
   }
 
-  createAnalysis() {
-    console.log('Create Analysis')
+  createAnalysis = () => {
+    const dialogRef = this._dialog.open(AnalysisRunModalComponent, {
+      width: '40rem',
+      data: { orgId: this.orgId, viewIds: [this.viewId] },
+    })
+
+    dialogRef
+      .afterClosed()
+      .pipe(
+        filter(Boolean),
+        switchMap(() => this.getAnalyses()),
+      )
+      .subscribe()
+  }
+
+  get isViewer() {
+    return this.currentUser?.org_role === 'viewer'
+  }
+
+  ngOnDestroy(): void {
+    this._unsubscribeAll$.next()
+    this._unsubscribeAll$.complete()
   }
 }

src/app/modules/inventory-detail/detail/header.component.ts

@@ -10,6 +10,7 @@ import type { AccessLevelInstance, Label, Organization } from '@seed/api'
 import { LabelComponent } from '@seed/components'
 import { MaterialImports } from '@seed/materials'
 import { ConfigService } from '@seed/services'
+import { AnalysisRunModalComponent } from 'app/modules/inventory/actions/analysis-run-modal.component'
 import type { GenericView, GroupMapping, Profile, ViewResponse } from 'app/modules/inventory/inventory.types'
 import { ModalComponent } from '../../column-list-profile/modal/modal.component'
 import { MapComponent } from './map.component'
@@ -110,9 +111,9 @@ export class HeaderComponent implements OnInit {
     {
       name: 'Run Analysis',
       action: () => {
-        this.tempAction()
+        this.openRunAnalysisModal()
       },
-      disabled: true,
+      disabled: false,
     },
     {
       name: 'Update with Audit Template',
@@ -214,6 +215,27 @@ export class HeaderComponent implements OnInit {
       .subscribe()
   }
 
+  openRunAnalysisModal() {
+    const dialogRef = this._dialog.open(AnalysisRunModalComponent, {
+      width: '40rem',
+      data: {
+        orgId: this.org.id,
+        viewIds: [this.selectedView.id],
+      },
+    })
+
+    dialogRef
+      .afterClosed()
+      .pipe(
+        take(1),
+        filter(Boolean),
+        tap(() => {
+          this.refreshDetail.emit()
+        }),
+      )
+      .subscribe()
+  }
+
   trackByFn(_index: number, { id }: AccessLevelInstance) {
     return id
   }