diff --git a/Server/Migrations/20200327034430_Device Notes.Designer.cs b/Server/Migrations/20200327034430_Device Notes.Designer.cs new file mode 100644 index 00000000..49ca39a2 --- /dev/null +++ b/Server/Migrations/20200327034430_Device Notes.Designer.cs @@ -0,0 +1,712 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Remotely.Server.Data; + +namespace Remotely.Server.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20200327034430_Device Notes")] + partial class DeviceNotes + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.2"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Email") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasColumnType("TEXT") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("RemotelyUsers"); + + b.HasDiscriminator("Discriminator").HasValue("IdentityUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("LoginProvider") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(128); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Alert", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("CreatedOn") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("DeviceID") + .HasColumnType("TEXT"); + + b.Property("Message") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("UserID") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("DeviceID"); + + b.HasIndex("OrganizationID"); + + b.HasIndex("UserID"); + + b.ToTable("Alerts"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Secret") + .HasColumnType("TEXT"); + + b.Property("Token") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.HasIndex("Token"); + + b.ToTable("ApiTokens"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.CommandResult", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("CommandMode") + .HasColumnType("TEXT"); + + b.Property("CommandResults") + .HasColumnType("TEXT"); + + b.Property("CommandText") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("PSCoreResults") + .HasColumnType("TEXT"); + + b.Property("SenderConnectionID") + .HasColumnType("TEXT"); + + b.Property("SenderUserID") + .HasColumnType("TEXT"); + + b.Property("TargetDeviceIDs") + .HasColumnType("TEXT"); + + b.Property("TimeStamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("CommandResults"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Device", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("AgentVersion") + .HasColumnType("TEXT"); + + b.Property("Alias") + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("CpuUtilization") + .HasColumnType("REAL"); + + b.Property("CurrentUser") + .HasColumnType("TEXT"); + + b.Property("DeviceGroupID") + .HasColumnType("TEXT"); + + b.Property("DeviceName") + .HasColumnType("TEXT"); + + b.Property("Drives") + .HasColumnType("TEXT"); + + b.Property("Is64Bit") + .HasColumnType("INTEGER"); + + b.Property("IsOnline") + .HasColumnType("INTEGER"); + + b.Property("LastOnline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Notes") + .HasColumnType("TEXT"); + + b.Property("OSArchitecture") + .HasColumnType("INTEGER"); + + b.Property("OSDescription") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("TEXT"); + + b.Property("ProcessorCount") + .HasColumnType("INTEGER"); + + b.Property("ServerVerificationToken") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("TotalMemory") + .HasColumnType("REAL"); + + b.Property("TotalStorage") + .HasColumnType("REAL"); + + b.Property("UsedMemory") + .HasColumnType("REAL"); + + b.Property("UsedStorage") + .HasColumnType("REAL"); + + b.HasKey("ID"); + + b.HasIndex("DeviceGroupID"); + + b.HasIndex("DeviceName"); + + b.HasIndex("OrganizationID"); + + b.ToTable("Devices"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.DeviceGroup", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT") + .HasMaxLength(200); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("DeviceGroups"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.EventLog", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("EventType") + .HasColumnType("INTEGER"); + + b.Property("Message") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("TimeStamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("EventLogs"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.InviteLink", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("DateSent") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("InvitedUser") + .HasColumnType("TEXT"); + + b.Property("IsAdmin") + .HasColumnType("INTEGER"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("ResetUrl") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("InviteLinks"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Organization", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("OrganizationName") + .HasColumnType("TEXT") + .HasMaxLength(25); + + b.HasKey("ID"); + + b.ToTable("Organizations"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.SharedFile", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("ContentType") + .HasColumnType("TEXT"); + + b.Property("FileContents") + .HasColumnType("BLOB"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("OrganizationID"); + + b.ToTable("SharedFiles"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.UserDevicePermission", b => + { + b.Property("ID") + .HasColumnType("TEXT"); + + b.Property("DeviceGroupID") + .HasColumnType("TEXT"); + + b.Property("UserID") + .HasColumnType("TEXT"); + + b.HasKey("ID"); + + b.HasIndex("DeviceGroupID"); + + b.HasIndex("UserID"); + + b.ToTable("PermissionLinks"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.RemotelyUser", b => + { + b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser"); + + b.Property("IsAdministrator") + .HasColumnType("INTEGER"); + + b.Property("IsServerAdmin") + .HasColumnType("INTEGER"); + + b.Property("OrganizationID") + .HasColumnType("TEXT"); + + b.Property("UserOptions") + .HasColumnType("TEXT"); + + b.HasIndex("OrganizationID"); + + b.HasIndex("UserName"); + + b.HasDiscriminator().HasValue("RemotelyUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Alert", b => + { + b.HasOne("Remotely.Shared.Models.Device", "Device") + .WithMany("Alerts") + .HasForeignKey("DeviceID"); + + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("Alerts") + .HasForeignKey("OrganizationID"); + + b.HasOne("Remotely.Shared.Models.RemotelyUser", "User") + .WithMany("Alerts") + .HasForeignKey("UserID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("ApiTokens") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.CommandResult", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("CommandResults") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.Device", b => + { + b.HasOne("Remotely.Shared.Models.DeviceGroup", "DeviceGroup") + .WithMany("Devices") + .HasForeignKey("DeviceGroupID"); + + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("Devices") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.DeviceGroup", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("DeviceGroups") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.EventLog", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("EventLogs") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.InviteLink", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("InviteLinks") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.SharedFile", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("SharedFiles") + .HasForeignKey("OrganizationID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.UserDevicePermission", b => + { + b.HasOne("Remotely.Shared.Models.DeviceGroup", "DeviceGroup") + .WithMany("PermissionLinks") + .HasForeignKey("DeviceGroupID"); + + b.HasOne("Remotely.Shared.Models.RemotelyUser", "User") + .WithMany("PermissionLinks") + .HasForeignKey("UserID"); + }); + + modelBuilder.Entity("Remotely.Shared.Models.RemotelyUser", b => + { + b.HasOne("Remotely.Shared.Models.Organization", "Organization") + .WithMany("RemotelyUsers") + .HasForeignKey("OrganizationID"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Server/Migrations/20200327034430_Device Notes.cs b/Server/Migrations/20200327034430_Device Notes.cs new file mode 100644 index 00000000..5d741247 --- /dev/null +++ b/Server/Migrations/20200327034430_Device Notes.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Remotely.Server.Migrations +{ + public partial class DeviceNotes : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Notes", + table: "Devices", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Notes", + table: "Devices"); + } + } +} diff --git a/Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Server/Migrations/ApplicationDbContextModelSnapshot.cs index fd828d39..5d1aaa4a 100644 --- a/Server/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Server/Migrations/ApplicationDbContextModelSnapshot.cs @@ -357,6 +357,9 @@ namespace Remotely.Server.Migrations .IsRequired() .HasColumnType("TEXT"); + b.Property("Notes") + .HasColumnType("TEXT"); + b.Property("OSArchitecture") .HasColumnType("INTEGER"); diff --git a/Server/Pages/EditDevice.cshtml b/Server/Pages/EditDevice.cshtml index 8a7aa795..bc3fdfa4 100644 --- a/Server/Pages/EditDevice.cshtml +++ b/Server/Pages/EditDevice.cshtml @@ -29,7 +29,7 @@ else
- +
@@ -63,6 +63,12 @@ else
+
+ +
+ +
+
diff --git a/Server/Pages/EditDevice.cshtml.cs b/Server/Pages/EditDevice.cshtml.cs index 28ae8ddb..0e03635b 100644 --- a/Server/Pages/EditDevice.cshtml.cs +++ b/Server/Pages/EditDevice.cshtml.cs @@ -57,7 +57,7 @@ namespace Remotely.Server.Pages return Page(); } - DataService.UpdateDevice(deviceID, Input.Tags, Input.Alias, Input.DeviceGroupID); + DataService.UpdateDevice(deviceID, Input.Tags, Input.Alias, Input.DeviceGroupID, Input.Notes); return RedirectToPage("EditDevice", new { deviceID, success = true }); } @@ -74,6 +74,7 @@ namespace Remotely.Server.Pages Input.Alias = device?.Alias; Input.DeviceGroupID = device?.DeviceGroupID; Input.Tags = device?.Tags; + Input.Notes = device?.Notes; } var groups = DataService.GetDeviceGroups(User.Identity.Name); @@ -89,6 +90,8 @@ namespace Remotely.Server.Pages [StringLength(200)] public string Tags { get; set; } + + public string Notes { get; set; } } } } diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs index 03fda162..b1757664 100644 --- a/Server/Services/DataService.cs +++ b/Server/Services/DataService.cs @@ -500,7 +500,8 @@ namespace Remotely.Server.Services return RemotelyContext.Alerts .Include(x => x.Device) .Include(x => x.User) - .Where(x => x.UserID == userID); + .Where(x => x.UserID == userID) + .OrderByDescending(x => x.CreatedOn); } public IEnumerable GetAllApiTokens(string userID) { @@ -611,7 +612,8 @@ namespace Remotely.Server.Services x.PermissionLinks.Count == 0 || x.PermissionLinks.Any(x => x.UserID == user.Id) ) - ) ?? Enumerable.Empty(); + ) + .OrderBy(x=>x.Name) ?? Enumerable.Empty(); } public IEnumerable GetDevicesForUser(string userName) @@ -841,7 +843,7 @@ namespace Remotely.Server.Services } } - public void UpdateDevice(string deviceID, string tag, string alias, string deviceGroupID) + public void UpdateDevice(string deviceID, string tag, string alias, string deviceGroupID, string notes) { var device = RemotelyContext.Devices.Find(deviceID); if (device == null) @@ -852,6 +854,7 @@ namespace Remotely.Server.Services device.Tags = tag; device.DeviceGroupID = deviceGroupID; device.Alias = alias; + device.Notes = notes; RemotelyContext.SaveChanges(); } diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js b/Server/wwwroot/scripts/Commands/WebCommands.js index 27866fb7..75125f90 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js +++ b/Server/wwwroot/scripts/Commands/WebCommands.js @@ -206,6 +206,8 @@ var commands = [
  • FreeMemory (between 0 and 1)
  • TotalMemory (number in GB)
  • ProcessorCount (number)
    • +
  • Tags (text)
    • +
  • Notes (text)
    • `, (parameters, paramDictionary) => { if (typeof paramDictionary["all"] != "undefined") { Main.DataGrid.DataSource.forEach(x => { diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js.map b/Server/wwwroot/scripts/Commands/WebCommands.js.map index 092308c9..b8b9e2bf 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js.map +++ b/Server/wwwroot/scripts/Commands/WebCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Commands/WebCommands.ts b/Server/wwwroot/scripts/Commands/WebCommands.ts index d191d4b0..6258334b 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.ts +++ b/Server/wwwroot/scripts/Commands/WebCommands.ts @@ -316,6 +316,8 @@ var commands: Array = [
  • FreeMemory (between 0 and 1)
  • TotalMemory (number in GB)
  • ProcessorCount (number)
    • +
  • Tags (text)
    • +
  • Notes (text)
    • `, (parameters, paramDictionary) => { diff --git a/Server/wwwroot/scripts/Models/Device.ts b/Server/wwwroot/scripts/Models/Device.ts index 004a7342..217c7646 100644 --- a/Server/wwwroot/scripts/Models/Device.ts +++ b/Server/wwwroot/scripts/Models/Device.ts @@ -10,6 +10,7 @@ Is64Bit: boolean; IsOnline: boolean; LastOnline: Date; + Notes: string; OrganizationID: string; OSArchitecture: any; OSDescription: string; diff --git a/Shared/Models/Device.cs b/Shared/Models/Device.cs index 0ea6e9a0..ee0db34d 100644 --- a/Shared/Models/Device.cs +++ b/Shared/Models/Device.cs @@ -25,26 +25,20 @@ namespace Remotely.Shared.Models public string DeviceName { get; set; } public List Drives { get; set; } - public double UsedMemory { get; set; } - - public double UsedStorage { get; set; } - [Key] public string ID { get; set; } public bool Is64Bit { get; set; } - public bool IsOnline { get; set; } - public DateTimeOffset LastOnline { get; set; } + public string Notes { get; set; } [JsonIgnore] public Organization Organization { get; set; } + public string OrganizationID { get; set; } public Architecture OSArchitecture { get; set; } - public string OSDescription { get; set; } public string Platform { get; set; } - public int ProcessorCount { get; set; } public string ServerVerificationToken { get; set; } [StringLength(200)] @@ -52,7 +46,8 @@ namespace Remotely.Shared.Models public double TotalMemory { get; set; } public double TotalStorage { get; set; } - + public double UsedMemory { get; set; } + public double UsedStorage { get; set; } } } \ No newline at end of file