Fixes various bugs (#41)

* only list profiles on cc

* extra data and dc icons on clp and detail

* filter on summary

* filter style

* fix dependency bug on org change

* summary refactor

* generic delete - groups, clp

* delete modal inv list

* delete modal org column mappings

* delete modal cycle

* delete modal goal

* delete modal derived cols

* delete modal email temps

* delete modal labels

* delete modal members

* standardize modal headers

* lint

* icon

Author: perryr16

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

@@ -23,7 +23,7 @@ export class AnalysisService {
   }
 
   summary(orgId: number, cycleId: number): Observable<AnalysisSummary> {
-    const url = `/api/v3/analyses/stats/?cycle_id=${cycleId}&organization_id=${orgId}`
+    const url = `/api/v4/analyses/stats/?cycle_id=${cycleId}&organization_id=${orgId}`
     return this._httpClient.get<AnalysisSummary>(url).pipe(
       catchError((error: HttpErrorResponse) => {
         return this._errorService.handleError(error, 'Error fetching analysis summary')

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

@@ -1,6 +1,13 @@
 export type AnalysisSummary = {
-  'column_settings fields and counts': Record<string, number>;
+  stats: AnalysisSummaryStats[];
   number_extra_data_fields: number;
   status: string;
   total_records: number;
 }
+
+export type AnalysisSummaryStats = {
+  column_name: string;
+  count: number;
+  display_name: string;
+  is_extra_data: boolean;
+}

…plates/modal/delete-modal.component.html …delete-modal/delete-modal.component.htmlsrc/app/modules/organizations/email-templates/modal/delete-modal.component.html renamed to src/@seed/components/delete-modal/delete-modal.component.html src/app/modules/organizations/email-templates/modal/delete-modal.component.html renamed to src/@seed/components/delete-modal/delete-modal.component.html

@@ -1,16 +1,13 @@
-<!-- header -->
-<div class="ml-4 mt-4 flex gap-4" mat-dialog-title>
+<div class="mt-4 flex gap-4" mat-dialog-title>
   <mat-icon class="text-current icon-size-5" svgIcon="fa-solid:trash-can"></mat-icon>
-  <div class="text-2xl font-medium leading-6">Delete Email Template</div>
+  <div class="text-2xl font-medium leading-6">Delete {{ data.model }}</div>
 </div>
 <mat-divider></mat-divider>
 
 <div class="mx-4 my-10 flex justify-evenly">
-  Are you sure you want to delete template {{ template.name }}? This action cannot be undone.
+  Are you sure you want to delete {{ data.model.toLowerCase() }} {{ data.instance }}? This action cannot be undone.
 </div>
 
-<mat-divider></mat-divider>
-
 <div class="flex justify-end">
   <mat-dialog-actions>
     <button (click)="onSubmit()" mat-raised-button color="warn">Yes</button>

src/@seed/components/delete-modal/delete-modal.component.ts

@@ -0,0 +1,28 @@
+import { Component, inject } from '@angular/core'
+import { MatButtonModule } from '@angular/material/button'
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'
+import { MatDividerModule } from '@angular/material/divider'
+import { MatIconModule } from '@angular/material/icon'
+
+@Component({
+  selector: 'seed-delete-modal',
+  templateUrl: './delete-modal.component.html',
+  imports: [
+    MatButtonModule,
+    MatDialogModule,
+    MatDividerModule,
+    MatIconModule,
+  ],
+})
+export class DeleteModalComponent {
+  private _dialogRef = inject(MatDialogRef<DeleteModalComponent>)
+  data = inject(MAT_DIALOG_DATA) as { instance: string; model: string }
+
+  onSubmit() {
+    this.close(true)
+  }
+
+  close(success = false) {
+    this._dialogRef.close(success)
+  }
+}

src/@seed/components/delete-modal/index.ts

@@ -0,0 +1 @@
+export * from './delete-modal.component'

src/@seed/components/index.ts

@@ -1,6 +1,7 @@
 export * from './alert'
 export * from './card'
 export * from './clipboard'
+export * from './delete-modal'
 export * from './drawer'
 export * from './label'
 export * from './loading-bar'

src/app/modules/column-list-profile/modal/modal.component.html

@@ -67,22 +67,6 @@
   </div>
 }
 
-<!-- DELETE -->
-@if (data.mode === 'delete') {
-  <div class="mx-4 my-10 flex justify-evenly">Are you sure you want to delete this profile? This action cannot be undone.</div>
-
-  <mat-divider></mat-divider>
-
-  <div class="flex justify-end">
-    <mat-dialog-actions>
-      <button (click)="onDelete()" color="warn" mat-raised-button>Delete</button>
-    </mat-dialog-actions>
-    <mat-dialog-actions>
-      <button (click)="dismiss()" mat-stroked-button>Dismiss</button>
-    </mat-dialog-actions>
-  </div>
-}
-
 <!-- RENAME -->
 @if (data.mode === 'rename') {
   <div class="m-4">

src/app/modules/column-list-profile/modal/modal.component.ts

@@ -118,13 +118,6 @@ export class ModalComponent {
     ).subscribe()
   }
 
-  onDelete() {
-    this._inventoryService.deleteColumnListProfile(this.data.orgId, this.data.profile.id).subscribe(() => {
-      console.log('DEVELOPER NOTE: Delete function fails while in development mode, via a vite proxy error')
-      this.close(-1)
-    })
-  }
-
   onRename() {
     this.data.profile.name = this.form.get('name')?.value
     this._inventoryService.updateColumnListProfile(this.data.orgId, this.data.profile.id, this.data.profile).subscribe(() => {

src/app/modules/inventory-detail/detail/grid/history-grid.component.html

@@ -25,8 +25,9 @@
     style="width: 100%; height: 100%"
   />
 
-  <span class="ml-4 text-xs italic text-gray-500">
-    <span class="material-icons align-middle ml-1 text-md text-gray-500">link</span>
-    indicates a Derived Column
-  </span>
+  <!-- legend -->
+  <div class="ml-4 text-sm italic text-gray-500">
+    <span class="mr-4"><span class="material-icons align-middle ml-1 text-md text-gray-500">emergency</span>Extra Data Column</span>
+    <span><span class="material-icons align-middle ml-1 text-lg text-gray-500">link</span>Derived Column</span>
+  </div>
 </div>

src/app/modules/inventory-detail/detail/grid/history-grid.component.ts

@@ -23,6 +23,7 @@ import { EditStateModalComponent } from '../modal/edit-state.component'
 
 ModuleRegistry.registerModules([AllCommunityModule])
 
+type CellRendererParams = { value: string; data: { derived_column: number; is_extra_data: boolean } }
 @Component({
   selector: 'seed-inventory-detail-history',
   templateUrl: './history-grid.component.html',
@@ -119,27 +120,10 @@ export class HistoryGridComponent implements OnChanges, OnDestroy {
 
   setColumnDefs() {
     this.columnDefs = [
-      {
-        field: 'field',
-        headerName: 'Field',
-        pinned: true,
-        cellRenderer: ({ value }: { value: string }) => {
-          // add 'link' icon to derived columns
-          const isDerived = this.derivedColumnNames.has(value)
-          return !isDerived
-            ? value
-            : `
-                <span style="display:inline-flex; align-items:center;">
-                  <span class="ag-icon ag-icon-linked" style="font-size: 16px; margin-right: 4px;"></span>
-                    ${value}
-                 </span>
-              `
-        },
-      },
-      {
-        field: 'state',
-        headerName: 'Main',
-      },
+      { field: 'field', headerName: 'Field', pinned: true, cellRenderer: this.fieldRenderer },
+      { field: 'state', headerName: 'Main' },
+      { field: 'derived_column', hide: true },
+      { field: 'is_extra_data', hide: true },
     ]
 
     for (const { filename } of this.view.history) {
@@ -152,15 +136,27 @@ export class HistoryGridComponent implements OnChanges, OnDestroy {
     }
   }
 
+  fieldRenderer = (params: CellRendererParams) => {
+    const value = params.value
+    const { derived_column, is_extra_data } = params.data
+    if (!derived_column && !is_extra_data) return value
+
+    // add icon to extra data and derived columns
+    const iconName = derived_column ? 'link' : is_extra_data ? 'emergency' : null
+    const textSize = derived_column ? 'text-sm' : 'text-xs'
+    return `${value} <span class="material-icons align-middle ml-1 mb-2 text-secondary ${textSize}">${iconName}</span>`
+  }
+
   setRowData() {
     // Transposed data. Each row is a column name (address line 1, address line 2, etc.)
     this.rowData = []
     const columnsSorted: GenericColumn[] = this.gridColumns.sort((a, b) => naturalSort(a.display_name, b.display_name))
 
     for (const { column_name, display_name } of columnsSorted) {
       const isExtraData = this.extraDataColumnNames.has(column_name)
+      const isDerived = this.derivedColumnNames.has(column_name)
       let value = isExtraData ? this.view.state.extra_data[column_name] : this.view.state[column_name]
-      const row = { field: display_name, state: value }
+      const row = { field: display_name, state: value, is_extra_data: isExtraData, derived_column: isDerived }
       for (const item of this.view.history) {
         value = isExtraData ? item.state.extra_data[column_name] : item.state[column_name]
         row[item.filename] = value