Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generated intake profile fields #672

Merged
merged 40 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
99b0ec0
Add profile routes
erikguntner Apr 2, 2024
194f61f
Create intake profile view
erikguntner Apr 2, 2024
17a0a91
Create hook to generate field groups and answers
erikguntner Apr 2, 2024
1f066b7
Render field groups
erikguntner Apr 2, 2024
1fe17eb
Add Formik and helper functions to build values and validations
erikguntner Apr 2, 2024
11084ef
Add error handling and validation to fields
erikguntner Apr 2, 2024
04b7487
Add additional guests component
erikguntner Apr 2, 2024
8f0f6f8
Added comments
erikguntner Apr 3, 2024
e9656f7
Display field group title
erikguntner Apr 3, 2024
5f85928
Dispatch alert on submit
erikguntner Apr 3, 2024
2cf4c75
Add browser integration for MSW, remove Storybook, updgrade Vite
erikguntner Apr 3, 2024
68caec3
Add mock profile handlers
erikguntner Apr 3, 2024
409999b
Add profile service
erikguntner Apr 3, 2024
a2c6dd6
Create data for intake profile endpoint
erikguntner Apr 3, 2024
ac9912a
Use handler to fetch example profiles
erikguntner Apr 3, 2024
e925aeb
Remove base implementation
erikguntner Apr 3, 2024
e573c3e
Create answers api and endpoint and support partial answers array
erikguntner Apr 3, 2024
a051869
Make default number of rows for short text answers 1
erikguntner Apr 3, 2024
7ac5232
Add error handling to select and radio groups
erikguntner Apr 4, 2024
2905421
update title typography
erikguntner Apr 4, 2024
f7a154a
Refactor validations creator to accomodate require_if logic, move types
erikguntner Apr 4, 2024
7d66ddb
Update import file path
erikguntner Apr 4, 2024
3d76844
Fix some typing errors
erikguntner Apr 4, 2024
133fcfd
Differentiate fields for host profile
erikguntner Apr 4, 2024
7aafe6e
Upgrade vitejs plugin react
erikguntner Apr 4, 2024
c7deb3c
Fix relative urls in tests
erikguntner Apr 4, 2024
7e791ac
Update file structure for Intake Profile view
erikguntner Apr 8, 2024
fdc8c06
Add some validations
erikguntner Apr 8, 2024
c048404
Merge branch 'main' of https://github.com/hackforla/HomeUniteUs into …
erikguntner Apr 18, 2024
c45d3f3
Re-run npm install
erikguntner Apr 18, 2024
db3fab4
Update the guest profile to include all sections
erikguntner Apr 24, 2024
20f1641
Update directory name
erikguntner May 17, 2024
beaa3fa
Merge branch 'main' of https://github.com/hackforla/HomeUniteUs into …
erikguntner May 17, 2024
904690d
Change answer to response
erikguntner May 17, 2024
c244de0
Add profile to guest dashboard
erikguntner May 20, 2024
1295c5f
Add proper height to profile layout
erikguntner May 20, 2024
9e6bced
Update tests
erikguntner May 20, 2024
19889c3
More test updates
erikguntner May 20, 2024
ce6c687
Merge branch 'main' of https://github.com/hackforla/HomeUniteUs into …
erikguntner May 22, 2024
e91ca56
Update status
erikguntner May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
287 changes: 287 additions & 0 deletions app/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,287 @@
/* eslint-disable */
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is generated by MSW to integrate with the browser. Don't worry about reviewing it.

/* tslint:disable */

/**
* Mock Service Worker (2.2.3).
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
*/

const INTEGRITY_CHECKSUM = '223d191a56023cd36aa88c802961b911'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

self.addEventListener('install', function () {
self.skipWaiting()
})

self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim())
})

self.addEventListener('message', async function (event) {
const clientId = event.source.id

if (!clientId || !self.clients) {
return
}

const client = await self.clients.get(clientId)

if (!client) {
return
}

const allClients = await self.clients.matchAll({
type: 'window',
})

switch (event.data) {
case 'KEEPALIVE_REQUEST': {
sendToClient(client, {
type: 'KEEPALIVE_RESPONSE',
})
break
}

case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: 'INTEGRITY_CHECK_RESPONSE',
payload: INTEGRITY_CHECKSUM,
})
break
}

case 'MOCK_ACTIVATE': {
activeClientIds.add(clientId)

sendToClient(client, {
type: 'MOCKING_ENABLED',
payload: true,
})
break
}

case 'MOCK_DEACTIVATE': {
activeClientIds.delete(clientId)
break
}

case 'CLIENT_CLOSED': {
activeClientIds.delete(clientId)

const remainingClients = allClients.filter((client) => {
return client.id !== clientId
})

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister()
}

break
}
}
})

