Add removing files

keyroll-99 · Jun 8, 2024 · 6ff760d · 6ff760d
1 parent 503d42a
commit 6ff760d
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 18 deletions.
diff --git a/ide/src/Fiona.IDE.ProjectManager/IProjectManager.cs b/ide/src/Fiona.IDE.ProjectManager/IProjectManager.cs
@@ -12,6 +12,7 @@ public interface IProjectManager
         IEnumerable<ProjectFile> GetFiles();
         ProjectFile GetProjectFileByNamespaceAndName(string @namespace, string name);
         Task CreateFileAsync(string name, string folderPath);
+        Task RemoveFile(ProjectFile projectFile);
 
     }
 }
diff --git a/ide/src/Fiona.IDE.ProjectManager/Models/FslnFile.cs b/ide/src/Fiona.IDE.ProjectManager/Models/FslnFile.cs
@@ -50,6 +50,13 @@ internal async Task AddFile(string name, string path)
             await SaveAsync();
         }
 
+        internal async Task RemoveFile(ProjectFile file)
+        {
+            ProjectFiles!.Remove(file);
+            ProjectFilesPath.Remove(file.Path);
+            await SaveAsync();
+        }
+
         private async Task SaveAsync()
         {
             await using FileStream fs = new($"{Path}{System.IO.Path.DirectorySeparatorChar}{Name}{Extension}",

diff --git a/ide/src/Fiona.IDE.ProjectManager/Models/ProjectFile.cs b/ide/src/Fiona.IDE.ProjectManager/Models/ProjectFile.cs
@@ -128,6 +128,7 @@ private void AddMethodContent(StringBuilder fileContentBuilder)
             fileContentBuilder.AppendLine("bodyEnd;");
         }
     }
+    public override int GetHashCode() => HashCode.Combine(Path);
 }
 
 internal static class ProjectFileExtensions

diff --git a/ide/src/Fiona.IDE.ProjectManager/ProjectManager.cs b/ide/src/Fiona.IDE.ProjectManager/ProjectManager.cs
@@ -45,6 +45,10 @@ public Task CreateFileAsync(string name, string folderPath)
         {
             return Project!.AddFile(name, folderPath);
         }
+        public async Task RemoveFile(ProjectFile projectFile)
+        {
+            await Project!.RemoveFile(projectFile);
+        }
 
         public bool IsLoaded()
             => Project is not null;

diff --git a/ide/src/Fiona.IDE/Components/Layout/Menu/LoadProjectModal.razor b/ide/src/Fiona.IDE/Components/Layout/Menu/LoadProjectModal.razor
@@ -1,5 +1,4 @@
-@using Fiona.IDE.Components.Pages.Project
-@using Fiona.IDE.ProjectManager
+@using Fiona.IDE.ProjectManager
 @using Fiona.IDE.ProjectManager.Exceptions
 @inject NavigationManager NavManager
 

diff --git a/ide/src/Fiona.IDE/Components/Pages/Project/Menu/ProjectMenu.razor b/ide/src/Fiona.IDE/Components/Pages/Project/Menu/ProjectMenu.razor
@@ -2,25 +2,35 @@
 @using Fiona.IDE.ProjectManager.Models
 @inject NavigationManager NavManager
 
-
-<BarItem>
-    <BarDropdown>
-        <BarDropdownToggle>Files</BarDropdownToggle>
-        <BarDropdownMenu>
-            <BarDropdownItem Clicked="OpenCreateNewFileModal">Create file</BarDropdownItem>
-            <DropdownDivider Class="divider" />
-            @foreach (ProjectFile projectFile in ProjectManager.GetFiles() ?? [])
-            {
-                <BarDropdownItem @onclick="() => OpenFile(projectFile)">@projectFile.Name</BarDropdownItem>
-            }
-        </BarDropdownMenu>
-    </BarDropdown>
-</BarItem>
-
+<ContextMenuTrigger MenuId="main-context-menu" CssClass="main-context-menu_trigger">
+    <BarItem>
+        <BarDropdown>
+            <BarDropdownToggle>Files</BarDropdownToggle>
+            <BarDropdownMenu>
+                <BarDropdownItem Clicked="OpenCreateNewFileModal">Create file</BarDropdownItem>
+                <DropdownDivider Class="divider"/>
+                @foreach (ProjectFile projectFile in ProjectManager.GetFiles() ?? [])
+                {
+                    <ContextMenuTrigger MenuId="@projectFile.GetHashCode().ToString()">
+                        <BarDropdownItem @onclick="() => OpenFile(projectFile)">@projectFile.Name</BarDropdownItem>
+                        <ContextMenu Id=@projectFile.GetHashCode().ToString()>
+                            <Item CssClass="context-menu-item" OnClick="@OnClick">Remove</Item>
+                        </ContextMenu>
+                    </ContextMenuTrigger>
+                }
+            </BarDropdownMenu>
+        </BarDropdown>
+    </BarItem>
+</ContextMenuTrigger>
+<ContextMenu Id="main-context-menu">
+    <Item CssClass="context-menu-item" OnClick="OpenCreateNewFileModal">Create file</Item>
+</ContextMenu>
+
 <CascadingValue Value="this">
     <CreateFileModal/>
 </CascadingValue>
 
