rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: http service (#2233)

Browse Source
This commit is contained in:
Mo
2023-02-28 20:43:25 -06:00
committed by GitHub
parent 6e7618b258
commit e7f1d35341
142 changed files with 1116 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/services/src/Domain/Files/FileService.spec.ts
View File

@@ -154,7 +154,7 @@ describe('fileService', () => {
const alertMock = (alertService.confirm = jest.fn().mockReturnValue(true))
const deleteItemMock = (itemManager.setItemToBeDeleted = jest.fn())
apiService.deleteFile = jest.fn().mockReturnValue({ error: true })
apiService.deleteFile = jest.fn().mockReturnValue({ data: { error: true } })
await fileService.deleteFile(file)

8
packages/services/src/Domain/Files/FileService.ts
View File

@@ -1,4 +1,4 @@
import { ClientDisplayableError } from '@standardnotes/responses'
import { ClientDisplayableError, isErrorResponse } from '@standardnotes/responses'
import { ContentType } from '@standardnotes/common'
import {
FileItem,
@@ -101,7 +101,7 @@ export class FileService extends AbstractService implements FilesClientInterface
const uploadSessionStarted = await this.api.startUploadSession(tokenResult)
if (!uploadSessionStarted.uploadId) {
if (isErrorResponse(uploadSessionStarted) || !uploadSessionStarted.data.uploadId) {
return new ClientDisplayableError('Could not start upload session')
}
@@ -243,7 +243,7 @@ export class FileService extends AbstractService implements FilesClientInterface
const result = await this.api.deleteFile(tokenResult)
if (result.error) {
if (result.data?.error) {
const deleteAnyway = await this.alertService.confirm(
spaceSeparatedStrings(
'This file could not be deleted from the server, possibly because you are attempting to delete a file item',
@@ -257,7 +257,7 @@ export class FileService extends AbstractService implements FilesClientInterface
)
if (!deleteAnyway) {
return ClientDisplayableError.FromError(result.error)
return ClientDisplayableError.FromError(result.data?.error)
}
}