refactor: added userTypeToTitleCase instead of hardcoded values for user types

Author: alex-struk

src/back-end/lib/resources/contact-list.ts

@@ -9,7 +9,7 @@ import {
   nullRequestBodyHandler
 } from "back-end/lib/server";
 import { Session } from "shared/lib/resources/session";
-import { UserType } from "shared/lib/resources/user";
+import { UserType, userTypeToTitleCase } from "shared/lib/resources/user";
 import { adt } from "shared/lib/types";
 import { isValid } from "shared/lib/validation";
 import { getString } from "shared/lib";
@@ -108,11 +108,9 @@ const readMany: crud.ReadMany<Session, db.Connection> = (
           // Add user type if both Government and Vendor types are selected
           if (includeUserType) {
             const userTypeLabel =
-              user.type === UserType.Government
-                ? "Government"
-                : user.type === UserType.Vendor
-                ? "Vendor"
-                : "Admin";
+              user.type === UserType.Admin
+                ? "Admin"
+                : userTypeToTitleCase(user.type);
             row.push(`"${userTypeLabel}"`);
           }
 

src/front-end/typescript/lib/pages/sign-up/step-two.tsx

@@ -16,7 +16,7 @@ import {
   immutable,
   component as component_
 } from "front-end/lib/framework";
-import { userTypeToTitleCase } from "front-end/lib/pages/user/lib";
+import { userTypeToTitleCase } from "shared/lib/resources/user";
 import * as ProfileForm from "front-end/lib/pages/user/lib/components/profile-form";
 import Link, {
   iconLinkSymbol,

src/front-end/typescript/lib/pages/user/lib/index.ts

@@ -41,16 +41,6 @@ export function userToKeyCloakIdentityProviderTitleCase(
   );
 }
 
-export function userTypeToTitleCase(v: UserType): string {
-  switch (v) {
-    case UserType.Government:
-    case UserType.Admin:
-      return "Public Sector Employee";
-    case UserType.Vendor:
-      return "Vendor";
-  }
-}
-
 export function userTypeToPermissions(v: UserType): string[] {
   switch (v) {
     case UserType.Admin:

src/front-end/typescript/lib/pages/user/list.tsx

@@ -12,9 +12,9 @@ import {
 import * as api from "front-end/lib/http/api";
 import {
   userStatusToColor,
-  userStatusToTitleCase,
-  userTypeToTitleCase
+  userStatusToTitleCase
 } from "front-end/lib/pages/user/lib";
+import { userTypeToTitleCase } from "shared/lib/resources/user";
 import Badge from "front-end/lib/views/badge";
 import Link, { routeDest } from "front-end/lib/views/link";
 import React from "react";

src/front-end/typescript/lib/pages/user/profile/tab/profile.tsx

@@ -11,9 +11,9 @@ import * as api from "front-end/lib/http/api";
 import {
   userStatusToColor,
   userStatusToTitleCase,
-  userTypeToPermissions,
-  userTypeToTitleCase
+  userTypeToPermissions
 } from "front-end/lib/pages/user/lib";
+import { userTypeToTitleCase } from "shared/lib/resources/user";
 import * as ProfileForm from "front-end/lib/pages/user/lib/components/profile-form";
 import * as toasts from "front-end/lib/pages/user/lib/toasts";
 import * as Tab from "front-end/lib/pages/user/profile/tab";

src/shared/lib/resources/user.ts

@@ -25,6 +25,16 @@ export function userTypeToKeycloakIdentityProvider(
   }
 }
 
+export function userTypeToTitleCase(v: UserType): string {
+  switch (v) {
+    case UserType.Government:
+    case UserType.Admin:
+      return "Public Sector Employee";
+    case UserType.Vendor:
+      return "Vendor";
+  }
+}
+
 export function gitHubProfileLink(username: string): string {
   return `https://github.com/${username}`;
 }