From 7225a8e050bed344f0247b1fc32bbab014500bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Mon, 22 Jul 2024 22:19:34 +0200 Subject: [PATCH] #1470: sort folder subtypes alphabetically in requests to ease testing --- @types/lib/metadataTypes/Folder.d.ts.map | 2 +- lib/metadataTypes/Folder.js | 3 ++- ...sforcedataextension,synchronizeddataextension-response.xml} | 0 ...activ,synchroni,triggered,triggered,useriniti-response.xml} | 0 ...rieve-ContentTypeINasset,asset-shared,journey-response.xml} | 0 ...-ContentTypeINasset,asset-shared,ssjsactivity-response.xml} | 0 ...list,list,mysubs,publication,suppression_list-response.xml} | 0 ...sforcedataextension,synchronizeddataextension-response.xml} | 0 ...sforcedataextension,synchronizeddataextension-response.xml} | 0 9 files changed, 3 insertions(+), 2 deletions(-) rename test/resources/1111111/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml => retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml => retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINjourney,asset,asset-shared-response.xml => retrieve-ContentTypeINasset,asset-shared,journey-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml => retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml => retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml => retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml => retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) diff --git a/@types/lib/metadataTypes/Folder.d.ts.map b/@types/lib/metadataTypes/Folder.d.ts.map index b2ee17d38..4bc459909 100644 --- a/@types/lib/metadataTypes/Folder.d.ts.map +++ b/@types/lib/metadataTypes/Folder.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBAmIhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA0B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApqBwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBAmIhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA2B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBArqBwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index cc04d334c..954d2b71f 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -586,7 +586,8 @@ class Folder extends MetadataType { const newFilter = { leftOperand: 'ContentType', operator: contentTypeList.length === 1 ? 'equals' : 'IN', - rightOperand: contentTypeList.length === 1 ? contentTypeList[0] : contentTypeList, + rightOperand: + contentTypeList.length === 1 ? contentTypeList[0] : contentTypeList.sort(), }; options.filter = options.filter ? { diff --git a/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/1111111/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml rename to test/resources/1111111/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,journey-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,journey-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml