diff --git a/package-lock.json b/package-lock.json index 912834b45..e5bd9aae8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,6 @@ "@angular/platform-browser": "^19.2.0", "@angular/platform-browser-dynamic": "^19.2.0", "@angular/router": "^19.2.0", - "@angular/service-worker": "^19.2.0", "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", @@ -913,7 +912,10 @@ "version": "19.2.14", "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.2.14.tgz", "integrity": "sha512-ajH4kjsuzDvJNxnG18y8N47R0avXFKwOeLszoiirlr5160C+k4HmQvIbzcCjD5liW0OkmxJN1cMW6KdilP8/2w==", + "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "tslib": "^2.3.0" }, diff --git a/package.json b/package.json index 63ec17e4b..b2aa7044e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "@angular/platform-browser": "^19.2.0", "@angular/platform-browser-dynamic": "^19.2.0", "@angular/router": "^19.2.0", - "@angular/service-worker": "^19.2.0", "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.ts b/src/app/core/components/breadcrumb/breadcrumb.component.ts index 767689e46..ec3c34816 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.ts +++ b/src/app/core/components/breadcrumb/breadcrumb.component.ts @@ -17,7 +17,7 @@ export class BreadcrumbComponent { private readonly router = inject(Router); private readonly route = inject(ActivatedRoute); - protected readonly url = toSignal( + readonly url = toSignal( this.router.events.pipe( filter((event) => event instanceof NavigationEnd), map(() => this.router.url), @@ -26,7 +26,7 @@ export class BreadcrumbComponent { { initialValue: this.router.url } ); - protected readonly routeData = toSignal( + readonly routeData = toSignal( this.router.events.pipe( filter((event) => event instanceof NavigationEnd), map(() => this.getCurrentRouteData()), @@ -35,9 +35,9 @@ export class BreadcrumbComponent { { initialValue: { skipBreadcrumbs: false } as RouteData } ); - protected readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true); + readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true); - protected readonly parsedUrl = computed(() => + readonly parsedUrl = computed(() => this.url() .split('?')[0] .split('/') diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index b11f9dd2b..75019bbb2 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -6,7 +6,7 @@ -
+
@for (icon of socialIcons; track icon.name) {
{{ 'footer.links.termsOfUse' | translate }} | @@ -43,6 +43,6 @@ {{ 'footer.links.topGuidelines' | translate }}
-
{{ 'footer.copyright' | translate }}
+
{{ 'footer.copyright' | translate }}
diff --git a/src/app/core/components/footer/footer.component.ts b/src/app/core/components/footer/footer.component.ts index 227a253d9..d91b31c12 100644 --- a/src/app/core/components/footer/footer.component.ts +++ b/src/app/core/components/footer/footer.component.ts @@ -18,5 +18,5 @@ import { IS_WEB } from '@osf/shared/helpers'; export class FooterComponent { isWeb = toSignal(inject(IS_WEB)); - protected readonly socialIcons = SOCIAL_ICONS; + readonly socialIcons = SOCIAL_ICONS; } diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts index 29a552419..5b5ff3c46 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.ts @@ -38,7 +38,7 @@ export class NavMenuComponent { private readonly isAuthenticated = select(UserSelectors.isAuthenticated); private readonly currentResource = select(CurrentResourceSelectors.getCurrentResource); - protected readonly mainMenuItems = computed(() => { + readonly mainMenuItems = computed(() => { const isAuthenticated = this.isAuthenticated(); const filtered = filterMenuItems(MENU_ITEMS, isAuthenticated); @@ -63,7 +63,7 @@ export class NavMenuComponent { return items; }); - protected readonly currentRoute = toSignal( + readonly currentRoute = toSignal( this.router.events.pipe( filter((event): event is NavigationEnd => event instanceof NavigationEnd), map(() => this.getRouteInfo()) @@ -73,11 +73,11 @@ export class NavMenuComponent { } ); - protected readonly currentResourceId = computed(() => this.currentRoute().resourceId); - protected readonly currentProviderId = computed(() => this.currentRoute().providerId); - protected readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId); - protected readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute); - protected readonly canUserViewReviews = select(UserSelectors.getCanViewReviews); + readonly currentResourceId = computed(() => this.currentRoute().resourceId); + readonly currentProviderId = computed(() => this.currentRoute().providerId); + readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId); + readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute); + readonly canUserViewReviews = select(UserSelectors.getCanViewReviews); private getRouteInfo() { const urlSegments = this.router.url.split('/').filter((segment) => segment); @@ -115,6 +115,6 @@ export class NavMenuComponent { } } - protected readonly hasVisibleChildren = (item: MenuItem): boolean => + readonly hasVisibleChildren = (item: MenuItem): boolean => Array.isArray(item.items) && item.items.some((child) => !!child.visible); } diff --git a/src/app/core/components/sidenav/sidenav.component.html b/src/app/core/components/sidenav/sidenav.component.html index dc22dbcb6..e7b6abeb7 100644 --- a/src/app/core/components/sidenav/sidenav.component.html +++ b/src/app/core/components/sidenav/sidenav.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts index 43b0b0343..24a443e7e 100644 --- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts +++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts @@ -45,26 +45,26 @@ export class InstitutionsSummaryComponent implements OnInit { rightsSearch = select(InstitutionsAdminSelectors.getSearchResults); rightsLoading = select(InstitutionsAdminSelectors.getSearchResultsLoading); - protected departmentLabels: string[] = []; - protected departmentDataset: DatasetInput[] = []; + departmentLabels: string[] = []; + departmentDataset: DatasetInput[] = []; - protected projectsLabels: string[] = []; - protected projectDataset: DatasetInput[] = []; + projectsLabels: string[] = []; + projectDataset: DatasetInput[] = []; - protected registrationsLabels: string[] = []; - protected registrationsDataset: DatasetInput[] = []; + registrationsLabels: string[] = []; + registrationsDataset: DatasetInput[] = []; - protected osfProjectsLabels: string[] = []; - protected osfProjectsDataset: DatasetInput[] = []; + osfProjectsLabels: string[] = []; + osfProjectsDataset: DatasetInput[] = []; - protected storageLabels: string[] = []; - protected storageDataset: DatasetInput[] = []; + storageLabels: string[] = []; + storageDataset: DatasetInput[] = []; - protected licenceLabels: string[] = []; - protected licenceDataset: DatasetInput[] = []; + licenceLabels: string[] = []; + licenceDataset: DatasetInput[] = []; - protected addonLabels: string[] = []; - protected addonDataset: DatasetInput[] = []; + addonLabels: string[] = []; + addonDataset: DatasetInput[] = []; private readonly actions = createDispatchMap({ fetchDepartments: FetchInstitutionDepartments, diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts index 0a43ed039..6c7b14287 100644 --- a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts +++ b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts @@ -23,16 +23,16 @@ import { ToastService } from '@shared/services'; }) export class AddToCollectionConfirmationDialogComponent { private toastService = inject(ToastService); - protected dialogRef = inject(DynamicDialogRef); - protected config = inject(DynamicDialogConfig); - protected destroyRef = inject(DestroyRef); - protected isSubmitting = signal(false); - protected actions = createDispatchMap({ + dialogRef = inject(DynamicDialogRef); + config = inject(DynamicDialogConfig); + destroyRef = inject(DestroyRef); + isSubmitting = signal(false); + actions = createDispatchMap({ createCollectionSubmission: CreateCollectionSubmission, updateProjectPublicStatus: UpdateProjectPublicStatus, }); - protected handleAddToCollectionConfirm(): void { + handleAddToCollectionConfirm(): void { const payload = this.config.data.payload; const project = this.config.data.project; diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts index 3b01c6e5e..cd508271e 100644 --- a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts +++ b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts @@ -67,27 +67,27 @@ export class AddToCollectionComponent implements CanDeactivateComponent { private readonly dialogService = inject(DialogService); private readonly translateService = inject(TranslateService); - protected readonly AddToCollectionSteps = AddToCollectionSteps; - - protected collectionMetadataForm = new FormGroup({}); - protected isProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); - protected collectionProvider = select(CollectionsSelectors.getCollectionProvider); - protected selectedProject = select(ProjectsSelectors.getSelectedProject); - protected currentUser = select(UserSelectors.getCurrentUser); - protected providerId = signal(''); - protected allowNavigation = signal(false); - protected projectMetadataSaved = signal(false); - protected projectContributorsSaved = signal(false); - protected collectionMetadataSaved = signal(false); - protected stepperActiveValue = signal(AddToCollectionSteps.SelectProject); - protected primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); - protected isProjectMetadataDisabled = computed(() => !this.selectedProject()); - protected isProjectContributorsDisabled = computed(() => !this.selectedProject() || !this.projectMetadataSaved()); - protected isCollectionMetadataDisabled = computed( + readonly AddToCollectionSteps = AddToCollectionSteps; + + collectionMetadataForm = new FormGroup({}); + isProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); + collectionProvider = select(CollectionsSelectors.getCollectionProvider); + selectedProject = select(ProjectsSelectors.getSelectedProject); + currentUser = select(UserSelectors.getCurrentUser); + providerId = signal(''); + allowNavigation = signal(false); + projectMetadataSaved = signal(false); + projectContributorsSaved = signal(false); + collectionMetadataSaved = signal(false); + stepperActiveValue = signal(AddToCollectionSteps.SelectProject); + primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); + isProjectMetadataDisabled = computed(() => !this.selectedProject()); + isProjectContributorsDisabled = computed(() => !this.selectedProject() || !this.projectMetadataSaved()); + isCollectionMetadataDisabled = computed( () => !this.selectedProject() || !this.projectMetadataSaved() || !this.projectContributorsSaved() ); - protected actions = createDispatchMap({ + actions = createDispatchMap({ getCollectionProvider: GetCollectionProvider, clearAddToCollectionState: ClearAddToCollectionState, createCollectionSubmission: CreateCollectionSubmission, diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts index 86e974b06..8086245b2 100644 --- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts @@ -24,8 +24,8 @@ import { CollectionsSelectors, GetCollectionDetails } from '@shared/stores'; }) export class CollectionMetadataStepComponent { private readonly filterTypes = collectionFilterTypes; - protected readonly collectionFilterOptions = select(CollectionsSelectors.getAllFiltersOptions); - protected readonly availableFilterEntries = computed(() => { + readonly collectionFilterOptions = select(CollectionsSelectors.getAllFiltersOptions); + readonly availableFilterEntries = computed(() => { const options = this.collectionFilterOptions(); return this.filterTypes @@ -46,10 +46,10 @@ export class CollectionMetadataStepComponent { stepChange = output(); metadataSaved = output(); - protected collectionMetadataForm = signal(new FormGroup({})); - protected collectionMetadataSaved = signal(false); + collectionMetadataForm = signal(new FormGroup({})); + collectionMetadataSaved = signal(false); - protected actions = createDispatchMap({ + actions = createDispatchMap({ getCollectionDetails: GetCollectionDetails, }); diff --git a/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts b/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts index 9a94426e2..dfa1bad79 100644 --- a/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts @@ -60,7 +60,7 @@ export class ProjectContributorsStepComponent { stepChange = output(); contributorsSaved = output(); - protected actions = createDispatchMap({ + actions = createDispatchMap({ addContributor: AddContributor, updateContributor: UpdateContributor, deleteContributor: DeleteContributor, diff --git a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts index ac8e45a60..f88889e4a 100644 --- a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts @@ -22,8 +22,8 @@ import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class SelectProjectStepComponent { - protected selectedProject = select(ProjectsSelectors.getSelectedProject); - protected currentUserSubmissions = select(CollectionsSelectors.getUserCollectionSubmissions); + selectedProject = select(ProjectsSelectors.getSelectedProject); + currentUserSubmissions = select(CollectionsSelectors.getUserCollectionSubmissions); stepperActiveValue = input.required(); targetStepValue = input.required(); @@ -34,12 +34,12 @@ export class SelectProjectStepComponent { currentSelectedProject = signal(null); - protected excludedProjectIds = computed(() => { + excludedProjectIds = computed(() => { const submissions = this.currentUserSubmissions(); return submissions.map((submission) => submission.nodeId); }); - protected actions = createDispatchMap({ + actions = createDispatchMap({ setSelectedProject: SetSelectedProject, getUserCollectionSubmissions: GetUserCollectionSubmissions, }); diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.ts index e199ec1f4..363456ffe 100644 --- a/src/app/features/collections/components/collections-discover/collections-discover.component.ts +++ b/src/app/features/collections/components/collections-discover/collections-discover.component.ts @@ -52,19 +52,19 @@ export class CollectionsDiscoverComponent { private querySyncService = inject(CollectionsQuerySyncService); private destroyRef = inject(DestroyRef); - protected searchControl = new FormControl(''); - protected providerId = signal(''); - - protected collectionProvider = select(CollectionsSelectors.getCollectionProvider); - protected collectionDetails = select(CollectionsSelectors.getCollectionDetails); - protected selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); - protected sortBy = select(CollectionsSelectors.getSortBy); - protected searchText = select(CollectionsSelectors.getSearchText); - protected pageNumber = select(CollectionsSelectors.getPageNumber); - protected isProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); - protected primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); - - protected actions = createDispatchMap({ + searchControl = new FormControl(''); + providerId = signal(''); + + collectionProvider = select(CollectionsSelectors.getCollectionProvider); + collectionDetails = select(CollectionsSelectors.getCollectionDetails); + selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); + sortBy = select(CollectionsSelectors.getSortBy); + searchText = select(CollectionsSelectors.getSearchText); + pageNumber = select(CollectionsSelectors.getPageNumber); + isProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); + primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); + + actions = createDispatchMap({ getCollectionProvider: GetCollectionProvider, getCollectionDetails: GetCollectionDetails, setSearchValue: SetSearchValue, @@ -80,7 +80,7 @@ export class CollectionsDiscoverComponent { this.setupSearchBinding(); } - protected openHelpDialog(): void { + openHelpDialog(): void { this.dialogService.open(CollectionsHelpDialogComponent, { focusOnShow: false, header: this.translateService.instant('collections.helpDialog.header'), @@ -90,7 +90,7 @@ export class CollectionsDiscoverComponent { }); } - protected onSearchTriggered(searchValue: string): void { + onSearchTriggered(searchValue: string): void { this.actions.setSearchValue(searchValue); this.actions.setPageNumber('1'); } diff --git a/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts b/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts index 7523ddba6..77f067bf1 100644 --- a/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts +++ b/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts @@ -28,11 +28,11 @@ import { changeDetection: ChangeDetectionStrategy.OnPush, }) export class CollectionsFilterChipsComponent { - protected activeFilters = select(CollectionsSelectors.getAllSelectedFilters); + activeFilters = select(CollectionsSelectors.getAllSelectedFilters); private readonly filterTypes = collectionFilterTypes; - protected actions = createDispatchMap({ + actions = createDispatchMap({ programArea: SetProgramAreaFilters, collectedType: SetCollectedTypeFilters, status: SetStatusFilters, @@ -45,7 +45,7 @@ export class CollectionsFilterChipsComponent { volume: SetVolumeFilters, }); - protected activeFilterEntries = computed(() => { + activeFilterEntries = computed(() => { const filters = this.activeFilters(); return this.filterTypes .map((key) => ({ @@ -55,7 +55,7 @@ export class CollectionsFilterChipsComponent { .filter((entry) => entry.filters.length); }); - protected onRemoveFilter(filterType: CollectionFilterType, removedFilter: string): void { + onRemoveFilter(filterType: CollectionFilterType, removedFilter: string): void { const currentFilters = this.activeFilters()[filterType].filter((filter: string) => filter !== removedFilter); switch (filterType) { diff --git a/src/app/features/collections/components/collections-filters/collections-filters.component.ts b/src/app/features/collections/components/collections-filters/collections-filters.component.ts index cae7d8b17..cd560197c 100644 --- a/src/app/features/collections/components/collections-filters/collections-filters.component.ts +++ b/src/app/features/collections/components/collections-filters/collections-filters.component.ts @@ -34,10 +34,10 @@ import { export class CollectionsFiltersComponent { private readonly filterTypes = collectionFilterTypes; - protected filtersOptions = select(CollectionsSelectors.getAllFiltersOptions); - protected selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); + filtersOptions = select(CollectionsSelectors.getAllFiltersOptions); + selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); - protected actions = createDispatchMap({ + actions = createDispatchMap({ programArea: SetProgramAreaFilters, collectedType: SetCollectedTypeFilters, status: SetStatusFilters, @@ -50,7 +50,7 @@ export class CollectionsFiltersComponent { volume: SetVolumeFilters, }); - protected availableFilterEntries = computed(() => { + availableFilterEntries = computed(() => { const options = this.filtersOptions(); const selectedFilters = this.selectedFilters(); @@ -69,7 +69,7 @@ export class CollectionsFiltersComponent { .filter((entry) => entry.options.length > 0); }); - protected setFilters(filterType: CollectionFilterType, $event: MultiSelectChangeEvent): void { + setFilters(filterType: CollectionFilterType, $event: MultiSelectChangeEvent): void { const filters = $event.value; switch (filterType) { @@ -106,7 +106,7 @@ export class CollectionsFiltersComponent { } } - protected clearFilters(filterType: CollectionFilterType): void { + clearFilters(filterType: CollectionFilterType): void { this.setFilters(filterType, { value: [] } as MultiSelectChangeEvent); } } diff --git a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts index 23019cfb5..700cc6b69 100644 --- a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts +++ b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts @@ -35,24 +35,24 @@ import { CollectionsSearchResultsComponent } from '../collections-search-results changeDetection: ChangeDetectionStrategy.OnPush, }) export class CollectionsMainContentComponent { - protected readonly sortOptions = collectionsSortOptions; - protected isWeb = toSignal(inject(IS_WEB)); - protected selectedSort = select(CollectionsSelectors.getSortBy); - protected collectionSubmissions = select(CollectionsSelectors.getCollectionSubmissionsSearchResult); - protected isCollectionSubmissionsLoading = select(CollectionsSelectors.getCollectionSubmissionsLoading); + readonly sortOptions = collectionsSortOptions; + isWeb = toSignal(inject(IS_WEB)); + selectedSort = select(CollectionsSelectors.getSortBy); + collectionSubmissions = select(CollectionsSelectors.getCollectionSubmissionsSearchResult); + isCollectionSubmissionsLoading = select(CollectionsSelectors.getCollectionSubmissionsLoading); - protected isFiltersOpen = signal(false); - protected isSortingOpen = signal(false); + isFiltersOpen = signal(false); + isSortingOpen = signal(false); - protected selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); - protected isCollectionProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); - protected isCollectionDetailsLoading = select(CollectionsSelectors.getCollectionDetailsLoading); + selectedFilters = select(CollectionsSelectors.getAllSelectedFilters); + isCollectionProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); + isCollectionDetailsLoading = select(CollectionsSelectors.getCollectionDetailsLoading); - protected isCollectionLoading = computed(() => { + isCollectionLoading = computed(() => { return this.isCollectionProviderLoading() || this.isCollectionDetailsLoading(); }); - protected hasAnySelectedFilters = computed(() => { + hasAnySelectedFilters = computed(() => { const currentFilters = this.selectedFilters(); const hasSelectedFiltersOptions = Object.values(currentFilters).some((value) => { return value.length; @@ -61,21 +61,21 @@ export class CollectionsMainContentComponent { return hasSelectedFiltersOptions; }); - protected actions = createDispatchMap({ + actions = createDispatchMap({ setSortBy: SetSortBy, }); - protected openFilters(): void { + openFilters(): void { this.isFiltersOpen.set(!this.isFiltersOpen()); this.isSortingOpen.set(false); } - protected openSorting(): void { + openSorting(): void { this.isSortingOpen.set(!this.isSortingOpen()); this.isFiltersOpen.set(false); } - protected handleSortBy(value: string): void { + handleSortBy(value: string): void { this.actions.setSortBy(value); this.isSortingOpen.set(false); } diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts index 7dfdc3c5a..32b2b18a3 100644 --- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts +++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts @@ -16,7 +16,7 @@ import { CollectionSubmissionWithGuid } from '@shared/models'; export class CollectionsSearchResultCardComponent { cardItem = input.required(); - protected presentSubmissionAttributes = computed(() => { + presentSubmissionAttributes = computed(() => { const item = this.cardItem(); if (!item) return []; diff --git a/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts b/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts index 30b43ede8..c456fb6af 100644 --- a/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts +++ b/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts @@ -21,23 +21,23 @@ import { CollectionsSearchResultCardComponent } from '../collections-search-resu changeDetection: ChangeDetectionStrategy.OnPush, }) export class CollectionsSearchResultsComponent { - protected searchResults = select(CollectionsSelectors.getCollectionSubmissionsSearchResult); - protected isCollectionDetailsLoading = select(CollectionsSelectors.getCollectionDetailsLoading); - protected isCollectionSubmissionsLoading = select(CollectionsSelectors.getCollectionSubmissionsLoading); - protected totalSubmissions = select(CollectionsSelectors.getTotalSubmissions); - protected pageNumber = select(CollectionsSelectors.getPageNumber); + searchResults = select(CollectionsSelectors.getCollectionSubmissionsSearchResult); + isCollectionDetailsLoading = select(CollectionsSelectors.getCollectionDetailsLoading); + isCollectionSubmissionsLoading = select(CollectionsSelectors.getCollectionSubmissionsLoading); + totalSubmissions = select(CollectionsSelectors.getTotalSubmissions); + pageNumber = select(CollectionsSelectors.getPageNumber); - protected actions = createDispatchMap({ + actions = createDispatchMap({ setPageNumber: SetPageNumber, }); - protected isLoading = computed(() => { + isLoading = computed(() => { return this.isCollectionDetailsLoading() || this.isCollectionSubmissionsLoading(); }); - protected firstIndex = computed(() => (parseInt(this.pageNumber()) - 1) * 10); + firstIndex = computed(() => (parseInt(this.pageNumber()) - 1) * 10); - protected onPageChange(event: PaginatorState): void { + onPageChange(event: PaginatorState): void { if (event.page !== undefined) { const pageNumber = (event.page + 1).toString(); this.actions.setPageNumber(pageNumber); diff --git a/src/app/features/files/components/create-folder-dialog/create-folder-dialog.component.ts b/src/app/features/files/components/create-folder-dialog/create-folder-dialog.component.ts index 685833155..6bcd42408 100644 --- a/src/app/features/files/components/create-folder-dialog/create-folder-dialog.component.ts +++ b/src/app/features/files/components/create-folder-dialog/create-folder-dialog.component.ts @@ -20,7 +20,7 @@ export class CreateFolderDialogComponent { readonly nameLimit = InputLimits.name.maxLength; readonly nameMinLength = InputLimits.name.minLength; - protected readonly folderForm = new FormGroup({ + readonly folderForm = new FormGroup({ name: new FormControl('', { nonNullable: true, validators: [CustomValidators.requiredTrimmed()], diff --git a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts index c7c233316..68b7f6c11 100644 --- a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts +++ b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts @@ -20,8 +20,8 @@ import { PatchFileMetadata } from '../../models'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class EditFileMetadataDialogComponent { - protected readonly resourceTypes = resourceTypes; - protected readonly languages = languageCodes; + readonly resourceTypes = resourceTypes; + readonly languages = languageCodes; private readonly dialogRef = inject(DynamicDialogRef); diff --git a/src/app/features/files/components/rename-file-dialog/rename-file-dialog.component.ts b/src/app/features/files/components/rename-file-dialog/rename-file-dialog.component.ts index 4eeeb4f13..b9b4e5c48 100644 --- a/src/app/features/files/components/rename-file-dialog/rename-file-dialog.component.ts +++ b/src/app/features/files/components/rename-file-dialog/rename-file-dialog.component.ts @@ -23,7 +23,7 @@ export class RenameFileDialogComponent { readonly nameLimit = InputLimits.name.maxLength; readonly nameMinLength = InputLimits.name.minLength; - protected readonly renameForm = new FormGroup({ + readonly renameForm = new FormGroup({ name: new FormControl(this.config.data?.currentName ?? '', { nonNullable: true, validators: [CustomValidators.requiredTrimmed()], diff --git a/src/app/features/home/home.component.ts b/src/app/features/home/home.component.ts index 7df01f953..5013b55ce 100644 --- a/src/app/features/home/home.component.ts +++ b/src/app/features/home/home.component.ts @@ -21,7 +21,7 @@ import { INTEGRATION_ICONS, SLIDES } from './constants'; export class HomeComponent { private readonly router = inject(Router); - protected searchControl = new FormControl(''); + searchControl = new FormControl(''); readonly icons = INTEGRATION_ICONS; readonly slides = SLIDES; diff --git a/src/app/features/home/pages/dashboard/dashboard.component.html b/src/app/features/home/pages/dashboard/dashboard.component.html index 738974891..cd1024b79 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.html +++ b/src/app/features/home/pages/dashboard/dashboard.component.html @@ -44,7 +44,7 @@

{{ 'home.loggedIn.publicProjects.title' | translate }}

>

{{ 'home.loggedIn.latestResearch.title' | translate }}

-

{{ 'home.loggedIn.latestResearch.subtitle' | translate }}

+

{{ 'home.loggedIn.latestResearch.subtitle' | translate }}

@@ -53,7 +53,7 @@

{{ 'home.loggedIn.latestResearch.title' | translate }}

{{ 'home.loggedIn.hosting.title' | translate }}

-

{{ 'home.loggedIn.hosting.subtitle' | translate }}

+

{{ 'home.loggedIn.hosting.subtitle' | translate }}

diff --git a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.html b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.html index 6a8e788e4..ec8eb0e80 100644 --- a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.html +++ b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.html @@ -9,7 +9,7 @@ } @else { @for (item of users(); track $index) { -
+
diff --git a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.ts b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.ts index 40337fa7b..106657b1c 100644 --- a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.ts +++ b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.ts @@ -35,23 +35,23 @@ import { ClearUsers, ModeratorsSelectors, SearchUsers } from '../../store/modera changeDetection: ChangeDetectionStrategy.OnPush, }) export class AddModeratorDialogComponent implements OnInit, OnDestroy { - protected dialogRef = inject(DynamicDialogRef); + dialogRef = inject(DynamicDialogRef); private readonly destroyRef = inject(DestroyRef); readonly config = inject(DynamicDialogConfig); - protected users = select(ModeratorsSelectors.getUsers); - protected isLoading = select(ModeratorsSelectors.isUsersLoading); - protected totalUsersCount = select(ModeratorsSelectors.getUsersTotalCount); - protected isInitialState = signal(true); + users = select(ModeratorsSelectors.getUsers); + isLoading = select(ModeratorsSelectors.isUsersLoading); + totalUsersCount = select(ModeratorsSelectors.getUsersTotalCount); + isInitialState = signal(true); - protected currentPage = signal(1); - protected first = signal(0); - protected rows = signal(10); + currentPage = signal(1); + first = signal(0); + rows = signal(10); - protected selectedUsers = signal([]); - protected searchControl = new FormControl(''); + selectedUsers = signal([]); + searchControl = new FormControl(''); - protected actions = createDispatchMap({ searchUsers: SearchUsers, clearUsers: ClearUsers }); + actions = createDispatchMap({ searchUsers: SearchUsers, clearUsers: ClearUsers }); ngOnInit(): void { this.setSearchSubscription(); diff --git a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts index 7f5697ff8..181ebc0b4 100644 --- a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts +++ b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts @@ -57,27 +57,27 @@ export class CollectionModerationSubmissionsComponent { private route = inject(ActivatedRoute); readonly submissionReviewOptions = COLLECTIONS_SUBMISSIONS_REVIEW_OPTIONS; - protected collectionProvider = select(CollectionsSelectors.getCollectionProvider); - protected isCollectionProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); - protected isSubmissionsLoading = select(CollectionsModerationSelectors.getCollectionSubmissionsLoading); - protected collectionSubmissions = select(CollectionsModerationSelectors.getCollectionSubmissions); - protected totalSubmissions = select(CollectionsModerationSelectors.getCollectionSubmissionsTotalCount); - protected providerId = signal(''); - protected primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); - protected reviewStatus = signal(SubmissionReviewStatus.Pending); - protected currentPage = signal('1'); - protected pageSize = 10; - - protected isLoading = computed(() => { + collectionProvider = select(CollectionsSelectors.getCollectionProvider); + isCollectionProviderLoading = select(CollectionsSelectors.getCollectionProviderLoading); + isSubmissionsLoading = select(CollectionsModerationSelectors.getCollectionSubmissionsLoading); + collectionSubmissions = select(CollectionsModerationSelectors.getCollectionSubmissions); + totalSubmissions = select(CollectionsModerationSelectors.getCollectionSubmissionsTotalCount); + providerId = signal(''); + primaryCollectionId = computed(() => this.collectionProvider()?.primaryCollection?.id); + reviewStatus = signal(SubmissionReviewStatus.Pending); + currentPage = signal('1'); + pageSize = 10; + + isLoading = computed(() => { return this.isCollectionProviderLoading() || this.isSubmissionsLoading(); }); sortOptions = COLLECTION_SUBMISSIONS_SORT_OPTIONS; selectedSortOption = signal(this.sortOptions[0].value); - protected firstIndex = computed(() => (parseInt(this.currentPage()) - 1) * 10); + firstIndex = computed(() => (parseInt(this.currentPage()) - 1) * 10); - protected actions = createDispatchMap({ + actions = createDispatchMap({ getCollectionProvider: GetCollectionProvider, getCollectionDetails: GetCollectionDetails, searchCollectionSubmissions: SearchCollectionSubmissions, diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts index 5467686c7..a44c3ff3e 100644 --- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts +++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts @@ -31,9 +31,9 @@ export class CollectionSubmissionItemComponent { submission = input.required(); collectionProvider = select(CollectionsSelectors.getCollectionProvider); - protected readonly reviewStatusIcon = ReviewStatusIcon; + readonly reviewStatusIcon = ReviewStatusIcon; - protected currentReviewAction = computed(() => { + currentReviewAction = computed(() => { const actions = this.submission().actions; if (!actions || !actions.length) return null; @@ -41,7 +41,7 @@ export class CollectionSubmissionItemComponent { return actions[0]; }); - protected currentSubmissionAttributes = computed(() => { + currentSubmissionAttributes = computed(() => { const item = this.submission(); if (!item) return null; @@ -53,7 +53,7 @@ export class CollectionSubmissionItemComponent { .filter((attribute) => attribute.value); }); - protected handleNavigation() { + handleNavigation() { const currentStatus = this.activatedRoute.snapshot.queryParams['status']; const queryParams = currentStatus ? { status: currentStatus, mode: 'moderation' } : {}; @@ -63,5 +63,5 @@ export class CollectionSubmissionItemComponent { }); } - protected readonly SubmissionReviewStatus = SubmissionReviewStatus; + readonly SubmissionReviewStatus = SubmissionReviewStatus; } diff --git a/src/app/features/moderation/components/invite-moderator-dialog/invite-moderator-dialog.component.html b/src/app/features/moderation/components/invite-moderator-dialog/invite-moderator-dialog.component.html index 10e5c1885..d1788cb00 100644 --- a/src/app/features/moderation/components/invite-moderator-dialog/invite-moderator-dialog.component.html +++ b/src/app/features/moderation/components/invite-moderator-dialog/invite-moderator-dialog.component.html @@ -10,7 +10,7 @@ ; - protected inputLimits = InputLimits; - protected readonly permissionsOptions = MODERATION_PERMISSIONS; + dialogRef = inject(DynamicDialogRef); + moderatorForm!: FormGroup; + inputLimits = InputLimits; + readonly permissionsOptions = MODERATION_PERMISSIONS; constructor() { this.initForm(); diff --git a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts index 5c575a75e..123fd3f6f 100644 --- a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts +++ b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts @@ -50,7 +50,7 @@ import { ModeratorsTableComponent } from '../moderators-table/moderators-table.c providers: [DialogService], }) export class ModeratorsListComponent implements OnInit { - protected searchControl = new FormControl(''); + searchControl = new FormControl(''); private readonly route = inject(ActivatedRoute); private readonly destroyRef = inject(DestroyRef); @@ -81,7 +81,7 @@ export class ModeratorsListComponent implements OnInit { }); }); - protected actions = createDispatchMap({ + actions = createDispatchMap({ loadModerators: LoadModerators, updateSearchValue: UpdateSearchValue, addModerators: AddModerator, diff --git a/src/app/features/moderation/components/moderators-table/moderators-table.component.ts b/src/app/features/moderation/components/moderators-table/moderators-table.component.ts index 1cfed3308..fc857a840 100644 --- a/src/app/features/moderation/components/moderators-table/moderators-table.component.ts +++ b/src/app/features/moderation/components/moderators-table/moderators-table.component.ts @@ -39,21 +39,21 @@ export class ModeratorsTableComponent { dialogService = inject(DialogService); translateService = inject(TranslateService); - protected readonly tableParams = signal({ ...MY_PROJECTS_TABLE_PARAMS }); - protected readonly permissionsOptions = MODERATION_PERMISSIONS; - protected readonly ModeratorPermission = ModeratorPermission; + readonly tableParams = signal({ ...MY_PROJECTS_TABLE_PARAMS }); + readonly permissionsOptions = MODERATION_PERMISSIONS; + readonly ModeratorPermission = ModeratorPermission; skeletonData: ModeratorModel[] = Array.from({ length: 3 }, () => ({}) as ModeratorModel); - protected updatePermission(item: ModeratorModel) { + updatePermission(item: ModeratorModel) { this.update.emit(item); } - protected removeModerator(item: ModeratorModel) { + removeModerator(item: ModeratorModel) { this.remove.emit(item); } - protected openEducationHistory(contributor: ModeratorModel) { + openEducationHistory(contributor: ModeratorModel) { this.dialogService.open(EducationHistoryDialogComponent, { width: '552px', data: contributor.education, @@ -65,7 +65,7 @@ export class ModeratorsTableComponent { }); } - protected openEmploymentHistory(contributor: ModeratorModel) { + openEmploymentHistory(contributor: ModeratorModel) { this.dialogService.open(EmploymentHistoryDialogComponent, { width: '552px', data: contributor.employment, diff --git a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts index 5e32a5e2b..734ae2e36 100644 --- a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts +++ b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts @@ -25,7 +25,7 @@ export class PreprintRecentActivityListComponent { pageChanged = output(); - protected first = signal(0); + first = signal(0); readonly reviewStatusIcon = ReviewStatusIcon; readonly preprintReviewStatus = PreprintReviewStatus; diff --git a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts index 217379e72..e1d9d0ce3 100644 --- a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts +++ b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts @@ -52,14 +52,14 @@ export class CitationSectionComponent implements OnInit { updateCustomCitation: UpdateCustomCitation, }); - protected defaultCitations = select(CitationsSelectors.getDefaultCitations); - protected areCitationsLoading = select(CitationsSelectors.getDefaultCitationsLoading); - protected citationStyles = select(CitationsSelectors.getCitationStyles); - protected areCitationStylesLoading = select(CitationsSelectors.getCitationStylesLoading); - protected styledCitation = select(CitationsSelectors.getStyledCitation); - protected citationStylesOptions = signal[]>([]); - - protected filterMessage = computed(() => { + defaultCitations = select(CitationsSelectors.getDefaultCitations); + areCitationsLoading = select(CitationsSelectors.getDefaultCitationsLoading); + citationStyles = select(CitationsSelectors.getCitationStyles); + areCitationStylesLoading = select(CitationsSelectors.getCitationStylesLoading); + styledCitation = select(CitationsSelectors.getStyledCitation); + citationStylesOptions = signal[]>([]); + + filterMessage = computed(() => { const isLoading = this.areCitationStylesLoading(); return isLoading ? this.translateService.instant('project.overview.metadata.citationLoadingPlaceholder') @@ -75,12 +75,12 @@ export class CitationSectionComponent implements OnInit { this.actions.getDefaultCitations(ResourceType.Preprint, this.preprintId()); } - protected handleCitationStyleFilterSearch(event: SelectFilterEvent) { + handleCitationStyleFilterSearch(event: SelectFilterEvent) { event.originalEvent.preventDefault(); this.filterSubject.next(event.filter); } - protected handleGetStyledCitation(event: SelectChangeEvent) { + handleGetStyledCitation(event: SelectChangeEvent) { this.actions.getStyledCitation(ResourceType.Preprint, this.preprintId(), event.value.id); } diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts index c6ce10509..df6933c9c 100644 --- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts +++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts @@ -45,7 +45,7 @@ export class GeneralInformationComponent implements OnDestroy { fetchPreprintById: FetchPreprintById, fetchResourceInstitutions: FetchResourceInstitutions, }); - protected readonly environment = environment; + readonly environment = environment; preprintProvider = input.required(); preprintVersionSelected = output(); diff --git a/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.html b/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.html index 9c4cb5bbd..6e5e1e74b 100644 --- a/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.html +++ b/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.html @@ -65,7 +65,7 @@

{{ 'preprints.details.decision.decline.label' | transl } -
+
{{ 'preprints.details.decision.decline.label' | transl
-
+
@@ -108,7 +108,7 @@

{{ rejectOptionLabel() | translate }}

-
+