Merge pull request #4260 from cisagov/feature/acet794

Fixing ISE merit submits for Jon
cisagov · Nov 26, 2024 · 795d689 · 795d689
2 parents 85a06ee + 715c2eb
commit 795d689
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs
@@ -37,7 +37,7 @@ public class JSONFileExport : IJSONFileExport
         public const string MeritExportPathName = "NCUAMeritExportPath";
         public void SendFileToMerit(string filename, string data, string uncPath)
         {
-            long minimumFileSize = 28000; // hardcoded value, change if file changes size (sorry)
+            long minimumFileSize = 25000; // hardcoded value, change if file changes size (sorry)
             if (!DoesDirectoryExist(uncPath))
             {
                 throw new ApplicationException("the directory Path is not available or does not exist");

diff --git a/CSETWebNg/src/app/services/ncua.service.ts b/CSETWebNg/src/app/services/ncua.service.ts
@@ -538,6 +538,12 @@ export class NCUAService {
             let questions = subcat?.questions?.sort(
               (a, b) => {
                 if (a.title.length == b.title.length) {
+
+                  // Core and Core+ both start at 1.1 now
+                  if (a.maturityLevel == "CORE" || a.maturityLevel == "CORE+") {
+                    return a.maturityLevel.length > b.maturityLevel.length ? 1 : ((b.maturityLevel.length > a.maturityLevel.length ? -1 : 0));
+                  }
+
                   return a.title > b.title ? 1 : ((b.title > a.title ? -1 : 0));
                 }
                 return a.title.length > b.title.length ? 1 : ((b.title.length > a.title.length ? -1 : 0));