Skip to content

Commit 05d833c

Browse files
committed
fix(duplicates): updated duplicates and fixed imports
1 parent 54671d3 commit 05d833c

File tree

30 files changed

+157
-157
lines changed

30 files changed

+157
-157
lines changed

src/app/app.routes.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ export const routes: Routes = [
7474
{
7575
path: 'my-registrations',
7676
canActivate: [authGuard],
77-
loadComponent: () => import('@osf/features/registries/pages').then((c) => c.MyRegistrationsComponent),
77+
loadComponent: () =>
78+
import('@osf/features/registries/pages/my-registrations/my-registrations.component').then(
79+
(c) => c.MyRegistrationsComponent
80+
),
7881
providers: [
7982
provideStates([RegistriesState]),
8083
ProvidersHandlers,

src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { FileMenuType } from '@shared/enums/file-menu-type.enum';
1919
import { FileModel } from '@shared/models/files/file.model';
2020

2121
@Component({
22-
selector: 'osf-move-file-dialog',
22+
selector: 'osf-confirm-move-file-dialog',
2323
imports: [Button, TranslatePipe],
2424
templateUrl: './confirm-move-file-dialog.component.html',
2525
styleUrl: './confirm-move-file-dialog.component.scss',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
1717
import {
1818
FilesSelectors,
1919
GetMoveDialogFiles,
20-
SetCurrentFolder,
20+
SetFilesCurrentFolder,
2121
SetMoveDialogCurrentFolder,
2222
} from '@osf/features/files/store';
2323
import { FileSelectDestinationComponent } from '@osf/shared/components/file-select-destination/file-select-destination.component';
@@ -80,7 +80,7 @@ export class MoveFileDialogComponent {
8080
readonly actions = createDispatchMap({
8181
getMoveDialogFiles: GetMoveDialogFiles,
8282
setMoveDialogCurrentFolder: SetMoveDialogCurrentFolder,
83-
setCurrentFolder: SetCurrentFolder,
83+
setCurrentFolder: SetFilesCurrentFolder,
8484
getResourceDetails: GetResourceDetails,
8585
getComponentsTree: GetResourceWithChildren,
8686
});

src/app/features/files/pages/files/files.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ import {
4646
GetRootFolders,
4747
GetStorageSupportedFeatures,
4848
RenameEntry,
49-
ResetState,
50-
SetCurrentFolder,
49+
ResetFilesState,
5150
SetCurrentProvider,
51+
SetFilesCurrentFolder,
5252
SetMoveDialogCurrentFolder,
5353
SetSearch,
5454
SetSort,
@@ -138,14 +138,14 @@ export class FilesComponent {
138138
getFiles: GetFiles,
139139
deleteEntry: DeleteEntry,
140140
renameEntry: RenameEntry,
141-
setCurrentFolder: SetCurrentFolder,
141+
setCurrentFolder: SetFilesCurrentFolder,
142142
setMoveDialogCurrentFolder: SetMoveDialogCurrentFolder,
143143
setSearch: SetSearch,
144144
setSort: SetSort,
145145
getRootFolders: GetRootFolders,
146146
getConfiguredStorageAddons: GetConfiguredStorageAddons,
147147
setCurrentProvider: SetCurrentProvider,
148-
resetState: ResetState,
148+
resetState: ResetFilesState,
149149
getResourceDetails: GetResourceDetails,
150150
getStorageSupportedFeatures: GetStorageSupportedFeatures,
151151
});

src/app/features/files/store/files.actions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export class SetSort {
3232
constructor(public sort: string) {}
3333
}
3434

35-
export class SetCurrentFolder {
36-
static readonly type = '[Files] Set Current Folder';
35+
export class SetFilesCurrentFolder {
36+
static readonly type = '[Files] Set Files Current Folder';
3737

3838
constructor(public folder: FileFolderModel | null) {}
3939
}
@@ -161,6 +161,6 @@ export class GetStorageSupportedFeatures {
161161
) {}
162162
}
163163

164-
export class ResetState {
164+
export class ResetFilesState {
165165
static readonly type = '[Files] Reset State';
166166
}

src/app/features/files/store/files.state.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import {
2727
GetRootFolders,
2828
GetStorageSupportedFeatures,
2929
RenameEntry,
30-
ResetState,
31-
SetCurrentFolder,
30+
ResetFilesState,
3231
SetCurrentProvider,
3332
SetFileMetadata,
33+
SetFilesCurrentFolder,
3434
SetMoveDialogCurrentFolder,
3535
SetSearch,
3636
SetSort,
@@ -91,8 +91,8 @@ export class FilesState {
9191
);
9292
}
9393

94-
@Action(SetCurrentFolder)
95-
setSelectedFolder(ctx: StateContext<FilesStateModel>, action: SetCurrentFolder) {
94+
@Action(SetFilesCurrentFolder)
95+
setSelectedFolder(ctx: StateContext<FilesStateModel>, action: SetFilesCurrentFolder) {
9696
ctx.patchState({ currentFolder: action.folder });
9797
}
9898

@@ -357,7 +357,7 @@ export class FilesState {
357357
);
358358
}
359359

360-
@Action(ResetState)
360+
@Action(ResetFilesState)
361361
resetState(ctx: StateContext<FilesStateModel>) {
362362
ctx.patchState(FILES_STATE_DEFAULTS);
363363
}

src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { FormsModule } from '@angular/forms';
1111
import { ENVIRONMENT } from '@core/provider/environment.provider';
1212
import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums';
1313
import { PreprintProviderDetails } from '@osf/features/preprints/models';
14-
import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint';
14+
import { FetchPreprintDetails, PreprintSelectors } from '@osf/features/preprints/store/preprint';
1515
import { AffiliatedInstitutionsViewComponent } from '@osf/shared/components/affiliated-institutions-view/affiliated-institutions-view.component';
1616
import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
1717
import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -55,7 +55,7 @@ export class GeneralInformationComponent implements OnDestroy {
5555
private actions = createDispatchMap({
5656
getBibliographicContributors: GetBibliographicContributors,
5757
resetContributorsState: ResetContributorsState,
58-
fetchPreprintById: FetchPreprintById,
58+
fetchPreprintById: FetchPreprintDetails,
5959
fetchResourceInstitutions: FetchResourceInstitutions,
6060
loadMoreBibliographicContributors: LoadMoreBibliographicContributors,
6161
});

src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Router } from '@angular/router';
1212

1313
import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums';
1414
import { PreprintProviderDetails } from '@osf/features/preprints/models';
15-
import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint';
15+
import { FetchPreprintDetails, PreprintSelectors } from '@osf/features/preprints/store/preprint';
1616
import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
1717
import { LicenseDisplayComponent } from '@osf/shared/components/license-display/license-display.component';
1818
import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
@@ -51,7 +51,7 @@ export class PreprintTombstoneComponent implements OnDestroy {
5151
private actions = createDispatchMap({
5252
getBibliographicContributors: GetBibliographicContributors,
5353
resetContributorsState: ResetContributorsState,
54-
fetchPreprintById: FetchPreprintById,
54+
fetchPreprintById: FetchPreprintDetails,
5555
fetchSubjects: FetchSelectedSubjects,
5656
loadMoreBibliographicContributors: LoadMoreBibliographicContributors,
5757
});

src/app/features/preprints/components/stepper/file-step/file-step.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
FetchProjectFilesByLink,
3636
PreprintStepperSelectors,
3737
ReuploadFile,
38-
SetCurrentFolder,
38+
SetPreprintStepperCurrentFolder,
3939
SetProjectRootFolder,
4040
SetSelectedPreprintFileSource,
4141
UploadFile,
@@ -80,7 +80,7 @@ export class FileStepComponent implements OnInit {
8080
setProjectRootFolder: SetProjectRootFolder,
8181
getProjectFilesByLink: FetchProjectFilesByLink,
8282
copyFileFromProject: CopyFileFromProject,
83-
setCurrentFolder: SetCurrentFolder,
83+
setCurrentFolder: SetPreprintStepperCurrentFolder,
8484
});
8585
private destroyRef = inject(DestroyRef);
8686

src/app/features/preprints/pages/create-new-version/create-new-version.component.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
import { toSignal } from '@angular/core/rxjs-interop';
2121
import { ActivatedRoute, Router } from '@angular/router';
2222

23-
import { ResetState } from '@osf/features/files/store';
2423
import { StepperComponent } from '@osf/shared/components/stepper/stepper.component';
2524
import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
2625
import { BrowserTabHelper } from '@osf/shared/helpers/browser-tab.helper';
@@ -32,9 +31,13 @@ import { BrandService } from '@osf/shared/services/brand.service';
3231
import { FileStepComponent, ReviewStepComponent } from '../../components';
3332
import { createNewVersionStepsConst } from '../../constants';
3433
import { PreprintSteps } from '../../enums';
35-
import { FetchPreprintById } from '../../store/preprint';
3634
import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
37-
import { PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper';
35+
import {
36+
FetchPreprintById,
37+
PreprintStepperSelectors,
38+
ResetPreprintStepperState,
39+
SetSelectedPreprintProviderId,
40+
} from '../../store/preprint-stepper';
3841

3942
@Component({
4043
selector: 'osf-create-new-version',
@@ -55,7 +58,7 @@ export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactiva
5558
private actions = createDispatchMap({
5659
getPreprintProviderById: GetPreprintProviderById,
5760
setSelectedPreprintProviderId: SetSelectedPreprintProviderId,
58-
resetState: ResetState,
61+
resetState: ResetPreprintStepperState,
5962
fetchPreprint: FetchPreprintById,
6063
});
6164

0 commit comments

Comments
 (0)