Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bc33816
refactor(preprint-hero): Extracted logic of handling search input
rrromchIk Jun 9, 2025
5721d60
Merge branch 'refs/heads/main' into feat/181,191-preprint-provider-di…
rrromchIk Jun 9, 2025
3a2fc45
feat(preprints-discover): Added discover page, registered route, basi…
rrromchIk Jun 10, 2025
20c9d4a
Merge branch 'refs/heads/main' into feat/181,191-preprint-provider-di…
rrromchIk Jun 10, 2025
8cf3b64
refactor(resource-req-type): Moved enum to shared
rrromchIk Jun 10, 2025
dfd16ce
refactor(resource-filter-label): Moved model to shared
rrromchIk Jun 10, 2025
afa45f3
refactor(search-state-defaults): Moved constant to shared
rrromchIk Jun 10, 2025
85685bf
refactor(resource-filters-defaults): Moved constant to shared
rrromchIk Jun 10, 2025
70cdccd
feat(preprints-resources-filters-state): Implemented state
rrromchIk Jun 10, 2025
cc89133
refactor(preprints-state): Moved to separate folder
rrromchIk Jun 10, 2025
52ff47d
fix(shared-const-index): Fixed index file
rrromchIk Jun 10, 2025
278fa35
feat(preprints-search-state): Implemented state for preprints discove…
rrromchIk Jun 10, 2025
58b641a
feat(preprints-resources-filters-options): Implemented state for prep…
rrromchIk Jun 10, 2025
7709a54
feat(preprints-filters-chips): Implemented filters chips component
rrromchIk Jun 10, 2025
acb4c2e
feat(preprints-date-created-filter): Implemented filter component
rrromchIk Jun 10, 2025
eb4a80f
fix(preprints-search-state): Created new state to fix strange error
rrromchIk Jun 10, 2025
870f229
fix(state-provider): Providing states on route level
rrromchIk Jun 11, 2025
5df7199
refactor(sort-options): extracted to shared constants
rrromchIk Jun 11, 2025
d80147d
feat(store): Added selectors to simplify logic
rrromchIk Jun 11, 2025
f74bc9b
Merge branch 'main' into feat/181,191-preprint-provider-discover
rrromchIk Jun 11, 2025
d9bcb4a
refactor(resource-card-service): Moved to shared
rrromchIk Jun 11, 2025
16a16d5
fix(preprints-filter-chips): Add PrimeTemplate import
rrromchIk Jun 11, 2025
66643e7
feat(preprints-resources): Implemented section to handle sorting, fil…
rrromchIk Jun 11, 2025
2b53d2f
feat(filters-store): Added new filter to the store
rrromchIk Jun 12, 2025
87c073d
fix(style): Fix styles for preprints resources component
rrromchIk Jun 12, 2025
30f5e3e
feat(preprints-hero): Added ability to pass search control
rrromchIk Jun 12, 2025
089a7b6
fix(resource-card): Loading user related counts only for items with R…
rrromchIk Jun 12, 2025
3c84296
fix(resource-card): Removed link to my projects for almost all resources
rrromchIk Jun 12, 2025
9cdd278
feat(home): Added links to already exising preprints and meetings page
rrromchIk Jun 12, 2025
d7764aa
feat(preprint-filters): Added all filters needed, Implemented discove…
rrromchIk Jun 12, 2025
e7a0eb0
fix(preprint-filters-tests): Fixed imports
rrromchIk Jun 12, 2025
6b357bf
fix(preprint-resources-filters): Fixed anyOptionsCount signal
rrromchIk Jun 12, 2025
cd696e9
fix(preprint-filters): Added export to index file, fixed imports
rrromchIk Jun 12, 2025
b0f2ebd
fix(resource-card): Removed global styles, added styles to shared com…
rrromchIk Jun 12, 2025
b183a96
feat(preprints-discover): Added iri prop to PreprintProviderDetails, …
rrromchIk Jun 12, 2025
3d9b867
fix(filters-chips): Reordered chips, removed unused
rrromchIk Jun 12, 2025
24b8a54
fix(preprints-discover): Minor fixes
rrromchIk Jun 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/app/core/constants/ngxs-states.constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { CollectionsState } from '@osf/features/collections/store';
import { InstitutionsState } from '@osf/features/institutions/store';
import { MeetingsState } from '@osf/features/meetings/store';
import { MyProjectsState } from '@osf/features/my-projects/store';
import { PreprintsState } from '@osf/features/preprints/store';
import { AnalyticsState } from '@osf/features/project/analytics/store';
import { ProjectOverviewState } from '@osf/features/project/overview/store';
import { RegistrationsState } from '@osf/features/project/registrations/store';
Expand Down Expand Up @@ -35,5 +34,4 @@ export const STATES = [
WikiState,
MeetingsState,
RegistrationsState,
PreprintsState,
];
4 changes: 2 additions & 2 deletions src/app/features/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h1>{{ 'home.loggedIn.latestResearch.title' | translate }}</h1>
<p class="m-t-12">{{ 'home.loggedIn.latestResearch.subtitle' | translate }}</p>
</div>

