diff --git a/web/src/__tests__/ProjectResourceConfigure.test.tsx b/web/src/__tests__/ProjectResourceConfigure.test.tsx index 3433d474c..56360ed3a 100644 --- a/web/src/__tests__/ProjectResourceConfigure.test.tsx +++ b/web/src/__tests__/ProjectResourceConfigure.test.tsx @@ -3,7 +3,6 @@ import { schemaMock } from '../test-helpers/schemaMock'; import React from 'react'; import { render, screen } from '@testing-library/react'; -import ProjectResourceConfigure from '../components/PassageDetail/Internalization/ProjectResourceConfigure'; import { MediaFile, MediaFileD, SectionResource } from '../model'; import { UnsavedProvider } from '../context/UnsavedContext'; import { PropsWithChildren } from 'react'; @@ -19,11 +18,14 @@ const mockMemory = { jest.mock('../schema', () => schemaMock(() => mockMemory)); +// Barrel utils pulls react-localization (ESM) via useCheckOnline → store. jest.mock('../utils', () => ({ logError: jest.fn(), - Severity: { info: 0, error: 1, retry: 2 }, + Severity: { error: 0, info: 1 }, })); +import ProjectResourceConfigure from '../components/PassageDetail/Internalization/ProjectResourceConfigure'; + // Mock GlobalContext to avoid context errors jest.mock('../context/useGlobal', () => ({ useGlobal: jest.fn((key: string) => { diff --git a/web/src/components/PassageDetail/Prompt/PassageDetailPromptAdmin.tsx b/web/src/components/PassageDetail/Prompt/PassageDetailPromptAdmin.tsx index 08fc693f2..e7cfc7bbe 100644 --- a/web/src/components/PassageDetail/Prompt/PassageDetailPromptAdmin.tsx +++ b/web/src/components/PassageDetail/Prompt/PassageDetailPromptAdmin.tsx @@ -15,25 +15,25 @@ import { remoteIdGuid, useArtifactType, useOrganizedBy, + useSecResCreate, + useSecResDelete, } from '../../../crud'; -import { ReplaceRelatedRecord } from '../../../model/baseModel'; -import { - RecordIdentity, - RecordKeyMap, - RecordTransformBuilder, -} from '@orbit/records'; +import { recordRef, ReplaceRelatedRecord } from '../../../model/baseModel'; +import { RecordKeyMap, RecordTransformBuilder } from '@orbit/records'; import { useGlobal } from '../../../context/useGlobal'; import usePassageDetailContext from '../../../context/usePassageDetailContext'; import { UnsavedContext } from '../../../context/UnsavedContext'; import MediaRecord from '../../MediaRecord'; import { useStepPermissions } from '../../../utils/useStepPermission'; import { isLinkedNote } from '../../../crud/isLinkedNote'; -import { useSecResCreate, useSecResDelete } from '../../../crud'; import { usePromptSectionResource } from './usePromptSectionResource'; import { promptPendingRestore } from './promptPendingRestore'; -import { SectionResourceD } from '../../../model'; +import { + SectionResourceD, + IPromptStrings, + ISharedStrings, +} from '../../../model'; import { promptSelector, sharedSelector } from '../../../selector'; -import { IPromptStrings, ISharedStrings } from '../../../model'; import { useMobile } from '../../../utils'; const toolId = 'PromptTool'; @@ -144,12 +144,11 @@ export default function PassageDetailPromptAdmin() { }, [promptMediaId, recorderState]); const linkMediaToStep = async (mediaId: string) => { - const mediaRecId = { type: 'mediafile', id: mediaId } as RecordIdentity; const t = new RecordTransformBuilder(); await memory.update([ ...ReplaceRelatedRecord( t, - mediaRecId, + recordRef('mediafile', mediaId), 'orgWorkflowStep', 'orgworkflowstep', currentstep @@ -168,12 +167,11 @@ export default function PassageDetailPromptAdmin() { await DeleteSectionResource(existing); sectionResourceRef.current = null; } - const mediaRecId = { - type: 'mediafile', - id: - remoteIdGuid('mediafile', mediaId, memory?.keyMap as RecordKeyMap) || - mediaId, - } as RecordIdentity; + const mediaRecId = recordRef( + 'mediafile', + remoteIdGuid('mediafile', mediaId, memory?.keyMap as RecordKeyMap) || + mediaId + ); await linkMediaToStep(mediaRecId.id); await AddSectionResource(0, null, mediaRecId); forceRefresh(); diff --git a/web/src/components/ProvideRights.tsx b/web/src/components/ProvideRights.tsx index 5a948e72b..6ef388e78 100644 --- a/web/src/components/ProvideRights.tsx +++ b/web/src/components/ProvideRights.tsx @@ -5,7 +5,7 @@ import { Organization, } from '../model'; import { SxProps } from '@mui/material/styles'; -import { +import React, { useContext, useEffect, useMemo, @@ -35,13 +35,7 @@ import { shallowEqual, useSelector } from 'react-redux'; import { AddRecord, ReplaceRelatedRecord } from '../model/baseModel'; import IntellectualProperty from '../model/intellectualProperty'; import { UploadType } from './UploadType'; -import { - RecordIdentity, - RecordKeyMap, - RecordTransformBuilder, - UninitializedRecord, -} from '@orbit/records'; -import React from 'react'; +import { RecordKeyMap, RecordTransformBuilder } from '@orbit/records'; import { IVoicePerm } from '../business/voice/PersonalizeVoicePermission'; import ProvideRightsMobile from './PassageDetail/mobile/record/ProvideRightsMobile'; @@ -58,12 +52,12 @@ interface IProps { speaker: string; aiip: boolean; recordType: ArtifactTypeSlug; - onRights?: ((hasRights: boolean) => void) | undefined; - team?: string | undefined; - planId?: string | undefined; + onRights?: (hasRights: boolean) => void; + team?: string; + planId?: string; } -export function ProvideRights(props: IProps) { +export function ProvideRights(props: Readonly) { const { speaker, recordType, onRights, team, planId, aiip } = props; const [user] = useGlobal('user'); const [organizationId] = useGlobal('organization'); @@ -72,14 +66,14 @@ export function ProvideRights(props: IProps) { const [statusText, setStatusText] = useState(''); const [canSave, setCanSave] = useState(false); const canSaveRef = useRef(false); - const [defaultFilename, setDefaultFileName] = useState(''); + const [defaultFilename, setDefaultFilename] = useState(''); const [coordinator] = useGlobal('coordinator'); const memory = coordinator?.getSource('memory') as Memory; - const [uploadVisible, setUploadVisiblex] = useState(false); + const [uploadVisible, setUploadVisiblex] = useState(false); // NOSONAR typescript:S6754 const uploadVisibleRef = useRef(false); const [resetMedia, setResetMedia] = useState(false); const [statement, setStatement] = useState(''); - const [, setSaving] = useState(false); + const [, setSaving] = useState(false); // NOSONAR typescript:S6754 const [paperWidth, setPaperWidth] = useState(0); const paperRef = useRef(null); const getGlobal = useGetGlobal(); @@ -164,7 +158,7 @@ export function ProvideRights(props: IProps) { ]); useEffect(() => { - setDefaultFileName(cleanFileName(`${speaker}_ip`)); + setDefaultFilename(cleanFileName(`${speaker}_ip`)); const state = getOrgDefault(orgDefaultVoices) as IVoicePerm; setState({ ...state, fullName: speaker } as IVoicePerm); // eslint-disable-next-line react-hooks/exhaustive-deps @@ -229,7 +223,7 @@ export function ProvideRights(props: IProps) { } else { if (statement) { const mediaRec = findRecord(memory, 'mediafile', id) as MediaFileD; - updateRecord({ + await updateRecord({ ...mediaRec, attributes: { ...mediaRec.attributes, transcription: statement }, } as MediaFileD); @@ -240,25 +234,13 @@ export function ProvideRights(props: IProps) { rightsHolder: speaker, notes: JSON.stringify(state), }, - } as IntellectualProperty & UninitializedRecord; + } as IntellectualProperty; await memory.update((t) => [ ...AddRecord(t, ip, user, memory), - ...ReplaceRelatedRecord( - t, - ip as RecordIdentity, - 'releaseMediafile', - 'mediafile', - id - ), - ...ReplaceRelatedRecord( - t, - ip as RecordIdentity, - 'organization', - 'organization', - orgId - ), + ...ReplaceRelatedRecord(t, ip, 'releaseMediafile', 'mediafile', id), + ...ReplaceRelatedRecord(t, ip, 'organization', 'organization', orgId), ]); - onRights && onRights(true); + onRights?.(true); } setStatusText(''); saveCompleted(toolId); @@ -271,7 +253,7 @@ export function ProvideRights(props: IProps) { }; const afterUpload = async (mediaRemoteIds?: string[]) => { - afterUploadCb( + await afterUploadCb( mediaRemoteIds && mediaRemoteIds.length > 0 ? mediaRemoteIds[0] : undefined @@ -297,7 +279,7 @@ export function ProvideRights(props: IProps) { }; const handleLater = () => { - onRights && onRights(true); + onRights?.(true); }; return ( diff --git a/web/src/crud/offlineProjectCreate.ts b/web/src/crud/offlineProjectCreate.ts index 964d62574..32115ded7 100644 --- a/web/src/crud/offlineProjectCreate.ts +++ b/web/src/crud/offlineProjectCreate.ts @@ -1,7 +1,6 @@ import { Project, OfflineProject, OfflineProjectD } from '../model'; import Memory from '@orbit/memory'; import { - RecordIdentity, RecordOperation, RecordTransformBuilder, StandardRecordNormalizer, @@ -32,14 +31,8 @@ export const offlineProjectCreate = ( } as OfflineProject; const rn = new StandardRecordNormalizer({ schema: memory?.schema }); proj = rn.normalizeRecord(proj) as OfflineProjectD; - ops.push(tb.addRecord(proj).toOperation()); ops.push( - ...ReplaceRelatedRecord( - tb, - proj as RecordIdentity, - 'project', - 'project', - project.id - ) + tb.addRecord(proj).toOperation(), + ...ReplaceRelatedRecord(tb, proj, 'project', 'project', project.id) ); }; diff --git a/web/src/crud/saveNewSection.ts b/web/src/crud/saveNewSection.ts index d5edf4c94..ce56e3aeb 100644 --- a/web/src/crud/saveNewSection.ts +++ b/web/src/crud/saveNewSection.ts @@ -22,7 +22,7 @@ export const saveNewSection = async (props: IProps) => { } as any; await memory.update((t) => [ ...AddRecord(t, sec, user, memory), - ...ReplaceRelatedRecord(t, sec as RecordIdentity, 'plan', 'plan', plan.id), + ...ReplaceRelatedRecord(t, sec, 'plan', 'plan', plan.id), ]); return sec as SectionD; }; diff --git a/web/src/crud/updatePassageState.ts b/web/src/crud/updatePassageState.ts index dfd86b8d7..f4a82e255 100644 --- a/web/src/crud/updatePassageState.ts +++ b/web/src/crud/updatePassageState.ts @@ -36,8 +36,10 @@ export const AddPassageStateChangeToOps = ( comments: comment, }, } as PassageStateChange; - ops.push(...AddRecord(t, psc, userId, memory)); - ops.push(...ReplaceRelatedRecord(t, psc, 'passage', 'passage', passage)); + ops.push( + ...AddRecord(t, psc, userId, memory), + ...ReplaceRelatedRecord(t, psc, 'passage', 'passage', passage) + ); }; export const AddFlatPassage = ( @@ -50,8 +52,10 @@ export const AddFlatPassage = ( ): RecordOperation[] => { const t = new RecordTransformBuilder(); const ops: RecordOperation[] = []; - ops.push(...AddRecord(t, rec, userId, memory)); - ops.push(...ReplaceRelatedRecord(t, rec, 'section', 'section', section.id)); + ops.push( + ...AddRecord(t, rec, userId, memory), + ...ReplaceRelatedRecord(t, rec, 'section', 'section', section.id) + ); AddPassageStateChangeToOps( t, ops, @@ -73,9 +77,9 @@ export const UpdateRelatedPassageOps = ( ops: RecordOperation[] ) => { ops.push( - ...UpdateLastModifiedBy(t, { type: 'section', id: section }, userId) + ...UpdateLastModifiedBy(t, { type: 'section', id: section }, userId), + ...UpdateLastModifiedBy(t, { type: 'plan', id: plan }, userId) ); - ops.push(...UpdateLastModifiedBy(t, { type: 'plan', id: plan }, userId)); }; export const UpdateMediaStateOps = ( mediafile: string, @@ -87,14 +91,16 @@ export const UpdateMediaStateOps = ( memory: Memory, comment: string ): RecordOperation[] => { - const mediaRecId = recordRef('mediafile', mediafile); + // Identity ops only need the id. Attributes come from the cache when present. + const mediaRef = recordRef('mediafile', mediafile); + const mediaRec = findRecord(memory, 'mediafile', mediafile) as + MediaFileD | undefined; if (state) ops.push( - t.replaceAttribute(mediaRecId, 'transcriptionstate', state).toOperation() + t.replaceAttribute(mediaRef, 'transcriptionstate', state).toOperation() ); - const mediaRec = findRecord(memory, 'mediafile', mediafile) as MediaFileD; const isVernacular = !related(mediaRec, 'artifactType'); - ops.push(...UpdateLastModifiedBy(t, mediaRecId, userId)); + ops.push(...UpdateLastModifiedBy(t, mediaRef, userId)); AddPassageStateChangeToOps( t, ops, diff --git a/web/src/crud/useGraphicCreate.ts b/web/src/crud/useGraphicCreate.ts index ea37f79a6..88a9261be 100644 --- a/web/src/crud/useGraphicCreate.ts +++ b/web/src/crud/useGraphicCreate.ts @@ -36,7 +36,7 @@ export const useGraphicCreate = () => { ...AddRecord(t, graphicRec, user, memory), ...ReplaceRelatedRecord( t, - graphicRec as RecordIdentity, + graphicRec, 'organization', 'organization', organization @@ -46,7 +46,7 @@ export const useGraphicCreate = () => { ops.push( ...ReplaceRelatedRecord( t, - graphicRec as RecordIdentity, + graphicRec, 'mediafile', 'mediafile', mediafileId diff --git a/web/src/crud/useKeyTermSave.ts b/web/src/crud/useKeyTermSave.ts index 0d87f419b..099175409 100644 --- a/web/src/crud/useKeyTermSave.ts +++ b/web/src/crud/useKeyTermSave.ts @@ -2,7 +2,6 @@ import { RecordOperation, RecordKeyMap, RecordTransformBuilder, - RecordIdentity, } from '@orbit/records'; import { useDispatch } from 'react-redux'; import { useGlobal } from '../context/useGlobal'; @@ -71,7 +70,7 @@ export const useKeyTermSave = ({ cb }: IProps) => { ...AddRecord(t, termTargetRec, user, memory), ...ReplaceRelatedRecord( t, - termTargetRec as RecordIdentity, + termTargetRec, 'organization', 'organization', org diff --git a/web/src/crud/useMediaResCreate.ts b/web/src/crud/useMediaResCreate.ts index f9ffa05f5..2efb39292 100644 --- a/web/src/crud/useMediaResCreate.ts +++ b/web/src/crud/useMediaResCreate.ts @@ -5,7 +5,7 @@ import { UninitializedRecord, } from '@orbit/records'; import { Resource, MediaFile, MediaFileD } from '../model'; -import { AddRecord, recordRef, ReplaceRelatedRecord } from '../model/baseModel'; +import { AddRecord, ReplaceRelatedRecord } from '../model/baseModel'; import { ArtifactTypeSlug, useArtifactType } from '.'; import { getContentType } from '../utils/contentType'; @@ -37,38 +37,25 @@ export const useMediaResCreate = (passage: RecordIdentity, stepId: string) => { }, } as any as MediaFile; const t = new RecordTransformBuilder(); - // AddRecord assigns mediaRec.id, so build the identity after it. - // TODO cleanup in next PR - guard against wrong ordering in future usages const ops = [ ...AddRecord(t, mediaRec as unknown as UninitializedRecord, user, memory), - ]; - const mediaRecordIdentity = recordRef('mediafile', mediaRec.id); - ops.push( - ...ReplaceRelatedRecord(t, mediaRecordIdentity, 'plan', 'plan', plan), - ...ReplaceRelatedRecord( - t, - mediaRecordIdentity, - 'recordedbyUser', - 'user', - user - ) + ...ReplaceRelatedRecord(t, mediaRec, 'plan', 'plan', plan), + ...ReplaceRelatedRecord(t, mediaRec, 'recordedbyUser', 'user', user), // shared resources are not associated with a single passage // ...ReplaceRelatedRecord(t, mediaRec, 'passage', 'passage', passage.id), - ); - ops.push( ...ReplaceRelatedRecord( t, - mediaRecordIdentity, + mediaRec, 'artifactType', 'artifacttype', getTypeId(ArtifactTypeSlug.SharedResource) - ) - ); + ), + ]; if (artifactCategoryId) ops.push( ...ReplaceRelatedRecord( t, - mediaRecordIdentity, + mediaRec, 'artifactCategory', 'artifactcategory', artifactCategoryId @@ -78,7 +65,7 @@ export const useMediaResCreate = (passage: RecordIdentity, stepId: string) => { ops.push( ...ReplaceRelatedRecord( t, - mediaRecordIdentity, + mediaRec, 'orgWorkflowStep', 'orgworkflowstep', stepId diff --git a/web/src/crud/useSecResCreate.ts b/web/src/crud/useSecResCreate.ts index dd9e5b47f..a269cc7da 100644 --- a/web/src/crud/useSecResCreate.ts +++ b/web/src/crud/useSecResCreate.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { useGlobal } from '../context/useGlobal'; import { RecordIdentity, RecordTransformBuilder } from '@orbit/records'; import { SectionResource } from '../model'; -import { AddRecord, recordRef, ReplaceRelatedRecord } from '../model/baseModel'; +import { AddRecord, ReplaceRelatedRecord } from '../model/baseModel'; import { getTool, related, ToolSlug } from '.'; import { findRecords } from './tryFindRecord'; @@ -47,41 +47,33 @@ export const useSecResCreate = ( }, } as SectionResource; const t = new RecordTransformBuilder(); - // AddRecord assigns secRes.id, so build the identity after it. - const ops = [...AddRecord(t, secRes, user, memory)]; - const sectionresourceIdentity = recordRef('sectionresource', secRes.id); - ops.push( + const ops = [ + ...AddRecord(t, secRes, user, memory), ...ReplaceRelatedRecord( t, - sectionresourceIdentity, + secRes, 'section', 'section', secId || section.id ), ...ReplaceRelatedRecord( t, - sectionresourceIdentity, + secRes, 'mediafile', 'mediafile', mediafile.id ), ...ReplaceRelatedRecord( t, - sectionresourceIdentity, + secRes, 'orgWorkflowStep', 'orgworkflowstep', orgWorkflowStepId ?? internalization?.id - ) - ); + ), + ]; if (passId) { ops.push( - ...ReplaceRelatedRecord( - t, - sectionresourceIdentity, - 'passage', - 'passage', - passId - ) + ...ReplaceRelatedRecord(t, secRes, 'passage', 'passage', passId) ); } await memory.update(ops); diff --git a/web/src/crud/useSecResUserCreate.ts b/web/src/crud/useSecResUserCreate.ts index 0ea4afa90..c40617dac 100644 --- a/web/src/crud/useSecResUserCreate.ts +++ b/web/src/crud/useSecResUserCreate.ts @@ -1,7 +1,7 @@ import { useGlobal } from '../context/useGlobal'; import { SectionResource, SectionResourceUser } from '../model'; import { AddRecord, ReplaceRelatedRecord } from '../model/baseModel'; -import { RecordIdentity, RecordTransformBuilder } from '@orbit/records'; +import { RecordTransformBuilder } from '@orbit/records'; export const useSecResUserCreate = () => { const [memory] = useGlobal('memory'); @@ -17,18 +17,12 @@ export const useSecResUserCreate = () => { ...AddRecord(t, secResUser, user, memory), ...ReplaceRelatedRecord( t, - secResUser as RecordIdentity, + secResUser, 'sectionresource', 'sectionresource', resource.id ), - ...ReplaceRelatedRecord( - t, - secResUser as RecordIdentity, - 'user', - 'user', - user - ), + ...ReplaceRelatedRecord(t, secResUser, 'user', 'user', user), ]; await memory.update(ops); }; diff --git a/web/src/crud/useShaRefCreate.ts b/web/src/crud/useShaRefCreate.ts index 25ebde23e..d32246504 100644 --- a/web/src/crud/useShaRefCreate.ts +++ b/web/src/crud/useShaRefCreate.ts @@ -1,9 +1,5 @@ import { useGlobal } from '../context/useGlobal'; -import { - RecordIdentity, - RecordOperation, - RecordTransformBuilder, -} from '@orbit/records'; +import { RecordOperation, RecordTransformBuilder } from '@orbit/records'; import { SharedResourceReference, SharedResource } from '../model'; import { AddRecord, ReplaceRelatedRecord } from '../model/baseModel'; import { BookRef } from '../model'; @@ -58,7 +54,7 @@ export const useShaRefCreate = (sharedResource: SharedResource) => { ...AddRecord(t, shaRefRec, user, memory), ...ReplaceRelatedRecord( t, - shaRefRec as RecordIdentity, + shaRefRec, 'sharedResource', 'sharedresource', sharedResource.id diff --git a/web/src/crud/useSharedResCreate.ts b/web/src/crud/useSharedResCreate.ts index c44239eb0..90a202535 100644 --- a/web/src/crud/useSharedResCreate.ts +++ b/web/src/crud/useSharedResCreate.ts @@ -8,7 +8,6 @@ import { } from '../model'; import { AddRecord, - recordRef, ReplaceRelatedRecord, UpdateRecord, } from '../model/baseModel'; @@ -66,17 +65,16 @@ export const useSharedResCreate = ({ }, } as SharedResource; const t = new RecordTransformBuilder(); - // AddRecord assigns sharedRes.id, so build the identity after it. - const ops = [...AddRecord(t, sharedRes, user, memory)]; - const srIdentity = recordRef('sharedresource', sharedRes.id); - ops.push( - ...ReplaceRelatedRecord(t, srIdentity, 'passage', 'passage', passage.id) - ); + const ops = [ + ...AddRecord(t, sharedRes, user, memory), + ...ReplaceRelatedRecord(t, sharedRes, 'passage', 'passage', passage.id), + ]; + if (cluster) { ops.push( ...ReplaceRelatedRecord( t, - srIdentity, + sharedRes, 'cluster', 'organization', cluster.id @@ -87,7 +85,7 @@ export const useSharedResCreate = ({ ops.push( ...ReplaceRelatedRecord( t, - srIdentity, + sharedRes, 'artifactCategory', 'artifactcategory', category @@ -98,7 +96,7 @@ export const useSharedResCreate = ({ ops.push( ...ReplaceRelatedRecord( t, - srIdentity, + sharedRes, 'titleMediafile', 'mediafile', mediaId diff --git a/web/src/crud/useTeamCreate.ts b/web/src/crud/useTeamCreate.ts index 2046d2f24..4692988be 100644 --- a/web/src/crud/useTeamCreate.ts +++ b/web/src/crud/useTeamCreate.ts @@ -31,7 +31,6 @@ import { useTeamApiPull } from './useTeamApiPull'; import { shallowEqual, useSelector } from 'react-redux'; import { sharedSelector } from '../selector'; import { - RecordIdentity, RecordKeyMap, RecordOperation, RecordTransformBuilder, @@ -139,13 +138,7 @@ export const useTeamCreate = () => { const t = new RecordTransformBuilder(); const orgOps: RecordOperation[] = [ ...AddRecord(t, orgRec, user, memory), - ...ReplaceRelatedRecord( - t, - orgRec as RecordIdentity, - 'owner', - 'user', - user - ), + ...ReplaceRelatedRecord(t, orgRec, 'owner', 'user', user), ]; await memory.update(orgOps); // The all-users group's owner, the memberships, note categories and diff --git a/web/src/crud/useVProjectUpdate.ts b/web/src/crud/useVProjectUpdate.ts index 98ce08c70..293edb1b6 100644 --- a/web/src/crud/useVProjectUpdate.ts +++ b/web/src/crud/useVProjectUpdate.ts @@ -1,11 +1,7 @@ import { useGlobal } from '../context/useGlobal'; import { PlanD, ProjectD, VProjectD } from '../model'; import { related, useTypeId } from '.'; -import { - recordRef, - ReplaceRelatedRecord, - UpdateRecord, -} from '../model/baseModel'; +import { ReplaceRelatedRecord, UpdateRecord } from '../model/baseModel'; export const useVProjectUpdate = () => { const [memory] = useGlobal('memory'); @@ -35,33 +31,29 @@ export const useVProjectUpdate = () => { publishUser, publishGroup, } = vProject.attributes; - const projectIdentity = recordRef('project', id); + const projectRec = { + type: 'project', + id, + attributes: { + name, + description, + uilanguagebcp47, + language, + languageName, + isPublic, + spellCheck, + defaultFont, + defaultFontSize, + rtl, + defaultParams, + }, + } as ProjectD; await memory.update((t) => [ - ...UpdateRecord( - t, - { - type: 'project', - id, - attributes: { - name, - description, - uilanguagebcp47, - language, - languageName, - isPublic, - spellCheck, - defaultFont, - defaultFontSize, - rtl, - defaultParams, - }, - } as ProjectD, - user - ), + ...UpdateRecord(t, projectRec, user), // We use the plan type and not the project type ...ReplaceRelatedRecord( t, - projectIdentity, + projectRec, 'projecttype', 'projecttype', getTypeId( @@ -71,28 +63,28 @@ export const useVProjectUpdate = () => { ), ...ReplaceRelatedRecord( t, - projectIdentity, + projectRec, 'editsheetuser', 'user', sheetUser ), ...ReplaceRelatedRecord( t, - projectIdentity, + projectRec, 'editsheetgroup', 'group', sheetGroup ), ...ReplaceRelatedRecord( t, - projectIdentity, + projectRec, 'publishuser', 'user', publishUser ), ...ReplaceRelatedRecord( t, - projectIdentity, + projectRec, 'publishgroup', 'group', publishGroup @@ -100,26 +92,23 @@ export const useVProjectUpdate = () => { //we aren't allowing them to change group, owner or oraganization currently ]); + const planRec = { + type: 'plan', + id: vProject.id, + attributes: { + name, + flat, + tags: JSON.stringify(tags), + organizedBy, + sectionCount: vProject.attributes.sectionCount, + slug: vProject.attributes.slug, + }, + } as any as PlanD; await memory.update((t) => [ - ...UpdateRecord( - t, - { - type: 'plan', - id: vProject.id, - attributes: { - name, - flat, - tags: JSON.stringify(tags), - organizedBy, - sectionCount: vProject.attributes.sectionCount, - slug: vProject.attributes.slug, - }, - } as any as PlanD, - user - ), + ...UpdateRecord(t, planRec, user), ...ReplaceRelatedRecord( t, - recordRef('plan', vProject.id), + planRec, 'plantype', 'plantype', getTypeId(type, 'plan') diff --git a/web/src/store/upload/actions.pendingRetry.test.ts b/web/src/store/upload/actions.pendingRetry.test.ts index a1d0e1e5a..4b96236ed 100644 --- a/web/src/store/upload/actions.pendingRetry.test.ts +++ b/web/src/store/upload/actions.pendingRetry.test.ts @@ -619,7 +619,7 @@ describe('writeFileLocal disk write (TT-7348)', () => { it('awaits ipc.write when saving in-memory recording without path', async () => { let writeFinished = false; mockIpc.write.mockImplementation(async () => { - await new Promise((resolve) => setTimeout(resolve, 50)); + await Promise.resolve(); writeFinished = true; }); @@ -652,13 +652,17 @@ describe('writeFileLocal disk write (TT-7348)', () => { it('nextUpload fails gracefully and aborts cloud POST if local disk write rejects', async () => { mockIpc.write.mockRejectedValue(new Error('Disk write failed: ENOSPC')); const dispatch = jest.fn(); - const cb = jest.fn(); + let resolveCb: () => void = () => undefined; + const cbDone = new Promise((resolve) => { + resolveCb = resolve; + }); + const cb = jest.fn(() => resolveCb()); const file = new File([new Uint8Array([1, 2, 3])], 'recording.wav', { type: 'audio/wav', }); const action = actionsModule.nextUpload({ - record: baseRecord, + record: { ...baseRecord }, files: [file], n: 0, token: 'token', @@ -668,7 +672,7 @@ describe('writeFileLocal disk write (TT-7348)', () => { cb, }); action(dispatch); - await new Promise((resolve) => setTimeout(resolve, 20)); + await cbDone; expect(mockIpc.write).toHaveBeenCalled(); expect(dispatch).toHaveBeenCalledWith( diff --git a/web/src/store/upload/actions.tsx b/web/src/store/upload/actions.tsx index c17c85b25..4f73b1b2e 100644 --- a/web/src/store/upload/actions.tsx +++ b/web/src/store/upload/actions.tsx @@ -47,7 +47,8 @@ import { updatePendingMediaUpload, } from './pendingMediaUploads'; -const ipc = window?.api as MainAPI; +// Call-time read so tests can stub window.api after import (and late Electron bind). +const ipc = () => window?.api as MainAPI | undefined; export interface WriteFileLocalResult { relativeMediaPath: string; @@ -86,16 +87,16 @@ export const writeFileLocal = async ( writeName = local.localname; if (!remoteName && filePath === '') writeName += path.sep + file.name; await createPathFolder(writeName); - while (await ipc?.exists(writeName)) { + while (await ipc()?.exists(writeName)) { writeName = nextVersion(writeName); } if (filePath) { - await ipc?.copyFile(filePath, writeName); + await ipc()?.copyFile(filePath, writeName); } else { // Modern replacement for deprecated readAsBinaryString const buffer = await file.arrayBuffer(); const bytes = new Uint8Array(buffer); - await ipc?.write(writeName, bytes, { + await ipc()?.write(writeName, bytes, { encoding: 'binary', flag: 'wx', // write - fail if file exists }); @@ -474,14 +475,15 @@ export const nextUpload = file: File ): Promise<{ absolutePath: string; fileForUpload: File }> => { const fromDisk = (file as File & { path?: string }).path; - if (fromDisk && ipc && (await ipc.exists(fromDisk))) { + const api = ipc(); + if (fromDisk && api && (await api.exists(fromDisk))) { return { absolutePath: fromDisk, fileForUpload: file }; } - if (!ipc?.read || !ipc?.write) { + if (!api?.read || !api?.write) { return { absolutePath: fromDisk || '', fileForUpload: file }; } const w = await writeFileLocal(file); - const buf = await ipc.read(w.absolutePath); + const buf = await api.read(w.absolutePath); if (!(buf instanceof Uint8Array)) { throw new Error('Could not read staged media file'); } diff --git a/web/src/store/upload/restoreAfterPendingUpload.ts b/web/src/store/upload/restoreAfterPendingUpload.ts index a57aef45d..746593293 100644 --- a/web/src/store/upload/restoreAfterPendingUpload.ts +++ b/web/src/store/upload/restoreAfterPendingUpload.ts @@ -3,14 +3,12 @@ import { RecordKeyMap, RecordOperation, RecordTransformBuilder, - UninitializedRecord, } from '@orbit/records'; import { findRecords, findRecord } from '../../crud/tryFindRecord'; import { related } from '../../crud/related'; import { remoteIdGuid } from '../../crud/remoteId'; import { AddRecord, - recordRef, ReplaceRelatedRecord, UpdateRelatedRecord, UpdateLastModifiedBy, @@ -140,28 +138,18 @@ async function restoreIntellectualProperty({ rightsHolder: restore.rightsHolder, notes: restore.notes ?? '{}', }, - } as IntellectualProperty & UninitializedRecord; - await memory.update((t) => { - const added = AddRecord(t, ip, user, memory); - const ipIdentity = recordRef('intellectualproperty', ip.id); - return [ - ...added, - ...ReplaceRelatedRecord( - t, - ipIdentity, - 'releaseMediafile', - 'mediafile', - mediaId - ), - ...ReplaceRelatedRecord( - t, - ipIdentity, - 'organization', - 'organization', - restore.organizationId - ), - ]; - }); + } as IntellectualProperty; + await memory.update((t) => [ + ...AddRecord(t, ip, user, memory), + ...ReplaceRelatedRecord(t, ip, 'releaseMediafile', 'mediafile', mediaId), + ...ReplaceRelatedRecord( + t, + ip, + 'organization', + 'organization', + restore.organizationId + ), + ]); } async function restoreComment({ @@ -270,7 +258,6 @@ async function restoreSectionResource({ memory: Memory; user: string; }): Promise { - const mediaRecId = recordRef('mediafile', mediaId); const mediaRec = findRecord(memory, 'mediafile', mediaId) as MediaFileD | undefined; @@ -293,7 +280,7 @@ async function restoreSectionResource({ sequenceNum, description: restore.description ?? '', }, - } as SectionResource & UninitializedRecord; + } as SectionResource; // One Orbit transform: media metadata + sectionresource + links succeed or // fail together (deterministic optimistic updates — TT-7363 / PR #565). @@ -312,22 +299,22 @@ async function restoreSectionResource({ ) ); } - if (restore.artifactCategoryId) { + if (restore.artifactCategoryId && mediaRec) { ops.push( ...ReplaceRelatedRecord( t, - mediaRecId, + mediaRec, 'artifactCategory', 'artifactcategory', restore.artifactCategoryId ) ); } - if (restore.passageId) { + if (restore.passageId && mediaRec) { ops.push( ...ReplaceRelatedRecord( t, - mediaRecId, + mediaRec, 'passage', 'passage', restore.passageId @@ -335,26 +322,13 @@ async function restoreSectionResource({ ); } - ops.push(...AddRecord(t, secRes, user, memory)); - const secResIdentity = recordRef('sectionresource', secRes.id); ops.push( + ...AddRecord(t, secRes, user, memory), + ...ReplaceRelatedRecord(t, secRes, 'section', 'section', restore.sectionId), + ...ReplaceRelatedRecord(t, secRes, 'mediafile', 'mediafile', mediaId), ...ReplaceRelatedRecord( t, - secResIdentity, - 'section', - 'section', - restore.sectionId - ), - ...ReplaceRelatedRecord( - t, - secResIdentity, - 'mediafile', - 'mediafile', - mediaId - ), - ...ReplaceRelatedRecord( - t, - secResIdentity, + secRes, 'orgWorkflowStep', 'orgworkflowstep', restore.orgWorkflowStepId @@ -364,7 +338,7 @@ async function restoreSectionResource({ ops.push( ...ReplaceRelatedRecord( t, - secResIdentity, + secRes, 'passage', 'passage', restore.passageId @@ -437,13 +411,13 @@ async function restoreOrgKeytermTarget({ termIndex: restore.termIndex, target: restore.target, }, - } as OrgKeytermTarget & UninitializedRecord; + } as OrgKeytermTarget; const ops: RecordOperation[] = [ ...AddRecord(t, termTargetRec, user, memory), ...ReplaceRelatedRecord( t, - recordRef('orgkeytermtarget', termTargetRec.id), + termTargetRec, 'organization', 'organization', restore.organizationId