@@ -307,6 +307,7 @@ export function makeSearchAreaInfo(cisxUI) {
307307}
308308
309309let tblCnt = 1 ;
310+ const CHECK_SORT = false ;
310311
311312export function makeServiceDescriptorSearchRequest ( request , serviceDescriptor , extraMeta = { } ) {
312313 const { standardID = '' , accessURL, utype, serDefParams, title, cisxUI= [ ] } = serviceDescriptor ;
@@ -318,11 +319,14 @@ export function makeServiceDescriptorSearchRequest(request, serviceDescriptor, e
318319 const hideObj = hiddenColumns ?
319320 Object . fromEntries ( hiddenColumns . split ( ',' ) . map ( ( c ) => [ `col.${ c } .visibility` , 'hide' ] ) ) : { } ;
320321
321- const sAry = tblSortOrder ?. split ( ',' ) ;
322+ const sAry = tblSortOrder ?. split ( ',' , 2 ) ;
322323 let sortObj = { } ;
323- if ( sAry ?. length > 1 ) {
324- const dir = sAry . shift ( ) ;
325- sortObj = { sortInfo : sortInfoString ( sAry , dir ?. toUpperCase ( ) === 'ASC' ) } ;
324+ if ( sAry ?. length > 1 && CHECK_SORT ) {
325+ const dir = sAry [ 0 ] . toUpperCase ( ) ;
326+ sortObj = { sortInfo : sortInfoString ( tblSortOrder . substring ( dir . length + 1 ) , dir === 'ASC' ) } ;
327+ // console.log('from service def: '+tblSortOrder);
328+ // console.log('using sortInfoString)(): '+sortObj.sortInfo);
329+ // sortObj= {sortInfo: tblSortOrder};
326330 }
327331
328332 const options = { ...sortObj , META_INFO : { ...hideObj , ...extraMeta } } ;
0 commit comments