Merge branch 'main' into release

mentorpal · Aug 15, 2023 · 105de8e · 105de8e
2 parents d3e4adf + 91b932b
commit 105de8e
Show file tree

Hide file tree

Showing 13 changed files with 353 additions and 23 deletions.
diff --git a/client/src/api.ts b/client/src/api.ts
@@ -337,13 +337,15 @@ export async function fetchUsers(
                 isPrivate
                 isArchived
                 isAdvanced
+                isPublicApproved
                 lastTrainStatus
                 orgPermissions {
                   orgId
                   viewPermission
                   editPermission
                 }
                 updatedAt
+                createdAt
               }
             }
           }
@@ -1030,6 +1032,7 @@ export async function fetchMentorById(
           dirtyReason
           isPrivate
           isArchived
+          isPublicApproved
           isAdvanced
           hasVirtualBackground
           virtualBackgroundUrl
@@ -1286,6 +1289,31 @@ export async function updateUserDisabled(
   );
 }
 
+export async function updateMentorPublicApproval(
+  isPublicApproved: boolean,
+  accessToken: string,
+  mentorId: string
+): Promise<Mentor> {
+  return execGql<Mentor>(
+    {
+      query: `
+      mutation UpdateMentorPublicApproval($mentorId: ID!, $isPublicApproved: Boolean) {
+        me {
+          updateMentorPublicApproval(mentorId: $mentorId, isPublicApproved: $isPublicApproved) {
+            isPublicApproved
+          }
+        }
+      }
+    `,
+      variables: {
+        mentorId,
+        isPublicApproved,
+      },
+    },
+    { dataPath: ["me", "updateMentorPublicApproval"], accessToken }
+  );
+}
+
 export async function updateAnswerUrl(
   accessToken: string,
   mentorId: string,
@@ -2347,6 +2375,7 @@ export async function fetchMentors(
                 title
                 isPrivate
                 isArchived
+                isPublicApproved
                 isAdvanced
                 orgPermissions {
                   orgId

diff --git a/client/src/components/setup/mentor-privacy-slide.tsx b/client/src/components/setup/mentor-privacy-slide.tsx
@@ -198,6 +198,12 @@ export function MentorPrivacySlide(props: {
             Organization Privacy Permissions:
           </Typography>
           {renderOrgPermission()}
+          {!mentor.isPublicApproved ? (
+            <Typography variant="subtitle1" style={{ color: "red" }}>
+              Your mentor is not yet approved to be public. They will not be
+              visible to anyone until they are approved.
+            </Typography>
+          ) : undefined}
         </div>
       }
     />

diff --git a/client/src/helpers.ts b/client/src/helpers.ts
@@ -368,12 +368,12 @@ export function canEditMentorPrivacy(
   if (!mentor || !myUser) {
     return false;
   }
-  const ops = mentor.orgPermissions?.filter(
-    (op) => op.editPermission === OrgEditPermissionType.ADMIN
+  const orgPerms = mentor.orgPermissions?.filter(
+    (perm) => perm.editPermission === OrgEditPermissionType.ADMIN
   );
-  if (ops) {
-    const os = ops.map((op) => op.orgId);
-    for (const org of orgs.filter((o) => os.includes(o._id))) {
+  if (orgPerms) {
+    const orgIds = orgPerms.map((op) => op.orgId);
+    for (const org of orgs.filter((o) => orgIds.includes(o._id))) {
       if (
         org.members.find(
           (m) => m.user._id === myUser._id && m.role === UserRole.ADMIN
@@ -483,3 +483,11 @@ interface EnumObject {
 export function getEnumValues(e: EnumObject): string[] {
   return Object.keys(e).map((i) => e[i]);
 }
+
+export function isDateWithinLastMonth(date: string): boolean {
+  const now = new Date();
+  const then = new Date(date);
+  const diff = now.getTime() - then.getTime();
+  const diffDays = Math.ceil(diff / (1000 * 3600 * 24));
+  return diffDays < 30;
+}
diff --git a/client/src/hooks/graphql/use-with-static-data-connection.ts b/client/src/hooks/graphql/use-with-static-data-connection.ts
@@ -71,7 +71,7 @@ export function useWithStaticDataConnection<T>(
     if (!data) {
       return;
     }
-    const edges = sortFilter(data.edges);
+    const edges = sortFilter(data.edges, pageSearchParams);
     const pd: Connection<T> = {
       edges: edges.slice(page - pageLimit, page),
       pageInfo: {
@@ -94,7 +94,10 @@ export function useWithStaticDataConnection<T>(
     });
   }, [data, page, pageSearchParams, preFilter, postSort]);
 
-  function sortFilter(e: Edge<T>[]): Edge<T>[] {
+  function sortFilter(
+    e: Edge<T>[],
+    pageSearchParams: StaticSearchParams
+  ): Edge<T>[] {
     let edges = e.filter((edge) => !preFilter || preFilter.filter(edge.node));
     if (pageSearchParams.sortBy) {
       const sortAscending = pageSearchParams.sortAscending ? 1 : -1;
@@ -149,6 +152,9 @@ export function useWithStaticDataConnection<T>(
         return 0;
       }
     }
+    if (typeof aVal === "boolean" && typeof bVal === "boolean") {
+      return (aVal ? 1 : 0 - (bVal ? 1 : 0)) * ascending;
+    }
     if (typeof aVal !== typeof bVal) {
       if (aVal === null || aVal === undefined) {
         return 1;
@@ -237,7 +243,7 @@ export function useWithStaticDataConnection<T>(
   }
 
   function hasNextPage(): boolean {
-    return sortFilter(data?.edges || []).length > page;
+    return sortFilter(data?.edges || [], pageSearchParams).length > page;
   }
 
   function hasPrevPage(): boolean {

diff --git a/client/src/hooks/graphql/use-with-users.tsx b/client/src/hooks/graphql/use-with-users.tsx
@@ -9,6 +9,7 @@ import {
   fetchUsers,
   updateMentorAdvanced,
   updateMentorPrivacy,
+  updateMentorPublicApproval,
   updateUserDisabled,
   updateUserPermissions,
 } from "api";
@@ -23,6 +24,7 @@ import {
 export interface UseUserData extends UseStaticDataConnection<User> {
   userDataError?: LoadingError;
   onUpdateUserPermissions: (userId: string, permissionLevel: string) => void;
+  onUpdateMentorPublicApproved: (userId: string, isDisabled: boolean) => void;
   onUpdateUserDisabled: (userId: string, isDisabled: boolean) => void;
   onUpdateMentorPrivacy: (mentorId: string, isPrivate: boolean) => void;
   onUpdateMentorAdvanced: (mentorId: string, isAdvanced: boolean) => void;
@@ -83,6 +85,22 @@ export function useWithUsers(accessToken: string): UseUserData {
       });
   }
 
+  function onUpdateMentorPublicApproved(
+    mentorId: string,
+    isPublicApproved: boolean
+  ): void {
+    updateMentorPublicApproval(isPublicApproved, accessToken, mentorId)
+      .then(() => {
+        reloadData();
+      })
+      .catch((err) => {
+        setUserDataError({
+          message: "Failed to update mentor for public approval",
+          error: `${err}`,
+        });
+      });
+  }
+
   function onUpdateMentorPrivacy(mentorId: string, isPrivate: boolean): void {
     updateMentorPrivacy(accessToken, { isPrivate }, mentorId)
       .then(() => {
@@ -144,6 +162,7 @@ export function useWithUsers(accessToken: string): UseUserData {
     onUpdateMentorPrivacy,
     onUpdateMentorAdvanced,
     onUpdateUserDisabled,
+    onUpdateMentorPublicApproved,
     onArchiveMentor,
   };
 }
diff --git a/client/src/pages/users.tsx b/client/src/pages/users.tsx
@@ -25,6 +25,8 @@ import {
   Theme,
   SelectChangeEvent,
   Checkbox,
+  Button,
+  Typography,
 } from "@mui/material";
 import { makeStyles } from "tss-react/mui";
 import {
@@ -57,6 +59,7 @@ import {
   canEditMentor,
   canEditMentorPrivacy,
   canEditUserRole,
+  isDateWithinLastMonth,
   launchMentor,
 } from "../helpers";
 import useActiveMentor from "store/slices/mentor/useActiveMentor";
@@ -107,6 +110,14 @@ function getTableColumns(
   isAdmin: boolean
 ): ColumnDef[] {
   let columns: ColumnDef[] = [
+    {
+      id: "defaultMentor",
+      subField: ["isPublicApproved"],
+      label: "Approval",
+      minWidth: 0,
+      align: "left",
+      sortable: true,
+    },
     {
       id: "name",
       label: "Name",
@@ -302,13 +313,32 @@ function UserItem(props: {
   const { switchActiveMentor } = useActiveMentor();
   const userRole = user.userRole;
   const mentor = edge.node.defaultMentor;
+  const [approvalText, setApprovalText] = useState<string>(
+    mentor.isPublicApproved ? "Approved" : "Not Approved"
+  );
+  const [approvalTextColor, setApprovalTextColor] = useState<string>(
+    mentor.isPublicApproved ? "green" : "red"
+  );
+
+  useEffect(() => {
+    setApprovalText(mentor.isPublicApproved ? "Approved" : "Not Approved");
+    setApprovalTextColor(mentor.isPublicApproved ? "green" : "red");
+  }, [mentor.isPublicApproved]);
+
   const isAdmin =
     userRole === UserRole.ADMIN || userRole === UserRole.SUPER_ADMIN;
 
   function handleRoleChange(user: string, permission: string): void {
     props.userPagin.onUpdateUserPermissions(user, permission);
   }
 
+  function handlePublicApprovalChange(
+    mentor: string,
+    isPublicApproved: boolean
+  ): void {
+    props.userPagin.onUpdateMentorPublicApproved(mentor, isPublicApproved);
+  }
+
   function handleDisabledChange(user: string, isDisabled: boolean): void {
     props.userPagin.onUpdateUserDisabled(user, isDisabled);
   }
@@ -324,9 +354,57 @@ function UserItem(props: {
   function handleArchiveChange(mentor: string, isArchived: boolean): void {
     props.userPagin.onArchiveMentor(mentor, isArchived);
   }
-
   return (
     <TableRow data-cy={`user-${i}`} hover role="checkbox" tabIndex={-1}>
+      <TableCell data-cy="publicApproved" align="center" key={mentor._id}>
+        <>
+          {isDateWithinLastMonth(mentor.createdAt) &&
+          !mentor.isPublicApproved ? (
+            <Typography
+              data-cy="new-mentor-indicator"
+              style={{
+                color: "lightgreen",
+                fontStyle: "italic",
+                textDecoration: "underline",
+              }}
+            >
+              New Mentor
+            </Typography>
+          ) : undefined}
+          <Button
+            data-cy="publicApprovalButton"
+            style={{
+              color: approvalTextColor,
+              cursor: "pointer",
+              width: "95px",
+              height: "50px",
+            }}
+            onMouseEnter={() => {
+              if (mentor.isPublicApproved) {
+                setApprovalText("Unapprove?");
+                setApprovalTextColor("red");
+              } else {
+                setApprovalText("Approve?");
+                setApprovalTextColor("green");
+              }
+            }}
+            onMouseLeave={() => {
+              if (mentor.isPublicApproved) {
+                setApprovalText("Approved");
+                setApprovalTextColor("green");
+              } else {
+                setApprovalText("Not Approved");
+                setApprovalTextColor("red");
+              }
+            }}
+            onClick={() => {
+              handlePublicApprovalChange(mentor._id, !mentor.isPublicApproved);
+            }}
+          >
+            <i>{approvalText}</i>
+          </Button>
+        </>
+      </TableCell>
       <TableCell data-cy="name" align="left">
         {edge.node.name}
       </TableCell>
@@ -430,19 +508,21 @@ function UserItem(props: {
         )}
       </TableCell>
       {isAdmin ? (
-        <TableCell data-cy="disabled" align="left">
-          <Checkbox
-            checked={edge.node.isDisabled}
-            disabled={
-              props.user.userRole !== UserRole.ADMIN &&
-              props.user.userRole !== UserRole.SUPER_ADMIN
-            }
-            color="secondary"
-            onClick={() =>
-              handleDisabledChange(edge.node._id, !edge.node.isDisabled)
-            }
-          />
-        </TableCell>
+        <>
+          <TableCell data-cy="disabled" align="left">
+            <Checkbox
+              checked={edge.node.isDisabled}
+              disabled={
+                props.user.userRole !== UserRole.ADMIN &&
+                props.user.userRole !== UserRole.SUPER_ADMIN
+              }
+              color="secondary"
+              onClick={() =>
+                handleDisabledChange(edge.node._id, !edge.node.isDisabled)
+              }
+            />
+          </TableCell>
+        </>
       ) : undefined}
       {isAdmin ? (
         <TableCell data-cy="advanced" align="left">

diff --git a/client/src/types-gql.ts b/client/src/types-gql.ts
@@ -61,6 +61,7 @@ export interface MentorGQL {
   isDirty: boolean;
   lastTrainStatus: JobState;
   dirtyReason: MentorDirtyReason;
+  isPublicApproved: boolean;
   isPrivate: boolean;
   isArchived: boolean;
   isAdvanced: boolean;
@@ -72,6 +73,7 @@ export interface MentorGQL {
   answers: AnswerGQL[];
   hasVirtualBackground: boolean;
   virtualBackgroundUrl: string;
+  createdAt: string;
   updatedAt: string;
 }
 

diff --git a/client/src/types.ts b/client/src/types.ts
@@ -192,6 +192,7 @@ export interface Mentor {
   isDirty: boolean;
   lastTrainStatus: JobState;
   dirtyReason: MentorDirtyReason;
+  isPublicApproved: boolean;
   isPrivate: boolean;
   isArchived: boolean;
   isAdvanced: boolean;
@@ -204,6 +205,7 @@ export interface Mentor {
   hasVirtualBackground: boolean;
   virtualBackgroundUrl: string;
   updatedAt: string;
+  createdAt: string;
   numAnswersComplete: number;
 }
 

diff --git a/cypress/cypress.json b/cypress/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:80",
+  "baseUrl": "http://localhost:8000",
   "video": false,
   "$schema": "https://on.cypress.io/cypress.schema.json",
   "chromeWebSecurity": false,