diff --git a/src/scenes/Engagement/LanguageEngagement/Header/LanguageEngagementHeader.tsx b/src/scenes/Engagement/LanguageEngagement/Header/LanguageEngagementHeader.tsx index 4e5c117139..33ecb90ef4 100644 --- a/src/scenes/Engagement/LanguageEngagement/Header/LanguageEngagementHeader.tsx +++ b/src/scenes/Engagement/LanguageEngagement/Header/LanguageEngagementHeader.tsx @@ -5,6 +5,7 @@ import { Helmet } from 'react-helmet-async'; import { makeStyles } from 'tss-react/mui'; import { EngagementStatusLabels } from '~/api/schema.graphql'; import { canEditAny, labelFrom } from '~/common'; +import { ToggleCommentsButton } from '~/components/Comments/ToggleCommentButton'; import { BooleanProperty } from '../../../../components/BooleanProperty'; import { DataButton } from '../../../../components/DataButton'; import { useDialog } from '../../../../components/Dialog'; @@ -106,6 +107,9 @@ export const LanguageEngagementHeader = ({ )} + + + { args.input?.filter?.pinned ?? false } /> + diff --git a/src/scenes/Partners/Detail/PartnerDetail.tsx b/src/scenes/Partners/Detail/PartnerDetail.tsx index 8dc7c8041d..a455e18707 100644 --- a/src/scenes/Partners/Detail/PartnerDetail.tsx +++ b/src/scenes/Partners/Detail/PartnerDetail.tsx @@ -10,6 +10,7 @@ import { Many, Nil } from '@seedcompany/common'; import { Helmet } from 'react-helmet-async'; import { useParams } from 'react-router-dom'; import { PartialDeep } from 'type-fest'; +import { ToggleCommentsButton } from '~/components/Comments/ToggleCommentButton'; import { DataButton } from '~/components/DataButton'; import { useDialog } from '~/components/Dialog'; import { Error } from '~/components/Error'; @@ -128,6 +129,7 @@ const PartnerHeader = ({ args.input?.filter?.pinned ?? false } /> + {acronym && ( diff --git a/src/scenes/Projects/Overview/ProjectOverview.tsx b/src/scenes/Projects/Overview/ProjectOverview.tsx index 27168fa411..31f271bc52 100644 --- a/src/scenes/Projects/Overview/ProjectOverview.tsx +++ b/src/scenes/Projects/Overview/ProjectOverview.tsx @@ -18,6 +18,7 @@ import { makeStyles } from 'tss-react/mui'; import { PartialDeep } from 'type-fest'; import { ProjectStepLabels, ProjectTypeLabels } from '~/api/schema.graphql'; import { labelFrom } from '~/common'; +import { ToggleCommentsButton } from '~/components/Comments/ToggleCommentButton'; import { BudgetOverviewCard } from '../../../components/BudgetOverviewCard'; import { CardGroup } from '../../../components/CardGroup'; import { ChangesetPropertyBadge } from '../../../components/Changeset'; @@ -242,6 +243,7 @@ export const ProjectOverview = () => { args.input?.filter?.pinned ?? false } /> + {project && } diff --git a/src/scenes/Root/MainLayout.tsx b/src/scenes/Root/MainLayout.tsx index ab7506d4ee..dd91b000df 100644 --- a/src/scenes/Root/MainLayout.tsx +++ b/src/scenes/Root/MainLayout.tsx @@ -1,6 +1,8 @@ import { ErrorBoundary } from 'react-error-boundary'; -import { Outlet } from 'react-router-dom'; +import { Outlet, useParams } from 'react-router-dom'; import { makeStyles } from 'tss-react/mui'; +import { firstValue } from '~/common'; +import { CommentsBar } from '~/components/Comments/CommentsBar'; import { Error } from '../../components/Error'; import { useAuthRequired } from '../Authentication'; import { CreateDialogProviders } from './Creates'; @@ -22,6 +24,8 @@ const useStyles = makeStyles()(() => ({ export const MainLayout = () => { useAuthRequired(); + const resourceId = firstValue(useParams()); + const { classes } = useStyles(); return (
@@ -30,6 +34,7 @@ export const MainLayout = () => {
+ }> diff --git a/src/scenes/Users/Detail/UserDetail.tsx b/src/scenes/Users/Detail/UserDetail.tsx index 50937ba2c6..da96bd6a60 100644 --- a/src/scenes/Users/Detail/UserDetail.tsx +++ b/src/scenes/Users/Detail/UserDetail.tsx @@ -10,6 +10,7 @@ import { makeStyles } from 'tss-react/mui'; import { PartialDeep } from 'type-fest'; import { RoleLabels } from '~/api/schema.graphql'; import { canEditAny, labelsFrom } from '~/common'; +import { ToggleCommentsButton } from '~/components/Comments/ToggleCommentButton'; import { useDialog } from '../../../components/Dialog'; import { DisplaySimpleProperty, @@ -98,6 +99,7 @@ export const UserDetail = () => { args.input?.filter?.pinned ?? false } /> +