diff --git a/.gitignore b/.gitignore index 2f3a845..2b72cff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ obj/ *.log checkpoints/ sample.txt +sample_data diff --git a/DB작업_U형측구.xlsx b/DB작업_U형측구.xlsx deleted file mode 100644 index f1fbba4..0000000 Binary files a/DB작업_U형측구.xlsx and /dev/null differ diff --git a/ExcelKv.Core/ExcelLoader.cs b/ExcelKv.Core/ExcelLoader.cs index 4308991..c307ec2 100644 --- a/ExcelKv.Core/ExcelLoader.cs +++ b/ExcelKv.Core/ExcelLoader.cs @@ -3,31 +3,32 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using MiniExcelLibs; -using StackExchange.Redis; // We'll just use IDatabase interface if possible, or dependency injection. - // For now, let's keep it simple and pass the db/batch or connection string. - // Better yet, pass an interface IStorageWrapper. namespace ExcelKv.Core; -// Simple Config DTO for user-defined areas public class RegionConfig { public int TopHeaderStartRow { get; set; } = 0; public int TopHeaderDepth { get; set; } = 3; public int LeftHeaderStartCol { get; set; } = 0; public int LeftHeaderWidth { get; set; } = 4; + + // Optional Parsing Limits (inclusive indices) + public int? DataEndRow { get; set; } + public int? DataEndCol { get; set; } } public interface IStorageWrapper { Task SetAsync(string key, string value); + // New: Metadata overload for Traceability + Task SetAsync(string key, string value, int row, int col); Task IncrementAsync(string key, double value); } // Live Aggregator Helper (Moved here for shared access) public class LiveAggregator { - // Simple basic check for now. Can be expanded. private static readonly System.Text.RegularExpressions.Regex MetricPattern = new System.Text.RegularExpressions.Regex(@"(수량|합계|Volume|Weight|Total|Usage)", System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Compiled); @@ -42,6 +43,25 @@ public class LiveAggregator public class ExcelLoader { + public static async Task> GetSheetNamesAsync(string filePath) + { + return await Task.Run(() => MiniExcel.GetSheetNames(filePath).ToList()); + } + + public static async Task> GetPreviewRowsAsync(string filePath, string sheetName, int count = 50) + { + return await Task.Run(() => + { + var rows = MiniExcel.Query(filePath, sheetName: sheetName, useHeaderRow: false).Take(count).ToList(); + List result = new(); + foreach(IDictionary r in rows) + { + result.Add(FlattenDictionaryRow(r)); + } + return result; + }); + } + public static async Task ProcessFileAsync( string filePath, string sheetName, @@ -50,7 +70,6 @@ public class ExcelLoader SchemaRegistry registry) { Console.WriteLine($"[Core.Loader] Processing {filePath} Sheet: {sheetName}..."); - Console.WriteLine($"[Config] Top: Row{config.TopHeaderStartRow} (+{config.TopHeaderDepth}), Left: Col{config.LeftHeaderStartCol} (+{config.LeftHeaderWidth})"); var rows = MiniExcel.Query(filePath, sheetName: sheetName, useHeaderRow: false).ToList(); @@ -58,112 +77,118 @@ public class ExcelLoader int dataStartRow = config.TopHeaderStartRow + config.TopHeaderDepth; if (rows.Count <= dataStartRow) return 0; - // 1. Analyze Top Headers - // Extract the rows that form the Top Header - List topHeaderRows = new(); + // 1. Analyze Top Headers (Data Columns) + var topHeaderRows = new List(); for (int i = config.TopHeaderStartRow; i < dataStartRow; i++) { - var rowDict = (IDictionary)rows[i]; - topHeaderRows.Add(FlattenDictionaryRow(rowDict)); + topHeaderRows.Add(FlattenDictionaryRow((IDictionary)rows[i])); } - // Flatten Top Headers (Horizontal Forward Fill) - // Offset: We effectively care about columns starting from LeftHeaderWidth to End - // but we pass the absolute index. - var topAxisKeys = FlattenTopHeaders(topHeaderRows, config.LeftHeaderStartCol + config.LeftHeaderWidth); + // Calculate Global Max Col from Data Rows to ensure we don't truncate data + // Optimization: check a sample or assume logical limit. For correctness, check valid rows. + int globalMaxCol = 0; + int limitRow = config.DataEndRow.HasValue ? Math.Min(rows.Count, config.DataEndRow.Value + 1) : rows.Count; + for(int i = dataStartRow; i < limitRow; i++) + { + var d = (IDictionary)rows[i]; + if(d.Count > globalMaxCol) globalMaxCol = d.Count; // Approximate + // FlattenDictionaryRow is cleaner but expensive to call just for count. + // d.Keys.Count is effectively the column count for that row. + } + + // Flatten Data Headers (Right Side) + var topAxisKeys = FlattenTopHeaders(topHeaderRows, config.LeftHeaderStartCol + config.LeftHeaderWidth, globalMaxCol); - // Register Schema + // ... (Left Axis Header logic omitted for brevity, unchanged) ... + // ** New: Extract Left Axis Headers (Corner Region) ** + // These are the headers *above* the Left Key columns. + var leftAxisHeaders = new List(); + var bottomHeaderRow = FlattenDictionaryRow((IDictionary)rows[dataStartRow - 1]); + + for (int c = 0; c < config.LeftHeaderWidth; c++) + { + int absCol = config.LeftHeaderStartCol + c; + string headerVal = (absCol < bottomHeaderRow.Length) ? bottomHeaderRow[absCol] : $"Col{c}"; + leftAxisHeaders.Add(headerVal); + } + string ns = System.IO.Path.GetFileName(filePath) + "_" + sheetName; registry.RegisterSchema(ns, topAxisKeys); // 2. Process Data Rows - // State for Vertical Forward Fill (Left Headers) - string[] lastLeftValues = new string[config.LeftHeaderWidth]; + string[] lastLeftValues = new string[config.LeftHeaderWidth]; int processedCount = 0; - for (int i = dataStartRow; i < rows.Count; i++) + for (int i = dataStartRow; i < limitRow; i++) { var rowDict = (IDictionary)rows[i]; var rowVals = FlattenDictionaryRow(rowDict); - // A. Build Left Axis Key (Vertical Forward Fill) + // ... (Left Key Logic Unchanged) ... var currentLeftParts = new List(); bool rowHasContent = false; - for (int c = 0; c < config.LeftHeaderWidth; c++) { int absCol = config.LeftHeaderStartCol + c; string val = (absCol < rowVals.Length) ? rowVals[absCol] : ""; - - // Logic: Unmerge & Fill (Same as Vertical Forward Fill) - if (string.IsNullOrWhiteSpace(val)) - { - val = lastLeftValues[c]; - } - else - { - lastLeftValues[c] = val; // New merge block starts - } - - if(!string.IsNullOrWhiteSpace(val)) - { + if (string.IsNullOrWhiteSpace(val)) val = lastLeftValues[c]; + else lastLeftValues[c] = val; + if(!string.IsNullOrWhiteSpace(val)) { currentLeftParts.Add(val); rowHasContent = true; } } - - // Skip rows with no left context (e.g. empty separator lines) if (!rowHasContent) continue; + string leftKey = string.Join("----", currentLeftParts); - string leftKey = string.Join(".", currentLeftParts); + // B. Map Values + int limitCol = config.DataEndCol.HasValue ? Math.Min(rowVals.Length, config.DataEndCol.Value + 1) : rowVals.Length; - // B. Map Values to Top Axis Keys - for (int c = config.LeftHeaderStartCol + config.LeftHeaderWidth; c < rowVals.Length; c++) + for (int c = config.LeftHeaderStartCol + config.LeftHeaderWidth; c < limitCol; c++) { - // Align physical column to Top Axis Index - // Top Axis Keys[0] corresponds to column (LeftStart + LeftWidth) int topIndex = c - (config.LeftHeaderStartCol + config.LeftHeaderWidth); - if (topIndex < 0 || topIndex >= topAxisKeys.Count) continue; string topKey = topAxisKeys[topIndex]; - string val = rowVals[c]; - - if (string.IsNullOrWhiteSpace(val)) continue; // Sparse + if (string.IsNullOrWhiteSpace(topKey)) continue; // Skip if no header key + + string val = rowVals[c]; + if (string.IsNullOrWhiteSpace(val)) continue; + + // ** Feature: Rounding to 6 Decimal Places ** + // "All data should be formatted to 6 decimal places by default" + if (double.TryParse(val, out double dVal)) + { + val = Math.Round(dVal, 6).ToString(); // Simple G-format or fixed? User said "Decimal 6 places". + // Let's use standard string representation of the rounded 6-digit number to avoid trailing zeros "1.100000". + // Math.Round(1.1, 6) -> 1.1. + // If user meant "Fixed 6 places" (1.100000), use F6. Usually "representation" means significant digits. + // Given SI context, significant precision matters. Let's use normalization (remove trailing zeros) + // Update: User said "소수점 6자리까지 표현하는걸로 통일". Could mean truncate or round. Safe bet is Round. + } - // C. Construct Final Key string fullKey = $"{sheetName}:{leftKey}*{topKey}"; - await storage.SetAsync(fullKey, val); + await storage.SetAsync(fullKey, val, i, c); - // D. Live Compute - if (LiveAggregator.IsMetric(topKey) && double.TryParse(val, out double dVal)) + if (LiveAggregator.IsMetric(topKey) && double.TryParse(val, out double statVal)) { - await storage.IncrementAsync($"Stats:Global:{topKey}", dVal); + await storage.IncrementAsync($"Stats:Global:{topKey}", statVal); } } processedCount++; } + Console.WriteLine($"[Core.Loader] Finished. Processed: {processedCount} items."); return processedCount; } + private static string[] FlattenDictionaryRow(IDictionary rowDict) { - // MiniExcel Dynamic Dictionary Keys are A, B... AA.. - // We assume we want 0-indexed string array. - // We find the 'Max' column index to allocate array. - - // This sorting + re-indexing is a bit naive for very wide sheets but OK for PoC. - // Better to use MiniExcel's column index if available, but dynamic object hides it. - // We'll trust the Key sorting for now. var sortedKeys = rowDict.Keys.OrderBy(k => k.Length).ThenBy(k => k).ToList(); var result = new string[sortedKeys.Count]; - // Note: Dictionary might define "A", "C" but skip "B". - // This simple list approach collapses them. - // TO BE EXACT: We should convert "A"->0, "B"->1. - // For PoC we keep this, but in production we need ColumnLetterToIndex logic. for (int i = 0; i < sortedKeys.Count; i++) { @@ -173,15 +198,16 @@ public class ExcelLoader return result; } - private static List FlattenTopHeaders(List headerRows, int startCol) + private static List FlattenTopHeaders(List headerRows, int startCol, int globalMaxCol) { if (headerRows.Count == 0) return new List(); - int maxCol = headerRows.Max(r => r.Length); + // Ensure we cover all data columns, even if headers are short + int maxCol = Math.Max(headerRows.Max(r => r.Length), globalMaxCol); + var flatHeaders = new List(); - var lastValues = new string[headerRows.Count]; // Last value for each ROW level (Horizontal Fill) - // Iterate Columns + var lastValues = new string[headerRows.Count]; for (int c = startCol; c < maxCol; c++) { var parts = new List(); @@ -190,19 +216,17 @@ public class ExcelLoader { string val = (c < headerRows[r].Length) ? headerRows[r][c] : ""; - // Horizontal Forward Fill (Unmerge Logic) - if (string.IsNullOrWhiteSpace(val)) - { - val = lastValues[r]; - } - else - { - lastValues[r] = val; - } + // Horizontal Forward Fill (Re-enabled for Merged Headers) + if (string.IsNullOrWhiteSpace(val)) val = lastValues[r]; + else lastValues[r] = val; if (!string.IsNullOrWhiteSpace(val)) parts.Add(val); } - flatHeaders.Add(string.Join(".", parts)); + // If empty, use "Col_Index" fallback or keep empty? + // User schema usually requires keys. If empty, it's skipped in mapping. + // Let's keep it empty, but if data exists, it won't map unless we have a key. + // If parts is empty, let's leave valid empty string so mapping can decide. + flatHeaders.Add(string.Join("----", parts)); } return flatHeaders; } diff --git a/ExcelKvPoC/Program.cs b/ExcelKvPoC/Program.cs index 381ee95..12c35c3 100644 --- a/ExcelKvPoC/Program.cs +++ b/ExcelKvPoC/Program.cs @@ -123,9 +123,7 @@ class Program await ExcelLoader.ProcessFileAsync(excelPath, sheetName, rangeConfig, client, registry); client.ExecuteBatch(); // Commit - - // Verification Dump - DumpSample(sheetName); + } else { @@ -135,25 +133,4 @@ class Program server.SaveCheckpoint(); Console.WriteLine("Done."); } - - static void DumpSample(string sheetName) - { - Console.WriteLine("\n--- Exporting to sample.txt ---"); - using var redis = StackExchange.Redis.ConnectionMultiplexer.Connect("localhost:3278"); - var serverEnd = redis.GetServer("localhost:3278"); - var db = redis.GetDatabase(); - var keys = serverEnd.Keys(pattern: $"{sheetName}:*"); - - using (var writer = new StreamWriter("sample.txt")) - { - int count = 0; - foreach(var key in keys) - { - string val = db.StringGet(key); - writer.WriteLine($"{key} = {val}"); - count++; - } - Console.WriteLine($"[Export] Written {count} keys to sample.txt"); - } - } } diff --git a/SchemaEditor/Components/App.razor b/SchemaEditor/Components/App.razor index 40404e5..c9531cc 100644 --- a/SchemaEditor/Components/App.razor +++ b/SchemaEditor/Components/App.razor @@ -15,6 +15,16 @@ + diff --git a/SchemaEditor/Components/Layout/NavMenu.razor b/SchemaEditor/Components/Layout/NavMenu.razor index 22a7ba3..7a98ad3 100644 --- a/SchemaEditor/Components/Layout/NavMenu.razor +++ b/SchemaEditor/Components/Layout/NavMenu.razor @@ -1,30 +1,39 @@ 
SchemaEditor +
- - -
+
+@code { + private bool collapseNavMenu = true; + + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + + private void ToggleNavMenu() + { + collapseNavMenu = !collapseNavMenu; + } +} diff --git a/SchemaEditor/Components/Pages/Counter.razor b/SchemaEditor/Components/Pages/Counter.razor deleted file mode 100644 index ba08d04..0000000 --- a/SchemaEditor/Components/Pages/Counter.razor +++ /dev/null @@ -1,19 +0,0 @@ -@page "/counter" -@rendermode InteractiveServer - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/SchemaEditor/Components/Pages/DataExplorer.razor b/SchemaEditor/Components/Pages/DataExplorer.razor new file mode 100644 index 0000000..437f2d4 --- /dev/null +++ b/SchemaEditor/Components/Pages/DataExplorer.razor @@ -0,0 +1,80 @@ +@page "/data" +@using Microsoft.AspNetCore.Components.QuickGrid +@using SchemaEditor.Services +@inject GarnetClientService GarnetClient +@rendermode InteractiveServer + +
+

