Merge pull request #52 from Luthetus/dev

Dev
Luthetus · Sep 4, 2023 · 72ce3b8 · 72ce3b8
2 parents 36a51ca + 0ae6241
commit 72ce3b8
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 66 deletions.
diff --git a/...s.Ide.ClassLib/HostedServiceCase/FileSystem/LuthetusIdeFileSystemBackgroundTaskService.cs b/...s.Ide.ClassLib/HostedServiceCase/FileSystem/LuthetusIdeFileSystemBackgroundTaskService.cs
@@ -23,18 +23,8 @@ public void QueueBackgroundWorkItem(
     public async Task<IBackgroundTask?> DequeueAsync(
         CancellationToken cancellationToken)
     {
-        IBackgroundTask? backgroundTask;
-
-        try
-        {
-            await _workItemsQueueSemaphoreSlim.WaitAsync(cancellationToken);
-
-            _backgroundTasks.TryDequeue(out backgroundTask);
-        }
-        finally
-        {
-            _workItemsQueueSemaphoreSlim.Release();
-        }
+        await _workItemsQueueSemaphoreSlim.WaitAsync(cancellationToken);
+        _ = _backgroundTasks.TryDequeue(out var backgroundTask);
 
         return backgroundTask;
     }

diff --git a/...ClassLib/HostedServiceCase/FileSystem/LuthetusIdeFileSystemBackgroundTaskServiceWorker.cs b/...ClassLib/HostedServiceCase/FileSystem/LuthetusIdeFileSystemBackgroundTaskServiceWorker.cs
@@ -32,8 +32,7 @@ protected async override Task ExecuteAsync(
 
         while (!cancellationToken.IsCancellationRequested)
         {
-            var backgroundTask = await BackgroundTaskService
-                .DequeueAsync(cancellationToken);
+            var backgroundTask = await BackgroundTaskService.DequeueAsync(cancellationToken);
 
             if (backgroundTask is not null)
             {

diff --git a/...hetus.Ide.ClassLib/HostedServiceCase/Terminal/LuthetusIdeTerminalBackgroundTaskService.cs b/...hetus.Ide.ClassLib/HostedServiceCase/Terminal/LuthetusIdeTerminalBackgroundTaskService.cs
@@ -23,18 +23,8 @@ public void QueueBackgroundWorkItem(
     public async Task<IBackgroundTask?> DequeueAsync(
         CancellationToken cancellationToken)
     {
-        IBackgroundTask? backgroundTask;
-
-        try
-        {
-            await _workItemsQueueSemaphoreSlim.WaitAsync(cancellationToken);
-
-            _backgroundTasks.TryDequeue(out backgroundTask);
-        }
-        finally
-        {
-            _workItemsQueueSemaphoreSlim.Release();
-        }
+        await _workItemsQueueSemaphoreSlim.WaitAsync(cancellationToken);
+        _ = _backgroundTasks.TryDequeue(out var backgroundTask);
 
         return backgroundTask;
     }

diff --git a/Source/Lib/Luthetus.Ide.ClassLib/Store/PanelCase/PanelsCollection.Actions.cs b/Source/Lib/Luthetus.Ide.ClassLib/Store/PanelCase/PanelsCollection.Actions.cs
@@ -7,7 +7,7 @@ public partial record PanelsCollection
     public record RegisterPanelRecordAction(PanelRecord PanelRecord);
     public record DisposePanelRecordAction(PanelRecordKey PanelRecordKey);
 
-    public record RegisterPanelTabAction(PanelRecordKey PanelRecordKey, PanelTab PanelTab);
+    public record RegisterPanelTabAction(PanelRecordKey PanelRecordKey, PanelTab PanelTab, bool InsertAtIndexZero);
     public record DisposePanelTabAction(PanelRecordKey PanelRecordKey, PanelTabKey PanelTabKey);
 
     public record SetActivePanelTabAction(PanelRecordKey PanelRecordKey, PanelTabKey PanelTabKey);

diff --git a/Source/Lib/Luthetus.Ide.ClassLib/Store/PanelCase/PanelsCollection.Reducer.cs b/Source/Lib/Luthetus.Ide.ClassLib/Store/PanelCase/PanelsCollection.Reducer.cs
@@ -57,8 +57,19 @@ public static PanelsCollection ReduceRegisterPanelTabAction(
             if (targetedPanelRecord is null)
                 return previousPanelsCollection;
 
-            var nextPanelTabs = targetedPanelRecord.PanelTabs.Add(
-                registerPanelTabAction.PanelTab);
+            var nextPanelTabs = targetedPanelRecord.PanelTabs;
+
+            if (registerPanelTabAction.InsertAtIndexZero)
+            {
+                nextPanelTabs = targetedPanelRecord.PanelTabs.Insert(
+                    0,
+                    registerPanelTabAction.PanelTab);
+            }
+            else
+            {
+                nextPanelTabs = targetedPanelRecord.PanelTabs.Add(
+                    registerPanelTabAction.PanelTab);
+            }
 
             var nextPanelRecord = targetedPanelRecord with
             {

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesDisplay.razor b/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesDisplay.razor
@@ -0,0 +1,13 @@
+<div class="luth_ide_background-services">
+    <div class="luth_ide_section-title">
+        Background Tasks
+    </div>
+
+    <div class="luth_ide_section-body">
+        <BackgroundServiceDisplay BackgroundTaskQueue="LuthetusCommonBackgroundTaskService" />
+        <BackgroundServiceDisplay BackgroundTaskQueue="LuthetusIdeFileSystemBackgroundTaskService" />
+        <BackgroundServiceDisplay BackgroundTaskQueue="LuthetusIdeTerminalBackgroundTaskService" />
+        <BackgroundServiceDisplay BackgroundTaskQueue="LuthetusTextEditorCompilerServiceBackgroundTaskService" />
+        <BackgroundServiceDisplay BackgroundTaskQueue="LuthetusTextEditorTextEditorBackgroundTaskService" />
+    </div>
+</div>
diff --git a/...e/BackgroundServicesPanelDisplay.razor.cs → ...ceCase/BackgroundServicesDisplay.razor.cs b/...e/BackgroundServicesPanelDisplay.razor.cs → ...ceCase/BackgroundServicesDisplay.razor.cs
@@ -7,7 +7,7 @@
 
 namespace Luthetus.Ide.RazorLib.BackgroundServiceCase;
 
-public partial class BackgroundServicesPanelDisplay : ComponentBase
+public partial class BackgroundServicesDisplay : ComponentBase
 {
     [Inject]
     private ILuthetusCommonBackgroundTaskService LuthetusCommonBackgroundTaskService { get; set; } = null!;

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesDisplay.razor.css b/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesDisplay.razor.css
@@ -0,0 +1,3 @@
+.luth_ide_background-services {
+    height: 100%;
+}
diff --git a/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesPanelDisplay.razor b/Source/Lib/Luthetus.Ide.RazorLib/BackgroundServiceCase/BackgroundServicesPanelDisplay.razor
diff --git a/Source/Lib/Luthetus.Ide.RazorLib/LuthetusIdeInitializer.razor.cs b/Source/Lib/Luthetus.Ide.RazorLib/LuthetusIdeInitializer.razor.cs
@@ -46,8 +46,13 @@ protected override void OnInitialized()
     {
         if (LuthetusHostingInformation.LuthetusHostingKind != LuthetusHostingKind.ServerSide)
         {
-            _ = Task.Run(async () => await LuthetusIdeFileSystemBackgroundTaskServiceWorker.StartAsync(CancellationToken.None));
-            _ = Task.Run(async () => await LuthetusIdeTerminalBackgroundTaskServiceWorker.StartAsync(CancellationToken.None));
+            _ = Task.Run(async () => await LuthetusIdeFileSystemBackgroundTaskServiceWorker
+                .StartAsync(CancellationToken.None)
+                .ConfigureAwait(false));
+
+            _ = Task.Run(async () => await LuthetusIdeTerminalBackgroundTaskServiceWorker
+                .StartAsync(CancellationToken.None)
+                .ConfigureAwait(false));
         }
 
         if (LuthetusTextEditorOptions.CustomThemeRecords is not null)
@@ -107,7 +112,8 @@ private void InitializeLeftPanelTabs()
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             leftPanel.PanelRecordKey,
-            solutionExplorerPanelTab));
+            solutionExplorerPanelTab,
+            false));
 
         var folderExplorerPanelTab = new PanelTab(
             PanelTabKey.NewPanelTabKey(),
@@ -119,7 +125,8 @@ private void InitializeLeftPanelTabs()
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             leftPanel.PanelRecordKey,
-            folderExplorerPanelTab));
+            folderExplorerPanelTab,
+            false));
 
         Dispatcher.Dispatch(new PanelsCollection.SetActivePanelTabAction(
             leftPanel.PanelRecordKey,
@@ -134,25 +141,27 @@ private void InitializeRightPanelTabs()
             PanelTabKey.NewPanelTabKey(),
             rightPanel.ElementDimensions,
             new(),
-            typeof(NotificationHistoryDisplay),
+            typeof(NotificationsDisplay),
             typeof(IconFolder),
             "Notifications");
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             rightPanel.PanelRecordKey,
-            notificationsPanelTab));
+            notificationsPanelTab,
+            false));
 
         var backgroundServicesPanelTab = new PanelTab(
             PanelTabKey.NewPanelTabKey(),
             rightPanel.ElementDimensions,
             new(),
-            typeof(BackgroundServicesPanelDisplay),
+            typeof(BackgroundServicesDisplay),
             typeof(IconFolder),
             "Background Tasks");
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             rightPanel.PanelRecordKey,
-            backgroundServicesPanelTab));
+            backgroundServicesPanelTab,
+            false));
     }
 
     private void InitializeBottomPanelTabs()
