Merge branch 'develop' into 7272-DecisionVariablesNotInVariableList

Author: yogeshrajpurohit-dev2

Dev/Dev2.Activities.Designers/Utils/DropEnabledActivityDesignerUtils.cs

@@ -32,7 +32,15 @@ public bool LimitDragDropOptions(IDataObject data)
             {
                 return true;
             }
-            var modelItemString = formats.FirstOrDefault(s => s.IndexOf("WorkflowItemTypeNameFormat", StringComparison.Ordinal) >= 0);
+            var modelItemString = formats.FirstOrDefault(s => s.IndexOf("ModelItemFormat", StringComparison.Ordinal) >= 0);
+            if (string.IsNullOrEmpty(modelItemString))
+            {
+                modelItemString = formats.FirstOrDefault(s => s.IndexOf("WorkflowItemTypeNameFormat", StringComparison.Ordinal) >= 0);
+                if (string.IsNullOrEmpty(modelItemString))
+                {
+                    return true;
+                }
+            }
             var objectData = data.GetData(modelItemString);
             return DropPointOnDragEnter(objectData);
         }

Dev/Dev2.Intellisense/Provider/DefaultIntellisenseProvider.cs

@@ -83,7 +83,7 @@ public IList<IntellisenseProviderResult> GetIntellisenseResults(IntellisenseProv
                 return new List<IntellisenseProviderResult>();
             }
 
-            return DataListSingleton.ActiveDataList.Provider.GetSuggestions(context.InputText, context.CaretPosition, true, context.FilterType).Select(a => new IntellisenseProviderResult(this, a, String.Empty)).ToList();
+            return DataListSingleton.ActiveDataList?.Provider.GetSuggestions(context.InputText, context.CaretPosition, true, context.FilterType).Select(a => new IntellisenseProviderResult(this, a, String.Empty)).ToList();
 
         }
 

Dev/Dev2.Studio.Core/AppResources/Repositories/ServerRepository.cs

@@ -476,7 +476,7 @@ static List<IServer> LookupEnvironments(IServer defaultEnvironment, List<IServer
             {
                 foreach (var connection in servers)
                 {
-                    if (!string.IsNullOrEmpty(connection.Address) && !string.IsNullOrEmpty(connection.WebAddress))
+                    if (!string.IsNullOrEmpty(connection?.Address) && !string.IsNullOrEmpty(connection?.WebAddress))
                     {
                         var environmentModel = CreateEnvironmentModel(connection);
                         result.Add(environmentModel);

Dev/Dev2.Studio/ViewModels/Help/HelpViewWrapper.cs

@@ -60,15 +60,15 @@ public Visibility CircularProgressBarVisibility
         public void Navigate(string uri)
         {
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Ssl3;
-            var path = Path.Combine(Environment.ExpandEnvironmentVariables("%localappdata%\\Warewolf"), _pathFolder);
+            var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Warewolf", _pathFolder);
             if (!Directory.Exists(path))
             {
-                CopyWebView2(Path.Combine(Directory.GetCurrentDirectory(), _pathFolder), path);
+                CopyWebView2(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), _pathFolder), path);
             }
             HelpView.webView.CreationProperties = new CoreWebView2CreationProperties
             {
                 BrowserExecutableFolder = path,
-                UserDataFolder = Environment.ExpandEnvironmentVariables("%localappdata%\\Warewolf")
+                UserDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Warewolf")
             };
             HelpView.webView.Source = new Uri(uri, UriKind.Absolute);
         }