= (props: ReviewersFieldPro
)
: undefined}
- {!props.isReadOnly && props.screenerOnly
+ {!props.isReadOnly && showFullReviewToggle
+ ? (
+
+
+
+ )
+ : undefined}
+
+ {!props.isReadOnly && showScreenerOnlyView
?
: undefined}
- {!props.isReadOnly && !props.screenerOnly
+ {!props.isReadOnly && !showScreenerOnlyView
? (
<>
void
+}
+
+jest.mock('../../../../../lib/components/form', () => ({
+ FormCheckboxField: function MockFormCheckboxField(props: MockFormCheckboxFieldProps) {
+ const reactHookForm: typeof import('react-hook-form') = jest.requireActual('react-hook-form')
+ const formContext = reactHookForm.useFormContext()
+ const controller = reactHookForm.useController({
+ control: formContext.control,
+ name: props.name,
+ })
+
+ function handleChange(event: { target: { checked: boolean } }): void {
+ controller.field.onChange(event.target.checked)
+ props.onChange?.(event.target.checked)
+ }
+
+ return (
+
+ )
+ },
+}))
+
+interface TestHarnessProps {
+ defaultMetadata?: ChallengeMetadata[]
+ funChallenge?: boolean
+}
+
+const MetadataWatcher: FC = () => {
+ const metadata = useWatch({
+ name: 'metadata',
+ })
+
+ return
+}
+
+const TestHarness: FC = (props: TestHarnessProps) => {
+ const formMethods = useForm({
+ defaultValues: {
+ description: 'Public challenge specification',
+ funChallenge: props.funChallenge,
+ metadata: props.defaultMetadata,
+ name: 'Challenge',
+ skills: [],
+ tags: [],
+ trackId: 'track-id',
+ typeId: 'type-id',
+ },
+ })
+
+ return (
+
+
+
+
+ )
+}
+
+const SHOW_DASHBOARD_LABEL = 'Show Dashboard'
+const SHOW_DATA_DASHBOARD_METADATA_FIELD = 'show_data_dashboard'
+
+describe('ShowDashboardField', () => {
+ it('leaves the dashboard disabled for standard marathon matches', async () => {
+ render()
+
+ await waitFor(() => {
+ expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+ .not
+ .toBeChecked()
+ })
+ expect(screen.getByTestId('metadata-value').textContent)
+ .toBe('[]')
+ })
+
+ it('defaults fun challenges to an enabled dashboard and persists the metadata', async () => {
+ render(
+ ,
+ )
+
+ await waitFor(() => {
+ expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+ .toBeChecked()
+ })
+ expect(screen.getByTestId('metadata-value').textContent)
+ .toBe(JSON.stringify([
+ {
+ name: 'existingMetadata',
+ value: 'keep-me',
+ },
+ {
+ name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ value: 'true',
+ },
+ ]))
+ })
+
+ it('restores the saved value instead of the fun-challenge default', async () => {
+ const metadata = [{
+ name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ value: 'false',
+ }]
+
+ render()
+
+ await waitFor(() => {
+ expect(screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL }))
+ .not
+ .toBeChecked()
+ })
+ expect(screen.getByTestId('metadata-value').textContent)
+ .toBe(JSON.stringify(metadata))
+ })
+
+ it('persists exact string booleans when the checkbox is toggled', async () => {
+ const user = userEvent.setup()
+
+ render()
+
+ const showDashboardCheckbox = screen.getByRole('checkbox', { name: SHOW_DASHBOARD_LABEL })
+
+ await user.click(showDashboardCheckbox)
+
+ expect(showDashboardCheckbox)
+ .toBeChecked()
+ expect(screen.getByTestId('metadata-value').textContent)
+ .toBe(JSON.stringify([{
+ name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ value: 'true',
+ }]))
+
+ await user.click(showDashboardCheckbox)
+
+ expect(showDashboardCheckbox)
+ .not
+ .toBeChecked()
+ expect(screen.getByTestId('metadata-value').textContent)
+ .toBe(JSON.stringify([{
+ name: SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ value: 'false',
+ }]))
+ })
+})
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx
new file mode 100644
index 000000000..29ace116a
--- /dev/null
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/ShowDashboardField.tsx
@@ -0,0 +1,144 @@
+import {
+ FC,
+ useCallback,
+ useEffect,
+} from 'react'
+import {
+ useFormContext,
+ useWatch,
+} from 'react-hook-form'
+
+import { FormCheckboxField } from '../../../../../lib/components/form'
+import {
+ ChallengeEditorFormData,
+ ChallengeMetadata,
+} from '../../../../../lib/models'
+import {
+ booleanToMetadata,
+ getMetadataValue,
+ metadataToBoolean,
+} from '../../../../../lib/utils/metadata.utils'
+
+export const SHOW_DATA_DASHBOARD_METADATA_FIELD = 'show_data_dashboard'
+const SHOW_DATA_DASHBOARD_TOGGLE_FIELD = 'showDataDashboardToggle'
+
+interface ShowDashboardFieldProps {
+ disabled?: boolean
+}
+
+/**
+ * Renders the Marathon Match data dashboard toggle in the Advanced Options section.
+ *
+ * Fun challenges default to an enabled dashboard when the challenge has no saved
+ * `show_data_dashboard` metadata, matching how Marathon Matches are normally set up. Saved metadata
+ * always wins so a copilot can turn the dashboard off again.
+ *
+ * @param props field state supplied by the challenge editor, including read-only disablement.
+ * @returns A checkbox that persists the `show_data_dashboard` challenge metadata flag.
+ * @throws Does not throw.
+ */
+export const ShowDashboardField: FC = (props: ShowDashboardFieldProps) => {
+ const formContext = useFormContext()
+ const dynamicFormControl = formContext.control as any
+ const metadata = useWatch({
+ control: dynamicFormControl,
+ name: 'metadata',
+ }) as ChallengeMetadata[] | undefined
+ const funChallenge = useWatch({
+ control: dynamicFormControl,
+ name: 'funChallenge',
+ }) as boolean | undefined
+ const showDataDashboardToggle = useWatch({
+ control: dynamicFormControl,
+ name: SHOW_DATA_DASHBOARD_TOGGLE_FIELD,
+ }) as boolean | undefined
+
+ const hasSavedDashboardFlag = getMetadataValue(
+ metadata,
+ SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ ) !== undefined
+ const isDashboardShown = hasSavedDashboardFlag
+ ? metadataToBoolean(metadata, SHOW_DATA_DASHBOARD_METADATA_FIELD)
+ : funChallenge === true
+
+ // Persist the fun-challenge default so saving the challenge keeps the dashboard enabled.
+ useEffect(() => {
+ if (hasSavedDashboardFlag || !isDashboardShown) {
+ return
+ }
+
+ formContext.setValue(
+ 'metadata',
+ booleanToMetadata(
+ metadata,
+ SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ true,
+ ),
+ {
+ shouldDirty: false,
+ shouldValidate: false,
+ },
+ )
+ }, [
+ formContext,
+ hasSavedDashboardFlag,
+ isDashboardShown,
+ metadata,
+ ])
+
+ useEffect(() => {
+ if (showDataDashboardToggle !== undefined) {
+ return
+ }
+
+ formContext.setValue(
+ SHOW_DATA_DASHBOARD_TOGGLE_FIELD as never,
+ isDashboardShown as never,
+ {
+ shouldDirty: false,
+ shouldValidate: false,
+ },
+ )
+ }, [
+ formContext,
+ isDashboardShown,
+ showDataDashboardToggle,
+ ])
+
+ const handleShowDashboardChange = useCallback((checked: boolean): void => {
+ if (hasSavedDashboardFlag && checked === isDashboardShown) {
+ return
+ }
+
+ formContext.setValue(
+ 'metadata',
+ booleanToMetadata(
+ metadata,
+ SHOW_DATA_DASHBOARD_METADATA_FIELD,
+ checked,
+ ),
+ {
+ shouldDirty: true,
+ shouldValidate: true,
+ },
+ )
+ }, [
+ formContext,
+ hasSavedDashboardFlag,
+ isDashboardShown,
+ metadata,
+ ])
+
+ return (
+
+ )
+}
+
+export default ShowDashboardField
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts
new file mode 100644
index 000000000..76c760683
--- /dev/null
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ShowDashboardField/index.ts
@@ -0,0 +1 @@
+export * from './ShowDashboardField'
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.spec.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.spec.tsx
index df35ddd99..9a4c89cef 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.spec.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.spec.tsx
@@ -18,6 +18,8 @@ const mockUseDownloadSubmission = jest.fn()
const mockUseFetchSubmissions = jest.fn()
const mockFetchMembersByUserIds = jest.fn()
const mockIsMarathonMatchChallenge = jest.fn()
+const mockCanViewSubmissionDuplicates = jest.fn()
+const mockUseFetchSubmissionDuplicates = jest.fn()
jest.mock('~/libs/ui', () => ({
Button: (props: {
@@ -82,6 +84,9 @@ jest.mock('../../../../../lib/contexts', () => {
jest.mock('../../../../../lib/hooks', () => ({
useDownloadAllSubmissions: (): unknown => mockUseDownloadAllSubmissions(),
useDownloadSubmission: (): unknown => mockUseDownloadSubmission(),
+ useFetchSubmissionDuplicates: (...args: unknown[]): unknown => (
+ mockUseFetchSubmissionDuplicates(...args)
+ ),
useFetchSubmissions: (...args: unknown[]): unknown => mockUseFetchSubmissions(...args),
}))
@@ -92,6 +97,7 @@ jest.mock('../../../../../lib/services', () => ({
jest.mock('../../../../../lib/utils', () => ({
canDownloadSubmissions: (): boolean => false,
canViewMarathonMatchRunnerLogs: (): boolean => false,
+ canViewSubmissionDuplicates: (...args: unknown[]): unknown => mockCanViewSubmissionDuplicates(...args),
getSubmissionFinalScore: (): number => 0,
getSubmissionInitialScore: (): number => 0,
getSubmissionProvisionalScore: (): number => 0,
@@ -180,6 +186,11 @@ describe('SubmissionsSection', () => {
jest.clearAllMocks()
mockIsMarathonMatchChallenge.mockReturnValue(true)
+ mockCanViewSubmissionDuplicates.mockReturnValue(true)
+ mockUseFetchSubmissionDuplicates.mockReturnValue({
+ duplicatesBySubmissionId: {},
+ isLoading: false,
+ })
mockUseDownloadAllSubmissions.mockReturnValue({
downloadAll: jest.fn(),
isDownloading: false,
@@ -273,4 +284,39 @@ describe('SubmissionsSection', () => {
expect(screen.queryByText('bravo-provisional-submission'))
.toBeNull()
})
+ describe('duplicate detection', () => {
+ it('requests duplicates for the visible submissions when the role allows it', () => {
+ render(
+ ,
+ )
+
+ expect(mockUseFetchSubmissionDuplicates)
+ .toHaveBeenCalledWith(
+ 'challenge-1',
+ expect.arrayContaining([
+ 'alpha-system-submission',
+ 'bravo-provisional-submission',
+ 'charlie-example-submission',
+ ]),
+ true,
+ )
+ })
+
+ it('disables the duplicates request for roles the API rejects', () => {
+ mockCanViewSubmissionDuplicates.mockReturnValue(false)
+
+ render(
+ ,
+ )
+
+ expect(mockUseFetchSubmissionDuplicates)
+ .toHaveBeenCalledWith('challenge-1', expect.any(Array), false)
+ })
+ })
})
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.tsx b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.tsx
index ace5be142..16b2b274b 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.tsx
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/SubmissionsSection/SubmissionsSection.tsx
@@ -24,6 +24,8 @@ import { WorkAppContext } from '../../../../../lib/contexts'
import {
useDownloadAllSubmissions,
useDownloadSubmission,
+ useFetchSubmissionDuplicates,
+ type UseFetchSubmissionDuplicatesResult,
useFetchSubmissions,
} from '../../../../../lib/hooks'
import { Challenge, Submission } from '../../../../../lib/models'
@@ -32,6 +34,7 @@ import type { MemberProfile } from '../../../../../lib/services'
import {
canDownloadSubmissions,
canViewMarathonMatchRunnerLogs,
+ canViewSubmissionDuplicates,
getSubmissionFinalScore,
getSubmissionInitialScore,
getSubmissionProvisionalScore,
@@ -601,6 +604,26 @@ export const SubmissionsSection: FC = (
const isMembersLoading = memberIdsToLoad.length > 0
const paginationTotal = sortedSubmissions.length
+ // Duplicates are only requested for the rows currently on screen, and only
+ // for roles the review API answers for.
+ const canCheckDuplicates = canViewSubmissionDuplicates(workAppContext.userRoles)
+ const duplicateCheckSubmissionIds = useMemo(
+ () => [
+ ...paginatedSubmissions,
+ ...sortedCheckpointSubmissions,
+ ]
+ .map(submission => normalizeValue(submission.id))
+ .filter(Boolean),
+ [paginatedSubmissions, sortedCheckpointSubmissions],
+ )
+ const {
+ duplicatesBySubmissionId,
+ }: UseFetchSubmissionDuplicatesResult = useFetchSubmissionDuplicates(
+ props.challengeId,
+ duplicateCheckSubmissionIds,
+ canCheckDuplicates,
+ )
+
const handleDownloadAll = useCallback(async (): Promise => {
try {
await downloadAllResult.downloadAll(toDownloadAllItems(submissionsResult.submissions))
@@ -793,6 +816,7 @@ export const SubmissionsSection: FC = (
canDownloadSubmissions={canDownload}
canViewRunnerLogs={canViewRunnerLogs}
challengeId={props.challengeId}
+ duplicatesBySubmissionId={duplicatesBySubmissionId}
isLoading={submissionsResult.isLoading}
isLoadingMembers={isMembersLoading}
onDownloadSubmission={handleDownloadSubmission}
@@ -815,6 +839,7 @@ export const SubmissionsSection: FC = (
canDownloadSubmissions={canDownload}
canViewRunnerLogs={canViewRunnerLogs}
challengeId={props.challengeId}
+ duplicatesBySubmissionId={duplicatesBySubmissionId}
isLoading={false}
isLoadingMembers={isMembersLoading}
onDownloadSubmission={handleDownloadSubmission}
diff --git a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
index 8154d1983..a70e4f2ae 100644
--- a/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
+++ b/src/apps/work/src/pages/challenges/ChallengeEditorPage/components/index.ts
@@ -30,6 +30,7 @@ export * from './ReviewersField'
export * from './ReviewTypeField'
export * from './ResourcesSection'
export * from './RoundTypeField'
+export * from './ShowDashboardField'
export * from './StockArtsField'
export * from './SubmissionsSection'
export * from './SubmissionTypeField'
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 62a460111..2c4f94c4e 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -9,6 +9,7 @@ export enum AppSubdomain {
wallet = 'wallet',
walletAdmin = 'wallet-admin',
copilots = 'copilots',
+ campus = 'campus',
admin = 'system-admin',
review = 'review',
calendar = 'calendar',
@@ -32,6 +33,7 @@ export enum ToolTitle {
wallet = 'Wallet',
walletAdmin = 'Wallet Admin',
copilots = 'Copilots',
+ campus = 'Campus',
admin = 'Admin',
review = 'Review',
calendar = 'Calendar',
diff --git a/src/libs/shared/lib/components/profile-picture/ProfilePicture.module.scss b/src/libs/shared/lib/components/profile-picture/ProfilePicture.module.scss
index 3e2b3d54e..8e67b7d7d 100644
--- a/src/libs/shared/lib/components/profile-picture/ProfilePicture.module.scss
+++ b/src/libs/shared/lib/components/profile-picture/ProfilePicture.module.scss
@@ -63,7 +63,6 @@
max-width: 100%;
max-height: 100%;
object-fit: cover;
- min-width: 150px;
aspect-ratio: 1 / 1;
border-radius: 50%;
diff --git a/tsconfig.paths.json b/tsconfig.paths.json
index 54e6a260e..809bc6b7c 100644
--- a/tsconfig.paths.json
+++ b/tsconfig.paths.json
@@ -27,6 +27,9 @@
"@wallet/*": [
"./src/apps/wallet/src/*"
],
+ "@campus/*": [
+ "./src/apps/campus/src/*"
+ ],
"@walletAdmin/*": [
"./src/apps/wallet-admin/src/*"
],