Add companies to software family admin page.

Marechai.Database/Models/CompaniesBySoftwareFamily.cs

@@ -35,5 +35,9 @@ namespace Marechai.Database.Models
         public virtual Company Company { get; set; }
         [Required]
         public virtual SoftwareFamily SoftwareFamily { get; set; }
+
+        public string RoleId           { get; set; }
+        public int    CompanyId        { get; set; }
+        public ulong  SoftwareFamilyId { get; set; }
     }
 }

Marechai/Pages/Admin/Details/SoftwareFamily.razor

@@ -32,6 +32,9 @@
 @using Marechai.Database.Models
 @inherits OwningComponentBase<SoftwareFamiliesService>
 @inject IStringLocalizer<SoftwareFamiliesService> L
+@inject CompaniesService CompaniesService
+@inject DocumentRolesService DocumentRolesService
+@inject CompaniesBySoftwareFamilyService CompaniesBySoftwareFamilyService
 @inject NavigationManager NavigationManager
 @inject IWebHostEnvironment Host
 @inject IJSRuntime JSRuntime
@@ -114,3 +117,85 @@
     }
     <a href="/admin/software_families" class="btn btn-secondary">@L["Back to list"]</a>
 </div>
+@if (!_editing)
+{
+    <hr />
+    <h3>@L["Companies involved in this software family"]</h3>
+    <Button Color="Color.Success" Clicked="OnAddCompanyClick" Disabled="_addingCompany">@L["Add new (company)"]</Button>
+    @if (_addingCompany)
+    {
+        <div>
+            <Field>
+                <FieldLabel>@L["Company"]</FieldLabel>
+                <Select Disabled="_savingCompany" TValue="int?" @bind-SelectedValue="@_addingCompanyId">
+                    @foreach (var company in _companies)
+                    {
+                        <SelectItem TValue="int?" Value="@company.Id">@company.Name</SelectItem>
+                    }
+                </Select>
+            </Field>
+            <Field>
+                <FieldLabel>@L["Role"]</FieldLabel>
+                <Select Disabled="!_editing" TValue="string" @bind-SelectedValue="@_addingCompanyRoleId">
+                    @foreach (var role in _roles)
+                    {
+                        <SelectItem TValue="string" Value="@role.Id">@role.Name</SelectItem>
+                    }
+                </Select>
+            </Field>
+            <Button Color="Color.Primary" Clicked="@CancelAddCpu" Disabled="@_savingCompany">@L["Cancel"]</Button>
+            <Button Color="Color.Success" Clicked="@ConfirmAddCpu" Disabled="@_savingCompany">@L["Add"]</Button>
+        </div>
+    }
+    @if (_softwareFamilyCompanies?.Count > 0)
+    {
+        <div>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>
+                        @L["Company"]
+                    </th>
+                    <th>
+                        @L["Role"]
+                    </th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach (var item in _softwareFamilyCompanies)
+                {
+                    <tr>
+                        <td>
+                            @item.Company
+                        </td>
+                        <td>
+                            @item.Role
+                        </td>
+                        <td>
+                            <Button Color="Color.Danger" Clicked="() => {ShowCpuDeleteModal(item.Id);}" Disabled="@_addingCompany">@L["Delete"]</Button>
+                        </td>
+                    </tr>
+                }
+                </tbody>
+            </table>
+        </div>
+    }
+
+    <Modal @ref="_frmDelete" IsCentered="true" Closing="@ModalClosing">
+        <ModalBackdrop />
+        <ModalContent Centered="true">
+            <ModalHeader>
+                <ModalTitle>@_deleteTitle</ModalTitle>
+                <CloseButton Clicked="@HideModal" />
+            </ModalHeader>
+            <ModalBody>
+                <Text>@_deleteText</Text>
+            </ModalBody>
+            <ModalFooter>
+                <Button Color="Color.Primary" Clicked="@HideModal" Disabled="@_deleteInProgress">@L["Cancel"]</Button>
+                <Button Color="Color.Danger" Clicked="@ConfirmDelete" Disabled="@_deleteInProgress">@L["Delete"]</Button>
+            </ModalFooter>
+        </ModalContent>
+    </Modal>
+}

Marechai/Pages/Admin/Details/SoftwareFamily.razor.cs

@@ -25,6 +25,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
 using Marechai.Shared;
