cleaned up code.

Controllers/APIController.cs

@@ -1868,7 +1868,7 @@ namespace CarCareTracker.Controllers
         {
             if (documents.Any())
             {
-                List<UploadedFileExportModel> uploadedFiles = new List<UploadedFileExportModel>();
+                List<UploadedFiles> uploadedFiles = new List<UploadedFiles>();
                 string uploadDirectory = "documents/";
                 string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory);
                 if (!Directory.Exists(uploadPath))
@@ -1881,11 +1881,10 @@ namespace CarCareTracker.Controllers
                     {
                         document.CopyTo(stream);
                     }
-                    uploadedFiles.Add(new UploadedFileExportModel
+                    uploadedFiles.Add(new UploadedFiles
                     {
                         Location = Path.Combine("/", uploadDirectory, fileName),
-                        Name = Path.GetFileName(document.FileName),
+                        Name = Path.GetFileName(document.FileName)
-                        UploadType = FileUploadType.File.ToString()
                     });
                 }
                 return Json(uploadedFiles);

Controllers/FilesController.cs

@@ -53,7 +53,7 @@ namespace CarCareTracker.Controllers
             foreach (IFormFile fileToUpload in file)
             {
                 var fileName = UploadFile(fileToUpload);
-                uploadedFiles.Add(new UploadedFiles { Name = fileToUpload.FileName, Location = fileName, UploadType = FileUploadType.File, IsPending = true});
+                uploadedFiles.Add(new UploadedFiles { Name = fileToUpload.FileName, Location = fileName, IsPending = true});
             }
             return Json(uploadedFiles);
         }

Controllers/Vehicle/GasController.cs

@@ -50,7 +50,7 @@ namespace CarCareTracker.Controllers
                     Notes = $"Auto Insert From Gas Record. {gasRecord.Notes}"
                 });
             }
-            gasRecord.Files = gasRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            gasRecord.Files = gasRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord.ToGasRecord());
             if (result)
             {

Controllers/Vehicle/NoteController.cs

@@ -31,7 +31,7 @@ namespace CarCareTracker.Controllers
             {
                 return Json(false);
             }
-            note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             bool isCreate = note.Id == default; //needed here since Notes don't use an input object.
             var result = _noteDataAccess.SaveNoteToVehicle(note);
             if (result)

Controllers/Vehicle/OdometerController.cs

@@ -45,7 +45,7 @@ namespace CarCareTracker.Controllers
                 return Json(false);
             }
             //move files from temp.
-            odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord());
             if (result)
             {

Controllers/Vehicle/PlanController.cs

@@ -29,7 +29,7 @@ namespace CarCareTracker.Controllers
             }
             planRecord.DateModified = DateTime.Now.ToString("G");
             //move files from temp.
-            planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (planRecord.Supplies.Any())
             {
                 planRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description));
@@ -63,7 +63,7 @@ namespace CarCareTracker.Controllers
             {
                 return Json(OperationResponse.Failed("A template with that description already exists for this vehicle"));
             }
-            planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord);
             return Json(OperationResponse.Conditional(result, "Template Added", string.Empty));
         }

Controllers/Vehicle/RepairController.cs

@@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers
                 });
             }
             //move files from temp.
-            collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (collisionRecord.Supplies.Any())
             {
                 collisionRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description));

Controllers/Vehicle/ServiceController.cs

@@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers
                 });
             }
             //move files from temp.
-            serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (serviceRecord.Supplies.Any())
             {
                 serviceRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description));

Controllers/Vehicle/SupplyController.cs

@@ -146,7 +146,7 @@ namespace CarCareTracker.Controllers
         public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
         {
             //move files from temp.
-            supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord());
             if (result)
             {

Controllers/Vehicle/TaxController.cs

@@ -47,7 +47,7 @@ namespace CarCareTracker.Controllers
                 return Json(false);
             }
             //move files from temp.
-            taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             //push back any reminders
             if (taxRecord.ReminderRecordId.Any())
             {

Controllers/Vehicle/UpgradeController.cs

@@ -42,7 +42,7 @@ namespace CarCareTracker.Controllers
                 });
             }
             //move files from temp.