@@ -169,7 +178,8 @@ private void InitializeBottomPanelTabs()
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             bottomPanel.PanelRecordKey,
-            terminalPanelTab));
+            terminalPanelTab,
+            false));
 
         var nuGetPanelTab = new PanelTab(
             PanelTabKey.NewPanelTabKey(),
@@ -181,7 +191,8 @@ private void InitializeBottomPanelTabs()
 
         Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
             bottomPanel.PanelRecordKey,
-            nuGetPanelTab));
+            nuGetPanelTab,
+            false));
 
         Dispatcher.Dispatch(new PanelsCollection.SetActivePanelTabAction(
             bottomPanel.PanelRecordKey,

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationHistoryDisplay.razor b/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationHistoryDisplay.razor
diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationsDisplay.razor b/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationsDisplay.razor
@@ -0,0 +1,9 @@
+<div class="luth_ide_folder-notifications">
+    <div class="luth_ide_section-title">
+        Notifications
+    </div>
+
+    <div class="luth_ide_section-body">
+        #TODO: Body
+    </div>
+</div>
diff --git a/...ation/NotificationHistoryDisplay.razor.cs → ...otification/NotificationsDisplay.razor.cs b/...ation/NotificationHistoryDisplay.razor.cs → ...otification/NotificationsDisplay.razor.cs
@@ -2,7 +2,7 @@
 
 namespace Luthetus.Ide.RazorLib.Notification;
 
-public partial class NotificationHistoryDisplay : ComponentBase
+public partial class NotificationsDisplay : ComponentBase
 {
 
 }
diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationsDisplay.razor.css b/Source/Lib/Luthetus.Ide.RazorLib/Notification/NotificationsDisplay.razor.css
@@ -0,0 +1,3 @@
+.luth_ide_folder-notifications {
+    height: 100%;
+}
diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelDisplay.razor.cs b/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelDisplay.razor.cs
@@ -142,7 +142,8 @@ private Task TopDropzoneOnMouseUp(MouseEventArgs mouseEventArgs)
 
             Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
                 panelRecord.PanelRecordKey,
-                panelDragEventArgs.Value.TagDragTarget));
+                panelDragEventArgs.Value.TagDragTarget,
+                true));
         }
 
         return Task.CompletedTask;
