Merge pull request fullstackhero#1 from blazorhero/master

Update 2.2

Author: lucasapoena

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch and Debug Standalone Blazor WebAssembly App",
+            "type": "blazorwasm",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/src/Server"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "${workspaceFolder}/BlazorHero.CleanArchitecture.sln",
+                // Ask dotnet build to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Features.md

@@ -9,7 +9,7 @@
 - [x] Logout Users / Regenerate Token from Multiple Client Browsers when Permission Changes
 - [x] FIX: Token Issue Fixed from v1.0.1
 - [x] User Images in Chat Component
-- [x] Chat - Integrated with Identity to support Private Chats (Will require re-migrating the DB scehmas)
+- [x] Chat - Integrated with Identity to support Private Chats (Will require re-migrating the DB schemas)
 - [x] Notifications System using SignalR
 - [x] Document Management
 - [x] Export to Excel

README.md

@@ -71,7 +71,7 @@ So, here is an in-depth video that takes you through the BlazorHero Project! Do
 # What to Expect in BlazorHero 3.0?
 
 - Modular Architecture
-- Cleaner Seperation Of Code
+- Cleaner Separation Of Code
 - Dedicated Documentation Website - [Here](https://blazorhero.github.io/docs/)
 - Tutorials to add new entities, controllers
 - UI Updates
@@ -88,7 +88,7 @@ So, here is an in-depth video that takes you through the BlazorHero Project! Do
 # Getting Started 🦸
 
 > **Important**
-If you are already using Blazor Hero v1.x, make sure that you drop your existing database and re-update your database using the CLI as there are couple of new migrations added that may clash with your existing schema. Also, install the latest version of BlazorHero.
+If you are already using Blazor Hero v1.x, make sure that you drop your existing database and re-update your database using the CLI as there are a couple of new migrations added that might clash with your existing schema. Also, install the latest version of BlazorHero.
 
 The easiest way to get started with Blazor Hero is to install the [NuGet package](https://www.nuget.org/packages/BlazorHero.CleanArchitecture/) and run `dotnet new BlazorHero.CleanArchitecture`:
 
@@ -113,15 +113,15 @@ What to do next? Read the [entire guide on my blog](https://codewithmukesh.com/b
 - Now navigate back to the root of the BlazorHero Project on your local machine and run the following via terminal - `docker-compose -f 'docker-compose.yml' up --build`
 - This will start pulling MSSQL Server Image from Docker Hub if you don't already have this image. It's around 500+ Mbs of download.
 - Once that is done, dotnet SDKs and runtimes are downloaded, if not present already. That's almost 200+ more Mbs of download.
-- PS If you find any issues while Docker installs the nuget packages, it is most likelt that your ssl certificates are not intalled properly. Apart from that I also added the `--disable-parallel` in the `Server\Dockerfile`to ensure network issues don't pop-up. You can remove this option to speed up the build process.
+- PS If you find any issues while Docker installs the nuget packages, it is most likely that your ssl certificates are not installed properly. Apart from that I also added the `--disable-parallel` in the `Server\Dockerfile`to ensure network issues don't pop-up. You can remove this option to speed up the build process.
 - That's almost everything. Once the containers are available, migrations are updated in the MSSQL DB, default data is seeded.
 - Browse to https://localhost:5005/ to use your version of BlazorHero !
 
 # Complete Documentation :rocket:
 
 Getting started with Blazor Hero – A Clean Architecture Template built for Blazor WebAssembly using MudBlazor Components. This project will make your Blazor Learning Process much easier than you anticipate. Blazor Hero is meant to be an Enterprise Level Boilerplate, which comes free of cost, completely open sourced. 
 
-The provided documentation / guide will get you started with BlazorHero in no-time. It provides a complete walkthrough about the project with to-the-point guides and notes.
+The provided documentation / guide will get you started with BlazorHero in no time. It provides a complete walkthrough for the project with to-the-point guides and notes.
 
 <a href="https://codewithmukesh.com/blog/blazor-hero-quick-start-guide/"><strong>Read the Quick Start Guide</strong></a>
 
@@ -131,7 +131,7 @@ All the completed and the upcoming features are mentioned in the [Features.MD Fi
 
 ## Contributing
 
-Contributions are what make the open-source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Contributions are what make the open-source community such an amazing place to be, learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
 1. Fork the Project
 2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`)
@@ -143,7 +143,7 @@ Here are the few contributions that I would highly appreciate ;)
 
 - [ ] Need someone to add in the API Documentation for Swagger.
 - [ ] Need someone to implement localization throughout every Razor Component of the solution under the WASM(Client) Project. You can take the Pages/Authentication/Login.razor as the point of reference. It is as simple as adding `@inject Microsoft.Extensions.Localization.IStringLocalizer<Login> localizer` to every page, changing the texts to `@localizer["Text Here"]` and finally adding resx files to the Resources Folder as per the folder structure.
-- [ ] Need few contributors to add in various language transalations as per the implemented Location. I got time to only add a few transalations for French as of now.
+- [ ] Need few contributors to add in various language translations as per the implemented Location. I got time to only add a few translations for French as of now.
 - [ ] Need a UI contributor to look at the UX/UI of the entire project
 - [ ] Need someone to buildup a cool Material Logo for BlazorHero (BH):D Do contact me on LinkedIn (https://www.linkedin.com/in/iammukeshm/).
 - [ ] And finally, Stars from everyone! :D

src/Application/Application.csproj

@@ -8,14 +8,14 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="FluentValidation" Version="10.2.3" />
+    <PackageReference Include="FluentValidation" Version="10.3.3" />
     <PackageReference Include="LazyCache" Version="2.1.3" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.10" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.12" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Domain\Domain.csproj" />

src/Application/Configurations/AppConfiguration.cs

@@ -3,5 +3,11 @@
     public class AppConfiguration
     {
         public string Secret { get; set; }
+
+        public bool BehindSSLProxy { get; set; }
+
+        public string ProxyIP { get; set; }
+
+        public string ApplicationUrl { get; set; }
     }
 }

src/Application/Features/Brands/Commands/Import/ImportBrandsCommand.cs

@@ -54,31 +54,39 @@ public async Task<Result<int>> Handle(ImportBrandsCommand request, CancellationT
                 { _localizer["Name"], (row,item) => item.Name = row[_localizer["Name"]].ToString() },
                 { _localizer["Description"], (row,item) => item.Description = row[_localizer["Description"]].ToString() },
                 { _localizer["Tax"], (row,item) => item.Tax = decimal.TryParse(row[_localizer["Tax"]].ToString(), out var tax) ? tax : 1 }
-            }, _localizer["Brands"])).ToList();
+            }, _localizer["Brands"]));
 
-            var errors = new List<string>();
-            var errorsOccurred = false;
-            foreach(var item in result)
+            if (result.Succeeded)
             {
-                var validationResult = await _addBrandValidator.ValidateAsync(_mapper.Map<AddEditBrandCommand>(item), cancellationToken);
-                if (validationResult.IsValid)
+                var importedBrands = result.Data;
+                var errors = new List<string>();
+                var errorsOccurred = false;
+                foreach (var brand in importedBrands)
                 {
-                    await _unitOfWork.Repository<Brand>().AddAsync(item);
+                    var validationResult = await _addBrandValidator.ValidateAsync(_mapper.Map<AddEditBrandCommand>(brand), cancellationToken);
+                    if (validationResult.IsValid)
+                    {
+                        await _unitOfWork.Repository<Brand>().AddAsync(brand);
+                    }
+                    else
+                    {
+                        errorsOccurred = true;
+                        errors.AddRange(validationResult.Errors.Select(e => $"{(!string.IsNullOrWhiteSpace(brand.Name) ? $"{brand.Name} - " : string.Empty)}{e.ErrorMessage}"));
+                    }
                 }
-                else
+
+                if (errorsOccurred)
                 {
-                    errorsOccurred = true;
-                    errors.AddRange(validationResult.Errors.Select(e => $"{(!string.IsNullOrWhiteSpace(item.Name) ? $"{item.Name} - " : string.Empty)}{e.ErrorMessage}"));
+                    return await Result<int>.FailAsync(errors);
                 }
-            }
 
-            if (errorsOccurred)
+                await _unitOfWork.CommitAndRemoveCache(cancellationToken, ApplicationConstants.Cache.GetAllBrandsCacheKey);
+                return await Result<int>.SuccessAsync(result.Data.Count(), result.Messages[0]);
+            }
+            else
             {
-                return await Result<int>.FailAsync(errors);
+                return await Result<int>.FailAsync(result.Messages);
             }
-
-            await _unitOfWork.CommitAndRemoveCache(cancellationToken, ApplicationConstants.Cache.GetAllBrandsCacheKey);
-            return await Result<int>.SuccessAsync(result.Count, _localizer["Import Success"]);
         }
     }
 }

src/Application/Features/ExtendedAttributes/Commands/AddEdit/AddEditExtendedAttributeCommand.cs

@@ -27,18 +27,35 @@ public class AddEditExtendedAttributeCommand<TId, TEntityId, TEntity, TExtendedA
             where TExtendedAttribute : AuditableEntityExtendedAttribute<TId, TEntityId, TEntity>, IEntity<TId>
             where TId : IEquatable<TId>
     {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TId Id { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TEntityId EntityId { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public EntityExtendedAttributeType Type { get; set; }
+
         [Required(AllowEmptyStrings = false)]
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string Key { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public string? Text { get; set; }
+
         public decimal? Decimal { get; set; }
+
         public DateTime? DateTime { get; set; }
+
         public string? Json { get; set; }
+
         public string? ExternalId { get; set; }
+
         public string? Group { get; set; }
+
         public string? Description { get; set; }
+
         public bool IsActive { get; set; }
     }
 
@@ -64,7 +81,7 @@ public AddEditExtendedAttributeCommandHandler(
 
         public async Task<Result<TId>> Handle(AddEditExtendedAttributeCommand<TId, TEntityId, TEntity, TExtendedAttribute> command, CancellationToken cancellationToken)
         {
-            if (await _unitOfWork.Repository<TExtendedAttribute>().Entities.Where(x => !x.Id.Equals(command.Id) && x.EntityId.Equals(command.EntityId))
+            if (await _unitOfWork.Repository<TExtendedAttribute>().Entities.Where(x => !x.Id.Equals(command.Id) && x.EntityId!.Equals(command.EntityId))
                 .AnyAsync(p => p.Key == command.Key, cancellationToken))
             {
                 return await Result<TId>.FailAsync(_localizer["Extended Attribute with this Key already exists."]);

src/Application/Features/ExtendedAttributes/Queries/GetAll/GetAllExtendedAttributesResponse.cs

@@ -7,21 +7,44 @@ namespace BlazorHero.CleanArchitecture.Application.Features.ExtendedAttributes.Q
 {
     public class GetAllExtendedAttributesResponse<TId, TEntityId> : IEntityAuditableExtendedAttribute
     {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TId Id { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TEntityId EntityId { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public EntityExtendedAttributeType Type { get; set; }
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string Key { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public string? Text { get; set; }
+
         public decimal? Decimal { get; set; }
+
         public DateTime? DateTime { get; set; }
+
         public string? Json { get; set; }
+
         public string? ExternalId { get; set; }
+
         public string? Group { get; set; }
+
         public string? Description { get; set; }
+
         public bool IsActive { get; set; }
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string CreatedBy { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public DateTime CreatedOn { get; set; }
-        public string LastModifiedBy { get; set; }
+
+        public string? LastModifiedBy { get; set; }
+
         public DateTime? LastModifiedOn { get; set; }
     }
 }

src/Application/Features/ExtendedAttributes/Queries/GetAllByEntityId/GetAllExtendedAttributesByEntityIdResponse.cs

@@ -7,21 +7,44 @@ namespace BlazorHero.CleanArchitecture.Application.Features.ExtendedAttributes.Q
 {
     public class GetAllExtendedAttributesByEntityIdResponse<TId, TEntityId> : IEntityAuditableExtendedAttribute
     {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TId Id { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TEntityId EntityId { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public EntityExtendedAttributeType Type { get; set; }
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string Key { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public string? Text { get; set; }
+
         public decimal? Decimal { get; set; }
+
         public DateTime? DateTime { get; set; }
+
         public string? Json { get; set; }
+
         public string? ExternalId { get; set; }
+
         public string? Group { get; set; }
+
         public string? Description { get; set; }
+
         public bool IsActive { get; set; }
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public string CreatedBy { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
         public DateTime CreatedOn { get; set; }
-        public string LastModifiedBy { get; set; }
+
+        public string? LastModifiedBy { get; set; }
+
         public DateTime? LastModifiedOn { get; set; }
     }
 }