From 7580b2856f5af297e85bd0bbd0d8774e0e5c4091 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 11:13:46 -0500 Subject: [PATCH 01/33] Add base collab area, began breadcrumb work --- src/components/Breadcrumbs/index.tsx | 164 ++++++++++++- src/components/FavoriteCard/index.tsx | 8 +- src/components/FavoriteCard/table.tsx | 8 +- src/components/NavigationBar/index.test.tsx | 40 +++- src/components/NavigationBar/index.tsx | 46 +++- src/i18n/en-US/collaborationArea.ts | 9 + src/i18n/en-US/index.ts | 2 + src/i18n/en-US/modelPlanTaskList.ts | 5 +- src/views/App/index.tsx | 8 + src/views/Home/Table/index.tsx | 2 +- src/views/Home/index.tsx | 2 +- .../ModelPlan/CollaborationArea/index.scss | 0 .../ModelPlan/CollaborationArea/index.tsx | 224 ++++++++++++++++++ .../Collaborators/AddCollaborator/index.tsx | 11 + src/views/ModelPlan/Collaborators/index.tsx | 21 +- src/views/ModelPlan/Status/index.tsx | 26 +- .../_components/TaskListStatus/index.tsx | 2 +- src/views/ModelPlan/TaskList/index.tsx | 10 +- 18 files changed, 512 insertions(+), 76 deletions(-) create mode 100644 src/i18n/en-US/collaborationArea.ts create mode 100644 src/views/ModelPlan/CollaborationArea/index.scss create mode 100644 src/views/ModelPlan/CollaborationArea/index.tsx diff --git a/src/components/Breadcrumbs/index.tsx b/src/components/Breadcrumbs/index.tsx index dae42ff0fc..8bb951bb3d 100644 --- a/src/components/Breadcrumbs/index.tsx +++ b/src/components/Breadcrumbs/index.tsx @@ -1,4 +1,6 @@ import React from 'react'; +import { useTranslation } from 'react-i18next'; +import { useParams } from 'react-router-dom'; import { Breadcrumb, BreadcrumbBar, @@ -8,33 +10,169 @@ import classNames from 'classnames'; import UswdsReactLink from 'components/LinkWrapper'; +type BreadcrumbItems = { + text: string; + url: string; +}; + +const breadcrumbItemOptions = [ + 'home', + 'taskList', + 'collaborationArea', + 'notifications', + 'helpCenter', + 'basics', + 'generalCharacteristics', + 'participantsAndProviders', + 'beneficiaries', + 'opsEvalAndLearning', + 'payments', + 'itTracker', + 'prepareForClearance', + 'collaborators', + 'documents', + 'crTDLs', + 'changeHistory', + 'status' +] as const; + +type BreadcrumbItemOptions = typeof breadcrumbItemOptions[number]; + export interface BreadcrumbsProps { className?: string; - items: { - text: string; - url?: string; - }[]; + items: (BreadcrumbItemOptions | string)[]; } -/** - * Generate a `BreadcrumbBar` from links. - */ +export const commonBreadCrumbs = ( + modelID: string +): Record => ({ + home: { + text: 'plan:home', + url: '/' + }, + taskList: { + text: 'modelPlanTaskList:heading', + url: `/models/${modelID}/task-list` + }, + collaborationArea: { + text: 'collaborationArea:heading', + url: `/models/${modelID}/collaboration-area` + }, + notifications: { + text: 'notifications:breadcrumb', + url: '/notifications' + }, + helpCenter: { + text: 'helpAndKnowledge:heading', + url: '/help-and-knowledge' + }, + basics: { + text: 'basicsMisc:heading', + url: `/models/${modelID}/task-list/basics` + }, + generalCharacteristics: { + text: 'generalCharacteristicsMisc:heading', + url: `/models/${modelID}/task-list/characteristics` + }, + participantsAndProviders: { + text: 'participantsAndProvidersMisc:heading', + url: `/models/${modelID}/task-list/participants-and-providers` + }, + beneficiaries: { + text: 'beneficiariesMisc:heading', + url: `/models/${modelID}/task-list/beneficiaries` + }, + opsEvalAndLearning: { + text: 'opsEvalAndLearningMisc:heading', + url: `/models/${modelID}/task-list/ops-eval-and-learning` + }, + payments: { + text: 'paymentsMisc:heading', + url: `/models/${modelID}/task-list/payments` + }, + itTracker: { + text: 'opSolutionsMisc:heading', + url: `/models/${modelID}/task-list/it-solutions` + }, + prepareForClearance: { + text: 'prepareForClearance:heading', + url: `/models/${modelID}/task-list/prepare-for-clearance` + }, + collaborators: { + text: 'collaboratorsMisc:manageModelTeam', + url: `/models/${modelID}/collaborators` + }, + documents: { + text: 'documentsMisc:heading', + url: '/documents' + }, + crTDLs: { + text: 'crTDLs:heading', + url: '/crs-tdls' + }, + changeHistory: { + text: 'changeHistory:heading', + url: '/change-history' + }, + status: { + text: 'modelPlanMisc:headingStatus', + url: '/status' + } +}); +// Check if the item is a common item, or a custom text string passed as the last option of item array +const isCommonItem = ( + item: BreadcrumbItemOptions | any +): item is BreadcrumbItemOptions => breadcrumbItemOptions.includes(item as any); + +// Last item in the array can be a custom text string, so we need to check if it's a common item or not const Breadcrumbs = ({ items, className }: BreadcrumbsProps) => { + const { t } = useTranslation(); + + const { modelID } = useParams<{ + modelID: string; + }>(); + return ( - {items.map((link, idx) => { + {items.map((item, idx) => { if (idx === items.length - 1) { return ( - - {link.text} + + + {isCommonItem(item) + ? t(commonBreadCrumbs(modelID)[item].text) + : item} + ); } return ( - - - {link.text} + + + + {isCommonItem(item) + ? t(commonBreadCrumbs(modelID)[item].text) + : item} + ); diff --git a/src/components/FavoriteCard/index.tsx b/src/components/FavoriteCard/index.tsx index 3bcd443231..50b8f76e8c 100644 --- a/src/components/FavoriteCard/index.tsx +++ b/src/components/FavoriteCard/index.tsx @@ -20,7 +20,7 @@ type FavoriteCardProps = { type?: 'plan'; // Built in for future iterations/varations of favorited datasets that ingest i18n translations for headers. modelPlan: FavoritesModelType; removeFavorite: (modelPlanID: string, type: UpdateFavoriteProps) => void; - toTaskList?: boolean; + toCollaborationArea?: boolean; }; const FavoriteCard = ({ @@ -28,7 +28,7 @@ const FavoriteCard = ({ type = 'plan', modelPlan, removeFavorite, - toTaskList = false + toCollaborationArea = false }: FavoriteCardProps) => { const { t } = useTranslation('plan'); const { t: h } = useTranslation('customHome'); @@ -72,7 +72,9 @@ const FavoriteCard = ({

{modelName} diff --git a/src/components/FavoriteCard/table.tsx b/src/components/FavoriteCard/table.tsx index 884b146f5a..a89dab4e04 100644 --- a/src/components/FavoriteCard/table.tsx +++ b/src/components/FavoriteCard/table.tsx @@ -13,7 +13,7 @@ type FavoritesModelType = GetFavoritesQuery['modelPlanCollection'][0]; type ModelPlansTableProps = { favorites: FavoritesModelType[]; removeFavorite: (modelPlanID: string, type: UpdateFavoriteProps) => void; - toTaskList?: boolean; + toCollaborationArea?: boolean; }; /** @@ -25,7 +25,7 @@ type ModelPlansTableProps = { const FavoritesTable = ({ favorites, removeFavorite, - toTaskList = false + toCollaborationArea = false }: ModelPlansTableProps) => { const columns: any = useMemo(() => { return [ @@ -39,14 +39,14 @@ const FavoritesTable = ({ key={row.original.id} modelPlan={row.original} removeFavorite={removeFavorite} - toTaskList={toTaskList} + toCollaborationArea={toCollaborationArea} /> ); } } ]; - }, [removeFavorite, toTaskList]); + }, [removeFavorite, toCollaborationArea]); const { getTableProps, diff --git a/src/components/NavigationBar/index.test.tsx b/src/components/NavigationBar/index.test.tsx index 6862a3c975..53a99cd0e9 100644 --- a/src/components/NavigationBar/index.test.tsx +++ b/src/components/NavigationBar/index.test.tsx @@ -5,7 +5,7 @@ import { MockedProvider } from '@apollo/client/testing'; import { render, waitFor } from '@testing-library/react'; import { GetPollNotificationsDocument } from 'gql/gen/graphql'; -import NavigationBar, { navLinks } from './index'; +import NavigationBar, { getActiveTab, navLinks } from './index'; const notificationsMock = [ { @@ -91,3 +91,41 @@ describe('The NavigationBar component', () => { }); }); }); + +describe('getActiveTab', () => { + it('should return true for the home route when pathname is the home route', () => { + const route = '/'; + const pathname = '/'; + expect(getActiveTab(route, pathname)).toBe(true); + }); + + it('should return true for the home route when pathname includes a home route', () => { + const route = '/'; + const pathname = '/collaboration-area/123'; + expect(getActiveTab(route, pathname)).toBe(true); + }); + + it('should return false for the home route when pathname does not match or include a home route', () => { + const route = '/'; + const pathname = '/other-route'; + expect(getActiveTab(route, pathname)).toBe(false); + }); + + it('should return true when currentBaseRoute matches baseRoute and pathname does not include any home routes', () => { + const route = '/some-route'; + const pathname = '/some-route/123'; + expect(getActiveTab(route, pathname)).toBe(true); + }); + + it('should return false when currentBaseRoute does not match baseRoute', () => { + const route = '/some-route'; + const pathname = '/different-route/123'; + expect(getActiveTab(route, pathname)).toBe(false); + }); + + it('should return false when pathname includes a home route', () => { + const route = '/some-route'; + const pathname = '/collaboration-area/123'; + expect(getActiveTab(route, pathname)).toBe(false); + }); +}); diff --git a/src/components/NavigationBar/index.tsx b/src/components/NavigationBar/index.tsx index 442c1006e8..e164aa6807 100644 --- a/src/components/NavigationBar/index.tsx +++ b/src/components/NavigationBar/index.tsx @@ -1,10 +1,11 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { NavLink } from 'react-router-dom'; +import { NavLink, useLocation } from 'react-router-dom'; import { GridContainer, Icon, PrimaryNav } from '@trussworks/react-uswds'; import classNames from 'classnames'; import { useGetPollNotificationsQuery } from 'gql/gen/graphql'; import { useFlags } from 'launchdarkly-react-client-sdk'; +import { c } from 'vite/dist/node/types.d-aGj9QkWt'; import './index.scss'; @@ -31,6 +32,42 @@ export const navLinks = [ } ]; +export const getActiveTab = (route: string, pathname: string) => { + const homeRoutes: string[] = [ + 'collaboration-area', + 'task-list', + 'notifications', + 'homepage-settings' + ]; + + // baseRoute is the first part of the route associated with the tab + const baseRoute = route.split('/')[1]; + // currentBaseRoute is the first part of the current pathname + const currentBaseRoute = pathname.split('/')[1]; + + // If the route is the home route, check if the pathname is the home route + if (route === '/') { + if (pathname === '/') { + return true; + } + // If the route is the home route, check if the pathname includes the home route - ex: /collaboration-area/123, task-list/123, notifications + if (homeRoutes.some(homeRoute => pathname.includes(homeRoute))) { + return true; + } + return false; + } + + // If the route is not the home route, check if the currentBaseRoute is the same as the baseRoute and the pathname does not include any of the home routes + if ( + currentBaseRoute === baseRoute && + !homeRoutes.some(homeRoute => pathname.includes(homeRoute)) + ) { + return true; + } + + return false; +}; + const NavigationBar = ({ isMobile, signout, @@ -42,6 +79,8 @@ const NavigationBar = ({ const flags = useFlags(); + const { pathname } = useLocation(); + const { data } = useGetPollNotificationsQuery({ pollInterval: 5000 }); @@ -53,8 +92,9 @@ const NavigationBar = ({
expandMobileSideNav(false)} exact={route.link === '/'} > diff --git a/src/i18n/en-US/collaborationArea.ts b/src/i18n/en-US/collaborationArea.ts new file mode 100644 index 0000000000..7bea0ab486 --- /dev/null +++ b/src/i18n/en-US/collaborationArea.ts @@ -0,0 +1,9 @@ +const collaborationArea = { + home: 'Home', + heading: 'Model collaboration area', + modelPlan: 'for {{modelName}}', + errorHeading: 'Failed to fetch model plan', + errorMessage: 'Please try again' +}; + +export default collaborationArea; diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 341ea52ff9..f2e16c0e41 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -48,6 +48,7 @@ import readOnlyModelPlan from './readOnly/readOnlyModelPlan'; import accessibilityStatement from './accessibilityStatement'; import auth from './auth'; import changeHistory from './changeHistory'; +import collaborationArea from './collaborationArea'; import cookies from './cookies'; import error from './error'; import externalLinkModal from './externalLinkModal'; @@ -67,6 +68,7 @@ import termsAndConditions from './termsAndConditions'; const enUS = { accessibilityStatement, auth, + collaborationArea, cookies, changeHistory, customHome, diff --git a/src/i18n/en-US/modelPlanTaskList.ts b/src/i18n/en-US/modelPlanTaskList.ts index dc71c0f872..1f450ea163 100644 --- a/src/i18n/en-US/modelPlanTaskList.ts +++ b/src/i18n/en-US/modelPlanTaskList.ts @@ -16,10 +16,7 @@ const statusText: Record = { }; const modelPlanTaskList = { - navigation: { - home: 'Home', - modelPlanTaskList: 'Model Plan task list' - }, + heading: 'Model Plan Task List', subheading: 'for <1>{{modelName}}', status: 'Status:', update: 'Update', diff --git a/src/views/App/index.tsx b/src/views/App/index.tsx index b68b60d877..65e29801a3 100644 --- a/src/views/App/index.tsx +++ b/src/views/App/index.tsx @@ -32,6 +32,7 @@ import Login from 'views/Login'; import ModelAccessWrapper from 'views/ModelAccessWrapper'; import ModelInfoWrapper from 'views/ModelInfoWrapper'; import ChangeHistory from 'views/ModelPlan/ChangeHistory'; +import CollaborationArea from 'views/ModelPlan/CollaborationArea'; import Collaborators from 'views/ModelPlan/Collaborators'; import CRTDL from 'views/ModelPlan/CRTDL'; import Documents from 'views/ModelPlan/Documents'; @@ -142,6 +143,13 @@ const AppRoutes = () => { component={Collaborators} /> + {/* Collaboration Area Routes */} + + {/* Task List Routes */} {value} diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx index dad23109b9..c409d36fcb 100644 --- a/src/views/Home/index.tsx +++ b/src/views/Home/index.tsx @@ -135,7 +135,7 @@ const Home = () => { )} {!favoritesLoading && !favorites?.length && ( diff --git a/src/views/ModelPlan/CollaborationArea/index.scss b/src/views/ModelPlan/CollaborationArea/index.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/ModelPlan/CollaborationArea/index.tsx b/src/views/ModelPlan/CollaborationArea/index.tsx new file mode 100644 index 0000000000..7faa50f59a --- /dev/null +++ b/src/views/ModelPlan/CollaborationArea/index.tsx @@ -0,0 +1,224 @@ +import React, { useEffect, useState } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Link, useParams } from 'react-router-dom'; +import { + Breadcrumb, + BreadcrumbBar, + BreadcrumbLink, + Grid, + GridContainer +} from '@trussworks/react-uswds'; +// import classNames from 'classnames'; +import { + // GetCrtdLsQuery, + GetModelPlanQuery, + useGetModelPlanQuery +} from 'gql/gen/graphql'; + +import Breadcrumbs from 'components/Breadcrumbs'; +// import { useFlags } from 'launchdarkly-react-client-sdk'; +// import UswdsReactLink from 'components/LinkWrapper'; +import MainContent from 'components/MainContent'; +import PageHeading from 'components/PageHeading'; +import PageLoading from 'components/PageLoading'; +import Alert from 'components/shared/Alert'; +// import Divider from 'components/shared/Divider'; +import { ErrorAlert, ErrorAlertMessage } from 'components/shared/ErrorAlert'; +import UpdateStatusModal from 'components/UpdateStatusModal'; +import useMessage from 'hooks/useMessage'; + +// import { formatDateLocal } from 'utils/date'; +// import { isAssessment } from 'utils/user'; +// import { SubscriptionContext } from 'views/SubscriptionWrapper'; +// import Discussions from '../Discussions'; +// import DiscussionModalWrapper from '../Discussions/DiscussionModalWrapper'; +import TaskListStatus from '../TaskList/_components/TaskListStatus'; + +import './index.scss'; + +type GetModelPlanTypes = GetModelPlanQuery['modelPlan']; +// type DiscussionType = GetModelPlanQuery['modelPlan']['discussions'][0]; +// type DocumentType = GetModelPlanQuery['modelPlan']['documents'][0]; + +// type CRTDLType = +// | GetCrtdLsQuery['modelPlan']['crs'][0] +// | GetCrtdLsQuery['modelPlan']['tdls'][0]; + +export type StatusMessageType = { + message: string; + status: 'success' | 'error'; +}; + +const CollaborationArea = () => { + const { t: collaborationAreaT } = useTranslation('collaborationArea'); + + const { modelID } = useParams<{ modelID: string }>(); + + const { message } = useMessage(); + + // const location = useLocation(); + + // const params = useMemo(() => { + // return new URLSearchParams(location.search); + // }, [location.search]); + + // // Get discussionID from generated email link + // const discussionID = params.gecollaborationAreaT('discussionID'); + + // const flags = useFlags(); + + // const [isDiscussionOpen, setIsDiscussionOpen] = useState(false); + + const [statusMessage, setStatusMessage] = useState( + null + ); + + const { data, loading, error, refetch } = useGetModelPlanQuery({ + variables: { + id: modelID + } + }); + + const modelPlan = data?.modelPlan || ({} as GetModelPlanTypes); + + const { + modelName, + // discussions, + // documents, + // crs, + // tdls, + status, + // collaborators, + suggestedPhase + } = modelPlan; + + // const planCRs = crs || []; + // const planTDLs = tdls || []; + + // const crTdls = [...planCRs, ...planTDLs] as CRTDLType[]; + + // Gets the sessions storage variable for statusChecked of modelPlan + const statusCheckedStorage = + sessionStorage.getItem(`statusChecked-${modelID}`) === 'true'; + + // Aligns session with default value of state + const [statusChecked, setStatusChecked] = useState( + statusCheckedStorage + ); + + // Status phase modal state + const [isStatusPhaseModalOpen, setStatusPhaseModalOpen] = useState( + !!suggestedPhase || false + ); + + // Updates state if session value changes + useEffect(() => { + setStatusChecked(statusCheckedStorage); + }, [statusCheckedStorage]); + + // Sets the modal open state based on session state and suggested phase + useEffect(() => { + if (suggestedPhase && !statusChecked) setStatusPhaseModalOpen(true); + }, [suggestedPhase, statusChecked]); + + // useEffect(() => { + // if (discussionID) setIsDiscussionOpen(true); + // }, [discussionID]); + + return ( + + + + + + + {error && ( + + + + )} + + {message && ( + + {message} + + )} + + {!loading && statusMessage && ( + + {statusMessage.message} + + )} + + {/* Wait for model status query param to be removed */} + {loading && ( +
+ +
+ )} + + {!loading && data && ( + + + + {collaborationAreaT('heading')} + +

+ {collaborationAreaT('modelPlan', { + modelName + })} +

+ + {!!modelPlan.suggestedPhase && !statusChecked && ( + { + sessionStorage.setItem(`statusChecked-${modelID}`, 'true'); + setStatusPhaseModalOpen(false); + }} + currentStatus={status} + suggestedPhase={modelPlan.suggestedPhase} + setStatusMessage={setStatusMessage} + refetch={refetch} + /> + )} + + {/* Discussion modal */} + {/* {isDiscussionOpen && ( + setIsDiscussionOpen(false)} + > + + + )} */} + + + + + )} + + + ); +}; + +export default CollaborationArea; diff --git a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx index 016e4bfab8..4d69c004b7 100644 --- a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx +++ b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx @@ -12,6 +12,7 @@ import { useUpdateModelPlanCollaboratorMutation } from 'gql/gen/graphql'; +import Breadcrumbs from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import OktaUserSelect from 'components/OktaUserSelect'; @@ -187,6 +188,16 @@ const Collaborators = () => {
+ + {collaboratorId ? collaboratorsMiscT('updateATeamMember') diff --git a/src/views/ModelPlan/Collaborators/index.tsx b/src/views/ModelPlan/Collaborators/index.tsx index 063c70ea1e..6f12db56dd 100644 --- a/src/views/ModelPlan/Collaborators/index.tsx +++ b/src/views/ModelPlan/Collaborators/index.tsx @@ -187,20 +187,6 @@ export const CollaboratorsContent = () => { return
{JSON.stringify(error)}
; } - const breadcrumbs = [ - { text: miscellaneousT('home'), url: '/' }, - { text: collaboratorsMiscT('teamBreadcrumb') } - ]; - - const breadcrumbsFromTaskList = [ - { text: miscellaneousT('home'), url: '/' }, - { - text: miscellaneousT('tasklistBreadcrumb'), - url: `/models/${modelID}/task-list/` - }, - { text: collaboratorsMiscT('manageModelTeam') } - ]; - return ( {RemoveCollaborator()} @@ -212,7 +198,12 @@ export const CollaboratorsContent = () => { diff --git a/src/views/ModelPlan/Status/index.tsx b/src/views/ModelPlan/Status/index.tsx index 01e46b0f6e..1911e429f2 100644 --- a/src/views/ModelPlan/Status/index.tsx +++ b/src/views/ModelPlan/Status/index.tsx @@ -1,10 +1,7 @@ import React, { useContext, useMemo, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Grid, GridContainer, @@ -15,6 +12,7 @@ import { import { ErrorMessage, Field, Form, Formik, FormikProps } from 'formik'; import { ModelStatus, useUpdateModelPlanMutation } from 'gql/gen/graphql'; +import Breadcrumbs from 'components/Breadcrumbs'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; import FieldGroup from 'components/shared/FieldGroup'; @@ -31,7 +29,6 @@ const Status = () => { const { t: modelPlanT } = useTranslation('modelPlan'); const { t: modelPlanTaskListT } = useTranslation('modelPlanTaskList'); const { t: modelPlanMiscT } = useTranslation('modelPlanMisc'); - const { t: miscellaneousT } = useTranslation('miscellaneous'); const { status: statusConfig } = usePlanTranslation('modelPlan'); @@ -71,7 +68,7 @@ const Status = () => { status: statusConfig.options[formikValues.status as ModelStatus] }) ); - history.push(`/models/${modelID}/task-list/`); + history.push(`/models/${modelID}/collaboration-area/`); } }) .catch(errors => { @@ -88,22 +85,7 @@ const Status = () => { - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {modelPlanMiscT('headingStatus')} - + {modelPlanMiscT('headingStatus')} diff --git a/src/views/ModelPlan/TaskList/_components/TaskListStatus/index.tsx b/src/views/ModelPlan/TaskList/_components/TaskListStatus/index.tsx index 27dcfd4a7f..fb78bd4a77 100644 --- a/src/views/ModelPlan/TaskList/_components/TaskListStatus/index.tsx +++ b/src/views/ModelPlan/TaskList/_components/TaskListStatus/index.tsx @@ -105,7 +105,7 @@ const TaskListStatus = ({ {hasEditAccess && ( diff --git a/src/views/ModelPlan/TaskList/index.tsx b/src/views/ModelPlan/TaskList/index.tsx index 6f8cffe0f3..97b070764d 100644 --- a/src/views/ModelPlan/TaskList/index.tsx +++ b/src/views/ModelPlan/TaskList/index.tsx @@ -33,6 +33,7 @@ import { } from 'gql/gen/graphql'; import { useFlags } from 'launchdarkly-react-client-sdk'; +import Breadcrumbs from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -255,14 +256,7 @@ const TaskList = () => { > - - - - {t('navigation.home')} - - - {t('navigation.modelPlanTaskList')} - + {!!modelPlan.suggestedPhase && !statusChecked && ( From d77648e907c8496e391b8f5cacc66ec942b68db6 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 11:29:57 -0500 Subject: [PATCH 02/33] Updated some breadcrumbs --- src/components/Breadcrumbs/index.tsx | 13 +++------ src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx | 21 ++------------ src/views/ModelPlan/CRTDL/CRTDLs/index.tsx | 23 ++------------- .../ModelPlan/Documents/AddDocument/index.tsx | 29 ++++++------------- 4 files changed, 18 insertions(+), 68 deletions(-) diff --git a/src/components/Breadcrumbs/index.tsx b/src/components/Breadcrumbs/index.tsx index 8bb951bb3d..037fc173ef 100644 --- a/src/components/Breadcrumbs/index.tsx +++ b/src/components/Breadcrumbs/index.tsx @@ -32,7 +32,6 @@ const breadcrumbItemOptions = [ 'collaborators', 'documents', 'crTDLs', - 'changeHistory', 'status' ] as const; @@ -104,19 +103,15 @@ export const commonBreadCrumbs = ( }, documents: { text: 'documentsMisc:heading', - url: '/documents' + url: `/models/${modelID}/documents` }, crTDLs: { - text: 'crTDLs:heading', - url: '/crs-tdls' - }, - changeHistory: { - text: 'changeHistory:heading', - url: '/change-history' + text: 'crtdlsMisc:heading', + url: `/models/${modelID}/cr-tdls` }, status: { text: 'modelPlanMisc:headingStatus', - url: '/status' + url: `/models/${modelID}/status` } }); diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx index 8cf5e4bb16..e94fb34234 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx @@ -2,9 +2,6 @@ import React, { useContext, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, ButtonGroup, DateInput, @@ -33,6 +30,7 @@ import { useUpdateTdlMutation } from 'gql/gen/graphql'; +import Breadcrumbs from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -241,22 +239,7 @@ const AddCRTDL = () => { return ( - - - - {h('home')} - - - - - {t('breadcrumb')} - - - {t('heading')} - +
diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx index dc81ad0141..0888a763e4 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx @@ -1,10 +1,7 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useParams } from 'react-router-dom'; +import { useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Grid, GridContainer, Icon, @@ -15,6 +12,7 @@ import { useGetModelPlanBaseQuery } from 'gql/gen/graphql'; +import Breadcrumbs from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -48,22 +46,7 @@ export const CRTDLs = () => { - - - - {h('home')} - - - - - {t('breadcrumb')} - - - {t('heading')} - + {message && {message}} diff --git a/src/views/ModelPlan/Documents/AddDocument/index.tsx b/src/views/ModelPlan/Documents/AddDocument/index.tsx index 3de04837db..5fe913f223 100644 --- a/src/views/ModelPlan/Documents/AddDocument/index.tsx +++ b/src/views/ModelPlan/Documents/AddDocument/index.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { useHistory, useLocation, useParams } from 'react-router-dom'; +import { useHistory, useLocation } from 'react-router-dom'; import { Button, ButtonGroup, @@ -18,9 +18,7 @@ import DocumentUpload from './documentUpload'; import LinkDocument from './LinkDocument'; const AddDocument = () => { - const { t: h } = useTranslation('draftModelPlan'); const { t } = useTranslation('documentsMisc'); - const { modelID } = useParams<{ modelID: string }>(); const [formState, setFormState] = useState<'upload' | 'link'>('upload'); @@ -38,20 +36,13 @@ const AddDocument = () => { const solutionDetailsLink = state?.solutionDetailsLink; const solutionID = state?.solutionID; - const breadcrumbs = [ - { text: h('home'), url: '/' }, - { text: t('breadcrumb'), url: `/models/${modelID}/task-list/` }, - { - text: solutionDetailsLink ? t('itTracker') : t('heading'), - url: solutionDetailsLink - ? `/models/${modelID}/task-list/it-solutions` - : `/models/${modelID}/documents` - }, - { - text: t('solutionDetails'), - url: solutionDetailsLink - }, - { text: t('breadcrumb2') } + const breadcrumbs = ['home', 'taskList', 'documents', t('addADocument')]; + + const solutionDocumentBreadcrumb = [ + 'home', + 'taskList', + 'itTracker', + t('solutionDetails') ]; return ( @@ -60,9 +51,7 @@ const AddDocument = () => { item.text !== t('solutionDetails')) + solutionDetailsLink ? solutionDocumentBreadcrumb : breadcrumbs } /> From 8aab931a6140a075a106abaef1b1a7a735f51d84 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 12:35:12 -0500 Subject: [PATCH 03/33] Adjusted brteadcrumbs to enum --- src/components/Breadcrumbs/index.tsx | 152 ++++++++---------- src/i18n/en-US/modelPlanTaskList.ts | 3 +- .../_components/SolutionsHeader/index.tsx | 15 +- src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx | 10 +- src/views/ModelPlan/CRTDL/CRTDLs/index.tsx | 10 +- .../ModelPlan/CollaborationArea/index.tsx | 19 ++- .../Collaborators/AddCollaborator/index.tsx | 32 ++-- src/views/ModelPlan/Collaborators/index.tsx | 18 ++- .../ModelPlan/Documents/AddDocument/index.tsx | 18 ++- src/views/ModelPlan/Documents/index.tsx | 24 +-- src/views/ModelPlan/Status/index.tsx | 10 +- src/views/ModelPlan/TaskList/index.tsx | 31 ++-- 12 files changed, 183 insertions(+), 159 deletions(-) diff --git a/src/components/Breadcrumbs/index.tsx b/src/components/Breadcrumbs/index.tsx index 037fc173ef..108dc1fbdc 100644 --- a/src/components/Breadcrumbs/index.tsx +++ b/src/components/Breadcrumbs/index.tsx @@ -15,113 +15,112 @@ type BreadcrumbItems = { url: string; }; -const breadcrumbItemOptions = [ - 'home', - 'taskList', - 'collaborationArea', - 'notifications', - 'helpCenter', - 'basics', - 'generalCharacteristics', - 'participantsAndProviders', - 'beneficiaries', - 'opsEvalAndLearning', - 'payments', - 'itTracker', - 'prepareForClearance', - 'collaborators', - 'documents', - 'crTDLs', - 'status' -] as const; - -type BreadcrumbItemOptions = typeof breadcrumbItemOptions[number]; +export enum BreadcrumbItemOptions { + HOME = 'HOME', + TASK_LIST = 'TASK_LIST', + COLLABORATION_AREA = 'COLLABORATION_AREA', + NOTIFICATIONS = 'NOTIFICATIONS', + HELP_CENTER = 'HELP_CENTER', + HELP_SOLUTIONS = 'HELP_SOLUTIONS', + BASICS = 'BASICS', + GENERAL_CHARACTERISTICS = 'GENERAL_CHARACTERISTICS', + PARTICIPANTS_AND_PROVIDERS = 'PARTICIPANTS_AND_PROVIDERS', + BENEFICIARIES = 'BENEFICIARIES', + OPS_EVAL_AND_LEARNING = 'OPS_EVAL_AND_LEARNING', + PAYMENTS = 'PAYMENTS', + IT_TRACKER = 'IT_TRACKER', + PREPARE_FOR_CLEARANCE = 'PREPARE_FOR_CLEARANCE', + COLLABORATORS = 'COLLABORATORS', + DOCUMENTS = 'DOCUMENTS', + CR_TDLS = 'CR_TDLS', + STATUS = 'STATUS' +} export interface BreadcrumbsProps { className?: string; - items: (BreadcrumbItemOptions | string)[]; + items: BreadcrumbItemOptions[]; + customItem?: string; } export const commonBreadCrumbs = ( modelID: string ): Record => ({ - home: { + HOME: { text: 'plan:home', url: '/' }, - taskList: { + TASK_LIST: { text: 'modelPlanTaskList:heading', url: `/models/${modelID}/task-list` }, - collaborationArea: { + COLLABORATION_AREA: { text: 'collaborationArea:heading', url: `/models/${modelID}/collaboration-area` }, - notifications: { + NOTIFICATIONS: { text: 'notifications:breadcrumb', url: '/notifications' }, - helpCenter: { + HELP_CENTER: { text: 'helpAndKnowledge:heading', url: '/help-and-knowledge' }, - basics: { + HELP_SOLUTIONS: { + text: 'helpAndKnowledge:operationalSolutions', + url: '/help-and-knowledge/operational-solutions?page=1' + }, + BASICS: { text: 'basicsMisc:heading', url: `/models/${modelID}/task-list/basics` }, - generalCharacteristics: { + GENERAL_CHARACTERISTICS: { text: 'generalCharacteristicsMisc:heading', url: `/models/${modelID}/task-list/characteristics` }, - participantsAndProviders: { + PARTICIPANTS_AND_PROVIDERS: { text: 'participantsAndProvidersMisc:heading', url: `/models/${modelID}/task-list/participants-and-providers` }, - beneficiaries: { + BENEFICIARIES: { text: 'beneficiariesMisc:heading', url: `/models/${modelID}/task-list/beneficiaries` }, - opsEvalAndLearning: { + OPS_EVAL_AND_LEARNING: { text: 'opsEvalAndLearningMisc:heading', url: `/models/${modelID}/task-list/ops-eval-and-learning` }, - payments: { + PAYMENTS: { text: 'paymentsMisc:heading', url: `/models/${modelID}/task-list/payments` }, - itTracker: { + IT_TRACKER: { text: 'opSolutionsMisc:heading', url: `/models/${modelID}/task-list/it-solutions` }, - prepareForClearance: { + PREPARE_FOR_CLEARANCE: { text: 'prepareForClearance:heading', url: `/models/${modelID}/task-list/prepare-for-clearance` }, - collaborators: { + COLLABORATORS: { text: 'collaboratorsMisc:manageModelTeam', url: `/models/${modelID}/collaborators` }, - documents: { + DOCUMENTS: { text: 'documentsMisc:heading', url: `/models/${modelID}/documents` }, - crTDLs: { + CR_TDLS: { text: 'crtdlsMisc:heading', url: `/models/${modelID}/cr-tdls` }, - status: { + STATUS: { text: 'modelPlanMisc:headingStatus', url: `/models/${modelID}/status` } }); -// Check if the item is a common item, or a custom text string passed as the last option of item array -const isCommonItem = ( - item: BreadcrumbItemOptions | any -): item is BreadcrumbItemOptions => breadcrumbItemOptions.includes(item as any); - // Last item in the array can be a custom text string, so we need to check if it's a common item or not -const Breadcrumbs = ({ items, className }: BreadcrumbsProps) => { +const Breadcrumbs = ({ items, customItem, className }: BreadcrumbsProps) => { const { t } = useTranslation(); const { modelID } = useParams<{ @@ -130,48 +129,35 @@ const Breadcrumbs = ({ items, className }: BreadcrumbsProps) => { return ( - {items.map((item, idx) => { - if (idx === items.length - 1) { + <> + {items.map((item, idx) => { + if (idx === items.length - 1 && !customItem) { + return ( + + {t(commonBreadCrumbs(modelID)[item].text)} + + ); + } return ( - - - {isCommonItem(item) - ? t(commonBreadCrumbs(modelID)[item].text) - : item} - + + + {t(commonBreadCrumbs(modelID)[item].text)} + ); - } - return ( - - - - {isCommonItem(item) - ? t(commonBreadCrumbs(modelID)[item].text) - : item} - - + })} + {customItem && ( + + {customItem} - ); - })} + )} + ); }; diff --git a/src/i18n/en-US/modelPlanTaskList.ts b/src/i18n/en-US/modelPlanTaskList.ts index 1f450ea163..81863f7444 100644 --- a/src/i18n/en-US/modelPlanTaskList.ts +++ b/src/i18n/en-US/modelPlanTaskList.ts @@ -182,7 +182,8 @@ const modelPlanTaskList = { goToTimeline: 'No, go to timeline', hint: 'Select the specific clearance phase.', statusText - } + }, + returnToCollaboration: 'Return to model collaboration area' }; export default modelPlanTaskList; diff --git a/src/views/HelpAndKnowledge/SolutionsHelp/_components/SolutionsHeader/index.tsx b/src/views/HelpAndKnowledge/SolutionsHelp/_components/SolutionsHeader/index.tsx index c36abb21cb..0037394e44 100644 --- a/src/views/HelpAndKnowledge/SolutionsHelp/_components/SolutionsHeader/index.tsx +++ b/src/views/HelpAndKnowledge/SolutionsHelp/_components/SolutionsHeader/index.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { Grid, GridContainer } from '@trussworks/react-uswds'; import classNames from 'classnames'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import PageHeading from 'components/PageHeading'; import GlobalClientFilter from 'components/TableFilter'; import { OperationalSolutionCategoryRoute } from 'data/operationalSolutionCategories'; @@ -37,15 +37,13 @@ const SolutionsHeader = ({ : ''; const breadcrumbs = [ - { text: t('heading'), url: '/help-and-knowledge' }, - { - text: t('operationalSolutions'), - url: `/help-and-knowledge/operational-solutions?page=1` - } + BreadcrumbItemOptions.HELP_CENTER, + BreadcrumbItemOptions.HELP_SOLUTIONS ]; + let crumbText = ''; if (categoryKey) { - let crumbText = t(`categories.${categoryKey}.header`); + crumbText = t(`categories.${categoryKey}.header`); if ( solutionCategories[categoryKey as OperationalSolutionCategoryRoute] @@ -53,8 +51,6 @@ const SolutionsHeader = ({ ) { crumbText += ` ${t(`categories.${categoryKey}.subHeader`)}`; } - - breadcrumbs.push({ text: crumbText, url: '' }); } return ( @@ -67,6 +63,7 @@ const SolutionsHeader = ({ diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx index e94fb34234..5da41ba9ce 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx @@ -30,7 +30,7 @@ import { useUpdateTdlMutation } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -239,7 +239,13 @@ const AddCRTDL = () => { return ( - +
diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx index 0888a763e4..e0c356c9b8 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx @@ -12,7 +12,7 @@ import { useGetModelPlanBaseQuery } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -46,7 +46,13 @@ export const CRTDLs = () => { - + {message && {message}} diff --git a/src/views/ModelPlan/CollaborationArea/index.tsx b/src/views/ModelPlan/CollaborationArea/index.tsx index 7faa50f59a..b7e5a7bf15 100644 --- a/src/views/ModelPlan/CollaborationArea/index.tsx +++ b/src/views/ModelPlan/CollaborationArea/index.tsx @@ -1,13 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useParams } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Grid, - GridContainer -} from '@trussworks/react-uswds'; +import { useParams } from 'react-router-dom'; +import { Grid, GridContainer } from '@trussworks/react-uswds'; // import classNames from 'classnames'; import { // GetCrtdLsQuery, @@ -15,7 +9,7 @@ import { useGetModelPlanQuery } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; // import { useFlags } from 'launchdarkly-react-client-sdk'; // import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; @@ -132,7 +126,12 @@ const CollaborationArea = () => { > - + {error && ( diff --git a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx index 4d69c004b7..eb0a9e9664 100644 --- a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx +++ b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx @@ -12,7 +12,7 @@ import { useUpdateModelPlanCollaboratorMutation } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import OktaUserSelect from 'components/OktaUserSelect'; @@ -184,20 +184,30 @@ const Collaborators = () => { } }; + const breadcrumbs = [BreadcrumbItemOptions.HOME]; + + if (manageOrAdd === 'manage') { + breadcrumbs.push( + BreadcrumbItemOptions.COLLABORATION_AREA, + BreadcrumbItemOptions.TASK_LIST, + BreadcrumbItemOptions.COLLABORATORS + ); + } else { + breadcrumbs.push(BreadcrumbItemOptions.COLLABORATORS); + } + return (
+
- - {collaboratorId ? collaboratorsMiscT('updateATeamMember') diff --git a/src/views/ModelPlan/Collaborators/index.tsx b/src/views/ModelPlan/Collaborators/index.tsx index 6f12db56dd..04698c92c3 100644 --- a/src/views/ModelPlan/Collaborators/index.tsx +++ b/src/views/ModelPlan/Collaborators/index.tsx @@ -17,7 +17,7 @@ import { useGetModelCollaboratorsQuery } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import Modal from 'components/Modal'; @@ -199,12 +199,22 @@ export const CollaboratorsContent = () => { {manageOrAdd === 'manage' ? ( diff --git a/src/views/ModelPlan/Documents/AddDocument/index.tsx b/src/views/ModelPlan/Documents/AddDocument/index.tsx index 5fe913f223..4054e51069 100644 --- a/src/views/ModelPlan/Documents/AddDocument/index.tsx +++ b/src/views/ModelPlan/Documents/AddDocument/index.tsx @@ -9,7 +9,7 @@ import { Icon } from '@trussworks/react-uswds'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; import RequiredAsterisk from 'components/shared/RequiredAsterisk'; @@ -36,13 +36,16 @@ const AddDocument = () => { const solutionDetailsLink = state?.solutionDetailsLink; const solutionID = state?.solutionID; - const breadcrumbs = ['home', 'taskList', 'documents', t('addADocument')]; + const breadcrumbs = [ + BreadcrumbItemOptions.HOME, + BreadcrumbItemOptions.TASK_LIST, + BreadcrumbItemOptions.DOCUMENTS + ]; const solutionDocumentBreadcrumb = [ - 'home', - 'taskList', - 'itTracker', - t('solutionDetails') + BreadcrumbItemOptions.HOME, + BreadcrumbItemOptions.TASK_LIST, + BreadcrumbItemOptions.IT_TRACKER ]; return ( @@ -53,6 +56,9 @@ const AddDocument = () => { items={ solutionDetailsLink ? solutionDocumentBreadcrumb : breadcrumbs } + customItem={ + solutionDetailsLink ? t('addDocument') : t('solutionDetails') + } /> diff --git a/src/views/ModelPlan/Documents/index.tsx b/src/views/ModelPlan/Documents/index.tsx index 923b8ba36c..42ec938534 100644 --- a/src/views/ModelPlan/Documents/index.tsx +++ b/src/views/ModelPlan/Documents/index.tsx @@ -10,6 +10,7 @@ import { Icon } from '@trussworks/react-uswds'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -41,22 +42,13 @@ export const DocumentsContent = () => { - - - - {h('home')} - - - - - {t('breadcrumb')} - - - {t('heading')} - + {message && {message}} diff --git a/src/views/ModelPlan/Status/index.tsx b/src/views/ModelPlan/Status/index.tsx index 1911e429f2..ca0de0fae7 100644 --- a/src/views/ModelPlan/Status/index.tsx +++ b/src/views/ModelPlan/Status/index.tsx @@ -12,7 +12,7 @@ import { import { ErrorMessage, Field, Form, Formik, FormikProps } from 'formik'; import { ModelStatus, useUpdateModelPlanMutation } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; import FieldGroup from 'components/shared/FieldGroup'; @@ -85,7 +85,13 @@ const Status = () => { - + {modelPlanMiscT('headingStatus')} diff --git a/src/views/ModelPlan/TaskList/index.tsx b/src/views/ModelPlan/TaskList/index.tsx index 97b070764d..214de7457a 100644 --- a/src/views/ModelPlan/TaskList/index.tsx +++ b/src/views/ModelPlan/TaskList/index.tsx @@ -9,11 +9,8 @@ import React, { } from 'react'; import { Trans, useTranslation } from 'react-i18next'; import { RootStateOrAny, useSelector } from 'react-redux'; -import { Link, useLocation, useParams } from 'react-router-dom'; +import { useLocation, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Grid, GridContainer, @@ -33,7 +30,7 @@ import { } from 'gql/gen/graphql'; import { useFlags } from 'launchdarkly-react-client-sdk'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -256,7 +253,13 @@ const TaskList = () => { > - + {!!modelPlan.suggestedPhase && !statusChecked && ( @@ -310,7 +313,7 @@ const TaskList = () => { - {t('navigation.modelPlanTaskList')} + {t('heading')}

{ )} - +

+ + + + {t('returnToCollaboration')} + + +
Date: Tue, 13 Aug 2024 12:50:45 -0500 Subject: [PATCH 04/33] Updated more breadcrumbs --- .../TaskList/Basics/Milestones/index.tsx | 28 +- .../TaskList/Basics/Overview/index.tsx | 28 +- src/views/ModelPlan/TaskList/Basics/index.tsx | 26 +- .../BeneficiaryIdentification/index.tsx | 28 +- .../Beneficiaries/Frequency/index.tsx | 28 +- .../Beneficiaries/PeopleImpact/index.tsx | 28 +- .../Authority/index.tsx | 30 +- .../Involvements/index.tsx | 37 +- .../KeyCharacteristics/index.tsx | 30 +- .../TargetsAndOptions/index.tsx | 29 +- .../TaskList/GeneralCharacteristics/index.tsx | 29 +- .../CCWAndQuality/index.tsx | 28 +- .../OpsEvalAndLearning/DataSharing/index.tsx | 36 +- .../OpsEvalAndLearning/Evaluation/index.tsx | 28 +- .../OpsEvalAndLearning/IDDOC/index.tsx | 28 +- .../IDDOCMonitoring/index.tsx | 28 +- .../OpsEvalAndLearning/IDDOCTesting/index.tsx | 28 +- .../OpsEvalAndLearning/Learning/index.tsx | 27 +- .../OpsEvalAndLearning/Performance/index.tsx | 36 +- .../TaskList/OpsEvalAndLearning/index.tsx | 28 +- .../Communication/index.tsx | 30 +- .../Coordination/index.tsx | 30 +- .../ParticipantOptions/index.tsx | 30 +- .../ProviderOptions/index.tsx | 30 +- .../ParticipantsAndProviders/index.tsx | 29 +- .../Payment/AnticipateDependencies/index.tsx | 27 +- .../Payment/BeneficiaryCostSharing/index.tsx | 28 +- .../Payment/ClaimsBasedPayment/index.tsx | 28 +- .../TaskList/Payment/Complexity/index.tsx | 27 +- .../TaskList/Payment/FundingSource/index.tsx | 28 +- .../Payment/NonClaimsBasedPayment/index.tsx | 27 +- .../TaskList/Payment/Recover/index.tsx | 27 +- .../PrepareForClearance/Checklist/index.tsx | 394 +++++++++--------- .../ClearanceReview/index.tsx | 36 +- 34 files changed, 550 insertions(+), 809 deletions(-) diff --git a/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx b/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx index f9fd3646be..0398006b15 100644 --- a/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx @@ -1,11 +1,8 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { Alert, - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -126,19 +124,15 @@ const Milestones = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {basicsMiscT('breadcrumb')} - + + {basicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx b/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx index 10704bdeb8..275f80f363 100644 --- a/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -21,6 +18,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -96,19 +94,15 @@ const Overview = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {basicsMiscT('breadcrumb')} - + + {basicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Basics/index.tsx b/src/views/ModelPlan/TaskList/Basics/index.tsx index cf39ccc48b..06e64e7986 100644 --- a/src/views/ModelPlan/TaskList/Basics/index.tsx +++ b/src/views/ModelPlan/TaskList/Basics/index.tsx @@ -1,7 +1,6 @@ import React, { Fragment, useEffect, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { - Link, Route, Switch, useHistory, @@ -9,9 +8,6 @@ import { useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -34,6 +30,7 @@ import { } from 'gql/gen/graphql'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MainContent from 'components/MainContent'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -224,19 +221,14 @@ const BasicsContent = () => { url={destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {basicsMiscT('breadcrumb')} - + {basicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/index.tsx b/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/index.tsx index 3b459e28f2..8e3847016b 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/index.tsx +++ b/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -124,19 +122,15 @@ const BeneficiaryIdentification = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {beneficiariesMiscT('breadcrumb')} - + + {beneficiariesMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/index.tsx b/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/index.tsx index 72538a51cf..e9ab2301b7 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/index.tsx +++ b/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -22,6 +19,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; @@ -145,19 +143,15 @@ const Frequency = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {beneficiariesMiscT('breadcrumb')} - + + {beneficiariesMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx index 607242d352..eb9abf91b5 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx +++ b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -25,6 +22,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -109,19 +107,15 @@ const PeopleImpact = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {beneficiariesMiscT('breadcrumb')} - + + {beneficiariesMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx index 4614823a5b..b54a1c0b13 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -22,6 +19,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -127,21 +125,15 @@ const Authority = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {generalCharacteristicsMiscT('breadcrumb')} - - + + {generalCharacteristicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/index.tsx index 284f70d514..f1bc405ad8 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/index.tsx @@ -1,15 +1,7 @@ import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Button, - Fieldset, - Icon, - Label -} from '@trussworks/react-uswds'; +import { useHistory, useParams } from 'react-router-dom'; +import { Button, Fieldset, Icon, Label } from '@trussworks/react-uswds'; import { Field, Form, Formik, FormikProps } from 'formik'; import { GetInvolvementsQuery, @@ -20,6 +12,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -114,21 +107,15 @@ const Involvements = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {generalCharacteristicsMiscT('breadcrumb')} - - + + {generalCharacteristicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx index 4fe8c507a8..c8443454bd 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -142,21 +140,15 @@ const KeyCharacteristics = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {generalCharacteristicsMiscT('breadcrumb')} - - + + {generalCharacteristicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx index 0370c3fc7e..1b8d44b8e8 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -143,22 +141,15 @@ const TargetsAndOptions = () => { closeModal={() => mutationError.setIsModalOpen(false)} url={mutationError.destinationURL} /> + - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {generalCharacteristicsMiscT('breadcrumb')} - - {generalCharacteristicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/index.tsx index e2522c1b0e..f4396d035e 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/index.tsx @@ -8,7 +8,6 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { - Link, Route, Switch, useHistory, @@ -16,9 +15,6 @@ import { useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, ComboBox, Fieldset, @@ -49,6 +45,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MainContent from 'components/MainContent'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -430,21 +427,15 @@ export const CharacteristicsContent = () => { url={destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {generalCharacteristicsMiscT('breadcrumb')} - - + + {generalCharacteristicsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx index 082af9590b..f34df033b6 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -23,6 +20,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -147,19 +145,15 @@ const CCWAndQuality = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/index.tsx index a758090a1d..6edff9e731 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/index.tsx @@ -1,16 +1,7 @@ import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Button, - Fieldset, - Icon, - Label, - Select -} from '@trussworks/react-uswds'; +import { useHistory, useParams } from 'react-router-dom'; +import { Button, Fieldset, Icon, Label, Select } from '@trussworks/react-uswds'; import { Field, Form, Formik, FormikProps } from 'formik'; import { DataStartsType, @@ -21,6 +12,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -163,19 +155,15 @@ const DataSharing = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx index 3c9233b548..51d80d4a72 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -25,6 +22,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -162,19 +160,15 @@ const Evaluation = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/index.tsx index d6dac7a7c1..094bb73a4f 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -21,6 +18,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -122,19 +120,15 @@ const IDDOC = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/index.tsx index 3a925d401d..ac0b7f156f 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -22,6 +19,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -122,19 +120,15 @@ const IDDOCMonitoring = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx index b840796b3c..bea9ca20b5 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -21,6 +18,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -122,19 +120,15 @@ const IDDOCTesting = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx index fe7e2506a3..4461bcfa05 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -21,6 +18,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -133,19 +131,14 @@ const Learning = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/index.tsx index 7206cfd891..00f2730552 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/index.tsx @@ -1,16 +1,7 @@ import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Button, - Fieldset, - Icon, - Label, - Radio -} from '@trussworks/react-uswds'; +import { useHistory, useParams } from 'react-router-dom'; +import { Button, Fieldset, Icon, Label, Radio } from '@trussworks/react-uswds'; import { Field, Form, Formik, FormikProps } from 'formik'; import { GetPerformanceQuery, @@ -21,6 +12,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -161,19 +153,15 @@ const Performance = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx index a8a2d7f105..5c37d6ce7f 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, Route, Switch, useHistory, useParams } from 'react-router-dom'; +import { Route, Switch, useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -27,6 +24,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MainContent from 'components/MainContent'; @@ -207,19 +205,15 @@ export const OpsEvalAndLearningContent = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {opsEvalAndLearningMiscT('breadcrumb')} - + + {opsEvalAndLearningMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx index d855397e3b..93c48792fa 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -23,6 +20,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; @@ -143,21 +141,15 @@ export const Communication = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {participantsAndProvidersMiscT('breadcrumb')} - - + + {participantsAndProvidersMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx index 1f8f8065ed..73ff2f1870 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -143,21 +141,15 @@ export const Coordination = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {participantsAndProvidersMiscT('breadcrumb')} - - + + {participantsAndProvidersMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx index 19433fac8e..3ad5e55d0a 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -127,21 +125,15 @@ export const ParticipantOptions = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {participantsAndProvidersMiscT('breadcrumb')} - - + + {participantsAndProvidersMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx index b54ef30527..1ed2081431 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Icon, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; @@ -159,21 +157,15 @@ export const ProviderOptions = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {participantsAndProvidersMiscT('breadcrumb')} - - + + {participantsAndProvidersMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx index 5f04a481eb..971e196e52 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/index.tsx @@ -1,10 +1,7 @@ import React, { useRef, useState } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, Route, Switch, useHistory, useParams } from 'react-router-dom'; +import { Route, Switch, useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -26,6 +23,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MainContent from 'components/MainContent'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -136,21 +134,14 @@ export const ParticipantsAndProvidersContent = () => { closeModal={() => setIsModalOpen(false)} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - - {participantsAndProvidersMiscT('breadcrumb')} - - + {participantsAndProvidersMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/index.tsx b/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/index.tsx index ab48d1a214..ea4f0d0a0e 100644 --- a/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -139,19 +137,14 @@ const AnticipateDependencies = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/index.tsx b/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/index.tsx index c620face1c..9c5322dc07 100644 --- a/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import MutationErrorModal from 'components/MutationErrorModal'; import PageHeading from 'components/PageHeading'; @@ -124,20 +122,14 @@ const BeneficiaryCostSharing = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - - + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/index.tsx b/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/index.tsx index 598da99749..b9756d7bca 100644 --- a/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -24,6 +21,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -138,19 +136,15 @@ const ClaimsBasedPayment = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx b/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx index a4b9e9868a..18f18cd1c8 100644 --- a/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/Complexity/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -26,6 +23,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -161,19 +159,14 @@ const Complexity = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/FundingSource/index.tsx b/src/views/ModelPlan/TaskList/Payment/FundingSource/index.tsx index 86b6a496bf..20b0fad0e2 100644 --- a/src/views/ModelPlan/TaskList/Payment/FundingSource/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/FundingSource/index.tsx @@ -1,10 +1,7 @@ import React, { Fragment, useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -26,6 +23,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -319,19 +317,15 @@ const FundingSource = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/index.tsx b/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/index.tsx index 4c536deab2..7199fd071d 100644 --- a/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -25,6 +22,7 @@ import { import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; import MutationErrorModal from 'components/MutationErrorModal'; @@ -157,19 +155,14 @@ const NonClaimsBasedPayment = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/Payment/Recover/index.tsx b/src/views/ModelPlan/TaskList/Payment/Recover/index.tsx index 07dcd149b7..9eb176d877 100644 --- a/src/views/ModelPlan/TaskList/Payment/Recover/index.tsx +++ b/src/views/ModelPlan/TaskList/Payment/Recover/index.tsx @@ -1,10 +1,7 @@ import React, { useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Link, useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, Button, Fieldset, Grid, @@ -25,6 +22,7 @@ import { useFlags } from 'launchdarkly-react-client-sdk'; import AddNote from 'components/AddNote'; import AskAQuestion from 'components/AskAQuestion'; import BooleanRadio from 'components/BooleanRadioForm'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import ConfirmLeave from 'components/ConfirmLeave'; import FrequencyForm from 'components/FrequencyForm'; import ITSolutionsWarning from 'components/ITSolutionsWarning'; @@ -161,19 +159,14 @@ const Recover = () => { url={mutationError.destinationURL} /> - - - - {miscellaneousT('home')} - - - - - {miscellaneousT('tasklistBreadcrumb')} - - - {paymentsMiscT('breadcrumb')} - + {paymentsMiscT('heading')} diff --git a/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/index.tsx b/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/index.tsx index accc1dc163..785d9e10e9 100644 --- a/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/index.tsx +++ b/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/index.tsx @@ -5,16 +5,8 @@ Each checkbox modifies the 'status' on its respective task list sections import React, { Fragment, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, useHistory } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Button, - Fieldset, - Grid, - Icon -} from '@trussworks/react-uswds'; +import { useHistory } from 'react-router-dom'; +import { Button, Fieldset, Grid, Icon } from '@trussworks/react-uswds'; import classNames from 'classnames'; import { Field, Form, Formik, FormikProps } from 'formik'; import { @@ -37,6 +29,7 @@ import { useUpdateClearancePaymentsMutation } from 'gql/gen/graphql'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import PageHeading from 'components/PageHeading'; import CheckboxField from 'components/shared/CheckboxField'; @@ -207,203 +200,208 @@ const PrepareForClearanceCheckList = ({ } return ( - - - - - {h('home')} - - - - - {h('tasklistBreadcrumb')} - - - {t('breadcrumb')} - - - {t('heading')} - - -

+ -

- {t('description')} -

- - { - handleFormSubmit(); - }} - enableReinitialize - innerRef={formikRef} - > - {(formikProps: FormikProps) => { - const { - errors, - handleSubmit, - setErrors, - values, - setFieldValue - } = formikProps; - const flatErrors = flattenErrors(errors); - - return ( - <> - {Object.keys(errors).length > 0 && ( - + + {t('heading')} + + +

+

+ {t('description')} +

+ + { + handleFormSubmit(); + }} + enableReinitialize + innerRef={formikRef} + > + {(formikProps: FormikProps) => { + const { + errors, + handleSubmit, + setErrors, + values, + setFieldValue + } = formikProps; + const flatErrors = flattenErrors(errors); + + return ( + <> + {Object.keys(errors).length > 0 && ( + + {Object.keys(flatErrors).map(key => { + return ( + + ); + })} + + )} + +
{ + handleSubmit(e); + }} > - {Object.keys(flatErrors).map(key => { - return ( - - ); - })} - - )} - - { - handleSubmit(e); - }} - > -

{t('subheading')}

- -
-
- - {flatErrors.basics} - {/* Mapping over task list sections and dynamically rendering each checkbox with labels */} - {Object.keys(taskListSections).map((section: string) => { - const sectionID = - values[ - section as keyof ClearanceStatusesModelPlanFormType - ]?.id; - - const sectionStatus = - values[ - section as keyof ClearanceStatusesModelPlanFormType - ]?.status; - - const readyForClearanceByUserAccount = - values[ - section as keyof ClearanceStatusesModelPlanFormType - ]?.readyForClearanceByUserAccount; - - const readyForClearanceDts = - values[ - section as keyof ClearanceStatusesModelPlanFormType - ]?.readyForClearanceDts; - - // Bypass/don't render itSolutions or prepareForClearance task list sections - if ( - section === 'itSolutions' || - section === 'prepareForClearance' - ) - return null; - return ( - - - ) => { - if (e.target.checked) { - setFieldValue( - `${section}.status`, +

{t('subheading')}

+ +
+
+ + {flatErrors.basics} + {/* Mapping over task list sections and dynamically rendering each checkbox with labels */} + {Object.keys(taskListSections).map( + (section: string) => { + const sectionID = + values[ + section as keyof ClearanceStatusesModelPlanFormType + ]?.id; + + const sectionStatus = + values[ + section as keyof ClearanceStatusesModelPlanFormType + ]?.status; + + const readyForClearanceByUserAccount = + values[ + section as keyof ClearanceStatusesModelPlanFormType + ]?.readyForClearanceByUserAccount; + + const readyForClearanceDts = + values[ + section as keyof ClearanceStatusesModelPlanFormType + ]?.readyForClearanceDts; + + // Bypass/don't render itSolutions or prepareForClearance task list sections + if ( + section === 'itSolutions' || + section === 'prepareForClearance' + ) + return null; + return ( + + - - {/* Label to render who marked readyForClearance and when */} - {readyForClearanceByUserAccount && - readyForClearanceDts && ( - - )} - - - {/* Need to pass in section ID to update readyForClearance state on next route */} - - {t('review', { - section: taskListSections[ - section - ].heading.toLowerCase() - })} - - + ) => { + if (e.target.checked) { + setFieldValue( + `${section}.status`, + TaskStatus.READY_FOR_CLEARANCE + ); + } else { + setFieldValue( + `${section}.status`, + TaskStatus.IN_PROGRESS + ); + } + }} /> - - - - ); - })} - + {/* Label to render who marked readyForClearance and when */} + {readyForClearanceByUserAccount && + readyForClearanceDts && ( + + )} + + + {/* Need to pass in section ID to update readyForClearance state on next route */} + + {t('review', { + section: taskListSections[ + section + ].heading.toLowerCase() + })} + + + + + + ); + } + )} + + + +
-
- -
- - - ); - }} -
- + + + + ); + }} + + +
); }; diff --git a/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/index.tsx b/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/index.tsx index ce4f77bb5b..b809ee0853 100644 --- a/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/index.tsx +++ b/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/index.tsx @@ -35,6 +35,7 @@ import { useUpdateClearancePaymentsMutation } from 'gql/gen/graphql'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import Modal from 'components/Modal'; @@ -243,32 +244,15 @@ export const ClearanceReview = ({ modelID }: ClearanceReviewProps) => { - - - - {t('home')} - - - - - {t('tasklistBreadcrumb')} - - - - - {p('breadcrumb')} - - - - {p(`reviewBreadcrumbs.${routeMap[section]}`)} - - + {errors && ( Date: Tue, 13 Aug 2024 12:54:18 -0500 Subject: [PATCH 05/33] Updated more breadcrumbs --- src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx | 1 + src/views/ModelPlan/CRTDL/CRTDLs/index.tsx | 1 + src/views/ModelPlan/Documents/AddDocument/index.tsx | 2 ++ src/views/ModelPlan/Documents/index.tsx | 1 + 4 files changed, 5 insertions(+) diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx index 5da41ba9ce..0057f67098 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx @@ -242,6 +242,7 @@ const AddCRTDL = () => { { { const breadcrumbs = [ BreadcrumbItemOptions.HOME, + BreadcrumbItemOptions.COLLABORATION_AREA, BreadcrumbItemOptions.TASK_LIST, BreadcrumbItemOptions.DOCUMENTS ]; const solutionDocumentBreadcrumb = [ BreadcrumbItemOptions.HOME, + BreadcrumbItemOptions.COLLABORATION_AREA, BreadcrumbItemOptions.TASK_LIST, BreadcrumbItemOptions.IT_TRACKER ]; diff --git a/src/views/ModelPlan/Documents/index.tsx b/src/views/ModelPlan/Documents/index.tsx index 42ec938534..4bb5b29495 100644 --- a/src/views/ModelPlan/Documents/index.tsx +++ b/src/views/ModelPlan/Documents/index.tsx @@ -45,6 +45,7 @@ export const DocumentsContent = () => { Date: Tue, 13 Aug 2024 13:06:14 -0500 Subject: [PATCH 06/33] Updated email links --- .../templates/added_as_collaborator_body.html | 2 +- .../_components/IndividualNotification.tsx | 2 +- src/views/Notifications/Home/index.tsx | 16 ++++++------- src/views/Notifications/Settings/index.tsx | 24 +++++++------------ 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/pkg/email/templates/added_as_collaborator_body.html b/pkg/email/templates/added_as_collaborator_body.html index 450525310c..f34c942671 100644 --- a/pkg/email/templates/added_as_collaborator_body.html +++ b/pkg/email/templates/added_as_collaborator_body.html @@ -3,7 +3,7 @@

You've been added as a collaborator on {{.ModelName}} in MINT.


- Start collaborating now + Start collaborating now


If you have not already been given access to MINT or if you cannot log in with your EUA credentials, please contact the MINT Team at diff --git a/src/views/Notifications/Home/_components/IndividualNotification.tsx b/src/views/Notifications/Home/_components/IndividualNotification.tsx index facb1d1996..4cadb3433f 100644 --- a/src/views/Notifications/Home/_components/IndividualNotification.tsx +++ b/src/views/Notifications/Home/_components/IndividualNotification.tsx @@ -88,7 +88,7 @@ const IndividualNotification = ({ } if (isAddingCollaborator(metaData)) { handleMarkAsRead(() => { - history.push(`/models/${metaData.modelPlanID}/task-list`); + history.push(`/models/${metaData.modelPlanID}/collaboration-area`); }); } if (isSharedActivity(metaData) || isNewModelPlan(metaData)) { diff --git a/src/views/Notifications/Home/index.tsx b/src/views/Notifications/Home/index.tsx index 124d383398..afd28bdddf 100644 --- a/src/views/Notifications/Home/index.tsx +++ b/src/views/Notifications/Home/index.tsx @@ -8,7 +8,7 @@ import { useUpdateAllNotificationsAsReadMutation } from 'gql/gen/graphql'; -import Breadcrumbs from 'components/Breadcrumbs'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; @@ -24,7 +24,6 @@ const NotificationsHome = () => { const { t: notificationsT } = useTranslation('notifications'); const { t: generalT } = useTranslation('general'); - const { t: miscellaneousT } = useTranslation('miscellaneous'); const { message } = useMessage(); @@ -36,11 +35,6 @@ const NotificationsHome = () => { const allNotifications = data?.currentUser.notifications.notifications || []; - const breadcrumbs = [ - { text: miscellaneousT('home'), url: '/' }, - { text: notificationsT('breadcrumb') } - ]; - if ((!loading && error) || (!loading && !data?.currentUser)) { return ; } @@ -64,7 +58,13 @@ const NotificationsHome = () => { - + {message && {message}} diff --git a/src/views/Notifications/Settings/index.tsx b/src/views/Notifications/Settings/index.tsx index 33707e99c9..2187952ea9 100644 --- a/src/views/Notifications/Settings/index.tsx +++ b/src/views/Notifications/Settings/index.tsx @@ -24,6 +24,7 @@ import { useUpdateNotificationSettingsMutation } from 'gql/gen/graphql'; +import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; import Alert from 'components/shared/Alert'; @@ -316,21 +317,14 @@ const NotificationSettings = () => { - - - - {miscellaneousT('home')} - - - - - {notificationsT('breadcrumb')} - - - - {notificationsT('settings.heading')} - - + {message && {message}} From 8c0aabd3cd35b9119e3977ed9b5970ac863875a6 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 13:08:30 -0500 Subject: [PATCH 07/33] Added CH link --- src/i18n/en-US/changeHistory.ts | 2 +- src/views/ModelPlan/ChangeHistory/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en-US/changeHistory.ts b/src/i18n/en-US/changeHistory.ts index a9b719190a..6154e84c66 100644 --- a/src/i18n/en-US/changeHistory.ts +++ b/src/i18n/en-US/changeHistory.ts @@ -1,7 +1,7 @@ const changeHistory = { heading: 'Change history', subheading: 'for {{modelName}}', - back: 'Back to the task list', + back: 'Back to the model collaboration area', backToReadView: 'Back to the Read view', thisModelPlan: 'this Model Plan', change: diff --git a/src/views/ModelPlan/ChangeHistory/index.tsx b/src/views/ModelPlan/ChangeHistory/index.tsx index b9479c5fd6..cb307253d7 100644 --- a/src/views/ModelPlan/ChangeHistory/index.tsx +++ b/src/views/ModelPlan/ChangeHistory/index.tsx @@ -251,7 +251,7 @@ const ChangeHistory = () => {

From b2f9aafe5b6c2388e187ad17113627b6051d1b69 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 13:47:13 -0500 Subject: [PATCH 08/33] Tweaks status link styles --- src/i18n/en-US/collaborationArea.ts | 3 +- .../ModelPlan/CollaborationArea/index.tsx | 1 + src/views/ModelPlan/ReadOnly/index.tsx | 2 +- .../_components/TaskListStatus/index.tsx | 104 +++++++++--------- 4 files changed, 57 insertions(+), 53 deletions(-) diff --git a/src/i18n/en-US/collaborationArea.ts b/src/i18n/en-US/collaborationArea.ts index 7bea0ab486..c0f7ae8514 100644 --- a/src/i18n/en-US/collaborationArea.ts +++ b/src/i18n/en-US/collaborationArea.ts @@ -3,7 +3,8 @@ const collaborationArea = { heading: 'Model collaboration area', modelPlan: 'for {{modelName}}', errorHeading: 'Failed to fetch model plan', - errorMessage: 'Please try again' + errorMessage: 'Please try again', + switchToReadView: 'Switch to the read view for the model' }; export default collaborationArea; diff --git a/src/views/ModelPlan/CollaborationArea/index.tsx b/src/views/ModelPlan/CollaborationArea/index.tsx index b7e5a7bf15..aeddabd6f9 100644 --- a/src/views/ModelPlan/CollaborationArea/index.tsx +++ b/src/views/ModelPlan/CollaborationArea/index.tsx @@ -211,6 +211,7 @@ const CollaborationArea = () => { status={status} updateLabel statusLabel + isCollaborationArea /> diff --git a/src/views/ModelPlan/ReadOnly/index.tsx b/src/views/ModelPlan/ReadOnly/index.tsx index 3bbe5860bc..89e5d1eae1 100644 --- a/src/views/ModelPlan/ReadOnly/index.tsx +++ b/src/views/ModelPlan/ReadOnly/index.tsx @@ -356,7 +356,7 @@ const ReadOnly = ({ isHelpArticle }: { isHelpArticle?: boolean }) => { { @@ -38,15 +39,14 @@ const TaskListStatus = ({ const { t: h } = useTranslation('generalReadOnly'); const { t: changeHistoryT } = useTranslation('changeHistory'); const { t: modelPlanT } = useTranslation('modelPlan'); - - const flags = useFlags(); + const { t: collaborationAreaT } = useTranslation('collaborationArea'); return (
- + - + {!!modifiedDts && (

{modifiedOrCreateLabel ? h('lastUpdate') : h('createdOn')} {formatDateLocal(modifiedDts, 'MM/dd/yyyy')}

)} + +
+
+
+ + {!isReadView && ( +
+ + {icon && } + {updateLabel && t('update')} + +
+ )} - {!readOnly && ( -
+
- {icon && } - {updateLabel && t('update')} + + + {changeHistoryT('viewChangeHistory')}
- )} - - {readOnly && ( -
-
-
- - {flags.changeHistoryEnabled && ( - <> - - - - {changeHistoryT('viewChangeHistory')} - - {hasEditAccess && ( -
- )} - - )} + {hasEditAccess && !isCollaborationArea && ( + + + {t('edit')} + + )} - {hasEditAccess && ( - - - {t('edit')} - - )} -
+ {isCollaborationArea && ( + + + {collaborationAreaT('switchToReadView')} + + )}
- )} +
); From a81eff14a0c4edd92e6ec34e443c21047e6dbd40 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 14:14:13 -0500 Subject: [PATCH 09/33] Began elipsis dropdown work --- pkg/graph/generated/generated.go | 6 +- pkg/graph/model/models_gen.go | 6 -- src/components/FavoriteCard/index.tsx | 41 ++++++----- src/components/ShareExport/index.tsx | 2 +- src/gql/apolloGQL/ModelPlan/GetModelPlan.ts | 1 + src/gql/gen/graphql.ts | 5 +- .../ModelPlan/CollaborationArea/index.tsx | 73 ++++++++++++++++--- .../_components/TaskListStatus/index.tsx | 2 +- src/views/ModelPlan/TaskList/index.tsx | 1 - 9 files changed, 96 insertions(+), 41 deletions(-) diff --git a/pkg/graph/generated/generated.go b/pkg/graph/generated/generated.go index 3634ea98af..a0060cce7a 100644 --- a/pkg/graph/generated/generated.go +++ b/pkg/graph/generated/generated.go @@ -25059,7 +25059,7 @@ func (ec *executionContext) fieldContext_DiscussionRoleSelection_userRoleDescrip return fc, nil } -func (ec *executionContext) _EnumTranslation_generalName(ctx context.Context, field graphql.CollectedField, obj *model.EnumTranslation) (ret graphql.Marshaler) { +func (ec *executionContext) _EnumTranslation_generalName(ctx context.Context, field graphql.CollectedField, obj *models.EnumTranslation) (ret graphql.Marshaler) { fc, err := ec.fieldContext_EnumTranslation_generalName(ctx, field) if err != nil { return graphql.Null @@ -25103,7 +25103,7 @@ func (ec *executionContext) fieldContext_EnumTranslation_generalName(ctx context return fc, nil } -func (ec *executionContext) _EnumTranslation_groupedName(ctx context.Context, field graphql.CollectedField, obj *model.EnumTranslation) (ret graphql.Marshaler) { +func (ec *executionContext) _EnumTranslation_groupedName(ctx context.Context, field graphql.CollectedField, obj *models.EnumTranslation) (ret graphql.Marshaler) { fc, err := ec.fieldContext_EnumTranslation_groupedName(ctx, field) if err != nil { return graphql.Null @@ -121313,7 +121313,7 @@ func (ec *executionContext) _DiscussionRoleSelection(ctx context.Context, sel as var enumTranslationImplementors = []string{"EnumTranslation"} -func (ec *executionContext) _EnumTranslation(ctx context.Context, sel ast.SelectionSet, obj *model.EnumTranslation) graphql.Marshaler { +func (ec *executionContext) _EnumTranslation(ctx context.Context, sel ast.SelectionSet, obj *models.EnumTranslation) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, enumTranslationImplementors) out := graphql.NewFieldSet(fields) diff --git a/pkg/graph/model/models_gen.go b/pkg/graph/model/models_gen.go index 135ddd9fc2..73e25dc9b1 100644 --- a/pkg/graph/model/models_gen.go +++ b/pkg/graph/model/models_gen.go @@ -35,12 +35,6 @@ type DiscussionReplyTranslation struct { IsAssessment models.TranslationFieldWithOptions `json:"isAssessment" db:"is_assessment"` } -// Represents a translation of enum values. generalName is the human readable name of the enum value, groupedName is an optional field if usually referenced by a difference table/name -type EnumTranslation struct { - GeneralName string `json:"generalName"` - GroupedName *string `json:"groupedName,omitempty"` -} - // Represents existing model link translation data type ExistingModelLinkTranslation struct { ExistingModelID models.TranslationField `json:"existingModelID" db:"existing_model_id"` diff --git a/src/components/FavoriteCard/index.tsx b/src/components/FavoriteCard/index.tsx index 50b8f76e8c..d2a24c76e6 100644 --- a/src/components/FavoriteCard/index.tsx +++ b/src/components/FavoriteCard/index.tsx @@ -147,6 +147,7 @@ type FavoriteIconProps = { isFavorite: boolean; modelPlanID: string; updateFavorite: (modelPlanID: string, type: UpdateFavoriteProps) => void; + isCollaborationArea?: boolean; }; // Icon favorite tag/toggle for readonly summary box @@ -154,29 +155,33 @@ export const FavoriteIcon = ({ className, modelPlanID, isFavorite, - updateFavorite + updateFavorite, + isCollaborationArea }: FavoriteIconProps) => { const { t } = useTranslation('plan'); return ( -
- - isFavorite - ? updateFavorite(modelPlanID, 'removeFavorite') - : updateFavorite(modelPlanID, 'addFavorite') + - {isFavorite ? ( - - ) : ( - - )} - - {isFavorite ? t('favorite.following') : t('favorite.follow')} - -
+ )} + onClick={() => + isFavorite + ? updateFavorite(modelPlanID, 'removeFavorite') + : updateFavorite(modelPlanID, 'addFavorite') + } + > + {isFavorite ? ( + + ) : ( + + )} + + {isFavorite ? t('favorite.following') : t('favorite.follow')} + ); }; diff --git a/src/components/ShareExport/index.tsx b/src/components/ShareExport/index.tsx index b2fa87426c..db1d6c8c3c 100644 --- a/src/components/ShareExport/index.tsx +++ b/src/components/ShareExport/index.tsx @@ -462,7 +462,7 @@ const ShareExportModal = ({
From 301e2fb247fd1d382cfdcac5827416f55d914a2c Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 13 Aug 2024 15:09:57 -0500 Subject: [PATCH 11/33] Style tweaks --- .../ShareExport/ShareExportButton.tsx | 13 ++- src/components/ShareExport/index.scss | 7 ++ src/components/ShareExport/index.tsx | 6 +- .../ModelPlan/CollaborationArea/index.tsx | 98 +++++-------------- 4 files changed, 48 insertions(+), 76 deletions(-) diff --git a/src/components/ShareExport/ShareExportButton.tsx b/src/components/ShareExport/ShareExportButton.tsx index a05c6b204e..0934578b5a 100644 --- a/src/components/ShareExport/ShareExportButton.tsx +++ b/src/components/ShareExport/ShareExportButton.tsx @@ -5,7 +5,7 @@ import { Button, Menu } from '@trussworks/react-uswds'; import Modal from 'components/Modal'; import { StatusMessageType } from 'views/ModelPlan/TaskList'; -import ShareExportModal from '.'; +import ShareExportModal, { NavModelElemet } from '.'; import './index.scss'; @@ -22,6 +22,8 @@ const ShareExportButton = ({ const [isExportModalOpen, setIsExportModalOpen] = useState(false); + const [defaultTab, setDefaultTab] = useState('share'); + const menuRef = useRef(null); useEffect(() => { @@ -50,6 +52,7 @@ const ShareExportButton = ({ closeModal={() => setIsExportModalOpen(false)} modelID={modelID} setStatusMessage={setStatusMessage} + defaultTab={defaultTab} /> @@ -68,10 +71,11 @@ const ShareExportButton = ({ ]} - isOpen={isMenuOpen} - /> - -
*/} -
-
+ + + +
+ + + +
+ + )} From 06e714503086821dde89b7e7c067c1047f710c49 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Wed, 14 Aug 2024 08:19:36 -0500 Subject: [PATCH 12/33] Updated routes to include collaboration area --- cypress/e2e/beneficiaries.spec.js | 2 +- cypress/e2e/characteristics.spec.js | 4 +- cypress/e2e/collaborator.spec.js | 5 +- cypress/e2e/modelPlan.spec.js | 28 ++++++---- cypress/e2e/notification.spec.js | 6 +-- cypress/e2e/opsEvalAndLearning.spec.js | 4 +- cypress/e2e/participantsAndProviders.spec.js | 6 ++- cypress/e2e/payments.spec.js | 18 ++++--- cypress/e2e/prepareForClearance.spec.js | 2 +- cypress/e2e/webSocket.spec.js | 2 +- cypress/support/model-plan-by-name.js | 2 +- mappings/export/exportTranslation.ts | 2 +- mappings/export/util.ts | 2 +- .../aggregated_daily_digest_body.html | 2 +- .../plan_discussion_created_body.html | 2 +- src/components/AskAQuestion/index.test.tsx | 4 +- src/components/Breadcrumbs/index.tsx | 26 +++++----- .../__snapshots__/index.test.tsx.snap | 2 +- .../ITSolutionsWarning/index.test.tsx | 4 +- src/components/UpdateStatusModal/index.tsx | 4 +- src/i18n/en-US/collaborationArea.ts | 4 +- src/views/App/index.tsx | 40 +++++++------- .../Solutions/BCDA/index.test.tsx | 2 +- .../Home/__snapshots__/index.test.tsx.snap | 4 +- .../__snapshots__/index.test.tsx.snap | 6 +-- src/views/ModelAccessWrapper/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 4 +- .../ModelPlan/CRTDL/AddCRTDL/index.test.tsx | 8 +-- src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx | 4 +- .../CRTDLs/__snapshots__/index.test.tsx.snap | 10 ++-- .../CRTDLs/__snapshots__/table.test.tsx.snap | 2 +- .../ModelPlan/CRTDL/CRTDLs/index.test.tsx | 4 +- src/views/ModelPlan/CRTDL/CRTDLs/index.tsx | 4 +- .../ModelPlan/CRTDL/CRTDLs/table.test.tsx | 8 +-- src/views/ModelPlan/CRTDL/CRTDLs/table.tsx | 2 +- src/views/ModelPlan/CRTDL/index.tsx | 4 +- .../components/RecentChanges/index.test.tsx | 6 +-- .../ModelPlan/CollaborationArea/index.tsx | 26 ++++++++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../AddCollaborator/index.test.tsx | 4 +- .../Collaborators/AddCollaborator/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 6 +-- .../ModelPlan/Collaborators/index.test.tsx | 8 +-- src/views/ModelPlan/Collaborators/index.tsx | 17 +++--- src/views/ModelPlan/Collaborators/table.tsx | 2 +- .../ModelPlan/Discussions/index.test.tsx | 12 ++--- .../Documents/AddDocument/LinkDocument.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 4 +- .../Documents/AddDocument/documentUpload.tsx | 2 +- .../Documents/AddDocument/index.test.tsx | 4 +- .../__snapshots__/index.test.tsx.snap | 6 +-- src/views/ModelPlan/Documents/index.test.tsx | 4 +- src/views/ModelPlan/Documents/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 4 +- .../ModelPlan/LockedTaskListSection/index.tsx | 6 +-- src/views/ModelPlan/NewPlan/index.tsx | 2 +- .../CRTDLs/__snapshots__/index.test.tsx.snap | 4 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../FilterView/BodyContent/index.test.tsx | 2 +- src/views/ModelPlan/ReadOnly/index.tsx | 4 +- .../Status/__snapshots__/index.test.tsx.snap | 2 +- src/views/ModelPlan/Status/index.test.tsx | 4 +- src/views/ModelPlan/Status/index.tsx | 4 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../TaskList/Basics/Milestones/index.test.tsx | 4 +- .../TaskList/Basics/Milestones/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../TaskList/Basics/Overview/index.test.tsx | 4 +- .../TaskList/Basics/Overview/index.tsx | 14 +++-- .../Basics/__snapshots__/index.test.tsx.snap | 4 +- .../ModelPlan/TaskList/Basics/index.test.tsx | 12 ++--- src/views/ModelPlan/TaskList/Basics/index.tsx | 14 +++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../BeneficiaryIdentification/index.test.tsx | 8 +-- .../BeneficiaryIdentification/index.tsx | 6 ++- .../__snapshots__/index.test.tsx.snap | 2 +- .../Beneficiaries/Frequency/index.test.tsx | 8 +-- .../Beneficiaries/Frequency/index.tsx | 12 +++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Beneficiaries/PeopleImpact/index.test.tsx | 8 +-- .../Beneficiaries/PeopleImpact/index.tsx | 8 +-- .../TaskList/Beneficiaries/index.tsx | 6 +-- .../ModelPlan/TaskList/CostEstimate/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../Authority/index.test.tsx | 8 +-- .../Authority/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Involvements/index.test.tsx | 8 +-- .../Involvements/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../KeyCharacteristics/index.test.tsx | 8 +-- .../KeyCharacteristics/index.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../TargetsAndOptions/index.test.tsx | 8 +-- .../TargetsAndOptions/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../GeneralCharacteristics/index.test.tsx | 8 +-- .../TaskList/GeneralCharacteristics/index.tsx | 18 ++++--- .../__snapshots__/index.test.tsx.snap | 6 +-- .../AddCustomSolution/index.test.tsx | 16 +++--- .../ITSolutions/AddCustomSolution/index.tsx | 8 +-- .../AddOrUpdateOperationalNeed/index.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 4 +- .../ITSolutions/AddSolution/index.test.tsx | 12 ++--- .../ITSolutions/AddSolution/index.tsx | 14 ++--- .../operationalNeedsTable.test.tsx.snap | 2 +- .../TaskList/ITSolutions/Home/index.tsx | 2 +- .../Home/operationalNeedsTable.test.tsx | 12 ++--- .../Home/operationalNeedsTable.tsx | 4 +- .../__snapshots__/index.test.tsx.snap | 16 +++--- .../ITSolutions/LinkDocuments/index.test.tsx | 8 +-- .../ITSolutions/LinkDocuments/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 6 +-- .../SelectSolutions/index.test.tsx | 8 +-- .../ITSolutions/SelectSolutions/index.tsx | 12 ++--- .../ITSolutions/SolutionDetails/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 6 +-- .../SolutionImplementation/index.test.tsx | 8 +-- .../SolutionImplementation/index.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 12 ++--- .../ITSolutions/Subtasks/index.test.tsx | 20 +++---- .../TaskList/ITSolutions/Subtasks/index.tsx | 18 +++---- .../__snapshots__/index.test.tsx.snap | 2 +- .../CheckboxCard/index.stories.tsx | 4 +- .../_components/CheckboxCard/index.test.tsx | 4 +- .../_components/CheckboxCard/index.tsx | 6 +-- .../_components/HelpBox/index.stories.tsx | 4 +- .../_components/HelpBox/index.test.tsx | 4 +- .../_component/InfoToggle.tsx | 2 +- .../NeedQuestionAndAnswer/index.test.tsx | 8 +-- .../NeedQuestionAndAnswer/index.tsx | 4 +- .../OperationalNeedRemovalModal/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../SolutionCard/index.stories.tsx | 4 +- .../_components/SolutionCard/index.test.tsx | 12 ++--- .../_components/SolutionCard/index.tsx | 4 +- .../__snapshots__/index.test.tsx.snap | 8 +-- .../SolutionDetailCard/index.stories.tsx | 4 +- .../SolutionDetailCard/index.test.tsx | 8 +-- .../_components/SolutionDetailCard/index.tsx | 4 +- .../SubtasksTable/index.stories.tsx | 4 +- .../_components/SubtasksTable/index.test.tsx | 8 +-- .../_components/SubtasksTable/index.tsx | 2 +- .../ModelPlan/TaskList/ITSolutions/index.tsx | 22 ++++---- .../TaskList/ITSolutions/util.test.tsx | 8 +-- .../ModelPlan/TaskList/ITSolutions/util.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../CCWAndQuality/index.test.tsx | 8 +-- .../CCWAndQuality/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../DataSharing/index.test.tsx | 8 +-- .../OpsEvalAndLearning/DataSharing/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Evaluation/index.test.tsx | 8 +-- .../OpsEvalAndLearning/Evaluation/index.tsx | 14 ++--- .../IDDOC/__snapshots__/index.test.tsx.snap | 2 +- .../OpsEvalAndLearning/IDDOC/index.test.tsx | 8 +-- .../OpsEvalAndLearning/IDDOC/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../IDDOCMonitoring/index.test.tsx | 8 +-- .../IDDOCMonitoring/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../IDDOCTesting/index.test.tsx | 8 +-- .../OpsEvalAndLearning/IDDOCTesting/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Learning/index.test.tsx | 8 +-- .../OpsEvalAndLearning/Learning/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Performance/index.test.tsx | 8 +-- .../OpsEvalAndLearning/Performance/index.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../OpsEvalAndLearning/index.test.tsx | 8 +-- .../TaskList/OpsEvalAndLearning/index.tsx | 28 +++++----- .../__snapshots__/index.test.tsx.snap | 2 +- .../Communication/index.test.tsx | 8 +-- .../Communication/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Coordination/index.test.tsx | 8 +-- .../Coordination/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../ParticipantOptions/index.test.tsx | 8 +-- .../ParticipantOptions/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../ProviderOptions/index.test.tsx | 8 +-- .../ProviderOptions/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../ParticipantsAndProviders/index.test.tsx | 8 +-- .../ParticipantsAndProviders/index.tsx | 14 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../AnticipateDependencies/index.test.tsx | 8 +-- .../Payment/AnticipateDependencies/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../BeneficiaryCostSharing/index.test.tsx | 8 +-- .../Payment/BeneficiaryCostSharing/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Payment/ClaimsBasedPayment/index.test.tsx | 8 +-- .../Payment/ClaimsBasedPayment/index.tsx | 8 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Payment/Complexity/index.test.tsx | 8 +-- .../TaskList/Payment/Complexity/index.tsx | 12 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../Payment/FundingSource/index.test.tsx | 8 +-- .../TaskList/Payment/FundingSource/index.tsx | 10 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../NonClaimsBasedPayment/index.test.tsx | 8 +-- .../Payment/NonClaimsBasedPayment/index.tsx | 12 ++--- .../Recover/__snapshots__/index.test.tsx.snap | 2 +- .../TaskList/Payment/Recover/index.test.tsx | 8 +-- .../TaskList/Payment/Recover/index.tsx | 8 +-- .../ModelPlan/TaskList/Payment/index.tsx | 14 ++--- .../__snapshots__/index.test.tsx.snap | 14 ++--- .../Checklist/index.test.tsx | 8 +-- .../PrepareForClearance/Checklist/index.tsx | 6 +-- .../__snapshots__/index.test.tsx.snap | 4 +- .../ClearanceReview/index.test.tsx | 12 ++--- .../ClearanceReview/index.tsx | 10 ++-- .../TaskList/PrepareForClearance/index.tsx | 4 +- .../TaskList/SubmitRequest/index.tsx | 2 +- .../_components/TaskListButton/index.test.tsx | 2 +- .../_components/TaskListButton/index.tsx | 6 ++- .../__snapshots__/index.test.tsx.snap | 2 +- .../TaskListSideNav/index.test.tsx | 4 +- .../_components/TaskListSideNav/index.tsx | 2 +- .../_components/TaskListStatus/index.tsx | 4 +- src/views/ModelPlan/TaskList/index.test.tsx | 52 +++++++++++++++---- src/views/ModelPlan/TaskList/index.tsx | 12 ++--- src/views/SubscriptionHandler/index.tsx | 2 +- src/views/SubscriptionWrapper/index.tsx | 2 +- src/views/TaskListBannerAlert/index.test.tsx | 8 +-- src/views/TaskListBannerAlert/index.tsx | 4 +- yarn.lock | 2 +- 231 files changed, 859 insertions(+), 745 deletions(-) diff --git a/cypress/e2e/beneficiaries.spec.js b/cypress/e2e/beneficiaries.spec.js index 4c1985f5e6..6dea10d1db 100644 --- a/cypress/e2e/beneficiaries.spec.js +++ b/cypress/e2e/beneficiaries.spec.js @@ -74,6 +74,6 @@ describe('The Model Plan Beneficiaries Form', () => { cy.contains('button', 'Save and return to task list').click(); - cy.url().should('include', '/task-list'); + cy.url().should('include', '/collaboration-area/task-list'); }); }); diff --git a/cypress/e2e/characteristics.spec.js b/cypress/e2e/characteristics.spec.js index 0ae9bd4b0d..2afec44a4e 100644 --- a/cypress/e2e/characteristics.spec.js +++ b/cypress/e2e/characteristics.spec.js @@ -14,7 +14,7 @@ describe('The Model Plan General Characteristics Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/characteristics/ + /\/models\/.{36}\/collaboration-area\/task-list\/characteristics/ ); }); @@ -269,7 +269,7 @@ describe('The Model Plan General Characteristics Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/participants-and-providers$/ + /\/models\/.{36}\/collaboration-area\/task-list\/participants-and-providers$/ ); }); diff --git a/cypress/e2e/collaborator.spec.js b/cypress/e2e/collaborator.spec.js index 6ce99b3a13..aba282a130 100644 --- a/cypress/e2e/collaborator.spec.js +++ b/cypress/e2e/collaborator.spec.js @@ -142,7 +142,10 @@ describe('The Collaborator/Team Member Form', () => { }); cy.get('@modelPlanURL').then(modelPlanURL => { - const taskList = modelPlanURL.replace('read-view', 'task-list'); + const taskList = modelPlanURL.replace( + 'read-view', + 'collaboration-area/task-list' + ); cy.visit(taskList); cy.location().should(loc => { expect(loc.pathname).to.match( diff --git a/cypress/e2e/modelPlan.spec.js b/cypress/e2e/modelPlan.spec.js index 5fd2e99de1..4c2ced6f3b 100644 --- a/cypress/e2e/modelPlan.spec.js +++ b/cypress/e2e/modelPlan.spec.js @@ -20,7 +20,7 @@ describe('The Model Plan Form', () => { cy.contains('button', 'Next').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/collaborators/); + expect(loc.pathname).to.match(/\/models\/.{36}\/collaboration-area/collaborators/); }); cy.get('[data-testid="page-loading"]').should('not.exist'); @@ -29,7 +29,9 @@ describe('The Model Plan Form', () => { // renames a model plan cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); cy.contains('h1', 'Model Plan task list'); @@ -39,7 +41,9 @@ describe('The Model Plan Form', () => { cy.contains('button', /Start$/).click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list\/basics/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list\/basics/ + ); }); cy.get('[data-testid="fieldset"]').should('not.be.disabled'); @@ -52,7 +56,9 @@ describe('The Model Plan Form', () => { cy.contains('button', 'Save and return to task list').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); cy.get('[data-testid="model-plan-name"]').contains( @@ -92,7 +98,7 @@ describe('The Model Plan Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/basics\/overview/ + /\/models\/.{36}\/collaboration-area\/task-list\/basics\/overview/ ); }); @@ -119,7 +125,7 @@ describe('The Model Plan Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/basics\/milestones/ + /\/models\/.{36}\/collaboration-area\/task-list\/basics\/milestones/ ); }); @@ -171,7 +177,9 @@ describe('The Model Plan Form', () => { cy.contains('button', 'Save and return to task list').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); cy.get('.model-plan-task-list__last-updated-status').should('be.visible'); @@ -185,7 +193,7 @@ describe('The Model Plan Form', () => { cy.contains('a', 'Update').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/status/); + expect(loc.pathname).to.match(/\/models\/.{36}\/collaboration-area/status/); }); cy.contains('h1', 'Update status'); @@ -204,7 +212,9 @@ describe('The Model Plan Form', () => { .click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); cy.get('.mint-tag').contains('Cleared'); diff --git a/cypress/e2e/notification.spec.js b/cypress/e2e/notification.spec.js index 255dca189d..9be4a03458 100644 --- a/cypress/e2e/notification.spec.js +++ b/cypress/e2e/notification.spec.js @@ -173,7 +173,7 @@ describe('Notification Center', () => { cy.clickPlanTableByName('Empty Plan'); // Add SF13 as a collaborator - cy.get('a[href*="/collaborators?view=manage"]').click(); + cy.get('a[href*="/collaboration-area/collaborators?view=manage"]').click(); cy.contains('a', 'Add team member').click(); @@ -211,7 +211,7 @@ describe('Notification Center', () => { cy.contains('button', 'Start collaborating').click(); - cy.url().should('include', '/task-list'); + cy.url().should('include', '/collaboration-area/task-list'); }); it('testing New Model Plan Notification', () => { @@ -248,7 +248,7 @@ describe('Notification Center', () => { .should('have.value', 'Cypress Model Plan'); cy.contains('button', 'Next').click(); - cy.url().should('include', '/collaborators'); + cy.url().should('include', '/collaboration-area/collaborators'); // Navigate back to Notification Center cy.get('[data-testid="navmenu__notification"]').first().click(); diff --git a/cypress/e2e/opsEvalAndLearning.spec.js b/cypress/e2e/opsEvalAndLearning.spec.js index 1dd97e7ef9..0972539867 100644 --- a/cypress/e2e/opsEvalAndLearning.spec.js +++ b/cypress/e2e/opsEvalAndLearning.spec.js @@ -375,7 +375,9 @@ describe('The Model Plan Ops Eval and Learning Form', () => { .wait(500); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); }); }); diff --git a/cypress/e2e/participantsAndProviders.spec.js b/cypress/e2e/participantsAndProviders.spec.js index 384fb5db31..f780a620dd 100644 --- a/cypress/e2e/participantsAndProviders.spec.js +++ b/cypress/e2e/participantsAndProviders.spec.js @@ -14,7 +14,7 @@ describe('The Model Plan Participants and providers Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/participants-and-providers/ + /\/models\/.{36}\/collaboration-area\/task-list\/participants-and-providers/ ); }); cy.get('[data-testid="model-plan-name"]').contains('for Empty Plan'); @@ -267,7 +267,9 @@ describe('The Model Plan Participants and providers Form', () => { cy.contains('button', 'Save and return to task list').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list/ + ); }); }); }); diff --git a/cypress/e2e/payments.spec.js b/cypress/e2e/payments.spec.js index 635d3aa644..6522fe71bc 100644 --- a/cypress/e2e/payments.spec.js +++ b/cypress/e2e/payments.spec.js @@ -13,7 +13,9 @@ describe('The Model Plan Payment Form', () => { // Page - /payment cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/task-list\/payment/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/task-list\/payment/ + ); }); cy.get( @@ -75,7 +77,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/claims-based-payment/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/claims-based-payment/ ); }); @@ -115,7 +117,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/anticipating-dependencies/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/anticipating-dependencies/ ); }); @@ -142,7 +144,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/beneficiary-cost-sharing/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/beneficiary-cost-sharing/ ); }); @@ -169,7 +171,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/non-claims-based-payment/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/non-claims-based-payment/ ); }); @@ -207,7 +209,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/complexity/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/complexity/ ); }); @@ -250,7 +252,7 @@ describe('The Model Plan Payment Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/payment\/recover-payment/ + /\/models\/.{36}\/collaboration-area\/task-list\/payment\/recover-payment/ ); }); @@ -294,7 +296,7 @@ describe('The Model Plan Payment Form', () => { cy.contains('button', 'Continue to operational solutions tracker').click(); cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/it-solutions$/ + /\/models\/.{36}\/collaboration-area\/task-list\/it-solutions$/ ); }); }); diff --git a/cypress/e2e/prepareForClearance.spec.js b/cypress/e2e/prepareForClearance.spec.js index 0f8f33f7d6..14a8959c71 100644 --- a/cypress/e2e/prepareForClearance.spec.js +++ b/cypress/e2e/prepareForClearance.spec.js @@ -38,7 +38,7 @@ describe('The Model Plan Prepare for Clearance Form', () => { cy.location().should(loc => { expect(loc.pathname).to.match( - /\/models\/.{36}\/task-list\/prepare-for-clearance/ + /\/models\/.{36}\/collaboration-area\/task-list\/prepare-for-clearance/ ); }); diff --git a/cypress/e2e/webSocket.spec.js b/cypress/e2e/webSocket.spec.js index 8c3546961c..5dc462725f 100644 --- a/cypress/e2e/webSocket.spec.js +++ b/cypress/e2e/webSocket.spec.js @@ -32,7 +32,7 @@ describe('Web Socket Connections', () => { modelPlanID, section: TaskListSection.PAYMENT }); - cy.visit(`/models/${modelPlanID}/task-list/payment`); + cy.visit(`/models/${modelPlanID}/collaboration-area/task-list/payment`); }); cy.get('[data-testid="page-locked"]').contains( diff --git a/cypress/support/model-plan-by-name.js b/cypress/support/model-plan-by-name.js index d073f44fa7..7eb9f3ae4c 100644 --- a/cypress/support/model-plan-by-name.js +++ b/cypress/support/model-plan-by-name.js @@ -4,6 +4,6 @@ Cypress.Commands.add('clickPlanTableByName', (planName, table) => { cy.get(`[data-testid="${table || 'table'}"] a`) .contains(planName) .click(); - cy.url().should('include', '/task-list'); + cy.url().should('include', '/collaboration-area/task-list'); cy.get('[data-testid="page-loading"]').should('not.exist'); }); diff --git a/mappings/export/exportTranslation.ts b/mappings/export/exportTranslation.ts index 17cdf5ade6..a5eef4b0e1 100644 --- a/mappings/export/exportTranslation.ts +++ b/mappings/export/exportTranslation.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import basics from '../../src/i18n/en-US/modelPlan/basics'; import beneficiaries from '../../src/i18n/en-US/modelPlan/beneficiaries'; -import collaborators from '../../src/i18n/en-US/modelPlan/collaborators'; +import collaborators from '../../src/i18n/en-US/modelPlan/collaboration-area/collaborators'; import crs from '../../src/i18n/en-US/modelPlan/crs'; import discussions from '../../src/i18n/en-US/modelPlan/discussions'; import documents from '../../src/i18n/en-US/modelPlan/documents'; diff --git a/mappings/export/util.ts b/mappings/export/util.ts index f9b89673c4..cac200def0 100644 --- a/mappings/export/util.ts +++ b/mappings/export/util.ts @@ -5,7 +5,7 @@ import basics from '../../src/i18n/en-US/modelPlan/basics'; import beneficiaries from '../../src/i18n/en-US/modelPlan/beneficiaries'; -import collaborator from '../../src/i18n/en-US/modelPlan/collaborators'; +import collaborator from '../../src/i18n/en-US/modelPlan/collaboration-area/collaborators'; import crs from '../../src/i18n/en-US/modelPlan/crs'; import discussion from '../../src/i18n/en-US/modelPlan/discussions'; import document from '../../src/i18n/en-US/modelPlan/documents'; diff --git a/pkg/email/templates/aggregated_daily_digest_body.html b/pkg/email/templates/aggregated_daily_digest_body.html index 9d74d81799..b62437c79d 100644 --- a/pkg/email/templates/aggregated_daily_digest_body.html +++ b/pkg/email/templates/aggregated_daily_digest_body.html @@ -21,7 +21,7 @@

{{$audit.ModelName}}


- View this Model Plan in MINT + View this Model Plan in MINT

diff --git a/pkg/email/templates/plan_discussion_created_body.html b/pkg/email/templates/plan_discussion_created_body.html index 6d8492fa67..5f2583086b 100644 --- a/pkg/email/templates/plan_discussion_created_body.html +++ b/pkg/email/templates/plan_discussion_created_body.html @@ -14,7 +14,7 @@

Discussion

{{.Role}}

{{.DiscussionContent}}

- + Respond to this discussion in MINT

diff --git a/src/components/AskAQuestion/index.test.tsx b/src/components/AskAQuestion/index.test.tsx index 00aa03dcda..b410f46853 100644 --- a/src/components/AskAQuestion/index.test.tsx +++ b/src/components/AskAQuestion/index.test.tsx @@ -128,10 +128,10 @@ describe('Ask a Question Component', () => { const { getByText, getByTestId } = render( - + diff --git a/src/components/Breadcrumbs/index.tsx b/src/components/Breadcrumbs/index.tsx index 108dc1fbdc..7167659407 100644 --- a/src/components/Breadcrumbs/index.tsx +++ b/src/components/Breadcrumbs/index.tsx @@ -51,7 +51,7 @@ export const commonBreadCrumbs = ( }, TASK_LIST: { text: 'modelPlanTaskList:heading', - url: `/models/${modelID}/task-list` + url: `/models/${modelID}/collaboration-area/task-list` }, COLLABORATION_AREA: { text: 'collaborationArea:heading', @@ -71,51 +71,51 @@ export const commonBreadCrumbs = ( }, BASICS: { text: 'basicsMisc:heading', - url: `/models/${modelID}/task-list/basics` + url: `/models/${modelID}/collaboration-area/task-list/basics` }, GENERAL_CHARACTERISTICS: { text: 'generalCharacteristicsMisc:heading', - url: `/models/${modelID}/task-list/characteristics` + url: `/models/${modelID}/collaboration-area/task-list/characteristics` }, PARTICIPANTS_AND_PROVIDERS: { text: 'participantsAndProvidersMisc:heading', - url: `/models/${modelID}/task-list/participants-and-providers` + url: `/models/${modelID}/collaboration-area/task-list/participants-and-providers` }, BENEFICIARIES: { text: 'beneficiariesMisc:heading', - url: `/models/${modelID}/task-list/beneficiaries` + url: `/models/${modelID}/collaboration-area/task-list/beneficiaries` }, OPS_EVAL_AND_LEARNING: { text: 'opsEvalAndLearningMisc:heading', - url: `/models/${modelID}/task-list/ops-eval-and-learning` + url: `/models/${modelID}/collaboration-area/task-list/ops-eval-and-learning` }, PAYMENTS: { text: 'paymentsMisc:heading', - url: `/models/${modelID}/task-list/payments` + url: `/models/${modelID}/collaboration-area/task-list/payments` }, IT_TRACKER: { text: 'opSolutionsMisc:heading', - url: `/models/${modelID}/task-list/it-solutions` + url: `/models/${modelID}/collaboration-area/task-list/it-solutions` }, PREPARE_FOR_CLEARANCE: { text: 'prepareForClearance:heading', - url: `/models/${modelID}/task-list/prepare-for-clearance` + url: `/models/${modelID}/collaboration-area/task-list/prepare-for-clearance` }, COLLABORATORS: { text: 'collaboratorsMisc:manageModelTeam', - url: `/models/${modelID}/collaborators` + url: `/models/${modelID}}/collaboration-area/collaborators` }, DOCUMENTS: { text: 'documentsMisc:heading', - url: `/models/${modelID}/documents` + url: `/models/${modelID}/collaboration-area/documents` }, CR_TDLS: { text: 'crtdlsMisc:heading', - url: `/models/${modelID}/cr-tdls` + url: `/models/${modelID}}/collaboration-area/cr-tdls` }, STATUS: { text: 'modelPlanMisc:headingStatus', - url: `/models/${modelID}/status` + url: `/models/${modelID}}/collaboration-area/status` } }); diff --git a/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap b/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap index d1837df0ee..4f017e009f 100644 --- a/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap +++ b/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap @@ -85,7 +85,7 @@ exports[`FavoriteCard > matches the snapshot 1`] = ` >
diff --git a/src/components/ITSolutionsWarning/index.test.tsx b/src/components/ITSolutionsWarning/index.test.tsx index 0a021a4e78..ba6f6d9ed1 100644 --- a/src/components/ITSolutionsWarning/index.test.tsx +++ b/src/components/ITSolutionsWarning/index.test.tsx @@ -9,10 +9,10 @@ describe('The ITSolutionsWarning component', () => { const { asFragment } = render( - + null} /> diff --git a/src/components/UpdateStatusModal/index.tsx b/src/components/UpdateStatusModal/index.tsx index ed33ff7113..729d92aaad 100644 --- a/src/components/UpdateStatusModal/index.tsx +++ b/src/components/UpdateStatusModal/index.tsx @@ -167,7 +167,9 @@ const UpdateStatusModal = ({ unstyled onClick={() => { closeModal(); - history.push(`/models/${modelID}/task-list/basics/milestones`); + history.push( + `/models/${modelID}/collaboration-area/task-list/basics/milestones` + ); }} > {modelPlanTaskListT('statusModal.goToTimeline')} diff --git a/src/i18n/en-US/collaborationArea.ts b/src/i18n/en-US/collaborationArea.ts index c0f7ae8514..20719f4d55 100644 --- a/src/i18n/en-US/collaborationArea.ts +++ b/src/i18n/en-US/collaborationArea.ts @@ -4,7 +4,9 @@ const collaborationArea = { modelPlan: 'for {{modelName}}', errorHeading: 'Failed to fetch model plan', errorMessage: 'Please try again', - switchToReadView: 'Switch to the read view for the model' + switchToReadView: 'Switch to the read view for the model', + areas: 'Areas', + goToModelPlan: 'Go to Model Plan' }; export default collaborationArea; diff --git a/src/views/App/index.tsx b/src/views/App/index.tsx index 65e29801a3..bc8ad4e288 100644 --- a/src/views/App/index.tsx +++ b/src/views/App/index.tsx @@ -138,11 +138,6 @@ const AppRoutes = () => { - - {/* Collaboration Area Routes */} { component={CollaborationArea} /> - {/* Task List Routes */} + + + {/* Task List Routes */} diff --git a/src/views/HelpAndKnowledge/SolutionsHelp/SolutionDetails/Solutions/BCDA/index.test.tsx b/src/views/HelpAndKnowledge/SolutionsHelp/SolutionDetails/Solutions/BCDA/index.test.tsx index 771cffdb8b..0e5b08987c 100644 --- a/src/views/HelpAndKnowledge/SolutionsHelp/SolutionDetails/Solutions/BCDA/index.test.tsx +++ b/src/views/HelpAndKnowledge/SolutionsHelp/SolutionDetails/Solutions/BCDA/index.test.tsx @@ -14,7 +14,7 @@ describe('The ITSolutionsWarning component', () => { '/help-and-knowledge/operational-solutions?solution=beneficiary-claims-data-api§ion=timeline' ]} > - + diff --git a/src/views/Home/__snapshots__/index.test.tsx.snap b/src/views/Home/__snapshots__/index.test.tsx.snap index 86b2da06a9..61297e5de7 100644 --- a/src/views/Home/__snapshots__/index.test.tsx.snap +++ b/src/views/Home/__snapshots__/index.test.tsx.snap @@ -554,7 +554,7 @@ exports[`The home page > matches setting snapshot 1`] = ` > My plan @@ -952,7 +952,7 @@ exports[`The home page > matches setting snapshot 1`] = ` > My plan diff --git a/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap b/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap index 8c2eae47d6..94bbd305a3 100644 --- a/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap +++ b/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap @@ -252,7 +252,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca >
@@ -389,7 +389,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca >
@@ -538,7 +538,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca >
diff --git a/src/views/ModelAccessWrapper/index.tsx b/src/views/ModelAccessWrapper/index.tsx index 10dae13d17..29341feb0d 100644 --- a/src/views/ModelAccessWrapper/index.tsx +++ b/src/views/ModelAccessWrapper/index.tsx @@ -33,9 +33,9 @@ const ModelAccessWrapper = ({ children }: ModelAccessWrapperProps) => { // Checking if user's location is task-list or collaborators // Everything with a modelID and under the parent 'task-list' or 'collaborators' route is considered editable const editable: boolean = - pathname.split('/')[3] === 'task-list' || - pathname.split('/')[3] === 'documents' || - pathname.split('/')[3] === 'collaborators'; + pathname.split('/')[3] === 'collaboration-area' || + pathname.split('/')[4] === 'documents' || + pathname.split('/')[4] === 'collaborators'; const helpArticle: boolean = pathname.split('/')[1] === 'help-and-knowledge'; diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/CRTDL/AddCRTDL/__snapshots__/index.test.tsx.snap index 73383825e1..01aa839aae 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/__snapshots__/index.test.tsx.snap @@ -36,7 +36,7 @@ exports[`Model Plan Add CR and TDL page > matches snapshot 1`] = ` > Model Plan task list @@ -456,7 +456,7 @@ exports[`Model Plan Add CR and TDL page > matches snapshot 1`] = ` ← diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/index.test.tsx b/src/views/ModelPlan/CRTDL/AddCRTDL/index.test.tsx index 6860326de9..ec38155917 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/index.test.tsx +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/index.test.tsx @@ -56,12 +56,12 @@ describe('Model Plan Add CR and TDL page', () => { const { getByTestId } = render( - + @@ -83,12 +83,12 @@ describe('Model Plan Add CR and TDL page', () => { const { asFragment, getByTestId } = render( - + diff --git a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx index 0057f67098..d718583b5c 100644 --- a/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx +++ b/src/views/ModelPlan/CRTDL/AddCRTDL/index.tsx @@ -166,7 +166,7 @@ const AddCRTDL = () => { ); - history.push(`/models/${modelID}/cr-and-tdl`); + history.push(`/models/${modelID}/collaboration-area/cr-and-tdl`); } }; @@ -586,7 +586,7 @@ const AddCRTDL = () => { to={ readOnly ? `/models/${modelID}/read-only/crs-and-tdl` - : `/models/${modelID}/cr-and-tdl` + : `/models/${modelID}/collaboration-area/cr-and-tdl` } > ← {' '} diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/index.test.tsx.snap index 49590796c6..921911b4e5 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/index.test.tsx.snap @@ -41,7 +41,7 @@ exports[`Model Plan CR and TDL page > matches snapshot 1`] = ` > Model Plan task list @@ -101,7 +101,7 @@ exports[`Model Plan CR and TDL page > matches snapshot 1`] = `

Add a CR or TDL @@ -387,7 +387,7 @@ exports[`Model Plan CR and TDL page > matches snapshot 1`] = ` > Edit @@ -630,7 +630,7 @@ exports[`Model Plan CR and TDL page > matches snapshot 1`] = ` > Edit diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/table.test.tsx.snap b/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/table.test.tsx.snap index 64d4b6288d..3333210058 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/table.test.tsx.snap +++ b/src/views/ModelPlan/CRTDL/CRTDLs/__snapshots__/table.test.tsx.snap @@ -259,7 +259,7 @@ exports[`Model Plan CR and TDL table > matches snapshot 1`] = ` > Edit diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx index f1ef8c5d0b..9faf079dbd 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx @@ -89,10 +89,10 @@ const store = mockStore({ auth: mockAuthReducer }); describe('Model Plan CR and TDL page', () => { it('matches snapshot', async () => { const { asFragment, getByTestId } = render( - + - + diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx index ad2a0c625c..68ef038c3f 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/index.tsx @@ -102,7 +102,7 @@ export const CRTDLs = () => { @@ -114,7 +114,7 @@ export const CRTDLs = () => { {t('addCRTDL')} diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/table.test.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/table.test.tsx index d15c0cd0b2..c457526b76 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/table.test.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/table.test.tsx @@ -59,12 +59,12 @@ describe('Model Plan CR and TDL table', () => { const { getByTestId } = render( - + { const { asFragment, getByTestId } = render( - + { {/* Model Plan CRTDL Pages */} } /> } /> diff --git a/src/views/ModelPlan/ChangeHistory/components/RecentChanges/index.test.tsx b/src/views/ModelPlan/ChangeHistory/components/RecentChanges/index.test.tsx index 08cc56e204..95723f9451 100644 --- a/src/views/ModelPlan/ChangeHistory/components/RecentChanges/index.test.tsx +++ b/src/views/ModelPlan/ChangeHistory/components/RecentChanges/index.test.tsx @@ -66,7 +66,7 @@ describe('RecentChanges', () => { render( @@ -80,7 +80,7 @@ describe('RecentChanges', () => { const { getByText } = render( @@ -99,7 +99,7 @@ describe('RecentChanges', () => { const { asFragment } = render( diff --git a/src/views/ModelPlan/CollaborationArea/index.tsx b/src/views/ModelPlan/CollaborationArea/index.tsx index 65aa51b69e..79ab762aa8 100644 --- a/src/views/ModelPlan/CollaborationArea/index.tsx +++ b/src/views/ModelPlan/CollaborationArea/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; -import { Grid, GridContainer } from '@trussworks/react-uswds'; +import { Button, Grid, GridContainer } from '@trussworks/react-uswds'; // import classNames from 'classnames'; import { // GetCrtdLsQuery, @@ -11,12 +11,14 @@ import { import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import { FavoriteIcon } from 'components/FavoriteCard'; +import UswdsReactLink from 'components/LinkWrapper'; // import { useFlags } from 'launchdarkly-react-client-sdk'; // import UswdsReactLink from 'components/LinkWrapper'; import MainContent from 'components/MainContent'; import PageHeading from 'components/PageHeading'; import PageLoading from 'components/PageLoading'; import Alert from 'components/shared/Alert'; +import Divider from 'components/shared/Divider'; // import Divider from 'components/shared/Divider'; import { ErrorAlert, ErrorAlertMessage } from 'components/shared/ErrorAlert'; import ShareExportButton from 'components/ShareExport/ShareExportButton'; @@ -178,13 +180,13 @@ const CollaborationArea = () => { )} {/* Wait for model status query param to be removed */} - {loading && ( + {!data && (
)} - {!loading && data && ( + {data && ( @@ -251,6 +253,24 @@ const CollaborationArea = () => { + + + + + +

+ {collaborationAreaT('areas')} +

+ + + {collaborationAreaT('goToModelPlan')} + + + )} diff --git a/src/views/ModelPlan/Collaborators/AddCollaborator/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/Collaborators/AddCollaborator/__snapshots__/index.test.tsx.snap index be5de4eb8d..75520daafc 100644 --- a/src/views/ModelPlan/Collaborators/AddCollaborator/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/Collaborators/AddCollaborator/__snapshots__/index.test.tsx.snap @@ -273,7 +273,7 @@ exports[`Adding a collaborator page > matches snapshot 1`] = ` ← diff --git a/src/views/ModelPlan/Collaborators/AddCollaborator/index.test.tsx b/src/views/ModelPlan/Collaborators/AddCollaborator/index.test.tsx index bea70a3d33..ad6fb24331 100644 --- a/src/views/ModelPlan/Collaborators/AddCollaborator/index.test.tsx +++ b/src/views/ModelPlan/Collaborators/AddCollaborator/index.test.tsx @@ -13,12 +13,12 @@ describe('Adding a collaborator page', () => { const { asFragment, getByTestId } = render( - + diff --git a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx index eb0a9e9664..ed889bbf81 100644 --- a/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx +++ b/src/views/ModelPlan/Collaborators/AddCollaborator/index.tsx @@ -124,7 +124,7 @@ const Collaborators = () => { ); history.push( - `/models/${modelID}/collaborators?view=${manageOrAdd}` + `/models/${modelID}/collaboration-area/collaborators?view=${manageOrAdd}` ); } }) @@ -163,7 +163,7 @@ const Collaborators = () => { ); history.push( - `/models/${modelID}/collaborators?view=${manageOrAdd}` + `/models/${modelID}/collaboration-area/collaborators?view=${manageOrAdd}` ); } }) @@ -396,7 +396,7 @@ const Collaborators = () => { ← {' '} {!collaboratorId diff --git a/src/views/ModelPlan/Collaborators/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/Collaborators/__snapshots__/index.test.tsx.snap index 8712821082..d044bed54c 100644 --- a/src/views/ModelPlan/Collaborators/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/Collaborators/__snapshots__/index.test.tsx.snap @@ -68,7 +68,7 @@ exports[`Collaborator/Team Member page w/table > matches snapshot 1`] = ` Add team member @@ -261,7 +261,7 @@ exports[`Collaborator/Team Member page w/table > matches snapshot 1`] = ` Edit @@ -289,7 +289,7 @@ exports[`Collaborator/Team Member page w/table > matches snapshot 1`] = ` Continue to Model Plan task list diff --git a/src/views/ModelPlan/Collaborators/index.test.tsx b/src/views/ModelPlan/Collaborators/index.test.tsx index 638827b366..ccdf8d9208 100644 --- a/src/views/ModelPlan/Collaborators/index.test.tsx +++ b/src/views/ModelPlan/Collaborators/index.test.tsx @@ -73,13 +73,13 @@ describe('Collaborator/Team Member page w/table', () => { render( - + @@ -103,13 +103,13 @@ describe('Collaborator/Team Member page w/table', () => { const { asFragment } = render( - + diff --git a/src/views/ModelPlan/Collaborators/index.tsx b/src/views/ModelPlan/Collaborators/index.tsx index 04698c92c3..a397a0a77d 100644 --- a/src/views/ModelPlan/Collaborators/index.tsx +++ b/src/views/ModelPlan/Collaborators/index.tsx @@ -210,11 +210,6 @@ export const CollaboratorsContent = () => { BreadcrumbItemOptions.COLLABORATORS ] } - customItem={ - manageOrAdd === 'manage' - ? null - : collaboratorsMiscT('collaboratorsMisc:addATeamMember') - } /> {manageOrAdd === 'manage' ? ( @@ -233,7 +228,9 @@ export const CollaboratorsContent = () => { {collaboratorsMiscT('manageModelTeamInfo')} - + ← {miscellaneousT('returnToTaskList')} @@ -256,7 +253,7 @@ export const CollaboratorsContent = () => { {collaboratorsMiscT('addTeamMemberButton')} @@ -294,7 +291,7 @@ export const CollaboratorsContent = () => { data-testid="continue-to-tasklist" className="usa-button usa-button--outline" variant="unstyled" - to={`/models/${modelID}/task-list`} + to={`/models/${modelID}/collaboration-area/task-list`} > {collaborators.length > 0 ? miscellaneousT('continueToTaskList') @@ -313,12 +310,12 @@ const Collaborators = () => { return ( } /> } /> diff --git a/src/views/ModelPlan/Collaborators/table.tsx b/src/views/ModelPlan/Collaborators/table.tsx index b50bba323b..8358840c9e 100644 --- a/src/views/ModelPlan/Collaborators/table.tsx +++ b/src/views/ModelPlan/Collaborators/table.tsx @@ -80,7 +80,7 @@ const CollaboratorsTable = ({ <> { const { getByText } = render( - + @@ -158,10 +158,10 @@ describe('Discussion Component', () => { const { getByText } = render( - + @@ -198,10 +198,10 @@ describe('Discussion Component', () => { const { getByText } = render( - + diff --git a/src/views/ModelPlan/Documents/AddDocument/LinkDocument.tsx b/src/views/ModelPlan/Documents/AddDocument/LinkDocument.tsx index 9d1e2b6df7..3eef1fd41b 100644 --- a/src/views/ModelPlan/Documents/AddDocument/LinkDocument.tsx +++ b/src/views/ModelPlan/Documents/AddDocument/LinkDocument.tsx @@ -125,7 +125,7 @@ const LinkDocument = ({ if (solutionDetailsLink) { history.push(solutionDetailsLink); } else { - history.push(`/models/${modelID}/documents`); + history.push(`/models/${modelID}/collaboration-area/documents`); } } } diff --git a/src/views/ModelPlan/Documents/AddDocument/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/Documents/AddDocument/__snapshots__/index.test.tsx.snap index 297f36a689..1ba6a732b2 100644 --- a/src/views/ModelPlan/Documents/AddDocument/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/Documents/AddDocument/__snapshots__/index.test.tsx.snap @@ -41,7 +41,7 @@ exports[`Model Plan Add Documents page > matches snapshot 1`] = ` > Model Plan task list @@ -53,7 +53,7 @@ exports[`Model Plan Add Documents page > matches snapshot 1`] = ` > Documents diff --git a/src/views/ModelPlan/Documents/AddDocument/documentUpload.tsx b/src/views/ModelPlan/Documents/AddDocument/documentUpload.tsx index a139133057..e6da3b9ea3 100644 --- a/src/views/ModelPlan/Documents/AddDocument/documentUpload.tsx +++ b/src/views/ModelPlan/Documents/AddDocument/documentUpload.tsx @@ -119,7 +119,7 @@ const DocumentUpload = ({ if (solutionDetailsLink) { history.push(solutionDetailsLink); } else { - history.push(`/models/${modelID}/documents`); + history.push(`/models/${modelID}/collaboration-area/documents`); } } } diff --git a/src/views/ModelPlan/Documents/AddDocument/index.test.tsx b/src/views/ModelPlan/Documents/AddDocument/index.test.tsx index 8c3e7b06a2..4f7a4f0b77 100644 --- a/src/views/ModelPlan/Documents/AddDocument/index.test.tsx +++ b/src/views/ModelPlan/Documents/AddDocument/index.test.tsx @@ -13,11 +13,11 @@ describe('Model Plan Add Documents page', () => { - + diff --git a/src/views/ModelPlan/Documents/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/Documents/__snapshots__/index.test.tsx.snap index 407ce17287..c364c008ca 100644 --- a/src/views/ModelPlan/Documents/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/Documents/__snapshots__/index.test.tsx.snap @@ -41,7 +41,7 @@ exports[`Model Plan Documents page > matches snapshot 1`] = ` > Model Plan task list @@ -76,7 +76,7 @@ exports[`Model Plan Documents page > matches snapshot 1`] = `

Model Plan task list @@ -63,7 +63,7 @@ exports[`Locked Task List Section Page > matches snapshot 1`] = `

Return to the task list diff --git a/src/views/ModelPlan/LockedTaskListSection/index.tsx b/src/views/ModelPlan/LockedTaskListSection/index.tsx index f2932fe9db..150f61ebeb 100644 --- a/src/views/ModelPlan/LockedTaskListSection/index.tsx +++ b/src/views/ModelPlan/LockedTaskListSection/index.tsx @@ -37,7 +37,7 @@ const LockedTaskListSection = () => { {t('navigation.modelPlanTaskList')} @@ -56,7 +56,7 @@ const LockedTaskListSection = () => { {t('returnToTaskList')} @@ -71,7 +71,7 @@ const LockedTaskListSection = () => { {t('returnToTaskList')} diff --git a/src/views/ModelPlan/NewPlan/index.tsx b/src/views/ModelPlan/NewPlan/index.tsx index 2aba2599a8..bea9ddb0b7 100644 --- a/src/views/ModelPlan/NewPlan/index.tsx +++ b/src/views/ModelPlan/NewPlan/index.tsx @@ -41,7 +41,7 @@ const NewPlanContent = () => { }).then(response => { if (!response.errors && response.data) { const { id } = response.data.createModelPlan; - history.push(`/models/${id}/collaborators?view=add`); + history.push(`/models/${id}/collaboration-area/collaborators?view=add`); } }); }; diff --git a/src/views/ModelPlan/ReadOnly/CRTDLs/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/ReadOnly/CRTDLs/__snapshots__/index.test.tsx.snap index 51ddd38136..76ee6c1a21 100644 --- a/src/views/ModelPlan/ReadOnly/CRTDLs/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/ReadOnly/CRTDLs/__snapshots__/index.test.tsx.snap @@ -298,7 +298,7 @@ exports[`Read Only CR and TDLs page > matches snapshot 1`] = ` > Edit @@ -541,7 +541,7 @@ exports[`Read Only CR and TDLs page > matches snapshot 1`] = ` > Edit diff --git a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap index d2f0579330..f24483cd6a 100644 --- a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap @@ -211,7 +211,7 @@ exports[`Read Only Model Plan Summary > matches snapshot 1`] = ` /> { )} {!isHelpArticle && ( -
+
{h('back')} diff --git a/src/views/ModelPlan/Status/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/Status/__snapshots__/index.test.tsx.snap index fb8671729b..aa3c0f0cdb 100644 --- a/src/views/ModelPlan/Status/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/Status/__snapshots__/index.test.tsx.snap @@ -40,7 +40,7 @@ exports[`Model Plan Status Update page > matches snapshot 1`] = ` > Model Plan task list diff --git a/src/views/ModelPlan/Status/index.test.tsx b/src/views/ModelPlan/Status/index.test.tsx index 8945f3ce9f..eb63cb80f9 100644 --- a/src/views/ModelPlan/Status/index.test.tsx +++ b/src/views/ModelPlan/Status/index.test.tsx @@ -11,10 +11,10 @@ describe('Model Plan Status Update page', () => { it('matches snapshot', async () => { const { asFragment } = render( - + diff --git a/src/views/ModelPlan/Status/index.tsx b/src/views/ModelPlan/Status/index.tsx index ca0de0fae7..d1893c0048 100644 --- a/src/views/ModelPlan/Status/index.tsx +++ b/src/views/ModelPlan/Status/index.tsx @@ -171,7 +171,9 @@ const Status = () => { type="button" className="usa-button usa-button--unstyled" onClick={() => - history.push(`/models/${modelID}/task-list/`) + history.push( + `/models/${modelID}/collaboration-area/task-list/` + ) } > diff --git a/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap index 2f5ce24edc..93540ffc4e 100644 --- a/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap @@ -27,7 +27,7 @@ exports[`Model Basics Milestones page > renders without errors and matches snaps > Model Plan task list diff --git a/src/views/ModelPlan/TaskList/Basics/Milestones/index.test.tsx b/src/views/ModelPlan/TaskList/Basics/Milestones/index.test.tsx index 0e2a09e069..d50cf1b81a 100644 --- a/src/views/ModelPlan/TaskList/Basics/Milestones/index.test.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Milestones/index.test.tsx @@ -60,11 +60,11 @@ describe('Model Basics Milestones page', () => { const { asFragment, getByTestId } = render( - + diff --git a/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx b/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx index 0398006b15..a88607070a 100644 --- a/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Milestones/index.tsx @@ -158,7 +158,9 @@ const Milestones = () => { { - history.push(`/models/${modelID}/task-list/characteristics`); + history.push( + `/models/${modelID}/collaboration-area/task-list/characteristics` + ); }} enableReinitialize validateOnBlur={false} @@ -534,7 +536,7 @@ const Milestones = () => { window.scrollTo(0, 0); } else { history.push( - `/models/${modelID}/task-list/basics/overview` + `/models/${modelID}/collaboration-area/task-list/basics/overview` ); } }); @@ -557,7 +559,9 @@ const Milestones = () => { type="button" className="usa-button usa-button--unstyled" onClick={() => - history.push(`/models/${modelID}/task-list`) + history.push( + `/models/${modelID}/collaboration-area/task-list` + ) } > diff --git a/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap index ed4483688c..02f3f2c992 100644 --- a/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap @@ -29,7 +29,7 @@ exports[`Basics overview page > renders without errors and matches snapshot 1`] > Model Plan task list diff --git a/src/views/ModelPlan/TaskList/Basics/Overview/index.test.tsx b/src/views/ModelPlan/TaskList/Basics/Overview/index.test.tsx index bd7c922966..245dbcba8a 100644 --- a/src/views/ModelPlan/TaskList/Basics/Overview/index.test.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Overview/index.test.tsx @@ -47,11 +47,11 @@ describe('Basics overview page', () => { const { asFragment, getByTestId } = render( - + diff --git a/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx b/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx index 275f80f363..f60f2a00e8 100644 --- a/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx +++ b/src/views/ModelPlan/TaskList/Basics/Overview/index.tsx @@ -123,7 +123,9 @@ const Overview = () => { { - history.push(`/models/${modelID}/task-list/basics/milestones`); + history.push( + `/models/${modelID}/collaboration-area/task-list/basics/milestones` + ); }} enableReinitialize validateOnBlur={false} @@ -262,7 +264,9 @@ const Overview = () => { type="button" className="usa-button usa-button--outline margin-bottom-1" onClick={() => - history.push(`/models/${modelID}/task-list/basics`) + history.push( + `/models/${modelID}/collaboration-area/task-list/basics` + ) } > {miscellaneousT('back')} @@ -280,7 +284,11 @@ const Overview = () => { Model Plan task list @@ -38,7 +38,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > Operational solutions tracker @@ -245,7 +245,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > About this solution { - + @@ -173,11 +173,11 @@ describe('Operational Solutions NeedQuestionAndAnswer', () => { - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/index.tsx index 2a1d20c60d..b3de035f22 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/index.tsx @@ -156,7 +156,7 @@ const SelectSolutions = () => { if (responses && !errors) { showMessageOnNextPage(removedSolutions); history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${ + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${ update ? `solution-implementation-details?isCustomNeed=${!!isCustomNeed}&update-details=true` : `solution-implementation-details?isCustomNeed=${!!isCustomNeed}` @@ -173,11 +173,11 @@ const SelectSolutions = () => { const breadcrumbs = [ { text: h('home'), url: '/' }, - { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/task-list/` }, - { text: t('breadcrumb'), url: `/models/${modelID}/task-list/it-solutions` }, + { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/collaboration-area/task-list/` }, + { text: t('breadcrumb'), url: `/models/${modelID}/collaboration-area/task-list/it-solutions` }, { text: t('solutionDetails'), - url: `/models/${modelID}/task-list/it-solutions/${operationalNeed.id}/${operationalNeed.solutions[0]?.id}/solution-details` + url: `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeed.id}/${operationalNeed.solutions[0]?.id}/solution-details` }, { text: update ? t('updateSolutions') : t('selectSolution') } ]; @@ -361,7 +361,7 @@ const SelectSolutions = () => { className="usa-button usa-button--outline margin-top-2 margin-bottom-3" onClick={() => { history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/add-solution?isCustomNeed=${!!isCustomNeed}` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/add-solution?isCustomNeed=${!!isCustomNeed}` ); }} > @@ -394,7 +394,7 @@ const SelectSolutions = () => { className="usa-button usa-button--unstyled display-flex flex-align-center" onClick={() => history.push( - `/models/${modelID}/task-list/it-solutions` + `/models/${modelID}/collaboration-area/task-list/it-solutions` ) } > diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SolutionDetails/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/SolutionDetails/index.tsx index 6aed5dc255..d609c1640e 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SolutionDetails/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/SolutionDetails/index.tsx @@ -122,7 +122,7 @@ const SolutionDetails = () => { {h('tasklistBreadcrumb')} @@ -130,7 +130,7 @@ const SolutionDetails = () => { {t('breadcrumb')} @@ -205,7 +205,7 @@ const SolutionDetails = () => { className="usa-button usa-button--outline" onClick={() => { history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/link-documents` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/link-documents` ); }} > @@ -219,10 +219,10 @@ const SolutionDetails = () => { className="usa-button usa-button--outline" onClick={() => { history.push({ - pathname: `/models/${modelID}/documents/add-document`, + pathname: `/models/${modelID}/collaboration-area/documents/add-document`, state: { solutionID: operationalSolutionID, - solutionDetailsLink: `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + solutionDetailsLink: `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` } }); }} diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap index 242ece7ba7..87f1062ad4 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap @@ -26,7 +26,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > Model Plan task list @@ -38,7 +38,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > Operational solutions tracker @@ -216,7 +216,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` /> About this solution { - + @@ -121,12 +121,12 @@ describe('Operational Solutions NeedQuestionAndAnswer', () => { - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/index.tsx index 6322263704..745a8d6262 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/index.tsx @@ -166,7 +166,7 @@ const SolutionImplementation = () => { if (fromSolutionDetails) { history.goBack(); } else { - history.push(`/models/${modelID}/task-list/it-solutions`); + history.push(`/models/${modelID}/collaboration-area/task-list/it-solutions`); } // Go back but still save solution details @@ -174,7 +174,7 @@ const SolutionImplementation = () => { history.goBack(); // Dont save solution details, solutions no needed, and return to tracker } else { - history.push(`/models/${modelID}/task-list/it-solutions`); + history.push(`/models/${modelID}/collaboration-area/task-list/it-solutions`); } } else if (errors) { setMutationError(true); @@ -204,7 +204,7 @@ const SolutionImplementation = () => { return history.goBack(); } if (solutionId) { - return history.push(`/models/${modelID}/task-list/it-solutions`); + return history.push(`/models/${modelID}/collaboration-area/task-list/it-solutions`); } return handleFormSubmit(values, null, true); }; @@ -223,11 +223,11 @@ const SolutionImplementation = () => { const breadcrumbs = [ { text: h('home'), url: '/' }, - { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/task-list/` }, - { text: t('breadcrumb'), url: `/models/${modelID}/task-list/it-solutions` }, + { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/collaboration-area/task-list/` }, + { text: t('breadcrumb'), url: `/models/${modelID}/collaboration-area/task-list/it-solutions` }, { text: t('solutionDetails'), - url: `/models/${modelID}/task-list/it-solutions/${operationalNeed.id}/${operationalNeed.solutions[0]?.id}/solution-details` + url: `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeed.id}/${operationalNeed.solutions[0]?.id}/solution-details` }, { text: statusBreadcrumb() } ]; diff --git a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap index 8be02bef93..0b9a04c00f 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap @@ -26,7 +26,7 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` > Model Plan task list @@ -38,7 +38,7 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` > Operational solutions tracker @@ -50,7 +50,7 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` > Solution details @@ -332,7 +332,7 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` > Model Plan task list @@ -344,7 +344,7 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` > Operational solutions tracker @@ -356,7 +356,7 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` > Solution details diff --git a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.test.tsx index c9643c2f0e..9c2c1348e7 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.test.tsx @@ -81,10 +81,10 @@ describe('Operational Solutions Add Subtasks', () => { const { getByTestId, getByRole } = render( - + @@ -107,10 +107,10 @@ describe('Operational Solutions Add Subtasks', () => { const { getByTestId, getByRole, queryAllByRole } = render( - + @@ -137,10 +137,10 @@ describe('Operational Solutions Add Subtasks', () => { const { getByTestId, getByRole, asFragment } = render( - + @@ -168,10 +168,10 @@ describe('Operational Solutions Manage Subtasks', () => { const { getByTestId } = render( - + @@ -206,10 +206,10 @@ describe('Operational Solutions Manage Subtasks', () => { const { getByTestId, asFragment } = render( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.tsx index 5313ca865c..35f478a05a 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/index.tsx @@ -160,7 +160,7 @@ const Subtasks = ({ ); history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` ); } } @@ -206,7 +206,7 @@ const Subtasks = ({ ); history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` ); } }) @@ -242,7 +242,7 @@ const Subtasks = ({ ); history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` ); } }) @@ -300,14 +300,14 @@ const Subtasks = ({ const breadcrumbs = [ { text: h('home'), url: '/' }, - { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/task-list/` }, + { text: h('tasklistBreadcrumb'), url: `/models/${modelID}/collaboration-area/task-list/` }, { text: opSolutionsMiscT('subtasks.itSolutionsTrackerBreadcrumb'), - url: `/models/${modelID}/task-list/it-solutions` + url: `/models/${modelID}/collaboration-area/task-list/it-solutions` }, { text: opSolutionsMiscT('subtasks.solutionDetails'), - url: `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + url: `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` }, { text: managingSubtasks @@ -535,7 +535,7 @@ const Subtasks = ({ onClick={() => managingSubtasks ? history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/add-subtasks?from=manage-subtasks` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/add-subtasks?from=manage-subtasks` ) : push({ __typename: @@ -585,10 +585,10 @@ const Subtasks = ({ onClick={() => fromManageSubtasks ? history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/manage-subtasks` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/manage-subtasks` ) : history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/solution-details` ) } > diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/__snapshots__/index.test.tsx.snap index 60fe498351..5ff5c1c23f 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/__snapshots__/index.test.tsx.snap @@ -85,7 +85,7 @@ exports[`Operational Solutions CheckboxCard > matches snapshot 1`] = ` > About this solution ( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.test.tsx index 7b1d160627..5b63fd260c 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.test.tsx @@ -45,10 +45,10 @@ describe('Operational Solutions CheckboxCard', () => { const { asFragment, getByRole, getByText, getByTestId } = render( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.tsx index b24aa6573c..7371e08651 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/CheckboxCard/index.tsx @@ -114,7 +114,7 @@ const CheckboxCard = ({ className="display-flex flex-align-center usa-button usa-button--unstyled margin-top-2 margin-bottom-0" onClick={() => history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/add-custom-solution/${ + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/add-custom-solution/${ solution.id !== '00000000-0000-0000-0000-000000000000' ? solution.id : '' @@ -140,7 +140,7 @@ const CheckboxCard = ({ className="display-flex flex-align-center usa-button usa-button--unstyled margin-top-2 margin-bottom-0" onClick={() => history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/add-custom-solution/${solution.id}${solutionParam}` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/add-custom-solution/${solution.id}${solutionParam}` ) } > @@ -167,7 +167,7 @@ const CheckboxCard = ({ )} diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.stories.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.stories.tsx index f402c5bc77..14ad7de0e2 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.stories.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.stories.tsx @@ -11,10 +11,10 @@ export default { Story => ( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.test.tsx index 22ef120a80..ba13e9df1d 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/HelpBox/index.test.tsx @@ -9,10 +9,10 @@ describe('Operational Solutions HelpBox', () => { const { asFragment } = render( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/_component/InfoToggle.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/_component/InfoToggle.tsx index fbe2ee60a4..56e6a98bd1 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/_component/InfoToggle.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/_component/InfoToggle.tsx @@ -94,7 +94,7 @@ const InfoToggle = ({ {t('changeAnswer')} diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/index.test.tsx index c63253ac4e..22eca800e9 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/NeedQuestionAndAnswer/index.test.tsx @@ -20,11 +20,11 @@ describe('Operational Solutions NeedQuestionAndAnswer', () => { - + { - + {t('updateThisOpertationalNeed')} @@ -200,7 +200,7 @@ const NeedQuestionAndAnswer = ({ } return ( {t('editNeed')} diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/OperationalNeedRemovalModal/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/OperationalNeedRemovalModal/index.tsx index a03386c342..9caec141ac 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/OperationalNeedRemovalModal/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/OperationalNeedRemovalModal/index.tsx @@ -49,7 +49,7 @@ const OperationalNeedRemovalModal = ({ ); - history.push(`/models/${modelID}/task-list/it-solutions`); + history.push(`/models/${modelID}/collaboration-area/task-list/it-solutions`); setIsModalOpen(false); } }) diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/__snapshots__/index.test.tsx.snap index 16b6191fa8..b49be36aef 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/__snapshots__/index.test.tsx.snap @@ -69,7 +69,7 @@ exports[`Operational Solutions SolutionCard > matches snapshot 1`] = ` /> About this solution ( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.test.tsx index b4dd3c69a0..175b0e9c43 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.test.tsx @@ -36,10 +36,10 @@ describe('Operational Solutions SolutionCard', () => { const { getByText, getByTestId } = render( - + @@ -62,10 +62,10 @@ describe('Operational Solutions SolutionCard', () => { const { getByTestId } = render( - + @@ -84,10 +84,10 @@ describe('Operational Solutions SolutionCard', () => { const { asFragment, getByText, getByTestId } = render( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.tsx index b570e35cf0..46be37b7ac 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionCard/index.tsx @@ -236,7 +236,7 @@ const SolutionCard = ({ > isUpdatingStatus variant 1`] = ` /> About this solution isUpdatingStatus variant 1`] = ` Update solutions for this operational need @@ -305,7 +305,7 @@ exports[`SolutionDetailsCard > matches snapshot 1`] = ` /> About this solution matches snapshot 1`] = ` Update solutions for this operational need diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.stories.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.stories.tsx index aea2bfebcc..5551a6d977 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.stories.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.stories.tsx @@ -44,10 +44,10 @@ export default { Story => ( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.test.tsx index 85115457ab..060938ff4d 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SolutionDetailCard/index.test.tsx @@ -54,10 +54,10 @@ describe('SolutionDetailsCard', () => { const { asFragment, getByText, getByTestId } = render( - + { const { asFragment, getByText, getByTestId } = render( - + {t('updateSolutionsLink')} @@ -117,7 +117,7 @@ const SolutionDetailCard = ({ className="usa-button usa-button--outline" onClick={() => { history.push({ - pathname: `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/solution-implementation-details/${operationalSolutionID}` + pathname: `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/solution-implementation-details/${operationalSolutionID}` }); }} > diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.stories.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.stories.tsx index c3348687f5..5d48dca971 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.stories.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.stories.tsx @@ -34,10 +34,10 @@ export default { Story => ( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.test.tsx index f4fbb2c562..2fbd9f3688 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.test.tsx @@ -32,10 +32,10 @@ describe('Subtasks Table Component', () => { const { getByTestId } = render( - + @@ -56,10 +56,10 @@ describe('Subtasks Table Component', () => { const { asFragment } = render( - + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.tsx index c5298e9f4b..3ad9251faa 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/_components/SubtasksTable/index.tsx @@ -119,7 +119,7 @@ export const SubtaskLinks = ({ className="usa-button usa-button--outline" onClick={() => { history.push( - `/models/${modelID}/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/${subtaskLinks[link]}` + `/models/${modelID}/collaboration-area/task-list/it-solutions/${operationalNeedID}/${operationalSolutionID}/${subtaskLinks[link]}` ); }} > diff --git a/src/views/ModelPlan/TaskList/ITSolutions/index.tsx b/src/views/ModelPlan/TaskList/ITSolutions/index.tsx index 556c3bff7d..79dcacd58b 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/index.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/index.tsx @@ -23,67 +23,67 @@ const ITSolutions = () => { } exact /> diff --git a/src/views/ModelPlan/TaskList/ITSolutions/util.test.tsx b/src/views/ModelPlan/TaskList/ITSolutions/util.test.tsx index a94ed14e94..af0dd6128b 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/util.test.tsx +++ b/src/views/ModelPlan/TaskList/ITSolutions/util.test.tsx @@ -121,7 +121,7 @@ describe('Operational Solutions Util', () => { ).toEqual( { ).toEqual( <> {i18next.t('opSolutionsMisc:itSolutionsTable.updateStatus')} {i18next.t('opSolutionsMisc:itSolutionsTable.viewDetails')} @@ -162,7 +162,7 @@ describe('Operational Solutions Util', () => { ).toEqual( {i18next.t('opSolutionsMisc:itSolutionsTable.updateStatus')} {i18next.t('opSolutionsMisc:itSolutionsTable.viewDetails')} @@ -135,7 +135,7 @@ export const returnActionLinks = ( ) { return ( {i18next.t('opSolutionsMisc:itSolutionsTable.updateNeed')} @@ -162,7 +162,7 @@ export const returnActionLinks = ( return ( @@ -173,7 +173,7 @@ export const returnActionLinks = ( return operationalNeedObj ? ( @@ -186,7 +186,7 @@ export const returnActionLinks = ( return operationalNeedObj ? ( matches snapshot 1`] > Model Plan task list diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.test.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.test.tsx index 46933157d0..4fa55fa563 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.test.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.test.tsx @@ -66,11 +66,11 @@ describe('Model Plan Ops Eval and Learning CCW and Qualtiy', () => { render( - + @@ -94,11 +94,11 @@ describe('Model Plan Ops Eval and Learning CCW and Qualtiy', () => { const { asFragment } = render( - + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx index f34df033b6..d49de481a5 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/index.tsx @@ -175,7 +175,7 @@ const CCWAndQuality = () => { initialValues={initialValues} onSubmit={() => { history.push( - `/models/${modelID}/task-list/ops-eval-and-learning/data-sharing` + `/models/${modelID}/collaboration-area/task-list/ops-eval-and-learning/data-sharing` ); }} enableReinitialize @@ -372,7 +372,7 @@ const CCWAndQuality = () => { id="ops-eval-and-learning-data-needed-warning" onClick={() => history.push( - `/models/${modelID}/task-list/it-solutions` + `/models/${modelID}/collaboration-area/task-list/it-solutions` ) } /> @@ -474,7 +474,7 @@ const CCWAndQuality = () => { className="usa-button usa-button--outline margin-bottom-1" onClick={() => { history.push( - `/models/${modelID}/task-list/ops-eval-and-learning/evaluation` + `/models/${modelID}/collaboration-area/task-list/ops-eval-and-learning/evaluation` ); }} > @@ -489,7 +489,7 @@ const CCWAndQuality = () => { -
-
-
-
-
-
-
-
-
- - Notes - -
-
- Cost sharing note -
-
-
-
-
-
-

- Non-Claims-Based Payments -

-
-
-

- - There are 5 additional questions that are not applicable for this model based on the answer selected for "What will you pay?". - -

-
-
-
- -
-
-
-
-
-
- - Notes - -
-
- Non claims note -
-
-
-
-
-
-
-
-
-
-
- - Notes - -
-
- Payments per cycle note -
-
-
-
-
-
-
-
-
- - Notes - -
-
- Shared systems note -
-
-
-
-
-
-
-
-
- - Notes - -
-
- Contractor planning note -
-
-
-
-
-
-
-
-
- - What level of complexity do you expect calculations to be? - -
-
- High level -
-
-
-
-
-
-
-
- - Notes - -
-
- Expected complexity note -
-
-
-
-
-
-
-
- - Are there any business requirement(s) that address claims processing precedence order with the other model(s)? If so, please specify. - -
- - No answer entered - -
-
-
-
-
-
-
-
- - Notes - -
-
- claim note -
-
-
-
-
-
-
-
- - Will participants be allowed to select between multiple payment mechanisms? If so, please describe. - -
-
- Yes - - - Can participants select how - -
-
-
-
-
-
-
-
-
- - Notes - -
-
- Payment mechanisms note -
-
-
-
-
-
-
-
- - How often do you anticipate making payments? - -
-
    -
  • - Semi-annually -
    • -
      -
    -
-
-
-
-
-
-
- - Notes - -
-
- Payment frequency note -
-
-
-
-
-
-
-
- - Will you recover the payments? - -
-
- Yes -
-
-
-
-
-
-
-
- - Notes - -
-
- Will recover note -
-
-
-
-
-
-
-
- - Do you anticipate reconciling payments retrospectively? - -
-
- Yes -
-
-
-
-
-
-
-
- - Notes - -
-
- Anticipate note -
-
-
-
-
-
-
-
- - How often are payments reconciled? - -
-
    -
  • - Continually -
    • -
      -
    • - Continual Frequency -
      • -
    -
-
-
-
-
-
-
-
- - Notes - -
-
- Reconciliation note -
-
-
-
-
-
-
-
- - How frequently do you anticipate making demands/recoupments? - -
-
    -
  • - Continually -
    • -
      -
    • - Continual Frequency -
      • -
    -
-
-
-
-
-
-
-
- - Notes - -
-
- Demand and Recoupment note -
-
-
-
-
-
-
-
- - When will payments start? - - -
- - - -
- - - - -
-
- 06/03/2022 -
-
-
-
-
-
-
-
- - Notes - -
-
- Note for payment start date -
-
-
-
-
- -`; - -exports[`Read Only Model Plan Summary -- Payment > matches snapshot 2`] = `
matches snapshot 1`] = ` data-testid="gridContainer" >
matches snapshot 1`] = ` View all models -
- - - - - Follow - -
+ + + Follow +

matches snapshot 1`] = `

-
-

- Status: -

- - Draft Model Plan - -
+ Status: +

+ + Draft Model Plan +

Last updated on 08/27/2022

-
+
+ - + + View change history + +
+
+ + + + + Edit Model Plan +
matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -39,11 +39,11 @@ exports[`Model Plan Status Update page > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area @@ -51,7 +51,9 @@ exports[`Model Plan Status Update page > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Update status + + Update status + diff --git a/src/views/ModelPlan/StepsOverview/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/StepsOverview/__snapshots__/index.test.tsx.snap index 37bc3112b9..27b5b9ec82 100644 --- a/src/views/ModelPlan/StepsOverview/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/StepsOverview/__snapshots__/index.test.tsx.snap @@ -24,7 +24,7 @@ exports[`The Model Plan Steps Overview static page > matches the snapshot 1`] = className="usa-breadcrumb__list-item" > @@ -37,7 +37,9 @@ exports[`The Model Plan Steps Overview static page > matches the snapshot 1`] = aria-current="page" className="usa-breadcrumb__list-item usa-current" > - Start a new model plan + + Start a new model plan + diff --git a/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap index 93540ffc4e..db882f524a 100644 --- a/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Basics/Milestones/__snapshots__/index.test.tsx.snap @@ -14,7 +14,7 @@ exports[`Model Basics Milestones page > renders without errors and matches snaps class="usa-breadcrumb__list-item" > @@ -26,11 +26,23 @@ exports[`Model Basics Milestones page > renders without errors and matches snaps class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -38,7 +50,9 @@ exports[`Model Basics Milestones page > renders without errors and matches snaps aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Model basics + + Model basics + diff --git a/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap index 02f3f2c992..98ed89d8ae 100644 --- a/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Basics/Overview/__snapshots__/index.test.tsx.snap @@ -16,7 +16,7 @@ exports[`Basics overview page > renders without errors and matches snapshot 1`] class="usa-breadcrumb__list-item" > @@ -28,11 +28,23 @@ exports[`Basics overview page > renders without errors and matches snapshot 1`] class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -40,7 +52,9 @@ exports[`Basics overview page > renders without errors and matches snapshot 1`] aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Model basics + + Model basics + diff --git a/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap index 099fbb2458..ed78927f32 100644 --- a/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Basics/__snapshots__/index.test.tsx.snap @@ -28,7 +28,7 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects class="usa-breadcrumb__list-item" > @@ -40,11 +40,23 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -52,7 +64,9 @@ exports[`Model Plan Basics page > disables and clears checkbox when user selects aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Model basics + + Model basics + @@ -1441,7 +1455,7 @@ exports[`Model Plan Basics page > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -1453,11 +1467,23 @@ exports[`Model Plan Basics page > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > + + Model collaboration area + + + +
  • + - Model Plan task list + Model Plan Task List
    • @@ -1465,7 +1491,9 @@ exports[`Model Plan Basics page > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Model basics + + Model basics + diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/__snapshots__/index.test.tsx.snap index a91d6948d9..eddc37758a 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Beneficiaries/BeneficiaryIdentification/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Beneficiaries + + Beneficiaries + diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/__snapshots__/index.test.tsx.snap index 91c59cf8bb..9378622881 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Beneficiaries/Frequency/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Beneficiaries + + Beneficiaries + diff --git a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap index 44324d51c0..8619052cee 100644 --- a/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Beneficiaries/PeopleImpact/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Beneficiaries > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Beneficiaries + + Beneficiaries + diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap index 401ae2a387..798aac306b 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Authority/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - General characteristics + + General characteristics + diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/__snapshots__/index.test.tsx.snap index 6a791b0956..21eb307ff1 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/Involvements/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - General characteristics + + General characteristics + diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/__snapshots__/index.test.tsx.snap index bee4587c8b..287b0ec0b4 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - General characteristics + + General characteristics + diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap index 7a8d0866f4..559168dbe5 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/TargetsAndOptions/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - General characteristics + + General characteristics + diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/GeneralCharacteristics/__snapshots__/index.test.tsx.snap index 4cbc61a90e..a61cdb0967 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Characteristics > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - General characteristics + + General characteristics + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/AddCustomSolution/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/AddCustomSolution/__snapshots__/index.test.tsx.snap index 9dbfcfd634..a03ceefa1f 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/AddCustomSolution/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/AddCustomSolution/__snapshots__/index.test.tsx.snap @@ -26,10 +26,10 @@ exports[`AddCustomSolution > matches snapshot 1`] = ` > - Model Plan task list + Model collaboration area @@ -38,10 +38,10 @@ exports[`AddCustomSolution > matches snapshot 1`] = ` > - Operational solutions tracker + Model Plan Task List @@ -50,7 +50,7 @@ exports[`AddCustomSolution > matches snapshot 1`] = ` > Add a solution diff --git a/src/views/ModelPlan/TaskList/ITSolutions/AddSolution/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/AddSolution/__snapshots__/index.test.tsx.snap index 25d9ba6403..23027662b3 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/AddSolution/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/AddSolution/__snapshots__/index.test.tsx.snap @@ -26,10 +26,22 @@ exports[`Operational Solutions AddSolution > matches snapshot 1`] = ` > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -41,7 +53,7 @@ exports[`Operational Solutions AddSolution > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker @@ -49,7 +61,9 @@ exports[`Operational Solutions AddSolution > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Add a solution + + Add a solution + diff --git a/src/views/ModelPlan/TaskList/ITSolutions/LinkDocuments/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/LinkDocuments/__snapshots__/index.test.tsx.snap index 097667e5e2..a13207a91b 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/LinkDocuments/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/LinkDocuments/__snapshots__/index.test.tsx.snap @@ -28,7 +28,7 @@ exports[`Model Plan Documents page > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -40,11 +40,23 @@ exports[`Model Plan Documents page > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > + + Model collaboration area + + + +
  • + - Model Plan task list + Model Plan Task List
    • @@ -52,7 +64,9 @@ exports[`Model Plan Documents page > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Documents + + Documents + @@ -502,10 +516,22 @@ exports[`Operational Solutions Link Documents > matches snapshot 1`] = ` > + + Model collaboration area + + + +
  • + - Model Plan task list + Model Plan Task List
    • @@ -517,7 +543,7 @@ exports[`Operational Solutions Link Documents > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker @@ -526,7 +552,7 @@ exports[`Operational Solutions Link Documents > matches snapshot 1`] = ` > Solution details diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/__snapshots__/index.test.tsx.snap index 6af60a2e28..8a191726a4 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/SelectSolutions/__snapshots__/index.test.tsx.snap @@ -26,10 +26,22 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -41,7 +53,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker diff --git a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap index 87f1062ad4..c7c7ff8d0f 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/SolutionImplementation/__snapshots__/index.test.tsx.snap @@ -26,10 +26,22 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -41,7 +53,7 @@ exports[`Operational Solutions NeedQuestionAndAnswer > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker diff --git a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap index 0b9a04c00f..1b7fd998cd 100644 --- a/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ITSolutions/Subtasks/__snapshots__/index.test.tsx.snap @@ -26,10 +26,22 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -41,7 +53,7 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker @@ -50,7 +62,7 @@ exports[`Operational Solutions Add Subtasks > matches snapshot 1`] = ` > Solution details @@ -332,10 +344,22 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` > + + Model collaboration area + + + +
  • + - Model Plan task list + Model Plan Task List
    • @@ -347,7 +371,7 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` href="/models/ce3405a0-3399-4e3a-88d7-3cfc613d2905/collaboration-area/task-list/it-solutions" > - Operational solutions tracker + Operational solutions and implementation status tracker @@ -356,7 +380,7 @@ exports[`Operational Solutions Manage Subtasks > matches snapshot 1`] = ` > Solution details diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/__snapshots__/index.test.tsx.snap index 8d2e5785db..ba8410786b 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/CCWAndQuality/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning CCW and Qualtiy > matches snapshot 1`] class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning CCW and Qualtiy > matches snapshot 1`] class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning CCW and Qualtiy > matches snapshot 1`] aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/__snapshots__/index.test.tsx.snap index b78d4af0be..964056b618 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/DataSharing/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning Data Sharing > matches snapshot 1`] = class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning Data Sharing > matches snapshot 1`] = class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning Data Sharing > matches snapshot 1`] = aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap index cf181c97e2..8fdb78a4f7 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Evaluation/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/__snapshots__/index.test.tsx.snap index 214e63b1ea..a0f5c22538 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOC/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/__snapshots__/index.test.tsx.snap index 85e0db583f..2234544ab7 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCMonitoring/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap index 64e501d996..5f1915fe8c 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/IDDOCTesting/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning IDDOC > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap index bfeafc2529..3d1b003160 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Learning/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning - Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning - Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning - Learning > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/__snapshots__/index.test.tsx.snap index 48364753d5..89f9af39e4 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/Performance/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning Performance > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning Performance > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning Performance > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap index cb61b31874..bf8bfc1959 100644 --- a/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/OpsEvalAndLearning/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Ops Eval and Learning > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Operations, evaluation, and learning + + Operations, evaluation, and learning + diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap index b5d13ee983..62b0588bc1 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Communication/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Communication > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Communication > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Communication > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Participants and providers + + Participants and providers + diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap index 33026970ca..078b51e244 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/Coordination/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Coordination > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Coordination > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Coordination > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Participants and providers + + Participants and providers + diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap index 5c01e57e59..158c242b5d 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ParticipantOptions/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan ParticipantsOptions > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Participants and providers + + Participants and providers + diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap index e9de57321a..876167517c 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/ProviderOptions/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan ProviderOptions > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Participants and providers + + Participants and providers + diff --git a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap index 88a824fb75..a6c1f39334 100644 --- a/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/ParticipantsAndProviders/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Participants and Providers > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Participants and Providers > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Participants and Providers > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Participants and providers + + Participants and providers + diff --git a/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/__snapshots__/index.test.tsx.snap index c9b65bf782..29390b6056 100644 --- a/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/AnticipateDependencies/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- Anticipate Dependencies > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- Anticipate Dependencies > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- Anticipate Dependencies > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/__snapshots__/index.test.tsx.snap index e8fbed2367..5343f46d66 100644 --- a/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/BeneficiaryCostSharing/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- BeneficiaryCostSharing > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- BeneficiaryCostSharing > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- BeneficiaryCostSharing > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/__snapshots__/index.test.tsx.snap index 9a9f2428f7..e73f31c284 100644 --- a/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/ClaimsBasedPayment/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- Claims Based Payment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- Claims Based Payment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- Claims Based Payment > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap index 47b11bb43d..e89cc7e3e7 100644 --- a/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/Complexity/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- Complexity > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/FundingSource/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/FundingSource/__snapshots__/index.test.tsx.snap index f61b9c231f..33f6efae18 100644 --- a/src/views/ModelPlan/TaskList/Payment/FundingSource/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/FundingSource/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan Payment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan Payment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan Payment > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/__snapshots__/index.test.tsx.snap index e019867512..2450903988 100644 --- a/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/NonClaimsBasedPayment/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- NonClaimsBasedPayment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- NonClaimsBasedPayment > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- NonClaimsBasedPayment > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/Payment/Recover/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/Payment/Recover/__snapshots__/index.test.tsx.snap index 4609e70537..47446ebb1e 100644 --- a/src/views/ModelPlan/TaskList/Payment/Recover/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/Payment/Recover/__snapshots__/index.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Model Plan -- Recover > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > @@ -25,11 +25,23 @@ exports[`Model Plan -- Recover > matches snapshot 1`] = ` class="usa-breadcrumb__list-item" > - Model Plan task list + Model collaboration area + + + +
  • + + + Model Plan Task List
    • @@ -37,7 +49,9 @@ exports[`Model Plan -- Recover > matches snapshot 1`] = ` aria-current="page" class="usa-breadcrumb__list-item usa-current" > - Payment + + Payment + diff --git a/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/__snapshots__/index.test.tsx.snap index 9e69f9a5e6..b795f70bd0 100644 --- a/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/PrepareForClearance/Checklist/__snapshots__/index.test.tsx.snap @@ -2,10 +2,7 @@ exports[`Prepare for clearance checklist > matches snapshot 1`] = ` -
    +
    -

    - Prepare for clearance -

    -

    -

    - After you’ve iterated on your Model Plan, make sure the information that’s included in your Model Plan matches any documentation that you’re using for clearance. -

    -
    -

    + Prepare for clearance +

    +

    +

    - Select which sections are ready for clearance. - -

    + -
    + Select which sections are ready for clearance. + +
    - - -

    -

    -
    - + +

    +

    +
    - Review model basics - - -
    -
    - -
    +
    - General characteristics - -

    -

    -
    - + +

    +

    +
    - Review general characteristics - - -
    -
    - -
    +
    - Participants and providers - -

    -

    -
    - + +

    +

    +
    - Review participants and providers - - -
    -
    - -
    +
    - Beneficiaries - -

    -

    -
    - + +

    +

    +
    - Review beneficiaries - - -
    -
    - -
    +
    - Operations, evaluation, and learning - -

    -

    -
    - + +

    +

    +
    - Review operations, evaluation, and learning - - -
    -
    - -
    +
    - Payment - -

    -

    -
    - + +

    +

    +
    - Review payment - - + Review payment + + +
    +
    -
    - - - + + +
    `; diff --git a/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/__snapshots__/index.test.tsx.snap index f3eec128c5..98cea6496e 100644 --- a/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/TaskList/PrepareForClearance/ClearanceReview/__snapshots__/index.test.tsx.snap @@ -19,7 +19,7 @@ exports[`ClearanceReview component > matches snapshot 1`] = ` > diff --git a/src/views/Notifications/Settings/__snapshots__/index.test.tsx.snap b/src/views/Notifications/Settings/__snapshots__/index.test.tsx.snap index 899a39105c..3ca791dda8 100644 --- a/src/views/Notifications/Settings/__snapshots__/index.test.tsx.snap +++ b/src/views/Notifications/Settings/__snapshots__/index.test.tsx.snap @@ -19,7 +19,7 @@ exports[`Notification Settings Page > matches snapshot 1`] = ` > From 567889d9ab78d1ab9e01804eb1e4b7a935077406 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Wed, 14 Aug 2024 13:53:07 -0500 Subject: [PATCH 19/33] Style tweaks, updated snaps --- .../__snapshots__/index.test.tsx.snap | 25 +------ src/components/FavoriteCard/index.tsx | 1 + .../__snapshots__/index.test.tsx.snap | 25 +------ src/components/ShareExport/pdfSummary.tsx | 1 + .../__snapshots__/index.test.tsx.snap | 75 +------------------ .../components/ModelsBySolutions/card.tsx | 6 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../_components/TaskListStatus/index.tsx | 46 +++++++----- 8 files changed, 39 insertions(+), 142 deletions(-) diff --git a/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap b/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap index f21b1254a2..ca54cfcbb9 100644 --- a/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap +++ b/src/components/FavoriteCard/__snapshots__/index.test.tsx.snap @@ -56,7 +56,7 @@ exports[`FavoriteCard > matches the snapshot 1`] = ` data-testid="grid" >
    matches the snapshot 1`] = ` />
    -
    - - - - - View change history - -
    diff --git a/src/components/FavoriteCard/index.tsx b/src/components/FavoriteCard/index.tsx index 1488a298cd..a10ec46b2d 100644 --- a/src/components/FavoriteCard/index.tsx +++ b/src/components/FavoriteCard/index.tsx @@ -85,6 +85,7 @@ const FavoriteCard = ({ matches the snapshot 1`] = `
    matches the snapshot 1`] = `

    -
    - - - - - View change history - -
    diff --git a/src/components/ShareExport/pdfSummary.tsx b/src/components/ShareExport/pdfSummary.tsx index e73c445ef1..b5ecf2eb9a 100644 --- a/src/components/ShareExport/pdfSummary.tsx +++ b/src/components/ShareExport/pdfSummary.tsx @@ -73,6 +73,7 @@ const PDFSummary = ({ modelID={modelID} status={status} statusLabel + changeHistoryLink={false} modifiedOrCreateLabel={!!modifiedDts} modifiedDts={modifiedDts ?? createdDts} /> diff --git a/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap b/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap index f9754eb55e..a234631fde 100644 --- a/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap +++ b/src/views/Home/components/ModelsBySolutions/__snapshots__/index.test.tsx.snap @@ -223,7 +223,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca Status

    renders solution models banner and ca />
    -
    - - - - - View change history - -
    @@ -373,7 +350,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca Status

    renders solution models banner and ca />
    -
    - - - - - View change history - -
    @@ -535,7 +489,7 @@ exports[`ModelsBySolution Table and Card > renders solution models banner and ca Status

    renders solution models banner and ca />
    -
    - - - - - View change history - -
    diff --git a/src/views/Home/components/ModelsBySolutions/card.tsx b/src/views/Home/components/ModelsBySolutions/card.tsx index c7a1cb2380..2d2713ce83 100644 --- a/src/views/Home/components/ModelsBySolutions/card.tsx +++ b/src/views/Home/components/ModelsBySolutions/card.tsx @@ -48,7 +48,11 @@ const ModelSolutionCard = ({

    {customHomeT('solutionCard.status')}

    - + diff --git a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap index 51fc161868..8f09070029 100644 --- a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap @@ -161,7 +161,7 @@ exports[`Read Only Model Plan Summary > matches snapshot 1`] = `
    -
    - - + {changeHistoryLink && ( +
    + + - {changeHistoryT('viewChangeHistory')} - -
    + {changeHistoryT('viewChangeHistory')} +     +
    + )} {hasEditAccess && !isCollaborationArea && (
    From a7eea1a1589953cda82f874847102441c2d2bd35 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Mon, 19 Aug 2024 09:41:42 -0500 Subject: [PATCH 20/33] Fixed accidental yarn overwrite --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index d6e44a6e0c..10d1798b64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15711,7 +15711,7 @@ start-server-and-test@^1.11.0: statuses@2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/collaboration-area/statuses/-/collaboration-area/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== std-env@^3.3.3: From 76454597487bdd666e722f06f74d851e22c9a0c4 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Mon, 19 Aug 2024 10:03:25 -0500 Subject: [PATCH 21/33] Fixed linting errors --- cypress/e2e/modelPlan.spec.js | 8 ++++++-- mappings/export/exportTranslation.ts | 2 +- src/components/NavigationBar/index.tsx | 1 - .../ModelPlan/CRTDL/CRTDLs/index.test.tsx | 4 +++- .../ModelPlan/CollaborationArea/index.scss | 2 +- src/views/ModelPlan/Documents/index.tsx | 11 ++--------- src/views/ModelPlan/Status/index.test.tsx | 4 +++- .../KeyCharacteristics/index.tsx | 6 +++++- .../TargetsAndOptions/index.tsx | 6 +++++- .../Home/operationalNeedsTable.test.tsx | 12 +++++++++--- .../OperationalNeedRemovalModal/index.tsx | 4 +++- .../OpsEvalAndLearning/CCWAndQuality/index.tsx | 6 +++++- .../OpsEvalAndLearning/DataSharing/index.tsx | 6 +++++- .../OpsEvalAndLearning/Evaluation/index.tsx | 6 +++++- .../OpsEvalAndLearning/IDDOC/index.tsx | 6 +++++- .../IDDOCMonitoring/index.tsx | 6 +++++- .../OpsEvalAndLearning/IDDOCTesting/index.tsx | 6 +++++- .../OpsEvalAndLearning/Learning/index.tsx | 10 ++++++++-- .../OpsEvalAndLearning/Performance/index.tsx | 10 ++++++++-- .../TaskList/OpsEvalAndLearning/index.tsx | 10 ++++++++-- .../Communication/index.tsx | 6 +++++- .../Coordination/index.tsx | 6 +++++- .../ParticipantOptions/index.tsx | 6 +++++- .../ProviderOptions/index.tsx | 10 ++++++++-- .../ParticipantsAndProviders/index.tsx | 4 +++- .../Payment/AnticipateDependencies/index.tsx | 8 ++++++-- .../Payment/BeneficiaryCostSharing/index.tsx | 8 ++++++-- .../Payment/ClaimsBasedPayment/index.tsx | 4 +++- .../TaskList/Payment/Complexity/index.tsx | 8 ++++++-- .../Payment/FundingSource/index.test.tsx | 8 ++++++-- .../TaskList/Payment/FundingSource/index.tsx | 12 +++++++++--- .../Payment/NonClaimsBasedPayment/index.tsx | 8 ++++++-- .../TaskList/Payment/Recover/index.tsx | 8 ++++++-- .../Checklist/index.test.tsx | 4 +++- .../PrepareForClearance/Checklist/index.tsx | 4 +++- .../ClearanceReview/index.tsx | 18 +++++++----------- .../_components/TaskListSideNav/index.tsx | 4 +++- .../_components/TaskListStatus/index.scss | 2 +- src/views/Notifications/Settings/index.tsx | 6 +----- 39 files changed, 184 insertions(+), 76 deletions(-) diff --git a/cypress/e2e/modelPlan.spec.js b/cypress/e2e/modelPlan.spec.js index 4c2ced6f3b..66728e0c80 100644 --- a/cypress/e2e/modelPlan.spec.js +++ b/cypress/e2e/modelPlan.spec.js @@ -20,7 +20,9 @@ describe('The Model Plan Form', () => { cy.contains('button', 'Next').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/collaboration-area/collaborators/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/collaborators/ + ); }); cy.get('[data-testid="page-loading"]').should('not.exist'); @@ -193,7 +195,9 @@ describe('The Model Plan Form', () => { cy.contains('a', 'Update').click(); cy.location().should(loc => { - expect(loc.pathname).to.match(/\/models\/.{36}\/collaboration-area/status/); + expect(loc.pathname).to.match( + /\/models\/.{36}\/collaboration-area\/status/ + ); }); cy.contains('h1', 'Update status'); diff --git a/mappings/export/exportTranslation.ts b/mappings/export/exportTranslation.ts index a5eef4b0e1..17cdf5ade6 100644 --- a/mappings/export/exportTranslation.ts +++ b/mappings/export/exportTranslation.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import basics from '../../src/i18n/en-US/modelPlan/basics'; import beneficiaries from '../../src/i18n/en-US/modelPlan/beneficiaries'; -import collaborators from '../../src/i18n/en-US/modelPlan/collaboration-area/collaborators'; +import collaborators from '../../src/i18n/en-US/modelPlan/collaborators'; import crs from '../../src/i18n/en-US/modelPlan/crs'; import discussions from '../../src/i18n/en-US/modelPlan/discussions'; import documents from '../../src/i18n/en-US/modelPlan/documents'; diff --git a/src/components/NavigationBar/index.tsx b/src/components/NavigationBar/index.tsx index e164aa6807..c6ac247c5b 100644 --- a/src/components/NavigationBar/index.tsx +++ b/src/components/NavigationBar/index.tsx @@ -5,7 +5,6 @@ import { GridContainer, Icon, PrimaryNav } from '@trussworks/react-uswds'; import classNames from 'classnames'; import { useGetPollNotificationsQuery } from 'gql/gen/graphql'; import { useFlags } from 'launchdarkly-react-client-sdk'; -import { c } from 'vite/dist/node/types.d-aGj9QkWt'; import './index.scss'; diff --git a/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx b/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx index 9faf079dbd..d94fd36c12 100644 --- a/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx +++ b/src/views/ModelPlan/CRTDL/CRTDLs/index.test.tsx @@ -89,7 +89,9 @@ const store = mockStore({ auth: mockAuthReducer }); describe('Model Plan CR and TDL page', () => { it('matches snapshot', async () => { const { asFragment, getByTestId } = render( - + diff --git a/src/views/ModelPlan/CollaborationArea/index.scss b/src/views/ModelPlan/CollaborationArea/index.scss index e7dddc4b91..636830f648 100644 --- a/src/views/ModelPlan/CollaborationArea/index.scss +++ b/src/views/ModelPlan/CollaborationArea/index.scss @@ -7,4 +7,4 @@ margin-top: -5rem; } } -} \ No newline at end of file +} diff --git a/src/views/ModelPlan/Documents/index.tsx b/src/views/ModelPlan/Documents/index.tsx index fb6cfa0efe..d75560e3d0 100644 --- a/src/views/ModelPlan/Documents/index.tsx +++ b/src/views/ModelPlan/Documents/index.tsx @@ -1,14 +1,7 @@ import React, { useContext, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link, Route, Switch, useParams } from 'react-router-dom'; -import { - Breadcrumb, - BreadcrumbBar, - BreadcrumbLink, - Grid, - GridContainer, - Icon -} from '@trussworks/react-uswds'; +import { Route, Switch, useParams } from 'react-router-dom'; +import { Grid, GridContainer, Icon } from '@trussworks/react-uswds'; import Breadcrumbs, { BreadcrumbItemOptions } from 'components/Breadcrumbs'; import UswdsReactLink from 'components/LinkWrapper'; diff --git a/src/views/ModelPlan/Status/index.test.tsx b/src/views/ModelPlan/Status/index.test.tsx index eb63cb80f9..1a14514df3 100644 --- a/src/views/ModelPlan/Status/index.test.tsx +++ b/src/views/ModelPlan/Status/index.test.tsx @@ -11,7 +11,9 @@ describe('Model Plan Status Update page', () => { it('matches snapshot', async () => { const { asFragment } = render( diff --git a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx index 1533e1f185..eac048599b 100644 --- a/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx +++ b/src/views/ModelPlan/TaskList/GeneralCharacteristics/KeyCharacteristics/index.tsx @@ -588,7 +588,11 @@ const KeyCharacteristics = () => { + + +
    From f2c8a1373e5b7b4d53e0967bbc70ded13f15b73e Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 20 Aug 2024 11:04:53 -0500 Subject: [PATCH 29/33] Added unerline to favoritecard --- src/components/FavoriteCard/index.scss | 6 ++++++ src/components/FavoriteCard/index.tsx | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/FavoriteCard/index.scss b/src/components/FavoriteCard/index.scss index 6460481013..5cc320b71c 100644 --- a/src/components/FavoriteCard/index.scss +++ b/src/components/FavoriteCard/index.scss @@ -40,6 +40,12 @@ top: .1em !important; } } + &__text { + &:hover { + text-decoration: underline !important; + text-underline-offset: 3px; + } + } &__status { display: flex; diff --git a/src/components/FavoriteCard/index.tsx b/src/components/FavoriteCard/index.tsx index a10ec46b2d..5fac251298 100644 --- a/src/components/FavoriteCard/index.tsx +++ b/src/components/FavoriteCard/index.tsx @@ -181,7 +181,9 @@ export const FavoriteIcon = ({ )} - {isFavorite ? t('favorite.following') : t('favorite.follow')} + + {isFavorite ? t('favorite.following') : t('favorite.follow')} + ); }; From fd067c3c2005e22be43d99c2ef4d26bd7d9c74b4 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 20 Aug 2024 11:42:07 -0500 Subject: [PATCH 30/33] Updated email links --- pkg/email/templates/model_plan_suggested_phase_body.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/email/templates/model_plan_suggested_phase_body.html b/pkg/email/templates/model_plan_suggested_phase_body.html index 89d78b2286..18392bda6f 100644 --- a/pkg/email/templates/model_plan_suggested_phase_body.html +++ b/pkg/email/templates/model_plan_suggested_phase_body.html @@ -25,10 +25,10 @@ {{end}}

    -Yes, update my model’s status +Yes, update my model’s status

    -

    If you’re not ready to update your model’s status, please adjust your model’s anticipated timeline. If you adjust your timeline, you may receive this notification again.

    +

    If you’re not ready to update your model’s status, please adjust your model’s anticipated timeline. If you adjust your timeline, you may receive this notification again.


    -

    You’re receiving this notification because you are listed as the model lead for {{.ModelPlanName}}. If this is incorrect, please update the model team.

    \ No newline at end of file +

    You’re receiving this notification because you are listed as the model lead for {{.ModelPlanName}}. If this is incorrect, please update the model team.

    \ No newline at end of file From b20ef09b7819692bed982684264f669c3ff4de3e Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 20 Aug 2024 11:43:34 -0500 Subject: [PATCH 31/33] Fix link --- pkg/email/templates/model_plan_suggested_phase_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/email/templates/model_plan_suggested_phase_body.html b/pkg/email/templates/model_plan_suggested_phase_body.html index 18392bda6f..d98677cafb 100644 --- a/pkg/email/templates/model_plan_suggested_phase_body.html +++ b/pkg/email/templates/model_plan_suggested_phase_body.html @@ -25,7 +25,7 @@ {{end}}

    -Yes, update my model’s status +Yes, update my model’s status

    If you’re not ready to update your model’s status, please adjust your model’s anticipated timeline. If you adjust your timeline, you may receive this notification again.

    From 94c606b5f65c523e2460e137888631d17f9d5f4a Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 20 Aug 2024 11:49:32 -0500 Subject: [PATCH 32/33] Fix email link one more time --- pkg/email/templates/model_plan_suggested_phase_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/email/templates/model_plan_suggested_phase_body.html b/pkg/email/templates/model_plan_suggested_phase_body.html index d98677cafb..78507a6527 100644 --- a/pkg/email/templates/model_plan_suggested_phase_body.html +++ b/pkg/email/templates/model_plan_suggested_phase_body.html @@ -25,7 +25,7 @@ {{end}}

    -Yes, update my model’s status +Yes, update my model’s status

    If you’re not ready to update your model’s status, please adjust your model’s anticipated timeline. If you adjust your timeline, you may receive this notification again.

    From 3d3d39b544d83156103d9f64f46175cdb55132a3 Mon Sep 17 00:00:00 2001 From: Patrick Segura Date: Tue, 20 Aug 2024 12:19:20 -0500 Subject: [PATCH 33/33] Updated snap --- .../ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap index 8f09070029..6cc03d902a 100644 --- a/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap +++ b/src/views/ModelPlan/ReadOnly/__snapshots__/index.test.tsx.snap @@ -144,7 +144,11 @@ exports[`Read Only Model Plan Summary > matches snapshot 1`] = ` d="m22 9.24-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71 4.04 4.38.38-3.32 2.88 1 4.28L12 15.4z" /> - Follow + + Follow +