<p-button [label]="'home.loggedIn.latestResearch.button' | translate" severity="success" />
<p-button routerLink="/preprints" [label]="'home.loggedIn.latestResearch.button' | translate" severity="success" />
</div>

<div class="hosting-container flex flex-column py-6 px-3 md:px-4 xl:flex-row xl:justify-content-between">
Expand All @@ -54,6 +54,6 @@ <h1>{{ 'home.loggedIn.hosting.title' | translate }}</h1>
<p class="m-t-12">{{ 'home.loggedIn.hosting.subtitle' | translate }}</p>
</div>

<p-button [label]="'home.loggedIn.hosting.button' | translate" severity="success" />
<p-button routerLink="/meetings" [label]="'home.loggedIn.hosting.button' | translate" severity="success" />
</div>
</section>
1 change: 0 additions & 1 deletion src/app/features/my-profile/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from './filters';
export { MyProfileFilterChipsComponent } from './my-profile-filter-chips/my-profile-filter-chips.component';
export { MyProfileResourceCardComponent } from './my-profile-resource-card/my-profile-resource-card.component';
export { MyProfileResourceFiltersComponent } from './my-profile-resource-filters/my-profile-resource-filters.component';
export { MyProfileResourcesComponent } from './my-profile-resources/my-profile-resources.component';
export { MyProfileSearchComponent } from './my-profile-search/my-profile-search.component';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { ResourceFilterLabel } from '@shared/models';

export interface MyProfileResourceFiltersStateModel {
creator: ResourceFilterLabel;
dateCreated: ResourceFilterLabel;
Expand All @@ -9,9 +11,3 @@ export interface MyProfileResourceFiltersStateModel {
provider: ResourceFilterLabel;
partOfCollection: ResourceFilterLabel;
}

export interface ResourceFilterLabel {
filterName: string;
label?: string;
value?: string;
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Selector } from '@ngxs/store';

import { ResourceFiltersStateModel } from '@osf/features/search/components/resource-filters/store';
import { ResourceFilterLabel } from '@shared/models';

import { ResourceFilterLabel } from './my-profile-resource-filters.model';
import { MyProfileResourceFiltersState } from './my-profile-resource-filters.state';

export class MyProfileResourceFiltersSelectors {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { Action, NgxsOnInit, State, StateContext, Store } from '@ngxs/store';
import { inject, Injectable } from '@angular/core';

import { UserSelectors } from '@osf/core/store/user';
import { FilterLabelsModel, resourceFiltersDefaultsModel } from '@osf/shared/models';
import { FilterLabelsModel } from '@osf/shared/models';
import { resourceFiltersDefaults } from '@shared/constants';

import {
SetCreator,
Expand All @@ -21,7 +22,7 @@ import { MyProfileResourceFiltersStateModel } from './my-profile-resource-filter
// Store for user selected filters values
@State<MyProfileResourceFiltersStateModel>({
name: 'myProfileResourceFilters',
defaults: resourceFiltersDefaultsModel,
defaults: resourceFiltersDefaults,
})
@Injectable()
export class MyProfileResourceFiltersState implements NgxsOnInit {
Expand All @@ -41,6 +42,7 @@ export class MyProfileResourceFiltersState implements NgxsOnInit {
}
});
}

@Action(SetCreator)
setCreator(ctx: StateContext<MyProfileResourceFiltersStateModel>, action: SetCreator) {
ctx.patchState({
Expand Down
Loading