Merge pull request #61 from FBoucher/60-a-few-changes-on-the-summary-page

fboucher · web-flow · commit 3ac444854d1c · 2025-06-01T11:48:33.000-04:00
A few changes on the summary editor
diff --git a/NoteBookmark.Api/DataStorageService.cs b/NoteBookmark.Api/DataStorageService.cs
@@ -288,4 +288,23 @@ public async Task UpdatePostReadStatus()
         }
     }
 
+    public async Task<string> SaveReadingNotesMarkdown(string markdown, string number)
+    {
+        var containerClient = blobClient.GetBlobContainerClient("final-markdown");
+        await containerClient.CreateIfNotExistsAsync();
+        
+        var fileName = $"readingnotes-{number}.md";
+        var markdownBlobClient = containerClient.GetBlobClient(fileName);
+        
+        byte[] markdownBytes = Encoding.UTF8.GetBytes(markdown);
+        var response = await markdownBlobClient.UploadAsync(new MemoryStream(markdownBytes), overwrite: true);
+        
+        if (response.GetRawResponse().Status == 201 || response.GetRawResponse().Status == 200)
+        {
+            return markdownBlobClient.Uri.ToString();
+        }
+        
+        return string.Empty;
+    }
+
 }
diff --git a/NoteBookmark.Api/IDataStorageService.cs b/NoteBookmark.Api/IDataStorageService.cs
@@ -32,4 +32,6 @@ public interface IDataStorageService
 	public Task UpdatePostReadStatus();
 
     public bool DeletePost(string rowKey);
+
+    public Task<string> SaveReadingNotesMarkdown(string markdown, string number);
 }
diff --git a/NoteBookmark.Api/SummaryEndpoints.cs b/NoteBookmark.Api/SummaryEndpoints.cs
@@ -20,6 +20,9 @@ public static void MapSummaryEndpoints(this IEndpointRouteBuilder app)
 
 		endpoints.MapPost("/summary", SaveSummary)
 			.WithDescription("Create or update the summary");
+
+		endpoints.MapPost("/{number}/markdown", SaveReadingNotesMarkdown)
+			.WithDescription("Save reading notes as markdown to blob storage");
 	}
 	static List<Summary> GetSummaries(TableServiceClient tblClient, BlobServiceClient blobClient)
 	{
@@ -54,4 +57,25 @@ static async Task<Results<Ok<ReadingNotes>, NotFound>> GetReadingNotes(string nu
 		return TypedResults.Ok(readingNotes);
 	}
 
+	static async Task<Results<Ok<string>, BadRequest>> SaveReadingNotesMarkdown(string number, MarkdownRequest request, TableServiceClient tblClient, BlobServiceClient blobClient)
+	{
+		try
+		{
+			var dataStorageService = new DataStorageService(tblClient, blobClient);
+			var url = await dataStorageService.SaveReadingNotesMarkdown(request.Markdown, number);
+			if (string.IsNullOrEmpty(url))
+			{
+				return TypedResults.BadRequest();
+			}
+			return TypedResults.Ok(url);
+		}
+		catch (Exception ex)
+		{
+			Console.WriteLine($"An error occurred while saving the markdown: {ex.Message}");
+			return TypedResults.BadRequest();
+		}
+	}
+
 }
