HOSTSD-246 Fix Data Service

src/dashboard/src/components/charts/storageTrends/StorageTrendsChart.tsx

@@ -18,8 +18,7 @@ import React from 'react';
 import { toast } from 'react-toastify';
 import { LineChart } from '../line';
 import styles from './StorageTrendsChart.module.scss';
-import { useServerHistoryItems } from './hooks';
-import { useStorageTrendsData } from './useStorageTrendsData';
+import { useServerHistoryItems, useStorageTrendsData } from './hooks';
 
 ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend);
 

src/dashboard/src/components/charts/storageTrends/hooks/index.ts

@@ -1 +1,2 @@
 export * from './useServerHistoryItems';
+export * from './useStorageTrendsData';

src/dashboard/src/components/charts/storageTrends/useStorageTrendsData.ts → src/dashboard/src/components/charts/storageTrends/hooks/useStorageTrendsData.ts

@@ -4,7 +4,7 @@ import { convertToStorageSize } from '@/utils';
 import { ChartData } from 'chart.js';
 import moment from 'moment';
 import React from 'react';
-import { generateStorageHistoryForDateRange } from '../utils';
+import { generateStorageHistoryForDateRange } from '../../utils';
 
 /**
  * Generates line chart data based on the current filtered server history items.

src/data-service/DataService.cs

@@ -361,7 +361,6 @@ private async Task ProcessConfigurationItemsAsync(Models.DataSyncModel option)
         }
 
         // Check if file system item exists in HSB.
-        // TODO: This is noisy, but we don't want to keep all of them in memory.
         var fileSystemItem = await this.HsbApi.GetFileSystemItemAsync(serviceNowKey, computerKey, fileSystemItemSN.Data.Name);
         if (fileSystemItemSN.Data.InstallStatus != "1")
         {

src/libs/dal/Services/ServerItemService.cs

@@ -173,9 +173,7 @@ join t in this.Context.Tenants on ut.TenantId equals t.Id
     public override EntityEntry<ServerItem> Add(ServerItem entity)
     {
         // This key provides a way to link only the current history record.
-        var key = Guid.NewGuid();
-        entity.HistoryKey = key;
-
+        entity.HistoryKey = Guid.NewGuid();
         var result = base.Add(entity);
 
         // Add item to history.
@@ -198,16 +196,13 @@ public EntityEntry<ServerItem> Update(ServerItem entity, bool updateTotals)
 
         if (updateTotals)
         {
-            // TODO: File system items need to be removed otherwise this formula will be invalid over time.
             // Grab all file system items for this server so that space can be calculated.
-            // The downside to this implementation is that the calculation will include the prior synced data until all file system items have been synced up.
             var volumes = this.Context.FileSystemItems.AsNoTracking().Where(fsi => fsi.ServerItemServiceNowKey == entity.ServiceNowKey).ToArray();
             entity.Capacity = volumes.Sum(v => v.SizeBytes);
             entity.AvailableSpace = volumes.Sum(v => v.FreeSpaceBytes);
             this.Context.Entry(entity).State = EntityState.Modified;
 
             // Update current historical record too.
-            // TODO: File system items need to be removed otherwise this formula will be invalid over time.
             var history = this.Context.ServerHistoryItems.FirstOrDefault(shi => shi.ServiceNowKey == entity.ServiceNowKey && shi.HistoryKey == entity.HistoryKey);
             if (history != null)
             {

src/libs/models/ServerItemModel.cs

@@ -7,6 +7,7 @@ public class ServerItemModel : AuditableModel
 {
     #region Properties
     public string ServiceNowKey { get; set; } = "";
+    public Guid? HistoryKey { get; set; }
 
     public int? TenantId { get; set; }
     public TenantModel? Tenant { get; set; }
@@ -48,6 +49,7 @@ public ServerItemModel() { }
     public ServerItemModel(ServerItem entity) : base(entity)
     {
         this.ServiceNowKey = entity.ServiceNowKey;
+        this.HistoryKey = entity.HistoryKey;
 
         this.TenantId = entity.TenantId;
         this.OrganizationId = entity.OrganizationId;
@@ -118,6 +120,7 @@ public static explicit operator ServerItem(ServerItemModel model)
         return new ServerItem(model.TenantId, model.OrganizationId, model.OperatingSystemItemId, model.RawData, model.RawDataCI)
         {
             ServiceNowKey = model.ServiceNowKey,
+            HistoryKey = model.HistoryKey,
             ClassName = model.ClassName,
             Name = model.Name,
             InstallStatus = model.InstallStatus,