Skip to content

Commit 1f0a7a1

Browse files
Fix/file guid (#264)
* feat(newbranch): test push * fix(file): add quid for file * fix(files): add file link component, refactoring * fix(files): update imports * fix(files): refactoring files * fix(files): refactoring files, fixed addons * Update src/app/shared/components/files-tree/files-tree.component.ts Co-authored-by: nsemets <nsemets@exoft.net> --------- Co-authored-by: nsemets <nsemets@exoft.net>
1 parent 9f549c2 commit 1f0a7a1

File tree

139 files changed

+1222
-1319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1222
-1319
lines changed

src/app/app.routes.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@ export const routes: Routes = [
172172
import('./core/components/request-access/request-access.component').then((mod) => mod.RequestAccessComponent),
173173
data: { skipBreadcrumbs: true },
174174
},
175+
{
176+
path: 'files/:fileGuid',
177+
loadComponent: () =>
178+
import('@osf/features/files/pages/file-detail/file-detail.component').then((c) => c.FileDetailComponent),
179+
},
175180
{
176181
path: '**',
177182
loadComponent: () =>

src/app/core/constants/ngxs-states.constant.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ProviderState } from '@core/store/provider';
22
import { UserState } from '@core/store/user';
3+
import { FilesState } from '@osf/features/files/store';
34
import { MeetingsState } from '@osf/features/meetings/store';
45
import { ProjectMetadataState } from '@osf/features/project/metadata/store';
56
import { ProjectOverviewState } from '@osf/features/project/overview/store';
@@ -28,4 +29,5 @@ export const STATES = [
2829
ProjectMetadataState,
2930
LicensesState,
3031
RegionsState,
32+
FilesState,
3133
];
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="flex flex-column gap-4">
33
<osf-text-input
44
[control]="folderForm.controls['name']"
5-
[label]="'project.files.dialogs.createFolder.folderName'"
6-
[placeholder]="'project.files.dialogs.createFolder.folderNamePlaceholder'"
5+
[label]="'files.dialogs.createFolder.folderName'"
6+
[placeholder]="'files.dialogs.createFolder.folderNamePlaceholder'"
77
[maxLength]="nameLimit"
88
[minLength]="nameMinLength"
99
>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<form [formGroup]="fileMetadataForm" (ngSubmit)="setFileMetadata()" class="flex flex-column gap-3">
22
<div class="flex flex-column gap-1">
3-
<p>{{ 'project.files.detail.fileMetadata.fields.title' | translate }}</p>
3+
<p>{{ 'files.detail.fileMetadata.fields.title' | translate }}</p>
44
<input pInputText id="title" [formControl]="titleControl" />
55
</div>
66

77
<div class="flex flex-column gap-1">
8-
<p>{{ 'project.files.detail.fileMetadata.fields.description' | translate }}</p>
8+
<p>{{ 'files.detail.fileMetadata.fields.description' | translate }}</p>
99
<input pInputText id="description" [formControl]="descriptionControl" />
1010
</div>
1111

1212
<div class="flex flex-column gap-1">
13-
<p>{{ 'project.files.detail.fileMetadata.fields.resourceType' | translate }}</p>
13+
<p>{{ 'files.detail.fileMetadata.fields.resourceType' | translate }}</p>
1414
<p-select
1515
class="w-full"
1616
[options]="resourceTypes"
@@ -23,7 +23,7 @@
2323
</div>
2424

2525
<div class="flex flex-column gap-1">
26-
<p>{{ 'project.files.detail.fileMetadata.fields.resourceLanguage' | translate }}</p>
26+
<p>{{ 'files.detail.fileMetadata.fields.resourceLanguage' | translate }}</p>
2727
<p-select
2828
class="w-full"
2929
[options]="languages"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="p-4 flex flex-column gap-2">
2-
<h2>{{ 'project.files.detail.keywords.title' | translate }}</h2>
2+
<h2>{{ 'files.detail.keywords.title' | translate }}</h2>
33

44
<div class="flex align-items-center gap-2">
55
<input pInputText class="flex-1" [formControl]="keywordControl" />

0 commit comments

Comments
 (0)