Add Advisor Role

backend/scripts/add-advisor.ts

@@ -0,0 +1,13 @@
+import { memberCollection, approvedMemberCollection } from '../src/firebase';
+
+const addAdvisor = async (collection) => {
+  const docs = await collection.listDocuments();
+  docs.forEach(async (doc) => {
+    await doc.update({
+      isAdvisor: false
+    });
+  });
+};
+
+addAdvisor(memberCollection);
+addAdvisor(approvedMemberCollection);

common-types/index.d.ts

@@ -31,6 +31,7 @@ interface IdolMember {
   readonly subteams: readonly string[];
   readonly formerSubteams?: readonly string[] | null;
   readonly role: Role;
+  readonly isAdvisor: boolean;
   readonly roleDescription: RoleDescription;
 }
 

frontend/src/components/Admin/AddUser/AddUser.tsx

@@ -94,6 +94,7 @@ export default function AddUser(): JSX.Element {
         pronouns: '',
         email: '',
         role: '' as Role,
+        isAdvisor: false,
         graduation: '',
         major: '',
         doubleMajor: '',
@@ -149,6 +150,16 @@ export default function AddUser(): JSX.Element {
       return;
     }
 
+    // Check that no tpms are also advisors
+    if (member.role === 'tpm' && member.isAdvisor) {
+      Emitters.generalError.emit({
+        headerMsg: 'Invalid Role!',
+        contentMsg:
+          'TPM advisor is not a valid role. Please select a different role if this member is returning as an advisor.'
+      });
+      return;
+    }
+
     MembersAPI.setMember({
       ...member,
       netid: getNetIDFromEmail(member.email),
@@ -194,6 +205,7 @@ export default function AddUser(): JSX.Element {
             ? m.formerSubteams.split(', ')
             : currMember.formerSubteams,
           role: m.role || currMember.role,
+          isAdvisor: m.isAdvisor || currMember.isAdvisor,
           roleDescription: getRoleDescriptionFromRoleID(m.role)
         } as IdolMember;
         MembersAPI.updateMember(updatedMember);
@@ -216,6 +228,7 @@ export default function AddUser(): JSX.Element {
           subteams: m.subteam ? [m.subteam] : [],
           formerSubteams: m.formerSubteams ? m.formerSubteams.split(', ') : [],
           role: m.role || ('' as Role),
+          isAdvisor: m.isAdvisor || false,
           roleDescription: getRoleDescriptionFromRoleID(m.role)
         } as IdolMember;
         MembersAPI.setMember(updatedMember);
@@ -244,7 +257,7 @@ export default function AddUser(): JSX.Element {
       const json = await csvtojson().fromString(csv);
       const errors = json
         .map((m) => {
-          const [email, role, subteam] = [m.email, m.role, m.subteam];
+          const [email, role, subteam, isAdvisor] = [m.email, m.role, m.subteam, m.isAdvisor];
           const formerSubteams: string[] = m.formerSubteams ? m.formerSubteams.split(', ') : [];
           const err = [];
           if (!email) {
@@ -265,6 +278,9 @@ export default function AddUser(): JSX.Element {
           if (formerSubteams.includes(subteam)) {
             err.push('subteam cannot be in former subteams');
           }
+          if (isAdvisor && role === 'tpm') {
+            err.push('tpm advisor is not a valid role');
+          }
           return err.length > 0 ? `Row ${json.indexOf(m) + 1}: ${err.join(', ')}` : '';
         })
         .filter((err) => err.length > 0);
@@ -445,6 +461,26 @@ export default function AddUser(): JSX.Element {
                       }}
                       value={state.currentSelectedMember.role || ''}
                     />
+                    <Form.Field
+                      control={Select}
+                      label="Advisor"
+                      options={[
+                        { key: true, text: 'Yes', value: true },
+                        { key: false, text: 'No', value: false }
+                      ]}
+                      placeholder="Advisor"
+                      disabled={state.currentSelectedMember.role === 'tpm'} // no tpm advisor
+                      onChange={(
+                        event: React.ChangeEvent<HTMLInputElement>,
+                        data: HTMLInputElement
+                      ) => {
+                        setCurrentlySelectedMember((currentSelectedMember) => ({
+                          ...currentSelectedMember,
+                          isAdvisor: Boolean(data.value)
+                        }));
+                      }}
+                      value={state.currentSelectedMember.isAdvisor || false}
+                    />
                   </Form.Group>
                   <Form.Group widths="equal">
                     <Form.Field

frontend/src/components/Forms/UserProfile/UserProfile.tsx

@@ -56,6 +56,7 @@ const UserProfile: React.FC = () => {
         lastName,
         pronouns,
         role: userRole,
+        isAdvisor: userInfoBeforeEdit?.isAdvisor ?? false,
         roleDescription: getRoleDescriptionFromRoleID(userRole),
         graduation,
         major,