server/AyaNova/biz/UnitModelBiz.cs

@@ -290,6 +290,8 @@ namespace AyaNova.Biz
                 var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
                 foreach (UnitModel w in orderedList)
                 {
+                    if (DateTime.UtcNow > renderTimeOutExpiry)
+                        throw new ReportRenderTimeOutException();
                     await PopulateVizFields(w);
                     var jo = JObject.FromObject(w);
                     if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))