@@ -36,12 +37,25 @@ namespace Marechai.Pages.Admin.Details
 {
     public partial class SoftwareFamily
     {
+        bool                                   _addingCompany;
+        int?                                   _addingCompanyId;
+        string                                 _addingCompanyRoleId;
         AuthenticationState                    _authState;
+        List<CompanyViewModel>                 _companies;
         bool                                   _creating;
+        CompanyBySoftwareFamilyViewModel       _currentCompanyBySoftwareFamily;
+        bool                                   _deleteInProgress;
+        string                                 _deleteText;
+        string                                 _deleteTitle;
+        bool                                   _deletingCompanyBySoftwareFamily;
         bool                                   _editing;
+        Modal                                  _frmDelete;
         bool                                   _loaded;
         SoftwareFamilyViewModel                _model;
+        List<DocumentRoleViewModel>            _roles;
+        bool                                   _savingCompany;
         List<SoftwareFamilyViewModel>          _softwareFamilies;
+        List<CompanyBySoftwareFamilyViewModel> _softwareFamilyCompanies;
         bool                                   _unknownIntroduced;
         bool                                   _unknownParent;
 
@@ -64,8 +78,11 @@ namespace Marechai.Pages.Admin.Details
                 return;
 
             _softwareFamilies    = await Service.GetAsync();
+            _companies           = await CompaniesService.GetAsync();
+            _roles               = await DocumentRolesService.GetEnabledAsync();
             _model               = _creating ? new SoftwareFamilyViewModel() : await Service.GetAsync(Id);
             _authState           = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            _addingCompanyRoleId = _roles.First().Id;
 
             _editing = _creating || NavigationManager.ToBaseRelativePath(NavigationManager.Uri).ToLowerInvariant().
                                                       StartsWith("admin/software_families/edit/",
@@ -137,5 +154,103 @@ namespace Marechai.Pages.Admin.Details
             Validators.ValidateString(e, L["Name must be smaller than 256 characters."], 256);
 
         void ValidateIntroduced(ValidatorEventArgs e) => Validators.ValidateDate(e);
+
+        void OnAddCompanyClick()
+        {
+            _addingCompany   = true;
+            _savingCompany   = false;
+            _addingCompanyId = _companies.First().Id;
+        }
+
+        void CancelAddCpu()
+        {
+            _addingCompany   = false;
+            _savingCompany   = false;
+            _addingCompanyId = null;
+        }
+
+        async Task ConfirmAddCpu()
+        {
+            if(_addingCompanyId is null ||
+               _addingCompanyId <= 0)
+            {
+                CancelAddCpu();
+
+                return;
+            }
+
+            _savingCompany = true;
+
+            // Yield thread to let UI to update
+            await Task.Yield();
+
+            await CompaniesBySoftwareFamilyService.CreateAsync(_addingCompanyId.Value, Id, _addingCompanyRoleId,
+                                                               (await UserManager.GetUserAsync(_authState.User)).Id);
+
+            _softwareFamilyCompanies = await CompaniesBySoftwareFamilyService.GetBySoftwareFamily(Id);
+
+            _addingCompany   = false;
+            _savingCompany   = false;
+            _addingCompanyId = null;
+
+            // Yield thread to let UI to update
+            await Task.Yield();
+
+            // Tell we finished loading
+            StateHasChanged();
+        }
+
+        void ShowCpuDeleteModal(ulong itemId)
+        {
+            _currentCompanyBySoftwareFamily  = _softwareFamilyCompanies.FirstOrDefault(n => n.Id == itemId);
+            _deletingCompanyBySoftwareFamily = true;
+            _deleteTitle                     = L["Delete company from this software family"];
+
+            _deleteText =
+                string.Format(L["Are you sure you want to delete the company {0} with role {1} from this software family?"],
+                              _currentCompanyBySoftwareFamily?.Company, _currentCompanyBySoftwareFamily?.Role);
+
+            _frmDelete.Show();
+        }
+
+        void ModalClosing(ModalClosingEventArgs obj)
+        {
+            _deleteInProgress                = false;
+            _deletingCompanyBySoftwareFamily = false;
+            _currentCompanyBySoftwareFamily  = null;
+        }
+
+        void HideModal() => _frmDelete.Hide();
+
+        async void ConfirmDelete()
+        {
+            if(_deletingCompanyBySoftwareFamily)
+                await ConfirmDeleteCpuByMachine();
+        }
+
+        async Task ConfirmDeleteCpuByMachine()
+        {
+            if(_currentCompanyBySoftwareFamily is null)
+                return;
+
+            _deleteInProgress = true;
+
+            // Yield thread to let UI to update
+            await Task.Yield();
+
+            await CompaniesBySoftwareFamilyService.DeleteAsync(_currentCompanyBySoftwareFamily.Id,
+                                                               (await UserManager.GetUserAsync(_authState.User)).Id);
+
+            _softwareFamilyCompanies = await CompaniesBySoftwareFamilyService.GetBySoftwareFamily(Id);
+
+            _deleteInProgress = false;
+            _frmDelete.Hide();
+
+            // Yield thread to let UI to update
+            await Task.Yield();
+
+            // Tell we finished loading
+            StateHasChanged();
+        }
     }
 }

Marechai/Resources/Services/SoftwareFamiliesService.en.resx

@@ -74,4 +74,25 @@
   <data name="Name must be smaller than 256 characters." xml:space="preserve">
     <value>Name must be smaller than 256 characters.</value>
   </data>
+  <data name="Companies involved in this software family" xml:space="preserve">
+    <value>Companies involved in this software family</value>
+  </data>
+  <data name="Add new (company)" xml:space="preserve">
+    <value>Add new</value>
+  </data>
+  <data name="Company" xml:space="preserve">
+    <value>Company</value>
+  </data>
+  <data name="Role" xml:space="preserve">
+    <value>Role</value>
+  </data>
+  <data name="Delete company from this software family" xml:space="preserve">
+    <value>Delete company from this software family</value>
+  </data>
+  <data name="Are you sure you want to delete the company {0} with role {1} from this software family?" xml:space="preserve">
+    <value>Are you sure you want to delete the company {0} with role {1} from this software family?</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
 </root>

Marechai/Resources/Services/SoftwareFamiliesService.es.resx

@@ -181,4 +181,25 @@
   <data name="Name must be smaller than 256 characters." xml:space="preserve">
     <value>El nombre debe contener menos de 256 caracteres.</value>
   </data>
+  <data name="Companies involved in this software family" xml:space="preserve">
+    <value>Compañías involucradas en esta familia de software</value>
+  </data>
+  <data name="Add new (company)" xml:space="preserve">
+    <value>Añadir nueva</value>
+  </data>
+  <data name="Company" xml:space="preserve">
+    <value>Compañía</value>
+  </data>
+  <data name="Role" xml:space="preserve">
+    <value>Rol</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Añadir</value>
+  </data>
+  <data name="Delete company from this software family" xml:space="preserve">
+    <value>Eliminar compañía de esta familia de software</value>
+  </data>
+  <data name="Are you sure you want to delete the company {0} with role {1} from this software family?" xml:space="preserve">
+    <value>¿Estás seguro de eliminar la compañía {0} con rol {1} de esta familia de software?</value>
+  </data>
 </root>

Marechai/Services/CompaniesBySoftwareFamilyService.cs

@@ -0,0 +1,80 @@
+/******************************************************************************
+// MARECHAI: Master repository of computing history artifacts information
+// ----------------------------------------------------------------------------
+//
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This program is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as
+//     published by the Free Software Foundation, either version 3 of the
+//     License, or (at your option) any later version.
+//
+//     This program is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2003-2020 Natalia Portillo
+*******************************************************************************/
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Marechai.Database.Models;
+using Marechai.ViewModels;
+using Microsoft.EntityFrameworkCore;
+
+namespace Marechai.Services
+{
+    public class CompaniesBySoftwareFamilyService
+    {
+        readonly MarechaiContext _context;
+
+        public CompaniesBySoftwareFamilyService(MarechaiContext context) => _context = context;
+
+        public async Task<List<CompanyBySoftwareFamilyViewModel>> GetBySoftwareFamily(ulong softwareFamilyId) =>
+            await _context.CompaniesBySoftwareFamilies.Where(p => p.SoftwareFamilyId == softwareFamilyId).
+                           Select(p => new CompanyBySoftwareFamilyViewModel
+                           {
+                               Id               = p.Id,
+                               Company          = p.Company.Name,
+                               CompanyId        = p.CompanyId,
+                               RoleId           = p.RoleId,
+                               Role             = p.Role.Name,
+                               SoftwareFamilyId = p.SoftwareFamilyId
+                           }).OrderBy(p => p.Company).ThenBy(p => p.Role).ToListAsync();
+
+        public async Task DeleteAsync(ulong id, string userId)
+        {
+            CompaniesBySoftwareFamily item = await _context.CompaniesBySoftwareFamilies.FindAsync(id);
+
+            if(item is null)
+                return;
+
+            _context.CompaniesBySoftwareFamilies.Remove(item);
+
+            await _context.SaveChangesWithUserAsync(userId);
+        }
+
+        public async Task<ulong> CreateAsync(int companyId, ulong softwareFamilyId, string roleId, string userId)
+        {
+            var item = new CompaniesBySoftwareFamily
+            {
+                CompanyId        = companyId,
+                SoftwareFamilyId = softwareFamilyId,
+                RoleId           = roleId
+            };
+
+            await _context.CompaniesBySoftwareFamilies.AddAsync(item);
+            await _context.SaveChangesWithUserAsync(userId);
+
+            return item.Id;
+        }
+    }
+}

Marechai/ViewModels/CompanyBySoftwareFamilyViewModel.cs

@@ -0,0 +1,36 @@
+/******************************************************************************
+// MARECHAI: Master repository of computing history artifacts information
+// ----------------------------------------------------------------------------
+//
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This program is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as
+//     published by the Free Software Foundation, either version 3 of the
+//     License, or (at your option) any later version.
+//
+//     This program is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2003-2020 Natalia Portillo
+*******************************************************************************/
+
+namespace Marechai.ViewModels
+{
+    public class CompanyBySoftwareFamilyViewModel : BaseViewModel<ulong>
+    {
+        public int    CompanyId        { get; set; }
+        public ulong  SoftwareFamilyId { get; set; }
+        public string RoleId           { get; set; }
+        public string Company          { get; set; }
+        public string Role             { get; set; }
+    }
+}