Fix/some fixes

src/app/components/domain-things/domain-collection/domain-collection.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import Fuse from 'fuse.js';
 import { DomainCardComponent } from '~/app/components/domain-things/domain-card/domain-card.component';
@@ -59,6 +59,10 @@ export class DomainCollectionComponent implements OnInit {
 
   visibleColumns: any[] = [];
 
+  constructor(
+    private cdr: ChangeDetectorRef,
+  ) {}
+
   ngOnInit() {
     this.filteredDomains = this.domains;
     this.sortDomains();
@@ -135,8 +139,10 @@ export class DomainCollectionComponent implements OnInit {
 
   reloadDomains(event: any) {
     setTimeout(() => {
+      // this.triggerReload();
       this.$triggerReload.emit(event);
-    }, 1500);
+      this.cdr.detectChanges();
+    }, 2000);
   }
 
   initializeFuse() {

src/app/components/domain-things/domain-filters/domain-filters.component.html

@@ -14,13 +14,13 @@
       <p-multiSelect
         id="field-filters"
         [options]="fieldOptions"
-        [(ngModel)]="selectedFields"
+        [(ngModel)]="selectedFieldsList"
         (onChange)="onSelectionChange()"
         optionLabel="label"
         selectedItemsLabel="{0} fields shown"
         [style]="{minWidth: '200px'}"
         placeholder="Choose visible fields"
-      ></p-multiSelect>
+      />
     </div>
     <!-- Sort Select Dropdown -->
     <div class="flex flex-col gap-1" *ngIf="selectedLayout">

src/app/components/domain-things/domain-filters/domain-filters.component.ts

@@ -50,6 +50,7 @@ export class FieldVisibilityFilterComponent implements OnInit {
   @Output() $triggerReload = new EventEmitter();
 
   selectedFields: FieldOption[] = [];
+  selectedFieldsList: string[] = [];
   sortOrder: FieldOption = this.sortOptions[0];
   selectedLayout: boolean = true;
   quickAddDialogOpen: boolean = false;
@@ -95,13 +96,18 @@ export class FieldVisibilityFilterComponent implements OnInit {
     this.selectedFields = this.fieldOptions.filter(option => 
       this.defaultSelectedFields.includes(option.value)
     );
+    this.selectedFieldsList = this.selectedFields.map(field => field.value);
     this.onSelectionChange();
   }
 
   onSelectionChange() {
     if (this.selectedFields.length === 0) {
       this.initializeSelectedFields();
     }
+    this.selectedFields = this.fieldOptions.filter(option => 
+      this.selectedFieldsList.includes(option.value)
+    );
+
     this.visibilityChange.emit(this.selectedFields);
   }
 

src/app/services/db-query-services/pg-database.service.ts

@@ -848,7 +848,7 @@ SELECT domains.*, registrars.name AS registrar_name, tags.name AS tag_name, host
 
 
 
-  async getDomainUptime(userId: string, domainId: string, timeframe: string): Promise<{
+  async getDomainUptime(userId: string, domainId: string, timeframe: string, limit?: number): Promise<{
     checked_at: string;
     is_up: boolean;
     response_code: number;

src/app/services/db-query-services/sb-database.service.ts

@@ -694,13 +694,66 @@ export default class MainDatabaseService extends DatabaseService {
    * @param domainId The ID of the domain
    * @param timeframe The timeframe to filter data (e.g., 'day', 'week', etc.)
    */
-    getDomainUptime(userId: string, domainId: string, timeframe: string) {
-      return this.supabase.supabase.rpc('get_domain_uptime', {
-        user_id: userId,
-        domain_id: domainId,
-        timeframe: timeframe,
-      });
-    }
+/**
+ * Fetches domain uptime records for the given timeframe,
+ * verifying that domain belongs to userId.
+ */
+async getDomainUptime(userId: string, domainId: string, timeframe: string, limit?: number) {
+  const fromDate = this.getFromDateForTimeframe(timeframe);
+  const { data, error } = await this.supabase.supabase
+    .from('uptime')
+    .select(`
+      checked_at,
+      is_up,
+      response_code,
+      response_time_ms,
+      dns_lookup_time_ms,
+      ssl_handshake_time_ms,
+      domains!inner(id, user_id)
+    `)
+    // domain must match
+    .eq('domain_id', domainId)
+    // user must match
+    .eq('domains.user_id', userId)
+    // checked_at >= fromDate
+    .gte('checked_at', fromDate.toISOString())
+    .order('checked_at', { ascending: true })
+    .limit(limit || 1000);
+
+  if (error) {
+    throw new Error(`Failed to fetch domain uptime: ${error.message}`);
+  }
+  return data || [];
+}
+
+/** 
+ * Helper that maps timeframe => JS date offset 
+ * e.g. 'day' => fromDate = (now - 1 day)
+ */
+private getFromDateForTimeframe(timeframe: string): Date {
+  const now = Date.now();
+  let offsetMs = 24 * 60 * 60 * 1000; // default 1 day
+  switch (timeframe) {
+    case 'day':
+      offsetMs = 24 * 60 * 60 * 1000;
+      break;
+    case 'week':
+      offsetMs = 7 * 24 * 60 * 60 * 1000;
+      break;
+    case 'month':
+      offsetMs = 30 * 24 * 60 * 60 * 1000;
+      break;
+    case 'year':
+      offsetMs = 365 * 24 * 60 * 60 * 1000;
+      break;
+    default:
+      // fallback to 1 day
+      offsetMs = 24 * 60 * 60 * 1000;
+      break;
+  }
+  return new Date(now - offsetMs);
+}
+
 
 
   checkAllTables(): Observable<{table: string; count: number | string; success: string;}[]> {

src/app/services/db-query-services/sb/db-history.service.ts

@@ -63,12 +63,12 @@ export class HistoryQueries {
       .from('domain_updates')
       .select('id', { count: 'exact' });
 
-    // if (domainName) {
-    //   query = this.supabase
-    //     .from('domain_updates')
-    //     .select('id, domains!inner(domain_name)', { count: 'exact' })
-    //     .eq('domains.domain_name', domainName);
-    // }
+    if (domainName) {
+      query = this.supabase
+        .from<any, any>('domain_updates')
+        .select('id, domains!inner(domain_name)', { count: 'exact' })
+        .eq('domains.domain_name', domainName);
+    }
 
     return from(query.then(({ count, error }: { count: number | null; error: any }) => {
       if (error) throw error;

src/types/Database.ts

@@ -131,7 +131,7 @@ export abstract class DatabaseService {
   statusQueries!: SbStatusQueries | PgStatusQueries;
   subdomainsQueries!: SbSubdomainsQueries | PgSubdomainsQueries;
 
-  abstract getDomainUptime(userId: string, domainId: string, timeframe: string): any;
+  abstract getDomainUptime(userId: string, domainId: string, timeframe: string, limit?: number): any;
   abstract listDomains(): Observable<DbDomain[]>;
   abstract domainExists(inputUserId: string | null, domainName: string): Promise<boolean>;
   abstract saveDomain(data: SaveDomainData): Observable<DbDomain>;