admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-12-12 01:16:34 +00:00
parent 2d444e1116
commit f65a24e272
13 changed files with 148 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -18,7 +18,7 @@ namespace AyaNova.DataList
// Get the data list data requested
//
//
internal static async Task<ApiDataListResponse> GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, AuthorizationRoles UserRoles, ILogger log)
internal static async Task<ApiDataListResponse> GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, AuthorizationRoles UserRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(DataListKey);
@@ -27,6 +27,7 @@ namespace AyaNova.DataList
if (DataList == null)
throw new System.ArgumentOutOfRangeException($"DataList \"{DataListKey}\" specified does not exist");
//check rights
if (!UserRoles.HasAnyFlags(DataList.AllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
@@ -39,8 +40,20 @@ namespace AyaNova.DataList
//This one is for the return list to the Client for grid column display
var PublicListViewArray = JArray.Parse(listOptions.ListView);
//this one is for internal use here to build the filter and sort etc
var InternalListViewArray = JArray.Parse(listOptions.ListView);
//Hard coded extra criteria from server end
if (DataList is IAyaDataListViewServerCriteria)
{
var ServerCriteriaListView = ((IAyaDataListViewServerCriteria)DataList).ListViewServerCriteria(userId);
foreach (JToken jt in ServerCriteriaListView)
InternalListViewArray.Add(jt);
}
//Hard coded extra criteria from Client end
var MetaListViewArray = JArray.Parse(listOptions.MetaView ?? "[]");
foreach (JToken jt in MetaListViewArray)
InternalListViewArray.Add(jt);
@@ -216,13 +229,15 @@ namespace AyaNova.DataList
// Get a list of id's of the datalist results for reporting
//
//
internal static async Task<long[]> GetIdListResponseAsync(string dataListKey, string listView, string metaListView, AyContext ct, AuthorizationRoles userRoles, ILogger log)
internal static async Task<long[]> GetIdListResponseAsync(string dataListKey, string listView, string metaListView, AyContext ct, AuthorizationRoles userRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(dataListKey);
//was the name not found as a list?
if (DataList == null)
throw new System.ArgumentOutOfRangeException($"DataList \"{dataListKey}\" specified does not exist");
//check rights
if (!userRoles.HasAnyFlags(DataList.AllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
@@ -234,6 +249,17 @@ namespace AyaNova.DataList
//parse the list view
var ListViewArray = JArray.Parse(listView);
//Hard coded extra criteria from server end
if (DataList is IAyaDataListViewServerCriteria)
{
var ServerCriteriaListView = ((IAyaDataListViewServerCriteria)DataList).ListViewServerCriteria(userId);
foreach (JToken jt in ServerCriteriaListView)
ListViewArray.Add(jt);
}
//Hard coded extra criteria from Client end
//parse and combine any additional listview hard coded from Client UI
var MetaListViewArray = JArray.Parse(metaListView ?? "[]");
foreach (JToken jt in MetaListViewArray)
ListViewArray.Add(jt);