-            upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, UploadType = x.UploadType, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (upgradeRecord.Supplies.Any())
             {
                 upgradeRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description));

Enum/FileUploadType.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public enum FileUploadType
-    {
-        File = 0,
-        Link = 1
-    }
-}

Helper/StaticHelper.cs

@@ -727,9 +727,10 @@ namespace CarCareTracker.Helper
                 return string.IsNullOrWhiteSpace(decorations) ? input.ToString("C2") : $"{input.ToString("C2")}{decorations}";
             }
         }
-        public static string GetIconByFileExtension(FileUploadType uploadType, string fileExt)
+        public static string GetIconByFileExtension(string fileLocation)
         {
-            if (uploadType == FileUploadType.Link)
+            var fileExt = Path.GetExtension(fileLocation);
+            if (!fileLocation.StartsWith("/documents") && !fileLocation.StartsWith("documents") && !fileLocation.StartsWith("/temp") && !fileLocation.StartsWith("temp"))
             {
                 return "bi-link-45deg";
             }

Models/Shared/ImportModel.cs

@@ -172,10 +172,4 @@ namespace CarCareTracker.Models
         [JsonConverter(typeof(FromBoolOptional))]
         public string IsRoot { get; set; }
     }
-    public class UploadedFileExportModel
-    {
-        public string Name { get; set; }
-        public string Location { get; set; }
-        public string UploadType { get; set; }
-    }
 }

Models/Shared/UploadedFiles.cs

@@ -4,8 +4,6 @@
     {
         public string Name { get; set; }
         public string Location { get; set; }
-        public FileUploadType UploadType { get; set; } = FileUploadType.File;
-        public string FileExtension { get { return Path.GetExtension(Location); } }
         public bool IsPending { get; set; }
     }
 }

Views/Vehicle/_FilesToUpload.cshtml

@@ -13,7 +13,7 @@
         <li class="list-group-item">
             <div class="d-flex justify-content-between">
                 <a class="uploadedFileName d-flex align-items-center text-truncate" href="@filesUploaded.Location" title="@filesUploaded.Name" target="_blank">
-                    <span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.UploadType, filesUploaded.FileExtension)"></i></span><span class="text-link">@filesUploaded.Name</span>
+                    <span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.Location)"></i></span><span class="text-link">@filesUploaded.Name</span>
                 </a>
                 <div class="d-flex align-items-center">
                     <button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>

Views/Vehicle/_UploadedFiles.cshtml

@@ -15,7 +15,7 @@
             <li class="list-group-item">
                 <div class="d-flex justify-content-between align-items-center">
                     <a class="uploadedFileName d-flex align-items-center text-truncate" href="@filesUploaded.Location" title="@filesUploaded.Name" target="_blank">
-                        <span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.UploadType, filesUploaded.FileExtension)"></i></span><span class="text-link">@filesUploaded.Name</span>
+                        <span class="lead me-2"><i class="bi @StaticHelper.GetIconByFileExtension(filesUploaded.Location)"></i></span><span class="text-link">@filesUploaded.Name</span>
                     </a>
                     <div class="d-flex align-items-center">
                         <button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>
@@ -30,6 +30,6 @@
     var uploadedFiles = [];
      @foreach (UploadedFiles filesUploaded in Model)
      {
-        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location", uploadType: "@filesUploaded.UploadType" });
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
      }
 </script>

wwwroot/js/shared.js

@@ -606,7 +606,7 @@ function uploadVehicleLinksAsync(event) {
         },
     }).then(function (result) {
         if (result.isConfirmed) {
-            uploadedFiles.push({ name: result.value.newLinkName, location: result.value.newLinkLocation, uploadType: 1, isPending: true });
+            uploadedFiles.push({ name: result.value.newLinkName, location: result.value.newLinkLocation, isPending: true });
             $.post('/Vehicle/GetFilesPendingUpload', { uploadedFiles: uploadedFiles }, function (viewData) {
                 $("#filesPendingUpload").html(viewData);
             });