HPCC-35694 Address review comments

- Fix ecm version to 1.69 as structure is shared with another service already
  on 1.68.
- Update all services using shared structure to version 1.69.
- Correct FileSize checks in Files.tsx
- Update unittests to return all DFU fields needed to pass new tests.

Signed-off-by: Terrence Asselin <terrence.asselin+copilot@lexisnexisrisk.com>

Author: asselitx

esp/scm/ws_dfu.ecm

@@ -1037,8 +1037,8 @@ ESPresponse [version("1.68"), exceptions_inline, nil_remove] DFUFileRenameRespon
 //  ===========================================================================
 ESPservice [
     auth_feature("DEFERRED"),
-    version("1.68"),
-    default_client_version("1.68"),
+    version("1.69"),
+    default_client_version("1.69"),
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
 {

esp/scm/ws_dfuXref.ecm

@@ -228,7 +228,7 @@ ESPresponse [exceptions_inline] DFUXRefUnusedFilesResponse
 };
 
 //  ===========================================================================
-ESPservice [version("1.04"), default_client_version("1.04"), auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsDFUXRef
+ESPservice [version("1.69"), default_client_version("1.69"), auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsDFUXRef
 {
     ///ESPmethod [resp_xsl_default("./smc_xslt/xref_main.xslt")] DFUXRefList(DFUXRefListRequest, DFUXRefListResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/xref_main.xslt")] DFUXRefList(DFUXRefListRequest, DFUXRefListResponse);

esp/scm/ws_dfu_common.ecm

@@ -59,5 +59,5 @@ ESPStruct DFULogicalFile
     [min_ver("1.63"), nil_remove] int64 MaxSkew;
     [min_ver("1.63"), nil_remove] int64 MinSkewPart;
     [min_ver("1.63"), nil_remove] int64 MaxSkewPart;
-    [min_ver("1.68")] int64 FileSize;
+    [min_ver("1.69")] int64 FileSize;
 };

esp/src/src-react/components/Files.tsx

@@ -212,13 +212,13 @@ export const Files: React.FunctionComponent<FilesProps> = ({
             FileSize: {
                 label: nlsHPCC.FileSize,
                 formatter: (value, row) => {
-                    if (row.FileSize) {
+                    if (row.FileSize !== undefined) {
                         return Utility.convertedSize(row.FileSize);
                     }
                     return Utility.convertedSize(row.IsCompressed ? row.CompressedFileSize : row.IntSize);
                 },
                 csvFormatter: (value, row) => {
-                    if (row.FileSize) {
+                    if (row.FileSize !== undefined) {
                         return row.FileSize;
                     }
                     return row.IsCompressed ? row.CompressedFileSize : row.IntSize;

testing/unittests/dalitests.cpp

@@ -2838,7 +2838,12 @@ class DaliDFSIteratorTests : public CppUnit::TestFixture
         filterBuf.append(DFUQFTspecial).append(DFUQFilterSeparator).append(DFUQSFFileType).append(DFUQFilterSeparator).append(DFUQFFTnonsuperfileonly).append(DFUQFilterSeparator);
         filterBuf.append(DFUQFTspecial).append(DFUQFilterSeparator).append(DFUQSFFileNameWithPrefix).append(DFUQFilterSeparator).append(wildName).append(DFUQFilterSeparator);
 
-        std::vector<DFUQResultField> fields = {DFUQResultField::size, DFUQResultField::cost, DFUQResultField::term};
+        // Must include all fields needed for sorting and inspection in loop below.
+        //
+        // rowCompressed and blockCompressed required for getLogicalFilesSorted to successfully run the isCompressed()
+        // test used when determining which size value to populate DFUQResultField::size with (compressed vs uncompressed).
+        // Alternately, could use DFUQResultField::includeAll to return all fields if the test expands in scope.
+        std::vector<DFUQResultField> fields = {DFUQResultField::size, DFUQResultField::cost, DFUQResultField::rowCompressed, DFUQResultField::blockCompressed, DFUQResultField::term};
 
         DFUQResultField sortOrder[2] = {DFUQResultField::job|DFUQResultField::reverse, DFUQResultField::term};
         __int64 hint;