diff --git a/e2e/cypress/support/dataCyType.d.ts b/e2e/cypress/support/dataCyType.d.ts index ae672a0d16..2599f9241f 100644 --- a/e2e/cypress/support/dataCyType.d.ts +++ b/e2e/cypress/support/dataCyType.d.ts @@ -41,9 +41,8 @@ declare namespace DataCy { "batch-operation-dialog-end-status" | "batch-operation-dialog-minimize" | "batch-operation-dialog-ok" | - "batch-operations-delete-button" | "batch-operations-select" | - "batch-operations-translate-button" | + "batch-operations-submit-button" | "batch-select-item" | "billing-actual-extra-credits" | "billing-actual-period" | diff --git a/webapp/src/views/projects/translations/BatchOperations/OperationAddTags.tsx b/webapp/src/views/projects/translations/BatchOperations/OperationAddTags.tsx index affd2c1b71..d7f9e767cb 100644 --- a/webapp/src/views/projects/translations/BatchOperations/OperationAddTags.tsx +++ b/webapp/src/views/projects/translations/BatchOperations/OperationAddTags.tsx @@ -43,13 +43,13 @@ export const OperationAddTags = ({ disabled, onStart }: Props) => { setTags((tags) => tags.filter((t) => t !== tag)); } - // const batchTranslate = useApiMutation({ + // const batchLoadable = useApiMutation({ // url: '/v2/projects/{projectId}/start-batch-job/translate', // method: 'post', // }); // function handleSubmit() { - // batchTranslate.mutate( + // batchLoadable.mutate( // { // path: { projectId: project.id }, // content: { @@ -85,8 +85,8 @@ export const OperationAddTags = ({ disabled, onStart }: Props) => { /> { const [namespace, setNamespace] = useState(); - // const batchTranslate = useApiMutation({ + // const batchLoadable = useApiMutation({ // url: '/v2/projects/{projectId}/start-batch-job/translate', // method: 'post', // }); // function handleSubmit() { - // batchTranslate.mutate( + // batchLoadable.mutate( // { // path: { projectId: project.id }, // content: { @@ -53,8 +53,8 @@ export const OperationChangeNamespace = ({ disabled, onStart }: Props) => { SearchSelectProps={{ SelectProps: { sx: { minWidth: 200 } } }} /> { const { t } = useTranslate(); const selection = useTranslationsSelector((c) => c.selection); const project = useProject(); - const batchDelete = useApiMutation({ + const batchLoadable = useApiMutation({ url: '/v2/projects/{projectId}/start-batch-job/delete-keys', method: 'post', }); @@ -26,7 +26,7 @@ export const OperationDelete = ({ disabled, onStart }: Props) => { count: String(selection.length), }), onConfirm() { - batchDelete.mutate( + batchLoadable.mutate( { path: { projectId: project.id }, content: { @@ -47,9 +47,9 @@ export const OperationDelete = ({ disabled, onStart }: Props) => { return ( { - // const project = useProject(); + const project = useProject(); const allLanguages = useTranslationsSelector((c) => c.languages) || []; const selectedGloballyLanguages = useTranslationsSelector( (c) => c.selectedLanguages ); - // const selection = useTranslationsSelector((c) => c.selection); + const selection = useTranslationsSelector((c) => c.selection); const baseLang = allLanguages.find((l) => l.base); @@ -25,34 +27,32 @@ export const OperationMarkAsReviewed = ({ disabled, onStart }: Props) => { selectedGloballyLanguages?.filter((tag) => tag !== baseLang?.tag) ); - // const batchTranslate = useApiMutation({ - // url: '/v2/projects/{projectId}/start-batch-job/translate', - // method: 'post', - // }); + const batchLoadable = useApiMutation({ + url: '/v2/projects/{projectId}/start-batch-job/set-translation-state', + method: 'post', + }); - // function handleSubmit() { - // batchTranslate.mutate( - // { - // path: { projectId: project.id }, - // content: { - // 'application/json': { - // keyIds: selection, - // targetLanguageIds: allLanguages - // ?.filter((l) => selectedLangs?.includes(l.tag)) - // .map((l) => l.id), - // useMachineTranslation: true, - // useTranslationMemory: false, - // service: undefined, - // }, - // }, - // }, - // { - // onSuccess(data) { - // onStart(data); - // }, - // } - // ); - // } + function handleSubmit() { + batchLoadable.mutate( + { + path: { projectId: project.id }, + content: { + 'application/json': { + keyIds: selection, + languageIds: allLanguages + ?.filter((l) => selectedLangs?.includes(l.tag)) + .map((l) => l.id), + state: 'REVIEWED', + }, + }, + }, + { + onSuccess(data) { + onStart(data); + }, + } + ); + } return ( @@ -64,11 +64,11 @@ export const OperationMarkAsReviewed = ({ disabled, onStart }: Props) => { context="batch-operations" /> diff --git a/webapp/src/views/projects/translations/BatchOperations/OperationMarkAsTranslated.tsx b/webapp/src/views/projects/translations/BatchOperations/OperationMarkAsTranslated.tsx index e25ce2ed25..59f67b254a 100644 --- a/webapp/src/views/projects/translations/BatchOperations/OperationMarkAsTranslated.tsx +++ b/webapp/src/views/projects/translations/BatchOperations/OperationMarkAsTranslated.tsx @@ -24,13 +24,13 @@ export const OperationMarkAsTranslated = ({ disabled, onStart }: Props) => { selectedGloballyLanguages?.filter((tag) => tag !== baseLang?.tag) ); - // const batchTranslate = useApiMutation({ + // const batchLoadable = useApiMutation({ // url: '/v2/projects/{projectId}/start-batch-job/translate', // method: 'post', // }); // function handleSubmit() { - // batchTranslate.mutate( + // batchLoadable.mutate( // { // path: { projectId: project.id }, // content: { @@ -63,8 +63,8 @@ export const OperationMarkAsTranslated = ({ disabled, onStart }: Props) => { context="batch-operations" /> { /> { selectedGloballyLanguages?.filter((tag) => tag !== baseLang?.tag) ); - const batchTranslate = useApiMutation({ + const batchLoadable = useApiMutation({ url: '/v2/projects/{projectId}/start-batch-job/translate', method: 'post', }); function handleSubmit() { - batchTranslate.mutate( + batchLoadable.mutate( { path: { projectId: project.id }, content: { @@ -66,8 +66,8 @@ export const OperationTranslate = ({ disabled, onStart }: Props) => { context="batch-operations" />