Fixes #99 Adds copy-paste dialog for pull-secret

crc-org · Jul 13, 2021 · 0e72d48 · 0e72d48
1 parent 757f578
commit 0e72d48
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 188 deletions.
diff --git a/CRCTray.cs b/CRCTray.cs
@@ -236,20 +236,16 @@ async private void StartMenu_Click(object sender, EventArgs e)
 
             if (!pullsecret)
             {
-                var pullSecretForm = new PullSecretPickerForm();
-                var pullSecretPath = pullSecretForm.ShowFilePicker();
-                if (pullSecretPath == String.Empty)
+                var pullSecretForm = new PullSecretForm();
+                pullSecretForm.ShowDialog();
+                var pullSecretContent = pullSecretForm.PullSecret;
+                if (pullSecretContent == String.Empty)
                 {
                     TrayIcon.NotifyWarn(@"No Pull Secret was provided, Cannot start cluster without pull secret.");
                     return;
                 }
-                Dictionary<String, dynamic> pullSecretConfig = new Dictionary<String, dynamic>
-                {
-                    ["pull-secret-file"] = pullSecretPath
-                };
 
-                string data = File.ReadAllText(pullSecretPath);
-                await TaskHelpers.TryTaskAndNotify(TaskHandlers.SetPullSecret, data,
+                await TaskHelpers.TryTaskAndNotify(TaskHandlers.SetPullSecret, pullSecretContent,
                     "Pull Secret stored",
                     "Pull Secret not stored",
                     String.Empty);

diff --git a/Forms/PullSecretForm.Designer.cs b/Forms/PullSecretForm.Designer.cs
diff --git a/Forms/PullSecretPickerForm.cs → Forms/PullSecretForm.cs b/Forms/PullSecretPickerForm.cs → Forms/PullSecretForm.cs
@@ -11,12 +11,14 @@
 
 namespace CRCTray
 {
-    public partial class PullSecretPickerForm : Form
+    public partial class PullSecretForm : Form
     {
-        string pullSecretPath = "";
-        public PullSecretPickerForm()
+
+        public PullSecretForm()
         {
             InitializeComponent();
+
+            PullSecret = String.Empty;
         }
 
         private void PullSecretPicker_Load(object sender, EventArgs e)
@@ -25,26 +27,15 @@ private void PullSecretPicker_Load(object sender, EventArgs e)
             Icon = Icon.FromHandle(bm.GetHicon());
         }
 
-        private void BrowseButton_Click(object sender, EventArgs e)
-        {
-            browseFile.ShowDialog();
-            if (browseFile.FileName != "")
-            { 
-                pullSecretPath = browseFile.FileName;
-                pullSecretPathTextField.Text = pullSecretPath;
-            }
-
-            Console.WriteLine("Selected file: {0}", pullSecretPath);
-        }
-
-        public String ShowFilePicker()
+        public String PullSecret
         {
-            base.ShowDialog();
-            return pullSecretPath;
+            get;
+            set;
         }
 
         private void okButton_Click(object sender, EventArgs e)
         {
+            PullSecret = textBox1.Text;
             Hide();
         }
 

diff --git a/Forms/PullSecretPickerForm.resx → Forms/PullSecretForm.resx b/Forms/PullSecretPickerForm.resx → Forms/PullSecretForm.resx
diff --git a/Forms/PullSecretPickerForm.Designer.cs b/Forms/PullSecretPickerForm.Designer.cs
diff --git a/crc-tray.csproj b/crc-tray.csproj
@@ -249,11 +249,11 @@
     <Compile Include="Forms\AboutForm.Designer.cs">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\PullSecretPickerForm.cs">
+    <Compile Include="Forms\PullSecretForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\PullSecretPickerForm.Designer.cs">
-      <DependentUpon>PullSecretPickerForm.cs</DependentUpon>
+    <Compile Include="Forms\PullSecretForm.Designer.cs">
+      <DependentUpon>PullSecretForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Helpers\DaemonLauncher.cs" />
     <Compile Include="Helpers\Handlers.cs" />
@@ -287,8 +287,8 @@
     <EmbeddedResource Include="Forms\CrcSettingsForm.resx">
       <DependentUpon>CrcSettingsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\PullSecretPickerForm.resx">
-      <DependentUpon>PullSecretPickerForm.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\PullSecretForm.resx">
+      <DependentUpon>PullSecretForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\StatusForm.resx">
       <DependentUpon>StatusForm.cs</DependentUpon>