Skip to content
Merged
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
229 changes: 0 additions & 229 deletions src/app/auth/views/RecoverView/RecoverView.tsx

This file was deleted.

27 changes: 8 additions & 19 deletions src/app/drive/services/downloadManager.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@ import { binaryStreamToBlob } from 'app/core/services/stream.service';
import { downloadFile, NetworkCredentials } from 'app/network/download';
import localStorageService from 'app/core/services/local-storage.service';
import date from 'app/core/services/date.service';
import { Iterator } from 'app/core/collections';
import { SharedFiles, SharedFolders } from '@internxt/sdk/dist/drive/share/types';
import { WorkspaceCredentialsDetails, WorkspaceData } from '@internxt/sdk/dist/workspaces';
import { ConnectionLostError } from './../../network/requests';
import { ErrorMessages } from 'app/core/constants';
import {
FolderIterator,
FileIterator,
SharedFolderIterator,
SharedFileIterator,
isLostConnectionError as isLostConnectionErrorUtil,
} from '../types/download-types';

export type DownloadCredentials = {
credentials: NetworkCredentials;
Expand All @@ -46,7 +51,6 @@ export type DownloadItem = {
};

export type DownloadItemType = DriveItemData | AdvancedSharedItem;
export type DownloadFilesType = DriveFileData[] & SharedFiles[];

export type DownloadTask = {
items: DownloadItemType[];
Expand All @@ -63,12 +67,6 @@ export type DownloadTask = {
failedItems: DownloadItemType[];
};

export type FolderIterator = (directoryUUID: string, workspaceId?: string) => Iterator<DriveFolderData>;
export type FileIterator = (directoryUUID: string, workspaceId?: string) => Iterator<DriveFileData>;

export type SharedFolderIterator = (directoryId: string, resourcesToken?: string) => Iterator<SharedFolders>;
export type SharedFileIterator = (directoryId: string, resourcesToken?: string) => Iterator<SharedFiles>;

/**
* DownloadManagerService handles file and folder downloads with queue management
*
Expand Down Expand Up @@ -487,16 +485,7 @@ export class DownloadManagerService {
};
}

export const isLostConnectionError = (error: unknown) => {
const castedError = errorService.castError(error);
const isLostConnectionError =
error instanceof ConnectionLostError ||
[ErrorMessages.ConnectionLost.toLowerCase(), ErrorMessages.NetworkError.toLowerCase()].includes(
castedError.message.toLowerCase() as ErrorMessages,
);

return isLostConnectionError;
};
export const isLostConnectionError = isLostConnectionErrorUtil;

export const areItemArraysEqual = (firstArray: DownloadItemType[], secondArray: DownloadItemType[]) => {
if (firstArray.length !== secondArray.length) return false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/drive/services/file.service/uploadFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { AppView } from '../../../core/types';
import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
import { getEnvironmentConfig } from '../network.service';
import { generateThumbnailFromFile } from '../thumbnail.service';
import { OwnerUserAuthenticationData } from '../../../network/UploadManager';
import { OwnerUserAuthenticationData } from '../../../network/types';
import { FileToUpload } from './types';

export interface FileUploadOptions {
Expand Down
2 changes: 1 addition & 1 deletion src/app/drive/services/folder.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
SharedFileIterator,
SharedFolderIterator,
isLostConnectionError,
} from '../../drive/services/downloadManager.service';
} from '../types/download-types';
import { DriveItemBlobData } from '../../database/services/database.service';
import dateService from '../../core/services/date.service';
import { SharedFiles } from '@internxt/sdk/dist/drive/share/types';
Expand Down
25 changes: 25 additions & 0 deletions src/app/drive/types/download-types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Iterator } from 'app/core/collections';
import { DriveFileData, DriveFolderData } from '.';
import { SharedFiles, SharedFolders } from '@internxt/sdk/dist/drive/share/types';
import errorService from 'app/core/services/error.service';
import { ConnectionLostError } from '../../network/requests';
import { ErrorMessages } from 'app/core/constants';

export type DownloadFilesType = DriveFileData[] & SharedFiles[];

export type FolderIterator = (directoryUUID: string, workspaceId?: string) => Iterator<DriveFolderData>;
export type FileIterator = (directoryUUID: string, workspaceId?: string) => Iterator<DriveFileData>;

export type SharedFolderIterator = (directoryId: string, resourcesToken?: string) => Iterator<SharedFolders>;
export type SharedFileIterator = (directoryId: string, resourcesToken?: string) => Iterator<SharedFiles>;

export const isLostConnectionError = (error: unknown) => {
const castedError = errorService.castError(error);
const isLostConnectionError =
error instanceof ConnectionLostError ||
[ErrorMessages.ConnectionLost.toLowerCase(), ErrorMessages.NetworkError.toLowerCase()].includes(
castedError.message.toLowerCase() as ErrorMessages,
);

return isLostConnectionError;
};
Loading
Loading