DOP-4549 fix sorting

mongodb · Apr 17, 2024 · 4a8a898 · 4a8a898
1 parent c88f308
commit 4a8a898
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/api/handlers/slack.ts b/api/handlers/slack.ts
@@ -53,12 +53,13 @@ export async function buildEntitledGroupsList(entitlement: any, repoBranchesRepo
       const buildWithSnooty = branch['buildsWithSnooty'];
       if (buildWithSnooty) {
         const active = branch['active'];
-        const repoPath = `${repoName}${directoryPath ? '/' + directoryPath : ''}/${branch['gitBranchName']}`;
+        const branchName = `${directoryPath ? '/' + directoryPath : ''}/${branch['gitBranchName']}`;
+        const repoPath = `${repoOwner}/${repoName}/${branchName}`;
         let txt: string;
         if (!active) {
-          txt = `(!inactive) ${repoPath}`;
+          txt = `(!inactive) ${branchName}`;
         } else {
-          txt = repoPath;
+          txt = branchName;
         }
         options.push({
           text: {
@@ -70,12 +71,15 @@ export async function buildEntitledGroupsList(entitlement: any, repoBranchesRepo
       }
     }
 
+    //create a sort function to sort the options by their text
     const repoOption = {
       label: {
         type: 'plain_text',
         text: repoOwner,
       },
-      options: options.sort(),
+      options: options.sort((branchOne, branchTwo) => {
+        return branchOne.text.text.localeCompare(branchTwo.text.text);
+      }),
     };
     repoOptions.push(repoOption);
   }