From d18ed349af2bcab9dd7c5f64424e85b8bb1add25 Mon Sep 17 00:00:00 2001
From: viogroza <viorel.groza@uipath.com>
Date: Wed, 18 Dec 2024 14:07:33 +0200
Subject: [PATCH] FTP: FTP Proxy (25.2) [STUD-64417]

Make the proxy properties visible also on windows and cross-platform
---
 .../ViewModels/WithFtpSessionViewModel.cs     | 25 +++++++++
 .../UiPath.FTP.Activities.Designer.cs         |  2 +-
 .../Properties/UiPath.FTP.Activities.resx     | 56 +++++++++----------
 .../Resources/ActivitiesMetadata.json         | 55 ++++++++++++++++++
 4 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs b/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs
index 1a5f6525..eab69116 100644
--- a/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs
+++ b/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs
@@ -102,6 +102,31 @@ public WithFtpSessionViewModel(IDesignServices services) : base(services)
         /// </summary>
         public DesignInArgument<bool> ContinueOnError { get; set; }
 
+        /// <summary>
+        /// The type of proxy used
+        /// </summary>
+        public DesignProperty<FtpProxyType> ProxyType { get; set; }
+
+        /// <summary>
+        /// The proxy host
+        /// </summary>
+        public DesignInArgument<string> ProxyServer { get; set; }
+
+        /// <summary>
+        /// The proxy port
+        /// </summary>
+        public DesignInArgument<int> ProxyPort { get; set; }
+
+        /// <summary>
+        /// User used for proxy authentification
+        /// </summary>
+        public DesignInArgument<string> ProxyUser { get; set; }
+
+        /// <summary>
+        /// Password for proxy
+        /// </summary>
+        public DesignInArgument<string> ProxyPassword { get; set; }
+
         private static DataSource<FtpSslProtocols> _sslProtocolsDataSource;
 
         protected override void InitializeModel()
diff --git a/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.Designer.cs b/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.Designer.cs
index ca805bb9..ddd9d6b9 100644
--- a/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.Designer.cs
+++ b/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.Designer.cs
@@ -880,7 +880,7 @@ public static string Activity_WithFtpSession_Property_ProxyType_Description {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to  Proxy Type.
+        ///   Looks up a localized string similar to Proxy Type.
         /// </summary>
         public static string Activity_WithFtpSession_Property_ProxyType_Name {
             get {
diff --git a/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.resx b/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.resx
index 70923b29..3a11d556 100644
--- a/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.resx
+++ b/Activities/FTP/UiPath.FTP.Activities/Properties/UiPath.FTP.Activities.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -738,7 +738,7 @@
     <value>The type of proxy</value>
   </data>
   <data name="Activity_WithFtpSession_Property_ProxyType_Name" xml:space="preserve">
-    <value> Proxy Type</value>
+    <value>Proxy Type</value>
   </data>
   <data name="Activity_WithFtpSession_Property_ProxyUser_Description" xml:space="preserve">
     <value>The user used for proxy if authentication is required</value>
diff --git a/Activities/FTP/UiPath.FTP.Activities/Resources/ActivitiesMetadata.json b/Activities/FTP/UiPath.FTP.Activities/Resources/ActivitiesMetadata.json
index cdbfcb4f..4c8885b1 100644
--- a/Activities/FTP/UiPath.FTP.Activities/Resources/ActivitiesMetadata.json
+++ b/Activities/FTP/UiPath.FTP.Activities/Resources/ActivitiesMetadata.json
@@ -477,6 +477,61 @@
           "IsRequired": false,
           "IsPrincipal": false,
           "IsVisible": true
+        },
+        {
+          "Name": "ProxyType",
+          "DisplayNameKey": "Activity_WithFtpSession_Property_ProxyType_Name",
+          "TooltipKey": "Activity_WithFtpSession_Property_ProxyType_Description",
+          "IsRequired": false,
+          "IsPrincipal": false,
+          "IsVisible": true,
+          "Category": {
+            "DisplayNameKey": "Proxy"
+          }
+        },
+        {
+          "Name": "ProxyServer",
+          "DisplayNameKey": "Activity_WithFtpSession_Property_ProxyServer_Name",
+          "TooltipKey": "Activity_WithFtpSession_Property_ProxyServer_Description",
+          "IsRequired": false,
+          "IsPrincipal": false,
+          "IsVisible": true,
+          "Category": {
+            "DisplayNameKey": "Proxy"
+          }
+        },
+        {
+          "Name": "ProxyPort",
+          "DisplayNameKey": "Activity_WithFtpSession_Property_ProxyPort_Name",
+          "TooltipKey": "Activity_WithFtpSession_Property_ProxyPort_Description",
+          "IsRequired": false,
+          "IsPrincipal": false,
+          "IsVisible": true,
+          "Category": {
+            "DisplayNameKey": "Proxy"
+          }
+        },
+        {
+          "Name": "ProxyUser",
+          "DisplayNameKey": "Activity_WithFtpSession_Property_ProxyUser_Name",
+          "TooltipKey": "Activity_WithFtpSession_Property_ProxyUser_Description",
+          "IsRequired": false,
+          "IsPrincipal": false,
+          "IsVisible": true,
+          "Category": {
+            "DisplayNameKey": "Proxy"
+          }
+        },
+        {
+          "Name": "ProxyPassword",
+          "DisplayNameKey": "Activity_WithFtpSession_Property_ProxyPassword_Name",
+          "TooltipKey": "Activity_WithFtpSession_Property_ProxyPassword_Description",
+          "IsRequired": false,
+          "IsPrincipal": false,
+          "IsVisible": true,
+          "Category": {
+            "DisplayNameKey": "Proxy"
+          }
         }
       ],
       "ViewModelType": "UiPath.FTP.Activities.NetCore.ViewModels.WithFtpSessionViewModel"