uhawaii-system-its-ti-iam · JorWo · Mar 8, 2024 · Feb 23, 2024
diff --git a/ui/.env b/ui/.env
@@ -1,5 +1,6 @@
 # =========================================================================
 NEXT_PUBLIC_BASE_URL=http://localhost:8080/uhgroupings
+NEXT_PUBLIC_API_BASE_URL=http://localhost:8081/uhgroupingsapi
 NEXT_PUBLIC_API_2_1_BASE_URL=http://localhost:8081/uhgroupingsapi/api/groupings/v2.1
 
 # =========================================================================

diff --git a/ui/src/components/layout/footer/Footer.tsx b/ui/src/components/layout/footer/Footer.tsx
@@ -6,7 +6,7 @@ const Footer = () => (
             <div className="grid sm:grid-cols-12 md:grid-cols-12">
                 <div className="mx-auto mb-6 col-span-6 md:col-span-5 lg:col-span-4">
                     <Image 
-                        src="uhgroupings/uh-logo-system.svg" 
+                        src="/uhgroupings/uh-logo-system.svg" 
                         alt="UH System logo" 
                         width={235} 
                         height={235} />

diff --git a/ui/src/components/layout/navbar/Navbar.tsx b/ui/src/components/layout/navbar/Navbar.tsx
@@ -15,7 +15,7 @@ const Navbar = async () => {
                 <div className="flex justify-between">
                     <Link href="/" className="lg:inline hidden">
                         <Image 
-                            src="uhgroupings/uh-groupings-logo.svg" 
+                            src="/uhgroupings/uh-groupings-logo.svg" 
                             alt="UH Groupings Logo" 
                             width={256} 
                             height={256} />
@@ -24,7 +24,7 @@ const Navbar = async () => {
                         <MobileNavbar currentUser={currentUser} />
                         <Link href="/">
                             <Image 
-                                src="uhgroupings/uh-groupings-logo-large.svg" 
+                                src="/uhgroupings/uh-groupings-logo-large.svg" 
                                 alt="UH Groupings Logo" 
                                 width={56} 
                                 height={56} />

diff --git a/ui/src/services/EmailService.ts b/ui/src/services/EmailService.ts
@@ -0,0 +1,29 @@
+'use server';
+
+import { getCurrentUser } from '@/access/AuthenticationService';
+import { ApiError } from '@/groupings/GroupingsApiResults';
+import { postRequest } from './FetchService';
+
+const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL as string;
+
+export type Feedback = {
+    name?: string,
+    email: string,
+    type: string,
+    message: string,
+    exceptionMessage?: string
+};
+
+export type EmailResult = {
+    resultCode: string,
+    recipient: string,
+    from: string,
+    subject: string,
+    text: string
+}
+
+export const sendFeedback = async (feedback: Feedback): Promise<EmailResult & ApiError> => {
+    const currentUser = await getCurrentUser();
+    const endpoint = `${baseUrl}/email/send/feedback`;
+    return postRequest(endpoint, currentUser.uid, feedback);
+}
diff --git a/ui/src/services/FetchService.ts b/ui/src/services/FetchService.ts
@@ -64,7 +64,7 @@ export const getRequest = async <T> (
 export const postRequest = async <T> (
     endpoint: string, 
     currentUserKey: string,
-    body?: string | string[], 
+    body?: object | string | string[], 
 ): Promise<T & ApiError> => 
     await fetch(endpoint, { 
         method: 'POST', 
@@ -130,7 +130,7 @@ export const postRequestRetry = async <T> (
 export const putRequest = async <T> (
     endpoint: string,
     currentUserKey: string,
-    body?: string | string[]
+    body?: object | string | string[]
 ): Promise<T & ApiError> => 
     await fetch(endpoint, { 
         method: 'PUT', 
@@ -170,7 +170,7 @@ export const putRequestAsync = async <T> (
 export const deleteRequest = async <T> (
     endpoint: string,
     currentUserKey: string,
-    body?: string | string[]
+    body?: object | string | string[]
 ): Promise<T & ApiError> =>
     await fetch(endpoint, { method: 'DELETE', headers: { 'current_user': currentUserKey }, body: JSON.stringify(body) })
         .then(res => res.json())
@@ -189,7 +189,7 @@ export const deleteRequest = async <T> (
 export const deleteRequestAsync = async <T> (
     endpoint: string,
     currentUserKey: string,
-    body?: string | string[]
+    body?: object | string | string[]
 ): Promise<T & ApiError> => 
     await fetch(endpoint, {
         method: 'DELETE', 

diff --git a/ui/tests/components/layout/footer/Footer.test.tsx b/ui/tests/components/layout/footer/Footer.test.tsx
@@ -7,7 +7,8 @@ describe ('Footer', () => {
         render(<Footer />);
 
         expect(screen.getByRole('contentinfo')).toBeInTheDocument();
-        expect(screen.getByRole('img', { name: 'UH System logo' })).toBeInTheDocument();
+        expect(screen.getByRole('img', { name: 'UH System logo' }))
+            .toHaveAttribute('src', '/uhgroupings/uh-logo-system.svg');
         expect(screen.getByRole('link', { name: 'equal opportunity/affirmative action institution' }))
             .toHaveAttribute('href', 'https://www.hawaii.edu/offices/eeo/policies/?policy=antidisc');
         expect(screen.getByRole('link', { name: 'Usage Policy' }))

diff --git a/ui/tests/components/layout/navbar/Navbar.test.tsx b/ui/tests/components/layout/navbar/Navbar.test.tsx
@@ -18,7 +18,7 @@ describe('Navbar', () => {
 
             expect(screen.getByRole('navigation')).toBeInTheDocument();
             expect(screen.getAllByRole('img', { name: 'UH Groupings Logo' })[0])
-                .toHaveAttribute('src', 'uhgroupings/uh-groupings-logo.svg');
+                .toHaveAttribute('src', '/uhgroupings/uh-groupings-logo.svg');
             expect(screen.getAllByRole('link', { name: 'UH Groupings Logo' })[0]).toHaveAttribute('href', '/');
             expect(screen.queryByRole('link', { name: 'Admin' })).not.toBeInTheDocument();
             expect(screen.queryByRole('link', { name: 'Memberships' })).not.toBeInTheDocument();
@@ -43,7 +43,7 @@ describe('Navbar', () => {
 
             expect(screen.getByRole('navigation')).toBeInTheDocument();
             expect(screen.getAllByRole('img', { name: 'UH Groupings Logo' })[0])
-                .toHaveAttribute('src', 'uhgroupings/uh-groupings-logo.svg');
+                .toHaveAttribute('src', '/uhgroupings/uh-groupings-logo.svg');
             expect(screen.getAllByRole('link', { name: 'UH Groupings Logo' })[0]).toHaveAttribute('href', '/');
             expect(screen.queryByRole('link', { name: 'Admin' })).not.toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Memberships' })).toHaveAttribute('href', '/memberships');
@@ -60,7 +60,7 @@ describe('Navbar', () => {
 
             expect(screen.getByRole('navigation')).toBeInTheDocument();
             expect(screen.getAllByRole('img', { name: 'UH Groupings Logo' })[0])
-                .toHaveAttribute('src', 'uhgroupings/uh-groupings-logo.svg');
+                .toHaveAttribute('src', '/uhgroupings/uh-groupings-logo.svg');
             expect(screen.getAllByRole('link', { name: 'UH Groupings Logo' })[0]).toHaveAttribute('href', '/');
             expect(screen.queryByRole('link', { name: 'Admin' })).not.toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Memberships' })).toHaveAttribute('href', '/memberships');
@@ -77,7 +77,7 @@ describe('Navbar', () => {
 
             expect(screen.getByRole('navigation')).toBeInTheDocument();
             expect(screen.getAllByRole('img', { name: 'UH Groupings Logo' })[0])
-                .toHaveAttribute('src', 'uhgroupings/uh-groupings-logo.svg');
+                .toHaveAttribute('src', '/uhgroupings/uh-groupings-logo.svg');
             expect(screen.getAllByRole('link', { name: 'UH Groupings Logo' })[0]).toHaveAttribute('href', '/');
             expect(screen.getByRole('link', { name: 'Admin' })).toHaveAttribute('href', '/admin');
             expect(screen.getByRole('link', { name: 'Memberships' })).toHaveAttribute('href', '/memberships');

diff --git a/ui/tests/services/EmailService.test.ts b/ui/tests/services/EmailService.test.ts
@@ -0,0 +1,38 @@
+import User from '@/access/User';
+import { Feedback, sendFeedback } from '@/services/EmailService';
+import * as AuthenticationService from '@/access/AuthenticationService';
+
+const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL as string;
+const testUser: User = JSON.parse(process.env.TEST_USER_A as string);
+
+jest.mock('@/access/AuthenticationService');
+
+describe('EmailService', () => {
+
+    const currentUser =  testUser;
+    const headers = { 'current_user': currentUser.uid };
+
+    beforeAll(() => {
+        jest.spyOn(AuthenticationService, 'getCurrentUser').mockResolvedValue(testUser);
+    });
+
+    describe('sendFeedback', () => {
+
+        const feedback: Feedback = {
+            name: 'name',
+            email: 'email',
+            type: 'type',
+            message: 'message'
+        };
+
+        it('should make a POST request at the correct endpoint', async () => {
+            await sendFeedback(feedback);
+            expect(fetch).toHaveBeenCalledWith(`${baseUrl}/email/send/feedback`, {
+                body: JSON.stringify(feedback),
+                headers,
+                method: 'POST'
+            });
+        });
+
+    });
+});