fix(search): Fixed PR comments and conflicts after merge

rrromchIk · rrromchIk · commit 9af6bb93e6dd · 2025-09-04T12:46:30.000+03:00
diff --git a/src/app/features/institutions/pages/institutions-search/institutions-search.component.html b/src/app/features/institutions/pages/institutions-search/institutions-search.component.html
@@ -20,6 +20,6 @@ <h1>{{ institution().name }}</h1>
       <p [innerHtml]="institution().description | safeHtml"></p>
     </div>
 
-    <osf-search [resourceTabOptions]="resourceTabOptions" />
+    <osf-global-search [resourceTabOptions]="resourceTabOptions" />
   }
 </section>
diff --git a/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts b/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts
@@ -10,12 +10,12 @@ import { ActivatedRoute } from '@angular/router';
 import { LoadingSpinnerComponent } from '@osf/shared/components';
 import { SEARCH_TAB_OPTIONS } from '@osf/shared/constants';
 import { FetchInstitutionById, InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
-import { OsfSearchComponent } from '@shared/components';
+import { GlobalSearchComponent } from '@shared/components';
 import { SetDefaultFilterValue } from '@shared/stores/osf-search';
 
 @Component({
   selector: 'osf-institutions-search',
-  imports: [FormsModule, NgOptimizedImage, LoadingSpinnerComponent, SafeHtmlPipe, OsfSearchComponent],
+  imports: [FormsModule, NgOptimizedImage, LoadingSpinnerComponent, SafeHtmlPipe, GlobalSearchComponent],
   templateUrl: './institutions-search.component.html',
   styleUrl: './institutions-search.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.html b/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.html
@@ -5,5 +5,5 @@
 />
 
 @if (preprintProvider()) {
-  <osf-search [searchControlInput]="searchControl" [provider]="preprintProvider() ?? null" />
+  <osf-global-search [searchControlInput]="searchControl" [provider]="preprintProvider() ?? null" />
 }
diff --git a/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts b/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts
@@ -7,15 +7,15 @@ import { ActivatedRoute } from '@angular/router';
 import { PreprintProviderHeroComponent } from '@osf/features/preprints/components';
 import { BrowserTabHelper, HeaderStyleHelper } from '@osf/shared/helpers';
 import { BrandService } from '@osf/shared/services';
-import { OsfSearchComponent } from '@shared/components/osf-search/osf-search.component';
+import { GlobalSearchComponent } from '@shared/components';
 import { ResourceType } from '@shared/enums';
-import { SetDefaultFilterValue, SetResourceType } from '@shared/stores/osf-search/osf-search.actions';
+import { SetDefaultFilterValue, SetResourceType } from '@shared/stores/osf-search';
 
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
 
 @Component({
   selector: 'osf-preprint-provider-discover',
-  imports: [PreprintProviderHeroComponent, OsfSearchComponent],
+  imports: [PreprintProviderHeroComponent, GlobalSearchComponent],
   templateUrl: './preprint-provider-discover.component.html',
   styleUrl: './preprint-provider-discover.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/profile/pages/my-profile/my-profile.component.html b/src/app/features/profile/pages/my-profile/my-profile.component.html
@@ -2,6 +2,6 @@
 
 @if (currentUser()) {
   <div class="m-t-48">
-    <osf-search [resourceTabOptions]="resourceTabOptions" />
+    <osf-global-search [resourceTabOptions]="resourceTabOptions" />
   </div>
 }
diff --git a/src/app/features/profile/pages/my-profile/my-profile.component.ts b/src/app/features/profile/pages/my-profile/my-profile.component.ts
@@ -6,14 +6,14 @@ import { Router } from '@angular/router';
 import { UserSelectors } from '@osf/core/store/user';
 import { ProfileInformationComponent } from '@osf/features/profile/components';
 import { SetUserProfile } from '@osf/features/profile/store';
-import { OsfSearchComponent } from '@shared/components';
+import { GlobalSearchComponent } from '@shared/components';
 import { SEARCH_TAB_OPTIONS } from '@shared/constants';
 import { ResourceType } from '@shared/enums';
 import { SetDefaultFilterValue, UpdateFilterValue } from '@shared/stores/osf-search';
 
 @Component({
   selector: 'osf-my-profile',
-  imports: [ProfileInformationComponent, OsfSearchComponent],
+  imports: [ProfileInformationComponent, GlobalSearchComponent],
   templateUrl: './my-profile.component.html',
   styleUrl: './my-profile.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/profile/pages/user-profile/user-profile.component.html b/src/app/features/profile/pages/user-profile/user-profile.component.html
@@ -1,10 +1,11 @@
 @if (isUserLoading()) {
+  <osf-loading-spinner />
 } @else {
-  <osf-profile-information [currentUser]="currentUser()" />
-
   @if (currentUser()) {
+    <osf-profile-information [currentUser]="currentUser()" />
+
     <div class="m-t-48">
-      <osf-search [resourceTabOptions]="resourceTabOptions" />
+      <osf-global-search [resourceTabOptions]="resourceTabOptions" />
     </div>
   }
 }
diff --git a/src/app/features/profile/pages/user-profile/user-profile.component.ts b/src/app/features/profile/pages/user-profile/user-profile.component.ts
@@ -1,23 +1,25 @@
 import { createDispatchMap, select } from '@ngxs/store';
 
-import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, inject, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { ProfileInformationComponent } from '@osf/features/profile/components';
 import { FetchUserProfile, ProfileSelectors } from '@osf/features/profile/store';
-import { OsfSearchComponent } from '@shared/components';
+import { GlobalSearchComponent, LoadingSpinnerComponent } from '@shared/components';
 import { SEARCH_TAB_OPTIONS } from '@shared/constants';
 import { ResourceType } from '@shared/enums';
 import { SetDefaultFilterValue } from '@shared/stores/osf-search';
 
 @Component({
   selector: 'osf-user-profile',
-  imports: [ProfileInformationComponent, OsfSearchComponent],
+  imports: [ProfileInformationComponent, GlobalSearchComponent, LoadingSpinnerComponent],
   templateUrl: './user-profile.component.html',
   styleUrl: './user-profile.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class UserProfileComponent implements OnInit {
+  @HostBinding('class') classes = 'flex-1';
+
   private route = inject(ActivatedRoute);
   private actions = createDispatchMap({
     fetchUserProfile: FetchUserProfile,
diff --git a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .registries-hero-container {
   background-image: var(--branding-hero-background-image-url);
diff --git a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts
@@ -28,6 +28,7 @@ export class RegistryProviderHeroComponent implements OnDestroy {
   private readonly translateService = inject(TranslateService);
   private readonly dialogService = inject(DialogService);
 
+  private readonly WHITE = '#ffffff';
   searchControl = input<FormControl>(new FormControl());
   provider = input.required<RegistryProviderDetails | null>();
   isProviderLoading = input.required<boolean>();
@@ -44,7 +45,7 @@ export class RegistryProviderHeroComponent implements OnDestroy {
       if (provider) {
         BrandService.applyBranding(provider.brand);
         HeaderStyleHelper.applyHeaderStyles(
-          '#ffffff',
+          this.WHITE,
           provider.brand.primaryColor,
           provider.brand.heroBackgroundImageUrl
         );
diff --git a/src/app/features/registries/pages/registries-provider-search/registries-provider-search.component.html b/src/app/features/registries/pages/registries-provider-search/registries-provider-search.component.html
@@ -5,5 +5,5 @@
 />
 
 @if (provider()) {
-  <osf-search [searchControlInput]="searchControl" />
+  <osf-global-search [searchControlInput]="searchControl" />
 }
diff --git a/src/app/features/registries/pages/registries-provider-search/registries-provider-search.component.ts b/src/app/features/registries/pages/registries-provider-search/registries-provider-search.component.ts
@@ -11,13 +11,13 @@ import {
   GetRegistryProviderBrand,
   RegistriesProviderSearchSelectors,
 } from '@osf/features/registries/store/registries-provider-search';
-import { OsfSearchComponent } from '@shared/components';
+import { GlobalSearchComponent } from '@shared/components';
 import { ResourceType } from '@shared/enums';
 import { SetDefaultFilterValue, SetResourceType } from '@shared/stores/osf-search';
 
 @Component({
   selector: 'osf-registries-provider-search',
-  imports: [RegistryProviderHeroComponent, OsfSearchComponent],
+  imports: [RegistryProviderHeroComponent, GlobalSearchComponent],
   templateUrl: './registries-provider-search.component.html',
   styleUrl: './registries-provider-search.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/search/search.component.html b/src/app/features/search/search.component.html
@@ -1,3 +1,3 @@
 <div class="m-t-48 p-t-40">
-  <osf-search [resourceTabOptions]="searchTabOptions" />
+  <osf-global-search [resourceTabOptions]="searchTabOptions" />
 </div>
diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts
@@ -1,14 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
-import { OsfSearchComponent } from '@shared/components';
+import { GlobalSearchComponent } from '@shared/components';
 import { SEARCH_TAB_OPTIONS } from '@shared/constants';
 
 @Component({
   selector: 'osf-search-page',
   templateUrl: './search.component.html',
   styleUrl: './search.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [OsfSearchComponent],
+  imports: [GlobalSearchComponent],
 })
 export class SearchComponent {
   searchTabOptions = SEARCH_TAB_OPTIONS;
diff --git a/src/app/shared/components/global-search/global-search.component.html b/src/app/shared/components/global-search/global-search.component.html
diff --git a/src/app/shared/components/global-search/global-search.component.scss b/src/app/shared/components/global-search/global-search.component.scss
diff --git a/src/app/shared/components/global-search/global-search.component.spec.ts b/src/app/shared/components/global-search/global-search.component.spec.ts
@@ -1,17 +1,17 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { OsfSearchComponent } from './osf-search.component';
+import { GlobalSearchComponent } from './global-search.component';
 
 describe.skip('OsfSearchComponent', () => {
-  let component: OsfSearchComponent;
-  let fixture: ComponentFixture<OsfSearchComponent>;
+  let component: GlobalSearchComponent;
+  let fixture: ComponentFixture<GlobalSearchComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [OsfSearchComponent],
+      imports: [GlobalSearchComponent],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(OsfSearchComponent);
+    fixture = TestBed.createComponent(GlobalSearchComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/shared/components/global-search/global-search.component.ts b/src/app/shared/components/global-search/global-search.component.ts
@@ -45,7 +45,7 @@ import { SearchInputComponent } from '../search-input/search-input.component';
 import { SearchResultsContainerComponent } from '../search-results-container/search-results-container.component';
 
 @Component({
-  selector: 'osf-search',
+  selector: 'osf-global-search',
   imports: [
     FilterChipsComponent,
     SearchInputComponent,
@@ -54,11 +54,11 @@ import { SearchResultsContainerComponent } from '../search-results-container/sea
     ReusableFilterComponent,
     SearchHelpTutorialComponent,
   ],
-  templateUrl: './osf-search.component.html',
-  styleUrl: './osf-search.component.scss',
+  templateUrl: './global-search.component.html',
+  styleUrl: './global-search.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class OsfSearchComponent implements OnInit, OnDestroy {
+export class GlobalSearchComponent implements OnInit, OnDestroy {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private destroyRef = inject(DestroyRef);
diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts
@@ -28,7 +28,6 @@ export { MakeDecisionDialogComponent } from './make-decision-dialog/make-decisio
 export { MarkdownComponent } from './markdown/markdown.component';
 export { MetadataTabsComponent } from './metadata-tabs/metadata-tabs.component';
 export { MyProjectsTableComponent } from './my-projects-table/my-projects-table.component';
-export { OsfSearchComponent } from './osf-search/osf-search.component';
 export { PasswordInputHintComponent } from './password-input-hint/password-input-hint.component';
 export { PieChartComponent } from './pie-chart/pie-chart.component';
 export { ProjectSelectorComponent } from './project-selector/project-selector.component';
@@ -52,3 +51,4 @@ export { ToastComponent } from './toast/toast.component';
 export { TruncatedTextComponent } from './truncated-text/truncated-text.component';
 export { ViewOnlyLinkMessageComponent } from './view-only-link-message/view-only-link-message.component';
 export { ViewOnlyTableComponent } from './view-only-table/view-only-table.component';
+export { GlobalSearchComponent } from '@shared/components/global-search/global-search.component';
diff --git a/src/app/shared/components/resource-card/resource-card.component.scss b/src/app/shared/components/resource-card/resource-card.component.scss
@@ -16,10 +16,6 @@
     }
   }
 
-  span {
-    display: inline;
-  }
-
   a {
     font-weight: bold;
     display: inline;
@@ -54,25 +50,6 @@
     word-break: break-word;
   }
 
-  .icon-container {
-    color: var.$dark-blue-1;
-    display: flex;
-    align-items: center;
-    column-gap: 0.3rem;
-
-    &:hover {
-      text-decoration: none;
-      color: var.$pr-blue-1;
-    }
-  }
-
-  .description {
-    line-height: 2rem;
-    word-wrap: break-word;
-    overflow-wrap: break-word;
-    word-break: break-word;
-  }
-
   .break-line {
     border: none;
     border-top: 1px solid var.$grey-2;
diff --git a/src/app/shared/components/resource-card/resource-card.component.spec.ts b/src/app/shared/components/resource-card/resource-card.component.spec.ts
@@ -4,7 +4,6 @@ import { of } from 'rxjs';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
-import { Router } from '@angular/router';
 
 import { IS_XSMALL } from '@osf/shared/helpers';
 import { ResourceCardComponent } from '@shared/components';
@@ -16,7 +15,6 @@ import { ResourceCardService } from '@shared/services';
 describe.skip('ResourceCardComponent', () => {
   let component: ResourceCardComponent;
   let fixture: ComponentFixture<ResourceCardComponent>;
-  let router: Router;
 
   const mockUserCounts = MOCK_USER_RELATED_COUNTS;
 
@@ -31,15 +29,13 @@ describe.skip('ResourceCardComponent', () => {
           getUserRelatedCounts: jest.fn().mockReturnValue(of(mockUserCounts)),
         }),
         MockProvider(IS_XSMALL, of(false)),
-        MockProvider(Router),
         TranslateServiceMock,
         provideNoopAnimations(),
       ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ResourceCardComponent);
     component = fixture.componentInstance;
-    router = TestBed.inject(Router);
   });
 
   it('should create', () => {
@@ -59,14 +55,6 @@ describe.skip('ResourceCardComponent', () => {
     expect(component.isSmall()).toBe(false);
   });
 
-  it('should not navigate for non-registration resources', () => {
-    const navigateSpy = jest.spyOn(router, 'navigate');
-
-    component.redirectToResource(mockAgentResource);
-
-    expect(navigateSpy).not.toHaveBeenCalled();
-  });
-
   it('should return early when item is null', () => {
     fixture.componentRef.setInput('item', null);
 
diff --git a/src/app/shared/components/search-results-container/search-results-container.component.scss b/src/app/shared/components/search-results-container/search-results-container.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .result-count {
   color: var(--pr-blue-1);
diff --git a/src/app/shared/constants/index.ts b/src/app/shared/constants/index.ts
@@ -13,8 +13,6 @@ export * from './osf-resource-types.const';
 export * from './pie-chart-palette';
 export * from './pie-chart-palette';
 export * from './registry-services-icons.const';
-export * from './remove-nullable.const';
-export * from './resource-languages.const';
 export * from './resource-types.const';
 export * from './scientists.const';
 export * from './search-sort-options.const';
diff --git a/src/app/shared/models/user/user.models.ts b/src/app/shared/models/user/user.models.ts
@@ -1,3 +1,5 @@
+import { JsonApiResponse } from '@shared/models';
+
 import { Education } from './education.model';
 import { Employment } from './employment.model';
 import { Social } from './social.model';

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ <h1>{{ institution().name }}</h1>`
`20`	`20`	`<p [innerHtml]="institution().description \| safeHtml"></p>`
`21`	`21`	`</div>`
`22`	`22`
`23`		`- <osf-search [resourceTabOptions]="resourceTabOptions" />`
	`23`	`+ <osf-global-search [resourceTabOptions]="resourceTabOptions" />`
`24`	`24`	`}`
`25`	`25`	`</section>`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`/>`
`6`	`6`
`7`	`7`	`@if (preprintProvider()) {`
`8`		`- <osf-search [searchControlInput]="searchControl" [provider]="preprintProvider() ?? null" />`
	`8`	`+ <osf-global-search [searchControlInput]="searchControl" [provider]="preprintProvider() ?? null" />`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`@if (currentUser()) {`
`4`	`4`	`<div class="m-t-48">`
`5`		`- <osf-search [resourceTabOptions]="resourceTabOptions" />`
	`5`	`+ <osf-global-search [resourceTabOptions]="resourceTabOptions" />`
`6`	`6`	`</div>`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@use "assets/styles/mixins" as mix;`
	`1`	`+@use "styles/mixins" as mix;`
`2`	`2`
`3`	`3`	`.registries-hero-container {`
`4`	`4`	`background-image: var(--branding-hero-background-image-url);`