dont redact pks

HicServices · Dec 11, 2023 · 6a7e640 · 6a7e640
1 parent da567f7
commit 6a7e640
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandIdentifyCHIInCatalogue.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandIdentifyCHIInCatalogue.cs
@@ -30,6 +30,7 @@ public class ExecuteCommandIdentifyCHIInCatalogue : BasicCommandExecution, IAtom
     private bool _bailOutEarly;
     private readonly Dictionary<string, List<string>> _allowLists = new();
 
+    //TODO don;t show PKs
     public ExecuteCommandIdentifyCHIInCatalogue(IBasicActivateItems activator, [DemandsInitialization("The catalogue to search")] ICatalogue catalogue, bool bailOutEarly = false, string allowListLocation = null) : base(activator)
     {
         _catalouge = catalogue;
@@ -58,6 +59,8 @@ public static string WrapCHIInContext(string chi, string source, int padding = 2
 
     private void handleFoundCHI(string foundChi, string contextValue, string columnName, string pkValue, string pkColumn)
     {
+        if (pkColumn.Split(".").Last().Replace("[", "").Replace("]", "") == columnName.Replace("[", "").Replace("]", "")) return; //don't redact PKs, it gets messy
+        //^TODO check this works and doesn;t need to munge the []^
         if (foundChis.Rows.Count == 0)
         {
             //init

diff --git a/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs b/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs
@@ -45,8 +45,8 @@ public ExecuteCommandPasteClipboardAsNewCatalogueItems(IBasicActivateItems activ
         _clipboardContentGetter = clipboardContentGetter;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
-        iconProvider.GetImage(RDMPConcept.Clipboard, OverlayKind.Import);
+    //public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+    //    iconProvider.GetImage(RDMPConcept.Clipboard, OverlayKind.Import);
 
     public override void Execute()
     {

diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteCHIRedactionStage.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteCHIRedactionStage.cs
@@ -100,10 +100,13 @@ in dt.Columns.Cast<DataColumn>()
                         }
                         var ft = tbl.GetFullyQualifiedName().Replace("_RAW", ""); //TODO
                         ft = ft.Replace("..", ".[dbo].");
-                        var rc = new RedactedCHI(_job.RepositoryLocator.CatalogueRepository, foundChi, replacementIdex, ft, pkValue, pkColumnName.Split(".").Last(), $"[{col.ColumnName}]");
-                        rc.SaveToDatabase();
-                        var redactionString = "##########";
-                        row[col] = row[col].ToString().Replace(foundChi, redactionString.Substring(0, Math.Min(foundChi.Length, redactionString.Length)));
+                        if (pkColumnName.Split(".").Last().Replace("[","").Replace("]","") != $"{col.ColumnName}")
+                        {
+                            var rc = new RedactedCHI(_job.RepositoryLocator.CatalogueRepository, foundChi, replacementIdex, ft, pkValue, pkColumnName.Split(".").Last(), $"[{col.ColumnName}]");
+                            rc.SaveToDatabase();
+                            var redactionString = "##########";
+                            row[col] = row[col].ToString().Replace(foundChi, redactionString.Substring(0, Math.Min(foundChi.Length, redactionString.Length)));
+                        }
                     }
                     else
                     {

diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueToDatasetUI.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueToDatasetUI.cs
@@ -49,6 +49,6 @@ public override void Execute()
         cmd.Execute();
     }
 
-    public override Image<Rgba32> GetImage([NotNull] IIconProvider iconProvider) =>
-        iconProvider.GetImage(RDMPConcept.Dataset, OverlayKind.Link);
+    //public override Image<Rgba32> GetImage([NotNull] IIconProvider iconProvider) =>
+    //    iconProvider.GetImage(RDMPConcept.Dataset, OverlayKind.Link);
 }
diff --git a/Rdmp.UI/SimpleDialogs/RedactChisInCatalogueDialog.cs b/Rdmp.UI/SimpleDialogs/RedactChisInCatalogueDialog.cs
@@ -53,11 +53,11 @@ private void Redact(int rowIndex)
             var pkColumn = result.ItemArray[4].ToString();
             var replacementIdex = int.Parse(result.ItemArray[5].ToString());
             var table = name.Replace($".[{column}]", "");
-            var rc = new RedactedCHI(_catalogue.CatalogueRepository, foundChi, replacementIdex, table, pkValue,"TODO", $"[{column}]");
+            var rc = new RedactedCHI(_catalogue.CatalogueRepository, foundChi, replacementIdex, table, pkValue,pkColumn, $"[{column}]");
             rc.SaveToDatabase();
 
             var redactedString = new string('#', foundChi.Length);
-            var fetchSQL = $"select {column} from {table} where {pkColumn} = '{pkValue}' and charindex('{foundChi}',{column},{replacementIdex}) >0";
+            var fetchSQL = $"select TOP 1 {column} from {table} where {pkColumn} = '{pkValue}' and charindex('{foundChi}',{column},{replacementIdex}) >0";
             var existingResultsDT = new DataTable();
             var columnInfo = _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ColumnInfo>().Where(ci => ci.Name == $"{table}.[{column}]").First();
             var catalogue = columnInfo.CatalogueItems.FirstOrDefault().Catalogue;
@@ -93,6 +93,9 @@ private void handleClick(object sender, DataGridViewCellEventArgs e)
 
         private void ShowResults()
         {
+            if(_results.Rows.Count ==0) { 
+                //TODO show a 'no results found' message
+            }
             dgResults.DataSource = _results;
             DataGridViewButtonColumn confirmColumn = new DataGridViewButtonColumn();
             confirmColumn.Text = "Redact";