Fixed dynamic input

bb-io · Mar 21, 2024 · 55121dc · 55121dc
1 parent 3a401d8
commit 55121dc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Apps.Memoq/DataSourceHandlers/UserDataHandler.cs b/Apps.Memoq/DataSourceHandlers/UserDataHandler.cs
@@ -29,8 +29,16 @@ public Dictionary<string, string> GetData(DataSourceContext context)
         }
 
         return users
-            .Where(x => context.SearchString is null ||
-                        x.FullName.Contains(context.SearchString, StringComparison.OrdinalIgnoreCase))
+            .Where(x =>
+            {
+                if (context.SearchString is null)
+                {
+                    return true;
+                }
+
+                var name = x.FullName ?? x.UserName;
+                return name.Contains(context.SearchString, StringComparison.OrdinalIgnoreCase);
+            })
             .Take(20)
             .ToDictionary(x => x.UserGuid.ToString(), x => x.FullName ?? x.UserName);
     }