+
 @code
 {
     [Inject]
@@ -44,15 +54,30 @@
         CloseCreateNewFileModal();
     }
 
+
     private void OpenFile(ProjectFile projectFile)
     {
         NavManager.NavigateTo($"/project-editor/{projectFile.Class.Namespace}/{projectFile.Class.Name}");
     }
+    async Task OnClick(ItemClickEventArgs e)
+    {
+        ProjectFile fileToRemove = ProjectManager.GetFiles().Single(x => x.GetHashCode().ToString() == e.ContextMenuId);
+        await ProjectManager.RemoveFile(fileToRemove);
+        StateHasChanged();
+    }
 }
 
 <style>
     .divider{
         background: grey !important; // override basic style
         height: 1px;
     }
+    
+    .main-context-menu_trigger{
+        border: 1px solid gray;
+    }
+
+    .context-menu-item{
+        color: #000c17;
+    }
 </style>
diff --git a/ide/src/Fiona.IDE/Components/_Imports.razor b/ide/src/Fiona.IDE/Components/_Imports.razor
@@ -13,4 +13,5 @@
 @using Blazor.Diagrams.Options
 @using Blazor.Diagrams
 @using Blazor.Diagrams.Core.Anchors
-@using Blazorise
+@using Blazorise
+@using BlazorContextMenu
diff --git a/ide/src/Fiona.IDE/Fiona.IDE.csproj b/ide/src/Fiona.IDE/Fiona.IDE.csproj
@@ -65,6 +65,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Blazor.ContextMenu" Version="2.1.0" />
         <PackageReference Include="Blazorise.Bootstrap5" Version="1.5.1" />
         <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.1" />
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />

diff --git a/ide/src/Fiona.IDE/MauiProgram.cs b/ide/src/Fiona.IDE/MauiProgram.cs
@@ -36,6 +36,7 @@ public static MauiApp CreateMauiApp()
             builder.Services.AddSingleton<MenuService>();
             builder.Services.AddProjectManager();
             builder.Services.AddCompiler();
+            builder.Services.AddBlazorContextMenu();
 #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();
     		builder.Logging.AddDebug();

diff --git a/ide/src/Fiona.IDE/wwwroot/index.html b/ide/src/Fiona.IDE/wwwroot/index.html
@@ -16,6 +16,7 @@
     <link href="_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css" rel="stylesheet" />
     <link href="_content/Z.Blazor.Diagrams/style.css" rel="stylesheet" />
     <link href="_content/Z.Blazor.Diagrams/default.styles.min.css" rel="stylesheet" />
+    <link href="_content/Blazor.ContextMenu/blazorContextMenu.min.css" rel="stylesheet" />
 </head>
 
 <body>
@@ -38,6 +39,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js" integrity="sha512-JPcRR8yFa8mmCsfrw4TNte1ZvF1e3+1SdGMslZvmrzDYxS69J7J49vkFL8u6u8PlPJK+H3voElBtUCzaXj+6ig==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
     <script src="_content/Z.Blazor.Diagrams/script.min.js"></script>
+    <script src="_content/Blazor.ContextMenu/blazorContextMenu.min.js"></script>
 </body>
 
 </html>
-Original file line number
+Diff line change
@@ Expand Up @@
                 fileContentBuilder.AppendLine("bodyEnd;");
             }
         }
+        public override int GetHashCode() => HashCode.Combine(Path);
     }
     internal static class ProjectFileExtensions
@@ Expand Down @@