+
+public record MarkdownRequest(string Markdown);
diff --git a/NoteBookmark.BlazorApp/Components/Pages/SummaryEditor.razor b/NoteBookmark.BlazorApp/Components/Pages/SummaryEditor.razor
@@ -21,8 +21,11 @@ else{
         <FluentTab Label=" Edit Summary" Icon="@(new Icons.Regular.Size20.FormSparkle())" Id="tabEdit">
             <EditForm Model="@readingNotes"  OnValidSubmit="@HandleValidSubmit" FormName="new_readingNotes">
                 <FluentStack Orientation="Orientation.Vertical" Width="100%">
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Save</FluentButton>
+                    
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Save as Draft</FluentButton>
+                    
                     <DataAnnotationsValidator />
+
                     <div style="width: 80%;">
                         <FluentTextField Label="Title" @bind-Value="readingNotes!.Title"/>
                     </div>
@@ -32,6 +35,9 @@ else{
                     <div style="width: 80%;">
                         <FluentTextField Label="Published Url" @bind-Value="@readingNotes!.PublishedUrl" style="width: 80%;"/>
                     </div>
+                    <div style="width: 80%;">
+                        <FluentTextArea Placeholder="Introduction" @bind-Value=@readingNotes.Intro Cols="100" Rows="5"></FluentTextArea>
+                    </div>
 
                     <div>
                         @foreach (var note in readingNotes!.Notes)
@@ -74,19 +80,17 @@ else{
                     <FluentValidationSummary />
                 </div>
                 <FluentButton OnClick="@(async () => await Publish())" Type="ButtonType.Button" Appearance="Appearance.Lightweight">Publish</FluentButton> | 
-                <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Save</FluentButton>
+                <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Save as Draft</FluentButton>
             </EditForm>
 
         </FluentTab>
 
         <FluentTab Label=" Markdown" Icon="@(new Icons.Regular.Size20.Markdown())" Id="tabMD">
-            <FluentLabel Typo="Typography.Body" Color="@Color.Disabled"> Read Only: This Markdown is generated from the form.</FluentLabel>
-            <FluentTextArea Value="@readingNotesMD" ReadOnly="true" Cols="100" Rows="30"/>
+            <FluentTextArea @bind-Value="@readingNotesMD" Cols="100" Rows="30"/>
         </FluentTab>
 
         <FluentTab Label=" Html" Icon="@(new Icons.Regular.Size20.Code())" Id="tabHTML">
-            <FluentLabel Typo="Typography.Body" Color="@Color.Disabled"> Read Only: This HTML is generated from the Markdown.</FluentLabel>
-            <FluentTextArea Value="@readingNotesHTML" ReadOnly="true" Cols="100" Rows="30"/>
+            <FluentTextArea Value="@readingNotesHTML" Cols="100" Rows="30"/>
         </FluentTab>
 
     </FluentTabs>
@@ -196,25 +200,44 @@ else{
     private void DeleteReadingNote(string category, string RowKey)
     {
         readingNotes!.Notes[category].RemoveAll(x => x.RowKey == RowKey);
-    }
-
+    }    
+    
     private async Task Publish()
     {
-        if(readingNotes is not null)
+        if (readingNotes is not null)
         {
+            if (string.IsNullOrWhiteSpace(readingNotes.PublishedUrl))
+            {
+                toastService.ShowError("Published Url is required to publish.");
+                return;
+            }
+            
+            // Save markdown to blob storage only if readingNotesMD is not null or empty
+            if (!string.IsNullOrWhiteSpace(readingNotesMD))
+            {
+                var markdownSaved = await client.SaveReadingNotesMarkdown(readingNotesMD, readingNotes.Number);
+                if (!markdownSaved)
+                {
+                    toastService.ShowError("Failed to save markdown file.");
+                    return;
+                }
+            }
+            
             await HandleValidSubmit();
             var settings = await client.GetSettings();
-            if(settings is not null)
+            if (settings is not null)
             {
                 var cnt = Convert.ToInt32(settings!.ReadingNotesCounter);
                 // Only increment if the current Summary is the most recent one.
-                if(cnt == Convert.ToInt32(readingNotes!.Number))
+                if (cnt == Convert.ToInt32(readingNotes!.Number))
                 {
                     cnt++;
                     settings.ReadingNotesCounter = (cnt).ToString();
                     await client.SaveSettings(settings);
                 }
             }
+            
+            toastService.ShowSuccess("Reading notes published successfully!");
         }
     }
 }
diff --git a/NoteBookmark.BlazorApp/PostNoteClient.cs b/NoteBookmark.BlazorApp/PostNoteClient.cs
@@ -150,4 +150,11 @@ public async Task<bool> DeletePost(string id)
         var response = await httpClient.DeleteAsync($"api/posts/{id}");
         return response.IsSuccessStatusCode;
     }
+
+    public async Task<bool> SaveReadingNotesMarkdown(string markdown, string number)
+    {
+        var request = new { Markdown = markdown };
+        var response = await httpClient.PostAsJsonAsync($"api/summary/{number}/markdown", request);
+        return response.IsSuccessStatusCode;
+    }
 }
diff --git a/NoteBookmark.Domain/ReadingNotes.cs b/NoteBookmark.Domain/ReadingNotes.cs
@@ -71,6 +71,8 @@ public string ToMarkDown()
         md.Append(Title + Environment.NewLine);
         md.Append('=', Title.Length);
 
+        md.Append(Environment.NewLine + Environment.NewLine + this.Intro ?? "" + Environment.NewLine);
+
         //== All Notes
         foreach (var key in this.Notes.Keys)
         {

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ public interface IDataStorageService`
`32`	`32`	`public Task UpdatePostReadStatus();`
`33`	`33`
`34`	`34`	`public bool DeletePost(string rowKey);`
	`35`	`+`
	`36`	`+ public Task<string> SaveReadingNotesMarkdown(string markdown, string number);`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,4 +150,11 @@ public async Task<bool> DeletePost(string id)`
`150`	`150`	`var response = await httpClient.DeleteAsync($"api/posts/{id}");`
`151`	`151`	`return response.IsSuccessStatusCode;`
`152`	`152`	`}`
	`153`	`+`
	`154`	`+ public async Task<bool> SaveReadingNotesMarkdown(string markdown, string number)`
	`155`	`+ {`
	`156`	`+ var request = new { Markdown = markdown };`
	`157`	`+ var response = await httpClient.PostAsJsonAsync($"api/summary/{number}/markdown", request);`
	`158`	`+ return response.IsSuccessStatusCode;`
	`159`	`+ }`
`153`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ public string ToMarkDown()`
`71`	`71`	`md.Append(Title + Environment.NewLine);`
`72`	`72`	`md.Append('=', Title.Length);`
`73`	`73`
	`74`	`+ md.Append(Environment.NewLine + Environment.NewLine + this.Intro ?? "" + Environment.NewLine);`
	`75`	`+`
`74`	`76`	`//== All Notes`
`75`	`77`	`foreach (var key in this.Notes.Keys)`
`76`	`78`	`{`