self.addEventListener('fetch', function (event) {
const { request } = event

// Bypass navigation requests.
if (request.mode === 'navigate') {
return
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
return
}

// Bypass all requests when there are no active clients.
// Prevents the self-unregistered worked from handling requests
// after it's been deleted (still remains active until the next reload).
if (activeClientIds.size === 0) {
return
}

// Generate unique request ID.
const requestId = crypto.randomUUID()
event.respondWith(handleRequest(event, requestId))
})

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event)
const response = await getResponse(event, client, requestId)

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
;(async function () {
const responseClone = response.clone()

sendToClient(
client,
{
type: 'RESPONSE',
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
type: responseClone.type,
status: responseClone.status,
statusText: responseClone.statusText,
body: responseClone.body,
headers: Object.fromEntries(responseClone.headers.entries()),
},
},
[responseClone.body],
)
})()
}

return response
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId)

if (client?.frameType === 'top-level') {
return client
}

const allClients = await self.clients.matchAll({
type: 'window',
})

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === 'visible'
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id)
})
}

async function getResponse(event, client, requestId) {
const { request } = event

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone()

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries())

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
delete headers['x-msw-intention']

return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough()
}

// Bypass initial page load requests (i.e. static assets).
// The absence of the immediate/parent client in the map of the active clients
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
// and is not ready to handle requests.
if (!activeClientIds.has(client.id)) {
return passthrough()
}

// Bypass requests with the explicit bypass header.
// Such requests can be issued by "ctx.fetch()".
const mswIntention = request.headers.get('x-msw-intention')
if (['bypass', 'passthrough'].includes(mswIntention)) {
return passthrough()
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer()
const clientMessage = await sendToClient(
client,
{
type: 'REQUEST',
payload: {
id: requestId,
url: request.url,
mode: request.mode,
method: request.method,
headers: Object.fromEntries(request.headers.entries()),
cache: request.cache,
credentials: request.credentials,
destination: request.destination,
integrity: request.integrity,
redirect: request.redirect,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
body: requestBuffer,
keepalive: request.keepalive,
},
},
[requestBuffer],
)

switch (clientMessage.type) {
case 'MOCK_RESPONSE': {
return respondWithMock(clientMessage.data)
}

case 'MOCK_NOT_FOUND': {
return passthrough()
}
}

return passthrough()
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel()

channel.port1.onmessage = (event) => {
if (event.data && event.data.error) {
return reject(event.data.error)
}

resolve(event.data)
}

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean)),
)
})
}

async function respondWithMock(response) {
// Setting response status code to 0 is a no-op.
// However, when responding with a "Response.error()", the produced Response
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error()
}

const mockedResponse = new Response(response.body, response)

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
})

return mockedResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('<GuestInviteButton />', () => {
const message = 'There was an error sending the invite.';

server.use(
http.post(`/api/auth/invite`, () => {
http.post('/api/auth/invite', () => {
return HttpResponse.json(
{
message,
Expand Down
18 changes: 7 additions & 11 deletions app/src/components/dashboard/DashboardTask.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,29 @@ import {Stack, Box, Typography, Button} from '@mui/material';
import CheckCircleOutlined from '@mui/icons-material/CheckCircleOutlined';
import LockIcon from '@mui/icons-material/Lock';
import AccessTimeIcon from '@mui/icons-material/AccessTime';
import {useNavigate} from 'react-router-dom';
import {Link} from 'react-router-dom';

import {SubTask} from '../../views/GuestApplicationTracker';

export type DashboardTaskProps = Pick<
SubTask,
'title' | 'description' | 'status' | 'buttonText' | 'url'
'title' | 'description' | 'status' | 'linkText' | 'url'
>;

export const DashboardTask = ({
title,
description,
status,
buttonText,
linkText,
url,
}: DashboardTaskProps) => {
const navigate = useNavigate();

console.log(url);
const statusIcons = {
inProgress: <AccessTimeIcon sx={{color: '#FFC700'}} />,
complete: <CheckCircleOutlined color="success" />,
locked: <LockIcon sx={{color: 'rgba(0, 0, 0, 0.38)'}} />,
};

const handleClick = () => {
navigate(url);
};

return (
<Stack sx={{flexDirection: 'row', px: 4, py: 3, width: '100%'}}>
<Box sx={{mr: 2}}>{statusIcons[status]}</Box>
Expand All @@ -53,9 +48,10 @@ export const DashboardTask = ({
size="medium"
variant="contained"
disabled={status === 'complete'}
onClick={handleClick}
to={url}
component={Link}
>
{buttonText}
{linkText}
</Button>
) : (
<Typography>Upcoming</Typography>
Expand Down
4 changes: 2 additions & 2 deletions app/src/components/dashboard/DashboardTaskAccordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ export const DashboardTaskAccordion = ({
</StyledAccordionSummary>
<Divider />
<AccordionDetails data-testid="tasks" sx={{padding: 0}}>
{subTasks.map(({id, title, description, status, buttonText, url}) => {
{subTasks.map(({id, title, description, status, linkText, url}) => {
return (
<DashboardTask
key={`subtask-${id}`}
title={title}
description={description}
status={status}
buttonText={buttonText}
linkText={linkText}
url={url}
/>
);
Expand Down
Loading
Loading