From 88887805474a154c4ab8e7fc00d4c2146cdbbe4b Mon Sep 17 00:00:00 2001 From: James Friel Date: Tue, 11 Mar 2025 16:22:31 +0000 Subject: [PATCH 1/2] lock down pipelines --- CHANGELOG.md | 1 + Directory.Packages.props | 4 ++-- .../PipelineUIs/Pipelines/PipelineSelectionUI.cs | 7 +++++++ Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs | 13 +++++++++++++ Rdmp.UI/SimpleDialogs/InstanceSettings.cs | 1 + 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd371dc26b..5297b89e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [8.4.4] - Ureleased - Re-add AggregateGraph functionality +- Add ability to show/hide quick edit pipeline controls during extractions ## [8.4.3] - 2025-02-24 diff --git a/Directory.Packages.props b/Directory.Packages.props index 7e5f44da47..17e090dee0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -21,7 +21,7 @@ - + @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs index 215338fbf2..fb571ef2bc 100644 --- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs +++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs @@ -13,6 +13,7 @@ using Rdmp.Core.DataExport.Data; using Rdmp.Core.Repositories; using Rdmp.Core.ReusableLibraryCode.Annotations; +using Rdmp.Core.Setting; using Rdmp.UI.ItemActivation; namespace Rdmp.UI.PipelineUIs.Pipelines; @@ -130,6 +131,12 @@ public PipelineSelectionUI(IActivateItems activator, IPipelineUseCase useCase, I ddPipelines.DrawMode = DrawMode.OwnerDrawFixed; ddPipelines.DrawItem += cmb_Type_DrawItem; + var showButtonsSetting = activator.RepositoryLocator.CatalogueRepository.GetAllObjects().FirstOrDefault(static s => s.Key == "ExtracttonPipelineQuickEdit"); + var showbuttons = showButtonsSetting != null && Convert.ToBoolean(showButtonsSetting.Value); + btnClonePipeline.Visible = showbuttons; + btnCreateNewPipeline.Visible = showbuttons; + btnDeletePipeline.Visible = showbuttons; + btnEditPipeline.Visible = showbuttons; } private void cmb_Type_DrawItem(object sender, DrawItemEventArgs e) diff --git a/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs b/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs index d2ea41272e..d183138d9c 100644 --- a/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs +++ b/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() label1 = new System.Windows.Forms.Label(); cbCohortVersioningOnCommit = new System.Windows.Forms.CheckBox(); cbYesNoAll = new System.Windows.Forms.CheckBox(); + cbExtracttonPipelineQuickEdit = new System.Windows.Forms.CheckBox(); SuspendLayout(); // // cbAutoSuggestProjectNumbers @@ -77,11 +78,22 @@ private void InitializeComponent() cbYesNoAll.UseVisualStyleBackColor = true; cbYesNoAll.CheckedChanged += checkBox1_CheckedChanged; // + // cbExtracttonPipelineQuickEdit + // + cbExtracttonPipelineQuickEdit.AutoSize = true; + cbExtracttonPipelineQuickEdit.Location = new System.Drawing.Point(13, 115); + cbExtracttonPipelineQuickEdit.Name = "cbExtracttonPipelineQuickEdit"; + cbExtracttonPipelineQuickEdit.Size = new System.Drawing.Size(366, 19); + cbExtracttonPipelineQuickEdit.TabIndex = 5; + cbExtracttonPipelineQuickEdit.Text = "Show Pipeline Clone/Edit functionality from within an extraction"; + cbExtracttonPipelineQuickEdit.UseVisualStyleBackColor = true; + // // InstanceSettings // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; ClientSize = new System.Drawing.Size(800, 450); + Controls.Add(cbExtracttonPipelineQuickEdit); Controls.Add(cbYesNoAll); Controls.Add(cbCohortVersioningOnCommit); Controls.Add(label1); @@ -99,5 +111,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox cbCohortVersioningOnCommit; private System.Windows.Forms.CheckBox cbYesNoAll; + private System.Windows.Forms.CheckBox cbExtracttonPipelineQuickEdit; } } \ No newline at end of file diff --git a/Rdmp.UI/SimpleDialogs/InstanceSettings.cs b/Rdmp.UI/SimpleDialogs/InstanceSettings.cs index 6dfbad2697..8d95c38d8d 100644 --- a/Rdmp.UI/SimpleDialogs/InstanceSettings.cs +++ b/Rdmp.UI/SimpleDialogs/InstanceSettings.cs @@ -28,6 +28,7 @@ public InstanceSettings(IActivateItems activator) RegisterCheckbox(cbAutoSuggestProjectNumbers, "AutoSuggestProjectNumbers"); RegisterCheckbox(cbCohortVersioningOnCommit, "PromptForVersionOnCohortCommit"); RegisterCheckbox(cbYesNoAll, "ToggleYestoAllNotoAlldataloadcheck"); + RegisterCheckbox(cbExtracttonPipelineQuickEdit, "ExtracttonPipelineQuickEdit"); _loaded = true; } From b989683431cf929d0e7ffd27f2b586adaa2b96ef Mon Sep 17 00:00:00 2001 From: James Friel Date: Wed, 12 Mar 2025 09:48:58 +0000 Subject: [PATCH 2/2] fix typo --- .../Pipelines/PipelineSelectionUI.cs | 2 +- .../InstanceSettings.Designer.cs | 22 +++++++++---------- Rdmp.UI/SimpleDialogs/InstanceSettings.cs | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs index fb571ef2bc..5946b2a5a2 100644 --- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs +++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs @@ -131,7 +131,7 @@ public PipelineSelectionUI(IActivateItems activator, IPipelineUseCase useCase, I ddPipelines.DrawMode = DrawMode.OwnerDrawFixed; ddPipelines.DrawItem += cmb_Type_DrawItem; - var showButtonsSetting = activator.RepositoryLocator.CatalogueRepository.GetAllObjects().FirstOrDefault(static s => s.Key == "ExtracttonPipelineQuickEdit"); + var showButtonsSetting = activator.RepositoryLocator.CatalogueRepository.GetAllObjects().FirstOrDefault(static s => s.Key == "ExtractionPipelineQuickEdit"); var showbuttons = showButtonsSetting != null && Convert.ToBoolean(showButtonsSetting.Value); btnClonePipeline.Visible = showbuttons; btnCreateNewPipeline.Visible = showbuttons; diff --git a/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs b/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs index d183138d9c..2dfb29faf9 100644 --- a/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs +++ b/Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs @@ -34,7 +34,7 @@ private void InitializeComponent() label1 = new System.Windows.Forms.Label(); cbCohortVersioningOnCommit = new System.Windows.Forms.CheckBox(); cbYesNoAll = new System.Windows.Forms.CheckBox(); - cbExtracttonPipelineQuickEdit = new System.Windows.Forms.CheckBox(); + cbExtractionPipelineQuickEdit = new System.Windows.Forms.CheckBox(); SuspendLayout(); // // cbAutoSuggestProjectNumbers @@ -78,22 +78,22 @@ private void InitializeComponent() cbYesNoAll.UseVisualStyleBackColor = true; cbYesNoAll.CheckedChanged += checkBox1_CheckedChanged; // - // cbExtracttonPipelineQuickEdit + // cbExtractionPipelineQuickEdit // - cbExtracttonPipelineQuickEdit.AutoSize = true; - cbExtracttonPipelineQuickEdit.Location = new System.Drawing.Point(13, 115); - cbExtracttonPipelineQuickEdit.Name = "cbExtracttonPipelineQuickEdit"; - cbExtracttonPipelineQuickEdit.Size = new System.Drawing.Size(366, 19); - cbExtracttonPipelineQuickEdit.TabIndex = 5; - cbExtracttonPipelineQuickEdit.Text = "Show Pipeline Clone/Edit functionality from within an extraction"; - cbExtracttonPipelineQuickEdit.UseVisualStyleBackColor = true; + cbExtractionPipelineQuickEdit.AutoSize = true; + cbExtractionPipelineQuickEdit.Location = new System.Drawing.Point(13, 115); + cbExtractionPipelineQuickEdit.Name = "cbExtractionPipelineQuickEdit"; + cbExtractionPipelineQuickEdit.Size = new System.Drawing.Size(366, 19); + cbExtractionPipelineQuickEdit.TabIndex = 5; + cbExtractionPipelineQuickEdit.Text = "Show Pipeline Clone/Edit functionality from within an extraction"; + cbExtractionPipelineQuickEdit.UseVisualStyleBackColor = true; // // InstanceSettings // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; ClientSize = new System.Drawing.Size(800, 450); - Controls.Add(cbExtracttonPipelineQuickEdit); + Controls.Add(cbExtractionPipelineQuickEdit); Controls.Add(cbYesNoAll); Controls.Add(cbCohortVersioningOnCommit); Controls.Add(label1); @@ -111,6 +111,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox cbCohortVersioningOnCommit; private System.Windows.Forms.CheckBox cbYesNoAll; - private System.Windows.Forms.CheckBox cbExtracttonPipelineQuickEdit; + private System.Windows.Forms.CheckBox cbExtractionPipelineQuickEdit; } } \ No newline at end of file diff --git a/Rdmp.UI/SimpleDialogs/InstanceSettings.cs b/Rdmp.UI/SimpleDialogs/InstanceSettings.cs index 8d95c38d8d..01b22ea163 100644 --- a/Rdmp.UI/SimpleDialogs/InstanceSettings.cs +++ b/Rdmp.UI/SimpleDialogs/InstanceSettings.cs @@ -28,7 +28,7 @@ public InstanceSettings(IActivateItems activator) RegisterCheckbox(cbAutoSuggestProjectNumbers, "AutoSuggestProjectNumbers"); RegisterCheckbox(cbCohortVersioningOnCommit, "PromptForVersionOnCohortCommit"); RegisterCheckbox(cbYesNoAll, "ToggleYestoAllNotoAlldataloadcheck"); - RegisterCheckbox(cbExtracttonPipelineQuickEdit, "ExtracttonPipelineQuickEdit"); + RegisterCheckbox(cbExtractionPipelineQuickEdit, "ExtractionPipelineQuickEdit"); _loaded = true; }