Skip to content

Commit 2f5f5ce

Browse files
committed
fix(files): updated files and file details
1 parent ea8bc54 commit 2f5f5ce

21 files changed

Lines changed: 469 additions & 353 deletions

src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
1111
import { languageCodes } from '@osf/shared/constants/language.const';
1212
import { resourceTypes } from '@osf/shared/constants/resource-types.const';
1313

14-
import { OsfFileCustomMetadata, PatchFileMetadata } from '../../models';
14+
import { OsfFileCustomMetadata } from '../../models/file-custom-metadata.model';
15+
import { PatchFileMetadata } from '../../models/patch-file-metadata.model';
1516

1617
@Component({
1718
selector: 'osf-edit-file-metadata-dialog',

src/app/features/files/components/file-metadata/file-metadata.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-h
1818
import { LanguageCodeModel } from '@shared/models/language-code.model';
1919

2020
import { FileMetadataFields } from '../../constants';
21-
import { PatchFileMetadata } from '../../models';
21+
import { PatchFileMetadata } from '../../models/patch-file-metadata.model';
2222
import { FilesSelectors, SetFileMetadata } from '../../store';
2323
import { EditFileMetadataDialogComponent } from '../edit-file-metadata-dialog/edit-file-metadata-dialog.component';
2424

src/app/features/files/components/file-revisions/file-revisions.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CopyButtonComponent } from '@osf/shared/components/copy-button/copy-but
1111
import { InfoIconComponent } from '@osf/shared/components/info-icon/info-icon.component';
1212
import { StopPropagationDirective } from '@osf/shared/directives/stop-propagation.directive';
1313

14-
import { OsfFileRevision } from '../../models';
14+
import { OsfFileRevision } from '../../models/file-revisions.model';
1515

1616
@Component({
1717
selector: 'osf-file-revisions',

src/app/features/files/constants/file-browser-info.constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ResourceType } from '@osf/shared/enums/resource-type.enum';
22

3-
import { FileInfoItem } from '../models';
3+
import { FileInfoItem } from '../models/info-item.model';
44

55
export const FILE_BROWSER_INFO_ITEMS: FileInfoItem[] = [
66
{

src/app/features/files/constants/file-metadata-fields.constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MetadataField } from '../models';
1+
import { MetadataField } from '../models/files-metadata-fields.model';
22

33
export const FileMetadataFields: MetadataField[] = [
44
{ key: 'title', label: 'common.labels.title' },

src/app/features/files/mappers/file-custom-metadata.mapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { ApiData } from '@osf/shared/models/common/json-api.model';
22
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
33

4-
import { FileCustomMetadata, OsfFileCustomMetadata } from '../models';
4+
import { OsfFileCustomMetadata } from '../models/file-custom-metadata.model';
5+
import { FileCustomMetadata } from '../models/get-file-metadata-response.model';
56

67
export function MapFileCustomMetadata(data: ApiData<FileCustomMetadata, null, null, null>): OsfFileCustomMetadata {
78
return {

src/app/features/files/mappers/file-revision.mapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ApiData } from '@osf/shared/models/common/json-api.model';
22

3-
import { FileRevisionJsonApi, OsfFileRevision } from '../models';
3+
import { OsfFileRevision } from '../models/file-revisions.model';
4+
import { FileRevisionJsonApi } from '../models/get-file-revisions-response.model';
45

56
export function MapFileRevision(data: ApiData<FileRevisionJsonApi, null, null, null>[]): OsfFileRevision[] {
67
const revision = data.map((revision) => ({
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { Observable } from 'rxjs';
2+
3+
import { FileModel } from '@shared/models/files/file.model';
4+
import { FileFolderModel } from '@shared/models/files/file-folder.model';
5+
6+
export interface DeleteSelectedOptions {
7+
files: FileModel[];
8+
deleteEntry: (link: string) => Observable<unknown>;
9+
onSuccess: () => void;
10+
}
11+
12+
export interface MoveFilesOptions {
13+
files: FileModel[];
14+
action: 'move' | 'copy';
15+
resourceId: string;
16+
storageProvider: string;
17+
foldersStack: FileFolderModel[];
18+
initialFolder: FileFolderModel | null | undefined;
19+
}
20+
21+
export interface CreateFolderOptions {
22+
newFolderLink: string;
23+
createFolder: (newFolderLink: string, folderName: string) => Observable<unknown>;
24+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { FileLinkModel } from '@osf/shared/models/files/file-link.model';
2+
3+
export interface UploadFilesOptions {
4+
files: File | File[];
5+
uploadLink: string;
6+
allowRevisions: boolean;
7+
onStart: (fileName: string) => void;
8+
onProgress: (progress: number) => void;
9+
onComplete: () => void;
10+
}
11+
12+
export interface UploadState {
13+
completedUploads: number;
14+
totalFiles: number;
15+
conflictFiles: FileLinkModel[];
16+
}

src/app/features/files/models/index.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)