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-02-13 22:18:25 +00:00
parent 684f7be73d
commit e855a7cf88
6 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ namespace AyaNova.DataList
internal static async Task<ApiDataListResponse> GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, long UserId, AuthorizationRoles UserRoles)
{
// var AyaObjectFields = AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY);
var DataList = DataListFactory.GetAyaDataList(DataListKey);
//was the name not found as a list?
if (DataList == null)
@@ -25,42 +25,39 @@ namespace AyaNova.DataList
}
//check rights
if (listOptions.Mini != null && listOptions.Mini == true)
{
if (!UserRoles.HasAnyFlags(DataList.MiniListAllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this mini format datalist");
}
else
{
if (!UserRoles.HasAnyFlags(DataList.FullListAllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this full format datalist");
}
//FETCH DATALISTTEMPLATE HERE OR USE DEFAULT IF FAULTY OR NOT FOUND
//start with default
string JSONDataListTemplate = DataList.DefaultDataListDisplayTemplate;
if (!UserRoles.HasAnyFlags(DataList.AllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
//parse the list view
//TODO: do I need to try /catch here? Or will an exception properly bubble back to the controller
var ListViewArray = JArray.Parse(listOptions.ListView);
//PARSE THE TEMPLATE INTO A STRING ARRAY
//SO WE KNOW WHICH FIELDS TO RETURN FROM QUERY
var jtemplate = JObject.Parse(JSONDataListTemplate);
// var jtemplate = JObject.Parse(JSONDataListTemplate);
//convert to strings array (https://stackoverflow.com/a/33836599/8939)
string[] templateFieldList;
if (listOptions.Mini != null && listOptions.Mini == true)
{
templateFieldList = ((JArray)jtemplate["mini"]).ToObject<string[]>();
}
else
{
templateFieldList = ((JArray)jtemplate["full"]).ToObject<string[]>();
}
// //convert to strings array (https://stackoverflow.com/a/33836599/8939)
// string[] templateFieldList;
// if (listOptions.Mini != null && listOptions.Mini == true)
// {
// templateFieldList = ((JArray)jtemplate["mini"]).ToObject<string[]>();
// }
// else
// {
// templateFieldList = ((JArray)jtemplate["full"]).ToObject<string[]>();
// }
string[] templateFieldList = DataList.GetFieldListFromListView(listOptions.ListView);
//BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE
var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, JSONDataListTemplate, listOptions.Mini);
var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, listOptions.ListView);
//FROM CLAUSE
var qFrom = DataList.SQLFrom;
@@ -179,14 +176,9 @@ namespace AyaNova.DataList
//BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT
Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
if (listOptions.Mini != null && listOptions.Mini == true)
{
ColumnsJSON = DataList.GenerateMINIListColumnsJSON();
}
else
{
ColumnsJSON = DataList.GenerateListColumnsJSONFromListView(JSONDataListTemplate);
}
ColumnsJSON = DataList.GenerateListColumnsJSONFromListView(JSONDataListTemplate);
return new ApiDataListResponse(rows, totalRecordCount, ColumnsJSON);