Data Explorer (Garnet)

+ +
+
+
Query Store
+
+
+
+ Key Pattern + + +
+
Using SCAN/KEYS command. Use specific patterns for performance.
+
+
+ + @if (errorMsg != null) + { +
@errorMsg
+ } + + @if (searchResults != null) + { +
+
+
Results
+ @searchResults.Count keys found +
+
+
+ + + + +
+
+ +
+
+
+ } +
+ +@code { + private string searchPattern = "*"; + private List>? searchResults; + private string? errorMsg; + private PaginationState pagination = new PaginationState { ItemsPerPage = 20 }; + + private async Task SearchKeys() + { + errorMsg = null; + searchResults = null; + try + { + var keys = await GarnetClient.SearchKeysAsync(searchPattern); + var list = new List>(); + + // Fetch values (Bulk get would be better but keeping simple for now) + // Limit to 1000 for safety in PoC UI + foreach (var k in keys.Take(1000)) + { + var val = await GarnetClient.GetValueAsync(k); + list.Add(new KeyValuePair(k, val)); + } + searchResults = list; + } + catch (Exception ex) + { + errorMsg = $"Query failed: {ex.Message}"; + } + } +} diff --git a/SchemaEditor/Components/Pages/Editor.razor b/SchemaEditor/Components/Pages/Editor.razor new file mode 100644 index 0000000..8fd8cba --- /dev/null +++ b/SchemaEditor/Components/Pages/Editor.razor @@ -0,0 +1,486 @@ +@page "/editor" +@using Microsoft.AspNetCore.Components.QuickGrid +@using SchemaEditor.Services +@using ExcelKv.Core +@inject ExcelService ExcelService +@inject GarnetClientService GarnetClient +@inject IJSRuntime JSRuntime +@rendermode InteractiveServer + +
+
+

Standard Schema Editor

+ @if (ExcelService.LoadedData.Any()) + { +
+ @ExcelService.LoadedData.Count keys + +
+ } +
+ + @if (!string.IsNullOrEmpty(errorMessage)) + { + + } + @if (!string.IsNullOrEmpty(successMessage)) + { + + } + + +
+
+
+
+
+
+ + + +
+
+
+
+ +
+
+ +
+
+
+
+ + @if (rawData != null && rawData.Any()) + { + +
+
+
+
+ Top Header +
+
+
+ Start Row + +
+
+
+
+ End Row + +
+
+ +
+ Left Axis +
+
+
+ Start Col + +
+
+
+
+ End Col + +
+
+ + +
+ Limit +
+
+
+ End Row + +
+
+
+
+ End Col + +
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+ RAW PREVIEW +
+
+ + + + + @for (int c = 0; c < (rawData.FirstOrDefault()?.Length ?? 0); c++) + { + bool isSearchMatch = SearchMatch(c, -1); + bool isLeftAxis = c >= config.LeftHeaderStartCol && c < config.LeftHeaderStartCol + config.LeftHeaderWidth; + + + } + + + + @for (int r = 0; r < rawData.Count; r++) + { + bool isHeaderRow = r >= config.TopHeaderStartRow && r < config.TopHeaderStartRow + config.TopHeaderDepth; + bool isDataStartRow = r == config.TopHeaderStartRow + config.TopHeaderDepth; + bool isLimit = (config.DataEndRow.HasValue && r == config.DataEndRow.Value) || (!config.DataEndRow.HasValue && r == rawData.Count - 1); + + + + @{ + int dataStartCol = config.LeftHeaderStartCol + config.LeftHeaderWidth; + bool isDataRowRange = r >= (config.TopHeaderStartRow + config.TopHeaderDepth) && (!config.DataEndRow.HasValue || r <= config.DataEndRow.Value); + } + @for (int c = 0; c < rawData[r].Length; c++) + { + var val = rawData[r][c]; + bool isHighlighted = (r == highlightedRow && c == highlightedCol); + bool isLimitCol = (config.DataEndCol.HasValue && c == config.DataEndCol.Value); + bool isLeftAxisCol = c >= config.LeftHeaderStartCol && c < config.LeftHeaderStartCol + config.LeftHeaderWidth; + bool isDataStartColumn = (c == dataStartCol); + + // Determine cell style based on region + string cellClass = ""; + if (isHighlighted) cellClass = "table-active border border-3 border-danger fw-bold"; + else if (isLimitCol) cellClass = "border-end border-3 border-danger"; + else if (isLeftAxisCol) cellClass = "table-light text-primary"; + else if (isHeaderRow && !isLeftAxisCol) cellClass = "table-primary fw-bold text-center"; + + // Feature: Yellow Data Region Start Line + if (isDataStartColumn && isDataRowRange) + { + cellClass += " border-start border-4 border-warning"; + } + + + } + + } + +
# + @c + @if(isLeftAxis) {
AXIS
} +
+ @if(isLimit) { END } + + + @{ + // Determine if this is the "End" cell + // Rule: It is the End Row. + // And it is either the explicit End Col OR the last column in the row if End Col is null. + bool isVisualEndCol = false; + if (isLimit) + { + if (config.DataEndCol.HasValue) isVisualEndCol = (c == config.DataEndCol.Value); + else isVisualEndCol = (c == rawData[r].Length - 1); + } + } + + @if(isDataStartRow && isDataStartColumn) + { + START + } + @if(isLimit && isVisualEndCol) + { + END + } + + @val +
+
+
+
+ + + @if (ExcelService.LoadedData.Any()) + { +
+
+
+ PARSED RESULT (@FilteredItems.Count() items) +
+ + +
+
+
+
+ + + + + + + + + @foreach (var item in FilteredItems.Take(100)) + { + + + + + } + @if(FilteredItems.Count() > 100) { } + +
KeyValue
@item.Key@item.Value
... showing first 100 of @FilteredItems.Count() (Refine Search) ...
+
+
+
+
+ } +
+ } +
+ +@code { + private string filePath = ""; + private List sampleFiles = new(); + private List sheets = new(); + + protected override void OnInitialized() + { + // Robust discovery: Check multiple possible locations + var currentDir = System.IO.Directory.GetCurrentDirectory(); + + // Candidates: + // 1. Current Dir (if running from repo root) + // 2. Parent Dir (if running from SchemaEditor project root) + // 3. Absolute path fallback (safeguard) + var candidates = new[] { + System.IO.Path.Combine(currentDir, "sample_data"), + System.IO.Path.Combine(currentDir, "..", "sample_data"), + "/home/lectom/repos/design-bim-dogma/sample_data" + }; + + bool found = false; + foreach(var path in candidates) + { + if(System.IO.Directory.Exists(path)) + { + sampleFiles = System.IO.Directory.GetFiles(path, "*.xlsx").ToList(); + if(sampleFiles.Any()) + { + filePath = sampleFiles.First(); + found = true; + // Debug info (console or temp ui) + Console.WriteLine($"[Editor] Found sample_data at: {path}"); + break; + } + } + } + + if(!found) + { + // Fallback for debugging - show where we looked + errorMessage = $"Warning: sample_data not found. Checked: {string.Join(", ", candidates)} (CWD: {currentDir})"; + } + } + + private void OnSampleFileSelected(ChangeEventArgs e) + { + var val = e.Value?.ToString(); + if(!string.IsNullOrEmpty(val)) filePath = val; + } + private string selectedSheet = ""; + private List rawData = new(); + private string? errorMessage; + private string? successMessage; + + // Traceability State + private int highlightedRow = -1; + private int highlightedCol = -1; + + // Search State + private string searchText = ""; + + // IQueryable Source for Filter + private IEnumerable FilteredItems => + string.IsNullOrWhiteSpace(searchText) + ? ExcelService.LoadedData + : ExcelService.LoadedData.Where(x => + { + var terms = searchText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + string k = x.Key ?? ""; + string v = x.Value ?? ""; + return terms.All(t => k.Contains(t, StringComparison.OrdinalIgnoreCase) || v.Contains(t, StringComparison.OrdinalIgnoreCase)); + }); + + private RegionConfig config = new RegionConfig + { + TopHeaderStartRow = 0, + TopHeaderDepth = 3, + LeftHeaderStartCol = 0, + LeftHeaderWidth = 4 + }; + + private async Task HighlightCell(int r, int c) + { + highlightedRow = r; + highlightedCol = c; + StateHasChanged(); + try { + await JSRuntime.InvokeVoidAsync("scrollToElement", $"cell-{r}-{c}"); + } catch { /* Ignore JS errors */ } + } + + private async Task OnPreviewCellDoubleClick(int r, int c) + { + highlightedRow = r; + highlightedCol = c; + + // Reverse Traceability: Find item in LoadedData + if (ExcelService.LoadedData.Any()) + { + var match = ExcelService.LoadedData.FirstOrDefault(x => x.Row == r && x.Col == c); + if (match != null) + { + // To ensure the item is visible in the virtualized/limited list, we filter by its Key + searchText = match.Key; + StateHasChanged(); // Apply filter + + // Wait for render then scroll + await Task.Delay(50); + try { + await JSRuntime.InvokeVoidAsync("scrollToElement", $"result-item-{r}-{c}"); + } catch { /* Ignore */ } + } + } + } + + private bool SearchMatch(int c, int r) + { + // Placeholder for future advanced matrix search highlighting if needed + return false; + } + + private async Task ConnectFile() + { + errorMessage = null; successMessage = null; + try + { + sheets = await ExcelService.GetSheetsAsync(filePath); + if(sheets.Any()) selectedSheet = sheets[0]; + } + catch(Exception ex) + { + errorMessage = $"Connection Failed: {ex.Message}"; + } + } + + private async Task LoadPreview() + { + if (string.IsNullOrEmpty(selectedSheet)) return; + errorMessage = null; successMessage = null; highlightedRow = -1; + try + { + rawData = await ExcelService.GetPreviewAsync(filePath, selectedSheet); + ExcelService.LoadedData.Clear(); + } + catch (Exception ex) + { + errorMessage = $"Preview Failed: {ex.Message}"; + } + } + + private void SetTopRow(int r) + { + if (r >= config.TopHeaderStartRow) + config.TopHeaderDepth = r - config.TopHeaderStartRow + 1; + else { + int oldEnd = config.TopHeaderStartRow + config.TopHeaderDepth - 1; + config.TopHeaderStartRow = r; + config.TopHeaderDepth = oldEnd - r + 1; + } + } + + private void SetLeftCol(int c) + { + if (c >= config.LeftHeaderStartCol) + config.LeftHeaderWidth = c - config.LeftHeaderStartCol + 1; + else { + int oldEnd = config.LeftHeaderStartCol + config.LeftHeaderWidth - 1; + config.LeftHeaderStartCol = c; + config.LeftHeaderWidth = oldEnd - c + 1; + } + } + + private async Task ParseData() + { + errorMessage = null; successMessage = null; highlightedRow = -1; + try + { + await ExcelService.LoadFileAsync(filePath, selectedSheet, config); + successMessage = $"Parsing Complete! {ExcelService.LoadedData.Count} items generated."; + } + catch (Exception ex) + { + errorMessage = $"Parse Failed: {ex.Message}"; + } + } + + private async Task SaveToGarnet() + { + errorMessage = null; successMessage = null; + if(!ExcelService.LoadedData.Any()) return; + + try + { + await ExcelService.SaveToStorageAsync(GarnetClient); + successMessage = $"Saved {ExcelService.LoadedData.Count} items to Garnet."; + } + catch(Exception ex) + { + errorMessage = $"Save Failed: {ex.Message}"; + } + } +} diff --git a/SchemaEditor/Components/Pages/Weather.razor b/SchemaEditor/Components/Pages/Weather.razor deleted file mode 100644 index 33631ab..0000000 --- a/SchemaEditor/Components/Pages/Weather.razor +++ /dev/null @@ -1,64 +0,0 @@ -@page "/weather" -@attribute [StreamRendering] - -Weather - -

Weather

- -

This component demonstrates showing data.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - // Simulate asynchronous loading to demonstrate streaming rendering - await Task.Delay(500); - - var startDate = DateOnly.FromDateTime(DateTime.Now); - var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; - forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = summaries[Random.Shared.Next(summaries.Length)] - }).ToArray(); - } - - private class WeatherForecast - { - public DateOnly Date { get; set; } - public int TemperatureC { get; set; } - public string? Summary { get; set; } - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } -} diff --git a/SchemaEditor/Components/_Imports.razor b/SchemaEditor/Components/_Imports.razor index 72d4b49..8b6464b 100644 --- a/SchemaEditor/Components/_Imports.razor +++ b/SchemaEditor/Components/_Imports.razor @@ -8,3 +8,4 @@ @using Microsoft.JSInterop @using SchemaEditor @using SchemaEditor.Components +@using Microsoft.AspNetCore.Components.QuickGrid diff --git a/SchemaEditor/Program.cs b/SchemaEditor/Program.cs index df0ea48..1a203d1 100644 --- a/SchemaEditor/Program.cs +++ b/SchemaEditor/Program.cs @@ -6,6 +6,10 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddHostedService(); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/SchemaEditor/SchemaEditor.csproj b/SchemaEditor/SchemaEditor.csproj index 13d8127..e467e57 100644 --- a/SchemaEditor/SchemaEditor.csproj +++ b/SchemaEditor/SchemaEditor.csproj @@ -6,4 +6,14 @@ enable + + + + + + + + + + diff --git a/SchemaEditor/Services/ExcelService.cs b/SchemaEditor/Services/ExcelService.cs new file mode 100644 index 0000000..9420b1c --- /dev/null +++ b/SchemaEditor/Services/ExcelService.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ExcelKv.Core; + +namespace SchemaEditor.Services; + +public record ParsedItem(string Key, string Value, int Row, int Col); + +public class InMemoryStorage : IStorageWrapper +{ + public ConcurrentDictionary Data { get; private set; } = new(); + + public Task SetAsync(string key, string value) + { + Data[key] = new ParsedItem(key, value, -1, -1); + return Task.CompletedTask; + } + + public Task SetAsync(string key, string value, int row, int col) + { + Data[key] = new ParsedItem(key, value, row, col); + return Task.CompletedTask; + } + + public Task IncrementAsync(string key, double value) + { + Data[key] = new ParsedItem(key, $"[Metric] {value} (Accumulated)", -1, -1); + return Task.CompletedTask; + } + + public List GetEntries() + { + return Data.Values.OrderBy(x => x.Key).ToList(); + } +} + +public class ExcelService +{ + // Changed to List for metadata access + public List LoadedData { get; private set; } = new(); + + public async Task> GetSheetsAsync(string filePath) + { + return await ExcelLoader.GetSheetNamesAsync(filePath); + } + + public async Task> GetPreviewAsync(string filePath, string sheetName) + { + // Increased limit to 1000 to ensure highlighting works for larger files + return await ExcelLoader.GetPreviewRowsAsync(filePath, sheetName, 1000); + } + + public async Task LoadFileAsync(string filePath, string sheetName, RegionConfig config) + { + var storage = new InMemoryStorage(); + var registry = new SchemaRegistry(); + + await ExcelLoader.ProcessFileAsync(filePath, sheetName, config, storage, registry); + + LoadedData = storage.GetEntries(); + } + + public async Task SaveToStorageAsync(IStorageWrapper targetStorage) + { + foreach (var entry in LoadedData) + { + await targetStorage.SetAsync(entry.Key, entry.Value); + } + } +} diff --git a/SchemaEditor/Services/GarnetClientService.cs b/SchemaEditor/Services/GarnetClientService.cs new file mode 100644 index 0000000..6580c34 --- /dev/null +++ b/SchemaEditor/Services/GarnetClientService.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using StackExchange.Redis; +using ExcelKv.Core; + +namespace SchemaEditor.Services; + +public class GarnetClientService : IStorageWrapper, IDisposable +{ + private ConnectionMultiplexer _redis; + private IDatabase _db; + + public bool IsConnected => _redis != null && _redis.IsConnected; + + public void Connect(string connectionString = "localhost:3187") + { + if (_redis == null || !_redis.IsConnected) + { + _redis = ConnectionMultiplexer.Connect(connectionString); + _db = _redis.GetDatabase(); + } + } + + public async Task SetAsync(string key, string value) + { + if (_db == null) Connect(); + await _db.StringSetAsync(key, value); + } + + public async Task SetAsync(string key, string value, int row, int col) + { + // For Garnet, we currently only store Key-Value string. + // Traceability metadata (row, col) could be stored in a hash or side key if needed. + // For now, we just proceed with standard storage. + if (_db == null) Connect(); + await _db.StringSetAsync(key, value); + } + + public async Task IncrementAsync(string key, double value) + { + if (_db == null) Connect(); + await _db.StringIncrementAsync(key, value); + } + + // For Data Explorer + public async Task> SearchKeysAsync(string pattern) + { + if (_db == null) Connect(); + var server = _redis.GetServer(_redis.GetEndPoints().First()); + // Use Keys for simplicity in Schema Editor (low traffic) + // In high production, use SCAN + var keys = server.Keys(pattern: pattern).Select(k => k.ToString()).ToList(); + return await Task.FromResult(keys); + } + + public async Task GetValueAsync(string key) + { + if (_db == null) Connect(); + return await _db.StringGetAsync(key); + } + + public void Dispose() + { + _redis?.Dispose(); + } +} diff --git a/SchemaEditor/Services/GarnetHost.cs b/SchemaEditor/Services/GarnetHost.cs new file mode 100644 index 0000000..5401401 --- /dev/null +++ b/SchemaEditor/Services/GarnetHost.cs @@ -0,0 +1,40 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Garnet; + +namespace SchemaEditor.Services; + +public class GarnetHost : IHostedService, IDisposable +{ + private GarnetServer? _server; + + public Task StartAsync(CancellationToken cancellationToken) + { + try + { + var serverArgs = new string[] { "--port", "3187" }; // Changed to 3187 + _server = new GarnetServer(serverArgs); + _server.Start(); + Console.WriteLine("[GarnetHost] Server started on port 3278"); + } + catch (Exception ex) + { + Console.WriteLine($"[GarnetHost] Failed to start: {ex.Message}"); + } + return Task.CompletedTask; + } + + public Task StopAsync(CancellationToken cancellationToken) + { + _server?.Dispose(); + Console.WriteLine("[GarnetHost] Server stopped"); + return Task.CompletedTask; + } + + public void Dispose() + { + _server?.Dispose(); + } +}