@@ -168,7 +169,8 @@ private Task BottomDropzoneOnMouseUp(MouseEventArgs mouseEventArgs)
 
             Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
                 panelRecord.PanelRecordKey,
-                panelDragEventArgs.Value.TagDragTarget));
+                panelDragEventArgs.Value.TagDragTarget,
+                false));
         }
 
         return Task.CompletedTask;

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelTabDisplay.razor b/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelTabDisplay.razor
@@ -9,6 +9,15 @@
         @PanelTab.DisplayName
     </span>
 
+    @*
+    <!--
+    Commenting out this code. The idea was to track the index of the panel tab
+    which was being hovered over. Then one can insert the panel tab they are
+    dragging either before or after that index.
+
+    (2023-09-03)
+    -->
+
     @if (PanelsCollectionWrap.Value.PanelDragEventArgs is not null)
     {
         <div class="luth_ide_panel-tab-dropzone luth_ide_panel-tab-dropzone-top"
@@ -20,7 +29,7 @@
              @onmouseup:stopPropagation="true"
              @onmouseup="BottomDropzoneOnMouseUp">
         </div>
-    }
+    } *@
 </button>
 
 @if (PanelTab.IsBeingDragged)

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelTabDisplay.razor.cs b/Source/Lib/Luthetus.Ide.RazorLib/Panel/PanelTabDisplay.razor.cs
@@ -127,7 +127,8 @@ private Task TopDropzoneOnMouseUp(MouseEventArgs mouseEventArgs)
 
             Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
                 PanelRecord.PanelRecordKey,
