diff --git a/src/redux/uploads/sagas.ts b/src/redux/uploads/sagas.ts index db67f679..790e011f 100644 --- a/src/redux/uploads/sagas.ts +++ b/src/redux/uploads/sagas.ts @@ -5,7 +5,7 @@ import { reqWrapper } from '../auth/sagas'; import { createUploader, uploadGetThumb, fakeUploader } from '~/utils/uploader'; import { HTTP_RESPONSES } from '~/utils/api'; import { VALIDATORS } from '~/utils/validators'; -import { UUID, IFileWithUUID } from '../types'; +import { UUID, IFileWithUUID, IResultWithStatus, IFile } from '../types'; function* uploadCall({ temp_id, onProgress, file }) { return yield call(reqWrapper, fakeUploader, { file: { url: 'some', error: 'cant do this boss' }, onProgress, mustSucceed: true }); @@ -68,7 +68,7 @@ function* uploadFile({ file, temp_id }: IFileWithUUID) { return yield put(uploadDropStatus(temp_id)); } - const { data, error } = result; + const { data, error }: IResultWithStatus = result; if (error) { return yield put( @@ -76,13 +76,15 @@ function* uploadFile({ file, temp_id }: IFileWithUUID) { ); } + console.log('upload', data); + yield put( uploadSetStatus(temp_id, { is_uploading: false, error: null, - uuid: data.uuid, - url: data.url, - thumbnail_url: data.url, + uuid: data.id, + url: data.full_path, + thumbnail_url: data.full_path, }) ); diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts index c38224a1..eee62644 100644 --- a/src/utils/uploader.ts +++ b/src/utils/uploader.ts @@ -3,6 +3,7 @@ import { eventChannel, END, EventChannel } from 'redux-saga'; import { VALIDATORS } from '~/utils/validators'; import { IResultWithStatus, IFile } from '~/redux/types'; import { HTTP_RESPONSES } from './api'; +import { EMPTY_FILE } from '~/redux/uploads/constants'; export const IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg']; @@ -60,7 +61,7 @@ export const fakeUploader = ({ setTimeout(() => { onProgress(2, 2); if (mustSucceed) { - resolve({ status: HTTP_RESPONSES.CREATED, data: { id: uuid() } }); + resolve({ status: HTTP_RESPONSES.CREATED, data: { ...EMPTY_FILE, id: uuid() } }); } else { reject({ response: { statusText: error } }); }