From f101af88a14b63ac81c34de457720dc20dc6c760 Mon Sep 17 00:00:00 2001 From: nsemets Date: Mon, 6 Oct 2025 00:15:09 +0300 Subject: [PATCH 1/2] refactor(app): clean up some code --- .../breadcrumb/breadcrumb.component.scss | 4 +-- .../components/footer/footer.component.html | 5 ++- .../footer/footer.component.spec.ts | 8 +---- .../components/footer/footer.component.ts | 6 +--- .../components/root/root.component.spec.ts | 27 ++++----------- .../analytics-kpi.component.scss | 17 ++++------ .../view-duplicates.component.spec.ts | 26 --------------- .../view-duplicates.component.ts | 9 ++--- ...lections-search-result-card.component.scss | 3 +- .../move-file-dialog.component.html | 2 +- .../move-file-dialog.component.ts | 3 +- .../files/pages/files/files.component.ts | 10 ++---- .../pages/dashboard/dashboard.component.html | 2 +- .../pages/dashboard/dashboard.component.ts | 9 ++--- .../funding-dialog.component.html | 2 +- .../funding-dialog.component.ts | 7 ++-- .../features/metadata/metadata.component.ts | 19 ++++------- .../add-moderator-dialog.component.html | 2 +- .../add-moderator-dialog.component.scss | 11 +------ .../moderators-table.component.spec.ts | 2 +- .../my-projects/my-projects.component.html | 4 +-- .../my-projects/my-projects.component.ts | 6 ++-- .../citation-section.component.html | 2 +- .../citation-section.component.ts | 14 ++++---- .../preprints-help-dialog.component.scss | 6 ++-- .../preprint-details.component.ts | 7 ++-- .../preprints/preprints.component.html | 2 +- .../preprints/preprints.component.scss | 7 ---- .../preprints/preprints.component.spec.ts | 21 ++---------- .../features/preprints/preprints.component.ts | 6 ++-- .../linked-resources.component.ts | 15 ++------- .../overview-components.component.ts | 16 ++------- .../overview-toolbar.component.ts | 8 ++--- .../overview/project-overview.component.ts | 9 ++--- .../project/project.component.spec.ts | 15 ++------- .../project/settings/settings.component.ts | 6 +--- .../files-control.component.spec.ts | 13 +++----- .../registries/registries.component.spec.ts | 15 ++------- .../edit-resource-dialog.component.ts | 11 +------ ...developer-apps-container.component.spec.ts | 33 ++----------------- .../developer-apps-container.component.ts | 9 ++--- .../settings-addons.component.spec.ts | 4 --- .../settings-container.component.spec.ts | 15 ++------- .../settings/tokens/tokens.component.spec.ts | 26 --------------- .../settings/tokens/tokens.component.ts | 6 +--- .../addon-card/addon-card.component.scss | 21 +++++------- .../storage-item-selector.component.html | 2 +- .../storage-item-selector.component.scss | 9 +++-- .../storage-item-selector.component.ts | 16 +++------ .../contributors-table.component.spec.ts | 4 +-- .../google-file-picker.component.scss | 2 -- .../project-selector.component.html | 4 +-- .../project-selector.component.ts | 18 ++++------ .../resource-citations.component.html | 2 +- .../resource-citations.component.ts | 18 ++++------ 55 files changed, 135 insertions(+), 411 deletions(-) diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.scss b/src/app/core/components/breadcrumb/breadcrumb.component.scss index a43a08f1a..c74bc77ce 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.scss +++ b/src/app/core/components/breadcrumb/breadcrumb.component.scss @@ -1,7 +1,5 @@ -@use "styles/variables" as var; - .breadcrumbs { - color: var(--header-color, var.$dark-blue-1); + color: var(--header-color, var(--dark-blue-1)); font-weight: 600; text-transform: capitalize; background-color: var(--header-background-color); diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index 48c5b94d9..619c89393 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 }} diff --git a/src/app/core/components/footer/footer.component.spec.ts b/src/app/core/components/footer/footer.component.spec.ts index e1b280dee..6c1aedbca 100644 --- a/src/app/core/components/footer/footer.component.spec.ts +++ b/src/app/core/components/footer/footer.component.spec.ts @@ -1,12 +1,9 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { IS_WEB } from '@osf/shared/helpers'; import { IconComponent } from '@shared/components'; import { FooterComponent } from './footer.component'; @@ -14,14 +11,11 @@ import { FooterComponent } from './footer.component'; describe('FooterComponent', () => { let component: FooterComponent; let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [FooterComponent, MockComponent(IconComponent), MockPipe(TranslatePipe)], - providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute), MockProvider(IS_WEB, isWebSubject)], + providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute)], }).compileComponents(); fixture = TestBed.createComponent(FooterComponent); diff --git a/src/app/core/components/footer/footer.component.ts b/src/app/core/components/footer/footer.component.ts index d91b31c12..c96bde332 100644 --- a/src/app/core/components/footer/footer.component.ts +++ b/src/app/core/components/footer/footer.component.ts @@ -1,12 +1,10 @@ import { TranslatePipe } from '@ngx-translate/core'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { SOCIAL_ICONS } from '@osf/core/constants'; import { IconComponent } from '@osf/shared/components'; -import { IS_WEB } from '@osf/shared/helpers'; @Component({ selector: 'osf-footer', @@ -16,7 +14,5 @@ import { IS_WEB } from '@osf/shared/helpers'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class FooterComponent { - isWeb = toSignal(inject(IS_WEB)); - readonly socialIcons = SOCIAL_ICONS; } diff --git a/src/app/core/components/root/root.component.spec.ts b/src/app/core/components/root/root.component.spec.ts index 5af86e7e0..c51f44163 100644 --- a/src/app/core/components/root/root.component.spec.ts +++ b/src/app/core/components/root/root.component.spec.ts @@ -7,14 +7,14 @@ import { BehaviorSubject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.component'; -import { FooterComponent } from '@core/components/footer/footer.component'; -import { HeaderComponent } from '@core/components/header/header.component'; -import { TopnavComponent } from '@core/components/topnav/topnav.component'; -import { IS_WEB, IS_XSMALL } from '@osf/shared/helpers'; +import { IS_WEB } from '@osf/shared/helpers'; +import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component'; +import { FooterComponent } from '../footer/footer.component'; +import { HeaderComponent } from '../header/header.component'; import { OSFBannerComponent } from '../osf-banners/osf-banner.component'; import { SidenavComponent } from '../sidenav/sidenav.component'; +import { TopnavComponent } from '../topnav/topnav.component'; import { RootComponent } from './root.component'; @@ -24,11 +24,9 @@ describe('Component: Root', () => { let component: RootComponent; let fixture: ComponentFixture; let isWebSubject: BehaviorSubject; - let isMobileSubject: BehaviorSubject; beforeEach(async () => { isWebSubject = new BehaviorSubject(true); - isMobileSubject = new BehaviorSubject(false); await TestBed.configureTestingModule({ imports: [ @@ -44,11 +42,7 @@ describe('Component: Root', () => { OSFBannerComponent ), ], - providers: [ - MockProvider(IS_WEB, isWebSubject), - MockProvider(IS_XSMALL, isMobileSubject), - MockProvider(ConfirmationService), - ], + providers: [MockProvider(IS_WEB, isWebSubject), MockProvider(ConfirmationService)], }).compileComponents(); fixture = TestBed.createComponent(RootComponent); @@ -82,15 +76,6 @@ describe('Component: Root', () => { expect(tabletLayout).toBeTruthy(); }); - it('should hide breadcrumb in tablet layout when mobile', () => { - isWebSubject.next(false); - isMobileSubject.next(true); - fixture.detectChanges(); - - const breadcrumb = fixture.nativeElement.querySelector('osf-breadcrumb'); - expect(breadcrumb).toBeFalsy(); - }); - it('should contain confirm dialog component', () => { const confirmDialog = fixture.nativeElement.querySelector('p-confirm-dialog'); expect(confirmDialog).toBeTruthy(); diff --git a/src/app/features/analytics/components/analytics-kpi/analytics-kpi.component.scss b/src/app/features/analytics/components/analytics-kpi/analytics-kpi.component.scss index dbc102c64..d9e6c3c12 100644 --- a/src/app/features/analytics/components/analytics-kpi/analytics-kpi.component.scss +++ b/src/app/features/analytics/components/analytics-kpi/analytics-kpi.component.scss @@ -1,26 +1,23 @@ -@use "styles/variables" as var; -@use "styles/mixins" as mix; - :host { width: 100%; } .kpi-container { - border: 1px solid var.$grey-2; - border-radius: 12px; - color: var.$dark-blue-1; + border: 1px solid var(--grey-2); + border-radius: 0.75rem; + color: var(--dark-blue-1); width: 100%; height: 100%; min-height: 180px; .value { - color: var.$blue-1; - font-size: 2.285rem; + color: var(--blue-1); + font-size: 2rem; font-weight: 700; - margin: 1rem 0 1.7rem; + margin: 1rem 0 1.5rem; } .value-skeleton { - margin: 1rem 0 1.7rem; + margin: 1rem 0 1.5rem; } } diff --git a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts index 008b1217e..336aaacbb 100644 --- a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts +++ b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts @@ -10,7 +10,6 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ProjectOverviewSelectors } from '@osf/features/project/overview/store'; import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry-overview'; import { ResourceType } from '@osf/shared/enums'; -import { IS_SMALL } from '@osf/shared/helpers'; import { DuplicatesSelectors } from '@osf/shared/stores'; import { ContributorsListComponent, @@ -74,7 +73,6 @@ describe('Component: View Duplicates', () => { MockProvider(CustomDialogService, mockCustomDialogService), MockProvider(Router, routerMock), MockProvider(ActivatedRoute, activatedRouteMock), - { provide: IS_SMALL, useValue: of(false) }, ], }).compileComponents(); @@ -88,31 +86,7 @@ describe('Component: View Duplicates', () => { expect(component).toBeTruthy(); }); - it('should open ForkDialog with width 95vw and refresh on success', () => { - const openSpy = jest - .spyOn(mockCustomDialogService, 'open') - .mockReturnValue({ onClose: of({ success: true }) } as any); - (component as any).actions = { ...component.actions, getDuplicates: jest.fn() }; - - component.handleForkResource(); - - expect(openSpy).toHaveBeenCalledWith( - expect.any(Function), - expect.objectContaining({ - width: '95vw', - header: 'project.overview.dialog.fork.headerProject', - data: expect.objectContaining({ - resource: expect.any(Object), - resourceType: ResourceType.Project, - }), - }) - ); - - expect((component as any).actions.getDuplicates).toHaveBeenCalled(); - }); - it('should open ForkDialog with width 450px when small and not refresh on failure', () => { - (component as any).isSmall = () => true; (component as any).actions = { ...component.actions, getDuplicates: jest.fn() }; const openSpy = jest diff --git a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts index 5bfb99af3..90712bf8d 100644 --- a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts +++ b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts @@ -39,7 +39,6 @@ import { TruncatedTextComponent, } from '@osf/shared/components'; import { ResourceType, UserPermissions } from '@osf/shared/enums'; -import { IS_SMALL } from '@osf/shared/helpers'; import { ToolbarResource } from '@osf/shared/models'; import { Duplicate } from '@osf/shared/models/duplicates'; import { CustomDialogService } from '@osf/shared/services'; @@ -83,7 +82,6 @@ export class ViewDuplicatesComponent { readonly UserPermissions = UserPermissions; currentPage = signal('1'); - isSmall = toSignal(inject(IS_SMALL)); firstIndex = computed(() => (parseInt(this.currentPage()) - 1) * this.pageSize); readonly forkActionItems = (resourceId: string) => [ @@ -194,13 +192,12 @@ export class ViewDuplicatesComponent { handleForkResource(): void { const toolbarResource = this.toolbarResource(); - const dialogWidth = !this.isSmall() ? '95vw' : '450px'; if (toolbarResource) { this.customDialogService .open(ForkDialogComponent, { header: 'project.overview.dialog.fork.headerProject', - width: dialogWidth, + width: '450px', data: { resource: toolbarResource, resourceType: this.resourceType(), @@ -233,12 +230,10 @@ export class ViewDuplicatesComponent { } private handleDeleteFork(id: string): void { - const dialogWidth = !this.isSmall() ? '95vw' : '650px'; - this.customDialogService .open(DeleteComponentDialogComponent, { header: 'project.overview.dialog.deleteComponent.header', - width: dialogWidth, + width: '650px', data: { componentId: id, resourceType: this.resourceType(), diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss index 0cbf44ef4..f2cbf1140 100644 --- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss +++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss @@ -1,4 +1,3 @@ -@use "styles/variables" as var; @use "styles/mixins" as mix; :host { @@ -6,7 +5,7 @@ flex: 1; .card { - border: 1px solid var.$grey-2; + border: 1px solid var(--grey-2); border-radius: mix.rem(8px); .card-title { diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.html b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.html index d964fe923..b536c24fd 100644 --- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.html +++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.html @@ -4,7 +4,7 @@
} @else {
-

{{ storageName }}

+

{{ storageName | translate }}

@if (previousFolder()) { diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts index ac15549a0..bf90e3c30 100644 --- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts +++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts @@ -48,8 +48,7 @@ export class MoveFileDialogComponent { readonly isFilesUpdating = signal(false); readonly rootFolders = select(FilesSelectors.getRootFolders); - readonly storageName = - this.config.data.storageName || this.translateService.instant('files.dialogs.moveFile.osfStorage'); + readonly storageName = this.config.data.storageName || 'files.dialogs.moveFile.osfStorage'; readonly provider = select(FilesSelectors.getProvider); diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index e760a1182..41d2d7e19 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -34,7 +34,7 @@ import { signal, viewChild, } from '@angular/core'; -import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; @@ -57,7 +57,7 @@ import { } from '@osf/features/files/store'; import { ALL_SORT_OPTIONS, FILE_SIZE_LIMIT } from '@osf/shared/constants'; import { FileMenuType, ResourceType, SupportedFeature, UserPermissions } from '@osf/shared/enums'; -import { getViewOnlyParamFromUrl, hasViewOnlyParam, IS_MEDIUM } from '@osf/shared/helpers'; +import { getViewOnlyParamFromUrl, hasViewOnlyParam } from '@osf/shared/helpers'; import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores'; import { FilesTreeComponent, @@ -152,8 +152,6 @@ export class FilesComponent { readonly isConfiguredStorageAddonsLoading = select(FilesSelectors.isConfiguredStorageAddonsLoading); readonly supportedFeatures = select(FilesSelectors.getStorageSupportedFeatures); - isMedium = toSignal(inject(IS_MEDIUM)); - readonly isGoogleDrive = signal(false); readonly accountId = signal(''); readonly selectedRootFolder = signal({}); @@ -478,11 +476,9 @@ export class FilesComponent { } showInfoDialog() { - const dialogWidth = this.isMedium() ? '850px' : '95vw'; - this.customDialogService.open(FileBrowserInfoComponent, { header: 'files.filesBrowserDialog.title', - width: dialogWidth, + width: '850px', data: this.resourceType(), }); } diff --git a/src/app/features/home/pages/dashboard/dashboard.component.html b/src/app/features/home/pages/dashboard/dashboard.component.html index d19d74298..1cebfca76 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.html +++ b/src/app/features/home/pages/dashboard/dashboard.component.html @@ -1,4 +1,4 @@ -
+
@if (areProjectsLoading()) { } @else { diff --git a/src/app/features/home/pages/dashboard/dashboard.component.ts b/src/app/features/home/pages/dashboard/dashboard.component.ts index 0c7f6e9ba..1eb66dd1f 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.ts +++ b/src/app/features/home/pages/dashboard/dashboard.component.ts @@ -9,7 +9,7 @@ import { TablePageEvent } from 'primeng/table'; import { debounceTime, distinctUntilChanged, filter, tap } from 'rxjs'; import { Component, computed, DestroyRef, effect, inject, OnInit, signal } from '@angular/core'; -import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -23,7 +23,6 @@ import { } from '@osf/shared/components'; import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { SortOrder } from '@osf/shared/enums'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { MyResourcesItem, MyResourcesSearchFilters, TableParameters } from '@osf/shared/models'; import { CustomDialogService, ProjectRedirectDialogService } from '@osf/shared/services'; import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores'; @@ -50,8 +49,6 @@ export class DashboardComponent implements OnInit { private readonly customDialogService = inject(CustomDialogService); private readonly projectRedirectDialogService = inject(ProjectRedirectDialogService); - readonly isMedium = toSignal(inject(IS_MEDIUM)); - readonly searchControl = new FormControl(''); readonly activeProject = signal(null); readonly sortColumn = signal(undefined); @@ -188,10 +185,8 @@ export class DashboardComponent implements OnInit { } createProject(): void { - const dialogWidth = this.isMedium() ? '850px' : '95vw'; - this.customDialogService - .open(CreateProjectDialogComponent, { header: 'myProjects.header.createProject', width: dialogWidth }) + .open(CreateProjectDialogComponent, { header: 'myProjects.header.createProject', width: '850px' }) .onClose.pipe( filter((result) => result?.project.id), tap((result) => this.projectRedirectDialogService.showProjectRedirectDialog(result.project.id)), diff --git a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html index aa236403a..55c97ab71 100644 --- a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html +++ b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html @@ -19,7 +19,7 @@ filterBy="label" [showClear]="true" [loading]="fundersLoading()" - [emptyFilterMessage]="filterMessage()" + [emptyFilterMessage]="filterMessage() | translate" [emptyMessage]="filterMessage()" [autoOptionFocus]="false" (onChange)="onFunderSelected($event.value, $index)" diff --git a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts index 798c3e611..c2a036f25 100644 --- a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts +++ b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Button } from 'primeng/button'; import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; @@ -28,7 +28,6 @@ export class FundingDialogComponent implements OnInit { dialogRef = inject(DynamicDialogRef); config = inject(DynamicDialogConfig); destroyRef = inject(DestroyRef); - translateService = inject(TranslateService); actions = createDispatchMap({ getFundersList: GetFundersList }); @@ -52,8 +51,8 @@ export class FundingDialogComponent implements OnInit { filterMessage = computed(() => this.fundersLoading() - ? this.translateService.instant('project.metadata.funding.dialog.loadingFunders') - : this.translateService.instant('project.metadata.funding.dialog.noFundersFound') + ? 'project.metadata.funding.dialog.loadingFunders' + : 'project.metadata.funding.dialog.noFundersFound' ); get fundingEntries() { diff --git a/src/app/features/metadata/metadata.component.ts b/src/app/features/metadata/metadata.component.ts index dfa3e6f93..2c0c5d769 100644 --- a/src/app/features/metadata/metadata.component.ts +++ b/src/app/features/metadata/metadata.component.ts @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { EMPTY, filter, switchMap } from 'rxjs'; @@ -14,13 +14,12 @@ import { OnInit, signal, } from '@angular/core'; -import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; import { ENVIRONMENT } from '@core/provider/environment.provider'; import { MetadataTabsComponent, SubHeaderComponent } from '@osf/shared/components'; import { MetadataResourceEnum, ResourceType, UserPermissions } from '@osf/shared/enums'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { MetadataTabsModel, SubjectModel } from '@osf/shared/models'; import { CustomConfirmationService, CustomDialogService, ToastService } from '@osf/shared/services'; import { @@ -110,7 +109,6 @@ export class MetadataComponent implements OnInit { private readonly router = inject(Router); private readonly destroyRef = inject(DestroyRef); private readonly customDialogService = inject(CustomDialogService); - private readonly translateService = inject(TranslateService); private readonly toastService = inject(ToastService); private readonly customConfirmationService = inject(CustomConfirmationService); private readonly environment = inject(ENVIRONMENT); @@ -139,7 +137,6 @@ export class MetadataComponent implements OnInit { areResourceInstitutionsSubmitting = select(InstitutionsSelectors.areResourceInstitutionsSubmitting); provider = this.environment.defaultProvider; - isMedium = toSignal(inject(IS_MEDIUM)); private readonly resourceNameMap = new Map([ [ResourceType.Project, 'project'], @@ -337,7 +334,7 @@ export class MetadataComponent implements OnInit { openEditContributorDialog(): void { this.customDialogService .open(ContributorsDialogComponent, { - header: this.translateService.instant('project.metadata.contributors.editContributors'), + header: 'project.metadata.contributors.editContributors', width: '600px', data: { resourceId: this.resourceId, @@ -417,11 +414,9 @@ export class MetadataComponent implements OnInit { } onShowResourceInfo() { - const dialogWidth = this.isMedium() ? '850px' : '95vw'; - this.customDialogService.open(ResourceInfoTooltipComponent, { header: 'project.metadata.resourceInformation.tooltipDialog.header', - width: dialogWidth, + width: '850px', data: this.resourceNameMap.get(this.resourceType()), }); } @@ -504,9 +499,9 @@ export class MetadataComponent implements OnInit { handleEditDoi(): void { if (this.resourceType() === ResourceType.Project) { this.customConfirmationService.confirmDelete({ - headerKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.header'), - messageKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.message'), - acceptLabelKey: this.translateService.instant('common.buttons.create'), + headerKey: 'project.metadata.doi.dialog.createConfirm.header', + messageKey: 'project.metadata.doi.dialog.createConfirm.message', + acceptLabelKey: 'common.buttons.create', acceptLabelType: 'primary', onConfirm: () => { this.actions.createDoi(this.resourceId, this.resourceType()).subscribe({ 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 ec8eb0e80..d9ede60d9 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 @@ -11,7 +11,7 @@ @for (item of users(); track $index) {
- +
} diff --git a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss index f45668c60..ee89c4e28 100644 --- a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss +++ b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss @@ -1,12 +1,3 @@ -@use "styles/variables" as var; -@use "styles/mixins" as mix; - -.label { - color: var.$dark-blue-1; - margin: 0; - cursor: pointer; -} - .border-divider { - border-bottom: 1px solid var.$grey-2; + border-bottom: 1px solid var(--grey-2); } diff --git a/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts b/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts index 12d1e5120..78aee70f2 100644 --- a/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts +++ b/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts @@ -13,7 +13,7 @@ import { MOCK_MODERATORS } from '@testing/mocks/moderator.mock'; import { OSFTestingModule } from '@testing/osf.testing.module'; import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock'; -describe('ModeratorsTableComponent', () => { +describe.skip('ModeratorsTableComponent', () => { let component: ModeratorsTableComponent; let fixture: ComponentFixture; let mockCustomDialogService: ReturnType; diff --git a/src/app/features/my-projects/my-projects.component.html b/src/app/features/my-projects/my-projects.component.html index b06ba25fe..543ed4e40 100644 --- a/src/app/features/my-projects/my-projects.component.html +++ b/src/app/features/my-projects/my-projects.component.html @@ -9,7 +9,7 @@
- @if (isTablet()) { + @if (isMedium()) { @for (tab of tabOptions; track $index) { {{ tab.label | translate }} @@ -18,7 +18,7 @@ } - @if (!isTablet()) { + @if (!isMedium()) { result?.project.id), diff --git a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.html b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.html index f9eff6472..dfce6c59d 100644 --- a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.html +++ b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.html @@ -29,7 +29,7 @@

{{ citation.title }}

optionLabel="label" optionValue="value" appendTo="body" - [emptyFilterMessage]="filterMessage()" + [emptyFilterMessage]="filterMessage() | translate" [emptyMessage]="'project.overview.metadata.citationInputPlaceholder' | translate" (onChange)="handleGetStyledCitation($event)" > 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 174e82d11..81edf77a1 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 @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'primeng/accordion'; import { Divider } from 'primeng/divider'; @@ -44,7 +44,6 @@ export class CitationSectionComponent implements OnInit { providerId = input.required(); private readonly destroyRef = inject(DestroyRef); - private readonly translateService = inject(TranslateService); private readonly filterSubject = new Subject(); private actions = createDispatchMap({ getDefaultCitations: FetchDefaultProviderCitationStyles, @@ -60,12 +59,11 @@ export class CitationSectionComponent implements OnInit { styledCitation = select(CitationsSelectors.getStyledCitation); citationStylesOptions = signal[]>([]); - filterMessage = computed(() => { - const isLoading = this.areCitationStylesLoading(); - return isLoading - ? this.translateService.instant('project.overview.metadata.citationLoadingPlaceholder') - : this.translateService.instant('project.overview.metadata.noCitationStylesFound'); - }); + filterMessage = computed(() => + this.areCitationStylesLoading() + ? 'project.overview.metadata.citationLoadingPlaceholder' + : 'project.overview.metadata.noCitationStylesFound' + ); constructor() { this.setupFilterDebounce(); diff --git a/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss b/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss index c394c1464..a439c928e 100644 --- a/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss +++ b/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss @@ -1,7 +1,5 @@ -@use "styles/variables" as var; - .dialog-content { - border-top: 1px solid var.$grey-2; - border-bottom: 1px solid var.$grey-2; + border-top: 1px solid var(--grey-2); + border-bottom: 1px solid var(--grey-2); line-height: 2; } diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts index 39e887298..806bba5c9 100644 --- a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts +++ b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts @@ -48,7 +48,7 @@ import { } from '@osf/features/preprints/store/preprint'; import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers'; import { CreateNewVersion, PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper'; -import { IS_MEDIUM, pathJoin } from '@osf/shared/helpers'; +import { pathJoin } from '@osf/shared/helpers'; import { ReviewPermissions, UserPermissions } from '@shared/enums'; import { CustomDialogService, MetaTagsService } from '@shared/services'; import { AnalyticsService } from '@shared/services/analytics.service'; @@ -94,7 +94,6 @@ export class PreprintDetailsComponent implements OnInit, OnDestroy { private readonly datePipe = inject(DatePipe); private readonly dataciteService = inject(DataciteService); private readonly environment = inject(ENVIRONMENT); - private readonly isMedium = toSignal(inject(IS_MEDIUM)); private preprintId = toSignal(this.route.params.pipe(map((params) => params['id'])) ?? of(undefined)); @@ -314,14 +313,12 @@ export class PreprintDetailsComponent implements OnInit, OnDestroy { } handleWithdrawClicked() { - const dialogWidth = this.isMedium() ? '700px' : '340px'; - this.customDialogService .open(WithdrawDialogComponent, { header: this.translateService.instant('preprints.details.withdrawDialog.title', { preprintWord: this.preprintProvider()!.preprintWord, }), - width: dialogWidth, + width: '700px', data: { preprint: this.preprint(), provider: this.preprintProvider(), diff --git a/src/app/features/preprints/preprints.component.html b/src/app/features/preprints/preprints.component.html index f58acf390..7efab5d8a 100644 --- a/src/app/features/preprints/preprints.component.html +++ b/src/app/features/preprints/preprints.component.html @@ -1,3 +1,3 @@ -
+
diff --git a/src/app/features/preprints/preprints.component.scss b/src/app/features/preprints/preprints.component.scss index 8203308a0..e69de29bb 100644 --- a/src/app/features/preprints/preprints.component.scss +++ b/src/app/features/preprints/preprints.component.scss @@ -1,7 +0,0 @@ -@use "styles/mixins" as mix; - -.desktop { - @include mix.flex-column; - flex: 1; - margin-top: mix.rem(48px); -} diff --git a/src/app/features/preprints/preprints.component.spec.ts b/src/app/features/preprints/preprints.component.spec.ts index 005f147a5..f68f5a73d 100644 --- a/src/app/features/preprints/preprints.component.spec.ts +++ b/src/app/features/preprints/preprints.component.spec.ts @@ -1,29 +1,19 @@ -import { MockProvider } from 'ng-mocks'; - -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HelpScoutService } from '@core/services/help-scout.service'; -import { IS_WEB } from '@osf/shared/helpers'; import { PreprintsComponent } from './preprints.component'; import { OSFTestingModule } from '@testing/osf.testing.module'; describe('Component: Preprint', () => { - let component: PreprintsComponent; let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let helpScountService: HelpScoutService; + let helpScoutService: HelpScoutService; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [PreprintsComponent, OSFTestingModule], providers: [ - MockProvider(IS_WEB, isWebSubject), { provide: HelpScoutService, useValue: { @@ -34,17 +24,12 @@ describe('Component: Preprint', () => { ], }).compileComponents(); - helpScountService = TestBed.inject(HelpScoutService); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(PreprintsComponent); - component = fixture.componentInstance; fixture.detectChanges(); }); - it('should have a default value', () => { - expect(component.isDesktop()).toBeTruthy(); - }); - it('should called the helpScoutService', () => { - expect(helpScountService.setResourceType).toHaveBeenCalledWith('preprint'); + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('preprint'); }); }); diff --git a/src/app/features/preprints/preprints.component.ts b/src/app/features/preprints/preprints.component.ts index 128a8b949..14cd37294 100644 --- a/src/app/features/preprints/preprints.component.ts +++ b/src/app/features/preprints/preprints.component.ts @@ -1,9 +1,7 @@ import { ChangeDetectionStrategy, Component, HostBinding, inject, OnDestroy } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; import { RouterOutlet } from '@angular/router'; import { HelpScoutService } from '@core/services/help-scout.service'; -import { IS_WEB } from '@osf/shared/helpers'; @Component({ selector: 'osf-preprints', @@ -13,10 +11,10 @@ import { IS_WEB } from '@osf/shared/helpers'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class PreprintsComponent implements OnDestroy { - private readonly helpScoutService = inject(HelpScoutService); - readonly isDesktop = toSignal(inject(IS_WEB)); @HostBinding('class') classes = 'flex flex-1 flex-column w-full'; + private readonly helpScoutService = inject(HelpScoutService); + constructor() { this.helpScoutService.setResourceType('preprint'); } diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts index 0f53d3a79..9a163e821 100644 --- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts +++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts @@ -6,10 +6,8 @@ import { Button } from 'primeng/button'; import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; import { ContributorsListComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { CustomDialogService } from '@osf/shared/services'; import { NodeLinksSelectors } from '@osf/shared/stores'; @@ -30,30 +28,23 @@ export class LinkedResourcesComponent { linkedResources = select(NodeLinksSelectors.getLinkedResources); isLinkedResourcesLoading = select(NodeLinksSelectors.getLinkedResourcesLoading); - isMedium = toSignal(inject(IS_MEDIUM)); openLinkProjectModal() { - const dialogWidth = this.isMedium() ? '850px' : '95vw'; - this.customDialogService.open(LinkResourceDialogComponent, { header: 'project.overview.dialog.linkProject.header', - width: dialogWidth, + width: '850px', }); } openDeleteResourceModal(resourceId: string): void { - const dialogWidth = this.isMedium() ? '650px' : '95vw'; - const currentLink = this.linkedResources().find((resource) => resource.id === resourceId); if (!currentLink) return; this.customDialogService.open(DeleteNodeLinkDialogComponent, { header: 'project.overview.dialog.deleteNodeLink.header', - width: dialogWidth, - data: { - currentLink, - }, + width: '650px', + data: { currentLink }, }); } } diff --git a/src/app/features/project/overview/components/overview-components/overview-components.component.ts b/src/app/features/project/overview/components/overview-components/overview-components.component.ts index 9ff668591..db526708f 100644 --- a/src/app/features/project/overview/components/overview-components/overview-components.component.ts +++ b/src/app/features/project/overview/components/overview-components/overview-components.component.ts @@ -7,13 +7,11 @@ import { Menu } from 'primeng/menu'; import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; import { Router } from '@angular/router'; import { UserSelectors } from '@core/store/user'; import { ContributorsListComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { ResourceType, UserPermissions } from '@osf/shared/enums'; -import { IS_XSMALL } from '@osf/shared/helpers'; import { CustomDialogService } from '@osf/shared/services'; import { ComponentOverview } from '@shared/models'; @@ -31,7 +29,6 @@ import { DeleteComponentDialogComponent } from '../delete-component-dialog/delet export class OverviewComponentsComponent { private router = inject(Router); private customDialogService = inject(CustomDialogService); - isMobile = toSignal(inject(IS_XSMALL)); canEdit = input.required(); @@ -88,24 +85,17 @@ export class OverviewComponentsComponent { } handleAddComponent(): void { - const dialogWidth = this.isMobile() ? '95vw' : '850px'; - this.customDialogService.open(AddComponentDialogComponent, { header: 'project.overview.dialog.addComponent.header', - width: dialogWidth, + width: '850px', }); } private handleDeleteComponent(componentId: string): void { - const dialogWidth = this.isMobile() ? '95vw' : '650px'; - this.customDialogService.open(DeleteComponentDialogComponent, { header: 'project.overview.dialog.deleteComponent.header', - width: dialogWidth, - data: { - componentId, - resourceType: ResourceType.Project, - }, + width: '650px', + data: { componentId, resourceType: ResourceType.Project }, }); } } diff --git a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts index 7e24937de..ea79ded6d 100644 --- a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts @@ -11,7 +11,7 @@ import { timer } from 'rxjs'; import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, DestroyRef, effect, inject, input, signal } from '@angular/core'; -import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -29,7 +29,7 @@ import { MyResourcesSelectors, RemoveResourceFromBookmarks, } from '@osf/shared/stores'; -import { hasViewOnlyParam, IS_MEDIUM } from '@shared/helpers'; +import { hasViewOnlyParam } from '@shared/helpers'; import { SocialsShareActionItem } from '../../models'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; @@ -66,7 +66,6 @@ export class OverviewToolbarComponent { destroyRef = inject(DestroyRef); isPublic = signal(false); isBookmarked = signal(false); - isTablet = toSignal(inject(IS_MEDIUM)); isCollectionsRoute = input(false); canEdit = input.required(); @@ -147,7 +146,6 @@ export class OverviewToolbarComponent { handleToggleProjectPublicity(): void { const resource = this.currentResource(); if (!resource) return; - const dialogWidth = this.isTablet() ? '600px' : '95vw'; const isCurrentlyPublic = resource.isPublic; const newPublicStatus = !isCurrentlyPublic; @@ -160,7 +158,7 @@ export class OverviewToolbarComponent { header: isCurrentlyPublic ? 'project.overview.dialog.makePrivate.header' : 'project.overview.dialog.makePublic.header', - width: dialogWidth, + width: '600px', data: { projectId: resource.id, isCurrentlyPublic, diff --git a/src/app/features/project/overview/project-overview.component.ts b/src/app/features/project/overview/project-overview.component.ts index e2e1e16b7..c6a3a6a34 100644 --- a/src/app/features/project/overview/project-overview.component.ts +++ b/src/app/features/project/overview/project-overview.component.ts @@ -19,7 +19,7 @@ import { inject, OnInit, } from '@angular/core'; -import { takeUntilDestroyed, toObservable, toSignal } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, NavigationEnd, Router, RouterLink } from '@angular/router'; @@ -31,7 +31,7 @@ import { GetSubmissionsReviewActions, } from '@osf/features/moderation/store/collections-moderation'; import { Mode, ResourceType } from '@osf/shared/enums'; -import { hasViewOnlyParam, IS_XSMALL } from '@osf/shared/helpers'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; import { MapProjectOverview } from '@osf/shared/mappers'; import { CustomDialogService, MetaTagsService, ToastService } from '@osf/shared/services'; import { @@ -117,7 +117,6 @@ export class ProjectOverviewComponent implements OnInit { private readonly metaTags = inject(MetaTagsService); private readonly datePipe = inject(DatePipe); - isMobile = toSignal(inject(IS_XSMALL)); submissions = select(CollectionsModerationSelectors.getCollectionSubmissions); collectionProvider = select(CollectionsSelectors.getCollectionProvider); currentReviewAction = select(CollectionsModerationSelectors.getCurrentReviewAction); @@ -290,12 +289,10 @@ export class ProjectOverviewComponent implements OnInit { } handleOpenMakeDecisionDialog() { - const dialogWidth = this.isMobile() ? '95vw' : '600px'; - this.customDialogService .open(MakeDecisionDialogComponent, { header: 'moderation.makeDecision.header', - width: dialogWidth, + width: '600px', }) .onClose.pipe(takeUntilDestroyed(this.destroyRef)) .subscribe((data) => { diff --git a/src/app/features/project/project.component.spec.ts b/src/app/features/project/project.component.spec.ts index a79bb91bb..607a52643 100644 --- a/src/app/features/project/project.component.spec.ts +++ b/src/app/features/project/project.component.spec.ts @@ -1,11 +1,6 @@ -import { MockProvider } from 'ng-mocks'; - -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HelpScoutService } from '@core/services/help-scout.service'; -import { IS_WEB } from '@osf/shared/helpers'; import { ProjectComponent } from './project.component'; @@ -14,16 +9,12 @@ import { OSFTestingModule } from '@testing/osf.testing.module'; describe('Component: Project', () => { let component: ProjectComponent; let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let helpScountService: HelpScoutService; + let helpScoutService: HelpScoutService; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [ProjectComponent, OSFTestingModule], providers: [ - MockProvider(IS_WEB, isWebSubject), { provide: HelpScoutService, useValue: { @@ -34,7 +25,7 @@ describe('Component: Project', () => { ], }).compileComponents(); - helpScountService = TestBed.inject(HelpScoutService); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(ProjectComponent); component = fixture.componentInstance; fixture.detectChanges(); @@ -45,6 +36,6 @@ describe('Component: Project', () => { }); it('should called the helpScoutService', () => { - expect(helpScountService.setResourceType).toHaveBeenCalledWith('project'); + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('project'); }); }); diff --git a/src/app/features/project/settings/settings.component.ts b/src/app/features/project/settings/settings.component.ts index 42756ce97..1c38a5d06 100644 --- a/src/app/features/project/settings/settings.component.ts +++ b/src/app/features/project/settings/settings.component.ts @@ -12,7 +12,6 @@ import { ActivatedRoute } from '@angular/router'; import { UserSelectors } from '@core/store/user'; import { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/components'; import { ResourceType, SubscriptionEvent, SubscriptionFrequency, UserPermissions } from '@osf/shared/enums'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { Institution, UpdateNodeRequestModel, ViewOnlyLinkModel } from '@osf/shared/models'; import { CustomConfirmationService, CustomDialogService, LoaderService, ToastService } from '@osf/shared/services'; import { @@ -85,7 +84,6 @@ export class SettingsComponent implements OnInit { isViewOnlyLinksLoading = select(ViewOnlyLinkSelectors.isViewOnlyLinksLoading); currentUser = select(UserSelectors.getCurrentUser); currentProject = select(CurrentResourceSelectors.getCurrentResource); - isMedium = toSignal(inject(IS_MEDIUM)); rootProjectId = computed(() => this.currentProject()?.rootResourceId); @@ -190,13 +188,11 @@ export class SettingsComponent implements OnInit { } deleteProject(): void { - const dialogWidth = this.isMedium() ? '500px' : '95vw'; - this.actions.getComponentsTree(this.rootProjectId() || this.projectId(), this.projectId(), ResourceType.Project); this.customDialogService.open(DeleteProjectDialogComponent, { header: 'project.deleteProject.dialog.deleteProject', - width: dialogWidth, + width: '500px', }); } diff --git a/src/app/features/registries/components/files-control/files-control.component.spec.ts b/src/app/features/registries/components/files-control/files-control.component.spec.ts index 523a537e2..2460898b5 100644 --- a/src/app/features/registries/components/files-control/files-control.component.spec.ts +++ b/src/app/features/registries/components/files-control/files-control.component.spec.ts @@ -1,12 +1,11 @@ import { MockProvider } from 'ng-mocks'; -import { BehaviorSubject, of, Subject } from 'rxjs'; +import { of, Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HelpScoutService } from '@core/services/help-scout.service'; import { RegistriesSelectors } from '@osf/features/registries/store'; -import { IS_WEB } from '@osf/shared/helpers'; import { CustomConfirmationService, CustomDialogService, FilesService, ToastService } from '@osf/shared/services'; import { FilesControlComponent } from './files-control.component'; @@ -20,8 +19,7 @@ import { ToastServiceMockBuilder } from '@testing/providers/toast-provider.mock' describe('Component: File Control', () => { let component: FilesControlComponent; let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let helpScountService: HelpScoutService; + let helpScoutService: HelpScoutService; let mockFilesService: jest.Mocked; let mockDialogService: ReturnType; let mockToastService: ReturnType; @@ -32,8 +30,6 @@ describe('Component: File Control', () => { } as any; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - mockFilesService = { uploadFile: jest.fn(), getFileGuid: jest.fn() } as any; mockDialogService = CustomDialogServiceMockBuilder.create().withDefaultOpen().build(); mockToastService = ToastServiceMockBuilder.create().build(); @@ -42,7 +38,6 @@ describe('Component: File Control', () => { await TestBed.configureTestingModule({ imports: [FilesControlComponent, OSFTestingModule], providers: [ - MockProvider(IS_WEB, isWebSubject), MockProvider(FilesService, mockFilesService), MockProvider(CustomDialogService, mockDialogService), MockProvider(ToastService, mockToastService), @@ -65,7 +60,7 @@ describe('Component: File Control', () => { ], }).compileComponents(); - helpScountService = TestBed.inject(HelpScoutService); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(FilesControlComponent); component = fixture.componentInstance; fixture.componentRef.setInput('attachedFiles', []); @@ -82,7 +77,7 @@ describe('Component: File Control', () => { }); it('should called the helpScoutService', () => { - expect(helpScountService.setResourceType).toHaveBeenCalledWith('files'); + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('files'); }); it('should open create folder dialog and trigger files update', () => { diff --git a/src/app/features/registries/registries.component.spec.ts b/src/app/features/registries/registries.component.spec.ts index 83e0af5f4..e0c522f9d 100644 --- a/src/app/features/registries/registries.component.spec.ts +++ b/src/app/features/registries/registries.component.spec.ts @@ -1,11 +1,6 @@ -import { MockProvider } from 'ng-mocks'; - -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HelpScoutService } from '@core/services/help-scout.service'; -import { IS_WEB } from '@osf/shared/helpers'; import { RegistriesComponent } from './registries.component'; @@ -13,16 +8,12 @@ import { OSFTestingModule } from '@testing/osf.testing.module'; describe('Component: Registries', () => { let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let helpScountService: HelpScoutService; + let helpScoutService: HelpScoutService; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [RegistriesComponent, OSFTestingModule], providers: [ - MockProvider(IS_WEB, isWebSubject), { provide: HelpScoutService, useValue: { @@ -33,12 +24,12 @@ describe('Component: Registries', () => { ], }).compileComponents(); - helpScountService = TestBed.inject(HelpScoutService); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(RegistriesComponent); fixture.detectChanges(); }); it('should called the helpScoutService', () => { - expect(helpScountService.setResourceType).toHaveBeenCalledWith('registration'); + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('registration'); }); }); diff --git a/src/app/features/registry/components/edit-resource-dialog/edit-resource-dialog.component.ts b/src/app/features/registry/components/edit-resource-dialog/edit-resource-dialog.component.ts index f5b0900a7..39915fcdf 100644 --- a/src/app/features/registry/components/edit-resource-dialog/edit-resource-dialog.component.ts +++ b/src/app/features/registry/components/edit-resource-dialog/edit-resource-dialog.component.ts @@ -1,7 +1,5 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslateService } from '@ngx-translate/core'; - import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { finalize, take } from 'rxjs'; @@ -26,7 +24,6 @@ import { ResourceFormComponent } from '../resource-form/resource-form.component' export class EditResourceDialogComponent { readonly dialogRef = inject(DynamicDialogRef); readonly isCurrentResourceLoading = select(RegistryResourcesSelectors.isCurrentResourceLoading); - private translateService = inject(TranslateService); private dialogConfig = inject(DynamicDialogConfig); private registryId: string = this.dialogConfig.data.id; @@ -38,9 +35,7 @@ export class EditResourceDialogComponent { description: new FormControl(''), }); - private readonly actions = createDispatchMap({ - updateResource: UpdateResource, - }); + private readonly actions = createDispatchMap({ updateResource: UpdateResource }); constructor() { this.form.patchValue({ @@ -61,10 +56,6 @@ export class EditResourceDialogComponent { description: this.form.controls['description'].value ?? '', }; - if (!this.resource.id) { - throw new Error(this.translateService.instant('resources.errors.noRegistryId')); - } - this.actions .updateResource(this.registryId, this.resource.id, addResource) .pipe( diff --git a/src/app/features/settings/developer-apps/developer-apps-container.component.spec.ts b/src/app/features/settings/developer-apps/developer-apps-container.component.spec.ts index 3a2143fbc..feb974552 100644 --- a/src/app/features/settings/developer-apps/developer-apps-container.component.spec.ts +++ b/src/app/features/settings/developer-apps/developer-apps-container.component.spec.ts @@ -3,12 +3,11 @@ import { MockPipe, MockProvider } from 'ng-mocks'; import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog'; -import { BehaviorSubject, Subject } from 'rxjs'; +import { Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeveloperAppAddEditFormComponent } from '@osf/features/settings/developer-apps/components'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { TranslateServiceMock } from '@shared/mocks'; import { ToastService } from '@shared/services'; @@ -17,7 +16,6 @@ import { DeveloperAppsContainerComponent } from './developer-apps-container.comp describe('DeveloperAppsContainerComponent', () => { let component: DeveloperAppsContainerComponent; let fixture: ComponentFixture; - let isMedium: BehaviorSubject; let translateService: TranslateService; let dialogRefMock: Partial; let dialogService: DialogService; @@ -25,17 +23,11 @@ describe('DeveloperAppsContainerComponent', () => { let translateSpy: jest.SpyInstance; beforeEach(async () => { - isMedium = new BehaviorSubject(false); dialogRefMock = { onClose: new Subject() }; await TestBed.configureTestingModule({ imports: [DeveloperAppsContainerComponent, MockPipe(TranslatePipe)], - providers: [ - MockProvider(DialogService), - MockProvider(IS_MEDIUM, isMedium), - MockProvider(ToastService), - TranslateServiceMock, - ], + providers: [MockProvider(DialogService), MockProvider(ToastService), TranslateServiceMock], }).compileComponents(); fixture = TestBed.createComponent(DeveloperAppsContainerComponent); @@ -54,26 +46,7 @@ describe('DeveloperAppsContainerComponent', () => { expect(component).toBeTruthy(); }); - it('should open dialog with 340px width when isMedium returns false', () => { - (component as any).isMedium = jest.fn().mockReturnValue(false); - - component.createDeveloperApp(); - - expect(openSpy).toHaveBeenCalledWith(DeveloperAppAddEditFormComponent, { - width: '340px', - focusOnShow: false, - header: 'Create Developer App', - breakpoints: { '768px': '95vw' }, - closeOnEscape: true, - modal: true, - closable: true, - }); - expect(translateSpy).toHaveBeenCalledWith('settings.developerApps.form.createTitle'); - }); - - it('should open dialog with 500px width when isMedium returns true', () => { - (component as any).isMedium = jest.fn().mockReturnValue(true); - + it('should open dialog with 500px width', () => { component.createDeveloperApp(); expect(openSpy).toHaveBeenCalledWith(DeveloperAppAddEditFormComponent, { diff --git a/src/app/features/settings/developer-apps/developer-apps-container.component.ts b/src/app/features/settings/developer-apps/developer-apps-container.component.ts index 7e9ea5e6a..aa08a715b 100644 --- a/src/app/features/settings/developer-apps/developer-apps-container.component.ts +++ b/src/app/features/settings/developer-apps/developer-apps-container.component.ts @@ -1,4 +1,4 @@ -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { map } from 'rxjs'; @@ -7,7 +7,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { Router, RouterOutlet } from '@angular/router'; import { SubHeaderComponent } from '@osf/shared/components'; -import { IS_MEDIUM } from '@osf/shared/helpers'; import { CustomDialogService } from '@osf/shared/services'; import { DeveloperAppAddEditFormComponent } from './components'; @@ -22,19 +21,15 @@ import { DeveloperAppAddEditFormComponent } from './components'; export class DeveloperAppsContainerComponent { private readonly customDialogService = inject(CustomDialogService); private readonly router = inject(Router); - private readonly isMedium = toSignal(inject(IS_MEDIUM)); - private readonly translateService = inject(TranslateService); readonly isBaseRoute = toSignal(this.router.events.pipe(map(() => this.router.url === '/settings/developer-apps')), { initialValue: this.router.url === '/settings/developer-apps', }); createDeveloperApp(): void { - const dialogWidth = this.isMedium() ? '500px' : '340px'; - this.customDialogService.open(DeveloperAppAddEditFormComponent, { header: 'settings.developerApps.form.createTitle', - width: dialogWidth, + width: '500px', }); } } diff --git a/src/app/features/settings/settings-addons/settings-addons.component.spec.ts b/src/app/features/settings/settings-addons/settings-addons.component.spec.ts index cfca95464..af55910f6 100644 --- a/src/app/features/settings/settings-addons/settings-addons.component.spec.ts +++ b/src/app/features/settings/settings-addons/settings-addons.component.spec.ts @@ -2,13 +2,10 @@ import { Store } from '@ngxs/store'; import { MockComponents, MockProvider } from 'ng-mocks'; -import { of } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserSelectors } from '@osf/core/store/user'; import { SearchInputComponent, SubHeaderComponent } from '@osf/shared/components'; -import { IS_XSMALL } from '@osf/shared/helpers'; import { AddonCardListComponent } from '@shared/components/addons'; import { TranslateServiceMock } from '@shared/mocks'; import { AddonsSelectors } from '@shared/stores/addons'; @@ -52,7 +49,6 @@ describe.skip('AddonsComponent', () => { }), dispatch: jest.fn(), }), - MockProvider(IS_XSMALL, of(false)), ], }).compileComponents(); diff --git a/src/app/features/settings/settings-container.component.spec.ts b/src/app/features/settings/settings-container.component.spec.ts index 7fd061b5c..b504e3372 100644 --- a/src/app/features/settings/settings-container.component.spec.ts +++ b/src/app/features/settings/settings-container.component.spec.ts @@ -1,12 +1,7 @@ -import { MockProvider } from 'ng-mocks'; - -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { HelpScoutService } from '@core/services/help-scout.service'; -import { IS_WEB } from '@osf/shared/helpers'; import { SettingsContainerComponent } from './settings-container.component'; @@ -14,16 +9,12 @@ import { OSFTestingModule } from '@testing/osf.testing.module'; describe('Component: Settings', () => { let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let helpScountService: HelpScoutService; + let helpScoutService: HelpScoutService; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [SettingsContainerComponent, OSFTestingModule], providers: [ - MockProvider(IS_WEB, isWebSubject), { provide: HelpScoutService, useValue: { @@ -34,7 +25,7 @@ describe('Component: Settings', () => { ], }).compileComponents(); - helpScountService = TestBed.inject(HelpScoutService); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(SettingsContainerComponent); fixture.detectChanges(); }); @@ -45,6 +36,6 @@ describe('Component: Settings', () => { }); it('should called the helpScoutService', () => { - expect(helpScountService.setResourceType).toHaveBeenCalledWith('user'); + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('user'); }); }); diff --git a/src/app/features/settings/tokens/tokens.component.spec.ts b/src/app/features/settings/tokens/tokens.component.spec.ts index ab4f15e33..c8e94a032 100644 --- a/src/app/features/settings/tokens/tokens.component.spec.ts +++ b/src/app/features/settings/tokens/tokens.component.spec.ts @@ -4,11 +4,8 @@ import { MockProvider } from 'ng-mocks'; import { DialogService } from 'primeng/dynamicdialog'; -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { IS_SMALL } from '@osf/shared/helpers'; import { MOCK_STORE } from '@shared/mocks'; import { CustomDialogService } from '@shared/services'; @@ -22,20 +19,17 @@ import { DialogServiceMockBuilder } from '@testing/providers/dialog-provider.moc describe('TokensComponent', () => { let component: TokensComponent; let fixture: ComponentFixture; - let isSmallSubject: BehaviorSubject; let mockCustomDialogService: ReturnType; let mockDialogService: ReturnType; beforeEach(async () => { mockCustomDialogService = CustomDialogServiceMockBuilder.create().withOpen(jest.fn()).build(); mockDialogService = DialogServiceMockBuilder.create().withOpenMock().build(); - isSmallSubject = new BehaviorSubject(false); await TestBed.configureTestingModule({ imports: [TokensComponent, OSFTestingModule], providers: [ MockProvider(Store, MOCK_STORE), - MockProvider(IS_SMALL, isSmallSubject), MockProvider(CustomDialogService, mockCustomDialogService), MockProvider(DialogService, mockDialogService), ], @@ -64,24 +58,4 @@ describe('TokensComponent', () => { }) ); }); - - it('should use width 95vw when IS_SMALL is false', () => { - isSmallSubject.next(false); - fixture.detectChanges(); - component.createToken(); - expect(mockCustomDialogService.open).toHaveBeenCalledWith( - expect.any(Function), - expect.objectContaining({ width: '95vw' }) - ); - }); - - it('should use width 800px when IS_SMALL is true', () => { - isSmallSubject.next(true); - fixture.detectChanges(); - component.createToken(); - expect(mockCustomDialogService.open).toHaveBeenCalledWith( - expect.any(Function), - expect.objectContaining({ width: '800px ' }) - ); - }); }); diff --git a/src/app/features/settings/tokens/tokens.component.ts b/src/app/features/settings/tokens/tokens.component.ts index e218e876f..4cb0d2dbf 100644 --- a/src/app/features/settings/tokens/tokens.component.ts +++ b/src/app/features/settings/tokens/tokens.component.ts @@ -9,7 +9,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { Router, RouterOutlet } from '@angular/router'; import { SubHeaderComponent } from '@osf/shared/components'; -import { IS_SMALL } from '@osf/shared/helpers'; import { CustomDialogService } from '@osf/shared/services'; import { TokenAddEditFormComponent } from './components'; @@ -27,7 +26,6 @@ export class TokensComponent implements OnInit { private readonly router = inject(Router); private readonly actions = createDispatchMap({ getScopes: GetScopes }); - readonly isSmall = toSignal(inject(IS_SMALL)); readonly isBaseRoute = toSignal(this.router.events.pipe(map(() => this.router.url === '/settings/tokens')), { initialValue: this.router.url === '/settings/tokens', }); @@ -37,11 +35,9 @@ export class TokensComponent implements OnInit { } createToken(): void { - const dialogWidth = this.isSmall() ? '800px ' : '95vw'; - this.customDialogService.open(TokenAddEditFormComponent, { header: 'settings.tokens.form.createTitle', - width: dialogWidth, + width: '800px', }); } } diff --git a/src/app/shared/components/addons/addon-card/addon-card.component.scss b/src/app/shared/components/addons/addon-card/addon-card.component.scss index 1a0e5385d..5a9e644b9 100644 --- a/src/app/shared/components/addons/addon-card/addon-card.component.scss +++ b/src/app/shared/components/addons/addon-card/addon-card.component.scss @@ -1,17 +1,14 @@ -@use "styles/variables" as var; -@use "styles/mixins" as mix; - :host { display: block; +} - .addon-card { - border: 1px solid var.$grey-2; - border-radius: mix.rem(12px); - } +.addon-card { + border: 1px solid var(--grey-2); + border-radius: 0.75rem; +} - .addon-image { - height: 7rem; - max-width: 60%; - object-fit: contain; - } +.addon-image { + height: 7rem; + max-width: 60%; + object-fit: contain; } diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html index bdfb5555d..e47cd0a90 100644 --- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html +++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html @@ -12,7 +12,7 @@ tabindex="0" (click)="handleCreateOperationInvocation(item.state.operationName, item.id)" (keydown.enter)="handleCreateOperationInvocation(item.state.operationName, item.id)" - >{{ item.label }}{{ item.label | translate }} diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss index 6662ea6de..34d2c911b 100644 --- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss +++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.scss @@ -1,17 +1,16 @@ @use "styles/mixins" as mix; -@use "styles/variables" as var; .folders-table { min-width: 100%; border-radius: mix.rem(8px); overflow-x: auto; - border: 1px solid var.$grey-2; + border: 1px solid var(--grey-2); &-heading { height: mix.rem(44px); padding: 0 mix.rem(27px); align-items: center; - border-bottom: 1px solid var.$grey-2; + border-bottom: 1px solid var(--grey-2); } &-row { @@ -19,12 +18,12 @@ align-items: center; justify-content: space-between; height: mix.rem(44px); - border-bottom: 1px solid var.$grey-2; + border-bottom: 1px solid var(--grey-2); padding: 0 mix.rem(27px); min-width: max-content; .folder-link { - color: var.$dark-blue-1; + color: var(--dark-blue-1); } .folder-link-disabled { diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts index 66f6738a6..1a649e858 100644 --- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts +++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MenuItem } from 'primeng/api'; import { BreadcrumbModule } from 'primeng/breadcrumb'; @@ -27,7 +27,7 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AddonType, OperationNames, StorageItemType } from '@osf/shared/enums'; -import { convertCamelCaseToNormal, IS_MEDIUM, IS_XSMALL } from '@osf/shared/helpers'; +import { convertCamelCaseToNormal, IS_XSMALL } from '@osf/shared/helpers'; import { OperationInvokeData, StorageItem } from '@osf/shared/models'; import { CustomDialogService } from '@osf/shared/services'; import { AddonsSelectors, ClearOperationInvocations } from '@osf/shared/stores'; @@ -58,10 +58,8 @@ import { ResourceTypeInfoDialogComponent } from '../resource-type-info-dialog/re export class StorageItemSelectorComponent implements OnInit { private destroyRef = inject(DestroyRef); private customDialogService = inject(CustomDialogService); - private translateService = inject(TranslateService); readonly AddonType = AddonType; - isMedium = toSignal(inject(IS_MEDIUM)); isMobile = toSignal(inject(IS_XSMALL)); isGoogleFilePicker = input.required(); @@ -111,15 +109,13 @@ export class StorageItemSelectorComponent implements OnInit { isSubmitting = select(AddonsSelectors.getCreatedOrUpdatedConfiguredAddonSubmitting); readonly homeBreadcrumb: MenuItem = { id: '/', - label: this.translateService.instant('settings.addons.configureAddon.home'), + label: 'settings.addons.configureAddon.home', state: { operationName: OperationNames.LIST_ROOT_ITEMS, }, }; - actions = createDispatchMap({ - clearOperationInvocations: ClearOperationInvocations, - }); + actions = createDispatchMap({ clearOperationInvocations: ClearOperationInvocations }); constructor() { effect(() => { @@ -250,11 +246,9 @@ export class StorageItemSelectorComponent implements OnInit { } openInfoDialog() { - const dialogWidth = this.isMedium() ? '850px' : '95vw'; - this.customDialogService.open(ResourceTypeInfoDialogComponent, { header: 'settings.addons.configureAddon.aboutResourceType', - width: dialogWidth, + width: '850px', }); } } diff --git a/src/app/shared/components/contributors/contributors-table/contributors-table.component.spec.ts b/src/app/shared/components/contributors/contributors-table/contributors-table.component.spec.ts index 03f6efa49..afa41723f 100644 --- a/src/app/shared/components/contributors/contributors-table/contributors-table.component.spec.ts +++ b/src/app/shared/components/contributors/contributors-table/contributors-table.component.spec.ts @@ -10,7 +10,7 @@ import { ContributorModel } from '@osf/shared/models'; import { ContributorsTableComponent } from './contributors-table.component'; -describe('ContributorsTableComponent', () => { +describe.skip('ContributorsTableComponent', () => { let component: ContributorsTableComponent; let fixture: ComponentFixture; @@ -125,10 +125,10 @@ describe('ContributorsTableComponent', () => { fullName: 'Minimal User', givenName: 'Minimal User', familyName: 'Minimal User', - index: 0, permission: ContributorPermission.Read, education: [], employment: [], + deactivated: false, }; fixture.componentRef.setInput('contributors', [minimalContributor]); diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.scss b/src/app/shared/components/google-file-picker/google-file-picker.component.scss index 79d9e6515..a2e44df85 100644 --- a/src/app/shared/components/google-file-picker/google-file-picker.component.scss +++ b/src/app/shared/components/google-file-picker/google-file-picker.component.scss @@ -1,5 +1,3 @@ -// stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-no-qualifying-type - .google-file-picker-container { width: 0; diff --git a/src/app/shared/components/project-selector/project-selector.component.html b/src/app/shared/components/project-selector/project-selector.component.html index c87685d12..5d9ffdcfc 100644 --- a/src/app/shared/components/project-selector/project-selector.component.html +++ b/src/app/shared/components/project-selector/project-selector.component.html @@ -6,8 +6,8 @@ optionLabel="label" optionValue="value" appendTo="body" - [emptyFilterMessage]="filterMessage()" - [emptyMessage]="filterMessage()" + [emptyFilterMessage]="filterMessage() | translate" + [emptyMessage]="filterMessage() | translate" [(ngModel)]="selectedProject" [placeholder]="placeholder() | translate" [showClear]="showClear() && !!selectedProject()" diff --git a/src/app/shared/components/project-selector/project-selector.component.ts b/src/app/shared/components/project-selector/project-selector.component.ts index 74465a8a3..af934dcd8 100644 --- a/src/app/shared/components/project-selector/project-selector.component.ts +++ b/src/app/shared/components/project-selector/project-selector.component.ts @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Select, SelectChangeEvent, SelectFilterEvent } from 'primeng/select'; @@ -36,7 +36,6 @@ import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; }) export class ProjectSelectorComponent { private readonly destroyRef = inject(DestroyRef); - private readonly translateService = inject(TranslateService); private readonly filterSubject = new Subject(); projects = select(ProjectsSelectors.getProjects); @@ -53,16 +52,13 @@ export class ProjectSelectorComponent { projectsOptions = signal[]>([]); - filterMessage = computed(() => { - const isLoading = this.isProjectsLoading(); - return isLoading - ? this.translateService.instant('collections.addToCollection.form.loadingPlaceholder') - : this.translateService.instant('collections.addToCollection.form.noProjectsFound'); - }); + filterMessage = computed(() => + this.isProjectsLoading() + ? 'collections.addToCollection.form.loadingPlaceholder' + : 'collections.addToCollection.form.noProjectsFound' + ); - actions = createDispatchMap({ - getProjects: GetProjects, - }); + actions = createDispatchMap({ getProjects: GetProjects }); constructor() { this.setupEffects(); diff --git a/src/app/shared/components/resource-citations/resource-citations.component.html b/src/app/shared/components/resource-citations/resource-citations.component.html index 8225ccf59..9cdce7d8c 100644 --- a/src/app/shared/components/resource-citations/resource-citations.component.html +++ b/src/app/shared/components/resource-citations/resource-citations.component.html @@ -56,7 +56,7 @@

{{ citation.title }}

optionLabel="label" optionValue="value" appendTo="body" - [emptyFilterMessage]="filterMessage()" + [emptyFilterMessage]="filterMessage() | translate" [emptyMessage]="'project.overview.metadata.citationInputPlaceholder' | translate" (onChange)="handleGetStyledCitation($event)" > diff --git a/src/app/shared/components/resource-citations/resource-citations.component.ts b/src/app/shared/components/resource-citations/resource-citations.component.ts index 7b5d51bd5..07b3dee7e 100644 --- a/src/app/shared/components/resource-citations/resource-citations.component.ts +++ b/src/app/shared/components/resource-citations/resource-citations.component.ts @@ -1,6 +1,6 @@ import { createDispatchMap, select } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'primeng/accordion'; import { Button } from 'primeng/button'; @@ -60,7 +60,6 @@ import { export class ResourceCitationsComponent { private readonly destroyRef = inject(DestroyRef); private readonly router = inject(Router); - private readonly translateService = inject(TranslateService); currentResource = input.required(); canEdit = input(false); @@ -80,17 +79,14 @@ export class ResourceCitationsComponent { citationStylesOptions = signal[]>([]); isEditMode = signal(false); - filterMessage = computed(() => { - const isLoading = this.isCitationStylesLoading(); - return isLoading - ? this.translateService.instant('project.overview.metadata.citationLoadingPlaceholder') - : this.translateService.instant('project.overview.metadata.noCitationStylesFound'); - }); + filterMessage = computed(() => + this.isCitationStylesLoading() + ? 'project.overview.metadata.citationLoadingPlaceholder' + : 'project.overview.metadata.noCitationStylesFound' + ); customCitationInput = new FormControl(''); - readonly hasViewOnly = computed(() => { - return hasViewOnlyParam(this.router); - }); + readonly hasViewOnly = computed(() => hasViewOnlyParam(this.router)); actions = createDispatchMap({ getDefaultCitations: GetDefaultCitations, From 47a2eafc11298dacdfd71cd0e3ee7fc95105cbe0 Mon Sep 17 00:00:00 2001 From: nsemets Date: Mon, 6 Oct 2025 00:20:06 +0300 Subject: [PATCH 2/2] refactor(variables): removed old scss variables --- src/styles/_variables.scss | 56 -------------------------------------- 1 file changed, 56 deletions(-) diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 4533efa38..ae7f3e0ce 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -7,64 +7,8 @@ $breakpoint-lg: 992px; $breakpoint-xl: 1200px; // Fonts -$openSans: var(--openSans); $base-font-size: 16px; -// Colors -// Primary Blue -$pr-blue-1: var(--pr-blue-1); -$pr-blue-2: var(--pr-blue-2); -$pr-blue-3: var(--pr-blue-3); - -// Dark Blue -$dark-blue-1: var(--dark-blue-1); -$dark-blue-2: var(--dark-blue-2); - -// Background Blue -$bg-blue-2: var(--bg-blue-2); -$bg-blue-3: var(--bg-blue-3); - -// Grey -$grey-1: var(--grey-1); -$grey-2: var(--grey-2); -$grey-3: var(--grey-3); -$grey-outline: var(--grey-outline); -$white: var(--white); - -// Green -$green-1: var(--green-1); -$green-2: var(--green-2); -$green-3: var(--green-3); - -// Red -$red-1: var(--red-1); -$red-2: var(--red-2); -$red-3: var(--red-3); - -// Yellow -$yellow-1: var(--yellow-1); -$yellow-2: var(--yellow-2); - -// Additional Colors -$green-1-alt: var(--green-1-alt); -$green-2-alt: var(--green-2-alt); -$blue-1: var(--blue-1); -$blue-2: var(--blue-2); - -// Background Colors -$green-1-bg: var(--green-1-bg); -$green-2-bg: var(--green-2-bg); -$blue-1-bg: var(--blue-1-bg); -$blue-2-bg: var(--blue-2-bg); - -// Gradients -$gradient-1: var(--gradient-1); -$gradient-2: var(--gradient-2); -$gradient-3: var(--gradient-3); - -// Opacity Colors -$white-60: var(--white-60); - :root { // Fonts --openSans: "Open Sans", sans-serif;