Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions web/src/__tests__/ProjectResourceConfigure.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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
Expand All @@ -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();
Expand Down
52 changes: 17 additions & 35 deletions web/src/components/ProvideRights.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Organization,
} from '../model';
import { SxProps } from '@mui/material/styles';
import {
import React, {
useContext,
useEffect,
useMemo,
Expand Down Expand Up @@ -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';

Expand All @@ -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<IProps>) {
const { speaker, recordType, onRights, team, planId, aiip } = props;
const [user] = useGlobal('user');
const [organizationId] = useGlobal('organization');
Expand All @@ -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<string>('');
const [, setSaving] = useState(false);
const [, setSaving] = useState(false); // NOSONAR typescript:S6754
const [paperWidth, setPaperWidth] = useState<number>(0);
const paperRef = useRef<HTMLDivElement>(null);
const getGlobal = useGetGlobal();
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -271,7 +253,7 @@ export function ProvideRights(props: IProps) {
};

const afterUpload = async (mediaRemoteIds?: string[]) => {
afterUploadCb(
await afterUploadCb(
mediaRemoteIds && mediaRemoteIds.length > 0
? mediaRemoteIds[0]
: undefined
Expand All @@ -297,7 +279,7 @@ export function ProvideRights(props: IProps) {
};

const handleLater = () => {
onRights && onRights(true);
onRights?.(true);
};

return (
Expand Down
11 changes: 2 additions & 9 deletions web/src/crud/offlineProjectCreate.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Project, OfflineProject, OfflineProjectD } from '../model';
import Memory from '@orbit/memory';
import {
RecordIdentity,
RecordOperation,
RecordTransformBuilder,
StandardRecordNormalizer,
Expand Down Expand Up @@ -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)
);
};
2 changes: 1 addition & 1 deletion web/src/crud/saveNewSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
26 changes: 16 additions & 10 deletions web/src/crud/updatePassageState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions web/src/crud/useGraphicCreate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const useGraphicCreate = () => {
...AddRecord(t, graphicRec, user, memory),
...ReplaceRelatedRecord(
t,
graphicRec as RecordIdentity,
graphicRec,
'organization',
'organization',
organization
Expand All @@ -46,7 +46,7 @@ export const useGraphicCreate = () => {
ops.push(
...ReplaceRelatedRecord(
t,
graphicRec as RecordIdentity,
graphicRec,
'mediafile',
'mediafile',
mediafileId
Expand Down
3 changes: 1 addition & 2 deletions web/src/crud/useKeyTermSave.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
RecordOperation,
RecordKeyMap,
RecordTransformBuilder,
RecordIdentity,
} from '@orbit/records';
import { useDispatch } from 'react-redux';
import { useGlobal } from '../context/useGlobal';
Expand Down Expand Up @@ -71,7 +70,7 @@ export const useKeyTermSave = ({ cb }: IProps) => {
...AddRecord(t, termTargetRec, user, memory),
...ReplaceRelatedRecord(
t,
termTargetRec as RecordIdentity,
termTargetRec,
'organization',
'organization',
org
Expand Down
Loading
Loading