Merge pull request #1420 from Northeastern-Electric-Racing/536-cr-creation-sort-the-wbs-dropdown

536 cr creation sort the wbs dropdown

Author: RChandler234

src/frontend/src/pages/CreateChangeRequestPage/CreateChangeRequestView.tsx

@@ -36,6 +36,7 @@ import NERFailButton from '../../components/NERFailButton';
 import NERSuccessButton from '../../components/NERSuccessButton';
 import { wbsNamePipe } from '../../utils/pipes';
 import PageLayout from '../../components/PageLayout';
+import { wbsNumComparator } from 'shared/src/validate-wbs';
 
 interface CreateChangeRequestViewProps {
   wbsNum: string;
@@ -103,6 +104,7 @@ const CreateChangeRequestsView: React.FC<CreateChangeRequestViewProps> = ({
   if (isError) return <ErrorPage message={error?.message} />;
 
   const projectOptions: { label: string; id: string }[] = [];
+
   const wbsDropdownOptions: { label: string; id: string }[] = [];
 
   projects.forEach((project: Project) => {
@@ -122,6 +124,8 @@ const CreateChangeRequestsView: React.FC<CreateChangeRequestViewProps> = ({
     });
   });
 
+  wbsDropdownOptions.sort((wbsNum1, wbsNum2) => wbsNumComparator(wbsNum1.id, wbsNum2.id));
+
   const wbsAutocompleteOnChange = (
     _event: React.SyntheticEvent<Element, Event>,
     value: { label: string; id: string } | null

src/frontend/src/tests/utils/validate-wbs.test.ts

@@ -0,0 +1,12 @@
+import { wbsNumComparator } from 'shared';
+import '@testing-library/jest-dom/extend-expect';
+
+describe('wbsNumComparator', () => {
+  it('should correctly compare two WBS Numbers', () => {
+    expect(wbsNumComparator('1.1.3', '1.3.4')).toBe(-1);
+    expect(wbsNumComparator('1.2.1', '1.2.1')).toBe(0);
+    expect(wbsNumComparator('1.3.4', '1.1.3')).toBe(1);
+    expect(wbsNumComparator('2.3.4', '1.1.3')).toBe(1);
+    expect(wbsNumComparator('1.3.4', '2.1.3')).toBe(-1);
+  });
+});

src/shared/src/validate-wbs.ts

@@ -5,6 +5,27 @@
 
 import { WbsNumber } from './types/project-types';
 
+/**
+ * Compares two wbs numbers in ascending order
+ *
+ * @param wbsNum1 WBS number to compare
+ * @param wbsNum2 WBS number to compare
+ */
+export const wbsNumComparator = (wbsNum1: string, wbsNum2: string) => {
+  const wbsParts1 = wbsNum1.split('.').map(Number);
+  const wbsParts2 = wbsNum2.split('.').map(Number);
+
+  for (let i = 0; i < wbsParts1.length; i++) {
+    if (wbsParts1[i] < wbsParts2[i]) {
+      return -1;
+    } else if (wbsParts1[i] > wbsParts2[i]) {
+      return 1;
+    }
+  }
+
+  return 0;
+};
+
 /**
  * Ensure the provided wbsNum is a valid Work Breakdown Structure Number
  *