From 850a0170022ddaa9fb621d1e23030738968a1040 Mon Sep 17 00:00:00 2001
From: To Huynh <37560480+tohuynh@users.noreply.github.com>
Date: Fri, 27 May 2022 20:05:05 -0700
Subject: [PATCH] fix/person-roles (#224)

* Localize supervisor role

* Redefine term roles
---
 src/assets/LocalizedStrings.tsx  | 1 +
 src/assets/strings/de.ts         | 1 +
 src/assets/strings/en.ts         | 1 +
 src/assets/strings/es.ts         | 1 +
 src/models/util/RoleUtilities.ts | 6 +++---
 src/networking/RoleService.ts    | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/assets/LocalizedStrings.tsx b/src/assets/LocalizedStrings.tsx
index c9db68aa..608cd46c 100644
--- a/src/assets/LocalizedStrings.tsx
+++ b/src/assets/LocalizedStrings.tsx
@@ -95,6 +95,7 @@ export interface MasterStringsList extends LocalizedStringsMethods {
   member: string;
   council_president: string;
   vice_chair: string;
+  supervisor: string;
   active: string;
   inactive: string;
   latest_vote: string;
diff --git a/src/assets/strings/de.ts b/src/assets/strings/de.ts
index 9e9754aa..cbb34d09 100644
--- a/src/assets/strings/de.ts
+++ b/src/assets/strings/de.ts
@@ -84,6 +84,7 @@ const de = {
   member: "Mitglied",
   council_president: "Präsident des Rates",
   vice_chair: "Stellvertretender Vorsitzender",
+  supervisor: "Supervisor/in",
   active: "aktiv",
   inactive: "inaktiv",
   latest_vote: "Letzte Abstimmung",
diff --git a/src/assets/strings/en.ts b/src/assets/strings/en.ts
index 50bdc72f..712e7f40 100644
--- a/src/assets/strings/en.ts
+++ b/src/assets/strings/en.ts
@@ -83,6 +83,7 @@ const en = {
   member: "Member",
   council_president: "Council President",
   vice_chair: "Vice Chair",
+  supervisor: "Supervisor",
   active: "active",
   inactive: "inactive",
   latest_vote: "Latest Vote",
diff --git a/src/assets/strings/es.ts b/src/assets/strings/es.ts
index 1c4d4eb5..4ce1aee2 100644
--- a/src/assets/strings/es.ts
+++ b/src/assets/strings/es.ts
@@ -83,6 +83,7 @@ const es = {
   member: "Miembro",
   council_president: "Presidente/a del Consejo",
   vice_chair: "Vicepresidente/a",
+  supervisor: "Supervisor/a",
   active: "activo/a",
   inactive: "inactivo/a",
   latest_vote: "Último Voto",
diff --git a/src/models/util/RoleUtilities.ts b/src/models/util/RoleUtilities.ts
index 36550805..ad8c8220 100644
--- a/src/models/util/RoleUtilities.ts
+++ b/src/models/util/RoleUtilities.ts
@@ -104,14 +104,14 @@ function partitionNonTermRoles(
   roles: Role[],
   termRoles: Role[]
 ): [Record<string, Role[][]>, Role[]] {
-  const nonTermRoles = roles.filter(
-    (role) => ![ROLE_TITLE.COUNCILMEMBER, ROLE_TITLE.COUNCILPRESIDENT].includes(role.title)
-  );
+  const nonTermRoles = roles.filter((role) => role.title !== ROLE_TITLE.COUNCILMEMBER);
 
   // sort by `nonTermRoleTitles`
   const nonTermRoleTitles = [
+    ROLE_TITLE.COUNCILPRESIDENT,
     ROLE_TITLE.CHAIR,
     ROLE_TITLE.VICE_CHAIR,
+    ROLE_TITLE.SUPERVISOR,
     ROLE_TITLE.MEMBER,
     ROLE_TITLE.ALTERNATE,
   ];
diff --git a/src/networking/RoleService.ts b/src/networking/RoleService.ts
index ca4d2c4f..60c88cd1 100644
--- a/src/networking/RoleService.ts
+++ b/src/networking/RoleService.ts
@@ -53,7 +53,7 @@ export default class RoleService extends ModelService {
           WHERE_OPERATOR.eq,
           doc(NetworkService.getDb(), COLLECTION_NAME.Person, personId)
         ),
-        where("title", WHERE_OPERATOR.in, [ROLE_TITLE.COUNCILMEMBER, ROLE_TITLE.COUNCILPRESIDENT]),
+        where("title", WHERE_OPERATOR.eq, ROLE_TITLE.COUNCILMEMBER),
         orderBy("start_datetime", ORDER_DIRECTION.desc),
       ],
       new PopulationOptions([populateSeatRef])