diff --git a/src/main/webapp/app/shared/util/core-drive-annotation-submission/core-drive-annotation-submission.spec.ts b/src/main/webapp/app/shared/util/core-drive-annotation-submission/core-drive-annotation-submission.spec.ts index 0c99da666..e1524a926 100644 --- a/src/main/webapp/app/shared/util/core-drive-annotation-submission/core-drive-annotation-submission.spec.ts +++ b/src/main/webapp/app/shared/util/core-drive-annotation-submission/core-drive-annotation-submission.spec.ts @@ -218,6 +218,8 @@ const mockGene = createMockGene({ penetrance_uuid: 'd4d542a7-c942-47b6-bb44-4559fa742348', }), name_uuid: '90061776-866f-40c1-819a-00dbad8213d0', + summary: 'summary', + summary_uuid: 'dec9f8ee-7c5d-4740-b17c-86331d867b15', }), createMockMutation({ mutation_effect: createMockMutationEffect({ @@ -243,6 +245,8 @@ const mockGene = createMockGene({ name: 'V600E', name_review: createMockReview({ updateTime: 1717770480000, updatedBy: 'John Doe' }), name_uuid: 'ee5900b8-d984-49a6-b6db-940eb1d0e807', + summary: 'summary', + summary_uuid: '8cbccd95-caf6-4a33-837d-5c72d1d221d7', tumors_uuid: 'b9e062b0-a1ae-46ad-9fc6-5bb6ee6b3674', alterations_uuid: '9eb7261b-74c8-463b-99cd-62815c416765', mutation_specific_cancer_risk: createMockCancerRisk({ @@ -287,7 +291,6 @@ const mockGene = createMockGene({ excludedRCTs_review: createMockReview({ updateTime: 1717770480000, updatedBy: 'John Doe', - lastReviewed: 'reviewed excludedRCTs', }), }), prognostic: { @@ -310,7 +313,6 @@ const mockGene = createMockGene({ excludedRCTs_review: createMockReview({ updateTime: 1717770480000, updatedBy: 'John Doe', - lastReviewed: 'reviewed excludedRCTs', }), }, prognosticSummary: '', @@ -505,11 +507,11 @@ const mockGene = createMockGene({ }), level_uuid: '7afcbe32-1684-436e-b659-c37ada75bae2', short: '', + excludedRCTs: [], excludedRCTs_uuid: '4a5ed610-72d6-4007-b68b-3913d9c01d38', excludedRCTs_review: createMockReview({ updateTime: 1717770480000, updatedBy: 'John Doe', - lastReviewed: 'reviewed excludedRCTs', }), }), diagnosticSummary: '', @@ -529,6 +531,7 @@ const mockGene = createMockGene({ lastReviewed: 'description review', }), description_uuid: 'b190d68a-bd23-47e8-a7e7-b67f91c946dd', + excludedRCTs: [], level: '', level_review: createMockReview({ updateTime: 1717770480000, @@ -649,9 +652,9 @@ const expectedGeneDataNoCommentsAndReviewed = { short: '', pathogenic: '', pathogenic_uuid: '11de51b2-1019-4ff7-95d0-9bcfe3439d2b', - description_review: { updatedBy: 'John Doe', updateTime: 1678309000000, lastReviewed: 'reviewed description' }, - effect_review: { updatedBy: 'John Doe', updateTime: 1678309000000, lastReviewed: 'Neutral' }, - oncogenic_review: { updatedBy: 'John Doe', updateTime: 1678309000000, lastReviewed: 'Yes' }, + description_review: { updatedBy: 'John Doe', updateTime: 1678309000000 }, + effect_review: { updatedBy: 'John Doe', updateTime: 1678309000000 }, + oncogenic_review: { updatedBy: 'John Doe', updateTime: 1678309000000 }, }, mutation_effect_uuid: 'f5646eb4-a8b2-4967-9f8e-fba706538a03', mutation_effect_comments: [], @@ -681,7 +684,9 @@ const expectedGeneDataNoCommentsAndReviewed = { mosaic: '', mosaic_uuid: 'c7c43f59-45d6-4b07-91d1-f2595ff9f90a', }, - name_review: { updatedBy: 'John Doe', updateTime: 1678309000000, lastReviewed: 'reviewed name' }, + name_review: { updatedBy: 'John Doe', updateTime: 1678309000000 }, + summary: 'summary', + summary_uuid: 'dec9f8ee-7c5d-4740-b17c-86331d867b15', }, { mutation_effect: { @@ -704,6 +709,8 @@ const expectedGeneDataNoCommentsAndReviewed = { alterations: [], alterations_uuid: '9eb7261b-74c8-463b-99cd-62815c416765', name_uuid: 'ee5900b8-d984-49a6-b6db-940eb1d0e807', + summary: 'summary', + summary_uuid: '8cbccd95-caf6-4a33-837d-5c72d1d221d7', tumors: [ { TIs: [ @@ -821,16 +828,15 @@ const expectedGeneDataNoCommentsAndReviewed = { excludedRCTs: [], excludedRCTs_uuid: '3a04990a-9b1f-4ceb-8896-4fd88ea2a02b', short: '', - description_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'description review' }, - fdaLevel_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'fdaLevel review' }, - indication_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'indication Review' }, - level_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'level Review' }, + description_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + fdaLevel_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + indication_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + level_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, name_review: { updatedBy: 'John Doe', updateTime: 1717770480000, - lastReviewed: '0ade496c-77e6-45cd-8e96-7c7d87b4e5de, 122b8921-3cd6-4b57-bdc8-5d39cc5465a1', }, - propagation_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: '1' }, + propagation_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, }, ], treatments_uuid: '6f8ed079-3b8b-437c-852c-c3c2a3c9a320', @@ -868,12 +874,12 @@ const expectedGeneDataNoCommentsAndReviewed = { description_uuid: '5c0856a1-1a56-4f01-8620-9518ebfb233e', level: 'level review', level_uuid: '7afcbe32-1684-436e-b659-c37ada75bae2', - excludedRCTs: 'reviewed excludedRCTs', + excludedRCTs: [], excludedRCTs_uuid: '4a5ed610-72d6-4007-b68b-3913d9c01d38', short: '', - description_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'description review' }, - level_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'level review' }, - excludedRCTs_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'reviewed excludedRCTs' }, + description_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + level_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + excludedRCTs_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, }, diagnosticSummary: 'summary review', diagnosticSummary_uuid: 'a601e863-3c0f-4c97-8037-b3aafd853aad', @@ -881,15 +887,15 @@ const expectedGeneDataNoCommentsAndReviewed = { diagnostic_uuid: 'c3d5a2d6-34ef-4645-9d8e-96739e4a3cd6', prognostic: { description: 'description review', - description_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'description review' }, + description_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, description_uuid: 'b190d68a-bd23-47e8-a7e7-b67f91c946dd', level: 'level review', - level_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'level review' }, + level_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, level_uuid: 'b12042a4-76c5-4029-97de-9722108b7b0e', short: '', excludedRCTs_uuid: '1cf4d012-1335-4229-8da1-76ced0819211', - excludedRCTs_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'reviewed excludedRCTs' }, - excludedRCTs: 'reviewed excludedRCTs', + excludedRCTs_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + excludedRCTs: [], }, prognosticSummary: 'summary review', prognosticSummary_uuid: 'c961a5e9-8c02-4b32-b001-9fc37f6c60c8', @@ -897,9 +903,9 @@ const expectedGeneDataNoCommentsAndReviewed = { prognostic_uuid: 'a482d71c-0079-40bd-8d8b-a13d35e26fe3', summary: 'summary review', summary_uuid: 'da67dbc0-7641-43db-a760-a3464e65a1c5', - diagnosticSummary_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'summary review' }, - prognosticSummary_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'summary review' }, - summary_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'summary review' }, + diagnosticSummary_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + prognosticSummary_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + summary_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, }, ], tumors_uuid: 'b9e062b0-a1ae-46ad-9fc6-5bb6ee6b3674', @@ -940,13 +946,13 @@ const expectedGeneDataNoCommentsAndReviewed = { ocg_uuid: '1a233927-54d7-4921-97bf-08489a1e9c7d', tsg: 'Oncogene', tsg_uuid: 'aafdb835-106b-426a-89dc-970f49f7eee6', - ocg_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'Tumor Suppressor' }, - tsg_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'Oncogene' }, + ocg_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + tsg_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, }, type_uuid: 'ea4d7bd1-bc94-4877-987f-37f2f13e571b', dmp_refseq_id_grch38: 'NM_000000.0', isoform_override_grch38: 'ENST00000000000', genomic_indicators: [], - background_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'test' }, - summary_review: { updatedBy: 'John Doe', updateTime: 1717770480000, lastReviewed: 'test' }, + background_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, + summary_review: { updatedBy: 'John Doe', updateTime: 1717770480000 }, }; diff --git a/src/main/webapp/app/shared/util/core-submission-shared/core-submission-utils.spec.ts b/src/main/webapp/app/shared/util/core-submission-shared/core-submission-utils.spec.ts index b48b6ff4c..bf1035125 100644 --- a/src/main/webapp/app/shared/util/core-submission-shared/core-submission-utils.spec.ts +++ b/src/main/webapp/app/shared/util/core-submission-shared/core-submission-utils.spec.ts @@ -123,7 +123,6 @@ describe('useLastReviewedOnly', () => { { summary: 'YYYYYYYYYYY', summary_review: { - lastReviewed: 'YYYYYYYYYYY', updateTime: 0, updatedBy: 'Test User', }, @@ -144,7 +143,6 @@ describe('useLastReviewedOnly', () => { type: { ocg: '', ocg_review: { - lastReviewed: '', updateTime: 0, updatedBy: 'Test User', }, @@ -186,7 +184,6 @@ describe('useLastReviewedOnly', () => { { name: 'new mutation name', name_review: { - lastReviewed: 'new mutation name', updateTime: 0, updatedBy: 'Test User', },