-                panelDragEventArgs.Value.TagDragTarget));
+                panelDragEventArgs.Value.TagDragTarget,
+                false));
         }
 
         return Task.CompletedTask;
@@ -145,7 +146,8 @@ private Task BottomDropzoneOnMouseUp(MouseEventArgs mouseEventArgs)
 
             Dispatcher.Dispatch(new PanelsCollection.RegisterPanelTabAction(
                 PanelRecord.PanelRecordKey,
-                panelDragEventArgs.Value.TagDragTarget));
+                panelDragEventArgs.Value.TagDragTarget,
+                false));
         }
 
         return Task.CompletedTask;

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/Shared/IdeMainLayout.razor b/Source/Lib/Luthetus.Ide.RazorLib/Shared/IdeMainLayout.razor
@@ -15,11 +15,11 @@
                  ClassCssString="@($"luth_ide_main-layout {UnselectableClassCss} {AppOptionsService.ThemeCssClassString}")"
                  StyleCssString="@($"{AppOptionsService.FontSizeCssStyleString} {AppOptionsService.FontFamilyCssStyleString}")">
 
-    <ShouldRenderBoundary>
-        <LuthetusCommonInitializer/>
-        <LuthetusTextEditorInitializer/>
-        <LuthetusIdeInitializer/>
+    <LuthetusCommonInitializer />
+    <LuthetusTextEditorInitializer />
+    <LuthetusIdeInitializer />
 
+    <ShouldRenderBoundary>
         <IdeHeader/>
 
         <StateHasChangedBoundary @ref="_bodyAndFooterStateHasChangedBoundaryComponent">

diff --git a/Source/Lib/Luthetus.Ide.RazorLib/wwwroot/luthetusIde.css b/Source/Lib/Luthetus.Ide.RazorLib/wwwroot/luthetusIde.css
@@ -31,7 +31,7 @@ input[type="checkbox"]{
 }
 
 .luth_ide_footer {
-    background-color: var(--luth_ide_footer-background-color);
+    background-color: var(--luth_ide_body-background-color);
 }
 
 .luth_ide_section-title {
@@ -310,6 +310,7 @@ button.luth_ide_input-file-address-hierarchy-entry {
 
 .luth_ide_panel-tabs {
     position: relative;
+    background-color: var(--luth_ide_footer-background-color);
 }
 
 .luth_ide_panel-tab {
@@ -326,20 +327,21 @@ button.luth_ide_input-file-address-hierarchy-entry {
     position: absolute;
     left: 0;
     z-index: 100;
+    background-color: var(--luth_primary-hover-background-color);
+    opacity: 0.6;
 }
 
-.luth_ide_panel-tab-dropzone:hover {
-    background-color: orange;
-}
+    .luth_ide_panel-tab-dropzone:hover {
+        background-color: var(--luth_button-hover-background-color);
+        box-shadow: 0 0 2px var(--luth_primary-overlay-box-shadow-color);
+    }
 
 .luth_ide_panel-tab-dropzone-top {
     top: 0;
-    background-color: aqua;
 }
 
 .luth_ide_panel-tab-dropzone-bottom {
     top: 50%;
-    background-color: mediumpurple;
 }
 
 .luth_ide_panel-tab-drag-display {