diff --git a/src/Analysim.Core/Entities/ProjectComment.cs b/src/Analysim.Core/Entities/ProjectComment.cs index c2af1f30..cce032a7 100644 --- a/src/Analysim.Core/Entities/ProjectComment.cs +++ b/src/Analysim.Core/Entities/ProjectComment.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/src/Analysim.Core/Entities/ProjectLog.cs b/src/Analysim.Core/Entities/ProjectLog.cs index 8b8996f2..a2f8a481 100644 --- a/src/Analysim.Core/Entities/ProjectLog.cs +++ b/src/Analysim.Core/Entities/ProjectLog.cs @@ -1,3 +1,5 @@ +#nullable enable // Enable nullable fields + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -21,6 +23,13 @@ public class ProjectLog public int ProjectID { get; set; } public Project Project{ get; set; } = null!; + // Referenced Notebook + [ForeignKey("ReferencedNotebookID")] + public int? ReferencedNotebookID { get; set; } + public Notebook? ReferencedNotebook { get; set; } + + public int? ReferencedNotebookVersion { get; set; } + // Project Log Title public string? Title { get; set; } diff --git a/src/Analysim.Core/Entities/Publication.cs b/src/Analysim.Core/Entities/Publication.cs index 4887039c..518d0260 100644 --- a/src/Analysim.Core/Entities/Publication.cs +++ b/src/Analysim.Core/Entities/Publication.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -30,6 +32,11 @@ public class Publication [Required(ErrorMessage = "Publication Year is a required field.")] [Range(1, 2100, ErrorMessage = "Enter a valid publication year.")] public int? Year { get; set; } + + public string? Volume { get; set; } + public string? Issue { get; set; } + public string? Pages { get; set; } + public string? Notes { get; set; } // Timestamps diff --git a/src/Analysim.Infrastructure/Data/ApplicationDbContext.cs b/src/Analysim.Infrastructure/Data/ApplicationDbContext.cs index cdae1610..0e8812a1 100644 --- a/src/Analysim.Infrastructure/Data/ApplicationDbContext.cs +++ b/src/Analysim.Infrastructure/Data/ApplicationDbContext.cs @@ -206,6 +206,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(pl => pl.BlobFileID) .OnDelete(DeleteBehavior.SetNull); + // Optional One To Many Relationship (Notebook -> ProjectLog) + modelBuilder.Entity() + .HasOne(pl => pl.ReferencedNotebook) + .WithMany() + .HasForeignKey(pl => pl.ReferencedNotebookID) + .OnDelete(DeleteBehavior.SetNull); + // One To Many Relationship (ProjectLog -> ProjectComment) modelBuilder.Entity() .HasMany(pl => pl.Comments) @@ -222,6 +229,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity() .HasIndex(pc => pc.ProjectLogID); + modelBuilder.Entity() + .HasIndex(pl => pl.ReferencedNotebookID); + #endregion // One To Many Relationship (Project -> Publication) diff --git a/src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs index d23e92b5..7989d6d6 100644 --- a/src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Analysim.Infrastructure/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs @@ -251,6 +251,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("CommentID")); b.Property("Content") + .IsRequired() .HasColumnType("text"); b.Property("CreatedAt") @@ -365,6 +366,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ProjectID") .HasColumnType("integer"); + b.Property("ReferencedNotebookID") + .HasColumnType("integer"); + + b.Property("ReferencedNotebookVersion") + .HasColumnType("integer"); + b.Property("Title") .HasColumnType("text"); @@ -380,6 +387,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("ProjectID"); + b.HasIndex("ReferencedNotebookID"); + b.HasIndex("UserID"); b.ToTable("ProjectLogs"); @@ -440,6 +449,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Doi") .HasColumnType("text"); + b.Property("Issue") + .HasColumnType("text"); + b.Property("Journal") .IsRequired() .HasColumnType("text"); @@ -447,6 +459,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Notes") .HasColumnType("text"); + b.Property("Pages") + .HasColumnType("text"); + b.Property("ProjectID") .HasColumnType("integer"); @@ -460,6 +475,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Url") .HasColumnType("text"); + b.Property("Volume") + .HasColumnType("text"); + b.Property("Year") .IsRequired() .HasColumnType("integer"); @@ -619,21 +637,21 @@ protected override void BuildModel(ModelBuilder modelBuilder) new { Id = 1, - ConcurrencyStamp = "e7431394-d3f8-4e7a-828d-930d0ecfe1ac", + ConcurrencyStamp = "d7c6278e-3f78-4db6-8832-aa41ea9fd62c", Name = "Admin", NormalizedName = "ADMIN" }, new { Id = 2, - ConcurrencyStamp = "b325405e-6f19-4b1c-a845-9df31e386760", + ConcurrencyStamp = "7383e31e-a884-4cd6-82f7-a6287b4e30a5", Name = "Customer", NormalizedName = "CUSTOMER" }, new { Id = 3, - ConcurrencyStamp = "f68ee1fe-5d74-4f56-ade1-5a8837a3e127", + ConcurrencyStamp = "398ef1f2-6b82-45f2-9601-ed2129f197e9", Name = "Moderator", NormalizedName = "MODERATOR" }); @@ -887,6 +905,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + b.HasOne("Core.Entities.Notebook", "ReferencedNotebook") + .WithMany() + .HasForeignKey("ReferencedNotebookID") + .OnDelete(DeleteBehavior.SetNull); + b.HasOne("Core.Entities.User", "User") .WithMany("ProjectLogs") .HasForeignKey("UserID") @@ -897,6 +920,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Project"); + b.Navigation("ReferencedNotebook"); + b.Navigation("User"); }); diff --git a/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.Designer.cs b/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.Designer.cs new file mode 100644 index 00000000..77d83dc4 --- /dev/null +++ b/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.Designer.cs @@ -0,0 +1,1105 @@ +// +using System; +using Infrastructure.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Infrastructure.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20260519132728_AddNotebookRefToProjectLogs")] + partial class AddNotebookRefToProjectLogs + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.6") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Analysim.Core.Entities.BlobFileContent", b => + { + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("Content") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.HasKey("BlobFileID"); + + b.ToTable("BlobFileContent"); + }); + + modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b => + { + b.Property("NotebookID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("Version") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("Author") + .IsRequired() + .HasColumnType("text"); + + b.Property("Content") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Size") + .HasColumnType("integer"); + + b.HasKey("NotebookID", "Version"); + + b.ToTable("NotebookContent"); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.Property("BlobFileID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("BlobFileID")); + + b.Property("Container") + .IsRequired() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Directory") + .IsRequired() + .HasColumnType("text"); + + b.Property("Extension") + .IsRequired() + .HasColumnType("text"); + + b.Property("LastModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("Size") + .HasColumnType("integer"); + + b.Property("Uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("BlobFileID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("UserID"); + + b.ToTable("BlobFiles"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.Property("NotebookID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("NotebookID")); + + b.Property("Container") + .IsRequired() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Directory") + .IsRequired() + .HasColumnType("text"); + + b.Property("Extension") + .IsRequired() + .HasColumnType("text"); + + b.Property("LastModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("Route") + .IsRequired() + .HasColumnType("text"); + + b.Property("Size") + .HasColumnType("integer"); + + b.Property("Uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("type") + .HasColumnType("text"); + + b.HasKey("NotebookID"); + + b.HasIndex("Directory"); + + b.HasIndex("ProjectID"); + + b.ToTable("Notebook"); + }); + + modelBuilder.Entity("Core.Entities.ObservableNotebookDataset", b => + { + b.Property("ID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ID")); + + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("NotebookID") + .HasColumnType("integer"); + + b.Property("datasetName") + .HasColumnType("text"); + + b.Property("datasetURL") + .HasColumnType("text"); + + b.HasKey("ID"); + + b.HasIndex("NotebookID"); + + b.ToTable("ObservableNotebookDataset"); + }); + + modelBuilder.Entity("Core.Entities.Project", b => + { + b.Property("ProjectID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ProjectID")); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("ForkedFromProjectID") + .HasColumnType("integer"); + + b.Property("LastUpdated") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("Route") + .IsRequired() + .HasColumnType("text"); + + b.Property("Visibility") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("ProjectID"); + + b.ToTable("Projects"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.Property("CommentID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("CommentID")); + + b.Property("Content") + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsDeleted") + .HasColumnType("boolean"); + + b.Property("IsPendingReview") + .HasColumnType("boolean"); + + b.Property("ParentCommentID") + .HasColumnType("integer"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("ProjectLogID") + .HasColumnType("integer"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("CommentID"); + + b.HasIndex("ParentCommentID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("ProjectLogID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectComments"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentFlag", b => + { + b.Property("FlagID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("FlagID")); + + b.Property("CommentContentSnapshot") + .HasColumnType("text"); + + b.Property("CommentID") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("FlagID"); + + b.HasIndex("UserID"); + + b.HasIndex("CommentID", "UserID") + .IsUnique(); + + b.ToTable("ProjectCommentFlags"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentLike", b => + { + b.Property("CommentID") + .HasColumnType("integer"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("CommentID", "UserID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectCommentLikes"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.Property("LogID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("LogID")); + + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsDeleted") + .HasColumnType("boolean"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("ReferencedNotebookID") + .HasColumnType("integer"); + + b.Property("ReferencedNotebookVersion") + .HasColumnType("integer"); + + b.Property("Title") + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("LogID"); + + b.HasIndex("BlobFileID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("ReferencedNotebookID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectLogs"); + }); + + modelBuilder.Entity("Core.Entities.ProjectTag", b => + { + b.Property("ProjectID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("TagID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.HasKey("ProjectID", "TagID"); + + b.HasIndex("TagID"); + + b.ToTable("ProjectTags"); + }); + + modelBuilder.Entity("Core.Entities.ProjectUser", b => + { + b.Property("UserID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("ProjectID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("IsFollowing") + .HasColumnType("boolean"); + + b.Property("UserRole") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("UserID", "ProjectID"); + + b.HasIndex("ProjectID"); + + b.ToTable("ProjectUsers"); + }); + + modelBuilder.Entity("Core.Entities.Publication", b => + { + b.Property("PublicationID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("PublicationID")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Doi") + .HasColumnType("text"); + + b.Property("Journal") + .IsRequired() + .HasColumnType("text"); + + b.Property("Notes") + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("SourceAuthor") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .HasColumnType("text"); + + b.Property("Url") + .HasColumnType("text"); + + b.Property("Year") + .IsRequired() + .HasColumnType("integer"); + + b.HasKey("PublicationID"); + + b.HasIndex("ProjectID"); + + b.ToTable("Publications"); + }); + + modelBuilder.Entity("Core.Entities.Tag", b => + { + b.Property("TagID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("TagID")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("TagID"); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("Bio") + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("LastOnline") + .HasColumnType("timestamp with time zone"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("RegistrationSurvey") + .HasColumnType("text"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Core.Entities.UserUser", b => + { + b.Property("UserID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("FollowerID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.HasKey("UserID", "FollowerID"); + + b.HasIndex("FollowerID"); + + b.ToTable("UserUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + + b.HasData( + new + { + Id = 1, + ConcurrencyStamp = "f8accda8-f6e5-43e2-acdc-ec7489690c7e", + Name = "Admin", + NormalizedName = "ADMIN" + }, + new + { + Id = 2, + ConcurrencyStamp = "5acac352-55a0-4b09-bc33-6a734391391b", + Name = "Customer", + NormalizedName = "CUSTOMER" + }, + new + { + Id = 3, + ConcurrencyStamp = "67d7e55c-aee8-4fe1-8cb4-c89f670c3c24", + Name = "Moderator", + NormalizedName = "MODERATOR" + }); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Analysim.Core.Entities.BlobFileContent", b => + { + b.HasOne("Core.Entities.BlobFile", "BlobFile") + .WithMany("BlobFileContents") + .HasForeignKey("BlobFileID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BlobFile"); + }); + + modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b => + { + b.HasOne("Core.Entities.Notebook", "Notebook") + .WithMany("NotebookContents") + .HasForeignKey("NotebookID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Notebook"); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("BlobFiles") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Core.Entities.User", "User") + .WithMany("BlobFiles") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("Notebooks") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Core.Entities.ObservableNotebookDataset", b => + { + b.HasOne("Core.Entities.Notebook", "notebook") + .WithMany("observableNotebookDatasets") + .HasForeignKey("NotebookID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("notebook"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.HasOne("Core.Entities.ProjectComment", "ParentComment") + .WithMany("Replies") + .HasForeignKey("ParentCommentID") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectComments") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.ProjectLog", "ProjectLog") + .WithMany("Comments") + .HasForeignKey("ProjectLogID") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectComments") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("ParentComment"); + + b.Navigation("Project"); + + b.Navigation("ProjectLog"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentFlag", b => + { + b.HasOne("Core.Entities.ProjectComment", "ProjectComment") + .WithMany("CommentFlags") + .HasForeignKey("CommentID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("CommentFlags") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ProjectComment"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentLike", b => + { + b.HasOne("Core.Entities.ProjectComment", "ProjectComment") + .WithMany("CommentLikes") + .HasForeignKey("CommentID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("CommentLikes") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ProjectComment"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.HasOne("Core.Entities.BlobFile", "BlobFile") + .WithMany() + .HasForeignKey("BlobFileID") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectLogs") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.Notebook", "ReferencedNotebook") + .WithMany() + .HasForeignKey("ReferencedNotebookID") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectLogs") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("BlobFile"); + + b.Navigation("Project"); + + b.Navigation("ReferencedNotebook"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectTag", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectTags") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.Tag", "Tag") + .WithMany("ProjectTags") + .HasForeignKey("TagID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("Tag"); + }); + + modelBuilder.Entity("Core.Entities.ProjectUser", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectUsers") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectUsers") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.Publication", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("Publications") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Core.Entities.UserUser", b => + { + b.HasOne("Core.Entities.User", "Follower") + .WithMany("Following") + .HasForeignKey("FollowerID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("Followers") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Follower"); + + b.Navigation("User"); + }); + + 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("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Core.Entities.User", 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("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.Navigation("BlobFileContents"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.Navigation("NotebookContents"); + + b.Navigation("observableNotebookDatasets"); + }); + + modelBuilder.Entity("Core.Entities.Project", b => + { + b.Navigation("BlobFiles"); + + b.Navigation("Notebooks"); + + b.Navigation("ProjectComments"); + + b.Navigation("ProjectLogs"); + + b.Navigation("ProjectTags"); + + b.Navigation("ProjectUsers"); + + b.Navigation("Publications"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.Navigation("CommentFlags"); + + b.Navigation("CommentLikes"); + + b.Navigation("Replies"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.Navigation("Comments"); + }); + + modelBuilder.Entity("Core.Entities.Tag", b => + { + b.Navigation("ProjectTags"); + }); + + modelBuilder.Entity("Core.Entities.User", b => + { + b.Navigation("BlobFiles"); + + b.Navigation("CommentFlags"); + + b.Navigation("CommentLikes"); + + b.Navigation("Followers"); + + b.Navigation("Following"); + + b.Navigation("ProjectComments"); + + b.Navigation("ProjectLogs"); + + b.Navigation("ProjectUsers"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.cs b/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.cs new file mode 100644 index 00000000..45f6040e --- /dev/null +++ b/src/Analysim.Infrastructure/Migrations/20260519132728_AddNotebookRefToProjectLogs.cs @@ -0,0 +1,98 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Infrastructure.Migrations +{ + public partial class AddNotebookRefToProjectLogs : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ReferencedNotebookID", + table: "ProjectLogs", + type: "integer", + nullable: true); + + migrationBuilder.AddColumn( + name: "ReferencedNotebookVersion", + table: "ProjectLogs", + type: "integer", + nullable: true); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 1, + column: "ConcurrencyStamp", + value: "f8accda8-f6e5-43e2-acdc-ec7489690c7e"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 2, + column: "ConcurrencyStamp", + value: "5acac352-55a0-4b09-bc33-6a734391391b"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 3, + column: "ConcurrencyStamp", + value: "67d7e55c-aee8-4fe1-8cb4-c89f670c3c24"); + + migrationBuilder.CreateIndex( + name: "IX_ProjectLogs_ReferencedNotebookID", + table: "ProjectLogs", + column: "ReferencedNotebookID"); + + migrationBuilder.AddForeignKey( + name: "FK_ProjectLogs_Notebook_ReferencedNotebookID", + table: "ProjectLogs", + column: "ReferencedNotebookID", + principalTable: "Notebook", + principalColumn: "NotebookID", + onDelete: ReferentialAction.SetNull); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_ProjectLogs_Notebook_ReferencedNotebookID", + table: "ProjectLogs"); + + migrationBuilder.DropIndex( + name: "IX_ProjectLogs_ReferencedNotebookID", + table: "ProjectLogs"); + + migrationBuilder.DropColumn( + name: "ReferencedNotebookID", + table: "ProjectLogs"); + + migrationBuilder.DropColumn( + name: "ReferencedNotebookVersion", + table: "ProjectLogs"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 1, + column: "ConcurrencyStamp", + value: "f1d80f82-74ad-4f0e-b39a-228c651b424a"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 2, + column: "ConcurrencyStamp", + value: "cfb8a477-eb7b-4e91-865d-122d17565ce0"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 3, + column: "ConcurrencyStamp", + value: "ecaa6f71-1595-44f7-9337-57b461da675a"); + } + } +} diff --git a/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.Designer.cs b/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.Designer.cs new file mode 100644 index 00000000..34e31421 --- /dev/null +++ b/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.Designer.cs @@ -0,0 +1,1118 @@ +// +using System; +using Infrastructure.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Infrastructure.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20260520182711_AddVolIssuePagesToPublications")] + partial class AddVolIssuePagesToPublications + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.6") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Analysim.Core.Entities.BlobFileContent", b => + { + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("Content") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.HasKey("BlobFileID"); + + b.ToTable("BlobFileContent"); + }); + + modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b => + { + b.Property("NotebookID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("Version") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("Author") + .IsRequired() + .HasColumnType("text"); + + b.Property("Content") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Size") + .HasColumnType("integer"); + + b.HasKey("NotebookID", "Version"); + + b.ToTable("NotebookContent"); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.Property("BlobFileID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("BlobFileID")); + + b.Property("Container") + .IsRequired() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Directory") + .IsRequired() + .HasColumnType("text"); + + b.Property("Extension") + .IsRequired() + .HasColumnType("text"); + + b.Property("LastModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("Size") + .HasColumnType("integer"); + + b.Property("Uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("BlobFileID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("UserID"); + + b.ToTable("BlobFiles"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.Property("NotebookID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("NotebookID")); + + b.Property("Container") + .IsRequired() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Directory") + .IsRequired() + .HasColumnType("text"); + + b.Property("Extension") + .IsRequired() + .HasColumnType("text"); + + b.Property("LastModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("Route") + .IsRequired() + .HasColumnType("text"); + + b.Property("Size") + .HasColumnType("integer"); + + b.Property("Uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("type") + .HasColumnType("text"); + + b.HasKey("NotebookID"); + + b.HasIndex("Directory"); + + b.HasIndex("ProjectID"); + + b.ToTable("Notebook"); + }); + + modelBuilder.Entity("Core.Entities.ObservableNotebookDataset", b => + { + b.Property("ID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ID")); + + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("NotebookID") + .HasColumnType("integer"); + + b.Property("datasetName") + .HasColumnType("text"); + + b.Property("datasetURL") + .HasColumnType("text"); + + b.HasKey("ID"); + + b.HasIndex("NotebookID"); + + b.ToTable("ObservableNotebookDataset"); + }); + + modelBuilder.Entity("Core.Entities.Project", b => + { + b.Property("ProjectID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ProjectID")); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("ForkedFromProjectID") + .HasColumnType("integer"); + + b.Property("LastUpdated") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("Route") + .IsRequired() + .HasColumnType("text"); + + b.Property("Visibility") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("ProjectID"); + + b.ToTable("Projects"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.Property("CommentID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("CommentID")); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsDeleted") + .HasColumnType("boolean"); + + b.Property("IsPendingReview") + .HasColumnType("boolean"); + + b.Property("ParentCommentID") + .HasColumnType("integer"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("ProjectLogID") + .HasColumnType("integer"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("CommentID"); + + b.HasIndex("ParentCommentID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("ProjectLogID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectComments"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentFlag", b => + { + b.Property("FlagID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("FlagID")); + + b.Property("CommentContentSnapshot") + .HasColumnType("text"); + + b.Property("CommentID") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("FlagID"); + + b.HasIndex("UserID"); + + b.HasIndex("CommentID", "UserID") + .IsUnique(); + + b.ToTable("ProjectCommentFlags"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentLike", b => + { + b.Property("CommentID") + .HasColumnType("integer"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("CommentID", "UserID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectCommentLikes"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.Property("LogID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("LogID")); + + b.Property("BlobFileID") + .HasColumnType("integer"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("ExpiresAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsDeleted") + .HasColumnType("boolean"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("ReferencedNotebookID") + .HasColumnType("integer"); + + b.Property("ReferencedNotebookVersion") + .HasColumnType("integer"); + + b.Property("Title") + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserID") + .HasColumnType("integer"); + + b.HasKey("LogID"); + + b.HasIndex("BlobFileID"); + + b.HasIndex("ProjectID"); + + b.HasIndex("ReferencedNotebookID"); + + b.HasIndex("UserID"); + + b.ToTable("ProjectLogs"); + }); + + modelBuilder.Entity("Core.Entities.ProjectTag", b => + { + b.Property("ProjectID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("TagID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.HasKey("ProjectID", "TagID"); + + b.HasIndex("TagID"); + + b.ToTable("ProjectTags"); + }); + + modelBuilder.Entity("Core.Entities.ProjectUser", b => + { + b.Property("UserID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("ProjectID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.Property("IsFollowing") + .HasColumnType("boolean"); + + b.Property("UserRole") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("UserID", "ProjectID"); + + b.HasIndex("ProjectID"); + + b.ToTable("ProjectUsers"); + }); + + modelBuilder.Entity("Core.Entities.Publication", b => + { + b.Property("PublicationID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("PublicationID")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Doi") + .HasColumnType("text"); + + b.Property("Issue") + .HasColumnType("text"); + + b.Property("Journal") + .IsRequired() + .HasColumnType("text"); + + b.Property("Notes") + .HasColumnType("text"); + + b.Property("Pages") + .HasColumnType("text"); + + b.Property("ProjectID") + .HasColumnType("integer"); + + b.Property("SourceAuthor") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .HasColumnType("text"); + + b.Property("Url") + .HasColumnType("text"); + + b.Property("Volume") + .HasColumnType("text"); + + b.Property("Year") + .IsRequired() + .HasColumnType("integer"); + + b.HasKey("PublicationID"); + + b.HasIndex("ProjectID"); + + b.ToTable("Publications"); + }); + + modelBuilder.Entity("Core.Entities.Tag", b => + { + b.Property("TagID") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("TagID")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("TagID"); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("Core.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("Bio") + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("LastOnline") + .HasColumnType("timestamp with time zone"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("ReceiveCommentReplyEmails") + .HasColumnType("boolean"); + + b.Property("RegistrationSurvey") + .HasColumnType("text"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Core.Entities.UserUser", b => + { + b.Property("UserID") + .HasColumnType("integer") + .HasColumnOrder(1); + + b.Property("FollowerID") + .HasColumnType("integer") + .HasColumnOrder(2); + + b.HasKey("UserID", "FollowerID"); + + b.HasIndex("FollowerID"); + + b.ToTable("UserUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + + b.HasData( + new + { + Id = 1, + ConcurrencyStamp = "d7c6278e-3f78-4db6-8832-aa41ea9fd62c", + Name = "Admin", + NormalizedName = "ADMIN" + }, + new + { + Id = 2, + ConcurrencyStamp = "7383e31e-a884-4cd6-82f7-a6287b4e30a5", + Name = "Customer", + NormalizedName = "CUSTOMER" + }, + new + { + Id = 3, + ConcurrencyStamp = "398ef1f2-6b82-45f2-9601-ed2129f197e9", + Name = "Moderator", + NormalizedName = "MODERATOR" + }); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Analysim.Core.Entities.BlobFileContent", b => + { + b.HasOne("Core.Entities.BlobFile", "BlobFile") + .WithMany("BlobFileContents") + .HasForeignKey("BlobFileID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BlobFile"); + }); + + modelBuilder.Entity("Analysim.Core.Entities.NotebookContent", b => + { + b.HasOne("Core.Entities.Notebook", "Notebook") + .WithMany("NotebookContents") + .HasForeignKey("NotebookID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Notebook"); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("BlobFiles") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Core.Entities.User", "User") + .WithMany("BlobFiles") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("Notebooks") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Core.Entities.ObservableNotebookDataset", b => + { + b.HasOne("Core.Entities.Notebook", "notebook") + .WithMany("observableNotebookDatasets") + .HasForeignKey("NotebookID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("notebook"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.HasOne("Core.Entities.ProjectComment", "ParentComment") + .WithMany("Replies") + .HasForeignKey("ParentCommentID") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectComments") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.ProjectLog", "ProjectLog") + .WithMany("Comments") + .HasForeignKey("ProjectLogID") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectComments") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("ParentComment"); + + b.Navigation("Project"); + + b.Navigation("ProjectLog"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentFlag", b => + { + b.HasOne("Core.Entities.ProjectComment", "ProjectComment") + .WithMany("CommentFlags") + .HasForeignKey("CommentID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("CommentFlags") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ProjectComment"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectCommentLike", b => + { + b.HasOne("Core.Entities.ProjectComment", "ProjectComment") + .WithMany("CommentLikes") + .HasForeignKey("CommentID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("CommentLikes") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ProjectComment"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.HasOne("Core.Entities.BlobFile", "BlobFile") + .WithMany() + .HasForeignKey("BlobFileID") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectLogs") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.Notebook", "ReferencedNotebook") + .WithMany() + .HasForeignKey("ReferencedNotebookID") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectLogs") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("BlobFile"); + + b.Navigation("Project"); + + b.Navigation("ReferencedNotebook"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.ProjectTag", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectTags") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.Tag", "Tag") + .WithMany("ProjectTags") + .HasForeignKey("TagID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("Tag"); + }); + + modelBuilder.Entity("Core.Entities.ProjectUser", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("ProjectUsers") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("ProjectUsers") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Core.Entities.Publication", b => + { + b.HasOne("Core.Entities.Project", "Project") + .WithMany("Publications") + .HasForeignKey("ProjectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Core.Entities.UserUser", b => + { + b.HasOne("Core.Entities.User", "Follower") + .WithMany("Following") + .HasForeignKey("FollowerID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Core.Entities.User", "User") + .WithMany("Followers") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Follower"); + + b.Navigation("User"); + }); + + 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("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Core.Entities.User", 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("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Core.Entities.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Core.Entities.BlobFile", b => + { + b.Navigation("BlobFileContents"); + }); + + modelBuilder.Entity("Core.Entities.Notebook", b => + { + b.Navigation("NotebookContents"); + + b.Navigation("observableNotebookDatasets"); + }); + + modelBuilder.Entity("Core.Entities.Project", b => + { + b.Navigation("BlobFiles"); + + b.Navigation("Notebooks"); + + b.Navigation("ProjectComments"); + + b.Navigation("ProjectLogs"); + + b.Navigation("ProjectTags"); + + b.Navigation("ProjectUsers"); + + b.Navigation("Publications"); + }); + + modelBuilder.Entity("Core.Entities.ProjectComment", b => + { + b.Navigation("CommentFlags"); + + b.Navigation("CommentLikes"); + + b.Navigation("Replies"); + }); + + modelBuilder.Entity("Core.Entities.ProjectLog", b => + { + b.Navigation("Comments"); + }); + + modelBuilder.Entity("Core.Entities.Tag", b => + { + b.Navigation("ProjectTags"); + }); + + modelBuilder.Entity("Core.Entities.User", b => + { + b.Navigation("BlobFiles"); + + b.Navigation("CommentFlags"); + + b.Navigation("CommentLikes"); + + b.Navigation("Followers"); + + b.Navigation("Following"); + + b.Navigation("ProjectComments"); + + b.Navigation("ProjectLogs"); + + b.Navigation("ProjectUsers"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.cs b/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.cs new file mode 100644 index 00000000..30aa3fa1 --- /dev/null +++ b/src/Analysim.Infrastructure/Migrations/20260520182711_AddVolIssuePagesToPublications.cs @@ -0,0 +1,105 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Infrastructure.Migrations +{ + public partial class AddVolIssuePagesToPublications : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Issue", + table: "Publications", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "Pages", + table: "Publications", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "Volume", + table: "Publications", + type: "text", + nullable: true); + + migrationBuilder.AlterColumn( + name: "Content", + table: "ProjectComments", + type: "text", + nullable: false, + defaultValue: "", + oldClrType: typeof(string), + oldType: "text", + oldNullable: true); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 1, + column: "ConcurrencyStamp", + value: "d7c6278e-3f78-4db6-8832-aa41ea9fd62c"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 2, + column: "ConcurrencyStamp", + value: "7383e31e-a884-4cd6-82f7-a6287b4e30a5"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 3, + column: "ConcurrencyStamp", + value: "398ef1f2-6b82-45f2-9601-ed2129f197e9"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Issue", + table: "Publications"); + + migrationBuilder.DropColumn( + name: "Pages", + table: "Publications"); + + migrationBuilder.DropColumn( + name: "Volume", + table: "Publications"); + + migrationBuilder.AlterColumn( + name: "Content", + table: "ProjectComments", + type: "text", + nullable: true, + oldClrType: typeof(string), + oldType: "text"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 1, + column: "ConcurrencyStamp", + value: "f8accda8-f6e5-43e2-acdc-ec7489690c7e"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 2, + column: "ConcurrencyStamp", + value: "5acac352-55a0-4b09-bc33-6a734391391b"); + + migrationBuilder.UpdateData( + table: "AspNetRoles", + keyColumn: "Id", + keyValue: 3, + column: "ConcurrencyStamp", + value: "67d7e55c-aee8-4fe1-8cb4-c89f670c3c24"); + } + } +} diff --git a/src/Analysim.Web/ClientApp/src/app/admin/admin.module.ts b/src/Analysim.Web/ClientApp/src/app/admin/admin.module.ts index b226a48c..41245edc 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/admin.module.ts +++ b/src/Analysim.Web/ClientApp/src/app/admin/admin.module.ts @@ -21,6 +21,8 @@ import { ModalDeleteReportsComponent } from './components/comments/modal-delete- import { ModalIgnoreReportsComponent } from './components/comments/modal-ignore-reports/modal-ignore-reports.component'; import { ProjectLogsComponent } from './components/project-logs/project-logs.component'; import { ExpiredLogItemComponent } from './components/project-logs/expired-log-item/expired-log-item.component'; +import { ModalDeleteLogComponent } from './components/project-logs/modal-delete-log/modal-delete-log.component'; +import { ModalRestoreLogComponent } from './components/project-logs/modal-restore-log/modal-restore-log.component'; @NgModule({ declarations: [ @@ -41,7 +43,9 @@ import { ExpiredLogItemComponent } from './components/project-logs/expired-log-i ModalDeleteReportsComponent, ModalIgnoreReportsComponent, ProjectLogsComponent, - ExpiredLogItemComponent + ExpiredLogItemComponent, + ModalDeleteLogComponent, + ModalRestoreLogComponent ], imports: [ CommonModule, diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.html b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.html index a085c2a5..07c7685a 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.html +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.html @@ -30,6 +30,14 @@
+ +
- \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.scss b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.scss index 905ff0dd..35b6e413 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.scss +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.scss @@ -4,7 +4,7 @@ .expired-log-row { display: grid; - grid-template-columns: 1.5fr .75fr .75fr .5fr .5fr .5fr .25fr; + grid-template-columns: 1.5fr .75fr .75fr .5fr .5fr .5fr .5fr; gap: var(--space-3); align-items: center; padding: var(--space-1) var(--space-3); @@ -63,6 +63,7 @@ .actions-col { display: flex; justify-content: flex-end; + gap: var(--space-2); } @media (max-width: 900px) { diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.ts index 93f7b29d..45c45084 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/expired-log-item/expired-log-item.component.ts @@ -1,4 +1,5 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild } from '@angular/core'; +import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { ExpiredProjectLog } from 'src/app/interfaces/expired-project-log'; @Component({ @@ -8,15 +9,56 @@ import { ExpiredProjectLog } from 'src/app/interfaces/expired-project-log'; }) export class ExpiredLogItemComponent implements OnInit { @Input() log!: ExpiredProjectLog; - @Output() deleteLog = new EventEmitter(); + @Output() onReload = new EventEmitter(); - constructor() { } + // Modals + @ViewChild('restoreModal') restoreModal: TemplateRef; + @ViewChild('deleteModal') deleteModal: TemplateRef; + + // Modal Refs + restoreModalRef: BsModalRef; + deleteModalRef: BsModalRef; + + isDeleted: boolean; + isDeleting: boolean; + isRestoring: boolean; + + constructor(private modalService: BsModalService) {} ngOnInit(): void { } + // Delete + onDelete(): void { - this.deleteLog.emit(this.log.logID); + this.toggleModalDelete(); + this.isDeleting = true; + } + + onHandleSuccessfulDelete(): void { + this.isDeleted = true; + this.isDeleting = false; + this.onReload.emit(); + } + + toggleModalDelete() { + this.deleteModalRef = this.modalService.show(this.deleteModal) + } + + // Restore + + onRestore(): void { + this.toggleModalRestore(); + this.isRestoring = true; + } + + onHandleSuccessfulRestore(): void { + this.isRestoring = false; + this.onReload.emit(); + } + + toggleModalRestore() { + this.restoreModalRef = this.modalService.show(this.restoreModal) } } diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.html b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.html new file mode 100644 index 00000000..eecb8052 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.html @@ -0,0 +1,48 @@ +
+
+
Delete Log
+
+ +
+

Are you sure you want to delete this project log?

+

+ This log and all of it's related content will be removed from the database. +

+

+ You will not be able to change this. +

+
+ +
+ × + {{ this.errorResult }} +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.scss b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.scss new file mode 100644 index 00000000..e4caf7ff --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.scss @@ -0,0 +1,15 @@ +.modal-confirm{ + text-align: center; + font-weight: 700; + font-size: large; + padding: 0; + padding-bottom: 1rem; + margin: 0; +} + +.modal-warning{ + text-align: center; + font-size: small; + padding: 0; + margin: 0; +} \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.spec.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.spec.ts new file mode 100644 index 00000000..9d6c2a09 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ModalDeleteLogComponent } from './modal-delete-log.component'; + +describe('ModalDeleteLogComponent', () => { + let component: ModalDeleteLogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ModalDeleteLogComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ModalDeleteLogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.ts new file mode 100644 index 00000000..9eb76da3 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-delete-log/modal-delete-log.component.ts @@ -0,0 +1,44 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; +import { ProjectService } from 'src/app/services/project.service'; + +@Component({ + selector: 'app-modal-delete-log', + templateUrl: './modal-delete-log.component.html', + styleUrls: ['./modal-delete-log.component.scss'], +}) +export class ModalDeleteLogComponent implements OnInit { + @Input() deleteModalRef: BsModalRef; + @Input() logID: number; + + @Output() onSuccessfulDelete = new EventEmitter(); + @Output() onCancelDelete = new EventEmitter(); + + errorResult: String; + errorStatusAlert = false; + + constructor(private projectService: ProjectService) {} + + ngOnInit(): void {} + + onDelete(): void { + this.projectService.deleteExpiredProjectLog(this.logID).subscribe({ + next: (result) => { + console.log('Deleted log:', this.logID); + this.onSuccessfulDelete.emit(); + this.deleteModalRef.hide(); + }, + error: (error) => { + this.errorStatusAlert = true; + this.errorResult = + 'Error: unable to delete log, please contact developers for assistance'; + console.log(error); + }, + }); + } + + closeModal() { + this.onCancelDelete.emit(); + this.deleteModalRef.hide(); + } +} diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.html b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.html new file mode 100644 index 00000000..b072d17d --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.html @@ -0,0 +1,48 @@ +
+
+
Restore Log
+
+ +
+

Are you sure you want to restore this log?

+

+ This log will no longer be set as expired and will be visible within the original project. +

+

+ You will not be able to change this. +

+
+ +
+ × + {{ this.errorResult }} +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.scss b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.scss new file mode 100644 index 00000000..e4caf7ff --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.scss @@ -0,0 +1,15 @@ +.modal-confirm{ + text-align: center; + font-weight: 700; + font-size: large; + padding: 0; + padding-bottom: 1rem; + margin: 0; +} + +.modal-warning{ + text-align: center; + font-size: small; + padding: 0; + margin: 0; +} \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.spec.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.spec.ts new file mode 100644 index 00000000..dec869bb --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ModalRestoreLogComponent } from './modal-restore-log.component'; + +describe('ModalRestoreLogComponent', () => { + let component: ModalRestoreLogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ModalRestoreLogComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ModalRestoreLogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.ts new file mode 100644 index 00000000..7e4e21bd --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/modal-restore-log/modal-restore-log.component.ts @@ -0,0 +1,43 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; +import { ProjectService } from 'src/app/services/project.service'; + +@Component({ + selector: 'app-modal-restore-log', + templateUrl: './modal-restore-log.component.html', + styleUrls: ['./modal-restore-log.component.scss'] +}) +export class ModalRestoreLogComponent implements OnInit { + @Input() restoreModalRef: BsModalRef + @Input() logID: number; + + @Output() onSuccessfulRestore = new EventEmitter(); + @Output() onCancelRestore = new EventEmitter(); + + errorResult: String; + errorStatusAlert = false; + + constructor(private projectService: ProjectService) { } + + ngOnInit(): void {} + + onRestore(): void { + this.projectService.repostProjectLog(this.logID).subscribe({ + next: (result) => { + console.log('Restored log', this.logID); + this.onSuccessfulRestore.emit(); + this.restoreModalRef.hide(); + }, + error: (error) => { + this.errorStatusAlert = true; + this.errorResult = "Error: unable to restore log, please contact developers for assistance"; + console.log(error); + }, + }); + } + + closeModal() { + this.onCancelRestore.emit(); + this.restoreModalRef.hide(); + } +} diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.html b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.html index bfd207d0..55c7ed95 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.html +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.html @@ -40,7 +40,7 @@

Expired Logs

diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.scss b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.scss index 92280443..0fc3044f 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.scss +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.scss @@ -11,7 +11,7 @@ .expired-log-header { display: grid; - grid-template-columns: 1.5fr .75fr .75fr .5fr .5fr .5fr .25fr; + grid-template-columns: 1.5fr .75fr .75fr .5fr .5fr .5fr .5fr; gap: var(--space-3); align-items: center; padding: var(--space-1) var(--space-3); @@ -24,7 +24,6 @@ .actions-col { display: flex; - justify-content: flex-end; } .empty-set{ diff --git a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.ts b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.ts index 044e0485..a9af5f1d 100644 --- a/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/admin/components/project-logs/project-logs.component.ts @@ -34,18 +34,4 @@ export class ProjectLogsComponent implements OnInit { }, }); } - - deleteExpiredLog(logID: number){ - this.projectService.deleteExpiredProjectLog(logID).subscribe({ - next: (result) => { - console.log('Deleted project log', logID); - this.loadLogs(); - }, - error: (error) => { - this.errorStatusAlert = true; - this.errorResult = "Error: unable to delete project log, please try again later"; - console.log(error); - }, - }); - } } diff --git a/src/Analysim.Web/ClientApp/src/app/interfaces/project-log.ts b/src/Analysim.Web/ClientApp/src/app/interfaces/project-log.ts index 51f9b08f..00b9b70a 100644 --- a/src/Analysim.Web/ClientApp/src/app/interfaces/project-log.ts +++ b/src/Analysim.Web/ClientApp/src/app/interfaces/project-log.ts @@ -1,15 +1,24 @@ -import { ProjectComment } from "./project-comment"; - export interface ProjectLog { logID: number; userID: number; authorName: string; projectID: number; title: string | null; + referencedNotebookID: number | null; + referencedNotebookVersion: number | null; + referencedNotebook: ReferencedNotebook | null; image: string | null; content: string; isDeleted: boolean; createdAt: string; updatedAt: string; commentCount: number; +} + +export interface ReferencedNotebook { + notebookID: number; + name: string; + extension: string; + directory: string; + type: string; } \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/interfaces/publication.ts b/src/Analysim.Web/ClientApp/src/app/interfaces/publication.ts index 066a05c8..9860e709 100644 --- a/src/Analysim.Web/ClientApp/src/app/interfaces/publication.ts +++ b/src/Analysim.Web/ClientApp/src/app/interfaces/publication.ts @@ -6,6 +6,9 @@ export interface Publication { doi: string; sourceAuthor: string; year: number; + volume: string; + issue: string; + pages: string; notes: string; createdAt: string; } \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-log/project-log-item/project-log-item.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-log/project-log-item/project-log-item.component.html index 1d4cfad9..5e6ac3ca 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-log/project-log-item/project-log-item.component.html +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-log/project-log-item/project-log-item.component.html @@ -73,9 +73,17 @@

-
- {{ log.content }} +
+ + {{log.referencedNotebook.name + log.referencedNotebook.extension}} + v{{log.referencedNotebookVersion}} + + View notebook for more details.
+ +
+ +
@@ -134,6 +142,57 @@

+ +
+
+ Reference Notebook +
+ +
+
+ + + +
+ +
+ + + +
+
+
+ +
+ - - - - - - - - - - - - +
+
+ + + + + + + + + + + +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ + + + + + + + +
diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.scss b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.scss index dca488f4..981ecf5c 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.scss +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.scss @@ -19,7 +19,7 @@ grid-template-columns: max-content 1fr; column-gap: var(--space-3); align-items: center; - margin-bottom: 1rem; + margin-bottom: .5rem; } .publication-form { @@ -39,6 +39,7 @@ width: 100%; min-width: 0; color: black !important; + padding: 0 var(--space-2); } .form-header { @@ -47,4 +48,17 @@ .error-center{ text-align: center; -} \ No newline at end of file +} + +.details-area { + display: flex; + flex-direction: row; + gap: 1rem var(--space-3); + margin-top: .5rem; + margin-bottom: .5rem; + align-items: center; +} + +// .control-sm{ +// width: 25px !important; +// } \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.ts index d1049180..adee8afe 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component.ts @@ -35,6 +35,9 @@ export class ModalEditPublicationComponent implements OnInit { doi: FormControl; sourceAuthor: FormControl; year: FormControl; + volume: FormControl; + issue: FormControl; + pages: FormControl; journal: FormControl; notes: FormControl; isLoading: boolean = false; @@ -57,6 +60,9 @@ export class ModalEditPublicationComponent implements OnInit { this.doi = new FormControl(ep ? (ep.doi ? ep.doi : '') : ''); this.sourceAuthor = new FormControl(ep ? (ep.sourceAuthor ? ep.sourceAuthor : '') : ''); this.year = new FormControl(ep ? (ep.year ? ep.year : '') : ''); + this.volume = new FormControl(ep ? (ep.volume ? ep.volume : '') : ''); + this.issue = new FormControl(ep ? (ep.issue ? ep.issue : '') : ''); + this.pages = new FormControl(ep ? (ep.pages ? ep.pages : '') : ''); this.journal = new FormControl(ep ? (ep.journal ? ep.journal : '') : ''); this.notes = new FormControl(ep ? (ep.notes ? ep.notes : '') : ''); @@ -68,6 +74,9 @@ export class ModalEditPublicationComponent implements OnInit { doi: this.doi, sourceAuthor: this.sourceAuthor, year: this.year, + volume: this.volume, + issue: this.issue, + pages: this.pages, notes: this.notes, }); } @@ -156,6 +165,9 @@ export class ModalEditPublicationComponent implements OnInit { if (pub.title) formData.append('title', pub.title); if (pub.url) formData.append('url', pub.url); if (pub.doi) formData.append('doi', pub.doi); + if (pub.volume) formData.append('volume', pub.volume); + if (pub.issue) formData.append('issue', pub.issue); + if (pub.pages) formData.append('pages', pub.pages); if (pub.notes) formData.append('notes', pub.notes); return formData; diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/publication-item/publication-item.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/publication-item/publication-item.component.html index f245aa74..33ba66af 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/publication-item/publication-item.component.html +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-publication/publication-item/publication-item.component.html @@ -1,9 +1,19 @@
-
-

- {{ publication.sourceAuthor }} ({{publication.year}}). {{ publication.title }}. {{ publication.journal }} -

-
+
+
+ {{ publication.sourceAuthor }} ({{ publication.year }}). + {{ publication.title }}. + {{ publication.journal }} + + + · + Vol. {{ publication.volume }} + (Issue {{ publication.issue }}) + : + pp. {{ publication.pages }} + +
+
-
+
-
 · 
+
DOI:
-

{{ publication.notes }}

+

{{ publication.notes }}

-
+ +
+
Member List
+
- - -
-
Member List
-
- - -
-
    -
  • - -
    - {{member.user.userName}} - {{member.userRole}} -
    -
    • -
-
- -
-
- + +
+
    +
  • + +
    + {{ member.user.userName }} - {{ member.userRole }}
    +
    • +
+
+ +
+
+
-
\ No newline at end of file +
+
diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.html new file mode 100644 index 00000000..1f79dd0a --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.html @@ -0,0 +1,51 @@ +
+
+
Updates
+
+
0 new
+
0
+
+ +
+
Recommendation
+
+
0 new
+
0
+
+ +
+ + +
+
0 new
+ +
+ {{ project | role: "member" }} +
+
+ +
+
Followers
+
+
0 new
+ +
+ {{ project | role: "follower" }} +
+
+
+ + + + + \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.scss b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.scss new file mode 100644 index 00000000..5fa71440 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.scss @@ -0,0 +1,50 @@ +.stat-group { + width: 100%; +} + +.stat-row { + display: grid; + grid-template-columns: max-content minmax(40px, 1fr) max-content 24px; + align-items: center; + column-gap: 10px; + margin-bottom: 6px; +} + +.stat-label { + color: var(--link-on-light); + white-space: nowrap; +} + +.stat-label-button { + border: 0; + background: transparent; + padding: 0; + font: inherit; + text-align: left; + cursor: pointer; +} + +.stat-label-button:hover { + text-decoration: underline; +} + +.stat-divider { + height: 1px; + min-width: 40px; + background-color: lightgray; +} + +.stat-pill { + padding: 1px 6px; + border: 1px solid var(--border-color); + border-radius: 20px; + font-size: 12px; + color: var(--link-on-light); + white-space: nowrap; +} + +.stat-current { + color: var(--link-on-light); + text-align: right; + justify-self: center; +} diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.spec.ts b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.spec.ts new file mode 100644 index 00000000..5261bca4 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProjectStatCounterComponent } from './project-stat-counter.component'; + +describe('ProjectStatCounterComponent', () => { + let component: ProjectStatCounterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ProjectStatCounterComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ProjectStatCounterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.ts new file mode 100644 index 00000000..0230a224 --- /dev/null +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project-stat-counter/project-stat-counter.component.ts @@ -0,0 +1,28 @@ +import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; +import { Project } from 'src/app/interfaces/project'; +import { User } from 'src/app/interfaces/user'; + +@Component({ + selector: 'app-project-stat-counter', + templateUrl: './project-stat-counter.component.html', + styleUrls: ['./project-stat-counter.component.scss'] +}) +export class ProjectStatCounterComponent implements OnInit { + @Input() project: Project; + @Input() currentUser: User; + + @ViewChild('memberListModal') memberListModal: TemplateRef + + memberListModalRef: BsModalRef; + + constructor(private modalService: BsModalService) { } + + ngOnInit(): void { + } + + toggleModalMemberList() { + this.memberListModalRef = this.modalService.show(this.memberListModal) + } + +} diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.html index 9101907e..d8a73b3c 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.html +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.html @@ -2,18 +2,21 @@
- -
-
- - -
-
-

- {{ projectname }} -

+
+

+ {{ projectname }} +

+
+ +
+
+
  • @@ -37,74 +40,11 @@

    -
    -
    - Updates -
    -
    - -
    -
    - 0 new -
    -
    - 0 -
    -
    -
    -
    - Recommendation -
    -
    - -
    -
    - 0 new -
    -
    - 0 -
    -
    -
    -
    - Members -
    -
    - -
    -
    - 0 new -
    -
    - {{ project | role:"member" }} -
    -
    -
    -
    - Followers -
    -
    - -
    -
    - 0 new -
    -
    - {{ project | role:"follower" }} -
    -
    -

-
-
-
- -
    -
  • Share
    • -
  • Comment
    • -
+
+
@@ -266,10 +206,7 @@

- - - + diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.scss b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.scss index 99978e08..9109ad9c 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.scss +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.scss @@ -1,9 +1,9 @@ :host ::ng-deep .project-overview-container { - border: 1px solid rgba(0,0,0,.125); + border: 1px solid rgba(0, 0, 0, 0.125); padding-top: 20px; - .owner-tools{ - border: 1px solid rgba(0,0,0,.125); + .owner-tools { + border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 8px; padding: 8px; box-sizing: border-box; @@ -12,7 +12,7 @@ justify-content: end; } - .owner-tools-actions{ + .owner-tools-actions { display: flex; gap: var(--space-3); flex-wrap: wrap; @@ -27,34 +27,34 @@ padding-right: 0 !important; } - .readme-area{ - border: 1px solid rgba(0,0,0,.125); + .readme-area { + border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 8px; background: white; padding: 14px 16px 16px; box-sizing: border-box; margin: 10px 0 14px; - .readme-header{ + .readme-header { display: flex; align-items: center; gap: 12px; padding-bottom: 10px; margin-bottom: 12px; - border-bottom: 1px solid rgba(0,0,0,.08); + border-bottom: 1px solid rgba(0, 0, 0, 0.08); - .readme-title{ + .readme-title { font-weight: 600; - color: rgba(0,0,0,.75); - letter-spacing: .02em; + color: rgba(0, 0, 0, 0.75); + letter-spacing: 0.02em; } } - .project-notebook-row{ + .project-notebook-row { padding: 0; } - .readme-actions{ + .readme-actions { display: flex; gap: var(--space-3); justify-content: center; @@ -62,11 +62,11 @@ margin-top: 1rem; padding-top: 1rem; - border-top: 1px solid rgba(0,0,0,.1); + border-top: 1px solid rgba(0, 0, 0, 0.1); } } - .project-notebook-row{ + .project-notebook-row { .notebook-readme, .notebook-readme-full { transition: @@ -83,8 +83,8 @@ max-height: 60vh; overflow: hidden; - -webkit-mask-image: linear-gradient(rgb(0,0,0) 70%, transparent); - mask-image: linear-gradient(rgb(0,0,0) 70%, transparent); + -webkit-mask-image: linear-gradient(rgb(0, 0, 0) 70%, transparent); + mask-image: linear-gradient(rgb(0, 0, 0) 70%, transparent); } /* EXPANDED */ @@ -100,7 +100,7 @@ background: #cfc8c8; padding: 10px; } - .notebook-cell pre{ + .notebook-cell pre { padding: 10px; } .notebook-cell img { @@ -108,25 +108,86 @@ height: auto; } - pre code.hljs{display:block;overflow-x:auto;padding:1em} - code.hljs{padding:3px 5px} - .hljs{background:#f3f3f3;color:#444} - .hljs-comment{color:#697070} - .hljs-punctuation,.hljs-tag{color:#444a} - .hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444} - .hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700} - .hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800} - .hljs-section,.hljs-title{color:#800;font-weight:700} - .hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656} - .hljs-literal{color:#695} - .hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300} - .hljs-meta{color:#1f7199} - .hljs-meta .hljs-string{color:#38a} - .hljs-emphasis{font-style:italic} - .hljs-strong{font-weight:700} + pre code.hljs { + display: block; + overflow-x: auto; + padding: 1em; + } + code.hljs { + padding: 3px 5px; + } + .hljs { + background: #f3f3f3; + color: #444; + } + .hljs-comment { + color: #697070; + } + .hljs-punctuation, + .hljs-tag { + color: #444a; + } + .hljs-tag .hljs-attr, + .hljs-tag .hljs-name { + color: #444; + } + .hljs-attribute, + .hljs-doctag, + .hljs-keyword, + .hljs-meta .hljs-keyword, + .hljs-name, + .hljs-selector-tag { + font-weight: 700; + } + .hljs-deletion, + .hljs-number, + .hljs-quote, + .hljs-selector-class, + .hljs-selector-id, + .hljs-string, + .hljs-template-tag, + .hljs-type { + color: #800; + } + .hljs-section, + .hljs-title { + color: #800; + font-weight: 700; + } + .hljs-link, + .hljs-operator, + .hljs-regexp, + .hljs-selector-attr, + .hljs-selector-pseudo, + .hljs-symbol, + .hljs-template-variable, + .hljs-variable { + color: #ab5656; + } + .hljs-literal { + color: #695; + } + .hljs-addition, + .hljs-built_in, + .hljs-bullet, + .hljs-code { + color: #397300; + } + .hljs-meta { + color: #1f7199; + } + .hljs-meta .hljs-string { + color: #38a; + } + .hljs-emphasis { + font-style: italic; + } + .hljs-strong { + font-weight: 700; + } } - .readme-toggle{ + .readme-toggle { margin-left: auto; border: none; background: transparent; @@ -134,94 +195,12 @@ color: var(--link-on-light); cursor: pointer; - &:hover{ + &:hover { color: var(--link-hover-color); text-decoration: underline; } } - - .project-detail-row { - margin-bottom: 1rem; - .project-description { - width: 70%; - - .project-authors-list { - display: flex; - list-style: none; - padding: 0px; - margin: 0px; - - .project-author { - display: flex; - cursor: pointer; - margin-right: 10px; - - &:hover { - .project-author-name { - color: var(--link-hover-color); - text-decoration: underline; - } - } - - .project-author-thumbnail { - width: 25px; - height: 25px; - border: 1px solid black; - border-radius: 40px; - margin-right: 5px; - margin-bottom: 10px; - } - } - } - - .project-tag li { - padding: 10px 0px; - - span:first-child { - margin-left: 0px !important; - } - } - } - - .project-statistics-group { - width: 30%; - padding-left: 5%; - - .project-statistics { - display: flex; - align-items: center; - margin-bottom: 5px; - - .project-statistics-header { - color: var(--link-on-light); - cursor: pointer; - } - - .project-statistics-divider { - border-top: 1px solid lightgray; - flex-grow: 1; - padding: 0px 5px; - box-sizing: border-box; - margin: 2px 10px 0px 10px; - } - - .project-statistics-pill { - padding: 1px 5px; - border: 1px solid var(--border-color); - border-radius: 20px; - margin-right: 10px; - font-size: 12px; - color: var(--link-on-light); - } - - .project-statistics-current { - color: var(--color-success); - } - } - } - } - .project-content-row { .project-content-header { display: flex; @@ -258,7 +237,8 @@ margin-bottom: 20px; margin-top: 10px; - input, button { + input, + button { border: none; background-color: unset; color: var(--link-on-light); @@ -278,7 +258,8 @@ justify-content: center; margin-bottom: 10px; - input, button { + input, + button { border: none; background-color: unset; color: var(--link-on-light); @@ -291,7 +272,7 @@ } .project-view-option-row { - border-top: 1px solid rgba(0,0,0,.125); + border-top: 1px solid rgba(0, 0, 0, 0.125); align-items: center; .project-view-toggle { @@ -399,7 +380,7 @@ color: var(--link-on-light); cursor: pointer; - + min-width: 74px; text-align: right; @@ -440,7 +421,7 @@ .badge { color: #212529; background-color: #f8f9fa; - margin-left: .25rem !important; + margin-left: 0.25rem !important; position: relative; top: -1px; font-weight: 300 !important; @@ -451,18 +432,22 @@ color: #fff; background-color: var(--button-background-color) !important; font-weight: 300 !important; - margin-right: .5rem !important; - padding-right: .8em; - padding-left: .8em; + margin-right: 0.5rem !important; + padding-right: 0.8em; + padding-left: 0.8em; border-radius: 10rem; display: inline-block; - padding: .25em .4em; + padding: 0.25em 0.4em; font-size: 14px; line-height: 1; text-align: center; white-space: nowrap; vertical-align: baseline; - transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; + transition: + color 0.15s ease-in-out, + background-color 0.15s ease-in-out, + border-color 0.15s ease-in-out, + box-shadow 0.15s ease-in-out; box-sizing: border-box; } @@ -498,4 +483,87 @@ } } } +} + +.flex-area { + display: flex; + gap: var(--space-3); +} + +.edit-icon { + font-size: 18px; + color: var(--button-background-color); +} + +.project-stats { + flex: 0 0 auto; + display: flex; + justify-content: flex-end; +} + +.project-detail-row { + margin-bottom: 1rem; + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: var(--space-8); + flex-wrap: wrap; +} + +.project-description { + flex: 1 1 0; + min-width: 0; +} + +.project-authors-list { + display: flex; + list-style: none; + padding: 0px; + margin: 0px; +} + +.project-author { + display: flex; + cursor: pointer; + margin-right: 10px; + + &:hover { + .project-author-name { + color: var(--link-hover-color); + text-decoration: underline; + } + } +} + +.project-author-thumbnail { + width: 25px; + height: 25px; + border: 1px solid black; + border-radius: 40px; + margin-right: 5px; + margin-bottom: 10px; +} + +.project-tag li { + padding: 10px 0px; +} +span:first-child { + margin-left: 0px !important; +} + +@media (max-width: 1000px) { + .project-description { + flex: 0 0 100%; + } + + .project-stats { + flex: 0 0 100%; + justify-content: stretch; + } + + .project-stats app-project-stat-counter, + app-project-stat-counter { + width: 100%; + max-width: none; + } } \ No newline at end of file diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.ts index 2b6a8658..60db75fe 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/projects/project/project.component.ts @@ -34,13 +34,11 @@ export class ProjectComponent implements OnInit { @ViewChild('forkModal') forkModal: TemplateRef @ViewChild('deleteModal') deleteModal: TemplateRef - @ViewChild('memberListModal') memberListModal: TemplateRef @ViewChildren(ProjectFileExplorerComponent) fileExplorer: ProjectFileExplorerComponent @ViewChild('displayNotebookModal') displayNotebookModal: TemplateRef; forkModalRef: BsModalRef; deleteModalRef: BsModalRef; - memberListModalRef: BsModalRef; displayNotebookModalRef: BsModalRef; project: Project = null @@ -449,11 +447,6 @@ export class ProjectComponent implements OnInit { this.deleteModalRef = this.modalService.show(this.deleteModal) } - toggleModalMemberList() { - // Show delete Modal - this.memberListModalRef = this.modalService.show(this.memberListModal) - } - showFile(): void { this.activeView = 'File'; this.toggleView = 'File'; diff --git a/src/Analysim.Web/ClientApp/src/app/projects/projects.module.ts b/src/Analysim.Web/ClientApp/src/app/projects/projects.module.ts index c523a167..84e5b280 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/projects.module.ts +++ b/src/Analysim.Web/ClientApp/src/app/projects/projects.module.ts @@ -67,6 +67,7 @@ import { ModalRepostLogComponent } from './project-overview/project-overview-vie import { PublicationItemComponent } from './project-overview/project-overview-view/project-publication/publication-item/publication-item.component'; import { ModalEditPublicationComponent } from './project-overview/project-overview-view/project-publication/modal-edit-publication/modal-edit-publication.component'; import { ModalDeletePublicationComponent } from './project-overview/project-overview-view/project-publication/modal-delete-publication/modal-delete-publication.component'; +import { ProjectStatCounterComponent } from './project/project-stat-counter/project-stat-counter.component'; @NgModule({ declarations: [ @@ -126,6 +127,7 @@ import { ModalDeletePublicationComponent } from './project-overview/project-over PublicationItemComponent, ModalEditPublicationComponent, ModalDeletePublicationComponent, + ProjectStatCounterComponent, ], imports: [ CommonModule, diff --git a/src/Analysim.Web/ClientApp/src/app/services/project.service.ts b/src/Analysim.Web/ClientApp/src/app/services/project.service.ts index 40cac2ce..17ae7012 100644 --- a/src/Analysim.Web/ClientApp/src/app/services/project.service.ts +++ b/src/Analysim.Web/ClientApp/src/app/services/project.service.ts @@ -50,6 +50,7 @@ export class ProjectService { private urlGetProjectLogComments: string = this.baseUrl + "getprojectlogcomments/"; private urlGetExpiredProjectLogs: string = this.baseUrl + "getexpiredprojectlogs/"; private urlGetPublications: string = this.baseUrl + "GetPublications/"; + private urlGetProjectNotebookRefs: string = this.baseUrl + "getprojectnotebookreferences/"; // Post private urlCreateProject: string = this.baseUrl + "createproject" @@ -1232,4 +1233,17 @@ export class ProjectService { }) ); } + + getProjectNotebookReferences(projectID: number) { + return this.http.get(this.urlGetProjectNotebookRefs + projectID).pipe( + map(body => { + console.log(body.message); + return body; + }), + catchError(error => { + console.log(error); + return throwError(error); + }) + ); + } } diff --git a/src/Analysim.Web/ClientApp/src/assets/styles/base/_bootstrap-overrides.scss b/src/Analysim.Web/ClientApp/src/assets/styles/base/_bootstrap-overrides.scss index 3f89386f..5ff79a4b 100644 --- a/src/Analysim.Web/ClientApp/src/assets/styles/base/_bootstrap-overrides.scss +++ b/src/Analysim.Web/ClientApp/src/assets/styles/base/_bootstrap-overrides.scss @@ -26,14 +26,25 @@ color: var(--button-font-color) !important; } -.btn-primary:hover:not(:disabled):not(.disabled), -.btn-primary:focus:not(:disabled):not(.disabled) { +/* Hover only */ +.btn-primary:hover:not(:disabled):not(.disabled) { background-color: var(--button-background-color-hov) !important; border: var(--button-border-width) var(--button-border-style) var(--button-border-color-hov) !important; color: var(--button-font-color-hov) !important; } +/* After click / focus returns to normal */ +.btn-primary:focus:not(:disabled):not(.disabled), +.btn-primary:active:not(:disabled):not(.disabled), +.btn-primary:focus:active:not(:disabled):not(.disabled) { + background-color: var(--button-background-color) !important; + border: var(--button-border-width) var(--button-border-style) + var(--button-border-color) !important; + color: var(--button-font-color) !important; + box-shadow: none !important; +} + /* Secondary button */ .btn-secondary { background-color: var(--button-background-color-secondary) !important; diff --git a/src/Analysim.Web/ClientApp/src/assets/styles/base/_reset.scss b/src/Analysim.Web/ClientApp/src/assets/styles/base/_reset.scss index 48f3e3f1..8c5dde38 100644 --- a/src/Analysim.Web/ClientApp/src/assets/styles/base/_reset.scss +++ b/src/Analysim.Web/ClientApp/src/assets/styles/base/_reset.scss @@ -20,3 +20,11 @@ body { section { margin: 0 !important; } + +h1 { + font-size: xx-large; +} + +h2 { + font-size: x-large; +} diff --git a/src/Analysim.Web/Controllers/ProjectController.cs b/src/Analysim.Web/Controllers/ProjectController.cs index c2dd9371..9ced0e7b 100644 --- a/src/Analysim.Web/Controllers/ProjectController.cs +++ b/src/Analysim.Web/Controllers/ProjectController.cs @@ -53,7 +53,7 @@ IMailNetService mailNetService } // Image Helpers - private static string? BuildImageDataUrl(byte[]? imageBytes, string? extension) + private static string BuildImageDataUrl(byte[] imageBytes, string extension) { if (imageBytes == null || imageBytes.Length == 0) return null; @@ -64,7 +64,7 @@ IMailNetService mailNetService return $"data:{contentType};base64,{base64}"; } - private static string GetImageContentType(string? extension) + private static string GetImageContentType(string extension) { var ext = extension?.Trim().ToLowerInvariant(); @@ -601,6 +601,21 @@ public async Task GetProjectLogs([FromRoute] int projectId) l.CreatedAt, l.UpdatedAt, + // Referenced Notebook + l.ReferencedNotebookID, + l.ReferencedNotebookVersion, + + ReferencedNotebook = l.ReferencedNotebook != null + ? new + { + l.ReferencedNotebook.NotebookID, + l.ReferencedNotebook.Name, + l.ReferencedNotebook.Extension, + l.ReferencedNotebook.Directory, + Type = l.ReferencedNotebook.type + } + : null, + BlobExtension = l.BlobFile != null ? l.BlobFile.Extension : null, @@ -623,6 +638,18 @@ public async Task GetProjectLogs([FromRoute] int projectId) AuthorName = l.AuthorName, ProjectID = l.ProjectID, Title = l.Title, + ReferencedNotebookID = l.ReferencedNotebookID, + ReferencedNotebookVersion = l.ReferencedNotebookVersion, + ReferencedNotebook = l.ReferencedNotebook != null + ? new ReferencedNotebookVM + { + NotebookID = l.ReferencedNotebook.NotebookID, + Name = l.ReferencedNotebook.Name, + Extension = l.ReferencedNotebook.Extension, + Directory = l.ReferencedNotebook.Directory, + Type = l.ReferencedNotebook.Type + } + : null, Image = BuildImageDataUrl(l.ImageBytes, l.BlobExtension), Content = l.Content, IsDeleted = l.IsDeleted, @@ -718,6 +745,9 @@ public async Task GetPublications([FromRoute] int projectId) Doi = p.Doi, SourceAuthor = p.SourceAuthor, Year = p.Year, + Volume = p.Volume, + Issue = p.Issue, + Pages = p.Pages, Notes = p.Notes, CreatedAt = p.CreatedAt, }).ToListAsync(); @@ -729,6 +759,41 @@ public async Task GetPublications([FromRoute] int projectId) }); } + /* + * Type : GET + * URL : /api/projects/GetProjectNotebookReferences/projectId + * Description: Gets all Notebooks for a project + */ + [HttpGet("[action]/{projectId}")] + public async Task GetProjectNotebookReferences([FromRoute] int projectId) + { + if (projectId <= 0) + return BadRequest("Invalid project id."); + + var notebooks = await _dbContext.Notebook + .AsNoTracking() + .Where(n => n.ProjectID == projectId) + .Where(n => n.type != "folder") + .OrderBy(n => n.Directory) + .ThenBy(n => n.Name) + .Select(n => new + { + n.NotebookID, + n.Name, + n.Extension, + n.Directory, + Type = n.type, + n.ProjectID + }) + .ToListAsync(); + + return Ok(new + { + result = notebooks, + message = "Project notebook references retrieved." + }); + } + #endregion #region POST REQUEST @@ -780,6 +845,9 @@ public async Task AddPublication([FromForm] CreatePublicationVM f Doi = formdata.Doi, SourceAuthor = formdata.SourceAuthor, Year = formdata.Year, + Volume = formdata.Volume, + Issue = formdata.Issue, + Pages = formdata.Pages, Notes = formdata.Notes, CreatedAt = DateTime.UtcNow, }; @@ -834,6 +902,25 @@ public async Task AddProjectLog([FromForm] CreateProjectLogVM for return BadRequest(new { message = "Project Log Content is required." }); } + if (formdata.ReferencedNotebookID.HasValue) + { + var notebookExists = await _dbContext.Notebook + .AsNoTracking() + .AnyAsync(n => + n.NotebookID == formdata.ReferencedNotebookID.Value && + n.ProjectID == project.ProjectID && + n.type != "folder"); + + if (!notebookExists) + { + return BadRequest(new { message = "Invalid notebook reference." }); + } + } + else + { + formdata.ReferencedNotebookVersion = null; + } + int? blobFileId = null; // Optional Image Handling @@ -903,6 +990,8 @@ public async Task AddProjectLog([FromForm] CreateProjectLogVM for : formdata.Title.Trim(), Content = formdata.Content.Trim(), BlobFileID = blobFileId, + ReferencedNotebookID = formdata.ReferencedNotebookID, + ReferencedNotebookVersion = formdata.ReferencedNotebookVersion, IsDeleted = false, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow @@ -970,7 +1059,7 @@ public async Task PostComment([FromForm] CreateProjectCommentVM f if (project == null) return NotFound(new { message = "Project Not Found" }); // Validate Project Log (if present) - ProjectLog? projectLog = null; + ProjectLog projectLog = null; if (formdata.ProjectLogID.HasValue) { projectLog = await _dbContext.ProjectLogs @@ -993,7 +1082,7 @@ public async Task PostComment([FromForm] CreateProjectCommentVM f return BadRequest(new { message = "Maximum length for Content is 1000 characters." }); // Validate Parent Comment - ProjectComment? parentComment = null; + ProjectComment parentComment = null; if (formdata.ParentCommentID.HasValue) { @@ -1147,7 +1236,7 @@ await _mailNetService.SendEmail( ); } } - catch (Exception ex){} + catch (Exception){} } // Return @@ -2678,6 +2767,9 @@ public async Task UpdatePublication([FromRoute] int publicationID publication.Doi = formdata.Doi; publication.SourceAuthor = formdata.SourceAuthor; publication.Year = formdata.Year; + publication.Volume = formdata.Volume; + publication.Issue = formdata.Issue; + publication.Pages = formdata.Pages; publication.Notes = formdata.Notes; // Update Publication in DB @@ -2750,12 +2842,33 @@ public async Task UpdateProjectLog([FromRoute] int logId, [FromFo }); } + if (formdata.ReferencedNotebookID.HasValue) + { + var notebookExists = await _dbContext.Notebook + .AsNoTracking() + .AnyAsync(n => + n.NotebookID == formdata.ReferencedNotebookID.Value && + n.ProjectID == projectLog.ProjectID && + n.type != "folder"); + + if (!notebookExists) + { + return BadRequest(new { message = "Invalid notebook reference." }); + } + } + else + { + formdata.ReferencedNotebookVersion = null; + } + // Update Log Text projectLog.Title = string.IsNullOrWhiteSpace(formdata.Title) ? null : formdata.Title.Trim(); projectLog.Content = formdata.Content.Trim(); + projectLog.ReferencedNotebookID = formdata.ReferencedNotebookID; + projectLog.ReferencedNotebookVersion = formdata.ReferencedNotebookVersion; projectLog.UpdatedAt = DateTime.UtcNow; // Remove existing image diff --git a/src/Analysim.Web/ViewModels/Project/CreateProjectLogVM.cs b/src/Analysim.Web/ViewModels/Project/CreateProjectLogVM.cs index 94854f4d..dcf8bd73 100644 --- a/src/Analysim.Web/ViewModels/Project/CreateProjectLogVM.cs +++ b/src/Analysim.Web/ViewModels/Project/CreateProjectLogVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using Microsoft.AspNetCore.Http; using System.ComponentModel.DataAnnotations; @@ -14,5 +16,9 @@ public class CreateProjectLogVM public string Content { get; set; } = string.Empty; public IFormFile? Image { get; set; } + + public int? ReferencedNotebookID { get; set; } + + public int? ReferencedNotebookVersion { get; set; } } } \ No newline at end of file diff --git a/src/Analysim.Web/ViewModels/Project/CreatePublicationVM.cs b/src/Analysim.Web/ViewModels/Project/CreatePublicationVM.cs index 03cc30d2..1dc77ade 100644 --- a/src/Analysim.Web/ViewModels/Project/CreatePublicationVM.cs +++ b/src/Analysim.Web/ViewModels/Project/CreatePublicationVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using System.ComponentModel.DataAnnotations; namespace Analysim.Web.ViewModels.Project @@ -20,6 +22,11 @@ public class CreatePublicationVM [Required(ErrorMessage = "Publication Year is a required field.")] [Range(1, 2100, ErrorMessage = "Enter a valid publication year.")] public int? Year { get; set; } + + public string? Volume { get; set; } + public string? Issue { get; set; } + public string? Pages { get; set; } + public string? Notes { get; set; } } } \ No newline at end of file diff --git a/src/Analysim.Web/ViewModels/Project/ExpiredProjectLogVM.cs b/src/Analysim.Web/ViewModels/Project/ExpiredProjectLogVM.cs index 2b04cb6c..a94d99fb 100644 --- a/src/Analysim.Web/ViewModels/Project/ExpiredProjectLogVM.cs +++ b/src/Analysim.Web/ViewModels/Project/ExpiredProjectLogVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; diff --git a/src/Analysim.Web/ViewModels/Project/ProjectCommentVM.cs b/src/Analysim.Web/ViewModels/Project/ProjectCommentVM.cs index 209fb691..23b4d0f1 100644 --- a/src/Analysim.Web/ViewModels/Project/ProjectCommentVM.cs +++ b/src/Analysim.Web/ViewModels/Project/ProjectCommentVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; diff --git a/src/Analysim.Web/ViewModels/Project/ProjectLogVM.cs b/src/Analysim.Web/ViewModels/Project/ProjectLogVM.cs index 51ac7072..148a37be 100644 --- a/src/Analysim.Web/ViewModels/Project/ProjectLogVM.cs +++ b/src/Analysim.Web/ViewModels/Project/ProjectLogVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; @@ -11,6 +13,11 @@ public class ProjectLogVM public int ProjectID { get; set; } public string? Title { get; set; } + // Referenced Notebook + public int? ReferencedNotebookID { get; set; } + public int? ReferencedNotebookVersion { get; set; } + public ReferencedNotebookVM? ReferencedNotebook { get; set; } + // base64 data URL. public string? Image { get; set; } @@ -21,4 +28,13 @@ public class ProjectLogVM public int CommentCount { get; set; } } + + public class ReferencedNotebookVM + { + public int NotebookID { get; set; } + public string Name { get; set; } = string.Empty; + public string Extension { get; set; } = string.Empty; + public string Directory { get; set; } = string.Empty; + public string Type { get; set; } = string.Empty; + } } \ No newline at end of file diff --git a/src/Analysim.Web/ViewModels/Project/PublicationVM.cs b/src/Analysim.Web/ViewModels/Project/PublicationVM.cs index 3b43685d..073eeff9 100644 --- a/src/Analysim.Web/ViewModels/Project/PublicationVM.cs +++ b/src/Analysim.Web/ViewModels/Project/PublicationVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; @@ -13,6 +15,9 @@ public class PublicationVM public string? Doi { get; set; } public string SourceAuthor { get; set; } = string.Empty; public int? Year { get; set; } + public string? Volume { get; set; } + public string? Issue { get; set; } + public string? Pages { get; set; } public string? Notes { get; set; } public DateTime CreatedAt { get; set; } } diff --git a/src/Analysim.Web/ViewModels/Project/UpdateProjectLogVM.cs b/src/Analysim.Web/ViewModels/Project/UpdateProjectLogVM.cs index 03b0e4f6..8431f77d 100644 --- a/src/Analysim.Web/ViewModels/Project/UpdateProjectLogVM.cs +++ b/src/Analysim.Web/ViewModels/Project/UpdateProjectLogVM.cs @@ -1,3 +1,5 @@ +#nullable enable + using Microsoft.AspNetCore.Http; using System.ComponentModel.DataAnnotations; @@ -14,5 +16,9 @@ public class UpdateProjectLogVM // True when the user wants to remove the current image public bool RemoveImage { get; set; } + + public int? ReferencedNotebookID { get; set; } + + public int? ReferencedNotebookVersion { get; set; } } } \ No newline at end of file