Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8f5c860
fix(meetings): fixed meetings small issues
nsemets Aug 26, 2025
8de9aef
fix(tooltips): added tooltips
nsemets Aug 27, 2025
516655f
Merge remote-tracking branch 'origin/main' into fix/tooltips
nsemets Aug 27, 2025
193a0b5
fix(table): updated sorting
nsemets Aug 28, 2025
35212d5
fix(settings): fixed update project
nsemets Aug 28, 2025
1cf324e
fix(bookmarks): updated bookmarks
nsemets Aug 28, 2025
6d76abc
fix(my-registrations): fixed my registrations
nsemets Aug 28, 2025
fc5c303
fix(developer-apps): fixed developer apps
nsemets Aug 28, 2025
2bf55dd
fix(settings): updated tokens and notifications
nsemets Aug 28, 2025
78a26e2
fix(translation): removed dot
nsemets Aug 28, 2025
3d65a7e
Merge remote-tracking branch 'origin/main' into fix/table-sorting
nsemets Aug 28, 2025
4112bea
fix(info-icon): updated info icon translate
nsemets Aug 28, 2025
72d5703
fix(profile-settings): fixed profile settings
nsemets Aug 28, 2025
72ac75d
fix(test): updated tests
nsemets Aug 28, 2025
7324a40
Merge branch 'fix/table-sorting' into fix/improvements
nsemets Aug 28, 2025
6392c7b
fix(settings): updated settings
nsemets Aug 31, 2025
269a864
fix(user-emails): updated adding emails to user account
nsemets Sep 1, 2025
924baa0
fix(tests): updated tests
nsemets Sep 1, 2025
b8aac51
Merge remote-tracking branch 'origin/main' into fix/improvements
nsemets Sep 1, 2025
bf23db4
fix(clean-up): clean up
Nazar690 Sep 1, 2025
cd7ab91
Merge remote-tracking branch 'origin/main' into fix/improvements
nsemets Sep 1, 2025
64f92f4
Merge remote-tracking branch 'origin/fix/clean-up' into fix/improvements
nsemets Sep 1, 2025
569f5d7
fix(models): updated models
nsemets Sep 1, 2025
1929104
fix(models): updated region and license models
nsemets Sep 1, 2025
a62b376
Merge remote-tracking branch 'origin/main' into fix/improvements
nsemets Sep 2, 2025
ff31520
fix(styles): moved styles from assets
nsemets Sep 2, 2025
0da2aac
Merge remote-tracking branch 'origin/main' into fix/improvements
nsemets Sep 2, 2025
e93ff98
fix(test): fixed institution loading and test for view only link
nsemets Sep 2, 2025
4022bf1
fix(analytics): added check if is public
nsemets Sep 2, 2025
5b0ca69
fix(analytics): updated analytics feature
nsemets Sep 2, 2025
95087c7
fix(analytics): show message when data loaded
nsemets Sep 2, 2025
9570fe9
Merge remote-tracking branch 'origin/main' into fix/improvements
nsemets Sep 2, 2025
File filter

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: 1 addition & 1 deletion src/app/core/store/user/user.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { tap } from 'rxjs';

import { inject, Injectable } from '@angular/core';

import { removeNullable } from '@osf/shared/constants';
import { ProfileSettingsKey } from '@osf/shared/enums';
import { removeNullable } from '@osf/shared/helpers';
import { UserMapper } from '@osf/shared/mappers';
import { Social } from '@osf/shared/models';

Expand Down
6 changes: 3 additions & 3 deletions src/app/features/institutions/institutions.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { provideStates } from '@ngxs/store';

import { Routes } from '@angular/router';

import { authGuard } from '@osf/core/guards';
import { InstitutionsComponent } from '@osf/features/institutions/institutions.component';
import { InstitutionsSearchState } from '@shared/stores';
import { authGuard } from '@core/guards';
import { InstitutionsSearchState } from '@osf/shared/stores';

import { InstitutionsComponent } from './institutions.component';
import { InstitutionsListComponent, InstitutionsSearchComponent } from './pages';

export const routes: Routes = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>{{ institution.name }}</h2>
}
</div>

@if (totalInstitutionsCount() > 10) {
@if (totalInstitutionsCount() > currentPageSize()) {
<osf-custom-paginator
[first]="first()"
[totalCount]="totalInstitutionsCount()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import {
LoadingSpinnerComponent,
SearchInputComponent,
SubHeaderComponent,
} from '@shared/components';
import { TABLE_PARAMS } from '@shared/constants';
import { parseQueryFilterParams } from '@shared/helpers';
import { QueryParams } from '@shared/models';
import { FetchInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
} from '@osf/shared/components';
import { TABLE_PARAMS } from '@osf/shared/constants';
import { parseQueryFilterParams } from '@osf/shared/helpers';
import { QueryParams } from '@osf/shared/models';
import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';

@Component({
selector: 'osf-institutions-list',
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/components/bar-chart/bar-chart.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
signal,
} from '@angular/core';

import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
import { PIE_CHART_PALETTE } from '@osf/shared/constants';
import { DatasetInput } from '@osf/shared/models';

import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
signal,
} from '@angular/core';

import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
import { PIE_CHART_PALETTE } from '@osf/shared/constants';
import { DatasetInput } from '@osf/shared/models';

import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/components/pie-chart/pie-chart.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
signal,
} from '@angular/core';

import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
import { PIE_CHART_PALETTE } from '@osf/shared/constants';
import { DatasetInput } from '@osf/shared/models';

import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
Expand Down
3 changes: 2 additions & 1 deletion src/app/shared/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export * from './language.const';
export * from './meetings-table.constants';
export * from './my-projects-table.constants';
export * from './osf-resource-types.const';
export * from './pie-chart-palette';
export * from './registry-services-icons.const';
export * from './remove-nullable.const';
export * from './resource-filters-defaults';
export * from './resource-languages.const';
export * from './resource-types.const';
Expand All @@ -20,4 +20,5 @@ export * from './search-sort-options.const';
export * from './search-state-defaults.const';
export * from './search-tab-options.const';
export * from './search-tutorial-steps.const';
export * from './social-share.config';
export * from './sort-options.const';
12 changes: 12 additions & 0 deletions src/app/shared/constants/pie-chart-palette.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const PIE_CHART_PALETTE = [
'#00bbde',
'#fe6672',
'#eeb058',
'#8a8ad6',
'#ff855c',
'#00cfbb',
'#5a9eed',
'#73d483',
'#c879bb',
'#0099b6',
];
6 changes: 6 additions & 0 deletions src/app/shared/constants/social-share.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const SOCIAL_SHARE_URLS = {
email: 'mailto:',
twitter: 'https://twitter.com/intent/tweet',
facebook: 'https://www.facebook.com/sharer/sharer.php',
linkedIn: 'https://www.linkedin.com/shareArticle',
};
2 changes: 1 addition & 1 deletion src/app/shared/enums/addon-tab.enum.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum AddonTabValue {
ALL_ADDONS = 0,
CONNECTED_ADDONS = 1,
CONNECTED_ADDONS,
}